From chninkel at users.sourceforge.net Sun Nov 1 01:00:18 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 01 Nov 2009 00:00:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7051] csw/mgar/pkg/rlwrap/trunk/Makefile Message-ID: Revision: 7051 http://gar.svn.sourceforge.net/gar/?rev=7051&view=rev Author: chninkel Date: 2009-11-01 00:00:18 +0000 (Sun, 01 Nov 2009) Log Message: ----------- rlwrap: fixed package name Modified Paths: -------------- csw/mgar/pkg/rlwrap/trunk/Makefile Modified: csw/mgar/pkg/rlwrap/trunk/Makefile =================================================================== --- csw/mgar/pkg/rlwrap/trunk/Makefile 2009-10-30 15:11:29 UTC (rev 7050) +++ csw/mgar/pkg/rlwrap/trunk/Makefile 2009-11-01 00:00:18 UTC (rev 7051) @@ -21,7 +21,7 @@ rlwrap is a readline wrapper, a small utility that uses the GNU readline library to allow the editing of keyboard input for any other command. It maintains a separate input history for each command, and can TAB-expand words using all previously seen words and/or a user-specified file. endef -PACKAGES = rlwrap +PACKAGES = CSWrlwrap REQUIRED_PKGS = CSWreadline This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Nov 1 01:07:46 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 01 Nov 2009 00:07:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7052] csw/mgar/pkg/cyrus_imapd/trunk Message-ID: Revision: 7052 http://gar.svn.sourceforge.net/gar/?rev=7052&view=rev Author: chninkel Date: 2009-11-01 00:07:46 +0000 (Sun, 01 Nov 2009) Log Message: ----------- cyrus_imapd: explicit berkeleydb4.2 dependancy Modified Paths: -------------- csw/mgar/pkg/cyrus_imapd/trunk/Makefile csw/mgar/pkg/cyrus_imapd/trunk/checksums csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2009-11-01 00:00:18 UTC (rev 7051) +++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2009-11-01 00:07:46 UTC (rev 7052) @@ -33,17 +33,17 @@ SPKG_DESC_CSWcyrusimapd = Pop and Imap server from the Cyrus mail system CATALOGNAME_CSWcyrusimapd = cyrus_imapd -REQUIRED_PKGS_CSWcyrusimapd = CSWosslrt CSWsasl CSWbdb4 CSWkrb5lib CSWtcpwrap CSWnetsnmp CSWpcrert +REQUIRED_PKGS_CSWcyrusimapd = CSWosslrt CSWsasl CSWbdb42 CSWkrb5lib CSWtcpwrap CSWnetsnmp CSWpcrert SPKG_CLASSES_CSWcyrusimapd = none services cswpreserveconf cswinitsmf SPKG_DESC_CSWcyrusimapdutils = Various admin utilities for Cyrus Imapd/Popd CATALOGNAME_CSWcyrusimapdutils = cyrus_imapd_utils -REQUIRED_PKGS_CSWcyrusimapdutils = CSWpmcyrus CSWosslrt CSWsasl CSWbdb4 CSWkrb5lib CSWpcrert +REQUIRED_PKGS_CSWcyrusimapdutils = CSWpmcyrus CSWosslrt CSWsasl CSWbdb42 CSWkrb5lib CSWpcrert SPKG_CLASSES_CSWcyrusimapdutils = none SPKG_DESC_CSWpmcyrus = Perl interface to Cyrus Imap functions CATALOGNAME_CSWpmcyrus = pm_cyrus -REQUIRED_PKGS_CSWpmcyrus = CSWperl CSWbdb4 CSWosslrt CSWsasl +REQUIRED_PKGS_CSWpmcyrus = CSWperl CSWbdb42 CSWosslrt CSWsasl SPKG_CLASSES_CSWpmcyrus = none @@ -104,8 +104,8 @@ CONFIGURE_ARGS += --with-cyrus-prefix=$(prefix) CONFIGURE_ARGS += --with-service-path=$(libexecdir)/cyrus CONFIGURE_ARGS += --sysconfdir=$(sysconfdir)/cyrus -CONFIGURE_ARGS += --with-bdb-libdir=$(prefix)/bdb4/lib -CONFIGURE_ARGS += --with-bdb-incdir=$(prefix)/bdb4/include +CONFIGURE_ARGS += --with-bdb-libdir=$(prefix)/bdb42/lib +CONFIGURE_ARGS += --with-bdb-incdir=$(prefix)/bdb42/include CONFIGURE_ARGS += --with-openssl=$(prefix) CONFIGURE_ARGS += --with-sasl=$(prefix) CONFIGURE_ARGS += --with-perl=$(prefix)/bin/perl Modified: csw/mgar/pkg/cyrus_imapd/trunk/checksums =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/checksums 2009-11-01 00:00:18 UTC (rev 7051) +++ csw/mgar/pkg/cyrus_imapd/trunk/checksums 2009-11-01 00:07:46 UTC (rev 7052) @@ -13,14 +13,14 @@ b4c99489eacf0fb7befeef5e3098a5c1 cyrus-imapd-2.3.7-nobarenewlinescheck.patch 6127a7b62ec4679a54985f6a2d915e52 cyrus-imapd-acceptinvalidfrom.patch fdb3416ec41f3a56d1594ca25a6dcd7d cyrus.conf -e8868f4e344649d1f2939d5d00f3f800 cyrus_imapd.changelog.CSW -d722bfe708263b946d7bbc7f4d0ddf46 cyrus_imapd_utils.changelog.CSW +1228b6378951f1b5434bd785973cab34 cyrus_imapd.changelog.CSW +da92e9f3f78942431ad5ca9f9c842083 cyrus_imapd_utils.changelog.CSW 5375c25c8bc325a90553d0be87a64a04 et_c.awk d1d86e61463a1dfefccbadedb11a8604 et_h.awk 79211aee56db01e15566ced1ba4078da i.services 908dbf764d3ccd541c4de881ac81a6ae imapd.conf 14bb6e8c6d6914351f80df293982e88a install-upgrade -e6730668fa500fc77120ee007e535274 pm_cyrus.changelog.CSW +fc47edab821dfac970ca342b7f20bde8 pm_cyrus.changelog.CSW 149ac6b6d82ef9ef4bb1b314f1a1cac4 r.services dce627f9a464ae4efe8a66c8dbd358d5 restore_allowplaintext_default.patch 6dfee20f7c02139350caf9f75199e587 services Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW 2009-11-01 00:00:18 UTC (rev 7051) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW 2009-11-01 00:07:46 UTC (rev 7052) @@ -3,6 +3,7 @@ * New upstream version. * Switched to cswclassutils for SMF support and configuration file handling. * Removed devel files (.h and .a). + * Now depends explicitly on berkeleydb42 instead of berkeleydb4. -- Yann Rouillard Sun, 11 Oct 2009 00:47:17 +0200 Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW 2009-11-01 00:00:18 UTC (rev 7051) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW 2009-11-01 00:07:46 UTC (rev 7052) @@ -1,6 +1,7 @@ cyrus_imapd_utils (2.3.15,REV=2009.10.11) unstable * New upstream version. + * Now depends explicitly on berkeleydb42 instead of berkeleydb4. -- Yann Rouillard Sun, 11 Oct 2009 00:47:17 +0200 Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW 2009-11-01 00:00:18 UTC (rev 7051) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW 2009-11-01 00:07:46 UTC (rev 7052) @@ -1,6 +1,7 @@ pm_cyrus (2.3.15,REV=2009.10.11) unstable * New upstream version. + * Now depends explicitly on berkeleydb42 instead of berkeleydb4. -- Yann Rouillard Sun, 11 Oct 2009 00:47:17 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Nov 1 01:24:46 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 01 Nov 2009 00:24:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7053] csw/mgar/pkg/lftp/trunk Message-ID: Revision: 7053 http://gar.svn.sourceforge.net/gar/?rev=7053&view=rev Author: chninkel Date: 2009-11-01 00:24:46 +0000 (Sun, 01 Nov 2009) Log Message: ----------- lftp: updated to 4.0.3 Modified Paths: -------------- csw/mgar/pkg/lftp/trunk/Makefile csw/mgar/pkg/lftp/trunk/checksums csw/mgar/pkg/lftp/trunk/files/changelog.CSW Modified: csw/mgar/pkg/lftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/lftp/trunk/Makefile 2009-11-01 00:07:46 UTC (rev 7052) +++ csw/mgar/pkg/lftp/trunk/Makefile 2009-11-01 00:24:46 UTC (rev 7053) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = lftp -GARVERSION = 4.0.2 +GARVERSION = 4.0.3 CATEGORIES = net DESCRIPTION = sophisticated command-line ftp/http client Modified: csw/mgar/pkg/lftp/trunk/checksums =================================================================== --- csw/mgar/pkg/lftp/trunk/checksums 2009-11-01 00:07:46 UTC (rev 7052) +++ csw/mgar/pkg/lftp/trunk/checksums 2009-11-01 00:24:46 UTC (rev 7053) @@ -1,3 +1,3 @@ 5bc881a13c106b1c97f2137ff1755817 CSWlftp.prototype -90cfdf4e9b3481ab053e46a4baf82845 changelog.CSW -664fd567bb49e1e4dea1ba37430a8449 lftp-4.0.2.tar.gz +db4f98b7f4e325262647231ebba66b74 changelog.CSW +3dcda96e6567c0829055dc7e0f92ff5c lftp-4.0.3.tar.gz Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2009-11-01 00:07:46 UTC (rev 7052) +++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2009-11-01 00:24:46 UTC (rev 7053) @@ -1,3 +1,9 @@ +lftp (4.0.3,REV=2009.11.01) unstable + + * New upstream release. + + -- Yann Rouillard Sun, 01 Nov 2009 01:23:45 +0100 + lftp (4.0.2,REV=2009.10.11) unstable * New upstream release. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Nov 1 01:49:23 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 01 Nov 2009 00:49:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7054] csw/mgar/pkg/vsftpd/trunk Message-ID: Revision: 7054 http://gar.svn.sourceforge.net/gar/?rev=7054&view=rev Author: chninkel Date: 2009-11-01 00:49:23 +0000 (Sun, 01 Nov 2009) Log Message: ----------- vsftpd: updated to 2.2.1 Modified Paths: -------------- csw/mgar/pkg/vsftpd/trunk/Makefile csw/mgar/pkg/vsftpd/trunk/checksums csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW Modified: csw/mgar/pkg/vsftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/vsftpd/trunk/Makefile 2009-11-01 00:24:46 UTC (rev 7053) +++ csw/mgar/pkg/vsftpd/trunk/Makefile 2009-11-01 00:49:23 UTC (rev 7054) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = vsftpd -GARVERSION = 2.2.0 +GARVERSION = 2.2.1 CATEGORIES = server DESCRIPTION = A very secure and fast FTP server. Modified: csw/mgar/pkg/vsftpd/trunk/checksums =================================================================== --- csw/mgar/pkg/vsftpd/trunk/checksums 2009-11-01 00:24:46 UTC (rev 7053) +++ csw/mgar/pkg/vsftpd/trunk/checksums 2009-11-01 00:49:23 UTC (rev 7054) @@ -2,7 +2,7 @@ 8944fcd302add66d5b2b287d390b9c91 CSWvsftpd.prototype eeaf77528b2da0c7730323838f30b7ef README.CSW 281c51282cabd9475cceef363bbc699b build_options.patch -1680c237d8aa01a3571b80e426dba7a3 changelog.CSW +c402d9755c9ea931dec6f256aef16541 changelog.CSW 54c1c39c6bfa8747a4457f135fd5bca1 csw_build_system.patch a9e994d2b57999b76a0e03503745c01a csw_paths.patch 98e1d831801985daf5ce2ed01fbc0efd cswusergroup @@ -10,7 +10,7 @@ 93173edf9931b8eb835c6d0177a7c6bd cswvsftpd.xml 73e59f9ada47d3d20199f7c97849fb13 destdir.patch a9a65f55cbfd01f9d72d1de25e67148d set_priv_sep_user.patch -e4eb190af270ae65d57a84274a38ec31 vsftpd-2.2.0.tar.gz +a25e53dd86fada8d3897910b8f0efdb7 vsftpd-2.2.1.tar.gz f6ce22a6959b93e500a4ae800295c2ee vsftpd.conf 0d4a1cf36560892adb9eb9410a01c522 vsftpd.smf_wrapper 60c736802e2ce00c531953b01e4a26f6 vsftpd.userlist Modified: csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW 2009-11-01 00:24:46 UTC (rev 7053) +++ csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW 2009-11-01 00:49:23 UTC (rev 7054) @@ -1,3 +1,9 @@ +vsftpd (2.2.1,REV=2009.11.01) unstable + + * New upstream version. + + -- Yann Rouillard Sun, 01 Nov 2009 01:47:26 +0100 + vsftpd (2.2.0,REV=2009.10.10) unstable * New upstream version. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Nov 1 01:50:12 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 01 Nov 2009 00:50:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7055] csw/mgar/pkg/bash/trunk Message-ID: Revision: 7055 http://gar.svn.sourceforge.net/gar/?rev=7055&view=rev Author: chninkel Date: 2009-11-01 00:50:09 +0000 (Sun, 01 Nov 2009) Log Message: ----------- bash: updated to patch level 35 Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile csw/mgar/pkg/bash/trunk/checksums csw/mgar/pkg/bash/trunk/files/changelog.CSW Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2009-11-01 00:49:23 UTC (rev 7054) +++ csw/mgar/pkg/bash/trunk/Makefile 2009-11-01 00:50:09 UTC (rev 7055) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = bash -GARVERSION = 4.0.33 +GARVERSION = 4.0.35 CATEGORIES = devel DESCRIPTION = A sh-compatible command language interpreter Modified: csw/mgar/pkg/bash/trunk/checksums =================================================================== --- csw/mgar/pkg/bash/trunk/checksums 2009-11-01 00:49:23 UTC (rev 7054) +++ csw/mgar/pkg/bash/trunk/checksums 2009-11-01 00:50:09 UTC (rev 7055) @@ -33,6 +33,8 @@ 389635281133416de9d13295251cabc7 bash40-031 d646cb4aed8e0f0d1d47eea2ed5f3690 bash40-032 d3e77d2a0a051478aca8c30d13ded834 bash40-033 -2e65971f182336356e87af544a24ccfe changelog.CSW +05a54807fd388e71bac8912ad530ac6d bash40-034 +fc3d8fdb83ccc407ab7f6d1b7ac6a221 bash40-035 +52c58cea6ccac9d7e51fb63adffbbfb3 changelog.CSW 60956e6be20f69dafbb06fcc83bab88e shells 29607316cff22f7427322d8f190cbadf use_system_bashrc_and_logout.patch Modified: csw/mgar/pkg/bash/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash/trunk/files/changelog.CSW 2009-11-01 00:49:23 UTC (rev 7054) +++ csw/mgar/pkg/bash/trunk/files/changelog.CSW 2009-11-01 00:50:09 UTC (rev 7055) @@ -1,3 +1,9 @@ +bash (4.0.35,REV=2009.11.01) unstable + + * Added bash patches bash40-034 to bash40-035. + + -- Yann Rouillard Sun, 01 Nov 2009 01:11:48 +0100 + bash (4.0.33,REV=2009.10.11) unstable * Added bash patches bash40-029 to bash40-033. 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 Nov 1 02:04:38 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 01 Nov 2009 01:04:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[7056] csw/mgar/pkg/samba/trunk Message-ID: Revision: 7056 http://gar.svn.sourceforge.net/gar/?rev=7056&view=rev Author: bdwalton Date: 2009-11-01 01:04:38 +0000 (Sun, 01 Nov 2009) Log Message: ----------- samba: bump version, update some gar stuff, handle 3/4 source diffs for config/build scripts Modified Paths: -------------- csw/mgar/pkg/samba/trunk/Makefile csw/mgar/pkg/samba/trunk/checksums Modified: csw/mgar/pkg/samba/trunk/Makefile =================================================================== --- csw/mgar/pkg/samba/trunk/Makefile 2009-11-01 00:50:09 UTC (rev 7055) +++ csw/mgar/pkg/samba/trunk/Makefile 2009-11-01 01:04:38 UTC (rev 7056) @@ -1,5 +1,5 @@ GARNAME = samba -GARVERSION = 3.3.4 +GARVERSION = 3.4.3 CATEGORIES = apps DESCRIPTION = Tools to access a servers filespace and printers via SMB (server) @@ -13,13 +13,21 @@ PACKAGES = CSWsamba CSWsambaclient CSWsambacommon CSWsambadoc CSWsambalib CSWsambalibdev CSWsambaswat CSWsambawb CATALOGNAME_CSWsamba = samba +SPKG_DESC_CSWsamba = $(DESCRIPTION) CATALOGNAME_CSWsambaclient = samba_client +SPKG_DESC_CSWsambaclient = Client binaries for samba CATALOGNAME_CSWsambacommon = samba_common +SPKG_DESC_CSWsambacommon = Shared support files for samba CATALOGNAME_CSWsambadoc = samba_doc +SPKG_DESC_CSWsambadoc = Samba documentation CATALOGNAME_CSWsambalib = samba_lib +SPKG_DESC_CSWsambalib = Samba shared libraries CATALOGNAME_CSWsambalibdev = samba_libdev +SPKG_DESC_CSWsambalibdev = Development files for the samba libraries CATALOGNAME_CSWsambaswat = samba_swat +SPKG_DESC_CSWsambaswat = Web-based samba administration tools CATALOGNAME_CSWsambawb = samba_wb +SPKG_DESC_CSWsambawb = not sure what this is REQUIRED_PKGS_CSWsamba = CSWsasl CSWsambacommon CSWoldaprt CSWlibpopt CSWlibnet CSWlibcups CSWkrb5lib CSWiconv CSWggettext CSWfam REQUIRED_PKGS_CSWsambaclient = CSWsasl CSWsambacommon CSWreadline CSWlibpopt CSWlibnet CSWkrb5lib CSWiconv CSWggettext @@ -34,6 +42,9 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +CONFIGURE_SCRIPTS = $(WORKSRC)/source3/configure CONFIGURE_ARGS = $(DIRPATHS) +BUILD_SCRIPTS = $(WORKSRC)/source3/Makefile + include gar/category.mk Modified: csw/mgar/pkg/samba/trunk/checksums =================================================================== --- csw/mgar/pkg/samba/trunk/checksums 2009-11-01 00:50:09 UTC (rev 7055) +++ csw/mgar/pkg/samba/trunk/checksums 2009-11-01 01:04:38 UTC (rev 7056) @@ -1 +1 @@ -1443165edb7cb3f56f1e77aec1ee3266 download/samba-3.3.4.tar.gz +322379680c12057f57685652a35a6b05 samba-3.4.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Nov 1 02:10:36 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 01 Nov 2009 01:10:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[7057] csw/mgar/pkg/ca_certificates/trunk/checksums Message-ID: Revision: 7057 http://gar.svn.sourceforge.net/gar/?rev=7057&view=rev Author: chninkel Date: 2009-11-01 01:10:36 +0000 (Sun, 01 Nov 2009) Log Message: ----------- ca_certificates: updated checksum Modified Paths: -------------- csw/mgar/pkg/ca_certificates/trunk/checksums Modified: csw/mgar/pkg/ca_certificates/trunk/checksums =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/checksums 2009-11-01 01:04:38 UTC (rev 7056) +++ csw/mgar/pkg/ca_certificates/trunk/checksums 2009-11-01 01:10:36 UTC (rev 7057) @@ -1,4 +1,4 @@ -4dabeaecfd46395da152e51d312107e4 download/certdata.txt +dabe696bb410d748fbaedbc5f18b11e2 download/certdata.txt 77fe4c8feb1b341814a6ed03d4ff764a download/certdata2pem.pl 8163827375c4cb08f9734930adb06ee2 download/update-ca-certificates b4f6772525da6772d51eb30f90605d60 download/ca-certificates.conf 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 Nov 1 02:48:16 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 01 Nov 2009 01:48:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7058] csw/mgar/pkg/samba/trunk Message-ID: Revision: 7058 http://gar.svn.sourceforge.net/gar/?rev=7058&view=rev Author: bdwalton Date: 2009-11-01 01:48:15 +0000 (Sun, 01 Nov 2009) Log Message: ----------- samba: store old notes from phil Added Paths: ----------- csw/mgar/pkg/samba/trunk/legacy_notes/ csw/mgar/pkg/samba/trunk/legacy_notes/BUILD.NOTES csw/mgar/pkg/samba/trunk/legacy_notes/Makefile.patch csw/mgar/pkg/samba/trunk/legacy_notes/makepkg.sh.diff csw/mgar/pkg/samba/trunk/legacy_notes/pkginfo.master Added: csw/mgar/pkg/samba/trunk/legacy_notes/BUILD.NOTES =================================================================== --- csw/mgar/pkg/samba/trunk/legacy_notes/BUILD.NOTES (rev 0) +++ csw/mgar/pkg/samba/trunk/legacy_notes/BUILD.NOTES 2009-11-01 01:48:15 UTC (rev 7058) @@ -0,0 +1,55 @@ +INSTRUCTIONS (reasons for it lower down) + +# edit source/Makefile and change SHELL to /bin/bash +# patch <~/pkgs/samba/Makefile.patch + +cd packaging/Solaris +patch <~/pkgs/samba/makepkg.sh.diff + +# tweak pkginfo.master as desired, for test package +bash ./makepkg.sh build + +You should then manually KILL IT, when it starts the compile phase. + Then cd ../../source, and edit out -z text from Makefile, and + do a make. + + (Where does it come from!?!? It's not in Makefile.in ?!!) + +------------------------------------------------------------ + +PROBLEMS: + +bombs out after loong time, with error under + source/lib/ldb with reference or something + from ldb_module.o + +both gcc and cc die. +Apparently, it's because samba does "bad things" with +reallocation of what should be read-only code in shared libs. +This makes it 'inefficient', by itself. + Unfortunately,"-z text" makes it a fatal flaw.. so, have to + manually remove that flag from Makefile, after configure!! +http://docsun.cites.uiuc.edu/sun_docs/C/solaris_9/SUNWdev/LLM/p24.html + +Additionally, need to change SHELL=/bin/sh to SHELL=bin/bash in Makefile + +LD_OPTIONS='-R/opt/csw/lib/$ISALIST -R$ORIGIN/../lib -R/opt/csw/lib -L/opt/csw/lib' + + +TO PACKAGE UP THEIR WAY: +Need to patch paths, and use +packaging/Solaris/makepkg.sh.csw + +Which also has to hack LD_LIBRARY_PATH because they script does naughty things + +plus, errors in final packaging: + + no object for found in root directory + no object for found in root directory + no object for found in root directory + no object for found in root directory + no object for found in root directory +# libsmbclient libmsrpc + +Late note: patch the sample smb.conf.default to have /var/opt +instead of /usr/local/samba/var reference Added: csw/mgar/pkg/samba/trunk/legacy_notes/Makefile.patch =================================================================== --- csw/mgar/pkg/samba/trunk/legacy_notes/Makefile.patch (rev 0) +++ csw/mgar/pkg/samba/trunk/legacy_notes/Makefile.patch 2009-11-01 01:48:15 UTC (rev 7058) @@ -0,0 +1,4 @@ +86c86 +< SHELL=/bin/sh +--- +> SHELL=/bin/bash Added: csw/mgar/pkg/samba/trunk/legacy_notes/makepkg.sh.diff =================================================================== --- csw/mgar/pkg/samba/trunk/legacy_notes/makepkg.sh.diff (rev 0) +++ csw/mgar/pkg/samba/trunk/legacy_notes/makepkg.sh.diff 2009-11-01 01:48:15 UTC (rev 7058) @@ -0,0 +1,152 @@ +*** makepkg.sh Thu Sep 18 08:49:02 2008 +--- makepkg.sh.csw Mon Oct 27 18:57:08 2008 +*************** +*** 4,12 **** + # Copyright (C) Gerald Carter 2004 + # + # script for build solaris Samba package +! # + +! INSTALL_BASE=/opt/samba + + SBINPROGS="smbd nmbd winbindd swat" + BINPROGS="findsmb nmblookup eventlogadm pdbedit rpcclient smbclient smbcquotas smbspool smbtar tdbbackup testparm wbinfo net ntlm_auth profiles smbcacls smbcontrol smbpasswd smbstatus smbtree tdbdump" +--- 4,19 ---- + # Copyright (C) Gerald Carter 2004 + # + # script for build solaris Samba package +! # Modified slightly by Philip Brown, to adhere to CSW standards +! # http://www.opencsw.org/ +! +! # Even though the link flags are *NICE* and use -$ORIGIN/../lib, # +! # the build/install scripts do wierd things, and call smbd from its SOURCE TREE location. +! # which then breaks dynamic libs. arg. SO need to override only for install purposes. +! LD_LIBRARY_PATH='$ORIGIN:$ORIGIN/../lib' +! export LD_LIBRARY_PATH + +! INSTALL_BASE=/opt/csw + + SBINPROGS="smbd nmbd winbindd swat" + BINPROGS="findsmb nmblookup eventlogadm pdbedit rpcclient smbclient smbcquotas smbspool smbtar tdbbackup testparm wbinfo net ntlm_auth profiles smbcacls smbcontrol smbpasswd smbstatus smbtree tdbdump" +*************** +*** 50,62 **** + + echo "#\n# libsmbclient\n#" + echo f none lib/libsmbclient.so 0755 root other +! echo f none lib/libsmbclient.a 0755 root other + echo f none include/libsmbclient.h 0644 root other + + echo "#\n# libmsrpc\n#" +! echo f none lib/libmsrpc.so 0755 root other +! echo f none lib/libmsrpc.a 0755 root other +! echo f none include/libmsrpc.h 0644 root other + + if [ -f lib/smbwrapper.so -a -f bin/smbsh ]; then + echo "#\n# smbwrapper\n#" +--- 57,71 ---- + + echo "#\n# libsmbclient\n#" + echo f none lib/libsmbclient.so 0755 root other +! #static lib doesnt get built. rather than try to "fix" this, dont bother. --CSW +! # echo f none lib/libsmbclient.a 0755 root other + echo f none include/libsmbclient.h 0644 root other + ++ #libmsrpc doesnt seem to get built. so dont try to package it after all. --CSW + echo "#\n# libmsrpc\n#" +! # echo f none lib/libmsrpc.so 0755 root other +! # echo f none lib/libmsrpc.a 0755 root other +! # echo f none include/libmsrpc.h 0644 root other + + if [ -f lib/smbwrapper.so -a -f bin/smbsh ]; then + echo "#\n# smbwrapper\n#" +*************** +*** 76,92 **** + echo "#\n# man pages \n#" + + # Create directories for man page sections if nonexistent +! cd man + for i in 1 2 3 4 5 6 7 8 9; do + manpages=`ls man$i 2>/dev/null` + if [ $? -eq 0 ]; then +! echo d none man/man${i} ? ? ? + for manpage in $manpages; do +! echo f none man/man${i}/${manpage} 0644 root other + done + fi + done +! cd .. + + echo "#\n# SWAT \n#" + list=`find swat -type d | grep -v "/.svn$"` +--- 85,101 ---- + echo "#\n# man pages \n#" + + # Create directories for man page sections if nonexistent +! cd share/man + for i in 1 2 3 4 5 6 7 8 9; do + manpages=`ls man$i 2>/dev/null` + if [ $? -eq 0 ]; then +! echo d none share/man/man${i} ? ? ? + for manpage in $manpages; do +! echo f none share/man/man${i}/${manpage} 0644 root other + done + fi + done +! cd ../.. + + echo "#\n# SWAT \n#" + list=`find swat -type d | grep -v "/.svn$"` +*************** +*** 103,111 **** + fi + done + + # Create entries for docs for the beginner +! echo 's none docs/using_samba=$BASEDIR/swat/using_samba' +! for file in docs/*pdf; do + echo f none $file 0644 root other + done + } +--- 112,122 ---- + fi + done + ++ mkdir share/doc ++ mv docs share/doc/samba + # Create entries for docs for the beginner +! echo 's none share/doc/samba/using_samba=$BASEDIR/swat/using_samba' +! for file in share/doc/samba/*pdf; do + echo f none $file 0644 root other + done + } +*************** +*** 128,141 **** + + cd $DISTR_BASE/source + +! if test "x$1" = "xbuild" ]; then + ./configure --prefix=$INSTALL_BASE \ +! --localstatedir=/var/lib/samba \ + --with-piddir=/var/run \ + --with-logfilebase=/var/log/samba \ +! --with-privatedir=/etc/samba/private \ +! --with-configdir=/etc/samba \ +! --with-lockdir=/var/lib/samba \ + --with-pam --with-acl-support \ + --with-quotas --with-included-popt \ + && make +--- 139,152 ---- + + cd $DISTR_BASE/source + +! if test "x$1" = "xbuild" ; then + ./configure --prefix=$INSTALL_BASE \ +! --localstatedir=/var/opt/csw/samba \ + --with-piddir=/var/run \ + --with-logfilebase=/var/log/samba \ +! --with-privatedir=/etc/opt/csw/samba/private \ +! --with-configdir=/etc/opt/csw/samba \ +! --with-lockdir=/var/opt/csw/samba \ + --with-pam --with-acl-support \ + --with-quotas --with-included-popt \ + && make Added: csw/mgar/pkg/samba/trunk/legacy_notes/pkginfo.master =================================================================== --- csw/mgar/pkg/samba/trunk/legacy_notes/pkginfo.master (rev 0) +++ csw/mgar/pkg/samba/trunk/legacy_notes/pkginfo.master 2009-11-01 01:48:15 UTC (rev 7058) @@ -0,0 +1,11 @@ +PKG=samba +NAME=TEST PACKAGE FOR SAMBA 3.2.4 BINARIES +ARCH=__ARCH__ +VERSION=__VERSION__ +CATEGORY=system +EMAIL=phil at opencsw.org +CLASSES=none +INTONLY=1 +ISTATES="S s 1 2 3" +RSTATES="S s 1 2 3" +BASEDIR=__BASEDIR__ 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 Nov 1 03:41:44 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 01 Nov 2009 02:41:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7059] csw/mgar/pkg/samba/trunk/legacy_notes/BUILD.NOTES Message-ID: Revision: 7059 http://gar.svn.sourceforge.net/gar/?rev=7059&view=rev Author: bdwalton Date: 2009-11-01 02:41:43 +0000 (Sun, 01 Nov 2009) Log Message: ----------- samba: augment legacy build notes with a bit of info Modified Paths: -------------- csw/mgar/pkg/samba/trunk/legacy_notes/BUILD.NOTES Modified: csw/mgar/pkg/samba/trunk/legacy_notes/BUILD.NOTES =================================================================== --- csw/mgar/pkg/samba/trunk/legacy_notes/BUILD.NOTES 2009-11-01 01:48:15 UTC (rev 7058) +++ csw/mgar/pkg/samba/trunk/legacy_notes/BUILD.NOTES 2009-11-01 02:41:43 UTC (rev 7059) @@ -14,6 +14,8 @@ do a make. (Where does it come from!?!? It's not in Makefile.in ?!!) + - This is leaked in from a call to `krb5-config --libs` + 20091031 -bw ------------------------------------------------------------ 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 Nov 1 14:19:06 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 01 Nov 2009 13:19:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7060] csw/mgar/pkg Message-ID: Revision: 7060 http://gar.svn.sourceforge.net/gar/?rev=7060&view=rev Author: dmichelsen Date: 2009-11-01 13:19:06 +0000 (Sun, 01 Nov 2009) Log Message: ----------- gsm: Initial commit, shared libraries missing Added Paths: ----------- csw/mgar/pkg/gsm/ csw/mgar/pkg/gsm/branches/ csw/mgar/pkg/gsm/tags/ csw/mgar/pkg/gsm/trunk/ csw/mgar/pkg/gsm/trunk/Makefile csw/mgar/pkg/gsm/trunk/checksums csw/mgar/pkg/gsm/trunk/files/ Property changes on: csw/mgar/pkg/gsm/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/gsm/trunk/Makefile =================================================================== --- csw/mgar/pkg/gsm/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gsm/trunk/Makefile 2009-11-01 13:19:06 UTC (rev 7060) @@ -0,0 +1,47 @@ +GARNAME = gsm +GARVERSION = 1.0.13 +CATEGORIES = utils + +DESCRIPTION = GSM 06.10 lossy speech compression +define BLURB +endef + +MASTER_SITES = http://user.cs.tu-berlin.de/~jutta/gsm/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://user.cs.tu-berlin.de/~jutta/toast.html + +WORKSRC = $(WORKDIR)/gsm-1.0-pl13 + +# Stuff needed for Shared Library +# @$(MAKE) REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ +# LIBS="-lsocket -lnsl" RANLIB=/bin/true \ +# AR=ld ARFLAGS="-G -h libwrap.so.1 -o " \ +# LIB=libwrap.so.1 VSYSLOG= \ +# NETGROUP=-DNETGROUP AUX_OBJ="setenv.o sharedhack.o" TLI=-DTLI \ +# BUGS="$(BUGS) -DSOLARIS_24_GETHOSTBYNAME_BUG" IPV6="$(IPV6)" \ +# EXTRA_CFLAGS="-DUSE_STRERROR -Kpic" all + +BUILD64 = 1 + +CONFIGURE_SCRIPTS = + +BUILD_ARGS = CC="$(CC)" CFLAGS="-c $(CFLAGS) -Iinc" + +TEST_TARGET = tst addtst misc +TEST_ARGS = $(BUILD_ARGS) + +INSTALL_ARGS = TOAST_INSTALL_ROOT="$(DESTDIR)$(prefix)" +INSTALL_ARGS += GSM_INSTALL_ROOT="$(DESTDIR)$(prefix)" + +include gar/category.mk + +pre-install-modulated: + ginstall -d $(DESTDIR)$(bindir) + ginstall -d $(DESTDIR)$(libdir) + ginstall -d $(DESTDIR)$(prefix)/inc + ginstall -d $(DESTDIR)$(prefix)/man/man1 + @$(MAKECOOKIE) Added: csw/mgar/pkg/gsm/trunk/checksums =================================================================== --- csw/mgar/pkg/gsm/trunk/checksums (rev 0) +++ csw/mgar/pkg/gsm/trunk/checksums 2009-11-01 13:19:06 UTC (rev 7060) @@ -0,0 +1 @@ +c1ba392ce61dc4aff1c29ea4e92f6df4 gsm-1.0.13.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 Nov 1 14:26:10 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 01 Nov 2009 13:26:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7061] csw/mgar/pkg Message-ID: Revision: 7061 http://gar.svn.sourceforge.net/gar/?rev=7061&view=rev Author: dmichelsen Date: 2009-11-01 13:26:09 +0000 (Sun, 01 Nov 2009) Log Message: ----------- lpc10: Initial commit Added Paths: ----------- csw/mgar/pkg/lpc10/ csw/mgar/pkg/lpc10/branches/ csw/mgar/pkg/lpc10/tags/ csw/mgar/pkg/lpc10/trunk/ csw/mgar/pkg/lpc10/trunk/Makefile csw/mgar/pkg/lpc10/trunk/checksums csw/mgar/pkg/lpc10/trunk/files/ Property changes on: csw/mgar/pkg/lpc10/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/lpc10/trunk/Makefile =================================================================== --- csw/mgar/pkg/lpc10/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lpc10/trunk/Makefile 2009-11-01 13:26:09 UTC (rev 7061) @@ -0,0 +1,23 @@ +GARNAME = lpc10 +GARVERSION = 1.5 +CATEGORIES = apps + +DESCRIPTION = LPC-10 speech coder software +define BLURB +endef + +MASTER_SITES = http://www.arl.wustl.edu/~jaf/lpc/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.arl.wustl.edu/~jaf/lpc/ + +BUILD64 = 1 + +# Some way to go for the manual build + +CONFIGURE_SCRIPTS = + +include gar/category.mk Added: csw/mgar/pkg/lpc10/trunk/checksums =================================================================== --- csw/mgar/pkg/lpc10/trunk/checksums (rev 0) +++ csw/mgar/pkg/lpc10/trunk/checksums 2009-11-01 13:26:09 UTC (rev 7061) @@ -0,0 +1 @@ +c6d9174b78c4aafa67ae50b232a3aef3 lpc10-1.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 Sun Nov 1 14:31:40 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 01 Nov 2009 13:31:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[7062] csw/mgar/pkg/sox Message-ID: Revision: 7062 http://gar.svn.sourceforge.net/gar/?rev=7062&view=rev Author: dmichelsen Date: 2009-11-01 13:31:39 +0000 (Sun, 01 Nov 2009) Log Message: ----------- sox: Convert from legacy to mGAR v2 Added Paths: ----------- csw/mgar/pkg/sox/branches/ csw/mgar/pkg/sox/tags/ csw/mgar/pkg/sox/tags/legacy/ csw/mgar/pkg/sox/trunk/Makefile csw/mgar/pkg/sox/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/sox/trunk/legacy/ Property Changed: ---------------- csw/mgar/pkg/sox/trunk/ Property changes on: csw/mgar/pkg/sox/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Copied: csw/mgar/pkg/sox/trunk/Makefile (from rev 7018, csw/mgar/pkg/libmad/trunk/Makefile) =================================================================== --- csw/mgar/pkg/sox/trunk/Makefile (rev 0) +++ csw/mgar/pkg/sox/trunk/Makefile 2009-11-01 13:31:39 UTC (rev 7062) @@ -0,0 +1,26 @@ +GARNAME = sox +GARVERSION = 14.3.0 +CATEGORIES = apps + +DESCRIPTION = Sound Processing Tool +define BLURB +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(DISTNAME).tar.gz + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://sox.sourceforge.net/ + +# XXX: Add gsm, lpc10 and wavpack +REQUIRED_PKGS = CSWvorbis CSWlibogg CSWlibmad CSWlame CSWlibid3tag +PREREQUISITE_PKGS = $(REQUIRED_PKGS) + +CONFIGURE_ARGS = $(DIRPATHS) + +BUILD64 = 1 + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/sox/trunk/checksums =================================================================== --- csw/mgar/pkg/sox/trunk/checksums (rev 0) +++ csw/mgar/pkg/sox/trunk/checksums 2009-11-01 13:31:39 UTC (rev 7062) @@ -0,0 +1 @@ +8e3509804e6227273ef84092e1a2fea7 sox-14.3.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 Nov 1 14:32:53 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 01 Nov 2009 13:32:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[7063] csw/mgar/pkg Message-ID: Revision: 7063 http://gar.svn.sourceforge.net/gar/?rev=7063&view=rev Author: dmichelsen Date: 2009-11-01 13:32:53 +0000 (Sun, 01 Nov 2009) Log Message: ----------- wavpack: Initial commit Added Paths: ----------- csw/mgar/pkg/wavpack/ csw/mgar/pkg/wavpack/branches/ csw/mgar/pkg/wavpack/tags/ csw/mgar/pkg/wavpack/trunk/ csw/mgar/pkg/wavpack/trunk/Makefile csw/mgar/pkg/wavpack/trunk/checksums csw/mgar/pkg/wavpack/trunk/files/ Property changes on: csw/mgar/pkg/wavpack/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/wavpack/trunk/Makefile =================================================================== --- csw/mgar/pkg/wavpack/trunk/Makefile (rev 0) +++ csw/mgar/pkg/wavpack/trunk/Makefile 2009-11-01 13:32:53 UTC (rev 7063) @@ -0,0 +1,24 @@ +GARNAME = wavpack +GARVERSION = 4.60.0 +CATEGORIES = lib + +DESCRIPTION = Open audio compression format +define BLURB + WavPack is a completely open audio compression format providing lossless, + high-quality lossy, and a unique hybrid compression mode. Although the + technology is loosely based on previous versions of WavPack, the new version 4 + format has been designed from the ground up to offer unparalleled performance + and functionality. +endef + +MASTER_SITES = http://www.wavpack.com/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +BUILD64 = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/wavpack/trunk/checksums =================================================================== --- csw/mgar/pkg/wavpack/trunk/checksums (rev 0) +++ csw/mgar/pkg/wavpack/trunk/checksums 2009-11-01 13:32:53 UTC (rev 7063) @@ -0,0 +1 @@ +722f90393b292cd1413e8af8250a3783 wavpack-4.60.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Nov 1 14:42:53 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 01 Nov 2009 13:42:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[7064] csw/mgar/pkg/cgit/trunk/Makefile Message-ID: Revision: 7064 http://gar.svn.sourceforge.net/gar/?rev=7064&view=rev Author: trygvis Date: 2009-11-01 13:42:53 +0000 (Sun, 01 Nov 2009) Log Message: ----------- o PRESERVECONF should be without the .CSW suffix. Modified Paths: -------------- csw/mgar/pkg/cgit/trunk/Makefile Modified: csw/mgar/pkg/cgit/trunk/Makefile =================================================================== --- csw/mgar/pkg/cgit/trunk/Makefile 2009-11-01 13:32:53 UTC (rev 7063) +++ csw/mgar/pkg/cgit/trunk/Makefile 2009-11-01 13:42:53 UTC (rev 7064) @@ -47,8 +47,8 @@ # pdf-doc does not work yet INSTALL_ARGS += man-doc html-doc -PRESERVECONF = /etc/opt/csw/cgit/apache.conf.CSW -PRESERVECONF += /etc/opt/csw/cgit/cgitrc.CSW +PRESERVECONF = /etc/opt/csw/cgit/apache.conf +PRESERVECONF += /etc/opt/csw/cgit/cgitrc # Trick to get the gar+git support to export the source code pre-extract-modulated: git-extract-cgit 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 Nov 1 17:12:23 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 01 Nov 2009 16:12:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7065] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswinetd Message-ID: Revision: 7065 http://gar.svn.sourceforge.net/gar/?rev=7065&view=rev Author: bdwalton Date: 2009-11-01 16:12:23 +0000 (Sun, 01 Nov 2009) Log Message: ----------- cswclassutils: use canonical filename of inetd.conf (match r script) since the /etc/inetd.conf symlink is only important on opensolaris where inetadm/svcs will be used anyway Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd 2009-11-01 13:42:53 UTC (rev 7064) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd 2009-11-01 16:12:23 UTC (rev 7065) @@ -94,7 +94,7 @@ else [ -n "$DEBUG" ] && echo "For solaris 8 or 9" - inetdconf=$PKG_INSTALL_ROOT/etc/inetd.conf + inetdconf=$PKG_INSTALL_ROOT/etc/inet/inetd.conf echo "Installing '$svcname' into inetd.conf." echo "# $PKGINST: added by i.cswinetd" >> $inetdconf 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 Nov 1 17:46:43 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 01 Nov 2009 16:46:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[7066] csw/mgar/pkg/cvsproxy/trunk Message-ID: Revision: 7066 http://gar.svn.sourceforge.net/gar/?rev=7066&view=rev Author: bonivart Date: 2009-11-01 16:46:43 +0000 (Sun, 01 Nov 2009) Log Message: ----------- cvsproxy: update to new cswclassutils scripts Modified Paths: -------------- csw/mgar/pkg/cvsproxy/trunk/Makefile csw/mgar/pkg/cvsproxy/trunk/checksums Modified: csw/mgar/pkg/cvsproxy/trunk/Makefile =================================================================== --- csw/mgar/pkg/cvsproxy/trunk/Makefile 2009-11-01 16:12:23 UTC (rev 7065) +++ csw/mgar/pkg/cvsproxy/trunk/Makefile 2009-11-01 16:46:43 UTC (rev 7066) @@ -9,8 +9,6 @@ MASTER_SITES = http://www.sra.co.jp/people/m-kasahr/cvsproxy/src/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += CSWcvsproxy.postinstall -DISTFILES += CSWcvsproxy.preremove REQUIRED_PKGS = CSWtcpwrap SPKG_SOURCEURL = http://www.sra.co.jp/people/m-kasahr/cvsproxy @@ -22,16 +20,21 @@ TEST_TARGET = check +ETCSERVICES = /opt/csw/etc/pkg/$(GARNAME)/services +INETDCONF = /opt/csw/etc/pkg/$(GARNAME)/inetd.conf + include gar/category.mk post-install-modulated: @echo "==> Post-install fixes" - @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -d -m 755 $(DESTDIR)$(docdir)/$(GARNAME) @cp $(WORKSRC)/README $(DESTDIR)$(docdir)/$(GARNAME) @cp $(WORKSRC)/NEWS $(DESTDIR)$(docdir)/$(GARNAME) @cp $(WORKSRC)/ChangeLog $(DESTDIR)$(docdir)/$(GARNAME) @mv $(DESTDIR)/opt/csw/libexec/cvsproxy $(DESTDIR)/opt/csw/libexec/cvsproxy.tmp - @ginstall -d $(DESTDIR)/opt/csw/libexec/$(GARNAME) - @cp $(FILEDIR)/editconf.pl $(DESTDIR)/opt/csw/libexec/$(GARNAME) + @ginstall -d -m 755 $(DESTDIR)/opt/csw/libexec/$(GARNAME) @mv $(DESTDIR)/opt/csw/libexec/cvsproxy.tmp $(DESTDIR)/opt/csw/libexec/$(GARNAME)/cvsproxy + @ginstall -d -m 755 $(DESTDIR)/opt/csw/etc/pkg/$(GARNAME) + @cp $(FILEDIR)/services $(DESTDIR)/opt/csw/etc/pkg/$(GARNAME) + @cp $(FILEDIR)/inetd.conf $(DESTDIR)/opt/csw/etc/pkg/$(GARNAME) @$(MAKECOOKIE) Modified: csw/mgar/pkg/cvsproxy/trunk/checksums =================================================================== --- csw/mgar/pkg/cvsproxy/trunk/checksums 2009-11-01 16:12:23 UTC (rev 7065) +++ csw/mgar/pkg/cvsproxy/trunk/checksums 2009-11-01 16:46:43 UTC (rev 7066) @@ -1,3 +1 @@ -5095049b846e80cbe0745d85929af2d9 download/CSWcvsproxy.postinstall -3ce92c760a74f36d40acc02eb5e8e275 download/CSWcvsproxy.preremove -ceff47a655085497f5712e2da160c607 download/cvsproxy-1.0.1.tar.gz +ceff47a655085497f5712e2da160c607 cvsproxy-1.0.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 Sun Nov 1 17:49:38 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 01 Nov 2009 16:49:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[7067] csw/mgar/pkg/cvsproxy/trunk/files Message-ID: Revision: 7067 http://gar.svn.sourceforge.net/gar/?rev=7067&view=rev Author: bonivart Date: 2009-11-01 16:49:37 +0000 (Sun, 01 Nov 2009) Log Message: ----------- cvsproxy: changes in files dir Added Paths: ----------- csw/mgar/pkg/cvsproxy/trunk/files/inetd.conf csw/mgar/pkg/cvsproxy/trunk/files/services Removed Paths: ------------- csw/mgar/pkg/cvsproxy/trunk/files/CSWcvsproxy.postinstall csw/mgar/pkg/cvsproxy/trunk/files/CSWcvsproxy.preremove csw/mgar/pkg/cvsproxy/trunk/files/editconf.pl Deleted: csw/mgar/pkg/cvsproxy/trunk/files/CSWcvsproxy.postinstall =================================================================== --- csw/mgar/pkg/cvsproxy/trunk/files/CSWcvsproxy.postinstall 2009-11-01 16:46:43 UTC (rev 7066) +++ csw/mgar/pkg/cvsproxy/trunk/files/CSWcvsproxy.postinstall 2009-11-01 16:49:37 UTC (rev 7067) @@ -1,30 +0,0 @@ -#!/bin/sh - -# Mostly copied from CSWfam - -set -e - -if [ "$PKG_ROOT_DIR" = "" ]; then - PKG_ROOT_DIR=/; -fi - -CSWROOT=$PKG_ROOT_DIR/opt/csw -EDITCONF=$CSWROOT/libexec/cvsproxy/editconf.pl - - -echo "Adding cvsproxy to /etc/services" -"$EDITCONF" "$PKG_ROOT_DIR/etc/services" add '^cvsproxy\b' \ - "cvsproxy 2401/tcp # Transparent CVS proxy" \ - "cvsproxy 2401/udp # Transparent CVS proxy" - -echo "Adding cvsproxy to inetd.conf" -"$EDITCONF" "$PKG_ROOT_DIR/etc/inetd.conf" add 'Transparent CVS proxy' \ - "# Transparent CVS proxy" -"$EDITCONF" "$PKG_ROOT_DIR/etc/inetd.conf" add '^cvsproxy\b' \ - "cvsproxy stream tcp nowait nobody /opt/csw/libexec/tcpd /opt/csw/libexec/cvsproxy/cvsproxy" - - -echo "Restarting inetd..." -pkill -HUP inetd - -exit 0 Deleted: csw/mgar/pkg/cvsproxy/trunk/files/CSWcvsproxy.preremove =================================================================== --- csw/mgar/pkg/cvsproxy/trunk/files/CSWcvsproxy.preremove 2009-11-01 16:46:43 UTC (rev 7066) +++ csw/mgar/pkg/cvsproxy/trunk/files/CSWcvsproxy.preremove 2009-11-01 16:49:37 UTC (rev 7067) @@ -1,21 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$PKG_ROOT_DIR" = "" ]; then - PKG_ROOT_DIR=/; -fi - -EDITCONF="$PKG_ROOT_DIR/opt/csw/libexec/cvsproxy/editconf.pl" - -echo "Removing cvsproxy from /etc/services" -"$EDITCONF" "$PKG_ROOT_DIR/etc/services" remove '^cvsproxy' - -echo "Removing cvsproxy from inetd.conf" -"$EDITCONF" "$PKG_ROOT_DIR/etc/inetd.conf" remove '^cvsproxy' -"$EDITCONF" "$PKG_ROOT_DIR/etc/inetd.conf" remove 'Transparent CVS proxy' - -echo "Restarting inetd..." -pkill -HUP inetd - -exit 0 Deleted: csw/mgar/pkg/cvsproxy/trunk/files/editconf.pl =================================================================== --- csw/mgar/pkg/cvsproxy/trunk/files/editconf.pl 2009-11-01 16:46:43 UTC (rev 7066) +++ csw/mgar/pkg/cvsproxy/trunk/files/editconf.pl 2009-11-01 16:49:37 UTC (rev 7067) @@ -1,440 +0,0 @@ -#!/usr/bin/perl -w - -use strict; - -# $Id: editconf.perl,v 1.1 2000/05/19 22:44:34 rusty Exp $ -# -# This edits configuration files during software install/uninstall. -# Run with --help or see the text of the usage subroutine below for -# more information. -# -# Examples: -# -# Add fam to /etc/inetd.conf during install: -# editconf inetd.conf add '\bfam\b' \ -# "# fam, the File Alteration Monitor" \ -# "sgi_fam/1-2 stream rpc/tcp wait root /usr/local/bin/fam fam" -# -# Remove fam from /etc/inetd.conf during uninstall: -# editconf inetd.conf remove '\bfam\b' -# -# Add /usr/sysadm/lib to /etc/ld.so.conf# -# editconf ld.so.conf add '\bsysadm\b' /usr/sysadm/lib -# -# Add sysadmd to /usr/local/etc/tcpmux.conf: -# editconf tcpmux.conf add '\bsysadm\b' \ -# "# sysadmd, for system administration applications" \ -# "sgi_sysadm root /usr/sysadm/bin/sysadmd sysadmd" -# -# The main goal of this script is to "do no harm." We don't -# modify any files if it looks like we're going to mess with -# lines which have been edited by the user. The only time we -# change a file is when we're confident that we're adding new -# lines, or messing with lines which we ourselves added or -# removed during a previous invocation of the script. -# -# Well... that's not entirely true; the "remove" operation comments -# out any line that matches the given regexp. But it makes a backup! -# -# USING EDITCONF WITH AUTOMAKE AND RPM -# -# This prepends DESTDIR to the files it operates on (unless you pass -# it a file starting with \.{0,2}/, so it can be used during an -# automake "make install" into a non-root directory (as you would do -# while building an RPM package). Note that the file it attempts to -# operate on probably won't be present, though, so you'll probably -# need to ignore errors during the make install: -# -# make-install-hook: -# -$(EDITCONF) ld.so.conf add '\bsysadm\b' /usr/sysadm/lib -# -# This will probably fail when DESTDIR is set, as ld.so.conf probably -# doesn't exist under DESTDIR; the only reason to have this line in the -# Makefile.am is so that a normal "make install" will update the -# configuration files. -# -# In order to have your configuration files updated during the install/ -# uninstall of an rpm package, you'll need to add something like this -# to your spec file: -# -# # this is %preun rather than %postun because we want to use our -# # script before it gets uninstalled. -# %preun -# perl /usr/local/lib/fam/editconf.perl ld.so.conf remove '\bsysadm\b' -# -# -sub usage { - my($msg) = @_; - $msg && ($msg ne "help") && print STDERR "$msg\n\n"; - print STDERR <<"EOF"; -Usage: - $0 [options] file \"add\" regexp lines... - $0 [options] file \"remove\" regexp [comment] - $0 --help - -Options: - -n No-exec (don't change any files) - -v Verbose - -s Silent - -- End argument processing (in case your new config file lines - start with -) -EOF - - if($msg eq "help") { - print STDERR <<"EOF"; - -This edits configuration files. Given a file name, it looks -in a list of directories (see below) for the file. (If the file -name starts with "/" or ".", the path list is not searched.) -Once the file is found, the given regular expression is searched -for in the file to determine whether the option or service we're -adding/removing already exists. - -If we're adding new lines to the file, there are four possible -outcomes: - - - If the regexp isn't found in the file, we figure our lines - haven't been added before, and we add them. - - - If the regexp is found in the file, and indeed the exact lines - we were going to add are already there, we're happy, and we - don't change the file. - - - If the regexp is found in the file, and the lines we were going - to add are present but commented out, we uncomment them. - - - If the regexp is found in the file, but in lines which are - different than the lines we were going to add, we figure the - option or service we were going to add has already been configured - differently; in this case, we make our changes in a new copy - of the file and print a warning message saying that someone - should compare the two files. (We don't change the - configuration of the system in this case.) - -If we're removing lines from the file, there are two possible -outcomes: - - - If the regexp isn't found in the file, we're happy, and we - don't change the file. - - - If the regexp is found in the file, we make a backup of the - file, and comment out the lines containing the regexp in the - original file. - -EOF - print STDERR "Configuration file paths:\n"; - foreach (@::paths) { print STDERR " $_\n"; } - } - - exit 1; -} - - -# See if DESTDIR is set, to have us operate on files not in / -my $DESTDIR = $ENV{'DESTDIR'} ? $ENV{'DESTDIR'} : ""; - -# This is the list of places we'll look for the configuration file -# if we weren't given an absolute path. -@::paths = ("$DESTDIR/etc", "$DESTDIR/usr/etc", "$DESTDIR/usr/local/etc"); - -my $comment = '#'; -my $verbose = &splicegrep('^-v$', \@ARGV, '^--$'); -my $noexec = &splicegrep('^-n$', \@ARGV, '^--$'); -my $silent = &splicegrep('^-s$', \@ARGV, '^--$'); -&splicegrep('^--?h', \@ARGV, '^--$') && &usage("help"); -&splicegrep('^-', \@ARGV, '^--$') && &usage(); -&splicegrep('^--$', \@ARGV); - -my $file; # the name of the file passed on the command line -my $regexp; # the pattern passed on the command line -my $op; # the operation being performed (add|remove) - -($file = shift) || &usage("The config file name is required!"); -(($op = shift) && ($op =~ /^(add|remove)$/)) || &usage("\"add\" or \"remove\" is required!"); -($regexp = shift) || &usage("The regexp to search for is required!"); -my @lines = @ARGV; - - -# -# Does the file name start with /, ./, or ../? -# -if ($file =~ m#^\.{0,2}/#) { - # Danger! Not applying $DESTDIR to $path here! - &shaketh_thy_booty($op, $file, $regexp, @lines); - exit 0; -} -# -# No, so we'll search for the file name in the list of paths. -# -$verbose && $DESTDIR && print "Using DESTDIR \"$DESTDIR\"\n"; -my($p, $path); -foreach $p (@::paths) { - $path = "$p/$file"; - $verbose && print STDERR "Looking for $path...\n"; - if (-f $path) { - &shaketh_thy_booty($op, $path, $regexp, @lines); - exit 0; - } -} -die("Couldn't find $file in " . join(" ", @::paths) . "\n"); - - -# -# Once we know what file we're attacking, this does the actual work. -# -sub shaketh_thy_booty { # or is it "thine"? - my($op, $path, $regexp, @lines) = @_; - $noexec || -w $path || die("I don't have write permission on $path!\n"); - # Might as well snort it into memory. Hopefully it's a small file, ha ha. - open(CFG, "<$path") || die("Couldn't open $path for input!\n"); - my @wholefile = ; - close(CFG); - - my $matched = 0; - if (!grep /$regexp/, @wholefile) { - if ($op eq 'add') { - # It doesn't contain our regexp, so append our lines and - # exit happily. - if ($noexec) { - print "I would have added the following lines to $path:\n"; - foreach (@lines) { print "$_\n"; } - } else { - open(CFG, ">>$path") || die("Couldn't open $path for append!\n"); - $silent || print "Added the following lines to $path:\n"; - foreach (@lines) { - $silent || print "$_\n"; - print CFG "$_\n"; - } - $silent || print "(end of lines added to $path)\n"; - } - exit 0; - } elsif ($op eq 'remove') { - # It doesn't contain our regexp, so we don't need to remove it, - # so we're happy. - exit 0; - } else { die("bad op \"$op\""); } - } - - if ($op eq "remove") { - # Since we're still here, and we're removing this entry, comment out - # all lines matching our regexp. - if ($noexec) { - print "I would have commented out the following lines in $path:\n"; - grep { - /$regexp/ && print; - } @wholefile; - } else { - my $tmpnm = &tmpnam("$path.$$"); - my $comment_re = quotemeta $comment; - my @commented_out; - open(CFG, ">$tmpnm") || die("Couldn't open $tmpnm for output!\n"); - foreach (@wholefile) { - # We care if it matches, and isn't already commented out. - if ((/$regexp/) && (!/^$comment_re/)) { - push @commented_out, $_; - print CFG $comment; - } - print CFG; - } - if ($#commented_out == -1) { - # We didn't actually need to comment anything out! - # Apparently all the lines that matched our regexp were - # already commented out. - $verbose && print "All the lines matching our regexp were ", - "already commented out, so we're not doing ", - "anything!\n"; - unlink $tmpnm; - exit 0; - } -# $silent || print "Commented out the following lines in $path:\n"; -# $silent || grep { print; } @commented_out; -# $silent || print "(end of lines commented out in $path)\n"; - my $bak = &tmpnam("$path.O"); - rename($path, $bak) || die("Couldn't rename $path to $bak!\n"); - rename($tmpnm, $path) || die("Couldn't rename $tmpnm to $path!\n"); - $silent || print "Original file saved as $bak\n"; - } - exit 0; - } - - # just a sanity check... - ($op eq "add") || die("bad op \"\$op\""); - - # We're still here, so we found our regexp, which suggests that the - # entry we're adding might already be in the file. Do our new lines - # match existing lines exactly? - $verbose && print "The file contains our regular expression, so let's see ", - "if it has our lines...\n"; - $matched = 1; - my $re; - foreach (@lines) { - $re = quotemeta $_; - $verbose && print " Looking for \"$re\"\n"; - if (! grep /^$re$/, @wholefile) { - $verbose && print " Didn't find it!\n"; - $matched = 0; - last; - } - } - if ($matched) { - # The lines we would have added are already in the file, so - # we can all go home early. - $verbose && print "$path already contains the lines we would have ", - "added.\n"; - exit 0; - } - - # All right, we're still here, so let's see if the lines we would have - # added are in the file, but commented out. This is slightly complicated - # by the possibility that lines we're adding start with comments; if so, - # we don't want to require that they be preceded by another comment - # character. - $verbose && print "Let's see if it has our lines, but commented out...\n"; - $re = quotemeta $comment; - my @linesre = @lines; - grep { - # If it starts with a comment, require make an additional starting - # comment optional. (the ($re.*)? as opposed to $re.*) - $_ = (/^$re/) ? "^($re.*)?" . quotemeta $_ : "^$re.*" . quotemeta $_; - } @linesre; - $matched = 1; - foreach $re (@linesre) { - # This loop through @linesre isn't done in the grep above because - # we want that to iterate through every element, while this loop - # can bail as soon as it fails to find a line it's looking for. - $verbose && print " Looking for \"$re\"\n"; - # If you change this next line, make sure you make the same changes - # in the substitution below. - if (! grep /$re$/, @wholefile) { - $verbose && print " Didn't find it!\n"; - $matched = 0; - last; - } - } - if ($matched) { - # The lines we would have added are already in the file, but - # commented out. Let's uncomment them into a temp file, and then - # replace the existing file with the temp file. - if ($noexec) { - print "I would have uncommented the following lines in $path:\n"; - foreach (@lines) { print "$_\n"; } - exit 0; - } - # This is crude. For every line in the file, if it matches the - # commented-out version of any of the lines we're adding, replace - # it with the corresponding non-commented-out line. - my $idx; - foreach (@wholefile) { - foreach $idx (0..$#lines) { - s/$linesre[$idx]$/$lines[$idx]/ && last; - } - } - # isn't there a perl tmpnam? this open/die is stupid. - my $tmpnm = &tmpnam("$path.$$"); - open(CFG, ">$tmpnm") || die("Couldn't open $tmpnm for output!\n"); - print CFG @wholefile; - close(CFG) || die("Couldn't close $tmpnm after writing!\n"); - rename($tmpnm, $path) || die("Couldn't replace $path with $tmpnm " . - "after writing!\n"); - exit 0; - } - - # We're still here, so it looks like our configuration lines are in the - # file, but they're different than what we would have added. Nuts! - # Comment out everything matching our regexp and append our new lines, - # but do it into a new file so that we don't stomp any existing - # configuration. - my $tmpnm = &tmpnam("$path.N"); - if ($noexec) { - print "I would have copied $path to $tmpnm and commented out the following lines in $tmpnm:\n"; - grep { - /$regexp/ && print; - } @wholefile; - print "...and added the following lines to $tmpnm:\n"; - foreach (@lines) { print "$_\n"; } - exit 0; - } - grep { - /$regexp/ && ($_ = ($comment . $_)); - } @wholefile; - # Now append our new stuff - foreach (@lines) { - push @wholefile, "$_\n"; - } - open(CFG, ">$tmpnm") || die("Couldn't open $tmpnm for output!\n"); - print CFG @wholefile; - close(CFG) || die("Couldn't close $tmpnm after writing!\n"); - # Just for fun, if $path.N already existed, let's see if it's the - # same as what we just wrote. - &diff($tmpnm, "$path.N", \@wholefile) || ($tmpnm = "$path.N"); - - print STDERR <<"EOF"; - -********************************************************************** -Configuration changes to $file have not been made -automatically because there appears to be a conflict between the -file's current contents and the lines which would have been added. - -Original file: $path -New file: $tmpnm - -Please compare these two files and update the original file as needed. -********************************************************************** - -EOF - exit 0; -} - - -# Returns the array of elements matching the given re in the given array, -# and removes those elements from the array. If $bre is set, we only -# search through the array until an element matching $bre is encountered. -sub splicegrep { - my($re, $a, $bre) = @_; - my @ta = (); - my @ra = (); - my $skip = 0; - $a || ($a = \@ARGV); - # sub-optimal but our argv should be short - grep { - $bre && /$bre/ && ($skip = 1); - ((!$skip) && /$re/) ? push @ra, $_ : push @ta, $_; - } @{$a}; - @{$a} = @ta; - return @ra; -} - - -# This is kind of stupid. -sub tmpnam { - my($base) = @_; - my $hope = $base; - my $count = 0; - while(-e $hope) { - $hope = "$base$count"; - ++$count; - } - return $hope; -} - - -# Returns 0 if we know the two files are the same, 1 if we're not sure. -sub diff { - my($fn1, $fn2, $fc1) = @_; - ($fn1 eq $fn2) && return 0; # same file name! - my $sz1 = (stat $fn1)[7]; # size $sstuff[7]; # size - my $sz2 = (stat $fn2)[7]; # size $sstuff[7]; # size - $sz1 && ($sz1 != $sz2) && return 1; # different sizes; they're different - # Nuts, they're the same size, so we have to compare them. - open(FH2, "<$fn2") || return 1; - my @snort2 = ; - close(FH2); - # Same number of lines? - ($#snort2 == $#{$fc1}) || return 1; - my $i = $#snort2; - while ($i >= 0) { - ($snort2[$i] eq $fc1->[$i]) || return 1; - --$i; - } - return 0; -} Added: csw/mgar/pkg/cvsproxy/trunk/files/inetd.conf =================================================================== --- csw/mgar/pkg/cvsproxy/trunk/files/inetd.conf (rev 0) +++ csw/mgar/pkg/cvsproxy/trunk/files/inetd.conf 2009-11-01 16:49:37 UTC (rev 7067) @@ -0,0 +1 @@ +cvsproxy stream tcp nowait nobody /opt/csw/libexec/tcpd /opt/csw/libexec/cvsproxy/cvsproxy Added: csw/mgar/pkg/cvsproxy/trunk/files/services =================================================================== --- csw/mgar/pkg/cvsproxy/trunk/files/services (rev 0) +++ csw/mgar/pkg/cvsproxy/trunk/files/services 2009-11-01 16:49:37 UTC (rev 7067) @@ -0,0 +1,2 @@ +cvsproxy 2401/tcp +cvsproxy 2401/udp 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 Nov 1 23:17:33 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 01 Nov 2009 22:17:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[7068] csw/mgar/pkg Message-ID: Revision: 7068 http://gar.svn.sourceforge.net/gar/?rev=7068&view=rev Author: dmichelsen Date: 2009-11-01 22:17:33 +0000 (Sun, 01 Nov 2009) Log Message: ----------- unrar: Initial commit Added Paths: ----------- csw/mgar/pkg/unrar/ csw/mgar/pkg/unrar/branches/ csw/mgar/pkg/unrar/tags/ csw/mgar/pkg/unrar/trunk/ csw/mgar/pkg/unrar/trunk/Makefile csw/mgar/pkg/unrar/trunk/checksums csw/mgar/pkg/unrar/trunk/files/ csw/mgar/pkg/unrar/trunk/files/unrar.1 Property changes on: csw/mgar/pkg/unrar/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/unrar/trunk/Makefile =================================================================== --- csw/mgar/pkg/unrar/trunk/Makefile (rev 0) +++ csw/mgar/pkg/unrar/trunk/Makefile 2009-11-01 22:17:33 UTC (rev 7068) @@ -0,0 +1,48 @@ +GARNAME = unrar +GARVERSION = 3.9.6 +CATEGORIES = utils + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = http://www.rarlab.com/rar/ +DISTFILES = unrarsrc-$(GARVERSION).tar.gz +DISTFILES += unrar.1 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.rarlab.com/rar_add.htm + +LICENSE = license.txt + +DISTNAME = unrar + +CONFIGURE_SCRIPTS = + +OPT_FLAGS_SOS = -fast -erroff=wvarhidemem + +#BUILD_SCRIPTS = $(WORKSRC)/makefile.unix +BUILD_ARGS = -f makefile.unix CXX=$(CXX) CXXFLAGS="$(CXXFLAGS)" DEFINES="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" STRIP=strip + +TEST_SCRIPTS = + +INSTALL_SCRIPTS = custom + +#CXXFLAGS=-fast -erroff=wvarhidemem +#DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE +#STRIP=strip +#DESTDIR=/usr + +include gar/category.mk + +install-custom: + ginstall -d $(DESTDIR)$(mandir)/man1 + ginstall $(WORKDIR)/unrar.1 $(DESTDIR)$(mandir)/man1/ + ginstall -d $(DESTDIR)$(bindir) + ginstall $(WORKSRC)/unrar $(DESTDIR)$(bindir) + ginstall -d $(DESTDIR)$(docdir)/unrar + ginstall $(WORKSRC)/readme.txt $(DESTDIR)$(docdir)/unrar + @$(MAKECOOKIE) Added: csw/mgar/pkg/unrar/trunk/checksums =================================================================== --- csw/mgar/pkg/unrar/trunk/checksums (rev 0) +++ csw/mgar/pkg/unrar/trunk/checksums 2009-11-01 22:17:33 UTC (rev 7068) @@ -0,0 +1,2 @@ +16edfaa469364b9f3dce70ea557f62ea unrar.1 +07d7c5dd3d3b778fc1870a981c43a3d3 unrarsrc-3.9.6.tar.gz Added: csw/mgar/pkg/unrar/trunk/files/unrar.1 =================================================================== --- csw/mgar/pkg/unrar/trunk/files/unrar.1 (rev 0) +++ csw/mgar/pkg/unrar/trunk/files/unrar.1 2009-11-01 22:17:33 UTC (rev 7068) @@ -0,0 +1,98 @@ +.TH UNRAR 1 02.11.1999 "" "RAR archiver" +.SH NAME +unrar \- extract files from rar archives +.SH SYNOPSIS +.B unrar +.I " [- -] archive [files...] [path\...]" +.SH "DESCRIPTION" +This manual page documents briefly the +.BR unrar +command. +.br +This manual page was written for the Debian GNU/Linux distribution +because the original program does not have a manual page. +.br +Commands and options described here are as of unrar 2.02. +.SH OPTIONS +After the program name comes a command and then optional switches with +dashes before them. +A summary of commands is included below. +For a complete description, run +.BR unrar +without options. +.TP +.B e +Extract files to current directory. +.TP +.B l +List archive content. +.TP +.B p +Print file to stdout. +.TP +.B t +Test archive files. +.TP +.B v +Verbosely list archive. +.TP +.B x +Extract files with full path. +.SH SWITCHES +.BR NOTE: +Every switch must be separated by a whitespace. You cannot put them +together. +.TP +.B -av- +Disable Authenticity Verification check. +.TP +.B -c- +Disable comments show. +.TP +.B -f +Freshen files. +.TP +.B -kb +Keep broken extracted files. +.TP +.B -ierr +Send all messages to stderr. +.TP +.B -inul +Disable all messages. +.TP +.B -o+ +Overwrite existing files. +.TP +.B -o- +Do not overwrite existing files. +.TP +.B -p +Set password. +.TP +.B -p- +Do not query password. +.TP +.B -r +Recurse subdirectories. +.TP +.B -u +Update files. +.TP +.B -v +List all volumes. +.TP +.B -x +Exclude specified file. +.TP +.B -x@ +Exclude files in specified list file. +.TP +.B -x@ +Read file names to exclude from stdin. +.TP +.B -y +Assume Yes on all queries. +.SH AUTHOR +This manual page was written by Petr Cech according +to "unrar \-h" for the Debian GNU/Linux system (but may be used by others). 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 Nov 1 23:18:25 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 01 Nov 2009 22:18:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7069] csw/mgar/pkg/unrar/trunk/checksums Message-ID: Revision: 7069 http://gar.svn.sourceforge.net/gar/?rev=7069&view=rev Author: dmichelsen Date: 2009-11-01 22:18:24 +0000 (Sun, 01 Nov 2009) Log Message: ----------- unrar: Fix checksum Modified Paths: -------------- csw/mgar/pkg/unrar/trunk/checksums Modified: csw/mgar/pkg/unrar/trunk/checksums =================================================================== --- csw/mgar/pkg/unrar/trunk/checksums 2009-11-01 22:17:33 UTC (rev 7068) +++ csw/mgar/pkg/unrar/trunk/checksums 2009-11-01 22:18:24 UTC (rev 7069) @@ -1,2 +1,2 @@ -16edfaa469364b9f3dce70ea557f62ea unrar.1 +594b777453751ee331ef241160f31499 unrar.1 07d7c5dd3d3b778fc1870a981c43a3d3 unrarsrc-3.9.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Mon Nov 2 09:42:21 2009 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Mon, 02 Nov 2009 08:42:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[7070] csw/mgar/pkg/denyhosts/trunk Message-ID: Revision: 7070 http://gar.svn.sourceforge.net/gar/?rev=7070&view=rev Author: bensons Date: 2009-11-02 08:42:21 +0000 (Mon, 02 Nov 2009) Log Message: ----------- denyhosts: initial package version Modified Paths: -------------- csw/mgar/pkg/denyhosts/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/denyhosts/trunk/files/cswdenyhosts Modified: csw/mgar/pkg/denyhosts/trunk/Makefile =================================================================== --- csw/mgar/pkg/denyhosts/trunk/Makefile 2009-11-01 22:18:24 UTC (rev 7069) +++ csw/mgar/pkg/denyhosts/trunk/Makefile 2009-11-02 08:42:21 UTC (rev 7070) @@ -1,6 +1,3 @@ -# TODO -# - Integrate into SMF, do we need daemon-control-dist at all? -# - Test the package GARNAME = denyhosts GARVERSION = 2.6 CATEGORIES = python @@ -26,6 +23,7 @@ DISTFILES = $(DISTNAME).tar.gz LICENSE = LICENSE.txt ARCHALL = 1 +INITSMF = /etc/opt/csw/init.d/cswdenyhosts # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -49,6 +47,7 @@ post-install-modulated: ginstall -d $(DOCDEST) ginstall -d $(DESTDIR)$(sysconfdir) + ginstall -d $(DESTDIR)$(sysconfdir)/init.d ginstall -d $(DESTDIR)$(localstatedir)/$(GARNAME) mv $(DESTDIR)$(bindir)/denyhosts.py $(DESTDIR)$(bindir)/denyhosts rm $(DESTDIR)$(datadir)/$(GARNAME)/README.txt @@ -57,17 +56,18 @@ mv $(DESTDIR)$(datadir)/$(GARNAME)/CHANGELOG.txt $(DOCDEST)/changelog mv $(DESTDIR)$(datadir)/$(GARNAME)/denyhosts.cfg-dist \ $(DESTDIR)$(sysconfdir)/denyhosts.cfg + ginstall -m 0755 $(FILEDIR)/cswdenyhosts $(DESTDIR)$(sysconfdir)/init.d #Adjust config to match Solaris paths + our package paths gsed -i \ -e 's,/var/log/secure,path to ssh log,' \ -e 's,/usr/share/denyhosts/data,$(localstatedir)/$(GARNAME),' \ - -e 's,/var/lock/subsys/denyhosts,/var/run/denyhosts.pid,' \ - -e 's,/var/log/denyhosts,$(localestatedir)/$(GARNAME)/$(GARNAME).log,' \ + -e 's,/var/lock/subsys/denyhosts,/var/opt/csw/run/denyhosts.pid,' \ + -e 's,/var/log/denyhosts,$(localstatedir)/$(GARNAME)/$(GARNAME).log,' \ $(DESTDIR)$(sysconfdir)/denyhosts.cfg gsed -i \ - -e 's,denyhosts.cfg,$(sysconfdir)/denyhosts.cfg' \ + -e 's,denyhosts.cfg,$(sysconfdir)/denyhosts.cfg,' \ $(DESTDIR)/opt/csw/lib/python/site-packages/DenyHosts/constants.py #Adjust daemon-control-dist wrapper script to match our package paths Added: csw/mgar/pkg/denyhosts/trunk/files/cswdenyhosts =================================================================== --- csw/mgar/pkg/denyhosts/trunk/files/cswdenyhosts (rev 0) +++ csw/mgar/pkg/denyhosts/trunk/files/cswdenyhosts 2009-11-02 08:42:21 UTC (rev 7070) @@ -0,0 +1,67 @@ +#! /bin/sh +# +# Init script for denyhosts +# + +PATH=/opt/csw/bin:$PATH +NAME=denyhosts +PROG=/opt/csw/bin/$NAME +PYTHON=/opt/csw/bin/python +PIDFILE=/var/opt/csw/run/denyhosts.pid +CONFIG=/etc/opt/csw/denyhosts.cfg +FLAGS="--purge --config=$CONFIG" + +# start denyhosts +start() { + test -x $PYTHON || exit 5 + test -f $CONFIG || { + echo "$CONFIG does not exist!" + exit 1 + } + + HOSTS_DENY=`grep '^HOSTS_DENY' $CONFIG | cut -d = -f 2` + test -f $HOSTS_DENY || touch $HOSTS_DENY + + if [ -f $PIDFILE ]; then + pid=`cat $PIDFILE` + if kill -0 "$pid" > /dev/null; then + echo "$NAME already running" + return + else + echo "Removing stale PID file $PIDFILE." + rm -f $PIDFILE + fi + fi + $PYTHON $PROG --daemon --purge --config=$CONFIG + [ $? -eq 0 ] && echo "started $NAME" || echo "start $NAME failed" +} + +# stop denyhosts +stop() { + if [ -f $PIDFILE ]; then + pid=`cat $PIDFILE` + if kill -0 "$pid" > /dev/null; then + kill `cat $PIDFILE` + [ $? -eq 0 ] && echo "stopped $NAME" || echo "stop $NAME failed" + else + echo "stop $NAME failed" + rm -f $PIDFILE + fi + fi +} + +# start or stop denyhosts +case "$1" in + start) + start + ;; + stop) + stop + ;; + *) + echo "Usage: $NAME {start|stop}" >&2 + exit 3 + ;; +esac + +exit 0 Property changes on: csw/mgar/pkg/denyhosts/trunk/files/cswdenyhosts ___________________________________________________________________ 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 Mon Nov 2 13:03:23 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 02 Nov 2009 12:03:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7071] csw/mgar/pkg/libevent/trunk Message-ID: Revision: 7071 http://gar.svn.sourceforge.net/gar/?rev=7071&view=rev Author: dmichelsen Date: 2009-11-02 12:03:23 +0000 (Mon, 02 Nov 2009) Log Message: ----------- libevent: Update to version modulate on 1.1b and add 64 bit for latest version Modified Paths: -------------- csw/mgar/pkg/libevent/trunk/Makefile csw/mgar/pkg/libevent/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/libevent/trunk/files/CSWlibevent-devel.depend csw/mgar/pkg/libevent/trunk/files/CSWlibevent-devel.gspec csw/mgar/pkg/libevent/trunk/files/CSWlibevent-devel.prototype csw/mgar/pkg/libevent/trunk/files/CSWlibevent.depend csw/mgar/pkg/libevent/trunk/files/CSWlibevent.gspec csw/mgar/pkg/libevent/trunk/files/CSWlibevent.prototype csw/mgar/pkg/libevent/trunk/files/stdint.diff csw/mgar/pkg/libevent/trunk/files/testsh.diff Modified: csw/mgar/pkg/libevent/trunk/Makefile =================================================================== --- csw/mgar/pkg/libevent/trunk/Makefile 2009-11-02 08:42:21 UTC (rev 7070) +++ csw/mgar/pkg/libevent/trunk/Makefile 2009-11-02 12:03:23 UTC (rev 7071) @@ -1,9 +1,17 @@ GARNAME = libevent GARVERSION = 1.4.12 -DISTVERSION = $(GARVERSION)-stable CATEGORIES = lib -DESCRIPTION = event notification library +EXTRA_MODULATORS = GARVERSION +MODULATIONS_GARVERSION = 1.1b 1.4.12 + +SKIP_MODULATIONS = isa-sparcv9-garversion-1.1b +SKIP_MODULATIONS += isa-amd64-garversion-1.1b + +DISTVERSION-1.1b = 1.1b +DISTVERSION-1.4.12 = 1.4.12-stable + +DESCRIPTION = Event notification library define BLURB The libevent API provides a mechanism to execute a callback function when a specific event occurs on a file descriptor or after a timeout has been @@ -12,21 +20,51 @@ endef MASTER_SITES = http://www.monkey.org/~provos/ -DISTFILES = $(GARNAME)-$(DISTVERSION).tar.gz -#DISTFILES += $(call admfiles,CSWlibevent,depend prototype) -#DISTFILES += $(call admfiles,CSWlibevent-devel,depend prototype) +SOURCEFILES = $(foreach V,$(MODULATIONS_GARVERSION),$(GARNAME)-$(DISTVERSION-$V).tar.gz) +DISTFILES += $(SOURCEFILES) +NOEXTRACT = $(filter-out $(GARNAME)-$(DISTVERSION-$(GARVERSION)).tar.gz,$(SOURCEFILES)) + +PACKAGES = CSWlibevent CSWlibevent-devel + +REQUIRED_PKGS_CSWlibevent-devel = CSWlibevent + +CATALOGNAME_CSWlibevent = libevent +CATALOGNAME_CSWlibevent-devel = libevent_devel + +SPKG_DESC_CSWlibevent = Event notification library +SPKG_DESC_CSWlibevent-devel = Event notification library header files + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-stable.tar.gz -WORKSRC = $(WORKDIR)/$(GARNAME)-$(DISTVERSION) +SPKG_SOURCEURL = http://www.monkey.org/~provos/libevent/ +WORKSRC = $(WORKDIR)/$(GARNAME)-$(DISTVERSION-$(GARVERSION)) + +BUILD64 = 1 +NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = verify +MERGE_SCRIPTS_isa-default-garversion-1.1b = copy-only +MERGE_DIRS_isa-default-garversion-1.1b = $(libdir) +MERGE_SCRIPTS_isa-extra-garversion-1.1b = copy-relocated-only +MERGE_DIRS_isa-extra-garversion-1.1b = $(libdir) + +MERGE_SCRIPTS_isa-default-garversion-1.4.12 = copy-all +MERGE_SCRIPTS_isa-extra-garversion-1.4.12 = copy-relocated-only +MERGE_DIRS_isa-extra-garversion-1.4.12 = $(libdir) + +PKGFILES_CSWlibevent-devel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibevent-devel += $(bindir)/.* + include gar/category.mk #LIBS += -lresolv -lnsl #export LIBS +post-extract-modulated: + perl -pi -e 's,#!/bin/sh,#!/bin/bash,' $(WORKSRC)/test/test.sh + @$(MAKECOOKIE) Modified: csw/mgar/pkg/libevent/trunk/checksums =================================================================== --- csw/mgar/pkg/libevent/trunk/checksums 2009-11-02 08:42:21 UTC (rev 7070) +++ csw/mgar/pkg/libevent/trunk/checksums 2009-11-02 12:03:23 UTC (rev 7071) @@ -1 +1,2 @@ -77b0d8b9885496871bb083165b35ba11 download/libevent-1.4.12-stable.tar.gz +ec8dac612aa43ed172f300f396fcec49 libevent-1.1b.tar.gz +77b0d8b9885496871bb083165b35ba11 libevent-1.4.12-stable.tar.gz Deleted: csw/mgar/pkg/libevent/trunk/files/CSWlibevent-devel.depend =================================================================== --- csw/mgar/pkg/libevent/trunk/files/CSWlibevent-devel.depend 2009-11-02 08:42:21 UTC (rev 7070) +++ csw/mgar/pkg/libevent/trunk/files/CSWlibevent-devel.depend 2009-11-02 12:03:23 UTC (rev 7071) @@ -1 +0,0 @@ -P CSWlibevent libevent - event notification library Deleted: csw/mgar/pkg/libevent/trunk/files/CSWlibevent-devel.gspec =================================================================== --- csw/mgar/pkg/libevent/trunk/files/CSWlibevent-devel.gspec 2009-11-02 08:42:21 UTC (rev 7070) +++ csw/mgar/pkg/libevent/trunk/files/CSWlibevent-devel.gspec 2009-11-02 12:03:23 UTC (rev 7071) @@ -1,29 +0,0 @@ -%var bitname libevent_devel -%var pkgname CSWlibevent-devel -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%var desc libevent development support -%copyright -Copyright (c) 2000-2004 Niels Provos -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Deleted: csw/mgar/pkg/libevent/trunk/files/CSWlibevent-devel.prototype =================================================================== --- csw/mgar/pkg/libevent/trunk/files/CSWlibevent-devel.prototype 2009-11-02 08:42:21 UTC (rev 7070) +++ csw/mgar/pkg/libevent/trunk/files/CSWlibevent-devel.prototype 2009-11-02 12:03:23 UTC (rev 7071) @@ -1,14 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/event_rpcgen.py 0755 root bin -d none /opt/csw/include 0755 root bin -f none /opt/csw/include/evdns.h 0644 root bin -f none /opt/csw/include/event.h 0644 root bin -f none /opt/csw/include/evhttp.h 0644 root bin -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libevent.a 0644 root bin -f none /opt/csw/lib/libevent.la 0755 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/evdns.3 0644 root bin -f none /opt/csw/share/man/man3/event.3 0644 root bin Deleted: csw/mgar/pkg/libevent/trunk/files/CSWlibevent.depend =================================================================== --- csw/mgar/pkg/libevent/trunk/files/CSWlibevent.depend 2009-11-02 08:42:21 UTC (rev 7070) +++ csw/mgar/pkg/libevent/trunk/files/CSWlibevent.depend 2009-11-02 12:03:23 UTC (rev 7071) @@ -1 +0,0 @@ -P CSWgcc4corert gcc4corert - GNU C Compiler Run Time Deleted: csw/mgar/pkg/libevent/trunk/files/CSWlibevent.gspec =================================================================== --- csw/mgar/pkg/libevent/trunk/files/CSWlibevent.gspec 2009-11-02 08:42:21 UTC (rev 7070) +++ csw/mgar/pkg/libevent/trunk/files/CSWlibevent.gspec 2009-11-02 12:03:23 UTC (rev 7071) @@ -1,28 +0,0 @@ -%var bitname libevent -%var pkgname CSWlibevent -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright -Copyright (c) 2000-2004 Niels Provos -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Deleted: csw/mgar/pkg/libevent/trunk/files/CSWlibevent.prototype =================================================================== --- csw/mgar/pkg/libevent/trunk/files/CSWlibevent.prototype 2009-11-02 08:42:21 UTC (rev 7070) +++ csw/mgar/pkg/libevent/trunk/files/CSWlibevent.prototype 2009-11-02 12:03:23 UTC (rev 7071) @@ -1,4 +0,0 @@ -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libevent-1.3e.so.1.0.3 0755 root bin -s none /opt/csw/lib/libevent-1.3e.so.1=libevent-1.3e.so.1.0.3 -s none /opt/csw/lib/libevent.so=libevent-1.3e.so.1.0.3 Deleted: csw/mgar/pkg/libevent/trunk/files/stdint.diff =================================================================== --- csw/mgar/pkg/libevent/trunk/files/stdint.diff 2009-11-02 08:42:21 UTC (rev 7070) +++ csw/mgar/pkg/libevent/trunk/files/stdint.diff 2009-11-02 12:03:23 UTC (rev 7071) @@ -1,72 +0,0 @@ -diff --speed-large-files --minimal -Nru libevent-1.3e.orig/epoll.c libevent-1.3e/epoll.c ---- libevent-1.3e.orig/epoll.c 2007-07-30 23:41:07.000000000 -0400 -+++ libevent-1.3e/epoll.c 2007-10-18 02:04:33.404892000 -0400 -@@ -28,7 +28,7 @@ - #include "config.h" - #endif - --#include -+//#include - #include - #include - #include -diff --speed-large-files --minimal -Nru libevent-1.3e.orig/epoll_sub.c libevent-1.3e/epoll_sub.c ---- libevent-1.3e.orig/epoll_sub.c 2007-02-15 19:48:32.000000000 -0500 -+++ libevent-1.3e/epoll_sub.c 2007-10-18 02:04:33.429501000 -0400 -@@ -24,7 +24,7 @@ - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ --#include -+//#include - - #include - #include -diff --speed-large-files --minimal -Nru libevent-1.3e.orig/evdns.c libevent-1.3e/evdns.c ---- libevent-1.3e.orig/evdns.c 2007-09-12 18:20:34.000000000 -0400 -+++ libevent-1.3e/evdns.c 2007-10-18 02:04:33.481063000 -0400 -@@ -80,7 +80,7 @@ - #include - #include - #ifdef HAVE_STDINT_H --#include -+//#include - #endif - #include - #include -diff --speed-large-files --minimal -Nru libevent-1.3e.orig/event.h libevent-1.3e/event.h ---- libevent-1.3e.orig/event.h 2007-07-30 23:41:09.000000000 -0400 -+++ libevent-1.3e/event.h 2007-10-18 02:04:33.528924000 -0400 -@@ -32,7 +32,7 @@ - #endif - - #include --#include -+//#include - #include - - #ifdef WIN32 -diff --speed-large-files --minimal -Nru libevent-1.3e.orig/event_rpcgen.py libevent-1.3e/event_rpcgen.py ---- libevent-1.3e.orig/event_rpcgen.py 2007-07-30 23:41:04.000000000 -0400 -+++ libevent-1.3e/event_rpcgen.py 2007-10-18 02:04:33.561748000 -0400 -@@ -1296,7 +1296,7 @@ - name, guard, guard) - - # insert stdint.h - let's hope everyone has it -- pre += '#include \n' -+ #pre += '#include \n' - - for statement in headerdirect: - pre += '%s\n' % statement -diff --speed-large-files --minimal -Nru libevent-1.3e.orig/test/regress.gen.h libevent-1.3e/test/regress.gen.h ---- libevent-1.3e.orig/test/regress.gen.h 2007-09-24 23:59:03.000000000 -0400 -+++ libevent-1.3e/test/regress.gen.h 2007-10-18 02:05:43.526021000 -0400 -@@ -5,7 +5,7 @@ - #ifndef _REGRESS_RPC_ - #define _REGRESS_RPC_ - --#include -+//#include - #define EVTAG_HAS(msg, member) ((msg)->member##_set == 1) - #define EVTAG_ASSIGN(msg, member, args...) (*(msg)->member##_assign)(msg, ## args) - #define EVTAG_GET(msg, member, args...) (*(msg)->member##_get)(msg, ## args) Deleted: csw/mgar/pkg/libevent/trunk/files/testsh.diff =================================================================== --- csw/mgar/pkg/libevent/trunk/files/testsh.diff 2009-11-02 08:42:21 UTC (rev 7070) +++ csw/mgar/pkg/libevent/trunk/files/testsh.diff 2009-11-02 12:03:23 UTC (rev 7071) @@ -1,9 +0,0 @@ -diff --speed-large-files --minimal -Nru libevent-1.2a.orig/test/test.sh libevent-1.2a/test/test.sh ---- libevent-1.2a.orig/test/test.sh 2006-10-27 23:28:57.000000000 -0400 -+++ libevent-1.2a/test/test.sh 2007-01-31 02:01:39.633670000 -0500 -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/bin/bash - - setup () { - EVENT_NOKQUEUE=yes; export EVENT_NOKQUEUE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Mon Nov 2 15:17:30 2009 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Mon, 02 Nov 2009 14:17:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[7072] csw/mgar/pkg/denyhosts/trunk Message-ID: Revision: 7072 http://gar.svn.sourceforge.net/gar/?rev=7072&view=rev Author: bensons Date: 2009-11-02 14:17:30 +0000 (Mon, 02 Nov 2009) Log Message: ----------- denyhosts: no AAUTOSTART for the smf script Modified Paths: -------------- csw/mgar/pkg/denyhosts/trunk/Makefile csw/mgar/pkg/denyhosts/trunk/files/cswdenyhosts Modified: csw/mgar/pkg/denyhosts/trunk/Makefile =================================================================== --- csw/mgar/pkg/denyhosts/trunk/Makefile 2009-11-02 12:03:23 UTC (rev 7071) +++ csw/mgar/pkg/denyhosts/trunk/Makefile 2009-11-02 14:17:30 UTC (rev 7072) @@ -57,6 +57,7 @@ mv $(DESTDIR)$(datadir)/$(GARNAME)/denyhosts.cfg-dist \ $(DESTDIR)$(sysconfdir)/denyhosts.cfg ginstall -m 0755 $(FILEDIR)/cswdenyhosts $(DESTDIR)$(sysconfdir)/init.d + ginstall -m 0644 $(FILEDIR)/readme $(DOCDEST) #Adjust config to match Solaris paths + our package paths gsed -i \ Modified: csw/mgar/pkg/denyhosts/trunk/files/cswdenyhosts =================================================================== --- csw/mgar/pkg/denyhosts/trunk/files/cswdenyhosts 2009-11-02 12:03:23 UTC (rev 7071) +++ csw/mgar/pkg/denyhosts/trunk/files/cswdenyhosts 2009-11-02 14:17:30 UTC (rev 7072) @@ -2,6 +2,7 @@ # # Init script for denyhosts # +# AUTOENABLE no PATH=/opt/csw/bin:$PATH NAME=denyhosts This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Mon Nov 2 15:18:00 2009 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Mon, 02 Nov 2009 14:18:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7073] csw/mgar/pkg/denyhosts/trunk/files/readme Message-ID: Revision: 7073 http://gar.svn.sourceforge.net/gar/?rev=7073&view=rev Author: bensons Date: 2009-11-02 14:17:59 +0000 (Mon, 02 Nov 2009) Log Message: ----------- denyhosts: added readme Added Paths: ----------- csw/mgar/pkg/denyhosts/trunk/files/readme Added: csw/mgar/pkg/denyhosts/trunk/files/readme =================================================================== --- csw/mgar/pkg/denyhosts/trunk/files/readme (rev 0) +++ csw/mgar/pkg/denyhosts/trunk/files/readme 2009-11-02 14:17:59 UTC (rev 7073) @@ -0,0 +1,17 @@ +### opencsw denyhosts readme + +Please make sure, you have configured syslogd and sshd +to log the auth messages. +Sshd defaults to auth.info on Solaris, so an entry for +/etc/syslog.conf could look like: + +[snip] +auth.info /var/log/authlog +[snap] + +Please configure /etc/opt/csw/denyhosts.cfg accordingly: +[snip] +SECURE_LOG = /var/log/authlog +[snap] + +Restart syslogd and denyhosts for the changes to take effect. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Mon Nov 2 15:19:50 2009 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Mon, 02 Nov 2009 14:19:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[7074] csw/mgar/pkg/denyhosts/trunk/Makefile Message-ID: Revision: 7074 http://gar.svn.sourceforge.net/gar/?rev=7074&view=rev Author: bensons Date: 2009-11-02 14:19:50 +0000 (Mon, 02 Nov 2009) Log Message: ----------- denyhosts: added pkg requirement CSWpython Modified Paths: -------------- csw/mgar/pkg/denyhosts/trunk/Makefile Modified: csw/mgar/pkg/denyhosts/trunk/Makefile =================================================================== --- csw/mgar/pkg/denyhosts/trunk/Makefile 2009-11-02 14:17:59 UTC (rev 7073) +++ csw/mgar/pkg/denyhosts/trunk/Makefile 2009-11-02 14:19:50 UTC (rev 7074) @@ -24,6 +24,7 @@ LICENSE = LICENSE.txt ARCHALL = 1 INITSMF = /etc/opt/csw/init.d/cswdenyhosts +REQUIRED_PKGS = CSWpython # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).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 Nov 2 16:02:31 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 02 Nov 2009 15:02:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7075] csw/mgar/pkg/octave/trunk Message-ID: Revision: 7075 http://gar.svn.sourceforge.net/gar/?rev=7075&view=rev Author: dmichelsen Date: 2009-11-02 15:02:31 +0000 (Mon, 02 Nov 2009) Log Message: ----------- octave: Initial commit, release delayed as a ton of dependencies is missing Added Paths: ----------- csw/mgar/pkg/octave/trunk/Makefile csw/mgar/pkg/octave/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/octave/trunk/ Property changes on: csw/mgar/pkg/octave/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Copied: csw/mgar/pkg/octave/trunk/Makefile (from rev 7015, csw/mgar/pkg/gperf/trunk/Makefile) =================================================================== --- csw/mgar/pkg/octave/trunk/Makefile (rev 0) +++ csw/mgar/pkg/octave/trunk/Makefile 2009-11-02 15:02:31 UTC (rev 7075) @@ -0,0 +1,20 @@ +GARNAME = octave +GARVERSION = 3.2.3 +CATEGORIES = apps + +DESCRIPTION = The GNU Octave language for numerical computations +define BLURB +endef + +MASTER_SITES = $(GNU_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + Added: csw/mgar/pkg/octave/trunk/checksums =================================================================== --- csw/mgar/pkg/octave/trunk/checksums (rev 0) +++ csw/mgar/pkg/octave/trunk/checksums 2009-11-02 15:02:31 UTC (rev 7075) @@ -0,0 +1 @@ +eecaa1a3b2da3b94fa7bcebbc4f1a1f2 octave-3.2.3.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Mon Nov 2 16:13:57 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 02 Nov 2009 15:13:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[7076] csw/mgar/pkg/xterm/trunk Message-ID: Revision: 7076 http://gar.svn.sourceforge.net/gar/?rev=7076&view=rev Author: skayser Date: 2009-11-02 15:13:57 +0000 (Mon, 02 Nov 2009) Log Message: ----------- xterm: working copy towards version 250 Modified Paths: -------------- csw/mgar/pkg/xterm/trunk/Makefile csw/mgar/pkg/xterm/trunk/checksums Added Paths: ----------- csw/mgar/pkg/xterm/trunk/files/changelog.CSW Modified: csw/mgar/pkg/xterm/trunk/Makefile =================================================================== --- csw/mgar/pkg/xterm/trunk/Makefile 2009-11-02 15:02:31 UTC (rev 7075) +++ csw/mgar/pkg/xterm/trunk/Makefile 2009-11-02 15:13:57 UTC (rev 7076) @@ -1,20 +1,23 @@ GARNAME = xterm -GARVERSION = 248 +GARVERSION = 250 CATEGORIES = apps DESCRIPTION = Terminal emulator for the X Window System define BLURB -The xterm program is a terminal emulator for the X Window System. It provides -DEC VT102 and Tektronix 4014 compatible terminals for programs that can't use -the window system directly. This version implements ISO/ANSI colors using the -"new" color model (i.e., background color erase). It also implements most of -the control sequences for VT220. + The xterm program is a terminal emulator for the X Window System. It provides + DEC VT102 and Tektronix 4014 compatible terminals for programs that can't use + the window system directly. This version implements ISO/ANSI colors using the + "new" color model (i.e., background color erase). It also implements most of + the control sequences for VT220. endef MASTER_SITES = ftp://invisible-island.net/xterm/ DISTFILES = $(GARNAME)-$(GARVERSION).tgz REQUIRED_PKGS = CSWfconfig CSWlibxft2 +# We needed to switch to CSW-built X11 (build against Solaris X11 was broken +# on the build boxes, ) and these came along as dependencies. +REQUIRED_PKGS += CSWlibice CSWlibx11 CSWlibxaw CSWlibxmu CSWlibxt # enable -mk_width per default to address unicode form character width woes, # can be taken out once upstream enhances wcwidth() sanity checking @@ -54,9 +57,15 @@ CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) CONFIGURE_ARGS_DBG = --enable-trace --enable-warnings +# The need for the following extra flags also came along with the switch +# to CSW X11, didn't yet investigate what exactly broke ./configure +EXTRA_LDFLAGS = -L$(libdir) -lfontconfig + include gar/category.mk +post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(CATALOGNAME) post-install-modulated: - @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) - @cp $(FILEDIR)/README.CSW $(DESTDIR)$(docdir)/$(GARNAME) + ginstall -d $(DOCDEST) + cp $(FILEDIR)/README.CSW $(DOCDEST) + cp $(FILEDIR)/changelog.CSW $(DOCDEST) @$(MAKECOOKIE) Modified: csw/mgar/pkg/xterm/trunk/checksums =================================================================== --- csw/mgar/pkg/xterm/trunk/checksums 2009-11-02 15:02:31 UTC (rev 7075) +++ csw/mgar/pkg/xterm/trunk/checksums 2009-11-02 15:13:57 UTC (rev 7076) @@ -1 +1 @@ -70771a21fbc54a79f68374cebb49935a download/xterm-248.tgz +962ce117f65daf6bf376b6697b2cd02d download/xterm-250.tgz Added: csw/mgar/pkg/xterm/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/xterm/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/xterm/trunk/files/changelog.CSW 2009-11-02 15:13:57 UTC (rev 7076) @@ -0,0 +1,5 @@ +xterm (250,REV=2009.11.02) + + * Updated to 250. (Fixes #3937, #3856) + + -- Sebastian Kayser Mon, 2 Nov 2009 16:11:49 +0100 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 Nov 2 16:31:22 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 02 Nov 2009 15:31:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[7077] csw/mgar/pkg Message-ID: Revision: 7077 http://gar.svn.sourceforge.net/gar/?rev=7077&view=rev Author: dmichelsen Date: 2009-11-02 15:31:22 +0000 (Mon, 02 Nov 2009) Log Message: ----------- glpk: Initial commit Added Paths: ----------- csw/mgar/pkg/glpk/ csw/mgar/pkg/glpk/branches/ csw/mgar/pkg/glpk/tags/ csw/mgar/pkg/glpk/trunk/ csw/mgar/pkg/glpk/trunk/Makefile csw/mgar/pkg/glpk/trunk/checksums csw/mgar/pkg/glpk/trunk/files/ Property changes on: csw/mgar/pkg/glpk/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/glpk/trunk/Makefile =================================================================== --- csw/mgar/pkg/glpk/trunk/Makefile (rev 0) +++ csw/mgar/pkg/glpk/trunk/Makefile 2009-11-02 15:31:22 UTC (rev 7077) @@ -0,0 +1,28 @@ +GARNAME = glpk +GARVERSION = 4.39 +CATEGORIES = lib + +DESCRIPTION = GNU Linear Programming Kit +define BLURB + The GLPK (GNU Linear Programming Kit) package is intended for solving large-scale + linear programming (LP), mixed integer programming (MIP), and other related problems. + It is a set of routines written in ANSI C and organized in the form of a callable library. +endef + +MASTER_SITES = $(GNU_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +PACKAGES = CSWlibglpk + +BUILD64 = 1 +NO_ISAEXEC = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +MERGE_DIRS_isa-extra = $(libdir) + +include gar/category.mk Added: csw/mgar/pkg/glpk/trunk/checksums =================================================================== --- csw/mgar/pkg/glpk/trunk/checksums (rev 0) +++ csw/mgar/pkg/glpk/trunk/checksums 2009-11-02 15:31:22 UTC (rev 7077) @@ -0,0 +1 @@ +95f276ef6c94c6de1eb689f161f525f3 glpk-4.39.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 Nov 2 16:54:31 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 02 Nov 2009 15:54:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7078] csw/mgar/pkg Message-ID: Revision: 7078 http://gar.svn.sourceforge.net/gar/?rev=7078&view=rev Author: dmichelsen Date: 2009-11-02 15:54:31 +0000 (Mon, 02 Nov 2009) Log Message: ----------- fftw: Initial commit for fftw3 Added Paths: ----------- csw/mgar/pkg/fftw/ csw/mgar/pkg/fftw/branches/ csw/mgar/pkg/fftw/tags/ csw/mgar/pkg/fftw/trunk/ csw/mgar/pkg/fftw/trunk/Makefile csw/mgar/pkg/fftw/trunk/checksums csw/mgar/pkg/fftw/trunk/files/ Property changes on: csw/mgar/pkg/fftw/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/fftw/trunk/Makefile =================================================================== --- csw/mgar/pkg/fftw/trunk/Makefile (rev 0) +++ csw/mgar/pkg/fftw/trunk/Makefile 2009-11-02 15:54:31 UTC (rev 7078) @@ -0,0 +1,27 @@ +GARNAME = fftw +GARVERSION = 3.2.2 +CATEGORIES = lib + +DESCRIPTION = Library for computing the discrete Fourier transform (DFT) +define BLURB + FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) + in one or more dimensions, of arbitrary input size, and of both real and complex + data (as well as of even/odd data, i.e. the discrete cosine/sine transforms or + DCT/DST). We believe that FFTW, which is free software, should become the FFT + library of choice for most applications. +endef + +MASTER_SITES = http://www.fftw.org/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.fftw.org/ + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/fftw/trunk/checksums =================================================================== --- csw/mgar/pkg/fftw/trunk/checksums (rev 0) +++ csw/mgar/pkg/fftw/trunk/checksums 2009-11-02 15:54:31 UTC (rev 7078) @@ -0,0 +1 @@ +b616e5c91218cc778b5aa735fefb61ae fftw-3.2.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 Mon Nov 2 16:55:45 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 02 Nov 2009 15:55:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[7079] csw/mgar/pkg/fftw/trunk/Makefile Message-ID: Revision: 7079 http://gar.svn.sourceforge.net/gar/?rev=7079&view=rev Author: dmichelsen Date: 2009-11-02 15:55:44 +0000 (Mon, 02 Nov 2009) Log Message: ----------- fftw: Don't use isaexec Modified Paths: -------------- csw/mgar/pkg/fftw/trunk/Makefile Modified: csw/mgar/pkg/fftw/trunk/Makefile =================================================================== --- csw/mgar/pkg/fftw/trunk/Makefile 2009-11-02 15:54:31 UTC (rev 7078) +++ csw/mgar/pkg/fftw/trunk/Makefile 2009-11-02 15:55:44 UTC (rev 7079) @@ -20,8 +20,11 @@ SPKG_SOURCEURL = http://www.fftw.org/ BUILD64 = 1 +NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check +MERGE_DIRS_isa-extra = $(bindir) + 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 Nov 2 17:21:55 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 02 Nov 2009 16:21:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[7080] csw/mgar/pkg/hdf5 Message-ID: Revision: 7080 http://gar.svn.sourceforge.net/gar/?rev=7080&view=rev Author: dmichelsen Date: 2009-11-02 16:21:53 +0000 (Mon, 02 Nov 2009) Log Message: ----------- hdf5: Move to mGAR v2 and 1.8.3 with legacy version modulations Added Paths: ----------- csw/mgar/pkg/hdf5/tags/ csw/mgar/pkg/hdf5/trunk/Makefile csw/mgar/pkg/hdf5/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/hdf5/trunk/legacy/ Property Changed: ---------------- csw/mgar/pkg/hdf5/trunk/ Property changes on: csw/mgar/pkg/hdf5/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Copied: csw/mgar/pkg/hdf5/trunk/Makefile (from rev 7071, csw/mgar/pkg/libevent/trunk/Makefile) =================================================================== --- csw/mgar/pkg/hdf5/trunk/Makefile (rev 0) +++ csw/mgar/pkg/hdf5/trunk/Makefile 2009-11-02 16:21:53 UTC (rev 7080) @@ -0,0 +1,64 @@ +GARNAME = hdf5 +GARVERSION = 1.8.3 +CATEGORIES = lib + +EXTRA_MODULATORS = GARVERSION +MODULATIONS_GARVERSION = 1.6.9 1.8.3 + +SKIP_MODULATIONS = isa-sparcv9-garversion-1.6.9 +SKIP_MODULATIONS += isa-amd64-garversion-1.6.9 + +DESCRIPTION = Event notification library +define BLURB + The libevent API provides a mechanism to execute a callback function when a + specific event occurs on a file descriptor or after a timeout has been + reached. Furthermore, libevent also support callbacks due to signals or + regular timeouts. +endef + +MASTER_SITES = http://www.hdfgroup.org/ftp/HDF5/current/src/ +MASTER_SITES += http://www.hdfgroup.org/ftp/HDF5/current16/src/ +SOURCEFILES = $(foreach V,$(MODULATIONS_GARVERSION),$(GARNAME)-$V.tar.gz) +DISTFILES += $(SOURCEFILES) + +NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz,$(SOURCEFILES)) + +PACKAGES = CSWhdf5 CSWhdf5rt + +REQUIRED_PKGS_CSWhdf5rt = CSWhdf5 + +CATALOGNAME_CSWhdf5 = hdf5 +CATALOGNAME_CSWhdf5rt = hdf5_rt + +SPKG_DESC_CSWhdf5 = HDF5 (Hierarchical Data Format 5) Software Utilities +SPKG_DESC_CSWhdf5rt = HDF5 (Hierarchical Data Format 5) Software Runtime Libraries + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.hdfgroup.org/HDF5/ + +BUILD64 = 1 +NO_ISAEXEC = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +MERGE_SCRIPTS_isa-default-garversion-1.6.9 = copy-only +MERGE_DIRS_isa-default-garversion-1.6.9 = $(libdir) +MERGE_SCRIPTS_isa-extra-garversion-1.6.9 = copy-relocated-only +MERGE_DIRS_isa-extra-garversion-1.6.9 = $(libdir) + +MERGE_SCRIPTS_isa-default-garversion-1.8.3 = copy-all +MERGE_SCRIPTS_isa-extra-garversion-1.8.3 = copy-relocated-only +MERGE_DIRS_isa-extra-garversion-1.8.3 = $(libdir) + +PKGFILES_CSWhdf5rt = $(PKGFILES_RT) + +include gar/category.mk + +pre-install-modulated: + ginstall -d $(DESTDIR)$(libdir) + ginstall -d $(DESTDIR)$(includedir) + ginstall -d $(DESTDIR)$(bindir) + @$(MAKECOOKIE) Added: csw/mgar/pkg/hdf5/trunk/checksums =================================================================== --- csw/mgar/pkg/hdf5/trunk/checksums (rev 0) +++ csw/mgar/pkg/hdf5/trunk/checksums 2009-11-02 16:21:53 UTC (rev 7080) @@ -0,0 +1,2 @@ +751eb3317a47e7c58978e1c3a13a93fc hdf5-1.6.9.tar.gz +5ce228d860bf9e797ca40ab1a823c380 hdf5-1.8.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 Nov 2 17:23:47 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 02 Nov 2009 16:23:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[7081] csw/mgar/pkg/gsm/trunk Message-ID: Revision: 7081 http://gar.svn.sourceforge.net/gar/?rev=7081&view=rev Author: dmichelsen Date: 2009-11-02 16:23:45 +0000 (Mon, 02 Nov 2009) Log Message: ----------- gsm: Add patches for 64 bit compilation Modified Paths: -------------- csw/mgar/pkg/gsm/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/gsm/trunk/files/0001-Fix-types-for-64-bit.patch csw/mgar/pkg/gsm/trunk/files/0002-Don-t-throw-errors-if-removed-files-don-t-exist.patch Modified: csw/mgar/pkg/gsm/trunk/Makefile =================================================================== --- csw/mgar/pkg/gsm/trunk/Makefile 2009-11-02 16:21:53 UTC (rev 7080) +++ csw/mgar/pkg/gsm/trunk/Makefile 2009-11-02 16:23:45 UTC (rev 7081) @@ -34,14 +34,25 @@ TEST_TARGET = tst addtst misc TEST_ARGS = $(BUILD_ARGS) -INSTALL_ARGS = TOAST_INSTALL_ROOT="$(DESTDIR)$(prefix)" -INSTALL_ARGS += GSM_INSTALL_ROOT="$(DESTDIR)$(prefix)" +INSTALL_SCRIPTS = custom +#INSTALL_ARGS = TOAST_INSTALL_ROOT="$(DESTDIR)$(prefix)" +#INSTALL_ARGS += GSM_INSTALL_ROOT="$(DESTDIR)$(prefix)" include gar/category.mk -pre-install-modulated: +post-build-modulated: + +install-custom: ginstall -d $(DESTDIR)$(bindir) + ginstall $(WORKSRC)/bin/toast $(DESTDIR)$(bindir) + gln untoast $(DESTDIR)$(bindir)/toast + gln tcat $(DESTDIR)$(bindir)/toast ginstall -d $(DESTDIR)$(libdir) - ginstall -d $(DESTDIR)$(prefix)/inc - ginstall -d $(DESTDIR)$(prefix)/man/man1 + ginstall $(WORKSRC)/lib/libgsm.a $(DESTDIR)$(libdir) + ginstall -d $(DESTDIR)$(includedir) + ginstall $(WORKSRC)/inc/gsm.h $(DESTDIR)$(includedir) + ginstall -d $(DESTDIR)$(mandir)/man1 + ginstall $(WORKSRC)/man/toast.1 $(DESTDIR)$(mandir)/man1 + ginstall -d $(DESTDIR)$(mandir)/man3 + ginstall $(WORKSRC)/man/*.3 $(DESTDIR)$(mandir)/man3 @$(MAKECOOKIE) Added: csw/mgar/pkg/gsm/trunk/files/0001-Fix-types-for-64-bit.patch =================================================================== --- csw/mgar/pkg/gsm/trunk/files/0001-Fix-types-for-64-bit.patch (rev 0) +++ csw/mgar/pkg/gsm/trunk/files/0001-Fix-types-for-64-bit.patch 2009-11-02 16:23:45 UTC (rev 7081) @@ -0,0 +1,34 @@ +From 3da2e2e562fc914c6f908cebf4e6c29210615136 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 2 Nov 2009 09:41:10 +0100 +Subject: [PATCH 1/2] Fix types for 64 bit + +--- + inc/private.h | 10 ++++++---- + 1 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/inc/private.h b/inc/private.h +index 0c94255..316c328 100644 +--- a/inc/private.h ++++ b/inc/private.h +@@ -9,11 +9,13 @@ + #ifndef PRIVATE_H + #define PRIVATE_H + +-typedef short word; /* 16 bit signed int */ +-typedef long longword; /* 32 bit signed int */ ++#include + +-typedef unsigned short uword; /* unsigned word */ +-typedef unsigned long ulongword; /* unsigned longword */ ++typedef int16_t word; /* 16 bit signed int */ ++typedef int32_t longword; /* 32 bit signed int */ ++ ++typedef uint16_t uword; /* unsigned word */ ++typedef uint32_t ulongword; /* unsigned longword */ + + struct gsm_state { + +-- +1.6.5 + Added: csw/mgar/pkg/gsm/trunk/files/0002-Don-t-throw-errors-if-removed-files-don-t-exist.patch =================================================================== --- csw/mgar/pkg/gsm/trunk/files/0002-Don-t-throw-errors-if-removed-files-don-t-exist.patch (rev 0) +++ csw/mgar/pkg/gsm/trunk/files/0002-Don-t-throw-errors-if-removed-files-don-t-exist.patch 2009-11-02 16:23:45 UTC (rev 7081) @@ -0,0 +1,140 @@ +From 158e510f219f29090b4fda509dc5372f9bdd98c7 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 2 Nov 2009 09:42:37 +0100 +Subject: [PATCH 2/2] Don't throw errors if removed files don't exist + +--- + Makefile | 38 +++++++++++++++++++------------------- + 1 files changed, 19 insertions(+), 19 deletions(-) + +diff --git a/Makefile b/Makefile +index cfab74f..571eb5a 100644 +--- a/Makefile ++++ b/Makefile +@@ -17,7 +17,7 @@ SASR = -DSASR + + # LTP_CUT = -DLTP_CUT + LTP_CUT = +-######### Define to enable the GSM library's long-term correlation ++######### Define to enable the GSM library's long-term -f correlation + ######### approximation option---faster, but worse; works for + ######### both integer and floating point multiplications. + ######### This flag is still in the experimental stage. +@@ -300,7 +300,7 @@ install: toastinstall gsminstall + # The basic API: libgsm + + $(LIBGSM): $(LIB) $(GSM_OBJECTS) +- -rm $(RMFLAGS) $(LIBGSM) ++ -rm -f $(RMFLAGS) $(LIBGSM) + $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS) + $(RANLIB) $(LIBGSM) + +@@ -311,11 +311,11 @@ $(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM) + $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB) + + $(UNTOAST): $(BIN) $(TOAST) +- -rm $(RMFLAGS) $(UNTOAST) ++ -rm -f $(RMFLAGS) $(UNTOAST) + $(LN) $(TOAST) $(UNTOAST) + + $(TCAT): $(BIN) $(TOAST) +- -rm $(RMFLAGS) $(TCAT) ++ -rm -f $(RMFLAGS) $(TCAT) + $(LN) $(TOAST) $(TCAT) + + +@@ -342,59 +342,59 @@ toastinstall: + + gsmuninstall: + -if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then \ +- rm $(RMFLAGS) $(GSM_INSTALL_TARGETS) ; \ ++ rm -f $(RMFLAGS) $(GSM_INSTALL_TARGETS) ; \ + fi + + toastuninstall: + -if [ x"$(TOAST_INSTALL_ROOT)" != x ] ; then \ +- rm $(RMFLAGS) $(TOAST_INSTALL_TARGETS); \ ++ rm -f $(RMFLAGS) $(TOAST_INSTALL_TARGETS); \ + fi + + $(TOAST_INSTALL_BIN)/toast: $(TOAST) +- -rm $@ ++ -rm -f $@ + cp $(TOAST) $@ + chmod 755 $@ + + $(TOAST_INSTALL_BIN)/untoast: $(TOAST_INSTALL_BIN)/toast +- -rm $@ ++ -rm -f $@ + ln $? $@ + + $(TOAST_INSTALL_BIN)/tcat: $(TOAST_INSTALL_BIN)/toast +- -rm $@ ++ -rm -f $@ + ln $? $@ + + $(TOAST_INSTALL_MAN)/toast.1: $(MAN)/toast.1 +- -rm $@ ++ -rm -f $@ + cp $? $@ + chmod 444 $@ + + $(GSM_INSTALL_MAN)/gsm.3: $(MAN)/gsm.3 +- -rm $@ ++ -rm -f $@ + cp $? $@ + chmod 444 $@ + + $(GSM_INSTALL_MAN)/gsm_option.3: $(MAN)/gsm_option.3 +- -rm $@ ++ -rm -f $@ + cp $? $@ + chmod 444 $@ + + $(GSM_INSTALL_MAN)/gsm_explode.3: $(MAN)/gsm_explode.3 +- -rm $@ ++ -rm -f $@ + cp $? $@ + chmod 444 $@ + + $(GSM_INSTALL_MAN)/gsm_print.3: $(MAN)/gsm_print.3 +- -rm $@ ++ -rm -f $@ + cp $? $@ + chmod 444 $@ + + $(GSM_INSTALL_INC)/gsm.h: $(INC)/gsm.h +- -rm $@ ++ -rm -f $@ + cp $? $@ + chmod 444 $@ + + $(GSM_INSTALL_LIB)/libgsm.a: $(LIBGSM) +- -rm $@ ++ -rm -f $@ + cp $? $@ + chmod 444 $@ + +@@ -416,16 +416,16 @@ uninstall: toastuninstall gsmuninstall + @-echo uninstall: Done. + + semi-clean: +- -rm $(RMFLAGS) */*.o \ ++ -rm -f $(RMFLAGS) */*.o \ + $(TST)/lin2cod $(TST)/lin2txt \ + $(TST)/cod2lin $(TST)/cod2txt \ + $(TST)/gsm2cod \ + $(TST)/*.*.* + -$(FIND) . \( -name core -o -name foo \) \ +- -print | xargs rm $(RMFLAGS) ++ -print | xargs rm -f $(RMFLAGS) + + clean: semi-clean +- -rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add \ ++ -rm -f $(RMFLAGS) $(LIBGSM) $(ADDTST)/add \ + $(TOAST) $(TCAT) $(UNTOAST) \ + $(ROOT)/gsm-1.0.tar.Z + +-- +1.6.5 + 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 Nov 2 19:29:02 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 02 Nov 2009 18:29:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[7082] csw/mgar/gar/v2-migrateconf/ Message-ID: Revision: 7082 http://gar.svn.sourceforge.net/gar/?rev=7082&view=rev Author: wahwah Date: 2009-11-02 18:28:45 +0000 (Mon, 02 Nov 2009) Log Message: ----------- Branching out to implement a shortcut for cswmigrateconf. Added Paths: ----------- csw/mgar/gar/v2-migrateconf/ Property changes on: csw/mgar/gar/v2-migrateconf ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-skayser:6087-6132 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 Nov 3 11:29:36 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 03 Nov 2009 10:29:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[7083] csw/mgar/gar/v2-migrateconf/gar.pkg.mk Message-ID: Revision: 7083 http://gar.svn.sourceforge.net/gar/?rev=7083&view=rev Author: wahwah Date: 2009-11-03 10:29:36 +0000 (Tue, 03 Nov 2009) Log Message: ----------- gar/v2-migrateconf: preliminary support in GAR Modified Paths: -------------- csw/mgar/gar/v2-migrateconf/gar.pkg.mk Modified: csw/mgar/gar/v2-migrateconf/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-migrateconf/gar.pkg.mk 2009-11-02 18:28:45 UTC (rev 7082) +++ csw/mgar/gar/v2-migrateconf/gar.pkg.mk 2009-11-03 10:29:36 UTC (rev 7083) @@ -171,6 +171,7 @@ # and able to be consumed by a service that might be started. SPKG_CLASSES := $(call _spkg_cond_add,SAMPLECONF,cswcpsampleconf) SPKG_CLASSES := $(call _spkg_cond_add,PRESERVECONF,cswpreserveconf) +SPKG_CLASSES := $(call _spkg_cond_add,MIGRATECONF,cswpycompile) SPKG_CLASSES := $(call _spkg_cond_add,ETCSERVICES,cswetcservices) SPKG_CLASSES := $(call _spkg_cond_add,USERGROUP,cswusergroup) SPKG_CLASSES := $(call _spkg_cond_add,PYCOMPILE,cswpycompile) @@ -178,10 +179,11 @@ SPKG_CLASSES := $(call _spkg_cond_add,INITSMF,cswinitsmf) # - set class for all config files -ifneq ($(SAMPLECONF)$(PRESERVECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),) +ifneq ($(SAMPLECONF)$(PRESERVECONF)$(MIGRATECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),) _CSWCLASS_FILTER = | perl -ane '\ $(foreach FILE,$(SAMPLECONF:%\.CSW=%),$$F[1] = "cswcpsampleconf" if ( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ $(foreach FILE,$(PRESERVECONF:%\.CSW=%),$$F[1] = "cswpreserveconf" if( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ + $(foreach FILE,$(MIGRATECONF),$$F[1] = "cswmigrateconf" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(ETCSERVICES),$$F[1] = "cswetcservices" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(INETDCONF),$$F[1] = "cswinetd" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(INITSMF),$$F[1] = "cswinitsmf" if( $$F[2] =~ m(^$(FILE)$$) );)\ 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 Nov 3 12:46:10 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 03 Nov 2009 11:46:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7084] csw/mgar/pkg/mbuffer/trunk Message-ID: Revision: 7084 http://gar.svn.sourceforge.net/gar/?rev=7084&view=rev Author: skayser Date: 2009-11-03 11:46:07 +0000 (Tue, 03 Nov 2009) Log Message: ----------- mbuffer: working copy, testing unofficial upstream release Modified Paths: -------------- csw/mgar/pkg/mbuffer/trunk/Makefile csw/mgar/pkg/mbuffer/trunk/checksums Modified: csw/mgar/pkg/mbuffer/trunk/Makefile =================================================================== --- csw/mgar/pkg/mbuffer/trunk/Makefile 2009-11-03 10:29:36 UTC (rev 7083) +++ csw/mgar/pkg/mbuffer/trunk/Makefile 2009-11-03 11:46:07 UTC (rev 7084) @@ -14,7 +14,7 @@ # GARNAME = mbuffer -GARVERSION = 20090628 +GARVERSION = 20091103 CATEGORIES = utils DESCRIPTION = A tool for buffering data streams Modified: csw/mgar/pkg/mbuffer/trunk/checksums =================================================================== --- csw/mgar/pkg/mbuffer/trunk/checksums 2009-11-03 10:29:36 UTC (rev 7083) +++ csw/mgar/pkg/mbuffer/trunk/checksums 2009-11-03 11:46:07 UTC (rev 7084) @@ -1 +1 @@ -66a39f6e3289f2e181b4861e6a301b01 download/mbuffer-20090628.tgz +c3f8fe27edb333d4df02cbe1d0f5f4f5 download/mbuffer-20091103.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Tue Nov 3 14:09:58 2009 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Tue, 03 Nov 2009 13:09:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7085] csw/mgar/pkg/denyhosts/trunk/files Message-ID: Revision: 7085 http://gar.svn.sourceforge.net/gar/?rev=7085&view=rev Author: bensons Date: 2009-11-03 13:09:58 +0000 (Tue, 03 Nov 2009) Log Message: ----------- denyhosts: adjusted README.CSW Added Paths: ----------- csw/mgar/pkg/denyhosts/trunk/files/README.CSW Removed Paths: ------------- csw/mgar/pkg/denyhosts/trunk/files/readme Added: csw/mgar/pkg/denyhosts/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/denyhosts/trunk/files/README.CSW (rev 0) +++ csw/mgar/pkg/denyhosts/trunk/files/README.CSW 2009-11-03 13:09:58 UTC (rev 7085) @@ -0,0 +1,18 @@ +### OpenCSW denyhosts README + +Please make sure, you have configured syslogd and sshd +to log the auth messages. +sshd defaults to auth.info on Solaris, so an entry for +/etc/syslog.conf could look like: + +[snip] +auth.info /var/log/authlog +[snap] + +Please configure /etc/opt/csw/denyhosts.cfg accordingly: + +[snip] +SECURE_LOG = /var/log/authlog +[snap] + +Restart syslogd and denyhosts for the changes to take effect. Deleted: csw/mgar/pkg/denyhosts/trunk/files/readme =================================================================== --- csw/mgar/pkg/denyhosts/trunk/files/readme 2009-11-03 11:46:07 UTC (rev 7084) +++ csw/mgar/pkg/denyhosts/trunk/files/readme 2009-11-03 13:09:58 UTC (rev 7085) @@ -1,17 +0,0 @@ -### opencsw denyhosts readme - -Please make sure, you have configured syslogd and sshd -to log the auth messages. -Sshd defaults to auth.info on Solaris, so an entry for -/etc/syslog.conf could look like: - -[snip] -auth.info /var/log/authlog -[snap] - -Please configure /etc/opt/csw/denyhosts.cfg accordingly: -[snip] -SECURE_LOG = /var/log/authlog -[snap] - -Restart syslogd and denyhosts for the changes to take effect. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Tue Nov 3 14:15:07 2009 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Tue, 03 Nov 2009 13:15:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7086] csw/mgar/pkg/denyhosts/trunk/Makefile Message-ID: Revision: 7086 http://gar.svn.sourceforge.net/gar/?rev=7086&view=rev Author: bensons Date: 2009-11-03 13:15:07 +0000 (Tue, 03 Nov 2009) Log Message: ----------- denyhosts: adjusted README.CSW Modified Paths: -------------- csw/mgar/pkg/denyhosts/trunk/Makefile Modified: csw/mgar/pkg/denyhosts/trunk/Makefile =================================================================== --- csw/mgar/pkg/denyhosts/trunk/Makefile 2009-11-03 13:09:58 UTC (rev 7085) +++ csw/mgar/pkg/denyhosts/trunk/Makefile 2009-11-03 13:15:07 UTC (rev 7086) @@ -58,7 +58,7 @@ mv $(DESTDIR)$(datadir)/$(GARNAME)/denyhosts.cfg-dist \ $(DESTDIR)$(sysconfdir)/denyhosts.cfg ginstall -m 0755 $(FILEDIR)/cswdenyhosts $(DESTDIR)$(sysconfdir)/init.d - ginstall -m 0644 $(FILEDIR)/readme $(DOCDEST) + ginstall -m 0644 $(FILEDIR)/README.CSW $(DOCDEST) #Adjust config to match Solaris paths + our package paths gsed -i \ 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 Nov 3 15:30:56 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 03 Nov 2009 14:30:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[7087] csw/mgar/pkg/aide/trunk Message-ID: Revision: 7087 http://gar.svn.sourceforge.net/gar/?rev=7087&view=rev Author: dmichelsen Date: 2009-11-03 14:30:56 +0000 (Tue, 03 Nov 2009) Log Message: ----------- aide: Relocate config-file to /etc/opt/csw and provide example Modified Paths: -------------- csw/mgar/pkg/aide/trunk/Makefile csw/mgar/pkg/aide/trunk/checksums Added Paths: ----------- csw/mgar/pkg/aide/trunk/files/aide.conf Modified: csw/mgar/pkg/aide/trunk/Makefile =================================================================== --- csw/mgar/pkg/aide/trunk/Makefile 2009-11-03 13:15:07 UTC (rev 7086) +++ csw/mgar/pkg/aide/trunk/Makefile 2009-11-03 14:30:56 UTC (rev 7087) @@ -11,6 +11,7 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += aide.conf # Disable Sun ACLs for now until bug #2887984 is fixed: # http://sourceforge.net/tracker/?func=detail&aid=2887984&group_id=86976&atid=581579 @@ -26,6 +27,9 @@ REQUIRED_PKGS = CSWcurlrt CSWgcrypt CSWgpgerr CSWlibidn CSWlibmhash CSWlibpq REQUIRED_PKGS += CSWoldaprt CSWosslrt CSWzlib +sysconfdir = /etc/opt/csw/aide +PRESERVECONF = $(sysconfdir)/aide.conf + EXTRA_LIB = $(prefix)/postgresql/lib EXTRA_INC = $(prefix)/postgresql/include @@ -48,3 +52,7 @@ TEST_SCRIPTS = include gar/category.mk + +post-install-modulated: + ginstall -d $(DESTDIR)/etc/opt/csw/aide + ginstall $(WORKDIR)/aide.conf $(DESTDIR)/etc/opt/csw/aide/ Modified: csw/mgar/pkg/aide/trunk/checksums =================================================================== --- csw/mgar/pkg/aide/trunk/checksums 2009-11-03 13:15:07 UTC (rev 7086) +++ csw/mgar/pkg/aide/trunk/checksums 2009-11-03 14:30:56 UTC (rev 7087) @@ -1,2 +1,3 @@ c0fe56738d4f293c4d5a8de164a2a01c 0002-Add-missing-prototypes-for-db_sql.patch 27978cc6bca4f0fbf3f6f5a1b330661c aide-0.13.1.tar.gz +d23d52d1464b957c0d64f75e7e1ec862 aide.conf Added: csw/mgar/pkg/aide/trunk/files/aide.conf =================================================================== --- csw/mgar/pkg/aide/trunk/files/aide.conf (rev 0) +++ csw/mgar/pkg/aide/trunk/files/aide.conf 2009-11-03 14:30:56 UTC (rev 7087) @@ -0,0 +1,166 @@ +# From http://www.mail-archive.com/aide at cs.tut.fi/msg00234.html +# +# "This is the one I used when I was still running Solaris 8. +# You will probably need to do some tweaking of the /devices +# directory depending on the hardware you have installed." +# Richard van den Berg +# +# The files has been adjusted to suite OpenCSW directory layout. +# Dagobert Michelsen (dam at opencsw.org) + +# Here are all the things we can check - these are the default rules +# +#p: permissions +#i: inode +#n: number of links +#u: user +#g: group +#s: size +#b: block count +#m: mtime +#a: atime +#c: ctime +#S: check for growing size +#md5: md5 checksum +#sha1: sha1 checksum +#rmd160: rmd160 checksum +#tiger: tiger checksum +#R: p+i+n+u+g+s+m+c+md5 +#L: p+i+n+u+g +#E: Empty group +#>: Growing logfile p+u+g+i+n+S + +# Place of databases +# +gzip_dbout = yes +#database = file:///etc/aide/aide.db.gz +database = file:///floppy/aidedb/aide.db.gz +database_out = file:///opt/csw/etc/aide/aide.db.new.gz +database_new = file:///opt/csw/etc/aide/aide.db.new.gz + +# Custom rules +# +Default = p+i+n+u+g+s+b+m+c+md5+sha1 +C = p+i+n +T = p+i+u+g +F = i+n+u+g +Y = i+n + +# Configutations +/etc Default +/etc/.*pipe$ L +/etc/.name_service_door$ n+u+g+p +/etc/mnttab T +!/etc/ppp/resolv.conf$ +!/etc/cron.d/FIFO$ +/usr/local/etc Default +/usr/.*/etc.* Default +/usr/local/.*/etc.* Default +!/usr/local/etc/.*.cache$ +/opt/.*/etc Default +!/etc/rmtab$ +!/etc/Master.ini$ + +# Executables + +/usr/bin Default +/usr/ucb Default +/usr/.*/bin.* Default +/usr/local/.*/bin.* Default +/sbin Default +/usr/sbin Default +/usr/.*/sbin.* Default +/usr/local/.*/sbin.* Default +/opt/.*/bin.* Default +/opt/.*/sbin.* Default + +# Libraries + +/usr/lib Default +/usr/.*/lib.* Default +/usr/local/.*/lib.* Default +/opt/.*/lib.* Default + +/var Default +/var/audit$ L +!/var/audit/.* +/var/log$ L +!/var/log/.* +/var/mail$ L +!/var/mail/.* +/var/squid$ L +!/var/squid/.* +/var/cron/log$ L +!/var/cron/log/.* +/var/adm$ L +!/var/adm/.*log +/var/dt$ L +!/var/dt/.* +/var/dhcp$ L +!/var/dhcp/\..* +!/var/dhcp/SUNWfiles1_192_168_0_0 +!/var/adm/messages.* +!/var/spool/.* +!/var/adm/utmpx$ +!/var/adm/wtmpx$ +/var/spool/lp/tmp$ L +!/var/spool/lp/tmp/.* +!/var/preserve/sunpcilogs.* +/var/adm/X10msgs > + + +# Critical devices + +/dev/dsk Default +/dev/rdsk Default +/devices Default +/devices/pseudo/pts.* Y +/devices/pseudo/.*tty.* Y +/devices/pseudo/[EMAIL PROTECTED]:console C +/devices/pseudo/cons.* C +/devices/pseudo/random.* L +#/devices/[EMAIL PROTECTED],0/.* L +/devices/[EMAIL PROTECTED],0/sound.* C +/devices/[EMAIL PROTECTED],0/[EMAIL PROTECTED]:sound,audioctl Y +/devices/[EMAIL PROTECTED],0/SUNW,[EMAIL PROTECTED]:m640 C +/devices/[EMAIL PROTECTED],0/[EMAIL PROTECTED]/[EMAIL PROTECTED],0/floppy* F +/devices/[EMAIL PROTECTED],0/[EMAIL PROTECTED]/[EMAIL PROTECTED],3f8:a L +/devices/[EMAIL PROTECTED],0/[EMAIL PROTECTED]/pci108e,[EMAIL PROTECTED]:sunpci2drv L +/dev/kmem Default +/dev/mem Default +/dev/null Default +/dev/zero Default +/devices/pseudo/[EMAIL PROTECTED]:kmem L +/devices/pseudo/[EMAIL PROTECTED]:mem Default +/devices/pseudo/[EMAIL PROTECTED]:null L +/devices/pseudo/[EMAIL PROTECTED]:zero L + +# Other critical + +/kernel Default + +# Temporary directories +/usr/tmp$ T +!/usr/tmp/.* +/var/tmp$ T +!/var/tmp/.* +/var/run$ T +!/var/run/.* +/var/dt/tmp$ T +!/var/dt/tmp/.* +/tmp$ T +!/tmp/.* +/usr/aset/tmp$ T +!/usr/aset/tmp/.* +/usr/oasys/tmp$ T +!/usr/oasys/tmp/.* + +# Aide stuff + +/opt/csw/etc/aide$ L +!/opt/csw/etc/aide/.*\.log +!/opt/csw/etc/aide/.*\.new +!/opt/csw/etc/aide/.*\.db +/opt/csw/etc/aide/aide.conf Default +#/opt/csw/etc/aide/aide.db Default + 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 Nov 3 15:52:57 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 03 Nov 2009 14:52:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[7088] csw/mgar/pkg Message-ID: Revision: 7088 http://gar.svn.sourceforge.net/gar/?rev=7088&view=rev Author: dmichelsen Date: 2009-11-03 14:52:56 +0000 (Tue, 03 Nov 2009) Log Message: ----------- qhull: Initial commit Added Paths: ----------- csw/mgar/pkg/libqhull/ csw/mgar/pkg/libqhull/branches/ csw/mgar/pkg/libqhull/tags/ csw/mgar/pkg/libqhull/trunk/ csw/mgar/pkg/libqhull/trunk/Makefile csw/mgar/pkg/libqhull/trunk/checksums csw/mgar/pkg/libqhull/trunk/files/ Property changes on: csw/mgar/pkg/libqhull/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/libqhull/trunk/Makefile =================================================================== --- csw/mgar/pkg/libqhull/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libqhull/trunk/Makefile 2009-11-03 14:52:56 UTC (rev 7088) @@ -0,0 +1,43 @@ +GARNAME = qhull +GARVERSION = 2003.1 +CATEGORIES = lib + +DESCRIPTION = Qhull computes the convex hull and other hulls +define BLURB + Qhull computes the convex hull, Delaunay triangulation, Voronoi diagram, + halfspace intersection about a point, furthest-site Delaunay triangulation, + and furthest-site Voronoi diagram. The source code runs in 2-d, 3-d, 4-d, + and higher dimensions. Qhull implements the Quickhull algorithm for computing + the convex hull. It handles roundoff errors from floating point arithmetic. + It computes volumes, surface areas, and approximations to the convex hull. + Qhull does not support constrained Delaunay triangulations, triangulation + of non-convex surfaces, mesh generation of non-convex objects, or + medium-sized inputs in 9-D and higher. +endef + +MASTER_SITES = http://www.qhull.org/download/ +DISTFILES = $(DISTNAME).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +PACKAGES = CSWqhull CSWqhullrt + +CATALOGNAME_CSWqhull = qhull +CATALOGNAME_CSWqhullrt = qhull_rt + +SPKG_DESC_CSWqhull = Qhull computes the convex hull and other hulls +SPKG_DESC_CSWqhullrt = Qhull runtime libraries + +PKGFILES_CSWqhullrt = $(PKGFILES_RT) + +REQUIRED_PKGS_CSWqhull = CSWqhullrt + +SPKG_SOURCEURL = http://www.qhull.org/ + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/libqhull/trunk/checksums =================================================================== --- csw/mgar/pkg/libqhull/trunk/checksums (rev 0) +++ csw/mgar/pkg/libqhull/trunk/checksums 2009-11-03 14:52:56 UTC (rev 7088) @@ -0,0 +1 @@ +48228e26422bff85ef1f45df5b6e3314 qhull-2003.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 Nov 3 15:55:23 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 03 Nov 2009 14:55:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7089] csw/mgar/pkg Message-ID: Revision: 7089 http://gar.svn.sourceforge.net/gar/?rev=7089&view=rev Author: dmichelsen Date: 2009-11-03 14:55:23 +0000 (Tue, 03 Nov 2009) Log Message: ----------- qhull: Rename to match project name Added Paths: ----------- csw/mgar/pkg/qhull/ Removed Paths: ------------- csw/mgar/pkg/libqhull/ 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 Nov 3 15:58:51 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 03 Nov 2009 14:58:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[7090] csw/mgar/pkg/hdf5/trunk/Makefile Message-ID: Revision: 7090 http://gar.svn.sourceforge.net/gar/?rev=7090&view=rev Author: dmichelsen Date: 2009-11-03 14:58:50 +0000 (Tue, 03 Nov 2009) Log Message: ----------- hdf5: Fix package dependencies Modified Paths: -------------- csw/mgar/pkg/hdf5/trunk/Makefile Modified: csw/mgar/pkg/hdf5/trunk/Makefile =================================================================== --- csw/mgar/pkg/hdf5/trunk/Makefile 2009-11-03 14:55:23 UTC (rev 7089) +++ csw/mgar/pkg/hdf5/trunk/Makefile 2009-11-03 14:58:50 UTC (rev 7090) @@ -23,9 +23,9 @@ NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz,$(SOURCEFILES)) -PACKAGES = CSWhdf5 CSWhdf5rt +PACKAGES = CSWhdf5rt CSWhdf5 -REQUIRED_PKGS_CSWhdf5rt = CSWhdf5 +REQUIRED_PKGS_CSWhdf5 = CSWhdf5rt CATALOGNAME_CSWhdf5 = hdf5 CATALOGNAME_CSWhdf5rt = hdf5_rt 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 Nov 3 16:52:45 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 03 Nov 2009 15:52:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[7091] csw/mgar/pkg/aide/trunk Message-ID: Revision: 7091 http://gar.svn.sourceforge.net/gar/?rev=7091&view=rev Author: dmichelsen Date: 2009-11-03 15:52:45 +0000 (Tue, 03 Nov 2009) Log Message: ----------- aide: Adjust aide.conf Modified Paths: -------------- csw/mgar/pkg/aide/trunk/checksums csw/mgar/pkg/aide/trunk/files/aide.conf Modified: csw/mgar/pkg/aide/trunk/checksums =================================================================== --- csw/mgar/pkg/aide/trunk/checksums 2009-11-03 14:58:50 UTC (rev 7090) +++ csw/mgar/pkg/aide/trunk/checksums 2009-11-03 15:52:45 UTC (rev 7091) @@ -1,3 +1,3 @@ c0fe56738d4f293c4d5a8de164a2a01c 0002-Add-missing-prototypes-for-db_sql.patch 27978cc6bca4f0fbf3f6f5a1b330661c aide-0.13.1.tar.gz -d23d52d1464b957c0d64f75e7e1ec862 aide.conf +a488b910d69ebf4edf65e350994ccbba aide.conf Modified: csw/mgar/pkg/aide/trunk/files/aide.conf =================================================================== --- csw/mgar/pkg/aide/trunk/files/aide.conf 2009-11-03 14:58:50 UTC (rev 7090) +++ csw/mgar/pkg/aide/trunk/files/aide.conf 2009-11-03 15:52:45 UTC (rev 7091) @@ -35,8 +35,8 @@ gzip_dbout = yes #database = file:///etc/aide/aide.db.gz database = file:///floppy/aidedb/aide.db.gz -database_out = file:///opt/csw/etc/aide/aide.db.new.gz -database_new = file:///opt/csw/etc/aide/aide.db.new.gz +database_out = file:///etc/opt/csw/aide/aide.db.new.gz +database_new = file:///etc/opt/csw/aide/aide.db.new.gz # Custom rules # @@ -98,7 +98,6 @@ !/var/dt/.* /var/dhcp$ L !/var/dhcp/\..* -!/var/dhcp/SUNWfiles1_192_168_0_0 !/var/adm/messages.* !/var/spool/.* !/var/adm/utmpx$ @@ -116,24 +115,17 @@ /devices Default /devices/pseudo/pts.* Y /devices/pseudo/.*tty.* Y -/devices/pseudo/[EMAIL PROTECTED]:console C +/devices/pseudo/cn at 0:console C /devices/pseudo/cons.* C /devices/pseudo/random.* L -#/devices/[EMAIL PROTECTED],0/.* L -/devices/[EMAIL PROTECTED],0/sound.* C -/devices/[EMAIL PROTECTED],0/[EMAIL PROTECTED]:sound,audioctl Y -/devices/[EMAIL PROTECTED],0/SUNW,[EMAIL PROTECTED]:m640 C -/devices/[EMAIL PROTECTED],0/[EMAIL PROTECTED]/[EMAIL PROTECTED],0/floppy* F -/devices/[EMAIL PROTECTED],0/[EMAIL PROTECTED]/[EMAIL PROTECTED],3f8:a L -/devices/[EMAIL PROTECTED],0/[EMAIL PROTECTED]/pci108e,[EMAIL PROTECTED]:sunpci2drv L /dev/kmem Default /dev/mem Default /dev/null Default /dev/zero Default -/devices/pseudo/[EMAIL PROTECTED]:kmem L -/devices/pseudo/[EMAIL PROTECTED]:mem Default -/devices/pseudo/[EMAIL PROTECTED]:null L -/devices/pseudo/[EMAIL PROTECTED]:zero L +/devices/pseudo/mm at 0:kmem L +/devices/pseudo/mm at 0:mem Default +/devices/pseudo/mm at 0:null L +/devices/pseudo/mm at 0:zero L # Other critical 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 Nov 3 18:36:59 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 03 Nov 2009 17:36:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[7092] csw/mgar/pkg/websvn/trunk Message-ID: Revision: 7092 http://gar.svn.sourceforge.net/gar/?rev=7092&view=rev Author: dmichelsen Date: 2009-11-03 17:36:58 +0000 (Tue, 03 Nov 2009) Log Message: ----------- websvn: Move to mGAR v2 and update to 2.2.1 Modified Paths: -------------- csw/mgar/pkg/websvn/trunk/Makefile csw/mgar/pkg/websvn/trunk/checksums csw/mgar/pkg/websvn/trunk/files/websvn-csw-config.patch Removed Paths: ------------- csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.depend csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.gspec csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.postinstall csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.preremove Property Changed: ---------------- csw/mgar/pkg/websvn/trunk/ Property changes on: csw/mgar/pkg/websvn/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/websvn/trunk/Makefile =================================================================== --- csw/mgar/pkg/websvn/trunk/Makefile 2009-11-03 15:52:45 UTC (rev 7091) +++ csw/mgar/pkg/websvn/trunk/Makefile 2009-11-03 17:36:58 UTC (rev 7092) @@ -1,5 +1,5 @@ GARNAME = websvn -GARVERSION = 2.0 +GARVERSION = 2.2.1 CATEGORIES = apps DESCRIPTION = PHP based web interface of Subversion repositories @@ -12,31 +12,36 @@ a particular revision. endef -MASTER_SITES = svn-http://websvn.tigris.org/svn/$(GARNAME)/tags/ -DISTFILES = $(GARVERSION) -NOCHECKSUM = $(GARVERSION) -SVNHTTP_CO_ARGS = --no-auth-cache --username guest --password guest +# MASTER_SITES = svn-http://websvn.tigris.org/svn/$(GARNAME)/tags/ +# DISTFILES = $(GARVERSION) +# NOCHECKSUM = $(GARVERSION) +# SVNHTTP_CO_ARGS = --no-auth-cache --username guest --password guest +MASTER_SITES = http://websvn.tigris.org/files/documents/1380/45918/ +DISTFILES = $(DISTNAME).tar.gz + SPKG_SOURCEURL = http://websvn.tigris.org/ -DISTFILES += $(call admfiles,CSWwebsvn,depend postinstall preremove) +LICENSE = license.txt + +# DISTFILES += $(call admfiles,CSWwebsvn,depend postinstall preremove) PATCHFILES = websvn-csw-config.patch -WORKSRC = $(WORKDIR)/$(GARVERSION) +REQUIRED_PKGS = CSWapache2 CSWdiffutils CSWsvn CSWenscript CSWgsed CSWgtar CSWgzip CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = INSTALL_SCRIPTS = custom +EXTRA_PAX_ARGS += -s ',^\.\(.*\)/distconfig.php$$,.\1/config.php,' + +PRESERVECONF = $(sharedstatedir)/www/websvn/include/config.php + +ARCHALL = 1 + include gar/category.mk -post-extract: - @echo " ==> Preparing include/config.php.CSW" - @cp $(WORKSRC)/include/distconfig.php \ - $(WORKSRC)/include/config.php.CSW - @$(MAKECOOKIE) - install-custom: @echo " ==> Installing $(GARNAME)" @rm -rf $(DESTDIR)$(sharedstatedir)/www/websvn Modified: csw/mgar/pkg/websvn/trunk/checksums =================================================================== --- csw/mgar/pkg/websvn/trunk/checksums 2009-11-03 15:52:45 UTC (rev 7091) +++ csw/mgar/pkg/websvn/trunk/checksums 2009-11-03 17:36:58 UTC (rev 7092) @@ -1,5 +1,2 @@ -953d95d8a7ee6451acfb7ebb06893ae8 download/CSWwebsvn.gspec -858def27dd10cc82f447b7220b3473f1 download/CSWwebsvn.depend -afea5f097c11a1d4e3da2b790dd65fdf download/CSWwebsvn.postinstall -67cef58e940c379cddd8a61e6023a6da download/CSWwebsvn.preremove -b380450f1a5135649a0588cb8eaa10e4 download/websvn-csw-config.patch +f7eb3d57840aa3d1917bb0c645794601 websvn-2.2.1.tar.gz +c9e2b0372fe02393c2376c0ea707c522 websvn-csw-config.patch Deleted: csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.depend =================================================================== --- csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.depend 2009-11-03 15:52:45 UTC (rev 7091) +++ csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.depend 2009-11-03 17:36:58 UTC (rev 7092) @@ -1,7 +0,0 @@ -P CSWapache2 apache2 - Apache 2.2 web server -P CSWdiffutils diffutils - GNU diff and related utils -P CSWsvn subversion - Version control rethought -P CSWenscript enscript - convert text files to PostScript -P CSWgsed gsed - The GNU non-interactive text Stream-oriented EDitor (sed) -P CSWgtar gtar - GNU tape archiver -P CSWgzip gzip - GNU compression utility (replacement for compress) Deleted: csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.gspec =================================================================== --- csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.gspec 2009-11-03 15:52:45 UTC (rev 7091) +++ csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.gspec 2009-11-03 17:36:58 UTC (rev 7092) @@ -1,5 +0,0 @@ -%var bitname websvn -%var pkgname CSWwebsvn -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/licence.txt Deleted: csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.postinstall =================================================================== --- csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.postinstall 2009-11-03 15:52:45 UTC (rev 7091) +++ csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.postinstall 2009-11-03 17:36:58 UTC (rev 7092) @@ -1,29 +0,0 @@ -#!/bin/sh - -CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw -CONFDIR=${CSW_PREFIX}/apache2/share/htdocs/websvn/include - -# Copy templates -template_list="config.php" - -echo Copying CSW templates: -for file in $template_list -do - filepath=${CONFDIR}/$file - if [ ! -f "$filepath" ] && [ -f "$filepath.CSW" ]; then - echo " creating $filepath" - cp $filepath.CSW $filepath - else - echo " preserving $filepath" - fi -done - -/usr/bin/cat < Revision: 7093 http://gar.svn.sourceforge.net/gar/?rev=7093&view=rev Author: wahwah Date: 2009-11-03 18:40:12 +0000 (Tue, 03 Nov 2009) Log Message: ----------- gar/v2-migrateconf: A fix, replacing a copied pycompile line with migrateconf Modified Paths: -------------- csw/mgar/gar/v2-migrateconf/gar.pkg.mk Modified: csw/mgar/gar/v2-migrateconf/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-migrateconf/gar.pkg.mk 2009-11-03 17:36:58 UTC (rev 7092) +++ csw/mgar/gar/v2-migrateconf/gar.pkg.mk 2009-11-03 18:40:12 UTC (rev 7093) @@ -171,7 +171,7 @@ # and able to be consumed by a service that might be started. SPKG_CLASSES := $(call _spkg_cond_add,SAMPLECONF,cswcpsampleconf) SPKG_CLASSES := $(call _spkg_cond_add,PRESERVECONF,cswpreserveconf) -SPKG_CLASSES := $(call _spkg_cond_add,MIGRATECONF,cswpycompile) +SPKG_CLASSES := $(call _spkg_cond_add,MIGRATECONF,cswmigrateconf) SPKG_CLASSES := $(call _spkg_cond_add,ETCSERVICES,cswetcservices) SPKG_CLASSES := $(call _spkg_cond_add,USERGROUP,cswusergroup) SPKG_CLASSES := $(call _spkg_cond_add,PYCOMPILE,cswpycompile) 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 Nov 3 19:41:09 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 03 Nov 2009 18:41:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[7094] csw/mgar/pkg/unixodbc/trunk Message-ID: Revision: 7094 http://gar.svn.sourceforge.net/gar/?rev=7094&view=rev Author: wahwah Date: 2009-11-03 18:41:09 +0000 (Tue, 03 Nov 2009) Log Message: ----------- unixodbc: Using cswmigrateconf Modified Paths: -------------- csw/mgar/pkg/unixodbc/trunk/Makefile csw/mgar/pkg/unixodbc/trunk/checksums Added Paths: ----------- csw/mgar/pkg/unixodbc/trunk/files/cswmigrateconf Property Changed: ---------------- csw/mgar/pkg/unixodbc/trunk/ Property changes on: csw/mgar/pkg/unixodbc/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-migrateconf Modified: csw/mgar/pkg/unixodbc/trunk/Makefile =================================================================== --- csw/mgar/pkg/unixodbc/trunk/Makefile 2009-11-03 18:40:12 UTC (rev 7093) +++ csw/mgar/pkg/unixodbc/trunk/Makefile 2009-11-03 18:41:09 UTC (rev 7094) @@ -8,13 +8,11 @@ DESCRIPTION = ODBC drivers for Unix systems define BLURB - It does stuff with things endef DL_NAME = unixODBC MASTER_SITES = http://www.unixodbc.org/ DISTFILES = $(DL_NAME)-$(GARVERSION).tar.gz -# The configuration migratin is pending decision. -# DISTFILES += CSWunixodbc.postinstall +DISTFILES += cswmigrateconf WORKSRC = $(WORKDIR)/$(DL_NAME)-$(GARVERSION) UFILES_REGEX = $(DL_NAME)-(\d+(?:\.\d+)*).tar.gz REQUIRED_PKGS = CSWiconv @@ -23,14 +21,17 @@ localstatedir = /var/opt/csw CONFIGURE_ARGS = $(DIRPATHS) --enable-gui=no BUILD64 = 1 -SAMPLECONF = /\/etc\/opt\/csw\/.*\.CSW +SAMPLECONF = \/etc\/opt\/csw\/odbc(inst|).ini +MIGRATECONF = \/etc\/opt\/csw\/pkg\/$(GARNAME)\/cswmigrateconf TEST_SCRIPTS = post-install-modulated: (cd $(DESTDIR)$(sysconfdir); \ - for f in ODBCDataSources odbc.ini odbcinst.ini; do \ + for f in odbc.ini odbcinst.ini; do \ mv "$${f}" "$${f}.CSW"; \ done) + ginstall -d -m 755 $(DESTDIR)$(sysconfdir)/pkg/$(GARNAME) + ginstall -m 644 $(FILEDIR)/cswmigrateconf $(DESTDIR)$(sysconfdir)/pkg/$(GARNAME) @$(MAKECOOKIE) include gar/category.mk Modified: csw/mgar/pkg/unixodbc/trunk/checksums =================================================================== --- csw/mgar/pkg/unixodbc/trunk/checksums 2009-11-03 18:40:12 UTC (rev 7093) +++ csw/mgar/pkg/unixodbc/trunk/checksums 2009-11-03 18:41:09 UTC (rev 7094) @@ -1 +1,2 @@ -f47c2efb28618ecf5f33319140a7acd0 download/unixODBC-2.2.14.tar.gz +8359050c8b7b37641805301da4d230c2 cswmigrateconf +f47c2efb28618ecf5f33319140a7acd0 unixODBC-2.2.14.tar.gz Added: csw/mgar/pkg/unixodbc/trunk/files/cswmigrateconf =================================================================== --- csw/mgar/pkg/unixodbc/trunk/files/cswmigrateconf (rev 0) +++ csw/mgar/pkg/unixodbc/trunk/files/cswmigrateconf 2009-11-03 18:41:09 UTC (rev 7094) @@ -0,0 +1,3 @@ +# $Id$ + +MIGRATE_FILES="odbc.ini odbcinst.ini ODBCDataSources" Property changes on: csw/mgar/pkg/unixodbc/trunk/files/cswmigrateconf ___________________________________________________________________ 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 Tue Nov 3 19:42:04 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 03 Nov 2009 18:42:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[7095] csw/mgar/pkg/unixodbc/trunk/checksums Message-ID: Revision: 7095 http://gar.svn.sourceforge.net/gar/?rev=7095&view=rev Author: wahwah Date: 2009-11-03 18:42:04 +0000 (Tue, 03 Nov 2009) Log Message: ----------- unixodbc: Updating the checksum of cswmigrateconf Modified Paths: -------------- csw/mgar/pkg/unixodbc/trunk/checksums Modified: csw/mgar/pkg/unixodbc/trunk/checksums =================================================================== --- csw/mgar/pkg/unixodbc/trunk/checksums 2009-11-03 18:41:09 UTC (rev 7094) +++ csw/mgar/pkg/unixodbc/trunk/checksums 2009-11-03 18:42:04 UTC (rev 7095) @@ -1,2 +1,2 @@ -8359050c8b7b37641805301da4d230c2 cswmigrateconf +fb47ac973383744b50cbd5af320a8dc2 cswmigrateconf f47c2efb28618ecf5f33319140a7acd0 unixODBC-2.2.14.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 Nov 3 21:18:12 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 03 Nov 2009 20:18:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7096] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 7096 http://gar.svn.sourceforge.net/gar/?rev=7096&view=rev Author: dmichelsen Date: 2009-11-03 20:18:12 +0000 (Tue, 03 Nov 2009) Log Message: ----------- mGAR v2: Add libpath as linker path if BUILD_PREFIX != prefix Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2009-11-03 18:42:04 UTC (rev 7095) +++ csw/mgar/gar/v2/gar.conf.mk 2009-11-03 20:18:12 UTC (rev 7096) @@ -492,7 +492,7 @@ RUNPATH_LINKER_FLAGS ?= $(foreach D,$(RUNPATH_DIRS),$(addprefix -R,$(addsuffix /\$$ISALIST,$(filter $D,$(RUNPATH_ISALIST))) $(abspath $D/$(MM_LIBDIR)))) $(addprefix -R,$(filter-out $(RUNPATH_DIRS),$(RUNPATH_ISALIST))) $(EXTRA_RUNPATH_LINKER_FLAGS) endif -LINKER_FLAGS ?= $(foreach ELIB,$(libdir_install) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR))) $(EXTRA_LINKER_FLAGS) +LINKER_FLAGS ?= $(foreach ELIB,$(libpath_install) $(filter-out $(libpath_install),$(libdir_install)) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR))) $(EXTRA_LINKER_FLAGS) CC_HOME = $($(GARCOMPILER)_CC_HOME) CC = $($(GARCOMPILER)_CC) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Nov 3 21:19:16 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 03 Nov 2009 20:19:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7097] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 7097 http://gar.svn.sourceforge.net/gar/?rev=7097&view=rev Author: dmichelsen Date: 2009-11-03 20:19:16 +0000 (Tue, 03 Nov 2009) Log Message: ----------- mysql-5.0.x: Tweak Makefile 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 2009-11-03 20:18:12 UTC (rev 7096) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-11-03 20:19:16 UTC (rev 7097) @@ -51,8 +51,6 @@ SPKG_DESC_CSWmysql5rt = MySQL 5 runtime files SPKG_DESC_CSWmysql5test = MySQL 5 testing files -support64 = (/(amd64|i386))? - # Defining the client programs, which are going to pick up the 32- and 64-bit # binaries, symbolic links, isaexec stuff and man pages. CSWmysql5client_programs = myisamlog @@ -75,11 +73,11 @@ PKGFILES_CSWmysql5bench = $(prefix)/sql-bench.* PKGFILES_CSWmysql5client = $(bindir) -PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(bindir)$(support64)/$(bin_name)) +PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(call baseisadirs,$(bindir),$(bin_name))) PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(mandir)/man1/$(bin_name)\.1) PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),/opt/csw/bin/$(bin_name)) PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),/opt/csw/sbin/$(bin_name)) -PKGFILES_CSWmysql5devel += $(bindir)$(support64)/mysql_config +PKGFILES_CSWmysql5devel += $(call baseisadirs,$(bindir),mysql_config) PKGFILES_CSWmysql5devel += $(mandir)/man1/mysql_config\.1 PKGFILES_CSWmysql5devel = $(prefix)/include.* PKGFILES_CSWmysql5rt = $(prefix)/lib/.*\.so.* @@ -105,11 +103,11 @@ # because we alter the prefix. this gets us proper linking as well as # LD_OPTIONS (RPATH) -EXTRA_LIB = /opt/csw/lib -EXTRA_INC = /opt/csw/include +# EXTRA_LIB = /opt/csw/lib +# EXTRA_INC = /opt/csw/include EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ -EXTRA_LIB = /opt/csw/mysql5/lib/$$ISALIST/mysql +# EXTRA_LIB = /opt/csw/mysql5/lib/$$ISALIST/mysql # Set ./configure options CONFIGURE_ARGS = $(DIRPATHS) @@ -130,14 +128,16 @@ BUILD64 = 1 USERGROUP = /etc/opt/csw/pkg/CSWmysql5/cswusergroup -PROTOTYPE_FILTER = awk ' \ - $$$$3 ~ /\/var\/opt\/csw\/mysql5$$$$/ { $$$$2 = "ugfiles"; \ - $$$$4 = "0700"; \ - $$$$5 = "mysql"; \ - $$$$6 = "mysql" } \ - { print }' -SPKG_CLASSES = none cswusergroup ugfiles +PROTOTYPE_MODIFIERS = ownmysql +PROTOTYPE_FILES_ownmysql = /var/opt/csw/mysql5 +PROTOTYPE_USER_ownmysql = mysql +PROTOTYPE_GROUP_ownmysql = mysql +PROTOTYPE_PERMS_ownmysql = 0700 +PROTOTYPE_CLASS_ownmysql = ugfiles + +SPKG_CLASSES = none ugfiles + include gar/category.mk post-install-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Nov 4 10:45:49 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 Nov 2009 09:45:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[7098] csw/mgar/gar/v2/bin/checkpkg Message-ID: Revision: 7098 http://gar.svn.sourceforge.net/gar/?rev=7098&view=rev Author: dmichelsen Date: 2009-11-04 09:45:49 +0000 (Wed, 04 Nov 2009) Log Message: ----------- mGAR v2: Replace xpg4/grep with bin/grep in checkpkg Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2009-11-03 20:19:16 UTC (rev 7097) +++ csw/mgar/gar/v2/bin/checkpkg 2009-11-04 09:45:49 UTC (rev 7098) @@ -451,7 +451,7 @@ if [[ $? -ne 0 ]]; then #if we've already looked at the package named $dep, #it'll be in the file. - awk "\$1 == \"$dep\" {print}" $SETDEPS | /usr/xpg4/bin/grep -q $dep + awk "\$1 == \"$dep\" {print}" $SETDEPS | /usr/bin/grep $dep >/dev/null if [[ $? -ne 0 ]]; then #we haven't yet seen this package in our set echo "Can't validate dependence on $dep. Storing for delayed validation." #store for validation at the end. @@ -530,7 +530,7 @@ while read mdep; do dep=`echo $mdep | nawk '{print $1}'` pkg=`echo $mdep | nawk '{print $2}'` - /usr/xpg4/bin/grep -q $dep $SETDEPS + /usr/bin/grep $dep $SETDEPS >/dev/null if [ $? -ne 0 ]; then errmsg "Couldn't validate $dep as a dependency in package $pkg" else @@ -545,7 +545,7 @@ lib=`echo $ldep | nawk '{print $1}'` [ "$lib" = "libm.so.2" ] && continue pkg=`echo $ldep | nawk '{print $2}'` - /usr/xpg4/bin/grep -q "[/=]$lib[ =]" $SETLIBS + /usr/bin/grep -q "[/=]$lib[ =]" $SETLIBS >/dev/null if [ $? -ne 0 ]; then errmsg "Couldn't find a package providing $lib" else 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 Nov 4 10:55:29 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 Nov 2009 09:55:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[7099] csw/mgar/pkg/ldns/trunk/Makefile Message-ID: Revision: 7099 http://gar.svn.sourceforge.net/gar/?rev=7099&view=rev Author: dmichelsen Date: 2009-11-04 09:55:29 +0000 (Wed, 04 Nov 2009) Log Message: ----------- ldns: Minor fixes with download URL Modified Paths: -------------- csw/mgar/pkg/ldns/trunk/Makefile Modified: csw/mgar/pkg/ldns/trunk/Makefile =================================================================== --- csw/mgar/pkg/ldns/trunk/Makefile 2009-11-04 09:45:49 UTC (rev 7098) +++ csw/mgar/pkg/ldns/trunk/Makefile 2009-11-04 09:55:29 UTC (rev 7099) @@ -11,7 +11,7 @@ scripting languages. endef -MASTER_SITES = http://www.nlnetlabs.nl/projects/ldns/ +MASTER_SITES = http://www.nlnetlabs.nl/downloads/ldns/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += CSWldns.doxyparse.diff @@ -22,12 +22,14 @@ SPKG_DESC_CSWldns = $(DESCRIPTION) SPKG_DESC_CSWldnsdevel = $(DESCRIPTION) development package +SPKG_SOURCEURL = http://www.nlnetlabs.nl/projects/ldns/ + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz # If the url used to check for software update is different of MASTER_SITES, then # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -UPSTREAM_MASTER_SITES = http://www.nlnetlabs.nl/downloads/ldns\ +UPSTREAM_MASTER_SITES = http://www.nlnetlabs.nl/downloads/ldns BUILD64 = 1 EXTRA_BUILD_ISAS_i386 = pentium_pro 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 Nov 4 12:52:27 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 Nov 2009 11:52:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7100] csw/mgar/pkg/libevent/trunk/Makefile Message-ID: Revision: 7100 http://gar.svn.sourceforge.net/gar/?rev=7100&view=rev Author: dmichelsen Date: 2009-11-04 11:52:27 +0000 (Wed, 04 Nov 2009) Log Message: ----------- libevent: Downgrade from 1.1b to 1.1a as the existing binaries link to it Modified Paths: -------------- csw/mgar/pkg/libevent/trunk/Makefile Modified: csw/mgar/pkg/libevent/trunk/Makefile =================================================================== --- csw/mgar/pkg/libevent/trunk/Makefile 2009-11-04 09:55:29 UTC (rev 7099) +++ csw/mgar/pkg/libevent/trunk/Makefile 2009-11-04 11:52:27 UTC (rev 7100) @@ -3,12 +3,12 @@ CATEGORIES = lib EXTRA_MODULATORS = GARVERSION -MODULATIONS_GARVERSION = 1.1b 1.4.12 +MODULATIONS_GARVERSION = 1.1a 1.4.12 -SKIP_MODULATIONS = isa-sparcv9-garversion-1.1b -SKIP_MODULATIONS += isa-amd64-garversion-1.1b +SKIP_MODULATIONS = isa-sparcv9-garversion-1.1a +SKIP_MODULATIONS += isa-amd64-garversion-1.1a -DISTVERSION-1.1b = 1.1b +DISTVERSION-1.1a = 1.1a DISTVERSION-1.4.12 = 1.4.12-stable DESCRIPTION = Event notification library @@ -48,10 +48,10 @@ TEST_TARGET = verify -MERGE_SCRIPTS_isa-default-garversion-1.1b = copy-only -MERGE_DIRS_isa-default-garversion-1.1b = $(libdir) -MERGE_SCRIPTS_isa-extra-garversion-1.1b = copy-relocated-only -MERGE_DIRS_isa-extra-garversion-1.1b = $(libdir) +MERGE_SCRIPTS_isa-default-garversion-1.1a = copy-only +MERGE_DIRS_isa-default-garversion-1.1a = $(libdir) +MERGE_SCRIPTS_isa-extra-garversion-1.1a = copy-relocated-only +MERGE_DIRS_isa-extra-garversion-1.1a = $(libdir) MERGE_SCRIPTS_isa-default-garversion-1.4.12 = copy-all MERGE_SCRIPTS_isa-extra-garversion-1.4.12 = copy-relocated-only 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 Nov 4 12:55:59 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 Nov 2009 11:55:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[7101] csw/mgar/pkg/libevent/trunk/checksums Message-ID: Revision: 7101 http://gar.svn.sourceforge.net/gar/?rev=7101&view=rev Author: dmichelsen Date: 2009-11-04 11:55:57 +0000 (Wed, 04 Nov 2009) Log Message: ----------- libevent: Update checksum Modified Paths: -------------- csw/mgar/pkg/libevent/trunk/checksums Modified: csw/mgar/pkg/libevent/trunk/checksums =================================================================== --- csw/mgar/pkg/libevent/trunk/checksums 2009-11-04 11:52:27 UTC (rev 7100) +++ csw/mgar/pkg/libevent/trunk/checksums 2009-11-04 11:55:57 UTC (rev 7101) @@ -1,2 +1,2 @@ -ec8dac612aa43ed172f300f396fcec49 libevent-1.1b.tar.gz +6cc776458ecaf9247550863702a44d7c libevent-1.1a.tar.gz 77b0d8b9885496871bb083165b35ba11 libevent-1.4.12-stable.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 Nov 4 12:58:11 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 Nov 2009 11:58:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[7102] csw/mgar/pkg/libevent/trunk/Makefile Message-ID: Revision: 7102 http://gar.svn.sourceforge.net/gar/?rev=7102&view=rev Author: dmichelsen Date: 2009-11-04 11:58:11 +0000 (Wed, 04 Nov 2009) Log Message: ----------- libevent: Enhance fix of test Modified Paths: -------------- csw/mgar/pkg/libevent/trunk/Makefile Modified: csw/mgar/pkg/libevent/trunk/Makefile =================================================================== --- csw/mgar/pkg/libevent/trunk/Makefile 2009-11-04 11:55:57 UTC (rev 7101) +++ csw/mgar/pkg/libevent/trunk/Makefile 2009-11-04 11:58:11 UTC (rev 7102) @@ -66,5 +66,5 @@ #export LIBS post-extract-modulated: - perl -pi -e 's,#!/bin/sh,#!/bin/bash,' $(WORKSRC)/test/test.sh + test -f $(WORKSRC)/test/test.sh && perl -pi -e 's,#!/bin/sh,#!/bin/bash,' $(WORKSRC)/test/test.sh @$(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 Nov 4 13:18:55 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 Nov 2009 12:18:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[7103] csw/mgar/pkg/libevent/trunk/Makefile Message-ID: Revision: 7103 http://gar.svn.sourceforge.net/gar/?rev=7103&view=rev Author: dmichelsen Date: 2009-11-04 12:18:55 +0000 (Wed, 04 Nov 2009) Log Message: ----------- libevent: Fix typo Modified Paths: -------------- csw/mgar/pkg/libevent/trunk/Makefile Modified: csw/mgar/pkg/libevent/trunk/Makefile =================================================================== --- csw/mgar/pkg/libevent/trunk/Makefile 2009-11-04 11:58:11 UTC (rev 7102) +++ csw/mgar/pkg/libevent/trunk/Makefile 2009-11-04 12:18:55 UTC (rev 7103) @@ -66,5 +66,5 @@ #export LIBS post-extract-modulated: - test -f $(WORKSRC)/test/test.sh && perl -pi -e 's,#!/bin/sh,#!/bin/bash,' $(WORKSRC)/test/test.sh + -test -f $(WORKSRC)/test/test.sh && perl -pi -e 's,#!/bin/sh,#!/bin/bash,' $(WORKSRC)/test/test.sh @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Nov 4 15:02:32 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 04 Nov 2009 14:02:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7104] csw/mgar/pkg/sudo/trunk/Makefile Message-ID: Revision: 7104 http://gar.svn.sourceforge.net/gar/?rev=7104&view=rev Author: wahwah Date: 2009-11-04 14:02:26 +0000 (Wed, 04 Nov 2009) Log Message: ----------- sudo: Moving the sudo symlink to the CSWsudo package Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2009-11-04 12:18:55 UTC (rev 7103) +++ csw/mgar/pkg/sudo/trunk/Makefile 2009-11-04 14:02:26 UTC (rev 7104) @@ -50,10 +50,11 @@ TEST_TARGET = check FIXCONFIG_DIRS = $(DESTDIR)$(libexecdir) +PKGFILES_CSWsudo = $(bindir)/sudo.minimal +PKGFILES_CSWsudo += $(bindir)/sudo + include gar/category.mk -PKGFILES_CSWsudo = .*$(bindir).*/sudo.minimal - post-install-modulated: @( cd $(DESTDIR)$(bindir) ; gmv sudo sudo.minimal ) @( cd $(DESTDIR)$(bindir) ; gln -s sudo.minimal sudo ) @@ -68,4 +69,3 @@ @$(MAKECOOKIE) SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) - 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 Nov 4 16:19:06 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 Nov 2009 15:19:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7105] csw/mgar/pkg/libgmp/trunk/Makefile Message-ID: Revision: 7105 http://gar.svn.sourceforge.net/gar/?rev=7105&view=rev Author: dmichelsen Date: 2009-11-04 15:19:06 +0000 (Wed, 04 Nov 2009) Log Message: ----------- libgmp: Fix ARCHFLAGS and required pkgs Modified Paths: -------------- csw/mgar/pkg/libgmp/trunk/Makefile Modified: csw/mgar/pkg/libgmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgmp/trunk/Makefile 2009-11-04 14:02:26 UTC (rev 7104) +++ csw/mgar/pkg/libgmp/trunk/Makefile 2009-11-04 15:19:06 UTC (rev 7105) @@ -55,11 +55,14 @@ PACKAGES = CSWlibgmp +REQUIRED_PKGS = CSWgcc4rt + include gar/category.mk + ifeq ($(ISA), sparcv8plus) ARCHFLAGS_$(GARCOMPILER)_$(ISA) = -mcpu=v9 -mv8plus endif ifeq ($(ISA), sparcv8plus+vis) - ARCHFLAGS_$(GARCOMPILER)_$(ISA) = -mcpu=v9 -mvis + ARCHFLAGS_$(GARCOMPILER)_$(ISA) = -mcpu=ultrasparc -mvis endif 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 Nov 4 16:20:24 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 Nov 2009 15:20:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7106] csw/mgar/pkg/libgmp/tags Message-ID: Revision: 7106 http://gar.svn.sourceforge.net/gar/?rev=7106&view=rev Author: dmichelsen Date: 2009-11-04 15:20:24 +0000 (Wed, 04 Nov 2009) Log Message: ----------- libgmp: Add legacy patches for 4.2.1 Added Paths: ----------- csw/mgar/pkg/libgmp/tags/legacy/ csw/mgar/pkg/libgmp/tags/legacy/patches-4.2.1-p5 Added: csw/mgar/pkg/libgmp/tags/legacy/patches-4.2.1-p5 =================================================================== --- csw/mgar/pkg/libgmp/tags/legacy/patches-4.2.1-p5 (rev 0) +++ csw/mgar/pkg/libgmp/tags/legacy/patches-4.2.1-p5 2009-11-04 15:20:24 UTC (rev 7106) @@ -0,0 +1,266 @@ +Index: mpn/generic/addsub_n.c +=================================================================== +RCS file: /home/cvsfiles/gmp42/mpn/generic/addsub_n.c,v +retrieving revision 1.1 +retrieving revision 1.2 +diff -p -2 -r1.1 -r1.2 +*** mpn/generic/addsub_n.c 14 Mar 2006 15:57:54 -0000 1.1 +--- mpn/generic/addsub_n.c 15 May 2006 22:38:42 -0000 1.2 +*************** +*** 1,5 **** + /* mpn_addsub_n -- Add and Subtract two limb vectors of equal, non-zero length. + +! Copyright 1999, 2000, 2001 Free Software Foundation, Inc. + + This file is part of the GNU MP Library. +--- 1,5 ---- + /* mpn_addsub_n -- Add and Subtract two limb vectors of equal, non-zero length. + +! Copyright 1999, 2000, 2001, 2006 Free Software Foundation, Inc. + + This file is part of the GNU MP Library. +*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp +*** 59,63 **** + { + this_n = MIN (n - off, PART_SIZE); +! #if HAVE_NATIVE_mpn_add_nc || !HAVE_NATIVE_mpn_add_n + acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo); + #else +--- 59,63 ---- + { + this_n = MIN (n - off, PART_SIZE); +! #if HAVE_NATIVE_mpn_add_nc + acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo); + #else +*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp +*** 65,69 **** + acyo = acyn + mpn_add_1 (r1p + off, r1p + off, this_n, acyo); + #endif +! #if HAVE_NATIVE_mpn_sub_nc || !HAVE_NATIVE_mpn_sub_n + scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo); + #else +--- 65,69 ---- + acyo = acyn + mpn_add_1 (r1p + off, r1p + off, this_n, acyo); + #endif +! #if HAVE_NATIVE_mpn_sub_nc + scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo); + #else +*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp +*** 82,86 **** + { + this_n = MIN (n - off, PART_SIZE); +! #if HAVE_NATIVE_mpn_sub_nc || !HAVE_NATIVE_mpn_sub_n + scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo); + #else +--- 82,86 ---- + { + this_n = MIN (n - off, PART_SIZE); +! #if HAVE_NATIVE_mpn_sub_nc + scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo); + #else +*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp +*** 88,92 **** + scyo = scyn + mpn_sub_1 (r2p + off, r2p + off, this_n, scyo); + #endif +! #if HAVE_NATIVE_mpn_add_nc || !HAVE_NATIVE_mpn_add_n + acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo); + #else +--- 88,92 ---- + scyo = scyn + mpn_sub_1 (r2p + off, r2p + off, this_n, scyo); + #endif +! #if HAVE_NATIVE_mpn_add_nc + acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo); + #else +*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp +*** 98,102 **** + else + { +! /* r1 and r2 are identical to s1 and s2 (r1==s1 and r2=s2 or vice versa) + Need temporary storage. */ + mp_limb_t tp[PART_SIZE]; +--- 98,102 ---- + else + { +! /* r1 and r2 are identical to s1 and s2 (r1==s1 and r2==s2 or vice versa) + Need temporary storage. */ + mp_limb_t tp[PART_SIZE]; +*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp +*** 106,110 **** + { + this_n = MIN (n - off, PART_SIZE); +! #if HAVE_NATIVE_mpn_add_nc || !HAVE_NATIVE_mpn_add_n + acyo = mpn_add_nc (tp, s1p + off, s2p + off, this_n, acyo); + #else +--- 106,110 ---- + { + this_n = MIN (n - off, PART_SIZE); +! #if HAVE_NATIVE_mpn_add_nc + acyo = mpn_add_nc (tp, s1p + off, s2p + off, this_n, acyo); + #else +*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp +*** 112,116 **** + acyo = acyn + mpn_add_1 (tp, tp, this_n, acyo); + #endif +! #if HAVE_NATIVE_mpn_sub_nc || !HAVE_NATIVE_mpn_sub_n + scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo); + #else +--- 112,116 ---- + acyo = acyn + mpn_add_1 (tp, tp, this_n, acyo); + #endif +! #if HAVE_NATIVE_mpn_sub_nc + scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo); + #else +Index: configure +=================================================================== +RCS file: /home/cvsfiles/gmp42/configure,v +retrieving revision 1.13 +retrieving revision 1.14 +diff -p -2 -r1.13 -r1.14 +*** configure 12 May 2006 16:00:27 -0000 1.13 +--- configure 17 May 2006 10:27:28 -0000 1.14 +*************** echo "include_mpn(\`sparc32/sparc-defs.m +*** 3555,3560 **** + esac + +! # If the user asked for a fat build, override the path set above + if test $enable_fat = yes; then + extra_functions="$extra_functions fat fat_entry" + path="x86/fat x86" +--- 3555,3562 ---- + esac + +! # If the user asked for a fat build, override the path and flags set above + if test $enable_fat = yes; then ++ gcc_cflags_cpu="" ++ gcc_cflags_arch="" + extra_functions="$extra_functions fat fat_entry" + path="x86/fat x86" +Index: configure +=================================================================== +RCS file: /home/cvsfiles/gmp42/configure,v +retrieving revision 1.11 +retrieving revision 1.13 +diff -p -2 -r1.11 -r1.13 +*** configure 4 May 2006 16:25:33 -0000 1.11 +--- configure 12 May 2006 16:00:27 -0000 1.13 +*************** _ACEOF +*** 2963,2969 **** + cc_cflags="-O2" + gcc_cflags="-O2 -mpowerpc" +! gcc_cflags_optlist="precomp subtype cpu" + gcc_cflags_precomp="-no-cpp-precomp" + gcc_cflags_subtype="-force_cpusubtype_ALL" # for vmx on darwin + + # grab this object, though it's not a true cycle counter routine +--- 2963,2971 ---- + cc_cflags="-O2" + gcc_cflags="-O2 -mpowerpc" +! gcc_cflags_optlist="precomp subtype asm cpu" + gcc_cflags_precomp="-no-cpp-precomp" + gcc_cflags_subtype="-force_cpusubtype_ALL" # for vmx on darwin ++ gcc_cflags_asm="" ++ gcc_cflags_cpu="" + + # grab this object, though it's not a true cycle counter routine +*************** _ACEOF +*** 2976,2980 **** + powerpc7400) + path="powerpc32/vmx powerpc32/750 powerpc32" ;; +! powerpc745?) + path="powerpc32/vmx powerpc32 powerpc32" ;; + *) +--- 2978,2982 ---- + powerpc7400) + path="powerpc32/vmx powerpc32/750 powerpc32" ;; +! powerpc74[45]?) + path="powerpc32/vmx powerpc32 powerpc32" ;; + *) +*************** _ACEOF +*** 3010,3015 **** + powerpc740) gcc_cflags_cpu="-mcpu=740" ;; + powerpc7400 | powerpc7410) + gcc_cflags_cpu="-mcpu=7400 -mcpu=750" ;; +! powerpc745?) gcc_cflags_cpu="-mcpu=7450" ;; + powerpc750) gcc_cflags_cpu="-mcpu=750" ;; + powerpc801) gcc_cflags_cpu="-mcpu=801" ;; +--- 3012,3020 ---- + powerpc740) gcc_cflags_cpu="-mcpu=740" ;; + powerpc7400 | powerpc7410) ++ gcc_cflags_asm="-Wa,-maltivec" + gcc_cflags_cpu="-mcpu=7400 -mcpu=750" ;; +! powerpc74[45]?) +! gcc_cflags_asm="-Wa,-maltivec" +! gcc_cflags_cpu="-mcpu=7450" ;; + powerpc750) gcc_cflags_cpu="-mcpu=750" ;; + powerpc801) gcc_cflags_cpu="-mcpu=801" ;; +Index: mpn/powerpc32/aix.m4 +=================================================================== +RCS file: /home/cvsfiles/gmp42/mpn/powerpc32/aix.m4,v +retrieving revision 1.3 +retrieving revision 1.4 +diff -p -2 -r1.3 -r1.4 +*** mpn/powerpc32/aix.m4 19 Apr 2006 08:40:28 -0000 1.3 +--- mpn/powerpc32/aix.m4 8 May 2006 09:47:12 -0000 1.4 +*************** m4_assert_numargs(2) +*** 52,56 **** + ` .toc + tc$2: +! .tc $2[TC], $2[RW]')' + ` lwz $1, tc$2(2)') + +--- 52,56 ---- + ` .toc + tc$2: +! .tc $2[TC], $2')' + ` lwz $1, tc$2(2)') + +Index: mpn/ia64/popcount.asm +=================================================================== +RCS file: /home/cvsfiles/gmp42/mpn/ia64/popcount.asm,v +retrieving revision 1.2 +retrieving revision 1.3 +diff -p -2 -r1.2 -r1.3 +*** mpn/ia64/popcount.asm 20 Mar 2006 14:00:18 -0000 1.2 +--- mpn/ia64/popcount.asm 19 May 2006 22:24:32 -0000 1.3 +*************** dnl to write mpn_hamdist with the same +*** 26,29 **** +--- 26,33 ---- + include(`../config.m4') + ++ define(ABI32, ++ m4_assert_onearg() ++ `ifdef(`HAVE_ABI_32',`$1')') ++ + C INPUT PARAMETERS + C sp = r32 +*************** PROLOGUE(mpn_popcount) +*** 34,39 **** + .prologue + .save ar.lc, r2 +! mov r2 = ar.lc + .body + and r22 = 3, r33 + shr.u r23 = r33, 2 ;; +--- 38,47 ---- + .prologue + .save ar.lc, r2 +! ABI32(` addp4 r32 = 0, r32') C M src extend +! mov r2 = ar.lc C I0 +! ABI32(` zxt4 r33 = r33') C I1 size extend +! ;; + .body ++ + and r22 = 3, r33 + shr.u r23 = r33, 2 ;; +*** mpz/set_d.c 14 Mar 2006 15:57:54 -0000 1.1 +--- mpz/set_d.c 31 May 2006 14:50:05 -0000 1.2 +*************** mpz_set_d (mpz_ptr r, double d) +*** 57,60 **** +--- 58,64 ---- + _mpz_realloc (r, rn); + ++ if (rn <= 0) ++ rn = 0; ++ + rp = PTR (r); + 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 Nov 4 16:24:26 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 Nov 2009 15:24:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[7107] csw/mgar/pkg/libgmp/trunk/Makefile Message-ID: Revision: 7107 http://gar.svn.sourceforge.net/gar/?rev=7107&view=rev Author: dmichelsen Date: 2009-11-04 15:24:26 +0000 (Wed, 04 Nov 2009) Log Message: ----------- libgmp: Fix typo Modified Paths: -------------- csw/mgar/pkg/libgmp/trunk/Makefile Modified: csw/mgar/pkg/libgmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgmp/trunk/Makefile 2009-11-04 15:20:24 UTC (rev 7106) +++ csw/mgar/pkg/libgmp/trunk/Makefile 2009-11-04 15:24:26 UTC (rev 7107) @@ -55,7 +55,7 @@ PACKAGES = CSWlibgmp -REQUIRED_PKGS = CSWgcc4rt +REQUIRED_PKGS = CSWgcc4corert include gar/category.mk 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 Nov 4 16:45:56 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Wed, 04 Nov 2009 15:45:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[7108] csw/mgar/pkg/unbound/trunk/Makefile Message-ID: Revision: 7108 http://gar.svn.sourceforge.net/gar/?rev=7108&view=rev Author: idogan23 Date: 2009-11-04 15:45:55 +0000 (Wed, 04 Nov 2009) Log Message: ----------- unbound: bump version to 1.3.4 Modified Paths: -------------- csw/mgar/pkg/unbound/trunk/Makefile Modified: csw/mgar/pkg/unbound/trunk/Makefile =================================================================== --- csw/mgar/pkg/unbound/trunk/Makefile 2009-11-04 15:24:26 UTC (rev 7107) +++ csw/mgar/pkg/unbound/trunk/Makefile 2009-11-04 15:45:55 UTC (rev 7108) @@ -28,6 +28,9 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = +PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 + ifeq ($(shell uname -r),5.8) GARCOMPILER = GCC4 REQUIRED_PKGS += CSWgcc4corert @@ -39,6 +42,7 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGUTE_ARGS += --with-solaris-threads +CONFIGURE_ARGS += --with-ldns=/opt/csw CONFIGURE_ARGS += --with-ssl=/opt/csw CONFIGURE_ARGS += --with-pidfile=/var/run/unbound.pid CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw 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 Nov 4 21:23:48 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 Nov 2009 20:23:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[7109] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 7109 http://gar.svn.sourceforge.net/gar/?rev=7109&view=rev Author: dmichelsen Date: 2009-11-04 20:23:48 +0000 (Wed, 04 Nov 2009) Log Message: ----------- cswclassutils: Add classes for texinfo and crontab Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/checksums csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.README.CSW Added Paths: ----------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcrontab csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswtexinfo csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcrontab csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswtexinfo Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2009-11-04 15:45:55 UTC (rev 7108) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2009-11-04 20:23:48 UTC (rev 7109) @@ -1,17 +1,21 @@ 48a97af56d55bc90ce90303228ed8cc3 COPYING fe030911decab669145b3017ed4fdf10 CSWcswclassutils.i.cswcpsampleconf +9a6f5ad4919b78e4083491edcd86db0c CSWcswclassutils.i.cswcrontab 56900bb1fc9f40f7c227877eca32b1f8 CSWcswclassutils.i.cswetcservices -0dec9b16f322a26b4fa5cc6c89dfd418 CSWcswclassutils.i.cswinetd +b363134a7c70a342195badc942a23b9d CSWcswclassutils.i.cswinetd fa318ca696e80a9a9f2efbf35cb69080 CSWcswclassutils.i.cswinitsmf 42668b41c7c886091a8ca44992b90806 CSWcswclassutils.i.cswmigrateconf c875d62c8ddaad0de2e18fff7946e1e8 CSWcswclassutils.i.cswpreserveconf 927297d22360707afd804c4ce58ed0a9 CSWcswclassutils.i.cswpycompile +1282bef941c49d98a061b3701a1fda7c CSWcswclassutils.i.cswtexinfo 7f04b24b421f3afbf3c61845941ef5dd CSWcswclassutils.i.cswusergroup d278a28a6f901c4ff5f07c583b4cff3d CSWcswclassutils.r.cswcpsampleconf +a204ca80139dd1d79e1a3af3e8bad7cb CSWcswclassutils.r.cswcrontab d60261ddc46e2cc83ecbbfc586a7e686 CSWcswclassutils.r.cswetcservices 9039ea60ad4c3f8994205fb242a49a72 CSWcswclassutils.r.cswinetd 791db9c2f6685aca67043820d260fc60 CSWcswclassutils.r.cswinitsmf f7a2a10bbf0f88c1909a31141e6d83ce CSWcswclassutils.r.cswmigrateconf 96453922952c92c6c5a024e54ed8525f CSWcswclassutils.r.cswpreserveconf 02326250b63d3c75c45a8ff81768e923 CSWcswclassutils.r.cswpycompile +ed76f47b045b000ab78154a90cf90ed4 CSWcswclassutils.r.cswtexinfo 752c74048ee18ae3a3c2c7b1d15e40f2 CSWcswclassutils.r.cswusergroup Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.README.CSW =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.README.CSW 2009-11-04 15:45:55 UTC (rev 7108) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.README.CSW 2009-11-04 20:23:48 UTC (rev 7109) @@ -53,6 +53,19 @@ /etc/services file. It is a one way manipulation. At package removal, the service entries are left behind. +- cswtexinfo + + This class takes care of keeping the info/dir page of CSWtexinfo + in sync with all texinfo pages installed. It adds entries on + package installation and removes them on package removal. + +- cswcrontab + + This class allows adding entries to the crontab for arbitrary users. + The entries will be tagged with the package name and removed on + package removal. If the entries have been changed manually they will + not be preserved. + Read more on the wiki: http://wiki.opencsw.org/cswclassutils-package. -- Added: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcrontab =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcrontab (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcrontab 2009-11-04 20:23:48 UTC (rev 7109) @@ -0,0 +1,50 @@ +#!/bin/sh +# +# i.cswcrontab - Class action script +# for registration of crontab entries +# +# Written and maintained by Dagobert Michelsen +# + +# set DEBUG to any value to enable trace output +DEBUG= + +echo "Installing class ..." + +while read src dest; do + + echo $dest + /usr/bin/cp $src $dest || exit 2 + + USERNAME=`/usr/bin/basename $dest` + echo "The following lines will be added to the crontab of the user '${USERNAME}':" + cat $dest + + TMPFILE=/tmp/cswcrontab.${PKGINST}.$$ + + umask 600 + /usr/bin/crontab -l ${USERNAME} | /usr/bin/grep -v "# Added by ${PKGINST}\$" > ${TMPFILE} + + if [ -n "$DEBUG" ]; then + echo "DEBUG: Contents of ${TMPFILE} after removing old lines from this package:" >&2 + cat ${TMPFILE} >&2 + fi + + cat $dest | while read LINE; do + echo "${LINE} % Added by ${PKGINST}" >> ${TMPFILE} + if [ -n "$DEBUG" ]; then + echo "DEBUG: Adding '${LINE} % Added by ${PKGINST}' to the end of the crontab" >&2 + fi + done + + if [ -n "$DEBUG" ]; then + echo "DEBUG: Installing crontab for user '${USERNAME}'" >&2 + cat ${TMPFILE} >&2 + fi + + su ${USERNAME} /usr/bin/crontab ${TMPFILE} + rm -f ${TMPFILE} + +done + +exit 0 Added: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswtexinfo =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswtexinfo (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswtexinfo 2009-11-04 20:23:48 UTC (rev 7109) @@ -0,0 +1,24 @@ +#!/bin/sh +# +# i.cswtexinfo - Class action script +# for registration of info pages to CSWtexinfo +# +# Written and maintained by Dagobert Michelsen +# +# 2009-11-04 Initial release + +echo "Installing class ..." + +while read src dest; do + + echo $dest + /usr/bin/cp $src $dest || exit 2 + + if [ -x ${PKG_INSTALL_ROOT}/opt/csw/bin/install-info ]; then + ${PKG_INSTALL_ROOT}/opt/csw/bin/install-info $dest ${PKG_INSTALL_ROOT}/opt/csw/info/dir + else + echo "CSWtexinfo couldn't be found." + fi +done + +exit 0 Added: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcrontab =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcrontab (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcrontab 2009-11-04 20:23:48 UTC (rev 7109) @@ -0,0 +1,33 @@ +#!/bin/sh +# +# r.cswcrontab - Class action script +# for registration of crontab entries +# +# Written and maintained by Dagobert Michelsen +# + +echo "Removing class ..." + +while read dest; do + echo $dest + rm -f $dest + + USERNAME=`/usr/bin/basename $dest` + TMPFILE=/tmp/cswcrontab.${PKGINST}.$$ + + umask 600 + + echo "The following lines will be removed from the crontab of the user '${USERNAME}':" + /usr/bin/crontab -l ${USERNAME} | /usr/bin/grep "# Added by ${PKGINST}\$" + + /usr/bin/crontab -l ${USERNAME} | /usr/bin/grep -v "# Added by ${PKGINST}\$" > ${TMPFILE} + + if [ -n "$DEBUG" ]; then + echo "DEBUG: Installing crontab for user '${USERNAME}'" >&2 + cat ${TMPFILE} >&2 + fi + + su ${USERNAME} /usr/bin/crontab ${TMPFILE} + rm -f ${TMPFILE} + +done Added: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswtexinfo =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswtexinfo (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswtexinfo 2009-11-04 20:23:48 UTC (rev 7109) @@ -0,0 +1,26 @@ +#!/bin/sh +# +# r.cswetcservices - Class action script +# for registration of info pages to CSWtexinfo +# +# Written and maintained by Dagobert Michelsen +# +# 2009-11-04 Initial release + +echo "Removing class ..." + +while read dest; do + + echo $dest + + if [ -x ${PKG_INSTALL_ROOT}/opt/csw/bin/install-info ]; then + ${PKG_INSTALL_ROOT}/opt/csw/bin/install-info --delete $dest ${PKG_INSTALL_ROOT}/opt/csw/info/dir + else + echo "CSWtexinfo couldn't be found." + fi + + rm -f $dest + +done + +exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Nov 4 21:33:03 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 Nov 2009 20:33:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[7110] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7110 http://gar.svn.sourceforge.net/gar/?rev=7110&view=rev Author: dmichelsen Date: 2009-11-04 20:33:03 +0000 (Wed, 04 Nov 2009) Log Message: ----------- mGAR v2: Fix repackage so it doesn't delete package-relevant files from DISTFILES Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-11-04 20:23:48 UTC (rev 7109) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-11-04 20:33:03 UTC (rev 7110) @@ -662,10 +662,9 @@ pkgreset-%: @echo " ==> Reset packaging state for $* ($(DESTIMG))" - @rm -rf $(foreach T,extract checksum package pkgcheck,$(COOKIEDIR)/*$(T)-$**) - @rm -rf $(COOKIEDIR)/pre-package $(COOKIEDIR)/post-package - @rm -rf $(WORKDIR)/$*.* $(WORKDIR)/prototype - @rm -f $(WORKDIR)/copyright $(WORKDIR)/*.copyright + $(_DBG)rm -rf $(foreach T,extract checksum package pkgcheck,$(COOKIEDIR)/*$(T)-$**) + $(_DBG)rm -rf $(COOKIEDIR)/pre-package $(COOKIEDIR)/post-package + $(_DBG)rm -rf $(addprefix $(WORKDIR)/,$(filter-out $(DISTFILES),$(patsubst $(WORKDIR)/%,%,$(wildcard $(WORKDIR)/$*.*)) prototype copyright $*.copyright)) repackage: pkgreset package 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 Nov 4 21:35:45 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 Nov 2009 20:35:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[7111] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7111 http://gar.svn.sourceforge.net/gar/?rev=7111&view=rev Author: dmichelsen Date: 2009-11-04 20:35:45 +0000 (Wed, 04 Nov 2009) Log Message: ----------- mGAR v2: Fix repackage so it doesn't delete package-relevant files from DISTFILES Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-11-04 20:33:03 UTC (rev 7110) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-11-04 20:35:45 UTC (rev 7111) @@ -660,6 +660,8 @@ reset-package: pkgreset +# Make sure we don't delete files we deliberately added with DISTFILES. They +# will not be copied to WORKDIR again. pkgreset-%: @echo " ==> Reset packaging state for $* ($(DESTIMG))" $(_DBG)rm -rf $(foreach T,extract checksum package pkgcheck,$(COOKIEDIR)/*$(T)-$**) 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 Nov 4 21:58:48 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 04 Nov 2009 20:58:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[7112] csw/mgar/pkg/cswclassutils/trunk/Makefile Message-ID: Revision: 7112 http://gar.svn.sourceforge.net/gar/?rev=7112&view=rev Author: bonivart Date: 2009-11-04 20:58:48 +0000 (Wed, 04 Nov 2009) Log Message: ----------- cswclassutils: add crontab and texinfo scripts Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-11-04 20:35:45 UTC (rev 7111) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-11-04 20:58:48 UTC (rev 7112) @@ -1,7 +1,7 @@ # $Id$ GARNAME = cswclassutils -GARVERSION = 1.27 +GARVERSION = 1.28 CATEGORIES = utils DESCRIPTION = CSW class action utilities This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Nov 5 09:50:56 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 Nov 2009 08:50:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[7113] csw/mgar/pkg/cpan Message-ID: Revision: 7113 http://gar.svn.sourceforge.net/gar/?rev=7113&view=rev Author: dmichelsen Date: 2009-11-05 08:50:56 +0000 (Thu, 05 Nov 2009) Log Message: ----------- cpan/Email-Date-Format: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Email-Date-Format/ csw/mgar/pkg/cpan/Email-Date-Format/branches/ csw/mgar/pkg/cpan/Email-Date-Format/tags/ csw/mgar/pkg/cpan/Email-Date-Format/trunk/ csw/mgar/pkg/cpan/Email-Date-Format/trunk/Makefile csw/mgar/pkg/cpan/Email-Date-Format/trunk/checksums csw/mgar/pkg/cpan/Email-Date-Format/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Email-Date-Format/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/Email-Date-Format/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Email-Date-Format/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Email-Date-Format/trunk/Makefile 2009-11-05 08:50:56 UTC (rev 7113) @@ -0,0 +1,15 @@ +GARNAME = Email-Date-Format +GARVERSION = 1.002 +CATEGORIES = cpan +AUTHOR = RJBS + +DESCRIPTION = Perl Email::Date::Format module to emit RFC 2822 style date strings +define BLURB +endef + +PACKAGES = CSWpmemaildateformat +CATALOGNAME = pm_emaildateformat + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Email-Date-Format/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Email-Date-Format/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Email-Date-Format/trunk/checksums 2009-11-05 08:50:56 UTC (rev 7113) @@ -0,0 +1 @@ +7ae25275da6ab272aa8b40141eac9f82 Email-Date-Format-1.002.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 Nov 5 09:52:26 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 Nov 2009 08:52:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[7114] csw/mgar/pkg/cpan/Email-Simple/trunk Message-ID: Revision: 7114 http://gar.svn.sourceforge.net/gar/?rev=7114&view=rev Author: dmichelsen Date: 2009-11-05 08:52:26 +0000 (Thu, 05 Nov 2009) Log Message: ----------- cpan/Email-Simple: Update to 2.100 Modified Paths: -------------- csw/mgar/pkg/cpan/Email-Simple/trunk/Makefile csw/mgar/pkg/cpan/Email-Simple/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Email-Simple/trunk/files/ Property Changed: ---------------- csw/mgar/pkg/cpan/Email-Simple/trunk/ Property changes on: csw/mgar/pkg/cpan/Email-Simple/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Email-Simple/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Email-Simple/trunk/Makefile 2009-11-05 08:50:56 UTC (rev 7113) +++ csw/mgar/pkg/cpan/Email-Simple/trunk/Makefile 2009-11-05 08:52:26 UTC (rev 7114) @@ -1,12 +1,19 @@ GARNAME = Email-Simple -GARVERSION = 2.005 +GARVERSION = 2.100 CATEGORIES = cpan AUTHOR = RJBS -DESCRIPTION = simple parsing of RFC2822 message format and headers +DESCRIPTION = Perl Email::Simple module for RFC2822 message format and headers define BLURB endef -DISTFILES += CSWpmemailsimple.gspec +REQUIRED_PKGS = CSWpmemaildateformat +PACKAGES = CSWpmemailsimple +CATALOGNAME = pm_emailsimple + +LICENSE = LICENSE + +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/Email-Simple/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Email-Simple/trunk/checksums 2009-11-05 08:50:56 UTC (rev 7113) +++ csw/mgar/pkg/cpan/Email-Simple/trunk/checksums 2009-11-05 08:52:26 UTC (rev 7114) @@ -1,2 +1 @@ -c694874fd890d5ad6f963a6d207fd4dd download/CSWpmemailsimple.gspec -945a8a487ba7aea909b01b84ceb1c678 download/Email-Simple-2.005.tar.gz +38205400f9b6b5f1d9b6ae45183cb71f Email-Simple-2.100.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 Nov 5 10:20:16 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 Nov 2009 09:20:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7115] csw/mgar/pkg/curl/trunk Message-ID: Revision: 7115 http://gar.svn.sourceforge.net/gar/?rev=7115&view=rev Author: dmichelsen Date: 2009-11-05 09:20:16 +0000 (Thu, 05 Nov 2009) Log Message: ----------- curl: Update to 7.19.7 Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile csw/mgar/pkg/curl/trunk/checksums Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2009-11-05 08:52:26 UTC (rev 7114) +++ csw/mgar/pkg/curl/trunk/Makefile 2009-11-05 09:20:16 UTC (rev 7115) @@ -1,5 +1,5 @@ GARNAME = curl -GARVERSION = 7.19.6 +GARVERSION = 7.19.7 CATEGORIES = net DESCRIPTION = Command line tool and library for client-side URL transfers. Modified: csw/mgar/pkg/curl/trunk/checksums =================================================================== --- csw/mgar/pkg/curl/trunk/checksums 2009-11-05 08:52:26 UTC (rev 7114) +++ csw/mgar/pkg/curl/trunk/checksums 2009-11-05 09:20:16 UTC (rev 7115) @@ -1,6 +1,6 @@ -8402c1f654c51ad7287aad57c3aa79be download/curl-7.19.6.tar.bz2 -f6e1a6d234d7f6811bb1c598ba9b7c8f download/curlbuild.h -a09fcad6dfcd9636061dfab7598357be download/libcurl.so.2.0.2.i -b46b41659b805013740eeb76e759af4b download/libcurl.so.2.0.2.s -30e826ef67b6ce799b32154250014dd9 download/libcurl.so.3.0.0.i -b63de55fb90feba487b1fd21e751d248 download/libcurl.so.3.0.0.s +79a8fbb2eed5464b97bdf94bee109380 curl-7.19.7.tar.bz2 +f6e1a6d234d7f6811bb1c598ba9b7c8f curlbuild.h +a09fcad6dfcd9636061dfab7598357be libcurl.so.2.0.2.i +b46b41659b805013740eeb76e759af4b libcurl.so.2.0.2.s +30e826ef67b6ce799b32154250014dd9 libcurl.so.3.0.0.i +b63de55fb90feba487b1fd21e751d248 libcurl.so.3.0.0.s 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 Nov 5 10:51:37 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 Nov 2009 09:51:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[7116] csw/mgar/pkg/unrar/trunk/Makefile Message-ID: Revision: 7116 http://gar.svn.sourceforge.net/gar/?rev=7116&view=rev Author: dmichelsen Date: 2009-11-05 09:51:37 +0000 (Thu, 05 Nov 2009) Log Message: ----------- unrar: Fix description Modified Paths: -------------- csw/mgar/pkg/unrar/trunk/Makefile Modified: csw/mgar/pkg/unrar/trunk/Makefile =================================================================== --- csw/mgar/pkg/unrar/trunk/Makefile 2009-11-05 09:20:16 UTC (rev 7115) +++ csw/mgar/pkg/unrar/trunk/Makefile 2009-11-05 09:51:37 UTC (rev 7116) @@ -2,9 +2,12 @@ GARVERSION = 3.9.6 CATEGORIES = utils -DESCRIPTION = Brief description +DESCRIPTION = RAR archive extractor define BLURB - Long description + WinRAR is a powerful archive manager. It can backup your data and reduce the size + of email attachments, decompress RAR, ZIP and other files downloaded from Internet + and create new archives in RAR and ZIP file format. You can try WinRAR before buy, + its trial version is available in downloads. endef MASTER_SITES = http://www.rarlab.com/rar/ @@ -24,18 +27,12 @@ OPT_FLAGS_SOS = -fast -erroff=wvarhidemem -#BUILD_SCRIPTS = $(WORKSRC)/makefile.unix BUILD_ARGS = -f makefile.unix CXX=$(CXX) CXXFLAGS="$(CXXFLAGS)" DEFINES="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" STRIP=strip TEST_SCRIPTS = INSTALL_SCRIPTS = custom -#CXXFLAGS=-fast -erroff=wvarhidemem -#DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -#STRIP=strip -#DESTDIR=/usr - include gar/category.mk install-custom: 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 Nov 5 11:10:54 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 Nov 2009 10:10:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[7117] csw/mgar/pkg/texinfo/trunk Message-ID: Revision: 7117 http://gar.svn.sourceforge.net/gar/?rev=7117&view=rev Author: dmichelsen Date: 2009-11-05 10:10:53 +0000 (Thu, 05 Nov 2009) Log Message: ----------- texinfo: Rework revision and make sure existing .info-files are registered Modified Paths: -------------- csw/mgar/pkg/texinfo/trunk/Makefile csw/mgar/pkg/texinfo/trunk/checksums Added Paths: ----------- csw/mgar/pkg/texinfo/trunk/files/CSWtexinfo.postinstall Modified: csw/mgar/pkg/texinfo/trunk/Makefile =================================================================== --- csw/mgar/pkg/texinfo/trunk/Makefile 2009-11-05 09:51:37 UTC (rev 7116) +++ csw/mgar/pkg/texinfo/trunk/Makefile 2009-11-05 10:10:53 UTC (rev 7117) @@ -1,7 +1,5 @@ GARNAME = texinfo -RELEASE = a -GARVERSION = 4.13 -DISTVERSION = $(GARVERSION)$(RELEASE) +GARVERSION = 4.13a CATEGORIES = utils DESCRIPTION = The GNU Documentation System @@ -11,7 +9,8 @@ endef MASTER_SITES = $(GNU_MIRROR) -DISTFILES = $(GARNAME)-$(DISTVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += CSWtexinfo.postinstall DISTFILES += mkdirentries SPKG_SOURCEURL = http://www.gnu.org/software/texinfo/ @@ -20,12 +19,16 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz REQUIRED_PKGS = CSWbash CSWgsed CSWncurses CSWiconv CSWggettextrt +# CSWgzip is needed for zdiff +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWgzip +DISTNAME = $(GARNAME)-4.13 + CONFIGURE_ARGS = $(DIRPATHS) # /opt/csw/lib is added automatically during the build and the # required libraries don't offer optimized versions, hence no $ISALIST. -RUNPATH_LINKER_FLAGS = +NORUNPATH = 1 TEST_TARGET = check @@ -33,12 +36,13 @@ include gar/category.mk -SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) - post-extract-modulated: perl -pi -e "s(#! /bin/sh)(#!/opt/csw/bin/bash)" $(WORKSRC)/util/texi2dvi @$(MAKECOOKIE) +# Some older packages execute this on postinstall. +# It can be removed when the last package using this has been updated with the +# cswtexinfo class. post-install-modulated: ginstall -d $(DESTDIR)$(sbindir) ginstall -m 755 $(WORKDIR)/mkdirentries $(DESTDIR)$(sbindir)/mkdirentries Modified: csw/mgar/pkg/texinfo/trunk/checksums =================================================================== --- csw/mgar/pkg/texinfo/trunk/checksums 2009-11-05 09:51:37 UTC (rev 7116) +++ csw/mgar/pkg/texinfo/trunk/checksums 2009-11-05 10:10:53 UTC (rev 7117) @@ -1,2 +1,3 @@ -71ba711519209b5fb583fed2b3d86fcb download/texinfo-4.13a.tar.gz -f5860ae7b0ff06605975c93e2f59fc07 download/mkdirentries +e125eda2f15f31ec8d4b0d34be449aae CSWtexinfo.postinstall +f5860ae7b0ff06605975c93e2f59fc07 mkdirentries +71ba711519209b5fb583fed2b3d86fcb texinfo-4.13a.tar.gz Copied: csw/mgar/pkg/texinfo/trunk/files/CSWtexinfo.postinstall (from rev 6855, csw/mgar/pkg/texinfo/trunk/files/mkdirentries) =================================================================== --- csw/mgar/pkg/texinfo/trunk/files/CSWtexinfo.postinstall (rev 0) +++ csw/mgar/pkg/texinfo/trunk/files/CSWtexinfo.postinstall 2009-11-05 10:10:53 UTC (rev 7117) @@ -0,0 +1,12 @@ +#!/bin/sh + +BASE=${PKG_INSTALL_ROOT}/opt/csw + +echo "Registering existing texinfo-files..." + +FILES=`ls $BASE/share/info/*.info $BASE/share/info/*.info-*` + +for i in $FILES; do + /opt/csw/bin/install-info $i $BASE/share/info/dir 2> /dev/null +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 Thu Nov 5 12:47:14 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 Nov 2009 11:47:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[7118] csw/mgar/pkg/libtasn1/trunk Message-ID: Revision: 7118 http://gar.svn.sourceforge.net/gar/?rev=7118&view=rev Author: dmichelsen Date: 2009-11-05 11:47:14 +0000 (Thu, 05 Nov 2009) Log Message: ----------- libtasn1: Update to 2.2 Modified Paths: -------------- csw/mgar/pkg/libtasn1/trunk/Makefile csw/mgar/pkg/libtasn1/trunk/checksums Modified: csw/mgar/pkg/libtasn1/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtasn1/trunk/Makefile 2009-11-05 10:10:53 UTC (rev 7117) +++ csw/mgar/pkg/libtasn1/trunk/Makefile 2009-11-05 11:47:14 UTC (rev 7118) @@ -1,5 +1,5 @@ GARNAME = libtasn1 -GARVERSION = 2.1 +GARVERSION = 2.2 CATEGORIES = lib DESCRIPTION = GNU ASN1 library Modified: csw/mgar/pkg/libtasn1/trunk/checksums =================================================================== --- csw/mgar/pkg/libtasn1/trunk/checksums 2009-11-05 10:10:53 UTC (rev 7117) +++ csw/mgar/pkg/libtasn1/trunk/checksums 2009-11-05 11:47:14 UTC (rev 7118) @@ -1 +1 @@ -9c6869cca08b7392415c7939ffd2bbae download/libtasn1-2.1.tar.gz +14cc361500d2e768a8a6ec538ce3fecb libtasn1-2.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 Nov 5 13:54:09 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 Nov 2009 12:54:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[7119] csw/mgar/pkg/gnutls/trunk Message-ID: Revision: 7119 http://gar.svn.sourceforge.net/gar/?rev=7119&view=rev Author: dmichelsen Date: 2009-11-05 12:54:09 +0000 (Thu, 05 Nov 2009) Log Message: ----------- gnutls: Update to 2.8.5 and switch to Sun Studio Modified Paths: -------------- csw/mgar/pkg/gnutls/trunk/Makefile csw/mgar/pkg/gnutls/trunk/checksums Modified: csw/mgar/pkg/gnutls/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnutls/trunk/Makefile 2009-11-05 11:47:14 UTC (rev 7118) +++ csw/mgar/pkg/gnutls/trunk/Makefile 2009-11-05 12:54:09 UTC (rev 7119) @@ -1,5 +1,5 @@ GARNAME = gnutls -GARVERSION = 2.6.5 +GARVERSION = 2.8.5 CATEGORIES = lib DESCRIPTION = GNU Transport Layer Security libraries and tools @@ -22,23 +22,21 @@ DISTFILES += libgnutls.so.13.i DISTFILES += libgnutls.so.13.s -GARCOMPILER = GNU - SPKG_SOURCEURL = http://www.gnu.org/software/gnutls/ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -#Waiting on gcc4 for amd64 -#BUILD64 = 1 -EXTRA_BUILD_ISAS_sparc = sparcv9 +BUILD64 = 1 NO_ISAEXEC = 1 +EXTRA_LDFLAGS = -L$(libdir) -lgpg-error -lsocket -lnsl + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check -REQUIRED_PKGS_CSWgnutls = CSWgcc4corert CSWgcc4g++rt CSWgcrypt CSWggettextrt +REQUIRED_PKGS_CSWgnutls = CSWgcrypt CSWggettextrt REQUIRED_PKGS_CSWgnutls += CSWgpgerr CSWlibtasn1 CSWreadline CSWzlib CSWiconv REQUIRED_PKGS_CSWgnutlsdevel = CSWgnutls Modified: csw/mgar/pkg/gnutls/trunk/checksums =================================================================== --- csw/mgar/pkg/gnutls/trunk/checksums 2009-11-05 11:47:14 UTC (rev 7118) +++ csw/mgar/pkg/gnutls/trunk/checksums 2009-11-05 12:54:09 UTC (rev 7119) @@ -1,5 +1,5 @@ -92b92c36b616aa8bd69a9a0fb2b8eb24 download/gnutls-2.6.5.tar.bz2 -073c509902375c40b885f5adc9f7dba9 download/libgnutls-openssl.so.13.i -02e4011d400d262b8d4b5c7311d8a5b0 download/libgnutls-openssl.so.13.s -b0eee0d29e3d260a146e626c6ca75b16 download/libgnutls.so.13.i -76f0d841ec6c4a3612ca2410c793e104 download/libgnutls.so.13.s +e3b2788b79bfc82acbe717e3c54d4e92 gnutls-2.8.5.tar.bz2 +073c509902375c40b885f5adc9f7dba9 libgnutls-openssl.so.13.i +02e4011d400d262b8d4b5c7311d8a5b0 libgnutls-openssl.so.13.s +b0eee0d29e3d260a146e626c6ca75b16 libgnutls.so.13.i +76f0d841ec6c4a3612ca2410c793e104 libgnutls.so.13.s This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From a_o_m at users.sourceforge.net Thu Nov 5 13:57:31 2009 From: a_o_m at users.sourceforge.net (a_o_m at users.sourceforge.net) Date: Thu, 05 Nov 2009 12:57:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7120] csw/mgar/pkg/scala/trunk Message-ID: Revision: 7120 http://gar.svn.sourceforge.net/gar/?rev=7120&view=rev Author: a_o_m Date: 2009-11-05 12:57:31 +0000 (Thu, 05 Nov 2009) Log Message: ----------- Scala: Update to 2.7.7 Modified Paths: -------------- csw/mgar/pkg/scala/trunk/Makefile csw/mgar/pkg/scala/trunk/checksums Modified: csw/mgar/pkg/scala/trunk/Makefile =================================================================== --- csw/mgar/pkg/scala/trunk/Makefile 2009-11-05 12:54:09 UTC (rev 7119) +++ csw/mgar/pkg/scala/trunk/Makefile 2009-11-05 12:57:31 UTC (rev 7120) @@ -1,7 +1,5 @@ -# Todo -# * Non-maintainer upload, needs to be checked by Alexander GARNAME = scala -GARVERSION = 2.7.4 +GARVERSION = 2.7.7 CATEGORIES = java DESCRIPTION = The Scala programming language @@ -12,7 +10,7 @@ languages. It is also fully interoperable with Java. endef -MASTER_SITES = http://www.scala-lang.org/sites/default/files/linuxsoft_archives/downloads/distrib/files/ +MASTER_SITES = http://www.scala-lang.org/downloads/distrib/files/ DISTFILES = $(GARNAME)-$(GARVERSION).final.tgz DISTNAME = $(GARNAME)-$(GARVERSION).final Modified: csw/mgar/pkg/scala/trunk/checksums =================================================================== --- csw/mgar/pkg/scala/trunk/checksums 2009-11-05 12:54:09 UTC (rev 7119) +++ csw/mgar/pkg/scala/trunk/checksums 2009-11-05 12:57:31 UTC (rev 7120) @@ -1 +1 @@ -9077f5d083c59f591f044b5295eb2011 download/scala-2.7.4.final.tgz +5d2294d5aab72fec869c0ba666d28b7e scala-2.7.7.final.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 Thu Nov 5 14:20:24 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 Nov 2009 13:20:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7121] csw/mgar/pkg/libsndfile/trunk Message-ID: Revision: 7121 http://gar.svn.sourceforge.net/gar/?rev=7121&view=rev Author: dmichelsen Date: 2009-11-05 13:20:24 +0000 (Thu, 05 Nov 2009) Log Message: ----------- libsndfile: Add possible enhancement Modified Paths: -------------- csw/mgar/pkg/libsndfile/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/libsndfile/trunk/files/sunpro-extensions.patch Modified: csw/mgar/pkg/libsndfile/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsndfile/trunk/Makefile 2009-11-05 12:57:31 UTC (rev 7120) +++ csw/mgar/pkg/libsndfile/trunk/Makefile 2009-11-05 13:20:24 UTC (rev 7121) @@ -38,6 +38,10 @@ PATCHFILES += 0003-Workaround-mising-stdint.h-and-Sun-Studio-shortcomin.patch PATCHFILES += 0004-Disable-stop-on-error-until-cpp_test-refcount-error-.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 + REQUIRED_PKGS = CSWvorbis CSWflac CSWlibogg CSWsqlite3rt PREREQUISITE_PKGS = $(REQUIRED_PKGS) Added: csw/mgar/pkg/libsndfile/trunk/files/sunpro-extensions.patch =================================================================== --- csw/mgar/pkg/libsndfile/trunk/files/sunpro-extensions.patch (rev 0) +++ csw/mgar/pkg/libsndfile/trunk/files/sunpro-extensions.patch 2009-11-05 13:20:24 UTC (rev 7121) @@ -0,0 +1,27 @@ +--- Makefile.orig 2009-05-18 13:08:50.608183737 +0200 ++++ Makefile +@@ -36,6 +36,11 @@ CONFIGURE_ENV+= ac_cv_c_struct_hack=yes + BUILDLINK_PASSTHRU_DIRS+= /Developer + .endif + ++# Needed for sun studio having __func__ defined ++.if ${PKGSRC_COMPILER} == "sunpro" ++CFLAGS+= -features=extensions ++.endif ++ + .include "../../audio/flac/buildlink3.mk" + #BUILDLINK_API_DEPENDS.libvorbis+= libvorbis>=1.2.1 + .include "../../audio/libvorbis/buildlink3.mk" +$NetBSD$ + +--- src/common.h.orig 2009-02-13 22:24:08.000000000 +0100 ++++ src/common.h +@@ -39,7 +39,7 @@ + + #if (SIZEOF_LONG == 8) + # define SF_PLATFORM_S64(x) x##l +-#elif COMPILER_IS_GCC ++#elif COMPILER_IS_GCC || __SUNPRO_C + # define SF_PLATFORM_S64(x) x##ll + #elif OS_IS_WIN32 + # define SF_PLATFORM_S64(x) x##I64 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 Nov 5 15:18:29 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 Nov 2009 14:18:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[7122] csw/mgar/pkg/cpan/Event-Lib/trunk Message-ID: Revision: 7122 http://gar.svn.sourceforge.net/gar/?rev=7122&view=rev Author: dmichelsen Date: 2009-11-05 14:18:29 +0000 (Thu, 05 Nov 2009) Log Message: ----------- cpan/Event-Lib: Update to 1.03 Modified Paths: -------------- csw/mgar/pkg/cpan/Event-Lib/trunk/Makefile csw/mgar/pkg/cpan/Event-Lib/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Event-Lib/trunk/files/CSWpmeventlib.depend csw/mgar/pkg/cpan/Event-Lib/trunk/files/CSWpmeventlib.gspec csw/mgar/pkg/cpan/Event-Lib/trunk/files/CSWpmeventlib.prototype Property Changed: ---------------- csw/mgar/pkg/cpan/Event-Lib/trunk/ Property changes on: csw/mgar/pkg/cpan/Event-Lib/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Event-Lib/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Event-Lib/trunk/Makefile 2009-11-05 13:20:24 UTC (rev 7121) +++ csw/mgar/pkg/cpan/Event-Lib/trunk/Makefile 2009-11-05 14:18:29 UTC (rev 7122) @@ -1,5 +1,5 @@ GARNAME = Event-Lib -GARVERSION = 1.01 +GARVERSION = 1.03 CATEGORIES = cpan AUTHOR = VPARSEVAL @@ -11,12 +11,21 @@ is received. endef -DISTFILES += $(call admfiles,CSWpmeventlib,depend prototype) +PACKAGES = CSWpmeventlib +CATALOGNAME = pm_eventlib +PREREQUISITE_PKGS = CSWlibevent-devel +REQUIRED_PKGS = CSWlibevent + # Sun cc inline function patch -PATCHFILES += inline.diff +PATCHFILES = inline.diff CONFIGURE_ARGS += LIBS="-L$(libdir) -levent" CONFIGURE_ARGS += INC="-I$(includedir)" +# Skip tests as some of them are failing. Remove after the +# issues have been resolved: +# https://rt.cpan.org/Ticket/Display.html?id=51129 +SKIPTEST = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/Event-Lib/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Event-Lib/trunk/checksums 2009-11-05 13:20:24 UTC (rev 7121) +++ csw/mgar/pkg/cpan/Event-Lib/trunk/checksums 2009-11-05 14:18:29 UTC (rev 7122) @@ -1,5 +1,2 @@ -f1ed7e6f920585b36e6d389648485fcb download/CSWpmeventlib.gspec -d777f90dbe31da0493a5cfa76b58e8ef download/CSWpmeventlib.depend -1b43841a2d0b4bc572c9acbb2e3ae1ae download/CSWpmeventlib.prototype -28ed9996dd6f4e2598cd5e94c549acf7 download/Event-Lib-1.01.tar.gz -c47167e36a0c8fb1289ca1b7e0751a34 download/inline.diff +90b60028f7f5836072e95c6d5b1d069e Event-Lib-1.03.tar.gz +c47167e36a0c8fb1289ca1b7e0751a34 inline.diff Deleted: csw/mgar/pkg/cpan/Event-Lib/trunk/files/CSWpmeventlib.depend =================================================================== --- csw/mgar/pkg/cpan/Event-Lib/trunk/files/CSWpmeventlib.depend 2009-11-05 13:20:24 UTC (rev 7121) +++ csw/mgar/pkg/cpan/Event-Lib/trunk/files/CSWpmeventlib.depend 2009-11-05 14:18:29 UTC (rev 7122) @@ -1 +0,0 @@ -P CSWlibevent libevent - event notification library Deleted: csw/mgar/pkg/cpan/Event-Lib/trunk/files/CSWpmeventlib.gspec =================================================================== --- csw/mgar/pkg/cpan/Event-Lib/trunk/files/CSWpmeventlib.gspec 2009-11-05 13:20:24 UTC (rev 7121) +++ csw/mgar/pkg/cpan/Event-Lib/trunk/files/CSWpmeventlib.gspec 2009-11-05 14:18:29 UTC (rev 7122) @@ -1,9 +0,0 @@ -%var bitname pm_eventlib -%var pkgname CSWpmeventlib -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (C) 2004-2005 by Tassilo von Parseval - -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.4 or, -at your option, any later version of Perl 5 you may have available. Deleted: csw/mgar/pkg/cpan/Event-Lib/trunk/files/CSWpmeventlib.prototype =================================================================== --- csw/mgar/pkg/cpan/Event-Lib/trunk/files/CSWpmeventlib.prototype 2009-11-05 13:20:24 UTC (rev 7121) +++ csw/mgar/pkg/cpan/Event-Lib/trunk/files/CSWpmeventlib.prototype 2009-11-05 14:18:29 UTC (rev 7122) @@ -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/Event 0755 root bin -f none /opt/csw/lib/perl/csw/Event/Lib.pm 0444 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Event 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Event/Lib 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Event/Lib/.packlist 0644 root bin -f none /opt/csw/lib/perl/csw/auto/Event/Lib/Lib.bs 0444 root bin -f none /opt/csw/lib/perl/csw/auto/Event/Lib/Lib.so 0555 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/Event::Lib.3perl 0444 root bin 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 Nov 5 15:59:23 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 Nov 2009 14:59:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7123] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7123 http://gar.svn.sourceforge.net/gar/?rev=7123&view=rev Author: dmichelsen Date: 2009-11-05 14:59:22 +0000 (Thu, 05 Nov 2009) Log Message: ----------- mGAR v2: Check all packages at the same time Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-11-05 14:18:29 UTC (rev 7122) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-11-05 14:59:22 UTC (rev 7123) @@ -579,12 +579,6 @@ # package - Use the mkpackage utility to create Solaris packages # -ifneq ($(ENABLE_CHECK),0) -PACKAGE_TARGETS = $(foreach SPEC,$(_PKG_SPECS), package-$(SPEC) pkgcheck-$(SPEC)) -else -PACKAGE_TARGETS = $(foreach SPEC,$(_PKG_SPECS), package-$(SPEC)) -endif - SPKG_DESTDIRS = $(SPKG_SPOOLDIR) $(SPKG_EXPORT) $(SPKG_DESTDIRS): @@ -610,7 +604,8 @@ # We depend on extract as the additional package files (like .gspec) must be # unpacked to global/ for packaging. E. g. 'merge' depends only on the specific # modulations and does not fill global/. -_package: validateplatform extract-global merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package +_package: validateplatform extract-global merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package $(if $(filter-out 0,$(ENABLE_CHECK)),pkgcheck) + @$(MAKECOOKIE) package: _package @echo @@ -642,13 +637,10 @@ # pkgcheck - check if the package is compliant # -pkgcheck: $(addprefix pkgcheck-,$(_PKG_SPECS)) - @$(DONADA) +pkgcheck: $(foreach SPEC,$(_PKG_SPECS),package-$(SPEC)) + $(_DBG)( LC_ALL=C $(GARBIN)/checkpkg $(foreach SPEC,$(_PKG_SPECS),$(SPKG_EXPORT)/`$(call _PKG_ENV,$(SPEC)) mkpackage -qs $(WORKDIR)/$(SPEC).gspec -D pkgfile`.gz ) || exit 2;) + @$(MAKECOOKIE) -pkgcheck-%: - @echo " ==> Checking compliance: $*" - @( LC_ALL=C $(GARBIN)/checkpkg $(SPKG_EXPORT)/`$(call _PKG_ENV,$1) mkpackage -qs $(WORKDIR)/$*.gspec -D pkgfile`.gz ) || exit 2 - pkgcheck-p: @$(foreach COOKIEFILE,$(PKGCHECK_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) 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 Nov 5 16:27:02 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 Nov 2009 15:27:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[7124] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7124 http://gar.svn.sourceforge.net/gar/?rev=7124&view=rev Author: dmichelsen Date: 2009-11-05 15:27:02 +0000 (Thu, 05 Nov 2009) Log Message: ----------- mGAR v2: Add missing target specification Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-11-05 14:59:22 UTC (rev 7123) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-11-05 15:27:02 UTC (rev 7124) @@ -579,6 +579,8 @@ # package - Use the mkpackage utility to create Solaris packages # +PACKAGE_TARGETS = $(foreach SPEC,$(_PKG_SPECS), package-$(SPEC)) + SPKG_DESTDIRS = $(SPKG_SPOOLDIR) $(SPKG_EXPORT) $(SPKG_DESTDIRS): 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 Nov 5 16:31:41 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 05 Nov 2009 15:31:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[7125] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 7125 http://gar.svn.sourceforge.net/gar/?rev=7125&view=rev Author: bonivart Date: 2009-11-05 15:31:40 +0000 (Thu, 05 Nov 2009) Log Message: ----------- pkgutil: update to 1.9 beta 1 Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype Added Paths: ----------- csw/mgar/pkg/pkgutil/trunk/files/i.cswpkgutil csw/mgar/pkg/pkgutil/trunk/files/r.cswpkgutil Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2009-11-05 15:27:02 UTC (rev 7124) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-11-05 15:31:40 UTC (rev 7125) @@ -1,5 +1,5 @@ GARNAME = pkgutil -GARVERSION = 1.8 +GARVERSION = 1.9b1 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily @@ -12,8 +12,9 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).zip -DISTFILES += $(call admfiles,CSWpkgutil,prototype postinstall preremove) -#DISTFILES += $(call admfiles,CSWpkgutil,postinstall preremove) +DISTFILES += $(call admfiles,CSWpkgutil,prototype) +DISTFILES += i.cswpkgutil +DISTFILES += r.cswpkgutil PACKAGES = CSWpkgutil CSWpkgutilplus @@ -40,35 +41,29 @@ WORKSRC = $(WORKDIR) SPKG_SOURCEURL = http://pkgutil.wikidot.com/ -#SPKG_CLASSES = none cswpkgutil +SPKG_CLASSES_CSWpkgutil = none cswpkgutil install-custom: @echo " ==> Installing $(GARNAME) (custom)" @rm -rf $(DESTDIR) @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg-hooks/preargproc.d - @cp $(WORKSRC)/$(GARNAME).conf $(DESTDIR)/etc/opt/csw/$(GARNAME).conf.CSW - @cp $(WORKSRC)/pkgutillog $(DESTDIR)/etc/opt/csw/pkg-hooks/preargproc.d/01-CSW$(GARNAME)plus-log + @ginstall $(WORKSRC)/$(GARNAME).conf $(DESTDIR)/etc/opt/csw/$(GARNAME).conf.CSW + @ginstall -m 755 $(WORKSRC)/pkgutillog $(DESTDIR)/etc/opt/csw/pkg-hooks/preargproc.d/01-CSW$(GARNAME)plus-log @ginstall -m 755 -d $(DESTDIR)$(bindir) - @cp $(WORKSRC)/$(GARNAME) $(DESTDIR)$(bindir) - @cp $(WORKSRC)/bldcat $(DESTDIR)$(bindir) - @cp $(WORKSRC)/chkcat $(DESTDIR)$(bindir) + @ginstall $(WORKSRC)/$(GARNAME) $(WORKSRC)/bldcat $(WORKSRC)/chkcat $(DESTDIR)$(bindir) @ginstall -m 755 -d $(DESTDIR)$(sysconfdir) - @cp $(WORKSRC)/$(GARNAME).conf $(DESTDIR)$(sysconfdir)/$(GARNAME).conf.CSW + @ginstall $(WORKSRC)/$(GARNAME).conf $(DESTDIR)$(sysconfdir)/$(GARNAME).conf.CSW @ginstall -m 755 -d $(DESTDIR)/opt/csw/libexec/$(GARNAME) - @cp $(WORKSRC)/wget-`uname -p` $(DESTDIR)/opt/csw/libexec/$(GARNAME)/wget + @ginstall $(WORKSRC)/wget-`uname -p` $(DESTDIR)/opt/csw/libexec/$(GARNAME)/wget @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME) - @cp $(WORKSRC)/readme $(DESTDIR)$(docdir)/$(GARNAME)/ - @cp $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)/ + @ginstall $(WORKSRC)/readme $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)/ @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME)plus - @cp $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)plus/ - @cp $(WORKSRC)/readme.pkgutilplus $(DESTDIR)$(docdir)/$(GARNAME)plus/readme + @ginstall $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)plus/ + @ginstall $(WORKSRC)/readme.pkgutilplus $(DESTDIR)$(docdir)/$(GARNAME)plus/readme @ginstall -m 755 -d $(DESTDIR)$(mandir)/man1 @pod2man --section=1 $(WORKSRC)/$(GARNAME) > $(DESTDIR)$(mandir)/man1/pkgutil.1 @pod2man --section=1 $(WORKSRC)/bldcat > $(DESTDIR)$(mandir)/man1/bldcat.1 @pod2man --section=1 $(WORKSRC)/chkcat > $(DESTDIR)$(mandir)/man1/chkcat.1 @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/$(GARNAME)/packages - @cp $(WORKSRC)/admin $(DESTDIR)/var/opt/csw/$(GARNAME)/admin.CSW -# @ginstall -m 755 -d $(DESTDIR)/usr/sadm/install/scripts -# @cp $(FILEDIR)/CSWpkgutil.i.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/i.cswpkgutil -# @cp $(FILEDIR)/CSWpkgutil.r.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/r.cswpkgutil + @ginstall $(WORKSRC)/admin $(DESTDIR)/var/opt/csw/$(GARNAME)/admin.CSW @$(MAKECOOKIE) Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-11-05 15:27:02 UTC (rev 7124) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-11-05 15:31:40 UTC (rev 7125) @@ -1,5 +1,5 @@ a16c6f81bc537d6172fd65d8da1aeecc CSWpkgutil.gspec -e1407c24d47306dbc4cea22dcb291f1d CSWpkgutil.postinstall -2fb6c94a2d212f08b71d462082a2d31a CSWpkgutil.preremove -951b11e347d6f3f49cc8617ecab4ad62 CSWpkgutil.prototype -f65b4c116cb03bc95c148a8488472515 pkgutil-1.8.zip +a9bd66f3cfaef5ec3df946363e80085f CSWpkgutil.prototype +443c6cb0435cefc046629a3e68e7fe61 i.cswpkgutil +15dcb525af077847f98ea51d1c6f4162 pkgutil-1.9b1.zip +c8a3a8c4ed123f229dbd60cd4722fd03 r.cswpkgutil Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype 2009-11-05 15:27:02 UTC (rev 7124) +++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype 2009-11-05 15:31:40 UTC (rev 7125) @@ -1,14 +1,14 @@ i pkginfo=CSWpkgutil.pkginfo i copyright=CSWpkgutil.copyright -i postinstall=CSWpkgutil.postinstall -i preremove=CSWpkgutil.preremove +i i.cswpkgutil +i r.cswpkgutil d none /etc/opt/csw 0755 root bin -f none /etc/opt/csw/pkgutil.conf.CSW 644 root bin +f cswpkgutil /etc/opt/csw/pkgutil.conf.CSW 644 root bin d none /opt/csw 0755 root bin d none /opt/csw/bin 0755 root bin f none /opt/csw/bin/pkgutil 755 root bin d none /opt/csw/etc 0755 root bin -f none /opt/csw/etc/pkgutil.conf.CSW 644 root bin +f cswpkgutil /opt/csw/etc/pkgutil.conf.CSW 644 root bin d none /opt/csw/libexec 0755 root bin d none /opt/csw/libexec/pkgutil 0755 root bin f none /opt/csw/libexec/pkgutil/wget 755 root bin @@ -22,5 +22,5 @@ f none /opt/csw/share/man/man1/pkgutil.1 644 root bin d none /var/opt/csw 0755 root bin d none /var/opt/csw/pkgutil 0755 root bin -f none /var/opt/csw/pkgutil/admin.CSW 644 root bin +f cswpkgutil /var/opt/csw/pkgutil/admin.CSW 644 root bin d none /var/opt/csw/pkgutil/packages 0755 root bin Added: csw/mgar/pkg/pkgutil/trunk/files/i.cswpkgutil =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/i.cswpkgutil (rev 0) +++ csw/mgar/pkg/pkgutil/trunk/files/i.cswpkgutil 2009-11-05 15:31:40 UTC (rev 7125) @@ -0,0 +1,12 @@ +#!/bin/sh + +while read src dest +do + cp $src $dest + conf=`echo $dest | sed 's/.CSW$//'` + if [-f "$conf"]; then + echo "$conf already exists, will not copy $dest to it." + else + cp $dest $conf + fi +done Added: csw/mgar/pkg/pkgutil/trunk/files/r.cswpkgutil =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/r.cswpkgutil (rev 0) +++ csw/mgar/pkg/pkgutil/trunk/files/r.cswpkgutil 2009-11-05 15:31:40 UTC (rev 7125) @@ -0,0 +1,12 @@ +#!/bin/sh + +while read dest +do + conf=`echo $dest | sed 's/.CSW$//'` + if [ "`cmp "$conf" "$dest" > /dev/null`" ]; then + rm $conf + else + echo "$conf modified, will not remove it." + fi + rm $dest +done 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 Nov 5 16:51:08 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 05 Nov 2009 15:51:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[7126] csw/mgar/pkg/autoproject/trunk/Makefile Message-ID: Revision: 7126 http://gar.svn.sourceforge.net/gar/?rev=7126&view=rev Author: wahwah Date: 2009-11-05 15:51:08 +0000 (Thu, 05 Nov 2009) Log Message: ----------- autoproject: Rewritten description, due to Phil's request Modified Paths: -------------- csw/mgar/pkg/autoproject/trunk/Makefile Modified: csw/mgar/pkg/autoproject/trunk/Makefile =================================================================== --- csw/mgar/pkg/autoproject/trunk/Makefile 2009-11-05 15:31:40 UTC (rev 7125) +++ csw/mgar/pkg/autoproject/trunk/Makefile 2009-11-05 15:51:08 UTC (rev 7126) @@ -6,7 +6,7 @@ GARVERSION = 0.20 CATEGORIES = apps -DESCRIPTION = creates a source package which follows the GNU programming standards +DESCRIPTION = A utility for automated configuration of GNU autotools define BLURB autoproject interviews the user, then creates a source package for a new 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 Nov 5 17:30:35 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 Nov 2009 16:30:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[7127] csw/mgar/pkg/doxygen/trunk Message-ID: Revision: 7127 http://gar.svn.sourceforge.net/gar/?rev=7127&view=rev Author: dmichelsen Date: 2009-11-05 16:30:35 +0000 (Thu, 05 Nov 2009) Log Message: ----------- doxygen: Update to 1.6.1 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 2009-11-05 15:51:08 UTC (rev 7126) +++ csw/mgar/pkg/doxygen/trunk/Makefile 2009-11-05 16:30:35 UTC (rev 7127) @@ -27,12 +27,13 @@ # GARNAME = doxygen -GARVERSION = 1.5.9 +GARVERSION = 1.6.1 CATEGORIES = utils DESCRIPTION = A documentation system for programming languages define BLURB - Long description + Doxygen is a documentation system for C++, C, Java, Objective-C, Python, + IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D. endef MASTER_SITES = http://ftp.stack.nl/pub/users/dimitri/ @@ -43,6 +44,8 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).src.tar.gz UPSTREAM_MASTER_SITES = $(SPKG_SOURCEURL) +PREREQUISITE_PKGS = CSWgraphviz2 + CONFIGURE_ARGS = $(subst =, ,$(filter --prefix=% , $(DIRPATHS))) CONFIGURE_ARGS += --docdir $(docdir) CONFIGURE_ARGS += --platform solaris-cc @@ -51,6 +54,9 @@ include gar/category.mk +# For 'dot' +PATH := $(PATH):/opt/csw/graphviz2/bin + post-extract-modulated: perl -pi -e 'if (/^TMAKE_CXXFLAGS_RELEASE/) { \ s|= .*|= $(filter-out -I/opt/csw/include, $(CXXFLAGS)) -norunpath|; }' \ Modified: csw/mgar/pkg/doxygen/trunk/checksums =================================================================== --- csw/mgar/pkg/doxygen/trunk/checksums 2009-11-05 15:51:08 UTC (rev 7126) +++ csw/mgar/pkg/doxygen/trunk/checksums 2009-11-05 16:30:35 UTC (rev 7127) @@ -1 +1 @@ -33c5598fa6d24cbc55849eaf89652557 download/doxygen-1.5.9.src.tar.gz +2ec343643e134f0d3ce2069420bcb4f0 doxygen-1.6.1.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 Nov 5 17:38:13 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 Nov 2009 16:38:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[7128] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 7128 http://gar.svn.sourceforge.net/gar/?rev=7128&view=rev Author: dmichelsen Date: 2009-11-05 16:38:13 +0000 (Thu, 05 Nov 2009) Log Message: ----------- mGAR v2: Adjust GCC flags for mcpu as v9 is invalid together with -mvis Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2009-11-05 16:30:35 UTC (rev 7127) +++ csw/mgar/gar/v2/gar.conf.mk 2009-11-05 16:38:13 UTC (rev 7128) @@ -203,8 +203,8 @@ ARCHFLAGS_SOS11_sparcv9+vis = -xarch=v9a ARCHFLAGS_SOS12_sparcv9+vis = -m64 -xarch=sparcvis - ARCHFLAGS_GCC3_sparcv9+vis = -m64 -mcpu=v9 -mvis - ARCHFLAGS_GCC4_sparcv9+vis = -m64 -mcpu=v9 -mvis + ARCHFLAGS_GCC3_sparcv9+vis = -m64 -mcpu=ultrasparc -mvis + ARCHFLAGS_GCC4_sparcv9+vis = -m64 -mcpu=ultrasparc -mvis MEMORYMODEL_sparcv9+vis = 64 ARCHFLAGS_SOS11_sparcv9 = -xarch=v9 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Nov 5 18:33:34 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 05 Nov 2009 17:33:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[7129] csw/mgar/pkg/cyrus_imapd/trunk/Makefile Message-ID: Revision: 7129 http://gar.svn.sourceforge.net/gar/?rev=7129&view=rev Author: chninkel Date: 2009-11-05 17:33:33 +0000 (Thu, 05 Nov 2009) Log Message: ----------- cyrus_imapd: reenable check Modified Paths: -------------- csw/mgar/pkg/cyrus_imapd/trunk/Makefile Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2009-11-05 16:38:13 UTC (rev 7128) +++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2009-11-05 17:33:33 UTC (rev 7129) @@ -120,9 +120,6 @@ TEST_SCRIPTS = -# Disable package check for now as pmcyrus dependancy is not recognized -ENABLE_CHECK=0 - include gar/category.mk # compile_et is missing so we want our to be used This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Nov 5 19:00:28 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 05 Nov 2009 18:00:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[7130] csw/mgar/pkg/openssl/trunk Message-ID: Revision: 7130 http://gar.svn.sourceforge.net/gar/?rev=7130&view=rev Author: chninkel Date: 2009-11-05 18:00:28 +0000 (Thu, 05 Nov 2009) Log Message: ----------- openssl: switch to dynamic gspec and depend file Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/openssl/trunk/files/CSWossl.depend csw/mgar/pkg/openssl/trunk/files/CSWossl.gspec csw/mgar/pkg/openssl/trunk/files/CSWossldevel.depend csw/mgar/pkg/openssl/trunk/files/CSWossldevel.gspec csw/mgar/pkg/openssl/trunk/files/CSWosslrt.depend csw/mgar/pkg/openssl/trunk/files/CSWosslrt.gspec csw/mgar/pkg/openssl/trunk/files/CSWosslutils.depend csw/mgar/pkg/openssl/trunk/files/CSWosslutils.gspec Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2009-11-05 17:33:33 UTC (rev 7129) +++ csw/mgar/pkg/openssl/trunk/Makefile 2009-11-05 18:00:28 UTC (rev 7130) @@ -1,9 +1,22 @@ +##################################################################### +# OpenCSW build recipe for OpenSSL +# +# Copyright 2009 Yann Rouillard +# All rights reserved. Use is subject to license terms. +# +# Redistribution and/or use, with or without modification, is +# permitted. This software is without warranty of any kind. The +# author(s) shall not be liable in the event that use of the +# software causes damage. +##################################################################### + +###### Package information ####### + GARNAME = openssl GARVERSION = 0.9.8k -CATEGORIES = lib - OPENSSL_VERSION := $(shell echo $(GARVERSION) | sed -e 's/[a-z]//g') OPENSSL_RELEASE := $(shell echo $(GARVERSION) | sed -e 's/[^a-z]//g') +CATEGORIES = lib DESCRIPTION = The Open Source toolkit for SSL and TLS define BLURB @@ -13,6 +26,28 @@ as a full-strength general-purpose cryptography library. endef +PACKAGES = CSWossl CSWosslrt CSWossldevel CSWosslutils + +SPKG_DESC_CSWossl = Openssl meta package +CATALOGNAME_CSWossl = openssl +REQUIRED_PKGS_CSWossl = CSWossldevel CSWosslutils CSWosslrt + +SPKG_DESC_CSWosslrt = Openssl runtime libraries +CATALOGNAME_CSWosslrt = openssl_rt +REQUIRED_PKGS_CSWosslrt = CSWcacertificates + +SPKG_DESC_CSWossldevel = Openssl development files +CATALOGNAME_CSWossldevel = openssl_devel +REQUIRED_PKGS_CSWossldevel = CSWosslrt + +SPKG_DESC_CSWosslutils = Openssl binaries and related tools +CATALOGNAME_CSWosslutils = openssl_utils +REQUIRED_PKGS_CSWosslutils = CSWosslrt +SPKG_CLASSES_CSWosslutils = none conf + + +###### Upstream and opencsw files information ####### + MASTER_SITES = http://www.openssl.org/source/ http://openssl.org/news/ # We define upstream file regex so we can be notifed of new upstream software release @@ -20,19 +55,20 @@ DISTNAME = $(GARNAME)-$(GARVERSION) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWossl,depend prototype) -DISTFILES += $(call admfiles,CSWosslrt,checkinstall preinstall postinstall depend prototype-i386 prototype-sparc) -DISTFILES += $(call admfiles,CSWossldevel,depend prototype-i386 prototype-sparc) -DISTFILES += $(call admfiles,CSWosslutils,depend prototype) +DISTFILES += CSWossl.prototype +DISTFILES += CSWosslrt.checkinstall CSWosslrt.preinstall CSWosslrt.postinstall CSWosslrt.prototype-i386 CSWosslrt.prototype-sparc +DISTFILES += CSWossldevel.prototype-i386 CSWossldevel.prototype-sparc +DISTFILES += CSWosslutils.prototype DISTFILES += changelog.CSW README.CSW DISTFILES += i.conf r.conf DOCFILES = CHANGES CHANGES.SSLeay PROBLEMS README FAQ README.ASN1 INSTALL NEWS README.ENGINE -SPKG_CLASSES = none conf - PATCHFILES = openssl.$(OPENSSL_VERSION).patch + +##### Build and installation information ##### + GARCOMPILER = SOS11 # The list of instructions set for which we will @@ -84,7 +120,6 @@ SKIPTEST = 1 - # support for pkcs11 engine http://blogs.sun.com/chichang1/entry/how_to_integrate_pkcs11_engine ifdef PKCS11 PATCHFILES += pkcs11_engine-0.9.8h.patch.2008-07-29 Deleted: csw/mgar/pkg/openssl/trunk/files/CSWossl.depend =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWossl.depend 2009-11-05 17:33:33 UTC (rev 7129) +++ csw/mgar/pkg/openssl/trunk/files/CSWossl.depend 2009-11-05 18:00:28 UTC (rev 7130) @@ -1,3 +0,0 @@ -P CSWossldevel openssl_devel Openssl development support -P CSWosslutils openssl_utils Openssl binaries and related files -P CSWosslrt openssl_rt Openssl runtime libraries Deleted: csw/mgar/pkg/openssl/trunk/files/CSWossl.gspec =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWossl.gspec 2009-11-05 17:33:33 UTC (rev 7129) +++ csw/mgar/pkg/openssl/trunk/files/CSWossl.gspec 2009-11-05 18:00:28 UTC (rev 7130) @@ -1,7 +0,0 @@ -%var bitname openssl -%var pkgname CSWossl -%var arch all -%var desc Openssl meta package -%var pkgfile %{bitname}-%{SPKG_VERSION}%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-all-CSW.pkg -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Deleted: csw/mgar/pkg/openssl/trunk/files/CSWossldevel.depend =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWossldevel.depend 2009-11-05 17:33:33 UTC (rev 7129) +++ csw/mgar/pkg/openssl/trunk/files/CSWossldevel.depend 2009-11-05 18:00:28 UTC (rev 7130) @@ -1 +0,0 @@ -P CSWosslrt openssl_rt - Openssl runtime libraries Deleted: csw/mgar/pkg/openssl/trunk/files/CSWossldevel.gspec =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWossldevel.gspec 2009-11-05 17:33:33 UTC (rev 7129) +++ csw/mgar/pkg/openssl/trunk/files/CSWossldevel.gspec 2009-11-05 18:00:28 UTC (rev 7130) @@ -1,5 +0,0 @@ -%var bitname openssl_devel -%var pkgname CSWossldevel -%var desc Openssl development support -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Deleted: csw/mgar/pkg/openssl/trunk/files/CSWosslrt.depend =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWosslrt.depend 2009-11-05 17:33:33 UTC (rev 7129) +++ csw/mgar/pkg/openssl/trunk/files/CSWosslrt.depend 2009-11-05 18:00:28 UTC (rev 7130) @@ -1 +0,0 @@ -P CSWcacertificates Deleted: csw/mgar/pkg/openssl/trunk/files/CSWosslrt.gspec =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWosslrt.gspec 2009-11-05 17:33:33 UTC (rev 7129) +++ csw/mgar/pkg/openssl/trunk/files/CSWosslrt.gspec 2009-11-05 18:00:28 UTC (rev 7130) @@ -1,5 +0,0 @@ -%var bitname openssl_rt -%var pkgname CSWosslrt -%var desc Openssl runtime libraries -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Deleted: csw/mgar/pkg/openssl/trunk/files/CSWosslutils.depend =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWosslutils.depend 2009-11-05 17:33:33 UTC (rev 7129) +++ csw/mgar/pkg/openssl/trunk/files/CSWosslutils.depend 2009-11-05 18:00:28 UTC (rev 7130) @@ -1 +0,0 @@ -P CSWosslrt openssl_rt - Openssl runtime libraries Deleted: csw/mgar/pkg/openssl/trunk/files/CSWosslutils.gspec =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWosslutils.gspec 2009-11-05 17:33:33 UTC (rev 7129) +++ csw/mgar/pkg/openssl/trunk/files/CSWosslutils.gspec 2009-11-05 18:00:28 UTC (rev 7130) @@ -1,5 +0,0 @@ -%var bitname openssl_utils -%var pkgname CSWosslutils -%var desc Openssl binaries and related tools -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Nov 5 19:02:46 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 05 Nov 2009 18:02:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7131] csw/mgar/pkg/openssl/trunk/Makefile Message-ID: Revision: 7131 http://gar.svn.sourceforge.net/gar/?rev=7131&view=rev Author: chninkel Date: 2009-11-05 18:02:46 +0000 (Thu, 05 Nov 2009) Log Message: ----------- openssl: switched to standard version scheme Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2009-11-05 18:00:28 UTC (rev 7130) +++ csw/mgar/pkg/openssl/trunk/Makefile 2009-11-05 18:02:46 UTC (rev 7131) @@ -140,11 +140,7 @@ include gar/category.mk -# we redefine the timestamp to fulfill opencsw standard -SPKG_VERSION := $(OPENSSL_VERSION) -SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(OPENSSL_RELEASE) - pre-configure-modulated: echo " ==> Creating configure script" cd $(WORKSRC) && ln -nf Configure configure This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Nov 5 19:17:23 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 05 Nov 2009 18:17:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7132] csw/mgar/pkg/openssl/trunk Message-ID: Revision: 7132 http://gar.svn.sourceforge.net/gar/?rev=7132&view=rev Author: chninkel Date: 2009-11-05 18:17:23 +0000 (Thu, 05 Nov 2009) Log Message: ----------- openssl: switched to cswpreserveconf for configuration file handling Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile csw/mgar/pkg/openssl/trunk/checksums csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype Removed Paths: ------------- csw/mgar/pkg/openssl/trunk/files/i.conf csw/mgar/pkg/openssl/trunk/files/r.conf Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2009-11-05 18:02:46 UTC (rev 7131) +++ csw/mgar/pkg/openssl/trunk/Makefile 2009-11-05 18:17:23 UTC (rev 7132) @@ -43,7 +43,7 @@ SPKG_DESC_CSWosslutils = Openssl binaries and related tools CATALOGNAME_CSWosslutils = openssl_utils REQUIRED_PKGS_CSWosslutils = CSWosslrt -SPKG_CLASSES_CSWosslutils = none conf +SPKG_CLASSES_CSWosslutils = none cswpreserveconf ###### Upstream and opencsw files information ####### @@ -60,7 +60,6 @@ DISTFILES += CSWossldevel.prototype-i386 CSWossldevel.prototype-sparc DISTFILES += CSWosslutils.prototype DISTFILES += changelog.CSW README.CSW -DISTFILES += i.conf r.conf DOCFILES = CHANGES CHANGES.SSLeay PROBLEMS README FAQ README.ASN1 INSTALL NEWS README.ENGINE @@ -164,7 +163,7 @@ install-certs: [ -f $(PKGROOT)$(prefix)/ssl/openssl.cnf ] && \ - ginstall -D $(PKGROOT)$(prefix)/ssl/openssl.cnf $(PKGROOT)$(sysconfdir)/ssl/openssl.cnf + ginstall -D $(PKGROOT)$(prefix)/ssl/openssl.cnf $(PKGROOT)$(sysconfdir)/ssl/openssl.cnf.CSW install-oldlibs: $(addprefix install-oldlibs-,$(OLDLIBS)) install-oldlibs-%: Modified: csw/mgar/pkg/openssl/trunk/checksums =================================================================== --- csw/mgar/pkg/openssl/trunk/checksums 2009-11-05 18:02:46 UTC (rev 7131) +++ csw/mgar/pkg/openssl/trunk/checksums 2009-11-05 18:17:23 UTC (rev 7132) @@ -1,23 +1,13 @@ -e555c6d58d276aec7fdc53363e338ab3 download/openssl-0.9.8k.tar.gz -b5ded4412606a0996595015bc2ff6974 download/CSWossl.gspec -05b45e7124833dee48e5f3c45591e95b download/CSWossl.depend -bd9bb4dfb9602fba461b21fa37f97765 download/CSWossl.prototype -83480e01971e71d037bd44fa5ed4e4e5 download/CSWosslrt.gspec -05ace5330714d6cd9c0e076b6ae2518f download/CSWosslrt.checkinstall -c9de908daad1a31fca20329cb043ad3c download/CSWosslrt.preinstall -1c3f600eaf942a18ecab3637e1fc32bd download/CSWosslrt.postinstall -cbf34987267073fb1f60bff86492dd8b download/CSWosslrt.depend -463d53d6fcab5f33e2e204a831d47ccc download/CSWosslrt.prototype-i386 -ec547e9a56e0933a928fd9d505c19333 download/CSWosslrt.prototype-sparc -2ac43ebf4689d236540e22171541be4e download/CSWossldevel.gspec -37995caa7f4155066b00fb7503e853da download/CSWossldevel.depend -da3116a1d8dfd2bd3e4f2a11f4fb5f8b download/CSWossldevel.prototype-i386 -bd40fcb60dfef960da30c718b718149d download/CSWossldevel.prototype-sparc -eec77249fb642c525cad67dcd055fb77 download/CSWosslutils.gspec -37995caa7f4155066b00fb7503e853da download/CSWosslutils.depend -a441995e4e3c95497e77aa613d2c673c download/CSWosslutils.prototype -904ceefa66b6b7b7e93ae0e9bc58bac8 download/changelog.CSW -b78faa440d6f6a2a07663de331678648 download/README.CSW -7fdc09cd3c11db459c83c8946f7872f6 download/i.conf -a454ac09091085813ec8900f5a0c917c download/r.conf -64f7c3f3a6cae483209b69c31c82557d download/openssl.0.9.8.patch +bd9bb4dfb9602fba461b21fa37f97765 CSWossl.prototype +da3116a1d8dfd2bd3e4f2a11f4fb5f8b CSWossldevel.prototype-i386 +bd40fcb60dfef960da30c718b718149d CSWossldevel.prototype-sparc +05ace5330714d6cd9c0e076b6ae2518f CSWosslrt.checkinstall +1c3f600eaf942a18ecab3637e1fc32bd CSWosslrt.postinstall +c9de908daad1a31fca20329cb043ad3c CSWosslrt.preinstall +463d53d6fcab5f33e2e204a831d47ccc CSWosslrt.prototype-i386 +ec547e9a56e0933a928fd9d505c19333 CSWosslrt.prototype-sparc +89ccb44272d2a4eb33fd4086c3348f3e CSWosslutils.prototype +b78faa440d6f6a2a07663de331678648 README.CSW +904ceefa66b6b7b7e93ae0e9bc58bac8 changelog.CSW +e555c6d58d276aec7fdc53363e338ab3 openssl-0.9.8k.tar.gz +64f7c3f3a6cae483209b69c31c82557d openssl.0.9.8.patch Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype 2009-11-05 18:02:46 UTC (rev 7131) +++ csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype 2009-11-05 18:17:23 UTC (rev 7132) @@ -62,7 +62,7 @@ f none /opt/csw/ssl/misc/c_name 0755 root bin s none /opt/csw/ssl/openssl.cnf=/opt/csw/etc/ssl/openssl.cnf 0644 root bin d none /opt/csw/etc/ssl 0755 root bin -e conf /opt/csw/etc/ssl/openssl.cnf 0644 root bin +f cswpreserveconf /opt/csw/etc/ssl/openssl.cnf.CSW 0644 root bin f none /opt/csw/share/doc/openssl_utils/changelog.CSW=changelog.CSW 644 root bin f none /opt/csw/share/doc/openssl_utils/CHANGES=CHANGES 644 root bin f none /opt/csw/share/doc/openssl_utils/CHANGES.SSLeay=CHANGES 644 root bin Deleted: csw/mgar/pkg/openssl/trunk/files/i.conf =================================================================== --- csw/mgar/pkg/openssl/trunk/files/i.conf 2009-11-05 18:02:46 UTC (rev 7131) +++ csw/mgar/pkg/openssl/trunk/files/i.conf 2009-11-05 18:17:23 UTC (rev 7132) @@ -1,54 +0,0 @@ -# -# Copyright 2006 Yann Rouillard -# All rights reserved. Use is subject to license terms. -# -# Redistribution and/or use, with or without modification, is -# permitted. This code is without warranty of any kind. The -# author(s) shall not be liable in the event that use of the -# software causes damage. -# -# i.conf - class script which install configuration files -# -# If the configuration file already exists on the filesystem, -# this script will let the existing file intact and will -# install a copy of the file provided in the package suffixed -# with .CSW -# except for service configuration files which are always installed -# CSW suffixed under Solaris 9 as they are used to enable/disable -# a service according to opencsw standards. -# -umask 0022 - -if [ -z "$PKG_INSTALL_ROOT" ]; then - PKG_INSTALL_ROOT=/ -fi - -while read SRC DEST; do - if [ -f "${PKG_INSTALL_ROOT}/$DEST" ]; then - cp "$SRC" "${PKG_INSTALL_ROOT}/$DEST.CSW" - else - cp "$SRC" "${PKG_INSTALL_ROOT}/$DEST" - fi -done - -# Unfortunately pkgadd doesn't backup the source file if the destination file is identical. -# It's a problem with zones installation where pkgadd try to find the backup files, so -# we do the backup manually -awk '{ if ( $3 == "conf" ) print $2,$3,$4,$5,$6,$7 }' $INST_DATADIR/$PKG/pkgmap | \ - while read FTYPE CLASS FPATH MODE OWNER GROUP; do - if echo $FPATH | grep "^/" >/dev/null; then - INST_PATH="$INST_DATADIR/$PKG/root/$FPATH" - SAVE_PATH="$PKGSAV/pspool/$PKG/root/$FPATH" - else - INST_PATH="$INST_DATADIR/$PKG/reloc/$FPATH" - SAVE_PATH="$PKGSAV/pspool/$PKG/reloc/$FPATH" - fi - - if [ ! -f "$SAVE_PATH" ]; then - mkdir -p "`LANG=C dirname $SAVE_PATH`" - cp "$INST_PATH" "$SAVE_PATH" - fi - done - -exit 0 - Deleted: csw/mgar/pkg/openssl/trunk/files/r.conf =================================================================== --- csw/mgar/pkg/openssl/trunk/files/r.conf 2009-11-05 18:02:46 UTC (rev 7131) +++ csw/mgar/pkg/openssl/trunk/files/r.conf 2009-11-05 18:17:23 UTC (rev 7132) @@ -1,21 +0,0 @@ -# -# Copyright 2006 Yann Rouillard -# All rights reserved. Use is subject to license terms. -# -# Redistribution and/or use, with or without modification, is -# permitted. This code is without warranty of any kind. The -# author(s) shall not be liable in the event that use of the -# software causes damage. -# -# r.conf - class script which removes configuration files -# -# This script doesn't delete config file, only backup ones -# installed by the package. -# - -while read DEST; do - if [ -f "$DEST.CSW" ]; then - rm "$DEST.CSW" - fi -done - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Thu Nov 5 23:21:12 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Thu, 05 Nov 2009 22:21:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7133] csw/mgar/pkg/php5/trunk Message-ID: Revision: 7133 http://gar.svn.sourceforge.net/gar/?rev=7133&view=rev Author: valholla Date: 2009-11-05 22:21:12 +0000 (Thu, 05 Nov 2009) Log Message: ----------- update to 5.2.11 Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile csw/mgar/pkg/php5/trunk/checksums Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2009-11-05 18:17:23 UTC (rev 7132) +++ csw/mgar/pkg/php5/trunk/Makefile 2009-11-05 22:21:12 UTC (rev 7133) @@ -1,5 +1,5 @@ GARNAME = php5 -GARVERSION = 5.2.10 +GARVERSION = 5.2.11 CATEGORIES = lang SF_PROJ = $(shell echo $(GARNAME) | sed -e 's/[0-9]//g') DISTNAME = $(SF_PROJ)-$(GARVERSION) @@ -82,7 +82,7 @@ # Disable Tests (report submitted to PHP QA) SKIPTEST = 1 -ENABLE_CHECK = 0 +#ENABLE_CHECK = 0 include files/scripts.mk include gar/category.mk Modified: csw/mgar/pkg/php5/trunk/checksums =================================================================== --- csw/mgar/pkg/php5/trunk/checksums 2009-11-05 18:17:23 UTC (rev 7132) +++ csw/mgar/pkg/php5/trunk/checksums 2009-11-05 22:21:12 UTC (rev 7133) @@ -1,17 +1,17 @@ -632cb357e102e18e04bb5666825a912f download/CSWap2modphp5.postinstall -e1381a4ba49e46b2097b76286a1b36fb download/CSWap2modphp5.preremove -0dd379f20ceb32fc77bb3a9bf045097f download/CSWap2modphp5.space -5f0046fe1b3f8e2228fdb165bdbbe73a download/CSWmodphp5.postinstall -2e5dbed2c9dd5e24c331753984946822 download/CSWmodphp5.preremove -0dd379f20ceb32fc77bb3a9bf045097f download/CSWmodphp5.space -98c6458b20eca91982b67c80a0554586 download/CSWphp5.postinstall -91060cc7c31aa917d88cd537d3d5bb42 download/configure.diff -a71677d80f5cfd1aeb03547dfdeb705a download/httpd-php5.conf.CSW -2206431e47c2075c0b9c4a12de5cf791 download/odbc.diff -230126f76ee6400ccf225bb6a8243532 download/pdopgsql.diff -d4c93751890b989c5a7b04acb5845fd9 download/pear.conf.CSW -13db46097c9686302bebf160e2d26ed2 download/pgsql.diff -15c7b5a87f57332d6fc683528e28247b download/php-5.2.10.tar.bz2 -a450a46ce0ea9fd0c0abe432e750a873 download/php-bug-45557-fix.diff -670b8fbf4cf9105d72f22dbf4b1e29cd download/php.ini.CSW -6251f3adcefc6ffa61d6339ac6b2d1eb download/phpext +632cb357e102e18e04bb5666825a912f CSWap2modphp5.postinstall +e1381a4ba49e46b2097b76286a1b36fb CSWap2modphp5.preremove +0dd379f20ceb32fc77bb3a9bf045097f CSWap2modphp5.space +5f0046fe1b3f8e2228fdb165bdbbe73a CSWmodphp5.postinstall +2e5dbed2c9dd5e24c331753984946822 CSWmodphp5.preremove +0dd379f20ceb32fc77bb3a9bf045097f CSWmodphp5.space +98c6458b20eca91982b67c80a0554586 CSWphp5.postinstall +91060cc7c31aa917d88cd537d3d5bb42 configure.diff +a71677d80f5cfd1aeb03547dfdeb705a httpd-php5.conf.CSW +2206431e47c2075c0b9c4a12de5cf791 odbc.diff +230126f76ee6400ccf225bb6a8243532 pdopgsql.diff +d4c93751890b989c5a7b04acb5845fd9 pear.conf.CSW +13db46097c9686302bebf160e2d26ed2 pgsql.diff +286bf34630f5643c25ebcedfec5e0a09 php-5.2.11.tar.bz2 +a450a46ce0ea9fd0c0abe432e750a873 php-bug-45557-fix.diff +670b8fbf4cf9105d72f22dbf4b1e29cd php.ini.CSW +6251f3adcefc6ffa61d6339ac6b2d1eb phpext This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Thu Nov 5 23:24:34 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Thu, 05 Nov 2009 22:24:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[7134] csw/mgar/pkg/php5/trunk/Makefile.cswdir Message-ID: Revision: 7134 http://gar.svn.sourceforge.net/gar/?rev=7134&view=rev Author: valholla Date: 2009-11-05 22:24:34 +0000 (Thu, 05 Nov 2009) Log Message: ----------- update to 5.2.11 Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile.cswdir Modified: csw/mgar/pkg/php5/trunk/Makefile.cswdir =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile.cswdir 2009-11-05 22:21:12 UTC (rev 7133) +++ csw/mgar/pkg/php5/trunk/Makefile.cswdir 2009-11-05 22:24:34 UTC (rev 7134) @@ -1,5 +1,5 @@ GARNAME = php5 -GARVERSION = 5.2.9 +GARVERSION = 5.2.11 CATEGORIES = lang SF_PROJ = $(shell echo $(GARNAME) | sed -e 's/[0-9]//g') DISTNAME = $(SF_PROJ)-$(GARVERSION) @@ -32,8 +32,9 @@ SPKG_DESC_CSWphp5 = A High-Level Scripting Languages CATALOGNAME_CSWphp5devel = php5_devel SPKG_DESC_CSWphp5devel = Development files for php5 -REQUIRED_PKGS_CSWphp5 = CSWexpat CSWggettextrt CSWiconv -REQUIRED_PKGS_CSWphp5 += CSWlibxml2 CSWzlib CSWmysql5rt +REQUIRED_PKGS_CSWphp5 = CSWexpat CSWggettextrt CSWiconv CSWpng CSWsqlite +REQUIRED_PKGS_CSWphp5 += CSWlibxml2 CSWzlib CSWmysql5rt CSWxpm CSWt1lib +REQUIRED_PKGS_CSWphp5 += CSWftype2 CSWgd CSWjpeg CSWlibmm REQUIRED_PKGS_CSWphp5devel = CSWphp5 PKGFILES_CSWphp5devel = $(bindir)/php-config @@ -81,7 +82,7 @@ # Disable Tests (report submitted to PHP QA) SKIPTEST = 1 -ENABLE_CHECK = 0 +#ENABLE_CHECK = 0 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 Fri Nov 6 02:58:39 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 06 Nov 2009 01:58:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[7135] csw/mgar/pkg/coreutils/trunk Message-ID: Revision: 7135 http://gar.svn.sourceforge.net/gar/?rev=7135&view=rev Author: bdwalton Date: 2009-11-06 01:58:39 +0000 (Fri, 06 Nov 2009) Log Message: ----------- coreutils: intial commit; 5 tests fail Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile csw/mgar/pkg/coreutils/trunk/checksums Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-05 22:24:34 UTC (rev 7134) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-06 01:58:39 UTC (rev 7135) @@ -2,32 +2,33 @@ GARVERSION = 7.6 CATEGORIES = utils -DESCRIPTION = Basic file, shell and text manipulation utilities +DESCRIPTION = GNU core utilities define BLURB -The GNU Core Utilities are the basic file, shell and text manipulation -utilities of the GNU operating system. These are the core utilities which -are expected to exist on every operating system. +The GNU Core Utilities are the basic file, shell and text manipulation utilities of the GNU operating system. These are the core utilities which are expected to exist on every operating system. -Previously these utilities were offered as three individual sets of GNU -utilities, fileutils, shellutils, and textutils. Those three have been -combined into a single set of utilities called the coreutils. +Previously these utilities were offered as three individual sets of GNU utilities, Fileutils, Shellutils, and Textutils. Those three have been combined into a single set of utilities called Coreutils. endef + MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -# We define upstream file regex so we can be notifed of new upstream -# software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +PREREQUISITE_PKGS = CSWautomake CSWautoconf CSWbison CSWggettext CSWgit +PREREQUISITE_PKGS += CSWgperf CSWgzip CSWperl CSWrsync CSWgtar CSWbash -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --program-prefix=g -CONFIGURE_ARGS += --enable-silent-rules -CONFIGURE_ARGS += --disable-libcap -CONFIGURE_ARGS += --with-packager="$(SPKG_PACKAGER) <$(SPKG_EMAIL)>" +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw +CONFIGURE_ARGS = $(DIRPATHS) + TEST_ARGS = check -GARCOMPILER = GNU +include gar/category.mk -include gar/category.mk +# pre-configure-modulated: +# @(cd $(WORKSRC); /opt/csw/bin/bash ./bootstrap; ) +# @$(MAKECOOKIE) + +PATH := /opt/csw/gnu:/opt/csw/bin:$(PATH) Modified: csw/mgar/pkg/coreutils/trunk/checksums =================================================================== --- csw/mgar/pkg/coreutils/trunk/checksums 2009-11-05 22:24:34 UTC (rev 7134) +++ csw/mgar/pkg/coreutils/trunk/checksums 2009-11-06 01:58:39 UTC (rev 7135) @@ -1 +1 @@ -3d82f979229365f880da750642e67cf3 download/coreutils-7.6.tar.gz +3d82f979229365f880da750642e67cf3 coreutils-7.6.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 Nov 6 03:02:16 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 06 Nov 2009 02:02:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7136] csw/mgar/pkg/cswpkgloghooks/ Message-ID: Revision: 7136 http://gar.svn.sourceforge.net/gar/?rev=7136&view=rev Author: bdwalton Date: 2009-11-06 02:02:16 +0000 (Fri, 06 Nov 2009) Log Message: ----------- cswpkgloghooks: renamed package Added Paths: ----------- csw/mgar/pkg/cswpkgloghooks/ 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 Nov 6 03:02:41 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 06 Nov 2009 02:02:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[7137] csw/mgar/pkg/cswpkgsyslog/ Message-ID: Revision: 7137 http://gar.svn.sourceforge.net/gar/?rev=7137&view=rev Author: bdwalton Date: 2009-11-06 02:02:40 +0000 (Fri, 06 Nov 2009) Log Message: ----------- cswpkgsyslog: renamed to pkgloghooks Removed Paths: ------------- csw/mgar/pkg/cswpkgsyslog/ 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 Nov 6 03:10:32 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 06 Nov 2009 02:10:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7138] csw/mgar/pkg/cswpkgloghooks/trunk Message-ID: Revision: 7138 http://gar.svn.sourceforge.net/gar/?rev=7138&view=rev Author: bdwalton Date: 2009-11-06 02:10:32 +0000 (Fri, 06 Nov 2009) Log Message: ----------- cswpkgloghooks: update files, file content to reflect rename Modified Paths: -------------- csw/mgar/pkg/cswpkgloghooks/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgloghooks-postupgrade csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgloghooks-preupgrade Removed Paths: ------------- csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgsyslog-postupgrade csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgsyslog-preupgrade Modified: csw/mgar/pkg/cswpkgloghooks/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswpkgloghooks/trunk/Makefile 2009-11-06 02:02:40 UTC (rev 7137) +++ csw/mgar/pkg/cswpkgloghooks/trunk/Makefile 2009-11-06 02:10:32 UTC (rev 7138) @@ -1,4 +1,4 @@ -GARNAME = cswpkgsyslog +GARNAME = cswpkgloghooks GARVERSION = 1.0 CATEGORIES = utils Copied: csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgloghooks-postupgrade (from rev 7136, csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgsyslog-postupgrade) =================================================================== --- csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgloghooks-postupgrade (rev 0) +++ csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgloghooks-postupgrade 2009-11-06 02:10:32 UTC (rev 7138) @@ -0,0 +1,62 @@ +#!/opt/csw/bin/bash + +script=$0 + +set -- ${1/-/ } +PKG=$1 +VER=$2 + +function logdie() { + logger -t "cswpkgloghooks" "$1" + exit 0 +} + +function success() { + case ${script} in + *install) MSG="installed ${PKG} ${VER}";; + *upgrade) MSG="upgraded ${PKG} to ${VER} (from: $1)";; + *remove) MSG="removed ${PKG} ${VER}";; + esac + + logdie "${MSG}" +} + +function failure() { + case ${script} in + *install) MSG="Failed to install ${PKG} ${VER}";; + *upgrade) MSG="Failed to upgrade ${PKG} ${VER} (current: $1)";; + *remove) MSG="Failed to remove ${PKG} ${VER}";; + esac + + logdie "${MSG}" +} + +if [ -d /var/sadm/pkg/${PKG} ]; then + SYSTEMVER=$(pkgparam ${PKG} VERSION 2>/dev/null) + pf=/var/opt/csw/pkg-hooks/CSWcswpkgloghooks.upgrade.${PKG} + if [ -f ${pf} ]; then + PREVVER=$(cat ${pf} 2>/dev/null) + rm -f ${pf} + fi + + case ${script} in + *remove) + failure + ;; + *install|*upgrade) + case "${VER}" in + ${SYSTEMVER}) success ${PREVVER};; + *) failure ${SYSTEMVER};; + esac + ;; + esac +else + case ${script} in + *remove) + success + ;; + *install|*upgrade) + failure + ;; + esac +fi Copied: csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgloghooks-preupgrade (from rev 7136, csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgsyslog-preupgrade) =================================================================== --- csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgloghooks-preupgrade (rev 0) +++ csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgloghooks-preupgrade 2009-11-06 02:10:32 UTC (rev 7138) @@ -0,0 +1,11 @@ +#!/opt/csw/bin/bash + +set -- ${1/-/ } + +PKG=$1 +VER=$2 + +SYSTEMVER=$(pkgparam ${PKG} VERSION) + +# store previous version so we can log smarter things if upgrade fails. +echo ${SYSTEMVER} > /var/opt/csw/pkg-hooks/CSWcswpkgloghooks.upgrade.${PKG} Deleted: csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgsyslog-postupgrade =================================================================== --- csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgsyslog-postupgrade 2009-11-06 02:02:40 UTC (rev 7137) +++ csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgsyslog-postupgrade 2009-11-06 02:10:32 UTC (rev 7138) @@ -1,62 +0,0 @@ -#!/opt/csw/bin/bash - -script=$0 - -set -- ${1/-/ } -PKG=$1 -VER=$2 - -function logdie() { - logger -t "cswpkgsyslog" "$1" - exit 0 -} - -function success() { - case ${script} in - *install) MSG="installed ${PKG} ${VER}";; - *upgrade) MSG="upgraded ${PKG} to ${VER} (from: $1)";; - *remove) MSG="removed ${PKG} ${VER}";; - esac - - logdie "${MSG}" -} - -function failure() { - case ${script} in - *install) MSG="Failed to install ${PKG} ${VER}";; - *upgrade) MSG="Failed to upgrade ${PKG} ${VER} (current: $1)";; - *remove) MSG="Failed to remove ${PKG} ${VER}";; - esac - - logdie "${MSG}" -} - -if [ -d /var/sadm/pkg/${PKG} ]; then - SYSTEMVER=$(pkgparam ${PKG} VERSION 2>/dev/null) - pf=/var/opt/csw/pkg-hooks/CSWcswpkgsyslog.upgrade.${PKG} - if [ -f ${pf} ]; then - PREVVER=$(cat ${pf} 2>/dev/null) - rm -f ${pf} - fi - - case ${script} in - *remove) - failure - ;; - *install|*upgrade) - case "${VER}" in - ${SYSTEMVER}) success ${PREVVER};; - *) failure ${SYSTEMVER};; - esac - ;; - esac -else - case ${script} in - *remove) - success - ;; - *install|*upgrade) - failure - ;; - esac -fi Deleted: csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgsyslog-preupgrade =================================================================== --- csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgsyslog-preupgrade 2009-11-06 02:02:40 UTC (rev 7137) +++ csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgsyslog-preupgrade 2009-11-06 02:10:32 UTC (rev 7138) @@ -1,11 +0,0 @@ -#!/opt/csw/bin/bash - -set -- ${1/-/ } - -PKG=$1 -VER=$2 - -SYSTEMVER=$(pkgparam ${PKG} VERSION) - -# store previous version so we can log smarter things if upgrade fails. -echo ${SYSTEMVER} > /var/opt/csw/pkg-hooks/CSWcswpkgsyslog.upgrade.${PKG} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Fri Nov 6 09:34:23 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 06 Nov 2009 08:34:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7139] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7139 http://gar.svn.sourceforge.net/gar/?rev=7139&view=rev Author: idogan23 Date: 2009-11-06 08:34:23 +0000 (Fri, 06 Nov 2009) Log Message: ----------- mGAR v2: Force /opt/csw/bin to be in the PATH to search for $MAKE Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-11-06 02:10:32 UTC (rev 7138) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-11-06 08:34:23 UTC (rev 7139) @@ -671,7 +671,7 @@ $(if $(PACKAGING_HOST_$P),\ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ $(MAKE) PLATFORM=$P _package && ,\ - $(SSH) -t $(PACKAGING_HOST_$P) "$(MAKE) -C $(CURDIR) PLATFORM=$P _package" && \ + $(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) PLATFORM=$P _package" && \ ),\ $(error *** No host has been defined for platform $P)\ )\ @@ -685,7 +685,7 @@ echo " (built on this host)";\ $(MAKE) -s PLATFORM=$P _pkgshow;echo;,\ echo " (built on host '$(PACKAGING_HOST_$P)')";\ - $(SSH) $(PACKAGING_HOST_$P) "$(MAKE) -C $(CURDIR) -s PLATFORM=$P _pkgshow";echo;\ + $(SSH) $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) -s PLATFORM=$P _pkgshow";echo;\ )\ ) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Fri Nov 6 11:14:53 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 06 Nov 2009 10:14:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[7140] csw/mgar/pkg/openssl/trunk Message-ID: Revision: 7140 http://gar.svn.sourceforge.net/gar/?rev=7140&view=rev Author: chninkel Date: 2009-11-06 10:14:52 +0000 (Fri, 06 Nov 2009) Log Message: ----------- openssl: followed some dago's advices Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile csw/mgar/pkg/openssl/trunk/checksums csw/mgar/pkg/openssl/trunk/files/CSWossl.prototype csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386 csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386 csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype Added Paths: ----------- csw/mgar/pkg/openssl/trunk/files/more_configure_targets.patch Removed Paths: ------------- csw/mgar/pkg/openssl/trunk/files/oldlibs.list.0.9.7m-i386 csw/mgar/pkg/openssl/trunk/files/oldlibs.list.0.9.7m-sparc csw/mgar/pkg/openssl/trunk/files/openssl.0.9.7.patch csw/mgar/pkg/openssl/trunk/files/openssl.0.9.8.patch Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2009-11-06 08:34:23 UTC (rev 7139) +++ csw/mgar/pkg/openssl/trunk/Makefile 2009-11-06 10:14:52 UTC (rev 7140) @@ -14,8 +14,6 @@ GARNAME = openssl GARVERSION = 0.9.8k -OPENSSL_VERSION := $(shell echo $(GARVERSION) | sed -e 's/[a-z]//g') -OPENSSL_RELEASE := $(shell echo $(GARVERSION) | sed -e 's/[^a-z]//g') CATEGORIES = lib DESCRIPTION = The Open Source toolkit for SSL and TLS @@ -53,7 +51,6 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*[a-z]?).tar.gz -DISTNAME = $(GARNAME)-$(GARVERSION) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += CSWossl.prototype DISTFILES += CSWosslrt.checkinstall CSWosslrt.preinstall CSWosslrt.postinstall CSWosslrt.prototype-i386 CSWosslrt.prototype-sparc @@ -63,13 +60,16 @@ DOCFILES = CHANGES CHANGES.SSLeay PROBLEMS README FAQ README.ASN1 INSTALL NEWS README.ENGINE -PATCHFILES = openssl.$(OPENSSL_VERSION).patch +# This patch add optimised build targets for some solaris isa, ie: +# solaris-386-cc, solaris-pentium-cc, solaris-pentium_pro-cc, solaris-sparcv9+vis-cc +PATCHFILES = more_configure_targets.patch ##### Build and installation information ##### GARCOMPILER = SOS11 + # The list of instructions set for which we will # provide optimized libraries and binaries EXTRA_BUILD_ISAS_i386 = pentium_pro amd64 @@ -78,14 +78,15 @@ # we don't yet use isaexec support so we disable # isa relocation for default isa NO_ISAEXEC = 1 + # GAR wants and puts sparcv9 in lib/64 but openssl build system # isn't the standard autoconf/automake one so we disable this # relocation for now ISALIBDIR_sparcv9 = . libdir = /opt/csw/lib -# we redefine the default merge exclude so *.a files are not excluded -MERGE_EXCLUDE_DEFAULT = $(MERGE_EXCLUDE_INFODIR) +# we include *.a files in the devel package so we don't want them excluded +MERGE_EXCLUDE_STATICLIBS = # The corresponding os/compiler to pass to the # openssl Configure script @@ -117,24 +118,10 @@ # we include previous release of libraries file for comptability purpose OLDLIBS = 0.9.7m -SKIPTEST = 1 - # support for pkcs11 engine http://blogs.sun.com/chichang1/entry/how_to_integrate_pkcs11_engine ifdef PKCS11 PATCHFILES += pkcs11_engine-0.9.8h.patch.2008-07-29 - ifeq ($(GARCH),sparc) - ifeq ($(ISA),sparcv9) - CONFIGURE_ARGS += --pk11-libname=/usr/lib/sparcv9/libpkcs11.so - else - CONFIGURE_ARGS += --pk11-libname=/usr/lib/libpkcs11.so - endif - else - ifeq ($(ISA),amd64) - CONFIGURE_ARGS += --pk11-libname=/usr/lib/sparcv9/libpkcs11.so - else - CONFIGURE_ARGS += --pk11-libname=/usr/lib/libpkcs11.so - endif - endif + CONFIGURE_ARGS += --pk11-libname=$(abspath /usr/lib/$(MM_LIBDIR)) endif include gar/category.mk @@ -153,12 +140,17 @@ find $(DESTDIR)$(libdir) -name "*.so*" -exec strip -x '{}' ';' install-changelog: - ginstall -D $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/changelog.CSW $(SPKG_PKGBASE)/changelog.CSW + for CATALOGNAME in $(foreach PKG, $(PACKAGES), $(call catalogname,$(PKG))); do \ + ginstall -D $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)/$(docdir)/$$CATALOGNAME/changelog.CSW; \ + done @$(MAKECOOKIE) install-doc: - cd $(WORKSRC_FIRSTMOD)/ && ginstall $(DOCFILES) $(SPKG_PKGBASE)/ - ginstall -D $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/README.CSW $(SPKG_PKGBASE)/README.CSW + for CATALOGNAME in $(foreach PKG, $(PACKAGES), $(call catalogname,$(PKG))); do \ + ginstall -d $(DOCFILES) $(PKGROOT)/$(docdir)/$$CATALOGNAME; \ + (cd $(WORKSRC_FIRSTMOD)/ && ginstall $(DOCFILES) $(PKGROOT)/$(docdir)/$$CATALOGNAME/); \ + ginstall -D $(WORKDIR_FIRSTMOD)/README.CSW $(PKGROOT)/$(docdir)/$$CATALOGNAME/README.CSW; \ + done @$(MAKECOOKIE) install-certs: Modified: csw/mgar/pkg/openssl/trunk/checksums =================================================================== --- csw/mgar/pkg/openssl/trunk/checksums 2009-11-06 08:34:23 UTC (rev 7139) +++ csw/mgar/pkg/openssl/trunk/checksums 2009-11-06 10:14:52 UTC (rev 7140) @@ -1,13 +1,13 @@ -bd9bb4dfb9602fba461b21fa37f97765 CSWossl.prototype -da3116a1d8dfd2bd3e4f2a11f4fb5f8b CSWossldevel.prototype-i386 -bd40fcb60dfef960da30c718b718149d CSWossldevel.prototype-sparc +66ea60c5a5446d9ac900b39bc36f6afa CSWossl.prototype +84293971f7dee23869728b6434b02abe CSWossldevel.prototype-i386 +b5193ec99f643aa22156f62ee965aa82 CSWossldevel.prototype-sparc 05ace5330714d6cd9c0e076b6ae2518f CSWosslrt.checkinstall 1c3f600eaf942a18ecab3637e1fc32bd CSWosslrt.postinstall c9de908daad1a31fca20329cb043ad3c CSWosslrt.preinstall -463d53d6fcab5f33e2e204a831d47ccc CSWosslrt.prototype-i386 +8b14ea8718a295d97ace5d7933a957d1 CSWosslrt.prototype-i386 ec547e9a56e0933a928fd9d505c19333 CSWosslrt.prototype-sparc -89ccb44272d2a4eb33fd4086c3348f3e CSWosslutils.prototype +88634d81695a173bdb35df1a80cc9761 CSWosslutils.prototype b78faa440d6f6a2a07663de331678648 README.CSW 904ceefa66b6b7b7e93ae0e9bc58bac8 changelog.CSW +64f7c3f3a6cae483209b69c31c82557d more_configure_targets.patch e555c6d58d276aec7fdc53363e338ab3 openssl-0.9.8k.tar.gz -64f7c3f3a6cae483209b69c31c82557d openssl.0.9.8.patch Modified: csw/mgar/pkg/openssl/trunk/files/CSWossl.prototype =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWossl.prototype 2009-11-06 08:34:23 UTC (rev 7139) +++ csw/mgar/pkg/openssl/trunk/files/CSWossl.prototype 2009-11-06 10:14:52 UTC (rev 7140) @@ -1,12 +1,12 @@ d none /opt/csw/share/doc/openssl 0755 root bin -f none /opt/csw/share/doc/openssl/changelog.CSW=changelog.CSW 644 root bin -f none /opt/csw/share/doc/openssl/CHANGES=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl/CHANGES.SSLeay=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl/PROBLEMS=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl/README=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl/FAQ=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl/README.ASN1=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl/INSTALL=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl/NEWS=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl/README.ENGINE=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl/README.CSW=README.CSW 644 root bin +f none /opt/csw/share/doc/openssl/changelog.CSW 644 root bin +f none /opt/csw/share/doc/openssl/CHANGES 644 root bin +f none /opt/csw/share/doc/openssl/CHANGES.SSLeay 644 root bin +f none /opt/csw/share/doc/openssl/PROBLEMS 644 root bin +f none /opt/csw/share/doc/openssl/README 644 root bin +f none /opt/csw/share/doc/openssl/FAQ 644 root bin +f none /opt/csw/share/doc/openssl/README.ASN1 644 root bin +f none /opt/csw/share/doc/openssl/INSTALL 644 root bin +f none /opt/csw/share/doc/openssl/NEWS 644 root bin +f none /opt/csw/share/doc/openssl/README.ENGINE 644 root bin +f none /opt/csw/share/doc/openssl/README.CSW 644 root bin Modified: csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386 =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386 2009-11-06 08:34:23 UTC (rev 7139) +++ csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386 2009-11-06 10:14:52 UTC (rev 7140) @@ -1041,14 +1041,14 @@ f none /opt/csw/share/man/man3/ui.3 0644 root bin f none /opt/csw/share/man/man3/ui_compat.3 0644 root bin f none /opt/csw/share/man/man3/x509.3 0644 root bin -f none /opt/csw/share/doc/openssl_devel/changelog.CSW=changelog.CSW 644 root bin -f none /opt/csw/share/doc/openssl_devel/CHANGES=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/CHANGES.SSLeay=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/PROBLEMS=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/README=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/FAQ=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/README.ASN1=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/INSTALL=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/NEWS=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/README.ENGINE=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/README.CSW=README.CSW 644 root bin +f none /opt/csw/share/doc/openssl_devel/changelog.CSW 644 root bin +f none /opt/csw/share/doc/openssl_devel/CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/CHANGES.SSLeay 644 root bin +f none /opt/csw/share/doc/openssl_devel/PROBLEMS 644 root bin +f none /opt/csw/share/doc/openssl_devel/README 644 root bin +f none /opt/csw/share/doc/openssl_devel/FAQ 644 root bin +f none /opt/csw/share/doc/openssl_devel/README.ASN1 644 root bin +f none /opt/csw/share/doc/openssl_devel/INSTALL 644 root bin +f none /opt/csw/share/doc/openssl_devel/NEWS 644 root bin +f none /opt/csw/share/doc/openssl_devel/README.ENGINE 644 root bin +f none /opt/csw/share/doc/openssl_devel/README.CSW 644 root bin Modified: csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc 2009-11-06 08:34:23 UTC (rev 7139) +++ csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc 2009-11-06 10:14:52 UTC (rev 7140) @@ -1041,14 +1041,14 @@ f none /opt/csw/share/man/man3/ui.3 0644 root bin f none /opt/csw/share/man/man3/ui_compat.3 0644 root bin f none /opt/csw/share/man/man3/x509.3 0644 root bin -f none /opt/csw/share/doc/openssl_devel/changelog.CSW=changelog.CSW 644 root bin -f none /opt/csw/share/doc/openssl_devel/CHANGES=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/CHANGES.SSLeay=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/PROBLEMS=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/README=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/FAQ=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/README.ASN1=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/INSTALL=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/NEWS=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/README.ENGINE=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/README.CSW=README.CSW 644 root bin +f none /opt/csw/share/doc/openssl_devel/changelog.CSW 644 root bin +f none /opt/csw/share/doc/openssl_devel/CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/CHANGES.SSLeay 644 root bin +f none /opt/csw/share/doc/openssl_devel/PROBLEMS 644 root bin +f none /opt/csw/share/doc/openssl_devel/README 644 root bin +f none /opt/csw/share/doc/openssl_devel/FAQ 644 root bin +f none /opt/csw/share/doc/openssl_devel/README.ASN1 644 root bin +f none /opt/csw/share/doc/openssl_devel/INSTALL 644 root bin +f none /opt/csw/share/doc/openssl_devel/NEWS 644 root bin +f none /opt/csw/share/doc/openssl_devel/README.ENGINE 644 root bin +f none /opt/csw/share/doc/openssl_devel/README.CSW 644 root bin Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386 =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386 2009-11-06 08:34:23 UTC (rev 7139) +++ csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386 2009-11-06 10:14:52 UTC (rev 7140) @@ -30,14 +30,14 @@ s none /opt/csw/ssl/private=../../../etc/opt/csw/ssl/private d none /etc/opt/csw/ssl/private 0700 root bin s none /opt/csw/etc/ssl/private=../../../../etc/opt/csw/ssl/private -f none /opt/csw/share/doc/openssl_rt/changelog.CSW=changelog.CSW 644 root bin -f none /opt/csw/share/doc/openssl_rt/CHANGES=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_rt/CHANGES.SSLeay=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_rt/PROBLEMS=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_rt/README=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_rt/FAQ=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_rt/README.ASN1=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_rt/INSTALL=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_rt/NEWS=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_rt/README.ENGINE=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_rt/README.CSW=README.CSW 644 root bin +f none /opt/csw/share/doc/openssl_rt/changelog.CSW 644 root bin +f none /opt/csw/share/doc/openssl_rt/CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_rt/CHANGES.SSLeay 644 root bin +f none /opt/csw/share/doc/openssl_rt/PROBLEMS 644 root bin +f none /opt/csw/share/doc/openssl_rt/README 644 root bin +f none /opt/csw/share/doc/openssl_rt/FAQ 644 root bin +f none /opt/csw/share/doc/openssl_rt/README.ASN1 644 root bin +f none /opt/csw/share/doc/openssl_rt/INSTALL 644 root bin +f none /opt/csw/share/doc/openssl_rt/NEWS 644 root bin +f none /opt/csw/share/doc/openssl_rt/README.ENGINE 644 root bin +f none /opt/csw/share/doc/openssl_rt/README.CSW 644 root bin Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype 2009-11-06 08:34:23 UTC (rev 7139) +++ csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype 2009-11-06 10:14:52 UTC (rev 7140) @@ -63,14 +63,14 @@ s none /opt/csw/ssl/openssl.cnf=/opt/csw/etc/ssl/openssl.cnf 0644 root bin d none /opt/csw/etc/ssl 0755 root bin f cswpreserveconf /opt/csw/etc/ssl/openssl.cnf.CSW 0644 root bin -f none /opt/csw/share/doc/openssl_utils/changelog.CSW=changelog.CSW 644 root bin -f none /opt/csw/share/doc/openssl_utils/CHANGES=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_utils/CHANGES.SSLeay=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_utils/PROBLEMS=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_utils/README=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_utils/FAQ=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_utils/README.ASN1=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_utils/INSTALL=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_utils/NEWS=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_utils/README.ENGINE=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_utils/README.CSW=README.CSW 644 root bin +f none /opt/csw/share/doc/openssl_utils/changelog.CSW 644 root bin +f none /opt/csw/share/doc/openssl_utils/CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_utils/CHANGES.SSLeay 644 root bin +f none /opt/csw/share/doc/openssl_utils/PROBLEMS 644 root bin +f none /opt/csw/share/doc/openssl_utils/README 644 root bin +f none /opt/csw/share/doc/openssl_utils/FAQ 644 root bin +f none /opt/csw/share/doc/openssl_utils/README.ASN1 644 root bin +f none /opt/csw/share/doc/openssl_utils/INSTALL 644 root bin +f none /opt/csw/share/doc/openssl_utils/NEWS 644 root bin +f none /opt/csw/share/doc/openssl_utils/README.ENGINE 644 root bin +f none /opt/csw/share/doc/openssl_utils/README.CSW 644 root bin Copied: csw/mgar/pkg/openssl/trunk/files/more_configure_targets.patch (from rev 7128, csw/mgar/pkg/openssl/trunk/files/openssl.0.9.8.patch) =================================================================== --- csw/mgar/pkg/openssl/trunk/files/more_configure_targets.patch (rev 0) +++ csw/mgar/pkg/openssl/trunk/files/more_configure_targets.patch 2009-11-06 10:14:52 UTC (rev 7140) @@ -0,0 +1,26 @@ +diff -ur openssl-0.9.8i.orig/Configure openssl-0.9.8i/Configure +--- openssl-0.9.8i.orig/Configure 2008-09-12 16:47:00.000000000 +0200 ++++ openssl-0.9.8i/Configure 2008-09-26 21:39:48.373741600 +0200 +@@ -199,8 +199,12 @@ + "solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN -DMD32_REG_T=int::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + + #### Solaris x86 with Sun C setups +-"solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +-"solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"solaris-x86-cc","cc:-fast -xdepend=no -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"solaris-386-cc","cc:-fast -xdepend=no -xarch=386 -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR ++RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"solaris-pentium-cc","cc:-fast -xdepend=no -xpentium -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"solaris-pentium_pro-cc","cc:-fast -xdepend=no -xarch=pentium_pro -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"solaris64-x86_64-cc","cc:-fast -xdepend=no -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + + #### SPARC Solaris with GNU C setups + "solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +@@ -219,6 +223,7 @@ + "solaris-sparcv7-cc","cc:-xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "solaris-sparcv8-cc","cc:-xarch=v8 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "solaris-sparcv9-cc","cc:-xtarget=ultra -xarch=v8plus -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"solaris-sparcv9+vis-cc","cc:-xtarget=ultra -xarch=v8plusa -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:::des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-KPIC:-xarch=v9 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs", + #### + "debug-solaris-sparcv8-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG_ALL -xarch=v8 -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8.o::::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", Deleted: csw/mgar/pkg/openssl/trunk/files/oldlibs.list.0.9.7m-i386 =================================================================== --- csw/mgar/pkg/openssl/trunk/files/oldlibs.list.0.9.7m-i386 2009-11-06 08:34:23 UTC (rev 7139) +++ csw/mgar/pkg/openssl/trunk/files/oldlibs.list.0.9.7m-i386 2009-11-06 10:14:52 UTC (rev 7140) @@ -1,4 +0,0 @@ -opt/csw/lib/libcrypto.so.0.9.7 -opt/csw/lib/libssl.so.0.9.7 -opt/csw/lib/pentium_pro/libcrypto.so.0.9.7 -opt/csw/lib/pentium_pro/libssl.so.0.9.7 Deleted: csw/mgar/pkg/openssl/trunk/files/oldlibs.list.0.9.7m-sparc =================================================================== --- csw/mgar/pkg/openssl/trunk/files/oldlibs.list.0.9.7m-sparc 2009-11-06 08:34:23 UTC (rev 7139) +++ csw/mgar/pkg/openssl/trunk/files/oldlibs.list.0.9.7m-sparc 2009-11-06 10:14:52 UTC (rev 7140) @@ -1,6 +0,0 @@ -opt/csw/lib/libcrypto.so.0.9.7 -opt/csw/lib/libssl.so.0.9.7 -opt/csw/lib/sparcv8plus+vis/libcrypto.so.0.9.7 -opt/csw/lib/sparcv8plus+vis/libssl.so.0.9.7 -opt/csw/lib/sparcv9/libcrypto.so.0.9.7 -opt/csw/lib/sparcv9/libssl.so.0.9.7 Deleted: csw/mgar/pkg/openssl/trunk/files/openssl.0.9.7.patch =================================================================== --- csw/mgar/pkg/openssl/trunk/files/openssl.0.9.7.patch 2009-11-06 08:34:23 UTC (rev 7139) +++ csw/mgar/pkg/openssl/trunk/files/openssl.0.9.7.patch 2009-11-06 10:14:52 UTC (rev 7140) @@ -1,68 +0,0 @@ -diff --speed-large-files --minimal -Nru openssl-0.9.7m.orig/Configure openssl-0.9.7m/Configure ---- openssl-0.9.7m.orig/Configure 2007-02-22 17:30:49.000000000 -0500 -+++ openssl-0.9.7m/Configure 2007-05-08 10:48:55.638232000 -0400 -@@ -180,8 +180,11 @@ - "solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN -DMD32_REG_T=int::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:asm/x86_64-gcc.o::::::asm/rc4-x86_64.o:::dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - - #### Solaris x86 with Sun C setups --"solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", --"solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL::::::::::dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"solaris-x86-cc","cc:-fast -xdepend=no -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"solaris-386-cc","cc:-fast -xdepend=no -xarch=386 -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"solaris-pentium-cc","cc:-fast -xdepend=no -xpentium -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"solaris-pentium_pro-cc","cc:-fast -xdepend=no -xarch=pentium_pro -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"solaris64-x86_64-cc","cc:-fast -xdepend=no -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL::::::::::dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - - #### SPARC Solaris with GNU C setups - "solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -@@ -207,6 +210,7 @@ - "solaris-sparcv7-cc","cc:-xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "solaris-sparcv8-cc","cc:-xarch=v8 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "solaris-sparcv9-cc","cc:-xtarget=ultra -xarch=v8plus -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"solaris-sparcv9+vis-cc","cc:-xtarget=ultra -xarch=v8plusa -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::asm/md5-sparcv9.o::::::dlfcn:solaris-shared:-KPIC:-xarch=v9 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs", - #### - "debug-solaris-sparcv8-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xarch=v8 -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -diff -ur openssl-0.9.7m.orig/ssl/ssl_lib.c openssl-0.9.7m/ssl/ssl_lib.c ---- openssl-0.9.7m.orig/ssl/ssl_lib.c 2006-09-28 07:53:51.000000000 -0400 -+++ openssl-0.9.7m/ssl/ssl_lib.c 2007-10-03 03:51:42.100016000 -0400 -@@ -1169,7 +1169,6 @@ - char *SSL_get_shared_ciphers(const SSL *s,char *buf,int len) - { - char *p; -- const char *cp; - STACK_OF(SSL_CIPHER) *sk; - SSL_CIPHER *c; - int i; -@@ -1182,20 +1181,21 @@ - sk=s->session->ciphers; - for (i=0; iname; *cp; ) -+ n=strlen(c->name); -+ if (n+1 > len) - { -- if (len-- <= 0) -- { -- *p='\0'; -- return(buf); -- } -- else -- *(p++)= *(cp++); -+ if (p != buf) -+ --p; -+ *p='\0'; -+ return buf; - } -+ strcpy(p,c->name); -+ p+=n; - *(p++)=':'; -+ len-=n+1; - } - p[-1]='\0'; - return(buf); Deleted: csw/mgar/pkg/openssl/trunk/files/openssl.0.9.8.patch =================================================================== --- csw/mgar/pkg/openssl/trunk/files/openssl.0.9.8.patch 2009-11-06 08:34:23 UTC (rev 7139) +++ csw/mgar/pkg/openssl/trunk/files/openssl.0.9.8.patch 2009-11-06 10:14:52 UTC (rev 7140) @@ -1,26 +0,0 @@ -diff -ur openssl-0.9.8i.orig/Configure openssl-0.9.8i/Configure ---- openssl-0.9.8i.orig/Configure 2008-09-12 16:47:00.000000000 +0200 -+++ openssl-0.9.8i/Configure 2008-09-26 21:39:48.373741600 +0200 -@@ -199,8 +199,12 @@ - "solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN -DMD32_REG_T=int::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - - #### Solaris x86 with Sun C setups --"solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", --"solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"solaris-x86-cc","cc:-fast -xdepend=no -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"solaris-386-cc","cc:-fast -xdepend=no -xarch=386 -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR -+RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"solaris-pentium-cc","cc:-fast -xdepend=no -xpentium -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"solaris-pentium_pro-cc","cc:-fast -xdepend=no -xarch=pentium_pro -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"solaris64-x86_64-cc","cc:-fast -xdepend=no -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - - #### SPARC Solaris with GNU C setups - "solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -@@ -219,6 +223,7 @@ - "solaris-sparcv7-cc","cc:-xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "solaris-sparcv8-cc","cc:-xarch=v8 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "solaris-sparcv9-cc","cc:-xtarget=ultra -xarch=v8plus -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"solaris-sparcv9+vis-cc","cc:-xtarget=ultra -xarch=v8plusa -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:::des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-KPIC:-xarch=v9 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs", - #### - "debug-solaris-sparcv8-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG_ALL -xarch=v8 -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8.o::::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 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 Nov 6 11:56:47 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 06 Nov 2009 10:56:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[7141] csw/mgar/pkg/mysql5/branches/mysql-5.0.x Message-ID: Revision: 7141 http://gar.svn.sourceforge.net/gar/?rev=7141&view=rev Author: wahwah Date: 2009-11-06 10:56:47 +0000 (Fri, 06 Nov 2009) Log Message: ----------- mysql5-5.0.x: Adjusting the quick start file, adjusting the startup script, shuffling files around the packages (mysql_config in mysql5devel), adding symlinks from /opt/csw/include/mysql and /opt/csw/lib/mysql Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/ChangeLog csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW Removed Paths: ------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW Property Changed: ---------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-11-06 10:14:52 UTC (rev 7140) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-11-06 10:56:47 UTC (rev 7141) @@ -70,16 +70,39 @@ CSWmysql5client_programs += perror CSWmysql5client_programs += replace +CSWmysql5devel_programs += mysql_config + PKGFILES_CSWmysql5bench = $(prefix)/sql-bench.* PKGFILES_CSWmysql5client = $(bindir) PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(call baseisadirs,$(bindir),$(bin_name))) PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(mandir)/man1/$(bin_name)\.1) PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),/opt/csw/bin/$(bin_name)) PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),/opt/csw/sbin/$(bin_name)) -PKGFILES_CSWmysql5devel += $(call baseisadirs,$(bindir),mysql_config) +PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),$(call baseisadirs,$(bindir),$(bin_name))) +PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),$(mandir)/man1/$(bin_name)\.1) +PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),/opt/csw/bin/$(bin_name)) +PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),/opt/csw/sbin/$(bin_name)) PKGFILES_CSWmysql5devel += $(mandir)/man1/mysql_config\.1 -PKGFILES_CSWmysql5devel = $(prefix)/include.* +PKGFILES_CSWmysql5devel += $(prefix)/include.* +PKGFILES_CSWmysql5devel += /opt/csw/include/mysql + +# -/opt/csw/include/mysql --> ../mysql5/include/mysql +# -/opt/csw/mysql5/bin +# -/opt/csw/mysql5/bin/mysql_config +# +# /opt/csw/bin/mysql_config=../mysql5/bin/mysql_config +# /opt/csw/mysql5/bin/amd64/mysql_config 0755 root bin +# /opt/csw/mysql5/bin/i386/mysql_config=/opt/csw/mysql5/bin/mysql_config 0755 root bin +# /opt/csw/mysql5/bin/mysql_config=/opt/csw/bin/isaexec 0755 root bin +# /opt/csw/mysql5/share/man/man1/mysql_config.1 0644 root bin + + +# work/build-global/CSWmysql5client.prototype:s none /opt/csw/bin/mysql_config=../mysql5/bin/mysql_config +# work/build-global/CSWmysql5client.prototype:f none /opt/csw/mysql5/bin/amd64/mysql_config 0755 root bin +# work/build-global/CSWmysql5client.prototype:f none /opt/csw/mysql5/bin/mysql_config 0755 root bin +# work/build-global/CSWmysql5client.prototype:f none /opt/csw/mysql5/share/man/man1/mysql_config.1 0644 root bin + PKGFILES_CSWmysql5rt = $(prefix)/lib/.*\.so.* PKGFILES_CSWmysql5test = $(prefix)/mysql-test.* @@ -91,7 +114,7 @@ MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.0/ DISTFILES = mysql-$(GARVERSION).tar.gz -DISTFILES += cswmysql5 quick_start-csw README.CSW +DISTFILES += cswmysql5 quick_start-csw README.CSW ChangeLog DISTFILES += CSWmysql5.preinstall DISTFILES += CSWmysql5.postinstall DISTFILES += cswusergroup @@ -101,13 +124,8 @@ REQUIRED_PKGS = CSWncurses CSWzlib PREREQUISITE_PKGS = $(REQUIRED_PKGS) -# because we alter the prefix. this gets us proper linking as well as -# LD_OPTIONS (RPATH) -# EXTRA_LIB = /opt/csw/lib -# EXTRA_INC = /opt/csw/include EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ -# EXTRA_LIB = /opt/csw/mysql5/lib/$$ISALIST/mysql # Set ./configure options CONFIGURE_ARGS = $(DIRPATHS) @@ -122,6 +140,7 @@ CONFIGURE_ARGS += --with-ssl=/opt/csw CONFIGURE_ARGS += --with-plugins=max-no-ndb +# TODO: Make the tests pass. They don't at the moment. TEST_SCRIPTS = # Enable 64 bits build @@ -143,6 +162,7 @@ post-install-modulated: ginstall -m 755 -d $(DESTDIR)$(localstatedir) ginstall -m 755 -d $(DESTDIR)$(datadir)/mysql/doc + ginstall -m 644 $(FILEDIR)/ChangeLog $(DESTDIR)$(datadir)/mysql/doc ginstall -m 644 $(FILEDIR)/README.CSW $(DESTDIR)$(datadir)/mysql/doc ginstall -m 755 -d $(DESTDIR)/opt/csw/share/mysql/doc ln -sf ../../../mysql5/share/mysql/doc/README.CSW \ @@ -153,8 +173,10 @@ ginstall -m 755 -d $(DESTDIR)$(global_sysconfdir)/pkg/CSWmysql5 ginstall -m 644 $(FILEDIR)/cswusergroup \ $(DESTDIR)$(global_sysconfdir)/pkg/CSWmysql5 - - # Create symlinks + # A symlink for mysql5 include files + ginstall -m 755 -d $(DESTDIR)/opt/csw/include + ln -s ../mysql5/include/mysql $(DESTDIR)/opt/csw/include/mysql + # Create symlinks to binaries ginstall -m 755 -d $(DESTDIR)$(global_bindir) for f in $(DESTDIR)$(bindir)/*; do \ ln -s ../mysql5/bin/`basename $$f` $(DESTDIR)$(global_bindir)/`basename $$f`; \ Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-11-06 10:14:52 UTC (rev 7140) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-11-06 10:56:47 UTC (rev 7141) @@ -1,11 +1,12 @@ -a0b98a7320bce2da3e1f90da704d3c85 download/0001-Use-libc-not-libcrypt.patch -1414d06fab1530484a508927a0de4154 download/0002-cast-user_info-pw_gid-to-gid_t.patch -5415f365f1b0f7a179d1efc25f45bbee download/0003-OpenCSW-perl-for-tests.patch -8ab232cd4d232b3cda3bbced93f80237 download/0004-basedir-and-datadir-in-the-cnf-files.patch -9b5511de728fec4394eca7dd0097fb43 download/CSWmysql5.postinstall -cc2a219abbe7dc6049775cff070a27a5 download/CSWmysql5.preinstall -70d7860bfa776dfc5510fc11d7c14203 download/README.CSW -9e86a7c581edf83eac11ceb827c318a2 download/cswmysql5 -67228e1f096fe08a94f4267439a4ec36 download/cswusergroup -671348f1a5b078da9ca76f97e1fda325 download/mysql-5.0.84.tar.gz -52ad413f019717b89bd5aa33babdedc3 download/quick_start-csw +a0b98a7320bce2da3e1f90da704d3c85 0001-Use-libc-not-libcrypt.patch +1414d06fab1530484a508927a0de4154 0002-cast-user_info-pw_gid-to-gid_t.patch +5415f365f1b0f7a179d1efc25f45bbee 0003-OpenCSW-perl-for-tests.patch +8ab232cd4d232b3cda3bbced93f80237 0004-basedir-and-datadir-in-the-cnf-files.patch +9b5511de728fec4394eca7dd0097fb43 CSWmysql5.postinstall +cc2a219abbe7dc6049775cff070a27a5 CSWmysql5.preinstall +e691b0cf00a3925ac55c1844045d6e30 ChangeLog +e42afb5ec1b1ab02d2ec3b46d0922636 README.CSW +33387959f9de060dc0af915c9c49bca8 cswmysql5 +67228e1f096fe08a94f4267439a4ec36 cswusergroup +671348f1a5b078da9ca76f97e1fda325 mysql-5.0.84.tar.gz +ca622220c7c3ab7427eb1604ddecded6 quick_start-csw Copied: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/ChangeLog (from rev 7097, csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW) =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/ChangeLog (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/ChangeLog 2009-11-06 10:56:47 UTC (rev 7141) @@ -0,0 +1,37 @@ +2009-11-05 Maciej Blizi?ski + + * Makefile: Reworked the package from ground up, using GAR. + +2007-06-17 Alex Moore + + * Version 5.1: MySQL 5.1 is still in beta. This package is released + for your testing only. + +2007-06-03 Alex Moore + + * Startup script: This update fixes a startup script problem that + caused the script to not work when --datadir is not the default. This + update also adds amd64 mysqld and client libraries. + +2006-12-29 Alex Moore + + * csw.conf: This update adds support for csw.conf. See the following + url for details. http://www.blastwave.org/standards/csw.conf.html The + daemon specific name for this package is mysql5. + *** IMPORTANT *** + If you are using mysql5rc; please move your options to my.cnf and + eliminate mysql5rc. A future release will remove mysql5rc. my.cnf is + more flexible and any new or missing options will not be added to + mysql5rc. quick_start-csw is changed with this release to Not write + mysql5rc. Options for --basedir and --datadir are included in the + default my.cnf files. + *** END OF IMPORTANT *** + +2006-04-16 Alex Moore + + * quick_start-csw: This update fixes some problems with + quick_start-csw and svc-mysql5. I have also corrected some issues + when using a database directory that is not /opt/csw/mysql5/var If you + are not using the default location for --datadir, package installation + will NOT start CSWmysql5. More code is needed for that. I welcome + patches. Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW 2009-11-06 10:14:52 UTC (rev 7140) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW 2009-11-06 10:56:47 UTC (rev 7141) @@ -1,62 +0,0 @@ -2007-06-17 -MySQL 5.1 is still in beta. This package is released for your testing -only. - -2007-06-03 -This update fixes a startup script problem that caused the script to not -work when --datadir is not the default. - -This update also adds amd64 mysqld and client libraries. - -2006-12-29 -This update adds support for csw.conf. See the following url for details. -http://www.blastwave.org/standards/csw.conf.html -The daemon specific name for this package is mysql5. - -*** IMPORTANT *** -If you are using mysql5rc; please move your options to my.cnf and eliminate - mysql5rc. A future release will remove mysql5rc. -my.cnf is more flexible and any new or missing options will not be added to - mysql5rc. -quick_start-csw is changed with this release to Not write mysql5rc. Options - for --basedir and --datadir are included in the default my.cnf files. -*** END OF IMPORTANT *** - -2006-04-16 -This update fixes some problems with quick_start-csw and svc-mysql5. -I have also corrected some issues when using a database directory that - is not /opt/csw/mysql5/var - -If you are not using the default location for --datadir, package installation - will NOT start CSWmysql5. More code is needed for that. I welcome patches. - -If you are not using the default location for --datadir, you will find - that CSWmysql5 works much better when you create /etc/my.cnf with at - least the entries that follow. You may also want some entries in this - global options file for client programs that you use. - For example: --datadir is /db/mysql5/var - Create /etc/my.cnf with the following entries: - # Global MySQL options file. - [mysqld] - datadir = /db/mysql5/var - basedir = /opt/csw/mysql5 - -I also changed the option for --defaults-file to --defaults-extra-file - in the startup script. - This allows your options file to be read after the global options file - /etc/my.cnf. - -Note that if you are using the default location for --datadir, you do not - really need /etc/opt/csw/mysql5rc. In this case, you should put any options - in the appropriate group in my.cnf. See the MySQL documentation for - details. -If you are not using the default location for --datadir, you only need - /etc/opt/csw/mysql5rc for the startup script options for - --defaults-extra-file and possibly --pid-file. All other options may be - put in the appropriate group in my.cnf - -Click 'Views and info' on the package page at - http://www.blastwave.org/packages.php/mysql5 -for the latest information. - -Alex Moore Added: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW 2009-11-06 10:56:47 UTC (rev 7141) @@ -0,0 +1,58 @@ +MySQL 5 OpenCSW package +======================= + +* http://www.opencsw.org/packages/mysql5 + +The package has been reworked from the ground up, using GAR. Up until this +moment, the mysql5 package was in the version from before the fork. The new +packages are created so that they are as close to the original ones as +possible, but some changes are inevitable, and some other changes were +considered necessary. + +* Read only /opt/csw support + - data in /var/opt/csw + - configuration in /etc/opt/csw +* The prefix is still /opt/csw/mysql5, but all the binaries are now linked from + /opt/csw, so that the standard PATH setting allows to use them +* The startup script is now in /etc/opt/csw/init.d +* SMF support is handled by cswclassutils + + +Here are the old notes from the previous maintainer, Alex Moore: + +--------------8<----------------8<--------------------8<------------------------ + +If you are not using the default location for --datadir, package installation + will NOT start CSWmysql5. More code is needed for that. I welcome patches. + +If you are not using the default location for --datadir, you will find + that CSWmysql5 works much better when you create /etc/my.cnf with at + least the entries that follow. You may also want some entries in this + global options file for client programs that you use. + For example: --datadir is /db/mysql5/var + Create /etc/my.cnf with the following entries: + # Global MySQL options file. + [mysqld] + datadir = /db/mysql5/var + basedir = /opt/csw/mysql5 + +I also changed the option for --defaults-file to --defaults-extra-file + in the startup script. + This allows your options file to be read after the global options file + /etc/my.cnf. + +Note that if you are using the default location for --datadir, you do not + really need /etc/opt/csw/mysql5rc. In this case, you should put any options + in the appropriate group in my.cnf. See the MySQL documentation for + details. + +If you are not using the default location for --datadir, you only need + /etc/opt/csw/mysql5rc for the startup script options for + --defaults-extra-file and possibly --pid-file. All other options may be + put in the appropriate group in my.cnf + +Click 'Views and info' on the package page at + http://www.opencsw.org/packages.php/mysql5 +for the latest information. + +Alex Moore Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 2009-11-06 10:14:52 UTC (rev 7140) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 2009-11-06 10:56:47 UTC (rev 7141) @@ -1,30 +1,33 @@ #!/bin/sh -# Start script for CSW www.blastwave.org package of MySQL database. # -# NOTE: Make sure DB_DIR is owned BY the mysql user and group and chmod +# $Id$ +# Start script for MySQL database. +# +# NOTE: Make sure DB_DIR is owned BY the mysql user and group and chmod # 700. # # First time installation can use quick_start-csw in # /opt/csw/mysql5/share/mysql to build the mysql database for the # grant tables. Or create the initial database yourself. # -# Use my.cnf for startup options. See MySQL documention +# Use my.cnf for startup options. See MySQL documention # for 'Using Option Files'. # Support for mysql5rc still remains in this startup script. # RETVAL=0 MYSQLHOME=/opt/csw/mysql5 -MYSQLD_DATADIR=/var/opt/csw/mysql5 -MYSQLD_PID_FILE=$MYSQLHOME/var/mysql.pid -CONFFILE=$MYSQLHOME/my.cnf +MYSQL_VAR=/var/opt/csw/mysql5 +MYSQLD_DATADIR=$MYSQL_VAR +MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid +CONFFILE=$MYSQL_VAR/my.cnf # # Source configuration [ -r /opt/csw/mysql5/etc/mysql5rc ] && . /opt/csw/mysql5/etc/mysql5rc [ -r /etc/opt/csw/mysql5rc ] && . /etc/opt/csw/mysql5rc -# To get started quickly, copy a sample configuration file from +# To get started quickly, copy a sample configuration file from # $MYSQLHOME/share/mysql # For example, # cp /opt/csw/mysql5/share/mysql/my-medium.cnf /opt/csw/mysql5/var/my.cnf @@ -42,95 +45,95 @@ fi # If CONFFILE is the server default file, unset CONFFILE -if [ x"$CONFFILE" = x"$MYSQLHOME/my.cnf" ]; then +if [ x"$CONFFILE" = x"$MYSQL_VAR/my.cnf" ]; then CONFFILE= fi # If MYSQLD_DATADIR does not contain a mysql directory, unset MYSQLD_DATADIR # Also, check that MYSQLD_DATADIR contains a mysql directory -if [ ! -d "$MYSQLHOME/var/mysql" -a ! -d "$MYSQLD_DATADIR/mysql" ] ; then +if [ ! -d "$MYSQL_VAR/mysql" -a ! -d "$MYSQLD_DATADIR/mysql" ] ; then MYSQLD_DATADIR= fi # Make sure required vars are set -MYSQLD_PID_FILE=${MYSQLD_PID_FILE:=$MYSQLHOME/var/mysql.pid} +MYSQLD_PID_FILE=${MYSQLD_PID_FILE:=$MYSQL_VAR/mysql.pid} # If a database already exists, start whether or not there is a conf file. # If no conf file, the database will just use internal defaults for everything. start_it() { if test -r $MYSQLD_PID_FILE ; then - if kill -0 `cat $MYSQLD_PID_FILE` > /dev/null 2>&1 ; then - echo "mysqld (`cat $MYSQLD_PID_FILE`) seems to be running." - return 1 - fi + if kill -0 `cat $MYSQLD_PID_FILE` > /dev/null 2>&1 ; then + echo "mysqld (`cat $MYSQLD_PID_FILE`) seems to be running." + return 1 + fi fi printf "%-60s" "Starting mysqld: " # 2006-03-11 -# This script no longer creates the default database. You may create the +# This script no longer creates the default database. You may create the # default database manually or use /opt/csw/mysql5/share/mysql/quick_start-csw # if [ ! -d "$MYSQLHOME/var/mysql" ] ; then # echo MySQL core database has not been created. # echo Creating it now... -# $MYSQLHOME/bin/mysql_install_db -# chown -R mysql:mysql $MYSQLHOME/var +# $MYSQLHOME/bin/mysql_install_db +# chown -R mysql:mysql $MYSQLHOME/var # fi -# 2006-04-16 --defaults-file is changed to --defaults-extra-file +# 2006-04-16 --defaults-file is changed to --defaults-extra-file $MYSQLHOME/bin/mysqld_safe \ `[ -n "$CONFFILE" ] && echo "--defaults-extra-file=$CONFFILE"` \ - --pid-file=$MYSQLD_PID_FILE \ - `[ -n "$MYSQLD_PROG" ] && echo "--mysqld=$MYSQLD_PROG"` \ - `[ -n "$MYSQLD_ANSI" ] && echo "--ansi"` \ - `[ -n "$MYSQLD_BASEDIR" ] && echo "--basedir=$MYSQLD_BASEDIR"` \ - `[ -n "$MYSQLD_BIG_TABLES" ] && echo "--big-tables"` \ - `[ -n "$MYSQLD_BIND_ADDRESS" ] && echo "--bind-address=$MYSQLD_BIND_ADDRESS"` \ - `[ -n "$MYSQLD_CHARACTER_SETS" ] && echo "--character-sets-dir=$MYSQLD_CHARACTER_SETS"` \ - `[ -n "$MYSQLD_CHROOT" ] && echo "--chroot=$MYSQLD_CHROOT"` \ - `[ -n "$MYSQLD_DATADIR" ] && echo "--datadir=$MYSQLD_DATADIR"` \ - `[ -n "$MYSQLD_DEFAULT_CHARSET" ] && echo "--default-character-set=$MYSQLD_DEFAULT_CHARSET"` \ - `[ -n "$MYSQLD_DEFAULT_TABLE_TYPE" ] && echo "--default-table-type=$MYSQLD_DEFAULT_TABLE_TYPE"` \ - `[ -n "$MYSQLD_DELAY_KEY_WRITE_TABLES" ] && echo "--delay-key-write-for-all-tables"` \ - `[ -n "$MYSQLD_ENABLE_LOCKING" ] && echo "--enable-locking"` \ - `[ -n "$MYSQLD_EXIT_INFO" ] && echo "--exit-info"` \ - `[ -n "$MYSQLD_FLUSH" ] && echo "--flush"` \ - `[ -n "$MYSQLD_INIT_FILE" ] && echo "--init-file=$MYSQLD_INIT_FILE"` \ - `[ -n "$MYSQLD_LANGUAGE" ] && echo "--language=$MYSQLD_LANGUAGE"` \ - `[ -n "$MYSQLD_LOG" ] && echo "--log=$MYSQLD_LOG"` \ - `[ -n "$MYSQLD_LOG_ISAM" ] && echo "--log-isam=$MYSQLD_LOG_ISAM"` \ - `[ -n "$MYSQLD_LOG_SLOW_QUERIES" ] && echo "--log-slow-queries=$MYSQLD_LOG_SLOW_QUERIES"` \ - `[ -n "$MYSQLD_LOG_UPDATE" ] && echo "--log-update=$MYSQLD_LOG_UPDATE"` \ - `[ -n "$MYSQLD_LOG_LONG_FORMAT" ] && echo "--log-long-format"` \ - `[ -n "$MYSQLD_LOW_PRIORITY_UPDATES" ] && echo "--low-priority-updates"` \ - `[ -n "$MYSQLD_MEMLOCK" ] && echo "--memlock"` \ - `[ -n "$MYSQLD_MYISAM_RECOVER" ] && echo "--myisam-recover=$MYSQLD_MYISAM_RECOVER"` \ - `[ -n "$MYSQLD_PORT" ] && echo "--port=$MYSQLD_PORT"` \ - `[ -n "$MYSQLD_OLD_PROTOCOL" ] && echo "--old-protocol"` \ - `[ -n "$MYSQLD_ONE_THREAD" ] && echo "--one-thread"` \ - `[ -n "$MYSQLD_SET_VARIABLE" ] && echo "--set-variablevar=$MYSQLD_SET_VARIABLE"` \ - `[ -n "$MYSQLD_SKIP_GRANT_TABLES" ] && echo "--skip-grant-tables"` \ - `[ -n "$MYSQLD_SAFE_MODE" ] && echo "--safe-mode"` \ - `[ -n "$MYSQLD_SECURE" ] && echo "--secure"` \ - `[ -n "$MYSQLD_SKIP_CONCURRENT_INSERT" ] && echo "--skip-concurrent-insert"` \ - `[ -n "$MYSQLD_SKIP_DELAY_KEY_WRITE" ] && echo "--skip-delay-key-write"` \ - `[ -n "$MYSQLD_SKIP_LOCKING" ] && echo "--skip-locking"` \ - `[ -n "$MYSQLD_SKIP_NAME_RESOLVE" ] && echo "--skip-name-resolve"` \ - `[ -n "$MYSQLD_SKIP_NETWORKING" ] && echo "--skip-networking"` \ - `[ -n "$MYSQLD_SKIP_NEW" ] && echo "--skip-new"` \ - `[ -n "$MYSQLD_SKIP_HOST_CACHE" ] && echo "--skip-host-cache"` \ - `[ -n "$MYSQLD_SKIP_SHOW_DATABASE" ] && echo "--skip-show-database"` \ - `[ -n "$MYSQLD_SKIP_THREAD_PRIORITY" ] && echo "--skip-thread-priority"` \ - `[ -n "$MYSQLD_SOCKET" ] && echo "--socket=$MYSQLD_SOCKET"` \ - `[ -n "$MYSQLD_TMPDIR" ] && echo "--tmpdir=$MYSQLD_TMPDIR"` \ - `[ -n "$MYSQLD_USER" ] && echo "--user=$MYSQLD_USER"` \ - & >/dev/null 2>&1 + --pid-file=$MYSQLD_PID_FILE \ + `[ -n "$MYSQLD_PROG" ] && echo "--mysqld=$MYSQLD_PROG"` \ + `[ -n "$MYSQLD_ANSI" ] && echo "--ansi"` \ + `[ -n "$MYSQLD_BASEDIR" ] && echo "--basedir=$MYSQLD_BASEDIR"` \ + `[ -n "$MYSQLD_BIG_TABLES" ] && echo "--big-tables"` \ + `[ -n "$MYSQLD_BIND_ADDRESS" ] && echo "--bind-address=$MYSQLD_BIND_ADDRESS"` \ + `[ -n "$MYSQLD_CHARACTER_SETS" ] && echo "--character-sets-dir=$MYSQLD_CHARACTER_SETS"` \ + `[ -n "$MYSQLD_CHROOT" ] && echo "--chroot=$MYSQLD_CHROOT"` \ + `[ -n "$MYSQLD_DATADIR" ] && echo "--datadir=$MYSQLD_DATADIR"` \ + `[ -n "$MYSQLD_DEFAULT_CHARSET" ] && echo "--default-character-set=$MYSQLD_DEFAULT_CHARSET"` \ + `[ -n "$MYSQLD_DEFAULT_TABLE_TYPE" ] && echo "--default-table-type=$MYSQLD_DEFAULT_TABLE_TYPE"` \ + `[ -n "$MYSQLD_DELAY_KEY_WRITE_TABLES" ] && echo "--delay-key-write-for-all-tables"` \ + `[ -n "$MYSQLD_ENABLE_LOCKING" ] && echo "--enable-locking"` \ + `[ -n "$MYSQLD_EXIT_INFO" ] && echo "--exit-info"` \ + `[ -n "$MYSQLD_FLUSH" ] && echo "--flush"` \ + `[ -n "$MYSQLD_INIT_FILE" ] && echo "--init-file=$MYSQLD_INIT_FILE"` \ + `[ -n "$MYSQLD_LANGUAGE" ] && echo "--language=$MYSQLD_LANGUAGE"` \ + `[ -n "$MYSQLD_LOG" ] && echo "--log=$MYSQLD_LOG"` \ + `[ -n "$MYSQLD_LOG_ISAM" ] && echo "--log-isam=$MYSQLD_LOG_ISAM"` \ + `[ -n "$MYSQLD_LOG_SLOW_QUERIES" ] && echo "--log-slow-queries=$MYSQLD_LOG_SLOW_QUERIES"` \ + `[ -n "$MYSQLD_LOG_UPDATE" ] && echo "--log-update=$MYSQLD_LOG_UPDATE"` \ + `[ -n "$MYSQLD_LOG_LONG_FORMAT" ] && echo "--log-long-format"` \ + `[ -n "$MYSQLD_LOW_PRIORITY_UPDATES" ] && echo "--low-priority-updates"` \ + `[ -n "$MYSQLD_MEMLOCK" ] && echo "--memlock"` \ + `[ -n "$MYSQLD_MYISAM_RECOVER" ] && echo "--myisam-recover=$MYSQLD_MYISAM_RECOVER"` \ + `[ -n "$MYSQLD_PORT" ] && echo "--port=$MYSQLD_PORT"` \ + `[ -n "$MYSQLD_OLD_PROTOCOL" ] && echo "--old-protocol"` \ + `[ -n "$MYSQLD_ONE_THREAD" ] && echo "--one-thread"` \ + `[ -n "$MYSQLD_SET_VARIABLE" ] && echo "--set-variablevar=$MYSQLD_SET_VARIABLE"` \ + `[ -n "$MYSQLD_SKIP_GRANT_TABLES" ] && echo "--skip-grant-tables"` \ + `[ -n "$MYSQLD_SAFE_MODE" ] && echo "--safe-mode"` \ + `[ -n "$MYSQLD_SECURE" ] && echo "--secure"` \ + `[ -n "$MYSQLD_SKIP_CONCURRENT_INSERT" ] && echo "--skip-concurrent-insert"` \ + `[ -n "$MYSQLD_SKIP_DELAY_KEY_WRITE" ] && echo "--skip-delay-key-write"` \ + `[ -n "$MYSQLD_SKIP_LOCKING" ] && echo "--skip-locking"` \ + `[ -n "$MYSQLD_SKIP_NAME_RESOLVE" ] && echo "--skip-name-resolve"` \ + `[ -n "$MYSQLD_SKIP_NETWORKING" ] && echo "--skip-networking"` \ + `[ -n "$MYSQLD_SKIP_NEW" ] && echo "--skip-new"` \ + `[ -n "$MYSQLD_SKIP_HOST_CACHE" ] && echo "--skip-host-cache"` \ + `[ -n "$MYSQLD_SKIP_SHOW_DATABASE" ] && echo "--skip-show-database"` \ + `[ -n "$MYSQLD_SKIP_THREAD_PRIORITY" ] && echo "--skip-thread-priority"` \ + `[ -n "$MYSQLD_SOCKET" ] && echo "--socket=$MYSQLD_SOCKET"` \ + `[ -n "$MYSQLD_TMPDIR" ] && echo "--tmpdir=$MYSQLD_TMPDIR"` \ + `[ -n "$MYSQLD_USER" ] && echo "--user=$MYSQLD_USER"` \ + & >/dev/null 2>&1 RETVAL=$? if [ $RETVAL = 0 ] ; then - echo "[ OK ]" + echo "[ OK ]" else - echo "[FAILED]" - return 1 + echo "[FAILED]" + return 1 fi return 0 } @@ -139,16 +142,16 @@ printf "%-60s" "Shutting down mysqld: " if test -f "$MYSQLD_PID_FILE" ; then - pkill mysqld_safe >/dev/null 2>&1 - kill `cat $MYSQLD_PID_FILE` >/dev/null 2>&1 - RETVAL=$? + pkill mysqld_safe >/dev/null 2>&1 + kill `cat $MYSQLD_PID_FILE` >/dev/null 2>&1 + RETVAL=$? else - RETVAL=1 + RETVAL=1 fi if [ $RETVAL = 0 ] ; then - echo "[ OK ]" + echo "[ OK ]" else - echo "[FAILED]" + echo "[FAILED]" fi echo "" return 0 Property changes on: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw 2009-11-06 10:14:52 UTC (rev 7140) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw 2009-11-06 10:56:47 UTC (rev 7141) @@ -1,21 +1,24 @@ #!/bin/ksh -p +# +# $Id$ +# # initial version for blastwave.org by Alex Moore 2006.02.25 # Revised 2006.03.25 - see bug report 0001542 # # This script creates a default database with the small-memory footprint. # Input may be provided for DATADIR and DEFAULTS_FILE -# # BASEDIR=/opt/csw/mysql5 +MYSQL_VAR=/var/opt/csw/mysql5 DEFAULTS_FILE=$BASEDIR/my.cnf -SAVE_DEFAULTS_FILE=$BASEDIR/my.cnf +SAVE_DEFAULTS_FILE=$MYSQL_VAR/my.cnf MYSQLD_USER=mysql # # Provide a default data directory -MYSQLD_DATADIR=/var/opt/csw/mysql5 +MYSQLD_DATADIR=$MYSQL_VAR # echo -echo "This is the blastwave quick start script to setup a MySQL5 database" +echo "This is the start script to setup a MySQL-5 database" echo " directory." echo echo " The base directory is $BASEDIR." @@ -48,11 +51,11 @@ ` || exit $? if [ $usrin = "[default]" ]; then if [ ! -f "$DEFAULTS_FILE" ]; then - IN_DEFAULTS_FILE=$BASEDIR/share/mysql/my-small.cnf - echo "Using $IN_DEFAULTS_FILE to create the options file." + IN_DEFAULTS_FILE=$BASEDIR/share/mysql/my-small.cnf + echo "Using $IN_DEFAULTS_FILE to create the options file." else - IN_DEFAULTS_FILE=$DEFAULTS_FILE - echo "Using $DEFAULTS_FILE as the options file." + IN_DEFAULTS_FILE=$DEFAULTS_FILE + echo "Using $DEFAULTS_FILE as the options file." fi else IN_DEFAULTS_FILE=$usrin Property changes on: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw ___________________________________________________________________ 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 Fri Nov 6 11:57:57 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 06 Nov 2009 10:57:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[7142] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums Message-ID: Revision: 7142 http://gar.svn.sourceforge.net/gar/?rev=7142&view=rev Author: wahwah Date: 2009-11-06 10:57:56 +0000 (Fri, 06 Nov 2009) Log Message: ----------- mysql5-5.0.x: Submitting checksum for files with the Id tag Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-11-06 10:56:47 UTC (rev 7141) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-11-06 10:57:56 UTC (rev 7142) @@ -6,7 +6,7 @@ cc2a219abbe7dc6049775cff070a27a5 CSWmysql5.preinstall e691b0cf00a3925ac55c1844045d6e30 ChangeLog e42afb5ec1b1ab02d2ec3b46d0922636 README.CSW -33387959f9de060dc0af915c9c49bca8 cswmysql5 +aaca748fc044834e71ad544ab293c494 cswmysql5 67228e1f096fe08a94f4267439a4ec36 cswusergroup 671348f1a5b078da9ca76f97e1fda325 mysql-5.0.84.tar.gz -ca622220c7c3ab7427eb1604ddecded6 quick_start-csw +fe747c88f7e6bd6a9636ba8ef2e96871 quick_start-csw 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 Nov 6 13:52:23 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 06 Nov 2009 12:52:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7143] csw/mgar/pkg/doxygen/trunk Message-ID: Revision: 7143 http://gar.svn.sourceforge.net/gar/?rev=7143&view=rev Author: dmichelsen Date: 2009-11-06 12:52:23 +0000 (Fri, 06 Nov 2009) Log Message: ----------- doxygen: Add patch for Solaris iconv Modified Paths: -------------- csw/mgar/pkg/doxygen/trunk/Makefile csw/mgar/pkg/doxygen/trunk/checksums Added Paths: ----------- csw/mgar/pkg/doxygen/trunk/files/0001-Add-suggested-iconv-patch-from-bug-599128.patch Modified: csw/mgar/pkg/doxygen/trunk/Makefile =================================================================== --- csw/mgar/pkg/doxygen/trunk/Makefile 2009-11-06 10:57:56 UTC (rev 7142) +++ csw/mgar/pkg/doxygen/trunk/Makefile 2009-11-06 12:52:23 UTC (rev 7143) @@ -1,31 +1,3 @@ -# Todo (feel free to take over): -# - gmake docs segfaults, check why -# (related to libiconv? Might change with libiconv 1.13+) -# - platform makefile doesn't honor our CCFLAGS -# work/build-isa-i386/doxygen-1.5.9/tmake/lib/solaris-cc/tmake.conf -# results in: CC -c -O2 -I.. -# -# Adding members to index pages... -# Generating style sheet... -# Generating index page... -# Generating page index... -# Segmentation Fault - core dumped -# gmake[1]: *** [all] Error 139 -# gmake[1]: Leaving directory `/home/skayser/mgar/pkg/doxygen/trunk/work/build-isa-i386/doxygen-1.5.9/doc' -# -# $ pstack work/build-isa-i386/doxygen-1.5.9/doc/core -# core 'work/build-isa-i386/doxygen-1.5.9/doc/core' of 20317: /home/skayser/mgar/pkg/doxygen/trunk/work/build-isa-i386/doxygen-1.5.9 -# df945898 iconv (ffffffff, 80478d8, 80478d0, 80478dc, 80478d4) + 38 -# 083d2e52 portable_iconv (ffffffff, 80478d8, 80478d0, 80478dc, 80478d4) + 1a -# 081c1ec2 __1cIHtmlHelpGrecode6MrknIQdDCString__1_ (804790c, 8da4210, 8047910) + 6a -# 081c1fe6 __1cIHtmlHelpPaddContentsItem6Mbpkc222_v_ (8da4210, 0, 8de85a8, 0, 8de85c8, 0) + b2 -# 08198b75 __1cJIndexListHforeach4CbCpkcC2C2C2_6MmJIndexIntf_MTATBTCTDTE_v34567_v_ (85fa380, 81d2af4, 0, 0, 8de85a8, 0, 8de85c8, 0) + 99 -# 081ccec6 __1cOwritePageIndex6FrnKOutputList__v_ (8d97f50) + 372 -# 081920c3 __1cOgenerateOutput6F_v_ () + a27 -# 08169d11 main (1, 8047ad8, 8047ae0) + 2d -# 08169c56 _start () + 7a -# - GARNAME = doxygen GARVERSION = 1.6.1 CATEGORIES = utils @@ -38,6 +10,19 @@ MASTER_SITES = http://ftp.stack.nl/pub/users/dimitri/ DISTFILES = $(GARNAME)-$(GARVERSION).src.tar.gz + +# Patch taken from +# https://bugzilla.gnome.org/show_bug.cgi?id=599128 +PATCHFILES = 0001-Add-suggested-iconv-patch-from-bug-599128.patch + +PACKAGES = CSWdoxygen CSWdoxygendoc + +CATALOGNAME_CSWdoxygen = doxygen +CATALOGNAME_CSWdoxygendoc = doxygen_doc + +SPKG_DESC_CSWdoxygen = A documentation system for programming languages +SPKG_DESC_CSWdoxygendoc = doxygen documentation + SPKG_SOURCEURL = http://www.stack.nl/~dimitri/doxygen/ # We define upstream file regex so we can be notifed of new upstream software release @@ -46,21 +31,23 @@ PREREQUISITE_PKGS = CSWgraphviz2 -CONFIGURE_ARGS = $(subst =, ,$(filter --prefix=% , $(DIRPATHS))) -CONFIGURE_ARGS += --docdir $(docdir) +CONFIGURE_ARGS = --prefix $(prefix) +CONFIGURE_ARGS += --release +CONFIGURE_ARGS += --docdir $(docdir)/doxygen +CONFIGURE_ARGS += --dot /opt/csw/graphviz2/bin/dot CONFIGURE_ARGS += --platform solaris-cc -TEST_SCRIPTS = +TEST_SCRIPTS = +INSTALL_ARGS = install_docs + +PKGFILES_CSWdoxygendoc = $(PKGFILES_DOC) + include gar/category.mk # For 'dot' PATH := $(PATH):/opt/csw/graphviz2/bin post-extract-modulated: - perl -pi -e 'if (/^TMAKE_CXXFLAGS_RELEASE/) { \ - s|= .*|= $(filter-out -I/opt/csw/include, $(CXXFLAGS)) -norunpath|; }' \ - $(WORKSRC)/tmake/lib/solaris-cc/tmake.conf - perl -pi -e 'if (/^TMAKE_CFLAGS_DEBUG/) { s|= .*|= $(filter-out -I/opt/csw/include,$(CFLAGS))|; }' \ - $(WORKSRC)/tmake/lib/solaris-cc/tmake.conf + perl -pi -e ' s,(TMAKE_CFLAGS_RELEASE\s*=\s*)(.*),\1$(filter-out -I/opt/csw/include,$(CFLAGS)),; s,(TMAKE_CXXFLAGS_RELEASE\s*=\s*)(.*),\1$(filter-out -I/opt/csw/include,$(CXXFLAGS)) -norunpath,; ' $(WORKSRC)/tmake/lib/solaris-cc/tmake.conf @$(MAKECOOKIE) Modified: csw/mgar/pkg/doxygen/trunk/checksums =================================================================== --- csw/mgar/pkg/doxygen/trunk/checksums 2009-11-06 10:57:56 UTC (rev 7142) +++ csw/mgar/pkg/doxygen/trunk/checksums 2009-11-06 12:52:23 UTC (rev 7143) @@ -1 +1,2 @@ +699b5b642fe694d7f6f0d142e0394b4d 0001-Add-suggested-iconv-patch-from-bug-599128.patch 2ec343643e134f0d3ce2069420bcb4f0 doxygen-1.6.1.src.tar.gz Added: csw/mgar/pkg/doxygen/trunk/files/0001-Add-suggested-iconv-patch-from-bug-599128.patch =================================================================== --- csw/mgar/pkg/doxygen/trunk/files/0001-Add-suggested-iconv-patch-from-bug-599128.patch (rev 0) +++ csw/mgar/pkg/doxygen/trunk/files/0001-Add-suggested-iconv-patch-from-bug-599128.patch 2009-11-06 12:52:23 UTC (rev 7143) @@ -0,0 +1,25 @@ +From af9b36d8e00b4db23c2d5dfb5657cf12c269d296 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 6 Nov 2009 10:57:44 +0100 +Subject: [PATCH] Add suggested iconv patch from bug #599128 + +--- + src/htmlhelp.cpp | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/htmlhelp.cpp b/src/htmlhelp.cpp +index f120a93..7283eb9 100644 +--- a/src/htmlhelp.cpp ++++ b/src/htmlhelp.cpp +@@ -302,7 +302,7 @@ static QDict s_languageDict; + void HtmlHelp::initialize() + { + const char *str = Config_getString("CHM_INDEX_ENCODING"); +- if(!str) str = "Windows-1250"; ++ if(!str) str = "CP1250"; + m_fromUtf8 = portable_iconv_open(str,"UTF-8"); + + /* open the contents file */ +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Nov 6 14:18:25 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 06 Nov 2009 13:18:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7144] csw/mgar/pkg/wavpack/trunk Message-ID: Revision: 7144 http://gar.svn.sourceforge.net/gar/?rev=7144&view=rev Author: dmichelsen Date: 2009-11-06 13:18:25 +0000 (Fri, 06 Nov 2009) Log Message: ----------- wavpack: Add necessary patch Modified Paths: -------------- csw/mgar/pkg/wavpack/trunk/Makefile csw/mgar/pkg/wavpack/trunk/checksums Added Paths: ----------- csw/mgar/pkg/wavpack/trunk/files/0001-Add-support-for-Sun-Studio-compiler.patch Modified: csw/mgar/pkg/wavpack/trunk/Makefile =================================================================== --- csw/mgar/pkg/wavpack/trunk/Makefile 2009-11-06 12:52:23 UTC (rev 7143) +++ csw/mgar/pkg/wavpack/trunk/Makefile 2009-11-06 13:18:25 UTC (rev 7144) @@ -13,12 +13,19 @@ MASTER_SITES = http://www.wavpack.com/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +PATCHFILES += 0001-Add-support-for-Sun-Studio-compiler.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +REQUIRED_PKGS = CSWiconv + BUILD64 = 1 - +NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) +TEST_TARGET = check + +MERGE_DIRS_isa-extra = $(libdir) + include gar/category.mk Modified: csw/mgar/pkg/wavpack/trunk/checksums =================================================================== --- csw/mgar/pkg/wavpack/trunk/checksums 2009-11-06 12:52:23 UTC (rev 7143) +++ csw/mgar/pkg/wavpack/trunk/checksums 2009-11-06 13:18:25 UTC (rev 7144) @@ -1 +1,2 @@ +a8cbb0b205d3865731e359f24341bd7d 0001-Add-support-for-Sun-Studio-compiler.patch 722f90393b292cd1413e8af8250a3783 wavpack-4.60.0.tar.bz2 Added: csw/mgar/pkg/wavpack/trunk/files/0001-Add-support-for-Sun-Studio-compiler.patch =================================================================== --- csw/mgar/pkg/wavpack/trunk/files/0001-Add-support-for-Sun-Studio-compiler.patch (rev 0) +++ csw/mgar/pkg/wavpack/trunk/files/0001-Add-support-for-Sun-Studio-compiler.patch 2009-11-06 13:18:25 UTC (rev 7144) @@ -0,0 +1,48 @@ +From e4e9a2384beca0d8be8f2742ec5c9b6607b20f10 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 6 Nov 2009 13:49:55 +0100 +Subject: [PATCH] Add support for Sun Studio compiler + +--- + cli/utils.c | 4 ++-- + include/wavpack.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/cli/utils.c b/cli/utils.c +index 6094f52..442685b 100644 +--- a/cli/utils.c ++++ b/cli/utils.c +@@ -16,7 +16,7 @@ + #include + #include + #include +-#elif defined(__GNUC__) ++#elif defined(__GNUC__) || defined(__sun) + #include + #include + #endif +@@ -164,7 +164,7 @@ char *filespec_ext (char *filespec) + // returned. // + ////////////////////////////////////////////////////////////////////////////// + +-#if defined(__GNUC__) && !defined(WIN32) ++#if (defined(__GNUC__) || defined(__sun)) && !defined(WIN32) + + char *filespec_path (char *filespec) + { +diff --git a/include/wavpack.h b/include/wavpack.h +index d264bdc..92caa48 100644 +--- a/include/wavpack.h ++++ b/include/wavpack.h +@@ -33,7 +33,7 @@ typedef float float32_t; + + typedef unsigned char uchar; + +-#if !defined(__GNUC__) || defined(WIN32) ++#if (!defined(__GNUC__) && !defined(__sun)) || defined(WIN32) + typedef unsigned short ushort; + typedef unsigned int uint; + #endif +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Nov 6 14:56:34 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 06 Nov 2009 13:56:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[7145] csw/mgar/pkg/doxygen/trunk/Makefile Message-ID: Revision: 7145 http://gar.svn.sourceforge.net/gar/?rev=7145&view=rev Author: dmichelsen Date: 2009-11-06 13:56:34 +0000 (Fri, 06 Nov 2009) Log Message: ----------- doxygen: Relocate manpage to proper location Modified Paths: -------------- csw/mgar/pkg/doxygen/trunk/Makefile Modified: csw/mgar/pkg/doxygen/trunk/Makefile =================================================================== --- csw/mgar/pkg/doxygen/trunk/Makefile 2009-11-06 13:18:25 UTC (rev 7144) +++ csw/mgar/pkg/doxygen/trunk/Makefile 2009-11-06 13:56:34 UTC (rev 7145) @@ -41,6 +41,8 @@ INSTALL_ARGS = install_docs +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/man,.$(mandir),' + PKGFILES_CSWdoxygendoc = $(PKGFILES_DOC) 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 Fri Nov 6 15:01:38 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 06 Nov 2009 14:01:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[7146] csw/mgar/pkg/memcached/trunk Message-ID: Revision: 7146 http://gar.svn.sourceforge.net/gar/?rev=7146&view=rev Author: dmichelsen Date: 2009-11-06 14:01:38 +0000 (Fri, 06 Nov 2009) Log Message: ----------- memcached: Forward to latest working devel tag Modified Paths: -------------- csw/mgar/pkg/memcached/trunk/Makefile csw/mgar/pkg/memcached/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/memcached/trunk/files/CSWmemcached.depend csw/mgar/pkg/memcached/trunk/files/CSWmemcached.gspec csw/mgar/pkg/memcached/trunk/files/CSWmemcached.prototype csw/mgar/pkg/memcached/trunk/files/Makefile.in csw/mgar/pkg/memcached/trunk/files/daemon.c csw/mgar/pkg/memcached/trunk/files/daemon.h csw/mgar/pkg/memcached/trunk/files/memcached.c csw/mgar/pkg/memcached/trunk/files/memcached.h csw/mgar/pkg/memcached/trunk/files/solaris.diff Modified: csw/mgar/pkg/memcached/trunk/Makefile =================================================================== --- csw/mgar/pkg/memcached/trunk/Makefile 2009-11-06 13:56:34 UTC (rev 7145) +++ csw/mgar/pkg/memcached/trunk/Makefile 2009-11-06 14:01:38 UTC (rev 7146) @@ -1,31 +1,27 @@ GARNAME = memcached -GARVERSION = 1.2.2 +GARVERSION = 1.4.3_rc2_2_g8c0a108 CATEGORIES = net -DESCRIPTION = distributed memory object caching system +DESCRIPTION = Distributed memory object caching system define BLURB memcached is a high-performance, distributed memory object caching system, generic in nature, but intended for use in speeding up dynamic web applications by alleviating database load. endef -MASTER_SITES = http://www.danga.com/memcached/dist/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWmemcached,depend prototype) +MASTER_SITES = http://memcached.googlecode.com/files/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -GARCOMPILER = GNU +SPKG_SOURCEURL = http://www.danga.com/memcached/ -DEPENDS += lib/libevent +PREREQUISITE_PKGS = CSWlibevent-devel +REQUIRED_PKGS = CSWlibevent -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --disable-dependency-tracking -CONFIGURE_ARGS += --with-libevent=$(prefix) +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) -# No test suite -TEST_SCRIPTS = - include gar/category.mk Modified: csw/mgar/pkg/memcached/trunk/checksums =================================================================== --- csw/mgar/pkg/memcached/trunk/checksums 2009-11-06 13:56:34 UTC (rev 7145) +++ csw/mgar/pkg/memcached/trunk/checksums 2009-11-06 14:01:38 UTC (rev 7146) @@ -1,7 +1 @@ -a08851f7fa7b15e92ee6320b7a79c321 download/memcached-1.2.2.tar.gz -b8864491e6eba79a2af3e3b2ad7fae85 download/CSWmemcached.gspec -fb52e1653adbc7d07e97a42dac3bcfee download/CSWmemcached.depend -5625832835a8377d55ab5e5c8791d042 download/CSWmemcached.prototype -c6c43cc3c0da436ba55716d287e0ba44 download/daemon.c -51969a2161c429524dfe4ae1e8b11f7b download/daemon.h -365b8479afe297a36e1491b2500fba3a download/solaris.diff +a2f988a668317fc3cfd91b22b05ab929 memcached-1.4.3_rc2_2_g8c0a108.tar.gz Deleted: csw/mgar/pkg/memcached/trunk/files/CSWmemcached.depend =================================================================== --- csw/mgar/pkg/memcached/trunk/files/CSWmemcached.depend 2009-11-06 13:56:34 UTC (rev 7145) +++ csw/mgar/pkg/memcached/trunk/files/CSWmemcached.depend 2009-11-06 14:01:38 UTC (rev 7146) @@ -1 +0,0 @@ -P CSWlibevent libevent - event notification library Deleted: csw/mgar/pkg/memcached/trunk/files/CSWmemcached.gspec =================================================================== --- csw/mgar/pkg/memcached/trunk/files/CSWmemcached.gspec 2009-11-06 13:56:34 UTC (rev 7145) +++ csw/mgar/pkg/memcached/trunk/files/CSWmemcached.gspec 2009-11-06 14:01:38 UTC (rev 7146) @@ -1,4 +0,0 @@ -%var bitname memcached -%var pkgname CSWmemcached -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/memcached/trunk/files/CSWmemcached.prototype =================================================================== --- csw/mgar/pkg/memcached/trunk/files/CSWmemcached.prototype 2009-11-06 13:56:34 UTC (rev 7145) +++ csw/mgar/pkg/memcached/trunk/files/CSWmemcached.prototype 2009-11-06 14:01:38 UTC (rev 7146) @@ -1,6 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/memcached 0755 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/memcached.1 0644 root bin Deleted: csw/mgar/pkg/memcached/trunk/files/Makefile.in =================================================================== --- csw/mgar/pkg/memcached/trunk/files/Makefile.in 2009-11-06 13:56:34 UTC (rev 7145) +++ csw/mgar/pkg/memcached/trunk/files/Makefile.in 2009-11-06 14:01:38 UTC (rev 7146) @@ -1,446 +0,0 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = - -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = . - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_alias = @build_alias@ -build_triplet = @build@ -host_alias = @host_alias@ -host_triplet = @host@ -target_alias = @target_alias@ -target_triplet = @target@ -CC = @CC@ -HAVE_LIB = @HAVE_LIB@ -LIB = @LIB@ -LTLIB = @LTLIB@ -MAKEINFO = @MAKEINFO@ -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - -bin_PROGRAMS = memcached - -memcached_SOURCES = memcached.c slabs.c items.c memcached.h assoc.c daemon.c - -SUBDIRS = doc -DIST_DIRS = scripts -EXTRA_DIST = doc scripts TODO - -AM_CFLAGS = -DNDEBUG -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = -PROGRAMS = $(bin_PROGRAMS) - - -DEFS = @DEFS@ -I. -I$(srcdir) -I. -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ -lsocket -lresolv -lmalloc -memcached_OBJECTS = memcached.o slabs.o items.o assoc.o daemon.o -memcached_LDADD = $(LDADD) -memcached_DEPENDENCIES = -memcached_LDFLAGS = -CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \ -Makefile.am Makefile.in NEWS TODO aclocal.m4 config.guess config.h.in \ -config.sub configure configure.ac install-sh missing mkinstalldirs - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -SOURCES = $(memcached_SOURCES) -OBJECTS = $(memcached_OBJECTS) - -all: all-redirect -.SUFFIXES: -.SUFFIXES: .S .c .o .s -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status - -$(ACLOCAL_M4): configure.ac - cd $(srcdir) && $(ACLOCAL) - -config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck -$(srcdir)/configure: $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) - cd $(srcdir) && $(AUTOCONF) - -config.h: stamp-h - @if test ! -f $@; then \ - rm -f stamp-h; \ - $(MAKE) stamp-h; \ - else :; fi -stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES= CONFIG_HEADERS=config.h \ - $(SHELL) ./config.status - @echo timestamp > stamp-h 2> /dev/null -$(srcdir)/config.h.in: $(srcdir)/stamp-h.in - @if test ! -f $@; then \ - rm -f $(srcdir)/stamp-h.in; \ - $(MAKE) $(srcdir)/stamp-h.in; \ - else :; fi -$(srcdir)/stamp-h.in: $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOHEADER) - @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null - -mostlyclean-hdr: - -clean-hdr: - -distclean-hdr: - -rm -f config.h - -maintainer-clean-hdr: - -mostlyclean-binPROGRAMS: - -clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) - -distclean-binPROGRAMS: - -maintainer-clean-binPROGRAMS: - -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ - else :; fi; \ - done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - list='$(bin_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ - done - -.c.o: - $(COMPILE) -c $< - -.s.o: - $(COMPILE) -c $< - -.S.o: - $(COMPILE) -c $< - -mostlyclean-compile: - -rm -f *.o core *.core - -clean-compile: - -distclean-compile: - -rm -f *.tab.c - -maintainer-clean-compile: - -memcached: $(memcached_OBJECTS) $(memcached_DEPENDENCIES) - @rm -f memcached - $(LINK) $(memcached_LDFLAGS) $(memcached_OBJECTS) $(memcached_LDADD) $(LIBS) - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. - - at SET_MAKE@ - -all-recursive install-data-recursive install-exec-recursive \ -installdirs-recursive install-recursive uninstall-recursive \ -check-recursive installcheck-recursive info-recursive dvi-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ - rev="$$subdir $$rev"; \ - test "$$subdir" != "." || dot_seen=yes; \ - done; \ - test "$$dot_seen" = "no" && rev=". $$rev"; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done - -tags: TAGS - -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) - -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP)) - -mostlyclean-tags: - -clean-tags: - -distclean-tags: - -rm -f TAGS ID - -maintainer-clean-tags: - -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) - -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - -rm -rf $(distdir) - GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz - mkdir $(distdir)/=build - mkdir $(distdir)/=inst - dc_install_base=`cd $(distdir)/=inst && pwd`; \ - cd $(distdir)/=build \ - && ../configure --srcdir=.. --prefix=$$dc_install_base \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) dist - -rm -rf $(distdir) - @banner="$(distdir).tar.gz is ready for distribution"; \ - dashes=`echo "$$banner" | sed s/./=/g`; \ - echo "$$dashes"; \ - echo "$$banner"; \ - echo "$$dashes" -dist: distdir - -chmod -R a+r $(distdir) - GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) - -rm -rf $(distdir) -dist-all: distdir - -chmod -R a+r $(distdir) - GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) - -rm -rf $(distdir) -distdir: $(DISTFILES) - -rm -rf $(distdir) - mkdir $(distdir) - -chmod 777 $(distdir) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done - for subdir in $(SUBDIRS); do \ - if test "$$subdir" = .; then :; else \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ - || exit 1; \ - fi; \ - done -assoc.o: assoc.c memcached.h -items.o: items.c memcached.h -memcached.o: memcached.c config.h memcached.h -slabs.o: slabs.c memcached.h - -info-am: -info: info-recursive -dvi-am: -dvi: dvi-recursive -check-am: all-am -check: check-recursive -installcheck-am: -installcheck: installcheck-recursive -all-recursive-am: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - -install-exec-am: install-binPROGRAMS -install-exec: install-exec-recursive - -install-data-am: -install-data: install-data-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-recursive -uninstall-am: uninstall-binPROGRAMS -uninstall: uninstall-recursive -all-am: Makefile $(PROGRAMS) config.h -all-redirect: all-recursive-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: installdirs-recursive -installdirs-am: - $(mkinstalldirs) $(DESTDIR)$(bindir) - - -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-hdr mostlyclean-binPROGRAMS \ - mostlyclean-compile mostlyclean-tags \ - mostlyclean-generic - -mostlyclean: mostlyclean-recursive - -clean-am: clean-hdr clean-binPROGRAMS clean-compile clean-tags \ - clean-generic mostlyclean-am - -clean: clean-recursive - -distclean-am: distclean-hdr distclean-binPROGRAMS distclean-compile \ - distclean-tags distclean-generic clean-am - -distclean: distclean-recursive - -rm -f config.status - -maintainer-clean-am: maintainer-clean-hdr maintainer-clean-binPROGRAMS \ - maintainer-clean-compile maintainer-clean-tags \ - maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-recursive - -rm -f config.status - -.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ -mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ -maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ -mostlyclean-compile distclean-compile clean-compile \ -maintainer-clean-compile install-data-recursive \ -uninstall-data-recursive install-exec-recursive \ -uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ -all-recursive check-recursive installcheck-recursive info-recursive \ -dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ -maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \ -install-exec-am install-exec install-data-am install-data install-am \ -install uninstall-am uninstall all-redirect all-am all installdirs-am \ -installdirs mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: Deleted: csw/mgar/pkg/memcached/trunk/files/daemon.c =================================================================== --- csw/mgar/pkg/memcached/trunk/files/daemon.c 2009-11-06 13:56:34 UTC (rev 7145) +++ csw/mgar/pkg/memcached/trunk/files/daemon.c 2009-11-06 14:01:38 UTC (rev 7146) @@ -1,89 +0,0 @@ -/*- - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include -#include -#include - -#ifndef HAVE_DAEMON - -#if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: daemon.c,v 1.2 1996/08/19 08:22:13 tholo Exp $"; -#endif /* LIBC_SCCS and not lint */ - -int -daemon(nochdir, noclose) - int nochdir, noclose; -{ - int fd; - - switch (fork()) { - case -1: - return (-1); - case 0: -#ifdef HAVE_CYGWIN - register_9x_service(); -#endif - break; - default: -#ifdef HAVE_CYGWIN - /* - * This sleep avoids a race condition which kills the - * child process if parent is started by a NT/W2K service. - */ - sleep(1); -#endif - _exit(0); - } - - if (setsid() == -1) - return (-1); - - if (!nochdir) - (void)chdir("/"); - - if (!noclose && (fd = open("/dev/null", O_RDWR, 0)) != -1) { - (void)dup2(fd, STDIN_FILENO); - (void)dup2(fd, STDOUT_FILENO); - (void)dup2(fd, STDERR_FILENO); - if (fd > 2) - (void)close (fd); - } - return (0); -} - -#endif /* !HAVE_DAEMON */ - - -#pragma ident "@(#)daemon.c 1.4 03/11/19 SMI" Deleted: csw/mgar/pkg/memcached/trunk/files/daemon.h =================================================================== --- csw/mgar/pkg/memcached/trunk/files/daemon.h 2009-11-06 13:56:34 UTC (rev 7145) +++ csw/mgar/pkg/memcached/trunk/files/daemon.h 2009-11-06 14:01:38 UTC (rev 7146) @@ -1,4 +0,0 @@ -#ifndef _DAEMON_H -#define _DAEMON_H -int daemon(int, int); -#endif /* _DAEMON_H */ Deleted: csw/mgar/pkg/memcached/trunk/files/memcached.c =================================================================== --- csw/mgar/pkg/memcached/trunk/files/memcached.c 2009-11-06 13:56:34 UTC (rev 7145) +++ csw/mgar/pkg/memcached/trunk/files/memcached.c 2009-11-06 14:01:38 UTC (rev 7146) @@ -1,1553 +0,0 @@ -/* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -/* - * memcached - memory caching daemon - * - * http://www.danga.com/memcached/ - * - * Copyright 2003 Danga Interactive, Inc. All rights reserved. - * - * Use and distribution licensed under the BSD license. See - * the LICENSE file for full text. - * - * Authors: - * Anatoly Vorobey - * Brad Fitzpatrick - * - * $Id: memcached.c,v 1.56 2005/04/05 00:10:26 bradfitz Exp $ - */ - -#include "daemon.h" -#include "config.h" -#include -#include -#include -#include -#include -#include -#include -/* some POSIX systems need the following definition - * to get mlockall flags out of sys/mman.h. */ -#ifndef _P1003_1B_VISIBLE -#define _P1003_1B_VISIBLE -#endif -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef HAVE_MALLOC_H -#include -#endif - -#include "memcached.h" - -struct stats stats; -struct settings settings; - -static item **todelete = 0; -static int delcurr; -static int deltotal; - -time_t realtime(time_t exptime) { - time_t now; - - /* no. of seconds in 30 days - largest possible delta exptime */ - #define REALTIME_MAXDELTA 60*60*24*30 - - if (exptime == 0) return 0; /* 0 means never expire */ - - if (exptime > REALTIME_MAXDELTA) - return exptime; - else { - now = time(0); - return exptime + now; - } -} - -void stats_init(void) { - stats.curr_items = stats.total_items = stats.curr_conns = stats.total_conns = stats.conn_structs = 0; - stats.get_cmds = stats.set_cmds = stats.get_hits = stats.get_misses = 0; - stats.curr_bytes = stats.bytes_read = stats.bytes_written = 0; - stats.started = time(0); -} - -void stats_reset(void) { - stats.total_items = stats.total_conns = 0; - stats.get_cmds = stats.set_cmds = stats.get_hits = stats.get_misses = 0; - stats.bytes_read = stats.bytes_written = 0; -} - -void settings_init(void) { - settings.port = 11211; - settings.interface.s_addr = htonl(INADDR_ANY); - settings.maxbytes = 64*1024*1024; /* default is 64MB */ - settings.maxconns = 1024; /* to limit connections-related memory to about 5MB */ - settings.verbose = 0; - settings.oldest_live = 0; - settings.evict_to_free = 1; /* push old items out of cache when memory runs out */ -} - -conn **freeconns; -int freetotal; -int freecurr; - -void set_cork (conn *c, int val) { - if (c->is_corked == val) return; - c->is_corked = val; -#ifdef TCP_NOPUSH - setsockopt(c->sfd, IPPROTO_TCP, TCP_NOPUSH, &val, sizeof(val)); -#endif -} - -void conn_init(void) { - freetotal = 200; - freecurr = 0; - freeconns = (conn **)malloc(sizeof (conn *)*freetotal); - return; -} - -conn *conn_new(int sfd, int init_state, int event_flags) { - conn *c; - - /* do we have a free conn structure from a previous close? */ - if (freecurr > 0) { - c = freeconns[--freecurr]; - } else { /* allocate a new one */ - if (!(c = (conn *)malloc(sizeof(conn)))) { - perror("malloc()"); - return 0; - } - c->rbuf = c->wbuf = 0; - c->ilist = 0; - - c->rbuf = (char *) malloc(DATA_BUFFER_SIZE); - c->wbuf = (char *) malloc(DATA_BUFFER_SIZE); - c->ilist = (item **) malloc(sizeof(item *)*200); - - if (c->rbuf == 0 || c->wbuf == 0 || c->ilist == 0) { - if (c->rbuf != 0) free(c->rbuf); - if (c->wbuf != 0) free(c->wbuf); - if (c->ilist !=0) free(c->ilist); - free(c); - perror("malloc()"); - return 0; - } - c->rsize = c->wsize = DATA_BUFFER_SIZE; - c->isize = 200; - stats.conn_structs++; - } - - if (settings.verbose > 1) { - if (init_state == conn_listening) - fprintf(stderr, "<%d server listening\n", sfd); - else - fprintf(stderr, "<%d new client connection\n", sfd); - } - - c->sfd = sfd; - c->state = init_state; - c->rlbytes = 0; - c->rbytes = c->wbytes = 0; - c->wcurr = c->wbuf; - c->rcurr = c->rbuf; - c->icurr = c->ilist; - c->ileft = 0; - c->iptr = c->ibuf; - c->ibytes = 0; - - c->write_and_go = conn_read; - c->write_and_free = 0; - c->item = 0; - - c->is_corked = 0; - - event_set(&c->event, sfd, event_flags, event_handler, (void *)c); - c->ev_flags = event_flags; - - if (event_add(&c->event, 0) == -1) { - if (freecurr < freetotal) { - freeconns[freecurr++] = c; - } else { - free (c->rbuf); - free (c->wbuf); - free (c->ilist); - free (c); - } - return 0; - } - - stats.curr_conns++; - stats.total_conns++; - - return c; -} - -void conn_close(conn *c) { - /* delete the event, the socket and the conn */ - event_del(&c->event); - - if (settings.verbose > 1) - fprintf(stderr, "<%d connection closed.\n", c->sfd); - - close(c->sfd); - - if (c->item) { - item_free(c->item); - } - - if (c->ileft) { - for (; c->ileft > 0; c->ileft--,c->icurr++) { - item_remove(*(c->icurr)); - } - } - - if (c->write_and_free) { - free(c->write_and_free); - } - - /* if we have enough space in the free connections array, put the structure there */ - if (freecurr < freetotal) { - freeconns[freecurr++] = c; - } else { - /* try to enlarge free connections array */ - conn **new_freeconns = realloc(freeconns, sizeof(conn *)*freetotal*2); - if (new_freeconns) { - freetotal *= 2; - freeconns = new_freeconns; - freeconns[freecurr++] = c; - } else { - free(c->rbuf); - free(c->wbuf); - free(c->ilist); - free(c); - } - } - - stats.curr_conns--; - - return; -} - -void out_string(conn *c, char *str) { - int len; - - if (settings.verbose > 1) - fprintf(stderr, ">%d %s\n", c->sfd, str); - - len = strlen(str); - if (len + 2 > c->wsize) { - /* ought to be always enough. just fail for simplicity */ - str = "SERVER_ERROR output line too long"; - len = strlen(str); - } - - strcpy(c->wbuf, str); - strcat(c->wbuf, "\r\n"); - c->wbytes = len + 2; - c->wcurr = c->wbuf; - - c->state = conn_write; - c->write_and_go = conn_read; - return; -} - -/* - * we get here after reading the value in set/add/replace commands. The command - * has been stored in c->item_comm, and the item is ready in c->item. - */ - -void complete_nread(conn *c) { - item *it = c->item; - int comm = c->item_comm; - item *old_it; - time_t now = time(0); - - stats.set_cmds++; - - while(1) { - if (strncmp(ITEM_data(it) + it->nbytes - 2, "\r\n", 2) != 0) { - out_string(c, "CLIENT_ERROR bad data chunk"); - break; - } - - old_it = assoc_find(ITEM_key(it)); - - if (old_it && settings.oldest_live && - old_it->time <= settings.oldest_live) { - item_unlink(old_it); - old_it = 0; - } - - if (old_it && old_it->exptime && old_it->exptime < now) { - item_unlink(old_it); - old_it = 0; - } - - if (old_it && comm==NREAD_ADD) { - item_update(old_it); - out_string(c, "NOT_STORED"); - break; - } - - if (!old_it && comm == NREAD_REPLACE) { - out_string(c, "NOT_STORED"); - break; - } - - if (old_it && (old_it->it_flags & ITEM_DELETED) && (comm == NREAD_REPLACE || comm == NREAD_ADD)) { - out_string(c, "NOT_STORED"); - break; - } - - if (old_it) { - item_replace(old_it, it); - } else item_link(it); - - c->item = 0; - out_string(c, "STORED"); - return; - } - - item_free(it); - c->item = 0; - return; -} - -void process_stat(conn *c, char *command) { - time_t now = time(0); - - if (strcmp(command, "stats") == 0) { - char temp[1024]; - pid_t pid = getpid(); - char *pos = temp; - struct rusage usage; - - getrusage(RUSAGE_SELF, &usage); - - pos += sprintf(pos, "STAT pid %u\r\n", pid); - pos += sprintf(pos, "STAT uptime %lu\r\n", now - stats.started); - pos += sprintf(pos, "STAT time %ld\r\n", now); - pos += sprintf(pos, "STAT version " VERSION "\r\n"); - pos += sprintf(pos, "STAT rusage_user %ld.%06ld\r\n", usage.ru_utime.tv_sec, usage.ru_utime.tv_usec); - pos += sprintf(pos, "STAT rusage_system %ld.%06ld\r\n", usage.ru_stime.tv_sec, usage.ru_stime.tv_usec); - pos += sprintf(pos, "STAT curr_items %u\r\n", stats.curr_items); - pos += sprintf(pos, "STAT total_items %u\r\n", stats.total_items); - pos += sprintf(pos, "STAT bytes %llu\r\n", stats.curr_bytes); - pos += sprintf(pos, "STAT curr_connections %u\r\n", stats.curr_conns - 1); /* ignore listening conn */ - pos += sprintf(pos, "STAT total_connections %u\r\n", stats.total_conns); - pos += sprintf(pos, "STAT connection_structures %u\r\n", stats.conn_structs); - pos += sprintf(pos, "STAT cmd_get %u\r\n", stats.get_cmds); - pos += sprintf(pos, "STAT cmd_set %u\r\n", stats.set_cmds); - pos += sprintf(pos, "STAT get_hits %u\r\n", stats.get_hits); - pos += sprintf(pos, "STAT get_misses %u\r\n", stats.get_misses); - pos += sprintf(pos, "STAT bytes_read %llu\r\n", stats.bytes_read); - pos += sprintf(pos, "STAT bytes_written %llu\r\n", stats.bytes_written); - pos += sprintf(pos, "STAT limit_maxbytes %u\r\n", settings.maxbytes); - pos += sprintf(pos, "END"); - out_string(c, temp); - return; - } - - if (strcmp(command, "stats reset") == 0) { - stats_reset(); - out_string(c, "RESET"); - return; - } - -#ifdef HAVE_MALLOC_H -#ifdef HAVE_STRUCT_MALLINFO - if (strcmp(command, "stats malloc") == 0) { - char temp[512]; - struct mallinfo info; - char *pos = temp; - - info = mallinfo(); - pos += sprintf(pos, "STAT arena_size %d\r\n", info.arena); - pos += sprintf(pos, "STAT free_chunks %d\r\n", info.ordblks); - pos += sprintf(pos, "STAT fastbin_blocks %d\r\n", info.smblks); - pos += sprintf(pos, "STAT mmapped_regions %d\r\n", info.hblks); - pos += sprintf(pos, "STAT mmapped_space %d\r\n", info.hblkhd); - pos += sprintf(pos, "STAT max_total_alloc %d\r\n", info.usmblks); - pos += sprintf(pos, "STAT fastbin_space %d\r\n", info.fsmblks); - pos += sprintf(pos, "STAT total_alloc %d\r\n", info.uordblks); - pos += sprintf(pos, "STAT total_free %d\r\n", info.fordblks); - pos += sprintf(pos, "STAT releasable_space %d\r\nEND", info.keepcost); - out_string(c, temp); - return; - } -#endif /* HAVE_STRUCT_MALLINFO */ -#endif /* HAVE_MALLOC_H */ - - if (strcmp(command, "stats maps") == 0) { - char *wbuf; - int wsize = 8192; /* should be enough */ - int fd; - int res; - - wbuf = (char *)malloc(wsize); - if (wbuf == 0) { - out_string(c, "SERVER_ERROR out of memory"); - return; - } - - fd = open("/proc/self/maps", O_RDONLY); - if (fd == -1) { - out_string(c, "SERVER_ERROR cannot open the maps file"); - free(wbuf); - return; - } - - res = read(fd, wbuf, wsize - 6); /* 6 = END\r\n\0 */ - if (res == wsize - 6) { - out_string(c, "SERVER_ERROR buffer overflow"); - free(wbuf); close(fd); - return; - } - if (res == 0 || res == -1) { - out_string(c, "SERVER_ERROR can't read the maps file"); - free(wbuf); close(fd); - return; - } - strcpy(wbuf + res, "END\r\n"); - c->write_and_free=wbuf; - c->wcurr=wbuf; - c->wbytes = res + 6; - c->state = conn_write; - c->write_and_go = conn_read; - close(fd); - return; - } - - if (strncmp(command, "stats cachedump", 15) == 0) { - char *buf; - unsigned int bytes, id, limit = 0; - char *start = command + 15; - if (sscanf(start, "%u %u\r\n", &id, &limit) < 1) { - out_string(c, "CLIENT_ERROR bad command line"); - return; - } - - buf = item_cachedump(id, limit, &bytes); - if (buf == 0) { - out_string(c, "SERVER_ERROR out of memory"); - return; - } - - c->write_and_free = buf; - c->wcurr = buf; - c->wbytes = bytes; - c->state = conn_write; - c->write_and_go = conn_read; - return; - } - - if (strcmp(command, "stats slabs")==0) { - int bytes = 0; - char *buf = slabs_stats(&bytes); - if (!buf) { - out_string(c, "SERVER_ERROR out of memory"); - return; - } - c->write_and_free = buf; - c->wcurr = buf; - c->wbytes = bytes; - c->state = conn_write; - c->write_and_go = conn_read; - return; - } - - if (strcmp(command, "stats items")==0) { - char buffer[4096]; - item_stats(buffer, 4096); - out_string(c, buffer); - return; - } - - if (strcmp(command, "stats sizes")==0) { - int bytes = 0; - char *buf = item_stats_sizes(&bytes); - if (! buf) { - out_string(c, "SERVER_ERROR out of memory"); - return; - } - - c->write_and_free = buf; - c->wcurr = buf; - c->wbytes = bytes; - c->state = conn_write; - c->write_and_go = conn_read; - return; - } - - out_string(c, "ERROR"); -} - -void process_command(conn *c, char *command) { - - int comm = 0; - int incr = 0; - - /* - * for commands set/add/replace, we build an item and read the data - * directly into it, then continue in nread_complete(). - */ - - if (settings.verbose > 1) - fprintf(stderr, "<%d %s\n", c->sfd, command); - - /* All incoming commands will require a response, so we cork at the beginning, - and uncork at the very end (usually by means of out_string) */ - set_cork(c, 1); - - if ((strncmp(command, "add ", 4) == 0 && (comm = NREAD_ADD)) || - (strncmp(command, "set ", 4) == 0 && (comm = NREAD_SET)) || - (strncmp(command, "replace ", 8) == 0 && (comm = NREAD_REPLACE))) { - - char key[251]; - int flags; - time_t expire; - int len, res; - item *it; - - res = sscanf(command, "%*s %250s %u %ld %d\n", key, &flags, &expire, &len); - if (res!=4 || strlen(key)==0 ) { - out_string(c, "CLIENT_ERROR bad command line format"); - return; - } - expire = realtime(expire); - it = item_alloc(key, flags, expire, len+2); - if (it == 0) { - out_string(c, "SERVER_ERROR out of memory"); - /* swallow the data line */ - c->write_and_go = conn_swallow; - c->sbytes = len+2; - return; - } - - c->item_comm = comm; - c->item = it; - c->rcurr = ITEM_data(it); - c->rlbytes = it->nbytes; - c->state = conn_nread; - return; - } - - if ((strncmp(command, "incr ", 5) == 0 && (incr = 1)) || - (strncmp(command, "decr ", 5) == 0)) { - char temp[32]; - unsigned int value; - item *it; - unsigned int delta; - char key[251]; - int res; - char *ptr; - time_t now = time(0); - - res = sscanf(command, "%*s %250s %u\n", key, &delta); - if (res!=2 || strlen(key)==0 ) { - out_string(c, "CLIENT_ERROR bad command line format"); - return; - } - - it = assoc_find(key); - if (it && (it->it_flags & ITEM_DELETED)) { - it = 0; - } - if (it && it->exptime && it->exptime < now) { - item_unlink(it); - it = 0; - } - - if (!it) { - out_string(c, "NOT_FOUND"); - return; - } - - ptr = ITEM_data(it); - while (*ptr && (*ptr<'0' && *ptr>'9')) ptr++; - - value = atoi(ptr); - - if (incr) - value+=delta; - else { - if (delta >= value) value = 0; - else value-=delta; - } - - sprintf(temp, "%u", value); - res = strlen(temp); - if (res + 2 > it->nbytes) { /* need to realloc */ - item *new_it; - new_it = item_alloc(ITEM_key(it), it->flags, it->exptime, res + 2 ); - if (new_it == 0) { - out_string(c, "SERVER_ERROR out of memory"); - return; - } - memcpy(ITEM_data(new_it), temp, res); - memcpy(ITEM_data(new_it) + res, "\r\n", 2); - item_replace(it, new_it); - } else { /* replace in-place */ - memcpy(ITEM_data(it), temp, res); - memset(ITEM_data(it) + res, ' ', it->nbytes-res-2); - } - out_string(c, temp); - return; - } - - if (strncmp(command, "get ", 4) == 0) { - - char *start = command + 4; - char key[251]; - int next; - int i = 0; - item *it; - time_t now = time(0); - - while(sscanf(start, " %250s%n", key, &next) >= 1) { - start+=next; - stats.get_cmds++; - it = assoc_find(key); - if (it && (it->it_flags & ITEM_DELETED)) { - it = 0; - } - if (settings.oldest_live && it && - it->time <= settings.oldest_live) { - item_unlink(it); - it = 0; - } - if (it && it->exptime && it->exptime < now) { - item_unlink(it); - it = 0; - } - - if (it) { - if (i >= c->isize) { - item **new_list = realloc(c->ilist, sizeof(item *)*c->isize*2); - if (new_list) { - c->isize *= 2; - c->ilist = new_list; - } else break; - } - stats.get_hits++; - it->refcount++; - item_update(it); - *(c->ilist + i) = it; - i++; - } else stats.get_misses++; - } - c->icurr = c->ilist; - c->ileft = i; - if (c->ileft) { - c->ipart = 0; - c->state = conn_mwrite; - c->ibytes = 0; - return; - } else { - out_string(c, "END"); - return; - } - } - - if (strncmp(command, "delete ", 7) == 0) { - char key[251]; - item *it; - int res; - time_t exptime = 0; - - res = sscanf(command, "%*s %250s %ld", key, &exptime); - it = assoc_find(key); - if (!it) { - out_string(c, "NOT_FOUND"); - return; - } - - if (exptime == 0) { - item_unlink(it); - out_string(c, "DELETED"); - return; - } - - if (delcurr >= deltotal) { - item **new_delete = realloc(todelete, sizeof(item *) * deltotal * 2); - if (new_delete) { - todelete = new_delete; - deltotal *= 2; - } else { - /* - * can't delete it immediately, user wants a delay, - * but we ran out of memory for the delete queue - */ - out_string(c, "SERVER_ERROR out of memory"); - return; - } - } - - exptime = realtime(exptime); - - it->refcount++; - /* use its expiration time as its deletion time now */ - it->exptime = exptime; - it->it_flags |= ITEM_DELETED; - todelete[delcurr++] = it; - out_string(c, "DELETED"); - return; - } - - if (strncmp(command, "stats", 5) == 0) { - process_stat(c, command); - return; - } - - if (strcmp(command, "flush_all") == 0) { - settings.oldest_live = time(0); - out_string(c, "OK"); - return; - } - - if (strcmp(command, "version") == 0) { - out_string(c, "VERSION " VERSION); - return; - } - - if (strcmp(command, "quit") == 0) { - c->state = conn_closing; - return; - } - - if (strncmp(command, "slabs reassign ", 15) == 0) { - int src, dst; - char *start = command+15; - if (sscanf(start, "%u %u\r\n", &src, &dst) == 2) { - int rv = slabs_reassign(src, dst); - if (rv == 1) { - out_string(c, "DONE"); - return; - } - if (rv == 0) { - out_string(c, "CANT"); - return; - } - if (rv == -1) { - out_string(c, "BUSY"); - return; - } - } - out_string(c, "CLIENT_ERROR bogus command"); - return; - } - - out_string(c, "ERROR"); - return; -} - -/* - * if we have a complete line in the buffer, process it and move whatever - * remains in the buffer to its beginning. - */ -int try_read_command(conn *c) { - char *el, *cont; - - if (!c->rbytes) - return 0; - el = memchr(c->rbuf, '\n', c->rbytes); - if (!el) - return 0; - cont = el + 1; - if (el - c->rbuf > 1 && *(el - 1) == '\r') { - el--; - } - *el = '\0'; - - process_command(c, c->rbuf); - - if (cont - c->rbuf < c->rbytes) { /* more stuff in the buffer */ - memmove(c->rbuf, cont, c->rbytes - (cont - c->rbuf)); - } - c->rbytes -= (cont - c->rbuf); - return 1; -} - -/* - * read from network as much as we can, handle buffer overflow and connection - * close. - * return 0 if there's nothing to read on the first read. - */ -int try_read_network(conn *c) { - int gotdata = 0; - int res; - while (1) { - if (c->rbytes >= c->rsize) { - char *new_rbuf = realloc(c->rbuf, c->rsize*2); - if (!new_rbuf) { - if (settings.verbose > 0) - fprintf(stderr, "Couldn't realloc input buffer\n"); - c->rbytes = 0; /* ignore what we read */ - out_string(c, "SERVER_ERROR out of memory"); - c->write_and_go = conn_closing; - return 1; - } - c->rbuf = new_rbuf; c->rsize *= 2; - } - res = read(c->sfd, c->rbuf + c->rbytes, c->rsize - c->rbytes); - if (res > 0) { - stats.bytes_read += res; - gotdata = 1; - c->rbytes += res; - continue; - } - if (res == 0) { - /* connection closed */ - c->state = conn_closing; - return 1; - } - if (res == -1) { - if (errno == EAGAIN || errno == EWOULDBLOCK) break; - else return 0; - } - } - return gotdata; -} - -int update_event(conn *c, int new_flags) { - if (c->ev_flags == new_flags) - return 1; - if (event_del(&c->event) == -1) return 0; - event_set(&c->event, c->sfd, new_flags, event_handler, (void *)c); - c->ev_flags = new_flags; - if (event_add(&c->event, 0) == -1) return 0; - return 1; -} - -void drive_machine(conn *c) { - - int exit = 0; - int sfd, flags = 1; - socklen_t addrlen; - struct sockaddr addr; - conn *newc; - int res; - - while (!exit) { - /* printf("state %d\n", c->state);*/ - switch(c->state) { - case conn_listening: - addrlen = sizeof(addr); - if ((sfd = accept(c->sfd, &addr, &addrlen)) == -1) { - if (errno == EAGAIN || errno == EWOULDBLOCK) { - exit = 1; - break; - } else { - perror("accept()"); - } - break; - } - if ((flags = fcntl(sfd, F_GETFL, 0)) < 0 || - fcntl(sfd, F_SETFL, flags | O_NONBLOCK) < 0) { - perror("setting O_NONBLOCK"); - close(sfd); - break; - } - newc = conn_new(sfd, conn_read, EV_READ | EV_PERSIST); - if (!newc) { - if (settings.verbose > 0) - fprintf(stderr, "couldn't create new connection\n"); - close(sfd); - break; - } - - break; - - case conn_read: - if (try_read_command(c)) { - continue; - } - if (try_read_network(c)) { - continue; - } - /* we have no command line and no data to read from network */ - if (!update_event(c, EV_READ | EV_PERSIST)) { - if (settings.verbose > 0) - fprintf(stderr, "Couldn't update event\n"); - c->state = conn_closing; - break; - } - exit = 1; - break; - - case conn_nread: - /* we are reading rlbytes into rcurr; */ - if (c->rlbytes == 0) { - complete_nread(c); - break; - } - /* first check if we have leftovers in the conn_read buffer */ - if (c->rbytes > 0) { - int tocopy = c->rbytes > c->rlbytes ? c->rlbytes : c->rbytes; - memcpy(c->rcurr, c->rbuf, tocopy); - c->rcurr += tocopy; - c->rlbytes -= tocopy; - if (c->rbytes > tocopy) { - memmove(c->rbuf, c->rbuf+tocopy, c->rbytes - tocopy); - } - c->rbytes -= tocopy; - break; - } - - /* now try reading from the socket */ - res = read(c->sfd, c->rcurr, c->rlbytes); - if (res > 0) { - stats.bytes_read += res; - c->rcurr += res; - c->rlbytes -= res; - break; - } - if (res == 0) { /* end of stream */ - c->state = conn_closing; - break; - } - if (res == -1 && (errno == EAGAIN || errno == EWOULDBLOCK)) { - if (!update_event(c, EV_READ | EV_PERSIST)) { - if (settings.verbose > 0) - fprintf(stderr, "Couldn't update event\n"); - c->state = conn_closing; - break; - } - exit = 1; - break; - } - /* otherwise we have a real error, on which we close the connection */ - if (settings.verbose > 0) - fprintf(stderr, "Failed to read, and not due to blocking\n"); - c->state = conn_closing; - break; - - case conn_swallow: - /* we are reading sbytes and throwing them away */ - if (c->sbytes == 0) { - c->state = conn_read; - break; - } - - /* first check if we have leftovers in the conn_read buffer */ - if (c->rbytes > 0) { - int tocopy = c->rbytes > c->sbytes ? c->sbytes : c->rbytes; - c->sbytes -= tocopy; - if (c->rbytes > tocopy) { - memmove(c->rbuf, c->rbuf+tocopy, c->rbytes - tocopy); - } - c->rbytes -= tocopy; - break; - } - - /* now try reading from the socket */ - res = read(c->sfd, c->rbuf, c->rsize > c->sbytes ? c->sbytes : c->rsize); - if (res > 0) { - stats.bytes_read += res; - c->sbytes -= res; - break; - } - if (res == 0) { /* end of stream */ - c->state = conn_closing; - break; - } - if (res == -1 && (errno == EAGAIN || errno == EWOULDBLOCK)) { - if (!update_event(c, EV_READ | EV_PERSIST)) { - if (settings.verbose > 0) - fprintf(stderr, "Couldn't update event\n"); - c->state = conn_closing; - break; - } - exit = 1; - break; - } - /* otherwise we have a real error, on which we close the connection */ - if (settings.verbose > 0) - fprintf(stderr, "Failed to read, and not due to blocking\n"); - c->state = conn_closing; - break; - - case conn_write: - /* we are writing wbytes bytes starting from wcurr */ - if (c->wbytes == 0) { - if (c->write_and_free) { - free(c->write_and_free); - c->write_and_free = 0; - } - c->state = c->write_and_go; - if (c->state == conn_read) - set_cork(c, 0); - break; - } - res = write(c->sfd, c->wcurr, c->wbytes); - if (res > 0) { - stats.bytes_written += res; - c->wcurr += res; - c->wbytes -= res; - break; - } - if (res == -1 && (errno == EAGAIN || errno == EWOULDBLOCK)) { - if (!update_event(c, EV_WRITE | EV_PERSIST)) { - if (settings.verbose > 0) - fprintf(stderr, "Couldn't update event\n"); - c->state = conn_closing; - break; - } - exit = 1; - break; - } - /* if res==0 or res==-1 and error is not EAGAIN or EWOULDBLOCK, - we have a real error, on which we close the connection */ - if (settings.verbose > 0) - fprintf(stderr, "Failed to write, and not due to blocking\n"); - c->state = conn_closing; - break; - case conn_mwrite: - /* - * we're writing ibytes bytes from iptr. iptr alternates between - * ibuf, where we build a string "VALUE...", and ITEM_data(it) for the - * current item. When we finish a chunk, we choose the next one using - * ipart, which has the following semantics: 0 - start the loop, 1 - - * we finished ibuf, go to current ITEM_data(it); 2 - we finished ITEM_data(it), - * move to the next item and build its ibuf; 3 - we finished all items, - * write "END". - */ - if (c->ibytes > 0) { - res = write(c->sfd, c->iptr, c->ibytes); - if (res > 0) { - stats.bytes_written += res; - c->iptr += res; - c->ibytes -= res; - break; - } - if (res == -1 && (errno == EAGAIN || errno == EWOULDBLOCK)) { - if (!update_event(c, EV_WRITE | EV_PERSIST)) { - if (settings.verbose > 0) - fprintf(stderr, "Couldn't update event\n"); - c->state = conn_closing; - break; - } - exit = 1; - break; - } - /* if res==0 or res==-1 and error is not EAGAIN or EWOULDBLOCK, - we have a real error, on which we close the connection */ - if (settings.verbose > 0) - fprintf(stderr, "Failed to write, and not due to blocking\n"); - c->state = conn_closing; - break; - } else { - item *it; - /* we finished a chunk, decide what to do next */ - switch (c->ipart) { - case 1: - it = *(c->icurr); - assert((it->it_flags & ITEM_SLABBED) == 0); - c->iptr = ITEM_data(it); - c->ibytes = it->nbytes; - c->ipart = 2; - break; - case 2: - it = *(c->icurr); - item_remove(it); - c->ileft--; - if (c->ileft <= 0) { - c->ipart = 3; - break; - } else { - c->icurr++; - } - /* FALL THROUGH */ - case 0: - it = *(c->icurr); - assert((it->it_flags & ITEM_SLABBED) == 0); - c->ibytes = sprintf(c->ibuf, "VALUE %s %u %u\r\n", ITEM_key(it), it->flags, it->nbytes - 2); - if (settings.verbose > 1) - fprintf(stderr, ">%d sending key %s\n", c->sfd, ITEM_key(it)); - c->iptr = c->ibuf; - c->ipart = 1; - break; - case 3: - out_string(c, "END"); - break; - } - } - break; - - case conn_closing: - conn_close(c); - exit = 1; - break; - } - - } - - return; -} - - -void event_handler(int fd, short which, void *arg) { - conn *c; - - c = (conn *)arg; - c->which = which; - - /* sanity */ - if (fd != c->sfd) { - if (settings.verbose > 0) - fprintf(stderr, "Catastrophic: event fd doesn't match conn fd!\n"); - conn_close(c); - return; - } - - /* do as much I/O as possible until we block */ - drive_machine(c); - - /* wait for next event */ - return; -} - -int new_socket(void) { - int sfd; - int flags; - - if ((sfd = socket(AF_INET, SOCK_STREAM, 0)) == -1) { - perror("socket()"); - return -1; - } - - if ((flags = fcntl(sfd, F_GETFL, 0)) < 0 || - fcntl(sfd, F_SETFL, flags | O_NONBLOCK) < 0) { - perror("setting O_NONBLOCK"); - close(sfd); - return -1; - } - return sfd; -} - -int server_socket(int port) { - int sfd; - struct linger ling = {0, 0}; - struct sockaddr_in addr; - int flags =1; - - if ((sfd = new_socket()) == -1) { - return -1; - } - - setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &flags, sizeof(flags)); - setsockopt(sfd, SOL_SOCKET, SO_KEEPALIVE, &flags, sizeof(flags)); - setsockopt(sfd, SOL_SOCKET, SO_LINGER, &ling, sizeof(ling)); -#if !defined(TCP_NOPUSH) - setsockopt(sfd, IPPROTO_TCP, TCP_NODELAY, &flags, sizeof(flags)); -#endif - - /* - * the memset call clears nonstandard fields in some impementations - * that otherwise mess things up. - */ - memset(&addr, 0, sizeof(addr)); - - addr.sin_family = AF_INET; - addr.sin_port = htons(port); - addr.sin_addr = settings.interface; - if (bind(sfd, (struct sockaddr *) &addr, sizeof(addr)) == -1) { - perror("bind()"); - close(sfd); - return -1; - } - if (listen(sfd, 1024) == -1) { - perror("listen()"); - close(sfd); - return -1; - } - return sfd; -} - -/* invoke right before gdb is called, on assert */ -void pre_gdb () { - int i = 0; - if(l_socket) close(l_socket); - for (i=3; i<=500; i++) close(i); /* so lame */ - kill(getpid(), SIGABRT); -} - -struct event deleteevent; - -void delete_handler(int fd, short which, void *arg) { - struct timeval t; - static int initialized = 0; - - if (initialized) { - /* some versions of libevent don't like deleting events that don't exist, - so only delete once we know this event has been added. */ - evtimer_del(&deleteevent); - } else { - initialized = 1; - } - - evtimer_set(&deleteevent, delete_handler, 0); - t.tv_sec = 5; t.tv_usec=0; - evtimer_add(&deleteevent, &t); - - { - int i, j=0; - time_t now = time(0); - for (i=0; iexptime < now) { - assert(it->refcount > 0); - it->it_flags &= ~ITEM_DELETED; - item_unlink(it); - item_remove(it); - } else { - todelete[j++] = it; - } - } - delcurr = j; - } - - return; -} - -void usage(void) { - printf(PACKAGE " " VERSION "\n"); - printf("-p port number to listen on\n"); - printf("-l interface to listen on, default is INDRR_ANY\n"); - printf("-d run as a daemon\n"); - printf("-r maximize core file limit\n"); - printf("-u assume identity of (only when run as root)\n"); - printf("-m max memory to use for items in megabytes, default is 64 MB\n"); - printf("-M return error on memory exhausted (rather than removing items)\n"); - printf("-c max simultaneous connections, default is 1024\n"); - printf("-k lock down all paged memory\n"); - printf("-v verbose (print errors/warnings while in event loop)\n"); - printf("-vv very verbose (also print client commands/reponses)\n"); - printf("-h print this help and exit\n"); - printf("-i print memcached and libevent license\n"); - printf("-P save PID in , only used with -d option\n"); - return; -} - -void usage_license(void) { - printf(PACKAGE " " VERSION "\n\n"); - printf( - "Copyright (c) 2003, Danga Interactive, Inc. \n" - "All rights reserved.\n" - "\n" - "Redistribution and use in source and binary forms, with or without\n" - "modification, are permitted provided that the following conditions are\n" - "met:\n" - "\n" - " * Redistributions of source code must retain the above copyright\n" - "notice, this list of conditions and the following disclaimer.\n" - "\n" - " * Redistributions in binary form must reproduce the above\n" - "copyright notice, this list of conditions and the following disclaimer\n" - "in the documentation and/or other materials provided with the\n" - "distribution.\n" - "\n" - " * Neither the name of the Danga Interactive nor the names of its\n" - "contributors may be used to endorse or promote products derived from\n" - "this software without specific prior written permission.\n" - "\n" - "THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n" - "\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n" - "LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n" - "A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n" - "OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n" - "SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n" - "LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n" - "DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n" - "THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n" - "(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n" - "OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" - "\n" - "\n" - "This product includes software developed by Niels Provos.\n" - "\n" - "[ libevent ]\n" - "\n" - "Copyright 2000-2003 Niels Provos \n" - "All rights reserved.\n" - "\n" - "Redistribution and use in source and binary forms, with or without\n" - "modification, are permitted provided that the following conditions\n" - "are met:\n" - "1. Redistributions of source code must retain the above copyright\n" - " notice, this list of conditions and the following disclaimer.\n" - "2. Redistributions in binary form must reproduce the above copyright\n" - " notice, this list of conditions and the following disclaimer in the\n" - " documentation and/or other materials provided with the distribution.\n" - "3. All advertising materials mentioning features or use of this software\n" - " must display the following acknowledgement:\n" - " This product includes software developed by Niels Provos.\n" - "4. The name of the author may not be used to endorse or promote products\n" - " derived from this software without specific prior written permission.\n" - "\n" - "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR\n" - "IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES\n" - "OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.\n" - "IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,\n" - "INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\n" - "NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n" - "DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n" - "THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n" - "(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF\n" - "THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" - ); - - return; -} - -void save_pid(pid_t pid,char *pid_file) { - FILE *fp; - if (!pid_file) - return; - - if (!(fp = fopen(pid_file,"w"))) { - fprintf(stderr,"Could not open the pid file %s for writing\n",pid_file); - return; - } - - fprintf(fp,"%ld\n",(long) pid); - if (fclose(fp) == -1) { - fprintf(stderr,"Could not close the pid file %s.\n",pid_file); - return; - } -} - -void remove_pidfile(char *pid_file) { - if (!pid_file) - return; - - if (unlink(pid_file)) { - fprintf(stderr,"Could not remove the pid file %s.\n",pid_file); - } - -} - -int l_socket=0; - -int main (int argc, char **argv) { - int c; - conn *l_conn; - struct in_addr addr; - int lock_memory = 0; - int daemonize = 0; - int maxcore = 0; - char *username = 0; - struct passwd *pw; - struct sigaction sa; - struct rlimit rlim; - char *pid_file = NULL; - - /* init settings */ - settings_init(); - - /* process arguments */ - while ((c = getopt(argc, argv, "p:m:Mc:khirvdl:u:P:")) != -1) { - switch (c) { - case 'p': - settings.port = atoi(optarg); - break; - case 'm': - settings.maxbytes = atoi(optarg)*1024*1024; - break; - case 'M': - settings.evict_to_free = 0; - break; - case 'c': - settings.maxconns = atoi(optarg); - break; - case 'h': - usage(); - exit(0); - case 'i': - usage_license(); - exit(0); - case 'k': - lock_memory = 1; - break; - case 'v': - settings.verbose++; - break; - case 'l': - if (!inet_aton(optarg, &addr)) { - fprintf(stderr, "Illegal address: %s\n", optarg); - return 1; - } else { - settings.interface = addr; - } - break; - case 'd': - daemonize = 1; - break; - case 'r': - maxcore = 1; - break; - case 'u': - username = optarg; - break; - case 'P': - pid_file = optarg; - break; - default: - fprintf(stderr, "Illegal argument \"%c\"\n", c); - return 1; - } - } - - if (maxcore) { - struct rlimit rlim_new; - /* - * First try raising to infinity; if that fails, try bringing - * the soft limit to the hard. - */ - if (getrlimit(RLIMIT_CORE, &rlim)==0) { - rlim_new.rlim_cur = rlim_new.rlim_max = RLIM_INFINITY; - if (setrlimit(RLIMIT_CORE, &rlim_new)!=0) { - /* failed. try raising just to the old max */ - rlim_new.rlim_cur = rlim_new.rlim_max = - rlim.rlim_max; - (void) setrlimit(RLIMIT_CORE, &rlim_new); - } - } - /* - * getrlimit again to see what we ended up with. Only fail if - * the soft limit ends up 0, because then no core files will be - * created at all. - */ - - if ((getrlimit(RLIMIT_CORE, &rlim)!=0) || rlim.rlim_cur==0) { - fprintf(stderr, "failed to ensure corefile creation\n"); - exit(1); - } - } - - /* - * If needed, increase rlimits to allow as many connections - * as needed. - */ - - if (getrlimit(RLIMIT_NOFILE, &rlim) != 0) { - fprintf(stderr, "failed to getrlimit number of files\n"); - exit(1); - } else { - int maxfiles = settings.maxconns; - if (rlim.rlim_cur < maxfiles) - rlim.rlim_cur = maxfiles + 3; - if (rlim.rlim_max < rlim.rlim_cur) - rlim.rlim_max = rlim.rlim_cur; - if (setrlimit(RLIMIT_NOFILE, &rlim) != 0) { - fprintf(stderr, "failed to set rlimit for open files. Try running as root or requesting smaller maxconns value.\n"); - exit(1); - } - } - - /* - * initialization order: first create the listening socket - * (may need root on low ports), then drop root if needed, - * then daemonise if needed, then init libevent (in some cases - * descriptors created by libevent wouldn't survive forking). - */ - - /* create the listening socket and bind it */ - l_socket = server_socket(settings.port); - if (l_socket == -1) { - fprintf(stderr, "failed to listen\n"); - exit(1); - } - - /* lose root privileges if we have them */ - if (getuid()== 0 || geteuid()==0) { - if (username==0 || *username=='\0') { - fprintf(stderr, "can't run as root without the -u switch\n"); - return 1; - } - if ((pw = getpwnam(username)) == 0) { - fprintf(stderr, "can't find the user %s to switch to\n", username); - return 1; - } - if (setgid(pw->pw_gid)<0 || setuid(pw->pw_uid)<0) { - fprintf(stderr, "failed to assume identity of user %s\n", username); - return 1; - } - } - - /* daemonize if requested */ - /* if we want to ensure our ability to dump core, don't chdir to / */ - if (daemonize) { - int res; - res = daemon(maxcore, settings.verbose); - if (res == -1) { - fprintf(stderr, "failed to daemon() in order to daemonize\n"); - return 1; - } - } - - - /* initialize other stuff */ - item_init(); - event_init(); - stats_init(); - assoc_init(); - conn_init(); - slabs_init(settings.maxbytes); - - /* lock paged memory if needed */ - if (lock_memory) { -#ifdef HAVE_MLOCKALL - mlockall(MCL_CURRENT | MCL_FUTURE); -#else - fprintf(stderr, "warning: mlockall() not supported on this platform. proceeding without.\n"); -#endif - } - - /* - * ignore SIGPIPE signals; we can use errno==EPIPE if we - * need that information - */ - sa.sa_handler = SIG_IGN; - sa.sa_flags = 0; - if (sigemptyset(&sa.sa_mask) == -1 || - sigaction(SIGPIPE, &sa, 0) == -1) { - perror("failed to ignore SIGPIPE; sigaction"); - exit(1); - } - - /* create the initial listening connection */ - if (!(l_conn = conn_new(l_socket, conn_listening, EV_READ | EV_PERSIST))) { - fprintf(stderr, "failed to create listening connection"); - exit(1); - } - - /* initialise deletion array and timer event */ - deltotal = 200; delcurr = 0; - todelete = malloc(sizeof(item *)*deltotal); - delete_handler(0,0,0); /* sets up the event */ - - /* save the PID in if we're a daemon */ - if (daemonize) - save_pid(getpid(),pid_file); - - /* enter the loop */ - event_loop(0); - - /* remove the PID file if we're a daemon */ - if (daemonize) - remove_pidfile(pid_file); - - return 0; -} - Deleted: csw/mgar/pkg/memcached/trunk/files/memcached.h =================================================================== --- csw/mgar/pkg/memcached/trunk/files/memcached.h 2009-11-06 13:56:34 UTC (rev 7145) +++ csw/mgar/pkg/memcached/trunk/files/memcached.h 2009-11-06 14:01:38 UTC (rev 7146) @@ -1,212 +0,0 @@ -/* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -/* $Id: memcached.h,v 1.21 2004/02/24 23:42:02 bradfitz Exp $ */ - -#define DATA_BUFFER_SIZE 2048 - -#if defined(TCP_CORK) && !defined(TCP_NOPUSH) -#define TCP_NOPUSH TCP_CORK -#endif - -struct stats { - unsigned int curr_items; - unsigned int total_items; - unsigned long long curr_bytes; - unsigned int curr_conns; - unsigned int total_conns; - unsigned int conn_structs; - unsigned int get_cmds; - unsigned int set_cmds; - unsigned int get_hits; - unsigned int get_misses; - time_t started; /* when the process was started */ - unsigned long long bytes_read; - unsigned long long bytes_written; -}; - -struct settings { - unsigned int maxbytes; - int maxconns; - int port; - struct in_addr interface; - int verbose; - time_t oldest_live; /* ignore existing items older than this */ - int evict_to_free; -}; - -extern struct stats stats; -extern struct settings settings; - -#define ITEM_LINKED 1 -#define ITEM_DELETED 2 - -/* temp */ -#define ITEM_SLABBED 4 - -typedef struct _stritem { - struct _stritem *next; - struct _stritem *prev; - struct _stritem *h_next; /* hash chain next */ - unsigned short refcount; - unsigned short flags; - int nbytes; /* size of data */ - time_t time; /* least recent access */ - time_t exptime; /* expire time */ - unsigned char it_flags; /* ITEM_* above */ - unsigned char slabs_clsid; - unsigned char nkey; /* key length, with terminating null and padding */ - unsigned char dummy1; - void *end; -} item; - -#define ITEM_key(item) ((char*)&((item)->end)) - -/* warning: don't use these macros with a function, as it evals its arg twice */ -#define ITEM_data(item) ((char*) &((item)->end) + (item)->nkey) -#define ITEM_ntotal(item) (sizeof(struct _stritem) + (item)->nkey + (item)->nbytes) - -enum conn_states { - conn_listening, /* the socket which listens for connections */ - conn_read, /* reading in a command line */ - conn_write, /* writing out a simple response */ - conn_nread, /* reading in a fixed number of bytes */ - conn_swallow, /* swallowing unnecessary bytes w/o storing */ - conn_closing, /* closing this connection */ - conn_mwrite /* writing out many items sequentially */ -}; - -#define NREAD_ADD 1 -#define NREAD_SET 2 -#define NREAD_REPLACE 3 - -typedef struct { - int sfd; - int state; - struct event event; - short ev_flags; - short which; /* which events were just triggered */ - - char *rbuf; - int rsize; - int rbytes; - - char *wbuf; - char *wcurr; - int wsize; - int wbytes; - int write_and_go; /* which state to go into after finishing current write */ - void *write_and_free; /* free this memory after finishing writing */ - char is_corked; /* boolean, connection is corked */ - - char *rcurr; - int rlbytes; - - /* data for the nread state */ - - /* - * item is used to hold an item structure created after reading the command - * line of set/add/replace commands, but before we finished reading the actual - * data. The data is read into ITEM_data(item) to avoid extra copying. - */ - - void *item; /* for commands set/add/replace */ - int item_comm; /* which one is it: set/add/replace */ - - /* data for the swallow state */ - int sbytes; /* how many bytes to swallow */ - - /* data for the mwrite state */ - item **ilist; /* list of items to write out */ - int isize; - item **icurr; - int ileft; - int ipart; /* 1 if we're writing a VALUE line, 2 if we're writing data */ - char ibuf[300]; /* for VALUE lines */ - char *iptr; - int ibytes; - -} conn; - -/* listening socket */ -extern int l_socket; - -/* temporary hack */ -/* #define assert(x) if(!(x)) { printf("assert failure: %s\n", #x); pre_gdb(); } - void pre_gdb (); */ - -/* - * Functions - */ - -/* - * given time value that's either unix time or delta from current unix time, return - * unix time. Use the fact that delta can't exceed one month (and real time value can't - * be that low). - */ - -time_t realtime(time_t exptime); - -/* slabs memory allocation */ - -/* Init the subsystem. The argument is the limit on no. of bytes to allocate, 0 if no limit */ -void slabs_init(unsigned int limit); - -/* Given object size, return id to use when allocating/freeing memory for object */ -/* 0 means error: can't store such a large object */ -unsigned int slabs_clsid(unsigned int size); - -/* Allocate object of given length. 0 on error */ -void *slabs_alloc(unsigned int size); - -/* Free previously allocated object */ -void slabs_free(void *ptr, unsigned int size); - -/* Fill buffer with stats */ -char* slabs_stats(int *buflen); - -/* Request some slab be moved between classes - 1 = success - 0 = fail - -1 = tried. busy. send again shortly. */ -int slabs_reassign(unsigned char srcid, unsigned char dstid); - -/* event handling, network IO */ -void event_handler(int fd, short which, void *arg); -conn *conn_new(int sfd, int init_state, int event_flags); -void conn_close(conn *c); -void conn_init(void); -void drive_machine(conn *c); -int new_socket(void); -int server_socket(int port); -int update_event(conn *c, int new_flags); -int try_read_command(conn *c); -int try_read_network(conn *c); -void complete_nread(conn *c); -void process_command(conn *c, char *command); - -/* stats */ -void stats_reset(void); -void stats_init(void); - -/* defaults */ -void settings_init(void); - -/* associative array */ -void assoc_init(void); -item *assoc_find(char *key); -int assoc_insert(char *key, item *item); -void assoc_delete(char *key); - - -void item_init(void); -item *item_alloc(char *key, int flags, time_t exptime, int nbytes); -void item_free(item *it); - -int item_link(item *it); /* may fail if transgresses limits */ -void item_unlink(item *it); -void item_remove(item *it); - -void item_update(item *it); /* update LRU time to current and reposition */ -int item_replace(item *it, item *new_it); -char *item_cachedump(unsigned int slabs_clsid, unsigned int limit, unsigned int *bytes); -char *item_stats_sizes(int *bytes); -void item_stats(char *buffer, int buflen); Deleted: csw/mgar/pkg/memcached/trunk/files/solaris.diff =================================================================== --- csw/mgar/pkg/memcached/trunk/files/solaris.diff 2009-11-06 13:56:34 UTC (rev 7145) +++ csw/mgar/pkg/memcached/trunk/files/solaris.diff 2009-11-06 14:01:38 UTC (rev 7146) @@ -1,56 +0,0 @@ -diff --speed-large-files --minimal -Nru memcached-1.1.12.orig/Makefile.in memcached-1.1.12/Makefile.in ---- memcached-1.1.12.orig/Makefile.in 2005-12-13 03:33:09.453997000 -0500 -+++ memcached-1.1.12/Makefile.in 2005-12-13 03:32:52.961025000 -0500 -@@ -73,7 +73,7 @@ - - bin_PROGRAMS = memcached - --memcached_SOURCES = memcached.c slabs.c items.c memcached.h assoc.c -+memcached_SOURCES = memcached.c slabs.c items.c memcached.h assoc.c daemon.c - - SUBDIRS = doc - DIST_DIRS = scripts -@@ -90,8 +90,8 @@ - DEFS = @DEFS@ -I. -I$(srcdir) -I. - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ --LIBS = @LIBS@ --memcached_OBJECTS = memcached.o slabs.o items.o assoc.o -+LIBS = @LIBS@ -lsocket -lresolv -lmalloc -+memcached_OBJECTS = memcached.o slabs.o items.o assoc.o daemon.o - memcached_LDADD = $(LDADD) - memcached_DEPENDENCIES = - memcached_LDFLAGS = -diff --speed-large-files --minimal -Nru memcached-1.1.12.orig/memcached.c memcached-1.1.12/memcached.c ---- memcached-1.1.12.orig/memcached.c 2005-12-13 03:33:09.998675000 -0500 -+++ memcached-1.1.12/memcached.c 2005-12-13 03:32:48.075669000 -0500 -@@ -16,7 +16,9 @@ - * $Id: memcached.c,v 1.56 2005/04/05 00:10:26 bradfitz Exp $ - */ - -+#include "daemon.h" - #include "config.h" -+#include - #include - #include - #include -diff --speed-large-files --minimal -Nru memcached-1.1.12.orig/memcached.h memcached-1.1.12/memcached.h ---- memcached-1.1.12.orig/memcached.h 2005-12-13 03:33:10.090457000 -0500 -+++ memcached-1.1.12/memcached.h 2005-12-13 03:32:48.110122000 -0500 -@@ -55,13 +55,13 @@ - unsigned char slabs_clsid; - unsigned char nkey; /* key length, with terminating null and padding */ - unsigned char dummy1; -- void * end[0]; -+ void *end; - } item; - --#define ITEM_key(item) ((char*)&((item)->end[0])) -+#define ITEM_key(item) ((char*)&((item)->end)) - - /* warning: don't use these macros with a function, as it evals its arg twice */ --#define ITEM_data(item) ((char*) &((item)->end[0]) + (item)->nkey) -+#define ITEM_data(item) ((char*) &((item)->end) + (item)->nkey) - #define ITEM_ntotal(item) (sizeof(struct _stritem) + (item)->nkey + (item)->nbytes) - - enum conn_states { 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 Nov 6 15:30:24 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 06 Nov 2009 14:30:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7147] csw/mgar/pkg/memcached/trunk/Makefile Message-ID: Revision: 7147 http://gar.svn.sourceforge.net/gar/?rev=7147&view=rev Author: dmichelsen Date: 2009-11-06 14:30:24 +0000 (Fri, 06 Nov 2009) Log Message: ----------- memcached: Disable tests for now Modified Paths: -------------- csw/mgar/pkg/memcached/trunk/Makefile Modified: csw/mgar/pkg/memcached/trunk/Makefile =================================================================== --- csw/mgar/pkg/memcached/trunk/Makefile 2009-11-06 14:01:38 UTC (rev 7146) +++ csw/mgar/pkg/memcached/trunk/Makefile 2009-11-06 14:30:24 UTC (rev 7147) @@ -23,5 +23,7 @@ BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) +SKIPTEST = 1 + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Fri Nov 6 15:40:07 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 06 Nov 2009 14:40:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7148] csw/mgar/pkg/openssl/trunk Message-ID: Revision: 7148 http://gar.svn.sourceforge.net/gar/?rev=7148&view=rev Author: chninkel Date: 2009-11-06 14:40:06 +0000 (Fri, 06 Nov 2009) Log Message: ----------- openssl: updated to 0.9.8l Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile csw/mgar/pkg/openssl/trunk/checksums csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc csw/mgar/pkg/openssl/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2009-11-06 14:30:24 UTC (rev 7147) +++ csw/mgar/pkg/openssl/trunk/Makefile 2009-11-06 14:40:06 UTC (rev 7148) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = openssl -GARVERSION = 0.9.8k +GARVERSION = 0.9.8l CATEGORIES = lib DESCRIPTION = The Open Source toolkit for SSL and TLS Modified: csw/mgar/pkg/openssl/trunk/checksums =================================================================== --- csw/mgar/pkg/openssl/trunk/checksums 2009-11-06 14:30:24 UTC (rev 7147) +++ csw/mgar/pkg/openssl/trunk/checksums 2009-11-06 14:40:06 UTC (rev 7148) @@ -5,9 +5,9 @@ 1c3f600eaf942a18ecab3637e1fc32bd CSWosslrt.postinstall c9de908daad1a31fca20329cb043ad3c CSWosslrt.preinstall 8b14ea8718a295d97ace5d7933a957d1 CSWosslrt.prototype-i386 -ec547e9a56e0933a928fd9d505c19333 CSWosslrt.prototype-sparc +521028d0016ae5a4cc8fd5e0b0add53f CSWosslrt.prototype-sparc 88634d81695a173bdb35df1a80cc9761 CSWosslutils.prototype b78faa440d6f6a2a07663de331678648 README.CSW -904ceefa66b6b7b7e93ae0e9bc58bac8 changelog.CSW +5c447b39d30f5ae4ede50d53dfcdfb58 changelog.CSW 64f7c3f3a6cae483209b69c31c82557d more_configure_targets.patch -e555c6d58d276aec7fdc53363e338ab3 openssl-0.9.8k.tar.gz +05a0ece1372392a2cf310ebb96333025 openssl-0.9.8l.tar.gz Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc 2009-11-06 14:30:24 UTC (rev 7147) +++ csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc 2009-11-06 14:40:06 UTC (rev 7148) @@ -34,14 +34,14 @@ s none /opt/csw/ssl/private=../../../etc/opt/csw/ssl/private d none /etc/opt/csw/ssl/private 0700 root bin s none /opt/csw/etc/ssl/private=../../../../etc/opt/csw/ssl/private -f none /opt/csw/share/doc/openssl_rt/changelog.CSW=changelog.CSW 644 root bin -f none /opt/csw/share/doc/openssl_rt/CHANGES=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_rt/CHANGES.SSLeay=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_rt/PROBLEMS=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_rt/README=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_rt/FAQ=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_rt/README.ASN1=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_rt/INSTALL=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_rt/NEWS=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_rt/README.ENGINE=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_rt/README.CSW=README.CSW 644 root bin +f none /opt/csw/share/doc/openssl_rt/changelog.CSW 644 root bin +f none /opt/csw/share/doc/openssl_rt/CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_rt/CHANGES.SSLeay 644 root bin +f none /opt/csw/share/doc/openssl_rt/PROBLEMS 644 root bin +f none /opt/csw/share/doc/openssl_rt/README 644 root bin +f none /opt/csw/share/doc/openssl_rt/FAQ 644 root bin +f none /opt/csw/share/doc/openssl_rt/README.ASN1 644 root bin +f none /opt/csw/share/doc/openssl_rt/INSTALL 644 root bin +f none /opt/csw/share/doc/openssl_rt/NEWS 644 root bin +f none /opt/csw/share/doc/openssl_rt/README.ENGINE 644 root bin +f none /opt/csw/share/doc/openssl_rt/README.CSW 644 root bin Modified: csw/mgar/pkg/openssl/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2009-11-06 14:30:24 UTC (rev 7147) +++ csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2009-11-06 14:40:06 UTC (rev 7148) @@ -1,17 +1,24 @@ -openssl (0.9.8,rev=2009.03.27_rev=k) unstable +openssl (0.9.8l,REV=2009.03.27) unstable * New upstream version. + * Changed package version numbering scheme. + -- Yann Rouillard Fri, 06 Nov 2009 11:16:03 +0100 + +openssl (0.9.8,REV=2009.03.27_rev=k) unstable + + * New upstream version. + -- Yann Rouillard Wed, 25 Mar 2009 22:57:40 +0100 -openssl (0.9.8,rev=2009.01.28_rev=j) unstable +openssl (0.9.8,REV=2009.01.28_rev=j) unstable * Fixed checkinstall bug, -h should be used instead of -L to test symlink because old sh doesn't know -L. -- Yann Rouillard Wed, 28 Jan 2009 10:37:43 +0100 -openssl (0.9.8,rev=2009.01.07_rev=j) unstable +openssl (0.9.8,REV=2009.01.07_rev=j) unstable * New upstream version. * Made the private directory local by symlinking it to @@ -19,7 +26,7 @@ -- Yann Rouillard Wed, 07 Jan 2009 19:07:01 +0100 -openssl (0.9.8,rev=2009.01.01_rev=i) unstable +openssl (0.9.8,REV=2009.01.01_rev=i) unstable * Removed CA and added dependancy on ca_certificates. * Added openssl documentation files. @@ -28,7 +35,7 @@ -- Yann Rouillard Sat, 13 Dec 2008 14:28:14 +0100 -openssl (0.9.8,rev=2008.10.05_rev=i) unstable +openssl (0.9.8,REV=2008.10.05_rev=i) unstable * New upstream version. * Added ca certs that were removed in 0.9.8h. 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 Nov 6 16:10:15 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 06 Nov 2009 15:10:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[7149] csw/mgar/pkg/sox/trunk Message-ID: Revision: 7149 http://gar.svn.sourceforge.net/gar/?rev=7149&view=rev Author: dmichelsen Date: 2009-11-06 15:10:15 +0000 (Fri, 06 Nov 2009) Log Message: ----------- sox: Add patch to allow 64 bit compilation Modified Paths: -------------- csw/mgar/pkg/sox/trunk/Makefile csw/mgar/pkg/sox/trunk/checksums Added Paths: ----------- csw/mgar/pkg/sox/trunk/files/ csw/mgar/pkg/sox/trunk/files/0001-Disable-stdio-hack-to-rewind-pipes.patch Modified: csw/mgar/pkg/sox/trunk/Makefile =================================================================== --- csw/mgar/pkg/sox/trunk/Makefile 2009-11-06 14:40:06 UTC (rev 7148) +++ csw/mgar/pkg/sox/trunk/Makefile 2009-11-06 15:10:15 UTC (rev 7149) @@ -9,6 +9,11 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(DISTNAME).tar.gz +# There is a hack in there to rewind pipes when detecting file formats. +# As the FILE struct is opaque in 64 bit we must disable this for 64 bit. +# But as we only need the library in 64 bit anyway this shouldn't hurt. +PATCHFILES = 0001-Disable-stdio-hack-to-rewind-pipes.patch + UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz SPKG_SOURCEURL = http://sox.sourceforge.net/ @@ -18,9 +23,12 @@ PREREQUISITE_PKGS = $(REQUIRED_PKGS) CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --without-libltdl BUILD64 = 1 - +NO_ISAEXEC = 1 TEST_TARGET = check +MERGE_DIRS_isa-extra = $(libdir) + include gar/category.mk Modified: csw/mgar/pkg/sox/trunk/checksums =================================================================== --- csw/mgar/pkg/sox/trunk/checksums 2009-11-06 14:40:06 UTC (rev 7148) +++ csw/mgar/pkg/sox/trunk/checksums 2009-11-06 15:10:15 UTC (rev 7149) @@ -1 +1,2 @@ +ce1fa27946b99c023d2b37bb0d5800c4 0001-Disable-stdio-hack-to-rewind-pipes.patch 8e3509804e6227273ef84092e1a2fea7 sox-14.3.0.tar.gz Added: csw/mgar/pkg/sox/trunk/files/0001-Disable-stdio-hack-to-rewind-pipes.patch =================================================================== --- csw/mgar/pkg/sox/trunk/files/0001-Disable-stdio-hack-to-rewind-pipes.patch (rev 0) +++ csw/mgar/pkg/sox/trunk/files/0001-Disable-stdio-hack-to-rewind-pipes.patch 2009-11-06 15:10:15 UTC (rev 7149) @@ -0,0 +1,31 @@ +From 91792a0837969dd584dd469c06874111d80cfcec Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 6 Nov 2009 16:05:59 +0100 +Subject: [PATCH] Disable stdio hack to rewind pipes + +--- + src/formats.c | 3 +-- + 1 files changed, 1 insertions(+), 2 deletions(-) + +diff --git a/src/formats.c b/src/formats.c +index 556f611..f238929 100644 +--- a/src/formats.c ++++ b/src/formats.c +@@ -397,13 +397,12 @@ static void UNUSED rewind_pipe(FILE * fp) + fp->_r += AUTO_DETECT_SIZE; + #elif defined __GLIBC__ + fp->_IO_read_ptr = fp->_IO_read_base; +-#elif defined _MSC_VER || defined __MINGW_H || defined _ISO_STDIO_ISO_H ++#elif !defined _LP64 && (defined _MSC_VER || defined __MINGW_H || defined _ISO_STDIO_ISO_H) + fp->_ptr = fp->_base; + #else + /* To fix this #error, either simply remove the #error line and live without + * file-type detection with pipes, or add support for your compiler in the + * lines above. Test with cat monkey.au | ./sox --info - */ +- #error FIX NEEDED HERE + #define NO_REWIND_PIPE + (void)fp; + #endif +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Nov 6 16:36:38 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 06 Nov 2009 15:36:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[7150] csw/mgar/pkg/balance/trunk Message-ID: Revision: 7150 http://gar.svn.sourceforge.net/gar/?rev=7150&view=rev Author: dmichelsen Date: 2009-11-06 15:36:38 +0000 (Fri, 06 Nov 2009) Log Message: ----------- balance: Update to 3.42 Modified Paths: -------------- csw/mgar/pkg/balance/trunk/Makefile csw/mgar/pkg/balance/trunk/checksums Added Paths: ----------- csw/mgar/pkg/balance/trunk/files/0001-Adjust-Makefile.patch Removed Paths: ------------- csw/mgar/pkg/balance/trunk/files/CSWbalance.gspec csw/mgar/pkg/balance/trunk/files/build.diff Property Changed: ---------------- csw/mgar/pkg/balance/trunk/ Property changes on: csw/mgar/pkg/balance/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/balance/trunk/Makefile =================================================================== --- csw/mgar/pkg/balance/trunk/Makefile 2009-11-06 15:10:15 UTC (rev 7149) +++ csw/mgar/pkg/balance/trunk/Makefile 2009-11-06 15:36:38 UTC (rev 7150) @@ -1,8 +1,8 @@ GARNAME = balance -GARVERSION = 3.11 +GARVERSION = 3.42 CATEGORIES = net -DESCRIPTION = A TCP proxy and load balancer. +DESCRIPTION = A TCP proxy and load balancer define BLURB Balance is a simple but powerful generic TCP proxy with round-robin load balancing and failover mechanisms. Its behaviour can be controlled at runtime @@ -11,15 +11,13 @@ MASTER_SITES = http://www.inlab.de/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWbalance,) +PATCHFILES = 0001-Adjust-Makefile.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# Configure for build with SunONE -PATCHFILES = build.diff - CONFIGURE_SCRIPTS = + TEST_SCRIPTS = include gar/category.mk Modified: csw/mgar/pkg/balance/trunk/checksums =================================================================== --- csw/mgar/pkg/balance/trunk/checksums 2009-11-06 15:10:15 UTC (rev 7149) +++ csw/mgar/pkg/balance/trunk/checksums 2009-11-06 15:36:38 UTC (rev 7150) @@ -1,3 +1,2 @@ -b3ab07862a1e25dc63c1f5f2a006f474 download/balance-3.11.tar.gz -3c06491c6dc775fc8883ef7346427343 download/CSWbalance.gspec -8dfddaec5c9b69f163e581447f1b592b download/build.diff +dff93af413acf3cfe6e54f9f8ec99327 0001-Adjust-Makefile.patch +24bc4063e8af298471d7d0a2ac7462a6 balance-3.42.tar.gz Added: csw/mgar/pkg/balance/trunk/files/0001-Adjust-Makefile.patch =================================================================== --- csw/mgar/pkg/balance/trunk/files/0001-Adjust-Makefile.patch (rev 0) +++ csw/mgar/pkg/balance/trunk/files/0001-Adjust-Makefile.patch 2009-11-06 15:36:38 UTC (rev 7150) @@ -0,0 +1,65 @@ +From f39ca105749c5c407c8e0ff6d53ed0a1fee12470 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 6 Nov 2009 16:33:53 +0100 +Subject: [PATCH] Adjust Makefile + +--- + Makefile | 20 ++++++++++++-------- + 1 files changed, 12 insertions(+), 8 deletions(-) + +diff --git a/Makefile b/Makefile +index 90a4b47..3c549ce 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,26 +1,28 @@ + # $Id: Makefile,v 1.45 2008/04/08 17:39:08 tommy Exp $ + + #CFLAGS=-g -I. +-CFLAGS=-O2 -Wall -Wstrict-prototypes -Wuninitialized ++# CFLAGS=-O2 -Wall -Wstrict-prototypes -Wuninitialized + + # uncomment for any OS other than Cygwin + BALANCE=balance + ROOT=root + INSTALL=install +-BINDIR=/usr/sbin +-MANDIR=${BINDIR}/../man/man1 ++# BINDIR=/usr/sbin ++# MANDIR=${BINDIR}/../man/man1 + + # uncomment for Solaris +-# LIBRARIES=-lsocket -lnsl +-# INSTALL=/usr/ucb/install ++LIBRARIES=-lsocket -lnsl ++INSTALL=/usr/ucb/install + # BINDIR=/usr/local/libexec ++BINDIR=/opt/csw/sbin ++MANDIR=/opt/csw/share/man/man1 + + # uncomment for Cygwin + # LIBRARIES=-L/usr/local/lib -lcygipc + # BALANCE=balance.exe + # ROOT=Administrators + +-CC=gcc ++# CC=gcc + RELEASE=3.42 + + all: balance +@@ -48,9 +50,11 @@ clean: + rm -f $(BALANCE) *.o balance.ps balance.pdf + + install: +- $(INSTALL) -o $(ROOT) -g $(ROOT) -m 755 $(BALANCE) \ ++ $(INSTALL) -d $(DESTDIR)$(BINDIR) ++ $(INSTALL) -m 755 $(BALANCE) \ + $(DESTDIR)$(BINDIR)/$(BALANCE) +- $(INSTALL) -o $(ROOT) -g $(ROOT) -m 755 balance.1 \ ++ $(INSTALL) -d $(DESTDIR)$(MANDIR) ++ $(INSTALL) -m 755 balance.1 \ + $(DESTDIR)$(MANDIR) + mkdir -p $(DESTDIR)/var/run/balance + chmod 1777 $(DESTDIR)/var/run/balance +-- +1.6.5.1 + Deleted: csw/mgar/pkg/balance/trunk/files/CSWbalance.gspec =================================================================== --- csw/mgar/pkg/balance/trunk/files/CSWbalance.gspec 2009-11-06 15:10:15 UTC (rev 7149) +++ csw/mgar/pkg/balance/trunk/files/CSWbalance.gspec 2009-11-06 15:36:38 UTC (rev 7150) @@ -1,4 +0,0 @@ -%var bitname balance -%var pkgname CSWbalance -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYRIGHT Deleted: csw/mgar/pkg/balance/trunk/files/build.diff =================================================================== --- csw/mgar/pkg/balance/trunk/files/build.diff 2009-11-06 15:10:15 UTC (rev 7149) +++ csw/mgar/pkg/balance/trunk/files/build.diff 2009-11-06 15:36:38 UTC (rev 7150) @@ -1,28 +0,0 @@ ---- balance-3.11.orig/Makefile 2003-10-04 02:41:44.000000000 -0700 -+++ balance-3.11/Makefile 2004-05-14 13:02:03.201642000 -0700 -@@ -1,12 +1,8 @@ - # $Id: build.diff,v 1.1.1.1 2004/08/17 17:07:34 comand Exp $ - --#CFLAGS=-g -I. --CFLAGS=-O2 -- - # uncomment for Solaris: --# LIBRARIES=-lsocket -lnsl -+LIBRARIES=-lsocket -lnsl - --CC=gcc - RELEASE=3.11 - - balance: balance.c butils.o balance.h -@@ -24,8 +20,9 @@ - rm -f balance - - install: -- install -o root -g root -m 755 balance /usr/sbin/balance -- install -o root -g root -m 755 balance.1 /usr/man/man1 -+ install -d $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir)/man1 -+ install -o root -g root -m 755 balance $(DESTDIR)$(sbindir)/balance -+ install -o root -g root -m 755 balance.1 $(DESTDIR)$(mandir)/man1 - mkdir -p /var/run/balance - chmod 1777 /var/run/balance - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Fri Nov 6 18:24:41 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 06 Nov 2009 17:24:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[7151] csw/mgar/pkg/openssl/trunk/Makefile Message-ID: Revision: 7151 http://gar.svn.sourceforge.net/gar/?rev=7151&view=rev Author: chninkel Date: 2009-11-06 17:24:41 +0000 (Fri, 06 Nov 2009) Log Message: ----------- openssl: fixed doc installation Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2009-11-06 15:36:38 UTC (rev 7150) +++ csw/mgar/pkg/openssl/trunk/Makefile 2009-11-06 17:24:41 UTC (rev 7151) @@ -147,7 +147,7 @@ install-doc: for CATALOGNAME in $(foreach PKG, $(PACKAGES), $(call catalogname,$(PKG))); do \ - ginstall -d $(DOCFILES) $(PKGROOT)/$(docdir)/$$CATALOGNAME; \ + ginstall -d $(PKGROOT)/$(docdir)/$$CATALOGNAME; \ (cd $(WORKSRC_FIRSTMOD)/ && ginstall $(DOCFILES) $(PKGROOT)/$(docdir)/$$CATALOGNAME/); \ ginstall -D $(WORKDIR_FIRSTMOD)/README.CSW $(PKGROOT)/$(docdir)/$$CATALOGNAME/README.CSW; \ 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 Fri Nov 6 21:19:29 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 06 Nov 2009 20:19:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[7152] csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile Message-ID: Revision: 7152 http://gar.svn.sourceforge.net/gar/?rev=7152&view=rev Author: dmichelsen Date: 2009-11-06 20:19:28 +0000 (Fri, 06 Nov 2009) Log Message: ----------- cpan/Text-CSV_XS: Fix name Modified Paths: -------------- csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile Modified: csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile 2009-11-06 17:24:41 UTC (rev 7151) +++ csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile 2009-11-06 20:19:28 UTC (rev 7152) @@ -10,11 +10,12 @@ fields into a CSV string and parse a CSV string into fields. endef -# XXX: This package name contains a type, it was released this way a long time -# ago and should be renamed sometime. -PACKAGES = CSWpmttextcsvxs +PACKAGES = CSWpmtextcsvxs CATALOGNAME = pm_textcsvxs +# This was the previous name. Note the typo! +INCOMPATIBLE_PKGS = CSWpmttextcsvxs + # This module uses .tgz instead of .tar.gz :-( MODDIST = $(GARNAME)-$(GARVERSION).tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Fri Nov 6 23:20:16 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Fri, 06 Nov 2009 22:20:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7153] csw/mgar/pkg Message-ID: Revision: 7153 http://gar.svn.sourceforge.net/gar/?rev=7153&view=rev Author: trygvis Date: 2009-11-06 22:20:16 +0000 (Fri, 06 Nov 2009) Log Message: ----------- o Adding an initial commit of qucs, not complete yet. Added Paths: ----------- csw/mgar/pkg/qucs/ csw/mgar/pkg/qucs/branches/ csw/mgar/pkg/qucs/tags/ csw/mgar/pkg/qucs/trunk/ csw/mgar/pkg/qucs/trunk/Makefile csw/mgar/pkg/qucs/trunk/checksums csw/mgar/pkg/qucs/trunk/files/ csw/mgar/pkg/qucs/trunk/files/0000-Missing-include.patch csw/mgar/pkg/qucs/trunk/files/0001-Replace-bin-sh-with-bin-bash.patch Property changes on: csw/mgar/pkg/qucs/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/qucs/trunk/Makefile =================================================================== --- csw/mgar/pkg/qucs/trunk/Makefile (rev 0) +++ csw/mgar/pkg/qucs/trunk/Makefile 2009-11-06 22:20:16 UTC (rev 7153) @@ -0,0 +1,35 @@ +GARNAME = qucs +GARVERSION = 0.0.15 +CATEGORIES = devel + +DESCRIPTION = Integrated circuit simulator +#define BLURB +# Long description +#endef + +SF_PROJ = $(GARNAME) +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0000-Missing-include.patch +PATCHFILES += 0001-Replace-bin-sh-with-bin-bash.patch + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +GARCOMPILER = GNU + +CONFIGURE_ENV = QTDIR=/opt/csw +CONFIGURE_ENV += LD_LIBRARY_PATH=/opt/csw/gcc4/lib +CONFIGURE_ENV += LDFLAGS="-L/opt/csw/kde-gcc/lib -L/opt/csw/gcc4/lib" +# -lstdc++" +CONFIGURE_ENV := $(CONFIGURE_ENV) +#LD_LIBRARY_PATH=/opt/csw/gcc4/lib QTDIR=/opt/csw CC=/opt/csw/gcc4/bin/gcc LDFLAGS="-L/opt/csw/kde-gcc/lib/ -lstdc++" CFLAGS="-I/opt/csw/kde-gcc/include -I/opt/csw/include" +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_SCRIPTS = + +include gar/category.mk Added: csw/mgar/pkg/qucs/trunk/checksums =================================================================== --- csw/mgar/pkg/qucs/trunk/checksums (rev 0) +++ csw/mgar/pkg/qucs/trunk/checksums 2009-11-06 22:20:16 UTC (rev 7153) @@ -0,0 +1,3 @@ +2c90464d784a2d26f833541731cc8874 0000-Missing-include.patch +7e60614d494bfb343cf07d2b33ee4c17 0001-Replace-bin-sh-with-bin-bash.patch +5a35eee790c92eba97de181b12794823 qucs-0.0.15.tar.gz Added: csw/mgar/pkg/qucs/trunk/files/0000-Missing-include.patch =================================================================== --- csw/mgar/pkg/qucs/trunk/files/0000-Missing-include.patch (rev 0) +++ csw/mgar/pkg/qucs/trunk/files/0000-Missing-include.patch 2009-11-06 22:20:16 UTC (rev 7153) @@ -0,0 +1,11 @@ +diff -u -r qucs-0.0.15/qucs-transcalc/coplanar.cpp qucs-0.0.15.ok/qucs-transcalc/coplanar.cpp +--- qucs-0.0.15/qucs-transcalc/coplanar.cpp 2008-04-10 14:44:26.000000000 +0200 ++++ qucs-0.0.15.ok/qucs-transcalc/coplanar.cpp 2009-11-06 17:26:59.389086865 +0100 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + #ifdef __MINGW32__ + # define finite(x) _finite(x) Added: csw/mgar/pkg/qucs/trunk/files/0001-Replace-bin-sh-with-bin-bash.patch =================================================================== --- csw/mgar/pkg/qucs/trunk/files/0001-Replace-bin-sh-with-bin-bash.patch (rev 0) +++ csw/mgar/pkg/qucs/trunk/files/0001-Replace-bin-sh-with-bin-bash.patch 2009-11-06 22:20:16 UTC (rev 7153) @@ -0,0 +1,29 @@ +diff -u -r qucs-0.0.15/qucs/qucsdigi qucs-0.0.15.ok/qucs/qucsdigi +--- qucs-0.0.15/qucs/qucsdigi 2008-09-25 21:15:57.000000000 +0200 ++++ qucs-0.0.15.ok/qucs/qucsdigi 2009-11-06 23:02:04.765281763 +0100 +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#! /bin/bash + # + # qucsdigi - wrapper script for digital simulation + # +diff -u -r qucs-0.0.15/qucs/qucsveri qucs-0.0.15.ok/qucs/qucsveri +--- qucs-0.0.15/qucs/qucsveri 2007-03-26 21:39:25.000000000 +0200 ++++ qucs-0.0.15.ok/qucs/qucsveri 2009-11-06 23:01:59.453243209 +0100 +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#! /bin/bash + # + # qucsveri - wrapper script for digital simulation + # +diff -u -r qucs-0.0.15/qucs-transcalc/coplanar.cpp qucs-0.0.15.ok/qucs-transcalc/coplanar.cpp +--- qucs-0.0.15/qucs-transcalc/coplanar.cpp 2008-04-10 14:44:26.000000000 +0200 ++++ qucs-0.0.15.ok/qucs-transcalc/coplanar.cpp 2009-11-06 23:01:31.414290151 +0100 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + #ifdef __MINGW32__ + # define finite(x) _finite(x) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Fri Nov 6 23:20:33 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Fri, 06 Nov 2009 22:20:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[7154] csw/mgar/pkg Message-ID: Revision: 7154 http://gar.svn.sourceforge.net/gar/?rev=7154&view=rev Author: trygvis Date: 2009-11-06 22:20:33 +0000 (Fri, 06 Nov 2009) Log Message: ----------- o Adding an initial commit of freehdl, not complete yet. Added Paths: ----------- csw/mgar/pkg/freehdl/ csw/mgar/pkg/freehdl/branches/ csw/mgar/pkg/freehdl/tags/ csw/mgar/pkg/freehdl/trunk/ csw/mgar/pkg/freehdl/trunk/Makefile csw/mgar/pkg/freehdl/trunk/checksums csw/mgar/pkg/freehdl/trunk/files/ csw/mgar/pkg/freehdl/trunk/files/0000-Mirring-strings.h-include.patch Property changes on: csw/mgar/pkg/freehdl/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/freehdl/trunk/Makefile =================================================================== --- csw/mgar/pkg/freehdl/trunk/Makefile (rev 0) +++ csw/mgar/pkg/freehdl/trunk/Makefile 2009-11-06 22:20:33 UTC (rev 7154) @@ -0,0 +1,32 @@ +GARNAME = freehdl +GARVERSION = 0.0.7 +CATEGORIES = devel + +DESCRIPTION = A project to develop a free, open source, GPL'ed VHDL simulator for Linux! +define BLURB +To develop a VHDL simulator that: + o Has a graphical waveform viewer. + o Has a source level debugger. + o Is VHDL-93 compliant. + o Is of commercial quality. (on par with, say, V-System - it'll take us a while to get there, but that should be our aim) + o Is freely distributable - both source and binaries - like Linux itself. (Under the Gnu General Public License (GPL)). +endef + +MASTER_SITES = http://freehdl.seul.org/~enaroska/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0000-Mirring-strings.h-include.patch + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +GARCOMPILER = GNU + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_SCRIPTS = + +include gar/category.mk Added: csw/mgar/pkg/freehdl/trunk/checksums =================================================================== --- csw/mgar/pkg/freehdl/trunk/checksums (rev 0) +++ csw/mgar/pkg/freehdl/trunk/checksums 2009-11-06 22:20:33 UTC (rev 7154) @@ -0,0 +1 @@ +6d702aa188fb2c62f8cfca5a2f66d956 freehdl-0.0.7.tar.gz Added: csw/mgar/pkg/freehdl/trunk/files/0000-Mirring-strings.h-include.patch =================================================================== --- csw/mgar/pkg/freehdl/trunk/files/0000-Mirring-strings.h-include.patch (rev 0) +++ csw/mgar/pkg/freehdl/trunk/files/0000-Mirring-strings.h-include.patch 2009-11-06 22:20:33 UTC (rev 7154) @@ -0,0 +1,11 @@ +diff -r -u freehdl-0.0.7/kernel/fhdl_stream.cc freehdl-0.0.7.fixed/kernel/fhdl_stream.cc +--- freehdl-0.0.7/kernel/fhdl_stream.cc 2006-01-12 09:05:01.000000000 +0100 ++++ freehdl-0.0.7.fixed/kernel/fhdl_stream.cc 2009-11-06 23:04:00.469398404 +0100 +@@ -6,6 +6,7 @@ + #include + #include + #include ++#include + + + // Error stream to output error messages generated by the kernel, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Nov 7 00:07:29 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 06 Nov 2009 23:07:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[7155] csw/mgar/pkg/openssl1/trunk Message-ID: Revision: 7155 http://gar.svn.sourceforge.net/gar/?rev=7155&view=rev Author: chninkel Date: 2009-11-06 23:07:28 +0000 (Fri, 06 Nov 2009) Log Message: ----------- openssl1: updated to 1.0.0-beta3 Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/openssl1/trunk/files/i.conf csw/mgar/pkg/openssl1/trunk/files/pkcs11_engine-0.9.8h.patch.2008-07-29 csw/mgar/pkg/openssl1/trunk/files/r.conf Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2009-11-06 22:20:33 UTC (rev 7154) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2009-11-06 23:07:28 UTC (rev 7155) @@ -1,5 +1,5 @@ ##################################################################### -# OpenCSW build recipe for openssl 1.x +# OpenCSW build recipe for OpenSSL # # Copyright 2009 Yann Rouillard # All rights reserved. Use is subject to license terms. @@ -13,12 +13,9 @@ ###### Package information ####### GARNAME = openssl -GARVERSION = 1.0.0-beta2 +GARVERSION = 1.0.0-beta3 CATEGORIES = lib -OPENSSL_VERSION := $(shell echo $(GARVERSION) | cut -d- -f1) -OPENSSL_RELEASE := $(shell echo $(GARVERSION) | cut -d- -f2) - DESCRIPTION = The Open Source toolkit for SSL and TLS define BLURB The OpenSSL Project is a collaborative effort to develop a robust, @@ -32,18 +29,29 @@ CATALOGNAME_CSWossl1rt = openssl1_rt REQUIRED_PKGS_CSWossl1rt = CSWcacertificates SPKG_DESC_CSWossl1rt = Openssl 1.0 runtime libraries -PKGFILES_CSWossl1rt = $(PKGFILES_RT) +PKGFILES_CSWossl1rt = $(libdir).*\.so(\.\d+)* +PKGFILES_CSWossl1rt += $(sysconfdir)/etc/ssl/private $(prefix)/ssl/private $(prefix)/ssl/certs /etc/$(prefix)/ssl/private +PKGFILES_CSWossl1rt += $(docdir)/openssl1_rt/.* CATALOGNAME_CSWossl1devel = openssl1_devel REQUIRED_PKGS_CSWossl1devel = CSWossl1rt SPKG_DESC_CSWossl1devel = Openssl 1.0 development support files -PKGFILES_CSWossl1devel = $(PKGFILES_DEVEL) +PKGFILES_CSWossl1devel = $(PKGFILES_DEVEL) +PKGFILES_CSWossl1devel += $(docdir)/openssl1_devel/.* CATALOGNAME_CSWossl1utils = openssl1_utils REQUIRED_PKGS_CSWossl1utils = CSWossl1rt SPKG_DESC_CSWossl1utils = Openssl 1.0 binaries and related tools +SPKG_CLASSES_CSWossl1utils = none cswpreserveconf +PKGFILES_CSWossl1utils = $(bindir)/[^/]* $(mandir)/man1/.* $(mandir)/man5/.* $(mandir)/man7/.* +PKGFILES_CSWossl1utils += $(prefix)/ssl/misc/.* +PKGFILES_CSWossl1utils += $(prefix)/ssl/openssl\.cnf $(sysconfdir)/ssl/openssl\.cnf.* +PKGFILES_CSWossl1utils += $(docdir)/openssl1_utils/.* -SPKG_CLASSES = none conf +PROTOTYPE_MODIFIERS = conf +PROTOTYPE_FILES_conf = $(sysconfdir)/ssl/openssl.cnf.CSW +PROTOTYPE_CLASS_conf = cswpreserveconf +PROTOTYPE_PERMS_conf = 0644 ###### Upstream and opencsw files information ####### @@ -53,22 +61,19 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*[a-z]?).tar.gz -DISTNAME = $(GARNAME)-$(GARVERSION) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += CSWossl1rt.checkinstall CSWossl1rt.preinstall CSWossl1rt.postinstall +DISTFILES += CSWossl1rt.checkinstall CSWossl1rt.preinstall CSWossl1rt.postinstall DISTFILES += changelog.CSW README.CSW -DISTFILES += i.conf r.conf DOCFILES = CHANGES CHANGES.SSLeay PROBLEMS README FAQ README.ASN1 INSTALL NEWS README.ENGINE -# add ... -PATCHFILES += more_configure_targets.patch +# This patch add optimised build targets for some solaris isa, ie: +# solaris-pentium_pro-cc and solaris-sparcv9+vis-cc +PATCHFILES = more_configure_targets.patch ##### Build and installation information ##### -ENABLE_CHECK = 0 - # The list of instructions set for which we will # provide optimized libraries and binaries EXTRA_BUILD_ISAS_i386 = pentium_pro amd64 @@ -77,18 +82,20 @@ # we don't yet use isaexec support so we disable # isa relocation for default isa NO_ISAEXEC = 1 + # GAR wants and puts sparcv9 in lib/64 but openssl build system # isn't the standard autoconf/automake one so we disable this # relocation for now ISALIBDIR_sparcv9 = . libdir = /opt/csw/lib -# we redefine the default merge exclude so *.a files are not excluded -MERGE_EXCLUDE_DEFAULT = $(MERGE_EXCLUDE_INFODIR) +# we include *.a files in the devel package so we don't want them excluded +MERGE_EXCLUDE_STATICLIBS = # The corresponding os/compiler to pass to the # openssl Configure script i386_OS_COMPILER = solaris-x86-cc +pentium_OS_COMPILER = solaris-pentium-cc pentium_pro_OS_COMPILER = solaris-pentium_pro-cc amd64_OS_COMPILER = solaris64-x86_64-cc @@ -112,16 +119,9 @@ # /opt/csw/ssl/man, but we want them under /opt/csw/share/man INSTALL_ARGS += MANDIR=$(mandir) -SKIPTEST = 1 - - include gar/category.mk -# we redefine the timestamp to fulfill opencsw standard -SPKG_VERSION := $(OPENSSL_VERSION) -SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(OPENSSL_RELEASE) - pre-configure-modulated: echo " ==> Creating configure script" cd $(WORKSRC) && ln -nf Configure configure @@ -142,7 +142,7 @@ install-doc: for CATALOGNAME in $(foreach PKG, $(PACKAGES), $(call catalogname,$(PKG))); do \ - ginstall -d $(DOCFILES) $(PKGROOT)/$(docdir)/$$CATALOGNAME; \ + ginstall -d $(PKGROOT)/$(docdir)/$$CATALOGNAME; \ (cd $(WORKSRC_FIRSTMOD)/ && ginstall $(DOCFILES) $(PKGROOT)/$(docdir)/$$CATALOGNAME/); \ ginstall -D $(WORKDIR_FIRSTMOD)/README.CSW $(PKGROOT)/$(docdir)/$$CATALOGNAME/README.CSW; \ done @@ -150,7 +150,12 @@ install-certs: [ -f $(PKGROOT)$(prefix)/ssl/openssl.cnf ] && \ - ginstall -D $(PKGROOT)$(prefix)/ssl/openssl.cnf $(PKGROOT)$(sysconfdir)/ssl/openssl.cnf + ginstall -D $(PKGROOT)$(prefix)/ssl/openssl.cnf $(PKGROOT)$(sysconfdir)/ssl/openssl.cnf.CSW + ginstall -d $(PKGROOT)/etc/$(prefix)/ssl/private + rm -rf $(PKGROOT)/$(prefix)/ssl/openssl.cnf && ln -s ../etc/ssl/openssl.cnf $(PKGROOT)/$(prefix)/ssl/openssl.cnf + rm -rf $(PKGROOT)/$(prefix)/ssl/certs && ln -s ../etc/ssl/certs $(PKGROOT)/$(prefix)/ssl/certs + rm -rf $(PKGROOT)/$(prefix)/ssl/private && ln -s ../../../etc/opt/csw/ssl/private $(PKGROOT)/$(prefix)/ssl/private + rm -rf $(PKGROOT)/$(prefix)/etc/ssl/private && ln -s ../../../../etc/opt/csw/ssl/private $(PKGROOT)/$(prefix)/etc/ssl/private + @$(MAKECOOKIE) post-merge: install-certs install-changelog install-doc - Deleted: csw/mgar/pkg/openssl1/trunk/files/i.conf =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/i.conf 2009-11-06 22:20:33 UTC (rev 7154) +++ csw/mgar/pkg/openssl1/trunk/files/i.conf 2009-11-06 23:07:28 UTC (rev 7155) @@ -1,54 +0,0 @@ -# -# Copyright 2006 Yann Rouillard -# All rights reserved. Use is subject to license terms. -# -# Redistribution and/or use, with or without modification, is -# permitted. This code is without warranty of any kind. The -# author(s) shall not be liable in the event that use of the -# software causes damage. -# -# i.conf - class script which install configuration files -# -# If the configuration file already exists on the filesystem, -# this script will let the existing file intact and will -# install a copy of the file provided in the package suffixed -# with .CSW -# except for service configuration files which are always installed -# CSW suffixed under Solaris 9 as they are used to enable/disable -# a service according to opencsw standards. -# -umask 0022 - -if [ -z "$PKG_INSTALL_ROOT" ]; then - PKG_INSTALL_ROOT=/ -fi - -while read SRC DEST; do - if [ -f "${PKG_INSTALL_ROOT}/$DEST" ]; then - cp "$SRC" "${PKG_INSTALL_ROOT}/$DEST.CSW" - else - cp "$SRC" "${PKG_INSTALL_ROOT}/$DEST" - fi -done - -# Unfortunately pkgadd doesn't backup the source file if the destination file is identical. -# It's a problem with zones installation where pkgadd try to find the backup files, so -# we do the backup manually -awk '{ if ( $3 == "conf" ) print $2,$3,$4,$5,$6,$7 }' $INST_DATADIR/$PKG/pkgmap | \ - while read FTYPE CLASS FPATH MODE OWNER GROUP; do - if echo $FPATH | grep "^/" >/dev/null; then - INST_PATH="$INST_DATADIR/$PKG/root/$FPATH" - SAVE_PATH="$PKGSAV/pspool/$PKG/root/$FPATH" - else - INST_PATH="$INST_DATADIR/$PKG/reloc/$FPATH" - SAVE_PATH="$PKGSAV/pspool/$PKG/reloc/$FPATH" - fi - - if [ ! -f "$SAVE_PATH" ]; then - mkdir -p "`LANG=C dirname $SAVE_PATH`" - cp "$INST_PATH" "$SAVE_PATH" - fi - done - -exit 0 - Deleted: csw/mgar/pkg/openssl1/trunk/files/pkcs11_engine-0.9.8h.patch.2008-07-29 =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/pkcs11_engine-0.9.8h.patch.2008-07-29 2009-11-06 22:20:33 UTC (rev 7154) +++ csw/mgar/pkg/openssl1/trunk/files/pkcs11_engine-0.9.8h.patch.2008-07-29 2009-11-06 23:07:28 UTC (rev 7155) @@ -1,10168 +0,0 @@ -diff -urN openssl-0.9.8j/Configure openssl-0.9.8j.new/Configure ---- openssl-0.9.8j/Configure 2008-12-29 01:18:23.000000000 +0100 -+++ openssl-0.9.8j.new/Configure 2009-02-15 22:26:02.669766669 +0100 -@@ -21,6 +21,9 @@ - # --prefix prefix for the OpenSSL include, lib and bin directories - # (Default: the OPENSSLDIR directory) - # -+# --pk11-libname PKCS#11 library name. -+# (Default: none) -+# - # --install_prefix Additional prefix for package builders (empty by - # default). This needn't be set in advance, you can - # just as well use "make INSTALL_PREFIX=/whatever install". -@@ -575,6 +578,8 @@ - my $idx_ranlib = $idx++; - my $idx_arflags = $idx++; - -+my $pk11_libname=""; -+ - my $prefix=""; - my $openssldir=""; - my $exe_ext=""; -@@ -807,6 +812,10 @@ - { - $flags.=$_." "; - } -+ elsif (/^--pk11-libname=(.*)$/) -+ { -+ $pk11_libname=$1; -+ } - elsif (/^--prefix=(.*)$/) - { - $prefix=$1; -@@ -938,6 +947,13 @@ - exit 0; - } - -+if (! $pk11_libname) -+ { -+ print STDERR "You must set --pk11-libname for PKCS#11 library.\n"; -+ print STDERR "See README.pkcs11 for more information.\n"; -+ exit 1; -+ } -+ - if ($target =~ m/^CygWin32(-.*)$/) { - $target = "Cygwin".$1; - } -@@ -1095,6 +1111,8 @@ - if ($flags ne "") { $cflags="$flags$cflags"; } - else { $no_user_cflags=1; } - -+$cflags="-DPK11_LIB_LOCATION=\"$pk11_libname\" $cflags"; -+ - # Kerberos settings. The flavor must be provided from outside, either through - # the script "config" or manually. - if (!$no_krb5) -@@ -1446,6 +1464,7 @@ - s/^VERSION=.*/VERSION=$version/; - s/^MAJOR=.*/MAJOR=$major/; - s/^MINOR=.*/MINOR=$minor/; -+ s/^PK11_LIB_LOCATION=.*/PK11_LIB_LOCATION=$pk11_libname/; - s/^SHLIB_VERSION_NUMBER=.*/SHLIB_VERSION_NUMBER=$shlib_version_number/; - s/^SHLIB_VERSION_HISTORY=.*/SHLIB_VERSION_HISTORY=$shlib_version_history/; - s/^SHLIB_MAJOR=.*/SHLIB_MAJOR=$shlib_major/; -diff -urN openssl-0.9.8j/Makefile.org openssl-0.9.8j.new/Makefile.org ---- openssl-0.9.8j/Makefile.org 2008-12-30 14:26:26.000000000 +0100 -+++ openssl-0.9.8j.new/Makefile.org 2009-02-15 22:26:02.673236044 +0100 -@@ -26,6 +26,9 @@ - INSTALL_PREFIX= - INSTALLTOP=/usr/local/ssl - -+# You must set this through --pk11-libname configure option. -+PK11_LIB_LOCATION= -+ - # Do not edit this manually. Use Configure --openssldir=DIR do change this! - OPENSSLDIR=/usr/local/ssl - -diff -urN openssl-0.9.8j/README.pkcs11 openssl-0.9.8j.new/README.pkcs11 ---- openssl-0.9.8j/README.pkcs11 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-0.9.8j.new/README.pkcs11 2009-02-15 22:26:02.675891756 +0100 -@@ -0,0 +1,159 @@ -+PKCS#11 engine support for OpenSSL 0.9.8h -+========================================= -+ -+[July 29, 2008] -+ -+This patch containing code available in OpenSolaris adds support for PKCS#11 -+engine into OpenSSL and implements PKCS#11 v2.20. It is to be applied against -+OpenSSL 0.9.8h source code distribution as shipped by OpenSSL.Org. Your system -+must provide PKCS#11 backend otherwise the patch is useless. You provide the -+PKCS#11 library name during the build configuration phase, see below. -+ -+Patch can be applied like this: -+ -+ # NOTE: use gtar if on Solaris -+ tar xfzv openssl-0.9.8h.tar.gz -+ # now download the patch to the current directory -+ # ... -+ cd openssl-0.9.8h -+ # NOTE: use gpatch if on Solaris -+ patch -p1 < ../pkcs11_engine-0.9.8h.patch.2008-07-29 -+ -+It is designed to support pure acceleration for RSA, DSA, DH and all the -+symetric ciphers and message digest algorithms that PKCS#11 and OpenSSL share -+except for missing support for patented algorithms MDC2, RC3, RC5 and IDEA. -+ -+According to the PKCS#11 providers installed on your machine, it can support -+following mechanisms: -+ -+ RSA, DSA, DH, RAND, DES-CBC, DES-EDE3-CBC, DES-ECB, DES-EDE3, RC4, -+ AES-128-CBC, AES-192-CBC, AES-256-CBC, AES-128-ECB, AES-192-ECB, -+ AES-256-ECB, AES-128-CTR, AES-192-CTR, AES-256-CTR, MD5, SHA1, SHA224, -+ SHA256, SHA384, SHA512 -+ -+Note that for AES counter mode the application must provide their own EVP -+functions since OpenSSL doesn't support counter mode through EVP yet. You may -+see OpenSSH source code (cipher.c) to get the idea how to do that. -+ -++------------------------------------------------------------------------------+ -+| NOTE: this patch version does NOT contain experimental code for accessing | -+| RSA keys stored in pkcs#11 key stores by reference. Some problems were found | -+| (thanks to all who wrote me!) and due to my ENOTIME problem I'll address | -+| those issues in the next version of the patch that will have that code back, | -+| hopefully fixed. | -++------------------------------------------------------------------------------+ -+ -+You must provide the location of PKCS#11 library in your system to the -+configure script. You will be instructed to do that when you try to run the -+config script: -+ -+ $ ./config -+ Operating system: i86pc-whatever-solaris2 -+ Configuring for solaris-x86-cc -+ You must set --pk11-libname for PKCS#11 library. -+ See README.pkcs11 for more information. -+ -+Taking openCryptoki project on Linux AMD64 box as an example, you would run -+configure like this: -+ -+ ./config --pk11-libname=/usr/lib64/pkcs11/PKCS11_API.so -+ -+To check whether newly built openssl really supports PKCS#11 it's enough to -+run "apps/openssl engine" and look for "(pkcs11) PKCS #11 engine support" in -+the output. -+ -+This patch was tested on Solaris against PKCS#11 engine available from Solaris -+Cryptographic Framework (Solaris 10 and OpenSolaris) and also on Linux using -+PKCS#11 libraries from openCryptoki project (see openCryptoki website -+http://sourceforge.net/projects/opencryptoki for more information). Some Linux -+distributions even ship those libraries with the system. The patch should work -+on any system that is supported by OpenSSL itself and has functional PKCS#11 -+library. -+ -+The patch contains "RSA Security Inc. PKCS #11 Cryptographic Token Interface -+(Cryptoki)" - files cryptoki.h, pkcs11.h, pkcs11f.h and pkcs11t.h which are -+copyrighted by RSA Security Inc., see pkcs11.h for more information. -+ -+Other added/modified code in this patch is copyrighted by Sun Microsystems, -+Inc. and is released under the OpenSSL license (see LICENSE file for more -+information). -+ -+Revisions of patch for 0.9.8 branch -+=================================== -+ -+2008-07-29 -+- update the patch to OpenSSL 0.9.8h version -+- pkcs11t.h updated to the latest version: -+ -+ 6545665 make CKM_AES_CTR available to non-kernel users -+ -+- fixed bugs in the engine code: -+ -+ 6602801 PK11_SESSION cache has to employ reference counting scheme for -+ asymmetric key operations -+ 6605538 pkcs11 functions C_FindObjects[{Init,Final}]() not called -+ atomically -+ 6607307 pkcs#11 engine can't read RSA private keys -+ 6652362 pk11_RSA_finish() is cutting corners -+ 6662112 pk11_destroy_{rsa,dsa,dh}_key_objects() use locking in -+ suboptimal way -+ 6666625 pk11_destroy_{rsa,dsa,dh}_key_objects() should be more -+ resilient to destroy failures -+ 6667273 OpenSSL engine should not use free() but OPENSSL_free() -+ 6670363 PKCS#11 engine fails to reuse existing symmetric keys -+ 6678135 memory corruption in pk11_DH_generate_key() in pkcs#11 engine -+ 6678503 DSA signature conversion in pk11_dsa_do_verify() ignores size -+ of big numbers leading to failures -+ 6706562 pk11_DH_compute_key() returns 0 in case of failure instead of -+ -1 -+ 6706622 pk11_load_{pub,priv}key create corrupted RSA key references -+ 6707129 return values from BN_new() in pk11_DH_generate_key() are not -+ checked -+ 6707274 DSA/RSA/DH PKCS#11 engine operations need to be resistant to -+ structure reuse -+ 6707782 OpenSSL PKCS#11 engine pretends to be aware of -+ OPENSSL_NO_{RSA,DSA,DH} -+ defines but fails miserably -+ 6709966 make check_new_*() to return values to indicate cache hit/miss -+ 6705200 pk11_dh struct initialization in PKCS#11 engine is missing -+ generate_params parameter -+ 6709513 PKCS#11 engine sets IV length even for ECB modes -+ 6728296 buffer length not initialized for C_(En|De)crypt_Final() in the -+ PKCS#11 engine -+ 6728871 PKCS#11 engine must reset global_session in pk11_finish() -+ -+- new features and enhancements: -+ -+ 6562155 OpenSSL pkcs#11 engine needs support for SHA224/256/384/512 -+ 6685012 OpenSSL pkcs#11 engine needs support for new cipher modes -+ 6725903 OpenSSL PKCS#11 engine shouldn't use soft token for symmetric -+ ciphers and digests -+ -+2007-10-15 -+- update for 0.9.8f version -+- update for "6607670 teach pkcs#11 engine how to use keys be reference" -+ -+2007-10-02 -+- draft for "6607670 teach pkcs#11 engine how to use keys be reference" -+- draft for "6607307 pkcs#11 engine can't read RSA private keys" -+ -+2007-09-26 -+- 6375348 Using pkcs11 as the SSLCryptoDevice with Apache/OpenSSL causes -+ significant performance drop -+- 6573196 memory is leaked when OpenSSL is used with PKCS#11 engine -+ -+2007-05-25 -+- 6558630 race in OpenSSL pkcs11 engine when using symetric block ciphers -+ -+2007-05-19 -+- initial patch for 0.9.8e using latest OpenSolaris code -+ -+ -+Feedback -+======== -+ -+Please send feedback to security-discuss at opensolaris.org. The patch was -+created by Jan.Pechanec at Sun.COM from code available in OpenSolaris. -+ -+Latest version should be always available on http://blogs.sun.com/janp. -+ -diff -urN openssl-0.9.8j/crypto/engine/Makefile openssl-0.9.8j.new/crypto/engine/Makefile ---- openssl-0.9.8j/crypto/engine/Makefile 2008-09-17 19:10:59.000000000 +0200 -+++ openssl-0.9.8j.new/crypto/engine/Makefile 2009-02-15 22:29:36.590747863 +0100 -@@ -21,12 +21,14 @@ - eng_table.c eng_pkey.c eng_fat.c eng_all.c \ - tb_rsa.c tb_dsa.c tb_ecdsa.c tb_dh.c tb_ecdh.c tb_rand.c tb_store.c \ - tb_cipher.c tb_digest.c \ -- eng_openssl.c eng_cnf.c eng_dyn.c eng_cryptodev.c eng_padlock.c -+ eng_openssl.c eng_cnf.c eng_dyn.c eng_cryptodev.c eng_padlock.c \ -+ hw_pk11.c hw_pk11_pub.c - LIBOBJ= eng_err.o eng_lib.o eng_list.o eng_init.o eng_ctrl.o \ - eng_table.o eng_pkey.o eng_fat.o eng_all.o \ - tb_rsa.o tb_dsa.o tb_ecdsa.o tb_dh.o tb_ecdh.o tb_rand.o tb_store.o \ - tb_cipher.o tb_digest.o \ -- eng_openssl.o eng_cnf.o eng_dyn.o eng_cryptodev.o eng_padlock.o -+ eng_openssl.o eng_cnf.o eng_dyn.o eng_cryptodev.o eng_padlock.o \ -+ hw_pk11.o hw_pk11_pub.o - - SRC= $(LIBSRC) - -@@ -286,6 +288,54 @@ - eng_table.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h - eng_table.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h - eng_table.o: eng_table.c -+hw_pk11.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -+hw_pk11.o: ../../include/openssl/engine.h ../../include/openssl/ossl_typ.h -+hw_pk11.o: ../../include/openssl/bn.h ../../include/openssl/rsa.h -+hw_pk11.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -+hw_pk11.o: ../../include/openssl/crypto.h ../../include/openssl/stack.h -+hw_pk11.o: ../../include/openssl/safestack.h ../../include/openssl/opensslv.h -+hw_pk11.o: ../../include/openssl/symhacks.h ../../include/openssl/dsa.h -+hw_pk11.o: ../../include/openssl/dh.h ../../include/openssl/rand.h -+hw_pk11.o: ../../include/openssl/ui.h ../../include/openssl/err.h -+hw_pk11.o: ../../include/openssl/lhash.h ../../include/openssl/dso.h -+hw_pk11.o: ../../include/openssl/pem.h ../../include/openssl/evp.h -+hw_pk11.o: ../../include/openssl/md2.h ../../include/openssl/md4.h -+hw_pk11.o: ../../include/openssl/md5.h ../../include/openssl/sha.h -+hw_pk11.o: ../../include/openssl/ripemd.h ../../include/openssl/des.h -+hw_pk11.o: ../../include/openssl/des_old.h ../../include/openssl/ui_compat.h -+hw_pk11.o: ../../include/openssl/rc4.h ../../include/openssl/rc2.h -+hw_pk11.o: ../../crypto/rc5/rc5.h ../../include/openssl/blowfish.h -+hw_pk11.o: ../../include/openssl/cast.h ../../include/openssl/idea.h -+hw_pk11.o: ../../crypto/mdc2/mdc2.h ../../include/openssl/aes.h -+hw_pk11.o: ../../include/openssl/objects.h ../../include/openssl/obj_mac.h -+hw_pk11.o: ../../include/openssl/x509.h ../../include/openssl/buffer.h -+hw_pk11.o: ../../include/openssl/x509_vfy.h ../../include/openssl/pkcs7.h -+hw_pk11.o: ../../include/openssl/pem2.h ../cryptlib.h -+hw_pk11.o: ../../e_os.h hw_pk11_err.c hw_pk11_err.h hw_pk11.c -+hw_pk11_pub.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -+hw_pk11_pub.o: ../../include/openssl/engine.h ../../include/openssl/ossl_typ.h -+hw_pk11_pub.o: ../../include/openssl/bn.h ../../include/openssl/rsa.h -+hw_pk11_pub.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -+hw_pk11_pub.o: ../../include/openssl/crypto.h ../../include/openssl/stack.h -+hw_pk11_pub.o: ../../include/openssl/safestack.h ../../include/openssl/opensslv.h -+hw_pk11_pub.o: ../../include/openssl/symhacks.h ../../include/openssl/dsa.h -+hw_pk11_pub.o: ../../include/openssl/dh.h ../../include/openssl/rand.h -+hw_pk11_pub.o: ../../include/openssl/ui.h ../../include/openssl/err.h -+hw_pk11_pub.o: ../../include/openssl/lhash.h ../../include/openssl/dso.h -+hw_pk11_pub.o: ../../include/openssl/pem.h ../../include/openssl/evp.h -+hw_pk11_pub.o: ../../include/openssl/md2.h ../../include/openssl/md4.h -+hw_pk11_pub.o: ../../include/openssl/md5.h ../../include/openssl/sha.h -+hw_pk11_pub.o: ../../include/openssl/ripemd.h ../../include/openssl/des.h -+hw_pk11_pub.o: ../../include/openssl/des_old.h ../../include/openssl/ui_compat.h -+hw_pk11_pub.o: ../../include/openssl/rc4.h ../../include/openssl/rc2.h -+hw_pk11_pub.o: ../../crypto/rc5/rc5.h ../../include/openssl/blowfish.h -+hw_pk11_pub.o: ../../include/openssl/cast.h ../../include/openssl/idea.h -+hw_pk11_pub.o: ../../crypto/mdc2/mdc2.h ../../include/openssl/aes.h -+hw_pk11_pub.o: ../../include/openssl/objects.h ../../include/openssl/obj_mac.h -+hw_pk11_pub.o: ../../include/openssl/x509.h ../../include/openssl/buffer.h -+hw_pk11_pub.o: ../../include/openssl/x509_vfy.h ../../include/openssl/pkcs7.h -+hw_pk11_pub.o: ../../include/openssl/pem2.h ../cryptlib.h -+hw_pk11_pub.o: ../../e_os.h hw_pk11_err.c hw_pk11_err.h hw_pk11_pub.c - tb_cipher.o: ../../e_os.h ../../include/openssl/asn1.h - tb_cipher.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h - tb_cipher.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -diff -urN openssl-0.9.8j/crypto/engine/cryptoki.h openssl-0.9.8j.new/crypto/engine/cryptoki.h ---- openssl-0.9.8j/crypto/engine/cryptoki.h 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-0.9.8j.new/crypto/engine/cryptoki.h 2009-02-15 22:26:02.684405873 +0100 -@@ -0,0 +1,103 @@ -+/* -+ * CDDL HEADER START -+ * -+ * The contents of this file are subject to the terms of the -+ * Common Development and Distribution License, Version 1.0 only -+ * (the "License"). You may not use this file except in compliance -+ * with the License. -+ * -+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -+ * or http://www.opensolaris.org/os/licensing. -+ * See the License for the specific language governing permissions -+ * and limitations under the License. -+ * -+ * When distributing Covered Code, include this CDDL HEADER in each -+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE. -+ * If applicable, add the following below this CDDL HEADER, with the -+ * fields enclosed by brackets "[]" replaced with your own identifying -+ * information: Portions Copyright [yyyy] [name of copyright owner] -+ * -+ * CDDL HEADER END -+ */ -+/* -+ * Copyright 2003 Sun Microsystems, Inc. All rights reserved. -+ * Use is subject to license terms. -+ */ -+ -+#ifndef _CRYPTOKI_H -+#define _CRYPTOKI_H -+ -+#pragma ident "@(#)cryptoki.h 1.2 05/06/08 SMI" -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+#ifndef CK_PTR -+#define CK_PTR * -+#endif -+ -+#ifndef CK_DEFINE_FUNCTION -+#define CK_DEFINE_FUNCTION(returnType, name) returnType name -+#endif -+ -+#ifndef CK_DECLARE_FUNCTION -+#define CK_DECLARE_FUNCTION(returnType, name) returnType name -+#endif -+ -+#ifndef CK_DECLARE_FUNCTION_POINTER -+#define CK_DECLARE_FUNCTION_POINTER(returnType, name) returnType (* name) -+#endif -+ -+#ifndef CK_CALLBACK_FUNCTION -+#define CK_CALLBACK_FUNCTION(returnType, name) returnType (* name) -+#endif -+ -+#ifndef NULL_PTR -+#include /* For NULL */ -+#define NULL_PTR NULL -+#endif -+ -+/* -+ * pkcs11t.h defines TRUE and FALSE in a way that upsets lint -+ */ -+#ifndef CK_DISABLE_TRUE_FALSE -+#define CK_DISABLE_TRUE_FALSE -+#ifndef TRUE -+#define TRUE 1 -+#endif /* TRUE */ -+#ifndef FALSE -+#define FALSE 0 -+#endif /* FALSE */ -+#endif /* CK_DISABLE_TRUE_FALSE */ -+ -+#undef CK_PKCS11_FUNCTION_INFO -+ -+#include "pkcs11.h" -+ -+/* Solaris specific functions */ -+ -+#include -+ -+/* -+ * SUNW_C_GetMechSession will initialize the framework and do all -+ * the necessary PKCS#11 calls to create a session capable of -+ * providing operations on the requested mechanism -+ */ -+CK_RV SUNW_C_GetMechSession(CK_MECHANISM_TYPE mech, -+ CK_SESSION_HANDLE_PTR hSession); -+ -+/* -+ * SUNW_C_KeyToObject will create a secret key object for the given -+ * mechanism from the rawkey data. -+ */ -+CK_RV SUNW_C_KeyToObject(CK_SESSION_HANDLE hSession, -+ CK_MECHANISM_TYPE mech, const void *rawkey, size_t rawkey_len, -+ CK_OBJECT_HANDLE_PTR obj); -+ -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif /* _CRYPTOKI_H */ -diff -urN openssl-0.9.8j/crypto/engine/eng_all.c openssl-0.9.8j.new/crypto/engine/eng_all.c ---- openssl-0.9.8j/crypto/engine/eng_all.c 2008-06-04 20:01:39.000000000 +0200 -+++ openssl-0.9.8j.new/crypto/engine/eng_all.c 2009-02-15 22:26:02.687356494 +0100 -@@ -110,6 +110,9 @@ - #if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG) - ENGINE_load_capi(); - #endif -+#ifndef OPENSSL_NO_HW_PKCS11 -+ ENGINE_load_pk11(); -+#endif - #endif - } - -diff -urN openssl-0.9.8j/crypto/engine/engine.h openssl-0.9.8j.new/crypto/engine/engine.h ---- openssl-0.9.8j/crypto/engine/engine.h 2008-06-04 20:01:40.000000000 +0200 -+++ openssl-0.9.8j.new/crypto/engine/engine.h 2009-02-15 22:26:02.691825491 +0100 -@@ -337,6 +337,7 @@ - void ENGINE_load_ubsec(void); - #endif - void ENGINE_load_cryptodev(void); -+void ENGINE_load_pk11(void); - void ENGINE_load_padlock(void); - void ENGINE_load_builtin_engines(void); - #ifndef OPENSSL_NO_CAPIENG -diff -urN openssl-0.9.8j/crypto/engine/hw_pk11.c openssl-0.9.8j.new/crypto/engine/hw_pk11.c ---- openssl-0.9.8j/crypto/engine/hw_pk11.c 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-0.9.8j.new/crypto/engine/hw_pk11.c 2009-02-15 22:26:02.715171244 +0100 -@@ -0,0 +1,3382 @@ -+/* -+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved. -+ * Use is subject to license terms. -+ */ -+ -+#pragma ident "@(#)hw_pk11.c 1.14 08/07/28 SMI" -+ -+/* crypto/engine/hw_pk11.c */ -+/* This product includes software developed by the OpenSSL Project for -+ * use in the OpenSSL Toolkit (http://www.openssl.org/). -+ * -+ * This project also referenced hw_pkcs11-0.9.7b.patch written by -+ * Afchine Madjlessi. -+ */ -+/* ==================================================================== -+ * Copyright (c) 2000-2001 The OpenSSL Project. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in -+ * the documentation and/or other materials provided with the -+ * distribution. -+ * -+ * 3. All advertising materials mentioning features or use of this -+ * software must display the following acknowledgment: -+ * "This product includes software developed by the OpenSSL Project -+ * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" -+ * -+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to -+ * endorse or promote products derived from this software without -+ * prior written permission. For written permission, please contact -+ * licensing at OpenSSL.org. -+ * -+ * 5. Products derived from this software may not be called "OpenSSL" -+ * nor may "OpenSSL" appear in their names without prior written -+ * permission of the OpenSSL Project. -+ * -+ * 6. Redistributions of any form whatsoever must retain the following -+ * acknowledgment: -+ * "This product includes software developed by the OpenSSL Project -+ * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY -+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR -+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -+ * OF THE POSSIBILITY OF SUCH DAMAGE. -+ * ==================================================================== -+ * -+ * This product includes cryptographic software written by Eric Young -+ * (eay at cryptsoft.com). This product includes software written by Tim -+ * Hudson (tjh at cryptsoft.com). -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#ifndef OPENSSL_NO_RSA -+#include -+#endif -+#ifndef OPENSSL_NO_DSA -+#include -+#endif -+#ifndef OPENSSL_NO_DH -+#include -+#endif -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#ifndef OPENSSL_NO_HW -+#ifndef OPENSSL_NO_HW_PK11 -+ -+/* label for debug messages printed on stderr */ -+#define PK11_DBG "PKCS#11 ENGINE DEBUG" -+/* prints a lot of debug messages on stderr about slot selection process */ -+#undef DEBUG_SLOT_SELECTION -+/* -+ * Solaris specific code. See comment at check_hw_mechanisms() for more -+ * information. -+ */ -+#undef SOLARIS_HW_SLOT_SELECTION -+ -+/* -+ * AES counter mode is not supported in the OpenSSL EVP API yet and neither -+ * there are official OIDs for mechanisms based on this mode. With our changes, -+ * an application can define its own EVP calls for AES counter mode and then -+ * it can make use of hardware acceleration through this engine. However, it's -+ * better if we keep AES CTR support code under ifdef's. -+ */ -+#define SOLARIS_AES_CTR -+ -+#include "cryptoki.h" -+#include "pkcs11.h" -+#include "hw_pk11_err.c" -+ -+#ifdef SOLARIS_AES_CTR -+/* -+ * NIDs for AES counter mode that will be defined during the engine -+ * initialization. -+ */ -+int NID_aes_128_ctr = NID_undef; -+int NID_aes_192_ctr = NID_undef; -+int NID_aes_256_ctr = NID_undef; -+#endif /* SOLARIS_AES_CTR */ -+ -+#ifdef SOLARIS_HW_SLOT_SELECTION -+/* -+ * Tables for symmetric ciphers and digest mechs found in the pkcs11_kernel -+ * library. See comment at check_hw_mechanisms() for more information. -+ */ -+int *hw_cnids; -+int *hw_dnids; -+#endif /* SOLARIS_HW_SLOT_SELECTION */ -+ -+/* -+ * Heads of the free PK11 session lists. We have three groups of algorithms in -+ * the engine. Public key mechanisms, random operations, and symetric ciphers -+ * and digests. We can use a different slot for each group so we must keep a -+ * separate cache of sessions for them. -+ */ -+static struct PK11_SESSION_st *pubkey_free_session = NULL; -+static struct PK11_SESSION_st *rand_free_session = NULL; -+static struct PK11_SESSION_st *free_session = NULL; -+ -+/* Create all secret key objects in a global session so that they are available -+ * to use for other sessions. These other sessions may be opened or closed -+ * without losing the secret key objects */ -+static CK_SESSION_HANDLE global_session = CK_INVALID_HANDLE; -+ -+/* ENGINE level stuff */ -+static int pk11_init(ENGINE *e); -+static int pk11_library_init(ENGINE *e); -+static int pk11_finish(ENGINE *e); -+static int pk11_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)()); -+static int pk11_destroy(ENGINE *e); -+ -+/* RAND stuff */ -+static void pk11_rand_seed(const void *buf, int num); -+static void pk11_rand_add(const void *buf, int num, double add_entropy); -+static void pk11_rand_cleanup(void); -+static int pk11_rand_bytes(unsigned char *buf, int num); -+static int pk11_rand_status(void); -+ -+/* These functions are also used in other files */ -+PK11_SESSION *pk11_get_session(PK11_OPTYPE optype); -+void pk11_return_session(PK11_SESSION *sp, PK11_OPTYPE optype); -+ -+/* active list manipulation functions used here */ -+int pk11_active_delete(CK_OBJECT_HANDLE h); -+ -+#ifndef OPENSSL_NO_RSA -+int pk11_destroy_rsa_key_objects(PK11_SESSION *session); -+int pk11_destroy_rsa_object_pub(PK11_SESSION *sp, CK_BBOOL uselock); -+int pk11_destroy_rsa_object_priv(PK11_SESSION *sp, CK_BBOOL uselock); -+#endif -+#ifndef OPENSSL_NO_DSA -+int pk11_destroy_dsa_key_objects(PK11_SESSION *session); -+int pk11_destroy_dsa_object_pub(PK11_SESSION *sp, CK_BBOOL uselock); -+int pk11_destroy_dsa_object_priv(PK11_SESSION *sp, CK_BBOOL uselock); -+#endif -+#ifndef OPENSSL_NO_DH -+int pk11_destroy_dh_key_objects(PK11_SESSION *session); -+int pk11_destroy_dh_object(PK11_SESSION *session, CK_BBOOL uselock); -+#endif -+ -+/* Local helper functions */ -+static int pk11_free_all_sessions(void); -+static int pk11_free_session_list(PK11_SESSION **sp); -+static int pk11_setup_session(PK11_SESSION *sp, PK11_OPTYPE optype); -+static int pk11_destroy_cipher_key_objects(PK11_SESSION *session); -+static int pk11_destroy_object(CK_SESSION_HANDLE session, -+ CK_OBJECT_HANDLE oh); -+static const char *get_PK11_LIBNAME(void); -+static void free_PK11_LIBNAME(void); -+static long set_PK11_LIBNAME(const char *name); -+ -+/* Symmetric cipher and digest support functions */ -+static int cipher_nid_to_pk11(int nid); -+#ifdef SOLARIS_AES_CTR -+static int pk11_add_NID(char *sn, char *ln); -+static int pk11_add_aes_ctr_NIDs(void); -+#endif /* SOLARIS_AES_CTR */ -+static int pk11_usable_ciphers(const int **nids); -+static int pk11_usable_digests(const int **nids); -+static int pk11_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key, -+ const unsigned char *iv, int enc); -+static int pk11_cipher_final(PK11_SESSION *sp); -+static int pk11_cipher_do_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, -+ const unsigned char *in, unsigned int inl); -+static int pk11_cipher_cleanup(EVP_CIPHER_CTX *ctx); -+static int pk11_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher, -+ const int **nids, int nid); -+static int pk11_engine_digests(ENGINE *e, const EVP_MD **digest, -+ const int **nids, int nid); -+static CK_OBJECT_HANDLE pk11_get_cipher_key(EVP_CIPHER_CTX *ctx, -+ const unsigned char *key, CK_KEY_TYPE key_type, PK11_SESSION *sp); -+static int check_new_cipher_key(PK11_SESSION *sp, const unsigned char *key, -+ int key_len); -+static int md_nid_to_pk11(int nid); -+static int pk11_digest_init(EVP_MD_CTX *ctx); -+static int pk11_digest_update(EVP_MD_CTX *ctx,const void *data, -+ size_t count); -+static int pk11_digest_final(EVP_MD_CTX *ctx,unsigned char *md); -+static int pk11_digest_copy(EVP_MD_CTX *to,const EVP_MD_CTX *from); -+static int pk11_digest_cleanup(EVP_MD_CTX *ctx); -+ -+static int pk11_choose_slots(int *any_slot_found); -+static void pk11_find_symmetric_ciphers(CK_FUNCTION_LIST_PTR pflist, -+ CK_SLOT_ID current_slot, int *current_slot_n_cipher, -+ int *local_cipher_nids); -+static void pk11_find_digests(CK_FUNCTION_LIST_PTR pflist, -+ CK_SLOT_ID current_slot, int *current_slot_n_digest, -+ int *local_digest_nids); -+static void pk11_get_symmetric_cipher(CK_FUNCTION_LIST_PTR, int slot_id, -+ CK_MECHANISM_TYPE mech, int *current_slot_n_cipher, int *local_cipher_nids, -+ int id); -+static void pk11_get_digest(CK_FUNCTION_LIST_PTR pflist, int slot_id, -+ CK_MECHANISM_TYPE mech, int *current_slot_n_digest, int *local_digest_nids, -+ int id); -+ -+#ifdef SOLARIS_HW_SLOT_SELECTION -+static int check_hw_mechanisms(void); -+static int nid_in_table(int nid, int *nid_table); -+#endif /* SOLARIS_HW_SLOT_SELECTION */ -+ -+/* Index for the supported ciphers */ -+enum pk11_cipher_id { -+ PK11_DES_CBC, -+ PK11_DES3_CBC, -+ PK11_DES_ECB, -+ PK11_DES3_ECB, -+ PK11_RC4, -+ PK11_AES_128_CBC, -+ PK11_AES_192_CBC, -+ PK11_AES_256_CBC, -+ PK11_AES_128_ECB, -+ PK11_AES_192_ECB, -+ PK11_AES_256_ECB, -+ PK11_BLOWFISH_CBC, -+#ifdef SOLARIS_AES_CTR -+ PK11_AES_128_CTR, -+ PK11_AES_192_CTR, -+ PK11_AES_256_CTR, -+#endif /* SOLARIS_AES_CTR */ -+ PK11_CIPHER_MAX -+}; -+ -+/* Index for the supported digests */ -+enum pk11_digest_id { -+ PK11_MD5, -+ PK11_SHA1, -+ PK11_SHA224, -+ PK11_SHA256, -+ PK11_SHA384, -+ PK11_SHA512, -+ PK11_DIGEST_MAX -+}; -+ -+#define TRY_OBJ_DESTROY(sess_hdl, obj_hdl, retval, uselock) \ -+ { \ -+ if (uselock) \ -+ CRYPTO_w_lock(CRYPTO_LOCK_PK11_ENGINE); \ -+ if (pk11_active_delete(obj_hdl) == 1) \ -+ { \ -+ retval = pk11_destroy_object(sess_hdl, obj_hdl); \ -+ } \ -+ if (uselock) \ -+ CRYPTO_w_unlock(CRYPTO_LOCK_PK11_ENGINE); \ -+ } -+ -+static int cipher_nids[PK11_CIPHER_MAX]; -+static int digest_nids[PK11_DIGEST_MAX]; -+static int cipher_count = 0; -+static int digest_count = 0; -+static CK_BBOOL pk11_have_rsa = CK_FALSE; -+static CK_BBOOL pk11_have_dsa = CK_FALSE; -+static CK_BBOOL pk11_have_dh = CK_FALSE; -+static CK_BBOOL pk11_have_random = CK_FALSE; -+ -+typedef struct PK11_CIPHER_st -+ { -+ enum pk11_cipher_id id; -+ int nid; -+ int iv_len; -+ int key_len; -+ CK_KEY_TYPE key_type; -+ CK_MECHANISM_TYPE mech_type; -+ } PK11_CIPHER; -+ -+static PK11_CIPHER ciphers[] = -+ { -+ {PK11_DES_CBC, NID_des_cbc, 8, 8, CKK_DES, CKM_DES_CBC, }, -+ {PK11_DES3_CBC, NID_des_ede3_cbc, 8, 24, CKK_DES3, CKM_DES3_CBC, }, -+ {PK11_DES_ECB, NID_des_ecb, 0, 8, CKK_DES, CKM_DES_ECB, }, -+ {PK11_DES3_ECB, NID_des_ede3_ecb, 0, 24, CKK_DES3, CKM_DES3_ECB, }, -+ {PK11_RC4, NID_rc4, 0, 16, CKK_RC4, CKM_RC4, }, -+ {PK11_AES_128_CBC, NID_aes_128_cbc, 16, 16, CKK_AES, CKM_AES_CBC, }, -+ {PK11_AES_192_CBC, NID_aes_192_cbc, 16, 24, CKK_AES, CKM_AES_CBC, }, -+ {PK11_AES_256_CBC, NID_aes_256_cbc, 16, 32, CKK_AES, CKM_AES_CBC, }, -+ {PK11_AES_128_ECB, NID_aes_128_ecb, 0, 16, CKK_AES, CKM_AES_ECB, }, -+ {PK11_AES_192_ECB, NID_aes_192_ecb, 0, 24, CKK_AES, CKM_AES_ECB, }, -+ {PK11_AES_256_ECB, NID_aes_256_ecb, 0, 32, CKK_AES, CKM_AES_ECB, }, -+ {PK11_BLOWFISH_CBC,NID_bf_cbc, 8, 16, CKK_BLOWFISH, CKM_BLOWFISH_CBC,}, -+#ifdef SOLARIS_AES_CTR -+ /* we don't know the correct NIDs until the engine is initialized */ -+ {PK11_AES_128_CTR, NID_undef, 16, 16, CKK_AES, CKM_AES_CTR, }, -+ {PK11_AES_192_CTR, NID_undef, 16, 24, CKK_AES, CKM_AES_CTR, }, -+ {PK11_AES_256_CTR, NID_undef, 16, 32, CKK_AES, CKM_AES_CTR, }, -+#endif /* SOLARIS_AES_CTR */ -+ }; -+ -+typedef struct PK11_DIGEST_st -+ { -+ enum pk11_digest_id id; -+ int nid; -+ CK_MECHANISM_TYPE mech_type; -+ } PK11_DIGEST; -+ -+static PK11_DIGEST digests[] = -+ { -+ {PK11_MD5, NID_md5, CKM_MD5, }, -+ {PK11_SHA1, NID_sha1, CKM_SHA_1, }, -+ {PK11_SHA224, NID_sha224, CKM_SHA224, }, -+ {PK11_SHA256, NID_sha256, CKM_SHA256, }, -+ {PK11_SHA384, NID_sha384, CKM_SHA384, }, -+ {PK11_SHA512, NID_sha512, CKM_SHA512, }, -+ {0, NID_undef, 0xFFFF, }, -+ }; -+ -+/* Structure to be used for the cipher_data/md_data in -+ * EVP_CIPHER_CTX/EVP_MD_CTX structures in order to use the same -+ * pk11 session in multiple cipher_update calls -+ */ -+typedef struct PK11_CIPHER_STATE_st -+ { -+ PK11_SESSION *sp; -+ } PK11_CIPHER_STATE; -+ -+ -+/* -+ * libcrypto EVP stuff - this is how we get wired to EVP so the engine gets -+ * called when libcrypto requests a cipher NID. -+ * -+ * Note how the PK11_CIPHER_STATE is used here. -+ */ -+ -+/* DES CBC EVP */ -+static const EVP_CIPHER pk11_des_cbc = -+ { -+ NID_des_cbc, -+ 8, 8, 8, -+ EVP_CIPH_CBC_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof(PK11_CIPHER_STATE), -+ EVP_CIPHER_set_asn1_iv, -+ EVP_CIPHER_get_asn1_iv, -+ NULL -+ }; -+ -+/* 3DES CBC EVP */ -+static const EVP_CIPHER pk11_3des_cbc = -+ { -+ NID_des_ede3_cbc, -+ 8, 24, 8, -+ EVP_CIPH_CBC_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof(PK11_CIPHER_STATE), -+ EVP_CIPHER_set_asn1_iv, -+ EVP_CIPHER_get_asn1_iv, -+ NULL -+ }; -+ -+/* -+ * ECB modes don't use an Initial Vector so that's why set_asn1_parameters and -+ * get_asn1_parameters fields are set to NULL. -+ */ -+static const EVP_CIPHER pk11_des_ecb = -+ { -+ NID_des_ecb, -+ 8, 8, 8, -+ EVP_CIPH_ECB_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof(PK11_CIPHER_STATE), -+ NULL, -+ NULL, -+ NULL -+ }; -+ -+static const EVP_CIPHER pk11_3des_ecb = -+ { -+ NID_des_ede3_ecb, -+ 8, 24, 8, -+ EVP_CIPH_ECB_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof(PK11_CIPHER_STATE), -+ NULL, -+ NULL, -+ NULL -+ }; -+ -+ -+static const EVP_CIPHER pk11_aes_128_cbc = -+ { -+ NID_aes_128_cbc, -+ 16, 16, 16, -+ EVP_CIPH_CBC_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof(PK11_CIPHER_STATE), -+ EVP_CIPHER_set_asn1_iv, -+ EVP_CIPHER_get_asn1_iv, -+ NULL -+ }; -+ -+static const EVP_CIPHER pk11_aes_192_cbc = -+ { -+ NID_aes_192_cbc, -+ 16, 24, 16, -+ EVP_CIPH_CBC_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof(PK11_CIPHER_STATE), -+ EVP_CIPHER_set_asn1_iv, -+ EVP_CIPHER_get_asn1_iv, -+ NULL -+ }; -+ -+static const EVP_CIPHER pk11_aes_256_cbc = -+ { -+ NID_aes_256_cbc, -+ 16, 32, 16, -+ EVP_CIPH_CBC_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof(PK11_CIPHER_STATE), -+ EVP_CIPHER_set_asn1_iv, -+ EVP_CIPHER_get_asn1_iv, -+ NULL -+ }; -+ -+/* -+ * ECB modes don't use IV so that's why set_asn1_parameters and -+ * get_asn1_parameters are set to NULL. -+ */ -+static const EVP_CIPHER pk11_aes_128_ecb = -+ { -+ NID_aes_128_ecb, -+ 16, 16, 0, -+ EVP_CIPH_ECB_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof(PK11_CIPHER_STATE), -+ NULL, -+ NULL, -+ NULL -+ }; -+ -+static const EVP_CIPHER pk11_aes_192_ecb = -+ { -+ NID_aes_192_ecb, -+ 16, 24, 0, -+ EVP_CIPH_ECB_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof(PK11_CIPHER_STATE), -+ NULL, -+ NULL, -+ NULL -+ }; -+ -+static const EVP_CIPHER pk11_aes_256_ecb = -+ { -+ NID_aes_256_ecb, -+ 16, 32, 0, -+ EVP_CIPH_ECB_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof(PK11_CIPHER_STATE), -+ NULL, -+ NULL, -+ NULL -+ }; -+ -+#ifdef SOLARIS_AES_CTR -+/* -+ * NID_undef's will be changed to the AES counter mode NIDs as soon they are -+ * created in pk11_library_init(). Note that the need to change these structures -+ * is the reason why we don't define them with the const keyword. -+ */ -+static EVP_CIPHER pk11_aes_128_ctr = -+ { -+ NID_undef, -+ 16, 16, 16, -+ EVP_CIPH_CBC_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof(PK11_CIPHER_STATE), -+ EVP_CIPHER_set_asn1_iv, -+ EVP_CIPHER_get_asn1_iv, -+ NULL -+ }; -+ -+static EVP_CIPHER pk11_aes_192_ctr = -+ { -+ NID_undef, -+ 16, 24, 16, -+ EVP_CIPH_CBC_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof(PK11_CIPHER_STATE), -+ EVP_CIPHER_set_asn1_iv, -+ EVP_CIPHER_get_asn1_iv, -+ NULL -+ }; -+ -+static EVP_CIPHER pk11_aes_256_ctr = -+ { -+ NID_undef, -+ 16, 32, 16, -+ EVP_CIPH_CBC_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof(PK11_CIPHER_STATE), -+ EVP_CIPHER_set_asn1_iv, -+ EVP_CIPHER_get_asn1_iv, -+ NULL -+ }; -+#endif /* SOLARIS_AES_CTR */ -+ -+static const EVP_CIPHER pk11_bf_cbc = -+ { -+ NID_bf_cbc, -+ 8, 16, 8, -+ EVP_CIPH_VARIABLE_LENGTH, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof(PK11_CIPHER_STATE), -+ EVP_CIPHER_set_asn1_iv, -+ EVP_CIPHER_get_asn1_iv, -+ NULL -+ }; -+ -+static const EVP_CIPHER pk11_rc4 = -+ { -+ NID_rc4, -+ 1, 16, 0, -+ EVP_CIPH_VARIABLE_LENGTH, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof(PK11_CIPHER_STATE), -+ NULL, -+ NULL, -+ NULL -+ }; -+ -+static const EVP_MD pk11_md5 = -+ { -+ NID_md5, -+ NID_md5WithRSAEncryption, -+ MD5_DIGEST_LENGTH, -+ 0, -+ pk11_digest_init, -+ pk11_digest_update, -+ pk11_digest_final, -+ pk11_digest_copy, -+ pk11_digest_cleanup, -+ EVP_PKEY_RSA_method, -+ MD5_CBLOCK, -+ sizeof(PK11_CIPHER_STATE), -+ }; -+ -+static const EVP_MD pk11_sha1 = -+ { -+ NID_sha1, -+ NID_sha1WithRSAEncryption, -+ SHA_DIGEST_LENGTH, -+ 0, -+ pk11_digest_init, -+ pk11_digest_update, -+ pk11_digest_final, -+ pk11_digest_copy, -+ pk11_digest_cleanup, -+ EVP_PKEY_RSA_method, -+ SHA_CBLOCK, -+ sizeof(PK11_CIPHER_STATE), -+ }; -+ -+static const EVP_MD pk11_sha224 = -+ { -+ NID_sha224, -+ NID_sha224WithRSAEncryption, -+ SHA224_DIGEST_LENGTH, -+ 0, -+ pk11_digest_init, -+ pk11_digest_update, -+ pk11_digest_final, -+ pk11_digest_copy, -+ pk11_digest_cleanup, -+ EVP_PKEY_RSA_method, -+ /* SHA-224 uses the same cblock size as SHA-256 */ -+ SHA256_CBLOCK, -+ sizeof(PK11_CIPHER_STATE), -+ }; -+ -+static const EVP_MD pk11_sha256 = -+ { -+ NID_sha256, -+ NID_sha256WithRSAEncryption, -+ SHA256_DIGEST_LENGTH, -+ 0, -+ pk11_digest_init, -+ pk11_digest_update, -+ pk11_digest_final, -+ pk11_digest_copy, -+ pk11_digest_cleanup, -+ EVP_PKEY_RSA_method, -+ SHA256_CBLOCK, -+ sizeof(PK11_CIPHER_STATE), -+ }; -+ -+static const EVP_MD pk11_sha384 = -+ { -+ NID_sha384, -+ NID_sha384WithRSAEncryption, -+ SHA384_DIGEST_LENGTH, -+ 0, -+ pk11_digest_init, -+ pk11_digest_update, -+ pk11_digest_final, -+ pk11_digest_copy, -+ pk11_digest_cleanup, -+ EVP_PKEY_RSA_method, -+ /* SHA-384 uses the same cblock size as SHA-512 */ -+ SHA512_CBLOCK, -+ sizeof(PK11_CIPHER_STATE), -+ }; -+ -+static const EVP_MD pk11_sha512 = -+ { -+ NID_sha512, -+ NID_sha512WithRSAEncryption, -+ SHA512_DIGEST_LENGTH, -+ 0, -+ pk11_digest_init, -+ pk11_digest_update, -+ pk11_digest_final, -+ pk11_digest_copy, -+ pk11_digest_cleanup, -+ EVP_PKEY_RSA_method, -+ SHA512_CBLOCK, -+ sizeof(PK11_CIPHER_STATE), -+ }; -+ -+/* Initialization function. Sets up various pk11 library components. -+ */ -+/* The definitions for control commands specific to this engine -+ */ -+#define PK11_CMD_SO_PATH ENGINE_CMD_BASE -+static const ENGINE_CMD_DEFN pk11_cmd_defns[] = -+ { -+ { -+ PK11_CMD_SO_PATH, -+ "SO_PATH", -+ "Specifies the path to the 'pkcs#11' shared library", -+ ENGINE_CMD_FLAG_STRING -+ }, -+ {0, NULL, NULL, 0} -+ }; -+ -+ -+static RAND_METHOD pk11_random = -+ { -+ pk11_rand_seed, -+ pk11_rand_bytes, -+ pk11_rand_cleanup, -+ pk11_rand_add, -+ pk11_rand_bytes, -+ pk11_rand_status -+ }; -+ -+ -+/* Constants used when creating the ENGINE -+ */ -+static const char *engine_pk11_id = "pkcs11"; -+static const char *engine_pk11_name = "PKCS #11 engine support"; -+ -+CK_FUNCTION_LIST_PTR pFuncList = NULL; -+static const char PK11_GET_FUNCTION_LIST[] = "C_GetFunctionList"; -+ -+/* Cryptoki library -+ */ -+static const char def_PK11_LIBNAME[] = PK11_LIB_LOCATION; -+ -+static CK_BBOOL true = TRUE; -+static CK_BBOOL false = FALSE; -+static CK_SLOT_ID pubkey_SLOTID = 0; -+static CK_SLOT_ID rand_SLOTID = 0; -+static CK_SLOT_ID SLOTID = 0; -+static int pk11_library_initialized = 0; -+static int pk11_pid = 0; -+ -+static DSO *pk11_dso = NULL; -+ -+/* -+ * This internal function is used by ENGINE_pk11() and "dynamic" ENGINE support. -+ */ -+static int bind_pk11(ENGINE *e) -+ { -+#ifndef OPENSSL_NO_RSA -+ const RSA_METHOD *rsa = NULL; -+ RSA_METHOD *pk11_rsa = PK11_RSA(); -+#endif /* OPENSSL_NO_RSA */ -+ if (!pk11_library_initialized) -+ pk11_library_init(e); -+ -+ if(!ENGINE_set_id(e, engine_pk11_id) || -+ !ENGINE_set_name(e, engine_pk11_name) || -+ !ENGINE_set_ciphers(e, pk11_engine_ciphers) || -+ !ENGINE_set_digests(e, pk11_engine_digests)) -+ return 0; -+#ifndef OPENSSL_NO_RSA -+ if(pk11_have_rsa == CK_TRUE) -+ { -+ if(!ENGINE_set_RSA(e, PK11_RSA()) || -+ !ENGINE_set_load_privkey_function(e, pk11_load_privkey) || -+ !ENGINE_set_load_pubkey_function(e, pk11_load_pubkey)) -+ return 0; -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: registered RSA\n", PK11_DBG); -+#endif /* DEBUG_SLOT_SELECTION */ -+ } -+#endif /* OPENSSL_NO_RSA */ -+#ifndef OPENSSL_NO_DSA -+ if(pk11_have_dsa == CK_TRUE) -+ { -+ if (!ENGINE_set_DSA(e, PK11_DSA())) -+ return 0; -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: registered DSA\n", PK11_DBG); -+#endif /* DEBUG_SLOT_SELECTION */ -+ } -+#endif /* OPENSSL_NO_DSA */ -+#ifndef OPENSSL_NO_DH -+ if(pk11_have_dh == CK_TRUE) -+ { -+ if (!ENGINE_set_DH(e, PK11_DH())) -+ return 0; -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: registered DH\n", PK11_DBG); -+#endif /* DEBUG_SLOT_SELECTION */ -+ } -+#endif /* OPENSSL_NO_DH */ -+ if(pk11_have_random) -+ { -+ if(!ENGINE_set_RAND(e, &pk11_random)) -+ return 0; -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: registered random\n", PK11_DBG); -+#endif /* DEBUG_SLOT_SELECTION */ -+ } -+ if(!ENGINE_set_init_function(e, pk11_init) || -+ !ENGINE_set_destroy_function(e, pk11_destroy) || -+ !ENGINE_set_finish_function(e, pk11_finish) || -+ !ENGINE_set_ctrl_function(e, pk11_ctrl) || -+ !ENGINE_set_cmd_defns(e, pk11_cmd_defns)) -+ return 0; -+ -+/* Apache calls OpenSSL function RSA_blinding_on() once during startup -+ * which in turn calls bn_mod_exp. Since we do not implement bn_mod_exp -+ * here, we wire it back to the OpenSSL software implementation. -+ * Since it is used only once, performance is not a concern. */ -+#ifndef OPENSSL_NO_RSA -+ rsa = RSA_PKCS1_SSLeay(); -+ pk11_rsa->rsa_mod_exp = rsa->rsa_mod_exp; -+ pk11_rsa->bn_mod_exp = rsa->bn_mod_exp; -+#endif /* OPENSSL_NO_RSA */ -+ -+ /* Ensure the pk11 error handling is set up */ -+ ERR_load_pk11_strings(); -+ -+ return 1; -+ } -+ -+/* Dynamic engine support is disabled at a higher level for Solaris -+ */ -+#ifdef ENGINE_DYNAMIC_SUPPORT -+static int bind_helper(ENGINE *e, const char *id) -+ { -+ if (id && (strcmp(id, engine_pk11_id) != 0)) -+ return 0; -+ -+ if (!bind_pk11(e)) -+ return 0; -+ -+ return 1; -+ } -+ -+IMPLEMENT_DYNAMIC_CHECK_FN() -+IMPLEMENT_DYNAMIC_BIND_FN(bind_helper) -+ -+#else -+static ENGINE *engine_pk11(void) -+ { -+ ENGINE *ret = ENGINE_new(); -+ -+ if (!ret) -+ return NULL; -+ -+ if (!bind_pk11(ret)) -+ { -+ ENGINE_free(ret); -+ return NULL; -+ } -+ -+ return ret; -+ } -+ -+void ENGINE_load_pk11(void) -+ { -+ ENGINE *e_pk11 = NULL; -+ -+ /* Do not use dynamic PKCS#11 library on Solaris due to -+ * security reasons. We will link it in statically -+ */ -+ /* Attempt to load PKCS#11 library -+ */ -+ if (!pk11_dso) -+ pk11_dso = DSO_load(NULL, get_PK11_LIBNAME(), NULL, 0); -+ -+ if (pk11_dso == NULL) -+ { -+ PK11err(PK11_F_LOAD, PK11_R_DSO_FAILURE); -+ return; -+ } -+ -+ e_pk11 = engine_pk11(); -+ if (!e_pk11) -+ { -+ DSO_free(pk11_dso); -+ pk11_dso = NULL; -+ return; -+ } -+ -+ /* At this point, the pk11 shared library is either dynamically -+ * loaded or statically linked in. So, initialize the pk11 -+ * library before calling ENGINE_set_default since the latter -+ * needs cipher and digest algorithm information -+ */ -+ if (!pk11_library_init(e_pk11)) -+ { -+ DSO_free(pk11_dso); -+ pk11_dso = NULL; -+ ENGINE_free(e_pk11); -+ return; -+ } -+ -+ ENGINE_add(e_pk11); -+ -+ ENGINE_free(e_pk11); -+ ERR_clear_error(); -+ } -+#endif /* ENGINE_DYNAMIC_SUPPORT */ -+ -+/* These are the static string constants for the DSO file name and -+ * the function symbol names to bind to. -+ */ -+static const char *PK11_LIBNAME = NULL; -+ -+static const char *get_PK11_LIBNAME(void) -+ { -+ if (PK11_LIBNAME) -+ return PK11_LIBNAME; -+ -+ return def_PK11_LIBNAME; -+ } -+ -+static void free_PK11_LIBNAME(void) -+ { -+ if (PK11_LIBNAME) -+ OPENSSL_free((void*)PK11_LIBNAME); -+ -+ PK11_LIBNAME = NULL; -+ } -+ -+static long set_PK11_LIBNAME(const char *name) -+ { -+ free_PK11_LIBNAME(); -+ -+ return ((PK11_LIBNAME = BUF_strdup(name)) != NULL ? 1 : 0); -+ } -+ -+/* Initialization function for the pk11 engine */ -+static int pk11_init(ENGINE *e) -+{ -+ return pk11_library_init(e); -+} -+ -+/* Initialization function. Sets up various pk11 library components. -+ * It selects a slot based on predefined critiera. In the process, it also -+ * count how many ciphers and digests to support. Since the cipher and -+ * digest information is needed when setting default engine, this function -+ * needs to be called before calling ENGINE_set_default. -+ */ -+static int pk11_library_init(ENGINE *e) -+ { -+ CK_C_GetFunctionList p; -+ CK_RV rv = CKR_OK; -+ CK_INFO info; -+ CK_ULONG ul_state_len; -+ int any_slot_found; -+ -+ /* -+ * pk11_library_initialized is set to 0 in pk11_finish() which is called -+ * from ENGINE_finish(). However, if there is still at least one -+ * existing functional reference to the engine (see engine(3) for more -+ * information), pk11_finish() is skipped. For example, this can happen -+ * if an application forgets to clear one cipher context. In case of a -+ * fork() when the application is finishing the engine so that it can be -+ * reinitialized in the child, forgotten functional reference causes -+ * pk11_library_initialized to stay 1. In that case we need the PID -+ * check so that we properly initialize the engine again. -+ */ -+ if (pk11_library_initialized) -+ { -+ if (pk11_pid == getpid()) -+ return 1; -+ else -+ global_session = CK_INVALID_HANDLE; -+ } -+ -+ if (pk11_dso == NULL) -+ { -+ PK11err(PK11_F_LIBRARY_INIT, PK11_R_DSO_FAILURE); -+ goto err; -+ } -+ -+#ifdef SOLARIS_AES_CTR -+ /* -+ * We must do this before we start working with slots since we need all -+ * NIDs there. -+ */ -+ if (pk11_add_aes_ctr_NIDs() == 0) -+ goto err; -+#endif /* SOLARIS_AES_CTR */ -+ -+#ifdef SOLARIS_HW_SLOT_SELECTION -+ if (check_hw_mechanisms() == 0) -+ goto err; -+#endif /* SOLARIS_HW_SLOT_SELECTION */ -+ -+ /* get the C_GetFunctionList function from the loaded library -+ */ -+ p = (CK_C_GetFunctionList)DSO_bind_func(pk11_dso, -+ PK11_GET_FUNCTION_LIST); -+ if ( !p ) -+ { -+ PK11err(PK11_F_LIBRARY_INIT, PK11_R_DSO_FAILURE); -+ goto err; -+ } -+ -+ /* get the full function list from the loaded library -+ */ -+ rv = p(&pFuncList); -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_LIBRARY_INIT, PK11_R_DSO_FAILURE, rv); -+ goto err; -+ } -+ -+ rv = pFuncList->C_Initialize(NULL_PTR); -+ if ((rv != CKR_OK) && (rv != CKR_CRYPTOKI_ALREADY_INITIALIZED)) -+ { -+ PK11err_add_data(PK11_F_LIBRARY_INIT, PK11_R_INITIALIZE, rv); -+ goto err; -+ } -+ -+ rv = pFuncList->C_GetInfo(&info); -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_LIBRARY_INIT, PK11_R_GETINFO, rv); -+ goto err; -+ } -+ -+ if (pk11_choose_slots(&any_slot_found) == 0) -+ goto err; -+ -+ /* -+ * The library we use, set in def_PK11_LIBNAME, may not offer any -+ * slot(s). In that case, we must not proceed but we must not return an -+ * error. The reason is that applications that try to set up the PKCS#11 -+ * engine don't exit on error during the engine initialization just -+ * because no slot was present. -+ */ -+ if (any_slot_found == 0) -+ return 1; -+ -+ if (global_session == CK_INVALID_HANDLE) -+ { -+ /* Open the global_session for the new process */ -+ rv = pFuncList->C_OpenSession(SLOTID, CKF_SERIAL_SESSION, -+ NULL_PTR, NULL_PTR, &global_session); -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_LIBRARY_INIT, -+ PK11_R_OPENSESSION, rv); -+ goto err; -+ } -+ } -+ -+ /* Disable digest if C_GetOperationState is not supported since -+ * this function is required by OpenSSL digest copy function */ -+ if (pFuncList->C_GetOperationState(global_session, NULL, &ul_state_len) -+ == CKR_FUNCTION_NOT_SUPPORTED) { -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: C_GetOperationState() not supported, " -+ "setting digest_count to 0\n", PK11_DBG); -+#endif /* DEBUG_SLOT_SELECTION */ -+ digest_count = 0; -+ } -+ -+ pk11_library_initialized = 1; -+ pk11_pid = getpid(); -+ return 1; -+ -+err: -+ return 0; -+ } -+ -+/* Destructor (complements the "ENGINE_pk11()" constructor) -+ */ -+static int pk11_destroy(ENGINE *e) -+ { -+ free_PK11_LIBNAME(); -+ ERR_unload_pk11_strings(); -+ return 1; -+ } -+ -+/* Termination function to clean up the session, the token, and -+ * the pk11 library. -+ */ -+static int pk11_finish(ENGINE *e) -+ { -+ if (pk11_dso == NULL) -+ { -+ PK11err(PK11_F_FINISH, PK11_R_NOT_LOADED); -+ goto err; -+ } -+ -+ OPENSSL_assert(pFuncList != NULL); -+ -+ if (pk11_free_all_sessions() == 0) -+ goto err; -+ -+ pFuncList->C_CloseSession(global_session); -+ global_session = CK_INVALID_HANDLE; -+ -+ /* -+ * Since we are part of a library (libcrypto.so), calling this function -+ * may have side-effects. -+ */ -+#if 0 -+ pFuncList->C_Finalize(NULL); -+#endif -+ -+ if (!DSO_free(pk11_dso)) -+ { -+ PK11err(PK11_F_FINISH, PK11_R_DSO_FAILURE); -+ goto err; -+ } -+ pk11_dso = NULL; -+ pFuncList = NULL; -+ pk11_library_initialized = 0; -+ pk11_pid = 0; -+ -+ return 1; -+ -+err: -+ return 0; -+ } -+ -+/* Standard engine interface function to set the dynamic library path */ -+static int pk11_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)()) -+ { -+ int initialized = ((pk11_dso == NULL) ? 0 : 1); -+ -+ switch(cmd) -+ { -+ case PK11_CMD_SO_PATH: -+ if (p == NULL) -+ { -+ PK11err(PK11_F_CTRL, ERR_R_PASSED_NULL_PARAMETER); -+ return 0; -+ } -+ -+ if (initialized) -+ { -+ PK11err(PK11_F_CTRL, PK11_R_ALREADY_LOADED); -+ return 0; -+ } -+ -+ return set_PK11_LIBNAME((const char*)p); -+ default: -+ break; -+ } -+ -+ PK11err(PK11_F_CTRL,PK11_R_CTRL_COMMAND_NOT_IMPLEMENTED); -+ -+ return 0; -+ } -+ -+ -+/* Required function by the engine random interface. It does nothing here -+ */ -+static void pk11_rand_cleanup(void) -+ { -+ return; -+ } -+ -+static void pk11_rand_add(const void *buf, int num, double add) -+ { -+ PK11_SESSION *sp; -+ -+ if ((sp = pk11_get_session(OP_RAND)) == NULL) -+ return; -+ -+ /* Ignore any errors (e.g. CKR_RANDOM_SEED_NOT_SUPPORTED) since -+ * the calling functions do not care anyway -+ */ -+ pFuncList->C_SeedRandom(sp->session, (unsigned char *) buf, num); -+ pk11_return_session(sp, OP_RAND); -+ -+ return; -+ } -+ -+static void pk11_rand_seed(const void *buf, int num) -+ { -+ pk11_rand_add(buf, num, 0); -+ } -+ -+static int pk11_rand_bytes(unsigned char *buf, int num) -+ { -+ CK_RV rv; -+ PK11_SESSION *sp; -+ -+ if ((sp = pk11_get_session(OP_RAND)) == NULL) -+ return 0; -+ -+ rv = pFuncList->C_GenerateRandom(sp->session, buf, num); -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_RAND_BYTES, PK11_R_GENERATERANDOM, rv); -+ pk11_return_session(sp, OP_RAND); -+ return 0; -+ } -+ -+ pk11_return_session(sp, OP_RAND); -+ return 1; -+ } -+ -+/* Required function by the engine random interface. It does nothing here -+ */ -+static int pk11_rand_status(void) -+ { -+ return 1; -+ } -+ -+/* -+ * Free all BIGNUM structures from PK11_SESSION. -+ */ -+static void pk11_free_nums(PK11_SESSION *sp) -+ { -+#ifndef OPENSSL_NO_RSA -+ if (sp->rsa_n_num != NULL) -+ BN_free(sp->rsa_n_num); -+ if (sp->rsa_e_num != NULL) -+ BN_free(sp->rsa_e_num); -+ if (sp->rsa_d_num != NULL) -+ BN_free(sp->rsa_d_num); -+#endif -+#ifndef OPENSSL_NO_DSA -+ if (sp->dsa_pub_num != NULL) -+ BN_free(sp->dsa_pub_num); -+ if (sp->dsa_priv_num != NULL) -+ BN_free(sp->dsa_priv_num); -+#endif -+#ifndef OPENSSL_NO_DH -+ if (sp->dh_priv_num != NULL) -+ BN_free(sp->dh_priv_num); -+#endif -+ } -+ -+/* -+ * Get new PK11_SESSION structure ready for use. Every process must have -+ * its own freelist of PK11_SESSION structures so handle fork() here -+ * by destroying the old and creating new freelist. -+ * The returned PK11_SESSION structure is disconnected from the freelist. -+ */ -+PK11_SESSION *pk11_get_session(PK11_OPTYPE optype) -+ { -+ PK11_SESSION *sp, *sp1, *freelist; -+ CK_RV rv; -+ -+ CRYPTO_w_lock(CRYPTO_LOCK_PK11_ENGINE); -+ switch (optype) -+ { -+ case OP_PUBKEY: -+ freelist = pubkey_free_session; -+ break; -+ case OP_RAND: -+ freelist = rand_free_session; -+ break; -+ case OP_DIGEST: -+ case OP_CIPHER: -+ freelist = free_session; -+ break; -+ default: -+ PK11err(PK11_F_GET_SESSION, -+ PK11_R_INVALID_OPERATION_TYPE); -+ goto err; -+ } -+ sp = freelist; -+ -+ /* -+ * If the free list is empty, allocate new unitialized (filled -+ * with zeroes) PK11_SESSION structure otherwise return first -+ * structure from the freelist. -+ */ -+ if (sp == NULL) -+ { -+ if ((sp = OPENSSL_malloc(sizeof(PK11_SESSION))) == NULL) -+ { -+ PK11err(PK11_F_GET_SESSION, -+ PK11_R_MALLOC_FAILURE); -+ goto err; -+ } -+ memset(sp, 0, sizeof(PK11_SESSION)); -+ } -+ else -+ { -+ freelist = sp->next; -+ } -+ -+ if (sp->pid != 0 && sp->pid != getpid()) -+ { -+ /* -+ * We are a new process and thus need to free any inherited -+ * PK11_SESSION objects. -+ */ -+ while ((sp1 = freelist) != NULL) -+ { -+ freelist = sp1->next; -+ /* -+ * NOTE: we do not want to call pk11_free_all_sessions() -+ * here because it would close underlying PKCS#11 -+ * sessions and destroy all objects. -+ */ -+ pk11_free_nums(sp1); -+ OPENSSL_free(sp1); -+ } -+ -+ /* Initialize the process */ -+ rv = pFuncList->C_Initialize(NULL_PTR); -+ if ((rv != CKR_OK) && (rv != CKR_CRYPTOKI_ALREADY_INITIALIZED)) -+ { -+ PK11err_add_data(PK11_F_GET_SESSION, PK11_R_INITIALIZE, -+ rv); -+ OPENSSL_free(sp); -+ sp = NULL; -+ goto err; -+ } -+ -+ /* -+ * Choose slot here since the slot table is different on this -+ * process. If we are here then we must have found at least one -+ * usable slot before so we don't need to check any_slot_found. -+ * See pk11_library_init()'s usage of this function for more -+ * information. -+ */ -+#ifdef SOLARIS_HW_SLOT_SELECTION -+ if (check_hw_mechanisms() == 0) -+ goto err; -+#endif /* SOLARIS_HW_SLOT_SELECTION */ -+ if (pk11_choose_slots(NULL) == 0) -+ goto err; -+ -+ /* Open the global_session for the new process */ -+ rv = pFuncList->C_OpenSession(SLOTID, CKF_SERIAL_SESSION, -+ NULL_PTR, NULL_PTR, &global_session); -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_GET_SESSION, PK11_R_OPENSESSION, -+ rv); -+ OPENSSL_free(sp); -+ sp = NULL; -+ goto err; -+ } -+ -+ /* It is an inherited session and needs re-initialization. -+ */ -+ if (pk11_setup_session(sp, optype) == 0) -+ { -+ OPENSSL_free(sp); -+ sp = NULL; -+ } -+ } -+ else if (sp->pid == 0) -+ { -+ /* It is a new session and needs initialization. */ -+ if (pk11_setup_session(sp, optype) == 0) -+ { -+ OPENSSL_free(sp); -+ sp = NULL; -+ } -+ } -+ -+ switch (optype) -+ { -+ case OP_PUBKEY: -+ pubkey_free_session = freelist; -+ break; -+ case OP_RAND: -+ rand_free_session = freelist; -+ break; -+ case OP_DIGEST: -+ case OP_CIPHER: -+ free_session = freelist; -+ break; -+ } -+ -+err: -+ if (sp != NULL) -+ sp->next = NULL; -+ -+ CRYPTO_w_unlock(CRYPTO_LOCK_PK11_ENGINE); -+ -+ return sp; -+ } -+ -+ -+void pk11_return_session(PK11_SESSION *sp, PK11_OPTYPE optype) -+ { -+ if (sp == NULL || sp->pid != getpid()) -+ return; -+ -+ CRYPTO_w_lock(CRYPTO_LOCK_PK11_ENGINE); -+ -+ switch (optype) -+ { -+ case OP_PUBKEY: -+ sp->next = pubkey_free_session; -+ pubkey_free_session = sp; -+ break; -+ case OP_RAND: -+ sp->next = rand_free_session; -+ rand_free_session = sp; -+ break; -+ case OP_DIGEST: -+ case OP_CIPHER: -+ sp->next = free_session; -+ free_session = sp; -+ break; -+ } -+ -+ CRYPTO_w_unlock(CRYPTO_LOCK_PK11_ENGINE); -+ } -+ -+ -+/* Destroy all objects. This function is called when the engine is finished -+ */ -+static int pk11_free_all_sessions() -+ { -+ int ret = 1; -+ -+#ifndef OPENSSL_NO_RSA -+ (void) pk11_destroy_rsa_key_objects(NULL); -+#endif /* OPENSSL_NO_RSA */ -+#ifndef OPENSSL_NO_DSA -+ (void) pk11_destroy_dsa_key_objects(NULL); -+#endif /* OPENSSL_NO_DSA */ -+#ifndef OPENSSL_NO_DH -+ (void) pk11_destroy_dh_key_objects(NULL); -+#endif /* OPENSSL_NO_DH */ -+ (void) pk11_destroy_cipher_key_objects(NULL); -+ -+ /* -+ * We try to release as much as we can but any error means that we will -+ * return 0 on exit. -+ */ -+ if (pk11_free_session_list(&free_session) == 0) -+ ret = 0; -+ if (pk11_free_session_list(&pubkey_free_session) == 0) -+ ret = 0; -+ if (pk11_free_session_list(&rand_free_session) == 0) -+ ret = 0; -+ -+ return ret; -+ } -+ -+/* -+ * Destroy session structures from the specified linked list. Free as many -+ * sessions as possible but any failure in C_CloseSession() means that we return -+ * an error on return. -+ */ -+static int pk11_free_session_list(PK11_SESSION **sessions) -+ { -+ CK_RV rv; -+ PK11_SESSION *sp = NULL; -+ pid_t mypid = getpid(); -+ int ret = 1; -+ -+ CRYPTO_w_lock(CRYPTO_LOCK_PK11_ENGINE); -+ while ((sp = *sessions) != NULL) -+ { -+ if (sp->session != CK_INVALID_HANDLE && sp->pid == mypid) -+ { -+ rv = pFuncList->C_CloseSession(sp->session); -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_FREE_ALL_SESSIONS, -+ PK11_R_CLOSESESSION, rv); -+ ret = 0; -+ } -+ } -+ if (sp->session_cipher != CK_INVALID_HANDLE && sp->pid == mypid) -+ { -+ rv = pFuncList->C_CloseSession(sp->session_cipher); -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_FREE_ALL_SESSIONS, -+ PK11_R_CLOSESESSION, rv); -+ ret = 0; -+ } -+ } -+ *sessions = sp->next; -+ pk11_free_nums(sp); -+ OPENSSL_free(sp); -+ } -+ -+ CRYPTO_w_unlock(CRYPTO_LOCK_PK11_ENGINE); -+ return ret; -+ } -+ -+ -+static int pk11_setup_session(PK11_SESSION *sp, PK11_OPTYPE optype) -+ { -+ CK_RV rv; -+ CK_SLOT_ID myslot; -+ -+ switch (optype) -+ { -+ case OP_PUBKEY: -+ myslot = pubkey_SLOTID; -+ break; -+ case OP_RAND: -+ myslot = rand_SLOTID; -+ break; -+ case OP_DIGEST: -+ case OP_CIPHER: -+ myslot = SLOTID; -+ break; -+ default: -+ PK11err(PK11_F_SETUP_SESSION, -+ PK11_R_INVALID_OPERATION_TYPE); -+ return 0; -+ } -+ -+ sp->session = CK_INVALID_HANDLE; -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: myslot=%d optype=%d\n", PK11_DBG, myslot, optype); -+#endif /* DEBUG_SLOT_SELECTION */ -+ rv = pFuncList->C_OpenSession(myslot, CKF_SERIAL_SESSION, -+ NULL_PTR, NULL_PTR, &sp->session); -+ if (rv == CKR_CRYPTOKI_NOT_INITIALIZED) -+ { -+ /* -+ * We are probably a child process so force the -+ * reinitialize of the session -+ */ -+ pk11_library_initialized = 0; -+ (void) pk11_library_init(NULL); -+ rv = pFuncList->C_OpenSession(myslot, CKF_SERIAL_SESSION, -+ NULL_PTR, NULL_PTR, &sp->session); -+ } -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_SETUP_SESSION, PK11_R_OPENSESSION, rv); -+ return 0; -+ } -+ -+ sp->session_cipher = CK_INVALID_HANDLE; -+ rv = pFuncList->C_OpenSession(myslot, CKF_SERIAL_SESSION, -+ NULL_PTR, NULL_PTR, &sp->session_cipher); -+ if (rv != CKR_OK) -+ { -+ (void) pFuncList->C_CloseSession(sp->session); -+ sp->session = CK_INVALID_HANDLE; -+ -+ PK11err_add_data(PK11_F_SETUP_SESSION, PK11_R_OPENSESSION, rv); -+ return 0; -+ } -+ -+ sp->pid = getpid(); -+ sp->rsa_pub_key = CK_INVALID_HANDLE; -+ sp->rsa_priv_key = CK_INVALID_HANDLE; -+ sp->dsa_pub_key = CK_INVALID_HANDLE; -+ sp->dsa_priv_key = CK_INVALID_HANDLE; -+ sp->dh_key = CK_INVALID_HANDLE; -+ sp->cipher_key = CK_INVALID_HANDLE; -+#ifndef OPENSSL_NO_RSA -+ sp->rsa_pub = NULL; -+ sp->rsa_n_num = NULL; -+ sp->rsa_e_num = NULL; -+ sp->rsa_priv = NULL; -+ sp->rsa_d_num = NULL; -+#endif /* OPENSSL_NO_RSA */ -+#ifndef OPENSSL_NO_DSA -+ sp->dsa_pub = NULL; -+ sp->dsa_pub_num = NULL; -+ sp->dsa_priv = NULL; -+ sp->dsa_priv_num = NULL; -+#endif /* OPENSSL_NO_DSA */ -+#ifndef OPENSSL_NO_DH -+ sp->dh = NULL; -+ sp->dh_priv_num = NULL; -+#endif /* OPENSSL_NO_DH */ -+ sp->encrypt = -1; -+ -+ return 1; -+ } -+ -+#ifndef OPENSSL_NO_RSA -+/* Destroy RSA public key from single session. */ -+int pk11_destroy_rsa_object_pub(PK11_SESSION *sp, CK_BBOOL uselock) -+ { -+ int ret = 0; -+ -+ if (sp->rsa_pub_key != CK_INVALID_HANDLE) -+ { -+ TRY_OBJ_DESTROY(sp->session, sp->rsa_pub_key, ret, uselock); -+ sp->rsa_pub_key = CK_INVALID_HANDLE; -+ sp->rsa_pub = NULL; -+ if (sp->rsa_n_num != NULL) -+ BN_free(sp->rsa_n_num); -+ sp->rsa_n_num = NULL; -+ if (sp->rsa_e_num != NULL) -+ BN_free(sp->rsa_e_num); -+ sp->rsa_e_num = NULL; -+ } -+ -+ return (ret); -+ } -+ -+/* Destroy RSA private key from single session. */ -+int pk11_destroy_rsa_object_priv(PK11_SESSION *sp, CK_BBOOL uselock) -+ { -+ int ret = 0; -+ -+ if (sp->rsa_priv_key != CK_INVALID_HANDLE) -+ { -+ TRY_OBJ_DESTROY(sp->session, sp->rsa_priv_key, ret, uselock); -+ sp->rsa_priv_key = CK_INVALID_HANDLE; -+ sp->rsa_priv = NULL; -+ if (sp->rsa_d_num != NULL) -+ BN_free(sp->rsa_d_num); -+ sp->rsa_d_num = NULL; -+ } -+ -+ return (ret); -+ } -+ -+/* -+ * Destroy RSA key object wrapper. If session is NULL, try to destroy all -+ * objects in the free list. -+ */ -+int pk11_destroy_rsa_key_objects(PK11_SESSION *session) -+ { -+ int ret = 1; -+ PK11_SESSION *sp = NULL; -+ PK11_SESSION *local_free_session; -+ CK_BBOOL uselock = TRUE; -+ -+ if (session != NULL) -+ local_free_session = session; -+ else -+ { -+ CRYPTO_w_lock(CRYPTO_LOCK_PK11_ENGINE); -+ local_free_session = pubkey_free_session; -+ uselock = FALSE; -+ } -+ -+ /* -+ * go through the list of sessions and delete key objects -+ */ -+ while ((sp = local_free_session) != NULL) -+ { -+ local_free_session = sp->next; -+ -+ /* -+ * Do not terminate list traversal if one of the -+ * destroy operations fails. -+ */ -+ if (pk11_destroy_rsa_object_pub(sp, uselock) == 0) -+ { -+ ret = 0; -+ continue; -+ } -+ if (pk11_destroy_rsa_object_priv(sp, uselock) == 0) -+ { -+ ret = 0; -+ continue; -+ } -+ } -+ -+ if (session == NULL) -+ CRYPTO_w_unlock(CRYPTO_LOCK_PK11_ENGINE); -+ -+ return ret; -+ } -+#endif /* OPENSSL_NO_RSA */ -+ -+#ifndef OPENSSL_NO_DSA -+/* Destroy DSA public key from single session. */ -+int pk11_destroy_dsa_object_pub(PK11_SESSION *sp, CK_BBOOL uselock) -+ { -+ int ret = 0; -+ -+ if (sp->dsa_pub_key != CK_INVALID_HANDLE) -+ { -+ TRY_OBJ_DESTROY(sp->session, sp->dsa_pub_key, ret, uselock); -+ sp->dsa_pub_key = CK_INVALID_HANDLE; -+ sp->dsa_pub = NULL; -+ if (sp->dsa_pub_num != NULL) -+ BN_free(sp->dsa_pub_num); -+ sp->dsa_pub_num = NULL; -+ } -+ -+ return (ret); -+ } -+ -+/* Destroy DSA private key from single session. */ -+int pk11_destroy_dsa_object_priv(PK11_SESSION *sp, CK_BBOOL uselock) -+ { -+ int ret = 0; -+ -+ if (sp->dsa_priv_key != CK_INVALID_HANDLE) -+ { -+ TRY_OBJ_DESTROY(sp->session, sp->dsa_priv_key, ret, uselock); -+ sp->dsa_priv_key = CK_INVALID_HANDLE; -+ sp->dsa_priv = NULL; -+ if (sp->dsa_priv_num != NULL) -+ BN_free(sp->dsa_priv_num); -+ sp->dsa_priv_num = NULL; -+ } -+ -+ return (ret); -+ } -+ -+/* -+ * Destroy DSA key object wrapper. If session is NULL, try to destroy all -+ * objects in the free list. -+ */ -+int pk11_destroy_dsa_key_objects(PK11_SESSION *session) -+ { -+ int ret = 1; -+ PK11_SESSION *sp = NULL; -+ PK11_SESSION *local_free_session; -+ CK_BBOOL uselock = TRUE; -+ -+ if (session != NULL) -+ local_free_session = session; -+ else -+ { -+ CRYPTO_w_lock(CRYPTO_LOCK_PK11_ENGINE); -+ local_free_session = pubkey_free_session; -+ uselock = FALSE; -+ } -+ -+ /* -+ * go through the list of sessions and delete key objects -+ */ -+ while ((sp = local_free_session) != NULL) -+ { -+ local_free_session = sp->next; -+ -+ /* -+ * Do not terminate list traversal if one of the -+ * destroy operations fails. -+ */ -+ if (pk11_destroy_dsa_object_pub(sp, uselock) == 0) -+ { -+ ret = 0; -+ continue; -+ } -+ if (pk11_destroy_dsa_object_priv(sp, uselock) == 0) -+ { -+ ret = 0; -+ continue; -+ } -+ } -+ -+ if (session == NULL) -+ CRYPTO_w_unlock(CRYPTO_LOCK_PK11_ENGINE); -+ -+ return ret; -+ } -+#endif /* OPENSSL_NO_DSA */ -+ -+#ifndef OPENSSL_NO_DH -+/* Destroy DH key from single session. */ -+int pk11_destroy_dh_object(PK11_SESSION *sp, CK_BBOOL uselock) -+ { -+ int ret = 0; -+ -+ if (sp->dh_key != CK_INVALID_HANDLE) -+ { -+ TRY_OBJ_DESTROY(sp->session, sp->dh_key, ret, uselock); -+ sp->dh_key = CK_INVALID_HANDLE; -+ sp->dh = NULL; -+ if (sp->dh_priv_num != NULL) -+ BN_free(sp->dh_priv_num); -+ sp->dh_priv_num = NULL; -+ } -+ -+ return (ret); -+ } -+ -+/* -+ * Destroy DH key object wrapper. -+ * -+ * arg0: pointer to PKCS#11 engine session structure -+ * if session is NULL, try to destroy all objects in the free list -+ */ -+int pk11_destroy_dh_key_objects(PK11_SESSION *session) -+ { -+ int ret = 1; -+ PK11_SESSION *sp = NULL; -+ PK11_SESSION *local_free_session; -+ CK_BBOOL uselock = TRUE; -+ -+ if (session != NULL) -+ local_free_session = session; -+ else -+ { -+ CRYPTO_w_lock(CRYPTO_LOCK_PK11_ENGINE); -+ local_free_session = pubkey_free_session; -+ uselock = FALSE; -+ } -+ -+ while ((sp = local_free_session) != NULL) -+ { -+ local_free_session = sp->next; -+ -+ /* -+ * Do not terminate list traversal if one of the -+ * destroy operations fails. -+ */ -+ if (pk11_destroy_dh_object(sp, uselock) == 0) -+ { -+ ret = 0; -+ continue; -+ } -+ } -+err: -+ if (session == NULL) -+ CRYPTO_w_unlock(CRYPTO_LOCK_PK11_ENGINE); -+ -+ return ret; -+ } -+#endif /* OPENSSL_NO_DH */ -+ -+static int pk11_destroy_object(CK_SESSION_HANDLE session, CK_OBJECT_HANDLE oh) -+ { -+ CK_RV rv; -+ rv = pFuncList->C_DestroyObject(session, oh); -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_DESTROY_OBJECT, PK11_R_DESTROYOBJECT, -+ rv); -+ return 0; -+ } -+ -+ return 1; -+ } -+ -+ -+/* Symmetric ciphers and digests support functions -+ */ -+ -+static int -+cipher_nid_to_pk11(int nid) -+ { -+ int i; -+ -+ for (i = 0; i < PK11_CIPHER_MAX; i++) -+ if (ciphers[i].nid == nid) -+ return (ciphers[i].id); -+ return (-1); -+ } -+ -+static int -+pk11_usable_ciphers(const int **nids) -+ { -+ if (cipher_count > 0) -+ *nids = cipher_nids; -+ else -+ *nids = NULL; -+ return (cipher_count); -+ } -+ -+static int -+pk11_usable_digests(const int **nids) -+ { -+ if (digest_count > 0) -+ *nids = digest_nids; -+ else -+ *nids = NULL; -+ return (digest_count); -+ } -+ -+/* -+ * Init context for encryption or decryption using a symmetric key. -+ */ -+static int pk11_init_symmetric(EVP_CIPHER_CTX *ctx, PK11_CIPHER *pcipher, -+ PK11_SESSION *sp, CK_MECHANISM_PTR pmech) -+ { -+ CK_RV rv; -+#ifdef SOLARIS_AES_CTR -+ CK_AES_CTR_PARAMS ctr_params; -+#endif /* SOLARIS_AES_CTR */ -+ -+ /* -+ * We expect pmech->mechanism to be already set and -+ * pParameter/ulParameterLen initialized to NULL/0 before -+ * pk11_init_symetric() is called. -+ */ -+ OPENSSL_assert(pmech->mechanism != NULL); -+ OPENSSL_assert(pmech->pParameter == NULL); -+ OPENSSL_assert(pmech->ulParameterLen == 0); -+ -+#ifdef SOLARIS_AES_CTR -+ if (ctx->cipher->nid == NID_aes_128_ctr || -+ ctx->cipher->nid == NID_aes_192_ctr || -+ ctx->cipher->nid == NID_aes_256_ctr) -+ { -+ pmech->pParameter = (void *)(&ctr_params); -+ pmech->ulParameterLen = sizeof(ctr_params); -+ /* -+ * For now, we are limited to the fixed length of the counter, -+ * it covers the whole counter block. That's what RFC 4344 -+ * needs. For more information on internal structure of the -+ * counter block, see RFC 3686. If needed in the future, we can -+ * add code so that the counter length can be set via -+ * ENGINE_ctrl() function. -+ */ -+ ctr_params.ulCounterBits = AES_BLOCK_SIZE * 8; -+ OPENSSL_assert(pcipher->iv_len == AES_BLOCK_SIZE); -+ memcpy(ctr_params.cb, ctx->iv, AES_BLOCK_SIZE); -+ } -+ else -+#endif /* SOLARIS_AES_CTR */ -+ { -+ if (pcipher->iv_len > 0) -+ { -+ pmech->pParameter = (void *)ctx->iv; -+ pmech->ulParameterLen = pcipher->iv_len; -+ } -+ } -+ -+ /* if we get here, the encryption needs to be reinitialized */ -+ if (ctx->encrypt) -+ rv = pFuncList->C_EncryptInit(sp->session_cipher, pmech, -+ sp->cipher_key); -+ else -+ rv = pFuncList->C_DecryptInit(sp->session_cipher, pmech, -+ sp->cipher_key); -+ -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_CIPHER_INIT, ctx->encrypt ? -+ PK11_R_ENCRYPTINIT : PK11_R_DECRYPTINIT, rv); -+ pk11_return_session(sp, OP_CIPHER); -+ return (0); -+ } -+ -+ return (1); -+ } -+ -+static int -+pk11_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key, -+ const unsigned char *iv, int enc) -+ { -+ CK_MECHANISM mech; -+ int index; -+ PK11_CIPHER_STATE *state = (PK11_CIPHER_STATE *) ctx->cipher_data; -+ PK11_SESSION *sp; -+ PK11_CIPHER *p_ciph_table_row; -+ -+ state->sp = NULL; -+ -+ index = cipher_nid_to_pk11(ctx->cipher->nid); -+ if (index < 0 || index >= PK11_CIPHER_MAX) -+ return 0; -+ -+ p_ciph_table_row = &ciphers[index]; -+ /* -+ * iv_len in the ctx->cipher structure is the maximum IV length for the -+ * current cipher and it must be less or equal to the IV length in our -+ * ciphers table. The key length must match precisely. Every application -+ * can define its own EVP functions so this code serves as a sanity -+ * check. -+ * -+ * Note that the reason why the IV length in ctx->cipher might be -+ * greater than the actual length is that OpenSSL uses BLOCK_CIPHER_defs -+ * macro to define functions that return EVP structures for all DES -+ * modes. So, even ECB modes get 8 byte IV. -+ */ -+ if (ctx->cipher->iv_len < p_ciph_table_row->iv_len || -+ ctx->key_len != p_ciph_table_row->key_len) -+ { -+ PK11err(PK11_F_CIPHER_INIT, PK11_R_KEY_OR_IV_LEN_PROBLEM); -+ return 0; -+ } -+ -+ if ((sp = pk11_get_session(OP_CIPHER)) == NULL) -+ return 0; -+ -+ /* if applicable, the mechanism parameter is used for IV */ -+ mech.mechanism = p_ciph_table_row->mech_type; -+ mech.pParameter = NULL; -+ mech.ulParameterLen = 0; -+ -+ /* The key object is destroyed here if it is not the current key -+ */ -+ (void) check_new_cipher_key(sp, key, p_ciph_table_row->key_len); -+ -+ /* If the key is the same and the encryption is also the same, -+ * then just reuse it. However, we must not forget to reinitialize the -+ * context that was finalized in pk11_cipher_cleanup(). -+ */ -+ if (sp->cipher_key != CK_INVALID_HANDLE && sp->encrypt == ctx->encrypt) -+ { -+ state->sp = sp; -+ if (pk11_init_symmetric(ctx, p_ciph_table_row, sp, &mech) == 0) -+ return (0); -+ -+ return (1); -+ } -+ -+ /* Check if the key has been invalidated. If so, a new key object -+ * needs to be created. -+ */ -+ if (sp->cipher_key == CK_INVALID_HANDLE) -+ { -+ sp->cipher_key = pk11_get_cipher_key( -+ ctx, key, p_ciph_table_row->key_type, sp); -+ } -+ -+ if (sp->encrypt != ctx->encrypt && sp->encrypt != -1) -+ { -+ /* The previous encryption/decryption -+ * is different. Need to terminate the previous -+ * active encryption/decryption here -+ */ -+ if (!pk11_cipher_final(sp)) -+ { -+ pk11_return_session(sp, OP_CIPHER); -+ return 0; -+ } -+ } -+ -+ if (sp->cipher_key == CK_INVALID_HANDLE) -+ { -+ pk11_return_session(sp, OP_CIPHER); -+ return 0; -+ } -+ -+ /* now initialize the context with a new key */ -+ if (pk11_init_symmetric(ctx, p_ciph_table_row, sp, &mech) == 0) -+ return (0); -+ -+ sp->encrypt = ctx->encrypt; -+ state->sp = sp; -+ -+ return 1; -+ } -+ -+/* When reusing the same key in an encryption/decryption session for a -+ * decryption/encryption session, we need to close the active session -+ * and recreate a new one. Note that the key is in the global session so -+ * that it needs not be recreated. -+ * -+ * It is more appropriate to use C_En/DecryptFinish here. At the time of this -+ * development, these two functions in the PKCS#11 libraries used return -+ * unexpected errors when passing in 0 length output. It may be a good -+ * idea to try them again if performance is a problem here and fix -+ * C_En/DecryptFinial if there are bugs there causing the problem. -+ */ -+static int -+pk11_cipher_final(PK11_SESSION *sp) -+ { -+ CK_RV rv; -+ -+ rv = pFuncList->C_CloseSession(sp->session_cipher); -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_CIPHER_FINAL, PK11_R_CLOSESESSION, rv); -+ return 0; -+ } -+ -+ rv = pFuncList->C_OpenSession(SLOTID, CKF_SERIAL_SESSION, -+ NULL_PTR, NULL_PTR, &sp->session_cipher); -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_CIPHER_FINAL, PK11_R_OPENSESSION, rv); -+ return 0; -+ } -+ -+ return 1; -+ } -+ -+/* An engine interface function. The calling function allocates sufficient -+ * memory for the output buffer "out" to hold the results */ -+static int -+pk11_cipher_do_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, -+ const unsigned char *in, unsigned int inl) -+ { -+ PK11_CIPHER_STATE *state = (PK11_CIPHER_STATE *) ctx->cipher_data; -+ PK11_SESSION *sp; -+ CK_RV rv; -+ unsigned long outl = inl; -+ -+ if (state == NULL || state->sp == NULL) -+ return 0; -+ -+ sp = (PK11_SESSION *) state->sp; -+ -+ if (!inl) -+ return 1; -+ -+ /* RC4 is the only stream cipher we support */ -+ if (ctx->cipher->nid != NID_rc4 && (inl % ctx->cipher->block_size) != 0) -+ return 0; -+ -+ if (ctx->encrypt) -+ { -+ rv = pFuncList->C_EncryptUpdate(sp->session_cipher, -+ (unsigned char *)in, inl, out, &outl); -+ -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_CIPHER_DO_CIPHER, -+ PK11_R_ENCRYPTUPDATE, rv); -+ return 0; -+ } -+ } -+ else -+ { -+ rv = pFuncList->C_DecryptUpdate(sp->session_cipher, -+ (unsigned char *)in, inl, out, &outl); -+ -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_CIPHER_DO_CIPHER, -+ PK11_R_DECRYPTUPDATE, rv); -+ return 0; -+ } -+ } -+ -+ /* for DES_CBC, DES3_CBC, AES_CBC, and RC4, the output size is always -+ * the same size of input -+ * The application has guaranteed to call the block ciphers with -+ * correctly aligned buffers. -+ */ -+ if (inl != outl) -+ return 0; -+ -+ return 1; -+ } -+ -+/* -+ * Return the session to the pool. Calling C_EncryptFinal() and C_DecryptFinal() -+ * here is the right thing because in EVP_DecryptFinal_ex(), engine's -+ * do_cipher() is not even called, and in EVP_EncryptFinal_ex() it is called but -+ * the engine can't find out that it's the finalizing call. We wouldn't -+ * necessarily have to finalize the context here since reinitializing it with -+ * C_(Encrypt|Decrypt)Init() should be fine but for the sake of correctness, -+ * let's do it. Some implementations might leak memory if the previously used -+ * context is initialized without finalizing it first. -+ */ -+static int -+pk11_cipher_cleanup(EVP_CIPHER_CTX *ctx) -+ { -+ CK_RV rv; -+ CK_ULONG len = EVP_MAX_BLOCK_LENGTH; -+ CK_BYTE buf[EVP_MAX_BLOCK_LENGTH]; -+ PK11_CIPHER_STATE *state = ctx->cipher_data; -+ -+ if (state != NULL && state->sp != NULL) -+ { -+ /* -+ * We are not interested in the data here, we just need to get -+ * rid of the context. -+ */ -+ if (ctx->encrypt) -+ rv = pFuncList->C_EncryptFinal( -+ state->sp->session_cipher, buf, &len); -+ else -+ rv = pFuncList->C_DecryptFinal( -+ state->sp->session_cipher, buf, &len); -+ -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_CIPHER_CLEANUP, ctx->encrypt ? -+ PK11_R_ENCRYPTFINAL : PK11_R_DECRYPTFINAL, rv); -+ pk11_return_session(state->sp, OP_CIPHER); -+ return (0); -+ } -+ -+ pk11_return_session(state->sp, OP_CIPHER); -+ state->sp = NULL; -+ } -+ -+ return (1); -+ } -+ -+/* Registered by the ENGINE when used to find out how to deal with -+ * a particular NID in the ENGINE. This says what we'll do at the -+ * top level - note, that list is restricted by what we answer with -+ */ -+static int -+pk11_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher, -+ const int **nids, int nid) -+ { -+ if (!cipher) -+ return (pk11_usable_ciphers(nids)); -+ -+ switch (nid) -+ { -+ case NID_des_ede3_cbc: -+ *cipher = &pk11_3des_cbc; -+ break; -+ case NID_des_cbc: -+ *cipher = &pk11_des_cbc; -+ break; -+ case NID_des_ede3_ecb: -+ *cipher = &pk11_3des_ecb; -+ break; -+ case NID_des_ecb: -+ *cipher = &pk11_des_ecb; -+ break; -+ case NID_aes_128_cbc: -+ *cipher = &pk11_aes_128_cbc; -+ break; -+ case NID_aes_192_cbc: -+ *cipher = &pk11_aes_192_cbc; -+ break; -+ case NID_aes_256_cbc: -+ *cipher = &pk11_aes_256_cbc; -+ break; -+ case NID_aes_128_ecb: -+ *cipher = &pk11_aes_128_ecb; -+ break; -+ case NID_aes_192_ecb: -+ *cipher = &pk11_aes_192_ecb; -+ break; -+ case NID_aes_256_ecb: -+ *cipher = &pk11_aes_256_ecb; -+ break; -+ case NID_bf_cbc: -+ *cipher = &pk11_bf_cbc; -+ break; -+ case NID_rc4: -+ *cipher = &pk11_rc4; -+ break; -+ default: -+#ifdef SOLARIS_AES_CTR -+ /* -+ * These can't be in separated cases because the NIDs -+ * here are not constants. -+ */ -+ if (nid == NID_aes_128_ctr) -+ *cipher = &pk11_aes_128_ctr; -+ else if (nid == NID_aes_192_ctr) -+ *cipher = &pk11_aes_192_ctr; -+ else if (nid == NID_aes_256_ctr) -+ *cipher = &pk11_aes_256_ctr; -+ else -+#endif /* SOLARIS_AES_CTR */ -+ *cipher = NULL; -+ break; -+ } -+ return (*cipher != NULL); -+ } -+ -+static int -+pk11_engine_digests(ENGINE *e, const EVP_MD **digest, -+ const int **nids, int nid) -+ { -+ if (!digest) -+ return (pk11_usable_digests(nids)); -+ -+ switch (nid) -+ { -+ case NID_md5: -+ *digest = &pk11_md5; -+ break; -+ case NID_sha1: -+ *digest = &pk11_sha1; -+ break; -+ case NID_sha224: -+ *digest = &pk11_sha224; -+ break; -+ case NID_sha256: -+ *digest = &pk11_sha256; -+ break; -+ case NID_sha384: -+ *digest = &pk11_sha384; -+ break; -+ case NID_sha512: -+ *digest = &pk11_sha512; -+ break; -+ default: -+ *digest = NULL; -+ break; -+ } -+ return (*digest != NULL); -+ } -+ -+ -+/* Create a secret key object in a PKCS#11 session -+ */ -+static CK_OBJECT_HANDLE pk11_get_cipher_key(EVP_CIPHER_CTX *ctx, -+ const unsigned char *key, CK_KEY_TYPE key_type, PK11_SESSION *sp) -+ { -+ CK_RV rv; -+ CK_OBJECT_HANDLE h_key = CK_INVALID_HANDLE; -+ CK_OBJECT_CLASS obj_key = CKO_SECRET_KEY; -+ CK_ULONG ul_key_attr_count = 6; -+ -+ CK_ATTRIBUTE a_key_template[] = -+ { -+ {CKA_CLASS, (void*) NULL, sizeof(CK_OBJECT_CLASS)}, -+ {CKA_KEY_TYPE, (void*) NULL, sizeof(CK_KEY_TYPE)}, -+ {CKA_TOKEN, &false, sizeof(false)}, -+ {CKA_ENCRYPT, &true, sizeof(true)}, -+ {CKA_DECRYPT, &true, sizeof(true)}, -+ {CKA_VALUE, (void*) NULL, 0}, -+ }; -+ -+ /* Create secret key object in global_session. All other sessions -+ * can use the key handles. Here is why: -+ * OpenSSL will call EncryptInit and EncryptUpdate using a secret key. -+ * It may then call DecryptInit and DecryptUpdate using the same key. -+ * To use the same key object, we need to call EncryptFinal with -+ * a 0 length message. Currently, this does not work for 3DES -+ * mechanism. To get around this problem, we close the session and -+ * then create a new session to use the same key object. When a session -+ * is closed, all the object handles will be invalid. Thus, create key -+ * objects in a global session, an individual session may be closed to -+ * terminate the active operation. -+ */ -+ CK_SESSION_HANDLE session = global_session; -+ a_key_template[0].pValue = &obj_key; -+ a_key_template[1].pValue = &key_type; -+ a_key_template[5].pValue = (void *) key; -+ a_key_template[5].ulValueLen = (unsigned long) ctx->key_len; -+ -+ rv = pFuncList->C_CreateObject(session, -+ a_key_template, ul_key_attr_count, &h_key); -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_GET_CIPHER_KEY, PK11_R_CREATEOBJECT, -+ rv); -+ goto err; -+ } -+ -+ /* Save the key information used in this session. -+ * The max can be saved is PK11_KEY_LEN_MAX. -+ */ -+ sp->key_len = ctx->key_len > PK11_KEY_LEN_MAX ? -+ PK11_KEY_LEN_MAX : ctx->key_len; -+ memcpy(sp->key, key, sp->key_len); -+err: -+ -+ return h_key; -+ } -+ -+static int -+md_nid_to_pk11(int nid) -+ { -+ int i; -+ -+ for (i = 0; i < PK11_DIGEST_MAX; i++) -+ if (digests[i].nid == nid) -+ return (digests[i].id); -+ return (-1); -+ } -+ -+static int -+pk11_digest_init(EVP_MD_CTX *ctx) -+ { -+ CK_RV rv; -+ CK_MECHANISM mech; -+ int index; -+ PK11_SESSION *sp; -+ PK11_DIGEST *pdp; -+ PK11_CIPHER_STATE *state = (PK11_CIPHER_STATE *) ctx->md_data; -+ -+ state->sp = NULL; -+ -+ index = md_nid_to_pk11(ctx->digest->type); -+ if (index < 0 || index >= PK11_DIGEST_MAX) -+ return 0; -+ -+ pdp = &digests[index]; -+ if ((sp = pk11_get_session(OP_DIGEST)) == NULL) -+ return 0; -+ -+ /* at present, no parameter is needed for supported digests */ -+ mech.mechanism = pdp->mech_type; -+ mech.pParameter = NULL; -+ mech.ulParameterLen = 0; -+ -+ rv = pFuncList->C_DigestInit(sp->session, &mech); -+ -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_DIGEST_INIT, PK11_R_DIGESTINIT, rv); -+ pk11_return_session(sp, OP_DIGEST); -+ return 0; -+ } -+ -+ state->sp = sp; -+ -+ return 1; -+ } -+ -+static int -+pk11_digest_update(EVP_MD_CTX *ctx,const void *data,size_t count) -+ { -+ CK_RV rv; -+ PK11_CIPHER_STATE *state = (PK11_CIPHER_STATE *) ctx->md_data; -+ -+ /* 0 length message will cause a failure in C_DigestFinal */ -+ if (count == 0) -+ return 1; -+ -+ if (state == NULL || state->sp == NULL) -+ return 0; -+ -+ rv = pFuncList->C_DigestUpdate(state->sp->session, (CK_BYTE *) data, -+ count); -+ -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_DIGEST_UPDATE, PK11_R_DIGESTUPDATE, rv); -+ pk11_return_session(state->sp, OP_DIGEST); -+ state->sp = NULL; -+ return 0; -+ } -+ -+ return 1; -+ } -+ -+static int -+pk11_digest_final(EVP_MD_CTX *ctx,unsigned char *md) -+ { -+ CK_RV rv; -+ unsigned long len; -+ PK11_CIPHER_STATE *state = (PK11_CIPHER_STATE *) ctx->md_data; -+ len = ctx->digest->md_size; -+ -+ if (state == NULL || state->sp == NULL) -+ return 0; -+ -+ rv = pFuncList->C_DigestFinal(state->sp->session, md, &len); -+ -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_DIGEST_FINAL, PK11_R_DIGESTFINAL, rv); -+ pk11_return_session(state->sp, OP_DIGEST); -+ state->sp = NULL; -+ return 0; -+ } -+ -+ if (ctx->digest->md_size != len) -+ return 0; -+ -+ /* Final is called and digest is returned, so return the session -+ * to the pool -+ */ -+ pk11_return_session(state->sp, OP_DIGEST); -+ state->sp = NULL; -+ -+ return 1; -+ } -+ -+static int -+pk11_digest_copy(EVP_MD_CTX *to,const EVP_MD_CTX *from) -+ { -+ CK_RV rv; -+ int ret = 0; -+ PK11_CIPHER_STATE *state, *state_to; -+ CK_BYTE_PTR pstate = NULL; -+ CK_ULONG ul_state_len; -+ -+ /* The copy-from state */ -+ state = (PK11_CIPHER_STATE *) from->md_data; -+ if (state == NULL || state->sp == NULL) -+ goto err; -+ -+ /* Initialize the copy-to state */ -+ if (!pk11_digest_init(to)) -+ goto err; -+ state_to = (PK11_CIPHER_STATE *) to->md_data; -+ -+ /* Get the size of the operation state of the copy-from session */ -+ rv = pFuncList->C_GetOperationState(state->sp->session, NULL, -+ &ul_state_len); -+ -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_DIGEST_COPY, PK11_R_GET_OPERATION_STATE, -+ rv); -+ goto err; -+ } -+ if (ul_state_len == 0) -+ { -+ goto err; -+ } -+ -+ pstate = OPENSSL_malloc(ul_state_len); -+ if (pstate == NULL) -+ { -+ PK11err(PK11_F_DIGEST_COPY, PK11_R_MALLOC_FAILURE); -+ goto err; -+ } -+ -+ /* Get the operation state of the copy-from session */ -+ rv = pFuncList->C_GetOperationState(state->sp->session, pstate, -+ &ul_state_len); -+ -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_DIGEST_COPY, PK11_R_GET_OPERATION_STATE, -+ rv); -+ goto err; -+ } -+ -+ /* Set the operation state of the copy-to session */ -+ rv = pFuncList->C_SetOperationState(state_to->sp->session, pstate, -+ ul_state_len, 0, 0); -+ -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_DIGEST_COPY, PK11_R_SET_OPERATION_STATE, rv); -+ goto err; -+ } -+ -+ ret = 1; -+err: -+ if (pstate != NULL) -+ OPENSSL_free(pstate); -+ -+ return ret; -+ } -+ -+/* Return any pending session state to the pool */ -+static int -+pk11_digest_cleanup(EVP_MD_CTX *ctx) -+ { -+ PK11_CIPHER_STATE *state = ctx->md_data; -+ unsigned char buf[EVP_MAX_MD_SIZE]; -+ -+ if (state != NULL && state->sp != NULL) -+ { -+ /* -+ * If state->sp is not NULL then pk11_digest_final() has not -+ * been called yet. We must call it now to free any memory -+ * that might have been allocated in the token when -+ * pk11_digest_init() was called. -+ */ -+ (void) pk11_digest_final(ctx,buf); -+ pk11_return_session(state->sp, OP_DIGEST); -+ state->sp = NULL; -+ } -+ -+ return 1; -+ } -+ -+/* -+ * Check if the new key is the same as the key object in the session. If the key -+ * is the same, no need to create a new key object. Otherwise, the old key -+ * object needs to be destroyed and a new one will be created. Return 1 for -+ * cache hit, 0 for cache miss. Note that we must check the key length first -+ * otherwise we could end up reusing a different, longer key with the same -+ * prefix. -+ */ -+static int check_new_cipher_key(PK11_SESSION *sp, const unsigned char *key, -+ int key_len) -+ { -+ if (sp->key_len != key_len || memcmp(sp->key, key, key_len) != 0) -+ { -+ (void) pk11_destroy_cipher_key_objects(sp); -+ return (0); -+ } -+ return (1); -+ } -+ -+/* Destroy one or more secret key objects. -+ */ -+static int pk11_destroy_cipher_key_objects(PK11_SESSION *session) -+ { -+ int ret = 0; -+ PK11_SESSION *sp = NULL; -+ PK11_SESSION *local_free_session; -+ -+ CRYPTO_w_lock(CRYPTO_LOCK_PK11_ENGINE); -+ if (session) -+ local_free_session = session; -+ else -+ local_free_session = free_session; -+ while ((sp = local_free_session) != NULL) -+ { -+ local_free_session = sp->next; -+ -+ if (sp->cipher_key != CK_INVALID_HANDLE) -+ { -+ /* The secret key object is created in the -+ * global_session. See pk11_get_cipher_key -+ */ -+ if (pk11_destroy_object(global_session, -+ sp->cipher_key) == 0) -+ goto err; -+ sp->cipher_key = CK_INVALID_HANDLE; -+ } -+ } -+ ret = 1; -+err: -+ CRYPTO_w_unlock(CRYPTO_LOCK_PK11_ENGINE); -+ -+ return ret; -+ } -+ -+ -+/* -+ * Public key mechanisms optionally supported -+ * -+ * CKM_RSA_X_509 -+ * CKM_RSA_PKCS -+ * CKM_DSA -+ * -+ * The first slot that supports at least one of those mechanisms is chosen as a -+ * public key slot. -+ * -+ * Symmetric ciphers optionally supported -+ * -+ * CKM_DES3_CBC -+ * CKM_DES_CBC -+ * CKM_AES_CBC -+ * CKM_DES3_ECB -+ * CKM_DES_ECB -+ * CKM_AES_ECB -+ * CKM_AES_CTR -+ * CKM_RC4 -+ * CKM_BLOWFISH_CBC -+ * -+ * Digests optionally supported -+ * -+ * CKM_MD5 -+ * CKM_SHA_1 -+ * CKM_SHA224 -+ * CKM_SHA256 -+ * CKM_SHA384 -+ * CKM_SHA512 -+ * -+ * The output of this function is a set of global variables indicating which -+ * mechanisms from RSA, DSA, DH and RAND are present, and also two arrays of -+ * mechanisms, one for symmetric ciphers and one for digests. Also, 3 global -+ * variables carry information about which slot was chosen for (a) public key -+ * mechanisms, (b) random operations, and (c) symmetric ciphers and digests. -+ */ -+static int -+pk11_choose_slots(int *any_slot_found) -+ { -+ CK_SLOT_ID_PTR pSlotList = NULL_PTR; -+ CK_ULONG ulSlotCount = 0; -+ CK_MECHANISM_INFO mech_info; -+ CK_TOKEN_INFO token_info; -+ int i; -+ CK_RV rv; -+ CK_SLOT_ID best_slot_sofar; -+ CK_BBOOL found_candidate_slot = CK_FALSE; -+ int slot_n_cipher = 0; -+ int slot_n_digest = 0; -+ CK_SLOT_ID current_slot = 0; -+ int current_slot_n_cipher = 0; -+ int current_slot_n_digest = 0; -+ -+ int local_cipher_nids[PK11_CIPHER_MAX]; -+ int local_digest_nids[PK11_DIGEST_MAX]; -+ -+ /* let's initialize the output parameter */ -+ if (any_slot_found != NULL) -+ *any_slot_found = 0; -+ -+ /* Get slot list for memory allocation */ -+ rv = pFuncList->C_GetSlotList(0, NULL_PTR, &ulSlotCount); -+ -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_CHOOSE_SLOT, PK11_R_GETSLOTLIST, rv); -+ return 0; -+ } -+ -+ /* it's not an error if we didn't find any providers */ -+ if (ulSlotCount == 0) -+ { -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: no crypto providers found\n", PK11_DBG); -+#endif /* DEBUG_SLOT_SELECTION */ -+ return 1; -+ } -+ -+ pSlotList = OPENSSL_malloc(ulSlotCount * sizeof (CK_SLOT_ID)); -+ -+ if (pSlotList == NULL) -+ { -+ PK11err(PK11_F_CHOOSE_SLOT, PK11_R_MALLOC_FAILURE); -+ return 0; -+ } -+ -+ /* Get the slot list for processing */ -+ rv = pFuncList->C_GetSlotList(0, pSlotList, &ulSlotCount); -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_CHOOSE_SLOT, PK11_R_GETSLOTLIST, rv); -+ OPENSSL_free(pSlotList); -+ return 0; -+ } -+ -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: provider: %s\n", PK11_DBG, def_PK11_LIBNAME); -+ fprintf(stderr, "%s: number of slots: %d\n", PK11_DBG, ulSlotCount); -+ -+ fprintf(stderr, "%s: == checking rand slots ==\n", PK11_DBG); -+#endif /* DEBUG_SLOT_SELECTION */ -+ for (i = 0; i < ulSlotCount; i++) -+ { -+ current_slot = pSlotList[i]; -+ -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: checking slot: %d\n", PK11_DBG, i); -+#endif /* DEBUG_SLOT_SELECTION */ -+ /* Check if slot has random support. */ -+ rv = pFuncList->C_GetTokenInfo(current_slot, &token_info); -+ if (rv != CKR_OK) -+ continue; -+ -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: token label: %.32s\n", PK11_DBG, token_info.label); -+#endif /* DEBUG_SLOT_SELECTION */ -+ -+ if (token_info.flags & CKF_RNG) -+ { -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: this token has CKF_RNG flag\n", PK11_DBG); -+#endif /* DEBUG_SLOT_SELECTION */ -+ pk11_have_random = CK_TRUE; -+ break; -+ } -+ } -+ -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: == checking pubkey slots ==\n", PK11_DBG); -+#endif /* DEBUG_SLOT_SELECTION */ -+ for (i = 0; i < ulSlotCount; i++) -+ { -+ CK_BBOOL slot_has_rsa = CK_FALSE; -+ CK_BBOOL slot_has_dsa = CK_FALSE; -+ CK_BBOOL slot_has_dh = CK_FALSE; -+ current_slot = pSlotList[i]; -+ -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: checking slot: %d\n", PK11_DBG, i); -+#endif /* DEBUG_SLOT_SELECTION */ -+ rv = pFuncList->C_GetTokenInfo(current_slot, &token_info); -+ if (rv != CKR_OK) -+ continue; -+ -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: token label: %.32s\n", PK11_DBG, token_info.label); -+#endif /* DEBUG_SLOT_SELECTION */ -+ -+#ifndef OPENSSL_NO_RSA -+ /* -+ * Check if this slot is capable of signing and -+ * verifying with CKM_RSA_PKCS. -+ */ -+ rv = pFuncList->C_GetMechanismInfo(current_slot, CKM_RSA_PKCS, -+ &mech_info); -+ -+ if (rv == CKR_OK && ((mech_info.flags & CKF_SIGN) && -+ (mech_info.flags & CKF_VERIFY))) -+ { -+ /* -+ * Check if this slot is capable of encryption, -+ * decryption, sign, and verify with CKM_RSA_X_509. -+ */ -+ rv = pFuncList->C_GetMechanismInfo(current_slot, -+ CKM_RSA_X_509, &mech_info); -+ -+ if (rv == CKR_OK && ((mech_info.flags & CKF_SIGN) && -+ (mech_info.flags & CKF_VERIFY) && -+ (mech_info.flags & CKF_ENCRYPT) && -+ (mech_info.flags & CKF_VERIFY_RECOVER) && -+ (mech_info.flags & CKF_DECRYPT))) -+ { -+ slot_has_rsa = CK_TRUE; -+ } -+ } -+#endif /* OPENSSL_NO_RSA */ -+ -+#ifndef OPENSSL_NO_DSA -+ /* -+ * Check if this slot is capable of signing and -+ * verifying with CKM_DSA. -+ */ -+ rv = pFuncList->C_GetMechanismInfo(current_slot, CKM_DSA, -+ &mech_info); -+ if (rv == CKR_OK && ((mech_info.flags & CKF_SIGN) && -+ (mech_info.flags & CKF_VERIFY))) -+ { -+ slot_has_dsa = CK_TRUE; -+ } -+#endif /* OPENSSL_NO_DSA */ -+ -+#ifndef OPENSSL_NO_DH -+ /* -+ * Check if this slot is capable of DH key generataion and -+ * derivation. -+ */ -+ rv = pFuncList->C_GetMechanismInfo(current_slot, -+ CKM_DH_PKCS_KEY_PAIR_GEN, &mech_info); -+ -+ if (rv == CKR_OK && (mech_info.flags & CKF_GENERATE_KEY_PAIR)) -+ { -+ rv = pFuncList->C_GetMechanismInfo(current_slot, -+ CKM_DH_PKCS_DERIVE, &mech_info); -+ if (rv == CKR_OK && (mech_info.flags & CKF_DERIVE)) -+ { -+ slot_has_dh = CK_TRUE; -+ } -+ } -+#endif /* OPENSSL_NO_DH */ -+ -+ if (!found_candidate_slot && -+ (slot_has_rsa || slot_has_dsa || slot_has_dh)) -+ { -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, -+ "%s: potential slot: %d\n", PK11_DBG, current_slot); -+#endif /* DEBUG_SLOT_SELECTION */ -+ best_slot_sofar = current_slot; -+ pk11_have_rsa = slot_has_rsa; -+ pk11_have_dsa = slot_has_dsa; -+ pk11_have_dh = slot_has_dh; -+ found_candidate_slot = CK_TRUE; -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, -+ "%s: setting found_candidate_slot to CK_TRUE\n", -+ PK11_DBG); -+ fprintf(stderr, -+ "%s: best so far slot: %d\n", PK11_DBG, -+ best_slot_sofar); -+ } -+ else -+ { -+ fprintf(stderr, -+ "%s: no rsa/dsa/dh\n", PK11_DBG); -+ } -+#else -+ } /* if */ -+#endif /* DEBUG_SLOT_SELECTION */ -+ } /* for */ -+ -+ if (found_candidate_slot) -+ { -+ pubkey_SLOTID = best_slot_sofar; -+ } -+ -+ found_candidate_slot = CK_FALSE; -+ best_slot_sofar = 0; -+ -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: == checking cipher/digest ==\n", PK11_DBG); -+#endif /* DEBUG_SLOT_SELECTION */ -+ for (i = 0; i < ulSlotCount; i++) -+ { -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: checking slot: %d\n", PK11_DBG, i); -+#endif /* DEBUG_SLOT_SELECTION */ -+ -+ current_slot = pSlotList[i]; -+ current_slot_n_cipher = 0; @@ 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 chninkel at users.sourceforge.net Sat Nov 7 00:11:06 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 06 Nov 2009 23:11:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7156] csw/mgar/pkg/openssl1/trunk/checksums Message-ID: Revision: 7156 http://gar.svn.sourceforge.net/gar/?rev=7156&view=rev Author: chninkel Date: 2009-11-06 23:11:06 +0000 (Fri, 06 Nov 2009) Log Message: ----------- openssl1: added checksums file Added Paths: ----------- csw/mgar/pkg/openssl1/trunk/checksums Added: csw/mgar/pkg/openssl1/trunk/checksums =================================================================== --- csw/mgar/pkg/openssl1/trunk/checksums (rev 0) +++ csw/mgar/pkg/openssl1/trunk/checksums 2009-11-06 23:11:06 UTC (rev 7156) @@ -0,0 +1,7 @@ +05ace5330714d6cd9c0e076b6ae2518f CSWossl1rt.checkinstall +1c3f600eaf942a18ecab3637e1fc32bd CSWossl1rt.postinstall +c9de908daad1a31fca20329cb043ad3c CSWossl1rt.preinstall +b78faa440d6f6a2a07663de331678648 README.CSW +904ceefa66b6b7b7e93ae0e9bc58bac8 changelog.CSW +a15d8b6511963d2e67448a88b0667fce more_configure_targets.patch +cf5a32016bb9da0b9578099727bf15c9 openssl-1.0.0-beta3.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 Nov 7 15:16:14 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 07 Nov 2009 14:16:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[7157] csw/mgar/pkg/mysql5/branches/mysql-5.0.x Message-ID: Revision: 7157 http://gar.svn.sourceforge.net/gar/?rev=7157&view=rev Author: wahwah Date: 2009-11-07 14:16:14 +0000 (Sat, 07 Nov 2009) Log Message: ----------- mysql5-5.0.x: Fixing a problem with the runtime library path. Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw Property Changed: ---------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.preinstall Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-11-06 23:11:06 UTC (rev 7156) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-11-07 14:16:14 UTC (rev 7157) @@ -72,7 +72,6 @@ CSWmysql5devel_programs += mysql_config - PKGFILES_CSWmysql5bench = $(prefix)/sql-bench.* PKGFILES_CSWmysql5client = $(bindir) PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(call baseisadirs,$(bindir),$(bin_name))) @@ -87,22 +86,6 @@ PKGFILES_CSWmysql5devel += $(prefix)/include.* PKGFILES_CSWmysql5devel += /opt/csw/include/mysql -# -/opt/csw/include/mysql --> ../mysql5/include/mysql -# -/opt/csw/mysql5/bin -# -/opt/csw/mysql5/bin/mysql_config -# -# /opt/csw/bin/mysql_config=../mysql5/bin/mysql_config -# /opt/csw/mysql5/bin/amd64/mysql_config 0755 root bin -# /opt/csw/mysql5/bin/i386/mysql_config=/opt/csw/mysql5/bin/mysql_config 0755 root bin -# /opt/csw/mysql5/bin/mysql_config=/opt/csw/bin/isaexec 0755 root bin -# /opt/csw/mysql5/share/man/man1/mysql_config.1 0644 root bin - - -# work/build-global/CSWmysql5client.prototype:s none /opt/csw/bin/mysql_config=../mysql5/bin/mysql_config -# work/build-global/CSWmysql5client.prototype:f none /opt/csw/mysql5/bin/amd64/mysql_config 0755 root bin -# work/build-global/CSWmysql5client.prototype:f none /opt/csw/mysql5/bin/mysql_config 0755 root bin -# work/build-global/CSWmysql5client.prototype:f none /opt/csw/mysql5/share/man/man1/mysql_config.1 0644 root bin - PKGFILES_CSWmysql5rt = $(prefix)/lib/.*\.so.* PKGFILES_CSWmysql5test = $(prefix)/mysql-test.* @@ -119,7 +102,7 @@ DISTFILES += CSWmysql5.postinstall DISTFILES += cswusergroup -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = mysql-(\d+(?:\.\d+)*).tar.gz REQUIRED_PKGS = CSWncurses CSWzlib PREREQUISITE_PKGS = $(REQUIRED_PKGS) @@ -127,6 +110,16 @@ EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ +# 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/mysql5/lib/amd64/libmysqlclient.so.15 +# The library is at: +# /opt/csw/mysql5/lib/amd64/mysql/libmysqlclient.so.15 +EXTRA_LD_OPTIONS = -R/opt/csw/mysql5/lib/\$$ISALIST/mysql + # Set ./configure options CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-assembler Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-11-06 23:11:06 UTC (rev 7156) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-11-07 14:16:14 UTC (rev 7157) @@ -2,11 +2,11 @@ 1414d06fab1530484a508927a0de4154 0002-cast-user_info-pw_gid-to-gid_t.patch 5415f365f1b0f7a179d1efc25f45bbee 0003-OpenCSW-perl-for-tests.patch 8ab232cd4d232b3cda3bbced93f80237 0004-basedir-and-datadir-in-the-cnf-files.patch -9b5511de728fec4394eca7dd0097fb43 CSWmysql5.postinstall +d5272c16bcc250df520ffe44bd60ef2a CSWmysql5.postinstall cc2a219abbe7dc6049775cff070a27a5 CSWmysql5.preinstall e691b0cf00a3925ac55c1844045d6e30 ChangeLog e42afb5ec1b1ab02d2ec3b46d0922636 README.CSW aaca748fc044834e71ad544ab293c494 cswmysql5 67228e1f096fe08a94f4267439a4ec36 cswusergroup 671348f1a5b078da9ca76f97e1fda325 mysql-5.0.84.tar.gz -fe747c88f7e6bd6a9636ba8ef2e96871 quick_start-csw +6342b90f82fbcdb85cd7f8269c0f860d quick_start-csw Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall 2009-11-06 23:11:06 UTC (rev 7156) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall 2009-11-07 14:16:14 UTC (rev 7157) @@ -5,7 +5,8 @@ MYSQLDATADIR=/var/opt/csw/mysql5 if [ ! -d "${MYSQLDATADIR}/mysql" ] ; then - echo "No database directory found in the default location." + echo "No database directory found in the default location:" + echo "${MYSQLDATADIR}/mysql" echo "If you need to build the initial database directory," echo " see /opt/csw/mysql5/share/mysql/quick_start-csw" echo "If you are using a non-default database directory location," Property changes on: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall ___________________________________________________________________ Added: svn:keywords + Id Property changes on: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.preinstall ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw 2009-11-06 23:11:06 UTC (rev 7156) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw 2009-11-07 14:16:14 UTC (rev 7157) @@ -102,7 +102,11 @@ echo "Creating MySQL core database in $MYSQLD_DATADIR" echo echo "### The following messages are from mysql_install_db." -$BASEDIR/bin/mysql_install_db --defaults-extra-file=$DEFAULTS_FILE --user=$MYSQLD_USER --basedir=$BASEDIR --datadir=$MYSQLD_DATADIR +$BASEDIR/bin/mysql_install_db \ + --defaults-extra-file=$DEFAULTS_FILE \ + --user=$MYSQLD_USER \ + --basedir=$BASEDIR \ + --datadir=$MYSQLD_DATADIR # # Fix permissions on the data directory @@ -125,7 +129,7 @@ echo " for starting CSWmysql5." smf=no if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ] ; then smf=yes ; fi -if [ $smf = yes ] +if [ $smf = yes ] then echo "To start mysqld; run \`svcadm enable cswmysql5\` on Solaris 10 or later" else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Nov 7 15:18:24 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 07 Nov 2009 14:18:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7158] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums Message-ID: Revision: 7158 http://gar.svn.sourceforge.net/gar/?rev=7158&view=rev Author: wahwah Date: 2009-11-07 14:18:24 +0000 (Sat, 07 Nov 2009) Log Message: ----------- mysql5-5.0.x: Setting the checksums of files with the Id tag Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-11-07 14:16:14 UTC (rev 7157) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-11-07 14:18:24 UTC (rev 7158) @@ -2,11 +2,11 @@ 1414d06fab1530484a508927a0de4154 0002-cast-user_info-pw_gid-to-gid_t.patch 5415f365f1b0f7a179d1efc25f45bbee 0003-OpenCSW-perl-for-tests.patch 8ab232cd4d232b3cda3bbced93f80237 0004-basedir-and-datadir-in-the-cnf-files.patch -d5272c16bcc250df520ffe44bd60ef2a CSWmysql5.postinstall -cc2a219abbe7dc6049775cff070a27a5 CSWmysql5.preinstall +747637bc4be42207974ae845d832ae65 CSWmysql5.postinstall +60162ea667507a6a487027e7c389ca55 CSWmysql5.preinstall e691b0cf00a3925ac55c1844045d6e30 ChangeLog e42afb5ec1b1ab02d2ec3b46d0922636 README.CSW aaca748fc044834e71ad544ab293c494 cswmysql5 67228e1f096fe08a94f4267439a4ec36 cswusergroup 671348f1a5b078da9ca76f97e1fda325 mysql-5.0.84.tar.gz -6342b90f82fbcdb85cd7f8269c0f860d quick_start-csw +90b7cfcd11ab56e021a195a6a085fa21 quick_start-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 Nov 7 18:43:50 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 07 Nov 2009 17:43:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[7159] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 7159 http://gar.svn.sourceforge.net/gar/?rev=7159&view=rev Author: wahwah Date: 2009-11-07 17:43:49 +0000 (Sat, 07 Nov 2009) Log Message: ----------- mysql-5.0.x: Added CSWperl as a dependency for CSWmysql5devel 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 2009-11-07 14:18:24 UTC (rev 7158) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-11-07 17:43:49 UTC (rev 7159) @@ -93,7 +93,7 @@ REQUIRED_PKGS_CSWmysql5client = CSWmysql5rt REQUIRED_PKGS_CSWmysql5 = CSWmysql5client CSWmysql5rt REQUIRED_PKGS_CSWmysql5devel = CSWmysql5 -REQUIRED_PKGS_CSWmysql5test = CSWmysql5 +REQUIRED_PKGS_CSWmysql5test = CSWmysql5 CSWperl MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.0/ DISTFILES = mysql-$(GARVERSION).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sat Nov 7 23:12:07 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sat, 07 Nov 2009 22:12:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7160] csw/mgar/pkg/cpan/Convert-UUlib/trunk/ Message-ID: Revision: 7160 http://gar.svn.sourceforge.net/gar/?rev=7160&view=rev Author: idogan23 Date: 2009-11-07 22:11:29 +0000 (Sat, 07 Nov 2009) Log Message: ----------- pm_convertuulib: Changed to mGAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Convert-UUlib/trunk/ Property changes on: csw/mgar/pkg/cpan/Convert-UUlib/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 idogan23 at users.sourceforge.net Sat Nov 7 23:34:30 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sat, 07 Nov 2009 22:34:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[7161] csw/mgar/pkg/cpan/Convert-UUlib/trunk Message-ID: Revision: 7161 http://gar.svn.sourceforge.net/gar/?rev=7161&view=rev Author: idogan23 Date: 2009-11-07 22:34:12 +0000 (Sat, 07 Nov 2009) Log Message: ----------- pm_convertuulib: Switch to dynamic gspec Modified Paths: -------------- csw/mgar/pkg/cpan/Convert-UUlib/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/cpan/Convert-UUlib/trunk/files/CSWpmconvertuulib.gspec Modified: csw/mgar/pkg/cpan/Convert-UUlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Convert-UUlib/trunk/Makefile 2009-11-07 22:11:29 UTC (rev 7160) +++ csw/mgar/pkg/cpan/Convert-UUlib/trunk/Makefile 2009-11-07 22:34:12 UTC (rev 7161) @@ -5,9 +5,12 @@ DESCRIPTION = Perl interface to the uulib library define BLURB - Includes Convert::UUlib + Convert::UUlib is a versatile and powerful decoder/encoder library + for a variety of encodings used in Usenet and Mail (uuencode, + xxencode, b64, binhex...). endef -DISTFILES += $(call admfiles,CSWpmconvertuulib,) +PACKAGES = CSWpmconvertuulib +CATALOGNAME = pm_convertuulib include gar/category.mk Deleted: csw/mgar/pkg/cpan/Convert-UUlib/trunk/files/CSWpmconvertuulib.gspec =================================================================== --- csw/mgar/pkg/cpan/Convert-UUlib/trunk/files/CSWpmconvertuulib.gspec 2009-11-07 22:11:29 UTC (rev 7160) +++ csw/mgar/pkg/cpan/Convert-UUlib/trunk/files/CSWpmconvertuulib.gspec 2009-11-07 22:34:12 UTC (rev 7161) @@ -1,4 +0,0 @@ -%var bitname pm_convertuulib -%var pkgname CSWpmconvertuulib -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright url file://%{WORKSRC}/COPYING.GNU This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sat Nov 7 23:42:48 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sat, 07 Nov 2009 22:42:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[7162] csw/mgar/pkg/cpan/Convert-UUlib/trunk Message-ID: Revision: 7162 http://gar.svn.sourceforge.net/gar/?rev=7162&view=rev Author: idogan23 Date: 2009-11-07 22:42:22 +0000 (Sat, 07 Nov 2009) Log Message: ----------- pm_convertuulib: bump version to 1.33 Modified Paths: -------------- csw/mgar/pkg/cpan/Convert-UUlib/trunk/Makefile csw/mgar/pkg/cpan/Convert-UUlib/trunk/checksums Modified: csw/mgar/pkg/cpan/Convert-UUlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Convert-UUlib/trunk/Makefile 2009-11-07 22:34:12 UTC (rev 7161) +++ csw/mgar/pkg/cpan/Convert-UUlib/trunk/Makefile 2009-11-07 22:42:22 UTC (rev 7162) @@ -1,5 +1,5 @@ GARNAME = Convert-UUlib -GARVERSION = 1.12 +GARVERSION = 1.33 CATEGORIES = cpan AUTHOR = MLEHMANN Modified: csw/mgar/pkg/cpan/Convert-UUlib/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Convert-UUlib/trunk/checksums 2009-11-07 22:34:12 UTC (rev 7161) +++ csw/mgar/pkg/cpan/Convert-UUlib/trunk/checksums 2009-11-07 22:42:22 UTC (rev 7162) @@ -1,2 +1 @@ -67c14375b70d8b1a701e76b5f6e1172e download/CSWpmconvertuulib.gspec -360d29db09aa7692d8873b336b7ec9d7 download/Convert-UUlib-1.12.tar.gz +d4e3330562e5d4f6c022b0a0619a2c71 Convert-UUlib-1.33.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 Nov 8 10:22:46 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 08 Nov 2009 09:22:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7163] csw/mgar/pkg/diffstat/trunk Message-ID: Revision: 7163 http://gar.svn.sourceforge.net/gar/?rev=7163&view=rev Author: dmichelsen Date: 2009-11-08 09:22:45 +0000 (Sun, 08 Nov 2009) Log Message: ----------- diffstat: Update to 1.51 Modified Paths: -------------- csw/mgar/pkg/diffstat/trunk/Makefile csw/mgar/pkg/diffstat/trunk/checksums Modified: csw/mgar/pkg/diffstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/diffstat/trunk/Makefile 2009-11-07 22:42:22 UTC (rev 7162) +++ csw/mgar/pkg/diffstat/trunk/Makefile 2009-11-08 09:22:45 UTC (rev 7163) @@ -1,5 +1,5 @@ GARNAME = diffstat -GARVERSION = 1.50 +GARVERSION = 1.51 CATEGORIES = utils DESCRIPTION = A utility which provides statistics based on the output of diff Modified: csw/mgar/pkg/diffstat/trunk/checksums =================================================================== --- csw/mgar/pkg/diffstat/trunk/checksums 2009-11-07 22:42:22 UTC (rev 7162) +++ csw/mgar/pkg/diffstat/trunk/checksums 2009-11-08 09:22:45 UTC (rev 7163) @@ -1 +1 @@ -ece8f6a380d30cf2355ebb27375350d7 diffstat-1.50.tgz +a7d3fd1ba2a9a6c9e2b32e867b5e8792 diffstat-1.51.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 Nov 8 10:45:11 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 08 Nov 2009 09:45:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[7164] csw/mgar/pkg/diffstat Message-ID: Revision: 7164 http://gar.svn.sourceforge.net/gar/?rev=7164&view=rev Author: dmichelsen Date: 2009-11-08 09:45:11 +0000 (Sun, 08 Nov 2009) Log Message: ----------- diffutils: Move legacy to tags Added Paths: ----------- csw/mgar/pkg/diffstat/tags/legacy/ Removed Paths: ------------- csw/mgar/pkg/diffstat/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 Sun Nov 8 10:45:31 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 08 Nov 2009 09:45:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7165] csw/mgar/pkg/diffstat/trunk/Makefile Message-ID: Revision: 7165 http://gar.svn.sourceforge.net/gar/?rev=7165&view=rev Author: dmichelsen Date: 2009-11-08 09:45:30 +0000 (Sun, 08 Nov 2009) Log Message: ----------- diffstat: Add copyright notice Modified Paths: -------------- csw/mgar/pkg/diffstat/trunk/Makefile Modified: csw/mgar/pkg/diffstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/diffstat/trunk/Makefile 2009-11-08 09:45:11 UTC (rev 7164) +++ csw/mgar/pkg/diffstat/trunk/Makefile 2009-11-08 09:45:30 UTC (rev 7165) @@ -20,3 +20,7 @@ TEST_TARGET = check include gar/category.mk + +post-extract-modulated: + -test -f $(WORKSRC)/diffstat.1 && perl -n -e 'next if( !/^\.\\"/ ); s/\.\\"//; print "*$$_"' $(WORKSRC)/diffstat.1 >$(WORKSRC)/COPYING + @$(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 Nov 8 11:48:54 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 08 Nov 2009 10:48:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[7166] csw/mgar/pkg/memcached/trunk Message-ID: Revision: 7166 http://gar.svn.sourceforge.net/gar/?rev=7166&view=rev Author: dmichelsen Date: 2009-11-08 10:48:54 +0000 (Sun, 08 Nov 2009) Log Message: ----------- memcached: Update to 1.4.3 Modified Paths: -------------- csw/mgar/pkg/memcached/trunk/Makefile csw/mgar/pkg/memcached/trunk/checksums Modified: csw/mgar/pkg/memcached/trunk/Makefile =================================================================== --- csw/mgar/pkg/memcached/trunk/Makefile 2009-11-08 09:45:30 UTC (rev 7165) +++ csw/mgar/pkg/memcached/trunk/Makefile 2009-11-08 10:48:54 UTC (rev 7166) @@ -1,5 +1,5 @@ GARNAME = memcached -GARVERSION = 1.4.3_rc2_2_g8c0a108 +GARVERSION = 1.4.3 CATEGORIES = net DESCRIPTION = Distributed memory object caching system Modified: csw/mgar/pkg/memcached/trunk/checksums =================================================================== --- csw/mgar/pkg/memcached/trunk/checksums 2009-11-08 09:45:30 UTC (rev 7165) +++ csw/mgar/pkg/memcached/trunk/checksums 2009-11-08 10:48:54 UTC (rev 7166) @@ -1 +1 @@ -a2f988a668317fc3cfd91b22b05ab929 memcached-1.4.3_rc2_2_g8c0a108.tar.gz +83c6cc6bad9612536b5acbbbddab3eb3 memcached-1.4.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Nov 8 14:18:06 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 08 Nov 2009 13:18:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7167] csw/mgar/pkg Message-ID: Revision: 7167 http://gar.svn.sourceforge.net/gar/?rev=7167&view=rev Author: trygvis Date: 2009-11-08 13:18:06 +0000 (Sun, 08 Nov 2009) Log Message: ----------- tofrodos: Initial commit. Added Paths: ----------- csw/mgar/pkg/tofrodos/ csw/mgar/pkg/tofrodos/branches/ csw/mgar/pkg/tofrodos/tags/ csw/mgar/pkg/tofrodos/trunk/ csw/mgar/pkg/tofrodos/trunk/Makefile csw/mgar/pkg/tofrodos/trunk/checksums csw/mgar/pkg/tofrodos/trunk/files/ Property changes on: csw/mgar/pkg/tofrodos/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/tofrodos/trunk/Makefile =================================================================== --- csw/mgar/pkg/tofrodos/trunk/Makefile (rev 0) +++ csw/mgar/pkg/tofrodos/trunk/Makefile 2009-11-08 13:18:06 UTC (rev 7167) @@ -0,0 +1,43 @@ +GARNAME = tofrodos +GARVERSION = 1.7.8 +CATEGORIES = utils + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +WORKSRC ?= $(WORKDIR)/$(GARNAME)/src +MASTER_SITES = http://tofrodos.sourceforge.net/download/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_SCRIPTS = + +#BUILD_ARGS = CC=$(CC) LD=$(CC) MAKE=$(MAKE) CDEBUG= CFLAGS="$(CFLAGS) -c" +BUILD_ARGS = CC=$(CC) LD=$(CC) MAKE=$(MAKE) CDEBUG= CFLAGS="$(CFLAGS) -c -Dstricmp=strcasecmp" + +TEST_SCRIPTS = + +INSTALL_ARGS = BINDIR=$(DESTDIR)$(bindir) MANDIR=$(DESTDIR)$(mandir)/man1 INSTALL=$(bindir)/ginstall + +pre-install-modulated: + @echo "Creating directories" + mkdir -p $(DESTDIR)$(bindir) + mkdir -p $(DESTDIR)$(mandir)/man1 + +post-install-modulated: + @echo "Creating links" + ln -s ./fromdos $(DESTDIR)$(bindir)/dos2unix + ln -s ./fromdos $(DESTDIR)$(bindir)/unix2dos + ln -s ./fromdos.1 $(DESTDIR)$(mandir)/man1/dos2unix + ln -s ./fromdos.1 $(DESTDIR)$(mandir)/man1/unix2dos + +include gar/category.mk Added: csw/mgar/pkg/tofrodos/trunk/checksums =================================================================== --- csw/mgar/pkg/tofrodos/trunk/checksums (rev 0) +++ csw/mgar/pkg/tofrodos/trunk/checksums 2009-11-08 13:18:06 UTC (rev 7167) @@ -0,0 +1 @@ +aaa044f9817a048e126d9eb7a7535e96 tofrodos-1.7.8.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Nov 8 14:23:46 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 08 Nov 2009 13:23:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7168] csw/mgar/pkg/tofrodos/trunk/Makefile Message-ID: Revision: 7168 http://gar.svn.sourceforge.net/gar/?rev=7168&view=rev Author: trygvis Date: 2009-11-08 13:23:45 +0000 (Sun, 08 Nov 2009) Log Message: ----------- o Adding blurb. Modified Paths: -------------- csw/mgar/pkg/tofrodos/trunk/Makefile Modified: csw/mgar/pkg/tofrodos/trunk/Makefile =================================================================== --- csw/mgar/pkg/tofrodos/trunk/Makefile 2009-11-08 13:18:06 UTC (rev 7167) +++ csw/mgar/pkg/tofrodos/trunk/Makefile 2009-11-08 13:23:45 UTC (rev 7168) @@ -2,9 +2,12 @@ GARVERSION = 1.7.8 CATEGORIES = utils -DESCRIPTION = Brief description +DESCRIPTION = Text file conversion utility that converts ASCII files between the MSDOS (or Windows) to Unix format. define BLURB - Long description +It is a useful utility to have around when you have to convert files between +MSDOS (or Windows) and Unix/Linux/BSD (and her clones and variants). It comes +standard with a number of systems and is often found on the system as "todos", +"fromdos", "dos2unix" and "unix2dos". endef WORKSRC ?= $(WORKDIR)/$(GARNAME)/src This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Nov 8 15:07:01 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 08 Nov 2009 14:07:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[7169] csw/mgar/pkg/tofrodos/trunk/Makefile Message-ID: Revision: 7169 http://gar.svn.sourceforge.net/gar/?rev=7169&view=rev Author: trygvis Date: 2009-11-08 14:07:01 +0000 (Sun, 08 Nov 2009) Log Message: ----------- tofrodos: Shortening DESCRIPTION. Modified Paths: -------------- csw/mgar/pkg/tofrodos/trunk/Makefile Modified: csw/mgar/pkg/tofrodos/trunk/Makefile =================================================================== --- csw/mgar/pkg/tofrodos/trunk/Makefile 2009-11-08 13:23:45 UTC (rev 7168) +++ csw/mgar/pkg/tofrodos/trunk/Makefile 2009-11-08 14:07:01 UTC (rev 7169) @@ -2,7 +2,7 @@ GARVERSION = 1.7.8 CATEGORIES = utils -DESCRIPTION = Text file conversion utility that converts ASCII files between the MSDOS (or Windows) to Unix format. +DESCRIPTION = Text file utility that converts files between MSDOS and Unix format. define BLURB It is a useful utility to have around when you have to convert files between MSDOS (or Windows) and Unix/Linux/BSD (and her clones and variants). It comes This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Nov 8 15:45:10 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 08 Nov 2009 14:45:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7170] csw/mgar/pkg Message-ID: Revision: 7170 http://gar.svn.sourceforge.net/gar/?rev=7170&view=rev Author: trygvis Date: 2009-11-08 14:45:10 +0000 (Sun, 08 Nov 2009) Log Message: ----------- gtkwave: Initial commit. Added Paths: ----------- csw/mgar/pkg/gtkwave/ csw/mgar/pkg/gtkwave/branches/ csw/mgar/pkg/gtkwave/tags/ csw/mgar/pkg/gtkwave/trunk/ csw/mgar/pkg/gtkwave/trunk/Makefile csw/mgar/pkg/gtkwave/trunk/checksums csw/mgar/pkg/gtkwave/trunk/files/ Property changes on: csw/mgar/pkg/gtkwave/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/gtkwave/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtkwave/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gtkwave/trunk/Makefile 2009-11-08 14:45:10 UTC (rev 7170) @@ -0,0 +1,33 @@ +GARNAME = gtkwave +GARVERSION = 3.2.3 +CATEGORIES = devel + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +SF_PROJ = $(GARNAME) +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +PREREQUISITE_BASE_PKGS = CSWtofrodos + +GARCOMPILER = GNU + +CONFIGURE_ARGS = $(DIRPATHS) LDFLAGS=-lintl + +pre-build-modulated: + find $(WORKSRC) -type f | xargs -I _ /opt/csw/bin/dos2unix _ _ + @$(MAKECOOKIE) + +TEST_SCRIPTS = + +include gar/category.mk Added: csw/mgar/pkg/gtkwave/trunk/checksums =================================================================== --- csw/mgar/pkg/gtkwave/trunk/checksums (rev 0) +++ csw/mgar/pkg/gtkwave/trunk/checksums 2009-11-08 14:45:10 UTC (rev 7170) @@ -0,0 +1 @@ +dcc427903a8f5e958c099f108958dce8 gtkwave-3.2.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Nov 8 16:16:52 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 08 Nov 2009 15:16:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[7171] csw/mgar/pkg/freehdl/trunk Message-ID: Revision: 7171 http://gar.svn.sourceforge.net/gar/?rev=7171&view=rev Author: trygvis Date: 2009-11-08 15:16:52 +0000 (Sun, 08 Nov 2009) Log Message: ----------- o Adding patch to use OpenCSW's pkg-config. Modified Paths: -------------- csw/mgar/pkg/freehdl/trunk/Makefile csw/mgar/pkg/freehdl/trunk/checksums Added Paths: ----------- csw/mgar/pkg/freehdl/trunk/files/0001-Use-OpenCSW-pkg-config.patch Modified: csw/mgar/pkg/freehdl/trunk/Makefile =================================================================== --- csw/mgar/pkg/freehdl/trunk/Makefile 2009-11-08 14:45:10 UTC (rev 7170) +++ csw/mgar/pkg/freehdl/trunk/Makefile 2009-11-08 15:16:52 UTC (rev 7171) @@ -14,7 +14,8 @@ MASTER_SITES = http://freehdl.seul.org/~enaroska/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PATCHFILES = 0000-Mirring-strings.h-include.patch +PATCHFILES = 0000-Mirring-strings.h-include.patch +PATCHFILES += 0001-Use-OpenCSW-pkg-config.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -29,4 +30,7 @@ TEST_SCRIPTS = +REQUIRED_PKGS = CSWgcc4corert CSWgcc4g++ CSWgcc4g++rt CSWpkgconfig +#CSWgcc3core CSWgcc3corert CSWgcc3g++ CSWgcc3g++rt + include gar/category.mk Modified: csw/mgar/pkg/freehdl/trunk/checksums =================================================================== --- csw/mgar/pkg/freehdl/trunk/checksums 2009-11-08 14:45:10 UTC (rev 7170) +++ csw/mgar/pkg/freehdl/trunk/checksums 2009-11-08 15:16:52 UTC (rev 7171) @@ -1 +1,3 @@ +75dd38573b84d23a93a10c028051305d 0000-Mirring-strings.h-include.patch +2950515cac5a87c43c97b264195ff5f7 0001-Use-OpenCSW-pkg-config.patch 6d702aa188fb2c62f8cfca5a2f66d956 freehdl-0.0.7.tar.gz Added: csw/mgar/pkg/freehdl/trunk/files/0001-Use-OpenCSW-pkg-config.patch =================================================================== --- csw/mgar/pkg/freehdl/trunk/files/0001-Use-OpenCSW-pkg-config.patch (rev 0) +++ csw/mgar/pkg/freehdl/trunk/files/0001-Use-OpenCSW-pkg-config.patch 2009-11-08 15:16:52 UTC (rev 7171) @@ -0,0 +1,25 @@ +--- ./freehdl/freehdl-config.orig 2009-11-08 16:03:07.101570078 +0100 ++++ ./freehdl/freehdl-config 2009-11-08 16:03:21.400958210 +0100 +@@ -21,14 +21,14 @@ + # + + option="$1" +-prefix=`pkg-config --variable prefix freehdl` +-exec_prefix=`pkg-config --variable exec_prefix freehdl` +-includedir=`pkg-config --variable includedir freehdl` +-libdir=`pkg-config --variable libdir freehdl` +-version=`pkg-config --modversion freehdl` +-cxxflags=`pkg-config --variable cxxflags freehdl` +-cxx=`pkg-config --variable cxx freehdl` +-linker=`pkg-config --variable libtool freehdl` ++prefix=`/opt/csw/bin/pkg-config --variable prefix freehdl` ++exec_prefix=`/opt/csw/bin/pkg-config --variable exec_prefix freehdl` ++includedir=`/opt/csw/bin/pkg-config --variable includedir freehdl` ++libdir=`/opt/csw/bin/pkg-config --variable libdir freehdl` ++version=`/opt/csw/bin/pkg-config --modversion freehdl` ++cxxflags=`/opt/csw/bin/pkg-config --variable cxxflags freehdl` ++cxx=`/opt/csw/bin/pkg-config --variable cxx freehdl` ++linker=`/opt/csw/bin/pkg-config --variable libtool freehdl` + + case "$option" in + 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 Nov 8 21:31:57 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 08 Nov 2009 20:31:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[7172] csw/mgar/pkg/doxygen/trunk/Makefile Message-ID: Revision: 7172 http://gar.svn.sourceforge.net/gar/?rev=7172&view=rev Author: dmichelsen Date: 2009-11-08 20:31:57 +0000 (Sun, 08 Nov 2009) Log Message: ----------- doxygen: Add license and make docs ARCHALL Modified Paths: -------------- csw/mgar/pkg/doxygen/trunk/Makefile Modified: csw/mgar/pkg/doxygen/trunk/Makefile =================================================================== --- csw/mgar/pkg/doxygen/trunk/Makefile 2009-11-08 15:16:52 UTC (rev 7171) +++ csw/mgar/pkg/doxygen/trunk/Makefile 2009-11-08 20:31:57 UTC (rev 7172) @@ -23,6 +23,8 @@ SPKG_DESC_CSWdoxygen = A documentation system for programming languages SPKG_DESC_CSWdoxygendoc = doxygen documentation +LICENSE = LICENSE + SPKG_SOURCEURL = http://www.stack.nl/~dimitri/doxygen/ # We define upstream file regex so we can be notifed of new upstream software release @@ -43,6 +45,7 @@ EXTRA_PAX_ARGS += -s ',^\.$(prefix)/man,.$(mandir),' +ARCHALL_CSWdoxygendoc = 1 PKGFILES_CSWdoxygendoc = $(PKGFILES_DOC) 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 Nov 9 09:16:45 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 09 Nov 2009 08:16:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[7173] csw/mgar/pkg Message-ID: Revision: 7173 http://gar.svn.sourceforge.net/gar/?rev=7173&view=rev Author: wahwah Date: 2009-11-09 08:16:45 +0000 (Mon, 09 Nov 2009) Log Message: ----------- cheetah: Initial commit Modified Paths: -------------- csw/mgar/pkg/cheetah/trunk/Makefile csw/mgar/pkg/cheetah/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cheetah/ Modified: csw/mgar/pkg/cheetah/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-11-08 20:31:57 UTC (rev 7172) +++ csw/mgar/pkg/cheetah/trunk/Makefile 2009-11-09 08:16:45 UTC (rev 7173) @@ -2,181 +2,23 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = cheetah +GARVERSION = 2.4.0 +CATEGORIES = python +DESCRIPTION = A template engine and code generation tool define BLURB - + Cheetah is an open source template engine and code generation tool, written + in Python. It can be used standalone or combined with other tools and + frameworks. Web development is its principle use, but Cheetah is very + flexible and is also being used to generate C++ game code, Java, sql, form + emails and even Python code. endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +SPKG_SOURCEURL = http://www.cheetahtemplate.org/ +MASTER_SITES = http://pypi.python.org/packages/source/C/Cheetah/ +DL_NAME = Cheetah +DISTNAME = $(DL_NAME)-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz +UFILES_REGEX = $(DL_NAME)-(\d+(?:\.\d+)*).tar.gz +CATALOGNAME = py_cheetah +PACKAGES = CSWpycheetah +include gar/category.mk Modified: csw/mgar/pkg/cheetah/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-11-08 20:31:57 UTC (rev 7172) +++ csw/mgar/pkg/cheetah/trunk/checksums 2009-11-09 08:16:45 UTC (rev 7173) @@ -0,0 +1 @@ +873f5440676355512f176fc4ac01011e Cheetah-2.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 Mon Nov 9 14:31:29 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 09 Nov 2009 13:31:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[7174] csw/mgar/pkg Message-ID: Revision: 7174 http://gar.svn.sourceforge.net/gar/?rev=7174&view=rev Author: dmichelsen Date: 2009-11-09 13:31:29 +0000 (Mon, 09 Nov 2009) Log Message: ----------- imlib: Initial commit Added Paths: ----------- csw/mgar/pkg/imlib/ csw/mgar/pkg/imlib/branches/ csw/mgar/pkg/imlib/tags/ csw/mgar/pkg/imlib/trunk/ csw/mgar/pkg/imlib/trunk/Makefile csw/mgar/pkg/imlib/trunk/checksums csw/mgar/pkg/imlib/trunk/files/ Property changes on: csw/mgar/pkg/imlib/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/imlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/imlib/trunk/Makefile (rev 0) +++ csw/mgar/pkg/imlib/trunk/Makefile 2009-11-09 13:31:29 UTC (rev 7174) @@ -0,0 +1,28 @@ +GARNAME = imlib +GARVERSION = 1.9.15 +CATEGORIES = lib + +DESCRIPTION = An advanced replacement library for libraries like libXpm +define BLURB +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +# EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --x-include=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/imlib/trunk/checksums =================================================================== --- csw/mgar/pkg/imlib/trunk/checksums (rev 0) +++ csw/mgar/pkg/imlib/trunk/checksums 2009-11-09 13:31:29 UTC (rev 7174) @@ -0,0 +1 @@ +7db987e6c52e4daf70d7d0f471238eae download/imlib-1.9.15.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 Nov 9 15:57:04 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 09 Nov 2009 14:57:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[7175] csw/mgar/pkg Message-ID: Revision: 7175 http://gar.svn.sourceforge.net/gar/?rev=7175&view=rev Author: wahwah Date: 2009-11-09 14:57:04 +0000 (Mon, 09 Nov 2009) Log Message: ----------- p4: Initial commit. Modified Paths: -------------- csw/mgar/pkg/p4/trunk/Makefile csw/mgar/pkg/p4/trunk/checksums Added Paths: ----------- csw/mgar/pkg/p4/ Modified: csw/mgar/pkg/p4/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-11-04 15:45:55 UTC (rev 7108) +++ csw/mgar/pkg/p4/trunk/Makefile 2009-11-09 14:57:04 UTC (rev 7175) @@ -2,181 +2,72 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = p4 +GARVERSION = 09.1 +CATEGORIES = utils +DESCRIPTION = Perforce command-line client define BLURB - + The purpose of this build to be able to easily package it up for in-house + distribution. It's not intended to be used to distribute p4 client as part + of the OpenCSW catalog. endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true +SPKG_SOURCEURL = http://www.perforce.com +P4OS_5.8 = solaris8 +P4OS_5.9 = solaris9 +P4OS_5.10 = solaris10 +P4OS = $(P4OS_$(GAROSREL)) -#include gar/category.mk +P4ARCH_i386 = x86 +P4ARCH_amd64 = x86_64 +P4ARCH_sparcv8 = sparc +P4ARCH_sparcv9 = sparc64 +P4ARCH = $(P4ARCH_$(KERNELISA)) +# MASTER_SITES = http://www.perforce.com/downloads/perforce/r$(GARVERSION)/bin.$(P4OS)$(P4ARCH)/ +MASTER_SITES += http://www.perforce.com/perforce/contracts/ +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +DISTFILES = +DISTFILES += p4-$(GARVERSION)-solaris10x86 +DISTFILES += p4-$(GARVERSION)-solaris10x86_64 +DISTFILES += p4-$(GARVERSION)-solaris10sparc +DISTFILES += p4-$(GARVERSION)-solaris10sparc64 +DISTFILES += commercial.pdf + +work/solaris%/download/p4-$(GARVERSION)-solaris10x86: + wget http://www.perforce.com/downloads/perforce/r$(GARVERSION)/bin.solaris10x86/p4 \ + -P $(PARTIALDIR) \ + -O $@ + +work/solaris%/download/p4-$(GARVERSION)-solaris10x86_64: + wget http://www.perforce.com/downloads/perforce/r$(GARVERSION)/bin.solaris10x86_64/p4 \ + -P $(PARTIALDIR) \ + -O $@ + +work/solaris%/download/p4-$(GARVERSION)-solaris10sparc: + wget http://www.perforce.com/downloads/perforce/r$(GARVERSION)/bin.solaris10sparc/p4 \ + -P $(PARTIALDIR) \ + -O $@ + +work/solaris%/download/p4-$(GARVERSION)-solaris10sparc64: + wget http://www.perforce.com/downloads/perforce/r$(GARVERSION)/bin.solaris10sparc64/p4 \ + -P $(PARTIALDIR) \ + -O $@ + +LICENSE = commercial.txt +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = p4 +INSTALL_SCRIPTS = p4 +TEST_SCRIPTS = +BUILD64 = 1 +include gar/category.mk + +build-p4: + pdftotext $(WORKDIR)/commercial.pdf + @$(MAKECOOKIE) + +install-p4: + ginstall -m 755 -d $(DESTDIR)$(bindir) + ginstall -m 755 $(WORKDIR)/p4-$(GARVERSION)-$(P4OS)$(P4ARCH) $(DESTDIR)$(bindir)/p4 + ginstall -m 755 -d $(DESTDIR)$(docdir)/p4 + ginstall -m 644 $(DOWNLOADDIR)/commercial.pdf $(DESTDIR)$(docdir)/p4 + @$(MAKECOOKIE) Modified: csw/mgar/pkg/p4/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-11-04 15:45:55 UTC (rev 7108) +++ csw/mgar/pkg/p4/trunk/checksums 2009-11-09 14:57:04 UTC (rev 7175) @@ -0,0 +1,5 @@ +ef4ef2c443c8c638c671b5c4e4bdd42f commercial.pdf +71704b52a8af0559d5319c6c3469de77 p4-09.1-solaris10sparc +ddc03484fd0fbcfb8129401644c1a76f p4-09.1-solaris10sparc64 +349d5e8d61389da2e23af8b31ec4fc9d p4-09.1-solaris10x86 +13c9469198f515ba57f5237ba5e428f6 p4-09.1-solaris10x86_64 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 Nov 9 16:00:59 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 09 Nov 2009 15:00:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[7176] csw/mgar/pkg/p4/trunk/Makefile Message-ID: Revision: 7176 http://gar.svn.sourceforge.net/gar/?rev=7176&view=rev Author: wahwah Date: 2009-11-09 15:00:59 +0000 (Mon, 09 Nov 2009) Log Message: ----------- p4: Fixing a problem in which GAROSREL is 5.8 on build10x Modified Paths: -------------- csw/mgar/pkg/p4/trunk/Makefile Modified: csw/mgar/pkg/p4/trunk/Makefile =================================================================== --- csw/mgar/pkg/p4/trunk/Makefile 2009-11-09 14:57:04 UTC (rev 7175) +++ csw/mgar/pkg/p4/trunk/Makefile 2009-11-09 15:00:59 UTC (rev 7176) @@ -67,7 +67,7 @@ install-p4: ginstall -m 755 -d $(DESTDIR)$(bindir) - ginstall -m 755 $(WORKDIR)/p4-$(GARVERSION)-$(P4OS)$(P4ARCH) $(DESTDIR)$(bindir)/p4 + ginstall -m 755 $(WORKDIR)/p4-$(GARVERSION)-solaris10$(P4ARCH) $(DESTDIR)$(bindir)/p4 ginstall -m 755 -d $(DESTDIR)$(docdir)/p4 ginstall -m 644 $(DOWNLOADDIR)/commercial.pdf $(DESTDIR)$(docdir)/p4 @$(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 Nov 9 16:43:43 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 09 Nov 2009 15:43:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[7177] csw/mgar/pkg Message-ID: Revision: 7177 http://gar.svn.sourceforge.net/gar/?rev=7177&view=rev Author: dmichelsen Date: 2009-11-09 15:43:43 +0000 (Mon, 09 Nov 2009) Log Message: ----------- ffmpeg: Initial commit Added Paths: ----------- csw/mgar/pkg/ffmpeg/ csw/mgar/pkg/ffmpeg/branches/ csw/mgar/pkg/ffmpeg/tags/ csw/mgar/pkg/ffmpeg/trunk/ csw/mgar/pkg/ffmpeg/trunk/Makefile csw/mgar/pkg/ffmpeg/trunk/checksums csw/mgar/pkg/ffmpeg/trunk/files/ Property changes on: csw/mgar/pkg/ffmpeg/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/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2009-11-09 15:43:43 UTC (rev 7177) @@ -0,0 +1,21 @@ +GARNAME = ffmpeg +GARVERSION = 0.5 +CATEGORIES = lib + +DESCRIPTION = Very fast video and audio converter (includes libavcodec) +define BLURB + FFmpeg is a complete, cross-platform solution to record, convert and stream + audio and video. It includes libavcodec - the leading audio/video codec library. +endef + +MASTER_SITES = http://ffmpeg.org/releases/ +DISTFILES = $(DISTNAME).tar.bz2 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +BUILD64 = 1 +NO_ISAEXEC = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/ffmpeg/trunk/checksums =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/checksums (rev 0) +++ csw/mgar/pkg/ffmpeg/trunk/checksums 2009-11-09 15:43:43 UTC (rev 7177) @@ -0,0 +1 @@ +be8503f15c3b81ba00eb8379ca8dcf33 ffmpeg-0.5.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 Nov 9 17:03:22 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 09 Nov 2009 16:03:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[7178] csw/mgar/pkg/bdb3/tags Message-ID: Revision: 7178 http://gar.svn.sourceforge.net/gar/?rev=7178&view=rev Author: wahwah Date: 2009-11-09 16:03:22 +0000 (Mon, 09 Nov 2009) Log Message: ----------- bdb: s/sf.net/sourceforge.net/ for the SSL certificates Property Changed: ---------------- csw/mgar/pkg/bdb3/tags/bdb-consolidation-4.4.20,REV=2009.07.28/ csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/ Property changes on: csw/mgar/pkg/bdb3/tags/bdb-consolidation-4.4.20,REV=2009.07.28 ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Nov 9 17:06:40 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 09 Nov 2009 16:06:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[7179] csw/mgar/pkg Message-ID: Revision: 7179 http://gar.svn.sourceforge.net/gar/?rev=7179&view=rev Author: dmichelsen Date: 2009-11-09 16:06:40 +0000 (Mon, 09 Nov 2009) Log Message: ----------- imlib2: Initial commit Modified Paths: -------------- csw/mgar/pkg/imlib2/trunk/Makefile csw/mgar/pkg/imlib2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/imlib2/ Modified: csw/mgar/pkg/imlib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/imlib/trunk/Makefile 2009-11-09 13:31:29 UTC (rev 7174) +++ csw/mgar/pkg/imlib2/trunk/Makefile 2009-11-09 16:06:40 UTC (rev 7179) @@ -1,27 +1,34 @@ -GARNAME = imlib -GARVERSION = 1.9.15 +GARNAME = imlib2 +GARVERSION = 1.4.2 CATEGORIES = lib -DESCRIPTION = An advanced replacement library for libraries like libXpm +DESCRIPTION = Imlib 2 is the successor to Imlib, a powerful graphics library define BLURB + Imlib 2 is the successor to Imlib. It is NOT a newer version -- it is a completely new library. + Imlib 2 can be installed alongside Imlib 1.x without any problems since they are effectively + different libraries which have very similar functionality. Please see the homepage for the + long description of the differences. endef +SF_PROJ = enlightenment MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTFILES += $(GARNAME)_loaders-$(GARVERSION).tar.bz2 # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -EXTRA_INC = $(prefix)/X11/include -EXTRA_LIB = $(prefix)/X11/lib -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +REQUIRED_PKGS = CSWbzip2 CSWftype2 CSWgiflibrt CSWjpeg CSWlibid3tag +REQUIRED_PKGS += CSWlibxext CSWpng CSWtiff CSWzlib -# EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so +#EXTRA_INC = $(prefix)/X11/include +#EXTRA_LIB = $(prefix)/X11/lib +#EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --x-include=$(prefix)/X11/include -CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +#CONFIGURE_ARGS += --x-include=$(prefix)/X11/include +#CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) TEST_TARGET = check Modified: csw/mgar/pkg/imlib2/trunk/checksums =================================================================== --- csw/mgar/pkg/imlib/trunk/checksums 2009-11-09 13:31:29 UTC (rev 7174) +++ csw/mgar/pkg/imlib2/trunk/checksums 2009-11-09 16:06:40 UTC (rev 7179) @@ -1 +1,2 @@ -7db987e6c52e4daf70d7d0f471238eae download/imlib-1.9.15.tar.bz2 +9f15568e76ebda9092c571e0df261f54 imlib2-1.4.2.tar.bz2 +972f64c179035014b72243ccd6245c5e imlib2_loaders-1.4.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 Nov 9 17:10:53 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 09 Nov 2009 16:10:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[7180] csw/mgar/pkg/sox/trunk/Makefile Message-ID: Revision: 7180 http://gar.svn.sourceforge.net/gar/?rev=7180&view=rev Author: dmichelsen Date: 2009-11-09 16:10:53 +0000 (Mon, 09 Nov 2009) Log Message: ----------- sox: Add dependencies Modified Paths: -------------- csw/mgar/pkg/sox/trunk/Makefile Modified: csw/mgar/pkg/sox/trunk/Makefile =================================================================== --- csw/mgar/pkg/sox/trunk/Makefile 2009-11-09 16:06:40 UTC (rev 7179) +++ csw/mgar/pkg/sox/trunk/Makefile 2009-11-09 16:10:53 UTC (rev 7180) @@ -20,6 +20,8 @@ # XXX: Add gsm, lpc10 and wavpack REQUIRED_PKGS = CSWvorbis CSWlibogg CSWlibmad CSWlame CSWlibid3tag +REQUIRED_PKGS += CSWflac CSWlibao CSWlibsndfile CSWpng CSWwavpack CSWzlib + PREREQUISITE_PKGS = $(REQUIRED_PKGS) 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 Mon Nov 9 17:13:59 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 09 Nov 2009 16:13:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[7181] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7181 http://gar.svn.sourceforge.net/gar/?rev=7181&view=rev Author: dmichelsen Date: 2009-11-09 16:13:59 +0000 (Mon, 09 Nov 2009) Log Message: ----------- mGAR v2: Activate pkgcheck after false check Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-11-09 16:10:53 UTC (rev 7180) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-11-09 16:13:59 UTC (rev 7181) @@ -606,7 +606,8 @@ # We depend on extract as the additional package files (like .gspec) must be # unpacked to global/ for packaging. E. g. 'merge' depends only on the specific # modulations and does not fill global/. -_package: validateplatform extract-global merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package $(if $(filter-out 0,$(ENABLE_CHECK)),pkgcheck) +ENABLE_CHECK ?= 1 +_package: validateplatform extract-global merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package $(if $(ENABLE_CHECK),pkgcheck) @$(MAKECOOKIE) package: _package 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 Nov 9 17:26:43 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 09 Nov 2009 16:26:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[7182] csw/mgar/pkg/ffmpeg/trunk/Makefile Message-ID: Revision: 7182 http://gar.svn.sourceforge.net/gar/?rev=7182&view=rev Author: dmichelsen Date: 2009-11-09 16:26:43 +0000 (Mon, 09 Nov 2009) Log Message: ----------- ffmpeg: Adjust configure flags Modified Paths: -------------- csw/mgar/pkg/ffmpeg/trunk/Makefile Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile 2009-11-09 16:13:59 UTC (rev 7181) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2009-11-09 16:26:43 UTC (rev 7182) @@ -16,6 +16,12 @@ BUILD64 = 1 NO_ISAEXEC = 1 -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = --prefix=$(prefix) +CONFIGURE_ARGS += --bindir=$(bindir) +CONFIGURE_ARGS += --datadir=$(datadir) +CONFIGURE_ARGS += --libdir=$(libdir) +CONFIGURE_ARGS += --shlibdir=$(libdir) +CONFIGURE_ARGS += --incdir=$(includedir) +CONFIGURE_ARGS += --mandir=$(mandir) 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 Nov 9 17:36:06 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 09 Nov 2009 16:36:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7183] csw/mgar/gar/v2 Message-ID: Revision: 7183 http://gar.svn.sourceforge.net/gar/?rev=7183&view=rev Author: dmichelsen Date: 2009-11-09 16:36:06 +0000 (Mon, 09 Nov 2009) Log Message: ----------- mGAR v2: Update excluded commondirs Modified Paths: -------------- csw/mgar/gar/v2/bin/update-commondirs csw/mgar/gar/v2/etc/commondirs-i386 csw/mgar/gar/v2/etc/commondirs-sparc Modified: csw/mgar/gar/v2/bin/update-commondirs =================================================================== --- csw/mgar/gar/v2/bin/update-commondirs 2009-11-09 16:26:43 UTC (rev 7182) +++ csw/mgar/gar/v2/bin/update-commondirs 2009-11-09 16:36:06 UTC (rev 7183) @@ -19,17 +19,17 @@ mkdir $TMPDIR ( cd $TMPDIR - wget http://mirror.opencsw.org/opencsw/current/$1/5.8/common-1.4.6,REV=2008.04.28-SunOS5.8-$1-CSW.pkg.gz - gzip -c -d common-* | pkgtrans /dev/fd/0 $TMPDIR all + wget http://mirror.opencsw.org/opencsw/current/$1/5.8/common-1.4.7,REV=2009.09.20-SunOS5.8-$1-CSW.pkg + cat common-* | pkgtrans /dev/fd/0 $TMPDIR all ) - perl -ne ' + ( perl -ne ' my @l = split; if( $l[1] =~ /^[ds]$/ ) { print ($l[3] =~ /([^=]*)/); print "\n"; } - ' $TMPDIR/CSWcommon/pkgmap > ../etc/commondirs-$1 + ' $TMPDIR/CSWcommon/pkgmap; echo "/var"; echo "/var/run") > ../etc/commondirs-$1 rm -rf $TMPDIR } Modified: csw/mgar/gar/v2/etc/commondirs-i386 =================================================================== --- csw/mgar/gar/v2/etc/commondirs-i386 2009-11-09 16:26:43 UTC (rev 7182) +++ csw/mgar/gar/v2/etc/commondirs-i386 2009-11-09 16:36:06 UTC (rev 7183) @@ -1,4 +1,17 @@ /etc/opt/csw +/etc/opt/csw/pkg-hooks +/etc/opt/csw/pkg-hooks/postbatchinstall.d +/etc/opt/csw/pkg-hooks/postbatchremove.d +/etc/opt/csw/pkg-hooks/postbatchupgrade.d +/etc/opt/csw/pkg-hooks/postinstall.d +/etc/opt/csw/pkg-hooks/postremove.d +/etc/opt/csw/pkg-hooks/postupgrade.d +/etc/opt/csw/pkg-hooks/prebatchinstall.d +/etc/opt/csw/pkg-hooks/prebatchremove.d +/etc/opt/csw/pkg-hooks/prebatchupgrade.d +/etc/opt/csw/pkg-hooks/preinstall.d +/etc/opt/csw/pkg-hooks/preremove.d +/etc/opt/csw/pkg-hooks/preupgrade.d /opt/csw /opt/csw/bin /opt/csw/bin/amd64 @@ -140,3 +153,6 @@ /opt/csw/share/man /opt/csw/var /var/opt/csw +/var/opt/csw/pkg-hooks +/var +/var/run Modified: csw/mgar/gar/v2/etc/commondirs-sparc =================================================================== --- csw/mgar/gar/v2/etc/commondirs-sparc 2009-11-09 16:26:43 UTC (rev 7182) +++ csw/mgar/gar/v2/etc/commondirs-sparc 2009-11-09 16:36:06 UTC (rev 7183) @@ -1,4 +1,17 @@ /etc/opt/csw +/etc/opt/csw/pkg-hooks +/etc/opt/csw/pkg-hooks/postbatchinstall.d +/etc/opt/csw/pkg-hooks/postbatchremove.d +/etc/opt/csw/pkg-hooks/postbatchupgrade.d +/etc/opt/csw/pkg-hooks/postinstall.d +/etc/opt/csw/pkg-hooks/postremove.d +/etc/opt/csw/pkg-hooks/postupgrade.d +/etc/opt/csw/pkg-hooks/prebatchinstall.d +/etc/opt/csw/pkg-hooks/prebatchremove.d +/etc/opt/csw/pkg-hooks/prebatchupgrade.d +/etc/opt/csw/pkg-hooks/preinstall.d +/etc/opt/csw/pkg-hooks/preremove.d +/etc/opt/csw/pkg-hooks/preupgrade.d /opt/csw /opt/csw/bin /opt/csw/bin/sparc @@ -144,3 +157,6 @@ /opt/csw/share/man /opt/csw/var /var/opt/csw +/var/opt/csw/pkg-hooks +/var +/var/run 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 Nov 9 17:59:07 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 09 Nov 2009 16:59:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7184] csw/mgar/gar/v2/categories Message-ID: Revision: 7184 http://gar.svn.sourceforge.net/gar/?rev=7184&view=rev Author: wahwah Date: 2009-11-09 16:59:07 +0000 (Mon, 09 Nov 2009) Log Message: ----------- gar-v2: Adding 'loose' category Added Paths: ----------- csw/mgar/gar/v2/categories/loose/ csw/mgar/gar/v2/categories/loose/category.mk Added: csw/mgar/gar/v2/categories/loose/category.mk =================================================================== --- csw/mgar/gar/v2/categories/loose/category.mk (rev 0) +++ csw/mgar/gar/v2/categories/loose/category.mk 2009-11-09 16:59:07 UTC (rev 7184) @@ -0,0 +1,28 @@ +# $Id$ +# +# Building packages from loose files, laid out in a directory. + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = loose +TEST_SCRIPTS = + +MASTER_SITES += $(sort $(addprefix file://$(LOCAL_SRC)/,$(dir $(FILES)))) +DISTFILES += $(notdir $(FILES)) + +include gar/gar.mk + +ifndef LOCAL_SRC +$(error "Please set the LOCAL_SRC variable to the root of your source code tree") +endif + +ifndef FILES +$(error "Please set the FILES variable to the list of files to include") +endif + +install-loose: + $(foreach F,$(FILES),ginstall \ + -d $(DESTDIR)$(prefix)/$(dir $F) \ + && ginstall $(WORKDIR)/$(notdir $F) \ + $(DESTDIR)$(prefix)/$(dir $F);) + @$(MAKECOOKIE) Property changes on: csw/mgar/gar/v2/categories/loose/category.mk ___________________________________________________________________ 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 Mon Nov 9 18:03:49 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 09 Nov 2009 17:03:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[7185] csw/mgar/pkg/gar/Makefile Message-ID: Revision: 7185 http://gar.svn.sourceforge.net/gar/?rev=7185&view=rev Author: wahwah Date: 2009-11-09 17:03:46 +0000 (Mon, 09 Nov 2009) Log Message: ----------- gar: Adding package-level Makefile Added Paths: ----------- csw/mgar/pkg/gar/Makefile Copied: csw/mgar/pkg/gar/Makefile (from rev 7172, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gar/Makefile (rev 0) +++ csw/mgar/pkg/gar/Makefile 2009-11-09 17:03:46 UTC (rev 7185) @@ -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) 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 Nov 9 19:02:45 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 09 Nov 2009 18:02:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[7186] csw/mgar/gar/v2/bin/checkpkg Message-ID: Revision: 7186 http://gar.svn.sourceforge.net/gar/?rev=7186&view=rev Author: wahwah Date: 2009-11-09 18:02:45 +0000 (Mon, 09 Nov 2009) Log Message: ----------- gar-v2/checkpkg: Using rot13 so that it can check itself without failing. Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2009-11-09 17:03:46 UTC (rev 7185) +++ csw/mgar/gar/v2/bin/checkpkg 2009-11-09 18:02:45 UTC (rev 7186) @@ -97,7 +97,10 @@ # Need to rewrite this whole thing to also # check for badly set RUNPATHs. sigh. # - for badpath in /export/medusa /opt/build ; do + # Using rot13 so that checkpkg can check itself without reporting + # an error. + badpaths="$(echo /rkcbeg/zrqhfn /bcg/ohvyq | gtr a-mn-z n-za-m)" + for badpath in $badpaths ; do GREP=/bin/grep gzgrep "$badpath" $f if [[ $? -eq 0 ]] ; then print "" 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 Nov 9 20:36:02 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 09 Nov 2009 19:36:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[7187] csw/mgar/pkg/cswutils/trunk/files/checkpkg Message-ID: Revision: 7187 http://gar.svn.sourceforge.net/gar/?rev=7187&view=rev Author: wahwah Date: 2009-11-09 19:36:02 +0000 (Mon, 09 Nov 2009) Log Message: ----------- cswutils/checkpkg: Using rot13 to allow checkpkg to check itself Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/files/checkpkg Modified: csw/mgar/pkg/cswutils/trunk/files/checkpkg =================================================================== --- csw/mgar/pkg/cswutils/trunk/files/checkpkg 2009-11-09 18:02:45 UTC (rev 7186) +++ csw/mgar/pkg/cswutils/trunk/files/checkpkg 2009-11-09 19:36:02 UTC (rev 7187) @@ -88,7 +88,8 @@ # Need to rewrite this whole thing to also # check for badly set RUNPATHs. sigh. # - for badpath in /export/medusa /opt/build ; do + badpaths="$(echo /rkcbeg/zrqhfn /bcg/ohvyq | gtr a-mn-z n-za-m)" + for badpath in $(badpaths) ; do GREP=/bin/grep gzgrep "$badpath" $f if [[ $? -eq 0 ]] ; then print "" 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 Nov 9 20:39:25 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 09 Nov 2009 19:39:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7188] csw/mgar/pkg/cswutils/trunk Message-ID: Revision: 7188 http://gar.svn.sourceforge.net/gar/?rev=7188&view=rev Author: wahwah Date: 2009-11-09 19:39:25 +0000 (Mon, 09 Nov 2009) Log Message: ----------- cswutils: Updating submitpkg, updating checksums, version bump to 1.14.6 Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile csw/mgar/pkg/cswutils/trunk/checksums Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2009-11-09 19:36:02 UTC (rev 7187) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2009-11-09 19:39:25 UTC (rev 7188) @@ -1,7 +1,7 @@ # $Id$ GARNAME = cswutils -GARVERSION = 1.14.5 +GARVERSION = 1.14.6 CATEGORIES = utils DESCRIPTION = Utilities for CSW maintainers @@ -9,7 +9,7 @@ endef SVNROOT = http://opencsw.svn.sourceforge.net/svnroot/opencsw/utilities/ -SVN_REV = 93 +SVN_REV = 96 MASTER_SITES = SVN_FILES = submit_to_newpkgs.py compare_pkgs.py opencsw_lib.py Modified: csw/mgar/pkg/cswutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswutils/trunk/checksums 2009-11-09 19:36:02 UTC (rev 7187) +++ csw/mgar/pkg/cswutils/trunk/checksums 2009-11-09 19:39:25 UTC (rev 7188) @@ -1,11 +1,11 @@ 091b12575ebc0e45cf8c3d8b43d8b638 COPYING -30b6598a4453e3ce0c1fabeede5eb5f8 checkpkg +59c261b5337c61ddda9146a2a97efc3d checkpkg 6ec3b6597e04714430987ccc199db3c4 checkpkg.8 -24881eb553044a5b437b7293f4138ba4 compare_pkgs.py-r93 +24881eb553044a5b437b7293f4138ba4 compare_pkgs.py-r96 9a637f6546cc50974159a987302d91c0 cpan2pkg 93b6a811d303ce3be0050c5a7b3c8e69 createpkg a605598f30195f9ab1b29fc3944d3b31 createpkg.8 -a60abc5eb12251c187086856be2c3470 opencsw_lib.py-r93 +6af12950bab350ecd2a14fe1e347b18b opencsw_lib.py-r96 cd4496ee27bf86d5c8bc656c9c5974be stagepkg 8908a0a898aa07a7a928b2b8bd8384f0 stagepkg.8 -3b102386ad1d2086dbe8f3be9d173fda submit_to_newpkgs.py-r93 +bb90fa5379bcae922a499333951f5796 submit_to_newpkgs.py-r96 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 Nov 9 22:08:13 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 09 Nov 2009 21:08:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[7189] csw/mgar/gar/v1/bin Message-ID: Revision: 7189 http://gar.svn.sourceforge.net/gar/?rev=7189&view=rev Author: dmichelsen Date: 2009-11-09 21:08:13 +0000 (Mon, 09 Nov 2009) Log Message: ----------- mGAR v1: Apply r7186 (check itself) to v1 Modified Paths: -------------- csw/mgar/gar/v1/bin/checkpkg Property Changed: ---------------- csw/mgar/gar/v1/bin/ Property changes on: csw/mgar/gar/v1/bin ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/gar/v2/bin:7186 Modified: csw/mgar/gar/v1/bin/checkpkg =================================================================== --- csw/mgar/gar/v1/bin/checkpkg 2009-11-09 19:39:25 UTC (rev 7188) +++ csw/mgar/gar/v1/bin/checkpkg 2009-11-09 21:08:13 UTC (rev 7189) @@ -85,7 +85,10 @@ # Need to rewrite this whole thing to also # check for badly set RUNPATHs. sigh. # - for badpath in /export/medusa /opt/build ; do + # Using rot13 so that checkpkg can check itself without reporting + # an error. + badpaths="$(echo /rkcbeg/zrqhfn /bcg/ohvyq | gtr a-mn-z n-za-m)" + for badpath in $badpaths ; do GREP=/bin/grep gzgrep "$badpath" $f if [[ $? -eq 0 ]] ; then print "" 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 Nov 9 22:10:35 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 09 Nov 2009 21:10:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[7190] csw/mgar/pkg/gar/trunk/Makefile Message-ID: Revision: 7190 http://gar.svn.sourceforge.net/gar/?rev=7190&view=rev Author: dmichelsen Date: 2009-11-09 21:10:30 +0000 (Mon, 09 Nov 2009) Log Message: ----------- gar: Remove check as checkpkg doesn't bail out on checking itself after r7186 Modified Paths: -------------- csw/mgar/pkg/gar/trunk/Makefile Modified: csw/mgar/pkg/gar/trunk/Makefile =================================================================== --- csw/mgar/pkg/gar/trunk/Makefile 2009-11-09 21:08:13 UTC (rev 7189) +++ csw/mgar/pkg/gar/trunk/Makefile 2009-11-09 21:10:30 UTC (rev 7190) @@ -35,9 +35,6 @@ ARCHALL = 1 -# Because the bad pathes are in the bad pathes check we cannot check ourselves -ENABLE_CHECK = 0 - include gar/category.mk install-gar: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Nov 10 01:56:04 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 10 Nov 2009 00:56:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[7191] csw/mgar/gar/v2/bin/checkpkg Message-ID: Revision: 7191 http://gar.svn.sourceforge.net/gar/?rev=7191&view=rev Author: wahwah Date: 2009-11-10 00:56:04 +0000 (Tue, 10 Nov 2009) Log Message: ----------- gar/checkpkg: Verifying that the package doesn't have double depends Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2009-11-09 21:10:30 UTC (rev 7190) +++ csw/mgar/gar/v2/bin/checkpkg 2009-11-10 00:56:04 UTC (rev 7191) @@ -443,6 +443,15 @@ exit 1 fi +# Verify that there are no double depends +repeated_depends="$(awk '{print $2}' $EXTRACTDIR/$pkgname/install/depend \ + | sort | uniq -c | awk '{print $1}' | sort | uniq | wc -l)" +if [[ "$repeated_depends" -ne 1 ]]; then + cat $EXTRACTDIR/$pkgname/install/depend + print ERROR: $pkgname has double depends + exit 1 +fi + #to retain a record of all packages currently being examined from $@ echo $pkgname >> $SETDEPS 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 Nov 10 02:25:32 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 10 Nov 2009 01:25:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7192] csw/mgar/gar/v2/bin/checkpkg Message-ID: Revision: 7192 http://gar.svn.sourceforge.net/gar/?rev=7192&view=rev Author: wahwah Date: 2009-11-10 01:25:32 +0000 (Tue, 10 Nov 2009) Log Message: ----------- gar/checkpkg: removing option -q from /usr/bin/grep invocation (/usr/bin/grep does not support -q) Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2009-11-10 00:56:04 UTC (rev 7191) +++ csw/mgar/gar/v2/bin/checkpkg 2009-11-10 01:25:32 UTC (rev 7192) @@ -557,7 +557,7 @@ lib=`echo $ldep | nawk '{print $1}'` [ "$lib" = "libm.so.2" ] && continue pkg=`echo $ldep | nawk '{print $2}'` - /usr/bin/grep -q "[/=]$lib[ =]" $SETLIBS >/dev/null + /usr/bin/grep "[/=]$lib[ =]" $SETLIBS >/dev/null if [ $? -ne 0 ]; then errmsg "Couldn't find a package providing $lib" else 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 Nov 10 02:54:17 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 10 Nov 2009 01:54:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[7193] csw/mgar/pkg/chmlib/trunk Message-ID: Revision: 7193 http://gar.svn.sourceforge.net/gar/?rev=7193&view=rev Author: bdwalton Date: 2009-11-10 01:54:17 +0000 (Tue, 10 Nov 2009) Log Message: ----------- chmlib: patch in working gnulib support and other autoconf fixes Modified Paths: -------------- csw/mgar/pkg/chmlib/trunk/Makefile csw/mgar/pkg/chmlib/trunk/checksums Added Paths: ----------- csw/mgar/pkg/chmlib/trunk/files/0001-gnulib-import-getopt-posix.patch csw/mgar/pkg/chmlib/trunk/files/0002-integrate-gnulib-into-the-auto-tool-files.patch csw/mgar/pkg/chmlib/trunk/files/0003-add-dummy-config.h-file.patch csw/mgar/pkg/chmlib/trunk/files/0004-add-autoconf-checks-for-lnsl-and-lsocket.patch Modified: csw/mgar/pkg/chmlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/chmlib/trunk/Makefile 2009-11-10 01:25:32 UTC (rev 7192) +++ csw/mgar/pkg/chmlib/trunk/Makefile 2009-11-10 01:54:17 UTC (rev 7193) @@ -14,7 +14,10 @@ MASTER_SITES = http://www.jedrea.com/chmlib/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -PATCHFILES = 0001-Add-autoconf-support-from-gnulib-for-getopt.h.patch +PATCHFILES = 0001-gnulib-import-getopt-posix.patch +PATCHFILES += 0002-integrate-gnulib-into-the-auto-tool-files.patch +PATCHFILES += 0003-add-dummy-config.h-file.patch +PATCHFILES += 0004-add-autoconf-checks-for-lnsl-and-lsocket.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 @@ -29,6 +32,10 @@ include gar/category.mk +pre-configure-modulated: + @(cd $(WORKSRC); aclocal -I gnulib/m4; autoconf -I gnulib/m4; automake) + @$(MAKECOOKIE) + post-install-modulated: ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) $(foreach D,$(DOCS),ginstall $(WORKSRC)/$D $(DESTDIR)$(docdir)/$(GARNAME)/$D;) Modified: csw/mgar/pkg/chmlib/trunk/checksums =================================================================== --- csw/mgar/pkg/chmlib/trunk/checksums 2009-11-10 01:25:32 UTC (rev 7192) +++ csw/mgar/pkg/chmlib/trunk/checksums 2009-11-10 01:54:17 UTC (rev 7193) @@ -1,2 +1,5 @@ -b7276bc25fffbf7044018f94ebe1baf9 download/0001-Add-autoconf-support-from-gnulib-for-getopt.h.patch -7ea49ed8c335215c1edc6fae83e6b912 download/chmlib-0.40.tar.bz2 +b454cb00abe8653f2e3c11318a884e0e 0001-gnulib-import-getopt-posix.patch +c181447a053d0c5a83099af4a68a5510 0002-integrate-gnulib-into-the-auto-tool-files.patch +b96303db2702dd6696ea45dfba2de5dc 0003-add-dummy-config.h-file.patch +883567051286cd6984b7a1b23fa8e783 0004-add-autoconf-checks-for-lnsl-and-lsocket.patch +7ea49ed8c335215c1edc6fae83e6b912 chmlib-0.40.tar.bz2 Added: csw/mgar/pkg/chmlib/trunk/files/0001-gnulib-import-getopt-posix.patch =================================================================== --- csw/mgar/pkg/chmlib/trunk/files/0001-gnulib-import-getopt-posix.patch (rev 0) +++ csw/mgar/pkg/chmlib/trunk/files/0001-gnulib-import-getopt-posix.patch 2009-11-10 01:54:17 UTC (rev 7193) @@ -0,0 +1,4596 @@ +From 23637dad0fc9fb0e5e0755744d5d3726536068ee Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Thu, 15 Oct 2009 21:32:41 +0200 +Subject: [PATCH 1/4] gnulib --import getopt-posix + +--- + gnulib/Makefile.am | 207 ++++++++ + gnulib/dummy.c | 42 ++ + gnulib/getopt.c | 1186 ++++++++++++++++++++++++++++++++++++++++++++ + gnulib/getopt.in.h | 242 +++++++++ + gnulib/getopt1.c | 170 +++++++ + gnulib/getopt_int.h | 130 +++++ + gnulib/gettext.h | 279 +++++++++++ + gnulib/m4/00gnulib.m4 | 30 ++ + gnulib/m4/extensions.m4 | 104 ++++ + gnulib/m4/getopt.m4 | 250 ++++++++++ + gnulib/m4/gnulib-cache.m4 | 36 ++ + gnulib/m4/gnulib-common.m4 | 124 +++++ + gnulib/m4/gnulib-comp.m4 | 197 ++++++++ + gnulib/m4/gnulib-tool.m4 | 57 +++ + gnulib/m4/include_next.m4 | 187 +++++++ + gnulib/m4/onceonly.m4 | 90 ++++ + gnulib/m4/stddef_h.m4 | 45 ++ + gnulib/m4/unistd_h.m4 | 115 +++++ + gnulib/m4/wchar_t.m4 | 20 + + gnulib/stddef.in.h | 86 ++++ + gnulib/unistd.in.h | 784 +++++++++++++++++++++++++++++ + link-warning.h | 28 + + 22 files changed, 4409 insertions(+), 0 deletions(-) + create mode 100644 gnulib/Makefile.am + create mode 100644 gnulib/dummy.c + create mode 100644 gnulib/getopt.c + create mode 100644 gnulib/getopt.in.h + create mode 100644 gnulib/getopt1.c + create mode 100644 gnulib/getopt_int.h + create mode 100644 gnulib/gettext.h + create mode 100644 gnulib/m4/00gnulib.m4 + create mode 100644 gnulib/m4/extensions.m4 + create mode 100644 gnulib/m4/getopt.m4 + create mode 100644 gnulib/m4/gnulib-cache.m4 + create mode 100644 gnulib/m4/gnulib-common.m4 + create mode 100644 gnulib/m4/gnulib-comp.m4 + create mode 100644 gnulib/m4/gnulib-tool.m4 + create mode 100644 gnulib/m4/include_next.m4 + create mode 100644 gnulib/m4/onceonly.m4 + create mode 100644 gnulib/m4/stddef_h.m4 + create mode 100644 gnulib/m4/unistd_h.m4 + create mode 100644 gnulib/m4/wchar_t.m4 + create mode 100644 gnulib/stddef.in.h + create mode 100644 gnulib/unistd.in.h + create mode 100644 link-warning.h + +diff --git a/gnulib/Makefile.am b/gnulib/Makefile.am +new file mode 100644 +index 0000000..ddcdb88 +--- /dev/null ++++ b/gnulib/Makefile.am +@@ -0,0 +1,207 @@ ++## 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=gnulib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=. --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 = ++EXTRA_DIST += m4/gnulib-cache.m4 ++ ++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 ++ ++## 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)/./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 ++ ++## 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_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_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_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ ++ -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \ ++ -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|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 ++ ++## 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/gnulib/dummy.c b/gnulib/dummy.c +new file mode 100644 +index 0000000..ccb5c26 +--- /dev/null ++++ b/gnulib/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/gnulib/getopt.c b/gnulib/getopt.c +new file mode 100644 +index 0000000..f1e6d1f +--- /dev/null ++++ b/gnulib/getopt.c +@@ -0,0 +1,1186 @@ ++/* 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 ++ 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, char **argv, 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/gnulib/getopt.in.h b/gnulib/getopt.in.h +new file mode 100644 +index 0000000..15c213f +--- /dev/null ++++ b/gnulib/getopt.in.h +@@ -0,0 +1,242 @@ ++/* 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. */ ++#if @HAVE_GETOPT_H@ ++# @INCLUDE_NEXT@ @NEXT_GETOPT_H@ ++#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) ++#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/gnulib/getopt1.c b/gnulib/getopt1.c +new file mode 100644 +index 0000000..ba115c4 +--- /dev/null ++++ b/gnulib/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/gnulib/getopt_int.h b/gnulib/getopt_int.h +new file mode 100644 +index 0000000..3c6628b +--- /dev/null ++++ b/gnulib/getopt_int.h +@@ -0,0 +1,130 @@ ++/* Internal declarations for getopt. ++ Copyright (C) 1989-1994,1996-1999,2001,2003,2004 ++ 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 ++ ++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/gnulib/gettext.h b/gnulib/gettext.h +new file mode 100644 +index 0000000..8cf2dca +--- /dev/null ++++ b/gnulib/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 3, 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/gnulib/m4/00gnulib.m4 b/gnulib/m4/00gnulib.m4 +new file mode 100644 +index 0000000..d4d04d1 +--- /dev/null ++++ b/gnulib/m4/00gnulib.m4 +@@ -0,0 +1,30 @@ ++# 00gnulib.m4 serial 2 ++dnl Copyright (C) 2009 Free Software Foundation, Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. ++ ++dnl This file must be named something that sorts before all other ++dnl gnulib-provided .m4 files. It is needed until such time as we can ++dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE semantics. ++ ++# AC_DEFUN_ONCE([NAME], VALUE) ++# ---------------------------- ++# Define NAME to expand to VALUE on the first use (whether by direct ++# expansion, or by AC_REQUIRE), and to nothing on all subsequent uses. ++# Avoid bugs in AC_REQUIRE in Autoconf 2.63 and earlier. This ++# definition is slower than the version in Autoconf 2.64, because it ++# can only use interfaces that existed since 2.59; but it achieves the ++# same effect. Quoting is necessary to avoid confusing Automake. ++m4_version_prereq([2.63.263], [], ++[m4_define([AC][_DEFUN_ONCE], ++ [AC][_DEFUN([$1], ++ [AC_REQUIRE([_gl_DEFUN_ONCE([$1])], ++ [m4_indir([_gl_DEFUN_ONCE([$1])])])])]dnl ++[AC][_DEFUN([_gl_DEFUN_ONCE([$1])], [$2])])]) ++ ++# gl_00GNULIB ++# ----------- ++# Witness macro that this file has been included. Needed to force ++# Automake to include this file prior to all other gnulib .m4 files. ++AC_DEFUN([gl_00GNULIB]) +diff --git a/gnulib/m4/extensions.m4 b/gnulib/m4/extensions.m4 +new file mode 100644 +index 0000000..ba6d5e1 +--- /dev/null ++++ b/gnulib/m4/extensions.m4 +@@ -0,0 +1,104 @@ ++# serial 8 -*- Autoconf -*- ++# Enable extensions on systems that normally disable them. ++ ++# Copyright (C) 2003, 2006-2009 Free Software Foundation, Inc. ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This definition of AC_USE_SYSTEM_EXTENSIONS is stolen from CVS ++# Autoconf. Perhaps we can remove this once we can assume Autoconf ++# 2.62 or later everywhere, but since CVS Autoconf mutates rapidly ++# enough in this area it's likely we'll need to redefine ++# AC_USE_SYSTEM_EXTENSIONS for quite some time. ++ ++# AC_USE_SYSTEM_EXTENSIONS ++# ------------------------ ++# Enable extensions on systems that normally disable them, ++# typically due to standards-conformance issues. ++# Remember that #undef in AH_VERBATIM gets replaced with #define by ++# AC_DEFINE. The goal here is to define all known feature-enabling ++# macros, then, if reports of conflicts are made, disable macros that ++# cause problems on some platforms (such as __EXTENSIONS__). ++AC_DEFUN_ONCE([AC_USE_SYSTEM_EXTENSIONS], ++[AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl ++AC_BEFORE([$0], [AC_RUN_IFELSE])dnl ++ ++ AC_REQUIRE([AC_CANONICAL_HOST]) ++ ++ AC_CHECK_HEADER([minix/config.h], [MINIX=yes], [MINIX=]) ++ if test "$MINIX" = yes; then ++ AC_DEFINE([_POSIX_SOURCE], [1], ++ [Define to 1 if you need to in order for `stat' and other ++ things to work.]) ++ AC_DEFINE([_POSIX_1_SOURCE], [2], ++ [Define to 2 if the system does not provide POSIX.1 features ++ except with this defined.]) ++ AC_DEFINE([_MINIX], [1], ++ [Define to 1 if on MINIX.]) ++ fi ++ ++ dnl HP-UX 11.11 defines mbstate_t only if _XOPEN_SOURCE is defined to 500, ++ dnl regardless of whether the flags -Ae or _D_HPUX_SOURCE=1 are already ++ dnl provided. ++ case "$host_os" in ++ hpux*) ++ AC_DEFINE([_XOPEN_SOURCE], [500], ++ [Define to 500 only on HP-UX.]) ++ ;; ++ esac ++ ++ AH_VERBATIM([__EXTENSIONS__], ++[/* Enable extensions on AIX 3, Interix. */ ++#ifndef _ALL_SOURCE ++# undef _ALL_SOURCE ++#endif ++/* Enable GNU extensions on systems that have them. */ ++#ifndef _GNU_SOURCE ++# undef _GNU_SOURCE ++#endif ++/* Enable threading extensions on Solaris. */ ++#ifndef _POSIX_PTHREAD_SEMANTICS ++# undef _POSIX_PTHREAD_SEMANTICS ++#endif ++/* Enable extensions on HP NonStop. */ ++#ifndef _TANDEM_SOURCE ++# undef _TANDEM_SOURCE ++#endif ++/* Enable general extensions on Solaris. */ ++#ifndef __EXTENSIONS__ ++# undef __EXTENSIONS__ ++#endif ++]) ++ AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__], ++ [ac_cv_safe_to_define___extensions__], ++ [AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM([[ ++# define __EXTENSIONS__ 1 ++ ]AC_INCLUDES_DEFAULT])], ++ [ac_cv_safe_to_define___extensions__=yes], ++ [ac_cv_safe_to_define___extensions__=no])]) ++ test $ac_cv_safe_to_define___extensions__ = yes && ++ AC_DEFINE([__EXTENSIONS__]) ++ AC_DEFINE([_ALL_SOURCE]) ++ AC_DEFINE([_GNU_SOURCE]) ++ AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) ++ AC_DEFINE([_TANDEM_SOURCE]) ++])# AC_USE_SYSTEM_EXTENSIONS ++ ++# gl_USE_SYSTEM_EXTENSIONS ++# ------------------------ ++# Enable extensions on systems that normally disable them, ++# typically due to standards-conformance issues. ++AC_DEFUN_ONCE([gl_USE_SYSTEM_EXTENSIONS], ++[ ++ dnl Require this macro before AC_USE_SYSTEM_EXTENSIONS. ++ dnl gnulib does not need it. But if it gets required by third-party macros ++ dnl after AC_USE_SYSTEM_EXTENSIONS is required, autoconf 2.62..2.63 emit a ++ dnl warning: "AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS". ++ dnl Note: We can do this only for one of the macros AC_AIX, AC_GNU_SOURCE, ++ dnl AC_MINIX. If people still use AC_AIX or AC_MINIX, they are out of luck. ++ AC_REQUIRE([AC_GNU_SOURCE]) ++ ++ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) ++]) +diff --git a/gnulib/m4/getopt.m4 b/gnulib/m4/getopt.m4 +new file mode 100644 +index 0000000..53a1a7e +--- /dev/null ++++ b/gnulib/m4/getopt.m4 +@@ -0,0 +1,250 @@ ++# getopt.m4 serial 22 ++dnl Copyright (C) 2002-2006, 2008-2009 Free Software Foundation, Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. ++ ++# Request a POSIX compliant getopt function. ++AC_DEFUN([gl_FUNC_GETOPT_POSIX], ++[ ++ m4_divert_text([DEFAULTS], [gl_getopt_required=POSIX]) ++ AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) ++ gl_GETOPT_IFELSE([ ++ gl_REPLACE_GETOPT ++ ], ++ []) ++]) ++ ++# Request a POSIX compliant getopt function with GNU extensions (such as ++# options with optional arguments) and the functions getopt_long, ++# getopt_long_only. ++AC_DEFUN([gl_FUNC_GETOPT_GNU], ++[ ++ m4_divert_text([INIT_PREPARE], [gl_getopt_required=GNU]) ++ ++ AC_REQUIRE([gl_FUNC_GETOPT_POSIX]) ++]) ++ ++# Request the gnulib implementation of the getopt functions unconditionally. ++# argp.m4 uses this. ++AC_DEFUN([gl_REPLACE_GETOPT], ++[ ++ dnl Arrange for getopt.h to be created. ++ gl_GETOPT_SUBSTITUTE_HEADER ++ dnl Arrange for unistd.h to include getopt.h. ++ GNULIB_UNISTD_H_GETOPT=1 ++ dnl Arrange to compile the getopt implementation. ++ AC_LIBOBJ([getopt]) ++ AC_LIBOBJ([getopt1]) ++ gl_PREREQ_GETOPT ++]) ++ ++# emacs' configure.in uses this. ++AC_DEFUN([gl_GETOPT_IFELSE], ++[ ++ AC_REQUIRE([gl_GETOPT_CHECK_HEADERS]) ++ AS_IF([test -n "$gl_replace_getopt"], [$1], [$2]) ++]) ++ ++# Determine whether to replace the entire getopt facility. ++AC_DEFUN([gl_GETOPT_CHECK_HEADERS], ++[ ++ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles ++ ++ dnl Persuade Solaris to declare optarg, optind, opterr, optopt. ++ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) ++ ++ gl_CHECK_NEXT_HEADERS([getopt.h]) ++ AC_CHECK_HEADERS_ONCE([getopt.h]) ++ if test $ac_cv_header_getopt_h = yes; then ++ HAVE_GETOPT_H=1 ++ else ++ HAVE_GETOPT_H=0 ++ fi ++ AC_SUBST([HAVE_GETOPT_H]) ++ ++ gl_replace_getopt= ++ ++ dnl Test whether is available. ++ if test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then ++ AC_CHECK_HEADERS([getopt.h], [], [gl_replace_getopt=yes]) ++ fi ++ ++ dnl Test whether the function getopt_long is available. ++ if test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then ++ AC_CHECK_FUNCS([getopt_long_only], [], [gl_replace_getopt=yes]) ++ fi ++ ++ dnl BSD getopt_long uses an incompatible method to reset option processing, ++ dnl but the testsuite does not show a need to use this 'optreset' variable. ++ if false && test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then ++ AC_CHECK_DECL([optreset], [gl_replace_getopt=yes], [], ++ [#include ]) ++ fi ++ ++ dnl mingw's getopt (in libmingwex.a) does weird things when the options ++ dnl strings starts with '+' and it's not the first call. Some internal state ++ dnl is left over from earlier calls, and neither setting optind = 0 nor ++ dnl setting optreset = 1 get rid of this internal state. ++ if test -z "$gl_replace_getopt"; then ++ AC_CACHE_CHECK([whether getopt is POSIX compatible], ++ [gl_cv_func_getopt_posix], ++ [ ++ dnl This test fails on mingw and succeeds on all other platforms. ++ AC_RUN_IFELSE([AC_LANG_SOURCE([[ ++#include ++#include ++#include ++ ++/* The glibc implementation of getopt supports setting optind = 0 as a means ++ of clearing the internal state, but other implementations don't. */ ++#if (__GLIBC__ >= 2) ++# define OPTIND_MIN 0 ++#else ++# define OPTIND_MIN 1 ++#endif ++ ++int ++main () ++{ ++ { ++ int argc = 0; ++ char *argv[10]; ++ int c; ++ ++ argv[argc++] = "program"; ++ argv[argc++] = "-a"; ++ argv[argc++] = "foo"; ++ argv[argc++] = "bar"; ++ optind = OPTIND_MIN; ++ opterr = 0; ++ ++ c = getopt (argc, argv, "ab"); ++ if (!(c == 'a')) ++ return 1; ++ c = getopt (argc, argv, "ab"); ++ if (!(c == -1)) ++ return 2; ++ if (!(optind == 2)) ++ return 3; ++ } ++ /* Some internal state exists at this point. */ ++ { ++ int argc = 0; ++ char *argv[10]; ++ int c; ++ ++ argv[argc++] = "program"; ++ argv[argc++] = "donald"; ++ argv[argc++] = "-p"; ++ argv[argc++] = "billy"; ++ argv[argc++] = "duck"; ++ argv[argc++] = "-a"; ++ argv[argc++] = "bar"; ++ optind = OPTIND_MIN; ++ opterr = 0; ++ ++ c = getopt (argc, argv, "+abp:q:"); ++ if (!(c == -1)) ++ return 4; ++ if (!(strcmp (argv[0], "program") == 0)) ++ return 5; ++ if (!(strcmp (argv[1], "donald") == 0)) ++ return 6; ++ if (!(strcmp (argv[2], "-p") == 0)) ++ return 7; ++ if (!(strcmp (argv[3], "billy") == 0)) ++ return 8; ++ if (!(strcmp (argv[4], "duck") == 0)) ++ return 9; ++ if (!(strcmp (argv[5], "-a") == 0)) ++ return 10; ++ if (!(strcmp (argv[6], "bar") == 0)) ++ return 11; ++ if (!(optind == 1)) ++ return 12; ++ } ++ ++ return 0; ++} ++]])], ++ [gl_cv_func_getopt_posix=yes], [gl_cv_func_getopt_posix=no], ++ [case "$host_os" in ++ mingw*) gl_cv_func_getopt_posix="guessing no";; ++ *) gl_cv_func_getopt_posix="guessing yes";; ++ esac ++ ]) ++ ]) ++ case "$gl_cv_func_getopt_posix" in ++ *no) gl_replace_getopt=yes ;; ++ esac ++ fi ++ ++ if test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then ++ AC_CACHE_CHECK([for working GNU getopt function], [gl_cv_func_getopt_gnu], ++ [AC_RUN_IFELSE( ++ [AC_LANG_PROGRAM([[#include ++ #include ++ #include ]], ++ [[ ++ /* This code succeeds on glibc 2.8, OpenBSD 4.0, Cygwin, mingw, ++ and fails on MacOS X 10.5, AIX 5.2, HP-UX 11, IRIX 6.5, ++ OSF/1 5.1, Solaris 10. */ ++ { ++ char *myargv[3]; ++ myargv[0] = "conftest"; ++ myargv[1] = "-+"; ++ myargv[2] = 0; ++ opterr = 0; ++ if (getopt (2, myargv, "+a") != '?') ++ return 1; ++ } ++ /* This code succeeds on glibc 2.8, mingw, ++ and fails on MacOS X 10.5, OpenBSD 4.0, AIX 5.2, HP-UX 11, ++ IRIX 6.5, OSF/1 5.1, Solaris 10, Cygwin. */ ++ { ++ char *argv[] = { "program", "-p", "foo", "bar" }; ++ ++ optind = 1; ++ if (getopt (4, argv, "p::") != 'p') ++ return 2; ++ if (optarg != NULL) ++ return 3; ++ if (getopt (4, argv, "p::") != -1) ++ return 4; ++ if (optind != 2) ++ return 5; ++ } ++ return 0; ++ ]])], ++ [gl_cv_func_getopt_gnu=yes], ++ [gl_cv_func_getopt_gnu=no], ++ [dnl Cross compiling. Guess based on host and declarations. ++ case "$host_os" in ++ *-gnu* | mingw*) gl_cv_func_getopt_gnu=no;; ++ *) gl_cv_func_getopt_gnu=yes;; ++ esac ++ ]) ++ ]) ++ if test "$gl_cv_func_getopt_gnu" = "no"; then ++ gl_replace_getopt=yes ++ fi ++ fi ++]) ++ ++# emacs' configure.in uses this. ++AC_DEFUN([gl_GETOPT_SUBSTITUTE_HEADER], ++[ ++ GETOPT_H=getopt.h ++ AC_DEFINE([__GETOPT_PREFIX], [[rpl_]], ++ [Define to rpl_ if the getopt replacement functions and variables ++ should be used.]) ++ AC_SUBST([GETOPT_H]) ++]) ++ ++# Prerequisites of lib/getopt*. ++# emacs' configure.in uses this. ++AC_DEFUN([gl_PREREQ_GETOPT], ++[ ++ AC_CHECK_DECLS_ONCE([getenv]) ++]) +diff --git a/gnulib/m4/gnulib-cache.m4 b/gnulib/m4/gnulib-cache.m4 +new file mode 100644 +index 0000000..56a554b +--- /dev/null ++++ b/gnulib/m4/gnulib-cache.m4 +@@ -0,0 +1,36 @@ ++# 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. ++# ++# This file represents the specification of how gnulib-tool is used. ++# It acts as a cache: It is written and read by gnulib-tool. ++# In projects using CVS, this file is meant to be stored in CVS, ++# like the configure.ac and various Makefile.am files. ++ ++ ++# Specification in the form of a command-line invocation: ++# gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=. --libtool --macro-prefix=gl --no-vc-files getopt-gnu ++ ++# Specification in the form of a few gnulib-tool.m4 macro invocations: ++gl_LOCAL_DIR([]) ++gl_MODULES([ ++ getopt-gnu ++]) ++gl_AVOID([]) ++gl_SOURCE_BASE([gnulib]) ++gl_M4_BASE([gnulib/m4]) ++gl_PO_BASE([]) ++gl_DOC_BASE([doc]) ++gl_TESTS_BASE([tests]) ++gl_LIB([libgnu]) ++gl_MAKEFILE_NAME([]) ++gl_LIBTOOL ++gl_MACRO_PREFIX([gl]) ++gl_PO_DOMAIN([]) ++gl_VC_FILES([false]) +diff --git a/gnulib/m4/gnulib-common.m4 b/gnulib/m4/gnulib-common.m4 +new file mode 100644 +index 0000000..c8fda20 +--- /dev/null ++++ b/gnulib/m4/gnulib-common.m4 +@@ -0,0 +1,124 @@ ++# gnulib-common.m4 serial 11 ++dnl Copyright (C) 2007-2009 Free Software Foundation, Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. ++ ++# gl_COMMON ++# is expanded unconditionally through gnulib-tool magic. ++AC_DEFUN([gl_COMMON], [ ++ dnl Use AC_REQUIRE here, so that the code is expanded once only. ++ AC_REQUIRE([gl_00GNULIB]) ++ AC_REQUIRE([gl_COMMON_BODY]) ++]) ++AC_DEFUN([gl_COMMON_BODY], [ ++ AH_VERBATIM([isoc99_inline], ++[/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports ++ the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of ++ earlier versions), but does not display it by setting __GNUC_STDC_INLINE__. ++ __APPLE__ && __MACH__ test for MacOS X. ++ __APPLE_CC__ tests for the Apple compiler and its version. ++ __STDC_VERSION__ tests for the C99 mode. */ ++#if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__ ++# define __GNUC_STDC_INLINE__ 1 ++#endif]) ++ AH_VERBATIM([unused_parameter], ++[/* Define as a marker that can be attached to function parameter declarations ++ for parameters that are not used. This helps to reduce warnings, such as ++ from GCC -Wunused-parameter. */ ++#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) ++# define _UNUSED_PARAMETER_ __attribute__ ((__unused__)) ++#else ++# define _UNUSED_PARAMETER_ ++#endif ++]) ++]) ++ ++# gl_MODULE_INDICATOR([modulename]) ++# defines a C macro indicating the presence of the given module. ++AC_DEFUN([gl_MODULE_INDICATOR], ++[ ++ AC_DEFINE([GNULIB_]translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___]), [1], ++ [Define to 1 when using the gnulib module ]$1[.]) ++]) ++ ++# m4_foreach_w ++# is a backport of autoconf-2.59c's m4_foreach_w. ++# Remove this macro when we can assume autoconf >= 2.60. ++m4_ifndef([m4_foreach_w], ++ [m4_define([m4_foreach_w], ++ [m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])]) ++ ++# AC_PROG_MKDIR_P ++# is a backport of autoconf-2.60's AC_PROG_MKDIR_P. ++# Remove this macro when we can assume autoconf >= 2.60. ++m4_ifdef([AC_PROG_MKDIR_P], [], [ ++ AC_DEFUN_ONCE([AC_PROG_MKDIR_P], ++ [AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake ++ MKDIR_P='$(mkdir_p)' ++ AC_SUBST([MKDIR_P])])]) ++ ++# AC_C_RESTRICT ++# This definition overrides the AC_C_RESTRICT macro from autoconf 2.60..2.61, ++# so that mixed use of GNU C and GNU C++ and mixed use of Sun C and Sun C++ ++# works. ++# This definition can be removed once autoconf >= 2.62 can be assumed. ++AC_DEFUN([AC_C_RESTRICT], ++[AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict], ++ [ac_cv_c_restrict=no ++ # The order here caters to the fact that C++ does not require restrict. ++ for ac_kw in __restrict __restrict__ _Restrict restrict; do ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM( ++ [[typedef int * int_ptr; ++ int foo (int_ptr $ac_kw ip) { ++ return ip[0]; ++ }]], ++ [[int s[1]; ++ int * $ac_kw t = s; ++ t[0] = 0; ++ return foo(t)]])], ++ [ac_cv_c_restrict=$ac_kw]) ++ test "$ac_cv_c_restrict" != no && break ++ done ++ ]) ++ AH_VERBATIM([restrict], ++[/* Define to the equivalent of the C99 'restrict' keyword, or to ++ nothing if this is not supported. Do not define if restrict is ++ supported directly. */ ++#undef restrict ++/* Work around a bug in Sun C++: it does not support _Restrict, even ++ though the corresponding Sun C compiler does, which causes ++ "#define restrict _Restrict" in the previous line. Perhaps some future ++ version of Sun C++ will work with _Restrict; if so, it'll probably ++ define __RESTRICT, just as Sun C does. */ ++#if defined __SUNPRO_CC && !defined __RESTRICT ++# define _Restrict ++#endif]) ++ case $ac_cv_c_restrict in ++ restrict) ;; ++ no) AC_DEFINE([restrict], []) ;; ++ *) AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;; ++ esac ++]) ++ ++# gl_BIGENDIAN ++# is like AC_C_BIGENDIAN, except that it can be AC_REQUIREd. ++# Note that AC_REQUIRE([AC_C_BIGENDIAN]) does not work reliably because some ++# macros invoke AC_C_BIGENDIAN with arguments. ++AC_DEFUN([gl_BIGENDIAN], ++[ ++ AC_C_BIGENDIAN ++]) ++ ++# gl_CACHE_VAL_SILENT(cache-id, command-to-set-it) ++# is like AC_CACHE_VAL(cache-id, command-to-set-it), except that it does not ++# output a spurious "(cached)" mark in the midst of other configure output. ++# This macro should be used instead of AC_CACHE_VAL when it is not surrounded ++# by an AC_MSG_CHECKING/AC_MSG_RESULT pair. ++AC_DEFUN([gl_CACHE_VAL_SILENT], ++[ ++ saved_as_echo_n="$as_echo_n" ++ as_echo_n=':' ++ AC_CACHE_VAL([$1], [$2]) ++ as_echo_n="$saved_as_echo_n" ++]) +diff --git a/gnulib/m4/gnulib-comp.m4 b/gnulib/m4/gnulib-comp.m4 +new file mode 100644 +index 0000000..6514552 +--- /dev/null ++++ b/gnulib/m4/gnulib-comp.m4 +@@ -0,0 +1,197 @@ ++# DO NOT EDIT! GENERATED AUTOMATICALLY! ++# 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. ++# ++# This file represents the compiled summary of the specification in ++# gnulib-cache.m4. It lists the computed macro invocations that need ++# to be invoked from configure.ac. ++# In projects using CVS, this file can be treated like other built files. ++ ++ ++# This macro should be invoked from ./configure.in, in the section ++# "Checks for programs", right after AC_PROG_CC, and certainly before ++# any checks for libraries, header files, types and library functions. ++AC_DEFUN([gl_EARLY], ++[ ++ m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace ++ m4_pattern_allow([^gl_ES$])dnl a valid locale name ++ m4_pattern_allow([^gl_LIBOBJS$])dnl a variable ++ m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable ++ AC_REQUIRE([AC_PROG_RANLIB]) ++ AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) ++]) ++ ++# This macro should be invoked from ./configure.in, in the section ++# "Check for header files, types and library functions". ++AC_DEFUN([gl_INIT], ++[ ++ AM_CONDITIONAL([GL_COND_LIBTOOL], [true]) ++ gl_cond_libtool=true ++ m4_pushdef([AC_LIBOBJ], m4_defn([gl_LIBOBJ])) ++ m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gl_REPLACE_FUNCS])) ++ m4_pushdef([AC_LIBSOURCES], m4_defn([gl_LIBSOURCES])) ++ m4_pushdef([gl_LIBSOURCES_LIST], []) ++ m4_pushdef([gl_LIBSOURCES_DIR], []) ++ gl_COMMON ++ gl_source_base='gnulib' ++ gl_FUNC_GETOPT_GNU ++ gl_MODULE_INDICATOR([getopt-gnu]) ++ gl_FUNC_GETOPT_POSIX ++ AC_SUBST([LIBINTL]) ++ AC_SUBST([LTLIBINTL]) ++ gl_STDDEF_H ++ gl_UNISTD_H ++ m4_ifval(gl_LIBSOURCES_LIST, [ ++ m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ || ++ for gl_file in ]gl_LIBSOURCES_LIST[ ; do ++ if test ! -r ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file ; then ++ echo "missing file ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file" >&2 ++ exit 1 ++ fi ++ done])dnl ++ m4_if(m4_sysval, [0], [], ++ [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])]) ++ ]) ++ m4_popdef([gl_LIBSOURCES_DIR]) ++ m4_popdef([gl_LIBSOURCES_LIST]) ++ m4_popdef([AC_LIBSOURCES]) ++ m4_popdef([AC_REPLACE_FUNCS]) ++ m4_popdef([AC_LIBOBJ]) ++ AC_CONFIG_COMMANDS_PRE([ ++ gl_libobjs= ++ gl_ltlibobjs= ++ if test -n "$gl_LIBOBJS"; then ++ # Remove the extension. ++ sed_drop_objext='s/\.o$//;s/\.obj$//' ++ for i in `for i in $gl_LIBOBJS; do echo "$i"; done | sed "$sed_drop_objext" | sort | uniq`; do ++ gl_libobjs="$gl_libobjs $i.$ac_objext" ++ gl_ltlibobjs="$gl_ltlibobjs $i.lo" ++ done ++ fi ++ AC_SUBST([gl_LIBOBJS], [$gl_libobjs]) ++ AC_SUBST([gl_LTLIBOBJS], [$gl_ltlibobjs]) ++ ]) ++ gltests_libdeps= ++ gltests_ltlibdeps= ++ m4_pushdef([AC_LIBOBJ], m4_defn([gltests_LIBOBJ])) ++ m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gltests_REPLACE_FUNCS])) ++ m4_pushdef([AC_LIBSOURCES], m4_defn([gltests_LIBSOURCES])) ++ m4_pushdef([gltests_LIBSOURCES_LIST], []) ++ m4_pushdef([gltests_LIBSOURCES_DIR], []) ++ gl_COMMON ++ gl_source_base='tests' ++ m4_ifval(gltests_LIBSOURCES_LIST, [ ++ m4_syscmd([test ! -d ]m4_defn([gltests_LIBSOURCES_DIR])[ || ++ for gl_file in ]gltests_LIBSOURCES_LIST[ ; do @@ 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 Nov 10 03:01:49 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 10 Nov 2009 02:01:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[7194] csw/mgar/pkg/template/trunk/Makefile Message-ID: Revision: 7194 http://gar.svn.sourceforge.net/gar/?rev=7194&view=rev Author: bdwalton Date: 2009-11-10 02:01:49 +0000 (Tue, 10 Nov 2009) Log Message: ----------- template: note availability of ETCSERVCIES and INETDCONF Modified Paths: -------------- csw/mgar/pkg/template/trunk/Makefile Modified: csw/mgar/pkg/template/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-11-10 01:54:17 UTC (rev 7193) +++ csw/mgar/pkg/template/trunk/Makefile 2009-11-10 02:01:49 UTC (rev 7194) @@ -111,6 +111,7 @@ ## ## 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 REQUIRED_PKGS. ## SPKG_CLASSES = none @@ -119,6 +120,8 @@ ## SAMPLECONF = ## INITSMF = ## USERGROUP = +## ETCSERVICES = +## INETDCONF = ## A list of runtime package dependencies in the form of CSWfoo. ## REQUIRED_PKGS = ## 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 Nov 10 03:22:01 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 10 Nov 2009 02:22:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[7195] csw/mgar/gar/v2/bin/checkpkg Message-ID: Revision: 7195 http://gar.svn.sourceforge.net/gar/?rev=7195&view=rev Author: bdwalton Date: 2009-11-10 02:22:01 +0000 (Tue, 10 Nov 2009) Log Message: ----------- gar: checkpkg should allow for packages with no deps Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2009-11-10 02:01:49 UTC (rev 7194) +++ csw/mgar/gar/v2/bin/checkpkg 2009-11-10 02:22:01 UTC (rev 7195) @@ -446,7 +446,7 @@ # Verify that there are no double depends repeated_depends="$(awk '{print $2}' $EXTRACTDIR/$pkgname/install/depend \ | sort | uniq -c | awk '{print $1}' | sort | uniq | wc -l)" -if [[ "$repeated_depends" -ne 1 ]]; then +if [[ "$repeated_depends" -gt 1 ]]; then cat $EXTRACTDIR/$pkgname/install/depend print ERROR: $pkgname has double depends exit 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 Nov 10 03:42:35 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 10 Nov 2009 02:42:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[7196] csw/mgar/gar/v2 Message-ID: Revision: 7196 http://gar.svn.sourceforge.net/gar/?rev=7196&view=rev Author: bdwalton Date: 2009-11-10 02:42:35 +0000 (Tue, 10 Nov 2009) Log Message: ----------- gar: change the way CSWcommon is handled, making it optional with a COMMON_PKG_DEPENDS Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk csw/mgar/gar/v2/gar.mk csw/mgar/gar/v2/pkglib/csw_dyngspec.gspec Removed Paths: ------------- csw/mgar/gar/v2/pkglib/csw/depend Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2009-11-10 02:22:01 UTC (rev 7195) +++ csw/mgar/gar/v2/gar.conf.mk 2009-11-10 02:42:35 UTC (rev 7196) @@ -164,6 +164,8 @@ DESTIMG ?= $(LOGNAME)-$(shell hostname) +# A default list of packages that everyone will depend on +COMMON_PKG_DEPENDS ?= CSWcommon # These are the core packages which must be installed for GAR to function correctly DEF_BASE_PKGS = CSWgmake CSWgtar CSWggrep CSWdiffutils CSWgfile CSWtextutils CSWwget CSWfindutils CSWgsed CSWgawk CSWbzip2 Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-11-10 02:22:01 UTC (rev 7195) +++ csw/mgar/gar/v2/gar.mk 2009-11-10 02:42:35 UTC (rev 7196) @@ -619,6 +619,10 @@ if test -f "$$F" -a \! -h "$$F"; then echo $$F; fi; \ done)),) +ifneq ($(COMMON_PKG_DEPENDS),) +_EXTRA_GAR_PKGS += $(COMMON_PKG_DEPENDS) +endif + ifneq ($(ISAEXEC_FILES),) _EXTRA_GAR_PKGS += CSWisaexec endif Deleted: csw/mgar/gar/v2/pkglib/csw/depend =================================================================== --- csw/mgar/gar/v2/pkglib/csw/depend 2009-11-10 02:22:01 UTC (rev 7195) +++ csw/mgar/gar/v2/pkglib/csw/depend 2009-11-10 02:42:35 UTC (rev 7196) @@ -1 +0,0 @@ -P CSWcommon common - common files and dirs for CSW packages Modified: csw/mgar/gar/v2/pkglib/csw_dyngspec.gspec =================================================================== --- csw/mgar/gar/v2/pkglib/csw_dyngspec.gspec 2009-11-10 02:22:01 UTC (rev 7195) +++ csw/mgar/gar/v2/pkglib/csw_dyngspec.gspec 2009-11-10 02:42:35 UTC (rev 7196) @@ -1,5 +1,4 @@ %include url file://%{PKGLIB}/csw_vars.gspec %include url file://%{PKGLIB}/csw_prototype.gspec %pkginfo url file://%{WORKSRC}/csw/pkginfo -%depend:merge url file://%{PKGLIB}/csw/depend %include url file://%{PKGLIB}/std_depend.gspec 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 Nov 10 03:49:30 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 10 Nov 2009 02:49:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[7197] csw/mgar/pkg/pkgutil/trunk/Makefile Message-ID: Revision: 7197 http://gar.svn.sourceforge.net/gar/?rev=7197&view=rev Author: bdwalton Date: 2009-11-10 02:49:30 +0000 (Tue, 10 Nov 2009) Log Message: ----------- pkgutil: use new CSWcommon disable feature Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2009-11-10 02:42:35 UTC (rev 7196) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-11-10 02:49:30 UTC (rev 7197) @@ -10,6 +10,9 @@ package automatically. endef +# Disable inclusion of CSWcommon by default. +COMMON_PKG_DEPENDS = + MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).zip DISTFILES += $(call admfiles,CSWpkgutil,prototype) @@ -21,7 +24,8 @@ SPKG_DESC_CSWpkgutil = $(DESCRIPTION) SPKG_DESC_CSWpkgutilplus = Extends pkgutil functionality -REQUIRED_PKGS_CSWpkgutilplus = CSWperl CSWgnupg CSWpkgutil +# Explicitly depend on CSWcommon here since it's not the default +REQUIRED_PKGS_CSWpkgutilplus = CSWcommon CSWperl CSWgnupg CSWpkgutil PKGFILES_CSWpkgutilplus = .*bldcat.* PKGFILES_CSWpkgutilplus += .*chkcat.* 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 Nov 10 09:29:20 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 10 Nov 2009 08:29:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[7198] csw/mgar/pkg/mysql5/branches/mysql-5.1.x/ Message-ID: Revision: 7198 http://gar.svn.sourceforge.net/gar/?rev=7198&view=rev Author: wahwah Date: 2009-11-10 08:29:19 +0000 (Tue, 10 Nov 2009) Log Message: ----------- mysql-5.1.x: Branching out to package mysql-5.1.x (among other things, fix the tests) Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/ 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 Nov 10 09:46:18 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 10 Nov 2009 08:46:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7199] csw/mgar/pkg/cups/trunk/Makefile Message-ID: Revision: 7199 http://gar.svn.sourceforge.net/gar/?rev=7199&view=rev Author: wahwah Date: 2009-11-10 08:46:18 +0000 (Tue, 10 Nov 2009) Log Message: ----------- cups: Removing explicit dependencies on CSWcswclassutils to avoid double depends Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2009-11-10 08:29:19 UTC (rev 7198) +++ csw/mgar/pkg/cups/trunk/Makefile 2009-11-10 08:46:18 UTC (rev 7199) @@ -76,17 +76,17 @@ ARCHALL_CSWcupsdoc = 1 ARCHALL_CSWcupsdev = 1 -REQUIRED_PKGS_CSWcups = CSWcswclassutils CSWcupsd CSWcupsclient -REQUIRED_PKGS_CSWcupsd = CSWcswclassutils CSWlibcups CSWoldaprt CSWzlib +REQUIRED_PKGS_CSWcups = CSWcupsd CSWcupsclient +REQUIRED_PKGS_CSWcupsd = CSWlibcups CSWoldaprt CSWzlib REQUIRED_PKGS_CSWcupsd += CSWjpeg CSWpng CSWtiff CSWlibtasn1 REQUIRED_PKGS_CSWcupsd += CSWgcrypt CSWgnutls CSWgpgerr CSWlibdbus REQUIRED_PKGS_CSWcupsd += CSWkrb5lib CSWosslrt CSWcupsdoc REQUIRED_PKGS_CSWcupsd += CSWdbusglib CSWggettextrt CSWglib2 -REQUIRED_PKGS_CSWcupsclient = CSWcswclassutils CSWlibcups CSWoldaprt CSWzlib +REQUIRED_PKGS_CSWcupsclient = CSWlibcups CSWoldaprt CSWzlib REQUIRED_PKGS_CSWcupsclient += CSWgcrypt CSWgnutls CSWgpgerr CSWlibtasn1 CSWosslrt -REQUIRED_PKGS_CSWcupsdoc = CSWcswclassutils -REQUIRED_PKGS_CSWcupsdev = CSWcswclassutils -REQUIRED_PKGS_CSWlibcups = CSWcswclassutils CSWjpeg CSWpng CSWtiff CSWzlib +REQUIRED_PKGS_CSWcupsdoc = +REQUIRED_PKGS_CSWcupsdev = +REQUIRED_PKGS_CSWlibcups = CSWjpeg CSWpng CSWtiff CSWzlib REQUIRED_PKGS_CSWlibcups += CSWgcrypt CSWgnutls CSWgpgerr CSWlibtasn1 CSWosslrt PKGFILES_CSWlibcups = $(libdir)/libcups.* 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 Nov 10 11:21:09 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 10 Nov 2009 10:21:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[7200] csw/mgar/gar/v2/pkglib/csw/depend Message-ID: Revision: 7200 http://gar.svn.sourceforge.net/gar/?rev=7200&view=rev Author: dmichelsen Date: 2009-11-10 10:21:09 +0000 (Tue, 10 Nov 2009) Log Message: ----------- mGAR v2: Re-add csw/depend after mistakenly delete from r7196 Added Paths: ----------- csw/mgar/gar/v2/pkglib/csw/depend Copied: csw/mgar/gar/v2/pkglib/csw/depend (from rev 7195, csw/mgar/gar/v2/pkglib/csw/depend) =================================================================== --- csw/mgar/gar/v2/pkglib/csw/depend (rev 0) +++ csw/mgar/gar/v2/pkglib/csw/depend 2009-11-10 10:21:09 UTC (rev 7200) @@ -0,0 +1 @@ +P CSWcommon common - common files and dirs for CSW packages Property changes on: csw/mgar/gar/v2/pkglib/csw/depend ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/gar/v2/pkglib/csw/depend:4936-6678 /csw/mgar/gar/v2-collapsed-modulations/pkglib/csw/depend:6895 /csw/mgar/gar/v2-skayser/pkglib/csw/depend:6087-6132 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Nov 10 12:31:56 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 10 Nov 2009 11:31:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[7202] csw/mgar/pkg/chmlib/trunk/Makefile Message-ID: Revision: 7202 http://gar.svn.sourceforge.net/gar/?rev=7202&view=rev Author: dmichelsen Date: 2009-11-10 11:31:56 +0000 (Tue, 10 Nov 2009) Log Message: ----------- chmlib: Add 64 bit Modified Paths: -------------- csw/mgar/pkg/chmlib/trunk/Makefile Modified: csw/mgar/pkg/chmlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/chmlib/trunk/Makefile 2009-11-10 11:31:47 UTC (rev 7201) +++ csw/mgar/pkg/chmlib/trunk/Makefile 2009-11-10 11:31:56 UTC (rev 7202) @@ -22,11 +22,15 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +BUILD64 = 1 +NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-examples TEST_TARGET = check +MERGE_DIRS_isa-extra = $(libdir) + DOCS = NEWS README DOCS += ChmLib-ds6.zip ChmLib-ce.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 Tue Nov 10 12:31:47 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 10 Nov 2009 11:31:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[7201] csw/mgar/pkg/chmlib/trunk/files/ 0001-Add-autoconf-support-from-gnulib-for-getopt.h.patch Message-ID: Revision: 7201 http://gar.svn.sourceforge.net/gar/?rev=7201&view=rev Author: dmichelsen Date: 2009-11-10 11:31:47 +0000 (Tue, 10 Nov 2009) Log Message: ----------- chmlib: Remove old patch Removed Paths: ------------- csw/mgar/pkg/chmlib/trunk/files/0001-Add-autoconf-support-from-gnulib-for-getopt.h.patch Deleted: csw/mgar/pkg/chmlib/trunk/files/0001-Add-autoconf-support-from-gnulib-for-getopt.h.patch =================================================================== --- csw/mgar/pkg/chmlib/trunk/files/0001-Add-autoconf-support-from-gnulib-for-getopt.h.patch 2009-11-10 10:21:09 UTC (rev 7200) +++ csw/mgar/pkg/chmlib/trunk/files/0001-Add-autoconf-support-from-gnulib-for-getopt.h.patch 2009-11-10 11:31:47 UTC (rev 7201) @@ -1,3298 +0,0 @@ -From a1225b04a6c45c2d3b923b54708ede187e760c0d Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Wed, 30 Sep 2009 15:46:12 +0200 -Subject: [PATCH] Add autoconf support from gnulib for getopt.h - ---- - Makefile.am | 5 +- - autoinit.sh | 6 + - configure.in | 3 + - lib/Makefile.am | 206 +++++++++ - lib/dummy.c | 42 ++ - lib/getopt.c | 1186 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - lib/getopt.in.h | 242 +++++++++++ - lib/getopt1.c | 170 ++++++++ - lib/getopt_int.h | 130 ++++++ - lib/gettext.h | 279 ++++++++++++ - lib/stddef.in.h | 86 ++++ - lib/unistd.in.h | 784 ++++++++++++++++++++++++++++++++++ - m4/gnulib-cache.m4 | 35 ++ - 13 files changed, 3172 insertions(+), 2 deletions(-) - create mode 100755 autoinit.sh - 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/gnulib-cache.m4 - -diff --git a/Makefile.am b/Makefile.am -index 3150987..dcaa91c 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,3 +1,4 @@ - AUTOMAKE_OPTIONS=1.6 dist-bzip2 dist-zip --SUBDIRS=src --EXTRA_DIST=ChmLib-ce.zip ChmLib-ds6.zip contrib -+SUBDIRS=lib src -+EXTRA_DIST=m4_gnulib-cache.m4 ChmLib-ce.zip ChmLib-ds6.zip contrib -+ACLOCAL_AMFLAGS=-I m4 -diff --git a/autoinit.sh b/autoinit.sh -new file mode 100755 -index 0000000..d5d5881 ---- /dev/null -+++ b/autoinit.sh -@@ -0,0 +1,6 @@ -+#!/bin/sh -+ -+aclocal -+autoconf -+autoheader -+automake --add-missing --foreign -diff --git a/configure.in b/configure.in -index b39413a..885e4a8 100644 ---- a/configure.in -+++ b/configure.in -@@ -2,12 +2,15 @@ dnl Process this file with autoconf to produce a configure script. - AC_INIT([chmlib],[0.40]) - dnl,[Jed Wing ]) - AC_CONFIG_SRCDIR(src/chm_lib.c) -+AC_CONFIG_FILES(lib/Makefile) - AM_INIT_AUTOMAKE - AM_MAINTAINER_MODE - - - dnl Checks for programs. - AC_PROG_CC -+gl_EARLY -+gl_INIT - AC_PROG_LD - AM_PROG_LIBTOOL - AC_PROG_INSTALL -diff --git a/lib/Makefile.am b/lib/Makefile.am -new file mode 100644 -index 0000000..fb6ec4e ---- /dev/null -+++ b/lib/Makefile.am -@@ -0,0 +1,206 @@ -+## 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=. --libtool --macro-prefix=gl getopt -+ -+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 -+ -+## 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)/./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 -+ -+## 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_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_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_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ -+ -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \ -+ -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|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 -+ -+## 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/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..f1e6d1f ---- /dev/null -+++ b/lib/getopt.c -@@ -0,0 +1,1186 @@ -+/* 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 -+ 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, char **argv, 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..15c213f ---- /dev/null -+++ b/lib/getopt.in.h -@@ -0,0 +1,242 @@ -+/* 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. */ -+#if @HAVE_GETOPT_H@ -+# @INCLUDE_NEXT@ @NEXT_GETOPT_H@ -+#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) -+#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..3c6628b ---- /dev/null -+++ b/lib/getopt_int.h -@@ -0,0 +1,130 @@ -+/* Internal declarations for getopt. -+ Copyright (C) 1989-1994,1996-1999,2001,2003,2004 -+ 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 -+ -+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..8a96e79 ---- /dev/null -+++ b/lib/unistd.in.h -@@ -0,0 +1,784 @@ -+/* 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@ -+# 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 is 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_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@ -+/* 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@ -+extern int linkat (int fd1, const char *path1, int fd2, const char *path2, -+ int flag); -+# endif -+#elif defined GNULIB_POSIXCHECK -+# undef linkat -+# define link(f1,path1,f2,path2,f) \ -+ (GL_LINK_WARNING ("linkat is unportable - " \ -+ "use gnulib module linkat for portability"), \ -+ linkat (f1, path1, f2, path2,f)) -+#endif -+ -+#if @GNULIB_LSEEK@ -+# if @REPLACE_LSEEK@ -+/* Set the offset of FD relative to SEEK_SET, SEEK_CUR, or SEEK_END. -+ Return the new offset if successful, otherwise -1 and errno set. -+ See the POSIX:2001 specification -+ . */ -+# define lseek rpl_lseek -+ extern off_t lseek (int fd, off_t offset, int whence); -+# endif -+#elif defined GNULIB_POSIXCHECK -+# undef lseek -+# define lseek(f,o,w) \ -+ (GL_LINK_WARNING ("lseek does not fail with ESPIPE on pipes on some " \ -+ "systems - use gnulib module lseek for portability"), \ -+ lseek (f, o, w)) -+#endif -+ -+ -+#if @GNULIB_PIPE2@ -+/* Create a pipe, applying the given flags when opening the read-end of the -+ pipe and the write-end of the pipe. -+ The flags are a bitmask, possibly including O_CLOEXEC (defined in ) -+ and O_TEXT, O_BINARY (defined in "binary-io.h"). -+ Store the read-end as fd[0] and the write-end as fd[1]. -+ Return 0 upon success, or -1 with errno set upon failure. -+ See also the Linux man page at -+ . */ -+# if @HAVE_PIPE2@ -+# define pipe2 rpl_pipe2 -+# endif -+extern int pipe2 (int fd[2], int flags); -+#elif defined GNULIB_POSIXCHECK -+# undef pipe2 -+# define pipe2(f,o) \ -+ (GL_LINK_WARNING ("pipe2 is unportable - " \ -+ "use gnulib module pipe2 for portability"), \ -+ pipe2 (f, o)) -+#endif -+ -+ -+#if @GNULIB_READLINK@ -+# if @REPLACE_READLINK@ -+# define readlink rpl_readlink -+# endif -+/* Read the contents of the symbolic link FILE and place the first BUFSIZE -+ bytes of it into BUF. Return the number of bytes placed into BUF if -+ successful, otherwise -1 and errno set. -+ See the POSIX:2001 specification -+ . */ -+# if !@HAVE_READLINK@ || @REPLACE_READLINK@ -+extern ssize_t readlink (const char *file, char *buf, size_t bufsize); -+# endif -+#elif defined GNULIB_POSIXCHECK -+# undef readlink -+# define readlink(f,b,s) \ -+ (GL_LINK_WARNING ("readlink is unportable - " \ -+ "use gnulib module readlink for portability"), \ -+ readlink (f, b, s)) -+#endif -+ -+ -+#if @GNULIB_READLINKAT@ -+# if !@HAVE_READLINKAT@ -+ssize_t readlinkat (int fd, char const *file, char *buf, size_t len); -+# endif -+#elif defined GNULIB_POSIXCHECK -+# undef readlinkat -+# define readlinkat(d,n,b,l) \ -+ (GL_LINK_WARNING ("readlinkat is not portable - " \ -+ "use gnulib module symlinkat for portability"), \ -+ readlinkat (d, n, b, l)) -+#endif -+ -+ -+#if @GNULIB_RMDIR@ -+# if @REPLACE_RMDIR@ -+# define rmdir rpl_rmdir -+/* Remove the directory DIR. */ -+extern int rmdir (char const *name); -+# endif -+#elif defined GNULIB_POSIXCHECK -+# undef rmdir -+# define rmdir(n) \ -+ (GL_LINK_WARNING ("rmdir is unportable - " \ @@ 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 dmichelsen at users.sourceforge.net Tue Nov 10 13:38:29 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 10 Nov 2009 12:38:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[7203] csw/mgar/pkg/gnutls/trunk Message-ID: Revision: 7203 http://gar.svn.sourceforge.net/gar/?rev=7203&view=rev Author: dmichelsen Date: 2009-11-10 12:38:28 +0000 (Tue, 10 Nov 2009) Log Message: ----------- gnutls: Test 2.9.9, revert back later to 2.8.x as 2.9 is experimental. Reported bugs are fixed upstream Modified Paths: -------------- csw/mgar/pkg/gnutls/trunk/Makefile csw/mgar/pkg/gnutls/trunk/checksums Modified: csw/mgar/pkg/gnutls/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnutls/trunk/Makefile 2009-11-10 11:31:56 UTC (rev 7202) +++ csw/mgar/pkg/gnutls/trunk/Makefile 2009-11-10 12:38:28 UTC (rev 7203) @@ -1,5 +1,5 @@ GARNAME = gnutls -GARVERSION = 2.8.5 +GARVERSION = 2.9.9 CATEGORIES = lib DESCRIPTION = GNU Transport Layer Security libraries and tools @@ -16,6 +16,7 @@ SPKG_DESC_CSWgnutlsdevel = GNU Transport Layer Security development headers and tools MASTER_SITES = $(GNU_MIRROR) +MASTER_SITES += http://alpha.gnu.org/gnu/gnutls/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += libgnutls-openssl.so.13.i DISTFILES += libgnutls-openssl.so.13.s @@ -27,11 +28,11 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +# We don't need it and if defined the test breaks +LD_OPTIONS = + BUILD64 = 1 NO_ISAEXEC = 1 - -EXTRA_LDFLAGS = -L$(libdir) -lgpg-error -lsocket -lnsl - CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check @@ -44,6 +45,10 @@ include gar/category.mk +# This is needed as tests/rfc2253-escape-test calls 'grep' instead of $GREP +# and uses option '-q' +PATH := /opt/csw/gnu:$(PATH) + post-install-isa-sparcv8: @cp $(FILEDIR)/libgnutls.so.13.s $(INSTALLISADIR)/opt/csw/lib/libgnutls.so.13 @cp $(FILEDIR)/libgnutls-openssl.so.13.s $(INSTALLISADIR)/opt/csw/lib/libgnutls-openssl.so.13 Modified: csw/mgar/pkg/gnutls/trunk/checksums =================================================================== --- csw/mgar/pkg/gnutls/trunk/checksums 2009-11-10 11:31:56 UTC (rev 7202) +++ csw/mgar/pkg/gnutls/trunk/checksums 2009-11-10 12:38:28 UTC (rev 7203) @@ -1,4 +1,4 @@ -e3b2788b79bfc82acbe717e3c54d4e92 gnutls-2.8.5.tar.bz2 +0d144230c388b74ba2339ac096e21823 gnutls-2.9.9.tar.bz2 073c509902375c40b885f5adc9f7dba9 libgnutls-openssl.so.13.i 02e4011d400d262b8d4b5c7311d8a5b0 libgnutls-openssl.so.13.s b0eee0d29e3d260a146e626c6ca75b16 libgnutls.so.13.i 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 Nov 10 13:53:31 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 10 Nov 2009 12:53:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7204] csw/mgar/pkg/mysql5/branches/mysql-5.1.x Message-ID: Revision: 7204 http://gar.svn.sourceforge.net/gar/?rev=7204&view=rev Author: wahwah Date: 2009-11-10 12:53:31 +0000 (Tue, 10 Nov 2009) Log Message: ----------- mysql-5.1.x: It builds, but the tests are failing Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums Property Changed: ---------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/ Property changes on: csw/mgar/pkg/mysql5/branches/mysql-5.1.x ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-git Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile 2009-11-10 12:38:28 UTC (rev 7203) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile 2009-11-10 12:53:31 UTC (rev 7204) @@ -3,7 +3,7 @@ # $Id$ GARNAME = mysql5 -GARVERSION = 5.0.84 +GARVERSION = 5.1.40 CATEGORIES = server DISTNAME = mysql-$(GARVERSION) @@ -95,7 +95,7 @@ REQUIRED_PKGS_CSWmysql5devel = CSWmysql5 REQUIRED_PKGS_CSWmysql5test = CSWmysql5 CSWperl -MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.0/ +MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.1/ DISTFILES = mysql-$(GARVERSION).tar.gz DISTFILES += cswmysql5 quick_start-csw README.CSW ChangeLog DISTFILES += CSWmysql5.preinstall @@ -107,6 +107,9 @@ REQUIRED_PKGS = CSWncurses CSWzlib PREREQUISITE_PKGS = $(REQUIRED_PKGS) +# MySQL-5.1.40 doesn't compile without setting EXTRA_INC. +EXTRA_INC = /opt/csw/include +EXTRA_LIB = /opt/csw/lib EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ @@ -134,7 +137,8 @@ CONFIGURE_ARGS += --with-plugins=max-no-ndb # TODO: Make the tests pass. They don't at the moment. -TEST_SCRIPTS = +# TEST_SCRIPTS = +TEST_TARGETS = check # Enable 64 bits build BUILD64 = 1 Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums 2009-11-10 12:38:28 UTC (rev 7203) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums 2009-11-10 12:53:31 UTC (rev 7204) @@ -8,5 +8,5 @@ e42afb5ec1b1ab02d2ec3b46d0922636 README.CSW aaca748fc044834e71ad544ab293c494 cswmysql5 67228e1f096fe08a94f4267439a4ec36 cswusergroup -671348f1a5b078da9ca76f97e1fda325 mysql-5.0.84.tar.gz +32e7373c16271606007374396e6742ad mysql-5.1.40.tar.gz 90b7cfcd11ab56e021a195a6a085fa21 quick_start-csw 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 Nov 10 14:56:39 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 10 Nov 2009 13:56:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[7205] csw/mgar/pkg/libthai/trunk Message-ID: Revision: 7205 http://gar.svn.sourceforge.net/gar/?rev=7205&view=rev Author: dmichelsen Date: 2009-11-10 13:56:39 +0000 (Tue, 10 Nov 2009) Log Message: ----------- libthai: Fixup Makefile Modified Paths: -------------- csw/mgar/pkg/libthai/trunk/Makefile csw/mgar/pkg/libthai/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libthai/trunk/files/0001-Remove-unknown-compiler-macro.patch Modified: csw/mgar/pkg/libthai/trunk/Makefile =================================================================== --- csw/mgar/pkg/libthai/trunk/Makefile 2009-11-10 12:53:31 UTC (rev 7204) +++ csw/mgar/pkg/libthai/trunk/Makefile 2009-11-10 13:56:39 UTC (rev 7205) @@ -1,5 +1,5 @@ GARNAME = libthai -GARVERSION = 0.1.4 +GARVERSION = 0.1.12 CATEGORIES = lib DESCRIPTION = Thai language support routines @@ -12,8 +12,9 @@ Thai Linux Working Group and opened for all contributors. endef -MASTER_SITES = $(SF_MIRRORS) +MASTER_SITES = http://linux.thai.net/pub/thailinux/software/libthai/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Remove-unknown-compiler-macro.patch UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=34448 UPSTREAM_USE_SF = 1 @@ -21,8 +22,10 @@ SPKG_SOURCEURL = http://linux.thai.net/projects/libthai/ +REQUIRED_PKGS = CSWlibdatrie +PREREQUISUITE_PKGS = $(REQUIRED_PKGS) + BUILD64 = 1 -NORUNPATH = 1 CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/libthai/trunk/checksums =================================================================== --- csw/mgar/pkg/libthai/trunk/checksums 2009-11-10 12:53:31 UTC (rev 7204) +++ csw/mgar/pkg/libthai/trunk/checksums 2009-11-10 13:56:39 UTC (rev 7205) @@ -1 +1,2 @@ -844dad9f8e7b915b4791409611fe816b download/libthai-0.1.4.tar.gz +11c46f4c6a8a3525861b750f890fee5e 0001-Remove-unknown-compiler-macro.patch +e206313d5a60ce98bc3be83d60373554 libthai-0.1.12.tar.gz Added: csw/mgar/pkg/libthai/trunk/files/0001-Remove-unknown-compiler-macro.patch =================================================================== --- csw/mgar/pkg/libthai/trunk/files/0001-Remove-unknown-compiler-macro.patch (rev 0) +++ csw/mgar/pkg/libthai/trunk/files/0001-Remove-unknown-compiler-macro.patch 2009-11-10 13:56:39 UTC (rev 7205) @@ -0,0 +1,25 @@ +From 89c9fcf2d67a3be06fb2f687fb8c7a231529bd24 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 10 Nov 2009 14:04:11 +0100 +Subject: [PATCH] Remove unknown compiler macro + +--- + src/libthai.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/libthai.c b/src/libthai.c +index bb7e8e0..91ae32a 100644 +--- a/src/libthai.c ++++ b/src/libthai.c +@@ -7,7 +7,7 @@ + + #include "thbrk/thbrk-private.h" + +-__attribute__ ((destructor)) void ++/* __attribute__ ((destructor)) */ void + _libthai_on_unload () + { + thbrk_on_unload (); +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Nov 10 15:06:31 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 10 Nov 2009 14:06:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7206] csw/mgar/pkg/libthai/trunk/Makefile Message-ID: Revision: 7206 http://gar.svn.sourceforge.net/gar/?rev=7206&view=rev Author: dmichelsen Date: 2009-11-10 14:06:31 +0000 (Tue, 10 Nov 2009) Log Message: ----------- libthai: Split off devel package Modified Paths: -------------- csw/mgar/pkg/libthai/trunk/Makefile Modified: csw/mgar/pkg/libthai/trunk/Makefile =================================================================== --- csw/mgar/pkg/libthai/trunk/Makefile 2009-11-10 13:56:39 UTC (rev 7205) +++ csw/mgar/pkg/libthai/trunk/Makefile 2009-11-10 14:06:31 UTC (rev 7206) @@ -20,14 +20,26 @@ UPSTREAM_USE_SF = 1 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWlibthai CSWlibthaidevel + +CATALOGNAME_CSWlibthai = libthai +CATALOGNAME_CSWlibthaidevel = libthai_devel + +SPKG_DESC_CSWlibthai = Thai language support routines +SPKG_DESC_CSWlibthaidevel = Thai language support routines development files + SPKG_SOURCEURL = http://linux.thai.net/projects/libthai/ -REQUIRED_PKGS = CSWlibdatrie -PREREQUISUITE_PKGS = $(REQUIRED_PKGS) +REQUIRED_PKGS_CSWlibthai = CSWlibdatrie +REQUIRED_PKGS_CSWlibthaidevel = CSWlibthai +PREREQUISUITE_PKGS = $(REQUIRED_PKGS_CSWlibthai) BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check +PKGFILES_CSWlibthaidevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibthaidevel += $(docdir)/.* + 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 Tue Nov 10 16:11:30 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 10 Nov 2009 15:11:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[7207] csw/mgar/pkg Message-ID: Revision: 7207 http://gar.svn.sourceforge.net/gar/?rev=7207&view=rev Author: dmichelsen Date: 2009-11-10 15:11:27 +0000 (Tue, 10 Nov 2009) Log Message: ----------- nfswatch: Initial commit Added Paths: ----------- csw/mgar/pkg/nfswatch/ csw/mgar/pkg/nfswatch/branches/ csw/mgar/pkg/nfswatch/tags/ csw/mgar/pkg/nfswatch/trunk/ csw/mgar/pkg/nfswatch/trunk/Makefile csw/mgar/pkg/nfswatch/trunk/checksums csw/mgar/pkg/nfswatch/trunk/files/ csw/mgar/pkg/nfswatch/trunk/files/0001-Add-missing-ifdefs-to-shield-Linux.patch Property changes on: csw/mgar/pkg/nfswatch/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/nfswatch/trunk/Makefile =================================================================== --- csw/mgar/pkg/nfswatch/trunk/Makefile (rev 0) +++ csw/mgar/pkg/nfswatch/trunk/Makefile 2009-11-10 15:11:27 UTC (rev 7207) @@ -0,0 +1,37 @@ +GARNAME = nfswatch +GARVERSION = 4.99.10 +CATEGORIES = utils + +DESCRIPTION = Monitors NFS client traffic and response time +define BLURB + NFSwatch lets you monitor NFS requests to any givenmachine, or the entire + local network. It mostly monitors NFS client traffic (NFS requests); it also + monitors the NFS reply traffic from a server inorder to measure the response + time for each RPC. +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Add-missing-ifdefs-to-shield-Linux.patch + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://nfswatch.sourceforge.net/ + +LICENSE = LICENSE + +CONFIGURE_SCRIPTS = + +BUILD_ARGS = CFLAGS="-DSUNOS58 -DSUNOS5 $(CFLAGS)" +BUILD_ARGS += LIBS="-lcurses -lnsl -lsocket -lm" +BUILD_ARGS += nfswatch nfslogsum + +TEST_SCRIPTS = + +INSTALL_OVERRIDE_VARS = INSTALL BINDIR MANDIR +INSTALL_OVERRIDE_VAR_INSTALL = /usr/ucb/install +INSTALL_OVERRIDE_VAR_BINDIR = $(bindir) +INSTALL_OVERRIDE_VAR_MANDIR = $(mandir)/man8 + +include gar/category.mk Added: csw/mgar/pkg/nfswatch/trunk/checksums =================================================================== --- csw/mgar/pkg/nfswatch/trunk/checksums (rev 0) +++ csw/mgar/pkg/nfswatch/trunk/checksums 2009-11-10 15:11:27 UTC (rev 7207) @@ -0,0 +1,2 @@ +645f230be6f77138c97fac9a1afa6ccf 0001-Add-missing-ifdefs-to-shield-Linux.patch +c20e510464f12384fdac330d8c84d127 nfswatch-4.99.10.tar.gz Added: csw/mgar/pkg/nfswatch/trunk/files/0001-Add-missing-ifdefs-to-shield-Linux.patch =================================================================== --- csw/mgar/pkg/nfswatch/trunk/files/0001-Add-missing-ifdefs-to-shield-Linux.patch (rev 0) +++ csw/mgar/pkg/nfswatch/trunk/files/0001-Add-missing-ifdefs-to-shield-Linux.patch 2009-11-10 15:11:27 UTC (rev 7207) @@ -0,0 +1,51 @@ +From 500575a6535481ebb2b5067c7e47ada6d7338152 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 10 Nov 2009 16:02:20 +0100 +Subject: [PATCH] Add missing ifdefs to shield Linux + +--- + nfswatch.c | 2 +- + pktfilter.c | 2 ++ + 2 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/nfswatch.c b/nfswatch.c +index abb595e..0607b4e 100644 +--- a/nfswatch.c ++++ b/nfswatch.c +@@ -637,12 +637,12 @@ main(int argc, char **argv) + finish(-1); + } + } +-#endif /* USE_LINUX */ + + if (ls.pcap == NULL) { + fprintf(stderr, "%s: no valid interfaces.\n", pname); + finish(-1); + } ++#endif /* USE_LINUX */ + + /* + * Now lose super-user permission, since we +diff --git a/pktfilter.c b/pktfilter.c +index 2005012..eafcc63 100644 +--- a/pktfilter.c ++++ b/pktfilter.c +@@ -196,6 +196,7 @@ pkt_filter_fddi(char *cp, u_int length, struct timeval *tstamp) + pkt_dispatch(packet, bdcst, etype, tstamp); + } + ++#ifdef LINUX + /* + * A DLT_LINUX_SLL fake link-layer header. + */ +@@ -244,6 +245,7 @@ pkt_filter_sll(char *cp, u_int length, struct timeval *tstamp) + */ + pkt_dispatch(packet, bdcst, sheader.sll_protocol, tstamp); + } ++#endif + + /* + * pkt_dispatch - count a packet, and pass it off to the appropriate filter. +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Nov 10 16:18:58 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 10 Nov 2009 15:18:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7208] csw/mgar/pkg/nfswatch/trunk/Makefile Message-ID: Revision: 7208 http://gar.svn.sourceforge.net/gar/?rev=7208&view=rev Author: dmichelsen Date: 2009-11-10 15:18:57 +0000 (Tue, 10 Nov 2009) Log Message: ----------- nfswatch: Fix install locations Modified Paths: -------------- csw/mgar/pkg/nfswatch/trunk/Makefile Modified: csw/mgar/pkg/nfswatch/trunk/Makefile =================================================================== --- csw/mgar/pkg/nfswatch/trunk/Makefile 2009-11-10 15:11:27 UTC (rev 7207) +++ csw/mgar/pkg/nfswatch/trunk/Makefile 2009-11-10 15:18:57 UTC (rev 7208) @@ -29,9 +29,10 @@ TEST_SCRIPTS = -INSTALL_OVERRIDE_VARS = INSTALL BINDIR MANDIR +INSTALL_OVERRIDE_VARS = INSTALL BINDIR MANDIR MANSUF INSTALL_OVERRIDE_VAR_INSTALL = /usr/ucb/install -INSTALL_OVERRIDE_VAR_BINDIR = $(bindir) +INSTALL_OVERRIDE_VAR_BINDIR = $(sbindir) INSTALL_OVERRIDE_VAR_MANDIR = $(mandir)/man8 +INSTALL_OVERRIDE_VAR_MANSUF = 8 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 Tue Nov 10 17:13:10 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 10 Nov 2009 16:13:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7209] csw/mgar/gar/v2-migrateconf Message-ID: Revision: 7209 http://gar.svn.sourceforge.net/gar/?rev=7209&view=rev Author: dmichelsen Date: 2009-11-10 16:13:05 +0000 (Tue, 10 Nov 2009) Log Message: ----------- mGAR v2-migrateconf: Add GAR support Modified Paths: -------------- csw/mgar/gar/v2-migrateconf/gar.mk csw/mgar/gar/v2-migrateconf/gar.pkg.mk Modified: csw/mgar/gar/v2-migrateconf/gar.mk =================================================================== --- csw/mgar/gar/v2-migrateconf/gar.mk 2009-11-10 15:18:57 UTC (rev 7208) +++ csw/mgar/gar/v2-migrateconf/gar.mk 2009-11-10 16:13:05 UTC (rev 7209) @@ -46,14 +46,16 @@ DISTNAME ?= $(GARNAME)-$(GARVERSION) DYNSCRIPTS = $(foreach PKG,$(SPKG_SPECS),$(foreach SCR,$(ADMSCRIPTS),$(if $(value $(PKG)_$(SCR)), $(PKG).$(SCR)))) -_NOCHECKSUM += $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))) +_NOCHECKSUM += $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))) $(_EXTRA_GAR_NOCHECKSUM) +DISTFILES += $(_EXTRA_GAR_DISTFILES) + # Allow overriding of only specific components of ALLFILES by clearing e. g. 'ALLFILES_DYNSCRIPTS = ' ALLFILES_DISTFILES ?= $(DISTFILES) ALLFILES_PATCHFILES ?= $(PATCHFILES) $(foreach M,$(MODULATIONS),$(PATCHFILES_$M)) ALLFILES_DYNSCRIPTS ?= $(DYNSCRIPTS) ALLFILES_GIT_REPOS ?= $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))) -ALLFILES ?= $(sort $(ALLFILES_DISTFILES) $(ALLFILES_PATCHFILES) $(ALLFILES_DYNSCRIPTS) $(ALLFILES_GIT_REPOS) $(EXTRA_ALLFILES)) +ALLFILES ?= $(sort $(ALLFILES_DISTFILES) $(ALLFILES_PATCHFILES) $(ALLFILES_DYNSCRIPTS) $(ALLFILES_GIT_REPOS) $(EXTRA_ALLFILES) $(_EXTRA_GAR_ALLFILES)) ifeq ($(MAKE_INSTALL_DIRS),1) INSTALL_DIRS = $(addprefix $(DESTDIR),$(prefix) $(exec_prefix) $(bindir) $(sbindir) $(libexecdir) $(datadir) $(sysconfdir) $(sharedstatedir) $(localstatedir) $(libdir) $(infodir) $(lispdir) $(includedir) $(mandir) $(foreach NUM,1 2 3 4 5 6 7 8, $(mandir)/man$(NUM)) $(sourcedir)) @@ -704,7 +706,7 @@ # The basic merge merges the compiles for all ISAs on the current architecture -merge: checksum pre-merge merge-do merge-license $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) post-merge +merge: checksum pre-merge merge-do merge-license merge-migrateconf $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) post-merge @$(DONADA) merge-do: $(if $(PARALLELMODULATIONS),merge-parallel,merge-sequential) Modified: csw/mgar/gar/v2-migrateconf/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-migrateconf/gar.pkg.mk 2009-11-10 15:18:57 UTC (rev 7208) +++ csw/mgar/gar/v2-migrateconf/gar.pkg.mk 2009-11-10 16:13:05 UTC (rev 7209) @@ -159,6 +159,24 @@ SPKG_PKGFILE ?= %{bitname}-%{SPKG_VERSION},%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-%{arch}-$(or $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),CSW).pkg +# Migration default +ifneq ($(MIGRATE_FILES),) +MIGRATECONF ?= /etc/opt/csw/pkg/$(call catalogname,$(firstword $(SPKG_SPECS)))/cswmigrateconf +_EXTRA_GAR_DISTFILES += cswmigrateconf +_EXTRA_GAR_NOCHECKSUM += cswmigrateconf + +$(DOWNLOADDIR)/cswmigrateconf: + @echo "[ Generating cswmigrateconf ]" + @(echo "MIGRATE_FILES=\"$(MIGRATE_FILES)\"";\ + $(foreach F,$(MIGRATE_FILES),\ + $(if $(MIGRATE_SOURCE_DIR_$F),echo "SOURCE_DIR_$(subst .,_,$F)=\"$(MIGRATE_SOURCE_DIR_$F)\"";)\ + $(if $(MIGRATE_DEST_DIR_$F),echo "DEST_DIR_$(subst .,_,$F)=\"$(MIGRATE_DEST_DIR_$F)\"";)\ + )\ + ) >$@ + + +endif + # Handle cswclassutils # append $2 to SPKG_CLASSES if $1 is non-null define _spkg_cond_add @@ -374,7 +392,7 @@ $(foreach S,$(filter-out $*,$(SPKG_SPECS)),-X $(call licensedir,$S)/license) \ $(foreach FILE,$(_PKGFILES_INCLUDE),-i '$(FILE)') \ $(if $(_PKGFILES_INCLUDE),-x '.*',$(foreach FILE,$(_PKGFILES_EXCLUDE),-x '$(FILE)')) \ - $(foreach IE,$(abspath $(ISAEXEC_FILES_$*) $(ISAEXEC_FILES)), \ + $(foreach IE,$(abspath $(ISAEXEC_FILES_$*) $(ISAEXEC_FILES)), \ -e '$(IE)=$(dir $(IE))$(ISA_DEFAULT)/$(notdir $(IE))' \ ) \ <$(PROTOTYPE); \ @@ -563,6 +581,12 @@ @rm -f $(COOKIEDIR)/merge-license $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-license-$(SPEC)) @$(DONADA) +merge-migrateconf: $(WORKDIR) + $(if $(MIGRATECONF),\ + ginstall -d $(PKGROOT)$(dir $(MIGRATECONF));\ + ginstall $(DOWNLOADDIR)/cswmigrateconf $(PKGROOT)$(MIGRATECONF)\ + ) + @$(MAKECOOKIE) merge-src: _SRCDIR=$(PKGROOT)$(sourcedir)/$(call catalogname,$(SRCPACKAGE_BASE)) merge-src: fetch 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 Nov 10 17:17:00 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 10 Nov 2009 16:17:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7210] csw/mgar/gar/v2-migrateconf/gar.pkg.mk Message-ID: Revision: 7210 http://gar.svn.sourceforge.net/gar/?rev=7210&view=rev Author: dmichelsen Date: 2009-11-10 16:17:00 +0000 (Tue, 10 Nov 2009) Log Message: ----------- mGAR v2-migrateconf: First do migrateconf, than sampleconf Modified Paths: -------------- csw/mgar/gar/v2-migrateconf/gar.pkg.mk Modified: csw/mgar/gar/v2-migrateconf/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-migrateconf/gar.pkg.mk 2009-11-10 16:13:05 UTC (rev 7209) +++ csw/mgar/gar/v2-migrateconf/gar.pkg.mk 2009-11-10 16:17:00 UTC (rev 7210) @@ -187,9 +187,9 @@ # always be the last two added. The reason for this is that # you need to ensure any binaries and config files are already on disk # and able to be consumed by a service that might be started. +SPKG_CLASSES := $(call _spkg_cond_add,MIGRATECONF,cswmigrateconf) SPKG_CLASSES := $(call _spkg_cond_add,SAMPLECONF,cswcpsampleconf) SPKG_CLASSES := $(call _spkg_cond_add,PRESERVECONF,cswpreserveconf) -SPKG_CLASSES := $(call _spkg_cond_add,MIGRATECONF,cswmigrateconf) SPKG_CLASSES := $(call _spkg_cond_add,ETCSERVICES,cswetcservices) SPKG_CLASSES := $(call _spkg_cond_add,USERGROUP,cswusergroup) SPKG_CLASSES := $(call _spkg_cond_add,PYCOMPILE,cswpycompile) @@ -199,9 +199,9 @@ # - set class for all config files ifneq ($(SAMPLECONF)$(PRESERVECONF)$(MIGRATECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),) _CSWCLASS_FILTER = | perl -ane '\ + $(foreach FILE,$(MIGRATECONF),$$F[1] = "cswmigrateconf" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(SAMPLECONF:%\.CSW=%),$$F[1] = "cswcpsampleconf" if ( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ $(foreach FILE,$(PRESERVECONF:%\.CSW=%),$$F[1] = "cswpreserveconf" if( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ - $(foreach FILE,$(MIGRATECONF),$$F[1] = "cswmigrateconf" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(ETCSERVICES),$$F[1] = "cswetcservices" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(INETDCONF),$$F[1] = "cswinetd" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(INITSMF),$$F[1] = "cswinitsmf" if( $$F[2] =~ m(^$(FILE)$$) );)\ 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 Nov 10 17:17:46 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 10 Nov 2009 16:17:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7211] csw/mgar/pkg/esound/trunk/Makefile Message-ID: Revision: 7211 http://gar.svn.sourceforge.net/gar/?rev=7211&view=rev Author: dmichelsen Date: 2009-11-10 16:17:46 +0000 (Tue, 10 Nov 2009) Log Message: ----------- esound: Use cswmigrateconf Modified Paths: -------------- csw/mgar/pkg/esound/trunk/Makefile Modified: csw/mgar/pkg/esound/trunk/Makefile =================================================================== --- csw/mgar/pkg/esound/trunk/Makefile 2009-11-10 16:17:00 UTC (rev 7210) +++ csw/mgar/pkg/esound/trunk/Makefile 2009-11-10 16:17:46 UTC (rev 7211) @@ -23,9 +23,17 @@ # - Document the location in esd(1) # - Skip 64 binaries +sysconfdir = /etc/opt/csw + +PRESERVECONF = $(sysconfdir)/esd.conf +MIGRATE_FILES = esd.conf + BUILD64 = 1 +NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check +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 Tue Nov 10 17:38:34 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 10 Nov 2009 16:38:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[7212] csw/mgar/gar/v2 Message-ID: Revision: 7212 http://gar.svn.sourceforge.net/gar/?rev=7212&view=rev Author: dmichelsen Date: 2009-11-10 16:38:34 +0000 (Tue, 10 Nov 2009) Log Message: ----------- mGAR v2: Merge in cswmigrateconf support Modified Paths: -------------- csw/mgar/gar/v2/gar.mk csw/mgar/gar/v2/gar.pkg.mk Property Changed: ---------------- csw/mgar/gar/v2/ Property changes on: csw/mgar/gar/v2 ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-skayser:6087-6132 + /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-skayser:6087-6132 Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-11-10 16:17:46 UTC (rev 7211) +++ csw/mgar/gar/v2/gar.mk 2009-11-10 16:38:34 UTC (rev 7212) @@ -46,14 +46,16 @@ DISTNAME ?= $(GARNAME)-$(GARVERSION) DYNSCRIPTS = $(foreach PKG,$(SPKG_SPECS),$(foreach SCR,$(ADMSCRIPTS),$(if $(value $(PKG)_$(SCR)), $(PKG).$(SCR)))) -_NOCHECKSUM += $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))) +_NOCHECKSUM += $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))) $(_EXTRA_GAR_NOCHECKSUM) +DISTFILES += $(_EXTRA_GAR_DISTFILES) + # Allow overriding of only specific components of ALLFILES by clearing e. g. 'ALLFILES_DYNSCRIPTS = ' ALLFILES_DISTFILES ?= $(DISTFILES) ALLFILES_PATCHFILES ?= $(PATCHFILES) $(foreach M,$(MODULATIONS),$(PATCHFILES_$M)) ALLFILES_DYNSCRIPTS ?= $(DYNSCRIPTS) ALLFILES_GIT_REPOS ?= $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))) -ALLFILES ?= $(sort $(ALLFILES_DISTFILES) $(ALLFILES_PATCHFILES) $(ALLFILES_DYNSCRIPTS) $(ALLFILES_GIT_REPOS) $(EXTRA_ALLFILES)) +ALLFILES ?= $(sort $(ALLFILES_DISTFILES) $(ALLFILES_PATCHFILES) $(ALLFILES_DYNSCRIPTS) $(ALLFILES_GIT_REPOS) $(EXTRA_ALLFILES) $(_EXTRA_GAR_ALLFILES)) ifeq ($(MAKE_INSTALL_DIRS),1) INSTALL_DIRS = $(addprefix $(DESTDIR),$(prefix) $(exec_prefix) $(bindir) $(sbindir) $(libexecdir) $(datadir) $(sysconfdir) $(sharedstatedir) $(localstatedir) $(libdir) $(infodir) $(lispdir) $(includedir) $(mandir) $(foreach NUM,1 2 3 4 5 6 7 8, $(mandir)/man$(NUM)) $(sourcedir)) @@ -708,7 +710,7 @@ # The basic merge merges the compiles for all ISAs on the current architecture -merge: checksum pre-merge merge-do merge-license $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) post-merge +merge: checksum pre-merge merge-do merge-license merge-migrateconf $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) post-merge @$(DONADA) merge-do: $(if $(PARALLELMODULATIONS),merge-parallel,merge-sequential) Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-11-10 16:17:46 UTC (rev 7211) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-11-10 16:38:34 UTC (rev 7212) @@ -159,6 +159,24 @@ SPKG_PKGFILE ?= %{bitname}-%{SPKG_VERSION},%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-%{arch}-$(or $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),CSW).pkg +# Migration default +ifneq ($(MIGRATE_FILES),) +MIGRATECONF ?= /etc/opt/csw/pkg/$(call catalogname,$(firstword $(SPKG_SPECS)))/cswmigrateconf +_EXTRA_GAR_DISTFILES += cswmigrateconf +_EXTRA_GAR_NOCHECKSUM += cswmigrateconf + +$(DOWNLOADDIR)/cswmigrateconf: + @echo "[ Generating cswmigrateconf ]" + @(echo "MIGRATE_FILES=\"$(MIGRATE_FILES)\"";\ + $(foreach F,$(MIGRATE_FILES),\ + $(if $(MIGRATE_SOURCE_DIR_$F),echo "SOURCE_DIR_$(subst .,_,$F)=\"$(MIGRATE_SOURCE_DIR_$F)\"";)\ + $(if $(MIGRATE_DEST_DIR_$F),echo "DEST_DIR_$(subst .,_,$F)=\"$(MIGRATE_DEST_DIR_$F)\"";)\ + )\ + ) >$@ + + +endif + # Handle cswclassutils # append $2 to SPKG_CLASSES if $1 is non-null define _spkg_cond_add @@ -169,6 +187,7 @@ # always be the last two added. The reason for this is that # you need to ensure any binaries and config files are already on disk # and able to be consumed by a service that might be started. +SPKG_CLASSES := $(call _spkg_cond_add,MIGRATECONF,cswmigrateconf) SPKG_CLASSES := $(call _spkg_cond_add,SAMPLECONF,cswcpsampleconf) SPKG_CLASSES := $(call _spkg_cond_add,PRESERVECONF,cswpreserveconf) SPKG_CLASSES := $(call _spkg_cond_add,ETCSERVICES,cswetcservices) @@ -178,8 +197,9 @@ SPKG_CLASSES := $(call _spkg_cond_add,INITSMF,cswinitsmf) # - set class for all config files -ifneq ($(SAMPLECONF)$(PRESERVECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),) +ifneq ($(SAMPLECONF)$(PRESERVECONF)$(MIGRATECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),) _CSWCLASS_FILTER = | perl -ane '\ + $(foreach FILE,$(MIGRATECONF),$$F[1] = "cswmigrateconf" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(SAMPLECONF:%\.CSW=%),$$F[1] = "cswcpsampleconf" if ( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ $(foreach FILE,$(PRESERVECONF:%\.CSW=%),$$F[1] = "cswpreserveconf" if( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ $(foreach FILE,$(ETCSERVICES),$$F[1] = "cswetcservices" if( $$F[2] =~ m(^$(FILE)$$) );)\ @@ -561,6 +581,12 @@ @rm -f $(COOKIEDIR)/merge-license $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-license-$(SPEC)) @$(DONADA) +merge-migrateconf: $(WORKDIR) + $(if $(MIGRATECONF),\ + ginstall -d $(PKGROOT)$(dir $(MIGRATECONF));\ + ginstall $(DOWNLOADDIR)/cswmigrateconf $(PKGROOT)$(MIGRATECONF)\ + ) + @$(MAKECOOKIE) merge-src: _SRCDIR=$(PKGROOT)$(sourcedir)/$(call catalogname,$(SRCPACKAGE_BASE)) merge-src: fetch 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 Nov 10 18:27:10 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 10 Nov 2009 17:27:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7213] csw/mgar/pkg/cfengine/trunk Message-ID: Revision: 7213 http://gar.svn.sourceforge.net/gar/?rev=7213&view=rev Author: bonivart Date: 2009-11-10 17:27:10 +0000 (Tue, 10 Nov 2009) Log Message: ----------- cfengine: update to 2.2.10, initial commit Modified Paths: -------------- csw/mgar/pkg/cfengine/trunk/Makefile csw/mgar/pkg/cfengine/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cfengine/trunk/files/CSWcfengine.gspec Property Changed: ---------------- csw/mgar/pkg/cfengine/trunk/ Property changes on: csw/mgar/pkg/cfengine/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cfengine/trunk/Makefile =================================================================== --- csw/mgar/pkg/cfengine/trunk/Makefile 2009-11-10 16:38:34 UTC (rev 7212) +++ csw/mgar/pkg/cfengine/trunk/Makefile 2009-11-10 17:27:10 UTC (rev 7213) @@ -1,5 +1,5 @@ GARNAME = cfengine -GARVERSION = 2.1.20 +GARVERSION = 2.2.10 CATEGORIES = utils DESCRIPTION = A tool for administering Networks of Diverse Machines @@ -13,21 +13,21 @@ scripts. You can also use it as a netwide front-end for `cron'. endef -MASTER_SITES = ftp://ftp.iu.hio.no/pub/$(GARNAME)/ +MASTER_SITES = http://www.cfengine.org/tarballs/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWcfengine,) +REQUIRED_PKGS = CSWosslrt CSWbdb3 + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# Requires GNU texi -PATCHFILES = nodoc.diff - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-DCE -CONFIGURE_ARGS += --with-berkeleydb=$(tool_prefix) -CONFIGURE_ARGS += --with-openssl=$(tool_prefix) +CONFIGURE_ARGS += --with-docs +CONFIGURE_ARGS += --with-berkeleydb=/opt/csw/bdb33 +GARCOMPILER = GCC3 + TEST_TARGET = check include gar/category.mk Modified: csw/mgar/pkg/cfengine/trunk/checksums =================================================================== --- csw/mgar/pkg/cfengine/trunk/checksums 2009-11-10 16:38:34 UTC (rev 7212) +++ csw/mgar/pkg/cfengine/trunk/checksums 2009-11-10 17:27:10 UTC (rev 7213) @@ -1,3 +1 @@ -2510349fef9ccc47d80f133d4a35322e download/cfengine-2.1.20.tar.gz -c96af1ce2a565fd3c212c510e96ea8cf download/CSWcfengine.gspec -35a189bc99c288ed21fbe0ea793f26a7 download/nodoc.diff +3b90ff8bf2ec941cd33cfb65f5012f16 cfengine-2.2.10.tar.gz Deleted: csw/mgar/pkg/cfengine/trunk/files/CSWcfengine.gspec =================================================================== --- csw/mgar/pkg/cfengine/trunk/files/CSWcfengine.gspec 2009-11-10 16:38:34 UTC (rev 7212) +++ csw/mgar/pkg/cfengine/trunk/files/CSWcfengine.gspec 2009-11-10 17:27:10 UTC (rev 7213) @@ -1,4 +0,0 @@ -%var bitname cfengine -%var pkgname CSWcfengine -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYRIGHT 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 Nov 11 09:44:48 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 11 Nov 2009 08:44:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[7214] csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile Message-ID: Revision: 7214 http://gar.svn.sourceforge.net/gar/?rev=7214&view=rev Author: wahwah Date: 2009-11-11 08:44:48 +0000 (Wed, 11 Nov 2009) Log Message: ----------- mysql-5.1.x: Building a debugging version by default. Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile 2009-11-10 17:27:10 UTC (rev 7213) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile 2009-11-11 08:44:48 UTC (rev 7214) @@ -14,6 +14,8 @@ (Structured Query Language) database server. endef +GARFLAVOR = DBG + # Change prefix to /opt/csw/mysql5 prefix = /opt/csw/mysql5 sysconfdir = /etc/opt/csw/mysql5 @@ -135,6 +137,9 @@ CONFIGURE_ARGS += --with-zlib-dir=/opt/csw CONFIGURE_ARGS += --with-ssl=/opt/csw CONFIGURE_ARGS += --with-plugins=max-no-ndb +CONFIGURE_ARGS += --with-comment +CONFIGURE_ARGS_DBG = --with-debug +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) # TODO: Make the tests pass. They don't at the moment. # TEST_SCRIPTS = 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 Nov 11 10:51:59 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 11 Nov 2009 09:51:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[7215] csw/mgar/pkg/cfengine/trunk/Makefile Message-ID: Revision: 7215 http://gar.svn.sourceforge.net/gar/?rev=7215&view=rev Author: bonivart Date: 2009-11-11 09:51:59 +0000 (Wed, 11 Nov 2009) Log Message: ----------- cfengine: split into main and doc pkg, half size Modified Paths: -------------- csw/mgar/pkg/cfengine/trunk/Makefile Modified: csw/mgar/pkg/cfengine/trunk/Makefile =================================================================== --- csw/mgar/pkg/cfengine/trunk/Makefile 2009-11-11 08:44:48 UTC (rev 7214) +++ csw/mgar/pkg/cfengine/trunk/Makefile 2009-11-11 09:51:59 UTC (rev 7215) @@ -16,8 +16,18 @@ MASTER_SITES = http://www.cfengine.org/tarballs/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -REQUIRED_PKGS = CSWosslrt CSWbdb3 +PACKAGES = CSWcfengine CSWcfenginedoc +PKGFILES_CSWcfenginedoc = .*/share/info/.* +PKGFILES_CSWcfenginedoc += .*/share/cfengine/.* +CATALOGNAME_CSWcfengine = cfengine +SPKG_DESC_CSWcfengine = A tool for administering Networks of Diverse Machines +REQUIRED_PKGS_CSWcfengine = CSWosslrt CSWbdb3 + +CATALOGNAME_CSWcfenginedoc = cfengine_doc +SPKG_DESC_CSWcfenginedoc = Cfengine documentation +ARCHALL_CSWcfenginedoc = 1 + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\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 Wed Nov 11 11:22:47 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 11 Nov 2009 10:22:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[7216] csw/mgar/pkg/tightvnc/trunk Message-ID: Revision: 7216 http://gar.svn.sourceforge.net/gar/?rev=7216&view=rev Author: wahwah Date: 2009-11-11 10:22:47 +0000 (Wed, 11 Nov 2009) Log Message: ----------- tightvnc: Adding MIGRATE_FILES and INITSMF Modified Paths: -------------- csw/mgar/pkg/tightvnc/trunk/Makefile csw/mgar/pkg/tightvnc/trunk/checksums Added Paths: ----------- csw/mgar/pkg/tightvnc/trunk/files/cswvncserver Modified: csw/mgar/pkg/tightvnc/trunk/Makefile =================================================================== --- csw/mgar/pkg/tightvnc/trunk/Makefile 2009-11-11 09:51:59 UTC (rev 7215) +++ csw/mgar/pkg/tightvnc/trunk/Makefile 2009-11-11 10:22:47 UTC (rev 7216) @@ -14,6 +14,7 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION)_unixsrc.tar.bz2 DISTFILES += vncservers +DISTFILES += cswvncserver PACKAGES = CSWvncs CSWvncv CATALOGNAME_CSWvncs = vncserver CATALOGNAME_CSWvncv = vncviewer @@ -27,7 +28,17 @@ SPKG_DESC_CSWvncs = TightVNC server SPKG_DESC_CSWvncv = TightVNC viewer -REQUIRED_PKGS = CSWjpeg CSWtcpwrap CSWzlib +MIGRATE_FILES_CSWvncs = vncservers +INITSMF = /etc/opt/csw/init.d/cswvncserver + +REQUIRED_PKGS = CSWbash +REQUIRED_PKGS += CSWjpeg +REQUIRED_PKGS += CSWlibice +REQUIRED_PKGS += CSWlibsm +REQUIRED_PKGS += CSWlibxext +REQUIRED_PKGS += CSWtcpwrap +REQUIRED_PKGS += CSWzlib + PREREQUISITE_PKGS = $(REQUIRED_PKGS) sysconfdir = /etc/opt/csw @@ -87,3 +98,5 @@ #install -m755 vncserver.init %{buildroot}/etc/rc.d/init.d/vncserver ginstall -d $(DESTDIR)$(sysconfdir)/vncservers ginstall -m 644 $(WORKDIR)/vncservers $(DESTDIR)$(sysconfdir)/vncservers + ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d + ginstall -m 644 $(FILEDIR)/cswvncserver $(DESTDIR)/etc/opt/csw/init.d Modified: csw/mgar/pkg/tightvnc/trunk/checksums =================================================================== --- csw/mgar/pkg/tightvnc/trunk/checksums 2009-11-11 09:51:59 UTC (rev 7215) +++ csw/mgar/pkg/tightvnc/trunk/checksums 2009-11-11 10:22:47 UTC (rev 7216) @@ -1,6 +1,7 @@ -38a4eaded4a6418f5547fa57cefb97f9 download/0001-Force-the-use-of-libwrap.patch -76166d097bf2e70627cb6c87d312bca5 download/0001-Sun-compiler-in-sun.cf.patch -1264014c1ce47a119a724f17a6e0a768 download/0003-GNU-make-by-default.patch -c5e9c3e4017caa65d14a0b98858043b9 download/0003-libdix.a-after-libos.a.patch -397b35faad32d5246b6d44b142f8304f download/tightvnc-1.3.10_unixsrc.tar.bz2 -56c09be17c17184e96193c13246fd649 download/vncservers +38a4eaded4a6418f5547fa57cefb97f9 0001-Force-the-use-of-libwrap.patch +76166d097bf2e70627cb6c87d312bca5 0001-Sun-compiler-in-sun.cf.patch +1264014c1ce47a119a724f17a6e0a768 0003-GNU-make-by-default.patch +c5e9c3e4017caa65d14a0b98858043b9 0003-libdix.a-after-libos.a.patch +824d150d2462568531788b04f239d573 cswvncserver +397b35faad32d5246b6d44b142f8304f tightvnc-1.3.10_unixsrc.tar.bz2 +56c09be17c17184e96193c13246fd649 vncservers Added: csw/mgar/pkg/tightvnc/trunk/files/cswvncserver =================================================================== --- csw/mgar/pkg/tightvnc/trunk/files/cswvncserver (rev 0) +++ csw/mgar/pkg/tightvnc/trunk/files/cswvncserver 2009-11-11 10:22:47 UTC (rev 7216) @@ -0,0 +1,63 @@ +#!/opt/csw/bin/bash +# +# $Id$ +# +# description: Starts and stops vncserver. \ +# used to provide remote X administration services. + +VNCSERVERS="" +ARGS="" +if [ -f /etc/opt/csw/vncservers ] ; then + . /etc/opt/csw/vncservers +fi + +prog="VNC server" + +start() { + echo "Starting $prog: " + ulimit -c 0 >/dev/null 2>&1 + RETVAL=0 + for display in ${VNCSERVERS} + do + echo "${display} " + su ${display##*:} -c "cd ~ && [ -f .vnc/passwd ] && vncserver ${ARGS} :${display%%:*}" + RETVAL=$? + [ "$RETVAL" -ne 0 ] && break + done + [ "$RETVAL" -eq 0 ] && touch /var/spool/locks/vncserver +} + +stop() { + echo "Shutting down $prog: " + for display in ${VNCSERVERS} + do + echo "${display} " + su ${display##*:} -c "vncserver -kill :${display%%:*} >/dev/null 2>&1" + RETVAL=$? + done + [ "$RETVAL" -eq 0 ] && rm -f /var/spool/locks/vncserver +} + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|reload) + stop + start + ;; + condrestart) + if [ -f /var/spool/locks/vncserver ]; then + stop + start + fi + ;; + *) + echo $"Usage: $0 {start|stop|restart|condrestart}" + exit 1 +esac + Property changes on: csw/mgar/pkg/tightvnc/trunk/files/cswvncserver ___________________________________________________________________ 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 Nov 11 11:23:18 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 11 Nov 2009 10:23:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7217] csw/mgar/pkg/tightvnc/trunk/checksums Message-ID: Revision: 7217 http://gar.svn.sourceforge.net/gar/?rev=7217&view=rev Author: wahwah Date: 2009-11-11 10:23:18 +0000 (Wed, 11 Nov 2009) Log Message: ----------- tightvnc: makesum for files with Id tags Modified Paths: -------------- csw/mgar/pkg/tightvnc/trunk/checksums Modified: csw/mgar/pkg/tightvnc/trunk/checksums =================================================================== --- csw/mgar/pkg/tightvnc/trunk/checksums 2009-11-11 10:22:47 UTC (rev 7216) +++ csw/mgar/pkg/tightvnc/trunk/checksums 2009-11-11 10:23:18 UTC (rev 7217) @@ -2,6 +2,6 @@ 76166d097bf2e70627cb6c87d312bca5 0001-Sun-compiler-in-sun.cf.patch 1264014c1ce47a119a724f17a6e0a768 0003-GNU-make-by-default.patch c5e9c3e4017caa65d14a0b98858043b9 0003-libdix.a-after-libos.a.patch -824d150d2462568531788b04f239d573 cswvncserver +000dc2f69bed5ab7f7ca86d5730e9c6e cswvncserver 397b35faad32d5246b6d44b142f8304f tightvnc-1.3.10_unixsrc.tar.bz2 56c09be17c17184e96193c13246fd649 vncservers 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 Nov 11 11:47:50 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 11 Nov 2009 10:47:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[7218] csw/mgar/pkg/syslog_ng/trunk/files Message-ID: Revision: 7218 http://gar.svn.sourceforge.net/gar/?rev=7218&view=rev Author: wahwah Date: 2009-11-11 10:47:49 +0000 (Wed, 11 Nov 2009) Log Message: ----------- syslog-ng: A bugfix for the preinstall script, http://www.opencsw.org/bugtrack/view.php?id=4005 Modified Paths: -------------- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.postremove csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall Property Changed: ---------------- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.postremove csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall Modified: csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.postremove =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.postremove 2009-11-11 10:23:18 UTC (rev 7217) +++ csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.postremove 2009-11-11 10:47:49 UTC (rev 7218) @@ -1,4 +1,7 @@ #!/bin/sh +# +# $Id$ +# if [ -x /usr/sbin/svcadm ]; then echo "Enabling svc:/system/system-log:default" Property changes on: csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.postremove ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall 2009-11-11 10:23:18 UTC (rev 7217) +++ csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall 2009-11-11 10:47:49 UTC (rev 7218) @@ -1,4 +1,7 @@ #!/bin/sh +# +# $Id$ +# if [ -x /usr/sbin/svcadm ]; then echo "Disabling svc:/system/system-log:default" @@ -9,8 +12,10 @@ # first. The -f option is for the rm command not to complain if it can't remove # the file. for f in /opt/csw/var/syslog-ng.{ctl,persist}; do - if [ -r "${f}" ]; + if [ -r "${f}" ]; then echo "Removing an obsolete file: '${f}'." rm -f "${f}" fi done + +exit 0 Property changes on: csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall ___________________________________________________________________ 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 Nov 11 11:48:58 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 11 Nov 2009 10:48:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7219] csw/mgar/pkg/tightvnc/trunk/files/cswvncserver Message-ID: Revision: 7219 http://gar.svn.sourceforge.net/gar/?rev=7219&view=rev Author: wahwah Date: 2009-11-11 10:48:57 +0000 (Wed, 11 Nov 2009) Log Message: ----------- tightvnc: Adjusting the vncservers path Modified Paths: -------------- csw/mgar/pkg/tightvnc/trunk/files/cswvncserver Modified: csw/mgar/pkg/tightvnc/trunk/files/cswvncserver =================================================================== --- csw/mgar/pkg/tightvnc/trunk/files/cswvncserver 2009-11-11 10:47:49 UTC (rev 7218) +++ csw/mgar/pkg/tightvnc/trunk/files/cswvncserver 2009-11-11 10:48:57 UTC (rev 7219) @@ -7,8 +7,9 @@ VNCSERVERS="" ARGS="" -if [ -f /etc/opt/csw/vncservers ] ; then - . /etc/opt/csw/vncservers +VNCSERVERS_CONF="/etc/opt/csw/vncservers/vncservers" +if [ -f "${VNCSERVERS_CONF}" ] ; then + . "${VNCSERVERS_CONF}" fi prog="VNC server" 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 Nov 11 11:51:32 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 11 Nov 2009 10:51:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7221] csw/mgar/pkg/syslog_ng/trunk/checksums Message-ID: Revision: 7221 http://gar.svn.sourceforge.net/gar/?rev=7221&view=rev Author: wahwah Date: 2009-11-11 10:51:32 +0000 (Wed, 11 Nov 2009) Log Message: ----------- syslog_ng: setting the checksum for files with Id tags Modified Paths: -------------- csw/mgar/pkg/syslog_ng/trunk/checksums Modified: csw/mgar/pkg/syslog_ng/trunk/checksums =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/checksums 2009-11-11 10:49:46 UTC (rev 7220) +++ csw/mgar/pkg/syslog_ng/trunk/checksums 2009-11-11 10:51:32 UTC (rev 7221) @@ -1,5 +1,5 @@ -91e692a52c4c9668e3bcf8b8816425c3 CSWsyslogng.postremove -c3da292b828f03158c7227f5b35feb12 CSWsyslogng.preinstall +ab950f80af5ca165ef3f5ba2df04f9be CSWsyslogng.postremove +d58b011085f44206053562078c012857 CSWsyslogng.preinstall fcd5effdaa96da8abf9788bc5745bda3 cswsyslog_ng 69bad95775b98d26e52db8a8292e2790 syslog-ng.conf.CSW 86c39779261545d2289e9c309e262b8d syslog-ng_3.0.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 Wed Nov 11 11:49:46 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 11 Nov 2009 10:49:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7220] csw/mgar/pkg/tightvnc/trunk/checksums Message-ID: Revision: 7220 http://gar.svn.sourceforge.net/gar/?rev=7220&view=rev Author: wahwah Date: 2009-11-11 10:49:46 +0000 (Wed, 11 Nov 2009) Log Message: ----------- tightvnc: Setting the checksum for files with the Id tag Modified Paths: -------------- csw/mgar/pkg/tightvnc/trunk/checksums Modified: csw/mgar/pkg/tightvnc/trunk/checksums =================================================================== --- csw/mgar/pkg/tightvnc/trunk/checksums 2009-11-11 10:48:57 UTC (rev 7219) +++ csw/mgar/pkg/tightvnc/trunk/checksums 2009-11-11 10:49:46 UTC (rev 7220) @@ -2,6 +2,6 @@ 76166d097bf2e70627cb6c87d312bca5 0001-Sun-compiler-in-sun.cf.patch 1264014c1ce47a119a724f17a6e0a768 0003-GNU-make-by-default.patch c5e9c3e4017caa65d14a0b98858043b9 0003-libdix.a-after-libos.a.patch -000dc2f69bed5ab7f7ca86d5730e9c6e cswvncserver +20c9ead98ffb7b739fdb63429c3bac85 cswvncserver 397b35faad32d5246b6d44b142f8304f tightvnc-1.3.10_unixsrc.tar.bz2 56c09be17c17184e96193c13246fd649 vncservers 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 Nov 11 12:02:28 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 11 Nov 2009 11:02:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[7222] csw/mgar/pkg/syslog_ng/trunk/Makefile Message-ID: Revision: 7222 http://gar.svn.sourceforge.net/gar/?rev=7222&view=rev Author: wahwah Date: 2009-11-11 11:02:28 +0000 (Wed, 11 Nov 2009) Log Message: ----------- syslog_ng: Removing the explicit dependency on CSWclassutils to avoid double depends Modified Paths: -------------- csw/mgar/pkg/syslog_ng/trunk/Makefile Modified: csw/mgar/pkg/syslog_ng/trunk/Makefile =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/Makefile 2009-11-11 10:51:32 UTC (rev 7221) +++ csw/mgar/pkg/syslog_ng/trunk/Makefile 2009-11-11 11:02:28 UTC (rev 7222) @@ -38,7 +38,6 @@ REQUIRED_PKGS += CSWggettextrt REQUIRED_PKGS += CSWglib2 REQUIRED_PKGS += CSWtcpwrap -REQUIRED_PKGS += CSWcswclassutils PREREQUISITE_PKGS = $(REQUIRED_PKGS) PREREQUISITE_PKGS += CSWggettext 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 Nov 11 13:31:00 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 11 Nov 2009 12:31:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7223] csw/mgar/pkg/tightvnc/trunk/Makefile Message-ID: Revision: 7223 http://gar.svn.sourceforge.net/gar/?rev=7223&view=rev Author: dmichelsen Date: 2009-11-11 12:31:00 +0000 (Wed, 11 Nov 2009) Log Message: ----------- tightvnc: Add cookies to custom phases Modified Paths: -------------- csw/mgar/pkg/tightvnc/trunk/Makefile Modified: csw/mgar/pkg/tightvnc/trunk/Makefile =================================================================== --- csw/mgar/pkg/tightvnc/trunk/Makefile 2009-11-11 11:02:28 UTC (rev 7222) +++ csw/mgar/pkg/tightvnc/trunk/Makefile 2009-11-11 12:31:00 UTC (rev 7223) @@ -87,6 +87,7 @@ LOCAL_LDFLAGS="-L/opt/csw/lib" \ EXTRA_INCLUDES="-I/opt/csw/include" \ $(MAKE)) + @$(MAKECOOKIE) install-vnc: ginstall -d $(DESTDIR)$(bindir) @@ -100,3 +101,4 @@ ginstall -m 644 $(WORKDIR)/vncservers $(DESTDIR)$(sysconfdir)/vncservers ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d ginstall -m 644 $(FILEDIR)/cswvncserver $(DESTDIR)/etc/opt/csw/init.d + @$(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 Nov 11 14:12:18 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 11 Nov 2009 13:12:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7224] csw/mgar/gar/v2 Message-ID: Revision: 7224 http://gar.svn.sourceforge.net/gar/?rev=7224&view=rev Author: dmichelsen Date: 2009-11-11 13:12:15 +0000 (Wed, 11 Nov 2009) Log Message: ----------- mGAR v2: Enhance cswmigrateconf support to be useful when building multiple packages 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 2009-11-11 12:31:00 UTC (rev 7223) +++ csw/mgar/gar/v2/gar.mk 2009-11-11 13:12:15 UTC (rev 7224) @@ -786,7 +786,7 @@ .PHONY: remerge reset-merge reset-merge-modulated remerge: reset-merge merge -reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-src +reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-migrateconf reset-merge-src @rm -f $(COOKIEDIR)/pre-merge $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge $(COOKIEDIR)/post-merge @rm -rf $(PKGROOT) @$(DONADA) Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-11-11 12:31:00 UTC (rev 7223) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-11-11 13:12:15 UTC (rev 7224) @@ -159,30 +159,14 @@ SPKG_PKGFILE ?= %{bitname}-%{SPKG_VERSION},%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-%{arch}-$(or $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),CSW).pkg -# Migration default -ifneq ($(MIGRATE_FILES),) -MIGRATECONF ?= /etc/opt/csw/pkg/$(call catalogname,$(firstword $(SPKG_SPECS)))/cswmigrateconf -_EXTRA_GAR_DISTFILES += cswmigrateconf -_EXTRA_GAR_NOCHECKSUM += cswmigrateconf - -$(DOWNLOADDIR)/cswmigrateconf: - @echo "[ Generating cswmigrateconf ]" - @(echo "MIGRATE_FILES=\"$(MIGRATE_FILES)\"";\ - $(foreach F,$(MIGRATE_FILES),\ - $(if $(MIGRATE_SOURCE_DIR_$F),echo "SOURCE_DIR_$(subst .,_,$F)=\"$(MIGRATE_SOURCE_DIR_$F)\"";)\ - $(if $(MIGRATE_DEST_DIR_$F),echo "DEST_DIR_$(subst .,_,$F)=\"$(MIGRATE_DEST_DIR_$F)\"";)\ - )\ - ) >$@ - - -endif - # Handle cswclassutils # append $2 to SPKG_CLASSES if $1 is non-null define _spkg_cond_add $(SPKG_CLASSES) $(if $($(1)),$(if $(filter $(2),$(SPKG_CLASSES)),,$(2))) endef +MIGRATECONF ?= $(foreach S,$(SPKG_SPECS),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),/etc/opt/csw/pkg/$S/cswmigrateconf)) + # NOTE: Order _can_ be important here. cswinitsmf and cswinetd should # always be the last two added. The reason for this is that # you need to ensure any binaries and config files are already on disk @@ -388,8 +372,8 @@ -n "$(_PKGFILES_EXCLUDE)" -o \ -n "$(ISAEXEC_FILES_$*)" -o \ -n "$(ISAEXEC_FILES)" ]; then \ - (pathfilter $(if $(or $(_PKGFILES_EXCLUDE),$(_PKGFILES_INCLUDE)),-I $(call licensedir,$*)/license) \ - $(foreach S,$(filter-out $*,$(SPKG_SPECS)),-X $(call licensedir,$S)/license) \ + (pathfilter $(if $(or $(_PKGFILES_EXCLUDE),$(_PKGFILES_INCLUDE)),-I $(call licensedir,$*)/license -I /etc/opt/csw/pkg/$*/cswmigrateconf) \ + $(foreach S,$(filter-out $*,$(SPKG_SPECS)),-X $(call licensedir,$S)/license -X /etc/opt/csw/pkg/$S/cswmigrateconf) \ $(foreach FILE,$(_PKGFILES_INCLUDE),-i '$(FILE)') \ $(if $(_PKGFILES_INCLUDE),-x '.*',$(foreach FILE,$(_PKGFILES_EXCLUDE),-x '$(FILE)')) \ $(foreach IE,$(abspath $(ISAEXEC_FILES_$*) $(ISAEXEC_FILES)), \ @@ -579,15 +563,29 @@ reset-merge-license: @rm -f $(COOKIEDIR)/merge-license $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-license-$(SPEC)) - @$(DONADA) -merge-migrateconf: $(WORKDIR) - $(if $(MIGRATECONF),\ - ginstall -d $(PKGROOT)$(dir $(MIGRATECONF));\ - ginstall $(DOWNLOADDIR)/cswmigrateconf $(PKGROOT)$(MIGRATECONF)\ - ) +merge-migrateconf: $(foreach S,$(SPKG_SPECS),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),merge-migrateconf-$S)) @$(MAKECOOKIE) +merge-migrateconf-%: MIGRATE_FILES_$* ?= $(MIGRATE_FILES) +merge-migrateconf-%: MIGRATE_SOURCE_DIR_$* ?= $(MIGRATE_SOURCE_DIR) +merge-migrateconf-%: MIGRATE_DEST_DIR_$* ?= $(MIGRATE_DEST_DIR) +merge-migrateconf-%: + @echo "[ Generating cswmigrateconf for package $* ]" + $(_DBG)ginstall -d $(PKGROOT)/etc/opt/csw/pkg/$* + $(_DBG)(echo "MIGRATE_FILES=\"$(MIGRATE_FILES_$*)\"";\ + $(if $(MIGRATE_SOURCE_DIR_$*),echo "SOURCE_DIR___default__=\"$(MIGRATE_SOURCE_DIR_$*)\"";)\ + $(if $(MIGRATE_DEST_DIR_$*),echo "DEST_DIR___default__=\"$(MIGRATE_DEST_DIR_$*)\"";)\ + $(foreach F,$(MIGRATE_FILES_$*),\ + $(if $(MIGRATE_SOURCE_DIR_$F),echo "SOURCE_DIR_$(subst .,_,$F)=\"$(MIGRATE_SOURCE_DIR_$F)\"";)\ + $(if $(MIGRATE_DEST_DIR_$F),echo "DEST_DIR_$(subst .,_,$F)=\"$(MIGRATE_DEST_DIR_$F)\"";)\ + )\ + ) >$(PKGROOT)/etc/opt/csw/pkg/$*/cswmigrateconf + @$(MAKECOOKIE) + +reset-merge-migrateconf: + @rm -f $(COOKIEDIR)/merge-migrateconf $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-migrateconf-$(SPEC)) + merge-src: _SRCDIR=$(PKGROOT)$(sourcedir)/$(call catalogname,$(SRCPACKAGE_BASE)) merge-src: fetch $(_DBG)mkdir -p $(_SRCDIR)/files 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 Nov 11 15:48:33 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 11 Nov 2009 14:48:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[7225] csw/mgar/pkg/orca/trunk/Makefile Message-ID: Revision: 7225 http://gar.svn.sourceforge.net/gar/?rev=7225&view=rev Author: dmichelsen Date: 2009-11-11 14:48:33 +0000 (Wed, 11 Nov 2009) Log Message: ----------- orca: Activate startscript Modified Paths: -------------- csw/mgar/pkg/orca/trunk/Makefile Modified: csw/mgar/pkg/orca/trunk/Makefile =================================================================== --- csw/mgar/pkg/orca/trunk/Makefile 2009-11-11 13:12:15 UTC (rev 7224) +++ csw/mgar/pkg/orca/trunk/Makefile 2009-11-11 14:48:33 UTC (rev 7225) @@ -87,8 +87,8 @@ post-install-modulated: @ginstall -d $(DESTDIR)$(sysconfdir)/init.d @# TBD: Use custom manifest for Solaris 10 SMF support - @#ginstall $(WORKDIR)/csworcallator $(DESTDIR)$(sysconfdir)/init.d/csworcallator - @#ginstall $(WORKDIR)/csworca_services $(DESTDIR)$(sysconfdir)/init.d/csworca_services + @ginstall $(WORKDIR)/csworcallator $(DESTDIR)$(sysconfdir)/init.d/csworcallator + @ginstall $(WORKDIR)/csworca_services $(DESTDIR)$(sysconfdir)/init.d/csworca_services @$(MAKE_COOKIE) post-merge: 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 Nov 11 15:53:54 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 11 Nov 2009 14:53:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[7226] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7226 http://gar.svn.sourceforge.net/gar/?rev=7226&view=rev Author: dmichelsen Date: 2009-11-11 14:53:54 +0000 (Wed, 11 Nov 2009) Log Message: ----------- mGAR v2: Add automatic setting of cswtexinfo class Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-11-11 14:48:33 UTC (rev 7225) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-11-11 14:53:54 UTC (rev 7226) @@ -180,6 +180,9 @@ SPKG_CLASSES := $(call _spkg_cond_add,INETDCONF,cswinetd) SPKG_CLASSES := $(call _spkg_cond_add,INITSMF,cswinitsmf) +# This is the default path for texinfo pages to be picked up. Extend or replace as necessary. +TEXINFO ?= $(infodir)/.*\.info(?:-\d+)? $(EXTRA_TEXINFO) + # - set class for all config files ifneq ($(SAMPLECONF)$(PRESERVECONF)$(MIGRATECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),) _CSWCLASS_FILTER = | perl -ane '\ @@ -191,7 +194,9 @@ $(foreach FILE,$(INITSMF),$$F[1] = "cswinitsmf" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(USERGROUP),$$F[1] = "cswusergroup" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(if $(PYCOMPILE),$(foreach FILE,$(_PYCOMPILE_FILES),$$F[1] = "cswpycompile" if( $$F[2] =~ m(^$(FILE)$$) );))\ + $(foreach FILE,$(TEXINFO),$$F[1] = "cswtexinfo" if( $$F[2] =~ m(^$(FILE)$$) );)\ print join(" ", at F),"\n";' + _EXTRA_GAR_PKGS += CSWcswclassutils # Make sure the configuration files always have a .CSW suffix and rename the # configuration files to this if necessary during merge. @@ -405,6 +410,13 @@ # $_EXTRA_GAR_PKGS is for dynamic dependencies added by GAR itself (like CSWisaexec or CSWcswclassutils) .PRECIOUS: $(WORKDIR)/%.depend + +# The texinfo filter has been taken out of the normal filters as TEXINFO has a default. +# The dependencies to CSWcswclassutils and CSWtexinfo are only added if there are files +# actually matching the _TEXINFO_FILTER. This is done at the prototype-level. +$(WORKDIR)/%.depend: $(WORKDIR)/$*.prototype +$(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach FILE,$(TEXINFO),print "$$F[2]\n" if( $$F[2] =~ m(^$(FILE)$$) );)'),CSWcswclassutils) + $(WORKDIR)/%.depend: $(WORKDIR) $(_DBG)$(if $(_EXTRA_GAR_PKGS)$(REQUIRED_PKGS_$*)$(REQUIRED_PKGS)$(INCOMPATIBLE_PKGS)$(INCOMPATIBLE_PKGS_$*), \ ($(foreach PKG,$(INCOMPATIBLE_PKGS_$*) $(INCOMPATIBLE_PKGS),\ @@ -493,7 +505,7 @@ endef define pkgvar -$(if $($(1)_$(2)),$($(1)_$(2)),$($(1))) +$(strip $(if $($(1)_$(2)),$($(1)_$(2)),$($(1)))) endef # Make sure every producable package contains specific descriptions. @@ -505,6 +517,11 @@ ))) .PRECIOUS: $(WORKDIR)/%.pkginfo + +# The texinfo filter has been taken out of the normal filters as TEXINFO has a default. +$(WORKDIR)/%.pkginfo: $(WORKDIR)/%.prototype +$(WORKDIR)/%.pkginfo: SPKG_CLASSES += $(if $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach FILE,$(TEXINFO),print "$$F[2]\n" if( $$F[2] =~ m(^$(FILE)$$) );)'),cswtexinfo) + $(WORKDIR)/%.pkginfo: $(WORKDIR) $(_DBG)(echo "PKG=$*"; \ echo "NAME=$(call catalogname,$*) - $(call pkgvar,SPKG_DESC,$*)"; \ @@ -646,7 +663,7 @@ @$(foreach SPEC,$(_PKG_SPECS),printf " %-20s %s\n" $(SPEC) $(SPKG_EXPORT)/$(shell $(call _PKG_ENV,$(SPEC)) $(GARBIN)/mkpackage -qs $(WORKDIR)/$(SPEC).gspec -D pkgfile).gz;) # The dynamic pkginfo is only generated for dynamic gspec-files -package-%: $(WORKDIR)/%.gspec $(if $(findstring %.gspec,$(DISTFILES)),,$(WORKDIR)/%.pkginfo) $(WORKDIR)/%.prototype-$(GARCH) $(WORKDIR)/%.depend +package-%: $(WORKDIR)/%.gspec $(WORKDIR)/%.prototype-$(GARCH) $(WORKDIR)/%.depend $(if $(findstring %.gspec,$(DISTFILES)),,$(WORKDIR)/%.pkginfo) @echo " ==> Processing $*.gspec" $(_DBG)( $(call _PKG_ENV,$*) mkpackage --spec $(WORKDIR)/$*.gspec \ --spooldir $(SPKG_SPOOLDIR) \ 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 Nov 11 16:05:07 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 11 Nov 2009 15:05:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7227] csw/mgar/pkg/wxwidgets/trunk/Makefile Message-ID: Revision: 7227 http://gar.svn.sourceforge.net/gar/?rev=7227&view=rev Author: dmichelsen Date: 2009-11-11 15:05:07 +0000 (Wed, 11 Nov 2009) Log Message: ----------- wxwidgets: Add dependency to sun libXext Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-11 14:53:54 UTC (rev 7226) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-11 15:05:07 UTC (rev 7227) @@ -88,6 +88,9 @@ CATALOGNAME_CSWwxwidgetsdevel = wxwidgets_devel CATALOGNAME_CSWwxwidgetsgtk2 = wxwidgets_gtk2 TEST_SCRIPTS = + +EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-gtk=2 CONFIGURE_ARGS += --with-gtk-prefix=/opt/csw 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 Nov 11 17:12:13 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 11 Nov 2009 16:12:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[7228] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7228 http://gar.svn.sourceforge.net/gar/?rev=7228&view=rev Author: dmichelsen Date: 2009-11-11 16:12:13 +0000 (Wed, 11 Nov 2009) Log Message: ----------- mGAR v2: Experimental addition of EXTRA_PKGFILES_INCLUDED Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-11-11 15:05:07 UTC (rev 7227) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-11-11 16:12:13 UTC (rev 7228) @@ -377,7 +377,7 @@ -n "$(_PKGFILES_EXCLUDE)" -o \ -n "$(ISAEXEC_FILES_$*)" -o \ -n "$(ISAEXEC_FILES)" ]; then \ - (pathfilter $(if $(or $(_PKGFILES_EXCLUDE),$(_PKGFILES_INCLUDE)),-I $(call licensedir,$*)/license -I /etc/opt/csw/pkg/$*/cswmigrateconf) \ + (pathfilter $(if $(or $(_PKGFILES_EXCLUDE),$(_PKGFILES_INCLUDE)),-I $(call licensedir,$*)/license -I /etc/opt/csw/pkg/$*/cswmigrateconf $(foreach I,$(EXTRA_PKGFILES_INCLUDED) $(EXTRA_PKGFILES_INCLUDED_$*),-I $I)) \ $(foreach S,$(filter-out $*,$(SPKG_SPECS)),-X $(call licensedir,$S)/license -X /etc/opt/csw/pkg/$S/cswmigrateconf) \ $(foreach FILE,$(_PKGFILES_INCLUDE),-i '$(FILE)') \ $(if $(_PKGFILES_INCLUDE),-x '.*',$(foreach FILE,$(_PKGFILES_EXCLUDE),-x '$(FILE)')) \ 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 Nov 11 17:50:27 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 11 Nov 2009 16:50:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7229] csw/mgar/pkg/perl/trunk/Makefile Message-ID: Revision: 7229 http://gar.svn.sourceforge.net/gar/?rev=7229&view=rev Author: bonivart Date: 2009-11-11 16:50:25 +0000 (Wed, 11 Nov 2009) Log Message: ----------- perl: add EXTRA_PKGFILES_EXCLUDED and EXTRA_PKGFILES_INCLUDED Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2009-11-11 16:12:13 UTC (rev 7228) +++ csw/mgar/pkg/perl/trunk/Makefile 2009-11-11 16:50:25 UTC (rev 7229) @@ -116,6 +116,8 @@ EXTRA_MERGE_EXCLUDE_FILES = .*\/perllocal.pod PKGFILES_CSWperldoc = .*\/pod\/.*\.pod .*\/man\/man.\/.* +EXTRA_PKGFILES_EXCLUDED_CSWperldoc = .*\/perldiag.pod +EXTRA_PKGFILES_INCLUDED_CSWperl = .*\/perldiag.pod # Tests take a long time 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 Wed Nov 11 18:30:00 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 11 Nov 2009 17:30:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7230] csw/mgar/pkg/tightvnc/trunk/ Message-ID: Revision: 7230 http://gar.svn.sourceforge.net/gar/?rev=7230&view=rev Author: wahwah Date: 2009-11-11 17:30:00 +0000 (Wed, 11 Nov 2009) Log Message: ----------- tightvnc: adding old-pkgs to the svn:ignore property Property Changed: ---------------- csw/mgar/pkg/tightvnc/trunk/ Property changes on: csw/mgar/pkg/tightvnc/trunk ___________________________________________________________________ Modified: svn:ignore - cookies download work + cookies download work old-pkgs 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 Nov 11 18:32:23 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 11 Nov 2009 17:32:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7231] csw/mgar/pkg/wxwidgets/ Message-ID: Revision: 7231 http://gar.svn.sourceforge.net/gar/?rev=7231&view=rev Author: wahwah Date: 2009-11-11 17:32:23 +0000 (Wed, 11 Nov 2009) Log Message: ----------- wxwidgets: Ignoring a source code directory Property Changed: ---------------- csw/mgar/pkg/wxwidgets/ Property changes on: csw/mgar/pkg/wxwidgets ___________________________________________________________________ Added: svn:ignore + wxWidgets-2.8.10 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 Nov 11 18:58:12 2009 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Wed, 11 Nov 2009 17:58:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7232] csw/mgar/pkg/sdlimage/trunk Message-ID: Revision: 7232 http://gar.svn.sourceforge.net/gar/?rev=7232&view=rev Author: jake_goerzen Date: 2009-11-11 17:58:12 +0000 (Wed, 11 Nov 2009) Log Message: ----------- sdlimage: Changed to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/sdlimage/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/sdlimage/trunk/ Property changes on: csw/mgar/pkg/sdlimage/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/sdlimage/trunk/Makefile =================================================================== --- csw/mgar/pkg/sdlimage/trunk/Makefile 2009-11-11 17:32:23 UTC (rev 7231) +++ csw/mgar/pkg/sdlimage/trunk/Makefile 2009-11-11 17:58:12 UTC (rev 7232) @@ -1,5 +1,5 @@ GARNAME = SDL_image -GARVERSION = 1.2.7 +GARVERSION = 1.2.8 CATEGORIES = lib DESCRIPTION = SDL image file loading library @@ -9,7 +9,6 @@ MASTER_SITES = http://www.libsdl.org/projects/SDL_image/release/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWsdlimage, prototype) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Wed Nov 11 19:58:14 2009 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Wed, 11 Nov 2009 18:58:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[7233] csw/mgar/pkg/sdlimage/trunk Message-ID: Revision: 7233 http://gar.svn.sourceforge.net/gar/?rev=7233&view=rev Author: jake_goerzen Date: 2009-11-11 18:58:14 +0000 (Wed, 11 Nov 2009) Log Message: ----------- update Makefile for mGAR v2 remove files .gspec and .depend Modified Paths: -------------- csw/mgar/pkg/sdlimage/trunk/Makefile csw/mgar/pkg/sdlimage/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/sdlimage/trunk/files/CSWsdlimage.gspec csw/mgar/pkg/sdlimage/trunk/files/CSWsdlimage.prototype Modified: csw/mgar/pkg/sdlimage/trunk/Makefile =================================================================== --- csw/mgar/pkg/sdlimage/trunk/Makefile 2009-11-11 17:58:12 UTC (rev 7232) +++ csw/mgar/pkg/sdlimage/trunk/Makefile 2009-11-11 18:58:14 UTC (rev 7233) @@ -1,4 +1,4 @@ -GARNAME = SDL_image +GARNAME = sdlimage GARVERSION = 1.2.8 CATEGORIES = lib @@ -7,13 +7,15 @@ SDL image library loads images as SDL surfaces, and supports the following formats: BMP, PNM, XPM, LBM, PCX, GIF, JPEG, PNG, TGA. endef +DISTNAME = SDL_image-$(GARVERSION) + MASTER_SITES = http://www.libsdl.org/projects/SDL_image/release/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = SDL_image-$(GARVERSION).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release +REQUIRED_PKGS = CSWlibsdl + UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz CONFIGURE_ARGS = $(DIRPATHS) --disable-static TEST_SCRIPTS = include gar/category.mk - Modified: csw/mgar/pkg/sdlimage/trunk/checksums =================================================================== --- csw/mgar/pkg/sdlimage/trunk/checksums 2009-11-11 17:58:12 UTC (rev 7232) +++ csw/mgar/pkg/sdlimage/trunk/checksums 2009-11-11 18:58:14 UTC (rev 7233) @@ -1,3 +1 @@ -a729ff61f74f0a45ec7fe36354cf938e download/SDL_image-1.2.7.tar.gz -c4a710e474cafa63d2fe24f9b376254c download/CSWsdlimage.gspec -50aad500d2b2d642733542ad8f931e7c download/CSWsdlimage.prototype +2e7c3efa0ec2acc039c46960e27c0792 SDL_image-1.2.8.tar.gz Deleted: csw/mgar/pkg/sdlimage/trunk/files/CSWsdlimage.gspec =================================================================== --- csw/mgar/pkg/sdlimage/trunk/files/CSWsdlimage.gspec 2009-11-11 17:58:12 UTC (rev 7232) +++ csw/mgar/pkg/sdlimage/trunk/files/CSWsdlimage.gspec 2009-11-11 18:58:14 UTC (rev 7233) @@ -1,4 +0,0 @@ -%var bitname sdlimage -%var pkgname CSWsdlimage -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/sdlimage/trunk/files/CSWsdlimage.prototype =================================================================== --- csw/mgar/pkg/sdlimage/trunk/files/CSWsdlimage.prototype 2009-11-11 17:58:12 UTC (rev 7232) +++ csw/mgar/pkg/sdlimage/trunk/files/CSWsdlimage.prototype 2009-11-11 18:58:14 UTC (rev 7233) @@ -1,10 +0,0 @@ -d none /opt/csw/include 0755 root bin -d none /opt/csw/include/SDL 0755 root bin -f none /opt/csw/include/SDL/SDL_image.h 0644 root bin -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libSDL_image-1.2.so.0.1.6 0755 root bin -s none /opt/csw/lib/libSDL_image-1.2.so.0=libSDL_image-1.2.so.0.1.6 -s none /opt/csw/lib/libSDL_image.so=libSDL_image-1.2.so.0.1.6 -i copyright=CSWsdlimage.copyright -i depend=CSWsdlimage.depend -i pkginfo=CSWsdlimage.pkginfo 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 Nov 12 08:54:15 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 12 Nov 2009 07:54:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[7234] csw/mgar/pkg/wxwidgets/trunk/Makefile Message-ID: Revision: 7234 http://gar.svn.sourceforge.net/gar/?rev=7234&view=rev Author: wahwah Date: 2009-11-12 07:54:15 +0000 (Thu, 12 Nov 2009) Log Message: ----------- wxwidgets: Added two more dependent packages Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-11 18:58:14 UTC (rev 7233) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-12 07:54:15 UTC (rev 7234) @@ -56,6 +56,8 @@ REQUIRED_PKGS += CSWiconv REQUIRED_PKGS += CSWjpeg REQUIRED_PKGS += CSWlibatk +REQUIRED_PKGS += CSWlibsm +REQUIRED_PKGS += CSWlibxext REQUIRED_PKGS += CSWmesa REQUIRED_PKGS += CSWpango REQUIRED_PKGS += CSWpng 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 Nov 12 09:26:17 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 12 Nov 2009 08:26:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[7235] csw/mgar/pkg/mbuffer/trunk Message-ID: Revision: 7235 http://gar.svn.sourceforge.net/gar/?rev=7235&view=rev Author: skayser Date: 2009-11-12 08:26:17 +0000 (Thu, 12 Nov 2009) Log Message: ----------- mbuffer: updated to 20091110, still broken Modified Paths: -------------- csw/mgar/pkg/mbuffer/trunk/Makefile csw/mgar/pkg/mbuffer/trunk/checksums Modified: csw/mgar/pkg/mbuffer/trunk/Makefile =================================================================== --- csw/mgar/pkg/mbuffer/trunk/Makefile 2009-11-12 07:54:15 UTC (rev 7234) +++ csw/mgar/pkg/mbuffer/trunk/Makefile 2009-11-12 08:26:17 UTC (rev 7235) @@ -1,20 +1,12 @@ -# TODO -# - sparcv9 (64-bit) tests fail with assertion failures (we have had this before, -# upstream doesn't test 64-bit builds) --> report upstream: -# -# ./mbuffer -q -I :8000 | openssl md5 > test2.md5 & -# sleep 1 -# rm -f test2.tar -# ./mbuffer -i test.tar -o /dev/null -O localhost:8000 -o test2.tar -H -# mbuffer: warning: error connecting localhost:8000: Network is unreachable -# -# mbuffer: warning: error connecting localhost:8000: Network is unreachable -# Assertion failed: (err == 0) && (bsize == sizeof(osize)), file network.c, line 64 -# Assertion failed: (err == 0) && (bsize == sizeof(osize)), file network.c, line 64 -# +# STATUS/TODO +# - 20090628 contained assertion failures in 64-bit code which have been fixed +# with 20091012, 20091012 introduced hickups with non-IPv6 systems when using +# -I / -O (and not explicitly specifying -4) +# - 20091110 does not work on Solaris 8 / 9 any more .. upstream informed +# - 20091110 dumps core on connection refused .. upstream informed GARNAME = mbuffer -GARVERSION = 20091103 +GARVERSION = 20091110 CATEGORIES = utils DESCRIPTION = A tool for buffering data streams @@ -27,19 +19,18 @@ if used correctly and speed up the whole backup process. endef -MASTER_SITES = http://www.maier-komor.de/software/mbuffer/ -DISTFILES = $(GARNAME)-$(GARVERSION).tgz +MASTER_SITES = http://www.maier-komor.de/software/mbuffer/ +DISTFILES = $(GARNAME)-$(GARVERSION).tgz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +SPKG_SOURCEURL = http://www.maier-komor.de/mbuffer.html + LICENSE = LICENSE # Required during packaging (for the "test" target) PREREQUISITE_PKGS = CSWmktemp CSWgcc4core -REQUIRED_PKGS = CSWosslrt +REQUIRED_PKGS = CSWosslrt CSWlibmhash -# We define upstream file regex so we can be notifed of new upstream software -# release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz - # To build the mixed package for x86 you have to do the following # 1) build8x: gmake merge # 2) build10x: gmake merge @@ -55,6 +46,12 @@ TEST_SCRIPTS = custom +# Required for updated libmhash (mbuffer builds against it) which allows for +# flexible const/non-const definitions. There should be a more intelligent +# way to do this than to just put it into every build recipe which requires +# libmhash though ... +EXTRA_CPPFLAGS = -D__const=const + include gar/category.mk # The test scripts do file IO and this is so sloooooow when being run @@ -76,19 +73,10 @@ rm -rf $(TMPDIR) @$(MAKECOOKIE) -# Solaris 10 on build10x has libm.so which points to libm.so.2. libm.so.2 -# is however not available on Solaris 8. So we have to explicitly use -# libm.so.1 during linking and get rid of the -lm reference. Otherwise -# the package check on build8x (when running "gmake package") fails. -post-configure-isa-amd64: - @echo "Patching Makefile to use /lib/64/libm.so.1 instead of -lm" - @perl -pi -e 's#-lm#/lib/64/libm.so.1#' $(WORKSRC)/Makefile - @$(MAKECOOKIE) - post-install-modulated: DOCS = ChangeLog README AUTHORS post-install-modulated: DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME) post-install-modulated: - @ginstall -d $(DOCDEST) - @$(foreach DOC,$(DOCS),cp $(WORKSRC)/$(DOC) $(DOCDEST);) - @cp $(FILEDIR)/changelog.CSW $(DOCDEST) + ginstall -d $(DOCDEST) + $(foreach DOC,$(DOCS),cp $(WORKSRC)/$(DOC) $(DOCDEST);) + cp $(FILEDIR)/changelog.CSW $(DOCDEST) @$(MAKECOOKIE) Modified: csw/mgar/pkg/mbuffer/trunk/checksums =================================================================== --- csw/mgar/pkg/mbuffer/trunk/checksums 2009-11-12 07:54:15 UTC (rev 7234) +++ csw/mgar/pkg/mbuffer/trunk/checksums 2009-11-12 08:26:17 UTC (rev 7235) @@ -1 +1 @@ -c3f8fe27edb333d4df02cbe1d0f5f4f5 download/mbuffer-20091103.tgz +1c2ba8b865c3a26c503bb680810142be mbuffer-20091110.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 Thu Nov 12 10:11:28 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Nov 2009 09:11:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[7236] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7236 http://gar.svn.sourceforge.net/gar/?rev=7236&view=rev Author: dmichelsen Date: 2009-11-12 09:11:28 +0000 (Thu, 12 Nov 2009) Log Message: ----------- mGAR v2: Reorder pathfilter args for EXTRA_PKGFILES_* Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-11-12 08:26:17 UTC (rev 7235) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-11-12 09:11:28 UTC (rev 7236) @@ -283,9 +283,6 @@ $(strip $(foreach S,$(filter-out $(1),$(_PKG_SPECS)), $(PKGFILES_$(S)) - $(EXTRA_PKGFILES_EXCLUDED) - $(EXTRA_PKGFILES_EXCLUDED_$(1)) - $(_EXTRA_PKGFILES_EXCLUDED) ) ) endef @@ -377,8 +374,10 @@ -n "$(_PKGFILES_EXCLUDE)" -o \ -n "$(ISAEXEC_FILES_$*)" -o \ -n "$(ISAEXEC_FILES)" ]; then \ - (pathfilter $(if $(or $(_PKGFILES_EXCLUDE),$(_PKGFILES_INCLUDE)),-I $(call licensedir,$*)/license -I /etc/opt/csw/pkg/$*/cswmigrateconf $(foreach I,$(EXTRA_PKGFILES_INCLUDED) $(EXTRA_PKGFILES_INCLUDED_$*),-I $I)) \ + (pathfilter $(if $(or $(_PKGFILES_EXCLUDE),$(_PKGFILES_INCLUDE)),-I $(call licensedir,$*)/license -I /etc/opt/csw/pkg/$*/cswmigrateconf) \ $(foreach S,$(filter-out $*,$(SPKG_SPECS)),-X $(call licensedir,$S)/license -X /etc/opt/csw/pkg/$S/cswmigrateconf) \ + $(foreach I,$(EXTRA_PKGFILES_INCLUDED) $(EXTRA_PKGFILES_INCLUDED_$*),-i '$I') \ + $(foreach X,$(EXTRA_PKGFILES_EXCLUDED) $(EXTRA_PKGFILES_EXCLUDED_$*),-x '$X') \ $(foreach FILE,$(_PKGFILES_INCLUDE),-i '$(FILE)') \ $(if $(_PKGFILES_INCLUDE),-x '.*',$(foreach FILE,$(_PKGFILES_EXCLUDE),-x '$(FILE)')) \ $(foreach IE,$(abspath $(ISAEXEC_FILES_$*) $(ISAEXEC_FILES)), \ 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 Nov 12 10:13:25 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Nov 2009 09:13:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7237] csw/mgar/pkg/perl/trunk/Makefile Message-ID: Revision: 7237 http://gar.svn.sourceforge.net/gar/?rev=7237&view=rev Author: dmichelsen Date: 2009-11-12 09:13:24 +0000 (Thu, 12 Nov 2009) Log Message: ----------- perl: Clarify inclusion of perldiag.pod to CSWperl instead of docs Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2009-11-12 09:11:28 UTC (rev 7236) +++ csw/mgar/pkg/perl/trunk/Makefile 2009-11-12 09:13:24 UTC (rev 7237) @@ -116,6 +116,9 @@ 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 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 Nov 12 11:00:51 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Nov 2009 10:00:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[7238] csw/mgar/pkg Message-ID: Revision: 7238 http://gar.svn.sourceforge.net/gar/?rev=7238&view=rev Author: dmichelsen Date: 2009-11-12 10:00:50 +0000 (Thu, 12 Nov 2009) Log Message: ----------- xchm: Initial commit Added Paths: ----------- csw/mgar/pkg/xchm/ csw/mgar/pkg/xchm/branches/ csw/mgar/pkg/xchm/tags/ csw/mgar/pkg/xchm/trunk/ csw/mgar/pkg/xchm/trunk/Makefile csw/mgar/pkg/xchm/trunk/checksums csw/mgar/pkg/xchm/trunk/files/ csw/mgar/pkg/xchm/trunk/files/0001-Fix-extra-comma-at-end-of-enum.patch csw/mgar/pkg/xchm/trunk/files/0002-Remove-W-Wall-for-Sun-Studio.patch csw/mgar/pkg/xchm/trunk/files/0003-Use-inttypes.h-instead-of-stdint.h.patch Property changes on: csw/mgar/pkg/xchm/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/xchm/trunk/Makefile =================================================================== --- csw/mgar/pkg/xchm/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xchm/trunk/Makefile 2009-11-12 10:00:50 UTC (rev 7238) @@ -0,0 +1,28 @@ +GARNAME = xchm +GARVERSION = 1.17 +CATEGORIES = utils + +DESCRIPTION = Cross-platform GUI front-end to chmlib (.chm reader) +define BLURB + xCHM is a cross-platform GUI front-end to chmlib, with borrowed bits from Pabs' chmdeco project. + xCHM can show the content tree if one is available, print pages, change font face and size, + remember bookmarks, display a searchable index, and search for words in the current page and the whole book. +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Fix-extra-comma-at-end-of-enum.patch +PATCHFILES += 0002-Remove-W-Wall-for-Sun-Studio.patch +PATCHFILES += 0003-Use-inttypes.h-instead-of-stdint.h.patch + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +REQUIRED_PKGS = CSWchmlib CSWwxwidgetscommon CSWwxwidgetsgtk2 +PREREQUISITE_PKGS = $(REQUIRED_PGKS) CSWwxwidgetsdevel + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_SCRIPTS = + +include gar/category.mk Added: csw/mgar/pkg/xchm/trunk/checksums =================================================================== --- csw/mgar/pkg/xchm/trunk/checksums (rev 0) +++ csw/mgar/pkg/xchm/trunk/checksums 2009-11-12 10:00:50 UTC (rev 7238) @@ -0,0 +1,4 @@ +3dd1f6628a7ecfd1d65f0b93451fad48 0001-Fix-extra-comma-at-end-of-enum.patch +c9e7de423f7a79f280aee0ed3dc3e0f7 0002-Remove-W-Wall-for-Sun-Studio.patch +6b248d3b57a9b479be69a7c8475bdc66 0003-Use-inttypes.h-instead-of-stdint.h.patch +4f34bc046fcc59f1af590d8eb1e08934 xchm-1.17.tar.gz Added: csw/mgar/pkg/xchm/trunk/files/0001-Fix-extra-comma-at-end-of-enum.patch =================================================================== --- csw/mgar/pkg/xchm/trunk/files/0001-Fix-extra-comma-at-end-of-enum.patch (rev 0) +++ csw/mgar/pkg/xchm/trunk/files/0001-Fix-extra-comma-at-end-of-enum.patch 2009-11-12 10:00:50 UTC (rev 7238) @@ -0,0 +1,25 @@ +From f327a8fe2df06b49bb7ad3dcec2f75108bea1e3c Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 12 Nov 2009 10:39:08 +0100 +Subject: [PATCH 1/3] Fix extra comma at end of enum + +--- + src/chmframe.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/chmframe.h b/src/chmframe.h +index 62a3f52..1dc59a1 100644 +--- a/src/chmframe.h ++++ b/src/chmframe.h +@@ -79,7 +79,7 @@ enum + ID_RegisterExtension, + ID_CloseTab, + ID_NewTab, +- ID_TreeCtrl = 1000, ++ ID_TreeCtrl = 1000 + }; + + +-- +1.6.5 + Added: csw/mgar/pkg/xchm/trunk/files/0002-Remove-W-Wall-for-Sun-Studio.patch =================================================================== --- csw/mgar/pkg/xchm/trunk/files/0002-Remove-W-Wall-for-Sun-Studio.patch (rev 0) +++ csw/mgar/pkg/xchm/trunk/files/0002-Remove-W-Wall-for-Sun-Studio.patch 2009-11-12 10:00:50 UTC (rev 7238) @@ -0,0 +1,39 @@ +From 042ab4f6497309a3488d73538f816e9a88c851de Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 12 Nov 2009 10:41:55 +0100 +Subject: [PATCH 2/3] Remove -W -Wall for Sun Studio + +--- + configure | 2 +- + configure.in | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/configure b/configure +index 50a3330..c5da2c9 100755 +--- a/configure ++++ b/configure +@@ -5385,7 +5385,7 @@ wx_config_minor_version=`echo $WX_VERSION | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` + + CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" +-CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY -W -Wall" ++CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY" + CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" + + +diff --git a/configure.in b/configure.in +index 82e4125..6b108d3 100644 +--- a/configure.in ++++ b/configure.in +@@ -34,7 +34,7 @@ wx_config_minor_version=`echo $WX_VERSION | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + + CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" +-CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY -W -Wall" ++CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY" + CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" + + +-- +1.6.5 + Added: csw/mgar/pkg/xchm/trunk/files/0003-Use-inttypes.h-instead-of-stdint.h.patch =================================================================== --- csw/mgar/pkg/xchm/trunk/files/0003-Use-inttypes.h-instead-of-stdint.h.patch (rev 0) +++ csw/mgar/pkg/xchm/trunk/files/0003-Use-inttypes.h-instead-of-stdint.h.patch 2009-11-12 10:00:50 UTC (rev 7238) @@ -0,0 +1,39 @@ +From 514f5e2682428b392fb5027b04f4557a837dbb64 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 12 Nov 2009 10:42:32 +0100 +Subject: [PATCH 3/3] Use inttypes.h instead of stdint.h + +--- + src/bitfiddle.inl | 2 +- + src/chmfile.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/bitfiddle.inl b/src/bitfiddle.inl +index 3edd779..6bbb2ae 100644 +--- a/src/bitfiddle.inl ++++ b/src/bitfiddle.inl +@@ -23,7 +23,7 @@ + + + #include +-#include ++#include + + + #define FIXENDIAN16(x) (x = wxUINT16_SWAP_ON_BE(x)) +diff --git a/src/chmfile.h b/src/chmfile.h +index dc00013..d740d20 100644 +--- a/src/chmfile.h ++++ b/src/chmfile.h +@@ -24,7 +24,7 @@ + #define __CHMFILE_H_ + + #include +-#include ++#include + #include + #include + #include +-- +1.6.5 + 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 Nov 12 12:14:36 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 12 Nov 2009 11:14:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[7239] csw/mgar/pkg/mysql5/branches/mysql-5.0.x Message-ID: Revision: 7239 http://gar.svn.sourceforge.net/gar/?rev=7239&view=rev Author: wahwah Date: 2009-11-12 11:14:36 +0000 (Thu, 12 Nov 2009) Log Message: ----------- mysql5: 5.0 version bump up to 5.0.87 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-11-12 10:00:50 UTC (rev 7238) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-11-12 11:14:36 UTC (rev 7239) @@ -3,7 +3,7 @@ # $Id$ GARNAME = mysql5 -GARVERSION = 5.0.84 +GARVERSION = 5.0.87 CATEGORIES = server DISTNAME = mysql-$(GARVERSION) Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-11-12 10:00:50 UTC (rev 7238) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-11-12 11:14:36 UTC (rev 7239) @@ -8,5 +8,5 @@ e42afb5ec1b1ab02d2ec3b46d0922636 README.CSW aaca748fc044834e71ad544ab293c494 cswmysql5 67228e1f096fe08a94f4267439a4ec36 cswusergroup -671348f1a5b078da9ca76f97e1fda325 mysql-5.0.84.tar.gz +65e6229cc98b6a8d4c5206d7fe16c7be mysql-5.0.87.tar.gz 90b7cfcd11ab56e021a195a6a085fa21 quick_start-csw 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 Nov 12 12:29:27 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Nov 2009 11:29:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7240] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7240 http://gar.svn.sourceforge.net/gar/?rev=7240&view=rev Author: dmichelsen Date: 2009-11-12 11:29:27 +0000 (Thu, 12 Nov 2009) Log Message: ----------- mGAR v2: Fix additional space forcing cswmigrateconf even when empty Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-11-12 11:14:36 UTC (rev 7239) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-11-12 11:29:27 UTC (rev 7240) @@ -165,7 +165,7 @@ $(SPKG_CLASSES) $(if $($(1)),$(if $(filter $(2),$(SPKG_CLASSES)),,$(2))) endef -MIGRATECONF ?= $(foreach S,$(SPKG_SPECS),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),/etc/opt/csw/pkg/$S/cswmigrateconf)) +MIGRATECONF ?= $(strip $(foreach S,$(SPKG_SPECS),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),/etc/opt/csw/pkg/$S/cswmigrateconf))) # NOTE: Order _can_ be important here. cswinitsmf and cswinetd should # always be the last two added. The reason for this is that 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 Nov 12 13:17:41 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 12 Nov 2009 12:17:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[7241] csw/mgar/pkg/perl/trunk/files Message-ID: Revision: 7241 http://gar.svn.sourceforge.net/gar/?rev=7241&view=rev Author: bonivart Date: 2009-11-12 12:17:41 +0000 (Thu, 12 Nov 2009) Log Message: ----------- perl: remove obsolete gspec, depend and prototype files Removed Paths: ------------- csw/mgar/pkg/perl/trunk/files/CSWperl.depend csw/mgar/pkg/perl/trunk/files/CSWperl.gspec csw/mgar/pkg/perl/trunk/files/CSWperl.prototype csw/mgar/pkg/perl/trunk/files/CSWperldoc.depend csw/mgar/pkg/perl/trunk/files/CSWperldoc.gspec csw/mgar/pkg/perl/trunk/files/CSWperldoc.prototype Deleted: csw/mgar/pkg/perl/trunk/files/CSWperl.depend =================================================================== --- csw/mgar/pkg/perl/trunk/files/CSWperl.depend 2009-11-12 11:29:27 UTC (rev 7240) +++ csw/mgar/pkg/perl/trunk/files/CSWperl.depend 2009-11-12 12:17:41 UTC (rev 7241) @@ -1,5 +0,0 @@ -I CSWperlmods -I CSWpmdigest -I CSWpmi18nlangtags -P CSWbdb44 berkeleydb44 - embedded database libraries and utilities -P CSWgdbm gdbm - GNU dbm Deleted: csw/mgar/pkg/perl/trunk/files/CSWperl.gspec =================================================================== --- csw/mgar/pkg/perl/trunk/files/CSWperl.gspec 2009-11-12 11:29:27 UTC (rev 7240) +++ csw/mgar/pkg/perl/trunk/files/CSWperl.gspec 2009-11-12 12:17:41 UTC (rev 7241) @@ -1,4 +0,0 @@ -%var bitname perl -%var pkgname CSWperl -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/Copying Deleted: csw/mgar/pkg/perl/trunk/files/CSWperl.prototype =================================================================== --- csw/mgar/pkg/perl/trunk/files/CSWperl.prototype 2009-11-12 11:29:27 UTC (rev 7240) +++ csw/mgar/pkg/perl/trunk/files/CSWperl.prototype 2009-11-12 12:17:41 UTC (rev 7241) @@ -1,1487 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/a2p 0755 root bin -f none /opt/csw/bin/c2ph 0755 root bin -f none /opt/csw/bin/cpan 0755 root bin -f none /opt/csw/bin/dprofpp 0755 root bin -f none /opt/csw/bin/enc2xs 0755 root bin -f none /opt/csw/bin/find2perl 0755 root bin -f none /opt/csw/bin/h2ph 0755 root bin -f none /opt/csw/bin/h2xs 0755 root bin -f none /opt/csw/bin/instmodsh 0755 root bin -f none /opt/csw/bin/libnetcfg 0755 root bin -f none /opt/csw/bin/perl5.8.8 0755 root bin -l none /opt/csw/bin/perl=perl5.8.8 -f none /opt/csw/bin/perlbug 0755 root bin -f none /opt/csw/bin/perlcc 0755 root bin -f none /opt/csw/bin/perldoc 0755 root bin -f none /opt/csw/bin/perlivp 0755 root bin -f none /opt/csw/bin/piconv 0755 root bin -f none /opt/csw/bin/pl2pm 0755 root bin -f none /opt/csw/bin/pod2html 0755 root bin -f none /opt/csw/bin/pod2latex 0755 root bin -f none /opt/csw/bin/pod2man 0755 root bin -f none /opt/csw/bin/pod2text 0755 root bin -f none /opt/csw/bin/pod2usage 0755 root bin -f none /opt/csw/bin/podchecker 0755 root bin -f none /opt/csw/bin/podselect 0755 root bin -f none /opt/csw/bin/prove 0755 root bin -l none /opt/csw/bin/psed=s2p -l none /opt/csw/bin/pstruct=c2ph -f none /opt/csw/bin/s2p 0755 root bin -f none /opt/csw/bin/splain 0755 root bin -f none /opt/csw/bin/xsubpp 0755 root bin -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libperl.so.5.8.8 0755 root bin -s none /opt/csw/lib/libperl.so.5.8=libperl.so.5.8.8 -s none /opt/csw/lib/libperl.so=libperl.so.5.8.8 -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/5.8.8 0755 root bin -f none /opt/csw/lib/perl/5.8.8/.packlist 0644 root bin -d none /opt/csw/lib/perl/5.8.8/B 0755 root bin -f none /opt/csw/lib/perl/5.8.8/B.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/B/Asmdata.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/B/Assembler.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/B/Bblock.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/B/Bytecode.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/B/C.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/B/CC.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/B/Concise.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/B/Debug.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/B/Deparse.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/B/Disassembler.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/B/Lint.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/B/Showlex.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/B/Stackobj.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/B/Stash.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/B/Terse.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/B/Xref.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/ByteLoader.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/CORE 0755 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/EXTERN.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/INTERN.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/XSUB.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/av.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/cc_runtime.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/config.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/cop.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/cv.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/dosish.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/embed.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/embedvar.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/fakesdio.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/fakethr.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/form.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/gv.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/handy.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/hv.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/intrpvar.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/iperlsys.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/keywords.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/malloc_ctl.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/mg.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/nostdio.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/op.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/opcode.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/opnames.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/pad.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/patchlevel.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/perl.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/perlapi.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/perlio.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/perliol.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/perlsdio.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/perlsfio.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/perlvars.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/perly.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/pp.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/pp_proto.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/proto.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/reentr.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/reentr.inc 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/regcomp.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/regexp.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/regnodes.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/scope.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/sv.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/thrdvar.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/thread.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/uconfig.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/unixish.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/utf8.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/utfebcdic.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/util.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/warnings.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Config.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Config.pod 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Config_heavy.pl 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Cwd.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/DB_File.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/Data 0755 root bin -f none /opt/csw/lib/perl/5.8.8/Data/Dumper.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/Devel 0755 root bin -f none /opt/csw/lib/perl/5.8.8/Devel/DProf.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Devel/PPPort.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Devel/Peek.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/Digest 0755 root bin -f none /opt/csw/lib/perl/5.8.8/Digest/MD5.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/DynaLoader.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/Encode 0755 root bin -f none /opt/csw/lib/perl/5.8.8/Encode.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Encode/Alias.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Encode/Byte.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Encode/CJKConstants.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Encode/CN.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Encode/Config.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Encode/EBCDIC.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Encode/Encoder.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Encode/Encoding.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Encode/Guess.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Encode/JP.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Encode/KR.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Encode/Symbol.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Encode/TW.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Encode/Unicode.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Errno.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Fcntl.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/File 0755 root bin -f none /opt/csw/lib/perl/5.8.8/File/Glob.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/File/Spec 0755 root bin -f none /opt/csw/lib/perl/5.8.8/File/Spec.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/File/Spec/Cygwin.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/File/Spec/Epoc.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/File/Spec/Functions.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/File/Spec/Mac.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/File/Spec/OS2.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/File/Spec/Unix.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/File/Spec/VMS.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/File/Spec/Win32.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/Filter 0755 root bin -d none /opt/csw/lib/perl/5.8.8/Filter/Util 0755 root bin -f none /opt/csw/lib/perl/5.8.8/Filter/Util/Call.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/GDBM_File.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/I18N 0755 root bin -f none /opt/csw/lib/perl/5.8.8/I18N/Langinfo.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/IO 0755 root bin -f none /opt/csw/lib/perl/5.8.8/IO.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/IO/Dir.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/IO/File.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/IO/Handle.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/IO/Pipe.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/IO/Poll.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/IO/Seekable.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/IO/Select.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/IO/Socket.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/IO/Socket 0755 root bin -f none /opt/csw/lib/perl/5.8.8/IO/Socket/INET.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/IO/Socket/UNIX.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/IPC 0755 root bin -f none /opt/csw/lib/perl/5.8.8/IPC/Msg.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/IPC/Semaphore.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/IPC/SysV.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/MIME 0755 root bin -f none /opt/csw/lib/perl/5.8.8/MIME/Base64.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/MIME/QuotedPrint.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/NDBM_File.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/O.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/ODBM_File.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Opcode.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/POSIX.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/POSIX.pod 0444 root bin -d none /opt/csw/lib/perl/5.8.8/PerlIO 0755 root bin -f none /opt/csw/lib/perl/5.8.8/PerlIO/encoding.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/PerlIO/scalar.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/PerlIO/via.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/SDBM_File.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Safe.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Socket.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Storable.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/Sys 0755 root bin -f none /opt/csw/lib/perl/5.8.8/Sys/Hostname.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Sys/Syslog.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/Time 0755 root bin -f none /opt/csw/lib/perl/5.8.8/Time/HiRes.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/Unicode 0755 root bin -f none /opt/csw/lib/perl/5.8.8/Unicode/Normalize.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/XS 0755 root bin -f none /opt/csw/lib/perl/5.8.8/XS/APItest.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/XS/Typemap.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/XSLoader.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/attrs.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/auto 0755 root bin -d none /opt/csw/lib/perl/5.8.8/auto/B 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/B/B.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/B/B.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/B/C 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/B/C/C.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/B/C/C.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/ByteLoader 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/ByteLoader/ByteLoader.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/ByteLoader/ByteLoader.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Cwd 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Cwd/Cwd.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Cwd/Cwd.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/DB_File 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/DB_File/DB_File.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/DB_File/DB_File.so 0555 root bin -f none /opt/csw/lib/perl/5.8.8/auto/DB_File/autosplit.ix 0444 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Data 0755 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Data/Dumper 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Data/Dumper/Dumper.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Data/Dumper/Dumper.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Devel 0755 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Devel/DProf 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Devel/DProf/DProf.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Devel/DProf/DProf.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Devel/PPPort 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Devel/PPPort/PPPort.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Devel/PPPort/PPPort.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Devel/Peek 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Devel/Peek/Peek.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Devel/Peek/Peek.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Digest 0755 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Digest/MD5 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Digest/MD5/MD5.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Digest/MD5/MD5.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/DynaLoader 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/DynaLoader/DynaLoader.a 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/DynaLoader/autosplit.ix 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/DynaLoader/dl_expandspec.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/DynaLoader/dl_find_symbol_anywhere.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/DynaLoader/dl_findfile.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/DynaLoader/extralibs.ld 0444 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Encode 0755 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Encode/Byte 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Encode/Byte/Byte.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Encode/Byte/Byte.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Encode/CN 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Encode/CN/CN.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Encode/CN/CN.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Encode/EBCDIC 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Encode/EBCDIC/EBCDIC.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Encode/EBCDIC/EBCDIC.so 0555 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Encode/Encode.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Encode/Encode.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Encode/JP 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Encode/JP/JP.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Encode/JP/JP.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Encode/KR 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Encode/KR/KR.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Encode/KR/KR.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Encode/Symbol 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Encode/Symbol/Symbol.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Encode/Symbol/Symbol.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Encode/TW 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Encode/TW/TW.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Encode/TW/TW.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Encode/Unicode 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Encode/Unicode/Unicode.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Encode/Unicode/Unicode.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Fcntl 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Fcntl/Fcntl.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Fcntl/Fcntl.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/File 0755 root bin -d none /opt/csw/lib/perl/5.8.8/auto/File/Glob 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/File/Glob/Glob.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/File/Glob/Glob.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Filter 0755 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Filter/Util 0755 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Filter/Util/Call 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Filter/Util/Call/Call.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Filter/Util/Call/Call.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/GDBM_File 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/GDBM_File/GDBM_File.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/GDBM_File/GDBM_File.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/I18N 0755 root bin -d none /opt/csw/lib/perl/5.8.8/auto/I18N/Langinfo 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/I18N/Langinfo/Langinfo.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/I18N/Langinfo/Langinfo.so 0555 root bin -f none /opt/csw/lib/perl/5.8.8/auto/I18N/Langinfo/autosplit.ix 0444 root bin -d none /opt/csw/lib/perl/5.8.8/auto/IO 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/IO/IO.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/IO/IO.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/IPC 0755 root bin -d none /opt/csw/lib/perl/5.8.8/auto/IPC/SysV 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/IPC/SysV/SysV.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/IPC/SysV/SysV.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/List 0755 root bin -d none /opt/csw/lib/perl/5.8.8/auto/List/Util 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/List/Util/Util.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/List/Util/Util.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/MIME 0755 root bin -d none /opt/csw/lib/perl/5.8.8/auto/MIME/Base64 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/MIME/Base64/Base64.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/MIME/Base64/Base64.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/NDBM_File 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/NDBM_File/NDBM_File.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/NDBM_File/NDBM_File.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/ODBM_File 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/ODBM_File/ODBM_File.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/ODBM_File/ODBM_File.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Opcode 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Opcode/Opcode.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Opcode/Opcode.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/POSIX 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/POSIX.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/POSIX.so 0555 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/abs.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/alarm.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/assert.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/atan2.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/atexit.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/atof.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/atoi.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/atol.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/autosplit.ix 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/bsearch.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/calloc.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/chdir.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/chmod.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/chown.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/clearerr.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/closedir.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/cos.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/creat.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/div.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/errno.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/execl.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/execle.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/execlp.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/execv.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/execve.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/execvp.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/exit.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/exp.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fabs.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fclose.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fcntl.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fdopen.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/feof.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/ferror.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fflush.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fgetc.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fgetpos.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fgets.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fileno.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fopen.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fork.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fprintf.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fputc.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fputs.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fread.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/free.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/freopen.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fscanf.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fseek.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fsetpos.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fstat.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fsync.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/ftell.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fwrite.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/getc.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/getchar.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/getegid.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/getenv.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/geteuid.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/getgid.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/getgrgid.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/getgrnam.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/getgroups.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/getlogin.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/getpgrp.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/getpid.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/getppid.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/getpwnam.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/getpwuid.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/gets.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/getuid.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/gmtime.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/isatty.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/kill.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/labs.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/ldiv.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/link.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/load_imports.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/localtime.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/log.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/longjmp.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/malloc.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/memchr.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/memcmp.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/memcpy.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/memmove.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/memset.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/mkdir.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/offsetof.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/opendir.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/perror.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/pow.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/printf.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/putc.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/putchar.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/puts.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/qsort.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/raise.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/rand.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/readdir.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/realloc.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/redef.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/remove.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/rename.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/rewind.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/rewinddir.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/rmdir.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/scanf.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/setbuf.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/setjmp.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/setvbuf.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/siglongjmp.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/sigsetjmp.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/sin.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/sleep.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/sprintf.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/sqrt.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/srand.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/sscanf.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/stat.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/strcat.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/strchr.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/strcmp.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/strcpy.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/strcspn.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/strerror.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/strlen.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/strncat.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/strncmp.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/strncpy.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/strpbrk.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/strrchr.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/strspn.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/strstr.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/strtok.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/system.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/time.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/tmpfile.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/tolower.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/toupper.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/umask.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/ungetc.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/unimpl.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/unlink.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/usage.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/utime.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/vfprintf.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/vprintf.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/vsprintf.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/wait.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/waitpid.al 0444 root bin -d none /opt/csw/lib/perl/5.8.8/auto/PerlIO 0755 root bin -d none /opt/csw/lib/perl/5.8.8/auto/PerlIO/encoding 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/PerlIO/encoding/encoding.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/PerlIO/encoding/encoding.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/PerlIO/scalar 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/PerlIO/scalar/scalar.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/PerlIO/scalar/scalar.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/PerlIO/via 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/PerlIO/via/via.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/PerlIO/via/via.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/SDBM_File 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/SDBM_File/SDBM_File.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/SDBM_File/SDBM_File.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Socket 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Socket/Socket.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Socket/Socket.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Storable 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/CAN_FLOCK.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/Storable.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/Storable.so 0555 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/_freeze.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/_retrieve.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/_store.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/_store_fd.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/autosplit.ix 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/fd_retrieve.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/freeze.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/lock_nstore.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/lock_retrieve.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/lock_store.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/logcarp.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/logcroak.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/nfreeze.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/nstore.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/nstore_fd.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/read_magic.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/retrieve.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/show_file_magic.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/store.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/store_fd.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/thaw.al 0444 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Sys 0755 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Sys/Hostname 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Sys/Hostname/Hostname.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Sys/Hostname/Hostname.so 0555 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Sys/Hostname/autosplit.ix 0444 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Sys/Syslog 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Sys/Syslog/Syslog.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Sys/Syslog/Syslog.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Time 0755 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Time/HiRes 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Time/HiRes/HiRes.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Time/HiRes/HiRes.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Unicode 0755 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Unicode/Normalize 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Unicode/Normalize/Normalize.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Unicode/Normalize/Normalize.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/XS 0755 root bin -d none /opt/csw/lib/perl/5.8.8/auto/XS/APItest 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/XS/APItest/APItest.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/XS/APItest/APItest.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/XS/Typemap 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/XS/Typemap/Typemap.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/XS/Typemap/Typemap.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/attrs 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/attrs/attrs.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/attrs/attrs.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/re 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/re/re.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/re/re.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/sdbm 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/sdbm/extralibs.ld 0444 root bin -d none /opt/csw/lib/perl/5.8.8/auto/threads 0755 root bin -d none /opt/csw/lib/perl/5.8.8/auto/threads/shared 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/threads/shared/shared.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/threads/shared/shared.so 0555 root bin -f none /opt/csw/lib/perl/5.8.8/auto/threads/threads.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/threads/threads.so 0555 root bin -f none /opt/csw/lib/perl/5.8.8/encoding.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/lib.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/ops.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/re.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/threads 0755 root bin -f none /opt/csw/lib/perl/5.8.8/threads.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/threads/shared.pm 0444 root bin -d none /opt/csw/lib/perl/site_perl 0755 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/a2p.1 0644 root bin -l none /opt/csw/share/man/man1/c2ph.1=pstruct.1 -f none /opt/csw/share/man/man1/cpan.1 0644 root bin -f none /opt/csw/share/man/man1/dprofpp.1 0644 root bin -f none /opt/csw/share/man/man1/enc2xs.1 0644 root bin -f none /opt/csw/share/man/man1/find2perl.1 0644 root bin -f none /opt/csw/share/man/man1/h2ph.1 0644 root bin -f none /opt/csw/share/man/man1/h2xs.1 0644 root bin -f none /opt/csw/share/man/man1/perl.1 0644 root bin -f none /opt/csw/share/man/man1/perlbug.1 0644 root bin -f none /opt/csw/share/man/man1/perlcc.1 0644 root bin -f none /opt/csw/share/man/man1/perldoc.1 0644 root bin -f none /opt/csw/share/man/man1/perlivp.1 0644 root bin -f none /opt/csw/share/man/man1/piconv.1 0644 root bin -f none /opt/csw/share/man/man1/pl2pm.1 0644 root bin -f none /opt/csw/share/man/man1/pod2html.1 0644 root bin -f none /opt/csw/share/man/man1/pod2latex.1 0644 root bin -f none /opt/csw/share/man/man1/pod2man.1 0644 root bin -f none /opt/csw/share/man/man1/pod2text.1 0644 root bin -f none /opt/csw/share/man/man1/pod2usage.1 0644 root bin -f none /opt/csw/share/man/man1/podchecker.1 0644 root bin -f none /opt/csw/share/man/man1/podselect.1 0644 root bin -f none /opt/csw/share/man/man1/prove.1 0644 root bin -f none /opt/csw/share/man/man1/psed.1 0644 root bin -f none /opt/csw/share/man/man1/pstruct.1 0644 root bin -l none /opt/csw/share/man/man1/s2p.1=psed.1 -f none /opt/csw/share/man/man1/splain.1 0644 root bin -f none /opt/csw/share/man/man1/xsubpp.1 0644 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/5.8.8 0755 root bin -f none /opt/csw/share/perl/5.8.8/AnyDBM_File.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Attribute 0755 root bin -f none /opt/csw/share/perl/5.8.8/Attribute/Handlers.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/AutoLoader.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/AutoSplit.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/B 0755 root bin -f none /opt/csw/share/perl/5.8.8/B/assemble 0444 root bin -f none /opt/csw/share/perl/5.8.8/B/cc_harness 0444 root bin -f none /opt/csw/share/perl/5.8.8/B/disassemble 0444 root bin -f none /opt/csw/share/perl/5.8.8/B/makeliblinks 0444 root bin -f none /opt/csw/share/perl/5.8.8/Benchmark.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/CGI 0755 root bin -f none /opt/csw/share/perl/5.8.8/CGI.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/CGI/Apache.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/CGI/Carp.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/CGI/Cookie.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/CGI/Fast.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/CGI/Pretty.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/CGI/Push.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/CGI/Switch.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/CGI/Util.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/CPAN 0755 root bin -f none /opt/csw/share/perl/5.8.8/CPAN.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/CPAN/FirstTime.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/CPAN/Nox.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/CPAN/PAUSE2003.pub 0444 root bin -f none /opt/csw/share/perl/5.8.8/CPAN/SIGNATURE 0444 root bin -d none /opt/csw/share/perl/5.8.8/Carp 0755 root bin -f none /opt/csw/share/perl/5.8.8/Carp.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Carp/Heavy.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Class 0755 root bin -f none /opt/csw/share/perl/5.8.8/Class/ISA.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Class/Struct.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/DB.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/DBM_Filter 0755 root bin -f none /opt/csw/share/perl/5.8.8/DBM_Filter.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/DBM_Filter/compress.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/DBM_Filter/encode.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/DBM_Filter/int32.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/DBM_Filter/null.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/DBM_Filter/utf8.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Devel 0755 root bin -f none /opt/csw/share/perl/5.8.8/Devel/SelfStubber.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Digest 0755 root bin -f none /opt/csw/share/perl/5.8.8/Digest.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Digest/base.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Digest/file.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/DirHandle.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Dumpvalue.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Encode 0755 root bin -d none /opt/csw/share/perl/5.8.8/Encode/CN 0755 root bin -f none /opt/csw/share/perl/5.8.8/Encode/CN/HZ.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Encode/Changes.e2x 0444 root bin -f none /opt/csw/share/perl/5.8.8/Encode/ConfigLocal_PM.e2x 0444 root bin -d none /opt/csw/share/perl/5.8.8/Encode/JP 0755 root bin -f none /opt/csw/share/perl/5.8.8/Encode/JP/H2Z.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Encode/JP/JIS7.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Encode/KR 0755 root bin -f none /opt/csw/share/perl/5.8.8/Encode/KR/2022_KR.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Encode/MIME 0755 root bin -d none /opt/csw/share/perl/5.8.8/Encode/MIME/Header 0755 root bin -f none /opt/csw/share/perl/5.8.8/Encode/MIME/Header.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Encode/MIME/Header/ISO_2022_JP.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Encode/Makefile_PL.e2x 0444 root bin -f none /opt/csw/share/perl/5.8.8/Encode/PerlIO.pod 0444 root bin -f none /opt/csw/share/perl/5.8.8/Encode/README.e2x 0444 root bin -f none /opt/csw/share/perl/5.8.8/Encode/Supported.pod 0444 root bin -d none /opt/csw/share/perl/5.8.8/Encode/Unicode 0755 root bin -f none /opt/csw/share/perl/5.8.8/Encode/Unicode/UTF7.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Encode/_PM.e2x 0444 root bin -f none /opt/csw/share/perl/5.8.8/Encode/_T.e2x 0444 root bin -f none /opt/csw/share/perl/5.8.8/Encode/encode.h 0444 root bin -f none /opt/csw/share/perl/5.8.8/English.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Env.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Exporter 0755 root bin -f none /opt/csw/share/perl/5.8.8/Exporter.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Exporter/Heavy.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/ExtUtils 0755 root bin -d none /opt/csw/share/perl/5.8.8/ExtUtils/Command 0755 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/Command.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/Command/MM.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/ExtUtils/Constant 0755 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/Constant.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/Constant/Base.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/Constant/Utils.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/Constant/XS.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/Embed.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/Install.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/Installed.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/ExtUtils/Liblist 0755 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/Liblist.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/Liblist/Kid.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MANIFEST.SKIP 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MM.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MM_AIX.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MM_Any.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MM_BeOS.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MM_Cygwin.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MM_DOS.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MM_MacOS.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MM_NW5.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MM_OS2.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MM_QNX.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MM_UWIN.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MM_Unix.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MM_VMS.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MM_VOS.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MM_Win32.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MM_Win95.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MY.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/ExtUtils/MakeMaker 0755 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MakeMaker.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MakeMaker/Config.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MakeMaker/FAQ.pod 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MakeMaker/Tutorial.pod 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MakeMaker/bytes.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MakeMaker/vmsish.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/Manifest.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/Miniperl.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/Mkbootstrap.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/Mksymlists.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/NOTES 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/PATCHING 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/Packlist.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/testlib.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/typemap 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/xsubpp 0444 root bin -f none /opt/csw/share/perl/5.8.8/Fatal.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/File 0755 root bin -f none /opt/csw/share/perl/5.8.8/File/Basename.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/File/CheckTree.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/File/Compare.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/File/Copy.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/File/DosGlob.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/File/Find.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/File/Path.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/File/Temp.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/File/stat.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/FileCache.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/FileHandle.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Filter 0755 root bin -f none /opt/csw/share/perl/5.8.8/Filter/Simple.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/FindBin.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Getopt 0755 root bin -f none /opt/csw/share/perl/5.8.8/Getopt/Long.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Getopt/Std.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Hash 0755 root bin -f none /opt/csw/share/perl/5.8.8/Hash/Util.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/I18N 0755 root bin -f none /opt/csw/share/perl/5.8.8/I18N/Collate.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/I18N/LangTags 0755 root bin -f none /opt/csw/share/perl/5.8.8/I18N/LangTags.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/I18N/LangTags/Detect.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/I18N/LangTags/List.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/IPC 0755 root bin -f none /opt/csw/share/perl/5.8.8/IPC/Open2.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/IPC/Open3.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/List 0755 root bin -f none /opt/csw/share/perl/5.8.8/List/Util.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Locale 0755 root bin -f none /opt/csw/share/perl/5.8.8/Locale/Constants.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Locale/Constants.pod 0444 root bin -f none /opt/csw/share/perl/5.8.8/Locale/Country.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Locale/Country.pod 0444 root bin -f none /opt/csw/share/perl/5.8.8/Locale/Currency.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Locale/Currency.pod 0444 root bin -f none /opt/csw/share/perl/5.8.8/Locale/Language.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Locale/Language.pod 0444 root bin -d none /opt/csw/share/perl/5.8.8/Locale/Maketext 0755 root bin -f none /opt/csw/share/perl/5.8.8/Locale/Maketext.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Locale/Maketext.pod 0444 root bin -f none /opt/csw/share/perl/5.8.8/Locale/Maketext/Guts.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Locale/Maketext/GutsLoader.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Locale/Maketext/TPJ13.pod 0444 root bin -f none /opt/csw/share/perl/5.8.8/Locale/Script.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Locale/Script.pod 0444 root bin -d none /opt/csw/share/perl/5.8.8/Math 0755 root bin -d none /opt/csw/share/perl/5.8.8/Math/BigFloat 0755 root bin -f none /opt/csw/share/perl/5.8.8/Math/BigFloat.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Math/BigFloat/Trace.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Math/BigInt 0755 root bin -f none /opt/csw/share/perl/5.8.8/Math/BigInt.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Math/BigInt/Calc.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Math/BigInt/CalcEmu.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Math/BigInt/Trace.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Math/BigRat.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Math/Complex.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Math/Trig.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Memoize 0755 root bin -f none /opt/csw/share/perl/5.8.8/Memoize.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Memoize/AnyDBM_File.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Memoize/Expire.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Memoize/ExpireFile.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Memoize/ExpireTest.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Memoize/NDBM_File.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Memoize/SDBM_File.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Memoize/Storable.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/NEXT.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Net 0755 root bin -f none /opt/csw/share/perl/5.8.8/Net/Cmd.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/Config.eg 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/Config.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/Domain.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Net/FTP 0755 root bin -f none /opt/csw/share/perl/5.8.8/Net/FTP.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/FTP/A.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/FTP/E.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/FTP/I.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/FTP/L.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/FTP/dataconn.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/Hostname.eg 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/NNTP.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/Netrc.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/POP3.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/Ping.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/SMTP.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/Time.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/hostent.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/libnetFAQ.pod 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/netent.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/protoent.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/servent.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/PerlIO 0755 root bin -f none /opt/csw/share/perl/5.8.8/PerlIO.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/PerlIO/via 0755 root bin -f none /opt/csw/share/perl/5.8.8/PerlIO/via/QuotedPrint.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Pod 0755 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Checker.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Find.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Functions.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Html.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/InputObjects.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/LaTeX.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Man.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/ParseLink.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/ParseUtils.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Parser.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Pod/Perldoc 0755 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Perldoc.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Perldoc/BaseTo.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Perldoc/GetOptsOO.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Perldoc/ToChecker.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Perldoc/ToMan.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Perldoc/ToNroff.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Perldoc/ToPod.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Perldoc/ToRtf.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Perldoc/ToText.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Perldoc/ToTk.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Perldoc/ToXml.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/PlainText.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Plainer.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Select.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Pod/Text 0755 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Text.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Text/Color.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Text/Overstrike.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Text/Termcap.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Usage.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Scalar 0755 root bin -f none /opt/csw/share/perl/5.8.8/Scalar/Util.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Search 0755 root bin -f none /opt/csw/share/perl/5.8.8/Search/Dict.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/SelectSaver.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/SelfLoader.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Shell.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Switch.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Symbol.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Term 0755 root bin -f none /opt/csw/share/perl/5.8.8/Term/ANSIColor.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Term/Cap.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Term/Complete.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Term/ReadLine.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Test 0755 root bin -f none /opt/csw/share/perl/5.8.8/Test.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Test/Builder 0755 root bin -f none /opt/csw/share/perl/5.8.8/Test/Builder.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Test/Builder/Module.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Test/Builder/Tester 0755 root bin -f none /opt/csw/share/perl/5.8.8/Test/Builder/Tester.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Test/Builder/Tester/Color.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Test/Harness 0755 root bin -f none /opt/csw/share/perl/5.8.8/Test/Harness.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Test/Harness/Assert.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Test/Harness/Iterator.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Test/Harness/Point.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Test/Harness/Straps.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Test/Harness/TAP.pod 0444 root bin -f none /opt/csw/share/perl/5.8.8/Test/More.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Test/Simple.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Test/Tutorial.pod 0444 root bin -d none /opt/csw/share/perl/5.8.8/Text 0755 root bin -f none /opt/csw/share/perl/5.8.8/Text/Abbrev.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Text/Balanced.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Text/ParseWords.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Text/Soundex.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Text/Tabs.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Text/Wrap.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Thread 0755 root bin -f none /opt/csw/share/perl/5.8.8/Thread.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Thread/Queue.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Thread/Semaphore.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Tie 0755 root bin -f none /opt/csw/share/perl/5.8.8/Tie/Array.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Tie/File.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Tie/Handle.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Tie/Hash.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Tie/Memoize.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Tie/RefHash.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Tie/Scalar.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Tie/SubstrHash.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Time 0755 root bin -f none /opt/csw/share/perl/5.8.8/Time/Local.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Time/gmtime.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Time/localtime.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Time/tm.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/UNIVERSAL.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Unicode 0755 root bin -d none /opt/csw/share/perl/5.8.8/Unicode/Collate 0755 root bin -f none /opt/csw/share/perl/5.8.8/Unicode/Collate.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Unicode/Collate/keys.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/Unicode/UCD.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/User 0755 root bin -f none /opt/csw/share/perl/5.8.8/User/grent.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/User/pwent.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/abbrev.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/assert.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/attributes.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/auto 0755 root bin -d none /opt/csw/share/perl/5.8.8/auto/POSIX 0755 root bin -d none /opt/csw/share/perl/5.8.8/auto/POSIX/SigAction 0755 root bin -f none /opt/csw/share/perl/5.8.8/auto/POSIX/SigAction/flags.al 0444 root bin -f none /opt/csw/share/perl/5.8.8/auto/POSIX/SigAction/handler.al 0444 root bin -f none /opt/csw/share/perl/5.8.8/auto/POSIX/SigAction/mask.al 0444 root bin -f none /opt/csw/share/perl/5.8.8/auto/POSIX/SigAction/safe.al 0444 root bin -f none /opt/csw/share/perl/5.8.8/autouse.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/base.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/bigfloat.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/bigint.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/bigint.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/bignum.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/bigrat.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/bigrat.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/blib.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/bytes.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/bytes_heavy.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/cacheout.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/charnames.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/complete.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/constant.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ctime.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/dbm_filter_util.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/diagnostics.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/dotsh.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/dumpvar.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/exceptions.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/fastcwd.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/fields.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/filetest.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/find.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/finddepth.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/flush.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/getcwd.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/getopt.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/getopts.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/hostname.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/if.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/importenv.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/integer.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/less.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/locale.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/look.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/newgetopt.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/open.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/open2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/open3.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/overload.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/perl5db.pl 0444 root bin -d none /opt/csw/share/perl/5.8.8/pod 0755 root bin -f none /opt/csw/share/perl/5.8.8/pod/perldiag.pod 0644 root bin -f none /opt/csw/share/perl/5.8.8/pwd.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/shellwords.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/sigtrap.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/sort.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/stat.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/strict.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/subs.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/syslog.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/tainted.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/termcap.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/timelocal.pl 0444 root bin -d none /opt/csw/share/perl/5.8.8/unicore 0755 root bin -f none /opt/csw/share/perl/5.8.8/unicore/ArabicShaping.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/BidiMirroring.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/Blocks.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/Canonical.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/CaseFolding.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/CombiningClass.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/CompositionExclusions.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/Decomposition.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/EastAsianWidth.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/Exact.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/HangulSyllableType.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/Index.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/Jamo.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/LineBreak.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/Name.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/NamedSequences.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/NamesList.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/NormalizationCorrections.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/PVA.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/PropList.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/PropValueAliases.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/Properties 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/PropertyAliases.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/ReadMe.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/Scripts.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/SpecialCasing.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/StandardizedVariants.txt 0444 root bin -d none /opt/csw/share/perl/5.8.8/unicore/To 0755 root bin -f none /opt/csw/share/perl/5.8.8/unicore/To/Digit.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/To/Fold.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/To/Lower.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/To/Title.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/To/Upper.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/UnicodeData.txt 0444 root bin -d none /opt/csw/share/perl/5.8.8/unicore/lib 0755 root bin -d none /opt/csw/share/perl/5.8.8/unicore/lib/bc 0755 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/AL.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/AN.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/B.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/BN.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/CS.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/EN.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/ES.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/ET.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/L.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/LRE.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/LRO.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/NSM.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/ON.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/PDF.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/R.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/RLE.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/RLO.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/S.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/WS.pl 0444 root bin -d none /opt/csw/share/perl/5.8.8/unicore/lib/ccc 0755 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/A.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/AL.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/AR.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/ATAR.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/ATB.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/ATBL.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/B.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/BL.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/BR.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/DA.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/DB.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/IS.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/KV.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/L.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/NK.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/NR.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/OV.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/R.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/VR.pl 0444 root bin -d none /opt/csw/share/perl/5.8.8/unicore/lib/dt 0755 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/dt/can.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/dt/com.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/dt/enc.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/dt/fin.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/dt/font.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/dt/fra.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/dt/init.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/dt/iso.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/dt/med.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/dt/nar.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/dt/nb.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/dt/sml.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/dt/sqr.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/dt/sub.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/dt/sup.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/dt/vert.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/dt/wide.pl 0444 root bin -d none /opt/csw/share/perl/5.8.8/unicore/lib/ea 0755 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ea/A.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ea/F.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ea/H.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ea/N.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ea/Na.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ea/W.pl 0444 root bin -d none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc 0755 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/AHex.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/ASCII.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Alnum.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Alpha.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Alphabet.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Any.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Arab.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Armn.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/AsciiHex.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Assigned.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Beng.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/BidiC.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/BidiCont.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Blank.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Bopo.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Brai.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Bugi.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Buhd.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/C.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Canadian.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Cc.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Cf.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Cher.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Cn.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Cntrl.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Co.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Copt.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Cprt.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Cs.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Cyrl.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Dash.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Dash2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Dep.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Deprecat.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Deva.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Dia.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Diacriti.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Digit.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Dsrt.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Ethi.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Ext.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Extender.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Geor.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Glag.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Goth.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/GrLink.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Graph.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Grapheme.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Grek.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Gujr.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Guru.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Hang.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Hani.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Hano.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Hebr.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Hex.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/HexDigit.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Hira.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Hyphen.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Hyphen2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/IDSB.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/IDST.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/IdContin.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/IdStart.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Ideo.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Ideograp.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/IdsBinar.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/IdsTrina.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InAegean.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InAlphab.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InAncie2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InAncien.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InArabi2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InArabi3.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InArabi4.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InArabic.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InArmeni.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InArrows.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InBasicL.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InBengal.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InBlockE.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InBopom2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InBopomo.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InBoxDra.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InBraill.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InBugine.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InBuhid.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InByzant.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCherok.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCjkCo2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCjkCo3.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCjkCo4.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCjkCom.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCjkRad.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCjkStr.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCjkSym.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCjkUn2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCjkUn3.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCjkUni.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCombi2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCombi3.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCombi4.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCombin.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InContro.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCoptic.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCurren.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCyprio.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCyril2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCyrill.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InDesere.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InDevana.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InDingba.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InEnclo2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InEnclos.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InEthio2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InEthio3.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InEthiop.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InGenera.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InGeomet.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InGeorg2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InGeorgi.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InGlagol.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InGothic.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InGreekA.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InGreekE.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InGujara.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InGurmuk.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InHalfwi.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InHangu2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InHangu3.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InHangul.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InHanuno.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InHebrew.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InHighPr.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InHighSu.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InHiraga.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InIdeogr.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InIpaExt.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InKanbun.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InKangxi.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InKannad.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InKatak2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InKataka.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InKharos.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InKhmer.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InKhmerS.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InLao.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InLatin1.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InLatin2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InLatin3.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InLatinE.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InLetter.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InLimbu.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InLinea2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InLinear.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InLowSur.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InMalaya.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InMathe2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InMathem.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InMisce2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InMisce3.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InMisce4.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InMisce5.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InMiscel.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InModifi.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InMongol.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InMusica.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InMyanma.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InNewTai.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InNumber.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InOgham.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InOldIta.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InOldPer.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InOptica.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InOriya.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InOsmany.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InPhone2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InPhonet.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InPrivat.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InRunic.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InShavia.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InSinhal.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InSmallF.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InSpacin.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InSpecia.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InSupers.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InSuppl2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InSuppl3.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InSuppl4.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InSuppl5.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InSuppl6.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InSupple.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InSyloti.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InSyriac.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InTagalo.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InTagban.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InTags.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InTaiLe.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InTaiXua.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InTamil.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InTelugu.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InThaana.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InThai.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InTibeta.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InTifina.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InUgarit.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InUnifie.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InVaria2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InVariat.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InVertic.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InYiRadi.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InYiSyll.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InYijing.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/JoinC.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/JoinCont.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Kana.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Khar.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Khmr.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Knda.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/L.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/LC.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/LOE.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Laoo.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Latn.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Limb.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/LinearB.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Ll.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Lm.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Lo.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/LogicalO.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Lower.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Lowercas.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Lt.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Lu.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/M.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Math.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Mc.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Me.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Mlym.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Mn.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Mong.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Mymr.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/N.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/NChar.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Nd.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/NewTaiLu.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Nl.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/No.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Nonchara.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/OAlpha.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/ODI.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/OGrExt.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/OIDC.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/OIDS.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/OLower.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/OMath.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/OUpper.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Ogam.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/OldItali.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/OldPersi.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Orya.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Osma.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/OtherAlp.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/OtherDef.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/OtherGra.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/OtherIdC.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/OtherIdS.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/OtherLow.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/OtherMat.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/OtherUpp.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/P.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/PatSyn.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/PatWS.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/PatternS.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/PatternW.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Pc.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Pd.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Pe.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Pf.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Pi.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Po.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Print.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Ps.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Punct.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/QMark.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Qaai.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Quotatio.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Radical.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Radical2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Runr.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/S.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/SD.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/STerm.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Sc.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Shaw.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Sinh.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Sk.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Sm.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/So.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/SoftDott.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Space.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/SpacePer.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Sterm2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/SylotiNa.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Syrc.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Tagb.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/TaiLe.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Taml.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Telu.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Term.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Terminal.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Tfng.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Tglg.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Thaa.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Thai.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Tibt.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Title.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/UIdeo.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Ugar.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/UnifiedI.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Upper.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Uppercas.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/VS.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Variatio.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/WSpace.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/WhiteSpa.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Word.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/XDigit.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Yiii.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Z.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Zl.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Zp.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Zs.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Zyyy.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/_CanonDC.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/_CaseIgn.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/_CombAbo.pl 0444 root bin -d none /opt/csw/share/perl/5.8.8/unicore/lib/hst 0755 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/hst/L.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/hst/LV.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/hst/LVT.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/hst/T.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/hst/V.pl 0444 root bin -d none /opt/csw/share/perl/5.8.8/unicore/lib/jt 0755 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/jt/C.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/jt/D.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/jt/R.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/jt/U.pl 0444 root bin -d none /opt/csw/share/perl/5.8.8/unicore/lib/lb 0755 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/AI.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/AL.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/B2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/BA.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/BB.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/BK.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/CB.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/CL.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/CM.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/CR.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/EX.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/GL.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/H2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/H3.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/HY.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/ID.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/IN.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/IS.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/JL.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/JT.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/JV.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/LF.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/NL.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/NS.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/NU.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/OP.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/PO.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/PR.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/QU.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/SA.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/SG.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/SP.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/SY.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/WJ.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/XX.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/ZW.pl 0444 root bin -d none /opt/csw/share/perl/5.8.8/unicore/lib/nt 0755 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/nt/De.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/nt/Di.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/nt/Nu.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/mktables 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/mktables.lst 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/version 0444 root bin -f none /opt/csw/share/perl/5.8.8/utf8.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/utf8_heavy.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/validate.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/vars.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/vmsish.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/warnings 0755 root bin -f none /opt/csw/share/perl/5.8.8/warnings.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/warnings/register.pm 0444 root bin Deleted: csw/mgar/pkg/perl/trunk/files/CSWperldoc.depend =================================================================== --- csw/mgar/pkg/perl/trunk/files/CSWperldoc.depend 2009-11-12 11:29:27 UTC (rev 7240) +++ csw/mgar/pkg/perl/trunk/files/CSWperldoc.depend 2009-11-12 12:17:41 UTC (rev 7241) @@ -1 +0,0 @@ -P CSWperl perl - A high-level, general-purpose programming language. Deleted: csw/mgar/pkg/perl/trunk/files/CSWperldoc.gspec =================================================================== --- csw/mgar/pkg/perl/trunk/files/CSWperldoc.gspec 2009-11-12 11:29:27 UTC (rev 7240) +++ csw/mgar/pkg/perl/trunk/files/CSWperldoc.gspec 2009-11-12 12:17:41 UTC (rev 7241) @@ -1,6 +0,0 @@ -%var bitname perldoc -%var pkgname CSWperldoc -%var arch all -%include url file://%{PKGLIB}/csw_standard.gspec -%var desc Perl documentation -%copyright url file://%{WORKSRC}/Copying Deleted: csw/mgar/pkg/perl/trunk/files/CSWperldoc.prototype =================================================================== --- csw/mgar/pkg/perl/trunk/files/CSWperldoc.prototype 2009-11-12 11:29:27 UTC (rev 7240) +++ csw/mgar/pkg/perl/trunk/files/CSWperldoc.prototype 2009-11-12 12:17:41 UTC (rev 7241) @@ -1,641 +0,0 @@ -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/instmodsh.1 0644 root bin -f none /opt/csw/share/man/man1/libnetcfg.1 0644 root bin -f none /opt/csw/share/man/man1/perl5004delta.1 0644 root bin -f none /opt/csw/share/man/man1/perl5005delta.1 0644 root bin @@ 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 bonivart at users.sourceforge.net Thu Nov 12 14:56:34 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 12 Nov 2009 13:56:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[7242] csw/mgar/pkg/perl/trunk/Makefile Message-ID: Revision: 7242 http://gar.svn.sourceforge.net/gar/?rev=7242&view=rev Author: bonivart Date: 2009-11-12 13:56:34 +0000 (Thu, 12 Nov 2009) Log Message: ----------- perl: add I-deps Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2009-11-12 12:17:41 UTC (rev 7241) +++ csw/mgar/pkg/perl/trunk/Makefile 2009-11-12 13:56:34 UTC (rev 7242) @@ -21,6 +21,7 @@ ARCHALL_CSWperldoc = 1 REQUIRED_PKGS_CSWperl = CSWbdb47 CSWgdbm REQUIRED_PKGS_CSWperldoc = CSWperl +INCOMPATIBLE_PKGS_CSWperl = CSWperlmods CSWpmdigest CSWpmi18nlangtags SPKG_DESC_CSWperl = $(DESCRIPTION) SPKG_DESC_CSWperldoc = Perl 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 Thu Nov 12 16:04:29 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Nov 2009 15:04:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[7243] csw/mgar/pkg/wireshark/trunk Message-ID: Revision: 7243 http://gar.svn.sourceforge.net/gar/?rev=7243&view=rev Author: dmichelsen Date: 2009-11-12 15:04:29 +0000 (Thu, 12 Nov 2009) Log Message: ----------- wireshark: Some more fixes Modified Paths: -------------- csw/mgar/pkg/wireshark/trunk/Makefile csw/mgar/pkg/wireshark/trunk/checksums Modified: csw/mgar/pkg/wireshark/trunk/Makefile =================================================================== --- csw/mgar/pkg/wireshark/trunk/Makefile 2009-11-12 13:56:34 UTC (rev 7242) +++ csw/mgar/pkg/wireshark/trunk/Makefile 2009-11-12 15:04:29 UTC (rev 7243) @@ -1,9 +1,12 @@ GARNAME = wireshark -GARVERSION = 1.2.2 +GARVERSION = 1.2.3 CATEGORIES = apps DESCRIPTION = Wireshark (was Ethereal) is a free network protocol analyzer define BLURB + Wireshark is the world's foremost network protocol analyzer, and is the + de facto (and often de jure) standard across many industries and + educational institutions. endef MASTER_SITES = $(SF_MIRRORS) @@ -17,7 +20,11 @@ #SED = /opt/csw/bin/gsed #EXTRA_COMMON_EXPORTS = SED -EXTRA_INC = /opt/csw/include/gtk-2.0 +#EXTRA_INC = $(prefix)/X11/include +#EXTRA_LIB = $(prefix)/X11/lib +#EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +EXTRA_INC += /opt/csw/include/gtk-2.0 EXTRA_INC += /opt/csw/lib/gtk-2.0/include EXTRA_INC += /opt/csw/include/glib-2.0 EXTRA_INC += /opt/csw/lib/glib-2.0/include @@ -25,7 +32,7 @@ EXTRA_INC += /opt/csw/include/pango-1.0 EXTRA_INC += /opt/csw/include/atk-1.0 -EXTRA_LINKER_FLAGS = -lgtk-x11-2.0 +EXTRA_LINKER_FLAGS = -lgtk-x11-2.0 -lX11 /usr/openwin/lib/libXext.so CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/wireshark/trunk/checksums =================================================================== --- csw/mgar/pkg/wireshark/trunk/checksums 2009-11-12 13:56:34 UTC (rev 7242) +++ csw/mgar/pkg/wireshark/trunk/checksums 2009-11-12 15:04:29 UTC (rev 7243) @@ -1 +1 @@ -bb5c09b8cffd461ced4d3251fddb217b wireshark-1.2.2.tar.bz2 +c2dfc197e485a0b0072ca64b8ac4d24c wireshark-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 Thu Nov 12 16:09:10 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Nov 2009 15:09:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7244] csw/mgar/gar/v2 Message-ID: Revision: 7244 http://gar.svn.sourceforge.net/gar/?rev=7244&view=rev Author: dmichelsen Date: 2009-11-12 15:09:10 +0000 (Thu, 12 Nov 2009) Log Message: ----------- mGAR v2: Add support for inline-definitions of cswusergroup, cswinetdconf and cswetcservices 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 2009-11-12 15:04:29 UTC (rev 7243) +++ csw/mgar/gar/v2/gar.mk 2009-11-12 15:09:10 UTC (rev 7244) @@ -710,7 +710,7 @@ # The basic merge merges the compiles for all ISAs on the current architecture -merge: checksum pre-merge merge-do merge-license merge-migrateconf $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) post-merge +merge: checksum pre-merge merge-do merge-license merge-classutils $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) post-merge @$(DONADA) merge-do: $(if $(PARALLELMODULATIONS),merge-parallel,merge-sequential) @@ -786,7 +786,7 @@ .PHONY: remerge reset-merge reset-merge-modulated remerge: reset-merge merge -reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-migrateconf reset-merge-src +reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-classutils reset-merge-src @rm -f $(COOKIEDIR)/pre-merge $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge $(COOKIEDIR)/post-merge @rm -rf $(PKGROOT) @$(DONADA) Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-11-12 15:04:29 UTC (rev 7243) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-11-12 15:09:10 UTC (rev 7244) @@ -167,6 +167,15 @@ MIGRATECONF ?= $(strip $(foreach S,$(SPKG_SPECS),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),/etc/opt/csw/pkg/$S/cswmigrateconf))) +# It is NOT sufficient to change the pathes here, they must be adjusted in merge-* also +_USERGROUP_FILES ?= $(strip $(foreach S,$(SPKG_SPECS),$(if $(value $(S)_usergroup),/etc/opt/csw/pkg/$S/cswusergroup))) +_INETDCONF_FILES ?= $(strip $(foreach S,$(SPKG_SPECS),$(if $(value $(S)_inetdconf),/etc/opt/csw/pkg/$S/inetd.conf))) +_ETCSERVICES_FILES ?= $(strip $(foreach S,$(SPKG_SPECS),$(if $(value $(S)_etcservices),/etc/opt/csw/pkg/$S/services))) + +USERGROUP += $(_USERGROUP_FILES) +INETDCONF += $(_INETDCONF_FILES) +ETCSERVICES += $(_ETCSERVICES_FILES) + # NOTE: Order _can_ be important here. cswinitsmf and cswinetd should # always be the last two added. The reason for this is that # you need to ensure any binaries and config files are already on disk @@ -580,6 +589,10 @@ reset-merge-license: @rm -f $(COOKIEDIR)/merge-license $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-license-$(SPEC)) +merge-classutils: merge-migrateconf merge-usergroup merge-inetdconf merge-etcservices + +reset-merge-classutils: reset-merge-migrateconf reset-merge-usergroup reset-merge-inetdconf reset-merge-etcservices + merge-migrateconf: $(foreach S,$(SPKG_SPECS),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),merge-migrateconf-$S)) @$(MAKECOOKIE) @@ -602,6 +615,43 @@ reset-merge-migrateconf: @rm -f $(COOKIEDIR)/merge-migrateconf $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-migrateconf-$(SPEC)) +_show_classutilvar//%: + $($*) + +merge-usergroup: $(foreach S,$(SPKG_SPECS),$(if $(value $(S)_usergroup),merge-usergroup-$S)) + @$(MAKECOOKIE) + +merge-usergroup-%: + @echo "[ Generating cswusergroup for package $* ]" + $(_DBG)ginstall -d $(PKGROOT)/etc/opt/csw/pkg/$* + $(_DBG)$(MAKE) --no-print-directory -n _show_classutilvar//$*_usergroup >$(PKGROOT)/etc/opt/csw/pkg/$*/cswusergroup + @$(MAKECOOKIE) + +reset-merge-usergroup: + @rm -f $(COOKIEDIR)/merge-usergroup $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-usergroup-$(SPEC)) + +merge-inetdconf: $(foreach S,$(SPKG_SPECS),$(if $(value $(S)_inetdconf),merge-inetdconf-$S)) + +merge-inetdconf-%: + @echo "[ Generating inetd.conf for package $* ]" + $(_DBG)ginstall -d $(PKGROOT)/etc/opt/csw/pkg/$* + $(_DBG)$(MAKE) --no-print-directory -n _show_classutilvar//$*_inetdconf >$(PKGROOT)/etc/opt/csw/pkg/$*/inetd.conf + @$(MAKECOOKIE) + +reset-merge-inetdconf: + @rm -f $(COOKIEDIR)/merge-inetdconf $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-inetdconf-$(SPEC)) + +merge-etcservices: $(foreach S,$(SPKG_SPECS),$(if $(value $(S)_etcservices),merge-etcservices-$S)) + +merge-etcservices-%: + @echo "[ Generating services for package $* ]" + $(_DBG)ginstall -d $(PKGROOT)/etc/opt/csw/pkg/$* + $(_DBG)$(MAKE) --no-print-directory -n _show_classutilvar//$*_etcservices >$(PKGROOT)/etc/opt/csw/pkg/$*/services + @$(MAKECOOKIE) + +reset-merge-etcservices: + @rm -f $(COOKIEDIR)/merge-etcservices $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-etcservices-$(SPEC)) + merge-src: _SRCDIR=$(PKGROOT)$(sourcedir)/$(call catalogname,$(SRCPACKAGE_BASE)) merge-src: fetch $(_DBG)mkdir -p $(_SRCDIR)/files 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 Nov 12 16:43:58 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Nov 2009 15:43:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7245] csw/mgar/pkg Message-ID: Revision: 7245 http://gar.svn.sourceforge.net/gar/?rev=7245&view=rev Author: dmichelsen Date: 2009-11-12 15:43:58 +0000 (Thu, 12 Nov 2009) Log Message: ----------- cvs2svn: Initial commit Added Paths: ----------- csw/mgar/pkg/cvs2svn/ csw/mgar/pkg/cvs2svn/branches/ csw/mgar/pkg/cvs2svn/tags/ csw/mgar/pkg/cvs2svn/trunk/ csw/mgar/pkg/cvs2svn/trunk/Makefile csw/mgar/pkg/cvs2svn/trunk/checksums csw/mgar/pkg/cvs2svn/trunk/files/ Property changes on: csw/mgar/pkg/cvs2svn/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/cvs2svn/trunk/Makefile =================================================================== --- csw/mgar/pkg/cvs2svn/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cvs2svn/trunk/Makefile 2009-11-12 15:43:58 UTC (rev 7245) @@ -0,0 +1,29 @@ +GARNAME = cvs2svn +GARVERSION = 2.3.0 +CATEGORIES = utils + +DESCRIPTION = CVS to svn/git/hg/bzr Repository Converter +define BLURB + cvs2svn is a tool for migrating a CVS repository to Subversion or git. The main design goals + are robustness and 100% data preservation. cvs2svn can convert just about any CVS repository + we've ever seen, including gcc, Mozilla, FreeBSD, KDE, GNOME... +endef + +MASTER_SITES = http://cvs2svn.tigris.org/files/documents/1462/46528/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +REQUIRED_PKGS = CSWpython + +SPKG_SOURCEURL = http://cvs2svn.tigris.org/ + +CONFIGURE_SCRIPTS = + +BUILD_ARGS = man + +TEST_TARGET = check + +include gar/category.mk + Added: csw/mgar/pkg/cvs2svn/trunk/checksums =================================================================== --- csw/mgar/pkg/cvs2svn/trunk/checksums (rev 0) +++ csw/mgar/pkg/cvs2svn/trunk/checksums 2009-11-12 15:43:58 UTC (rev 7245) @@ -0,0 +1 @@ +6c412baec974f3ff64b9145944682a15 cvs2svn-2.3.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 Nov 12 16:47:55 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Nov 2009 15:47:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[7246] csw/mgar/pkg/cvs2svn/trunk/Makefile Message-ID: Revision: 7246 http://gar.svn.sourceforge.net/gar/?rev=7246&view=rev Author: dmichelsen Date: 2009-11-12 15:47:55 +0000 (Thu, 12 Nov 2009) Log Message: ----------- cvs2svn: Use PYCOMPILE Modified Paths: -------------- csw/mgar/pkg/cvs2svn/trunk/Makefile Modified: csw/mgar/pkg/cvs2svn/trunk/Makefile =================================================================== --- csw/mgar/pkg/cvs2svn/trunk/Makefile 2009-11-12 15:43:58 UTC (rev 7245) +++ csw/mgar/pkg/cvs2svn/trunk/Makefile 2009-11-12 15:47:55 UTC (rev 7246) @@ -15,10 +15,12 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +SPKG_SOURCEURL = http://cvs2svn.tigris.org/ + +ARCHALL = 1 +PYCOMPILE = 1 REQUIRED_PKGS = CSWpython -SPKG_SOURCEURL = http://cvs2svn.tigris.org/ - CONFIGURE_SCRIPTS = BUILD_ARGS = 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 Thu Nov 12 17:23:05 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Nov 2009 16:23:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[7247] csw/mgar/pkg/cvs2svn/trunk/Makefile Message-ID: Revision: 7247 http://gar.svn.sourceforge.net/gar/?rev=7247&view=rev Author: dmichelsen Date: 2009-11-12 16:23:05 +0000 (Thu, 12 Nov 2009) Log Message: ----------- cvs2svn: Add requirements Modified Paths: -------------- csw/mgar/pkg/cvs2svn/trunk/Makefile Modified: csw/mgar/pkg/cvs2svn/trunk/Makefile =================================================================== --- csw/mgar/pkg/cvs2svn/trunk/Makefile 2009-11-12 15:47:55 UTC (rev 7246) +++ csw/mgar/pkg/cvs2svn/trunk/Makefile 2009-11-12 16:23:05 UTC (rev 7247) @@ -19,7 +19,8 @@ ARCHALL = 1 PYCOMPILE = 1 -REQUIRED_PKGS = CSWpython +REQUIRED_PKGS = CSWpython CSWrcs +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CONFIGURE_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 Thu Nov 12 17:56:46 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 12 Nov 2009 16:56:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7248] csw/mgar/pkg/cups/trunk Message-ID: Revision: 7248 http://gar.svn.sourceforge.net/gar/?rev=7248&view=rev Author: wahwah Date: 2009-11-12 16:56:46 +0000 (Thu, 12 Nov 2009) Log Message: ----------- cups: Upgrade to 1.4.2 Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile csw/mgar/pkg/cups/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cups/trunk/files/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2009-11-12 16:23:05 UTC (rev 7247) +++ csw/mgar/pkg/cups/trunk/Makefile 2009-11-12 16:56:46 UTC (rev 7248) @@ -3,7 +3,7 @@ # $Id$ GARNAME = cups -GARVERSION = 1.4.1 +GARVERSION = 1.4.2 CATEGORIES = net define BLURB @@ -51,7 +51,6 @@ PATCHFILES = 0001-cswcups-for-service-name.patch PATCHFILES += 0002-Adding-the-refcount-member-to-mime_type_t.patch PATCHFILES += 0003-Reference-counting-for-printers-only.patch -PATCHFILES += 0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch PATCHFILES += 0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch PATCHFILES += 0006-Fail-compilation-if-no-SSL-impl-chosen.patch PATCHFILES += 0007-Solaris-zone-support-in-init-script.patch Modified: csw/mgar/pkg/cups/trunk/checksums =================================================================== --- csw/mgar/pkg/cups/trunk/checksums 2009-11-12 16:23:05 UTC (rev 7247) +++ csw/mgar/pkg/cups/trunk/checksums 2009-11-12 16:56:46 UTC (rev 7248) @@ -1,11 +1,11 @@ -1e5e54a2b503cfdeeda1b683bcccab83 download/0001-cswcups-for-service-name.patch -0da4ea6bf72d61adfc4316a738b90ab5 download/0002-Adding-the-refcount-member-to-mime_type_t.patch -a80b8543633e2f9b3b1e531ac2289306 download/0003-Reference-counting-for-printers-only.patch -193912518565c7052724420e7899930b download/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch -bbf0295c76cd06b5311ac3a3467fd431 download/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch -0dd35cc0938696577104852781ec1df6 download/0006-Fail-compilation-if-no-SSL-impl-chosen.patch -44ff410e237d6f4f9f0fe650ba2c7fa0 download/0007-Solaris-zone-support-in-init-script.patch -cf6a3fe902545aac1ab2303e41c08a3e download/CSWcupsclient.preinstall -ca7718998e56c320c08a77cfefe046f6 download/CSWcupsd.postremove -cf6a3fe902545aac1ab2303e41c08a3e download/CSWcupsd.preinstall -587a58039c112ecb3c932e048c8a7b01 download/cups-1.4.1-source.tar.bz2 +1e5e54a2b503cfdeeda1b683bcccab83 0001-cswcups-for-service-name.patch +0da4ea6bf72d61adfc4316a738b90ab5 0002-Adding-the-refcount-member-to-mime_type_t.patch +a80b8543633e2f9b3b1e531ac2289306 0003-Reference-counting-for-printers-only.patch +193912518565c7052724420e7899930b 0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch +bbf0295c76cd06b5311ac3a3467fd431 0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch +0dd35cc0938696577104852781ec1df6 0006-Fail-compilation-if-no-SSL-impl-chosen.patch +44ff410e237d6f4f9f0fe650ba2c7fa0 0007-Solaris-zone-support-in-init-script.patch +cf6a3fe902545aac1ab2303e41c08a3e CSWcupsclient.preinstall +ca7718998e56c320c08a77cfefe046f6 CSWcupsd.postremove +cf6a3fe902545aac1ab2303e41c08a3e CSWcupsd.preinstall +d95e2d588e3d36e563027a963b117b1b cups-1.4.2-source.tar.bz2 Deleted: csw/mgar/pkg/cups/trunk/files/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch =================================================================== --- csw/mgar/pkg/cups/trunk/files/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch 2009-11-12 16:23:05 UTC (rev 7247) +++ csw/mgar/pkg/cups/trunk/files/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch 2009-11-12 16:56:46 UTC (rev 7248) @@ -1,25 +0,0 @@ -From df22eb20fe2b75a3a39384c11fd57194a8977a27 Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= -Date: Mon, 19 Oct 2009 13:22:37 +0100 -Subject: [PATCH] Fix for usb-unix.c, from http://www.cups.org/str.php?L3332 - ---- - backend/usb-unix.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/backend/usb-unix.c b/backend/usb-unix.c -index c749253..8ce92b9 100644 ---- a/backend/usb-unix.c -+++ b/backend/usb-unix.c -@@ -560,7 +560,7 @@ open_device(const char *uri, /* I - Device URI */ - * 'side_cb()' - Handle side-channel requests... - */ - --static void -+static int /* O - 0 on success, -1 on error */ - side_cb(int print_fd, /* I - Print file */ - int device_fd, /* I - Device file */ - int snmp_fd, /* I - SNMP socket (unused) */ --- -1.6.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 Thu Nov 12 18:45:17 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 12 Nov 2009 17:45:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[7249] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 7249 http://gar.svn.sourceforge.net/gar/?rev=7249&view=rev Author: wahwah Date: 2009-11-12 17:45:17 +0000 (Thu, 12 Nov 2009) Log Message: ----------- mysql-5.0.x: Using post-install instead of post-install-modulated 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 2009-11-12 16:56:46 UTC (rev 7248) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-11-12 17:45:17 UTC (rev 7249) @@ -152,7 +152,7 @@ include gar/category.mk -post-install-modulated: +post-install: ginstall -m 755 -d $(DESTDIR)$(localstatedir) ginstall -m 755 -d $(DESTDIR)$(datadir)/mysql/doc ginstall -m 644 $(FILEDIR)/ChangeLog $(DESTDIR)$(datadir)/mysql/doc 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 Nov 12 19:38:14 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 12 Nov 2009 18:38:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[7250] csw/mgar/pkg/pyantlrrt/trunk/Makefile Message-ID: Revision: 7250 http://gar.svn.sourceforge.net/gar/?rev=7250&view=rev Author: wahwah Date: 2009-11-12 18:38:13 +0000 (Thu, 12 Nov 2009) Log Message: ----------- pyantlr: Renaming the package in the Makefile Modified Paths: -------------- csw/mgar/pkg/pyantlrrt/trunk/Makefile Modified: csw/mgar/pkg/pyantlrrt/trunk/Makefile =================================================================== --- csw/mgar/pkg/pyantlrrt/trunk/Makefile 2009-11-12 17:45:17 UTC (rev 7249) +++ csw/mgar/pkg/pyantlrrt/trunk/Makefile 2009-11-12 18:38:13 UTC (rev 7250) @@ -2,9 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -GARNAME = pyantlrrt +GARNAME = py_antlr GARVERSION = 3.1.1 -CATEGORIES = lib +CATEGORIES = python DESCRIPTION = Python ANTLR runtime define BLURB @@ -16,28 +16,23 @@ WORKSRC = $(WORKDIR)/antlr_python_runtime-$(GARVERSION) -REQUIRED_PKGS = CSWcswclassutils CSWpython CSWpython-rt -PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWpysetuptools +PACKAGES = CSWpy-antlr +CATALOGNAME = py_antlr +PREREQUISITE_PKGS = CSWpysetuptools UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_CLASSES = none cswpycompile ARCHALL = 1 -PROTOTYPE_FILTER = awk ' \ - $$$$3 ~/.*\.py$$$$/ { $$$$2 = "pycompile" } \ - { print }' +# BUILD_SCRIPTS = $(WORKSRC)/setup.py -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = $(WORKSRC)/setup.py +# INSTALL_SCRIPTS = $(WORKSRC)/setup.py +# INSTALL_ARGS += --root=$(DESTDIR) --prefix=$(prefix) -INSTALL_SCRIPTS = $(WORKSRC)/setup.py -INSTALL_ARGS += --root=$(DESTDIR) --prefix=$(prefix) - TEST_SCRIPTS = -post-install-modulated: +include gar/category.mk + +post-install: gfind $(DESTDIR) -type f -name '*.pyc' -exec rm {} \; @$(MAKECOOKIE) - -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 Nov 12 19:44:45 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 12 Nov 2009 18:44:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[7251] csw/mgar/pkg Message-ID: Revision: 7251 http://gar.svn.sourceforge.net/gar/?rev=7251&view=rev Author: wahwah Date: 2009-11-12 18:44:45 +0000 (Thu, 12 Nov 2009) Log Message: ----------- py_antlr: Renaming the directory in GAR. Added Paths: ----------- csw/mgar/pkg/py_antlr/ Removed Paths: ------------- csw/mgar/pkg/pyantlrrt/ 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 Nov 12 21:19:46 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Nov 2009 20:19:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7252] csw/mgar/pkg Message-ID: Revision: 7252 http://gar.svn.sourceforge.net/gar/?rev=7252&view=rev Author: dmichelsen Date: 2009-11-12 20:19:46 +0000 (Thu, 12 Nov 2009) Log Message: ----------- dnstracer: Initial commit Added Paths: ----------- csw/mgar/pkg/dnstracer/ csw/mgar/pkg/dnstracer/branches/ csw/mgar/pkg/dnstracer/tags/ csw/mgar/pkg/dnstracer/trunk/ csw/mgar/pkg/dnstracer/trunk/Makefile csw/mgar/pkg/dnstracer/trunk/checksums csw/mgar/pkg/dnstracer/trunk/files/ Property changes on: csw/mgar/pkg/dnstracer/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/dnstracer/trunk/Makefile =================================================================== --- csw/mgar/pkg/dnstracer/trunk/Makefile (rev 0) +++ csw/mgar/pkg/dnstracer/trunk/Makefile 2009-11-12 20:19:46 UTC (rev 7252) @@ -0,0 +1,29 @@ +GARNAME = dnstracer +GARVERSION = 1.9 +CATEGORIES = apps + +DESCRIPTION = Trace a chain of DNS servers to the source +define BLURB + Dnstracer determines where a given Domain Name Server (DNS) gets its + information from, and follows the chain of DNS servers back to the + servers which know the data. +endef + +MASTER_SITES = http://www.mavetju.org/download/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +LICENSE = LICENSE + +SPKG_SOURCEURL = http://www.mavetju.org/unix/general.php + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --disable-ipv6 + +EXTRA_LDFLAGS = -lresolv + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/dnstracer/trunk/checksums =================================================================== --- csw/mgar/pkg/dnstracer/trunk/checksums (rev 0) +++ csw/mgar/pkg/dnstracer/trunk/checksums 2009-11-12 20:19:46 UTC (rev 7252) @@ -0,0 +1 @@ +7db73ce3070119c98049a617fe52ea84 dnstracer-1.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 Nov 12 21:44:19 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Nov 2009 20:44:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[7253] csw/mgar/pkg Message-ID: Revision: 7253 http://gar.svn.sourceforge.net/gar/?rev=7253&view=rev Author: dmichelsen Date: 2009-11-12 20:44:19 +0000 (Thu, 12 Nov 2009) Log Message: ----------- euler: Initial commit Added Paths: ----------- csw/mgar/pkg/euler/ csw/mgar/pkg/euler/branches/ csw/mgar/pkg/euler/tags/ csw/mgar/pkg/euler/trunk/ csw/mgar/pkg/euler/trunk/Makefile csw/mgar/pkg/euler/trunk/checksums csw/mgar/pkg/euler/trunk/files/ Property changes on: csw/mgar/pkg/euler/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/euler/trunk/Makefile =================================================================== --- csw/mgar/pkg/euler/trunk/Makefile (rev 0) +++ csw/mgar/pkg/euler/trunk/Makefile 2009-11-12 20:44:19 UTC (rev 7253) @@ -0,0 +1,27 @@ +GARNAME = euler +GARVERSION = 1.61.0 +CATEGORIES = apps + +DESCRIPTION = EULER interactive computing with real, complex numbers and matrices +define BLURB + This is the GTK+ based version of EULER for Unix / Linux systems. It has been ported + to GTK+ by Eric Bouchar? (bouchare dot eric at wanadoo dot fr) on the base of Dr Ren + Grothmann's X11 version. Euler was started by Dr Grothmann. He also maintains a version + for Windows systems. + + EULER is a program for quickly and interactively computing with real and complex + numbers and matrices, or with intervals, in the style of MatLab, Octave,... + It can draw and animate your functions in two and three dimensions. +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tgz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tz + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/euler/trunk/checksums =================================================================== --- csw/mgar/pkg/euler/trunk/checksums (rev 0) +++ csw/mgar/pkg/euler/trunk/checksums 2009-11-12 20:44:19 UTC (rev 7253) @@ -0,0 +1 @@ +4a45d7aaba2b73c7978e6d5623141103 euler-1.61.0.tgz 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 Nov 12 21:57:45 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 12 Nov 2009 20:57:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[7254] csw/mgar/pkg/wxwidgets/trunk Message-ID: Revision: 7254 http://gar.svn.sourceforge.net/gar/?rev=7254&view=rev Author: wahwah Date: 2009-11-12 20:57:45 +0000 (Thu, 12 Nov 2009) Log Message: ----------- wxwidgets: Enabling Solaris 9 builds, making 2.8.5 build monolithic Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/wxwidgets/trunk/ Property changes on: csw/mgar/pkg/wxwidgets/trunk ___________________________________________________________________ Modified: svn:ignore - cookies download work + cookies download work old-pkgs Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-12 20:44:19 UTC (rev 7253) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-12 20:57:45 UTC (rev 7254) @@ -12,6 +12,12 @@ wxWidgets applications look and feel native. This is because wxWidgets uses the platform's own native controls rather than emulating them. endef + +# The unicode version can't be currently built on Solaris 8. Doing separate +# builds on Solaris 8 and Solaris 9. Unicode support will start in Solaris 9. +# More details below, look for 'unicode'. +PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 solaris9-sparc solaris9-i386 + EXTRA_MODULATORS = GARVERSION MODULATIONS_GARVERSION = 2.8.5 2.8.10 MERGE_SCRIPTS_isa-i386-garversion-2.8.5 = copy-only @@ -112,11 +118,16 @@ EXTRA_LIB = /opt/csw/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +# The 2.8.5 version has been compiled as a monolithic library. Building it the +# same way for backwards compatibility. +CONFIGURE_ARGS_garversion-2.8.5 = --enable-monolithic +CONFIGURE_ARGS += $(CONFIGURE_ARGS_garversion-$(GARVERSION)) + INSTALL_SCRIPTS = wxwidgets +include gar/category.mk + install-wxwidgets: (cd $(WORKSRC); $(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) install) (cd $(WORKSRC)/contrib; $(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) install) @$(MAKECOOKIE) - -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 Fri Nov 13 00:47:43 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 12 Nov 2009 23:47:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[7255] csw/mgar/pkg/libyaml/trunk Message-ID: Revision: 7255 http://gar.svn.sourceforge.net/gar/?rev=7255&view=rev Author: wahwah Date: 2009-11-12 23:47:43 +0000 (Thu, 12 Nov 2009) Log Message: ----------- libyaml: Upgrade to 0.1.3 Modified Paths: -------------- csw/mgar/pkg/libyaml/trunk/Makefile csw/mgar/pkg/libyaml/trunk/checksums Modified: csw/mgar/pkg/libyaml/trunk/Makefile =================================================================== --- csw/mgar/pkg/libyaml/trunk/Makefile 2009-11-12 20:57:45 UTC (rev 7254) +++ csw/mgar/pkg/libyaml/trunk/Makefile 2009-11-12 23:47:43 UTC (rev 7255) @@ -3,7 +3,7 @@ # $Id$ GARNAME = libyaml -GARVERSION = 0.1.2 +GARVERSION = 0.1.3 CATEGORIES = lib DESCRIPTION = a YAML 1.1 parser and emitter written in C define BLURB Modified: csw/mgar/pkg/libyaml/trunk/checksums =================================================================== --- csw/mgar/pkg/libyaml/trunk/checksums 2009-11-12 20:57:45 UTC (rev 7254) +++ csw/mgar/pkg/libyaml/trunk/checksums 2009-11-12 23:47:43 UTC (rev 7255) @@ -1 +1 @@ -f6c9b5c2b0f6919abd79f5fd059b01dc download/yaml-0.1.2.tar.gz +b8ab9064e8e0330423fe640de76608cd download/yaml-0.1.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 Fri Nov 13 00:48:44 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 12 Nov 2009 23:48:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7256] csw/mgar/pkg/pyyaml/trunk Message-ID: Revision: 7256 http://gar.svn.sourceforge.net/gar/?rev=7256&view=rev Author: wahwah Date: 2009-11-12 23:48:44 +0000 (Thu, 12 Nov 2009) Log Message: ----------- pyyaml: Updating package names, version bump to 3.09 Modified Paths: -------------- csw/mgar/pkg/pyyaml/trunk/Makefile csw/mgar/pkg/pyyaml/trunk/checksums Modified: csw/mgar/pkg/pyyaml/trunk/Makefile =================================================================== --- csw/mgar/pkg/pyyaml/trunk/Makefile 2009-11-12 23:47:43 UTC (rev 7255) +++ csw/mgar/pkg/pyyaml/trunk/Makefile 2009-11-12 23:48:44 UTC (rev 7256) @@ -3,7 +3,7 @@ # $Header$ GARNAME = pyyaml -GARVERSION = 3.08 +GARVERSION = 3.09 CATEGORIES = python PROJ_NAME = PyYAML @@ -32,26 +32,26 @@ DISTFILES = $(PROJ_NAME)-$(GARVERSION).tar.gz WORKSRC = $(WORKDIR)/$(PROJ_NAME)-$(GARVERSION) SPKG_SOURCEURL = http://pyyaml.org/wiki/PyYAML -SPKG_CLASSES = none cswpycompile -PACKAGES = CSWpyyaml CSWpyyamlrt -CATALOGNAME_CSWpyyaml = py_pyyaml -CATALOGNAME_CSWpyyamlrt = py_pyyaml_rt +PACKAGES = CSWpy-yaml CSWpy-yaml-rt +CATALOGNAME_CSWpy-yaml = py_yaml +CATALOGNAME_CSWpy-yaml-rt = py_yaml_rt -REQUIRED_PKGS_CSWpyyamlrt = CSWpython-rt CSWlibyaml -PREREQUISITE_PKGS = CSWpython CSWlibyaml +REQUIRED_PKGS_CSWpy-yaml = CSWpython +REQUIRED_PKGS_CSWpy-yaml-rt = CSWpython-rt CSWlibyaml +PREREQUISITE_PKGS = $(REQUIRED_PKGS_CSWpy-yaml) $(REQUIRED_PKGS_CSWpy-yaml-rt) -SPKG_DESC_CSWpyyaml = YAML parser and emitter for Python -SPKG_DESC_CSWpyyamlrt = Runtime libraries for YAML parser and emitter +SPKG_DESC_CSWpy-yaml = YAML parser and emitter for Python +SPKG_DESC_CSWpy-yaml-rt = Runtime libraries for YAML parser and emitter -ARCHALL_CSWpyyaml = 1 -PKGFILES_CSWpyyamlrt = /opt/csw/lib/python/site-packages/.*\.so +ARCHALL_CSWpy-yaml = 1 +PKGFILES_CSWpy-yaml-rt = /opt/csw/lib/python/site-packages/.*\.so UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -BUILD_SCRIPTS = pyyaml +BUILD_SCRIPTS = py-yaml -build-pyyaml: +build-py-yaml: (cd $(WORKSRC); $(BUILD_ENV) python setup.py --with-libyaml build) @$(MAKECOOKIE) Modified: csw/mgar/pkg/pyyaml/trunk/checksums =================================================================== --- csw/mgar/pkg/pyyaml/trunk/checksums 2009-11-12 23:47:43 UTC (rev 7255) +++ csw/mgar/pkg/pyyaml/trunk/checksums 2009-11-12 23:48:44 UTC (rev 7256) @@ -1 +1 @@ -a4163a2017fa57f448c66815511fa555 download/PyYAML-3.08.tar.gz +f219af2361e87fdc5e85e95b84c11d87 download/PyYAML-3.09.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 Nov 13 00:55:15 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 12 Nov 2009 23:55:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[7257] csw/mgar/pkg/libyaml/trunk/Makefile Message-ID: Revision: 7257 http://gar.svn.sourceforge.net/gar/?rev=7257&view=rev Author: wahwah Date: 2009-11-12 23:55:15 +0000 (Thu, 12 Nov 2009) Log Message: ----------- libyaml: enabling 64-bit build Modified Paths: -------------- csw/mgar/pkg/libyaml/trunk/Makefile Modified: csw/mgar/pkg/libyaml/trunk/Makefile =================================================================== --- csw/mgar/pkg/libyaml/trunk/Makefile 2009-11-12 23:48:44 UTC (rev 7256) +++ csw/mgar/pkg/libyaml/trunk/Makefile 2009-11-12 23:55:15 UTC (rev 7257) @@ -14,5 +14,6 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) +BUILD64 = 1 WORKSRC = $(WORKDIR)/yaml-$(GARVERSION) 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 Fri Nov 13 00:55:55 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 12 Nov 2009 23:55:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[7258] csw/mgar/pkg/pyyaml/trunk/Makefile Message-ID: Revision: 7258 http://gar.svn.sourceforge.net/gar/?rev=7258&view=rev Author: wahwah Date: 2009-11-12 23:55:55 +0000 (Thu, 12 Nov 2009) Log Message: ----------- pyyaml: enabling 64-bit build Modified Paths: -------------- csw/mgar/pkg/pyyaml/trunk/Makefile Modified: csw/mgar/pkg/pyyaml/trunk/Makefile =================================================================== --- csw/mgar/pkg/pyyaml/trunk/Makefile 2009-11-12 23:55:15 UTC (rev 7257) +++ csw/mgar/pkg/pyyaml/trunk/Makefile 2009-11-12 23:55:55 UTC (rev 7258) @@ -44,6 +44,7 @@ SPKG_DESC_CSWpy-yaml = YAML parser and emitter for Python SPKG_DESC_CSWpy-yaml-rt = Runtime libraries for YAML parser and emitter +BUILD64 = 1 ARCHALL_CSWpy-yaml = 1 PKGFILES_CSWpy-yaml-rt = /opt/csw/lib/python/site-packages/.*\.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 Fri Nov 13 12:43:23 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 13 Nov 2009 11:43:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7259] csw/mgar/pkg/euler/trunk Message-ID: Revision: 7259 http://gar.svn.sourceforge.net/gar/?rev=7259&view=rev Author: dmichelsen Date: 2009-11-13 11:43:23 +0000 (Fri, 13 Nov 2009) Log Message: ----------- euler: Fix linkage and set dependencies Modified Paths: -------------- csw/mgar/pkg/euler/trunk/Makefile csw/mgar/pkg/euler/trunk/checksums Added Paths: ----------- csw/mgar/pkg/euler/trunk/files/0001-Remove-static-setting-of-CFLAGS.patch Modified: csw/mgar/pkg/euler/trunk/Makefile =================================================================== --- csw/mgar/pkg/euler/trunk/Makefile 2009-11-12 23:55:55 UTC (rev 7258) +++ csw/mgar/pkg/euler/trunk/Makefile 2009-11-13 11:43:23 UTC (rev 7259) @@ -16,10 +16,24 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tgz +PATCHFILES = 0001-Remove-static-setting-of-CFLAGS.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tz +REQUIRED_PKGS = CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWgtk2 +REQUIRED_PKGS += CSWlibatk CSWlibcairo CSWlibxext CSWpango +PREREQUISITE_PKGS = $(REQUIRED_PKGS) +PREREQUISITE_PKGS += CSWglib2devel CSWgtk2devel +PREREQUISITE_PKGS += CSWlibcairodevel CSWlibxextdevel CSWpangodevel + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +EXTRA_LDFLAGS = -lm /usr/openwin/lib/libXext.so + +BUILD_OVERRIDE_DIRS = CFLAGS CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/euler/trunk/checksums =================================================================== --- csw/mgar/pkg/euler/trunk/checksums 2009-11-12 23:55:55 UTC (rev 7258) +++ csw/mgar/pkg/euler/trunk/checksums 2009-11-13 11:43:23 UTC (rev 7259) @@ -1 +1,2 @@ +6a755d3f19921a0527b84e615fcfb8f6 0001-Remove-static-setting-of-CFLAGS.patch 4a45d7aaba2b73c7978e6d5623141103 euler-1.61.0.tgz Added: csw/mgar/pkg/euler/trunk/files/0001-Remove-static-setting-of-CFLAGS.patch =================================================================== --- csw/mgar/pkg/euler/trunk/files/0001-Remove-static-setting-of-CFLAGS.patch (rev 0) +++ csw/mgar/pkg/euler/trunk/files/0001-Remove-static-setting-of-CFLAGS.patch 2009-11-13 11:43:23 UTC (rev 7259) @@ -0,0 +1,43 @@ +From f860746c9111658622bf8f524c421fb9fc6a4064 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 13 Nov 2009 12:31:27 +0100 +Subject: [PATCH] Remove static setting of CFLAGS + +--- + src/Makefile.am | 4 ---- + src/Makefile.in | 4 ---- + 2 files changed, 0 insertions(+), 8 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index d061923..38006c7 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -7,10 +7,6 @@ + INCLUDES = \ + $(GTK_CFLAGS) + +-AM_CFLAGS =\ +- -Wall\ +- -O3 +- + bin_PROGRAMS = euler + + euler_SOURCES = \ +diff --git a/src/Makefile.in b/src/Makefile.in +index f4fbb7b..db80e65 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -193,10 +193,6 @@ target_alias = @target_alias@ + INCLUDES = \ + $(GTK_CFLAGS) + +-AM_CFLAGS = \ +- -Wall\ +- -O3 +- + euler_SOURCES = \ + main.c\ + binary.c\ +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Nov 13 13:34:44 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 13 Nov 2009 12:34:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7260] csw/mgar/pkg/exiftool/trunk/Makefile Message-ID: Revision: 7260 http://gar.svn.sourceforge.net/gar/?rev=7260&view=rev Author: hson Date: 2009-11-13 12:34:44 +0000 (Fri, 13 Nov 2009) Log Message: ----------- exiftool: Update to 7.99 Modified Paths: -------------- csw/mgar/pkg/exiftool/trunk/Makefile Modified: csw/mgar/pkg/exiftool/trunk/Makefile =================================================================== --- csw/mgar/pkg/exiftool/trunk/Makefile 2009-11-13 11:43:23 UTC (rev 7259) +++ csw/mgar/pkg/exiftool/trunk/Makefile 2009-11-13 12:34:44 UTC (rev 7260) @@ -1,5 +1,5 @@ GARNAME = exiftool -GARVERSION = 7.93 +GARVERSION = 7.99 CATEGORIES = cpan DESCRIPTION = Read, Write and Edit Image File Meta Information This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Nov 13 13:37:46 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 13 Nov 2009 12:37:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7261] csw/mgar/pkg/exiftool/trunk/checksums Message-ID: Revision: 7261 http://gar.svn.sourceforge.net/gar/?rev=7261&view=rev Author: hson Date: 2009-11-13 12:37:46 +0000 (Fri, 13 Nov 2009) Log Message: ----------- exiftool: commit checksum file Modified Paths: -------------- csw/mgar/pkg/exiftool/trunk/checksums Modified: csw/mgar/pkg/exiftool/trunk/checksums =================================================================== --- csw/mgar/pkg/exiftool/trunk/checksums 2009-11-13 12:34:44 UTC (rev 7260) +++ csw/mgar/pkg/exiftool/trunk/checksums 2009-11-13 12:37:46 UTC (rev 7261) @@ -1,2 +1,2 @@ 13f9aae615a5de5e3c145b374950a75c download/CSWexiftool.gspec -da1077cc9a8910f38b97cf5475a37360 download/Image-ExifTool-7.93.tar.gz +f397ee071a01104e6c68da43f3bdd372 download/Image-ExifTool-7.99.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 Nov 13 15:02:34 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 13 Nov 2009 14:02:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[7262] csw/mgar/pkg/tightvnc/trunk/files/cswvncserver Message-ID: Revision: 7262 http://gar.svn.sourceforge.net/gar/?rev=7262&view=rev Author: wahwah Date: 2009-11-13 14:02:32 +0000 (Fri, 13 Nov 2009) Log Message: ----------- vncserver: Fixing a startup script bug Modified Paths: -------------- csw/mgar/pkg/tightvnc/trunk/files/cswvncserver Modified: csw/mgar/pkg/tightvnc/trunk/files/cswvncserver =================================================================== --- csw/mgar/pkg/tightvnc/trunk/files/cswvncserver 2009-11-13 12:37:46 UTC (rev 7261) +++ csw/mgar/pkg/tightvnc/trunk/files/cswvncserver 2009-11-13 14:02:32 UTC (rev 7262) @@ -30,6 +30,7 @@ stop() { echo "Shutting down $prog: " + RETVAL=0 for display in ${VNCSERVERS} do echo "${display} " 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 Nov 13 15:03:33 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 13 Nov 2009 14:03:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[7263] csw/mgar/pkg/tightvnc/trunk/files/cswvncserver Message-ID: Revision: 7263 http://gar.svn.sourceforge.net/gar/?rev=7263&view=rev Author: wahwah Date: 2009-11-13 14:03:33 +0000 (Fri, 13 Nov 2009) Log Message: ----------- vncserver: startup script standarizing on spaces Modified Paths: -------------- csw/mgar/pkg/tightvnc/trunk/files/cswvncserver Modified: csw/mgar/pkg/tightvnc/trunk/files/cswvncserver =================================================================== --- csw/mgar/pkg/tightvnc/trunk/files/cswvncserver 2009-11-13 14:02:32 UTC (rev 7262) +++ csw/mgar/pkg/tightvnc/trunk/files/cswvncserver 2009-11-13 14:03:33 UTC (rev 7263) @@ -1,9 +1,10 @@ #!/opt/csw/bin/bash +# vim:set ft=4 sw=4 sts=4 expandtab: # # $Id$ # # description: Starts and stops vncserver. \ -# used to provide remote X administration services. +# used to provide remote X administration services. VNCSERVERS="" ARGS="" @@ -34,7 +35,7 @@ for display in ${VNCSERVERS} do echo "${display} " - su ${display##*:} -c "vncserver -kill :${display%%:*} >/dev/null 2>&1" + su ${display##*:} -c "vncserver -kill :${display%%:*} >/dev/null 2>&1" RETVAL=$? done [ "$RETVAL" -eq 0 ] && rm -f /var/spool/locks/vncserver @@ -43,23 +44,23 @@ # See how we were called. case "$1" in start) - start - ;; + start + ;; stop) - stop - ;; + stop + ;; restart|reload) - stop - start - ;; + stop + start + ;; condrestart) - if [ -f /var/spool/locks/vncserver ]; then - stop - start - fi - ;; + if [ -f /var/spool/locks/vncserver ]; then + stop + start + fi + ;; *) - echo $"Usage: $0 {start|stop|restart|condrestart}" - exit 1 + echo $"Usage: $0 {start|stop|restart|condrestart}" + 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 Fri Nov 13 15:25:08 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 13 Nov 2009 14:25:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[7264] csw/mgar/pkg/libfaac/trunk Message-ID: Revision: 7264 http://gar.svn.sourceforge.net/gar/?rev=7264&view=rev Author: dmichelsen Date: 2009-11-13 14:25:08 +0000 (Fri, 13 Nov 2009) Log Message: ----------- libfaac: Add 64 bit support Modified Paths: -------------- csw/mgar/pkg/libfaac/trunk/Makefile csw/mgar/pkg/libfaac/trunk/checksums Modified: csw/mgar/pkg/libfaac/trunk/Makefile =================================================================== --- csw/mgar/pkg/libfaac/trunk/Makefile 2009-11-13 14:03:33 UTC (rev 7263) +++ csw/mgar/pkg/libfaac/trunk/Makefile 2009-11-13 14:25:08 UTC (rev 7264) @@ -4,7 +4,7 @@ DESCRIPTION = AAC encoder library and tool define BLURB - FAAC is an open source MPEG-4 and MPEG-2 AAC encoder + FAAC is an open source MPEG-4 and MPEG-2 AAC encoder endef SF_PROJ = faac @@ -28,8 +28,12 @@ PATCHFILES += input.c.diff ltp.c.diff mp4property.h.diff mp4util.h.diff PATCHFILES += mpeg4ip.h.diff psych.h.diff +BUILD64 = 1 +NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check +MERGE_DIRS_isa-extra = $(libdir) + include gar/category.mk Modified: csw/mgar/pkg/libfaac/trunk/checksums =================================================================== --- csw/mgar/pkg/libfaac/trunk/checksums 2009-11-13 14:03:33 UTC (rev 7263) +++ csw/mgar/pkg/libfaac/trunk/checksums 2009-11-13 14:25:08 UTC (rev 7264) @@ -1,16 +1,16 @@ -c5dde68840cefe46532089c9392d1df0 download/faac-1.28.tar.bz2 -eb7e2cee261c71ac4a8d718b5498777e download/Makefile.in.frontend.diff -3d7c0f7936dcc1c4833d693860720adf download/Makefile.in.common.mp4v2.diff -19f2eebe3df5300ab4a1a16e43593663 download/aacquant.c.diff -2af64ce38f023774fb0c8f691b98c564 download/aacquant.h.diff -ea8508703521e663e637382231d4c13b download/config.h.in.diff -027ebf052052128c67f0749e610f4acb download/configure.diff -56f2c5e28e1177e3b6956aaf83a10e13 download/faac.h.diff -268d60a6a1304fa1758a962a20731c1c download/faaccfg.h.diff -29fe6485d9ebe7fd0892c18ed450bac5 download/frame.h.diff -a4e382e8b7123a144c1cf1c10a7e1725 download/input.c.diff -bf65a158a69527826c5e9fff74d10e83 download/ltp.c.diff -dee39c5250880eb427a11269ececa205 download/mp4property.h.diff -e97db55385453a0482ab2673056d4022 download/mp4util.h.diff -ff5300984a0b097a08d66cb39d8a3ef0 download/mpeg4ip.h.diff -46b44023ce14bce4f0ed981ee5514c5c download/psych.h.diff +3d7c0f7936dcc1c4833d693860720adf Makefile.in.common.mp4v2.diff +eb7e2cee261c71ac4a8d718b5498777e Makefile.in.frontend.diff +19f2eebe3df5300ab4a1a16e43593663 aacquant.c.diff +2af64ce38f023774fb0c8f691b98c564 aacquant.h.diff +ea8508703521e663e637382231d4c13b config.h.in.diff +027ebf052052128c67f0749e610f4acb configure.diff +c5dde68840cefe46532089c9392d1df0 faac-1.28.tar.bz2 +56f2c5e28e1177e3b6956aaf83a10e13 faac.h.diff +268d60a6a1304fa1758a962a20731c1c faaccfg.h.diff +29fe6485d9ebe7fd0892c18ed450bac5 frame.h.diff +a4e382e8b7123a144c1cf1c10a7e1725 input.c.diff +bf65a158a69527826c5e9fff74d10e83 ltp.c.diff +dee39c5250880eb427a11269ececa205 mp4property.h.diff +e97db55385453a0482ab2673056d4022 mp4util.h.diff +ff5300984a0b097a08d66cb39d8a3ef0 mpeg4ip.h.diff +46b44023ce14bce4f0ed981ee5514c5c psych.h.diff 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 Nov 13 15:51:25 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 13 Nov 2009 14:51:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7265] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswpycompile Message-ID: Revision: 7265 http://gar.svn.sourceforge.net/gar/?rev=7265&view=rev Author: bdwalton Date: 2009-11-13 14:51:25 +0000 (Fri, 13 Nov 2009) Log Message: ----------- cswclassutils: correct exception handling for python compilation Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile 2009-11-13 14:25:08 UTC (rev 7264) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile 2009-11-13 14:51:25 UTC (rev 7265) @@ -49,7 +49,7 @@ for f in pyfiles: try: py_compile.compile(f, doraise=True) - except PyCompileError: + except py_compile.PyCompileError: print "Error compiling: %s" % f EOF 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 Nov 13 16:06:19 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 13 Nov 2009 15:06:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[7266] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswpycompile Message-ID: Revision: 7266 http://gar.svn.sourceforge.net/gar/?rev=7266&view=rev Author: bdwalton Date: 2009-11-13 15:06:19 +0000 (Fri, 13 Nov 2009) Log Message: ----------- cswclassutils: pycompile -> make python only warn about space/tab mix instead of error out Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile 2009-11-13 14:51:25 UTC (rev 7265) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile 2009-11-13 15:06:19 UTC (rev 7266) @@ -61,10 +61,10 @@ fi echo "Compiling py files to normal bytecode ..." -${PY_BINDIR}/python -Wi -tt $TMPPY +${PY_BINDIR}/python -Wi -t $TMPPY echo "Compiling py files to optimized bytecode ..." -${PY_BINDIR}/python -Wi -tt -O $TMPPY +${PY_BINDIR}/python -Wi -t -O $TMPPY rm $TMPPY 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 Nov 13 16:14:12 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 13 Nov 2009 15:14:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7267] csw/mgar/pkg Message-ID: Revision: 7267 http://gar.svn.sourceforge.net/gar/?rev=7267&view=rev Author: bonivart Date: 2009-11-13 15:14:11 +0000 (Fri, 13 Nov 2009) Log Message: ----------- spamass-milter: initial checkin Added Paths: ----------- csw/mgar/pkg/spamass-milter/ csw/mgar/pkg/spamass-milter/branches/ csw/mgar/pkg/spamass-milter/tags/ csw/mgar/pkg/spamass-milter/trunk/ csw/mgar/pkg/spamass-milter/trunk/Makefile csw/mgar/pkg/spamass-milter/trunk/checksums csw/mgar/pkg/spamass-milter/trunk/files/ csw/mgar/pkg/spamass-milter/trunk/files/COPYING Property changes on: csw/mgar/pkg/spamass-milter/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/spamass-milter/trunk/Makefile =================================================================== --- csw/mgar/pkg/spamass-milter/trunk/Makefile (rev 0) +++ csw/mgar/pkg/spamass-milter/trunk/Makefile 2009-11-13 15:14:11 UTC (rev 7267) @@ -0,0 +1,36 @@ +GARNAME = spamass-milter +GARVERSION = 0.3.1 +CATEGORIES = net + +DESCRIPTION = Plugin for the Sendmail Milter library for SpamAssassin +define BLURB + Plugin for the Sendmail Milter library for SpamAssassin +endef + +MASTER_SITES = http://mirrors.aixtools.net/sv/spamass-milt/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += COPYING + +PACKAGES = CSWspamass-milter +CATALOGNAME = spamass_milter +REQUIRED_PKGS = CSWspamassassin + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + +DOCLIST = AUTHORS Changelog NEWS README TODO + +install-custom: + @echo " ==> Installing $(GARNAME) (custom)" + @( cd $(WORKSRC) ; \ + gmake DESTDIR=$(DESTDIR) install ) + @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME) + @$(foreach DOC,$(DOCLIST),ginstall -m 444 $(WORKSRC)/$(DOC) $(DESTDIR)$(docdir)/$(GARNAME);) + @$(MAKECOOKIE) Added: csw/mgar/pkg/spamass-milter/trunk/checksums =================================================================== --- csw/mgar/pkg/spamass-milter/trunk/checksums (rev 0) +++ csw/mgar/pkg/spamass-milter/trunk/checksums 2009-11-13 15:14:11 UTC (rev 7267) @@ -0,0 +1,2 @@ +751419260aa954499f7abaabaa882bbe COPYING +ca6bf6a9c88db74a6bfea41f499c0ba6 spamass-milter-0.3.1.tar.gz Added: csw/mgar/pkg/spamass-milter/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/spamass-milter/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/spamass-milter/trunk/files/COPYING 2009-11-13 15:14:11 UTC (rev 7267) @@ -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. 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 Nov 13 16:18:10 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 13 Nov 2009 15:18:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7268] csw/mgar/pkg/cswclassutils/trunk/Makefile Message-ID: Revision: 7268 http://gar.svn.sourceforge.net/gar/?rev=7268&view=rev Author: bonivart Date: 2009-11-13 15:18:09 +0000 (Fri, 13 Nov 2009) Log Message: ----------- cswclassutils: update to 1.29, fixed i.cswpycompile Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-11-13 15:14:11 UTC (rev 7267) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-11-13 15:18:09 UTC (rev 7268) @@ -1,7 +1,7 @@ # $Id$ GARNAME = cswclassutils -GARVERSION = 1.28 +GARVERSION = 1.29 CATEGORIES = utils DESCRIPTION = CSW class action utilities This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Nov 13 16:22:12 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 13 Nov 2009 15:22:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7269] csw/mgar/pkg/cswclassutils/trunk/checksums Message-ID: Revision: 7269 http://gar.svn.sourceforge.net/gar/?rev=7269&view=rev Author: bonivart Date: 2009-11-13 15:22:12 +0000 (Fri, 13 Nov 2009) Log Message: ----------- cswclassutils: update checksums Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/checksums Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2009-11-13 15:18:09 UTC (rev 7268) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2009-11-13 15:22:12 UTC (rev 7269) @@ -6,7 +6,7 @@ fa318ca696e80a9a9f2efbf35cb69080 CSWcswclassutils.i.cswinitsmf 42668b41c7c886091a8ca44992b90806 CSWcswclassutils.i.cswmigrateconf c875d62c8ddaad0de2e18fff7946e1e8 CSWcswclassutils.i.cswpreserveconf -927297d22360707afd804c4ce58ed0a9 CSWcswclassutils.i.cswpycompile +9018419febe06c12e89d66cc76e7261f CSWcswclassutils.i.cswpycompile 1282bef941c49d98a061b3701a1fda7c CSWcswclassutils.i.cswtexinfo 7f04b24b421f3afbf3c61845941ef5dd CSWcswclassutils.i.cswusergroup d278a28a6f901c4ff5f07c583b4cff3d CSWcswclassutils.r.cswcpsampleconf 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 Nov 13 16:22:58 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 13 Nov 2009 15:22:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7270] csw/mgar/pkg Message-ID: Revision: 7270 http://gar.svn.sourceforge.net/gar/?rev=7270&view=rev Author: dmichelsen Date: 2009-11-13 15:22:57 +0000 (Fri, 13 Nov 2009) Log Message: ----------- gcpio: Initial checkin Modified Paths: -------------- csw/mgar/pkg/gcpio/trunk/Makefile csw/mgar/pkg/gcpio/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gcpio/ csw/mgar/pkg/gcpio/trunk/files/non-gnu-compiler.patch Modified: csw/mgar/pkg/gcpio/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtar/trunk/Makefile 2009-05-27 21:50:22 UTC (rev 5079) +++ csw/mgar/pkg/gcpio/trunk/Makefile 2009-11-13 15:22:57 UTC (rev 7270) @@ -1,35 +1,31 @@ -GARNAME = tar -GARVERSION = 1.22 +GARNAME = cpio +GARVERSION = 2.10 CATEGORIES = utils -DESCRIPTION = GNU tape archiver +DESCRIPTION = GNU cpio define BLURB - GNU 'tar' saves many files together into a single tape or disk archive, - and can restore individual files from the archive. It includes - multivolume support, the ability to archive sparse files, automatic - archive compression/decompression, remote archives and special features - that allow 'tar' to be used for incremental and full backups. This - distribution also includes 'rmt', the remote tape server. The 'mt' tape - drive control program is in the GNU 'cpio' distribution. GNU 'tar' is - derived from John Gilmore's public domain 'tar'. endef MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PACKAGES = CSWgtar +# From http://bugs.gentoo.org/275295 +PATCHFILES = non-gnu-compiler.patch +PATCHDIRLEVEL = 0 +PACKAGES = CSWgcpio + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_SOURCEURL = http://www.gnu.org/software/tar/ +SPKG_SOURCEURL = http://www.gnu.org/software/cpio/ -REQUIRED_PKGS = CSWggettextrt CSWiconv +REQUIRED_PKGS = NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) --program-prefix=g TEST_SCRIPTS = -EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias +#EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias include gar/category.mk Modified: csw/mgar/pkg/gcpio/trunk/checksums =================================================================== --- csw/mgar/pkg/gtar/trunk/checksums 2009-05-27 21:50:22 UTC (rev 5079) +++ csw/mgar/pkg/gcpio/trunk/checksums 2009-11-13 15:22:57 UTC (rev 7270) @@ -1 +1,2 @@ -efafad1b256e3de410f4fce5335d9c9d download/tar-1.22.tar.gz +351ab3d38d8949913e478cc23b9d6ad4 cpio-2.10.tar.gz +ff86aab1185277a2ae53928e4bd01692 non-gnu-compiler.patch Added: csw/mgar/pkg/gcpio/trunk/files/non-gnu-compiler.patch =================================================================== --- csw/mgar/pkg/gcpio/trunk/files/non-gnu-compiler.patch (rev 0) +++ csw/mgar/pkg/gcpio/trunk/files/non-gnu-compiler.patch 2009-11-13 15:22:57 UTC (rev 7270) @@ -0,0 +1,12 @@ +--- src/cpiohdr.h.dist 2009-06-24 15:41:26.983725240 +0100 ++++ src/cpiohdr.h 2009-06-24 15:41:59.753567720 +0100 +@@ -24,6 +24,8 @@ + + #ifdef HAVE_ATTRIB_PACKED + #define ATTRIB_PACKED __attribute__((packed)) ++#else ++#define ATTRIB_PACKED + #endif + + #ifdef HAVE_PRAGMA_PACK + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Nov 13 16:30:50 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 13 Nov 2009 15:30:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[7271] csw/mgar/pkg/libexif/trunk Message-ID: Revision: 7271 http://gar.svn.sourceforge.net/gar/?rev=7271&view=rev Author: hson Date: 2009-11-13 15:30:50 +0000 (Fri, 13 Nov 2009) Log Message: ----------- libexif: update to 0.6.19 Modified Paths: -------------- csw/mgar/pkg/libexif/trunk/Makefile csw/mgar/pkg/libexif/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libexif/trunk/files/exif-tag.patch Modified: csw/mgar/pkg/libexif/trunk/Makefile =================================================================== --- csw/mgar/pkg/libexif/trunk/Makefile 2009-11-13 15:22:57 UTC (rev 7270) +++ csw/mgar/pkg/libexif/trunk/Makefile 2009-11-13 15:30:50 UTC (rev 7271) @@ -1,5 +1,5 @@ GARNAME = libexif -GARVERSION = 0.6.17 +GARVERSION = 0.6.19 CATEGORIES = lib DESCRIPTION = EXIF Tag Parsing Library @@ -28,6 +28,7 @@ # UPSTREAM_MASTER_SITES = PATCHFILES = Makefile.patch +PATCHFILES += exif-tag.patch CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/libexif/trunk/checksums =================================================================== --- csw/mgar/pkg/libexif/trunk/checksums 2009-11-13 15:22:57 UTC (rev 7270) +++ csw/mgar/pkg/libexif/trunk/checksums 2009-11-13 15:30:50 UTC (rev 7271) @@ -1,2 +1,3 @@ -f7cf4e623a48c9a3b13f7f95f0a41015 download/libexif-0.6.17.tar.bz2 19e4a8ace576426613e54b5a267c2548 download/Makefile.patch +e7bf07b7e1012f6a32b17cf43389dd94 download/exif-tag.patch +56144a030a4c875c600b1ccf713f69f7 download/libexif-0.6.19.tar.bz2 Added: csw/mgar/pkg/libexif/trunk/files/exif-tag.patch =================================================================== --- csw/mgar/pkg/libexif/trunk/files/exif-tag.patch (rev 0) +++ csw/mgar/pkg/libexif/trunk/files/exif-tag.patch 2009-11-13 15:30:50 UTC (rev 7271) @@ -0,0 +1,11 @@ +--- libexif-0.6.19.orig/libexif/exif-tag.c 2009-11-08 07:13:41.000000000 +0100 ++++ libexif-0.6.19/libexif/exif-tag.c 2009-11-13 14:06:20.669421347 +0100 +@@ -870,7 +870,7 @@ + * Return the number of entries in the EXIF tag table, including the + * terminating NULL entry. + */ +-inline unsigned int ++unsigned int + exif_tag_table_count (void) + { + return sizeof (ExifTagTable) / sizeof (ExifTagTable[0]); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Nov 13 16:38:21 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 13 Nov 2009 15:38:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[7272] csw/mgar/pkg/libglade2/trunk/Makefile Message-ID: Revision: 7272 http://gar.svn.sourceforge.net/gar/?rev=7272&view=rev Author: dmichelsen Date: 2009-11-13 15:38:21 +0000 (Fri, 13 Nov 2009) Log Message: ----------- libglade2: Fix pathes to csw X11 Modified Paths: -------------- csw/mgar/pkg/libglade2/trunk/Makefile Modified: csw/mgar/pkg/libglade2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libglade2/trunk/Makefile 2009-11-13 15:30:50 UTC (rev 7271) +++ csw/mgar/pkg/libglade2/trunk/Makefile 2009-11-13 15:38:21 UTC (rev 7272) @@ -23,11 +23,18 @@ # new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -PKG_CONFIG_PATH = /opt/csw/lib/pkgconfig:/opt/csw/X11/lib/pkgconfig -EXTRA_EXPORTS = PKG_CONFIG_PATH +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -STRIP_LIBTOOL = 1 +SUNX11SUB_sparcv9 = sparcv9/ +SUNX11SUB_amd64 = amd64/ +EXTRA_LDFLAGS = -lm /usr/openwin/lib/$(SUNX11SUB_$(ISA))libXext.so + +BUILD64 = 1 +NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check + 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 Fri Nov 13 16:56:24 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 13 Nov 2009 15:56:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7273] csw/mgar/pkg/puppet/trunk Message-ID: Revision: 7273 http://gar.svn.sourceforge.net/gar/?rev=7273&view=rev Author: wahwah Date: 2009-11-13 15:56:23 +0000 (Fri, 13 Nov 2009) Log Message: ----------- puppet: Using the --single option of pkgutil Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/Makefile csw/mgar/pkg/puppet/trunk/checksums Added Paths: ----------- csw/mgar/pkg/puppet/trunk/files/0002-Using-the-single-option-of-pkgutil.patch Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2009-11-13 15:38:21 UTC (rev 7272) +++ csw/mgar/pkg/puppet/trunk/Makefile 2009-11-13 15:56:23 UTC (rev 7273) @@ -53,6 +53,7 @@ INSTALL_SCRIPTS = puppet PATCHFILES = 0001-pkgutil-support.patch +PATCHFILES += 0002-Using-the-single-option-of-pkgutil.patch include gar/category.mk Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2009-11-13 15:38:21 UTC (rev 7272) +++ csw/mgar/pkg/puppet/trunk/checksums 2009-11-13 15:56:23 UTC (rev 7273) @@ -1,5 +1,6 @@ abaa404420106f9f28e9e1218b4e365b 0001-pkgutil-support.patch -3b7da4c98895e944262ed684e48e3b08 cswpuppetd +9c27c0cdca051eae986b56b91ef889ca 0002-Using-the-single-option-of-pkgutil.patch +db0230ad9c2a8622c7f7e73c10f61dbc cswpuppetd fd5e49b7d2b7d288d5beb224d0cfa855 cswpuppetmasterd 3ab0d4f9801075bc78b68b766b496fc7 cswusergroup 288d46dee00acad64d0f3ecc6d8ba6fa puppet-0.24.8.tgz Added: csw/mgar/pkg/puppet/trunk/files/0002-Using-the-single-option-of-pkgutil.patch =================================================================== --- csw/mgar/pkg/puppet/trunk/files/0002-Using-the-single-option-of-pkgutil.patch (rev 0) +++ csw/mgar/pkg/puppet/trunk/files/0002-Using-the-single-option-of-pkgutil.patch 2009-11-13 15:56:23 UTC (rev 7273) @@ -0,0 +1,57 @@ +From bf4be0c98f180175dbadeaf3d841bd426b23752e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= +Date: Fri, 13 Nov 2009 15:44:24 +0000 +Subject: [PATCH] Using the --single option of pkgutil. + +--- + lib/puppet/provider/package/apt.rb | 1 + + lib/puppet/provider/package/pkgutil.rb | 5 ++++- + 2 files changed, 5 insertions(+), 1 deletions(-) + +diff --git a/lib/puppet/provider/package/apt.rb b/lib/puppet/provider/package/apt.rb +index a99ee4c..91e0121 100755 +--- a/lib/puppet/provider/package/apt.rb ++++ b/lib/puppet/provider/package/apt.rb +@@ -1,3 +1,4 @@ ++# vim:set sw=4 ts=4 sts=4: + Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do + # Provide sorting functionality + include Puppet::Util::Package +diff --git a/lib/puppet/provider/package/pkgutil.rb b/lib/puppet/provider/package/pkgutil.rb +index cde7482..c2489cc 100755 +--- a/lib/puppet/provider/package/pkgutil.rb ++++ b/lib/puppet/provider/package/pkgutil.rb +@@ -1,4 +1,5 @@ + # Packaging using pkgutil from http://pkgutil.wikidot.com/ ++# vim:set sw=4 ts=4 sts=4: + Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun do + desc "Package management using ``pkgutil`` command on Solaris." + pkgutil = "pkgutil" +@@ -20,6 +21,7 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d + end + end + ++ # It's a class method. Returns a list of instances of this class. + def self.instances(hash = {}) + blastlist(hash).collect do |bhash| + bhash.delete(:avail) +@@ -32,6 +34,7 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d + command = ["-c"] + + if hash[:justme] ++ command << ["--single"] + command << hash[:justme] + end + +@@ -86,7 +89,7 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d + pkgutil "-y", "--install", @resource[:name] + end + +- # Retrieve the version from the current package file. ++ # What's the latest version of the package available? + def latest + hash = self.class.blastlist(:justme => @resource[:name]) + hash[:avail] +-- +1.6.5.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 Fri Nov 13 17:17:53 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 13 Nov 2009 16:17:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[7274] csw/mgar/pkg/pyyaml/trunk/Makefile Message-ID: Revision: 7274 http://gar.svn.sourceforge.net/gar/?rev=7274&view=rev Author: wahwah Date: 2009-11-13 16:17:53 +0000 (Fri, 13 Nov 2009) Log Message: ----------- pyyaml: Disabling the 64-bit build. Modified Paths: -------------- csw/mgar/pkg/pyyaml/trunk/Makefile Modified: csw/mgar/pkg/pyyaml/trunk/Makefile =================================================================== --- csw/mgar/pkg/pyyaml/trunk/Makefile 2009-11-13 15:56:23 UTC (rev 7273) +++ csw/mgar/pkg/pyyaml/trunk/Makefile 2009-11-13 16:17:53 UTC (rev 7274) @@ -44,7 +44,6 @@ SPKG_DESC_CSWpy-yaml = YAML parser and emitter for Python SPKG_DESC_CSWpy-yaml-rt = Runtime libraries for YAML parser and emitter -BUILD64 = 1 ARCHALL_CSWpy-yaml = 1 PKGFILES_CSWpy-yaml-rt = /opt/csw/lib/python/site-packages/.*\.so 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 Nov 13 17:27:07 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 13 Nov 2009 16:27:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7275] csw/mgar/pkg/pyyaml/trunk/Makefile Message-ID: Revision: 7275 http://gar.svn.sourceforge.net/gar/?rev=7275&view=rev Author: wahwah Date: 2009-11-13 16:27:04 +0000 (Fri, 13 Nov 2009) Log Message: ----------- pyyaml: removing an explicit dependency to avoid double depends Modified Paths: -------------- csw/mgar/pkg/pyyaml/trunk/Makefile Modified: csw/mgar/pkg/pyyaml/trunk/Makefile =================================================================== --- csw/mgar/pkg/pyyaml/trunk/Makefile 2009-11-13 16:17:53 UTC (rev 7274) +++ csw/mgar/pkg/pyyaml/trunk/Makefile 2009-11-13 16:27:04 UTC (rev 7275) @@ -37,7 +37,7 @@ CATALOGNAME_CSWpy-yaml = py_yaml CATALOGNAME_CSWpy-yaml-rt = py_yaml_rt -REQUIRED_PKGS_CSWpy-yaml = CSWpython +REQUIRED_PKGS_CSWpy-yaml = REQUIRED_PKGS_CSWpy-yaml-rt = CSWpython-rt CSWlibyaml PREREQUISITE_PKGS = $(REQUIRED_PKGS_CSWpy-yaml) $(REQUIRED_PKGS_CSWpy-yaml-rt) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Nov 13 17:27:16 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 13 Nov 2009 16:27:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7276] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 7276 http://gar.svn.sourceforge.net/gar/?rev=7276&view=rev Author: bonivart Date: 2009-11-13 16:27:16 +0000 (Fri, 13 Nov 2009) Log Message: ----------- pkgutil: 1.9 beta 2 Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype csw/mgar/pkg/pkgutil/trunk/files/i.cswpkgutil csw/mgar/pkg/pkgutil/trunk/files/r.cswpkgutil Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2009-11-13 16:27:04 UTC (rev 7275) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-11-13 16:27:16 UTC (rev 7276) @@ -1,5 +1,5 @@ GARNAME = pkgutil -GARVERSION = 1.9b1 +GARVERSION = 1.9b2 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily @@ -68,6 +68,7 @@ @pod2man --section=1 $(WORKSRC)/$(GARNAME) > $(DESTDIR)$(mandir)/man1/pkgutil.1 @pod2man --section=1 $(WORKSRC)/bldcat > $(DESTDIR)$(mandir)/man1/bldcat.1 @pod2man --section=1 $(WORKSRC)/chkcat > $(DESTDIR)$(mandir)/man1/chkcat.1 + @chmod 444 $(DESTDIR)$(mandir)/man1/* @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/$(GARNAME)/packages @ginstall $(WORKSRC)/admin $(DESTDIR)/var/opt/csw/$(GARNAME)/admin.CSW @$(MAKECOOKIE) Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-11-13 16:27:04 UTC (rev 7275) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-11-13 16:27:16 UTC (rev 7276) @@ -1,5 +1,5 @@ a16c6f81bc537d6172fd65d8da1aeecc CSWpkgutil.gspec -a9bd66f3cfaef5ec3df946363e80085f CSWpkgutil.prototype -443c6cb0435cefc046629a3e68e7fe61 i.cswpkgutil +b93ce519cebdc48350eb0e2a22214827 CSWpkgutil.prototype +33f82561e1fcf3aaf22f66bac22afba1 i.cswpkgutil 15dcb525af077847f98ea51d1c6f4162 pkgutil-1.9b1.zip -c8a3a8c4ed123f229dbd60cd4722fd03 r.cswpkgutil +6d472d94ea850b600fd29aba7a6fc4b3 r.cswpkgutil Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype 2009-11-13 16:27:04 UTC (rev 7275) +++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype 2009-11-13 16:27:16 UTC (rev 7276) @@ -15,11 +15,11 @@ d none /opt/csw/share 0755 root bin d none /opt/csw/share/doc 0755 root bin d none /opt/csw/share/doc/pkgutil 0755 root bin -f none /opt/csw/share/doc/pkgutil/license 644 root bin -f none /opt/csw/share/doc/pkgutil/readme 644 root bin +f none /opt/csw/share/doc/pkgutil/license 444 root bin +f none /opt/csw/share/doc/pkgutil/readme 444 root bin d none /opt/csw/share/man 0755 root bin d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/pkgutil.1 644 root bin +f none /opt/csw/share/man/man1/pkgutil.1 444 root bin d none /var/opt/csw 0755 root bin d none /var/opt/csw/pkgutil 0755 root bin f cswpkgutil /var/opt/csw/pkgutil/admin.CSW 644 root bin Modified: csw/mgar/pkg/pkgutil/trunk/files/i.cswpkgutil =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/i.cswpkgutil 2009-11-13 16:27:04 UTC (rev 7275) +++ csw/mgar/pkg/pkgutil/trunk/files/i.cswpkgutil 2009-11-13 16:27:16 UTC (rev 7276) @@ -4,7 +4,7 @@ do cp $src $dest conf=`echo $dest | sed 's/.CSW$//'` - if [-f "$conf"]; then + if [ -f "$conf" ]; then echo "$conf already exists, will not copy $dest to it." else cp $dest $conf Modified: csw/mgar/pkg/pkgutil/trunk/files/r.cswpkgutil =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/r.cswpkgutil 2009-11-13 16:27:04 UTC (rev 7275) +++ csw/mgar/pkg/pkgutil/trunk/files/r.cswpkgutil 2009-11-13 16:27:16 UTC (rev 7276) @@ -4,9 +4,9 @@ do conf=`echo $dest | sed 's/.CSW$//'` if [ "`cmp "$conf" "$dest" > /dev/null`" ]; then - rm $conf + rm -f $conf else echo "$conf modified, will not remove it." fi - rm $dest + rm -f $dest 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 Fri Nov 13 17:36:50 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 13 Nov 2009 16:36:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[7277] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 7277 http://gar.svn.sourceforge.net/gar/?rev=7277&view=rev Author: bonivart Date: 2009-11-13 16:36:50 +0000 (Fri, 13 Nov 2009) Log Message: ----------- pkgutil: fix checksum 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 2009-11-13 16:27:16 UTC (rev 7276) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-11-13 16:36:50 UTC (rev 7277) @@ -25,6 +25,7 @@ SPKG_DESC_CSWpkgutilplus = Extends pkgutil functionality # Explicitly depend on CSWcommon here since it's not the default +#REQUIRED_PKGS_CSWpkgutilplus = CSWcommon CSWperl CSWgnupg CSWpkgutil CSWpmwwwcurl REQUIRED_PKGS_CSWpkgutilplus = CSWcommon CSWperl CSWgnupg CSWpkgutil PKGFILES_CSWpkgutilplus = .*bldcat.* Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-11-13 16:27:16 UTC (rev 7276) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-11-13 16:36:50 UTC (rev 7277) @@ -1,5 +1,5 @@ a16c6f81bc537d6172fd65d8da1aeecc CSWpkgutil.gspec b93ce519cebdc48350eb0e2a22214827 CSWpkgutil.prototype 33f82561e1fcf3aaf22f66bac22afba1 i.cswpkgutil -15dcb525af077847f98ea51d1c6f4162 pkgutil-1.9b1.zip +2d9c8f2e8ed58c015bdcd73862c5d9f4 pkgutil-1.9b2.zip 6d472d94ea850b600fd29aba7a6fc4b3 r.cswpkgutil 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 Nov 13 21:12:43 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 13 Nov 2009 20:12:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[7278] csw/mgar/pkg/rapidsvn/trunk Message-ID: Revision: 7278 http://gar.svn.sourceforge.net/gar/?rev=7278&view=rev Author: dmichelsen Date: 2009-11-13 20:12:43 +0000 (Fri, 13 Nov 2009) Log Message: ----------- rapidsvn: Update to 0.12 Modified Paths: -------------- csw/mgar/pkg/rapidsvn/trunk/Makefile csw/mgar/pkg/rapidsvn/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/rapidsvn/trunk/ Property changes on: csw/mgar/pkg/rapidsvn/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/rapidsvn/trunk/Makefile =================================================================== --- csw/mgar/pkg/rapidsvn/trunk/Makefile 2009-11-13 16:36:50 UTC (rev 7277) +++ csw/mgar/pkg/rapidsvn/trunk/Makefile 2009-11-13 20:12:43 UTC (rev 7278) @@ -1,62 +1,65 @@ GARNAME = rapidsvn -GARVERSION = 0.9.1 +GARVERSION = 0.12.0-1 CATEGORIES = utils -DESCRIPTION = Subversion GUI +DESCRIPTION = GUI front-end for the Subversion revision system define BLURB - # TODO: Insert Blurb + This is the developer site for RapidSVN. You have access to the source code + of RapidSVN, the issue tracker and the mailing lists. If you are a user of + RapidSVN you might want to take a look at http://www.rapidsvn.org where we + are working on the Documentation and Online Help of RapidSVN endef -MASTER_SITES = http://www.rapidsvn.org/download/ +MASTER_SITES = http://www.rapidsvn.org/download/release/0.12/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWrapidsvn,depend prototype) -DISTFILES += $(call admfiles,CSWsvncpp,depend prototype) +# DISTFILES += $(call admfiles,CSWrapidsvn,depend prototype) +# DISTFILES += $(call admfiles,CSWsvncpp,depend prototype) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +SPKG_SOURCEURL = http://rapidsvn.tigris.org/ + # RapidSVN 0.9.1 omits the manpage from the dist archive -DISTFILES += rapidsvn.xml +# DISTFILES += rapidsvn.xml # Remove gcc C/CXXFLAGS, and fix autoconf tests -PATCHFILES += configure.diff +# PATCHFILES += configure.diff # This should be separated out of CSWkdelibsgcc -KSGML = $(prefix)/kde-gcc/share/apps/ksgmltools2 -DOCBOOK_MANPAGE = $(KSGML)/docbook/xsl/manpages/docbook.xsl +# KSGML = $(prefix)/kde-gcc/share/apps/ksgmltools2 +# DOCBOOK_MANPAGE = $(KSGML)/docbook/xsl/manpages/docbook.xsl -SVNLIB = $(prefix)/lib/svn - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-apr-config=$(prefix)/apache2/bin/apr-1-config CONFIGURE_ARGS += --with-apu-config=$(prefix)/apache2/bin/apu-1-config -CONFIGURE_ARGS += --with-svn-lib=$(SVNLIB) +CONFIGURE_ARGS += --with-svn-lib=$(libdir)/svn CONFIGURE_ARGS += --with-svn-include=$(includedir) -CONFIGURE_ARGS += --with-docbook-xsl-manpages=$(DOCBOOK_MANPAGE) +# CONFIGURE_ARGS += --with-docbook-xsl-manpages=$(DOCBOOK_MANPAGE) -EXTRA_LIB = $(prefix)/bdb43/lib $(SVNLIB) -EXTRA_INC = $(prefix)/bdb43/include +# EXTRA_LIB = $(prefix)/bdb43/lib $(SVNLIB) +# EXTRA_INC = $(prefix)/bdb43/include TEST_TARGET = check include gar/category.mk -pre-configure: - @echo " ==> Regenerating build tools..." - @(cd $(WORKSRC) ; \ - aclocal && \ - autoconf && \ - libtoolize --automake --force && \ - aclocal && \ - automake -a ) - @$(MAKECOOKIE) +# pre-configure: +# @echo " ==> Regenerating build tools..." +# @(cd $(WORKSRC) ; \ +# aclocal && \ +# autoconf && \ +# libtoolize --automake --force && \ +# aclocal && \ +# automake -a ) +# @$(MAKECOOKIE) -pre-build: - @cp $(WORKDIR)/rapidsvn.xml $(WORKSRC)/doc/manpage +# pre-build: +# @cp $(WORKDIR)/rapidsvn.xml $(WORKSRC)/doc/manpage -post-install: - install -d $(DESTDIR)$(mandir)/man1 - ( cd $(WORKSRC)/doc/manpage ; make manpage-yes ) - install $(WORKSRC)/doc/manpage/rapidsvn.1 $(DESTDIR)$(mandir)/man1 - @$(MAKECOOKIE) +# post-install: +# install -d $(DESTDIR)$(mandir)/man1 +# ( cd $(WORKSRC)/doc/manpage ; make manpage-yes ) +# install $(WORKSRC)/doc/manpage/rapidsvn.1 $(DESTDIR)$(mandir)/man1 +# @$(MAKECOOKIE) Modified: csw/mgar/pkg/rapidsvn/trunk/checksums =================================================================== --- csw/mgar/pkg/rapidsvn/trunk/checksums 2009-11-13 16:36:50 UTC (rev 7277) +++ csw/mgar/pkg/rapidsvn/trunk/checksums 2009-11-13 20:12:43 UTC (rev 7278) @@ -1,9 +1 @@ -ba03034db35912c7b51b146cc7e6090e download/rapidsvn-0.9.1.tar.gz -7791a3a0681b1daff320f531948c0fe6 download/CSWrapidsvn.gspec -554c43f3c3086a8229bd4021be747aed download/CSWrapidsvn.depend -e5194b3eebe3f418ff6dc7267a0c043e download/CSWrapidsvn.prototype -6b161aa8e8c9342e20116451b8ab35cd download/CSWsvncpp.gspec -b2d74eb6645f9d95b2fd0b9506efb91b download/CSWsvncpp.depend -f18368ee36c8208b76d0e2d980f23ecd download/CSWsvncpp.prototype -58f6f5a25173450f037563fd52dc3eef download/rapidsvn.xml -a7fa20da2caebf270134b381346e1424 download/configure.diff +8ec54104fca32d81e396a68e25324263 rapidsvn-0.12.0-1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Fri Nov 13 22:46:07 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Fri, 13 Nov 2009 21:46:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7279] csw/mgar/pkg/java/ajccollections/trunk/Makefile Message-ID: Revision: 7279 http://gar.svn.sourceforge.net/gar/?rev=7279&view=rev Author: wbonnet Date: 2009-11-13 21:46:06 +0000 (Fri, 13 Nov 2009) Log Message: ----------- Remove extra dependencies to fix cyclic depend Modified Paths: -------------- csw/mgar/pkg/java/ajccollections/trunk/Makefile Modified: csw/mgar/pkg/java/ajccollections/trunk/Makefile =================================================================== --- csw/mgar/pkg/java/ajccollections/trunk/Makefile 2009-11-13 20:12:43 UTC (rev 7278) +++ csw/mgar/pkg/java/ajccollections/trunk/Makefile 2009-11-13 21:46:06 UTC (rev 7279) @@ -24,7 +24,7 @@ SPKG_DESC_CSWajccollectdoc = $(DESCRIPTION) documentation package # Defines dependencies -REQUIRED_PKGS_CSWajccollect = CSWajcconfig CSWajcdigester CSWajcemail CSWajcnet +REQUIRED_PKGS_CSWajccollect = CSWajcdigester # Defines package content PKGFILES_CSWajccollect = $(prefix)/share/doc/$(GARNAME)/LICENSE.txt 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 Nov 14 02:12:46 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 14 Nov 2009 01:12:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7280] csw/mgar/pkg/ruby/trunk Message-ID: Revision: 7280 http://gar.svn.sourceforge.net/gar/?rev=7280&view=rev Author: bdwalton Date: 2009-11-14 01:12:46 +0000 (Sat, 14 Nov 2009) Log Message: ----------- ruby: ensure we use $ARCH specific rbconfig.rb for GCC4 alternate Modified Paths: -------------- csw/mgar/pkg/ruby/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.i386 csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.sparc Removed Paths: ------------- csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4 Modified: csw/mgar/pkg/ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby/trunk/Makefile 2009-11-13 21:46:06 UTC (rev 7279) +++ csw/mgar/pkg/ruby/trunk/Makefile 2009-11-14 01:12:46 UTC (rev 7280) @@ -124,7 +124,7 @@ multiconfig: @echo "Setting up the CSW rbconfig stuff so we can switch between compilers" @mv $(DESTDIR)$(RBCONFIG) $(DESTDIR)$(RBCONFIG).SOS11 - @gcp $(FILEDIR)/rbconfig.rb.GCC4 $(DESTDIR)/$(RBCONFIG).GCC4 + @gcp $(FILEDIR)/rbconfig.rb.GCC4.$(GARCH) $(DESTDIR)/$(RBCONFIG).GCC4 @gln -s $(RBCONFIG).SOS11 $(DESTDIR)$(RBCONFIG) @gcp $(FILEDIR)/cswrbconfig $(DESTDIR)/opt/csw/bin/ @chmod 755 $(DESTDIR)/opt/csw/bin/cswrbconfig Deleted: csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4 =================================================================== --- csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4 2009-11-13 21:46:06 UTC (rev 7279) +++ csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4 2009-11-14 01:12:46 UTC (rev 7280) @@ -1,182 +0,0 @@ - -# This file was created by mkconfig.rb when ruby was built. Any -# changes made to this file will be lost the next time ruby is built. - -module Config - RUBY_VERSION == "1.8.7" or - raise "ruby lib version (1.8.7) doesn't match executable version (#{RUBY_VERSION})" - - TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/1.8/i386-solaris2.8") - DESTDIR = '' unless defined? DESTDIR - CONFIG = {} - CONFIG["DESTDIR"] = DESTDIR - CONFIG["INSTALL"] = '/opt/csw/bin/ginstall -c' - CONFIG["prefix"] = (TOPDIR || DESTDIR + "/opt/csw") - CONFIG["EXEEXT"] = "" - CONFIG["ruby_install_name"] = "ruby" - CONFIG["RUBY_INSTALL_NAME"] = "ruby" - CONFIG["RUBY_SO_NAME"] = "ruby" - CONFIG["SHELL"] = "/bin/bash" - CONFIG["PATH_SEPARATOR"] = ":" - CONFIG["PACKAGE_NAME"] = "" - CONFIG["PACKAGE_TARNAME"] = "" - CONFIG["PACKAGE_VERSION"] = "" - CONFIG["PACKAGE_STRING"] = "" - CONFIG["PACKAGE_BUGREPORT"] = "" - CONFIG["exec_prefix"] = "$(DESTDIR)/opt/csw" - CONFIG["bindir"] = "$(DESTDIR)/opt/csw/bin" - CONFIG["sbindir"] = "$(DESTDIR)/opt/csw/sbin" - CONFIG["libexecdir"] = "$(DESTDIR)/opt/csw/libexec" - CONFIG["datarootdir"] = "$(prefix)/share" - CONFIG["datadir"] = "$(DESTDIR)/opt/csw/share" - CONFIG["sysconfdir"] = "$(DESTDIR)/opt/csw/etc" - CONFIG["sharedstatedir"] = "$(DESTDIR)/opt/csw/share" - CONFIG["localstatedir"] = "$(DESTDIR)/opt/csw/var" - CONFIG["includedir"] = "$(DESTDIR)/opt/csw/include" - CONFIG["oldincludedir"] = "/usr/include" - CONFIG["docdir"] = "$(datarootdir)/doc/$(PACKAGE)" - CONFIG["infodir"] = "$(DESTDIR)/opt/csw/share/info" - CONFIG["htmldir"] = "$(docdir)" - CONFIG["dvidir"] = "$(docdir)" - CONFIG["pdfdir"] = "$(docdir)" - CONFIG["psdir"] = "$(docdir)" - CONFIG["libdir"] = "$(DESTDIR)/opt/csw/lib" - CONFIG["localedir"] = "$(datarootdir)/locale" - CONFIG["mandir"] = "$(DESTDIR)/opt/csw/share/man" - CONFIG["DEFS"] = "-D_FILE_OFFSET_BITS=64" - CONFIG["ECHO_C"] = "" - CONFIG["ECHO_N"] = "-n" - CONFIG["ECHO_T"] = "" - CONFIG["LIBS"] = "-lpthread -lrt -ldl -lcrypt -lm " - CONFIG["build_alias"] = "" - CONFIG["host_alias"] = "" - CONFIG["target_alias"] = "" - CONFIG["MAJOR"] = "1" - CONFIG["MINOR"] = "8" - CONFIG["TEENY"] = "7" - CONFIG["build"] = "i386-pc-solaris2.8" - CONFIG["build_cpu"] = "i386" - CONFIG["build_vendor"] = "pc" - CONFIG["build_os"] = "solaris2.8" - CONFIG["host"] = "i386-pc-solaris2.8" - CONFIG["host_cpu"] = "i386" - CONFIG["host_vendor"] = "pc" - CONFIG["host_os"] = "solaris2.8" - CONFIG["target"] = "i386-pc-solaris2.8" - CONFIG["target_cpu"] = "i386" - CONFIG["target_vendor"] = "pc" - CONFIG["target_os"] = "solaris2.8" - CONFIG["CC"] = "/opt/csw/gcc4/bin/gcc" - CONFIG["CFLAGS"] = "-mtune=i686 -O2 -pipe -m32 -march=i386 -I/opt/csw/include -fPIC $(cflags)" - CONFIG["LDFLAGS"] = "-L. -L/opt/csw/gcc4/lib/. -m32 -march=i386 -R /opt/csw/gcc4/lib -L/opt/csw/lib" - CONFIG["CPPFLAGS"] = "-I/opt/csw/include $(DEFS) $(cppflags)" - CONFIG["OBJEXT"] = "o" - CONFIG["CPP"] = "/opt/csw/gcc4/bin/gcc -E" - CONFIG["GREP"] = "/opt/csw/bin/ggrep" - CONFIG["EGREP"] = "/opt/csw/bin/ggrep -E" - CONFIG["GNU_LD"] = "no" - CONFIG["CPPOUTFILE"] = "-o conftest.i" - CONFIG["OUTFLAG"] = "-o " - CONFIG["YACC"] = "bison -y" - CONFIG["YFLAGS"] = "" - CONFIG["RANLIB"] = "ranlib" - CONFIG["AR"] = "ar" - CONFIG["AS"] = "as" - CONFIG["ASFLAGS"] = "" - CONFIG["NM"] = "" - CONFIG["WINDRES"] = "" - CONFIG["DLLWRAP"] = "" - CONFIG["OBJDUMP"] = "" - CONFIG["LN_S"] = "ln -s" - CONFIG["SET_MAKE"] = "" - CONFIG["INSTALL_PROGRAM"] = "$(INSTALL)" - CONFIG["INSTALL_SCRIPT"] = "$(INSTALL)" - CONFIG["INSTALL_DATA"] = "$(INSTALL) -m 644" - CONFIG["RM"] = "rm -f" - CONFIG["CP"] = "cp" - CONFIG["MAKEDIRS"] = "mkdir -p" - CONFIG["ALLOCA"] = "" - CONFIG["DLDFLAGS"] = "" - CONFIG["ARCH_FLAG"] = "" - CONFIG["STATIC"] = "" - CONFIG["CCDLFLAGS"] = " -fPIC" - CONFIG["LDSHARED"] = "$(CC) -shared" - CONFIG["DLEXT"] = "so" - CONFIG["DLEXT2"] = "" - CONFIG["LIBEXT"] = "a" - CONFIG["LINK_SO"] = "" - CONFIG["LIBPATHFLAG"] = " -L%1$-s" - CONFIG["RPATHFLAG"] = " -Wl,-R%1$-s" - CONFIG["LIBPATHENV"] = "LD_LIBRARY_PATH" - CONFIG["TRY_LINK"] = "" - CONFIG["STRIP"] = "strip" - CONFIG["EXTSTATIC"] = "" - CONFIG["setup"] = "Setup" - CONFIG["PREP"] = "miniruby$(EXEEXT)" - CONFIG["EXTOUT"] = ".ext" - CONFIG["ARCHFILE"] = "" - CONFIG["RDOCTARGET"] = "install-doc" - CONFIG["cppflags"] = "-I/opt/csw/include" - CONFIG["cflags"] = "$(optflags) $(debugflags)" - CONFIG["optflags"] = "" - CONFIG["debugflags"] = "" - CONFIG["LIBRUBY_LDSHARED"] = "$(CC) -shared" - CONFIG["LIBRUBY_DLDFLAGS"] = " -Wl,-h,$(@|#_!!_#|F)" - CONFIG["rubyw_install_name"] = "" - CONFIG["RUBYW_INSTALL_NAME"] = "" - CONFIG["LIBRUBY_A"] = "lib$(RUBY_SO_NAME)-static.a" - CONFIG["LIBRUBY_SO"] = "lib$(RUBY_SO_NAME).so.$(MAJOR)" - CONFIG["LIBRUBY_ALIASES"] = "lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY) lib$(RUBY_SO_NAME).so" - CONFIG["LIBRUBY"] = "$(LIBRUBY_SO)" - CONFIG["LIBRUBYARG"] = "$(LIBRUBYARG_SHARED)" - CONFIG["LIBRUBYARG_STATIC"] = "-l$(RUBY_SO_NAME)-static" - CONFIG["LIBRUBYARG_SHARED"] = "-Wl,-R -Wl,$(libdir) -L$(libdir) -l$(RUBY_SO_NAME)" - CONFIG["SOLIBS"] = "$(LIBS)" - CONFIG["DLDLIBS"] = " -lc" - CONFIG["ENABLE_SHARED"] = "yes" - CONFIG["MAINLIBS"] = "" - CONFIG["COMMON_LIBS"] = "" - CONFIG["COMMON_MACROS"] = "" - CONFIG["COMMON_HEADERS"] = "" - CONFIG["EXPORT_PREFIX"] = "" - CONFIG["MAKEFILES"] = "Makefile" - CONFIG["arch"] = "i386-solaris2.8" - CONFIG["sitearch"] = "i386-solaris2.8" - CONFIG["sitedir"] = "$(libdir)/ruby/site_ruby" - CONFIG["vendordir"] = "$(libdir)/ruby/vendor_ruby" - CONFIG["configure_args"] = " '--prefix=/opt/csw' '--exec_prefix=/opt/csw' '--bindir=/opt/csw/bin' '--sbindir=/opt/csw/sbin' '--libexecdir=/opt/csw/libexec' '--datadir=/opt/csw/share' '--sysconfdir=/opt/csw/etc' '--sharedstatedir=/opt/csw/share' '--localstatedir=/opt/csw/var' '--libdir=/opt/csw/lib' '--infodir=/opt/csw/share/info' '--includedir=/opt/csw/include' '--mandir=/opt/csw/share/man' '--enable-pthread' '--enable-shared' '--with-tcl-dir=/opt/csw' '--with-tk-dir=/opt/csw' '--with-dbm-dir=/opt/csw' '--with-gdbm-dir=/opt/csw' '--with-iconv-dir=/opt/csw' '--with-openssl-dir=/opt/csw' '--with-readline-dir=/opt/csw' '--with-zlib-dir=/opt/csw' '--enable-install-doc' 'CC=/opt/csw/gcc4/bin/gcc' 'CFLAGS=-mtune=i686 -O2 -pipe -m32 -march=i386 -I/opt/csw/include' 'LDFLAGS=-L/opt/csw/gcc4/lib/. -m32 -march=i386 -R /opt/csw/gcc4/lib -L/opt/csw/lib' 'CPPFLAGS=-I/opt/csw/include'" - CONFIG["NROFF"] = "/usr/bin/nroff" - CONFIG["MANTYPE"] = "man" - CONFIG["ruby_version"] = "$(MAJOR).$(MINOR)" - CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)" - CONFIG["archdir"] = "$(rubylibdir)/$(arch)" - CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)" - CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)" - CONFIG["vendorlibdir"] = "$(vendordir)/$(ruby_version)" - CONFIG["vendorarchdir"] = "$(vendorlibdir)/$(sitearch)" - CONFIG["topdir"] = File.dirname(__FILE__) - MAKEFILE_CONFIG = {} - CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup} - def Config::expand(val, config = CONFIG) - val.gsub!(/\$\$|\$\(([^()]+)\)|\$\{([^{}]+)\}/) do |var| - if !(v = $1 || $2) - '$' - elsif key = config[v = v[/\A[^:]+(?=(?::(.*?)=(.*))?\z)/]] - pat, sub = $1, $2 - config[v] = false - Config::expand(key, config) - config[v] = key - key = key.gsub(/#{Regexp.quote(pat)}(?=\s|\z)/n) {sub} if pat - key - else - var - end - end - val - end - CONFIG.each_value do |val| - Config::expand(val) - end -end -RbConfig = Config # compatibility for ruby-1.9 -CROSS_COMPILING = nil unless defined? CROSS_COMPILING Copied: csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.i386 (from rev 6972, csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4) =================================================================== --- csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.i386 (rev 0) +++ csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.i386 2009-11-14 01:12:46 UTC (rev 7280) @@ -0,0 +1,182 @@ + +# This file was created by mkconfig.rb when ruby was built. Any +# changes made to this file will be lost the next time ruby is built. + +module Config + RUBY_VERSION == "1.8.7" or + raise "ruby lib version (1.8.7) doesn't match executable version (#{RUBY_VERSION})" + + TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/1.8/i386-solaris2.8") + DESTDIR = '' unless defined? DESTDIR + CONFIG = {} + CONFIG["DESTDIR"] = DESTDIR + CONFIG["INSTALL"] = '/opt/csw/bin/ginstall -c' + CONFIG["prefix"] = (TOPDIR || DESTDIR + "/opt/csw") + CONFIG["EXEEXT"] = "" + CONFIG["ruby_install_name"] = "ruby" + CONFIG["RUBY_INSTALL_NAME"] = "ruby" + CONFIG["RUBY_SO_NAME"] = "ruby" + CONFIG["SHELL"] = "/bin/bash" + CONFIG["PATH_SEPARATOR"] = ":" + CONFIG["PACKAGE_NAME"] = "" + CONFIG["PACKAGE_TARNAME"] = "" + CONFIG["PACKAGE_VERSION"] = "" + CONFIG["PACKAGE_STRING"] = "" + CONFIG["PACKAGE_BUGREPORT"] = "" + CONFIG["exec_prefix"] = "$(DESTDIR)/opt/csw" + CONFIG["bindir"] = "$(DESTDIR)/opt/csw/bin" + CONFIG["sbindir"] = "$(DESTDIR)/opt/csw/sbin" + CONFIG["libexecdir"] = "$(DESTDIR)/opt/csw/libexec" + CONFIG["datarootdir"] = "$(prefix)/share" + CONFIG["datadir"] = "$(DESTDIR)/opt/csw/share" + CONFIG["sysconfdir"] = "$(DESTDIR)/opt/csw/etc" + CONFIG["sharedstatedir"] = "$(DESTDIR)/opt/csw/share" + CONFIG["localstatedir"] = "$(DESTDIR)/opt/csw/var" + CONFIG["includedir"] = "$(DESTDIR)/opt/csw/include" + CONFIG["oldincludedir"] = "/usr/include" + CONFIG["docdir"] = "$(datarootdir)/doc/$(PACKAGE)" + CONFIG["infodir"] = "$(DESTDIR)/opt/csw/share/info" + CONFIG["htmldir"] = "$(docdir)" + CONFIG["dvidir"] = "$(docdir)" + CONFIG["pdfdir"] = "$(docdir)" + CONFIG["psdir"] = "$(docdir)" + CONFIG["libdir"] = "$(DESTDIR)/opt/csw/lib" + CONFIG["localedir"] = "$(datarootdir)/locale" + CONFIG["mandir"] = "$(DESTDIR)/opt/csw/share/man" + CONFIG["DEFS"] = "-D_FILE_OFFSET_BITS=64" + CONFIG["ECHO_C"] = "" + CONFIG["ECHO_N"] = "-n" + CONFIG["ECHO_T"] = "" + CONFIG["LIBS"] = "-lpthread -lrt -ldl -lcrypt -lm " + CONFIG["build_alias"] = "" + CONFIG["host_alias"] = "" + CONFIG["target_alias"] = "" + CONFIG["MAJOR"] = "1" + CONFIG["MINOR"] = "8" + CONFIG["TEENY"] = "7" + CONFIG["build"] = "i386-pc-solaris2.8" + CONFIG["build_cpu"] = "i386" + CONFIG["build_vendor"] = "pc" + CONFIG["build_os"] = "solaris2.8" + CONFIG["host"] = "i386-pc-solaris2.8" + CONFIG["host_cpu"] = "i386" + CONFIG["host_vendor"] = "pc" + CONFIG["host_os"] = "solaris2.8" + CONFIG["target"] = "i386-pc-solaris2.8" + CONFIG["target_cpu"] = "i386" + CONFIG["target_vendor"] = "pc" + CONFIG["target_os"] = "solaris2.8" + CONFIG["CC"] = "/opt/csw/gcc4/bin/gcc" + CONFIG["CFLAGS"] = "-mtune=i686 -O2 -pipe -m32 -march=i386 -I/opt/csw/include -fPIC $(cflags)" + CONFIG["LDFLAGS"] = "-L. -L/opt/csw/gcc4/lib/. -m32 -march=i386 -R /opt/csw/gcc4/lib -L/opt/csw/lib" + CONFIG["CPPFLAGS"] = "-I/opt/csw/include $(DEFS) $(cppflags)" + CONFIG["OBJEXT"] = "o" + CONFIG["CPP"] = "/opt/csw/gcc4/bin/gcc -E" + CONFIG["GREP"] = "/opt/csw/bin/ggrep" + CONFIG["EGREP"] = "/opt/csw/bin/ggrep -E" + CONFIG["GNU_LD"] = "no" + CONFIG["CPPOUTFILE"] = "-o conftest.i" + CONFIG["OUTFLAG"] = "-o " + CONFIG["YACC"] = "bison -y" + CONFIG["YFLAGS"] = "" + CONFIG["RANLIB"] = "ranlib" + CONFIG["AR"] = "ar" + CONFIG["AS"] = "as" + CONFIG["ASFLAGS"] = "" + CONFIG["NM"] = "" + CONFIG["WINDRES"] = "" + CONFIG["DLLWRAP"] = "" + CONFIG["OBJDUMP"] = "" + CONFIG["LN_S"] = "ln -s" + CONFIG["SET_MAKE"] = "" + CONFIG["INSTALL_PROGRAM"] = "$(INSTALL)" + CONFIG["INSTALL_SCRIPT"] = "$(INSTALL)" + CONFIG["INSTALL_DATA"] = "$(INSTALL) -m 644" + CONFIG["RM"] = "rm -f" + CONFIG["CP"] = "cp" + CONFIG["MAKEDIRS"] = "mkdir -p" + CONFIG["ALLOCA"] = "" + CONFIG["DLDFLAGS"] = "" + CONFIG["ARCH_FLAG"] = "" + CONFIG["STATIC"] = "" + CONFIG["CCDLFLAGS"] = " -fPIC" + CONFIG["LDSHARED"] = "$(CC) -shared" + CONFIG["DLEXT"] = "so" + CONFIG["DLEXT2"] = "" + CONFIG["LIBEXT"] = "a" + CONFIG["LINK_SO"] = "" + CONFIG["LIBPATHFLAG"] = " -L%1$-s" + CONFIG["RPATHFLAG"] = " -Wl,-R%1$-s" + CONFIG["LIBPATHENV"] = "LD_LIBRARY_PATH" + CONFIG["TRY_LINK"] = "" + CONFIG["STRIP"] = "strip" + CONFIG["EXTSTATIC"] = "" + CONFIG["setup"] = "Setup" + CONFIG["PREP"] = "miniruby$(EXEEXT)" + CONFIG["EXTOUT"] = ".ext" + CONFIG["ARCHFILE"] = "" + CONFIG["RDOCTARGET"] = "install-doc" + CONFIG["cppflags"] = "-I/opt/csw/include" + CONFIG["cflags"] = "$(optflags) $(debugflags)" + CONFIG["optflags"] = "" + CONFIG["debugflags"] = "" + CONFIG["LIBRUBY_LDSHARED"] = "$(CC) -shared" + CONFIG["LIBRUBY_DLDFLAGS"] = " -Wl,-h,$(@|#_!!_#|F)" + CONFIG["rubyw_install_name"] = "" + CONFIG["RUBYW_INSTALL_NAME"] = "" + CONFIG["LIBRUBY_A"] = "lib$(RUBY_SO_NAME)-static.a" + CONFIG["LIBRUBY_SO"] = "lib$(RUBY_SO_NAME).so.$(MAJOR)" + CONFIG["LIBRUBY_ALIASES"] = "lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY) lib$(RUBY_SO_NAME).so" + CONFIG["LIBRUBY"] = "$(LIBRUBY_SO)" + CONFIG["LIBRUBYARG"] = "$(LIBRUBYARG_SHARED)" + CONFIG["LIBRUBYARG_STATIC"] = "-l$(RUBY_SO_NAME)-static" + CONFIG["LIBRUBYARG_SHARED"] = "-Wl,-R -Wl,$(libdir) -L$(libdir) -l$(RUBY_SO_NAME)" + CONFIG["SOLIBS"] = "$(LIBS)" + CONFIG["DLDLIBS"] = " -lc" + CONFIG["ENABLE_SHARED"] = "yes" + CONFIG["MAINLIBS"] = "" + CONFIG["COMMON_LIBS"] = "" + CONFIG["COMMON_MACROS"] = "" + CONFIG["COMMON_HEADERS"] = "" + CONFIG["EXPORT_PREFIX"] = "" + CONFIG["MAKEFILES"] = "Makefile" + CONFIG["arch"] = "i386-solaris2.8" + CONFIG["sitearch"] = "i386-solaris2.8" + CONFIG["sitedir"] = "$(libdir)/ruby/site_ruby" + CONFIG["vendordir"] = "$(libdir)/ruby/vendor_ruby" + CONFIG["configure_args"] = " '--prefix=/opt/csw' '--exec_prefix=/opt/csw' '--bindir=/opt/csw/bin' '--sbindir=/opt/csw/sbin' '--libexecdir=/opt/csw/libexec' '--datadir=/opt/csw/share' '--sysconfdir=/opt/csw/etc' '--sharedstatedir=/opt/csw/share' '--localstatedir=/opt/csw/var' '--libdir=/opt/csw/lib' '--infodir=/opt/csw/share/info' '--includedir=/opt/csw/include' '--mandir=/opt/csw/share/man' '--enable-pthread' '--enable-shared' '--with-tcl-dir=/opt/csw' '--with-tk-dir=/opt/csw' '--with-dbm-dir=/opt/csw' '--with-gdbm-dir=/opt/csw' '--with-iconv-dir=/opt/csw' '--with-openssl-dir=/opt/csw' '--with-readline-dir=/opt/csw' '--with-zlib-dir=/opt/csw' '--enable-install-doc' 'CC=/opt/csw/gcc4/bin/gcc' 'CFLAGS=-mtune=i686 -O2 -pipe -m32 -march=i386 -I/opt/csw/include' 'LDFLAGS=-L/opt/csw/gcc4/lib/. -m32 -march=i386 -R /opt/csw/gcc4/lib -L/opt/csw/lib' 'CPPFLAGS=-I/opt/csw/include'" + CONFIG["NROFF"] = "/usr/bin/nroff" + CONFIG["MANTYPE"] = "man" + CONFIG["ruby_version"] = "$(MAJOR).$(MINOR)" + CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)" + CONFIG["archdir"] = "$(rubylibdir)/$(arch)" + CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)" + CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)" + CONFIG["vendorlibdir"] = "$(vendordir)/$(ruby_version)" + CONFIG["vendorarchdir"] = "$(vendorlibdir)/$(sitearch)" + CONFIG["topdir"] = File.dirname(__FILE__) + MAKEFILE_CONFIG = {} + CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup} + def Config::expand(val, config = CONFIG) + val.gsub!(/\$\$|\$\(([^()]+)\)|\$\{([^{}]+)\}/) do |var| + if !(v = $1 || $2) + '$' + elsif key = config[v = v[/\A[^:]+(?=(?::(.*?)=(.*))?\z)/]] + pat, sub = $1, $2 + config[v] = false + Config::expand(key, config) + config[v] = key + key = key.gsub(/#{Regexp.quote(pat)}(?=\s|\z)/n) {sub} if pat + key + else + var + end + end + val + end + CONFIG.each_value do |val| + Config::expand(val) + end +end +RbConfig = Config # compatibility for ruby-1.9 +CROSS_COMPILING = nil unless defined? CROSS_COMPILING Added: csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.sparc =================================================================== --- csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.sparc (rev 0) +++ csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.sparc 2009-11-14 01:12:46 UTC (rev 7280) @@ -0,0 +1,182 @@ + +# This file was created by mkconfig.rb when ruby was built. Any +# changes made to this file will be lost the next time ruby is built. + +module Config + RUBY_VERSION == "1.8.7" or + raise "ruby lib version (1.8.7) doesn't match executable version (#{RUBY_VERSION})" + + TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/1.8/sparc-solaris2.8") + DESTDIR = '' unless defined? DESTDIR + CONFIG = {} + CONFIG["DESTDIR"] = DESTDIR + CONFIG["INSTALL"] = '/opt/csw/bin/ginstall -c' + CONFIG["prefix"] = (TOPDIR || DESTDIR + "/opt/csw") + CONFIG["EXEEXT"] = "" + CONFIG["ruby_install_name"] = "ruby" + CONFIG["RUBY_INSTALL_NAME"] = "ruby" + CONFIG["RUBY_SO_NAME"] = "ruby" + CONFIG["SHELL"] = "/bin/bash" + CONFIG["PATH_SEPARATOR"] = ":" + CONFIG["PACKAGE_NAME"] = "" + CONFIG["PACKAGE_TARNAME"] = "" + CONFIG["PACKAGE_VERSION"] = "" + CONFIG["PACKAGE_STRING"] = "" + CONFIG["PACKAGE_BUGREPORT"] = "" + CONFIG["exec_prefix"] = "$(DESTDIR)/opt/csw" + CONFIG["bindir"] = "$(DESTDIR)/opt/csw/bin" + CONFIG["sbindir"] = "$(DESTDIR)/opt/csw/sbin" + CONFIG["libexecdir"] = "$(DESTDIR)/opt/csw/libexec" + CONFIG["datarootdir"] = "$(prefix)/share" + CONFIG["datadir"] = "$(DESTDIR)/opt/csw/share" + CONFIG["sysconfdir"] = "$(DESTDIR)/opt/csw/etc" + CONFIG["sharedstatedir"] = "$(DESTDIR)/opt/csw/share" + CONFIG["localstatedir"] = "$(DESTDIR)/opt/csw/var" + CONFIG["includedir"] = "$(DESTDIR)/opt/csw/include" + CONFIG["oldincludedir"] = "/usr/include" + CONFIG["docdir"] = "$(datarootdir)/doc/$(PACKAGE)" + CONFIG["infodir"] = "$(DESTDIR)/opt/csw/share/info" + CONFIG["htmldir"] = "$(docdir)" + CONFIG["dvidir"] = "$(docdir)" + CONFIG["pdfdir"] = "$(docdir)" + CONFIG["psdir"] = "$(docdir)" + CONFIG["libdir"] = "$(DESTDIR)/opt/csw/lib" + CONFIG["localedir"] = "$(datarootdir)/locale" + CONFIG["mandir"] = "$(DESTDIR)/opt/csw/share/man" + CONFIG["DEFS"] = "-D_FILE_OFFSET_BITS=64" + CONFIG["ECHO_C"] = "" + CONFIG["ECHO_N"] = "-n" + CONFIG["ECHO_T"] = "" + CONFIG["LIBS"] = "-lpthread -lrt -ldl -lcrypt -lm " + CONFIG["build_alias"] = "" + CONFIG["host_alias"] = "" + CONFIG["target_alias"] = "" + CONFIG["MAJOR"] = "1" + CONFIG["MINOR"] = "8" + CONFIG["TEENY"] = "7" + CONFIG["build"] = "sparc-sun-solaris2.8" + CONFIG["build_cpu"] = "sparc" + CONFIG["build_vendor"] = "sun" + CONFIG["build_os"] = "solaris2.8" + CONFIG["host"] = "sparc-sun-solaris2.8" + CONFIG["host_cpu"] = "sparc" + CONFIG["host_vendor"] = "sun" + CONFIG["host_os"] = "solaris2.8" + CONFIG["target"] = "sparc-sun-solaris2.8" + CONFIG["target_cpu"] = "sparc" + CONFIG["target_vendor"] = "sun" + CONFIG["target_os"] = "solaris2.8" + CONFIG["CC"] = "/opt/csw/gcc4/bin/gcc" + CONFIG["CFLAGS"] = "-O2 -pipe -mcpu=v8 -I/opt/csw/include -fPIC $(cflags)" + CONFIG["LDFLAGS"] = "-L. -L/opt/csw/gcc4/lib/. -mcpu=v8 -R /opt/csw/gcc4/lib -L/opt/csw/lib" + CONFIG["CPPFLAGS"] = "-I/opt/csw/include $(DEFS) $(cppflags)" + CONFIG["OBJEXT"] = "o" + CONFIG["CPP"] = "/opt/csw/gcc4/bin/gcc -E" + CONFIG["GREP"] = "/opt/csw/bin/ggrep" + CONFIG["EGREP"] = "/opt/csw/bin/ggrep -E" + CONFIG["GNU_LD"] = "no" + CONFIG["CPPOUTFILE"] = "-o conftest.i" + CONFIG["OUTFLAG"] = "-o " + CONFIG["YACC"] = "bison -y" + CONFIG["YFLAGS"] = "" + CONFIG["RANLIB"] = "ranlib" + CONFIG["AR"] = "ar" + CONFIG["AS"] = "as" + CONFIG["ASFLAGS"] = "" + CONFIG["NM"] = "" + CONFIG["WINDRES"] = "" + CONFIG["DLLWRAP"] = "" + CONFIG["OBJDUMP"] = "" + CONFIG["LN_S"] = "ln -s" + CONFIG["SET_MAKE"] = "" + CONFIG["INSTALL_PROGRAM"] = "$(INSTALL)" + CONFIG["INSTALL_SCRIPT"] = "$(INSTALL)" + CONFIG["INSTALL_DATA"] = "$(INSTALL) -m 644" + CONFIG["RM"] = "rm -f" + CONFIG["CP"] = "cp" + CONFIG["MAKEDIRS"] = "mkdir -p" + CONFIG["ALLOCA"] = "" + CONFIG["DLDFLAGS"] = "" + CONFIG["ARCH_FLAG"] = "" + CONFIG["STATIC"] = "" + CONFIG["CCDLFLAGS"] = " -fPIC" + CONFIG["LDSHARED"] = "$(CC) -shared" + CONFIG["DLEXT"] = "so" + CONFIG["DLEXT2"] = "" + CONFIG["LIBEXT"] = "a" + CONFIG["LINK_SO"] = "" + CONFIG["LIBPATHFLAG"] = " -L%1$-s" + CONFIG["RPATHFLAG"] = " -Wl,-R%1$-s" + CONFIG["LIBPATHENV"] = "LD_LIBRARY_PATH" + CONFIG["TRY_LINK"] = "" + CONFIG["STRIP"] = "strip" + CONFIG["EXTSTATIC"] = "" + CONFIG["setup"] = "Setup" + CONFIG["PREP"] = "miniruby$(EXEEXT)" + CONFIG["EXTOUT"] = ".ext" + CONFIG["ARCHFILE"] = "" + CONFIG["RDOCTARGET"] = "install-doc" + CONFIG["cppflags"] = "-I/opt/csw/include" + CONFIG["cflags"] = "$(optflags) $(debugflags)" + CONFIG["optflags"] = "" + CONFIG["debugflags"] = "" + CONFIG["LIBRUBY_LDSHARED"] = "$(CC) -shared" + CONFIG["LIBRUBY_DLDFLAGS"] = " -Wl,-h,$(@|#_!!_#|F)" + CONFIG["rubyw_install_name"] = "" + CONFIG["RUBYW_INSTALL_NAME"] = "" + CONFIG["LIBRUBY_A"] = "lib$(RUBY_SO_NAME)-static.a" + CONFIG["LIBRUBY_SO"] = "lib$(RUBY_SO_NAME).so.$(MAJOR)" + CONFIG["LIBRUBY_ALIASES"] = "lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY) lib$(RUBY_SO_NAME).so" + CONFIG["LIBRUBY"] = "$(LIBRUBY_SO)" + CONFIG["LIBRUBYARG"] = "$(LIBRUBYARG_SHARED)" + CONFIG["LIBRUBYARG_STATIC"] = "-l$(RUBY_SO_NAME)-static" + CONFIG["LIBRUBYARG_SHARED"] = "-Wl,-R -Wl,$(libdir) -L$(libdir) -l$(RUBY_SO_NAME)" + CONFIG["SOLIBS"] = "$(LIBS)" + CONFIG["DLDLIBS"] = " -lc" + CONFIG["ENABLE_SHARED"] = "yes" + CONFIG["MAINLIBS"] = "" + CONFIG["COMMON_LIBS"] = "" + CONFIG["COMMON_MACROS"] = "" + CONFIG["COMMON_HEADERS"] = "" + CONFIG["EXPORT_PREFIX"] = "" + CONFIG["MAKEFILES"] = "Makefile" + CONFIG["arch"] = "sparc-solaris2.8" + CONFIG["sitearch"] = "sparc-solaris2.8" + CONFIG["sitedir"] = "$(libdir)/ruby/site_ruby" + CONFIG["vendordir"] = "$(libdir)/ruby/vendor_ruby" + CONFIG["configure_args"] = " '--prefix=/opt/csw' '--exec_prefix=/opt/csw' '--bindir=/opt/csw/bin' '--sbindir=/opt/csw/sbin' '--libexecdir=/opt/csw/libexec' '--datadir=/opt/csw/share' '--sysconfdir=/opt/csw/etc' '--sharedstatedir=/opt/csw/share' '--localstatedir=/opt/csw/var' '--libdir=/opt/csw/lib' '--infodir=/opt/csw/share/info' '--includedir=/opt/csw/include' '--mandir=/opt/csw/share/man' '--enable-pthread' '--enable-shared' '--with-tcl-dir=/opt/csw' '--with-tk-dir=/opt/csw' '--with-dbm-dir=/opt/csw' '--with-gdbm-dir=/opt/csw' '--with-iconv-dir=/opt/csw' '--with-openssl-dir=/opt/csw' '--with-readline-dir=/opt/csw' '--with-zlib-dir=/opt/csw' '--enable-install-doc' 'CC=/opt/csw/gcc4/bin/gcc' 'CFLAGS=-O2 -pipe -mcpu=v8 -I/opt/csw/include' 'LDFLAGS=-L/opt/csw/gcc4/lib/. -mcpu=v8 -R /opt/csw/gcc4/lib -L/opt/csw/lib' 'CPPFLAGS=-I/opt/csw/include'" + CONFIG["NROFF"] = "/usr/bin/nroff" + CONFIG["MANTYPE"] = "man" + CONFIG["ruby_version"] = "$(MAJOR).$(MINOR)" + CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)" + CONFIG["archdir"] = "$(rubylibdir)/$(arch)" + CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)" + CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)" + CONFIG["vendorlibdir"] = "$(vendordir)/$(ruby_version)" + CONFIG["vendorarchdir"] = "$(vendorlibdir)/$(sitearch)" + CONFIG["topdir"] = File.dirname(__FILE__) + MAKEFILE_CONFIG = {} + CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup} + def Config::expand(val, config = CONFIG) + val.gsub!(/\$\$|\$\(([^()]+)\)|\$\{([^{}]+)\}/) do |var| + if !(v = $1 || $2) + '$' + elsif key = config[v = v[/\A[^:]+(?=(?::(.*?)=(.*))?\z)/]] + pat, sub = $1, $2 + config[v] = false + Config::expand(key, config) + config[v] = key + key = key.gsub(/#{Regexp.quote(pat)}(?=\s|\z)/n) {sub} if pat + key + else + var + end + end + val + end + CONFIG.each_value do |val| + Config::expand(val) + end +end +RbConfig = Config # compatibility for ruby-1.9 +CROSS_COMPILING = nil unless defined? CROSS_COMPILING 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 Nov 14 04:14:31 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 14 Nov 2009 03:14:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7281] csw/mgar/pkg/ruby/trunk/Makefile Message-ID: Revision: 7281 http://gar.svn.sourceforge.net/gar/?rev=7281&view=rev Author: bdwalton Date: 2009-11-14 03:14:31 +0000 (Sat, 14 Nov 2009) Log Message: ----------- ruby: correct package versioning now that pkg-get does REV= Modified Paths: -------------- csw/mgar/pkg/ruby/trunk/Makefile Modified: csw/mgar/pkg/ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby/trunk/Makefile 2009-11-14 01:12:46 UTC (rev 7280) +++ csw/mgar/pkg/ruby/trunk/Makefile 2009-11-14 03:14:31 UTC (rev 7281) @@ -112,7 +112,7 @@ include gar/category.mk -SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(PATCHLEVEL) +SPKG_VERSION := $(SPKG_VERSION)$(PATCHLEVEL) RBCONFIG = /opt/csw/lib/ruby/1.8/$(GARCH)-solaris2.8/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 Sat Nov 14 15:28:56 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 14 Nov 2009 14:28:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[7282] csw/mgar/pkg Message-ID: Revision: 7282 http://gar.svn.sourceforge.net/gar/?rev=7282&view=rev Author: bdwalton Date: 2009-11-14 14:28:55 +0000 (Sat, 14 Nov 2009) Log Message: ----------- git-subtree: initial commit Added Paths: ----------- csw/mgar/pkg/git-subtree/ csw/mgar/pkg/git-subtree/branches/ csw/mgar/pkg/git-subtree/tags/ csw/mgar/pkg/git-subtree/trunk/ csw/mgar/pkg/git-subtree/trunk/Makefile csw/mgar/pkg/git-subtree/trunk/checksums csw/mgar/pkg/git-subtree/trunk/files/ csw/mgar/pkg/git-subtree/trunk/files/0001-add-installation-support-to-Makefile.patch csw/mgar/pkg/git-subtree/trunk/files/0002-make-git-version-dynamic-when-building-documentation.patch Property changes on: csw/mgar/pkg/git-subtree/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/git-subtree/trunk/Makefile =================================================================== --- csw/mgar/pkg/git-subtree/trunk/Makefile (rev 0) +++ csw/mgar/pkg/git-subtree/trunk/Makefile 2009-11-14 14:28:55 UTC (rev 7282) @@ -0,0 +1,39 @@ +GARNAME = git-subtree +GARVERSION = 0.2 +PATCHLEVEL = c567d9 +CATEGORIES = devel + +DESCRIPTION = Subtree support for git +define BLURB +An experimental alternative to the git-submodule command. +endef + +PACKAGES = CSWgitsubtree +CATALOGNAME_CSWgitsubtree = git_subtree + +ARCHALL_CSWgitsubtree = 1 + +PREREQUISITE_PKGS = CSWasciidoc CSWxmlto + +REQUIRED_PKGS_CSWgitsubtree = CSWbash CSWgit + +GIT_REPOS = git://github.com/apenwarr/git-subtree.git +GIT_TREEISH_git-subtree.git = $(PATCHLEVEL) + +PATCHFILES = 0001-add-installation-support-to-Makefile.patch +PATCHFILES += 0002-make-git-version-dynamic-when-building-documentation.patch + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = custom +TEST_SCRIPTS = + +SPKG_VERSION = $(GARVERSION)_$(PATCHLEVEL) + +include gar/category.mk + +install-custom: + @(cd $(WORKSRC); \ + gsed 's#/bin/bash#/opt/csw/bin/bash#' git-subtree.sh > git-subtree.sh.new; \ + mv git-subtree.sh.new git-subtree.sh; \ + gmake DESTDIR=$(DESTDIR) INSTALL=/opt/csw/bin/ginstall prefix=/opt/csw install ) Added: csw/mgar/pkg/git-subtree/trunk/checksums =================================================================== --- csw/mgar/pkg/git-subtree/trunk/checksums (rev 0) +++ csw/mgar/pkg/git-subtree/trunk/checksums 2009-11-14 14:28:55 UTC (rev 7282) @@ -0,0 +1,2 @@ +40a8c3282a2f4bd4e5fbaebf2bba9359 0001-add-installation-support-to-Makefile.patch +7587367599ef47e0a3e81c96996f855b 0002-make-git-version-dynamic-when-building-documentation.patch Added: csw/mgar/pkg/git-subtree/trunk/files/0001-add-installation-support-to-Makefile.patch =================================================================== --- csw/mgar/pkg/git-subtree/trunk/files/0001-add-installation-support-to-Makefile.patch (rev 0) +++ csw/mgar/pkg/git-subtree/trunk/files/0001-add-installation-support-to-Makefile.patch 2009-11-14 14:28:55 UTC (rev 7282) @@ -0,0 +1,48 @@ +From 9c69a401f3d2fb44b0a09702aff99c9e28b627c4 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Fri, 13 Nov 2009 12:01:31 -0500 +Subject: [PATCH 1/2] add installation support to Makefile + +Signed-off-by: Ben Walton +--- + Makefile | 20 ++++++++++++++++++++ + 1 files changed, 20 insertions(+), 0 deletions(-) + +diff --git a/Makefile b/Makefile +index 3e97c62..faefffd 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,3 +1,13 @@ ++prefix ?= /usr/local ++mandir ?= $(prefix)/share/man ++gitdir ?= $(shell git --exec-path) ++ ++# this should be set to a 'standard' bsd-type install program ++INSTALL ?= install ++INSTALL_DATA = $(INSTALL) -c -m 0644 ++INSTALL_EXE = $(INSTALL) -c -m 0755 ++INSTALL_DIR = $(INSTALL) -c -d -m 0755 ++ + default: + @echo "git-subtree doesn't need to be built." + @echo "Just copy it somewhere on your PATH, like /usr/local/bin." +@@ -5,6 +15,16 @@ default: + @echo "Try: make doc" + @false + ++install: install-exe install-doc ++ ++install-exe: git-subtree.sh ++ $(INSTALL_DIR) $(DESTDIR)/$(gitdir) ++ $(INSTALL_EXE) $< $(DESTDIR)/$(gitdir)/git-subtree ++ ++install-doc: git-subtree.1 ++ $(INSTALL_DIR) $(DESTDIR)/$(mandir)/man1/ ++ $(INSTALL_DATA) $< $(DESTDIR)/$(mandir)/man1/ ++ + doc: git-subtree.1 + + %.1: %.xml +-- +1.6.5 + Added: csw/mgar/pkg/git-subtree/trunk/files/0002-make-git-version-dynamic-when-building-documentation.patch =================================================================== --- csw/mgar/pkg/git-subtree/trunk/files/0002-make-git-version-dynamic-when-building-documentation.patch (rev 0) +++ csw/mgar/pkg/git-subtree/trunk/files/0002-make-git-version-dynamic-when-building-documentation.patch 2009-11-14 14:28:55 UTC (rev 7282) @@ -0,0 +1,35 @@ +From e17159437af26336537a46cf64825c9130e91267 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Fri, 13 Nov 2009 12:08:02 -0500 +Subject: [PATCH 2/2] make git version dynamic when building documentation + +Signed-off-by: Ben Walton +--- + Makefile | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/Makefile b/Makefile +index faefffd..9b204bd 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,6 +2,8 @@ prefix ?= /usr/local + mandir ?= $(prefix)/share/man + gitdir ?= $(shell git --exec-path) + ++gitver ?= $(word 3,$(shell git --version)) ++ + # this should be set to a 'standard' bsd-type install program + INSTALL ?= install + INSTALL_DATA = $(INSTALL) -c -m 0644 +@@ -32,7 +34,7 @@ doc: git-subtree.1 + + %.xml: %.txt + asciidoc -b docbook -d manpage -f asciidoc.conf \ +- -agit_version=1.6.3 $^ ++ -agit_version=$(gitver) $^ + + clean: + rm -f *~ *.xml *.html *.1 +-- +1.6.5 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Nov 14 18:36:54 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 14 Nov 2009 17:36:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[7283] csw/mgar/pkg Message-ID: Revision: 7283 http://gar.svn.sourceforge.net/gar/?rev=7283&view=rev Author: dmichelsen Date: 2009-11-14 17:36:54 +0000 (Sat, 14 Nov 2009) Log Message: ----------- xboard: Initial commit Added Paths: ----------- csw/mgar/pkg/xboard/ csw/mgar/pkg/xboard/branches/ csw/mgar/pkg/xboard/tags/ csw/mgar/pkg/xboard/trunk/ csw/mgar/pkg/xboard/trunk/Makefile csw/mgar/pkg/xboard/trunk/checksums csw/mgar/pkg/xboard/trunk/files/ Property changes on: csw/mgar/pkg/xboard/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/xboard/trunk/Makefile =================================================================== --- csw/mgar/pkg/xboard/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xboard/trunk/Makefile 2009-11-14 17:36:54 UTC (rev 7283) @@ -0,0 +1,28 @@ +GARNAME = xboard +GARVERSION = 4.4.1 +CATEGORIES = apps + +DESCRIPTION = X graphical chessboard +define BLURB + XBoard is a graphical user interface for chess in all its major forms, + including international chess, xiangqi (Chinese chess) and shogi (Japanese chess), + in addition to many minor variants such as Losers Chess, Crazyhouse, Chess960 and + Capabanca Chess. It displays a chessboard on the screen, accepts moves made with + the mouse, and loads and saves games in Portable Game Notation (PGN). +endef + +MASTER_SITES = $(GNU_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +EXTRA_LDFLAGS = -lm /usr/openwin/lib/libXext.so + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/xboard/trunk/checksums =================================================================== --- csw/mgar/pkg/xboard/trunk/checksums (rev 0) +++ csw/mgar/pkg/xboard/trunk/checksums 2009-11-14 17:36:54 UTC (rev 7283) @@ -0,0 +1 @@ +4623a83fdd43f410bfcc8a20e2eb1474 xboard-4.4.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Nov 14 18:44:14 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 14 Nov 2009 17:44:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[7284] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 7284 http://gar.svn.sourceforge.net/gar/?rev=7284&view=rev Author: rthurner Date: 2009-11-14 17:44:13 +0000 (Sat, 14 Nov 2009) Log Message: ----------- upgrade to svn-1.6.6 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 2009-11-14 17:36:54 UTC (rev 7283) +++ csw/mgar/pkg/subversion/trunk/Makefile 2009-11-14 17:44:13 UTC (rev 7284) @@ -1,5 +1,5 @@ GARNAME = subversion -DISTVERSION = 1.6.5 +DISTVERSION = 1.6.6 GARVERSION = $(subst -,,$(DISTVERSION)) CATEGORIES = utils Modified: csw/mgar/pkg/subversion/trunk/checksums =================================================================== --- csw/mgar/pkg/subversion/trunk/checksums 2009-11-14 17:36:54 UTC (rev 7283) +++ csw/mgar/pkg/subversion/trunk/checksums 2009-11-14 17:44:13 UTC (rev 7284) @@ -1,9 +1,9 @@ -32b2cc8a237404d160a5617ea2da53d8 download/CSWap2svn.postinstall -586b9c9924c1547d44451a84d2aca702 download/CSWap2svn.preremove -395ec6d1bfe07efadc1c0aa8816673fa download/CSWsvn.checkinstall -41ec540885de7c34625768aa1fb9682b download/fixme.sh -f107831ad0c702ff32e51df6a207237b download/httpd-svn.conf.CSW -f0aa58c145ae99f8e4d72499ab826169 download/javahl_headers_for_nested_classes.diff -1a53a0e72bee0bf814f4da83a9b6a636 download/subversion-1.6.5.tar.bz2 -f7d05c59656dcf01fb844295c9912f78 download/subversion161.diff -1b532d3055708a97771f5cd959983628 download/svn_access.conf.CSW +32b2cc8a237404d160a5617ea2da53d8 CSWap2svn.postinstall +586b9c9924c1547d44451a84d2aca702 CSWap2svn.preremove +395ec6d1bfe07efadc1c0aa8816673fa CSWsvn.checkinstall +41ec540885de7c34625768aa1fb9682b fixme.sh +f107831ad0c702ff32e51df6a207237b httpd-svn.conf.CSW +f0aa58c145ae99f8e4d72499ab826169 javahl_headers_for_nested_classes.diff +e5109da756d74c7d98f683f004a539af subversion-1.6.6.tar.bz2 +f7d05c59656dcf01fb844295c9912f78 subversion161.diff +1b532d3055708a97771f5cd959983628 svn_access.conf.CSW 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 Sat Nov 14 19:49:22 2009 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Sat, 14 Nov 2009 18:49:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[7285] csw/mgar/pkg/sdlimage/trunk/Makefile Message-ID: Revision: 7285 http://gar.svn.sourceforge.net/gar/?rev=7285&view=rev Author: jake_goerzen Date: 2009-11-14 18:49:21 +0000 (Sat, 14 Nov 2009) Log Message: ----------- restoring GARNAME DISFILES; using PACKAGES instead Modified Paths: -------------- csw/mgar/pkg/sdlimage/trunk/Makefile Modified: csw/mgar/pkg/sdlimage/trunk/Makefile =================================================================== --- csw/mgar/pkg/sdlimage/trunk/Makefile 2009-11-14 17:44:13 UTC (rev 7284) +++ csw/mgar/pkg/sdlimage/trunk/Makefile 2009-11-14 18:49:21 UTC (rev 7285) @@ -1,4 +1,4 @@ -GARNAME = sdlimage +GARNAME = SDL_image GARVERSION = 1.2.8 CATEGORIES = lib @@ -7,11 +7,10 @@ SDL image library loads images as SDL surfaces, and supports the following formats: BMP, PNM, XPM, LBM, PCX, GIF, JPEG, PNG, TGA. endef -DISTNAME = SDL_image-$(GARVERSION) - MASTER_SITES = http://www.libsdl.org/projects/SDL_image/release/ -DISTFILES = SDL_image-$(GARVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PACKAGES = CSWsdlimage REQUIRED_PKGS = CSWlibsdl UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Sat Nov 14 20:11:12 2009 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Sat, 14 Nov 2009 19:11:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7286] csw/mgar/pkg/sdlmixer/trunk Message-ID: Revision: 7286 http://gar.svn.sourceforge.net/gar/?rev=7286&view=rev Author: jake_goerzen Date: 2009-11-14 19:11:12 +0000 (Sat, 14 Nov 2009) Log Message: ----------- Changed to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/sdlmixer/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/sdlmixer/trunk/files/CSWsdlmixer.depend csw/mgar/pkg/sdlmixer/trunk/files/CSWsdlmixer.gspec csw/mgar/pkg/sdlmixer/trunk/files/CSWsdlmixer.prototype Property Changed: ---------------- csw/mgar/pkg/sdlmixer/trunk/ Property changes on: csw/mgar/pkg/sdlmixer/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/sdlmixer/trunk/Makefile =================================================================== --- csw/mgar/pkg/sdlmixer/trunk/Makefile 2009-11-14 18:49:21 UTC (rev 7285) +++ csw/mgar/pkg/sdlmixer/trunk/Makefile 2009-11-14 19:11:12 UTC (rev 7286) @@ -1,5 +1,5 @@ GARNAME = SDL_mixer -GARVERSION = 1.2.8 +GARVERSION = 1.2.10 CATEGORIES = lib DESCRIPTION = multi-channel audio mixer library @@ -9,8 +9,10 @@ MASTER_SITES = http://www.libsdl.org/projects/SDL_mixer/release/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWsdlmixer, depend prototype) +PACKAGES = CSWsdlmixer +REQUIRED_PKGS = CSWlibsdl + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Deleted: csw/mgar/pkg/sdlmixer/trunk/files/CSWsdlmixer.depend =================================================================== --- csw/mgar/pkg/sdlmixer/trunk/files/CSWsdlmixer.depend 2009-11-14 18:49:21 UTC (rev 7285) +++ csw/mgar/pkg/sdlmixer/trunk/files/CSWsdlmixer.depend 2009-11-14 19:11:12 UTC (rev 7286) @@ -1,4 +0,0 @@ -P CSWlibsdl -P CSWlibogg -P CSWvorbis -P CSWsunmath Deleted: csw/mgar/pkg/sdlmixer/trunk/files/CSWsdlmixer.gspec =================================================================== --- csw/mgar/pkg/sdlmixer/trunk/files/CSWsdlmixer.gspec 2009-11-14 18:49:21 UTC (rev 7285) +++ csw/mgar/pkg/sdlmixer/trunk/files/CSWsdlmixer.gspec 2009-11-14 19:11:12 UTC (rev 7286) @@ -1,4 +0,0 @@ -%var bitname sdlmixer -%var pkgname CSWsdlmixer -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/sdlmixer/trunk/files/CSWsdlmixer.prototype =================================================================== --- csw/mgar/pkg/sdlmixer/trunk/files/CSWsdlmixer.prototype 2009-11-14 18:49:21 UTC (rev 7285) +++ csw/mgar/pkg/sdlmixer/trunk/files/CSWsdlmixer.prototype 2009-11-14 19:11:12 UTC (rev 7286) @@ -1,9 +0,0 @@ -d none /opt/csw/include/SDL 0755 root bin -f none /opt/csw/include/SDL/SDL_mixer.h 0644 root bin -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libSDL_mixer-1.2.so.0.2.6 0755 root bin -s none /opt/csw/lib/libSDL_mixer-1.2.so.0=libSDL_mixer-1.2.so.0.2.6 -s none /opt/csw/lib/libSDL_mixer.so=libSDL_mixer-1.2.so.0.2.6 -i copyright=CSWsdlmixer.copyright -i depend=CSWsdlmixer.depend -i pkginfo=CSWsdlmixer.pkginfo 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 Sat Nov 14 20:23:50 2009 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Sat, 14 Nov 2009 19:23:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[7287] csw/mgar/pkg/sdlmixer/trunk Message-ID: Revision: 7287 http://gar.svn.sourceforge.net/gar/?rev=7287&view=rev Author: jake_goerzen Date: 2009-11-14 19:23:50 +0000 (Sat, 14 Nov 2009) Log Message: ----------- add EXTRA_LDFLAGS = -lm Modified Paths: -------------- csw/mgar/pkg/sdlmixer/trunk/Makefile csw/mgar/pkg/sdlmixer/trunk/checksums Modified: csw/mgar/pkg/sdlmixer/trunk/Makefile =================================================================== --- csw/mgar/pkg/sdlmixer/trunk/Makefile 2009-11-14 19:11:12 UTC (rev 7286) +++ csw/mgar/pkg/sdlmixer/trunk/Makefile 2009-11-14 19:23:50 UTC (rev 7287) @@ -12,6 +12,7 @@ PACKAGES = CSWsdlmixer REQUIRED_PKGS = CSWlibsdl +EXTRA_LDFLAGS = -lm # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/sdlmixer/trunk/checksums =================================================================== --- csw/mgar/pkg/sdlmixer/trunk/checksums 2009-11-14 19:11:12 UTC (rev 7286) +++ csw/mgar/pkg/sdlmixer/trunk/checksums 2009-11-14 19:23:50 UTC (rev 7287) @@ -1,4 +1 @@ -0b5b91015d0f3bd9597e094ba67c4d65 download/SDL_mixer-1.2.8.tar.gz -c1158a1551d60aa1f6dab9896df82545 download/CSWsdlmixer.gspec -6fd7872952bbae2565e57654dc0f9965 download/CSWsdlmixer.depend -62269238c73ae43b22fd98ecb9533ffc download/CSWsdlmixer.prototype +a357558552436b0b5ea0333b3e2327df SDL_mixer-1.2.10.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Nov 14 23:20:33 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 14 Nov 2009 22:20:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[7288] csw/mgar/pkg Message-ID: Revision: 7288 http://gar.svn.sourceforge.net/gar/?rev=7288&view=rev Author: dmichelsen Date: 2009-11-14 22:20:33 +0000 (Sat, 14 Nov 2009) Log Message: ----------- libast: Initial commit Added Paths: ----------- csw/mgar/pkg/libast/ csw/mgar/pkg/libast/branches/ csw/mgar/pkg/libast/tags/ csw/mgar/pkg/libast/trunk/ csw/mgar/pkg/libast/trunk/Makefile csw/mgar/pkg/libast/trunk/checksums csw/mgar/pkg/libast/trunk/files/ csw/mgar/pkg/libast/trunk/files/0001-Fix-unknown-Sun-Studio-directive.patch Property changes on: csw/mgar/pkg/libast/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/libast/trunk/Makefile =================================================================== --- csw/mgar/pkg/libast/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libast/trunk/Makefile 2009-11-14 22:20:33 UTC (rev 7288) @@ -0,0 +1,24 @@ +GARNAME = libast +GARVERSION = 0.7 +CATEGORIES = lib + +DESCRIPTION = The Library of Assorted Spiffy Things (LibAST - formerly libmej) +define BLURB +endef + +MASTER_SITES = http://www.eterm.org/download/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Fix-unknown-Sun-Studio-directive.patch + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +STRIP_LIBTOOL = 1 + +BUILD64 = 1 +NO_ISAEXEC = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +MERGE_DIRS_isa-extra = $(libdir) + +include gar/category.mk Added: csw/mgar/pkg/libast/trunk/checksums =================================================================== --- csw/mgar/pkg/libast/trunk/checksums (rev 0) +++ csw/mgar/pkg/libast/trunk/checksums 2009-11-14 22:20:33 UTC (rev 7288) @@ -0,0 +1,2 @@ +2460a809fdffec738719fa1d59b63705 0001-Fix-unknown-Sun-Studio-directive.patch +a9ec3b2da317f35869316e6d9571d296 libast-0.7.tar.gz Added: csw/mgar/pkg/libast/trunk/files/0001-Fix-unknown-Sun-Studio-directive.patch =================================================================== --- csw/mgar/pkg/libast/trunk/files/0001-Fix-unknown-Sun-Studio-directive.patch (rev 0) +++ csw/mgar/pkg/libast/trunk/files/0001-Fix-unknown-Sun-Studio-directive.patch 2009-11-14 22:20:33 UTC (rev 7288) @@ -0,0 +1,451 @@ +From 530336bdbb1de36263137a2fc73fe6d75e06816e Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sat, 14 Nov 2009 23:06:39 +0100 +Subject: [PATCH] Fix unknown Sun Studio directive + +--- + src/array.c | 3 ++- + src/builtin_hashes.c | 4 ++-- + src/conf.c | 4 ++-- + src/debug.c | 4 ++-- + src/dlinked_list.c | 4 ++-- + src/file.c | 4 ++-- + src/linked_list.c | 4 ++-- + src/mbuff.c | 4 ++-- + src/mem.c | 4 ++-- + src/msgs.c | 4 ++-- + src/obj.c | 4 ++-- + src/objpair.c | 4 ++-- + src/options.c | 4 ++-- + src/regexp.c | 4 ++-- + src/snprintf.c | 2 ++ + src/socket.c | 4 ++-- + src/str.c | 4 ++-- + src/strings.c | 6 +++--- + src/tok.c | 4 ++-- + src/url.c | 4 ++-- + 20 files changed, 41 insertions(+), 38 deletions(-) + +diff --git a/src/array.c b/src/array.c +index 8dde32d..e00d809 100644 +--- a/src/array.c ++++ b/src/array.c +@@ -21,13 +21,14 @@ + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + ++#include ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: array.c,v 1.18 2004/07/16 23:22:18 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include + + /* *INDENT-OFF* */ + SPIF_DECL_OBJ(array_iterator) { +diff --git a/src/builtin_hashes.c b/src/builtin_hashes.c +index 7de999a..48b3c2d 100644 +--- a/src/builtin_hashes.c ++++ b/src/builtin_hashes.c +@@ -21,14 +21,14 @@ + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + ++#include ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: builtin_hashes.c,v 1.3 2004/07/23 21:38:39 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include +- + #define BUILTIN_RANDOM_SEED (SPIF_CAST(uint32) 0xf721b64d) + + /* +diff --git a/src/conf.c b/src/conf.c +index 3df8280..2c98677 100644 +--- a/src/conf.c ++++ b/src/conf.c +@@ -31,14 +31,14 @@ + * @author Michael Jennings + */ + ++#include ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: conf.c,v 1.26 2005/03/07 22:29:07 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include +- + static spifconf_var_t *spifconf_new_var(void); + static void spifconf_free_var(spifconf_var_t *); + static spif_charptr_t spifconf_get_var(const spif_charptr_t); +diff --git a/src/debug.c b/src/debug.c +index f0da466..abbb1e5 100644 +--- a/src/debug.c ++++ b/src/debug.c +@@ -32,14 +32,14 @@ + * $Date: 2004/12/15 00:00:22 $ + */ + ++#include "libast_internal.h" ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: debug.c,v 1.14 2004/12/15 00:00:22 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include "libast_internal.h" +- + /** + * Debug level. + * +diff --git a/src/dlinked_list.c b/src/dlinked_list.c +index a220f6e..87990ec 100644 +--- a/src/dlinked_list.c ++++ b/src/dlinked_list.c +@@ -21,14 +21,14 @@ + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + ++#include ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: dlinked_list.c,v 1.21 2004/07/20 22:32:08 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include +- + /* *INDENT-OFF* */ + SPIF_DECL_OBJ(dlinked_list_iterator) { + SPIF_DECL_PARENT_TYPE(obj); +diff --git a/src/file.c b/src/file.c +index f77981c..8ac9945 100644 +--- a/src/file.c ++++ b/src/file.c +@@ -32,14 +32,14 @@ + * $Date: 2004/07/23 21:38:39 $ + */ + ++#include ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: file.c,v 1.11 2004/07/23 21:38:39 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include +- + /** + * Create and open a temporary file. + * +diff --git a/src/linked_list.c b/src/linked_list.c +index 53a3425..11b8cfc 100644 +--- a/src/linked_list.c ++++ b/src/linked_list.c +@@ -21,14 +21,14 @@ + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + ++#include ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: linked_list.c,v 1.26 2004/07/23 21:38:39 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include +- + /* *INDENT-OFF* */ + SPIF_DECL_OBJ(linked_list_iterator) { + SPIF_DECL_PARENT_TYPE(obj); +diff --git a/src/mbuff.c b/src/mbuff.c +index 30ffd0d..bb87101 100644 +--- a/src/mbuff.c ++++ b/src/mbuff.c +@@ -21,14 +21,14 @@ + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + ++#include ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: mbuff.c,v 1.1 2004/12/15 00:00:22 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include +- + /* *INDENT-OFF* */ + static SPIF_CONST_TYPE(mbuffclass) mb_class = { + { +diff --git a/src/mem.c b/src/mem.c +index bb564ac..a4f5d6c 100644 +--- a/src/mem.c ++++ b/src/mem.c +@@ -32,14 +32,14 @@ + * $Date: 2005/12/22 23:28:55 $ + */ + ++#include "libast_internal.h" ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: mem.c,v 1.25 2005/12/22 23:28:55 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include "libast_internal.h" +- + static void memrec_add_var(memrec_t *, const spif_charptr_t, unsigned long, void *, size_t); + static ptr_t *memrec_find_var(memrec_t *, const void *); + static void memrec_rem_var(memrec_t *, const spif_charptr_t, const spif_charptr_t, unsigned long, const void *); +diff --git a/src/msgs.c b/src/msgs.c +index d68b659..ea32ac5 100644 +--- a/src/msgs.c ++++ b/src/msgs.c +@@ -33,14 +33,14 @@ + * $Date: 2004/07/23 21:38:39 $ + */ + ++#include "libast_internal.h" ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: msgs.c,v 1.11 2004/07/23 21:38:39 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include "libast_internal.h" +- + /** + * Program name. + * +diff --git a/src/obj.c b/src/obj.c +index fa89837..1954187 100644 +--- a/src/obj.c ++++ b/src/obj.c +@@ -32,14 +32,14 @@ + * $Date: 2004/07/23 21:38:39 $ + */ + ++#include ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: obj.c,v 1.27 2004/07/23 21:38:39 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include +- + /* *INDENT-OFF* */ + /** + * The actual class structure for the @c obj type. +diff --git a/src/objpair.c b/src/objpair.c +index dc999dd..0efc707 100644 +--- a/src/objpair.c ++++ b/src/objpair.c +@@ -32,14 +32,14 @@ + * $Date: 2004/07/23 21:38:39 $ + */ + ++#include ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: objpair.c,v 1.10 2004/07/23 21:38:39 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include +- + /* *INDENT-OFF* */ + /** + * The actual class structure for the @c objpair type. +diff --git a/src/options.c b/src/options.c +index a34bca6..cf2ddaf 100644 +--- a/src/options.c ++++ b/src/options.c +@@ -33,14 +33,14 @@ + * $Date: 2004/10/26 18:01:53 $ + */ + ++#include ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: options.c,v 1.18 2004/10/26 18:01:53 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include +- + /*@{*/ + /** + * @name Internal Parser Macros +diff --git a/src/regexp.c b/src/regexp.c +index 9e975d3..e5a162e 100644 +--- a/src/regexp.c ++++ b/src/regexp.c +@@ -21,14 +21,14 @@ + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + ++#include ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: regexp.c,v 1.15 2004/07/23 21:38:39 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include +- + /* *INDENT-OFF* */ + static SPIF_CONST_TYPE(class) r_class = { + SPIF_DECL_CLASSNAME(regexp), +diff --git a/src/snprintf.c b/src/snprintf.c +index 4e79f92..8087f5f 100644 +--- a/src/snprintf.c ++++ b/src/snprintf.c +@@ -9,6 +9,8 @@ + # undef HAVE_STDARG_H + #endif + ++#include ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: snprintf.c,v 1.6 2004/07/23 21:38:39 mej Exp $"; + + /* +diff --git a/src/socket.c b/src/socket.c +index da601b4..b040cde 100644 +--- a/src/socket.c ++++ b/src/socket.c +@@ -21,14 +21,14 @@ + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + ++#include ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: socket.c,v 1.23 2004/07/23 21:38:39 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include +- + static spif_url_t spif_url_new_from_ipaddr(spif_ipsockaddr_t); + static spif_bool_t spif_url_init_from_ipaddr(spif_url_t, spif_ipsockaddr_t); + static spif_url_t spif_url_new_from_unixaddr(spif_unixsockaddr_t); +diff --git a/src/str.c b/src/str.c +index 62d41b4..aa7a943 100644 +--- a/src/str.c ++++ b/src/str.c +@@ -21,14 +21,14 @@ + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + ++#include ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: str.c,v 1.32 2004/12/15 00:00:22 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include +- + /* *INDENT-OFF* */ + static SPIF_CONST_TYPE(strclass) s_class = { + { +diff --git a/src/strings.c b/src/strings.c +index 080f5ee..5b4b700 100644 +--- a/src/strings.c ++++ b/src/strings.c +@@ -30,14 +30,14 @@ + * @author Michael Jennings + */ + ++#include ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: strings.c,v 1.25 2005/03/07 22:29:07 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include +- + #if !(HAVE_MEMMEM) + /* Find first occurance of bytestring needle of size needlelen in memory region + haystack of size haystacklen */ +@@ -159,7 +159,7 @@ strrev(register char *str) + REQUIRE_RVAL(str != SPIF_NULL_TYPE(ptr), SPIF_NULL_TYPE(ptr)); + i = strlen(str); + for (j = 0, i--; i > j; i--, j++) { +- (void) SWAP(str[j], str[i]); ++ SWAP(str[j], str[i]); + } + return (str); + +diff --git a/src/tok.c b/src/tok.c +index e0f99b3..8952efc 100644 +--- a/src/tok.c ++++ b/src/tok.c +@@ -21,14 +21,14 @@ + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + ++#include ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: tok.c,v 1.22 2004/07/23 21:38:39 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include +- + /* *INDENT-OFF* */ + static SPIF_CONST_TYPE(class) t_class = { + SPIF_DECL_CLASSNAME(tok), +diff --git a/src/url.c b/src/url.c +index f78766f..c699a5f 100644 +--- a/src/url.c ++++ b/src/url.c +@@ -21,14 +21,14 @@ + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + ++#include ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: url.c,v 1.20 2004/07/23 21:38:39 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include +- + /* *INDENT-OFF* */ + static SPIF_CONST_TYPE(class) u_class = { + SPIF_DECL_CLASSNAME(url), +-- +1.6.5.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 Sat Nov 14 23:53:30 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 14 Nov 2009 22:53:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[7289] csw/mgar/pkg/wxwidgets/trunk Message-ID: Revision: 7289 http://gar.svn.sourceforge.net/gar/?rev=7289&view=rev Author: wahwah Date: 2009-11-14 22:53:30 +0000 (Sat, 14 Nov 2009) Log Message: ----------- wxwidgets: providing vsscanf via ncursesw Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/wxwidgets/trunk/files/0003-vsscanf-support-via-ncursesw.patch Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-14 22:20:33 UTC (rev 7288) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-14 22:53:30 UTC (rev 7289) @@ -97,23 +97,18 @@ CATALOGNAME_CSWwxwidgetsgtk2 = wxwidgets_gtk2 TEST_SCRIPTS = -EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so +# To fix a problem with unresolved symbols +EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so +# For vsscanf support +EXTRA_LINKER_FLAGS += /opt/csw/lib/libncursesw.so CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-gtk=2 CONFIGURE_ARGS += --with-gtk-prefix=/opt/csw CONFIGURE_ARGS += --with-regex CONFIGURE_ARGS += --with-opengl -# Unicode-enabled build on Solaris 8 fails with: -# "./src/common/wxchar.cpp", line 1693: Error: The function "vswscanf" must have -# a prototype. -# Building Unicode support for Solaris 9 and 10 only. -CONFIGURE_ARGS_5.8 = --disable-unicode -CONFIGURE_ARGS_5.9 = --enable-unicode -CONFIGURE_ARGS_5.10 = --enable-unicode -CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GAROSREL)) -EXTRA_CFLAGS = -fast -xstrconst -xnolibmopt -EXTRA_CXXFLAGS = -fast -xstrconst -xnolibmopt +EXTRA_CFLAGS = -fast -xstrconst -xnolibmopt -D__EXTENSIONS__ +EXTRA_CXXFLAGS = -fast -xstrconst -xnolibmopt -D__EXTENSIONS__ EXTRA_INC = /opt/csw/X11/include /usr/X11/include /usr/openwin/share/include EXTRA_LIB = /opt/csw/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib Added: csw/mgar/pkg/wxwidgets/trunk/files/0003-vsscanf-support-via-ncursesw.patch =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/files/0003-vsscanf-support-via-ncursesw.patch (rev 0) +++ csw/mgar/pkg/wxwidgets/trunk/files/0003-vsscanf-support-via-ncursesw.patch 2009-11-14 22:53:30 UTC (rev 7289) @@ -0,0 +1,24 @@ +From 402daca1490a5ba6b0742011d72372680d261cc3 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sat, 14 Nov 2009 22:47:42 +0100 +Subject: [PATCH] vsscanf support via ncursesw + +--- + src/common/wxchar.cpp | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp +index f594796..1550acc 100644 +--- a/src/common/wxchar.cpp ++++ b/src/common/wxchar.cpp +@@ -15,6 +15,7 @@ + + // For compilers that support precompilation, includes "wx.h". + #include "wx/wxprec.h" ++#include "ncursesw/ncurses.h" + + #ifdef __BORLANDC__ + #pragma hdrstop +-- +1.6.5.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 Nov 15 02:46:27 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 15 Nov 2009 01:46:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7290] csw/mgar/pkg/wxwidgets/trunk/Makefile Message-ID: Revision: 7290 http://gar.svn.sourceforge.net/gar/?rev=7290&view=rev Author: wahwah Date: 2009-11-15 01:46:27 +0000 (Sun, 15 Nov 2009) Log Message: ----------- wxwidgets: Adding the --enable-unicode flag Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-14 22:53:30 UTC (rev 7289) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-15 01:46:27 UTC (rev 7290) @@ -107,6 +107,7 @@ CONFIGURE_ARGS += --with-gtk-prefix=/opt/csw CONFIGURE_ARGS += --with-regex CONFIGURE_ARGS += --with-opengl +CONFIGURE_ARGS += --enable-unicode EXTRA_CFLAGS = -fast -xstrconst -xnolibmopt -D__EXTENSIONS__ EXTRA_CXXFLAGS = -fast -xstrconst -xnolibmopt -D__EXTENSIONS__ EXTRA_INC = /opt/csw/X11/include /usr/X11/include /usr/openwin/share/include This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Nov 15 02:58:23 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 15 Nov 2009 01:58:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7291] csw/mgar/pkg/wxwidgets/trunk Message-ID: Revision: 7291 http://gar.svn.sourceforge.net/gar/?rev=7291&view=rev Author: wahwah Date: 2009-11-15 01:58:23 +0000 (Sun, 15 Nov 2009) Log Message: ----------- wxwidgets: Enabling 0003-vsscanf-support-via-ncursesw.patch Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile csw/mgar/pkg/wxwidgets/trunk/checksums Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-15 01:46:27 UTC (rev 7290) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-15 01:58:23 UTC (rev 7291) @@ -36,13 +36,17 @@ PATCHFILES_isa-i386-garversion-2.8.5 = 0500-wxT-macro-first-iteration.patch PATCHFILES_isa-i386-garversion-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch PATCHFILES_isa-i386-garversion-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch +PATCHFILES_isa-i386-garversion-2.8.5 += 0003-vsscanf-support-via-ncursesw.patch PATCHFILES_isa-sparcv8-garversion-2.8.5 = 0500-wxT-macro-first-iteration.patch PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch +PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0003-vsscanf-support-via-ncursesw.patch PATCHFILES_isa-i386-garversion-2.8.10 = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch PATCHFILES_isa-i386-garversion-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch +PATCHFILES_isa-i386-garversion-2.8.10 += 0003-vsscanf-support-via-ncursesw.patch PATCHFILES_isa-sparcv8-garversion-2.8.10 = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch PATCHFILES_isa-sparcv8-garversion-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch +PATCHFILES_isa-sparcv8-garversion-2.8.10 += 0003-vsscanf-support-via-ncursesw.patch DISTFILES = $(SOURCEFILES) UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz PACKAGES = CSWwxwidgetscommon Modified: csw/mgar/pkg/wxwidgets/trunk/checksums =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/checksums 2009-11-15 01:46:27 UTC (rev 7290) +++ csw/mgar/pkg/wxwidgets/trunk/checksums 2009-11-15 01:58:23 UTC (rev 7291) @@ -1,6 +1,7 @@ -7830ab8006ade9b14567341b5481eadd download/0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch -45df2933ed2fa53f229feda01467db81 download/0002-Fixing-retarded-checks-for-libGL.patch -75ecdc04af4392f918ff6856a3ba6605 download/0500-wxT-macro-first-iteration.patch -17d8d019fd2e4137b4cd44816b14e282 download/0501-a-possible-fix-to-wxchar.h.patch -05b32ca051651f4b1885a90f62969faf download/wxWidgets-2.8.10.tar.gz -43274231ee50eb1f35e04e693ebab902 download/wxWidgets-2.8.5.tar.gz +7830ab8006ade9b14567341b5481eadd 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch +45df2933ed2fa53f229feda01467db81 0002-Fixing-retarded-checks-for-libGL.patch +225f6163a1c31d1f96a3b0548b338105 0003-vsscanf-support-via-ncursesw.patch +75ecdc04af4392f918ff6856a3ba6605 0500-wxT-macro-first-iteration.patch +17d8d019fd2e4137b4cd44816b14e282 0501-a-possible-fix-to-wxchar.h.patch +05b32ca051651f4b1885a90f62969faf wxWidgets-2.8.10.tar.gz +43274231ee50eb1f35e04e693ebab902 wxWidgets-2.8.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 Sun Nov 15 05:04:22 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 15 Nov 2009 04:04:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[7292] csw/mgar/pkg/ruby/trunk/Makefile Message-ID: Revision: 7292 http://gar.svn.sourceforge.net/gar/?rev=7292&view=rev Author: bdwalton Date: 2009-11-15 04:04:21 +0000 (Sun, 15 Nov 2009) Log Message: ----------- ruby: tweak the way rbconfig.rb.SOS11 is symlinked initially Modified Paths: -------------- csw/mgar/pkg/ruby/trunk/Makefile Modified: csw/mgar/pkg/ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby/trunk/Makefile 2009-11-15 01:58:23 UTC (rev 7291) +++ csw/mgar/pkg/ruby/trunk/Makefile 2009-11-15 04:04:21 UTC (rev 7292) @@ -125,7 +125,7 @@ @echo "Setting up the CSW rbconfig stuff so we can switch between compilers" @mv $(DESTDIR)$(RBCONFIG) $(DESTDIR)$(RBCONFIG).SOS11 @gcp $(FILEDIR)/rbconfig.rb.GCC4.$(GARCH) $(DESTDIR)/$(RBCONFIG).GCC4 - @gln -s $(RBCONFIG).SOS11 $(DESTDIR)$(RBCONFIG) + @gln -n -s $(RBCONFIG).SOS11 $(DESTDIR)$(RBCONFIG) @gcp $(FILEDIR)/cswrbconfig $(DESTDIR)/opt/csw/bin/ @chmod 755 $(DESTDIR)/opt/csw/bin/cswrbconfig @ginstall -c -d -m 0755 $(DESTDIR)$(docdir)/ruby/ 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 Nov 15 10:42:24 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 15 Nov 2009 09:42:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7293] csw/mgar/pkg/wxwidgets/trunk Message-ID: Revision: 7293 http://gar.svn.sourceforge.net/gar/?rev=7293&view=rev Author: wahwah Date: 2009-11-15 09:42:24 +0000 (Sun, 15 Nov 2009) Log Message: ----------- wxwidgets: adding 0004-add-monodll_appbase.so-to-wxrc.patch Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile csw/mgar/pkg/wxwidgets/trunk/checksums Added Paths: ----------- csw/mgar/pkg/wxwidgets/trunk/files/0004-add-monodll_appbase.so-to-wxrc.patch Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-15 04:04:21 UTC (rev 7292) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-15 09:42:24 UTC (rev 7293) @@ -37,10 +37,12 @@ PATCHFILES_isa-i386-garversion-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch PATCHFILES_isa-i386-garversion-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch PATCHFILES_isa-i386-garversion-2.8.5 += 0003-vsscanf-support-via-ncursesw.patch +PATCHFILES_isa-i386-garversion-2.8.5 += 0004-add-monodll_appbase.so-to-wxrc.patch PATCHFILES_isa-sparcv8-garversion-2.8.5 = 0500-wxT-macro-first-iteration.patch PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0003-vsscanf-support-via-ncursesw.patch +PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0004-add-monodll_appbase.so-to-wxrc.patch PATCHFILES_isa-i386-garversion-2.8.10 = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch PATCHFILES_isa-i386-garversion-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch PATCHFILES_isa-i386-garversion-2.8.10 += 0003-vsscanf-support-via-ncursesw.patch Modified: csw/mgar/pkg/wxwidgets/trunk/checksums =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/checksums 2009-11-15 04:04:21 UTC (rev 7292) +++ csw/mgar/pkg/wxwidgets/trunk/checksums 2009-11-15 09:42:24 UTC (rev 7293) @@ -1,6 +1,7 @@ 7830ab8006ade9b14567341b5481eadd 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch 45df2933ed2fa53f229feda01467db81 0002-Fixing-retarded-checks-for-libGL.patch 225f6163a1c31d1f96a3b0548b338105 0003-vsscanf-support-via-ncursesw.patch +d3ee8b20cf9b3dad989f7f0d3363406c 0004-add-monodll_appbase.so-to-wxrc.patch 75ecdc04af4392f918ff6856a3ba6605 0500-wxT-macro-first-iteration.patch 17d8d019fd2e4137b4cd44816b14e282 0501-a-possible-fix-to-wxchar.h.patch 05b32ca051651f4b1885a90f62969faf wxWidgets-2.8.10.tar.gz Added: csw/mgar/pkg/wxwidgets/trunk/files/0004-add-monodll_appbase.so-to-wxrc.patch =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/files/0004-add-monodll_appbase.so-to-wxrc.patch (rev 0) +++ csw/mgar/pkg/wxwidgets/trunk/files/0004-add-monodll_appbase.so-to-wxrc.patch 2009-11-15 09:42:24 UTC (rev 7293) @@ -0,0 +1,39 @@ +From 97b45391f2f97c5455d600051445dd9852a5c58b Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 15 Nov 2009 10:25:28 +0100 +Subject: [PATCH] add monodll_appbase.so to wxrc + +--- + src/common/wxchar.cpp | 1 - + utils/wxrc/Makefile.in | 3 ++- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp +index 1550acc..f594796 100644 +--- a/src/common/wxchar.cpp ++++ b/src/common/wxchar.cpp +@@ -15,7 +15,6 @@ + + // For compilers that support precompilation, includes "wx.h". + #include "wx/wxprec.h" +-#include "ncursesw/ncurses.h" + + #ifdef __BORLANDC__ + #pragma hdrstop +diff --git a/utils/wxrc/Makefile.in b/utils/wxrc/Makefile.in +index 086ba6f..9f1f171 100644 +--- a/utils/wxrc/Makefile.in ++++ b/utils/wxrc/Makefile.in +@@ -44,7 +44,8 @@ WXRC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS) + WXRC_OBJECTS = \ +- wxrc_wxrc.o ++ wxrc_wxrc.o \ ++ ../../monodll_appbase.o + + ### Conditionally set variables: ### + +-- +1.6.2.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 Nov 15 12:15:49 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 15 Nov 2009 11:15:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[7294] csw/mgar/pkg/wxwidgets/trunk Message-ID: Revision: 7294 http://gar.svn.sourceforge.net/gar/?rev=7294&view=rev Author: wahwah Date: 2009-11-15 11:15:49 +0000 (Sun, 15 Nov 2009) Log Message: ----------- Fixing 0004-add-monodll_appbase.so-to-wxrc.patch not to revert 0003 Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/checksums csw/mgar/pkg/wxwidgets/trunk/files/0004-add-monodll_appbase.so-to-wxrc.patch Modified: csw/mgar/pkg/wxwidgets/trunk/checksums =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/checksums 2009-11-15 09:42:24 UTC (rev 7293) +++ csw/mgar/pkg/wxwidgets/trunk/checksums 2009-11-15 11:15:49 UTC (rev 7294) @@ -1,7 +1,7 @@ 7830ab8006ade9b14567341b5481eadd 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch 45df2933ed2fa53f229feda01467db81 0002-Fixing-retarded-checks-for-libGL.patch 225f6163a1c31d1f96a3b0548b338105 0003-vsscanf-support-via-ncursesw.patch -d3ee8b20cf9b3dad989f7f0d3363406c 0004-add-monodll_appbase.so-to-wxrc.patch +f073300d39ce7c88db1033bbce64cdca 0004-add-monodll_appbase.so-to-wxrc.patch 75ecdc04af4392f918ff6856a3ba6605 0500-wxT-macro-first-iteration.patch 17d8d019fd2e4137b4cd44816b14e282 0501-a-possible-fix-to-wxchar.h.patch 05b32ca051651f4b1885a90f62969faf wxWidgets-2.8.10.tar.gz Modified: csw/mgar/pkg/wxwidgets/trunk/files/0004-add-monodll_appbase.so-to-wxrc.patch =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/files/0004-add-monodll_appbase.so-to-wxrc.patch 2009-11-15 09:42:24 UTC (rev 7293) +++ csw/mgar/pkg/wxwidgets/trunk/files/0004-add-monodll_appbase.so-to-wxrc.patch 2009-11-15 11:15:49 UTC (rev 7294) @@ -8,18 +8,6 @@ utils/wxrc/Makefile.in | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp -index 1550acc..f594796 100644 ---- a/src/common/wxchar.cpp -+++ b/src/common/wxchar.cpp -@@ -15,7 +15,6 @@ - - // For compilers that support precompilation, includes "wx.h". - #include "wx/wxprec.h" --#include "ncursesw/ncurses.h" - - #ifdef __BORLANDC__ - #pragma hdrstop diff --git a/utils/wxrc/Makefile.in b/utils/wxrc/Makefile.in index 086ba6f..9f1f171 100644 --- a/utils/wxrc/Makefile.in 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 Nov 15 14:51:22 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 15 Nov 2009 13:51:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[7295] csw/mgar/pkg Message-ID: Revision: 7295 http://gar.svn.sourceforge.net/gar/?rev=7295&view=rev Author: wahwah Date: 2009-11-15 13:51:19 +0000 (Sun, 15 Nov 2009) Log Message: ----------- multiple packages: adding package-level Makefiles Added Paths: ----------- csw/mgar/pkg/GeoIP/Makefile csw/mgar/pkg/S10gnome/Makefile csw/mgar/pkg/Vispan/Makefile csw/mgar/pkg/anjuta/Makefile csw/mgar/pkg/atspi/Makefile csw/mgar/pkg/autossh/Makefile csw/mgar/pkg/awstats/Makefile csw/mgar/pkg/axel/Makefile csw/mgar/pkg/bass/Makefile csw/mgar/pkg/bind2nsd/Makefile csw/mgar/pkg/binutils/Makefile csw/mgar/pkg/bluefish/Makefile csw/mgar/pkg/botnet/Makefile csw/mgar/pkg/boxbackup/Makefile csw/mgar/pkg/bvi/Makefile csw/mgar/pkg/ca_certificates/Makefile csw/mgar/pkg/cacti/Makefile csw/mgar/pkg/control-center/Makefile csw/mgar/pkg/convmv/Makefile csw/mgar/pkg/csup/Makefile csw/mgar/pkg/cvsps/Makefile csw/mgar/pkg/dante/Makefile csw/mgar/pkg/dcc/Makefile csw/mgar/pkg/desktop-file-utils/Makefile csw/mgar/pkg/dhcp/Makefile csw/mgar/pkg/dhcping/Makefile csw/mgar/pkg/diffstat/Makefile csw/mgar/pkg/dnswalk/Makefile csw/mgar/pkg/docbook-dtds/Makefile csw/mgar/pkg/docbook-style-dsssl/Makefile csw/mgar/pkg/docbook-style-xsl/Makefile csw/mgar/pkg/dovecot/Makefile csw/mgar/pkg/drill/Makefile csw/mgar/pkg/enigma/Makefile csw/mgar/pkg/eog/Makefile csw/mgar/pkg/epiphany/Makefile csw/mgar/pkg/esound/Makefile csw/mgar/pkg/etckeeper/Makefile csw/mgar/pkg/evolution/Makefile csw/mgar/pkg/evolution-ds/Makefile csw/mgar/pkg/fedora-ds/Makefile csw/mgar/pkg/ficy/Makefile csw/mgar/pkg/fortune/Makefile csw/mgar/pkg/fotaq/Makefile csw/mgar/pkg/fprobe/Makefile csw/mgar/pkg/gail/Makefile csw/mgar/pkg/gal/Makefile csw/mgar/pkg/gal2/Makefile csw/mgar/pkg/gconf2/Makefile csw/mgar/pkg/gdb/Makefile csw/mgar/pkg/gnome/Makefile csw/mgar/pkg/gnome-applets/Makefile csw/mgar/pkg/gnome-games/Makefile csw/mgar/pkg/gnome-icon-theme/Makefile csw/mgar/pkg/gnome-keyring/Makefile csw/mgar/pkg/gnome-panel/Makefile csw/mgar/pkg/gnome-pilot/Makefile csw/mgar/pkg/gnome-session/Makefile csw/mgar/pkg/gnome-skeleton/Makefile csw/mgar/pkg/gnome-spell/Makefile csw/mgar/pkg/gnome-terminal/Makefile csw/mgar/pkg/gnome-themes/Makefile csw/mgar/pkg/gnome-utils/Makefile csw/mgar/pkg/gnomedesktop/Makefile csw/mgar/pkg/gnomevfs2/Makefile csw/mgar/pkg/gnupg2/Makefile csw/mgar/pkg/gpgme/Makefile csw/mgar/pkg/gstreamer/Makefile csw/mgar/pkg/gtk-engines/Makefile csw/mgar/pkg/gtkhtml/Makefile csw/mgar/pkg/gtkhtml31/Makefile csw/mgar/pkg/gts/Makefile csw/mgar/pkg/hatari/Makefile csw/mgar/pkg/hdf5/Makefile csw/mgar/pkg/hexdump/Makefile csw/mgar/pkg/httping/Makefile csw/mgar/pkg/icinga/Makefile csw/mgar/pkg/iftop/Makefile csw/mgar/pkg/imapsync/Makefile csw/mgar/pkg/indent/Makefile csw/mgar/pkg/intltool/Makefile csw/mgar/pkg/iperf/Makefile csw/mgar/pkg/kshdbx/Makefile csw/mgar/pkg/lame/Makefile csw/mgar/pkg/ldns/Makefile csw/mgar/pkg/leafnode/Makefile csw/mgar/pkg/libassuan/Makefile csw/mgar/pkg/libbonobo2/Makefile csw/mgar/pkg/libbonoboui/Makefile csw/mgar/pkg/libcroco/Makefile csw/mgar/pkg/libfaac/Makefile csw/mgar/pkg/libgadu/Makefile csw/mgar/pkg/libgcrypt/Makefile csw/mgar/pkg/libgnome/Makefile csw/mgar/pkg/libgnomecanvas/Makefile csw/mgar/pkg/libgnomecups/Makefile csw/mgar/pkg/libgnomeprint/Makefile csw/mgar/pkg/libgnomeprintui/Makefile csw/mgar/pkg/libgnomeui/Makefile csw/mgar/pkg/libgpg_error/Makefile csw/mgar/pkg/libgss/Makefile csw/mgar/pkg/libgtop/Makefile csw/mgar/pkg/libidn/Makefile csw/mgar/pkg/libksba/Makefile csw/mgar/pkg/liblasi/Makefile csw/mgar/pkg/libmhash/Makefile csw/mgar/pkg/libserf/Makefile csw/mgar/pkg/libsoup/Makefile csw/mgar/pkg/libsoup2/Makefile csw/mgar/pkg/libspectre/Makefile csw/mgar/pkg/libtasn1/Makefile csw/mgar/pkg/libthai/Makefile csw/mgar/pkg/libtheora/Makefile csw/mgar/pkg/libwnck/Makefile csw/mgar/pkg/libxklavier/Makefile csw/mgar/pkg/libxml2/Makefile csw/mgar/pkg/libxslt/Makefile csw/mgar/pkg/libytnef/Makefile csw/mgar/pkg/loudmouth/Makefile csw/mgar/pkg/lzop/Makefile csw/mgar/pkg/mailx/Makefile csw/mgar/pkg/mairix/Makefile csw/mgar/pkg/mbuffer/Makefile csw/mgar/pkg/mcabber/Makefile csw/mgar/pkg/meanwhile/Makefile csw/mgar/pkg/metacity/Makefile csw/mgar/pkg/mgetty/Makefile csw/mgar/pkg/miltergreylist/Makefile csw/mgar/pkg/mod_macro/Makefile csw/mgar/pkg/mod_wsgi/Makefile csw/mgar/pkg/mtr/Makefile csw/mgar/pkg/multisync/Makefile csw/mgar/pkg/multitail/Makefile csw/mgar/pkg/mysql5/Makefile csw/mgar/pkg/nagios/Makefile csw/mgar/pkg/nagios_plugins/Makefile csw/mgar/pkg/nagvis/Makefile csw/mgar/pkg/nano/Makefile csw/mgar/pkg/nautilus/Makefile csw/mgar/pkg/ncal/Makefile csw/mgar/pkg/ncdu/Makefile csw/mgar/pkg/ndoutils/Makefile csw/mgar/pkg/nethack/Makefile csw/mgar/pkg/nginx/Makefile csw/mgar/pkg/npadmin/Makefile csw/mgar/pkg/nrpe/Makefile csw/mgar/pkg/nsca/Makefile csw/mgar/pkg/nsd/Makefile csw/mgar/pkg/octave/Makefile csw/mgar/pkg/openjade/Makefile csw/mgar/pkg/openjpeg/Makefile csw/mgar/pkg/openobex/Makefile csw/mgar/pkg/openssl1/Makefile csw/mgar/pkg/otr/Makefile csw/mgar/pkg/p7zip/Makefile csw/mgar/pkg/pango-libthai/Makefile csw/mgar/pkg/par/Makefile csw/mgar/pkg/pbzip2/Makefile csw/mgar/pkg/pcb/Makefile csw/mgar/pkg/pen/Makefile csw/mgar/pkg/php5_apc/Makefile csw/mgar/pkg/php5_xdebug/Makefile csw/mgar/pkg/phpMyAdmin/Makefile csw/mgar/pkg/phpmode/Makefile csw/mgar/pkg/phpsysinfo/Makefile csw/mgar/pkg/pidgin/Makefile csw/mgar/pkg/pidginotr/Makefile csw/mgar/pkg/pil/Makefile csw/mgar/pkg/pnp/Makefile csw/mgar/pkg/poppler/Makefile csw/mgar/pkg/postgresql/Makefile csw/mgar/pkg/pound2/Makefile csw/mgar/pkg/privoxy/Makefile csw/mgar/pkg/proxytunnel/Makefile csw/mgar/pkg/pureftpd/Makefile csw/mgar/pkg/pydes/Makefile csw/mgar/pkg/pyorbit/Makefile csw/mgar/pkg/pyzor/Makefile csw/mgar/pkg/qpopper/Makefile csw/mgar/pkg/rcs/Makefile csw/mgar/pkg/rdesktop/Makefile csw/mgar/pkg/reportlab/Makefile csw/mgar/pkg/samba/Makefile csw/mgar/pkg/scala/Makefile csw/mgar/pkg/scponly/Makefile csw/mgar/pkg/scummvm/Makefile csw/mgar/pkg/shmux/Makefile csw/mgar/pkg/siege/Makefile csw/mgar/pkg/silctoolkit/Makefile csw/mgar/pkg/skeleton/Makefile csw/mgar/pkg/slocate/Makefile csw/mgar/pkg/smartmontools/Makefile csw/mgar/pkg/sox/Makefile csw/mgar/pkg/speex/Makefile csw/mgar/pkg/spider/Makefile csw/mgar/pkg/sqlite/Makefile csw/mgar/pkg/startup-notification/Makefile csw/mgar/pkg/stunnel/Makefile csw/mgar/pkg/swftools/Makefile csw/mgar/pkg/synce/Makefile csw/mgar/pkg/synce_multisync/Makefile csw/mgar/pkg/tcl/Makefile csw/mgar/pkg/tcl85/Makefile csw/mgar/pkg/tcpdrop/Makefile csw/mgar/pkg/tcpflow/Makefile csw/mgar/pkg/timidity/Makefile csw/mgar/pkg/tk/Makefile csw/mgar/pkg/tla/Makefile csw/mgar/pkg/tla-tools/Makefile csw/mgar/pkg/top/Makefile csw/mgar/pkg/trafshow/Makefile csw/mgar/pkg/transmission/Makefile csw/mgar/pkg/tuntap/Makefile csw/mgar/pkg/unbound/Makefile csw/mgar/pkg/unclutter/Makefile csw/mgar/pkg/vixiecron/Makefile csw/mgar/pkg/vttest/Makefile csw/mgar/pkg/watch/Makefile csw/mgar/pkg/wbxml2/Makefile csw/mgar/pkg/which/Makefile csw/mgar/pkg/wmcliphist/Makefile csw/mgar/pkg/wmclock/Makefile csw/mgar/pkg/wmmail/Makefile csw/mgar/pkg/wput/Makefile csw/mgar/pkg/wv2/Makefile csw/mgar/pkg/x11-ssh-askpass/Makefile csw/mgar/pkg/x2x/Makefile csw/mgar/pkg/xbill/Makefile csw/mgar/pkg/ximian_connector/Makefile csw/mgar/pkg/xmahjongg/Makefile csw/mgar/pkg/xmlparser/Makefile csw/mgar/pkg/xpdf/Makefile csw/mgar/pkg/xsel/Makefile csw/mgar/pkg/xterm/Makefile csw/mgar/pkg/xtide/Makefile csw/mgar/pkg/zlib/Makefile Copied: csw/mgar/pkg/GeoIP/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/GeoIP/Makefile (rev 0) +++ csw/mgar/pkg/GeoIP/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/S10gnome/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/S10gnome/Makefile (rev 0) +++ csw/mgar/pkg/S10gnome/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/Vispan/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/Vispan/Makefile (rev 0) +++ csw/mgar/pkg/Vispan/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/anjuta/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/anjuta/Makefile (rev 0) +++ csw/mgar/pkg/anjuta/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/atspi/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/atspi/Makefile (rev 0) +++ csw/mgar/pkg/atspi/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/autossh/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/autossh/Makefile (rev 0) +++ csw/mgar/pkg/autossh/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/awstats/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/awstats/Makefile (rev 0) +++ csw/mgar/pkg/awstats/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/axel/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/axel/Makefile (rev 0) +++ csw/mgar/pkg/axel/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/bass/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/bass/Makefile (rev 0) +++ csw/mgar/pkg/bass/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/bind2nsd/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/bind2nsd/Makefile (rev 0) +++ csw/mgar/pkg/bind2nsd/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/binutils/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/binutils/Makefile (rev 0) +++ csw/mgar/pkg/binutils/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/bluefish/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/bluefish/Makefile (rev 0) +++ csw/mgar/pkg/bluefish/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/botnet/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/botnet/Makefile (rev 0) +++ csw/mgar/pkg/botnet/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/boxbackup/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/boxbackup/Makefile (rev 0) +++ csw/mgar/pkg/boxbackup/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/bvi/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/bvi/Makefile (rev 0) +++ csw/mgar/pkg/bvi/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/ca_certificates/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/ca_certificates/Makefile (rev 0) +++ csw/mgar/pkg/ca_certificates/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/cacti/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/cacti/Makefile (rev 0) +++ csw/mgar/pkg/cacti/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/control-center/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/control-center/Makefile (rev 0) +++ csw/mgar/pkg/control-center/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/convmv/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/convmv/Makefile (rev 0) +++ csw/mgar/pkg/convmv/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/csup/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/csup/Makefile (rev 0) +++ csw/mgar/pkg/csup/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/cvsps/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/cvsps/Makefile (rev 0) +++ csw/mgar/pkg/cvsps/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/dante/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/dante/Makefile (rev 0) +++ csw/mgar/pkg/dante/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/dcc/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/dcc/Makefile (rev 0) +++ csw/mgar/pkg/dcc/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/desktop-file-utils/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/desktop-file-utils/Makefile (rev 0) +++ csw/mgar/pkg/desktop-file-utils/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/dhcp/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/dhcp/Makefile (rev 0) +++ csw/mgar/pkg/dhcp/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/dhcping/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/dhcping/Makefile (rev 0) +++ csw/mgar/pkg/dhcping/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/diffstat/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/diffstat/Makefile (rev 0) +++ csw/mgar/pkg/diffstat/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/dnswalk/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/dnswalk/Makefile (rev 0) +++ csw/mgar/pkg/dnswalk/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/docbook-dtds/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/docbook-dtds/Makefile (rev 0) +++ csw/mgar/pkg/docbook-dtds/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/docbook-style-dsssl/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/docbook-style-dsssl/Makefile (rev 0) +++ csw/mgar/pkg/docbook-style-dsssl/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/docbook-style-xsl/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/docbook-style-xsl/Makefile (rev 0) +++ csw/mgar/pkg/docbook-style-xsl/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/dovecot/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/dovecot/Makefile (rev 0) +++ csw/mgar/pkg/dovecot/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/drill/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/drill/Makefile (rev 0) +++ csw/mgar/pkg/drill/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/enigma/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/enigma/Makefile (rev 0) +++ csw/mgar/pkg/enigma/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/eog/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/eog/Makefile (rev 0) +++ csw/mgar/pkg/eog/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/epiphany/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/epiphany/Makefile (rev 0) +++ csw/mgar/pkg/epiphany/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/esound/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/esound/Makefile (rev 0) +++ csw/mgar/pkg/esound/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/etckeeper/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/etckeeper/Makefile (rev 0) +++ csw/mgar/pkg/etckeeper/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/evolution/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/evolution/Makefile (rev 0) +++ csw/mgar/pkg/evolution/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/evolution-ds/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/evolution-ds/Makefile (rev 0) +++ csw/mgar/pkg/evolution-ds/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/fedora-ds/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/fedora-ds/Makefile (rev 0) +++ csw/mgar/pkg/fedora-ds/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/ficy/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/ficy/Makefile (rev 0) +++ csw/mgar/pkg/ficy/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/fortune/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/fortune/Makefile (rev 0) +++ csw/mgar/pkg/fortune/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/fotaq/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/fotaq/Makefile (rev 0) +++ csw/mgar/pkg/fotaq/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/fprobe/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/fprobe/Makefile (rev 0) +++ csw/mgar/pkg/fprobe/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gail/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gail/Makefile (rev 0) +++ csw/mgar/pkg/gail/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gal/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gal/Makefile (rev 0) +++ csw/mgar/pkg/gal/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gal2/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gal2/Makefile (rev 0) +++ csw/mgar/pkg/gal2/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gconf2/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gconf2/Makefile (rev 0) +++ csw/mgar/pkg/gconf2/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gdb/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gdb/Makefile (rev 0) +++ csw/mgar/pkg/gdb/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gnome/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gnome/Makefile (rev 0) +++ csw/mgar/pkg/gnome/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gnome-applets/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gnome-applets/Makefile (rev 0) +++ csw/mgar/pkg/gnome-applets/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gnome-games/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gnome-games/Makefile (rev 0) +++ csw/mgar/pkg/gnome-games/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gnome-icon-theme/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gnome-icon-theme/Makefile (rev 0) +++ csw/mgar/pkg/gnome-icon-theme/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gnome-keyring/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gnome-keyring/Makefile (rev 0) +++ csw/mgar/pkg/gnome-keyring/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gnome-panel/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gnome-panel/Makefile (rev 0) +++ csw/mgar/pkg/gnome-panel/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gnome-pilot/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gnome-pilot/Makefile (rev 0) +++ csw/mgar/pkg/gnome-pilot/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gnome-session/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gnome-session/Makefile (rev 0) +++ csw/mgar/pkg/gnome-session/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gnome-skeleton/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gnome-skeleton/Makefile (rev 0) +++ csw/mgar/pkg/gnome-skeleton/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gnome-spell/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gnome-spell/Makefile (rev 0) +++ csw/mgar/pkg/gnome-spell/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gnome-terminal/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gnome-terminal/Makefile (rev 0) +++ csw/mgar/pkg/gnome-terminal/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gnome-themes/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gnome-themes/Makefile (rev 0) +++ csw/mgar/pkg/gnome-themes/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gnome-utils/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gnome-utils/Makefile (rev 0) +++ csw/mgar/pkg/gnome-utils/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gnomedesktop/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gnomedesktop/Makefile (rev 0) +++ csw/mgar/pkg/gnomedesktop/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gnomevfs2/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gnomevfs2/Makefile (rev 0) +++ csw/mgar/pkg/gnomevfs2/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gnupg2/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gnupg2/Makefile (rev 0) +++ csw/mgar/pkg/gnupg2/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gpgme/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gpgme/Makefile (rev 0) +++ csw/mgar/pkg/gpgme/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gstreamer/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gstreamer/Makefile (rev 0) +++ csw/mgar/pkg/gstreamer/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gtk-engines/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gtk-engines/Makefile (rev 0) +++ csw/mgar/pkg/gtk-engines/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gtkhtml/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gtkhtml/Makefile (rev 0) +++ csw/mgar/pkg/gtkhtml/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gtkhtml31/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gtkhtml31/Makefile (rev 0) +++ csw/mgar/pkg/gtkhtml31/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gts/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gts/Makefile (rev 0) +++ csw/mgar/pkg/gts/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/hatari/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/hatari/Makefile (rev 0) +++ csw/mgar/pkg/hatari/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/hdf5/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/hdf5/Makefile (rev 0) +++ csw/mgar/pkg/hdf5/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/hexdump/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/hexdump/Makefile (rev 0) +++ csw/mgar/pkg/hexdump/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/httping/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/httping/Makefile (rev 0) +++ csw/mgar/pkg/httping/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/icinga/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/icinga/Makefile (rev 0) +++ csw/mgar/pkg/icinga/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/iftop/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/iftop/Makefile (rev 0) +++ csw/mgar/pkg/iftop/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/imapsync/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/imapsync/Makefile (rev 0) +++ csw/mgar/pkg/imapsync/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/indent/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/indent/Makefile (rev 0) +++ csw/mgar/pkg/indent/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/intltool/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/intltool/Makefile (rev 0) +++ csw/mgar/pkg/intltool/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/iperf/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/iperf/Makefile (rev 0) +++ csw/mgar/pkg/iperf/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/kshdbx/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/kshdbx/Makefile (rev 0) +++ csw/mgar/pkg/kshdbx/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/lame/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/lame/Makefile (rev 0) +++ csw/mgar/pkg/lame/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/ldns/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/ldns/Makefile (rev 0) +++ csw/mgar/pkg/ldns/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/leafnode/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/leafnode/Makefile (rev 0) +++ csw/mgar/pkg/leafnode/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libassuan/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libassuan/Makefile (rev 0) +++ csw/mgar/pkg/libassuan/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libbonobo2/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libbonobo2/Makefile (rev 0) +++ csw/mgar/pkg/libbonobo2/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libbonoboui/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libbonoboui/Makefile (rev 0) +++ csw/mgar/pkg/libbonoboui/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libcroco/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libcroco/Makefile (rev 0) +++ csw/mgar/pkg/libcroco/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libfaac/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libfaac/Makefile (rev 0) +++ csw/mgar/pkg/libfaac/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libgadu/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libgadu/Makefile (rev 0) +++ csw/mgar/pkg/libgadu/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libgcrypt/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libgcrypt/Makefile (rev 0) +++ csw/mgar/pkg/libgcrypt/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libgnome/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libgnome/Makefile (rev 0) +++ csw/mgar/pkg/libgnome/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libgnomecanvas/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libgnomecanvas/Makefile (rev 0) +++ csw/mgar/pkg/libgnomecanvas/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libgnomecups/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libgnomecups/Makefile (rev 0) +++ csw/mgar/pkg/libgnomecups/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libgnomeprint/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libgnomeprint/Makefile (rev 0) +++ csw/mgar/pkg/libgnomeprint/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libgnomeprintui/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libgnomeprintui/Makefile (rev 0) +++ csw/mgar/pkg/libgnomeprintui/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libgnomeui/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libgnomeui/Makefile (rev 0) +++ csw/mgar/pkg/libgnomeui/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libgpg_error/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libgpg_error/Makefile (rev 0) +++ csw/mgar/pkg/libgpg_error/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libgss/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libgss/Makefile (rev 0) +++ csw/mgar/pkg/libgss/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libgtop/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libgtop/Makefile (rev 0) +++ csw/mgar/pkg/libgtop/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libidn/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libidn/Makefile (rev 0) +++ csw/mgar/pkg/libidn/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libksba/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libksba/Makefile (rev 0) +++ csw/mgar/pkg/libksba/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/liblasi/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/liblasi/Makefile (rev 0) +++ csw/mgar/pkg/liblasi/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libmhash/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libmhash/Makefile (rev 0) +++ csw/mgar/pkg/libmhash/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libserf/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libserf/Makefile (rev 0) +++ csw/mgar/pkg/libserf/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libsoup/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libsoup/Makefile (rev 0) +++ csw/mgar/pkg/libsoup/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libsoup2/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libsoup2/Makefile (rev 0) +++ csw/mgar/pkg/libsoup2/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libspectre/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libspectre/Makefile (rev 0) +++ csw/mgar/pkg/libspectre/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libtasn1/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libtasn1/Makefile (rev 0) +++ csw/mgar/pkg/libtasn1/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libthai/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libthai/Makefile (rev 0) +++ csw/mgar/pkg/libthai/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libtheora/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libtheora/Makefile (rev 0) +++ csw/mgar/pkg/libtheora/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libwnck/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libwnck/Makefile (rev 0) +++ csw/mgar/pkg/libwnck/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libxklavier/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libxklavier/Makefile (rev 0) +++ csw/mgar/pkg/libxklavier/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libxml2/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libxml2/Makefile (rev 0) +++ csw/mgar/pkg/libxml2/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libxslt/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libxslt/Makefile (rev 0) +++ csw/mgar/pkg/libxslt/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libytnef/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libytnef/Makefile (rev 0) +++ csw/mgar/pkg/libytnef/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/loudmouth/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/loudmouth/Makefile (rev 0) +++ csw/mgar/pkg/loudmouth/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/lzop/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/lzop/Makefile (rev 0) +++ csw/mgar/pkg/lzop/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/mailx/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/mailx/Makefile (rev 0) +++ csw/mgar/pkg/mailx/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/mairix/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/mairix/Makefile (rev 0) +++ csw/mgar/pkg/mairix/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/mbuffer/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/mbuffer/Makefile (rev 0) +++ csw/mgar/pkg/mbuffer/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/mcabber/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/mcabber/Makefile (rev 0) +++ csw/mgar/pkg/mcabber/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/meanwhile/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/meanwhile/Makefile (rev 0) +++ csw/mgar/pkg/meanwhile/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/metacity/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/metacity/Makefile (rev 0) +++ csw/mgar/pkg/metacity/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/mgetty/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/mgetty/Makefile (rev 0) +++ csw/mgar/pkg/mgetty/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/miltergreylist/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/miltergreylist/Makefile (rev 0) +++ csw/mgar/pkg/miltergreylist/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/mod_macro/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/mod_macro/Makefile (rev 0) +++ csw/mgar/pkg/mod_macro/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/mod_wsgi/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/mod_wsgi/Makefile (rev 0) +++ csw/mgar/pkg/mod_wsgi/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/mtr/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/mtr/Makefile (rev 0) +++ csw/mgar/pkg/mtr/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/multisync/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/multisync/Makefile (rev 0) +++ csw/mgar/pkg/multisync/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/multitail/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/multitail/Makefile (rev 0) +++ csw/mgar/pkg/multitail/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/mysql5/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/mysql5/Makefile (rev 0) +++ csw/mgar/pkg/mysql5/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/nagios/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/nagios/Makefile (rev 0) +++ csw/mgar/pkg/nagios/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/nagios_plugins/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/nagios_plugins/Makefile (rev 0) +++ csw/mgar/pkg/nagios_plugins/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/nagvis/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/nagvis/Makefile (rev 0) +++ csw/mgar/pkg/nagvis/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/nano/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/nano/Makefile (rev 0) +++ csw/mgar/pkg/nano/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/nautilus/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/nautilus/Makefile (rev 0) +++ csw/mgar/pkg/nautilus/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/ncal/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/ncal/Makefile (rev 0) +++ csw/mgar/pkg/ncal/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/ncdu/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/ncdu/Makefile (rev 0) +++ csw/mgar/pkg/ncdu/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/ndoutils/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/ndoutils/Makefile (rev 0) +++ csw/mgar/pkg/ndoutils/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/nethack/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/nethack/Makefile (rev 0) +++ csw/mgar/pkg/nethack/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/nginx/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/nginx/Makefile (rev 0) +++ csw/mgar/pkg/nginx/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/npadmin/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/npadmin/Makefile (rev 0) +++ csw/mgar/pkg/npadmin/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/nrpe/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/nrpe/Makefile (rev 0) +++ csw/mgar/pkg/nrpe/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/nsca/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/nsca/Makefile (rev 0) +++ csw/mgar/pkg/nsca/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/nsd/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/nsd/Makefile (rev 0) +++ csw/mgar/pkg/nsd/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/octave/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/octave/Makefile (rev 0) +++ csw/mgar/pkg/octave/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/openjade/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/openjade/Makefile (rev 0) +++ csw/mgar/pkg/openjade/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/openjpeg/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/openjpeg/Makefile (rev 0) +++ csw/mgar/pkg/openjpeg/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/openobex/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/openobex/Makefile (rev 0) +++ csw/mgar/pkg/openobex/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/openssl1/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/openssl1/Makefile (rev 0) +++ csw/mgar/pkg/openssl1/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/otr/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/otr/Makefile (rev 0) +++ csw/mgar/pkg/otr/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/p7zip/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/p7zip/Makefile (rev 0) +++ csw/mgar/pkg/p7zip/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/pango-libthai/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/pango-libthai/Makefile (rev 0) +++ csw/mgar/pkg/pango-libthai/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/par/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/par/Makefile (rev 0) +++ csw/mgar/pkg/par/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/pbzip2/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/pbzip2/Makefile (rev 0) +++ csw/mgar/pkg/pbzip2/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/pcb/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/pcb/Makefile (rev 0) +++ csw/mgar/pkg/pcb/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/pen/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/pen/Makefile (rev 0) +++ csw/mgar/pkg/pen/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/php5_apc/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/php5_apc/Makefile (rev 0) +++ csw/mgar/pkg/php5_apc/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/php5_xdebug/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/php5_xdebug/Makefile (rev 0) +++ csw/mgar/pkg/php5_xdebug/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/phpMyAdmin/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/phpMyAdmin/Makefile (rev 0) +++ csw/mgar/pkg/phpMyAdmin/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/phpmode/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/phpmode/Makefile (rev 0) +++ csw/mgar/pkg/phpmode/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/phpsysinfo/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/phpsysinfo/Makefile (rev 0) +++ csw/mgar/pkg/phpsysinfo/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/pidgin/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/pidgin/Makefile (rev 0) +++ csw/mgar/pkg/pidgin/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/pidginotr/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/pidginotr/Makefile (rev 0) +++ csw/mgar/pkg/pidginotr/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/pil/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/pil/Makefile (rev 0) +++ csw/mgar/pkg/pil/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/pnp/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/pnp/Makefile (rev 0) +++ csw/mgar/pkg/pnp/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/poppler/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/poppler/Makefile (rev 0) +++ csw/mgar/pkg/poppler/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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 + @@ 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 wahwah at users.sourceforge.net Sun Nov 15 16:20:40 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 15 Nov 2009 15:20:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[7296] csw/mgar/pkg/wxwidgets/trunk Message-ID: Revision: 7296 http://gar.svn.sourceforge.net/gar/?rev=7296&view=rev Author: wahwah Date: 2009-11-15 15:20:40 +0000 (Sun, 15 Nov 2009) Log Message: ----------- wxwidgets: adding 0005-stupid-vwscanf-workaround.patch Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile csw/mgar/pkg/wxwidgets/trunk/checksums Added Paths: ----------- csw/mgar/pkg/wxwidgets/trunk/files/0005-stupid-vwscanf-workaround.patch Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-15 13:51:19 UTC (rev 7295) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-15 15:20:40 UTC (rev 7296) @@ -16,7 +16,7 @@ # The unicode version can't be currently built on Solaris 8. Doing separate # builds on Solaris 8 and Solaris 9. Unicode support will start in Solaris 9. # More details below, look for 'unicode'. -PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 solaris9-sparc solaris9-i386 +PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 EXTRA_MODULATORS = GARVERSION MODULATIONS_GARVERSION = 2.8.5 2.8.10 @@ -29,27 +29,32 @@ SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(GARNAME)-$(VERSION).tar.gz) NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz,$(SOURCEFILES)) +DISTFILES = $(SOURCEFILES) SPKG_SOURCEURL = http://www.wxwidgets.org/ MASTER_SITES = $(SF_MIRRORS) SF_PROJ = wxwindows + PATCHFILES_isa-i386-garversion-2.8.5 = 0500-wxT-macro-first-iteration.patch PATCHFILES_isa-i386-garversion-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch PATCHFILES_isa-i386-garversion-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch PATCHFILES_isa-i386-garversion-2.8.5 += 0003-vsscanf-support-via-ncursesw.patch PATCHFILES_isa-i386-garversion-2.8.5 += 0004-add-monodll_appbase.so-to-wxrc.patch +PATCHFILES_isa-i386-garversion-2.8.5 += 0005-stupid-vwscanf-workaround.patch PATCHFILES_isa-sparcv8-garversion-2.8.5 = 0500-wxT-macro-first-iteration.patch PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0003-vsscanf-support-via-ncursesw.patch PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0004-add-monodll_appbase.so-to-wxrc.patch +PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0005-stupid-vwscanf-workaround.patch PATCHFILES_isa-i386-garversion-2.8.10 = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch PATCHFILES_isa-i386-garversion-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch PATCHFILES_isa-i386-garversion-2.8.10 += 0003-vsscanf-support-via-ncursesw.patch +PATCHFILES_isa-i386-garversion-2.8.10 += 0005-stupid-vwscanf-workaround.patch PATCHFILES_isa-sparcv8-garversion-2.8.10 = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch PATCHFILES_isa-sparcv8-garversion-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch PATCHFILES_isa-sparcv8-garversion-2.8.10 += 0003-vsscanf-support-via-ncursesw.patch -DISTFILES = $(SOURCEFILES) +PATCHFILES_isa-sparcv8-garversion-2.8.10 += 0005-stupid-vwscanf-workaround.patch UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz PACKAGES = CSWwxwidgetscommon PACKAGES += CSWwxwidgetsdevel @@ -106,7 +111,8 @@ # To fix a problem with unresolved symbols EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so # For vsscanf support -EXTRA_LINKER_FLAGS += /opt/csw/lib/libncursesw.so +# EXTRA_LINKER_FLAGS += /opt/csw/lib/libncursesw.so +EXTRA_LINKER_FLAGS += -lncursesw CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-gtk=2 Modified: csw/mgar/pkg/wxwidgets/trunk/checksums =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/checksums 2009-11-15 13:51:19 UTC (rev 7295) +++ csw/mgar/pkg/wxwidgets/trunk/checksums 2009-11-15 15:20:40 UTC (rev 7296) @@ -2,6 +2,7 @@ 45df2933ed2fa53f229feda01467db81 0002-Fixing-retarded-checks-for-libGL.patch 225f6163a1c31d1f96a3b0548b338105 0003-vsscanf-support-via-ncursesw.patch f073300d39ce7c88db1033bbce64cdca 0004-add-monodll_appbase.so-to-wxrc.patch +969c363847e675dc4d3ad6b8871b96db 0005-stupid-vwscanf-workaround.patch 75ecdc04af4392f918ff6856a3ba6605 0500-wxT-macro-first-iteration.patch 17d8d019fd2e4137b4cd44816b14e282 0501-a-possible-fix-to-wxchar.h.patch 05b32ca051651f4b1885a90f62969faf wxWidgets-2.8.10.tar.gz Added: csw/mgar/pkg/wxwidgets/trunk/files/0005-stupid-vwscanf-workaround.patch =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/files/0005-stupid-vwscanf-workaround.patch (rev 0) +++ csw/mgar/pkg/wxwidgets/trunk/files/0005-stupid-vwscanf-workaround.patch 2009-11-15 15:20:40 UTC (rev 7296) @@ -0,0 +1,28 @@ +From 739b2e9cbecf828c1f74f0e349a6ad8b3a2a0060 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 15 Nov 2009 16:07:25 +0100 +Subject: [PATCH] stupid vwscanf workaround + +--- + include/wx/wxchar.h | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h +index 04fbd8d..e88484a 100644 +--- a/include/wx/wxchar.h ++++ b/include/wx/wxchar.h +@@ -1011,9 +1011,9 @@ WXDLLIMPEXP_BASE bool wxOKlibc(); /* for internal use */ + so on but not all systems have them so use our own implementations in this + case. + */ +-#if wxUSE_UNICODE && !defined(wxHAVE_TCHAR_SUPPORT) && !defined(HAVE_WPRINTF) ++/* #if wxUSE_UNICODE && !defined(wxHAVE_TCHAR_SUPPORT) && !defined(HAVE_WPRINTF) */ + #define wxNEED_WPRINTF +-#endif ++/* #endif */ + + /* + More Unicode complications: although both ANSI C and C++ define a number of +-- +1.6.2.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Nov 15 16:49:08 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 15 Nov 2009 15:49:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[7297] csw/mgar/pkg/pcb/trunk/Makefile Message-ID: Revision: 7297 http://gar.svn.sourceforge.net/gar/?rev=7297&view=rev Author: trygvis Date: 2009-11-15 15:49:07 +0000 (Sun, 15 Nov 2009) Log Message: ----------- pcb: Adding PREREQUISITE_PKGS. Modified Paths: -------------- csw/mgar/pkg/pcb/trunk/Makefile Modified: csw/mgar/pkg/pcb/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcb/trunk/Makefile 2009-11-15 15:20:40 UTC (rev 7296) +++ csw/mgar/pkg/pcb/trunk/Makefile 2009-11-15 15:49:07 UTC (rev 7297) @@ -12,6 +12,7 @@ reduce layout time. endef +SF_PROJ = $(GARNAME) MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz @@ -20,6 +21,14 @@ LICENSE = COPYING #REQUIRED_PKGS = CSWggettextrt CSWiconv +PREREQUISITE_PKGS = CSWglib2devel +PREREQUISITE_PKGS += CSWgtk2devel +PREREQUISITE_PKGS += CSWlibxcbdevel +PREREQUISITE_PKGS += CSWlibpthreadstubs +PREREQUISITE_PKGS += CSWlibxaudevel +PREREQUISITE_PKGS += CSWrenderproto +PREREQUISITE_PKGS += CSWxproto +PREREQUISITE_PKGS += CSWkbproto # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=73743 @@ -33,6 +42,7 @@ # Patch submitted to upstream, pending new release #PATCHFILES = iptc-dataset.patch +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-update-desktop-database CONFIGURE_ARGS += --disable-update-mime-database This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Nov 15 17:05:55 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 15 Nov 2009 16:05:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[7298] csw/mgar/pkg/supybot/trunk/Makefile Message-ID: Revision: 7298 http://gar.svn.sourceforge.net/gar/?rev=7298&view=rev Author: skayser Date: 2009-11-15 16:05:55 +0000 (Sun, 15 Nov 2009) Log Message: ----------- supybot: add docs/ and man pages Modified Paths: -------------- csw/mgar/pkg/supybot/trunk/Makefile Modified: csw/mgar/pkg/supybot/trunk/Makefile =================================================================== --- csw/mgar/pkg/supybot/trunk/Makefile 2009-11-15 15:49:07 UTC (rev 7297) +++ csw/mgar/pkg/supybot/trunk/Makefile 2009-11-15 16:05:55 UTC (rev 7298) @@ -12,7 +12,7 @@ plugins providing around 400 actual commands. endef -SPKG_SOURCEURL = http://sourceforge.net/projects/supybot/ +SPKG_SOURCEURL = http://supybot.com/ MASTER_SITES = $(SF_MIRRORS) DISTNAME = Supybot-$(GARVERSION) DISTFILES = $(DISTNAME).tar.gz @@ -25,10 +25,12 @@ include gar/category.mk -post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(CATALOGNAME) -post-install-modulated: DOCS=ChangeLog ACKS +post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) +post-install-modulated: DOCS=ChangeLog ACKS docs/* +post-install-modulated: MANDEST=$(DESTDIR)$(mandir)/man1 post-install-modulated: ginstall -d $(DOCDEST) cp $(FILEDIR)/changelog.CSW $(DOCDEST) - cp $(addprefix $(WORKSRC)/, $(DOCS)) $(DOCDEST) + -cp $(addprefix $(WORKSRC)/, $(DOCS)) $(DOCDEST) + ginstall -d $(MANDEST) && cp $(WORKSRC)/docs/man/* $(MANDEST) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Nov 15 18:14:05 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 15 Nov 2009 17:14:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[7299] csw/mgar/pkg/pcb/trunk/Makefile Message-ID: Revision: 7299 http://gar.svn.sourceforge.net/gar/?rev=7299&view=rev Author: trygvis Date: 2009-11-15 17:14:05 +0000 (Sun, 15 Nov 2009) Log Message: ----------- pcb: Excluding files that make pkgmk core dump(!). Modified Paths: -------------- csw/mgar/pkg/pcb/trunk/Makefile Modified: csw/mgar/pkg/pcb/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcb/trunk/Makefile 2009-11-15 16:05:55 UTC (rev 7298) +++ csw/mgar/pkg/pcb/trunk/Makefile 2009-11-15 17:14:05 UTC (rev 7299) @@ -49,4 +49,6 @@ TEST_SCRIPTS = +EXTRA_MERGE_EXCLUDE_FILES = .*/single-ended\ .* + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Nov 15 19:07:22 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 15 Nov 2009 18:07:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[7300] csw/mgar/pkg/pcb/trunk/Makefile Message-ID: Revision: 7300 http://gar.svn.sourceforge.net/gar/?rev=7300&view=rev Author: trygvis Date: 2009-11-15 18:07:22 +0000 (Sun, 15 Nov 2009) Log Message: ----------- pcb: Updating REQUIRED_PKGS. Excluding a bunch of packages that kills the build. Modified Paths: -------------- csw/mgar/pkg/pcb/trunk/Makefile Modified: csw/mgar/pkg/pcb/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcb/trunk/Makefile 2009-11-15 17:14:05 UTC (rev 7299) +++ csw/mgar/pkg/pcb/trunk/Makefile 2009-11-15 18:07:22 UTC (rev 7300) @@ -20,7 +20,23 @@ LICENSE = COPYING -#REQUIRED_PKGS = CSWggettextrt CSWiconv +REQUIRED_PKGS = CSWfconfig +REQUIRED_PKGS += CSWftype2 +REQUIRED_PKGS += CSWgd +REQUIRED_PKGS += CSWggettextrt +REQUIRED_PKGS += CSWglib2 +REQUIRED_PKGS += CSWgtk2 +REQUIRED_PKGS += CSWiconv +REQUIRED_PKGS += CSWjpeg +REQUIRED_PKGS += CSWlibatk +REQUIRED_PKGS += CSWlibcairo +REQUIRED_PKGS += CSWlibxpm +REQUIRED_PKGS += CSWlibxrender +REQUIRED_PKGS += CSWpango +REQUIRED_PKGS += CSWpng +REQUIRED_PKGS += CSWxpm +REQUIRED_PKGS += CSWzlib + PREREQUISITE_PKGS = CSWglib2devel PREREQUISITE_PKGS += CSWgtk2devel PREREQUISITE_PKGS += CSWlibxcbdevel @@ -49,6 +65,28 @@ TEST_SCRIPTS = -EXTRA_MERGE_EXCLUDE_FILES = .*/single-ended\ .* +# 2009-11-15:If these are not excluded pkgmk core dumps or just fails. - trygvis +EXTRA_MERGE_EXCLUDE_FILES = .*/connector/single-ended.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/1.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/10.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/12.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/16.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/2.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/20.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/24.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/32.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/4.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/5.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/8.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/DIL.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/EIA.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/PLCC.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/QFP.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/SMD.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/SMD-W.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/W-DIL.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/ZIF.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/ZIP.* + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Nov 15 20:10:43 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 15 Nov 2009 19:10:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[7301] csw/mgar/pkg/guile/trunk Message-ID: Revision: 7301 http://gar.svn.sourceforge.net/gar/?rev=7301&view=rev Author: trygvis Date: 2009-11-15 19:10:43 +0000 (Sun, 15 Nov 2009) Log Message: ----------- guile: Work in progress to get guile 1.8.7 to work. Package builds, not entirely sure if the content is correct. Modified Paths: -------------- csw/mgar/pkg/guile/trunk/Makefile csw/mgar/pkg/guile/trunk/checksums Modified: csw/mgar/pkg/guile/trunk/Makefile =================================================================== --- csw/mgar/pkg/guile/trunk/Makefile 2009-11-15 18:07:22 UTC (rev 7300) +++ csw/mgar/pkg/guile/trunk/Makefile 2009-11-15 19:10:43 UTC (rev 7301) @@ -1,5 +1,12 @@ +# 2009-11-15: The package builds successfully with GCC (not with sun cc). +# The version in the catalog (1.6.7,REV=2005.07.03) includes the .a +# and .la files only, this package include the .so files only. I'm +# not quite sure what's the correct approach here. +# The existing Makefile included the libraries under files/ +# - Trygve + GARNAME = guile -GARVERSION = 1.6.8 +GARVERSION = 1.8.7 CATEGORIES = lib DESCRIPTION = GNU extensibility library @@ -7,69 +14,30 @@ Guile is a library designed to help programmers create flexible applications. Using Guile in an application allows programmers to write plug-ins, or modules (there are many names, but the concept is essentially the same) and users to use them to have an application fit their needs. endef +SPKG_DESC_CSWguilelib12 = GNU extensibility library (shared libraries) + +# There has to be something wrong when a package depends on *both* gcc3 and gcc4 - trygve +REQUIRED_PKGS = CSWgcc3core +REQUIRED_PKGS += CSWgcc3corert +REQUIRED_PKGS += CSWgcc4corert +REQUIRED_PKGS += CSWggettextrt +REQUIRED_PKGS += CSWlibgmp +REQUIRED_PKGS += CSWlibtoolrt +REQUIRED_PKGS += CSWncurses +REQUIRED_PKGS += CSWreadline + MASTER_SITES = ftp://ftp.gnu.org/pub/gnu/guile/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWguile,$(ADMSTANDARD)) -DISTFILES += $(call admfiles,CSWguilelib12,$(ADMSTANDARD)) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -CONFIGURE_ARGS = $(DIRPATHS) +GARCOMPILER = GNU +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-error-on-warning=no + TEST_SCRIPTS = BUILD_64BIT = yes include gar/category.mk - -post-extract: - @( cd $(WORKDIR) ; gzcat ../../$(FILEDIR)/$(GARNAME)lib12-$(GARCH)-libs-1.6.7.tar.gz | tar xf - ) - -pre-install: - @if test ! -d $(DESTDIR)/opt/csw/share ; then \ - mkdir -p $(DESTDIR)/opt/csw/share ; \ - fi - @if test ! -d $(DESTDIR)/opt/csw/lib ; then \ - mkdir $(DESTDIR)/opt/csw/lib ; \ - fi - @if test ! -d $(DESTDIR)/opt/csw/bin ; then \ - mkdir $(DESTDIR)/opt/csw/bin ; \ - fi - @if test ! -d $(DESTDIR)/opt/csw/sbin ; then \ - mkdir $(DESTDIR)/opt/csw/sbin ; \ - fi - @if test ! -d $(DESTDIR)/opt/csw/share/doc ; then \ - mkdir $(DESTDIR)/opt/csw/share/doc ; \ - fi - @if test ! -d $(DESTDIR)/opt/csw/share/info ; then \ - mkdir $(DESTDIR)/opt/csw/share/info ; \ - fi - @if test ! -d $(DESTDIR)/opt/csw/share/locale ; then \ - mkdir $(DESTDIR)/opt/csw/share/locale ; \ - fi - @if test ! -d $(DESTDIR)/opt/csw/share/man ; then \ - mkdir $(DESTDIR)/opt/csw/share/man ; \ - fi - @if test ! -h $(DESTDIR)/opt/csw/man ; then \ - ln -s $(DESTDIR)/opt/csw/share/man $(DESTDIR)/opt/csw/man ; \ - fi - @if test ! -h $(DESTDIR)/opt/csw/doc ; then \ - ln -s $(DESTDIR)/opt/csw/share/doc $(DESTDIR)/opt/csw/doc ; \ - fi - @if test ! -h $(DESTDIR)/opt/csw/info ; then \ - ln -s $(DESTDIR)/opt/csw/share/info $(DESTDIR)/opt/csw/info ; \ - fi - @if test ! -h $(DESTDIR)/opt/csw/lib/locale ; then \ - ln -s $(DESTDIR)/opt/csw/share/locale $(DESTDIR)/opt/csw/lib/locale ; \ - fi - - -post-install: - @for curlib in libguile-ltdl.so.1.0.0 libguile-srfi-srfi-13-14-v-1.so.1.0.0 libguile-srfi-srfi-4-v-1.so.1.0.0 libguile.so.12.3.0 libguilereadline-v-12.so.12.3.0; do \ - if test -f $(WORKDIR)/$$curlib ; then \ - ginstall -m0755 \ - $(WORKDIR)/$$curlib \ - $(DESTDIR)$(libdir)/$$curlib ; \ - fi ; \ - done - @$(MAKECOOKIE) Modified: csw/mgar/pkg/guile/trunk/checksums =================================================================== --- csw/mgar/pkg/guile/trunk/checksums 2009-11-15 18:07:22 UTC (rev 7300) +++ csw/mgar/pkg/guile/trunk/checksums 2009-11-15 19:10:43 UTC (rev 7301) @@ -1,7 +1 @@ -2756b01f428b910d33267aeaa0e2d59a download/guile-1.6.8.tar.gz -4dfbfa0a9c83ce718bc9e84f912a1463 download/CSWguile.gspec -55b9e3cd0e4bb084a23aa431375ca2ec download/CSWguile.prototype -3360bc130644f066d92ee36acb4d12dd download/CSWguile.depend -3e6e797ea03ebaa3e1e8e19886beb563 download/CSWguilelib12.gspec -677ed30ce2900e4013b262a93ec42753 download/CSWguilelib12.prototype -620a1fb38f3a59a12f40a0d1b01d0f77 download/CSWguilelib12.depend +991b5b3efcbbc3f7507d05bc42f80a5e guile-1.8.7.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Nov 15 20:36:00 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 15 Nov 2009 19:36:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7302] csw/mgar/pkg Message-ID: Revision: 7302 http://gar.svn.sourceforge.net/gar/?rev=7302&view=rev Author: trygvis Date: 2009-11-15 19:36:00 +0000 (Sun, 15 Nov 2009) Log Message: ----------- geda: Initial commit of gEDA. Added Paths: ----------- csw/mgar/pkg/geda/ csw/mgar/pkg/geda/branches/ csw/mgar/pkg/geda/tags/ csw/mgar/pkg/geda/trunk/ csw/mgar/pkg/geda/trunk/Makefile csw/mgar/pkg/geda/trunk/checksums Property changes on: csw/mgar/pkg/geda/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/geda/trunk/Makefile =================================================================== --- csw/mgar/pkg/geda/trunk/Makefile (rev 0) +++ csw/mgar/pkg/geda/trunk/Makefile 2009-11-15 19:36:00 UTC (rev 7302) @@ -0,0 +1,25 @@ +GARNAME = geda +GARVERSION = 1.6.0 +CATEGORIES = devel + +DESCRIPTION = The gEDA suite with gschem, gattrib, gnetlist, gsch2pcb, gsymcheck and libgeda +define BLURB +endef + +MASTER_SITES = http://geda.seul.org/release/v1.6/1.6.0/ +DISTFILES = geda-gaf-$(GARVERSION).tar.gz + +WORKSRC = $(WORKDIR)/geda-gaf-$(GARVERSION) + +# We define upstream file regex so we can be notifed of new upstream software release +# UFILES_REGEX = geda-gaf-(\d+(?:\.\d+)*).tar.gz +# That pattern won't work, geda has a funny major.minor/major.minor.micro +# layout, see MASTER_SITES - trygve + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/geda/trunk/checksums =================================================================== --- csw/mgar/pkg/geda/trunk/checksums (rev 0) +++ csw/mgar/pkg/geda/trunk/checksums 2009-11-15 19:36:00 UTC (rev 7302) @@ -0,0 +1 @@ +1dacc71407e69d77eaf4c1115f5bcd56 geda-gaf-1.6.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Nov 15 22:04:05 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 15 Nov 2009 21:04:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[7303] csw/mgar/pkg/guile/trunk/ Message-ID: Revision: 7303 http://gar.svn.sourceforge.net/gar/?rev=7303&view=rev Author: trygvis Date: 2009-11-15 21:04:05 +0000 (Sun, 15 Nov 2009) Log Message: ----------- guile: Switching the external to GAR v2 after the Makefile was upgraded. Property Changed: ---------------- csw/mgar/pkg/guile/trunk/ Property changes on: csw/mgar/pkg/guile/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 Nov 15 22:20:06 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 15 Nov 2009 21:20:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7304] csw/mgar/pkg/git-subtree/trunk/Makefile Message-ID: Revision: 7304 http://gar.svn.sourceforge.net/gar/?rev=7304&view=rev Author: bdwalton Date: 2009-11-15 21:20:05 +0000 (Sun, 15 Nov 2009) Log Message: ----------- git-subtree: update to newer commit to avoid patching in GPL file Modified Paths: -------------- csw/mgar/pkg/git-subtree/trunk/Makefile Modified: csw/mgar/pkg/git-subtree/trunk/Makefile =================================================================== --- csw/mgar/pkg/git-subtree/trunk/Makefile 2009-11-15 21:04:05 UTC (rev 7303) +++ csw/mgar/pkg/git-subtree/trunk/Makefile 2009-11-15 21:20:05 UTC (rev 7304) @@ -1,6 +1,6 @@ GARNAME = git-subtree GARVERSION = 0.2 -PATCHLEVEL = c567d9 +PATCHLEVEL = d8b2c CATEGORIES = devel DESCRIPTION = Subtree support for git This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Nov 15 22:46:19 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 15 Nov 2009 21:46:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[7305] csw/mgar/pkg/pcb/trunk/Makefile Message-ID: Revision: 7305 http://gar.svn.sourceforge.net/gar/?rev=7305&view=rev Author: trygvis Date: 2009-11-15 21:46:19 +0000 (Sun, 15 Nov 2009) Log Message: ----------- pcb: Renaming files with space in them, pcb still handles it ok. Modified Paths: -------------- csw/mgar/pkg/pcb/trunk/Makefile Modified: csw/mgar/pkg/pcb/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcb/trunk/Makefile 2009-11-15 21:20:05 UTC (rev 7304) +++ csw/mgar/pkg/pcb/trunk/Makefile 2009-11-15 21:46:19 UTC (rev 7305) @@ -65,28 +65,12 @@ TEST_SCRIPTS = -# 2009-11-15:If these are not excluded pkgmk core dumps or just fails. - trygvis -EXTRA_MERGE_EXCLUDE_FILES = .*/connector/single-ended.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/1.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/10.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/12.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/16.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/2.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/20.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/24.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/32.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/4.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/5.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/8.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/DIL.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/EIA.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/PLCC.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/QFP.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/SMD.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/SMD-W.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/W-DIL.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/ZIF.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/ZIP.* - - include gar/category.mk + +post-extract-modulated: + @echo " ==> Renaming files (' ' => '_')" + @find $(WORKSRC)/lib/pcblib-newlib -name \*\ \* | \ + while read f; \ + do \ + mv "$$f" `echo $$f | tr " " _`; \ + done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Nov 15 23:15:08 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 15 Nov 2009 22:15:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[7306] csw/mgar/pkg/geda/trunk/Makefile Message-ID: Revision: 7306 http://gar.svn.sourceforge.net/gar/?rev=7306&view=rev Author: trygvis Date: 2009-11-15 22:15:08 +0000 (Sun, 15 Nov 2009) Log Message: ----------- geda: Working package as long as it's built against latest guile. Modified Paths: -------------- csw/mgar/pkg/geda/trunk/Makefile Modified: csw/mgar/pkg/geda/trunk/Makefile =================================================================== --- csw/mgar/pkg/geda/trunk/Makefile 2009-11-15 21:46:19 UTC (rev 7305) +++ csw/mgar/pkg/geda/trunk/Makefile 2009-11-15 22:15:08 UTC (rev 7306) @@ -1,3 +1,13 @@ +# 2009-11-15: Building successfully against svn version of guile, the +# current version in GAR is too old. Getting messages like these when +# starting: +# Read system config file [/opt/csw/share/gEDA/system-gafrc] +# Read system config file [/opt/csw/share/gEDA/system-gschemrc] +# Read init scm file [/opt/csw/share/gEDA/scheme/gschem.scm] +# Should probably find a way to move the configuration files under +# /etc/opt/csw. +# - Trygve + GARNAME = geda GARVERSION = 1.6.0 CATEGORIES = devel @@ -20,6 +30,10 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +GARCOMPILER = GCC4 CONFIGURE_ARGS = $(DIRPATHS) +TEST_SCRIPTS = + 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 Nov 16 02:30:19 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 16 Nov 2009 01:30:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[7307] csw/mgar/pkg/wxwidgets/trunk/Makefile Message-ID: Revision: 7307 http://gar.svn.sourceforge.net/gar/?rev=7307&view=rev Author: wahwah Date: 2009-11-16 01:30:19 +0000 (Mon, 16 Nov 2009) Log Message: ----------- wxwidgets: Adding dependency on CSWncurses and CSWsunmath (fixes the __sincos symbol problem on x86) Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-15 22:15:08 UTC (rev 7306) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-16 01:30:19 UTC (rev 7307) @@ -76,8 +76,10 @@ REQUIRED_PKGS += CSWlibsm REQUIRED_PKGS += CSWlibxext REQUIRED_PKGS += CSWmesa +REQUIRED_PKGS += CSWncurses REQUIRED_PKGS += CSWpango REQUIRED_PKGS += CSWpng +REQUIRED_PKGS += CSWsunmath REQUIRED_PKGS += CSWtiff REQUIRED_PKGS += CSWzlib @@ -113,6 +115,8 @@ # For vsscanf support # EXTRA_LINKER_FLAGS += /opt/csw/lib/libncursesw.so EXTRA_LINKER_FLAGS += -lncursesw +# To fix the __sincos problem on x86 +EXTRA_LINKER_FLAGS += -lsunmath CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-gtk=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 Mon Nov 16 09:03:14 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 16 Nov 2009 08:03:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[7308] csw/mgar/pkg/libtasn1/trunk Message-ID: Revision: 7308 http://gar.svn.sourceforge.net/gar/?rev=7308&view=rev Author: dmichelsen Date: 2009-11-16 08:03:14 +0000 (Mon, 16 Nov 2009) Log Message: ----------- libtasn1: Update to 2.3 Modified Paths: -------------- csw/mgar/pkg/libtasn1/trunk/Makefile csw/mgar/pkg/libtasn1/trunk/checksums Modified: csw/mgar/pkg/libtasn1/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtasn1/trunk/Makefile 2009-11-16 01:30:19 UTC (rev 7307) +++ csw/mgar/pkg/libtasn1/trunk/Makefile 2009-11-16 08:03:14 UTC (rev 7308) @@ -1,5 +1,5 @@ GARNAME = libtasn1 -GARVERSION = 2.2 +GARVERSION = 2.3 CATEGORIES = lib DESCRIPTION = GNU ASN1 library Modified: csw/mgar/pkg/libtasn1/trunk/checksums =================================================================== --- csw/mgar/pkg/libtasn1/trunk/checksums 2009-11-16 01:30:19 UTC (rev 7307) +++ csw/mgar/pkg/libtasn1/trunk/checksums 2009-11-16 08:03:14 UTC (rev 7308) @@ -1 +1 @@ -14cc361500d2e768a8a6ec538ce3fecb libtasn1-2.2.tar.gz +4f0918cf8fe8b2b4ba189938772d1dd2 libtasn1-2.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 Mon Nov 16 13:08:57 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 16 Nov 2009 12:08:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[7309] csw/mgar/pkg/rapidsvn/trunk/Makefile Message-ID: Revision: 7309 http://gar.svn.sourceforge.net/gar/?rev=7309&view=rev Author: wahwah Date: 2009-11-16 12:08:57 +0000 (Mon, 16 Nov 2009) Log Message: ----------- rapidsvn: Added two build dependencies Modified Paths: -------------- csw/mgar/pkg/rapidsvn/trunk/Makefile Modified: csw/mgar/pkg/rapidsvn/trunk/Makefile =================================================================== --- csw/mgar/pkg/rapidsvn/trunk/Makefile 2009-11-16 08:03:14 UTC (rev 7308) +++ csw/mgar/pkg/rapidsvn/trunk/Makefile 2009-11-16 12:08:57 UTC (rev 7309) @@ -19,6 +19,7 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz SPKG_SOURCEURL = http://rapidsvn.tigris.org/ +PREREQUISITE_PKGS = CSWsvn-devel CSWapache2-devel # RapidSVN 0.9.1 omits the manpage from the dist archive # DISTFILES += rapidsvn.xml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Nov 16 16:15:04 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 16 Nov 2009 15:15:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[7310] csw/mgar/pkg/patch/trunk Message-ID: Revision: 7310 http://gar.svn.sourceforge.net/gar/?rev=7310&view=rev Author: dmichelsen Date: 2009-11-16 15:15:04 +0000 (Mon, 16 Nov 2009) Log Message: ----------- patch: Update to 2.6 Modified Paths: -------------- csw/mgar/pkg/patch/trunk/Makefile csw/mgar/pkg/patch/trunk/checksums Modified: csw/mgar/pkg/patch/trunk/Makefile =================================================================== --- csw/mgar/pkg/patch/trunk/Makefile 2009-11-16 12:08:57 UTC (rev 7309) +++ csw/mgar/pkg/patch/trunk/Makefile 2009-11-16 15:15:04 UTC (rev 7310) @@ -1,5 +1,5 @@ GARNAME = patch -GARVERSION = 2.5.9 +GARVERSION = 2.6 CATEGORIES = utils DESCRIPTION = GNU patch utility Modified: csw/mgar/pkg/patch/trunk/checksums =================================================================== --- csw/mgar/pkg/patch/trunk/checksums 2009-11-16 12:08:57 UTC (rev 7309) +++ csw/mgar/pkg/patch/trunk/checksums 2009-11-16 15:15:04 UTC (rev 7310) @@ -1 +1 @@ -dacfb618082f8d3a2194601193cf8716 download/patch-2.5.9.tar.gz +bc71d33c35004db3768465bcaf9ed23c patch-2.6.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 Nov 16 16:45:50 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 16 Nov 2009 15:45:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[7311] csw/mgar/pkg/pcre/trunk Message-ID: Revision: 7311 http://gar.svn.sourceforge.net/gar/?rev=7311&view=rev Author: dmichelsen Date: 2009-11-16 15:45:49 +0000 (Mon, 16 Nov 2009) Log Message: ----------- pcre: Update to 8.00 Modified Paths: -------------- csw/mgar/pkg/pcre/trunk/Makefile csw/mgar/pkg/pcre/trunk/checksums Modified: csw/mgar/pkg/pcre/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcre/trunk/Makefile 2009-11-16 15:15:04 UTC (rev 7310) +++ csw/mgar/pkg/pcre/trunk/Makefile 2009-11-16 15:45:49 UTC (rev 7311) @@ -1,5 +1,5 @@ GARNAME = pcre -GARVERSION = 7.9 +GARVERSION = 8.00 CATEGORIES = lib DESCRIPTION = Perl-compatible regular expression tools Modified: csw/mgar/pkg/pcre/trunk/checksums =================================================================== --- csw/mgar/pkg/pcre/trunk/checksums 2009-11-16 15:15:04 UTC (rev 7310) +++ csw/mgar/pkg/pcre/trunk/checksums 2009-11-16 15:45:49 UTC (rev 7311) @@ -1 +1 @@ -2256d0a1d0a358265165ca70e7cfc47a download/pcre-7.9.tar.gz +c95500eeda12c8c7edc6b0926d60952c pcre-8.00.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 Nov 16 16:46:30 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 16 Nov 2009 15:46:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[7312] csw/mgar/pkg/tightvnc/trunk Message-ID: Revision: 7312 http://gar.svn.sourceforge.net/gar/?rev=7312&view=rev Author: wahwah Date: 2009-11-16 15:46:30 +0000 (Mon, 16 Nov 2009) Log Message: ----------- vncserver: Injecting into EXTRA_DEFINES to achieve compilation for the right architecture (and avoid V8+) Modified Paths: -------------- csw/mgar/pkg/tightvnc/trunk/Makefile csw/mgar/pkg/tightvnc/trunk/checksums Added Paths: ----------- csw/mgar/pkg/tightvnc/trunk/files/0002-GNU-make-by-default.patch Removed Paths: ------------- csw/mgar/pkg/tightvnc/trunk/files/0003-GNU-make-by-default.patch Modified: csw/mgar/pkg/tightvnc/trunk/Makefile =================================================================== --- csw/mgar/pkg/tightvnc/trunk/Makefile 2009-11-16 15:45:49 UTC (rev 7311) +++ csw/mgar/pkg/tightvnc/trunk/Makefile 2009-11-16 15:46:30 UTC (rev 7312) @@ -56,7 +56,7 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = vnc PATCHFILES = 0001-Sun-compiler-in-sun.cf.patch -PATCHFILES += 0003-GNU-make-by-default.patch +PATCHFILES += 0002-GNU-make-by-default.patch PATCHFILES += 0003-libdix.a-after-libos.a.patch PATCHFILES += 0001-Force-the-use-of-libwrap.patch @@ -73,17 +73,18 @@ build-vnc: (cd $(WORKSRC) && $(BUILD_ENV) \ EXTRA_INCLUDES="-I/opt/csw/include" \ + EXTRA_DEFINES="$(CFLAGS)" \ LOCAL_LDFLAGS="-L/opt/csw/lib" \ gmake World) (cd $(WORKSRC)/Xvnc && $(CONFIGURE_ENV) \ EXTRA_LIBRARIES="-lwrap -lsocket" \ - EXTRA_DEFINES="-DUSE_LIBWRAP=1" \ + EXTRA_DEFINES="-DUSE_LIBWRAP=1 $(CFLAGS)" \ EXTRA_INCLUDES="-I/opt/csw/include" \ LOCAL_LDFLAGS="-L/opt/csw/lib" \ ./configure) (cd $(WORKSRC)/Xvnc && $(BUILD_ENV) \ EXTRA_LIBRARIES="-lwrap -lsocket" \ - EXTRA_DEFINES="-DUSE_LIBWRAP=1" \ + EXTRA_DEFINES="-DUSE_LIBWRAP=1 $(CFLAGS)" \ LOCAL_LDFLAGS="-L/opt/csw/lib" \ EXTRA_INCLUDES="-I/opt/csw/include" \ $(MAKE)) Modified: csw/mgar/pkg/tightvnc/trunk/checksums =================================================================== --- csw/mgar/pkg/tightvnc/trunk/checksums 2009-11-16 15:45:49 UTC (rev 7311) +++ csw/mgar/pkg/tightvnc/trunk/checksums 2009-11-16 15:46:30 UTC (rev 7312) @@ -1,7 +1,7 @@ 38a4eaded4a6418f5547fa57cefb97f9 0001-Force-the-use-of-libwrap.patch 76166d097bf2e70627cb6c87d312bca5 0001-Sun-compiler-in-sun.cf.patch -1264014c1ce47a119a724f17a6e0a768 0003-GNU-make-by-default.patch +1264014c1ce47a119a724f17a6e0a768 0002-GNU-make-by-default.patch c5e9c3e4017caa65d14a0b98858043b9 0003-libdix.a-after-libos.a.patch -20c9ead98ffb7b739fdb63429c3bac85 cswvncserver +691ddda52a4bcbc14ee1c19f77e465a1 cswvncserver 397b35faad32d5246b6d44b142f8304f tightvnc-1.3.10_unixsrc.tar.bz2 56c09be17c17184e96193c13246fd649 vncservers Copied: csw/mgar/pkg/tightvnc/trunk/files/0002-GNU-make-by-default.patch (from rev 7270, csw/mgar/pkg/tightvnc/trunk/files/0003-GNU-make-by-default.patch) =================================================================== --- csw/mgar/pkg/tightvnc/trunk/files/0002-GNU-make-by-default.patch (rev 0) +++ csw/mgar/pkg/tightvnc/trunk/files/0002-GNU-make-by-default.patch 2009-11-16 15:46:30 UTC (rev 7312) @@ -0,0 +1,25 @@ +From 3e9ba23cbf15392e04b1d06e57575027a88a16c3 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Mon, 7 Sep 2009 10:09:47 +0200 +Subject: [PATCH 3/3] GNU make by default + +--- + Xvnc/config/cf/svr4.cf | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Xvnc/config/cf/svr4.cf b/Xvnc/config/cf/svr4.cf +index b9fbcfc..2d7d3ab 100644 +--- a/Xvnc/config/cf/svr4.cf ++++ b/Xvnc/config/cf/svr4.cf +@@ -74,7 +74,7 @@ XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.25.2.2 1997/07/05 15:55:30 dawes Exp $ + #define LexCmd /usr/ccs/bin/lex + #endif + #ifndef MakeCmd +-#define MakeCmd /usr/ccs/bin/make ++#define MakeCmd /opt/csw/bin/gmake + #endif + #ifndef YaccCmd + #define YaccCmd /usr/ccs/bin/yacc +-- +1.6.3.2 + Deleted: csw/mgar/pkg/tightvnc/trunk/files/0003-GNU-make-by-default.patch =================================================================== --- csw/mgar/pkg/tightvnc/trunk/files/0003-GNU-make-by-default.patch 2009-11-16 15:45:49 UTC (rev 7311) +++ csw/mgar/pkg/tightvnc/trunk/files/0003-GNU-make-by-default.patch 2009-11-16 15:46:30 UTC (rev 7312) @@ -1,25 +0,0 @@ -From 3e9ba23cbf15392e04b1d06e57575027a88a16c3 Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Mon, 7 Sep 2009 10:09:47 +0200 -Subject: [PATCH 3/3] GNU make by default - ---- - Xvnc/config/cf/svr4.cf | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/Xvnc/config/cf/svr4.cf b/Xvnc/config/cf/svr4.cf -index b9fbcfc..2d7d3ab 100644 ---- a/Xvnc/config/cf/svr4.cf -+++ b/Xvnc/config/cf/svr4.cf -@@ -74,7 +74,7 @@ XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.25.2.2 1997/07/05 15:55:30 dawes Exp $ - #define LexCmd /usr/ccs/bin/lex - #endif - #ifndef MakeCmd --#define MakeCmd /usr/ccs/bin/make -+#define MakeCmd /opt/csw/bin/gmake - #endif - #ifndef YaccCmd - #define YaccCmd /usr/ccs/bin/yacc --- -1.6.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 Mon Nov 16 17:29:27 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 16 Nov 2009 16:29:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7313] csw/mgar/pkg/libtool/tags/libtool-2.2.6, REV=2009.09. 04_rev=a/ Message-ID: Revision: 7313 http://gar.svn.sourceforge.net/gar/?rev=7313&view=rev Author: dmichelsen Date: 2009-11-16 16:29:26 +0000 (Mon, 16 Nov 2009) Log Message: ----------- Put away 2.2.6 release package Added Paths: ----------- csw/mgar/pkg/libtool/tags/libtool-2.2.6,REV=2009.09.04_rev=a/ 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 Nov 16 17:39:25 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 16 Nov 2009 16:39:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7314] csw/mgar/pkg/libtool/trunk Message-ID: Revision: 7314 http://gar.svn.sourceforge.net/gar/?rev=7314&view=rev Author: dmichelsen Date: 2009-11-16 16:39:11 +0000 (Mon, 16 Nov 2009) Log Message: ----------- libtool: Update to 2.2.6b Modified Paths: -------------- csw/mgar/pkg/libtool/trunk/Makefile csw/mgar/pkg/libtool/trunk/checksums Modified: csw/mgar/pkg/libtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtool/trunk/Makefile 2009-11-16 16:29:26 UTC (rev 7313) +++ csw/mgar/pkg/libtool/trunk/Makefile 2009-11-16 16:39:11 UTC (rev 7314) @@ -1,10 +1,9 @@ GARNAME = libtool -RELEASE = a -GARVERSION = 2.2.6 +GARVERSION = 2.2.6b CATEGORIES = devel EXTRA_MODULATORS = GARVERSION GARCOMPILER -MODULATIONS_GARVERSION = 1.5.26 2.2.6 +MODULATIONS_GARVERSION = 1.5.26 2.2.6b MODULATIONS_GARCOMPILER = GCC3 GCC4 SOS11 # Modulate over compiler only for 2.2.6 @@ -12,9 +11,6 @@ # Compile 64 bit libraries only with SOS11 SKIP_MODULATIONS += $(foreach I,sparcv9 amd64,$(foreach C,GCC3 GCC4,isa-$I-garversion-2.2.6-garcompiler-$C)) -FILEVERSION_1.5.26 = 1.5.26 -FILEVERSION_2.2.6 = 2.2.6$(RELEASE) - DESCRIPTION = A generic library support tool define BLURB GNU libtool is a generic library support script. Libtool hides the complexity @@ -23,7 +19,7 @@ endef MASTER_SITES = $(GNU_MIRROR) -SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(GARNAME)-$(FILEVERSION_$(VERSION)).tar.gz) +SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(GARNAME)-$(VERSION).tar.gz) DISTFILES = $(SOURCEFILES) PATCH_LIBTOOL = patch-libtool.diff @@ -31,7 +27,7 @@ PATCHFILES_POSTINSTALL_isa-sparcv8-garversion-2.2.6-garcompiler-SOS11 = $(PATCH_LIBTOOL) DISTFILES += $(PATCH_LIBTOOL) -NOEXTRACT = $(filter-out $(GARNAME)-$(FILEVERSION_$(GARVERSION)).tar.gz,$(SOURCEFILES)) +NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz,$(SOURCEFILES)) EXTRA_TAGS = gcc3 gcc4 COMPILER_TAGNAME_GCC3 = gcc3 @@ -58,36 +54,22 @@ SKIPTEST = 1 TEST_TARGET = check - MERGE_SCRIPTS_isa-i386-garversion-1.5.26-garcompiler-SOS11 = copy-only - MERGE_DIRS_isa-i386-garversion-1.5.26-garcompiler-SOS11 = $(libdir) - MERGE_SCRIPTS_isa-amd64-garversion-1.5.26-garcompiler-SOS11 = copy-relocated-only - MERGE_DIRS_isa-amd64-garversion-1.5.26-garcompiler-SOS11 = $(libdir) + MERGE_SCRIPTS_isa-default-garversion-1.5.26-garcompiler-SOS11 = copy-only + MERGE_DIRS_isa-default-garversion-1.5.26-garcompiler-SOS11 = $(libdir) + MERGE_SCRIPTS_isa-default64-garversion-1.5.26-garcompiler-SOS11 = copy-relocated-only + MERGE_DIRS_isa-default64-garversion-1.5.26-garcompiler-SOS11 = $(libdir) - MERGE_SCRIPTS_isa-i386-garversion-2.2.6-garcompiler-SOS11 = copy-all - MERGE_SCRIPTS_isa-amd64-garversion-2.2.6-garcompiler-SOS11 = copy-relocated-only - MERGE_DIRS_isa-amd64-garversion-2.2.6-garcompiler-SOS11 = $(libdir) + MERGE_SCRIPTS_isa-default-garversion-2.2.6b-garcompiler-SOS11 = copy-all + MERGE_SCRIPTS_isa-default64-garversion-2.2.6b-garcompiler-SOS11 = copy-relocated-only + MERGE_DIRS_isa-default64-garversion-2.2.6b-garcompiler-SOS11 = $(libdir) - MERGE_SCRIPTS_isa-i386-garversion-2.2.6-garcompiler-GCC3 = copy-tags - MERGE_SCRIPTS_isa-i386-garversion-2.2.6-garcompiler-GCC4 = copy-tags + MERGE_SCRIPTS_isa-default-garversion-2.2.6b-garcompiler-GCC3 = copy-tags + MERGE_SCRIPTS_isa-default-garversion-2.2.6b-garcompiler-GCC4 = copy-tags -MERGE_SCRIPTS_isa-sparcv8-garversion-1.5.26-garcompiler-SOS11 = copy-only - MERGE_DIRS_isa-sparcv8-garversion-1.5.26-garcompiler-SOS11 = $(libdir) -MERGE_SCRIPTS_isa-sparcv9-garversion-1.5.26-garcompiler-SOS11 = copy-relocated-only - MERGE_DIRS_isa-sparcv9-garversion-1.5.26-garcompiler-SOS11 = $(libdir) - - MERGE_SCRIPTS_isa-sparcv8-garversion-2.2.6-garcompiler-SOS11 = copy-all - MERGE_SCRIPTS_isa-sparcv9-garversion-2.2.6-garcompiler-SOS11 = copy-relocated-only - MERGE_DIRS_isa-sparcv9-garversion-2.2.6-garcompiler-SOS11 = $(libdir) - - MERGE_SCRIPTS_isa-sparcv8-garversion-2.2.6-garcompiler-GCC3 = copy-tags - MERGE_SCRIPTS_isa-sparcv8-garversion-2.2.6-garcompiler-GCC4 = copy-tags - PKGFILES_CSWlibtoolrt = $(PKGFILES_RT) include gar/category.mk -SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) - post-install-modulated: $(if $(PATCHFILES_POSTINSTALL_$(MODULATION)),patch-libtool) post-install-modulated: $(if $(COMPILER_TAGNAME_$(GARCOMPILER)),install-libtool-$(COMPILER_TAGNAME_$(GARCOMPILER))) Modified: csw/mgar/pkg/libtool/trunk/checksums =================================================================== --- csw/mgar/pkg/libtool/trunk/checksums 2009-11-16 16:29:26 UTC (rev 7313) +++ csw/mgar/pkg/libtool/trunk/checksums 2009-11-16 16:39:11 UTC (rev 7314) @@ -1,3 +1,3 @@ -aa9c5107f3ec9ef4200eb6556f3b3c29 download/libtool-1.5.26.tar.gz -8ca1ea241cd27ff9832e045fe9afe4fd download/libtool-2.2.6a.tar.gz -92bb3c7712498b6a5993ab5d5fc8f077 download/patch-libtool.diff +aa9c5107f3ec9ef4200eb6556f3b3c29 libtool-1.5.26.tar.gz +07da460450490148c6d2df0f21481a25 libtool-2.2.6b.tar.gz +92bb3c7712498b6a5993ab5d5fc8f077 patch-libtool.diff 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 Nov 16 18:01:56 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 16 Nov 2009 17:01:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[7315] csw/mgar/pkg/libtool/trunk/Makefile Message-ID: Revision: 7315 http://gar.svn.sourceforge.net/gar/?rev=7315&view=rev Author: dmichelsen Date: 2009-11-16 17:01:56 +0000 (Mon, 16 Nov 2009) Log Message: ----------- libtool: Fix skipped modulations Modified Paths: -------------- csw/mgar/pkg/libtool/trunk/Makefile Modified: csw/mgar/pkg/libtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtool/trunk/Makefile 2009-11-16 16:39:11 UTC (rev 7314) +++ csw/mgar/pkg/libtool/trunk/Makefile 2009-11-16 17:01:56 UTC (rev 7315) @@ -9,7 +9,7 @@ # Modulate over compiler only for 2.2.6 SKIP_MODULATIONS = $(foreach I,sparcv8 sparcv9 i386 amd64,$(foreach C,GCC3 GCC4,isa-$I-garversion-1.5.26-garcompiler-$C)) # Compile 64 bit libraries only with SOS11 -SKIP_MODULATIONS += $(foreach I,sparcv9 amd64,$(foreach C,GCC3 GCC4,isa-$I-garversion-2.2.6-garcompiler-$C)) +SKIP_MODULATIONS += $(foreach I,sparcv9 amd64,$(foreach C,GCC3 GCC4,isa-$I-garversion-2.2.6b-garcompiler-$C)) DESCRIPTION = A generic library support tool define BLURB 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 Nov 17 02:25:49 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 17 Nov 2009 01:25:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[7316] csw/mgar/pkg/git-subtree/trunk Message-ID: Revision: 7316 http://gar.svn.sourceforge.net/gar/?rev=7316&view=rev Author: bdwalton Date: 2009-11-17 01:25:48 +0000 (Tue, 17 Nov 2009) Log Message: ----------- git-subtree: drop patches that were accepted upstream Modified Paths: -------------- csw/mgar/pkg/git-subtree/trunk/Makefile csw/mgar/pkg/git-subtree/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/git-subtree/trunk/files/0001-add-installation-support-to-Makefile.patch csw/mgar/pkg/git-subtree/trunk/files/0002-make-git-version-dynamic-when-building-documentation.patch Modified: csw/mgar/pkg/git-subtree/trunk/Makefile =================================================================== --- csw/mgar/pkg/git-subtree/trunk/Makefile 2009-11-16 17:01:56 UTC (rev 7315) +++ csw/mgar/pkg/git-subtree/trunk/Makefile 2009-11-17 01:25:48 UTC (rev 7316) @@ -1,6 +1,6 @@ GARNAME = git-subtree GARVERSION = 0.2 -PATCHLEVEL = d8b2c +PATCHLEVEL = d20ac CATEGORIES = devel DESCRIPTION = Subtree support for git @@ -20,9 +20,6 @@ GIT_REPOS = git://github.com/apenwarr/git-subtree.git GIT_TREEISH_git-subtree.git = $(PATCHLEVEL) -PATCHFILES = 0001-add-installation-support-to-Makefile.patch -PATCHFILES += 0002-make-git-version-dynamic-when-building-documentation.patch - CONFIGURE_SCRIPTS = BUILD_SCRIPTS = INSTALL_SCRIPTS = custom Modified: csw/mgar/pkg/git-subtree/trunk/checksums =================================================================== --- csw/mgar/pkg/git-subtree/trunk/checksums 2009-11-16 17:01:56 UTC (rev 7315) +++ csw/mgar/pkg/git-subtree/trunk/checksums 2009-11-17 01:25:48 UTC (rev 7316) @@ -1,2 +0,0 @@ -40a8c3282a2f4bd4e5fbaebf2bba9359 0001-add-installation-support-to-Makefile.patch -7587367599ef47e0a3e81c96996f855b 0002-make-git-version-dynamic-when-building-documentation.patch Deleted: csw/mgar/pkg/git-subtree/trunk/files/0001-add-installation-support-to-Makefile.patch =================================================================== --- csw/mgar/pkg/git-subtree/trunk/files/0001-add-installation-support-to-Makefile.patch 2009-11-16 17:01:56 UTC (rev 7315) +++ csw/mgar/pkg/git-subtree/trunk/files/0001-add-installation-support-to-Makefile.patch 2009-11-17 01:25:48 UTC (rev 7316) @@ -1,48 +0,0 @@ -From 9c69a401f3d2fb44b0a09702aff99c9e28b627c4 Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Fri, 13 Nov 2009 12:01:31 -0500 -Subject: [PATCH 1/2] add installation support to Makefile - -Signed-off-by: Ben Walton ---- - Makefile | 20 ++++++++++++++++++++ - 1 files changed, 20 insertions(+), 0 deletions(-) - -diff --git a/Makefile b/Makefile -index 3e97c62..faefffd 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,3 +1,13 @@ -+prefix ?= /usr/local -+mandir ?= $(prefix)/share/man -+gitdir ?= $(shell git --exec-path) -+ -+# this should be set to a 'standard' bsd-type install program -+INSTALL ?= install -+INSTALL_DATA = $(INSTALL) -c -m 0644 -+INSTALL_EXE = $(INSTALL) -c -m 0755 -+INSTALL_DIR = $(INSTALL) -c -d -m 0755 -+ - default: - @echo "git-subtree doesn't need to be built." - @echo "Just copy it somewhere on your PATH, like /usr/local/bin." -@@ -5,6 +15,16 @@ default: - @echo "Try: make doc" - @false - -+install: install-exe install-doc -+ -+install-exe: git-subtree.sh -+ $(INSTALL_DIR) $(DESTDIR)/$(gitdir) -+ $(INSTALL_EXE) $< $(DESTDIR)/$(gitdir)/git-subtree -+ -+install-doc: git-subtree.1 -+ $(INSTALL_DIR) $(DESTDIR)/$(mandir)/man1/ -+ $(INSTALL_DATA) $< $(DESTDIR)/$(mandir)/man1/ -+ - doc: git-subtree.1 - - %.1: %.xml --- -1.6.5 - Deleted: csw/mgar/pkg/git-subtree/trunk/files/0002-make-git-version-dynamic-when-building-documentation.patch =================================================================== --- csw/mgar/pkg/git-subtree/trunk/files/0002-make-git-version-dynamic-when-building-documentation.patch 2009-11-16 17:01:56 UTC (rev 7315) +++ csw/mgar/pkg/git-subtree/trunk/files/0002-make-git-version-dynamic-when-building-documentation.patch 2009-11-17 01:25:48 UTC (rev 7316) @@ -1,35 +0,0 @@ -From e17159437af26336537a46cf64825c9130e91267 Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Fri, 13 Nov 2009 12:08:02 -0500 -Subject: [PATCH 2/2] make git version dynamic when building documentation - -Signed-off-by: Ben Walton ---- - Makefile | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/Makefile b/Makefile -index faefffd..9b204bd 100644 ---- a/Makefile -+++ b/Makefile -@@ -2,6 +2,8 @@ prefix ?= /usr/local - mandir ?= $(prefix)/share/man - gitdir ?= $(shell git --exec-path) - -+gitver ?= $(word 3,$(shell git --version)) -+ - # this should be set to a 'standard' bsd-type install program - INSTALL ?= install - INSTALL_DATA = $(INSTALL) -c -m 0644 -@@ -32,7 +34,7 @@ doc: git-subtree.1 - - %.xml: %.txt - asciidoc -b docbook -d manpage -f asciidoc.conf \ -- -agit_version=1.6.3 $^ -+ -agit_version=$(gitver) $^ - - clean: - rm -f *~ *.xml *.html *.1 --- -1.6.5 - 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 Nov 17 11:37:08 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 17 Nov 2009 10:37:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[7317] csw/mgar/pkg/pygobject/trunk Message-ID: Revision: 7317 http://gar.svn.sourceforge.net/gar/?rev=7317&view=rev Author: wahwah Date: 2009-11-17 10:37:07 +0000 (Tue, 17 Nov 2009) Log Message: ----------- pygobject: Upgrade to 0.20.0 Modified Paths: -------------- csw/mgar/pkg/pygobject/trunk/Makefile csw/mgar/pkg/pygobject/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pygobject/trunk/files/0001-forcing-lglib-2.0.patch Modified: csw/mgar/pkg/pygobject/trunk/Makefile =================================================================== --- csw/mgar/pkg/pygobject/trunk/Makefile 2009-11-17 01:25:48 UTC (rev 7316) +++ csw/mgar/pkg/pygobject/trunk/Makefile 2009-11-17 10:37:07 UTC (rev 7317) @@ -1,13 +1,14 @@ GARNAME = pygobject -GARVERSION = 2.18.0 +GARVERSION = 2.20.0 CATEGORIES = lang +RELVER = $(shell echo $(GARVERSION) | gsed -e 's/\.[0-9]\+$$//') DESCRIPTION = pygobject support for Python define BLURB This is a Python language binding for gobject. endef -MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.18/ +MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/$(GARNAME)/$(RELVER)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 STRIP_LIBTOOL = 1 @@ -17,25 +18,18 @@ CATALOGNAME_CSWpygobject = pygobject SPKG_DESC_CSWpygobject = pygobject support for Python +PYCOMPILE = 1 -## patch to change zero sized struct to zero-sized sub-object -#PATCHFILES = pygobject.diff +PATCHFILES = 0001-forcing-lglib-2.0.patch -# We define upstream file regex so we can be notifed of -# new upstream software release -UFILES_REGEX = (\d+(?:\.\d+)*) +EXTRA_MERGE_EXCLUDE_FILES += .*\.egg-info.* .*\.pyo .*\.pyc -EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc -PROTOTYPE_FILTER = awk '$$$$3 ~ /.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' -SPKG_CLASSES = none cswpycompile -REQUIRED_PKGS += CSWcswclassutils - +UFILES_REGEX = (\d+(?:\.\d+)*).tar.bz2 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --without-ffi ## Tests require gtk, but gtk requries gobject TEST_TARGET = check -TEST_SCRIPTS = +TEST_SCRIPTS = include gar/category.mk - Modified: csw/mgar/pkg/pygobject/trunk/checksums =================================================================== --- csw/mgar/pkg/pygobject/trunk/checksums 2009-11-17 01:25:48 UTC (rev 7316) +++ csw/mgar/pkg/pygobject/trunk/checksums 2009-11-17 10:37:07 UTC (rev 7317) @@ -1,2 +1,2 @@ -522b813219a6ad14b85b25d953b08727 download/pygobject-2.18.0.tar.bz2 -58a4ba1e53516251eb4c69fae6372208 download/pygobject.diff +bc2cdac34e1084f4d72eb2bf762e700c 0001-forcing-lglib-2.0.patch +10e1fb79be3d698476a28b1e1b0c5640 pygobject-2.20.0.tar.bz2 Added: csw/mgar/pkg/pygobject/trunk/files/0001-forcing-lglib-2.0.patch =================================================================== --- csw/mgar/pkg/pygobject/trunk/files/0001-forcing-lglib-2.0.patch (rev 0) +++ csw/mgar/pkg/pygobject/trunk/files/0001-forcing-lglib-2.0.patch 2009-11-17 10:37:07 UTC (rev 7317) @@ -0,0 +1,25 @@ +From bdf70ab64e91f0c1ad058447ff843de9be055662 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Sun, 18 Oct 2009 13:16:29 +0100 +Subject: [PATCH] forcing -lglib-2.0 + +--- + gobject/Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/gobject/Makefile.am b/gobject/Makefile.am +index fa0ea20..112e750 100644 +--- a/gobject/Makefile.am ++++ b/gobject/Makefile.am +@@ -26,7 +26,7 @@ constants.py: generate-constants$(EXEEXT) constants.py.in + $(top_builddir)/gobject/generate-constants$(EXEEXT) >> constants.py + chmod 444 constants.py + +-generate_constants_CFLAGS = $(GLIB_CFLAGS) $(PYTHON_INCLUDES) ++generate_constants_CFLAGS = $(GLIB_CFLAGS) $(PYTHON_INCLUDES) -lglib-2.0 + + noinst_PROGRAMS = generate-constants + CLEANFILES = constants.py +-- +1.6.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Nov 17 14:05:16 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 Nov 2009 13:05:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7318] csw/mgar/pkg Message-ID: Revision: 7318 http://gar.svn.sourceforge.net/gar/?rev=7318&view=rev Author: dmichelsen Date: 2009-11-17 13:05:15 +0000 (Tue, 17 Nov 2009) Log Message: ----------- libshout: Initial commit Added Paths: ----------- csw/mgar/pkg/libshout/ csw/mgar/pkg/libshout/branches/ csw/mgar/pkg/libshout/tags/ csw/mgar/pkg/libshout/trunk/ csw/mgar/pkg/libshout/trunk/Makefile csw/mgar/pkg/libshout/trunk/checksums csw/mgar/pkg/libshout/trunk/files/ Property changes on: csw/mgar/pkg/libshout/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/libshout/trunk/Makefile =================================================================== --- csw/mgar/pkg/libshout/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libshout/trunk/Makefile 2009-11-17 13:05:15 UTC (rev 7318) @@ -0,0 +1,28 @@ +GARNAME = libshout +GARVERSION = 2.2.2 +CATEGORIES = lib + +DESCRIPTION = Icecast library +define BLURB +endef + +MASTER_SITES = http://downloads.us.xiph.org/releases/libshout/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +REQUIRED_PKGS = CSWlibogg CSWtheora CSWvorbis +PRERQUISITE_PKGS = $(REQUIRED_PKGS) + +# GAR default: -xO3 -xarch=v8 -I/opt/csw/include +# Configure hardwired: -xO4 -fast -w -fsimple -native -xcg92 + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +BUILD_ARGS = CFLAGS="-xO4 -fast -w -fsimple -native -xcg92 $(filter -xarch=% -I%,$(CFLAGS))" + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/libshout/trunk/checksums =================================================================== --- csw/mgar/pkg/libshout/trunk/checksums (rev 0) +++ csw/mgar/pkg/libshout/trunk/checksums 2009-11-17 13:05:15 UTC (rev 7318) @@ -0,0 +1 @@ +4f75fc9901c724b712c371c9a1e782d3 libshout-2.2.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 Tue Nov 17 14:26:55 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 Nov 2009 13:26:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[7320] csw/mgar/pkg/cpan/Shout/trunk/Makefile Message-ID: Revision: 7320 http://gar.svn.sourceforge.net/gar/?rev=7320&view=rev Author: dmichelsen Date: 2009-11-17 13:26:55 +0000 (Tue, 17 Nov 2009) Log Message: ----------- cpan/Shout: Remove examples from distribution Modified Paths: -------------- csw/mgar/pkg/cpan/Shout/trunk/Makefile Modified: csw/mgar/pkg/cpan/Shout/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Shout/trunk/Makefile 2009-11-17 13:24:10 UTC (rev 7319) +++ csw/mgar/pkg/cpan/Shout/trunk/Makefile 2009-11-17 13:26:55 UTC (rev 7320) @@ -16,4 +16,6 @@ PACKAGES = CSWpmshout CATALOGNAME = pm_shout +EXTRA_MERGE_EXCLUDE_FILES = .*/example\.pl .*/example2\.pl + 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 Tue Nov 17 14:24:13 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 Nov 2009 13:24:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[7319] csw/mgar/pkg/cpan Message-ID: Revision: 7319 http://gar.svn.sourceforge.net/gar/?rev=7319&view=rev Author: dmichelsen Date: 2009-11-17 13:24:10 +0000 (Tue, 17 Nov 2009) Log Message: ----------- cpan/Shout: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Shout/ csw/mgar/pkg/cpan/Shout/branches/ csw/mgar/pkg/cpan/Shout/tags/ csw/mgar/pkg/cpan/Shout/trunk/ csw/mgar/pkg/cpan/Shout/trunk/Makefile csw/mgar/pkg/cpan/Shout/trunk/checksums csw/mgar/pkg/cpan/Shout/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Shout/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/Shout/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Shout/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Shout/trunk/Makefile 2009-11-17 13:24:10 UTC (rev 7319) @@ -0,0 +1,19 @@ +GARNAME = Shout +GARVERSION = 2.1 +CATEGORIES = cpan +AUTHOR = MYSELF + +DESCRIPTION = Perl bindings for libshout 2 +define BLURB +endef + +MASTER_SITES = http://downloads.us.xiph.org/releases/libshout/ +DISTFILES = $(DISTNAME).tar.gz + +REQUIRED_PKGS = CSWlibogg CSWlibshout CSWspeex CSWtheora CSWvorbis +PREREQUISITE_PKGS = $(REQUIRED_PKGS) + +PACKAGES = CSWpmshout +CATALOGNAME = pm_shout + +include gar/category.mk Added: csw/mgar/pkg/cpan/Shout/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Shout/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Shout/trunk/checksums 2009-11-17 13:24:10 UTC (rev 7319) @@ -0,0 +1 @@ +7171eb8f9e60d6c5cc6c469ba0f32dc9 Shout-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 Tue Nov 17 14:51:40 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 17 Nov 2009 13:51:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[7321] csw/mgar/pkg/cups/trunk Message-ID: Revision: 7321 http://gar.svn.sourceforge.net/gar/?rev=7321&view=rev Author: wahwah Date: 2009-11-17 13:51:39 +0000 (Tue, 17 Nov 2009) Log Message: ----------- cups: Adding an example client.conf file, and /etc/opt/csw/cups to CSWcupsclient Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile csw/mgar/pkg/cups/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cups/trunk/files/client.conf.CSW Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2009-11-17 13:26:55 UTC (rev 7320) +++ csw/mgar/pkg/cups/trunk/Makefile 2009-11-17 13:51:39 UTC (rev 7321) @@ -47,6 +47,7 @@ DISTFILES += CSWcupsclient.preinstall DISTFILES += CSWcupsd.preinstall DISTFILES += CSWcupsd.postremove +DISTFILES += client.conf.CSW PATCHFILES = 0001-cswcups-for-service-name.patch PATCHFILES += 0002-Adding-the-refcount-member-to-mime_type_t.patch @@ -100,7 +101,13 @@ PKGFILES_CSWcupsdev += $(datadir)/cups/ppdc.* PKGFILES_CSWcupsdev += $(datadir)/cups/drv.* -PKGFILES_CSWcupsd = $(sysconfdir)/.* +PKGFILES_CSWcupsd = $(sysconfdir)/init\.d/.* +PKGFILES_CSWcupsd += $(sysconfdir)/rc.* +PKGFILES_CSWcupsd += $(sysconfdir)/cups/cupsd.* +PKGFILES_CSWcupsd += $(sysconfdir)/cups/interfaces.* +PKGFILES_CSWcupsd += $(sysconfdir)/cups/ppd.* +PKGFILES_CSWcupsd += $(sysconfdir)/cups/snmp.* +PKGFILES_CSWcupsd += $(sysconfdir)/cups/ssl.* PKGFILES_CSWcupsd += $(mandir)/man1m PKGFILES_CSWcupsd += $(mandir)/man1m/cups(filter|d|-polld|-deviced|-driverd|-lpd).* PKGFILES_CSWcupsd += $(mandir)/man7/(backend|filter).7 @@ -136,6 +143,7 @@ PKGFILES_CSWcupsclient += $(mandir)/man5/client.conf.5 PKGFILES_CSWcupsclient += $(mandir)/man5/ppdcfile\.5 PKGFILES_CSWcupsclient += $(mandir)/man7/(drv|notifier)\.7 +PKGFILES_CSWcupsclient += $(sysconfdir)/cups/client\.conf\.CSW SPKG_DESC_CSWcups = Common Unix Printing System SPKG_DESC_CSWlibcups = CUPS libraries @@ -145,7 +153,8 @@ SPKG_DESC_CSWcupsdev = CUPS header files # http://lists.opencsw.org/pipermail/maintainers/2009-September/004249.html -SAMPLECONF = $(sysconfdir)/cups/cupsd\.conf\.CSW +SAMPLECONF = $(sysconfdir)/cups/cupsd\.conf\.CSW +SAMPLECONF += $(sysconfdir)/cups/client\.conf\.CSW INITSMF = $(sysconfdir)/init\.d/cswcups LD_OPTIONS = -R/opt/csw/lib/\$$ISALIST -R/opt/csw/lib @@ -200,4 +209,7 @@ chmod 0644 "$$i.CSW"; \ fi \ done) + ginstall -m 644 \ + $(FILEDIR)/client.conf.CSW \ + $(DESTDIR)$(sysconfdir)/cups/client.conf.CSW @$(MAKECOOKIE) Modified: csw/mgar/pkg/cups/trunk/checksums =================================================================== --- csw/mgar/pkg/cups/trunk/checksums 2009-11-17 13:26:55 UTC (rev 7320) +++ csw/mgar/pkg/cups/trunk/checksums 2009-11-17 13:51:39 UTC (rev 7321) @@ -1,11 +1,11 @@ 1e5e54a2b503cfdeeda1b683bcccab83 0001-cswcups-for-service-name.patch 0da4ea6bf72d61adfc4316a738b90ab5 0002-Adding-the-refcount-member-to-mime_type_t.patch a80b8543633e2f9b3b1e531ac2289306 0003-Reference-counting-for-printers-only.patch -193912518565c7052724420e7899930b 0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch bbf0295c76cd06b5311ac3a3467fd431 0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch 0dd35cc0938696577104852781ec1df6 0006-Fail-compilation-if-no-SSL-impl-chosen.patch 44ff410e237d6f4f9f0fe650ba2c7fa0 0007-Solaris-zone-support-in-init-script.patch cf6a3fe902545aac1ab2303e41c08a3e CSWcupsclient.preinstall ca7718998e56c320c08a77cfefe046f6 CSWcupsd.postremove cf6a3fe902545aac1ab2303e41c08a3e CSWcupsd.preinstall +b69e58be75aab71165f77e9c1ec49ea3 client.conf.CSW d95e2d588e3d36e563027a963b117b1b cups-1.4.2-source.tar.bz2 Added: csw/mgar/pkg/cups/trunk/files/client.conf.CSW =================================================================== --- csw/mgar/pkg/cups/trunk/files/client.conf.CSW (rev 0) +++ csw/mgar/pkg/cups/trunk/files/client.conf.CSW 2009-11-17 13:51:39 UTC (rev 7321) @@ -0,0 +1,6 @@ +# $Id$ +# +# CUPS client configuration file. +# +# Type 'man client.conf' to see instructions. + Property changes on: csw/mgar/pkg/cups/trunk/files/client.conf.CSW ___________________________________________________________________ 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 Tue Nov 17 14:53:25 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 17 Nov 2009 13:53:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7322] csw/mgar/pkg/cups/trunk/checksums Message-ID: Revision: 7322 http://gar.svn.sourceforge.net/gar/?rev=7322&view=rev Author: wahwah Date: 2009-11-17 13:53:25 +0000 (Tue, 17 Nov 2009) Log Message: ----------- cups: Submitting the checksum for a file with the Id tag Modified Paths: -------------- csw/mgar/pkg/cups/trunk/checksums Modified: csw/mgar/pkg/cups/trunk/checksums =================================================================== --- csw/mgar/pkg/cups/trunk/checksums 2009-11-17 13:51:39 UTC (rev 7321) +++ csw/mgar/pkg/cups/trunk/checksums 2009-11-17 13:53:25 UTC (rev 7322) @@ -7,5 +7,5 @@ cf6a3fe902545aac1ab2303e41c08a3e CSWcupsclient.preinstall ca7718998e56c320c08a77cfefe046f6 CSWcupsd.postremove cf6a3fe902545aac1ab2303e41c08a3e CSWcupsd.preinstall -b69e58be75aab71165f77e9c1ec49ea3 client.conf.CSW +4e6b68d829be4e88afd27ac4897957f4 client.conf.CSW d95e2d588e3d36e563027a963b117b1b cups-1.4.2-source.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 Tue Nov 17 14:59:07 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 Nov 2009 13:59:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7323] csw/mgar/pkg Message-ID: Revision: 7323 http://gar.svn.sourceforge.net/gar/?rev=7323&view=rev Author: dmichelsen Date: 2009-11-17 13:59:07 +0000 (Tue, 17 Nov 2009) Log Message: ----------- shout-python: Initial commit Modified Paths: -------------- csw/mgar/pkg/shout-python/trunk/Makefile csw/mgar/pkg/shout-python/trunk/checksums Added Paths: ----------- csw/mgar/pkg/shout-python/ Modified: csw/mgar/pkg/shout-python/trunk/Makefile =================================================================== --- csw/mgar/pkg/pyyaml/trunk/Makefile 2009-11-15 19:36:00 UTC (rev 7302) +++ csw/mgar/pkg/shout-python/trunk/Makefile 2009-11-17 13:59:07 UTC (rev 7323) @@ -2,57 +2,34 @@ # Distributed under the terms of the GNU General Public License v2 # $Header$ -GARNAME = pyyaml -GARVERSION = 3.09 +GARNAME = shout-python +GARVERSION = 0.2.1 CATEGORIES = python -PROJ_NAME = PyYAML +DESCRIPTION = Python bindings for libshout 2 define BLURB - PyYAML is a YAML parser and emitter for the Python programming language. - - PyYAML features: - - * a complete YAML 1.1 parser. In particular, PyYAML can parse all examples - from the specification. The parsing algorithm is simple enough to be a - reference for YAML parser implementors. - * Unicode support including UTF-8/UTF-16 input/output and \u escape - sequences. - * low-level event-based parser and emitter API (like SAX). - * high-level API for serializing and deserializing native Python - objects (like DOM or pickle). - * support for all types from the YAML types repository. A - simple extension API is provided. - * both pure-Python and fast LibYAML-based parsers and - emitters. - * relatively sensible error messages. endef -MASTER_SITES = http://pyyaml.org/download/pyyaml/ -DISTFILES = $(PROJ_NAME)-$(GARVERSION).tar.gz -WORKSRC = $(WORKDIR)/$(PROJ_NAME)-$(GARVERSION) -SPKG_SOURCEURL = http://pyyaml.org/wiki/PyYAML +MASTER_SITES = http://downloads.us.xiph.org/releases/libshout/ +DISTFILES = $(DISTNAME).tar.gz -PACKAGES = CSWpy-yaml CSWpy-yaml-rt -CATALOGNAME_CSWpy-yaml = py_yaml -CATALOGNAME_CSWpy-yaml-rt = py_yaml_rt +SPKG_SOURCEURL = http://www.icecast.org/ -REQUIRED_PKGS_CSWpy-yaml = -REQUIRED_PKGS_CSWpy-yaml-rt = CSWpython-rt CSWlibyaml -PREREQUISITE_PKGS = $(REQUIRED_PKGS_CSWpy-yaml) $(REQUIRED_PKGS_CSWpy-yaml-rt) +REQUIRED_PKGS = CSWlibogg CSWlibshout CSWspeex CSWtheora CSWvorbis -SPKG_DESC_CSWpy-yaml = YAML parser and emitter for Python -SPKG_DESC_CSWpy-yaml-rt = Runtime libraries for YAML parser and emitter +PACKAGES = CSWpyshout +CATALOGNAME_CSWpyshout = py_shout -ARCHALL_CSWpy-yaml = 1 -PKGFILES_CSWpy-yaml-rt = /opt/csw/lib/python/site-packages/.*\.so +REQUIRED_PKGS_CSWpyshout = -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +BUILD_SCRIPTS = custom -BUILD_SCRIPTS = py-yaml +TEST_SCRIPTS = -build-py-yaml: - (cd $(WORKSRC); $(BUILD_ENV) python setup.py --with-libyaml build) +include gar/category.mk + +build-custom: + (cd $(WORKSRC); $(BUILD_ENV) python setup.py build) @$(MAKECOOKIE) -include gar/category.mk Modified: csw/mgar/pkg/shout-python/trunk/checksums =================================================================== --- csw/mgar/pkg/pyyaml/trunk/checksums 2009-11-15 19:36:00 UTC (rev 7302) +++ csw/mgar/pkg/shout-python/trunk/checksums 2009-11-17 13:59:07 UTC (rev 7323) @@ -1 +1 @@ -f219af2361e87fdc5e85e95b84c11d87 download/PyYAML-3.09.tar.gz +864cfecc2474590470fcce750416b7d3 shout-python-0.2.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 Nov 17 16:01:51 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 Nov 2009 15:01:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[7324] csw/mgar/pkg Message-ID: Revision: 7324 http://gar.svn.sourceforge.net/gar/?rev=7324&view=rev Author: dmichelsen Date: 2009-11-17 15:01:51 +0000 (Tue, 17 Nov 2009) Log Message: ----------- libschroedinger: Initial commit Added Paths: ----------- csw/mgar/pkg/libschroedinger/ csw/mgar/pkg/libschroedinger/branches/ csw/mgar/pkg/libschroedinger/tags/ csw/mgar/pkg/libschroedinger/trunk/ csw/mgar/pkg/libschroedinger/trunk/Makefile csw/mgar/pkg/libschroedinger/trunk/checksums csw/mgar/pkg/libschroedinger/trunk/files/ Property changes on: csw/mgar/pkg/libschroedinger/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/libschroedinger/trunk/Makefile =================================================================== --- csw/mgar/pkg/libschroedinger/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libschroedinger/trunk/Makefile 2009-11-17 15:01:51 UTC (rev 7324) @@ -0,0 +1,25 @@ +GARNAME = libschroedinger +GARVERSION = 1.0.7 +CATEGORIES = lib + +DESCRIPTION = A cross-platform implementation of the Dirac video compression specification +define BLURB + A new release of Schr?dinger is available. Schr?dinger (o"schro" + for short) is a cross-platform implementation of the Dirac video + compression specification as a C library. Many media frameworks + such as GStreamer and ffmpeg use schro to encode and decode Dirac + video. +endef + +MASTER_SITES = http://diracvideo.org/download/schroedinger/ +DISTNAME = schroedinger-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +BUILD64 = 1 +NO_ISAEXEC = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +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 Tue Nov 17 16:24:08 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 Nov 2009 15:24:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[7325] csw/mgar/pkg/postgresql/trunk Message-ID: Revision: 7325 http://gar.svn.sourceforge.net/gar/?rev=7325&view=rev Author: dmichelsen Date: 2009-11-17 15:24:08 +0000 (Tue, 17 Nov 2009) Log Message: ----------- postgresql: Remove includes from CFLAGS, they should be only in CPPFLAGS anyway. TBD: Review as general update in GAR Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile csw/mgar/pkg/postgresql/trunk/checksums Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2009-11-17 15:01:51 UTC (rev 7324) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2009-11-17 15:24:08 UTC (rev 7325) @@ -60,6 +60,8 @@ include gar/category.mk +CFLAGS := $(filter-out -I%,$(CFLAGS)) + post-merge: ginstall -d $(PKGROOT)/etc/init.d && ginstall $(WORKDIR)/cswpostgres $(PKGROOT)/etc/init.d/ ginstall -d $(PKGROOT)/opt/csw/etc/pkg/postgresql && ginstall $(WORKDIR)/cswusergroup $(PKGROOT)/opt/csw/etc/pkg/postgresql/ Modified: csw/mgar/pkg/postgresql/trunk/checksums =================================================================== --- csw/mgar/pkg/postgresql/trunk/checksums 2009-11-17 15:01:51 UTC (rev 7324) +++ csw/mgar/pkg/postgresql/trunk/checksums 2009-11-17 15:24:08 UTC (rev 7325) @@ -1,5 +1,5 @@ -45613fd5367cd230505ad68feb9ad634 README-CSW.txt -6916c5b1a6e1285c6a564abf4b659697 cswpostgres +6e4e2a7755acf94bc83200a308e21ef3 README-CSW.txt +73f96aa85c8f99caf4d708c874e23dab cswpostgres 443171cc5303a8ea0f0a13cbb5e32189 cswusergroup f2015af17bacbbfe140daf0d1067f9c9 postgresql-8.4.1.tar.bz2 -121c45f17350191ca5676453c25716da postgresql.conf +20c32ebdca7d585728b6078798fa1f50 postgresql.conf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Tue Nov 17 18:05:43 2009 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Tue, 17 Nov 2009 17:05:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[7326] csw/mgar/pkg/denyhosts/trunk/Makefile Message-ID: Revision: 7326 http://gar.svn.sourceforge.net/gar/?rev=7326&view=rev Author: bensons Date: 2009-11-17 17:05:43 +0000 (Tue, 17 Nov 2009) Log Message: ----------- denyhosts: remove implicit dependency Modified Paths: -------------- csw/mgar/pkg/denyhosts/trunk/Makefile Modified: csw/mgar/pkg/denyhosts/trunk/Makefile =================================================================== --- csw/mgar/pkg/denyhosts/trunk/Makefile 2009-11-17 15:24:08 UTC (rev 7325) +++ csw/mgar/pkg/denyhosts/trunk/Makefile 2009-11-17 17:05:43 UTC (rev 7326) @@ -24,7 +24,6 @@ LICENSE = LICENSE.txt ARCHALL = 1 INITSMF = /etc/opt/csw/init.d/cswdenyhosts -REQUIRED_PKGS = CSWpython # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).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 Nov 17 20:08:35 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 Nov 2009 19:08:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[7327] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7327 http://gar.svn.sourceforge.net/gar/?rev=7327&view=rev Author: dmichelsen Date: 2009-11-17 19:08:35 +0000 (Tue, 17 Nov 2009) Log Message: ----------- mGAR v2: Fix automatic setting of texinfo class Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-11-17 17:05:43 UTC (rev 7326) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-11-17 19:08:35 UTC (rev 7327) @@ -192,8 +192,10 @@ # This is the default path for texinfo pages to be picked up. Extend or replace as necessary. TEXINFO ?= $(infodir)/.*\.info(?:-\d+)? $(EXTRA_TEXINFO) +$(warning TEXINFO: $(TEXINFO) ) + # - set class for all config files -ifneq ($(SAMPLECONF)$(PRESERVECONF)$(MIGRATECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),) +ifneq ($(SAMPLECONF)$(PRESERVECONF)$(MIGRATECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE)$(TEXINFO),) _CSWCLASS_FILTER = | perl -ane '\ $(foreach FILE,$(MIGRATECONF),$$F[1] = "cswmigrateconf" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(SAMPLECONF:%\.CSW=%),$$F[1] = "cswcpsampleconf" if ( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ 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 Nov 17 20:09:27 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 Nov 2009 19:09:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7328] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7328 http://gar.svn.sourceforge.net/gar/?rev=7328&view=rev Author: dmichelsen Date: 2009-11-17 19:09:27 +0000 (Tue, 17 Nov 2009) Log Message: ----------- mGAR v2: Take out erranous warning Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-11-17 19:08:35 UTC (rev 7327) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-11-17 19:09:27 UTC (rev 7328) @@ -192,8 +192,6 @@ # This is the default path for texinfo pages to be picked up. Extend or replace as necessary. TEXINFO ?= $(infodir)/.*\.info(?:-\d+)? $(EXTRA_TEXINFO) -$(warning TEXINFO: $(TEXINFO) ) - # - set class for all config files ifneq ($(SAMPLECONF)$(PRESERVECONF)$(MIGRATECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE)$(TEXINFO),) _CSWCLASS_FILTER = | perl -ane '\ 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 Nov 17 20:19:31 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 Nov 2009 19:19:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7329] csw/mgar/pkg/pcre/trunk/Makefile Message-ID: Revision: 7329 http://gar.svn.sourceforge.net/gar/?rev=7329&view=rev Author: dmichelsen Date: 2009-11-17 19:19:31 +0000 (Tue, 17 Nov 2009) Log Message: ----------- pcre: Remove isaexec Modified Paths: -------------- csw/mgar/pkg/pcre/trunk/Makefile Modified: csw/mgar/pkg/pcre/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcre/trunk/Makefile 2009-11-17 19:09:27 UTC (rev 7328) +++ csw/mgar/pkg/pcre/trunk/Makefile 2009-11-17 19:19:31 UTC (rev 7329) @@ -30,6 +30,7 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz BUILD64 = 1 +NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-unicode-properties @@ -41,6 +42,8 @@ TEST_TARGET = check +MERGE_DIRS_isa-extra = $(libdir) + PKGFILES_CSWpcrert = $(PKGFILES_RT) 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 Tue Nov 17 20:48:51 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 17 Nov 2009 19:48:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[7330] csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/ Message-ID: Revision: 7330 http://gar.svn.sourceforge.net/gar/?rev=7330&view=rev Author: wahwah Date: 2009-11-17 19:48:50 +0000 (Tue, 17 Nov 2009) Log Message: ----------- Making a branch to try out another way of laying out the files. Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/ 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 Nov 17 21:29:17 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 17 Nov 2009 20:29:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[7331] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 7331 http://gar.svn.sourceforge.net/gar/?rev=7331&view=rev Author: skayser Date: 2009-11-17 20:29:17 +0000 (Tue, 17 Nov 2009) Log Message: ----------- gar/v2: multitail tweak, not yet sure why -j is needed, reduce window height to 1 meanwhile Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-11-17 19:48:50 UTC (rev 7330) +++ csw/mgar/gar/v2/gar.mk 2009-11-17 20:29:17 UTC (rev 7331) @@ -734,7 +734,7 @@ merge-watch: _USEMULTITAIL=$(shell test -x $(MULTITAIL) && test -x $(TTY) && $(TTY) >/dev/null 2>&1; if [ $$? -eq 0 ]; then echo yes; fi) merge-watch: $(addprefix $(WORKROOTDIR)/build-,global $(MODULATIONS)) $(_DBG_MERGE)$(if $(_USEMULTITAIL),\ - $(MULTITAIL) --retry-all $(foreach M,$(MODULATIONS),$(WORKROOTDIR)/build-$M/build.log) -j & echo $$! > $(WORKROOTDIR)/build-global/multitail.pid,\ + $(MULTITAIL) --retry-all $(foreach M,$(MODULATIONS),$(WORKROOTDIR)/build-$M/build.log) -t "multi-platform-build in progress" -wh 1 -j & echo $$! > $(WORKROOTDIR)/build-global/multitail.pid,\ echo "Building all ISAs in parallel. Please see the individual logfiles for details:";$(foreach M,$(MODULATIONS),echo "- $(WORKROOTDIR)/build-$M/build.log";)\ ) 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 Nov 17 22:56:43 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 Nov 2009 21:56:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[7332] csw/mgar/gar/v2 Message-ID: Revision: 7332 http://gar.svn.sourceforge.net/gar/?rev=7332&view=rev Author: dmichelsen Date: 2009-11-17 21:56:31 +0000 (Tue, 17 Nov 2009) Log Message: ----------- mGAR v2: Fix cpan category for automatic CSWcommon dependency inside GAR Modified Paths: -------------- csw/mgar/gar/v2/categories/cpan/category.mk csw/mgar/gar/v2/pkglib/csw/depend.perl csw/mgar/gar/v2/pkglib/csw_cpan.gspec Added Paths: ----------- csw/mgar/gar/v2/pkglib/csw_cpan_dyngspec.gspec Modified: csw/mgar/gar/v2/categories/cpan/category.mk =================================================================== --- csw/mgar/gar/v2/categories/cpan/category.mk 2009-11-17 20:29:17 UTC (rev 7331) +++ csw/mgar/gar/v2/categories/cpan/category.mk 2009-11-17 21:56:31 UTC (rev 7332) @@ -34,7 +34,7 @@ SPKG_SOURCEURL := $(SPKG_SOURCEURL)/$(GARNAME) _MERGE_EXCLUDE_CATEGORY = .*/perllocal\.pod .*/\.packlist -_CATEGORY_GSPEC_INCLUDE ?= csw_cpan.gspec +_CATEGORY_GSPEC_INCLUDE ?= csw_cpan_dyngspec.gspec include gar/gar.mk Modified: csw/mgar/gar/v2/pkglib/csw/depend.perl =================================================================== --- csw/mgar/gar/v2/pkglib/csw/depend.perl 2009-11-17 20:29:17 UTC (rev 7331) +++ csw/mgar/gar/v2/pkglib/csw/depend.perl 2009-11-17 21:56:31 UTC (rev 7332) @@ -1,2 +1 @@ -P CSWcommon common - common files and dirs for CSW packages P CSWperl perl - A high-level, general-purpose programming language Modified: csw/mgar/gar/v2/pkglib/csw_cpan.gspec =================================================================== --- csw/mgar/gar/v2/pkglib/csw_cpan.gspec 2009-11-17 20:29:17 UTC (rev 7331) +++ csw/mgar/gar/v2/pkglib/csw_cpan.gspec 2009-11-17 21:56:31 UTC (rev 7332) @@ -1,5 +1,6 @@ %include url file://%{PKGLIB}/csw_vars.gspec %pkginfo url file://%{PKGLIB}/csw/pkginfo %prototype exec cswproto -s %{TIMESTAMP} -r %{DESTDIR} %{DESTDIR} +%depend:merge url file://%{PKGLIB}/csw/depend %depend:merge url file://%{PKGLIB}/csw/depend.perl %depend exec gawk '$1 ~ /f/{print $3}' %{prototype} | depmaker --root %{DESTDIR} --nodep %{pkgname} %{DEPMAKER_EXTRA_ARGS} Copied: csw/mgar/gar/v2/pkglib/csw_cpan_dyngspec.gspec (from rev 7323, csw/mgar/gar/v2/pkglib/csw_cpan.gspec) =================================================================== --- csw/mgar/gar/v2/pkglib/csw_cpan_dyngspec.gspec (rev 0) +++ csw/mgar/gar/v2/pkglib/csw_cpan_dyngspec.gspec 2009-11-17 21:56:31 UTC (rev 7332) @@ -0,0 +1,5 @@ +%include url file://%{PKGLIB}/csw_vars.gspec +%pkginfo url file://%{PKGLIB}/csw/pkginfo +%prototype exec cswproto -s %{TIMESTAMP} -r %{DESTDIR} %{DESTDIR} +%depend:merge url file://%{PKGLIB}/csw/depend.perl +%depend exec gawk '$1 ~ /f/{print $3}' %{prototype} | depmaker --root %{DESTDIR} --nodep %{pkgname} %{DEPMAKER_EXTRA_ARGS} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Nov 17 23:11:36 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 Nov 2009 22:11:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[7333] csw/mgar/pkg Message-ID: Revision: 7333 http://gar.svn.sourceforge.net/gar/?rev=7333&view=rev Author: dmichelsen Date: 2009-11-17 22:11:32 +0000 (Tue, 17 Nov 2009) Log Message: ----------- di: Initial commit Added Paths: ----------- csw/mgar/pkg/di/ csw/mgar/pkg/di/branches/ csw/mgar/pkg/di/tags/ csw/mgar/pkg/di/trunk/ csw/mgar/pkg/di/trunk/Makefile csw/mgar/pkg/di/trunk/checksums csw/mgar/pkg/di/trunk/files/ Property changes on: csw/mgar/pkg/di/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/di/trunk/Makefile =================================================================== --- csw/mgar/pkg/di/trunk/Makefile (rev 0) +++ csw/mgar/pkg/di/trunk/Makefile 2009-11-17 22:11:32 UTC (rev 7333) @@ -0,0 +1,22 @@ +GARNAME = di +GARVERSION = 4.16 +CATEGORIES = utils + +DESCRIPTION = Disk information utility +define BLURB + 'di' is a disk information utility, displaying everything (and more) + that your 'df' command does. It features the ability to display your + disk usage in whatever format you desire/prefer/are used to. It is + designed to be portable across many platforms. +endef + +MASTER_SITES = http://www.gentoo.com/di/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_SCRIPTS = + +include gar/category.mk + Added: csw/mgar/pkg/di/trunk/checksums =================================================================== --- csw/mgar/pkg/di/trunk/checksums (rev 0) +++ csw/mgar/pkg/di/trunk/checksums 2009-11-17 22:11:32 UTC (rev 7333) @@ -0,0 +1 @@ +a035972d3f90bc8390b19461156ee4ea di-4.16.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 Tue Nov 17 23:16:08 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 17 Nov 2009 22:16:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[7334] csw/mgar/pkg/postgresql/trunk/Makefile Message-ID: Revision: 7334 http://gar.svn.sourceforge.net/gar/?rev=7334&view=rev Author: wahwah Date: 2009-11-17 22:16:07 +0000 (Tue, 17 Nov 2009) Log Message: ----------- postgresql: First sketch of the Debian-inspired directory layout. Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2009-11-17 22:11:32 UTC (rev 7333) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2009-11-17 22:16:07 UTC (rev 7334) @@ -1,11 +1,28 @@ GARNAME = postgresql -GARVERSION = 8.4.1 +BASE_VERSION = 8.4 +PATCHLEVEL = 1 +GARVERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = apps DESCRIPTION = An advanced open source database define BLURB endef +bindir = $(prefix)/bin/$(GARNAME)/$(BASE_VERSION) +datadir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION) +docdir=$(prefix)/share/doc/$(GARNAME)/$(BASE_VERSION) +includedir=$(prefix)/include/$(GARNAME)/$(BASE_VERSION) +infodir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION)/info +libdir=$(prefix)/lib/$(GARNAME)/$(BASE_VERSION) +libexecdir=$(prefix)/libexec/$(GARNAME)/$(BASE_VERSION) +lispdir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION)/emacs/site-lisp +localstatedir = /var/opt/csw/$(GARNAME)/$(BASE_VERSION) +mandir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION)/man +sbindir = $(prefix)/sbin/$(GARNAME)/$(BASE_VERSION) +sharedstatedir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION) +sourcedir=$(prefix)/src/$(GARNAME)/$(BASE_VERSION) +sysconfdir = /etc/opt/csw/$(GARNAME)/$(BASE_VERSION) + MASTER_SITES = http://wwwmaster.postgresql.org/redir/53/h/source/v$(GARVERSION)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += cswpostgres @@ -32,8 +49,8 @@ LICENSE = COPYRIGHT -prefix = $(BUILD_PREFIX)/postgresql -docdir = $(BUILD_PREFIX)/share/doc +# prefix = $(BUILD_PREFIX)/postgresql +# docdir = $(BUILD_PREFIX)/share/doc EXTRA_INC = $(BUILD_PREFIX)/include EXTRA_LIB = $(BUILD_PREFIX)/lib @@ -50,21 +67,29 @@ PKGFILES_CSWlibpq = $(PKGFILES_RT) # -> TODO: start in rc3.d S10, Stop everywhere else in K90 -INITSMF = /etc/init.d/cswpostgres +INITSMF = /etc/opt/csw/init\.d/cswpostgres-$(BASE_VERSION) # -> TODO: Migrate /opt/csw/var/pgdata to /var/opt/csw/postgresql/pgdata -USERGROUP = /opt/csw/etc/pkg/postgresql +USERGROUP = /etc/opt/csw/pkg/postgresql-$(BASE_VERSION) # -> TODO: Migrate /opt/csw/etc/postgresql.conf to /etc/opt/csw/postgresql.conf -PRESERVECONF = /opt/csw/etc/postgresql.conf +PRESERVECONF = /opt/csw/etc/postgresql\.conf include gar/category.mk CFLAGS := $(filter-out -I%,$(CFLAGS)) post-merge: - ginstall -d $(PKGROOT)/etc/init.d && ginstall $(WORKDIR)/cswpostgres $(PKGROOT)/etc/init.d/ - ginstall -d $(PKGROOT)/opt/csw/etc/pkg/postgresql && ginstall $(WORKDIR)/cswusergroup $(PKGROOT)/opt/csw/etc/pkg/postgresql/ - ginstall -d $(PKGROOT)/opt/csw/etc && ginstall $(WORKDIR)/postgresql.conf $(PKGROOT)/opt/csw/etc/ - ginstall -d $(PKGROOT)$(docdir)/postgresql/ && ginstall $(WORKDIR)/README-CSW.txt $(PKGROOT)$(docdir)/postgresql/ + ginstall -d $(PKGROOT)/etc/opt/csw/init.d + ginstall \ + $(WORKDIR)/cswpostgres \ + $(PKGROOT)/etc/opt/csw/init.d/cswpostgres-$(BASE_VERSION) + ginstall -d $(PKGROOT)/opt/csw/etc/pkg/$(GARNAME) + ginstall $(WORKDIR)/cswusergroup \ + $(PKGROOT)/etc/opt/csw/pkg/postgresql/$(GARNAME)-$(BASE_VERSION) + ginstall -d $(PKGROOT)/etc/opt/csw/$(GARNAME)-$(BASE_VERSION) + ginstall $(WORKDIR)/postgresql.conf \ + $(PKGROOT)/etc/opt/csw/$(GARNAME)-$(BASE_VERSION) + ginstall -d $(PKGROOT)$(docdir)/$(GARNAME) + ginstall $(WORKDIR)/README-CSW.txt $(PKGROOT)$(docdir)/$(GARNAME)/ @$(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 Nov 18 03:51:57 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 18 Nov 2009 02:51:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[7335] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 7335 http://gar.svn.sourceforge.net/gar/?rev=7335&view=rev Author: skayser Date: 2009-11-18 02:51:57 +0000 (Wed, 18 Nov 2009) Log Message: ----------- gar/v2: adjusted multitail status bar message Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-11-17 22:16:07 UTC (rev 7334) +++ csw/mgar/gar/v2/gar.mk 2009-11-18 02:51:57 UTC (rev 7335) @@ -734,7 +734,7 @@ merge-watch: _USEMULTITAIL=$(shell test -x $(MULTITAIL) && test -x $(TTY) && $(TTY) >/dev/null 2>&1; if [ $$? -eq 0 ]; then echo yes; fi) merge-watch: $(addprefix $(WORKROOTDIR)/build-,global $(MODULATIONS)) $(_DBG_MERGE)$(if $(_USEMULTITAIL),\ - $(MULTITAIL) --retry-all $(foreach M,$(MODULATIONS),$(WORKROOTDIR)/build-$M/build.log) -t "multi-platform-build in progress" -wh 1 -j & echo $$! > $(WORKROOTDIR)/build-global/multitail.pid,\ + $(MULTITAIL) --retry-all $(foreach M,$(MODULATIONS),$(WORKROOTDIR)/build-$M/build.log) -t "build(s) in progress" -wh 1 -j & echo $$! > $(WORKROOTDIR)/build-global/multitail.pid,\ echo "Building all ISAs in parallel. Please see the individual logfiles for details:";$(foreach M,$(MODULATIONS),echo "- $(WORKROOTDIR)/build-$M/build.log";)\ ) 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 Nov 18 04:12:37 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 18 Nov 2009 03:12:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[7336] csw/mgar/pkg/xterm/trunk Message-ID: Revision: 7336 http://gar.svn.sourceforge.net/gar/?rev=7336&view=rev Author: skayser Date: 2009-11-18 03:12:37 +0000 (Wed, 18 Nov 2009) Log Message: ----------- xterm: version bump to 251, documented CSW X11 related build changes since 243 Modified Paths: -------------- csw/mgar/pkg/xterm/trunk/Makefile csw/mgar/pkg/xterm/trunk/checksums csw/mgar/pkg/xterm/trunk/files/changelog.CSW Modified: csw/mgar/pkg/xterm/trunk/Makefile =================================================================== --- csw/mgar/pkg/xterm/trunk/Makefile 2009-11-18 02:51:57 UTC (rev 7335) +++ csw/mgar/pkg/xterm/trunk/Makefile 2009-11-18 03:12:37 UTC (rev 7336) @@ -1,5 +1,8 @@ +# TODO +# - Now that we mostly have our own CSW X11 libs, can we place the app-default +# files in a location where they are actually read by default? GARNAME = xterm -GARVERSION = 250 +GARVERSION = 251 CATEGORIES = apps DESCRIPTION = Terminal emulator for the X Window System @@ -11,26 +14,16 @@ the control sequences for VT220. endef -MASTER_SITES = ftp://invisible-island.net/xterm/ -DISTFILES = $(GARNAME)-$(GARVERSION).tgz +SPKG_SOURCEURL = http://invisible-island.net/xterm/ +MASTER_SITES = ftp://invisible-island.net/xterm/ +DISTFILES = $(GARNAME)-$(GARVERSION).tgz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz REQUIRED_PKGS = CSWfconfig CSWlibxft2 -# We needed to switch to CSW-built X11 (build against Solaris X11 was broken -# on the build boxes, ) and these came along as dependencies. -REQUIRED_PKGS += CSWlibice CSWlibx11 CSWlibxaw CSWlibxmu CSWlibxt -# enable -mk_width per default to address unicode form character width woes, -# can be taken out once upstream enhances wcwidth() sanity checking -# http://article.gmane.org/gmane.comp.lib.ncurses.bugs/3795 -# -# fixed in #244, let's see whether it works -#PATCHFILES = patch-mkwidth.diff +# xterm Makefile doesn't have a test target +TEST_TARGET = -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz - -TEST_SCRIPTS = - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-setuid CONFIGURE_ARGS += --disable-setgid @@ -46,26 +39,46 @@ CONFIGURE_ARGS += --enable-wide-chars CONFIGURE_ARGS += --program-suffix=86 --with-xterm-symlink CONFIGURE_ARGS += --with-freetype-cflags="-I$(includedir)/freetype2" + +#GARFLAVOR = DBG +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) +CONFIGURE_ARGS_DBG = --enable-trace --enable-warnings + +# Notes on CSW X11 libs: +# xterm depends on Xrender and Xft for freetype font support. Starting with +# +# libxrender-0.9.4,REV=2009.06.11 +# libxft2-2.1.13,REV=2009.06.15 +# +# these libs moved to the CSW X11 libs prefix (/opt/csw/X11). Accordingly, +# we need to build against these X11 libs, otherwise ./configure bails out +# when verifying the linkage to freetype. This unfortunatel drags a pile +# of other CSW X11 libs with it ... o_O ... Any caveats? libX11 for +# instance will be run-time linked twice (see ldd output on xterm). +# One from Solaris, another one from us. Time will show how this works out. CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include CONFIGURE_ARGS += --x-libraries=$(prefix)/X11/lib +REQUIRED_PKGS += CSWlibice CSWlibx11 CSWlibxaw CSWlibxmu CSWlibxt + +# The need for the explicit -lfontconfig linkage also came along when +# we upgraded from xterm-243 (CSW X11 libs had been introduced in the +# meantime, related? pkgconfig woes?). Without the explicit linkage +# there are implicit symbol dependencies on the final xterm linking run. +EXTRA_LDFLAGS = -L$(libdir) -lfontconfig + # luit comes with snv_85 # http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6662431 #CONFIGURE_ARGS += --enable-luit -#GARFLAVOR = DBG -CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) -CONFIGURE_ARGS_DBG = --enable-trace --enable-warnings -# The need for the following extra flags also came along with the switch -# to CSW X11, didn't yet investigate what exactly broke ./configure -EXTRA_LDFLAGS = -L$(libdir) -lfontconfig - include gar/category.mk -post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(CATALOGNAME) +post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) +post-install-modulated: CSWDOCS=README.CSW changelog.CSW +post-install-modulated: DOCS=xterm.log.html ctlseqs.txt post-install-modulated: ginstall -d $(DOCDEST) - cp $(FILEDIR)/README.CSW $(DOCDEST) - cp $(FILEDIR)/changelog.CSW $(DOCDEST) + cp $(addprefix $(FILEDIR)/,$(CSWDOCS)) $(DOCDEST) + cp $(addprefix $(WORKSRC)/,$(DOCS)) $(DOCDEST) @$(MAKECOOKIE) Modified: csw/mgar/pkg/xterm/trunk/checksums =================================================================== --- csw/mgar/pkg/xterm/trunk/checksums 2009-11-18 02:51:57 UTC (rev 7335) +++ csw/mgar/pkg/xterm/trunk/checksums 2009-11-18 03:12:37 UTC (rev 7336) @@ -1 +1 @@ -962ce117f65daf6bf376b6697b2cd02d download/xterm-250.tgz +343a4ce213f70c53cf65979f163bebc3 xterm-251.tgz Modified: csw/mgar/pkg/xterm/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/xterm/trunk/files/changelog.CSW 2009-11-18 02:51:57 UTC (rev 7335) +++ csw/mgar/pkg/xterm/trunk/files/changelog.CSW 2009-11-18 03:12:37 UTC (rev 7336) @@ -1,5 +1,5 @@ -xterm (250,REV=2009.11.02) +xterm (251,REV=2009.11.18) * Updated to 250. (Fixes #3937, #3856) - -- Sebastian Kayser Mon, 2 Nov 2009 16:11:49 +0100 + -- Sebastian Kayser Wed, 18 Nov 2009 03:23:47 +0100 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 Nov 18 09:57:58 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 18 Nov 2009 08:57:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7337] csw/mgar/gar/v2-git Message-ID: Revision: 7337 http://gar.svn.sourceforge.net/gar/?rev=7337&view=rev Author: wahwah Date: 2009-11-18 08:57:57 +0000 (Wed, 18 Nov 2009) Log Message: ----------- gar-v2-git: merging changes from v2 Modified Paths: -------------- csw/mgar/gar/v2-git/bin/checkpkg csw/mgar/gar/v2-git/bin/gitproxy csw/mgar/gar/v2-git/bin/update-commondirs csw/mgar/gar/v2-git/categories/cpan/category.mk csw/mgar/gar/v2-git/categories/x11/category.mk csw/mgar/gar/v2-git/category.mk csw/mgar/gar/v2-git/etc/commondirs-i386 csw/mgar/gar/v2-git/etc/commondirs-sparc csw/mgar/gar/v2-git/gar.conf.mk csw/mgar/gar/v2-git/gar.lib.mk csw/mgar/gar/v2-git/gar.mk csw/mgar/gar/v2-git/gar.pkg.mk csw/mgar/gar/v2-git/pkglib/csw/depend.perl csw/mgar/gar/v2-git/pkglib/csw_cpan.gspec csw/mgar/gar/v2-git/pkglib/csw_dyngspec.gspec Added Paths: ----------- csw/mgar/gar/v2-git/categories/loose/ csw/mgar/gar/v2-git/categories/loose/category.mk csw/mgar/gar/v2-git/pkglib/csw_cpan_dyngspec.gspec Removed Paths: ------------- csw/mgar/gar/v2-git/categories/loose/category.mk Property Changed: ---------------- csw/mgar/gar/v2-git/ Property changes on: csw/mgar/gar/v2-git ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-skayser:6087-6132 + /csw/mgar/gar/v2:4936-6678,6916-7336 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-skayser:6087-6132 Modified: csw/mgar/gar/v2-git/bin/checkpkg =================================================================== --- csw/mgar/gar/v2-git/bin/checkpkg 2009-11-18 03:12:37 UTC (rev 7336) +++ csw/mgar/gar/v2-git/bin/checkpkg 2009-11-18 08:57:57 UTC (rev 7337) @@ -97,7 +97,10 @@ # Need to rewrite this whole thing to also # check for badly set RUNPATHs. sigh. # - for badpath in /export/medusa /opt/build ; do + # Using rot13 so that checkpkg can check itself without reporting + # an error. + badpaths="$(echo /rkcbeg/zrqhfn /bcg/ohvyq | gtr a-mn-z n-za-m)" + for badpath in $badpaths ; do GREP=/bin/grep gzgrep "$badpath" $f if [[ $? -eq 0 ]] ; then print "" @@ -440,6 +443,15 @@ exit 1 fi +# Verify that there are no double depends +repeated_depends="$(awk '{print $2}' $EXTRACTDIR/$pkgname/install/depend \ + | sort | uniq -c | awk '{print $1}' | sort | uniq | wc -l)" +if [[ "$repeated_depends" -gt 1 ]]; then + cat $EXTRACTDIR/$pkgname/install/depend + print ERROR: $pkgname has double depends + exit 1 +fi + #to retain a record of all packages currently being examined from $@ echo $pkgname >> $SETDEPS @@ -451,7 +463,7 @@ if [[ $? -ne 0 ]]; then #if we've already looked at the package named $dep, #it'll be in the file. - awk "\$1 == \"$dep\" {print}" $SETDEPS | /usr/xpg4/bin/grep -q $dep + awk "\$1 == \"$dep\" {print}" $SETDEPS | /usr/bin/grep $dep >/dev/null if [[ $? -ne 0 ]]; then #we haven't yet seen this package in our set echo "Can't validate dependence on $dep. Storing for delayed validation." #store for validation at the end. @@ -530,7 +542,7 @@ while read mdep; do dep=`echo $mdep | nawk '{print $1}'` pkg=`echo $mdep | nawk '{print $2}'` - /usr/xpg4/bin/grep -q $dep $SETDEPS + /usr/bin/grep $dep $SETDEPS >/dev/null if [ $? -ne 0 ]; then errmsg "Couldn't validate $dep as a dependency in package $pkg" else @@ -545,7 +557,7 @@ lib=`echo $ldep | nawk '{print $1}'` [ "$lib" = "libm.so.2" ] && continue pkg=`echo $ldep | nawk '{print $2}'` - /usr/xpg4/bin/grep -q "[/=]$lib[ =]" $SETLIBS + /usr/bin/grep "[/=]$lib[ =]" $SETLIBS >/dev/null if [ $? -ne 0 ]; then errmsg "Couldn't find a package providing $lib" else Modified: csw/mgar/gar/v2-git/bin/gitproxy =================================================================== --- csw/mgar/gar/v2-git/bin/gitproxy 2009-11-18 03:12:37 UTC (rev 7336) +++ csw/mgar/gar/v2-git/bin/gitproxy 2009-11-18 08:57:57 UTC (rev 7337) @@ -15,6 +15,6 @@ nc ${PROXYHOST} ${PROXYPORT} | (read a; read a; cat ) else - echo Please set http_proxy in your environment. + echo Please set http_proxy in your environment. >&2 exit 1 fi Modified: csw/mgar/gar/v2-git/bin/update-commondirs =================================================================== --- csw/mgar/gar/v2-git/bin/update-commondirs 2009-11-18 03:12:37 UTC (rev 7336) +++ csw/mgar/gar/v2-git/bin/update-commondirs 2009-11-18 08:57:57 UTC (rev 7337) @@ -19,17 +19,17 @@ mkdir $TMPDIR ( cd $TMPDIR - wget http://mirror.opencsw.org/opencsw/current/$1/5.8/common-1.4.6,REV=2008.04.28-SunOS5.8-$1-CSW.pkg.gz - gzip -c -d common-* | pkgtrans /dev/fd/0 $TMPDIR all + wget http://mirror.opencsw.org/opencsw/current/$1/5.8/common-1.4.7,REV=2009.09.20-SunOS5.8-$1-CSW.pkg + cat common-* | pkgtrans /dev/fd/0 $TMPDIR all ) - perl -ne ' + ( perl -ne ' my @l = split; if( $l[1] =~ /^[ds]$/ ) { print ($l[3] =~ /([^=]*)/); print "\n"; } - ' $TMPDIR/CSWcommon/pkgmap > ../etc/commondirs-$1 + ' $TMPDIR/CSWcommon/pkgmap; echo "/var"; echo "/var/run") > ../etc/commondirs-$1 rm -rf $TMPDIR } Modified: csw/mgar/gar/v2-git/categories/cpan/category.mk =================================================================== --- csw/mgar/gar/v2-git/categories/cpan/category.mk 2009-11-18 03:12:37 UTC (rev 7336) +++ csw/mgar/gar/v2-git/categories/cpan/category.mk 2009-11-18 08:57:57 UTC (rev 7337) @@ -34,7 +34,7 @@ SPKG_SOURCEURL := $(SPKG_SOURCEURL)/$(GARNAME) _MERGE_EXCLUDE_CATEGORY = .*/perllocal\.pod .*/\.packlist -_CATEGORY_GSPEC_INCLUDE ?= csw_cpan.gspec +_CATEGORY_GSPEC_INCLUDE ?= csw_cpan_dyngspec.gspec include gar/gar.mk Deleted: csw/mgar/gar/v2-git/categories/loose/category.mk =================================================================== --- csw/mgar/gar/v2/categories/loose/category.mk 2009-11-18 03:12:37 UTC (rev 7336) +++ csw/mgar/gar/v2-git/categories/loose/category.mk 2009-11-18 08:57:57 UTC (rev 7337) @@ -1,28 +0,0 @@ -# $Id$ -# -# Building packages from loose files, laid out in a directory. - -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = -INSTALL_SCRIPTS = loose -TEST_SCRIPTS = - -MASTER_SITES += $(sort $(addprefix file://$(LOCAL_SRC)/,$(dir $(FILES)))) -DISTFILES += $(notdir $(FILES)) - -include gar/gar.mk - -ifndef LOCAL_SRC -$(error "Please set the LOCAL_SRC variable to the root of your source code tree") -endif - -ifndef FILES -$(error "Please set the FILES variable to the list of files to include") -endif - -install-loose: - $(foreach F,$(FILES),ginstall \ - -d $(DESTDIR)$(prefix)/$(dir $F) \ - && ginstall $(WORKDIR)/$(notdir $F) \ - $(DESTDIR)$(prefix)/$(dir $F);) - @$(MAKECOOKIE) Copied: csw/mgar/gar/v2-git/categories/loose/category.mk (from rev 7336, csw/mgar/gar/v2/categories/loose/category.mk) =================================================================== --- csw/mgar/gar/v2-git/categories/loose/category.mk (rev 0) +++ csw/mgar/gar/v2-git/categories/loose/category.mk 2009-11-18 08:57:57 UTC (rev 7337) @@ -0,0 +1,28 @@ +# $Id$ +# +# Building packages from loose files, laid out in a directory. + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = loose +TEST_SCRIPTS = + +MASTER_SITES += $(sort $(addprefix file://$(LOCAL_SRC)/,$(dir $(FILES)))) +DISTFILES += $(notdir $(FILES)) + +include gar/gar.mk + +ifndef LOCAL_SRC +$(error "Please set the LOCAL_SRC variable to the root of your source code tree") +endif + +ifndef FILES +$(error "Please set the FILES variable to the list of files to include") +endif + +install-loose: + $(foreach F,$(FILES),ginstall \ + -d $(DESTDIR)$(prefix)/$(dir $F) \ + && ginstall $(WORKDIR)/$(notdir $F) \ + $(DESTDIR)$(prefix)/$(dir $F);) + @$(MAKECOOKIE) Modified: csw/mgar/gar/v2-git/categories/x11/category.mk =================================================================== --- csw/mgar/gar/v2-git/categories/x11/category.mk 2009-11-18 03:12:37 UTC (rev 7336) +++ csw/mgar/gar/v2-git/categories/x11/category.mk 2009-11-18 08:57:57 UTC (rev 7337) @@ -1,6 +1,11 @@ # X11 -X11_PROTO_MASTER_SITE = http://xorg.freedesktop.org/releases/individual/proto/ -X11_LIB_MASTER_SITE = http://xorg.freedesktop.org/releases/individual/lib/ + +# Version of X11 +X11_RELEASE_VERSION = X11R7.4 + +# Definition of the URL to access sources +X11_PROTO_MASTER_SITE = http://xorg.freedesktop.org/releases/$(X11_RELEASE_VERSION)/src/proto/ +X11_LIB_MASTER_SITE = http://xorg.freedesktop.org/releases/$(X11_RELEASE_VERSION)/src/lib/ XCB_MASTER_SITES = http://xcb.freedesktop.org/dist/ # C and C++ compiler flags Modified: csw/mgar/gar/v2-git/category.mk =================================================================== --- csw/mgar/gar/v2-git/category.mk 2009-11-18 03:12:37 UTC (rev 7336) +++ csw/mgar/gar/v2-git/category.mk 2009-11-18 08:57:57 UTC (rev 7337) @@ -2,8 +2,8 @@ # This makefile is to be included from Makefiles in each category # directory. -ifeq (,$(CATEGORIES)) - $(error Please set CATEGORIES to one of $(wildcard categories/*)) +ifeq (,$(wildcard gar/categories/$(CATEGORIES)/category.mk)) + $(error The category '$(CATEGORIES)' is invalid. Valid categories are $(patsubst gar/categories/%,%,$(wildcard gar/categories/*))) endif include gar/categories/$(CATEGORIES)/category.mk Modified: csw/mgar/gar/v2-git/etc/commondirs-i386 =================================================================== --- csw/mgar/gar/v2-git/etc/commondirs-i386 2009-11-18 03:12:37 UTC (rev 7336) +++ csw/mgar/gar/v2-git/etc/commondirs-i386 2009-11-18 08:57:57 UTC (rev 7337) @@ -1,4 +1,17 @@ /etc/opt/csw +/etc/opt/csw/pkg-hooks +/etc/opt/csw/pkg-hooks/postbatchinstall.d +/etc/opt/csw/pkg-hooks/postbatchremove.d +/etc/opt/csw/pkg-hooks/postbatchupgrade.d +/etc/opt/csw/pkg-hooks/postinstall.d +/etc/opt/csw/pkg-hooks/postremove.d +/etc/opt/csw/pkg-hooks/postupgrade.d +/etc/opt/csw/pkg-hooks/prebatchinstall.d +/etc/opt/csw/pkg-hooks/prebatchremove.d +/etc/opt/csw/pkg-hooks/prebatchupgrade.d +/etc/opt/csw/pkg-hooks/preinstall.d +/etc/opt/csw/pkg-hooks/preremove.d +/etc/opt/csw/pkg-hooks/preupgrade.d /opt/csw /opt/csw/bin /opt/csw/bin/amd64 @@ -140,3 +153,6 @@ /opt/csw/share/man /opt/csw/var /var/opt/csw +/var/opt/csw/pkg-hooks +/var +/var/run Modified: csw/mgar/gar/v2-git/etc/commondirs-sparc =================================================================== --- csw/mgar/gar/v2-git/etc/commondirs-sparc 2009-11-18 03:12:37 UTC (rev 7336) +++ csw/mgar/gar/v2-git/etc/commondirs-sparc 2009-11-18 08:57:57 UTC (rev 7337) @@ -1,4 +1,17 @@ /etc/opt/csw +/etc/opt/csw/pkg-hooks +/etc/opt/csw/pkg-hooks/postbatchinstall.d +/etc/opt/csw/pkg-hooks/postbatchremove.d +/etc/opt/csw/pkg-hooks/postbatchupgrade.d +/etc/opt/csw/pkg-hooks/postinstall.d +/etc/opt/csw/pkg-hooks/postremove.d +/etc/opt/csw/pkg-hooks/postupgrade.d +/etc/opt/csw/pkg-hooks/prebatchinstall.d +/etc/opt/csw/pkg-hooks/prebatchremove.d +/etc/opt/csw/pkg-hooks/prebatchupgrade.d +/etc/opt/csw/pkg-hooks/preinstall.d +/etc/opt/csw/pkg-hooks/preremove.d +/etc/opt/csw/pkg-hooks/preupgrade.d /opt/csw /opt/csw/bin /opt/csw/bin/sparc @@ -144,3 +157,6 @@ /opt/csw/share/man /opt/csw/var /var/opt/csw +/var/opt/csw/pkg-hooks +/var +/var/run Modified: csw/mgar/gar/v2-git/gar.conf.mk =================================================================== --- csw/mgar/gar/v2-git/gar.conf.mk 2009-11-18 03:12:37 UTC (rev 7336) +++ csw/mgar/gar/v2-git/gar.conf.mk 2009-11-18 08:57:57 UTC (rev 7337) @@ -164,6 +164,8 @@ DESTIMG ?= $(LOGNAME)-$(shell hostname) +# A default list of packages that everyone will depend on +COMMON_PKG_DEPENDS ?= CSWcommon # These are the core packages which must be installed for GAR to function correctly DEF_BASE_PKGS = CSWgmake CSWgtar CSWggrep CSWdiffutils CSWgfile CSWtextutils CSWwget CSWfindutils CSWgsed CSWgawk CSWbzip2 @@ -203,8 +205,8 @@ ARCHFLAGS_SOS11_sparcv9+vis = -xarch=v9a ARCHFLAGS_SOS12_sparcv9+vis = -m64 -xarch=sparcvis - ARCHFLAGS_GCC3_sparcv9+vis = -m64 -mcpu=v9 -mvis - ARCHFLAGS_GCC4_sparcv9+vis = -m64 -mcpu=v9 -mvis + ARCHFLAGS_GCC3_sparcv9+vis = -m64 -mcpu=ultrasparc -mvis + ARCHFLAGS_GCC4_sparcv9+vis = -m64 -mcpu=ultrasparc -mvis MEMORYMODEL_sparcv9+vis = 64 ARCHFLAGS_SOS11_sparcv9 = -xarch=v9 @@ -492,7 +494,7 @@ RUNPATH_LINKER_FLAGS ?= $(foreach D,$(RUNPATH_DIRS),$(addprefix -R,$(addsuffix /\$$ISALIST,$(filter $D,$(RUNPATH_ISALIST))) $(abspath $D/$(MM_LIBDIR)))) $(addprefix -R,$(filter-out $(RUNPATH_DIRS),$(RUNPATH_ISALIST))) $(EXTRA_RUNPATH_LINKER_FLAGS) endif -LINKER_FLAGS ?= $(foreach ELIB,$(libdir_install) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR))) $(EXTRA_LINKER_FLAGS) +LINKER_FLAGS ?= $(foreach ELIB,$(libpath_install) $(filter-out $(libpath_install),$(libdir_install)) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR))) $(EXTRA_LINKER_FLAGS) CC_HOME = $($(GARCOMPILER)_CC_HOME) CC = $($(GARCOMPILER)_CC) Modified: csw/mgar/gar/v2-git/gar.lib.mk =================================================================== --- csw/mgar/gar/v2-git/gar.lib.mk 2009-11-18 03:12:37 UTC (rev 7336) +++ csw/mgar/gar/v2-git/gar.lib.mk 2009-11-18 08:57:57 UTC (rev 7337) @@ -498,6 +498,12 @@ @( cd $* ; $(CONFIGURE_ENV) ruby ./setup.rb config $(CONFIGURE_ARGS) ) @$(MAKECOOKIE) +# WAF build, for details see http://code.google.com/p/waf/ +configure-%/waf: + @echo " ==> Running waf configure in $*" + cd $* && $(CONFIGURE_ENV) ./waf configure $(CONFIGURE_ARGS) + @$(MAKECOOKIE) + #################### BUILD RULES #################### # build from a standard gnu-style makefile's default rule. @@ -537,6 +543,12 @@ @( cd $* ; $(BUILD_ENV) ruby ./setup.rb setup $(BUILD_ARGS) ) @$(MAKECOOKIE) +# WAF build, for details see http://code.google.com/p/waf/ +build-%/waf: + @echo " ==> Running waf build in $*" + @$(cd $* ; (BUILD_ENV) ./waf build $(BUILD_ARGS) ) + @$(MAKECOOKIE) + # This can be: build, build_py, build_ext, build_clib, build_scripts # See setup.py --help-commands for details PYBUILD_CMD ?= build @@ -615,6 +627,12 @@ @( cd $* ; $(INSTALL_ENV) ruby ./setup.rb install --prefix=$(DESTDIR) ) @$(MAKECOOKIE) +# WAF build, for details see http://code.google.com/p/waf/ +install-%/waf: + @echo " ==> Running waf install in $*" + @$(cd $* ; (INSTALL_ENV) ./waf install $(INSTALL_ARGS) ) + @$(MAKECOOKIE) + # This can be: install, install_lib, install_headers, install_scripts, # or install_data. See setup.py --help-commands for details. PYINSTALL_CMD ?= install Modified: csw/mgar/gar/v2-git/gar.mk =================================================================== --- csw/mgar/gar/v2-git/gar.mk 2009-11-18 03:12:37 UTC (rev 7336) +++ csw/mgar/gar/v2-git/gar.mk 2009-11-18 08:57:57 UTC (rev 7337) @@ -46,14 +46,16 @@ DISTNAME ?= $(GARNAME)-$(GARVERSION) DYNSCRIPTS = $(foreach PKG,$(SPKG_SPECS),$(foreach SCR,$(ADMSCRIPTS),$(if $(value $(PKG)_$(SCR)), $(PKG).$(SCR)))) -_NOCHECKSUM += $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))) +_NOCHECKSUM += $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))) $(_EXTRA_GAR_NOCHECKSUM) +DISTFILES += $(_EXTRA_GAR_DISTFILES) + # Allow overriding of only specific components of ALLFILES by clearing e. g. 'ALLFILES_DYNSCRIPTS = ' ALLFILES_DISTFILES ?= $(DISTFILES) ALLFILES_PATCHFILES ?= $(PATCHFILES) $(foreach M,$(MODULATIONS),$(PATCHFILES_$M)) ALLFILES_DYNSCRIPTS ?= $(DYNSCRIPTS) ALLFILES_GIT_REPOS ?= $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))) -ALLFILES ?= $(sort $(ALLFILES_DISTFILES) $(ALLFILES_PATCHFILES) $(ALLFILES_DYNSCRIPTS) $(ALLFILES_GIT_REPOS) $(EXTRA_ALLFILES)) +ALLFILES ?= $(sort $(ALLFILES_DISTFILES) $(ALLFILES_PATCHFILES) $(ALLFILES_DYNSCRIPTS) $(ALLFILES_GIT_REPOS) $(EXTRA_ALLFILES) $(_EXTRA_GAR_ALLFILES)) ifeq ($(MAKE_INSTALL_DIRS),1) INSTALL_DIRS = $(addprefix $(DESTDIR),$(prefix) $(exec_prefix) $(bindir) $(sbindir) $(libexecdir) $(datadir) $(sysconfdir) $(sharedstatedir) $(localstatedir) $(libdir) $(infodir) $(lispdir) $(includedir) $(mandir) $(foreach NUM,1 2 3 4 5 6 7 8, $(mandir)/man$(NUM)) $(sourcedir)) @@ -191,6 +193,48 @@ $(eval $(call _modulate,$(MODULATORS))) +# --- This next block allows you to use collapsed ISAs in modulations +# isa-default-... instead of isa-sparcv8-... and isa-i386-... +# isa-default64-... instead of isa-sparcv9-... and isa-amd64-... +# isa-extra-... instead of any other ISA (if default64 is undefined it falls back to 'extra') + +__collapsedisa = $(strip $(or $(and $(filter $(ISA_DEFAULT_sparc) $(ISA_DEFAULT_i386),$(1)),default),\ + $(and $(filter $(ISA_DEFAULT64_sparc) $(ISA_DEFAULT64_i386),$(1)),default64),\ + extra)) + +__collapsedisa64 = default64 +__collapsedisaextra = extra + +__isacollapsedmodulation_1 = $(call tolower,$(1))-$(if $(filter ISA,$(1)),$(call $(2),$(ISA)),$($(1))) +__isacollapsedmodulation = $(if $(word 2,$(1)),\ + $(foreach P,$(call __isacollapsedmodulation_1,$(firstword $(1)),$(2)),\ + $(addprefix $(P)-,$(call __isacollapsedmodulation,$(wordlist 2,$(words $(1)),$(1))))\ + ),\ + $(call __isacollapsedmodulation_1,$(1),$(2))) + +# This is the name of the current modulation but with the ISA i386, sparcv8 and amd64, sparcv9 replaced +# with the collapsed name 'default', 'default64' and everything else as 'extra'. +MODULATION_ISACOLLAPSED = $(strip $(call __isacollapsedmodulation,$(strip $(MODULATORS)),__collapsedisa)) + +# This is the name of the current modulation but with the ISA replaced with 'default64' +MODULATION_ISACOLLAPSED64 = $(strip $(call __isacollapsedmodulation,$(strip $(MODULATORS)),__collapsedisa64)) + +# This is the name of the current modulation but with the ISA replaced with 'extra' +MODULATION_ISACOLLAPSEDEXTRA = $(strip $(call __isacollapsedmodulation,$(strip $(MODULATORS)),__collapsedisaextra)) + +# $(warning Mod: $(MODULATION) ISA: $(ISA) coll: $(MODULATION_ISACOLLAPSED) 64: $(MODULATION_ISACOLLAPSED64) extra: $(MODULATION_ISACOLLAPSEDEXTRA)) + +# Call this function to get either the modulation-specific value or the default. +# Instead of $(myvar_$(MODULATION)) $(call modulationvalue,myvar) +define modulationvalue +$(strip $(or $($(1)_$(MODULATION)),\ + $($(1)_$(call __isacollapsedmodulation,$(strip $(MODULATORS)),__collapsedisa)),\ + $($(1)_$(call __isacollapsedmodulation,$(strip $(MODULATORS)),__collapsedisaextra))\ +)) +endef + +# --- end of collapsed ISA modulations + #################### DIRECTORY MAKERS #################### # This is to make dirs as needed by the base rules @@ -590,10 +634,15 @@ MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-all $(EXTRA_MERGE_SCRIPTS_$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) else ISAEXEC_DIRS ?= $(if $(NO_ISAEXEC),,$(bindir) $(sbindir) $(libexecdir)) -MERGE_DIRS_isa-$(ISA_DEFAULT) ?= $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA_DEFAULT)) -MERGE_DIRS_isa-$(ISA) ?= $(bindir) $(sbindir) $(libexecdir) $(libdir) $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA)) -MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-relocate $(EXTRA_MERGE_SCRIPTS_isa-$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) -MERGE_SCRIPTS_isa-$(ISA) ?= copy-relocated-only $(EXTRA_MERGE_SCRIPTS_isa-$(ISA)) $(EXTRA_MERGE_SCRIPTS) +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_$(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_$(MODULATION_ISACOLLAPSED64) ?= $(MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSEDEXTRA)) +MERGE_SCRIPTS_$(MODULATION) ?= $(MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSED)) endif # These directories get relocated into their ISA subdirectories @@ -609,6 +658,10 @@ if test -f "$$F" -a \! -h "$$F"; then echo $$F; fi; \ done)),) +ifneq ($(COMMON_PKG_DEPENDS),) +_EXTRA_GAR_PKGS += $(COMMON_PKG_DEPENDS) +endif + ifneq ($(ISAEXEC_FILES),) _EXTRA_GAR_PKGS += CSWisaexec endif @@ -694,7 +747,7 @@ # The basic merge merges the compiles for all ISAs on the current architecture -merge: checksum pre-merge merge-do merge-license $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) post-merge +merge: checksum pre-merge merge-do merge-license merge-classutils $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) post-merge @$(DONADA) merge-do: $(if $(PARALLELMODULATIONS),merge-parallel,merge-sequential) @@ -718,7 +771,7 @@ merge-watch: _USEMULTITAIL=$(shell test -x $(MULTITAIL) && test -x $(TTY) && $(TTY) >/dev/null 2>&1; if [ $$? -eq 0 ]; then echo yes; fi) merge-watch: $(addprefix $(WORKROOTDIR)/build-,global $(MODULATIONS)) $(_DBG_MERGE)$(if $(_USEMULTITAIL),\ - $(MULTITAIL) --retry-all $(foreach M,$(MODULATIONS),$(WORKROOTDIR)/build-$M/build.log) -j & echo $$! > $(WORKROOTDIR)/build-global/multitail.pid,\ + $(MULTITAIL) --retry-all $(foreach M,$(MODULATIONS),$(WORKROOTDIR)/build-$M/build.log) -t "build(s) in progress" -wh 1 -j & echo $$! > $(WORKROOTDIR)/build-global/multitail.pid,\ echo "Building all ISAs in parallel. Please see the individual logfiles for details:";$(foreach M,$(MODULATIONS),echo "- $(WORKROOTDIR)/build-$M/build.log";)\ ) @@ -729,14 +782,14 @@ # Copy the whole tree verbatim merge-copy-all: $(PKGROOT) $(INSTALLISADIR) - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -p e -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 && pax -r -w -v $(_PAX_ARGS) \ $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/,p") \ . $(PKGROOT)) @$(MAKECOOKIE) # Copy only the merge directories merge-copy-only: $(PKGROOT) - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -p e -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 && pax -r -w -v $(_PAX_ARGS) \ $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/,p") -s ",.*,," \ . $(PKGROOT) \ ) @@ -744,7 +797,7 @@ # Copy the whole tree and relocate the directories in $(MERGE_DIRS) merge-copy-relocate: $(PKGROOT) $(INSTALLISADIR) - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -p e -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 && pax -r -w -v $(_PAX_ARGS) \ $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/$(ISA)/,p") \ . $(PKGROOT) \ ) @@ -752,7 +805,7 @@ # Copy only the relocated directories merge-copy-relocated-only: $(PKGROOT) $(INSTALLISADIR) - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -p e -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 && pax -r -w -v $(_PAX_ARGS) \ $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/$(ISA)/,p") -s ",.*,," \ . $(PKGROOT) \ ) @@ -760,7 +813,7 @@ # Copy merge-copy-config-only: - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -p e -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 && pax -r -w -v $(_PAX_ARGS) \ -s ",^\(\.$(bindir)/.*-config\)\$$,\1,p" \ -s ",.*,," \ . $(PKGROOT) \ @@ -770,7 +823,7 @@ .PHONY: remerge reset-merge reset-merge-modulated remerge: reset-merge merge -reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-src +reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-classutils reset-merge-src @rm -f $(COOKIEDIR)/pre-merge $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge $(COOKIEDIR)/post-merge @rm -rf $(PKGROOT) @$(DONADA) Modified: csw/mgar/gar/v2-git/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-git/gar.pkg.mk 2009-11-18 03:12:37 UTC (rev 7336) +++ csw/mgar/gar/v2-git/gar.pkg.mk 2009-11-18 08:57:57 UTC (rev 7337) @@ -165,10 +165,22 @@ $(SPKG_CLASSES) $(if $($(1)),$(if $(filter $(2),$(SPKG_CLASSES)),,$(2))) endef +MIGRATECONF ?= $(strip $(foreach S,$(SPKG_SPECS),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),/etc/opt/csw/pkg/$S/cswmigrateconf))) + +# It is NOT sufficient to change the pathes here, they must be adjusted in merge-* also +_USERGROUP_FILES ?= $(strip $(foreach S,$(SPKG_SPECS),$(if $(value $(S)_usergroup),/etc/opt/csw/pkg/$S/cswusergroup))) +_INETDCONF_FILES ?= $(strip $(foreach S,$(SPKG_SPECS),$(if $(value $(S)_inetdconf),/etc/opt/csw/pkg/$S/inetd.conf))) +_ETCSERVICES_FILES ?= $(strip $(foreach S,$(SPKG_SPECS),$(if $(value $(S)_etcservices),/etc/opt/csw/pkg/$S/services))) + +USERGROUP += $(_USERGROUP_FILES) +INETDCONF += $(_INETDCONF_FILES) +ETCSERVICES += $(_ETCSERVICES_FILES) + # NOTE: Order _can_ be important here. cswinitsmf and cswinetd should # always be the last two added. The reason for this is that # you need to ensure any binaries and config files are already on disk # and able to be consumed by a service that might be started. +SPKG_CLASSES := $(call _spkg_cond_add,MIGRATECONF,cswmigrateconf) SPKG_CLASSES := $(call _spkg_cond_add,SAMPLECONF,cswcpsampleconf) SPKG_CLASSES := $(call _spkg_cond_add,PRESERVECONF,cswpreserveconf) SPKG_CLASSES := $(call _spkg_cond_add,ETCSERVICES,cswetcservices) @@ -177,9 +189,13 @@ SPKG_CLASSES := $(call _spkg_cond_add,INETDCONF,cswinetd) SPKG_CLASSES := $(call _spkg_cond_add,INITSMF,cswinitsmf) +# This is the default path for texinfo pages to be picked up. Extend or replace as necessary. +TEXINFO ?= $(infodir)/.*\.info(?:-\d+)? $(EXTRA_TEXINFO) + # - set class for all config files -ifneq ($(SAMPLECONF)$(PRESERVECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),) +ifneq ($(SAMPLECONF)$(PRESERVECONF)$(MIGRATECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE)$(TEXINFO),) _CSWCLASS_FILTER = | perl -ane '\ + $(foreach FILE,$(MIGRATECONF),$$F[1] = "cswmigrateconf" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(SAMPLECONF:%\.CSW=%),$$F[1] = "cswcpsampleconf" if ( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ $(foreach FILE,$(PRESERVECONF:%\.CSW=%),$$F[1] = "cswpreserveconf" if( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ $(foreach FILE,$(ETCSERVICES),$$F[1] = "cswetcservices" if( $$F[2] =~ m(^$(FILE)$$) );)\ @@ -187,7 +203,9 @@ $(foreach FILE,$(INITSMF),$$F[1] = "cswinitsmf" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(USERGROUP),$$F[1] = "cswusergroup" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(if $(PYCOMPILE),$(foreach FILE,$(_PYCOMPILE_FILES),$$F[1] = "cswpycompile" if( $$F[2] =~ m(^$(FILE)$$) );))\ + $(foreach FILE,$(TEXINFO),$$F[1] = "cswtexinfo" if( $$F[2] =~ m(^$(FILE)$$) );)\ print join(" ", at F),"\n";' + _EXTRA_GAR_PKGS += CSWcswclassutils # Make sure the configuration files always have a .CSW suffix and rename the # configuration files to this if necessary during merge. @@ -274,9 +292,6 @@ $(strip $(foreach S,$(filter-out $(1),$(_PKG_SPECS)), $(PKGFILES_$(S)) - $(EXTRA_PKGFILES_EXCLUDED) - $(EXTRA_PKGFILES_EXCLUDED_$(1)) - $(_EXTRA_PKGFILES_EXCLUDED) ) ) endef @@ -368,8 +383,10 @@ -n "$(_PKGFILES_EXCLUDE)" -o \ -n "$(ISAEXEC_FILES_$*)" -o \ -n "$(ISAEXEC_FILES)" ]; then \ - (pathfilter $(if $(or $(_PKGFILES_EXCLUDE),$(_PKGFILES_INCLUDE)),-I $(call licensedir,$*)/license) \ - $(foreach S,$(filter-out $*,$(SPKG_SPECS)),-X $(call licensedir,$S)/license) \ + (pathfilter $(if $(or $(_PKGFILES_EXCLUDE),$(_PKGFILES_INCLUDE)),-I $(call licensedir,$*)/license -I /etc/opt/csw/pkg/$*/cswmigrateconf) \ + $(foreach S,$(filter-out $*,$(SPKG_SPECS)),-X $(call licensedir,$S)/license -X /etc/opt/csw/pkg/$S/cswmigrateconf) \ + $(foreach I,$(EXTRA_PKGFILES_INCLUDED) $(EXTRA_PKGFILES_INCLUDED_$*),-i '$I') \ + $(foreach X,$(EXTRA_PKGFILES_EXCLUDED) $(EXTRA_PKGFILES_EXCLUDED_$*),-x '$X') \ $(foreach FILE,$(_PKGFILES_INCLUDE),-i '$(FILE)') \ $(if $(_PKGFILES_INCLUDE),-x '.*',$(foreach FILE,$(_PKGFILES_EXCLUDE),-x '$(FILE)')) \ $(foreach IE,$(abspath $(ISAEXEC_FILES_$*) $(ISAEXEC_FILES)), \ @@ -401,6 +418,13 @@ # $_EXTRA_GAR_PKGS is for dynamic dependencies added by GAR itself (like CSWisaexec or CSWcswclassutils) .PRECIOUS: $(WORKDIR)/%.depend + +# The texinfo filter has been taken out of the normal filters as TEXINFO has a default. +# The dependencies to CSWcswclassutils and CSWtexinfo are only added if there are files +# actually matching the _TEXINFO_FILTER. This is done at the prototype-level. +$(WORKDIR)/%.depend: $(WORKDIR)/$*.prototype +$(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach FILE,$(TEXINFO),print "$$F[2]\n" if( $$F[2] =~ m(^$(FILE)$$) );)'),CSWcswclassutils) + $(WORKDIR)/%.depend: $(WORKDIR) $(_DBG)$(if $(_EXTRA_GAR_PKGS)$(REQUIRED_PKGS_$*)$(REQUIRED_PKGS)$(INCOMPATIBLE_PKGS)$(INCOMPATIBLE_PKGS_$*), \ ($(foreach PKG,$(INCOMPATIBLE_PKGS_$*) $(INCOMPATIBLE_PKGS),\ @@ -489,7 +513,7 @@ endef define pkgvar -$(if $($(1)_$(2)),$($(1)_$(2)),$($(1))) +$(strip $(if $($(1)_$(2)),$($(1)_$(2)),$($(1)))) endef # Make sure every producable package contains specific descriptions. @@ -501,6 +525,11 @@ ))) .PRECIOUS: $(WORKDIR)/%.pkginfo + +# The texinfo filter has been taken out of the normal filters as TEXINFO has a default. +$(WORKDIR)/%.pkginfo: $(WORKDIR)/%.prototype +$(WORKDIR)/%.pkginfo: SPKG_CLASSES += $(if $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach FILE,$(TEXINFO),print "$$F[2]\n" if( $$F[2] =~ m(^$(FILE)$$) );)'),cswtexinfo) + $(WORKDIR)/%.pkginfo: $(WORKDIR) $(_DBG)(echo "PKG=$*"; \ echo "NAME=$(call catalogname,$*) - $(call pkgvar,SPKG_DESC,$*)"; \ @@ -547,7 +576,7 @@ if [ -f "$$LICENSEFILE" ]; then cp $$LICENSEFILE $(WORKDIR)/$*.copyright; fi;, \ echo "Please see $$LICENSEDIR/license for license information." > $(WORKDIR)/$*.copyright; \ ) \ - mkdir -p $(PKGROOT)$$LICENSEDIR && \ + umask 022 && mkdir -p $(PKGROOT)$$LICENSEDIR && \ rm -f $(PKGROOT)$$LICENSEDIR/license && \ cp $$LICENSEFILE $(PKGROOT)$$LICENSEDIR/license; \ fi \ @@ -559,9 +588,70 @@ reset-merge-license: @rm -f $(COOKIEDIR)/merge-license $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-license-$(SPEC)) - @$(DONADA) +merge-classutils: merge-migrateconf merge-usergroup merge-inetdconf merge-etcservices +reset-merge-classutils: reset-merge-migrateconf reset-merge-usergroup reset-merge-inetdconf reset-merge-etcservices + +merge-migrateconf: $(foreach S,$(SPKG_SPECS),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),merge-migrateconf-$S)) + @$(MAKECOOKIE) + +merge-migrateconf-%: MIGRATE_FILES_$* ?= $(MIGRATE_FILES) +merge-migrateconf-%: MIGRATE_SOURCE_DIR_$* ?= $(MIGRATE_SOURCE_DIR) +merge-migrateconf-%: MIGRATE_DEST_DIR_$* ?= $(MIGRATE_DEST_DIR) +merge-migrateconf-%: + @echo "[ Generating cswmigrateconf for package $* ]" + $(_DBG)ginstall -d $(PKGROOT)/etc/opt/csw/pkg/$* + $(_DBG)(echo "MIGRATE_FILES=\"$(MIGRATE_FILES_$*)\"";\ + $(if $(MIGRATE_SOURCE_DIR_$*),echo "SOURCE_DIR___default__=\"$(MIGRATE_SOURCE_DIR_$*)\"";)\ + $(if $(MIGRATE_DEST_DIR_$*),echo "DEST_DIR___default__=\"$(MIGRATE_DEST_DIR_$*)\"";)\ + $(foreach F,$(MIGRATE_FILES_$*),\ + $(if $(MIGRATE_SOURCE_DIR_$F),echo "SOURCE_DIR_$(subst .,_,$F)=\"$(MIGRATE_SOURCE_DIR_$F)\"";)\ + $(if $(MIGRATE_DEST_DIR_$F),echo "DEST_DIR_$(subst .,_,$F)=\"$(MIGRATE_DEST_DIR_$F)\"";)\ + )\ + ) >$(PKGROOT)/etc/opt/csw/pkg/$*/cswmigrateconf + @$(MAKECOOKIE) + +reset-merge-migrateconf: + @rm -f $(COOKIEDIR)/merge-migrateconf $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-migrateconf-$(SPEC)) + +_show_classutilvar//%: + $($*) + +merge-usergroup: $(foreach S,$(SPKG_SPECS),$(if $(value $(S)_usergroup),merge-usergroup-$S)) + @$(MAKECOOKIE) + +merge-usergroup-%: + @echo "[ Generating cswusergroup for package $* ]" + $(_DBG)ginstall -d $(PKGROOT)/etc/opt/csw/pkg/$* + $(_DBG)$(MAKE) --no-print-directory -n _show_classutilvar//$*_usergroup >$(PKGROOT)/etc/opt/csw/pkg/$*/cswusergroup + @$(MAKECOOKIE) + +reset-merge-usergroup: + @rm -f $(COOKIEDIR)/merge-usergroup $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-usergroup-$(SPEC)) + +merge-inetdconf: $(foreach S,$(SPKG_SPECS),$(if $(value $(S)_inetdconf),merge-inetdconf-$S)) + +merge-inetdconf-%: + @echo "[ Generating inetd.conf for package $* ]" + $(_DBG)ginstall -d $(PKGROOT)/etc/opt/csw/pkg/$* + $(_DBG)$(MAKE) --no-print-directory -n _show_classutilvar//$*_inetdconf >$(PKGROOT)/etc/opt/csw/pkg/$*/inetd.conf + @$(MAKECOOKIE) + +reset-merge-inetdconf: + @rm -f $(COOKIEDIR)/merge-inetdconf $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-inetdconf-$(SPEC)) + +merge-etcservices: $(foreach S,$(SPKG_SPECS),$(if $(value $(S)_etcservices),merge-etcservices-$S)) + +merge-etcservices-%: + @echo "[ Generating services for package $* ]" + $(_DBG)ginstall -d $(PKGROOT)/etc/opt/csw/pkg/$* + $(_DBG)$(MAKE) --no-print-directory -n _show_classutilvar//$*_etcservices >$(PKGROOT)/etc/opt/csw/pkg/$*/services + @$(MAKECOOKIE) + +reset-merge-etcservices: + @rm -f $(COOKIEDIR)/merge-etcservices $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-etcservices-$(SPEC)) + merge-src: _SRCDIR=$(PKGROOT)$(sourcedir)/$(call catalogname,$(SRCPACKAGE_BASE)) merge-src: fetch $(_DBG)mkdir -p $(_SRCDIR)/files @@ -579,11 +669,7 @@ # package - Use the mkpackage utility to create Solaris packages # -ifneq ($(ENABLE_CHECK),0) -PACKAGE_TARGETS = $(foreach SPEC,$(_PKG_SPECS), package-$(SPEC) pkgcheck-$(SPEC)) -else PACKAGE_TARGETS = $(foreach SPEC,$(_PKG_SPECS), package-$(SPEC)) -endif SPKG_DESTDIRS = $(SPKG_SPOOLDIR) $(SPKG_EXPORT) @@ -610,7 +696,9 @@ # We depend on extract as the additional package files (like .gspec) must be # unpacked to global/ for packaging. E. g. 'merge' depends only on the specific # modulations and does not fill global/. -_package: validateplatform extract-global merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package +ENABLE_CHECK ?= 1 +_package: validateplatform extract-global merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package $(if $(ENABLE_CHECK),pkgcheck) + @$(MAKECOOKIE) package: _package @echo @@ -624,7 +712,7 @@ @$(foreach SPEC,$(_PKG_SPECS),printf " %-20s %s\n" $(SPEC) $(SPKG_EXPORT)/$(shell $(call _PKG_ENV,$(SPEC)) $(GARBIN)/mkpackage -qs $(WORKDIR)/$(SPEC).gspec -D pkgfile).gz;) # The dynamic pkginfo is only generated for dynamic gspec-files -package-%: $(WORKDIR)/%.gspec $(if $(findstring %.gspec,$(DISTFILES)),,$(WORKDIR)/%.pkginfo) $(WORKDIR)/%.prototype-$(GARCH) $(WORKDIR)/%.depend +package-%: $(WORKDIR)/%.gspec $(WORKDIR)/%.prototype-$(GARCH) $(WORKDIR)/%.depend $(if $(findstring %.gspec,$(DISTFILES)),,$(WORKDIR)/%.pkginfo) @echo " ==> Processing $*.gspec" $(_DBG)( $(call _PKG_ENV,$*) mkpackage --spec $(WORKDIR)/$*.gspec \ --spooldir $(SPKG_SPOOLDIR) \ @@ -642,13 +730,10 @@ # pkgcheck - check if the package is compliant # -pkgcheck: $(addprefix pkgcheck-,$(_PKG_SPECS)) - @$(DONADA) +pkgcheck: $(foreach SPEC,$(_PKG_SPECS),package-$(SPEC)) + $(_DBG)( LC_ALL=C $(GARBIN)/checkpkg $(foreach SPEC,$(_PKG_SPECS),$(SPKG_EXPORT)/`$(call _PKG_ENV,$(SPEC)) mkpackage -qs $(WORKDIR)/$(SPEC).gspec -D pkgfile`.gz ) || exit 2;) + @$(MAKECOOKIE) -pkgcheck-%: - @echo " ==> Checking compliance: $*" - @( LC_ALL=C $(GARBIN)/checkpkg $(SPKG_EXPORT)/`$(call _PKG_ENV,$1) mkpackage -qs $(WORKDIR)/$*.gspec -D pkgfile`.gz ) || exit 2 - pkgcheck-p: @$(foreach COOKIEFILE,$(PKGCHECK_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) @@ -660,12 +745,13 @@ reset-package: pkgreset +# Make sure we don't delete files we deliberately added with DISTFILES. They +# will not be copied to WORKDIR again. pkgreset-%: @echo " ==> Reset packaging state for $* ($(DESTIMG))" - @rm -rf $(foreach T,extract checksum package pkgcheck,$(COOKIEDIR)/*$(T)-$**) - @rm -rf $(COOKIEDIR)/pre-package $(COOKIEDIR)/post-package - @rm -rf $(WORKDIR)/$*.* $(WORKDIR)/prototype - @rm -f $(WORKDIR)/copyright $(WORKDIR)/*.copyright + $(_DBG)rm -rf $(foreach T,extract checksum package pkgcheck,$(COOKIEDIR)/*$(T)-$**) + $(_DBG)rm -rf $(COOKIEDIR)/pre-package $(COOKIEDIR)/post-package + $(_DBG)rm -rf $(addprefix $(WORKDIR)/,$(filter-out $(DISTFILES),$(patsubst $(WORKDIR)/%,%,$(wildcard $(WORKDIR)/$*.*)) prototype copyright $*.copyright)) repackage: pkgreset package @@ -676,7 +762,7 @@ $(if $(PACKAGING_HOST_$P),\ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ $(MAKE) PLATFORM=$P _package && ,\ - $(SSH) -t $(PACKAGING_HOST_$P) "$(MAKE) -C $(CURDIR) PLATFORM=$P _package" && \ + $(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) PLATFORM=$P _package" && \ ),\ $(error *** No host has been defined for platform $P)\ )\ @@ -690,7 +776,7 @@ echo " (built on this host)";\ $(MAKE) -s PLATFORM=$P _pkgshow;echo;,\ echo " (built on host '$(PACKAGING_HOST_$P)')";\ - $(SSH) $(PACKAGING_HOST_$P) "$(MAKE) -C $(CURDIR) -s PLATFORM=$P _pkgshow";echo;\ + $(SSH) $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) -s PLATFORM=$P _pkgshow";echo;\ )\ ) @$(MAKECOOKIE) Modified: csw/mgar/gar/v2-git/pkglib/csw/depend.perl =================================================================== --- csw/mgar/gar/v2-git/pkglib/csw/depend.perl 2009-11-18 03:12:37 UTC (rev 7336) +++ csw/mgar/gar/v2-git/pkglib/csw/depend.perl 2009-11-18 08:57:57 UTC (rev 7337) @@ -1,2 +1 @@ -P CSWcommon common - common files and dirs for CSW packages P CSWperl perl - A high-level, general-purpose programming language Modified: csw/mgar/gar/v2-git/pkglib/csw_cpan.gspec =================================================================== --- csw/mgar/gar/v2-git/pkglib/csw_cpan.gspec 2009-11-18 03:12:37 UTC (rev 7336) +++ csw/mgar/gar/v2-git/pkglib/csw_cpan.gspec 2009-11-18 08:57:57 UTC (rev 7337) @@ -1,5 +1,6 @@ %include url file://%{PKGLIB}/csw_vars.gspec %pkginfo url file://%{PKGLIB}/csw/pkginfo %prototype exec cswproto -s %{TIMESTAMP} -r %{DESTDIR} %{DESTDIR} +%depend:merge url file://%{PKGLIB}/csw/depend %depend:merge url file://%{PKGLIB}/csw/depend.perl %depend exec gawk '$1 ~ /f/{print $3}' %{prototype} | depmaker --root %{DESTDIR} --nodep %{pkgname} %{DEPMAKER_EXTRA_ARGS} Copied: csw/mgar/gar/v2-git/pkglib/csw_cpan_dyngspec.gspec (from rev 7336, csw/mgar/gar/v2/pkglib/csw_cpan_dyngspec.gspec) =================================================================== --- csw/mgar/gar/v2-git/pkglib/csw_cpan_dyngspec.gspec (rev 0) +++ csw/mgar/gar/v2-git/pkglib/csw_cpan_dyngspec.gspec 2009-11-18 08:57:57 UTC (rev 7337) @@ -0,0 +1,5 @@ +%include url file://%{PKGLIB}/csw_vars.gspec +%pkginfo url file://%{PKGLIB}/csw/pkginfo +%prototype exec cswproto -s %{TIMESTAMP} -r %{DESTDIR} %{DESTDIR} +%depend:merge url file://%{PKGLIB}/csw/depend.perl +%depend exec gawk '$1 ~ /f/{print $3}' %{prototype} | depmaker --root %{DESTDIR} --nodep %{pkgname} %{DEPMAKER_EXTRA_ARGS} Modified: csw/mgar/gar/v2-git/pkglib/csw_dyngspec.gspec =================================================================== --- csw/mgar/gar/v2-git/pkglib/csw_dyngspec.gspec 2009-11-18 03:12:37 UTC (rev 7336) +++ csw/mgar/gar/v2-git/pkglib/csw_dyngspec.gspec 2009-11-18 08:57:57 UTC (rev 7337) @@ -1,5 +1,4 @@ %include url file://%{PKGLIB}/csw_vars.gspec %include url file://%{PKGLIB}/csw_prototype.gspec %pkginfo url file://%{WORKSRC}/csw/pkginfo -%depend:merge url file://%{PKGLIB}/csw/depend %include url file://%{PKGLIB}/std_depend.gspec 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 Nov 18 11:52:23 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 18 Nov 2009 10:52:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7338] csw/mgar/pkg/cups/trunk/Makefile Message-ID: Revision: 7338 http://gar.svn.sourceforge.net/gar/?rev=7338&view=rev Author: wahwah Date: 2009-11-18 10:52:23 +0000 (Wed, 18 Nov 2009) Log Message: ----------- cups: Adding CSWcupsclient-ln Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2009-11-18 08:57:57 UTC (rev 7337) +++ csw/mgar/pkg/cups/trunk/Makefile 2009-11-18 10:52:23 UTC (rev 7338) @@ -71,8 +71,13 @@ SPKG_CLASSES = none cswcpsampleconf cswinitsmf -PACKAGES = CSWlibcups CSWcupsd CSWcupsclient CSWcupsdoc CSWcupsdev CSWcups +PACKAGES = CSWlibcups CSWcupsd CSWcupsclient CSWcupsdoc CSWcupsdev CSWcups +PACKAGES += CSWcupsclient-ln +INCOMPATIBLE_PKGS_CSWcupsclient-ln = SUNWpcr SUNWpcu +CATALOGNAME_CSWcupsclient-ln = cupsclient_ln +ARCHALL_CSWcupsclient-ln = 1 + ARCHALL_CSWcupsdoc = 1 ARCHALL_CSWcupsdev = 1 @@ -88,6 +93,7 @@ REQUIRED_PKGS_CSWcupsdev = REQUIRED_PKGS_CSWlibcups = CSWjpeg CSWpng CSWtiff CSWzlib REQUIRED_PKGS_CSWlibcups += CSWgcrypt CSWgnutls CSWgpgerr CSWlibtasn1 CSWosslrt +REQUIRED_PKGS_CSWcupsclient-ln = CSWcupsclient PKGFILES_CSWlibcups = $(libdir)/libcups.* @@ -144,6 +150,8 @@ PKGFILES_CSWcupsclient += $(mandir)/man5/ppdcfile\.5 PKGFILES_CSWcupsclient += $(mandir)/man7/(drv|notifier)\.7 PKGFILES_CSWcupsclient += $(sysconfdir)/cups/client\.conf\.CSW +PKGFILES_CSWcupsclient-ln = /usr/sbin/.* +PKGFILES_CSWcupsclient-ln += /usr/bin/.* SPKG_DESC_CSWcups = Common Unix Printing System SPKG_DESC_CSWlibcups = CUPS libraries @@ -151,6 +159,7 @@ SPKG_DESC_CSWcupsclient = CUPS client binaries SPKG_DESC_CSWcupsdoc = CUPS documentation SPKG_DESC_CSWcupsdev = CUPS header files +SPKG_DESC_CSWcupsclient-ln = Drop-in replacement for SUNWpcu and SUNWpcr # http://lists.opencsw.org/pipermail/maintainers/2009-September/004249.html SAMPLECONF = $(sysconfdir)/cups/cupsd\.conf\.CSW @@ -199,7 +208,7 @@ include gar/category.mk -post-install-modulated: +post-install: (cd $(DESTDIR)$(sysconfdir)/cups; \ echo "Making .CSW configs in $(DESTDIR)$(sysconfdir)/cups"; \ for i in cupsd.conf; do \ @@ -212,4 +221,12 @@ ginstall -m 644 \ $(FILEDIR)/client.conf.CSW \ $(DESTDIR)$(sysconfdir)/cups/client.conf.CSW + ginstall -d -m 755 $(DESTDIR)/usr/bin + for f in cancel lp lpoptions lppassd lpq lpr lprm lpstat; do \ + ln -s ../../opt/csw/bin/$$f $(DESTDIR)/usr/bin/$$f; \ + done + ginstall -d -m 755 $(DESTDIR)/usr/sbin + for f in accept lpadmin lpc lpinfo lpmove reject; do \ + ln -s ../../opt/csw/sbin/$$f $(DESTDIR)/usr/sbin/$$f; \ + done @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Nov 18 12:24:59 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 18 Nov 2009 11:24:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[7339] csw/mgar/pkg/postgresql/trunk/Makefile Message-ID: Revision: 7339 http://gar.svn.sourceforge.net/gar/?rev=7339&view=rev Author: wahwah Date: 2009-11-18 11:24:58 +0000 (Wed, 18 Nov 2009) Log Message: ----------- postgresql: Fix for the /etc/opt/csw/pkg/$(GARNAME) directory Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2009-11-18 10:52:23 UTC (rev 7338) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2009-11-18 11:24:58 UTC (rev 7339) @@ -84,7 +84,7 @@ ginstall \ $(WORKDIR)/cswpostgres \ $(PKGROOT)/etc/opt/csw/init.d/cswpostgres-$(BASE_VERSION) - ginstall -d $(PKGROOT)/opt/csw/etc/pkg/$(GARNAME) + ginstall -d $(PKGROOT)/etc/opt/csw/pkg/$(GARNAME) ginstall $(WORKDIR)/cswusergroup \ $(PKGROOT)/etc/opt/csw/pkg/postgresql/$(GARNAME)-$(BASE_VERSION) ginstall -d $(PKGROOT)/etc/opt/csw/$(GARNAME)-$(BASE_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 Wed Nov 18 15:45:35 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Nov 2009 14:45:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[7340] csw/mgar/pkg Message-ID: Revision: 7340 http://gar.svn.sourceforge.net/gar/?rev=7340&view=rev Author: dmichelsen Date: 2009-11-18 14:45:18 +0000 (Wed, 18 Nov 2009) Log Message: ----------- icecast: Initial commit Added Paths: ----------- csw/mgar/pkg/icecast/ csw/mgar/pkg/icecast/branches/ csw/mgar/pkg/icecast/tags/ csw/mgar/pkg/icecast/trunk/ csw/mgar/pkg/icecast/trunk/Makefile csw/mgar/pkg/icecast/trunk/checksums csw/mgar/pkg/icecast/trunk/files/ Property changes on: csw/mgar/pkg/icecast/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/icecast/trunk/Makefile =================================================================== --- csw/mgar/pkg/icecast/trunk/Makefile (rev 0) +++ csw/mgar/pkg/icecast/trunk/Makefile 2009-11-18 14:45:18 UTC (rev 7340) @@ -0,0 +1,27 @@ +GARNAME = icecast +GARVERSION = 2.3.2 +CATEGORIES = apps + +DESCRIPTION = A free server software for streaming multimedia +define BLURB +endef + +MASTER_SITES = http://downloads.xiph.org/releases/icecast/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.icecast.org/ + +REQUIRED_PKGS = CSWlibogg CSWosslrt CSWtheora CSWvorbis CSWzlib +REQUIRED_PKGS += CSWcurlrt CSWlibidn CSWoldaprt CSWspeex + +PREREQUISITE_PKGS = $(REQUIRED_PKGS) + +sysconfdir = /etc/opt/csw +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/icecast/trunk/checksums =================================================================== --- csw/mgar/pkg/icecast/trunk/checksums (rev 0) +++ csw/mgar/pkg/icecast/trunk/checksums 2009-11-18 14:45:18 UTC (rev 7340) @@ -0,0 +1 @@ +ff516b3ccd2bcc31e68f460cd316093f icecast-2.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 Nov 18 16:00:25 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Nov 2009 15:00:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7341] csw/mgar/pkg/icecast/trunk/Makefile Message-ID: Revision: 7341 http://gar.svn.sourceforge.net/gar/?rev=7341&view=rev Author: dmichelsen Date: 2009-11-18 15:00:23 +0000 (Wed, 18 Nov 2009) Log Message: ----------- icecast: Add more requirements Modified Paths: -------------- csw/mgar/pkg/icecast/trunk/Makefile Modified: csw/mgar/pkg/icecast/trunk/Makefile =================================================================== --- csw/mgar/pkg/icecast/trunk/Makefile 2009-11-18 14:45:18 UTC (rev 7340) +++ csw/mgar/pkg/icecast/trunk/Makefile 2009-11-18 15:00:23 UTC (rev 7341) @@ -16,6 +16,7 @@ REQUIRED_PKGS = CSWlibogg CSWosslrt CSWtheora CSWvorbis CSWzlib REQUIRED_PKGS += CSWcurlrt CSWlibidn CSWoldaprt CSWspeex +REQUIRED_PKGS += CSWiconv CSWlibnet CSWlibxml2 CSWlibxslt CSWsasl PREREQUISITE_PKGS = $(REQUIRED_PKGS) 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 Nov 18 17:57:47 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Nov 2009 16:57:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[7342] csw/mgar/pkg Message-ID: Revision: 7342 http://gar.svn.sourceforge.net/gar/?rev=7342&view=rev Author: dmichelsen Date: 2009-11-18 16:57:47 +0000 (Wed, 18 Nov 2009) Log Message: ----------- liboggz: Initial commit Added Paths: ----------- csw/mgar/pkg/liboggz/ csw/mgar/pkg/liboggz/branches/ csw/mgar/pkg/liboggz/tags/ csw/mgar/pkg/liboggz/trunk/ csw/mgar/pkg/liboggz/trunk/Makefile csw/mgar/pkg/liboggz/trunk/checksums csw/mgar/pkg/liboggz/trunk/files/ csw/mgar/pkg/liboggz/trunk/files/0001-Remove-linker-version.patch Property changes on: csw/mgar/pkg/liboggz/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/liboggz/trunk/Makefile =================================================================== --- csw/mgar/pkg/liboggz/trunk/Makefile (rev 0) +++ csw/mgar/pkg/liboggz/trunk/Makefile 2009-11-18 16:57:47 UTC (rev 7342) @@ -0,0 +1,34 @@ +GARNAME = liboggz +GARVERSION = 1.1.0 +CATEGORIES = lib + +DESCRIPTION = A commandline tool for manipulating Ogg files +define BLURB + Oggz comprises liboggz and the tool oggz, which provides commands to inspect, edit + and validate Ogg files. The oggz-chop tool can also be used to serve time ranges of + Ogg media over HTTP by any web server that supports CGI. + + liboggz is a C library for reading and writing Ogg files and streams. It offers various + improvements over the reference libogg, including support for seeking, validation and + timestamp interpretation. +endef + +MASTER_SITES = http://downloads.xiph.org/releases/liboggz/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Remove-linker-version.patch + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +PREREQUISITE_PKGS = CSWdoxygen +REQUIRED_PKGS = CSWlibogg + +BUILD64 = 1 +NO_ISAEXEC = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +MERGE_DIRS_isa-extra = $(libdir) + +include gar/category.mk Added: csw/mgar/pkg/liboggz/trunk/checksums =================================================================== --- csw/mgar/pkg/liboggz/trunk/checksums (rev 0) +++ csw/mgar/pkg/liboggz/trunk/checksums 2009-11-18 16:57:47 UTC (rev 7342) @@ -0,0 +1,2 @@ +f4ec200018ed77f1cb44fee2c4687d49 0001-Remove-linker-version.patch +f97f1d57820a9fc1d080409cf203b38a liboggz-1.1.0.tar.gz Added: csw/mgar/pkg/liboggz/trunk/files/0001-Remove-linker-version.patch =================================================================== --- csw/mgar/pkg/liboggz/trunk/files/0001-Remove-linker-version.patch (rev 0) +++ csw/mgar/pkg/liboggz/trunk/files/0001-Remove-linker-version.patch 2009-11-18 16:57:47 UTC (rev 7342) @@ -0,0 +1,55 @@ +From 98520890bdf48d718490927f04197c48a1958647 Mon Sep 17 00:00:00 2001 +From: dam +Date: Mon, 9 Nov 2009 03:55:19 +0100 +Subject: [PATCH] Remove linker version + +--- + configure | 8 -------- + configure.ac | 12 ------------ + 2 files changed, 0 insertions(+), 20 deletions(-) + +diff --git a/configure b/configure +index 9342074..cafccae 100755 +--- a/configure ++++ b/configure +@@ -15629,14 +15629,6 @@ if test "x${ac_enable_gcc_werror}" = xyes ; then + fi + + +-case "$target_os" in +- linux* | solaris*|k*bsd*-gnu*|gnu-*) +- SHLIB_VERSION_ARG="-Wl,--version-script=Version_script" +- ;; +- *) +- ;; +-esac +- + # Checks for library functions. + + +diff --git a/configure.ac b/configure.ac +index bc9acb8..1098ca1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -396,18 +396,6 @@ if test "x${ac_enable_gcc_werror}" = xyes ; then + CFLAGS="-Werror $CFLAGS" + fi + +-dnl +-dnl Shared library symbol versioning and hiding +-dnl +- +-case "$target_os" in +- linux* | solaris*|k*bsd*-gnu*|gnu-*) +- SHLIB_VERSION_ARG="-Wl,--version-script=Version_script" +- ;; +- *) +- ;; +-esac +- + # Checks for library functions. + + dnl +-- +1.6.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Wed Nov 18 18:12:31 2009 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Wed, 18 Nov 2009 17:12:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7343] csw/mgar/pkg Message-ID: Revision: 7343 http://gar.svn.sourceforge.net/gar/?rev=7343&view=rev Author: bensons Date: 2009-11-18 17:12:31 +0000 (Wed, 18 Nov 2009) Log Message: ----------- tunctl: initial GAR commit Added Paths: ----------- csw/mgar/pkg/tunctl/ csw/mgar/pkg/tunctl/branches/ csw/mgar/pkg/tunctl/tags/ csw/mgar/pkg/tunctl/trunk/ csw/mgar/pkg/tunctl/trunk/Makefile csw/mgar/pkg/tunctl/trunk/checksums Property changes on: csw/mgar/pkg/tunctl/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/tunctl/trunk/Makefile =================================================================== --- csw/mgar/pkg/tunctl/trunk/Makefile (rev 0) +++ csw/mgar/pkg/tunctl/trunk/Makefile 2009-11-18 17:12:31 UTC (rev 7343) @@ -0,0 +1,29 @@ +GARNAME = tunctl +GARVERSION = 1.5 +CATEGORIES = net + +DESCRIPTION = Used to set up and maintain persistent TUN/TAP network interface +define BLURB + tunctl is used to set up and maintain persistent TUN/TAP network interfaces, + enabling user applications to simulate network traffic. Such interfaces + is useful for VPN software, virtualization, emulation, simulation, and a + number of other applications. +endef + +MASTER_SITES = http://garr.dl.sourceforge.net/sourceforge/tunctl/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# since there is no configure script, this is intentionally left empty +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_SCRIPTS = + +# no tests +TEST_SCRIPTS = custom + +include gar/category.mk + +test-custom: + @true + +pre-build-modulated: + @perl -pi -e 's#^CFLAGS.*#$(CFLAGS)#' $(WORKSRC)/Makefile Added: csw/mgar/pkg/tunctl/trunk/checksums =================================================================== --- csw/mgar/pkg/tunctl/trunk/checksums (rev 0) +++ csw/mgar/pkg/tunctl/trunk/checksums 2009-11-18 17:12:31 UTC (rev 7343) @@ -0,0 +1 @@ +fdbedc263b3e85bb0e087cd567414607 tunctl-1.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Nov 18 19:38:18 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 18 Nov 2009 18:38:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7344] csw/mgar/pkg/axel/trunk Message-ID: Revision: 7344 http://gar.svn.sourceforge.net/gar/?rev=7344&view=rev Author: skayser Date: 2009-11-18 18:38:18 +0000 (Wed, 18 Nov 2009) Log Message: ----------- axel: version bump to 2.4 Modified Paths: -------------- csw/mgar/pkg/axel/trunk/Makefile csw/mgar/pkg/axel/trunk/checksums Added Paths: ----------- csw/mgar/pkg/axel/trunk/files/0001-configure-use-backticks-and-honor-prefix-for-gettext.patch csw/mgar/pkg/axel/trunk/files/changelog.CSW Modified: csw/mgar/pkg/axel/trunk/Makefile =================================================================== --- csw/mgar/pkg/axel/trunk/Makefile 2009-11-18 17:12:31 UTC (rev 7343) +++ csw/mgar/pkg/axel/trunk/Makefile 2009-11-18 18:38:18 UTC (rev 7344) @@ -1,5 +1,7 @@ +# TODO +# - Migrate configuration from /opt to /etc GARNAME = axel -GARVERSION = 2.3 +GARVERSION = 2.4 CATEGORIES = utils DESCRIPTION = Lightweight command-line download accelerator @@ -9,42 +11,44 @@ very useful on bootdisks or other small systems as a wget replacement endef -MASTER_SITES = http://alioth.debian.org/frs/download.php/2717/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz - +# Beware: When bumping the version, you also need to visit the download page +# and get the correct DOWNLOAD_ID for the new version. If you don't change it, +# you will get the tarball with the corrent name, but with the old content. SPKG_SOURCEURL = http://axel.alioth.debian.org/ -SPKG_CLASSES = none cswcpsampleconf +MASTER_SITES = http://alioth.debian.org/frs/download.php/$(DOWNLOAD_ID)/ +DOWNLOAD_ID = 3015 +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS = CSWcswclassutils +# upstream_watch currently uses lftp and lftp only lists files when +# they are offered via the SAME scheme as the requested page. The +# axel download page can be accessed via http:// and https:// but +# the files themselves are only offered via https://, thus https://. +UPSTREAM_MASTER_SITES = https://alioth.debian.org/frs/?group_id=100070 -# Doesn't work yet, upstream watch needs to be improved first -#UPSTREAM_MASTER_SITES = http://alioth.debian.org/frs/?group_id=100070 -#UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +# Make ./configure play nicely with /bin/sh and /opt/csw prefix +PATCHFILES = 0001-configure-use-backticks-and-honor-prefix-for-gettext.patch -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --i18n=0 +# axel doesn't come with a test suite TEST_SCRIPTS = -PROTOTYPE_FILTER = awk '\ - $$$$3 ~ /axelrc.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ - { print }' +SAMPLECONF = $(sysconfdir)/axelrc include gar/category.mk -# ./configure is not your usual kind of configure ... -post-configure-modulated: - @perl -pi -e 's|-g -Os||' $(WORKSRC)/Makefile.settings - @echo CFLAGS+=$(CFLAGS) >> $(WORKSRC)/Makefile.settings - @$(MAKECOOKIE) - +# Get rid of hard-coded -Wall gcc'ism pre-build-modulated: - @perl -pi -e 's/-Wall//g' $(WORKSRC)/Makefile + perl -pi -e 's/-Wall//g' $(WORKSRC)/Makefile @$(MAKECOOKIE) +post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) post-install-modulated: - @perl -pi -e "s#/etc/axelrc#$(sysconfdir)/axelrc#" \ + ginstall -d $(DOCDEST) + cp $(FILEDIR)/changelog.CSW $(DOCDEST) + perl -pi -e "s#/etc/axelrc#$(sysconfdir)/axelrc#" \ $(DESTDIR)$(mandir)/man1/axel.1 \ $(DESTDIR)$(mandir)/zh_CN/man1/axel.1 - @mv $(DESTDIR)$(sysconfdir)/axelrc \ - $(DESTDIR)$(sysconfdir)/axelrc.CSW @$(MAKECOOKIE) Modified: csw/mgar/pkg/axel/trunk/checksums =================================================================== --- csw/mgar/pkg/axel/trunk/checksums 2009-11-18 17:12:31 UTC (rev 7343) +++ csw/mgar/pkg/axel/trunk/checksums 2009-11-18 18:38:18 UTC (rev 7344) @@ -1 +1,2 @@ -6f49813ffc1dd10829d74b73712cb5ed download/axel-2.3.tar.gz +717e172161023dd7ad5ca4bdd3cd2678 0001-configure-use-backticks-and-honor-prefix-for-gettext.patch +a2a762fce0c96781965c8f9786a3d09d axel-2.4.tar.gz Added: csw/mgar/pkg/axel/trunk/files/0001-configure-use-backticks-and-honor-prefix-for-gettext.patch =================================================================== --- csw/mgar/pkg/axel/trunk/files/0001-configure-use-backticks-and-honor-prefix-for-gettext.patch (rev 0) +++ csw/mgar/pkg/axel/trunk/files/0001-configure-use-backticks-and-honor-prefix-for-gettext.patch 2009-11-18 18:38:18 UTC (rev 7344) @@ -0,0 +1,40 @@ +From 7de9123636a2d04d6d8bdeec4a8de367c666d031 Mon Sep 17 00:00:00 2001 +From: Sebastian Kayser +Date: Wed, 18 Nov 2009 18:33:30 +0100 +Subject: [PATCH] configure: use backticks and honor prefix for gettext + +--- + configure | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/configure b/configure +index 81ecb99..535a0af 100755 +--- a/configure ++++ b/configure +@@ -42,8 +42,8 @@ EOF + exit; + fi + +- keyname=$(expr "$e" : '\(.*\)=.*' | sed 's/[^a-z0-9_]/_/g') +- value=$(expr "$e" : '.*=\(.*\)' | sed "s/'/_/g") ++ keyname=`expr "$e" : '\(.*\)=.*' | sed 's/[^a-z0-9_]/_/g'` ++ value=`expr "$e" : '.*=\(.*\)' | sed "s/'/_/g"` + + eval "$keyname='$value'" + shift; +@@ -106,9 +106,9 @@ fi + if [ "$i18n" = "1" ]; then + echo 'I18N=1' >> Makefile.settings + echo '#define I18N' >> config.h +- if cat /usr/local/include/libintl.h > /dev/null 2> /dev/null; then +- echo 'CFLAGS+=-I/usr/local/include' >> Makefile.settings +- echo 'LFLAGS+=-L/usr/local/lib' >> Makefile.settings; ++ if [ -f "${prefix}/include/libintl.h" ]; then ++ echo "CFLAGS+=-I${prefix}/include" >> Makefile.settings ++ echo "LFLAGS+=-L${prefix}/lib" >> Makefile.settings; + fi; + fi + +-- +1.6.5.1 + Added: csw/mgar/pkg/axel/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/axel/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/axel/trunk/files/changelog.CSW 2009-11-18 18:38:18 UTC (rev 7344) @@ -0,0 +1,5 @@ +axel (2.4,REV=2009.11.18) + + * Updated to 2.4. (Fixes #4032) + + -- Sebastian Kayser Wed, 18 Nov 2009 16:13:33 +0100 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 Nov 18 22:47:29 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 18 Nov 2009 21:47:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[7345] csw/mgar/pkg/axel/trunk/Makefile Message-ID: Revision: 7345 http://gar.svn.sourceforge.net/gar/?rev=7345&view=rev Author: skayser Date: 2009-11-18 21:47:29 +0000 (Wed, 18 Nov 2009) Log Message: ----------- axel: changed sysconfdir and integrated MIGRATE_FILES Modified Paths: -------------- csw/mgar/pkg/axel/trunk/Makefile Modified: csw/mgar/pkg/axel/trunk/Makefile =================================================================== --- csw/mgar/pkg/axel/trunk/Makefile 2009-11-18 18:38:18 UTC (rev 7344) +++ csw/mgar/pkg/axel/trunk/Makefile 2009-11-18 21:47:29 UTC (rev 7345) @@ -1,5 +1,3 @@ -# TODO -# - Migrate configuration from /opt to /etc GARNAME = axel GARVERSION = 2.4 CATEGORIES = utils @@ -29,13 +27,16 @@ # Make ./configure play nicely with /bin/sh and /opt/csw prefix PATCHFILES = 0001-configure-use-backticks-and-honor-prefix-for-gettext.patch +sysconfdir = /etc/opt/csw CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --etcdir=$(sysconfdir) CONFIGURE_ARGS += --i18n=0 # axel doesn't come with a test suite TEST_SCRIPTS = SAMPLECONF = $(sysconfdir)/axelrc +MIGRATE_FILES = axelrc 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 Nov 18 23:03:37 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 18 Nov 2009 22:03:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[7346] csw/mgar/pkg/tightvnc/trunk Message-ID: Revision: 7346 http://gar.svn.sourceforge.net/gar/?rev=7346&view=rev Author: wahwah Date: 2009-11-18 22:03:37 +0000 (Wed, 18 Nov 2009) Log Message: ----------- tightvnc: wrapping the vncserver script to provide a useful error message http://www.opencsw.org/mantis/view.php?id=942 Modified Paths: -------------- csw/mgar/pkg/tightvnc/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/tightvnc/trunk/files/vncserver-wrapper.sh Modified: csw/mgar/pkg/tightvnc/trunk/Makefile =================================================================== --- csw/mgar/pkg/tightvnc/trunk/Makefile 2009-11-18 21:47:29 UTC (rev 7345) +++ csw/mgar/pkg/tightvnc/trunk/Makefile 2009-11-18 22:03:37 UTC (rev 7346) @@ -102,4 +102,9 @@ ginstall -m 644 $(WORKDIR)/vncservers $(DESTDIR)$(sysconfdir)/vncservers ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d ginstall -m 644 $(FILEDIR)/cswvncserver $(DESTDIR)/etc/opt/csw/init.d + ginstall -d -m 755 $(DESTDIR)$(libexecdir) + mv $(DESTDIR)$(bindir)/vncserver $(DESTDIR)$(libexecdir) + ginstall -m 755 \ + $(FILEDIR)/vncserver-wrapper.sh \ + $(DESTDIR)$(bindir)/vncserver @$(MAKECOOKIE) Added: csw/mgar/pkg/tightvnc/trunk/files/vncserver-wrapper.sh =================================================================== --- csw/mgar/pkg/tightvnc/trunk/files/vncserver-wrapper.sh (rev 0) +++ csw/mgar/pkg/tightvnc/trunk/files/vncserver-wrapper.sh 2009-11-18 22:03:37 UTC (rev 7346) @@ -0,0 +1,50 @@ +#!/opt/csw/bin/bash +# vim:set sw=2 ts=2 sts=2 expandtab: +# +# $Id$ +# +# This file is a workaround for the bug number 942[1]. +# +# The /tmp/.X11-unix directory has following permissions: +# +# maciej at build8st [build8st]:~ > ls -ld /tmp/.X11-unix +# drwxrwxr-x 2 root root 176 Jul 13 23:31 /tmp/.X11-unix +# +# As a result, non-root users cannot run vnc servers. The purpose of +# this file is to provide a useful error message to the user when +# appropriate. +# +# [1] http://www.opencsw.org/mantis/view.php?id=942 + +test_dir="/tmp/.X11-unix" + +# Test whether the directory in question is world writable, or writable by the +# current user. +writable() { + find "$1" -prune -type d \ + -a \ + \( \ + -perm -o+w \ + -o \ + \( \ + -user "${UID}" \ + -a \ + -perm -u+w \ + \) \ + \) | grep "$1" +} + +if writable "${test_dir}"; then + exec /opt/csw/libexec/vncserver "$@" +else + cat < Revision: 7347 http://gar.svn.sourceforge.net/gar/?rev=7347&view=rev Author: skayser Date: 2009-11-18 23:04:18 +0000 (Wed, 18 Nov 2009) Log Message: ----------- ncdu: version bump to 1.6 Modified Paths: -------------- csw/mgar/pkg/ncdu/trunk/Makefile csw/mgar/pkg/ncdu/trunk/checksums csw/mgar/pkg/ncdu/trunk/files/changelog.CSW Removed Paths: ------------- csw/mgar/pkg/ncdu/trunk/files/gar-base.diff Modified: csw/mgar/pkg/ncdu/trunk/Makefile =================================================================== --- csw/mgar/pkg/ncdu/trunk/Makefile 2009-11-18 22:03:37 UTC (rev 7346) +++ csw/mgar/pkg/ncdu/trunk/Makefile 2009-11-18 23:04:18 UTC (rev 7347) @@ -1,42 +1,34 @@ GARNAME = ncdu -GARVERSION = 1.5 +GARVERSION = 1.6 CATEGORIES = utils DESCRIPTION = Ncurses version of the famous old 'du' unix define BLURB -As the name already suggests, ncdu is an ncurses version of the famous old 'du' -unix command. It provides a fast and easy interface to your harddrive. Where is -your disk space going? Why is your home directory that large? ncdu can answer -those questions for you in just a matter of seconds! + As the name already suggests, ncdu is an ncurses version of the famous + old 'du' unix command. It provides a fast and easy interface to your + harddrive. Where is your disk space going? Why is your home directory + that large? ncdu can answer those questions for you in just a matter of + seconds! endef SPKG_SOURCEURL = http://dev.yorhel.nl/ncdu/ -MASTER_SITES = http://dev.yorhel.nl/download/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +MASTER_SITES = http://dev.yorhel.nl/download/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz REQUIRED_PKGS = CSWncurses +# ncdu doesn't come with a test suite TEST_SCRIPTS = EXTRA_INC = /opt/csw/include/ncursesw CONFIGURE_ARGS = $(DIRPATHS) -# - Autoconf check and replacement for non-POSIX dirfd() -# See http://sf.net/tracker/?func=detail&aid=2789779&group_id=200175&atid=972449 -# - Fix for non-void return in src/delete.c:void delete_process() -# See http://sf.net/tracker/?func=detail&aid=2789781&group_id=200175&atid=972449 -PATCHFILES=gar-base.diff - include gar/category.mk -pre-configure-modulated: - @cd $(WORKSRC) && autoconf - @$(MAKECOOKIE) - post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) post-install-modulated: - @ginstall -d $(DOCDEST) - @cp $(FILEDIR)/changelog.CSW $(DOCDEST) + ginstall -d $(DOCDEST) + cp $(FILEDIR)/changelog.CSW $(DOCDEST) @$(MAKECOOKIE) Modified: csw/mgar/pkg/ncdu/trunk/checksums =================================================================== --- csw/mgar/pkg/ncdu/trunk/checksums 2009-11-18 22:03:37 UTC (rev 7346) +++ csw/mgar/pkg/ncdu/trunk/checksums 2009-11-18 23:04:18 UTC (rev 7347) @@ -1,2 +1 @@ -6596993c949abab8e579c401dbe50089 download/gar-base.diff -90a69cc3b2e9f0324eb14e6ce1df0f22 download/ncdu-1.5.tar.gz +95d29cf64af2d8cf4b5005e6e3d60384 ncdu-1.6.tar.gz Modified: csw/mgar/pkg/ncdu/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/ncdu/trunk/files/changelog.CSW 2009-11-18 22:03:37 UTC (rev 7346) +++ csw/mgar/pkg/ncdu/trunk/files/changelog.CSW 2009-11-18 23:04:18 UTC (rev 7347) @@ -1,3 +1,9 @@ +ncdu (1.6,REV=2009.11.19) + + * Updated to 1.6. + + -- Sebastian Kayser Thu, 19 Nov 2009 00:02:30 +0100 + ncdu (1.5,REV=2009.05.10) * Updated to 1.5 (Closes: #3565). Deleted: csw/mgar/pkg/ncdu/trunk/files/gar-base.diff =================================================================== --- csw/mgar/pkg/ncdu/trunk/files/gar-base.diff 2009-11-18 22:03:37 UTC (rev 7346) +++ csw/mgar/pkg/ncdu/trunk/files/gar-base.diff 2009-11-18 23:04:18 UTC (rev 7347) @@ -1,43 +0,0 @@ -diff --speed-large-files --minimal -Nru ncdu-1.5.orig/src/delete.c ncdu-1.5/src/delete.c ---- ncdu-1.5.orig/src/delete.c 2009-05-02 10:42:17.000000000 +0200 -+++ ncdu-1.5/src/delete.c 2009-05-10 18:57:49.873038400 +0200 -@@ -213,8 +213,10 @@ - /* confirm */ - seloption = 1; - while(state == DS_CONFIRM && !noconfirm) -- if(input_handle(0)) -- return browse_init(root); -+ if(input_handle(0)) { -+ browse_init(root); -+ return; -+ } - - /* chdir */ - if(path_chdir(getpath(root->parent)) < 0) { -diff -ur ncdu-1.5.orig/configure.in ncdu-1.5/configure.in ---- ncdu-1.5.orig/configure.in 2009-05-10 19:38:59.182413272 +0200 -+++ ncdu-1.5/configure.in 2009-05-02 13:09:18.000000000 +0200 -@@ -27,6 +27,9 @@ - [getcwd gettimeofday memset fnmatch chdir rmdir unlink lstat getcwd],[], - AC_MSG_ERROR([required function missing])) - -+# dirfd is a glibc extension and available on Solaris -+AC_CHECK_FUNCS([dirfd]) -+ - AC_OUTPUT([Makefile src/Makefile doc/Makefile]) - - echo "" -diff -ur ncdu-1.5.orig/src/path.h ncdu-1.5/src/path.h ---- ncdu-1.5.orig/src/path.h 2009-05-10 19:38:59.209594590 +0200 -+++ ncdu-1.5/src/path.h 2009-05-02 10:42:17.000000000 +0200 -@@ -44,4 +44,10 @@ - /* works exactly the same as chdir() */ - extern int path_chdir(const char *); - -+#ifndef HAVE_DIRFD -+#if defined(__sun__) || defined(__sun) -+#define dirfd(a) ((a)->dd_fd) -+#endif -+#endif -+ - #endif 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 Nov 19 00:51:48 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 18 Nov 2009 23:51:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[7348] csw/mgar/pkg/tightvnc/trunk/files/vncserver-wrapper. sh Message-ID: Revision: 7348 http://gar.svn.sourceforge.net/gar/?rev=7348&view=rev Author: wahwah Date: 2009-11-18 23:51:48 +0000 (Wed, 18 Nov 2009) Log Message: ----------- tightvnc: suppressing grep's output Modified Paths: -------------- csw/mgar/pkg/tightvnc/trunk/files/vncserver-wrapper.sh Modified: csw/mgar/pkg/tightvnc/trunk/files/vncserver-wrapper.sh =================================================================== --- csw/mgar/pkg/tightvnc/trunk/files/vncserver-wrapper.sh 2009-11-18 23:04:18 UTC (rev 7347) +++ csw/mgar/pkg/tightvnc/trunk/files/vncserver-wrapper.sh 2009-11-18 23:51:48 UTC (rev 7348) @@ -31,7 +31,7 @@ -a \ -perm -u+w \ \) \ - \) | grep "$1" + \) | grep "$1" > /dev/null } if writable "${test_dir}"; then 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 Nov 19 00:52:45 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 18 Nov 2009 23:52:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[7349] csw/mgar/pkg/tightvnc/trunk Message-ID: Revision: 7349 http://gar.svn.sourceforge.net/gar/?rev=7349&view=rev Author: wahwah Date: 2009-11-18 23:52:45 +0000 (Wed, 18 Nov 2009) Log Message: ----------- tightvnc: checksums of files with the Id tag Modified Paths: -------------- csw/mgar/pkg/tightvnc/trunk/Makefile csw/mgar/pkg/tightvnc/trunk/checksums Modified: csw/mgar/pkg/tightvnc/trunk/Makefile =================================================================== --- csw/mgar/pkg/tightvnc/trunk/Makefile 2009-11-18 23:51:48 UTC (rev 7348) +++ csw/mgar/pkg/tightvnc/trunk/Makefile 2009-11-18 23:52:45 UTC (rev 7349) @@ -15,6 +15,7 @@ DISTFILES = $(GARNAME)-$(GARVERSION)_unixsrc.tar.bz2 DISTFILES += vncservers DISTFILES += cswvncserver +DISTFILES += vncserver-wrapper.sh PACKAGES = CSWvncs CSWvncv CATALOGNAME_CSWvncs = vncserver CATALOGNAME_CSWvncv = vncviewer Modified: csw/mgar/pkg/tightvnc/trunk/checksums =================================================================== --- csw/mgar/pkg/tightvnc/trunk/checksums 2009-11-18 23:51:48 UTC (rev 7348) +++ csw/mgar/pkg/tightvnc/trunk/checksums 2009-11-18 23:52:45 UTC (rev 7349) @@ -4,4 +4,5 @@ c5e9c3e4017caa65d14a0b98858043b9 0003-libdix.a-after-libos.a.patch 691ddda52a4bcbc14ee1c19f77e465a1 cswvncserver 397b35faad32d5246b6d44b142f8304f tightvnc-1.3.10_unixsrc.tar.bz2 +46d0bcb1569025d9a559bab091aa79fa vncserver-wrapper.sh 56c09be17c17184e96193c13246fd649 vncservers 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 Nov 19 09:03:27 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 19 Nov 2009 08:03:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7350] csw/mgar/pkg/nspr/trunk Message-ID: Revision: 7350 http://gar.svn.sourceforge.net/gar/?rev=7350&view=rev Author: wahwah Date: 2009-11-19 08:03:27 +0000 (Thu, 19 Nov 2009) Log Message: ----------- nspr: update to 4.8, plus some extra work Modified Paths: -------------- csw/mgar/pkg/nspr/trunk/Makefile csw/mgar/pkg/nspr/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/nspr/trunk/files/CSWnspr.depend csw/mgar/pkg/nspr/trunk/files/CSWnspr.gspec Property Changed: ---------------- csw/mgar/pkg/nspr/trunk/ Property changes on: csw/mgar/pkg/nspr/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/nspr/trunk/Makefile =================================================================== --- csw/mgar/pkg/nspr/trunk/Makefile 2009-11-18 23:52:45 UTC (rev 7349) +++ csw/mgar/pkg/nspr/trunk/Makefile 2009-11-19 08:03:27 UTC (rev 7350) @@ -1,38 +1,84 @@ GARNAME = nspr -GARVERSION = 4.6.6 +MIN_VERSION = 8 +GARVERSION = 4.$(MIN_VERSION) CATEGORIES = lib -DISTNAME = $(GARNAME) +# DISTNAME = $(GARNAME) DESCRIPTION = NSPR Netscape Portable Runtime define BLURB -NSPR Netscape Portable Runtime + NSPR Netscape Portable Runtime endef MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(GARVERSION)/src/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWnspr, depend ) -# DISTFILES += CSWnspr.depend CSWnspr.gspec CSWnspr.prototype +PATCHFILES = nspr-4.6.1-config.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PERL="/opt/csw/bin/perl" -CFLAGS=-xlibmil -CXXFLAGS="-xlibmil -xlibmopt -features=tmplife -norunpath" -LDFLAGS="-R'\$\$ORIGIN:\$\$ORIGIN/..' -L/opt/csw/lib -R/opt/csw/lib" +PERL = /opt/csw/bin/perl +EXTRA_CFLAGS = -xlibmil +EXTRA_CXXFLAGS = -xlibmil -xlibmopt -features=tmplife -norunpath +EXTRA_LDFLAGS = -R'\$\$ORIGIN:\$\$ORIGIN/..' -L/opt/csw/lib -R/opt/csw/lib +CONFIGURE_SCRIPTS = nspr +BUILD_SCRIPTS = nspr +TEST_SCRIPTS = +INSTALL_SCRIPTS = nspr -export PERL CFLAGS CXXFLAGS LDFLAGS +# export PERL CFLAGS CXXFLAGS LDFLAGS +export PERL -CONFIGURE_ARGS = --prefix=/opt/csw/mozilla/nspr --mandir=/opt/csw/share/man --with-mozilla --disable-debug --enable-strip --with-native-threads --enable-ipv6 --with-dist-prefix=$(DESTDIR)/opt/csw/mozilla/nspr --enable-optimize="-xO3" --disable-tests --with-dist-bindir=$(DESTDIR)/opt/csw/mozilla/nspr/lib +# prefix = /opt/csw/mozilla/nspr +libdir = $(prefix)/lib/nspr +localstatedir = /var/opt/csw +sysconfdir = /etc/opt/csw +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-mozilla +CONFIGURE_ARGS += --disable-debug +CONFIGURE_ARGS += --enable-strip +CONFIGURE_ARGS += --with-native-threads +CONFIGURE_ARGS += --enable-ipv6 +# CONFIGURE_ARGS += --enable-64bit +# CONFIGURE_ARGS += --with-dist-prefix=$(DESTDIR)/opt/csw/mozilla/nspr +# CONFIGURE_ARGS += --enable-optimize="-xO3" +CONFIGURE_ARGS += --disable-tests +CONFIGURE_ARGS += --enable-system-sqlite +# CONFIGURE_ARGS += --with-dist-bindir=$(DESTDIR)/opt/csw/mozilla/nspr/lib + # PATCHFILES = autoconf.mk.in.diff include gar/category.mk -post-extract: - ( mv $(WORKDIR)/$(DISTNAME)-$(GARVERSION)/mozilla/nsprpub $(WORKDIR)/$(DISTNAME) ) - ( cp $(FILEDIR)/LICENSE $(WORKDIR)/$(DISTNAME) ) +configure-nspr: + (cp $(FILEDIR)/LICENSE $(WORKSRC)) + (cd $(WORKSRC) && mkdir build inst) + gsed -i -e 's/$$(mkshlib) $$(OBJS)/$$(MKSHLIB) $$(LDFLAGS) $$(OBJS)/g' \ + $(WORKSRC)/mozilla/nsprpub/config/rules.mk + cd $(WORKSRC)/build && ../mozilla/nsprpub/configure $(CONFIGURE_ARGS) @$(MAKECOOKIE) +build-nspr: + cd $(WORKSRC)/build && $(BUILD_ENV) gmake + @$(MAKECOOKIE) + +install-nspr: + (cd $(WORKSRC)/build && $(INSTALL_ENV) gmake install DESTDIR=$(DESTDIR)) + (cd $(DESTDIR)/opt/csw/lib/nspr \ + && for file in *.so; do \ + mv $${file} $${file}.$(MIN_VERSION); \ + ln -s $${file}.$(MIN_VERSION) $${file}; \ + done) + ginstall -m 755 -d $(DESTDIR)$(bindir) + ginstall -m 755 $(WORKSRC)/build/config/nspr-config \ + $(DESTDIR)$(bindir) + ginstall -m 755 -d $(DESTDIR)$(prefix)/pkgconfig + ginstall -m 644 $(WORKSRC)/build/config/nspr.pc \ + $(DESTDIR)$(prefix)/pkgconfig + rm $(DESTDIR)$(bindir)/prerr.properties + rm $(DESTDIR)$(bindir)/nspr.pc + @$(MAKECOOKIE) + post-install: - ( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | grep ELF | grep -e 'executable' -e 'dynamic lib' | grep 'not stripped' && strip {}" \; ) + # ( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | grep ELF | grep -e 'executable' -e 'dynamic lib' | grep 'not stripped' && strip {}" \; ) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/nspr/trunk/checksums =================================================================== --- csw/mgar/pkg/nspr/trunk/checksums 2009-11-18 23:52:45 UTC (rev 7349) +++ csw/mgar/pkg/nspr/trunk/checksums 2009-11-19 08:03:27 UTC (rev 7350) @@ -1,3 +1,2 @@ -ba49bc35e2068f54893d3ea7031ad59c download/nspr-4.6.6.tar.gz -8c1d57aae51158397ae963ecac053a4d download/CSWnspr.gspec -a5616e691e9a4fed991893ee673b1a88 download/CSWnspr.depend +4720bb68a64bfa9188ac6318458b47d2 nspr-4.6.1-config.patch +e0916a72bcc6c427551ea262183fdb26 nspr-4.8.tar.gz Deleted: csw/mgar/pkg/nspr/trunk/files/CSWnspr.gspec =================================================================== --- csw/mgar/pkg/nspr/trunk/files/CSWnspr.gspec 2009-11-18 23:52:45 UTC (rev 7349) +++ csw/mgar/pkg/nspr/trunk/files/CSWnspr.gspec 2009-11-19 08:03:27 UTC (rev 7350) @@ -1,4 +0,0 @@ -%var bitname nspr -%var pkgname CSWnspr -%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 wahwah at users.sourceforge.net Thu Nov 19 09:07:35 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 19 Nov 2009 08:07:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[7351] csw/mgar/pkg/nspr/trunk/files/nspr-4.6.1-config. patch Message-ID: Revision: 7351 http://gar.svn.sourceforge.net/gar/?rev=7351&view=rev Author: wahwah Date: 2009-11-19 08:07:34 +0000 (Thu, 19 Nov 2009) Log Message: ----------- nspr: Adding a patch copied from Gentoo, adds nspr.pc Added Paths: ----------- csw/mgar/pkg/nspr/trunk/files/nspr-4.6.1-config.patch Added: csw/mgar/pkg/nspr/trunk/files/nspr-4.6.1-config.patch =================================================================== --- csw/mgar/pkg/nspr/trunk/files/nspr-4.6.1-config.patch (rev 0) +++ csw/mgar/pkg/nspr/trunk/files/nspr-4.6.1-config.patch 2009-11-19 08:07:34 UTC (rev 7351) @@ -0,0 +1,89 @@ +--- a/mozilla/nsprpub/lib/libc/src/Makefile.in.orig 2005-06-01 14:28:26.000000000 +0000 ++++ b/mozilla/nsprpub/lib/libc/src/Makefile.in 2006-01-15 02:50:39.000000000 +0000 +@@ -112,6 +112,10 @@ + MKSHLIB += -R '$$ORIGIN' + endif + ++ifeq ($(OS_ARCH), Linux) ++DSO_LDOPTS +=-Wl,-R,'$$ORIGIN' ++endif ++ + ifeq ($(OS_ARCH),OS2) + MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def + GARBAGE += $(MAPFILE) +--- a/mozilla/nsprpub/lib/ds/Makefile.in.orig 2005-06-01 14:28:25.000000000 +0000 ++++ b/mozilla/nsprpub/lib/ds/Makefile.in 2006-01-15 02:52:30.000000000 +0000 +@@ -102,6 +102,10 @@ + MKSHLIB += -R '$$ORIGIN' + endif + ++ifeq ($(OS_ARCH), Linux) ++DSO_LDOPTS += -Wl,-R,'$$ORIGIN' ++endif ++ + ifeq ($(OS_ARCH),OS2) + MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def + GARBAGE += $(MAPFILE) +--- a/mozilla/nsprpub/pr/src/Makefile.in.orig 2005-06-01 14:28:27.000000000 +0000 ++++ b/mozilla/nsprpub/pr/src/Makefile.in 2006-01-15 03:29:36.000000000 +0000 +@@ -168,6 +168,7 @@ + else + OS_LIBS = -ldl + endif ++DSO_LDOPTS +=-Wl,-R,'$$ORIGIN' + endif + + ifeq ($(OS_ARCH),HP-UX) +--- a/mozilla/nsprpub/config/Makefile.in.orig 2005-06-01 14:28:23.000000000 +0000 ++++ b/mozilla/nsprpub/config/Makefile.in 2006-01-15 04:13:42.000000000 +0000 +@@ -54,7 +54,7 @@ + # because it is included by every makefile. + DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config + +-RELEASE_BINS = nspr-config ++RELEASE_BINS = nspr-config nspr.pc + + include $(topsrcdir)/config/config.mk + +@@ -139,6 +139,7 @@ + + export:: $(TARGETS) + rm -f $(dist_bindir)/nspr-config ++ rm -f $(dist_bindir)/nspr.pc + + ifdef WRAP_SYSTEM_INCLUDES + export:: +--- a/mozilla/nsprpub/config/nspr.pc.in.orig 1970-01-01 00:00:00.000000000 +0000 ++++ b/mozilla/nsprpub/config/nspr.pc.in 2006-01-15 04:12:23.000000000 +0000 +@@ -0,0 +1,10 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: NSPR ++Description: The Netscape Portable Runtime ++Version: @MOD_MAJOR_VERSION at .@MOD_MINOR_VERSION at .@MOD_PATCH_VERSION@ ++Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 @OS_LIBS@ -Wl,-R${libdir} ++Cflags: -I${includedir} +--- a/mozilla/nsprpub/configure.orig 2006-01-15 04:17:59.000000000 +0000 ++++ b/mozilla/nsprpub/configure 2006-01-15 04:21:35.000000000 +0000 +@@ -5899,6 +5899,7 @@ + config/nsprincl.mk + config/nsprincl.sh + config/nspr-config ++config/nspr.pc + lib/Makefile + lib/ds/Makefile + lib/libc/Makefile +--- a/mozilla/nsprpub/config/nspr-config.in.orig 2005-05-11 00:53:41.000000000 +0000 ++++ b/mozilla/nsprpub/config/nspr-config.in 2006-01-15 06:37:58.000000000 +0000 +@@ -122,7 +122,7 @@ + fi + + if test "$echo_libs" = "yes"; then +- libdirs=-L$libdir ++ libdirs="-Wl,-R$libdir -L$libdir" + if test -n "$lib_plds"; then + libdirs="$libdirs -lplds${major_version}" + fi 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 Nov 19 09:51:01 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 19 Nov 2009 08:51:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[7352] csw/mgar/pkg/nspr/trunk/Makefile Message-ID: Revision: 7352 http://gar.svn.sourceforge.net/gar/?rev=7352&view=rev Author: wahwah Date: 2009-11-19 08:51:00 +0000 (Thu, 19 Nov 2009) Log Message: ----------- nspr: enable 64-bit compilation Modified Paths: -------------- csw/mgar/pkg/nspr/trunk/Makefile Modified: csw/mgar/pkg/nspr/trunk/Makefile =================================================================== --- csw/mgar/pkg/nspr/trunk/Makefile 2009-11-19 08:07:34 UTC (rev 7351) +++ csw/mgar/pkg/nspr/trunk/Makefile 2009-11-19 08:51:00 UTC (rev 7352) @@ -2,33 +2,38 @@ MIN_VERSION = 8 GARVERSION = 4.$(MIN_VERSION) CATEGORIES = lib -# DISTNAME = $(GARNAME) -DESCRIPTION = NSPR Netscape Portable Runtime define BLURB - NSPR Netscape Portable Runtime + Netscape Portable Runtime (NSPR) provides a platform-neutral API for system + level and libc like functions. The API is used in the Mozilla clients and + many of Red Hat's, Sun's, and other software offerings. endef MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(GARVERSION)/src/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = nspr-4.6.1-config.patch -# We define upstream file regex so we can be notifed of new upstream software release +PACKAGES = CSWnspr CSWnspr-devel +PKGFILES_CSWnspr-devel = $(PKGFILES_DEVEL) +PKGFILES_CSWnspr-devel += $(bindir).*nspr-config +PKGFILES_CSWnspr-devel += $(prefix)/pkgconfig/nspr\.pc + +SPKG_DESC_CSWnspr = Netscape Portable Runtime +SPKG_DESC_CSWnspr-devel = Netscape Portable Runtime development files +CATALOGNAME_CSWnspr-devel = nspr_devel + UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz PERL = /opt/csw/bin/perl EXTRA_CFLAGS = -xlibmil EXTRA_CXXFLAGS = -xlibmil -xlibmopt -features=tmplife -norunpath -EXTRA_LDFLAGS = -R'\$\$ORIGIN:\$\$ORIGIN/..' -L/opt/csw/lib -R/opt/csw/lib CONFIGURE_SCRIPTS = nspr BUILD_SCRIPTS = nspr TEST_SCRIPTS = INSTALL_SCRIPTS = nspr -# export PERL CFLAGS CXXFLAGS LDFLAGS export PERL -# prefix = /opt/csw/mozilla/nspr libdir = $(prefix)/lib/nspr localstatedir = /var/opt/csw sysconfdir = /etc/opt/csw @@ -39,27 +44,33 @@ CONFIGURE_ARGS += --enable-strip CONFIGURE_ARGS += --with-native-threads CONFIGURE_ARGS += --enable-ipv6 -# CONFIGURE_ARGS += --enable-64bit -# CONFIGURE_ARGS += --with-dist-prefix=$(DESTDIR)/opt/csw/mozilla/nspr -# CONFIGURE_ARGS += --enable-optimize="-xO3" +CONFIGURE_ARGS += --enable-optimize="-xO3" CONFIGURE_ARGS += --disable-tests CONFIGURE_ARGS += --enable-system-sqlite +CONFIGURE_ARGS_isa-sparcv9 = --enable-64bit +CONFIGURE_ARGS_isa-amd64 = --enable-64bit +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION)) + +# These options I'm unsure about, are they really needed? +# EXTRA_LDFLAGS = -R'\$\$ORIGIN:\$\$ORIGIN/..' -R/opt/csw/lib +# prefix = /opt/csw/mozilla/nspr +# CONFIGURE_ARGS += --with-dist-prefix=$(DESTDIR)/opt/csw/mozilla/nspr # CONFIGURE_ARGS += --with-dist-bindir=$(DESTDIR)/opt/csw/mozilla/nspr/lib -# PATCHFILES = autoconf.mk.in.diff +BUILD64 = 1 include gar/category.mk configure-nspr: (cp $(FILEDIR)/LICENSE $(WORKSRC)) - (cd $(WORKSRC) && mkdir build inst) + (cd $(WORKSRC) && mkdir -p build inst) gsed -i -e 's/$$(mkshlib) $$(OBJS)/$$(MKSHLIB) $$(LDFLAGS) $$(OBJS)/g' \ $(WORKSRC)/mozilla/nsprpub/config/rules.mk - cd $(WORKSRC)/build && ../mozilla/nsprpub/configure $(CONFIGURE_ARGS) + cd $(WORKSRC)/build && $(CONFIGURE_ENV) ../mozilla/nsprpub/configure $(CONFIGURE_ARGS) @$(MAKECOOKIE) build-nspr: - cd $(WORKSRC)/build && $(BUILD_ENV) gmake + (cd $(WORKSRC)/build && $(BUILD_ENV) gmake CC=$(CC) CXX=$(CXX)) @$(MAKECOOKIE) install-nspr: @@ -77,8 +88,5 @@ $(DESTDIR)$(prefix)/pkgconfig rm $(DESTDIR)$(bindir)/prerr.properties rm $(DESTDIR)$(bindir)/nspr.pc + rm $(DESTDIR)$(bindir)/compile-et.pl @$(MAKECOOKIE) - -post-install: - # ( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | grep ELF | grep -e 'executable' -e 'dynamic lib' | grep 'not stripped' && strip {}" \; ) - @$(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 Thu Nov 19 10:12:29 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 19 Nov 2009 09:12:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[7353] csw/mgar/pkg/nspr/trunk/Makefile Message-ID: Revision: 7353 http://gar.svn.sourceforge.net/gar/?rev=7353&view=rev Author: wahwah Date: 2009-11-19 09:12:28 +0000 (Thu, 19 Nov 2009) Log Message: ----------- nspr: Adding CSWnspr as a dependency for CSWnspr-devel Modified Paths: -------------- csw/mgar/pkg/nspr/trunk/Makefile Modified: csw/mgar/pkg/nspr/trunk/Makefile =================================================================== --- csw/mgar/pkg/nspr/trunk/Makefile 2009-11-19 08:51:00 UTC (rev 7352) +++ csw/mgar/pkg/nspr/trunk/Makefile 2009-11-19 09:12:28 UTC (rev 7353) @@ -21,6 +21,7 @@ SPKG_DESC_CSWnspr = Netscape Portable Runtime SPKG_DESC_CSWnspr-devel = Netscape Portable Runtime development files CATALOGNAME_CSWnspr-devel = nspr_devel +REQUIRED_PKGS_CSWnspr-devel = CSWnspr UFILES_REGEX = $(GARNAME)-(\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 Thu Nov 19 10:29:42 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 19 Nov 2009 09:29:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[7354] csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/ Makefile Message-ID: Revision: 7354 http://gar.svn.sourceforge.net/gar/?rev=7354&view=rev Author: wahwah Date: 2009-11-19 09:29:42 +0000 (Thu, 19 Nov 2009) Log Message: ----------- mysql-5.1.x-optcsw: First sketch of an /opt/csw version of MySQL build Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2009-11-19 09:12:28 UTC (rev 7353) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2009-11-19 09:29:42 UTC (rev 7354) @@ -3,7 +3,9 @@ # $Id$ GARNAME = mysql5 -GARVERSION = 5.1.40 +BASE_VERSION = 5.1 +PATCHLEVEL = 40 +GARVERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = server DISTNAME = mysql-$(GARVERSION) @@ -16,14 +18,27 @@ GARFLAVOR = DBG -# Change prefix to /opt/csw/mysql5 -prefix = /opt/csw/mysql5 -sysconfdir = /etc/opt/csw/mysql5 -localstatedir = /var/opt/csw/mysql5 +bindir = $(prefix)/bin/mysql/$(BASE_VERSION) +datadir=$(prefix)/share/mysql/$(BASE_VERSION) +docdir=$(prefix)/share/doc/mysql/$(BASE_VERSION) +includedir=$(prefix)/include/mysql/$(BASE_VERSION) +infodir=$(prefix)/share/mysql/$(BASE_VERSION)/info +libdir=$(prefix)/lib/mysql/$(BASE_VERSION) +libexecdir=$(prefix)/libexec/mysql/$(BASE_VERSION) +lispdir=$(prefix)/share/mysql/$(BASE_VERSION)/emacs/site-lisp +localstatedir = /var/opt/csw/mysql/$(BASE_VERSION) +mandir=$(prefix)/share/mysql/$(BASE_VERSION)/man +sbindir = $(prefix)/sbin/mysql/$(BASE_VERSION) +sharedstatedir=$(prefix)/share/mysql/$(BASE_VERSION) +sourcedir=$(prefix)/src/mysql/$(BASE_VERSION) +sysconfdir = /etc/opt/csw/mysql/$(BASE_VERSION) + +# Where to put the init script global_sysconfdir = /etc/opt/csw +# Where to link the binaries global_bindir = /opt/csw/bin -INITSMF = $(global_sysconfdir)/init\.d/cswmysql5 +INITSMF = $(global_sysconfdir)/init\.d/cswmysql-$(BASE_VERSION) PATCHFILES = 0001-Use-libc-not-libcrypt.patch PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch @@ -97,7 +112,7 @@ REQUIRED_PKGS_CSWmysql5devel = CSWmysql5 REQUIRED_PKGS_CSWmysql5test = CSWmysql5 CSWperl -MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.1/ +MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-$(BASE_VERSION)/ DISTFILES = mysql-$(GARVERSION).tar.gz DISTFILES += cswmysql5 quick_start-csw README.CSW ChangeLog DISTFILES += CSWmysql5.preinstall @@ -142,7 +157,7 @@ CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) # TODO: Make the tests pass. They don't at the moment. -# TEST_SCRIPTS = +TEST_SCRIPTS = TEST_TARGETS = check # Enable 64 bits build @@ -181,6 +196,6 @@ # Create symlinks to binaries ginstall -m 755 -d $(DESTDIR)$(global_bindir) for f in $(DESTDIR)$(bindir)/*; do \ - ln -s ../mysql5/bin/`basename $$f` $(DESTDIR)$(global_bindir)/`basename $$f`; \ + ln -s mysql/$(BASE_VERSION)/`basename $$f` $(DESTDIR)$(global_bindir)/`basename $$f`; \ done @$(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 Thu Nov 19 10:37:43 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 19 Nov 2009 09:37:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[7355] csw/mgar/pkg/dovecot/trunk Message-ID: Revision: 7355 http://gar.svn.sourceforge.net/gar/?rev=7355&view=rev Author: skayser Date: 2009-11-19 09:37:43 +0000 (Thu, 19 Nov 2009) Log Message: ----------- dovecot: working copy towards 1.1.20 Modified Paths: -------------- csw/mgar/pkg/dovecot/trunk/Makefile csw/mgar/pkg/dovecot/trunk/checksums Added Paths: ----------- csw/mgar/pkg/dovecot/trunk/files/README.CSW csw/mgar/pkg/dovecot/trunk/files/changelog.CSW csw/mgar/pkg/dovecot/trunk/files/cswdovecot Removed Paths: ------------- csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.README.CSW csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.changelog.CSW csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswdovecot csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswusergroup Modified: csw/mgar/pkg/dovecot/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot/trunk/Makefile 2009-11-19 09:29:42 UTC (rev 7354) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2009-11-19 09:37:43 UTC (rev 7355) @@ -1,8 +1,11 @@ -# TODO: -# * Bump to 1.1.13, http://hg.dovecot.org/dovecot-1.1/rev/a2013dedbad0 - +# TODO +# - Migrate config from /opt/csw/etc/dovecot to /etc +# - example.conf patch needs tweaking (rejected) +# - SSL certs to /etc/opt/csw/ssl? +# - USERGROUP doesn't work yet, wrong usage? +# - /var/run/dovecot instead of /var/opt/csw/run? GARNAME = dovecot -GARVERSION = 1.1.11 +GARVERSION = 1.1.20 CATEGORIES = server DESCRIPTION = Secure IMAP server @@ -13,32 +16,28 @@ special administration and it uses very little memory. endef -MASTER_SITES = http://dovecot.org/releases/1.1/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +SPKG_SOURCEURL = http://dovecot.org/ +MASTER_SITES = http://dovecot.org/releases/1.1/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWdovecot CSWdovecot-devel CSWdovecot-sieve +# Sieve plugin is packaged via a post-package hook (see package-sieveplugin:) +PACKAGES = CSWdovecot CSWdovecot-devel CSWdovecot-sieve +NOPACKAGE = CSWdovecot-sieve + CATALOGNAME_CSWdovecot = dovecot CATALOGNAME_CSWdovecot-devel = dovecot_devel CATALOGNAME_CSWdovecot-sieve = dovecot_sieve -# Sieve plugin is packaged individually (see package-sieveplugin:) -NOPACKAGE = CSWdovecot-sieve - -# CSWdovecot is not installed on the build farm and as such its dependent -# packages throw errors when fed to checkpkg -ENABLE_CHECK=0 - -SPKG_SOURCEURL = http://dovecot.org/ SPKG_DESC_CSWdovecot = Secure IMAP server SPKG_DESC_CSWdovecot-devel = Dovecot secure IMAP server header files SPKG_DESC_CSWdovecot-sieve = Dovecot secure IMAP server sieve plugin -SPKG_CLASSES_CSWdovecot = none cswusergroup cswcpsampleconf cswinitsmf REQUIRED_PKGS_CSWdovecot = CSWosslrt CSWmysql5rt CSWoldaprt CSWlibpq REQUIRED_PKGS_CSWdovecot += CSWsasl CSWsqlite3 CSWzlib CSWlibnet REQUIRED_PKGS_CSWdovecot += CSWbzip2 CSWiconv CSWcswclassutils REQUIRED_PKGS_CSWdovecot += CSWkrb5lib -REQUIRED_PKGS_CSWdovecot-devel = CSWdovecot +REQUIRED_PKGS_CSWdovecot-devel = CSWdovecot REQUIRED_PKGS_CSWdovecot-sieve = CSWdovecot PREREQUISITE_PKGS = CSWossldevel CSWosslrt @@ -52,20 +51,20 @@ PKGFILES_CSWdovecot-devel = $(PKGFILES_DEVEL) PKGFILES_CSWdovecot-sieve = .*sieve.* -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +# These directories belong to CSWosslrt +PROTOTYPE_FILTER = awk '\ + $$$$3 == "/opt/csw/ssl/certs" { next } \ + $$$$3 == "/opt/csw/ssl/private" { next } \ + { print }' # No test suite for Dovecot available TEST_SCRIPTS = -# See http://dovecot.org/list/dovecot/2009-February/037273.html -PATCHFILES = patch-authcrash.diff -# See http://dovecot.org/list/dovecot/2009-March/038201.html -PATCHFILES += patch-enosys.diff # Adjust the comment about file paths in the example conf header PATCHFILES += patch-exampleconf.diff # Override some paths for configure +sysconfdir=/etc/opt/csw localstatedir=/var/opt/csw CONFIGURE_ARGS = $(DIRPATHS) @@ -87,14 +86,10 @@ STRIP_DIRS = $(DESTDIR)$(libexecdir)/dovecot -PROTOTYPE_FILTER = awk '\ - $$$$3 ~ /\/init.d\/cswdovecot$$$$/ { $$$$2 = "cswinitsmf" } \ - $$$$3 ~ /cswusergroup$$$$/ { $$$$2 = "cswusergroup" } \ - $$$$3 ~ /dovecot.pem.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ - $$$$3 ~ /dovecot.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ - $$$$3 == "/opt/csw/ssl/certs" { next } \ - $$$$3 == "/opt/csw/ssl/private" { next } \ - { print }' +# cswclassutils integration +INITSMF = $(sysconfdir)/init.d/cswdovecot +USERGROUP = dovecot:dovecot:Dovecot IMAP Server:/var/opt/csw/run/dovecot/login:/bin/false +SAMPLECONF = .*/dovecot.pem $(sysconfdir)/dovecot.conf include gar/category.mk @@ -102,8 +97,8 @@ # build process, but i found it easiest to put it here and not clutter # post-install even more pre-install-modulated: - @perl -pi -e 's|/etc/ssl|/opt/csw/ssl|' $(WORKSRC)/doc/mkcert.sh - @perl -pi -e '\ + perl -pi -e 's|/etc/ssl|/opt/csw/ssl|' $(WORKSRC)/doc/mkcert.sh + perl -pi -e '\ s| /var/run| /var/opt/csw/run|; \ s| /etc/ssl| /opt/csw/ssl|; \ s| /usr/libexec| /opt/csw/libexec|; \ @@ -111,65 +106,65 @@ $(WORKSRC)/dovecot-example.conf @$(MAKECOOKIE) -# Maybe there is a nicer way to build this via modulations ... -build-and-install-sieveplugin: CONFIGURE_ARGS = $(DIRPATHS) -build-and-install-sieveplugin: CONFIGURE_ARGS += --with-dovecot=../$(WORKSRC) -build-and-install-sieveplugin: - @echo - @echo [===== NOW BUILDING extra cmusieve plugin =====] - @echo - @wget -nc http://www.dovecot.org/releases/sieve/dovecot-sieve-1.1.6.tar.gz - @gtar xzf dovecot-sieve-1.1.6.tar.gz - @(cd dovecot-sieve-1.1.6; \ - $(CONFIGURE_ENV) ./configure $(CONFIGURE_ARGS); \ - $(BUILD_ENV) gmake $(BUILD_ARGS); \ - $(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) $(INSTALL_ARGS) install; ) - @rm -rf dovecot-sieve-1.1.6* - @$(MAKECOOKIE) - -# Sieve plugin needs to be packaged with version != $(GARVERSION) -package-sieveplugin: - @gmake -o post-package \ - NOPACKAGE="CSWdovecot CSWdovecot-devel" SPKG_VERSION=1.1.6 \ - repackage - - -post-install-modulated: DOCS = NEWS AUTHORS COPYING.LGPL COPYING.MIT post-install-modulated: DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME) +post-install-modulated: DOCS = NEWS AUTHORS COPYING.LGPL COPYING.MIT +post-install-modulated: CSWDOCS=README.CSW changelog.CSW post-install-modulated: SSLDIR = $(DESTDIR)/opt/csw/ssl post-install-modulated: build-and-install-sieveplugin - @ginstall -d $(DOCDEST) - @ginstall -d $(DESTDIR)/etc/opt/csw/init.d - @ginstall -d $(DESTDIR)$(sysconfdir)/pkg/CSWdovecot - @ginstall -d $(SSLDIR)/certs - @ginstall -d $(SSLDIR)/private # Include these in the pkg. dovecot will create them otherwise # with root:root ownership, which conflicts with other pkg's - @ginstall -d $(localstatedir)/run $(localstatedir)/lib + ginstall -d $(DESTDIR)$(localstatedir)/run + ginstall -d $(DESTDIR)$(localstatedir)/lib - @cp $(DESTDIR)$(sysconfdir)/dovecot-example.conf \ - $(DESTDIR)$(sysconfdir)/dovecot.conf.CSW + cp $(DESTDIR)$(sysconfdir)/dovecot-example.conf \ + $(DESTDIR)$(sysconfdir)/dovecot.conf # Create self-signed sample cert - @( cd $(WORKSRC)/doc; SSLDIR=$(SSLDIR) /bin/sh ./mkcert.sh ) - @mv $(SSLDIR)/certs/dovecot.pem $(SSLDIR)/certs/dovecot.pem.CSW - @mv $(SSLDIR)/private/dovecot.pem $(SSLDIR)/private/dovecot.pem.CSW - @chmod 400 $(SSLDIR)/private/dovecot.pem.CSW + ginstall -d $(SSLDIR)/certs + ginstall -d $(SSLDIR)/private + ( cd $(WORKSRC)/doc; SSLDIR=$(SSLDIR) /bin/sh ./mkcert.sh ) + chmod 400 $(SSLDIR)/private/dovecot.pem # Copy documentation (upstream + CSW) and mkcert.sh - @$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);) - @cp $(FILEDIR)/CSWdovecot.changelog.CSW $(DOCDEST)/changelog.CSW - @cp $(FILEDIR)/CSWdovecot.README.CSW $(DOCDEST)/README.CSW - @ginstall -m 755 $(WORKSRC)/doc/mkcert.sh $(DOCDEST) - @cp $(WORKSRC)/doc/dovecot-openssl.cnf $(DOCDEST) + ginstall -d $(DOCDEST) + cp $(addprefix $(FILEDIR)/,$(CSWDOCS)) $(DOCDEST) + cp $(addprefix $(WORKSRC)/,$(DOCS)) $(DOCDEST) + ginstall -m 755 $(WORKSRC)/doc/mkcert.sh $(DOCDEST) + cp $(WORKSRC)/doc/dovecot-openssl.cnf $(DOCDEST) - # Files for cswinitsmf and cswusergroup - @ginstall -m 755 $(FILEDIR)/CSWdovecot.cswdovecot \ + # Copy init script + ginstall -Dm 755 $(FILEDIR)/cswdovecot \ $(DESTDIR)/etc/opt/csw/init.d/cswdovecot - @ginstall -m 644 $(FILEDIR)/CSWdovecot.cswusergroup \ - $(DESTDIR)$(sysconfdir)/pkg/CSWdovecot/cswusergroup @$(MAKECOOKIE) post-package: package-sieveplugin @$(MAKECOOKIE) + +# Extra targets for the Sieve plugin build and packaging process, invoked +# via post-install-modulated and post-package. + +SIEVEVERSION = 1.1.8 +SIEVEDIST = dovecot-sieve-$(SIEVEVERSION) +SIEVEURL = http://www.dovecot.org/releases/sieve/$(SIEVEDIST).tar.gz + +build-and-install-sieveplugin: CONFIGURE_ARGS = $(DIRPATHS) +build-and-install-sieveplugin: CONFIGURE_ARGS += --with-dovecot=../$(WORKSRC) +build-and-install-sieveplugin: + @echo + @echo [===== NOW BUILDING extra cmusieve plugin =====] + @echo + wget -nc $(SIEVEURL) + gtar xzf $(SIEVEDIST).tar.gz + (cd $(SIEVEDIST); \ + $(CONFIGURE_ENV) ./configure $(CONFIGURE_ARGS); \ + $(BUILD_ENV) gmake $(BUILD_ARGS); \ + $(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) $(INSTALL_ARGS) install; ) + rm -rf $(SIEVEDIST)* + @$(MAKECOOKIE) + +# Sieve plugin needs to be packaged with version != $(GARVERSION) +package-sieveplugin: + gmake -o post-package \ + NOPACKAGE="CSWdovecot CSWdovecot-devel" SPKG_VERSION=$(SIEVEVERSION) \ + repackage Modified: csw/mgar/pkg/dovecot/trunk/checksums =================================================================== --- csw/mgar/pkg/dovecot/trunk/checksums 2009-11-19 09:29:42 UTC (rev 7354) +++ csw/mgar/pkg/dovecot/trunk/checksums 2009-11-19 09:37:43 UTC (rev 7355) @@ -1,4 +1,2 @@ -c973eb41aca79fb16630a16f0d84f765 download/dovecot-1.1.11.tar.gz -1f39cae3a38d10169fe31f246095b67f download/patch-authcrash.diff -b6bdbd7b8e6f513a8f19dbc0a7507aa6 download/patch-enosys.diff -765a31bece26ed3cebee784dc4aa8216 download/patch-exampleconf.diff +1b0ccfac7765d25f0d106489321a0764 dovecot-1.1.20.tar.gz +765a31bece26ed3cebee784dc4aa8216 patch-exampleconf.diff Deleted: csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.README.CSW =================================================================== --- csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.README.CSW 2009-11-19 09:29:42 UTC (rev 7354) +++ csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.README.CSW 2009-11-19 09:37:43 UTC (rev 7355) @@ -1,56 +0,0 @@ -Configuration file ------------------- - -The default configuration path is /opt/csw/etc/dovecot.conf. CSWdovecot -brings with it a sample configuration (suffixed with .CSW) that will be -installed when dovecot.conf doesn't exist yet. This sample configuration -provides IMAP/POP3 and IMAPS/POP3S services to system users and uses a -self-signed certificate that comes with the package. - -When you adjust dovecot.conf, package upgrades will preserve your -configuration and just install the sample configuration as dovecot.conf.CSW. - - -Machine-local configuration in shared /opt setups -------------------------------------------------- - -If you share /opt among several machines (via NFS for example) you can use -/etc/opt/csw/dovecot.conf as machine-local configuration. The dovecot -startup script will then use it instead of the default configuration. - - -User accounts -------------- - -On installation CSWdovecot will create a user named dovecot in case no user -account by this name exists. This user account is required for the Dovecot -login service (and nothing else). - -If you want to use Dovecot for virtual users, you need to create another -user account (!= dovecot). For background information, see - - http://wiki.dovecot.org/UserIds - - -Upgrading ---------- - -For upgrading information from other IMAP servers or previous Dovecot -versions, see - - http://wiki.dovecot.org/UpgradingDovecot - - -Sieve plugin ------------- - -Sieve support (via the cmusieve plugin) is contained in the CSWdovecot_sieve -package. If required install this package and add - - mail_plugins = cmusieve - -to the "protocol lda" section in dovecot.conf. This requires that you use -Dovecot's deliver as LDA of course. See the following URLs for details - - http://wiki.dovecot.org/LDA - http://wiki.dovecot.org/LDA/Sieve#CMUSieve_Plugin Deleted: csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.changelog.CSW =================================================================== --- csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.changelog.CSW 2009-11-19 09:29:42 UTC (rev 7354) +++ csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.changelog.CSW 2009-11-19 09:37:43 UTC (rev 7355) @@ -1,9 +0,0 @@ -dovecot (1.1.11,REV=2009.03.28) - - * Package adopted and updated to 1.1.11. - * Tested and validated LDAP interopability with PAM. (Closes: #2760) - * Adjusted SSLDIR in mkcert.sh. (Closes: #3027) - * Compiled with --localstatedir=/var/opt/csw. Changes base_dir from - /opt/csw/var/run/dovecot to /var/opt/csw/run/dovecot. - - -- Sebastian Kayser Sat, 28 Mar 2009 18:18:35 +0100 Deleted: csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswdovecot =================================================================== --- csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswdovecot 2009-11-19 09:29:42 UTC (rev 7354) +++ csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswdovecot 2009-11-19 09:37:43 UTC (rev 7355) @@ -1,64 +0,0 @@ -#!/bin/sh -# License is public domain. -# -# Taken from http://wiki.dovecot.org/DovecotInit -# Modified for CSW by Sebastian Kayser -# -#FMRI network - -DAEMON=/opt/csw/sbin/dovecot - -test -x $DAEMON || exit 1 -set -e - -CONF=/opt/csw/etc/dovecot.conf -CONF_LOCAL=/etc/opt/csw/dovecot.conf -[ -r $CONF_LOCAL ] && CONF=$CONF_LOCAL - -[ "`ulimit -n`" -lt 1024 ] && ulimit -n 1024 - -base_dir=`$DAEMON -a|grep '^base_dir: '|sed 's/^base_dir: //'` -pidfile=$base_dir/master.pid - -if test -f $pidfile; then - running=yes -else - running=no -fi - -case "$1" in - start) - echo "Starting Dovecot" - $DAEMON -c $CONF - ;; - stop) - if test $running = yes; then - echo "Stopping Dovecot" - kill `cat $pidfile` - else - echo "Dovecot is already stopped." - fi - ;; - reload) - if test $running = yes; then - echo "Reloading Dovecot configuration" - kill -HUP `cat $pidfile` - else - echo "Dovecot isn't running." - fi - ;; - restart|force-reload) - echo "Restarting Dovecot" - if test $running = yes; then - kill `cat $pidfile` - sleep 1 - fi - $DAEMON -c $CONF - ;; - *) - echo "Usage: /etc/init.d/cswdovecot {start|stop|reload|restart|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0 Deleted: csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswusergroup =================================================================== --- csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswusergroup 2009-11-19 09:29:42 UTC (rev 7354) +++ csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswusergroup 2009-11-19 09:37:43 UTC (rev 7355) @@ -1 +0,0 @@ -dovecot:dovecot:Dovecot IMAP Server:/var/opt/csw/run/dovecot/login:/bin/false Copied: csw/mgar/pkg/dovecot/trunk/files/README.CSW (from rev 6137, csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.README.CSW) =================================================================== --- csw/mgar/pkg/dovecot/trunk/files/README.CSW (rev 0) +++ csw/mgar/pkg/dovecot/trunk/files/README.CSW 2009-11-19 09:37:43 UTC (rev 7355) @@ -0,0 +1,56 @@ +Configuration file +------------------ + +The default configuration path is /opt/csw/etc/dovecot.conf. CSWdovecot +brings with it a sample configuration (suffixed with .CSW) that will be +installed when dovecot.conf doesn't exist yet. This sample configuration +provides IMAP/POP3 and IMAPS/POP3S services to system users and uses a +self-signed certificate that comes with the package. + +When you adjust dovecot.conf, package upgrades will preserve your +configuration and just install the sample configuration as dovecot.conf.CSW. + + +Machine-local configuration in shared /opt setups +------------------------------------------------- + +If you share /opt among several machines (via NFS for example) you can use +/etc/opt/csw/dovecot.conf as machine-local configuration. The dovecot +startup script will then use it instead of the default configuration. + + +User accounts +------------- + +On installation CSWdovecot will create a user named dovecot in case no user +account by this name exists. This user account is required for the Dovecot +login service (and nothing else). + +If you want to use Dovecot for virtual users, you need to create another +user account (!= dovecot). For background information, see + + http://wiki.dovecot.org/UserIds + + +Upgrading +--------- + +For upgrading information from other IMAP servers or previous Dovecot +versions, see + + http://wiki.dovecot.org/UpgradingDovecot + + +Sieve plugin +------------ + +Sieve support (via the cmusieve plugin) is contained in the CSWdovecot_sieve +package. If required install this package and add + + mail_plugins = cmusieve + +to the "protocol lda" section in dovecot.conf. This requires that you use +Dovecot's deliver as LDA of course. See the following URLs for details + + http://wiki.dovecot.org/LDA + http://wiki.dovecot.org/LDA/Sieve#CMUSieve_Plugin Copied: csw/mgar/pkg/dovecot/trunk/files/changelog.CSW (from rev 6137, csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.changelog.CSW) =================================================================== --- csw/mgar/pkg/dovecot/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/dovecot/trunk/files/changelog.CSW 2009-11-19 09:37:43 UTC (rev 7355) @@ -0,0 +1,9 @@ +dovecot (1.1.11,REV=2009.03.28) + + * Package adopted and updated to 1.1.11. + * Tested and validated LDAP interopability with PAM. (Closes: #2760) + * Adjusted SSLDIR in mkcert.sh. (Closes: #3027) + * Compiled with --localstatedir=/var/opt/csw. Changes base_dir from + /opt/csw/var/run/dovecot to /var/opt/csw/run/dovecot. + + -- Sebastian Kayser Sat, 28 Mar 2009 18:18:35 +0100 Copied: csw/mgar/pkg/dovecot/trunk/files/cswdovecot (from rev 6137, csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswdovecot) =================================================================== --- csw/mgar/pkg/dovecot/trunk/files/cswdovecot (rev 0) +++ csw/mgar/pkg/dovecot/trunk/files/cswdovecot 2009-11-19 09:37:43 UTC (rev 7355) @@ -0,0 +1,64 @@ +#!/bin/sh +# License is public domain. +# +# Taken from http://wiki.dovecot.org/DovecotInit +# Modified for CSW by Sebastian Kayser +# +#FMRI network + +DAEMON=/opt/csw/sbin/dovecot + +test -x $DAEMON || exit 1 +set -e + +CONF=/opt/csw/etc/dovecot.conf +CONF_LOCAL=/etc/opt/csw/dovecot.conf +[ -r $CONF_LOCAL ] && CONF=$CONF_LOCAL + +[ "`ulimit -n`" -lt 1024 ] && ulimit -n 1024 + +base_dir=`$DAEMON -a|grep '^base_dir: '|sed 's/^base_dir: //'` +pidfile=$base_dir/master.pid + +if test -f $pidfile; then + running=yes +else + running=no +fi + +case "$1" in + start) + echo "Starting Dovecot" + $DAEMON -c $CONF + ;; + stop) + if test $running = yes; then + echo "Stopping Dovecot" + kill `cat $pidfile` + else + echo "Dovecot is already stopped." + fi + ;; + reload) + if test $running = yes; then + echo "Reloading Dovecot configuration" + kill -HUP `cat $pidfile` + else + echo "Dovecot isn't running." + fi + ;; + restart|force-reload) + echo "Restarting Dovecot" + if test $running = yes; then + kill `cat $pidfile` + sleep 1 + fi + $DAEMON -c $CONF + ;; + *) + echo "Usage: /etc/init.d/cswdovecot {start|stop|reload|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Nov 19 10:58:10 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 19 Nov 2009 09:58:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7356] csw/mgar/pkg/nspr/trunk/Makefile Message-ID: Revision: 7356 http://gar.svn.sourceforge.net/gar/?rev=7356&view=rev Author: wahwah Date: 2009-11-19 09:58:10 +0000 (Thu, 19 Nov 2009) Log Message: ----------- nspr: adjusting the nspr.pc file location Modified Paths: -------------- csw/mgar/pkg/nspr/trunk/Makefile Modified: csw/mgar/pkg/nspr/trunk/Makefile =================================================================== --- csw/mgar/pkg/nspr/trunk/Makefile 2009-11-19 09:37:43 UTC (rev 7355) +++ csw/mgar/pkg/nspr/trunk/Makefile 2009-11-19 09:58:10 UTC (rev 7356) @@ -84,9 +84,9 @@ ginstall -m 755 -d $(DESTDIR)$(bindir) ginstall -m 755 $(WORKSRC)/build/config/nspr-config \ $(DESTDIR)$(bindir) - ginstall -m 755 -d $(DESTDIR)$(prefix)/pkgconfig + ginstall -m 755 -d $(DESTDIR)$(libdir)/pkgconfig ginstall -m 644 $(WORKSRC)/build/config/nspr.pc \ - $(DESTDIR)$(prefix)/pkgconfig + $(DESTDIR)$(libdir)/pkgconfig rm $(DESTDIR)$(bindir)/prerr.properties rm $(DESTDIR)$(bindir)/nspr.pc rm $(DESTDIR)$(bindir)/compile-et.pl This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Thu Nov 19 16:37:24 2009 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Thu, 19 Nov 2009 15:37:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7357] csw/mgar/pkg/tuntap/trunk/Makefile Message-ID: Revision: 7357 http://gar.svn.sourceforge.net/gar/?rev=7357&view=rev Author: bensons Date: 2009-11-19 15:37:24 +0000 (Thu, 19 Nov 2009) Log Message: ----------- tuntap: adjusted Makefile in respect to SPKG_DESC_ Modified Paths: -------------- csw/mgar/pkg/tuntap/trunk/Makefile Modified: csw/mgar/pkg/tuntap/trunk/Makefile =================================================================== --- csw/mgar/pkg/tuntap/trunk/Makefile 2009-11-19 09:58:10 UTC (rev 7356) +++ csw/mgar/pkg/tuntap/trunk/Makefile 2009-11-19 15:37:24 UTC (rev 7357) @@ -11,6 +11,7 @@ to create a network bridge, while TUN is used with routing. endef +SPKG_SOURCEURL = http://www.whiteboard.ne.jp/~admin2/tuntap/ MASTER_SITES = http://www.whiteboard.ne.jp/~admin2/tuntap/source/tuntap/ # fix Dist DISTNAME = tuntap @@ -24,7 +25,9 @@ # one Makefile for both packages PACKAGES = CSWtun CSWtap CATALOGNAME_CSWtun = tun +SPKG_DESC_CSWtun = tun CATALOGNAME_CSWtap = tap +SPKG_DESC_CSWtap = tap # define packagefiles PKGFILES_CSWtun = /usr/kernel/drv/tun PKGFILES_CSWtun += /usr/kernel/drv/tun.conf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Nov 20 09:47:13 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 20 Nov 2009 08:47:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[7358] csw/mgar/pkg/libmcrypt/trunk Message-ID: Revision: 7358 http://gar.svn.sourceforge.net/gar/?rev=7358&view=rev Author: wahwah Date: 2009-11-20 08:47:13 +0000 (Fri, 20 Nov 2009) Log Message: ----------- mcrypt: Bumped version to 2.6.8, but it needs newer mhash Modified Paths: -------------- csw/mgar/pkg/libmcrypt/trunk/Makefile csw/mgar/pkg/libmcrypt/trunk/checksums Modified: csw/mgar/pkg/libmcrypt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmcrypt/trunk/Makefile 2009-11-19 15:37:24 UTC (rev 7357) +++ csw/mgar/pkg/libmcrypt/trunk/Makefile 2009-11-20 08:47:13 UTC (rev 7358) @@ -1,5 +1,5 @@ GARNAME = libmcrypt -GARVERSION = 2.5.8 +GARVERSION = 2.6.8 CATEGORIES = lib DESCRIPTION = GPL replacement for Unix crypt that supports a wide range of algorithms and modes @@ -10,11 +10,11 @@ endef SF_PROJ = mcrypt -MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(SF_PROJ)-$(GARVERSION).tar.gz +DISTNAME = $(SF_PROJ)-$(GARVERSION) -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz BUILD64 = 1 NOISALIST = 1 Modified: csw/mgar/pkg/libmcrypt/trunk/checksums =================================================================== --- csw/mgar/pkg/libmcrypt/trunk/checksums 2009-11-19 15:37:24 UTC (rev 7357) +++ csw/mgar/pkg/libmcrypt/trunk/checksums 2009-11-20 08:47:13 UTC (rev 7358) @@ -1 +1 @@ -c4f491dd411a09e9de3b8702ea6f73eb libmcrypt-2.5.8.tar.bz2 +97639f8821b10f80943fa17da302607e mcrypt-2.6.8.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 Nov 20 10:09:26 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 20 Nov 2009 09:09:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[7359] csw/mgar/pkg/libmcrypt/trunk Message-ID: Revision: 7359 http://gar.svn.sourceforge.net/gar/?rev=7359&view=rev Author: wahwah Date: 2009-11-20 09:09:26 +0000 (Fri, 20 Nov 2009) Log Message: ----------- libmcrypt: Fixed a problem with arbitrary -Wall, not it misses /opt/csw/lib/libltdl.la Modified Paths: -------------- csw/mgar/pkg/libmcrypt/trunk/Makefile csw/mgar/pkg/libmcrypt/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libmcrypt/trunk/files/no-wall.patch Modified: csw/mgar/pkg/libmcrypt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmcrypt/trunk/Makefile 2009-11-20 08:47:13 UTC (rev 7358) +++ csw/mgar/pkg/libmcrypt/trunk/Makefile 2009-11-20 09:09:26 UTC (rev 7359) @@ -15,6 +15,7 @@ DISTNAME = $(SF_PROJ)-$(GARVERSION) UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +PATCHFILES = no-wall.patch BUILD64 = 1 NOISALIST = 1 @@ -23,6 +24,8 @@ CONFIGURE_ARGS += --enable-dynamic-loading CONFIGURE_ARGS += --with-included-algos=cast-128,gost,rijndael-128,twofish,arcfour,cast-256,loki97,rijndael-192,saferplus,wake,blowfish-compat,des,rijndael-256,serpent,xtea,blowfish,enigma,rc2,tripledes +EXTRA_CFLAGS = -D__const=const + TEST_TARGET = check include gar/category.mk Modified: csw/mgar/pkg/libmcrypt/trunk/checksums =================================================================== --- csw/mgar/pkg/libmcrypt/trunk/checksums 2009-11-20 08:47:13 UTC (rev 7358) +++ csw/mgar/pkg/libmcrypt/trunk/checksums 2009-11-20 09:09:26 UTC (rev 7359) @@ -1 +1,2 @@ 97639f8821b10f80943fa17da302607e mcrypt-2.6.8.tar.gz +7047afdeed0db312f9e0a120ad3ec419 no-wall.patch Added: csw/mgar/pkg/libmcrypt/trunk/files/no-wall.patch =================================================================== --- csw/mgar/pkg/libmcrypt/trunk/files/no-wall.patch (rev 0) +++ csw/mgar/pkg/libmcrypt/trunk/files/no-wall.patch 2009-11-20 09:09:26 UTC (rev 7359) @@ -0,0 +1,11 @@ +--- mcrypt-2.6.8/configure.in.orig 2009-11-20 10:01:43.576935508 +0100 ++++ mcrypt-2.6.8/configure.in 2009-11-20 10:01:51.038566121 +0100 +@@ -57,7 +57,7 @@ + *** in OpenPGP packets.)) + + LIBS="${LIBS} ${LIBMCRYPT_LIBS}" +-CFLAGS="${CFLAGS} ${LIBMCRYPT_CFLAGS} -Wall" ++CFLAGS="${CFLAGS} ${LIBMCRYPT_CFLAGS}" + + + AC_C_CONST 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 Nov 20 10:34:23 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 20 Nov 2009 09:34:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7360] csw/mgar/pkg/libmcrypt/trunk Message-ID: Revision: 7360 http://gar.svn.sourceforge.net/gar/?rev=7360&view=rev Author: wahwah Date: 2009-11-20 09:34:23 +0000 (Fri, 20 Nov 2009) Log Message: ----------- libmcrypt: There's a difference between libmcrypt and mcrypt. Modified Paths: -------------- csw/mgar/pkg/libmcrypt/trunk/Makefile csw/mgar/pkg/libmcrypt/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/libmcrypt/trunk/files/no-wall.patch Modified: csw/mgar/pkg/libmcrypt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmcrypt/trunk/Makefile 2009-11-20 09:09:26 UTC (rev 7359) +++ csw/mgar/pkg/libmcrypt/trunk/Makefile 2009-11-20 09:34:23 UTC (rev 7360) @@ -1,5 +1,5 @@ GARNAME = libmcrypt -GARVERSION = 2.6.8 +GARVERSION = 2.5.8 CATEGORIES = lib DESCRIPTION = GPL replacement for Unix crypt that supports a wide range of algorithms and modes @@ -10,12 +10,11 @@ endef SF_PROJ = mcrypt -MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(SF_PROJ)-$(GARVERSION).tar.gz -DISTNAME = $(SF_PROJ)-$(GARVERSION) +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PATCHFILES = no-wall.patch +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 BUILD64 = 1 NOISALIST = 1 @@ -24,8 +23,6 @@ CONFIGURE_ARGS += --enable-dynamic-loading CONFIGURE_ARGS += --with-included-algos=cast-128,gost,rijndael-128,twofish,arcfour,cast-256,loki97,rijndael-192,saferplus,wake,blowfish-compat,des,rijndael-256,serpent,xtea,blowfish,enigma,rc2,tripledes -EXTRA_CFLAGS = -D__const=const - TEST_TARGET = check include gar/category.mk Modified: csw/mgar/pkg/libmcrypt/trunk/checksums =================================================================== --- csw/mgar/pkg/libmcrypt/trunk/checksums 2009-11-20 09:09:26 UTC (rev 7359) +++ csw/mgar/pkg/libmcrypt/trunk/checksums 2009-11-20 09:34:23 UTC (rev 7360) @@ -1,2 +1 @@ -97639f8821b10f80943fa17da302607e mcrypt-2.6.8.tar.gz -7047afdeed0db312f9e0a120ad3ec419 no-wall.patch +c4f491dd411a09e9de3b8702ea6f73eb libmcrypt-2.5.8.tar.bz2 Deleted: csw/mgar/pkg/libmcrypt/trunk/files/no-wall.patch =================================================================== --- csw/mgar/pkg/libmcrypt/trunk/files/no-wall.patch 2009-11-20 09:09:26 UTC (rev 7359) +++ csw/mgar/pkg/libmcrypt/trunk/files/no-wall.patch 2009-11-20 09:34:23 UTC (rev 7360) @@ -1,11 +0,0 @@ ---- mcrypt-2.6.8/configure.in.orig 2009-11-20 10:01:43.576935508 +0100 -+++ mcrypt-2.6.8/configure.in 2009-11-20 10:01:51.038566121 +0100 -@@ -57,7 +57,7 @@ - *** in OpenPGP packets.)) - - LIBS="${LIBS} ${LIBMCRYPT_LIBS}" --CFLAGS="${CFLAGS} ${LIBMCRYPT_CFLAGS} -Wall" -+CFLAGS="${CFLAGS} ${LIBMCRYPT_CFLAGS}" - - - AC_C_CONST 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 Nov 20 16:15:11 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 20 Nov 2009 15:15:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[7361] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7361 http://gar.svn.sourceforge.net/gar/?rev=7361&view=rev Author: dmichelsen Date: 2009-11-20 15:15:11 +0000 (Fri, 20 Nov 2009) Log Message: ----------- mGAR v2: Clarify variable assignment in MIGRATE_FILES Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-11-20 09:34:23 UTC (rev 7360) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-11-20 15:15:11 UTC (rev 7361) @@ -596,16 +596,14 @@ merge-migrateconf: $(foreach S,$(SPKG_SPECS),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),merge-migrateconf-$S)) @$(MAKECOOKIE) -merge-migrateconf-%: MIGRATE_FILES_$* ?= $(MIGRATE_FILES) -merge-migrateconf-%: MIGRATE_SOURCE_DIR_$* ?= $(MIGRATE_SOURCE_DIR) -merge-migrateconf-%: MIGRATE_DEST_DIR_$* ?= $(MIGRATE_DEST_DIR) merge-migrateconf-%: @echo "[ Generating cswmigrateconf for package $* ]" + @echo "X: $(MIGRATE_FILES_$*) Y: $(MIGRATE_FILES)" $(_DBG)ginstall -d $(PKGROOT)/etc/opt/csw/pkg/$* - $(_DBG)(echo "MIGRATE_FILES=\"$(MIGRATE_FILES_$*)\"";\ + $(_DBG)(echo "MIGRATE_FILES=\"$(or $(MIGRATE_FILES_$*),$(MIGRATE_FILES))\"";\ $(if $(MIGRATE_SOURCE_DIR_$*),echo "SOURCE_DIR___default__=\"$(MIGRATE_SOURCE_DIR_$*)\"";)\ $(if $(MIGRATE_DEST_DIR_$*),echo "DEST_DIR___default__=\"$(MIGRATE_DEST_DIR_$*)\"";)\ - $(foreach F,$(MIGRATE_FILES_$*),\ + $(foreach F,$(or $(MIGRATE_FILES_$*),$(MIGRATE_FILES)),\ $(if $(MIGRATE_SOURCE_DIR_$F),echo "SOURCE_DIR_$(subst .,_,$F)=\"$(MIGRATE_SOURCE_DIR_$F)\"";)\ $(if $(MIGRATE_DEST_DIR_$F),echo "DEST_DIR_$(subst .,_,$F)=\"$(MIGRATE_DEST_DIR_$F)\"";)\ )\ 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 Nov 20 16:29:51 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 20 Nov 2009 15:29:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[7362] csw/mgar/pkg/postgresql/trunk/Makefile Message-ID: Revision: 7362 http://gar.svn.sourceforge.net/gar/?rev=7362&view=rev Author: dmichelsen Date: 2009-11-20 15:29:51 +0000 (Fri, 20 Nov 2009) Log Message: ----------- postgresql: Reset directories to let GAR extend the path Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2009-11-20 15:15:11 UTC (rev 7361) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2009-11-20 15:29:51 UTC (rev 7362) @@ -8,17 +8,17 @@ define BLURB endef -bindir = $(prefix)/bin/$(GARNAME)/$(BASE_VERSION) +bindir_install = $(prefix)/bin/$(GARNAME)/$(BASE_VERSION) datadir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION) docdir=$(prefix)/share/doc/$(GARNAME)/$(BASE_VERSION) includedir=$(prefix)/include/$(GARNAME)/$(BASE_VERSION) infodir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION)/info -libdir=$(prefix)/lib/$(GARNAME)/$(BASE_VERSION) -libexecdir=$(prefix)/libexec/$(GARNAME)/$(BASE_VERSION) +libdir_install =$(prefix)/lib/$(GARNAME)/$(BASE_VERSION) +libexecdir_install =$(prefix)/libexec/$(GARNAME)/$(BASE_VERSION) lispdir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION)/emacs/site-lisp localstatedir = /var/opt/csw/$(GARNAME)/$(BASE_VERSION) mandir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION)/man -sbindir = $(prefix)/sbin/$(GARNAME)/$(BASE_VERSION) +sbindir_install = $(prefix)/sbin/$(GARNAME)/$(BASE_VERSION) sharedstatedir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION) sourcedir=$(prefix)/src/$(GARNAME)/$(BASE_VERSION) sysconfdir = /etc/opt/csw/$(GARNAME)/$(BASE_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 Fri Nov 20 17:05:43 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 20 Nov 2009 16:05:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[7363] csw/mgar/pkg/icecast/trunk/Makefile Message-ID: Revision: 7363 http://gar.svn.sourceforge.net/gar/?rev=7363&view=rev Author: dmichelsen Date: 2009-11-20 16:05:42 +0000 (Fri, 20 Nov 2009) Log Message: ----------- icecast: Relocate directories to new locations Modified Paths: -------------- csw/mgar/pkg/icecast/trunk/Makefile Modified: csw/mgar/pkg/icecast/trunk/Makefile =================================================================== --- csw/mgar/pkg/icecast/trunk/Makefile 2009-11-20 15:29:51 UTC (rev 7362) +++ csw/mgar/pkg/icecast/trunk/Makefile 2009-11-20 16:05:42 UTC (rev 7363) @@ -21,8 +21,14 @@ PREREQUISITE_PKGS = $(REQUIRED_PKGS) sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw +PRESERVECONF = $(sysconfdir)/icecast.xml + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check include gar/category.mk + +post-install-modulated: + @ginstall -d $(DESTDIR)$(localstatedir)/log/icecast 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 Nov 20 22:27:08 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 20 Nov 2009 21:27:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[7364] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 7364 http://gar.svn.sourceforge.net/gar/?rev=7364&view=rev Author: bdwalton Date: 2009-11-20 21:27:07 +0000 (Fri, 20 Nov 2009) Log Message: ----------- cswclassutils: cswinetd: create manifest directory when required Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/checksums csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2009-11-20 16:05:42 UTC (rev 7363) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2009-11-20 21:27:07 UTC (rev 7364) @@ -2,7 +2,7 @@ fe030911decab669145b3017ed4fdf10 CSWcswclassutils.i.cswcpsampleconf 9a6f5ad4919b78e4083491edcd86db0c CSWcswclassutils.i.cswcrontab 56900bb1fc9f40f7c227877eca32b1f8 CSWcswclassutils.i.cswetcservices -b363134a7c70a342195badc942a23b9d CSWcswclassutils.i.cswinetd +4f2e9de463cb4b17ba6e1b3dfdf18913 CSWcswclassutils.i.cswinetd fa318ca696e80a9a9f2efbf35cb69080 CSWcswclassutils.i.cswinitsmf 42668b41c7c886091a8ca44992b90806 CSWcswclassutils.i.cswmigrateconf c875d62c8ddaad0de2e18fff7946e1e8 CSWcswclassutils.i.cswpreserveconf Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd 2009-11-20 16:05:42 UTC (rev 7363) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd 2009-11-20 21:27:07 UTC (rev 7364) @@ -72,6 +72,8 @@ if [ "$isrpc" = "yes" ]; then outdir=$outdir/rpc fi + [ -d $outdir ] || mkdir -p $outdir + manifest=$outdir/$svcname-$proto.xml TMPOUT=/var/opt/csw/cswclassutils/$svcname.$$ 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 Nov 20 22:36:22 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 20 Nov 2009 21:36:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[7365] csw/mgar/pkg/cswclassutils/trunk/Makefile Message-ID: Revision: 7365 http://gar.svn.sourceforge.net/gar/?rev=7365&view=rev Author: bonivart Date: 2009-11-20 21:36:21 +0000 (Fri, 20 Nov 2009) Log Message: ----------- cswclassutils: update to 1.30 with inetd fix Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-11-20 21:27:07 UTC (rev 7364) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-11-20 21:36:21 UTC (rev 7365) @@ -1,7 +1,7 @@ # $Id$ GARNAME = cswclassutils -GARVERSION = 1.29 +GARVERSION = 1.30 CATEGORIES = utils DESCRIPTION = CSW class action utilities This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Nov 21 09:48:44 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 21 Nov 2009 08:48:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7366] csw/mgar/pkg/nspr/trunk/Makefile Message-ID: Revision: 7366 http://gar.svn.sourceforge.net/gar/?rev=7366&view=rev Author: wahwah Date: 2009-11-21 08:48:44 +0000 (Sat, 21 Nov 2009) Log Message: ----------- nspr: headers in include/nspr, better CSWnspr-devel package. Modified Paths: -------------- csw/mgar/pkg/nspr/trunk/Makefile Modified: csw/mgar/pkg/nspr/trunk/Makefile =================================================================== --- csw/mgar/pkg/nspr/trunk/Makefile 2009-11-20 21:36:21 UTC (rev 7365) +++ csw/mgar/pkg/nspr/trunk/Makefile 2009-11-21 08:48:44 UTC (rev 7366) @@ -14,9 +14,10 @@ PATCHFILES = nspr-4.6.1-config.patch PACKAGES = CSWnspr CSWnspr-devel -PKGFILES_CSWnspr-devel = $(PKGFILES_DEVEL) +PKGFILES_CSWnspr-devel = $(PKGFILES_DEVEL) PKGFILES_CSWnspr-devel += $(bindir).*nspr-config -PKGFILES_CSWnspr-devel += $(prefix)/pkgconfig/nspr\.pc +PKGFILES_CSWnspr-devel += .*/nspr\.pc +PKGFILES_CSWnspr-devel += .*compile-et\.pl SPKG_DESC_CSWnspr = Netscape Portable Runtime SPKG_DESC_CSWnspr-devel = Netscape Portable Runtime development files @@ -38,19 +39,26 @@ libdir = $(prefix)/lib/nspr localstatedir = /var/opt/csw sysconfdir = /etc/opt/csw +# Move the include files to include/nspr to prevent polluting the main +# header file namespace. +includedir = $(prefix)/include/nspr CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-mozilla -CONFIGURE_ARGS += --disable-debug -CONFIGURE_ARGS += --enable-strip CONFIGURE_ARGS += --with-native-threads CONFIGURE_ARGS += --enable-ipv6 -CONFIGURE_ARGS += --enable-optimize="-xO3" -CONFIGURE_ARGS += --disable-tests CONFIGURE_ARGS += --enable-system-sqlite CONFIGURE_ARGS_isa-sparcv9 = --enable-64bit CONFIGURE_ARGS_isa-amd64 = --enable-64bit CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION)) +CONFIGURE_ARGS_OPT = --enable-optimize="-xO3" +CONFIGURE_ARGS_OPT += --disable-debug +CONFIGURE_ARGS_OPT += --enable-strip +CONFIGURE_ARGS_OPT += --disable-tests +CONFIGURE_ARGS_DBG = --enable-debug +CONFIGURE_ARGS_DBG += --disable-strip +CONFIGURE_ARGS_DBG += --enable-tests +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) # These options I'm unsure about, are they really needed? # EXTRA_LDFLAGS = -R'\$\$ORIGIN:\$\$ORIGIN/..' -R/opt/csw/lib @@ -89,5 +97,4 @@ $(DESTDIR)$(libdir)/pkgconfig rm $(DESTDIR)$(bindir)/prerr.properties rm $(DESTDIR)$(bindir)/nspr.pc - rm $(DESTDIR)$(bindir)/compile-et.pl @$(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 Sat Nov 21 11:04:07 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 21 Nov 2009 10:04:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7367] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7367 http://gar.svn.sourceforge.net/gar/?rev=7367&view=rev Author: dmichelsen Date: 2009-11-21 10:04:07 +0000 (Sat, 21 Nov 2009) Log Message: ----------- mGAR v2: Fix depend on cswclassutils which broke on introduction of TEXINFO Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-11-21 08:48:44 UTC (rev 7366) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-11-21 10:04:07 UTC (rev 7367) @@ -193,7 +193,6 @@ TEXINFO ?= $(infodir)/.*\.info(?:-\d+)? $(EXTRA_TEXINFO) # - set class for all config files -ifneq ($(SAMPLECONF)$(PRESERVECONF)$(MIGRATECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE)$(TEXINFO),) _CSWCLASS_FILTER = | perl -ane '\ $(foreach FILE,$(MIGRATECONF),$$F[1] = "cswmigrateconf" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(SAMPLECONF:%\.CSW=%),$$F[1] = "cswcpsampleconf" if ( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ @@ -206,6 +205,8 @@ $(foreach FILE,$(TEXINFO),$$F[1] = "cswtexinfo" if( $$F[2] =~ m(^$(FILE)$$) );)\ print join(" ", at F),"\n";' +# The TEXINFO dependency is handled dynamically by looking at the prototype for matching files +ifneq ($(MIGRATECONF)$(SAMPLECONF)$(PRESERVECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),) _EXTRA_GAR_PKGS += CSWcswclassutils # Make sure the configuration files always have a .CSW suffix and rename the # configuration files to this if necessary during merge. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Nov 21 11:25:41 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 21 Nov 2009 10:25:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[7368] csw/mgar/pkg/libssh2/trunk Message-ID: Revision: 7368 http://gar.svn.sourceforge.net/gar/?rev=7368&view=rev Author: dmichelsen Date: 2009-11-21 10:25:39 +0000 (Sat, 21 Nov 2009) Log Message: ----------- libssh2: Update to 1.2.2, test was commented out and is still failing Modified Paths: -------------- csw/mgar/pkg/libssh2/trunk/Makefile csw/mgar/pkg/libssh2/trunk/checksums Modified: csw/mgar/pkg/libssh2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libssh2/trunk/Makefile 2009-11-21 10:04:07 UTC (rev 7367) +++ csw/mgar/pkg/libssh2/trunk/Makefile 2009-11-21 10:25:39 UTC (rev 7368) @@ -1,8 +1,8 @@ GARNAME = libssh2 -GARVERSION = 1.2.1 +GARVERSION = 1.2.2 CATEGORIES = lib -DESCRIPTION = A Library Implementing the SSH2 Protocol. +DESCRIPTION = A Library Implementing the SSH2 Protocol define BLURB libssh2 is a library implementing the SSH2 protocol as defined by Internet Drafts: SECSH-TRANS, SECSH-USERAUTH, SECSH-CONNECTION, @@ -14,24 +14,21 @@ SPKG_SOURCEURL = http://www.libssh2.org DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PACKAGES = CSWlibssh2 -CATALOGNAME_CSWlibssh2 = libssh2 -SPKG_DESC_CSWlibssh2 = $(DESCRIPTION) - -REQUIRED_PKGS_CSWlibssh2 = CSWosslrt CSWzlib - - # We define upstream file regex so we can be notifed of # new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +REQUIRED_PKGS = CSWosslrt CSWzlib +PREREQUISITE_PKGS = CSWossldevel CSWzlib + BUILD64 = 1 NO_ISAEXEC = 1 -TEST_SCRIPTS = -TEST_TARGET = check CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libz CONFIGURE_ARGS += --with-openssl=/opt/csw +# TEST_SCRIPTS = +TEST_TARGET = check + include gar/category.mk Modified: csw/mgar/pkg/libssh2/trunk/checksums =================================================================== --- csw/mgar/pkg/libssh2/trunk/checksums 2009-11-21 10:04:07 UTC (rev 7367) +++ csw/mgar/pkg/libssh2/trunk/checksums 2009-11-21 10:25:39 UTC (rev 7368) @@ -1 +1 @@ -4ee0197947a3b8a4472328c346e1a0e4 download/libssh2-1.2.1.tar.gz +fa8d9cd425bdd62f57244fc61fb54da7 libssh2-1.2.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 Sat Nov 21 11:29:12 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 21 Nov 2009 10:29:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7369] csw/mgar/pkg/squid/tags/squid-2.7, REV=2009.06. 18_STABLE6/ Message-ID: Revision: 7369 http://gar.svn.sourceforge.net/gar/?rev=7369&view=rev Author: dmichelsen Date: 2009-11-21 10:29:11 +0000 (Sat, 21 Nov 2009) Log Message: ----------- squid: Tag existing release Added Paths: ----------- csw/mgar/pkg/squid/tags/squid-2.7,REV=2009.06.18_STABLE6/ 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 Nov 21 12:11:03 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 21 Nov 2009 11:11:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[7370] csw/mgar/pkg/nspr/trunk/Makefile Message-ID: Revision: 7370 http://gar.svn.sourceforge.net/gar/?rev=7370&view=rev Author: wahwah Date: 2009-11-21 11:11:02 +0000 (Sat, 21 Nov 2009) Log Message: ----------- nspr: nspr.pc in /opt/csw/lib/pkgconfig. Modified Paths: -------------- csw/mgar/pkg/nspr/trunk/Makefile Modified: csw/mgar/pkg/nspr/trunk/Makefile =================================================================== --- csw/mgar/pkg/nspr/trunk/Makefile 2009-11-21 10:29:11 UTC (rev 7369) +++ csw/mgar/pkg/nspr/trunk/Makefile 2009-11-21 11:11:02 UTC (rev 7370) @@ -36,7 +36,7 @@ export PERL -libdir = $(prefix)/lib/nspr +libdir_install = $(prefix)/lib/nspr localstatedir = /var/opt/csw sysconfdir = /etc/opt/csw # Move the include files to include/nspr to prevent polluting the main @@ -92,9 +92,9 @@ ginstall -m 755 -d $(DESTDIR)$(bindir) ginstall -m 755 $(WORKSRC)/build/config/nspr-config \ $(DESTDIR)$(bindir) - ginstall -m 755 -d $(DESTDIR)$(libdir)/pkgconfig + ginstall -m 755 -d $(DESTDIR)$(prefix)/lib/pkgconfig ginstall -m 644 $(WORKSRC)/build/config/nspr.pc \ - $(DESTDIR)$(libdir)/pkgconfig + $(DESTDIR)$(prefix)/lib/pkgconfig rm $(DESTDIR)$(bindir)/prerr.properties rm $(DESTDIR)$(bindir)/nspr.pc @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Nov 21 15:11:18 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 21 Nov 2009 14:11:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7371] csw/mgar/pkg Message-ID: Revision: 7371 http://gar.svn.sourceforge.net/gar/?rev=7371&view=rev Author: wbonnet Date: 2009-11-21 14:11:16 +0000 (Sat, 21 Nov 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/image-editor/ csw/mgar/pkg/image-editor/branches/ csw/mgar/pkg/image-editor/tags/ csw/mgar/pkg/image-editor/trunk/ csw/mgar/pkg/image-editor/trunk/Makefile csw/mgar/pkg/image-editor/trunk/checksums csw/mgar/pkg/image-editor/trunk/files/ csw/mgar/pkg/image-editor/trunk/files/ImageEditor csw/mgar/pkg/image-editor/trunk/files/License.txt Property changes on: csw/mgar/pkg/image-editor/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/image-editor/trunk/Makefile =================================================================== --- csw/mgar/pkg/image-editor/trunk/Makefile (rev 0) +++ csw/mgar/pkg/image-editor/trunk/Makefile 2009-11-21 14:11:16 UTC (rev 7371) @@ -0,0 +1,39 @@ +GARNAME = image-editor +GARVERSION = 2.1.355 +CATEGORIES = java + +DESCRIPTION = Java Image Editor +define BLURB + A fully-featured image editor written in Java using the image filters. Suitable for editing icons or Web images. Features include: Multiple layers, blending modes, image effects, image warping. +endef + +MASTER_SITES = http://www.jhlabs.com/ie/ +DISTFILES = ImageEditor.jar +DISTFILES += ImageEditor +DISTFILES += License.txt + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +PACKAGES = CSWimageeditor +CATALOGNAME_CSWimageeditor = imageeditor + +ARCHALL = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom +LICENSE = License.txt + +include gar/category.mk + +install-custom: + @ginstall -d $(DESTDIR)$(bindir) + @ginstall -d $(DESTDIR)$(datadir)/java + @ginstall $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/ImageEditor $(DESTDIR)$(bindir) + @ginstall $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/ImageEditor.jar $(DESTDIR)$(datadir)/java + + @$(MAKECOOKIE) Added: csw/mgar/pkg/image-editor/trunk/checksums =================================================================== --- csw/mgar/pkg/image-editor/trunk/checksums (rev 0) +++ csw/mgar/pkg/image-editor/trunk/checksums 2009-11-21 14:11:16 UTC (rev 7371) @@ -0,0 +1,3 @@ +aae1797a343749f06d8de254f34d7def ImageEditor +ab316d6430e8fa589ed7a638a24cf8e8 ImageEditor.jar +c308b6deb32b66acd054415c3f60851e License.txt Added: csw/mgar/pkg/image-editor/trunk/files/ImageEditor =================================================================== --- csw/mgar/pkg/image-editor/trunk/files/ImageEditor (rev 0) +++ csw/mgar/pkg/image-editor/trunk/files/ImageEditor 2009-11-21 14:11:16 UTC (rev 7371) @@ -0,0 +1,2 @@ +#!/bin/sh +java -jar /opt/csw/share/java/ImageEditor.jar Property changes on: csw/mgar/pkg/image-editor/trunk/files/ImageEditor ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/image-editor/trunk/files/License.txt =================================================================== --- csw/mgar/pkg/image-editor/trunk/files/License.txt (rev 0) +++ csw/mgar/pkg/image-editor/trunk/files/License.txt 2009-11-21 14:11:16 UTC (rev 7371) @@ -0,0 +1 @@ +To be defined, seems to be apache 2.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 Nov 21 16:16:44 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 21 Nov 2009 15:16:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7372] csw/mgar/pkg Message-ID: Revision: 7372 http://gar.svn.sourceforge.net/gar/?rev=7372&view=rev Author: wahwah Date: 2009-11-21 15:16:44 +0000 (Sat, 21 Nov 2009) Log Message: ----------- nss: Initial commit, work in progress, installer segfaults. Modified Paths: -------------- csw/mgar/pkg/nss/trunk/Makefile csw/mgar/pkg/nss/trunk/checksums Added Paths: ----------- csw/mgar/pkg/nss/ csw/mgar/pkg/nss/trunk/files/nss-3.12.4.patch csw/mgar/pkg/nss/trunk/files/shared-libs.patch Modified: csw/mgar/pkg/nss/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-11-12 20:57:45 UTC (rev 7254) +++ csw/mgar/pkg/nss/trunk/Makefile 2009-11-21 15:16:44 UTC (rev 7372) @@ -11,8 +11,11 @@ ## For more information about GAR variables, please see: ## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference ## -GARNAME = mypkg -GARVERSION = 1.0 +# Based on: +# http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/nss-3.12.4-r1.ebuild?view=markup +GARNAME = nss +GARVERSION = 3.12.4 +# http://www.gentoo-portage.com/AJAX/Ebuild/96014 ## ## The category that your software fits in. This is not a descriptive field, but ## influences the build process. Depending on the CATEGORIES setting, different @@ -25,21 +28,22 @@ CATEGORIES = lib ## ## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = +DESCRIPTION = Network Security Services library, implements PKI support ## ## 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 = +SPKG_SOURCEURL = http://www.mozilla.org/projects/security/pki/nss/ ## ## Whitespace-separated list of URLs to download the source package from. ## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = +# TODO: Generate RTM_NAME from GARVERSION +RTM_NAME = NSS_3_12_4_RTM +MASTER_SITES = ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/ ## ## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the ## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge @@ -49,14 +53,18 @@ ## 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 = +# http://bugs.gentoo.org/show_bug.cgi?id=256102 +PATCHFILES = nss-3.12.4.patch +PATCHFILES += shared-libs.patch +## PATCHFILES = freebl.patch ## ## Whitespace-separated list of files which comprise this build. mGAR will look ## for the files in the $(FILEDIR) (trunk/files) directory and on the ## $(MASTER_SITES). DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz ## -## We define upstream file regex so we can be notifed of new upstream software release +## We define upstream file regex so we can be notifed of new upstream software +## release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz ## ## Catalog name is the name to be used with pkg{-get,util} -i . @@ -123,10 +131,10 @@ ## ETCSERVICES = ## INETDCONF = ## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = +REQUIRED_PKGS = CSWnspr CSWsqlite3 ## ## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWsqlite3devel ## ## When using non-empty $(PACKAGES): ## REQUIRED_PKGS_CSWpkgname = @@ -145,10 +153,10 @@ ## 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 = +CONFIGURE_SCRIPTS = nss +BUILD_SCRIPTS = nss +INSTALL_SCRIPTS = nss +TEST_SCRIPTS = ## ## Compilation settings ## @@ -162,7 +170,7 @@ ## Arguments passed to the ./configure script. CONFIGURE_ARGS = $(DIRPATHS) ## -## BUILD64 = +BUILD64 = 1 ## CONFIGURE_ENV = ## EXTRA_CFLAGS = ## EXTRA_LDFLAGS = @@ -176,10 +184,66 @@ ## 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 +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +## # To fix PR_STATIC_ASSERT(sizeof(size_t) > 4); in drbg.c, line 510 +## EXTRA_CFLAGS = -DNS_PTR_GT_32=1 +## EXTRA_CXXFLAGS = -DNS_PTR_GT_32=1 +BUILD_OPT = 1 +NSS_USE_SYSTEM_SQLITE = 1 +NSPR_INCLUDE_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --cflags-only-I nspr | gsed 's/-I//') +NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//') +USE_SYSTEM_ZLIB = 1 +ZLIB_LIBS = -lz +NSDISTMODE = copy +NSS_ENABLE_ECC = 1 +XCFLAGS=$(CFLAGS) +FREEBL_NO_DEPEND = 1 +# DSO_LDOPTS = -R/opt/csw/lib/$$$$ISALIST -L/opt/csw/lib +# export DSO_LDOPTS +ifeq ($(MODULATION),isa-sparcv9) + USE_64 = 1 +endif +ifeq ($(MODULATION),isa-amd64) + USE_64 = 1 +endif +export BUILD_OPT NSS_USE_SYSTEM_SQLITE NSPR_INCLUDE_DIR NSPR_LIB_DIR USE_64 +export USE_SYSTEM_ZLIB ZLIB_LIBS NSDISTMODE NSS_ENABLE_ECC XCFLAGS FREEBL_NO_DEPEND + +include gar/category.mk + +configure-nss: + (cd $(WORKSRC)/mozilla/security/coreconf \ + && \ + gsed -e 's:SOURCE_PREFIX = $$(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $$(CORE_DEPTH)/dist:' \ + -i source.mk \ + && \ + gsed -i -e 's/\$$(MKSHLIB) -o/\$$(MKSHLIB) \$$(LDFLAGS) -o/g' rules.mk \ + ) + @$(MAKECOOKIE) + +build-nss: build-coreconf build-dbm build-nss-compile + +build-coreconf: + (cd $(WORKSRC)/mozilla/security/coreconf \ + && \ + $(BUILD_ENV) \ + && \ + gmake -j1 CC="$(CC)") + @$(MAKECOOKIE) + +build-dbm: + (cd $(WORKSRC)/mozilla/security/dbm \ + && \ + $(BUILD_ENV) \ + && \ + gmake -j1 CC="$(CC)") + @$(MAKECOOKIE) + +build-nss-compile: + (cd $(WORKSRC)/mozilla/security/nss \ + && \ + $(BUILD_ENV) \ + && \ + gmake -j1 CC="$(CC)") + @$(MAKECOOKIE) Modified: csw/mgar/pkg/nss/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-11-12 20:57:45 UTC (rev 7254) +++ csw/mgar/pkg/nss/trunk/checksums 2009-11-21 15:16:44 UTC (rev 7372) @@ -0,0 +1,3 @@ +39b9d2431d4ff717d103b742fcaefb81 nss-3.12.4.patch +1ee3ed9c1900079319bd1de51388d856 nss-3.12.4.tar.gz +0b7f69f1fdd6fbeddd9c216f59ecabc6 shared-libs.patch Added: csw/mgar/pkg/nss/trunk/files/nss-3.12.4.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/nss-3.12.4.patch (rev 0) +++ csw/mgar/pkg/nss/trunk/files/nss-3.12.4.patch 2009-11-21 15:16:44 UTC (rev 7372) @@ -0,0 +1,141 @@ +--- mozilla/security/nss/lib/freebl/stubs.c.dist 2009-09-16 17:46:24.600678560 +0100 ++++ b/mozilla/security/nss/lib/freebl/stubs.c 2009-09-16 18:09:59.275307160 +0100 +@@ -70,9 +70,32 @@ + #include + #include + +-#define FREEBL_NO_WEAK 1 ++#ifdef __sgi ++# include ++# ifndef _RLD_INTERFACE_DLFCN_H_DLADDR ++# define _RLD_INTERFACE_DLFCN_H_DLADDR ++ typedef struct Dl_info { ++ const char * dli_fname; ++ void * dli_fbase; ++ const char * dli_sname; ++ void * dli_saddr; ++ int dli_version; ++ int dli_reserved1; ++ long dli_reserved[4]; ++ } Dl_info; ++# endif ++# define _RLD_DLADDR 14 ++int dladdr(void *address, Dl_info *dl); ++ ++int dladdr(void *address, Dl_info *dl) ++{ ++ void *v; ++ v = _rld_new_interface(_RLD_DLADDR,address,dl); ++ return (int)v; ++} ++#endif + +-#define WEAK __attribute__((weak)) ++#define FREEBL_NO_WEAK 1 + + #ifdef FREEBL_NO_WEAK + +@@ -93,17 +116,17 @@ + static type_##fn ptr_##fn = NULL + + #define STUB_SAFE_CALL0(fn) \ +- if (ptr_##fn) { return ptr_##fn(); } ++ if (ptr_##fn) { ptr_##fn(); } + #define STUB_SAFE_CALL1(fn,a1) \ +- if (ptr_##fn) { return ptr_##fn(a1); } ++ if (ptr_##fn) { ptr_##fn(a1); } + #define STUB_SAFE_CALL2(fn,a1,a2) \ +- if (ptr_##fn) { return ptr_##fn(a1,a2); } ++ if (ptr_##fn) { ptr_##fn(a1,a2); } + #define STUB_SAFE_CALL3(fn,a1,a2,a3) \ +- if (ptr_##fn) { return ptr_##fn(a1,a2,a3); } ++ if (ptr_##fn) { ptr_##fn(a1,a2,a3); } + #define STUB_SAFE_CALL4(fn,a1,a2,a3,a4) \ +- if (ptr_##fn) { return ptr_##fn(a1,a2,a3,a4); } ++ if (ptr_##fn) { ptr_##fn(a1,a2,a3,a4); } + #define STUB_SAFE_CALL6(fn,a1,a2,a3,a4,a5,a6) \ +- if (ptr_##fn) { return ptr_##fn(a1,a2,a3,a4,a5,a6); } ++ if (ptr_##fn) { ptr_##fn(a1,a2,a3,a4,a5,a6); } + + #define STUB_FETCH_FUNCTION(fn) \ + ptr_##fn = (type_##fn) dlsym(lib,#fn); \ +@@ -118,6 +141,8 @@ + * libutil will not resolve these symbols. + */ + ++#define WEAK __attribute__((weak)) ++ + #define STUB_DECLARE(ret, fn, args) \ + WEAK extern ret fn args + +@@ -200,7 +225,7 @@ extern void + PORT_Free_stub(void *ptr) + { + STUB_SAFE_CALL1(PORT_Free_Util, ptr); +- return free(ptr); ++ free(ptr); + } + + extern void * +@@ -220,14 +245,14 @@ PORT_ZFree_stub(void *ptr, size_t len) + { + STUB_SAFE_CALL2(PORT_ZFree_Util, ptr, len); + memset(ptr, 0, len); +- return free(ptr); ++ free(ptr); + } + + extern void + PR_Free_stub(void *ptr) + { + STUB_SAFE_CALL1(PR_Free, ptr); +- return free(ptr); ++ free(ptr); + } + + /* +@@ -530,7 +555,7 @@ freebl_InitNSSUtil(void *lib) + * fetch the library if it's loaded. For NSS it should already be loaded + */ + #define freebl_getLibrary(libName) \ +- dlopen (libName, RTLD_LAZY|RTLD_NOLOAD) ++ dlopen (libName, RTLD_LAZY) + + #define freebl_releaseLibrary(lib) \ + if (lib) dlclose(lib) +@@ -538,7 +563,7 @@ freebl_InitNSSUtil(void *lib) + static void * FREEBLnsprGlobalLib = NULL; + static void * FREEBLnssutilGlobalLib = NULL; + +-void __attribute ((destructor)) FREEBL_unload() ++void FREEBL_unload() + { + freebl_releaseLibrary(FREEBLnsprGlobalLib); + freebl_releaseLibrary(FREEBLnssutilGlobalLib); +--- mozilla/security/nss/lib/freebl/nsslowhash.c.dist 2009-09-16 18:16:17.529500640 +0100 ++++ b/mozilla/security/nss/lib/freebl/nsslowhash.c 2009-09-16 18:16:37.634080480 +0100 +@@ -375,21 +375,21 @@ NSSLOWHASH_NewContext(NSSLOWInitContext + void + NSSLOWHASH_Begin(NSSLOWHASHContext *context) + { +- return context->hashObj->begin(context->hashCtxt); ++ context->hashObj->begin(context->hashCtxt); + } + + void + NSSLOWHASH_Update(NSSLOWHASHContext *context, const unsigned char *buf, + unsigned int len) + { +- return context->hashObj->update(context->hashCtxt, buf, len); ++ context->hashObj->update(context->hashCtxt, buf, len); + } + + void + NSSLOWHASH_End(NSSLOWHASHContext *context, unsigned char *buf, + unsigned int *ret, unsigned int len) + { +- return context->hashObj->end(context->hashCtxt, buf, ret, len); ++ context->hashObj->end(context->hashCtxt, buf, ret, len); + } + + void Added: csw/mgar/pkg/nss/trunk/files/shared-libs.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/shared-libs.patch (rev 0) +++ csw/mgar/pkg/nss/trunk/files/shared-libs.patch 2009-11-21 15:16:44 UTC (rev 7372) @@ -0,0 +1,18 @@ +--- nss-3.12.4/mozilla/security/nss/lib/softoken/config.mk 2009-11-21 15:53:39.167529521 +0100 ++++ nss-3.12.4/mozilla/security/nss/lib/softoken/config.mk.orig 2009-11-21 15:52:38.972288644 +0100 +@@ -54,7 +54,6 @@ + + ifdef NS_USE_GCC + EXTRA_SHARED_LIBS += \ +- -L/opt/csw/lib \ + -L$(DIST)/lib \ + -L$(NSSUTIL_LIB_DIR) \ + -lnssutil3 \ +@@ -81,7 +80,6 @@ + # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS) + # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX. + EXTRA_SHARED_LIBS += \ +- -L/opt/csw/lib \ + -L$(DIST)/lib \ + -L$(NSSUTIL_LIB_DIR) \ + -lnssutil3 \ 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 Nov 21 17:40:28 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 21 Nov 2009 16:40:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[7373] csw/mgar/pkg/nss/trunk Message-ID: Revision: 7373 http://gar.svn.sourceforge.net/gar/?rev=7373&view=rev Author: wahwah Date: 2009-11-21 16:40:28 +0000 (Sat, 21 Nov 2009) Log Message: ----------- nss: adding a patch to find the sqlite3 library, using with-nspr-4.8 version of NSS Modified Paths: -------------- csw/mgar/pkg/nss/trunk/Makefile csw/mgar/pkg/nss/trunk/checksums csw/mgar/pkg/nss/trunk/files/shared-libs.patch Added Paths: ----------- csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3.patch Modified: csw/mgar/pkg/nss/trunk/Makefile =================================================================== --- csw/mgar/pkg/nss/trunk/Makefile 2009-11-21 15:16:44 UTC (rev 7372) +++ csw/mgar/pkg/nss/trunk/Makefile 2009-11-21 16:40:28 UTC (rev 7373) @@ -43,7 +43,8 @@ ## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). # TODO: Generate RTM_NAME from GARVERSION RTM_NAME = NSS_3_12_4_RTM -MASTER_SITES = ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/ +# MASTER_SITES = ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/ +MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_4_RTM/src/ ## ## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the ## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge @@ -56,12 +57,15 @@ # http://bugs.gentoo.org/show_bug.cgi?id=256102 PATCHFILES = nss-3.12.4.patch PATCHFILES += shared-libs.patch +PATCHFILES += platlibs-sqlite3.patch ## PATCHFILES = freebl.patch ## ## Whitespace-separated list of files which comprise this build. mGAR will look ## for the files in the $(FILEDIR) (trunk/files) directory and on the ## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION)-with-nspr-4.8.tar.gz +DISTNAME = $(GARNAME)-$(GARVERSION)-with-nspr-4.8 ## ## We define upstream file regex so we can be notifed of new upstream software ## release Modified: csw/mgar/pkg/nss/trunk/checksums =================================================================== --- csw/mgar/pkg/nss/trunk/checksums 2009-11-21 15:16:44 UTC (rev 7372) +++ csw/mgar/pkg/nss/trunk/checksums 2009-11-21 16:40:28 UTC (rev 7373) @@ -1,3 +1,4 @@ +8f76e381bf2339d731bfd5b8116c25a4 nss-3.12.4-with-nspr-4.8.tar.gz 39b9d2431d4ff717d103b742fcaefb81 nss-3.12.4.patch -1ee3ed9c1900079319bd1de51388d856 nss-3.12.4.tar.gz -0b7f69f1fdd6fbeddd9c216f59ecabc6 shared-libs.patch +f0f40bd021423ab1680b4d87cd19c1db platlibs-sqlite3.patch +971cfae38e3070d64dccb0960e5deae0 shared-libs.patch Added: csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3.patch (rev 0) +++ csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3.patch 2009-11-21 16:40:28 UTC (rev 7373) @@ -0,0 +1,11 @@ +--- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk.orig 2009-11-21 17:28:09.997982796 +0100 ++++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk 2009-11-21 17:28:32.107632453 +0100 +@@ -80,7 +80,7 @@ + endif + endif + +-SQLITE=-lsqlite3 ++SQLITE=-R/opt/csw/lib/$$ISALIST -L/opt/csw/lib -lsqlite3 + + ifdef NSS_DISABLE_DBM + DBMLIB = $(NULL) Modified: csw/mgar/pkg/nss/trunk/files/shared-libs.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/shared-libs.patch 2009-11-21 15:16:44 UTC (rev 7372) +++ csw/mgar/pkg/nss/trunk/files/shared-libs.patch 2009-11-21 16:40:28 UTC (rev 7373) @@ -1,18 +1,18 @@ ---- nss-3.12.4/mozilla/security/nss/lib/softoken/config.mk 2009-11-21 15:53:39.167529521 +0100 -+++ nss-3.12.4/mozilla/security/nss/lib/softoken/config.mk.orig 2009-11-21 15:52:38.972288644 +0100 -@@ -54,7 +54,6 @@ +--- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/lib/softoken/config.mk.orig 2009-11-21 16:42:33.499624641 +0100 ++++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/lib/softoken/config.mk 2009-11-21 16:43:06.838729533 +0100 +@@ -54,6 +54,7 @@ ifdef NS_USE_GCC EXTRA_SHARED_LIBS += \ -- -L/opt/csw/lib \ ++ -L/opt/csw/lib \ -L$(DIST)/lib \ -L$(NSSUTIL_LIB_DIR) \ -lnssutil3 \ -@@ -81,7 +80,6 @@ +@@ -80,6 +81,7 @@ # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS) # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX. EXTRA_SHARED_LIBS += \ -- -L/opt/csw/lib \ ++ -L/opt/csw/lib \ -L$(DIST)/lib \ -L$(NSSUTIL_LIB_DIR) \ -lnssutil3 \ 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 Nov 21 20:46:36 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 21 Nov 2009 19:46:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[7374] csw/mgar/pkg/rox-filer/trunk/Makefile Message-ID: Revision: 7374 http://gar.svn.sourceforge.net/gar/?rev=7374&view=rev Author: wahwah Date: 2009-11-21 19:46:36 +0000 (Sat, 21 Nov 2009) Log Message: ----------- rox-filer: Adding more files from the $(WORKSRC), should now include help and Options.xml Modified Paths: -------------- csw/mgar/pkg/rox-filer/trunk/Makefile Modified: csw/mgar/pkg/rox-filer/trunk/Makefile =================================================================== --- csw/mgar/pkg/rox-filer/trunk/Makefile 2009-11-21 16:40:28 UTC (rev 7373) +++ csw/mgar/pkg/rox-filer/trunk/Makefile 2009-11-21 19:46:36 UTC (rev 7374) @@ -18,8 +18,9 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 REQUIRED_PKGS = CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWgtk2 REQUIRED_PKGS += CSWlibatk CSWlibcairo CSWlibglade2 CSWlibxml2 CSWpango -REQUIRED_PKGS += CSWbash +REQUIRED_PKGS += CSWbash CSWlibice CSWlibsm + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = rox INSTALL_SCRIPTS = rox @@ -41,6 +42,12 @@ ginstall -d $(DESTDIR)$(datadir)/ROX gcp -av $(WORKSRC)/ROX-Filer/ROX $(DESTDIR)$(datadir) gcp -av $(WORKSRC)/ROX-Filer/images $(DESTDIR)$(datadir)/ROX + gcp -av $(WORKSRC)/ROX-Filer/Help $(DESTDIR)$(datadir)/ROX + gcp -av $(WORKSRC)/ROX-Filer/Options.xml $(DESTDIR)$(datadir)/ROX + gcp -av $(WORKSRC)/ROX-Filer/Messages $(DESTDIR)$(datadir)/ROX + gcp -av $(WORKSRC)/ROX-Filer/AppInfo.xml $(DESTDIR)$(datadir)/ROX + ginstall -d -m 755 $(DESTDIR)$(mandir)/man1 + ginstall -m 644 $(WORKSRC)/rox.1 $(DESTDIR)$(mandir)/man1 gfind $(DESTDIR)$(datadir) -type d -exec chmod 0755 {} \; gfind $(DESTDIR)$(datadir) -type f -exec chmod 0644 {} \; @$(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 Sat Nov 21 20:51:01 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 21 Nov 2009 19:51:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[7375] csw/mgar/pkg/tightvnc/trunk Message-ID: Revision: 7375 http://gar.svn.sourceforge.net/gar/?rev=7375&view=rev Author: wahwah Date: 2009-11-21 19:51:01 +0000 (Sat, 21 Nov 2009) Log Message: ----------- tightvnc: updated the wrapper script to cope with missing /tmp/.X11-unix Modified Paths: -------------- csw/mgar/pkg/tightvnc/trunk/checksums csw/mgar/pkg/tightvnc/trunk/files/vncserver-wrapper.sh Modified: csw/mgar/pkg/tightvnc/trunk/checksums =================================================================== --- csw/mgar/pkg/tightvnc/trunk/checksums 2009-11-21 19:46:36 UTC (rev 7374) +++ csw/mgar/pkg/tightvnc/trunk/checksums 2009-11-21 19:51:01 UTC (rev 7375) @@ -4,5 +4,5 @@ c5e9c3e4017caa65d14a0b98858043b9 0003-libdix.a-after-libos.a.patch 691ddda52a4bcbc14ee1c19f77e465a1 cswvncserver 397b35faad32d5246b6d44b142f8304f tightvnc-1.3.10_unixsrc.tar.bz2 -46d0bcb1569025d9a559bab091aa79fa vncserver-wrapper.sh +e5deb36e898ac88a64dfb960976d251c vncserver-wrapper.sh 56c09be17c17184e96193c13246fd649 vncservers Modified: csw/mgar/pkg/tightvnc/trunk/files/vncserver-wrapper.sh =================================================================== --- csw/mgar/pkg/tightvnc/trunk/files/vncserver-wrapper.sh 2009-11-21 19:46:36 UTC (rev 7374) +++ csw/mgar/pkg/tightvnc/trunk/files/vncserver-wrapper.sh 2009-11-21 19:51:01 UTC (rev 7375) @@ -36,6 +36,8 @@ if writable "${test_dir}"; then exec /opt/csw/libexec/vncserver "$@" +elif [ ! -d "${test_dir}" ]; then + exec /opt/csw/libexec/vncserver "$@" else cat < Revision: 7376 http://gar.svn.sourceforge.net/gar/?rev=7376&view=rev Author: wahwah Date: 2009-11-21 19:57:53 +0000 (Sat, 21 Nov 2009) Log Message: ----------- tightvnc: Updating a checksum for a file with the Id tag Modified Paths: -------------- csw/mgar/pkg/tightvnc/trunk/checksums Modified: csw/mgar/pkg/tightvnc/trunk/checksums =================================================================== --- csw/mgar/pkg/tightvnc/trunk/checksums 2009-11-21 19:51:01 UTC (rev 7375) +++ csw/mgar/pkg/tightvnc/trunk/checksums 2009-11-21 19:57:53 UTC (rev 7376) @@ -4,5 +4,5 @@ c5e9c3e4017caa65d14a0b98858043b9 0003-libdix.a-after-libos.a.patch 691ddda52a4bcbc14ee1c19f77e465a1 cswvncserver 397b35faad32d5246b6d44b142f8304f tightvnc-1.3.10_unixsrc.tar.bz2 -e5deb36e898ac88a64dfb960976d251c vncserver-wrapper.sh +e51b38ef54aa082ed9c277e87b1399de vncserver-wrapper.sh 56c09be17c17184e96193c13246fd649 vncservers 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 Nov 21 21:22:58 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 21 Nov 2009 20:22:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7377] csw/mgar/pkg/nss/trunk Message-ID: Revision: 7377 http://gar.svn.sourceforge.net/gar/?rev=7377&view=rev Author: wahwah Date: 2009-11-21 20:22:58 +0000 (Sat, 21 Nov 2009) Log Message: ----------- nss: Added the runtime search path option to the shared libs patch. Now, instead of segfaulting, it aborts. Modified Paths: -------------- csw/mgar/pkg/nss/trunk/Makefile csw/mgar/pkg/nss/trunk/checksums csw/mgar/pkg/nss/trunk/files/shared-libs.patch Modified: csw/mgar/pkg/nss/trunk/Makefile =================================================================== --- csw/mgar/pkg/nss/trunk/Makefile 2009-11-21 19:57:53 UTC (rev 7376) +++ csw/mgar/pkg/nss/trunk/Makefile 2009-11-21 20:22:58 UTC (rev 7377) @@ -190,9 +190,6 @@ ## EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -## # To fix PR_STATIC_ASSERT(sizeof(size_t) > 4); in drbg.c, line 510 -## EXTRA_CFLAGS = -DNS_PTR_GT_32=1 -## EXTRA_CXXFLAGS = -DNS_PTR_GT_32=1 BUILD_OPT = 1 NSS_USE_SYSTEM_SQLITE = 1 NSPR_INCLUDE_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --cflags-only-I nspr | gsed 's/-I//') @@ -207,11 +204,13 @@ # export DSO_LDOPTS ifeq ($(MODULATION),isa-sparcv9) USE_64 = 1 + export USE_64 endif ifeq ($(MODULATION),isa-amd64) USE_64 = 1 + export USE_64 endif -export BUILD_OPT NSS_USE_SYSTEM_SQLITE NSPR_INCLUDE_DIR NSPR_LIB_DIR USE_64 +export BUILD_OPT NSS_USE_SYSTEM_SQLITE NSPR_INCLUDE_DIR NSPR_LIB_DIR export USE_SYSTEM_ZLIB ZLIB_LIBS NSDISTMODE NSS_ENABLE_ECC XCFLAGS FREEBL_NO_DEPEND include gar/category.mk Modified: csw/mgar/pkg/nss/trunk/checksums =================================================================== --- csw/mgar/pkg/nss/trunk/checksums 2009-11-21 19:57:53 UTC (rev 7376) +++ csw/mgar/pkg/nss/trunk/checksums 2009-11-21 20:22:58 UTC (rev 7377) @@ -1,4 +1,4 @@ 8f76e381bf2339d731bfd5b8116c25a4 nss-3.12.4-with-nspr-4.8.tar.gz 39b9d2431d4ff717d103b742fcaefb81 nss-3.12.4.patch f0f40bd021423ab1680b4d87cd19c1db platlibs-sqlite3.patch -971cfae38e3070d64dccb0960e5deae0 shared-libs.patch +31aeaf6718c269812c445fb3e86f6ac6 shared-libs.patch Modified: csw/mgar/pkg/nss/trunk/files/shared-libs.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/shared-libs.patch 2009-11-21 19:57:53 UTC (rev 7376) +++ csw/mgar/pkg/nss/trunk/files/shared-libs.patch 2009-11-21 20:22:58 UTC (rev 7377) @@ -1,17 +1,19 @@ ---- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/lib/softoken/config.mk.orig 2009-11-21 16:42:33.499624641 +0100 -+++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/lib/softoken/config.mk 2009-11-21 16:43:06.838729533 +0100 -@@ -54,6 +54,7 @@ +--- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/lib/softoken/config.mk.orig 2009-11-21 21:00:43.881431583 +0100 ++++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/lib/softoken/config.mk 2009-11-21 21:01:18.985608134 +0100 +@@ -54,6 +54,8 @@ ifdef NS_USE_GCC EXTRA_SHARED_LIBS += \ ++ -R/opt/csw/lib/$$ISALIST \ + -L/opt/csw/lib \ -L$(DIST)/lib \ -L$(NSSUTIL_LIB_DIR) \ -lnssutil3 \ -@@ -80,6 +81,7 @@ +@@ -80,6 +82,8 @@ # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS) # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX. EXTRA_SHARED_LIBS += \ ++ -R/opt/csw/lib/$$ISALIST \ + -L/opt/csw/lib \ -L$(DIST)/lib \ -L$(NSSUTIL_LIB_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 Sun Nov 22 03:04:18 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 22 Nov 2009 02:04:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7378] csw/mgar/pkg/coreutils/trunk Message-ID: Revision: 7378 http://gar.svn.sourceforge.net/gar/?rev=7378&view=rev Author: bdwalton Date: 2009-11-22 02:04:18 +0000 (Sun, 22 Nov 2009) Log Message: ----------- coreutils: bump to 8.1; disable acl support; add program prefix Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile csw/mgar/pkg/coreutils/trunk/checksums Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-21 20:22:58 UTC (rev 7377) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-22 02:04:18 UTC (rev 7378) @@ -1,5 +1,5 @@ GARNAME = coreutils -GARVERSION = 7.6 +GARVERSION = 8.1 CATEGORIES = utils DESCRIPTION = GNU core utilities @@ -22,6 +22,7 @@ sysconfdir = /etc/opt/csw localstatedir = /var/opt/csw CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --disable-acl --program-prefix=g TEST_ARGS = check Modified: csw/mgar/pkg/coreutils/trunk/checksums =================================================================== --- csw/mgar/pkg/coreutils/trunk/checksums 2009-11-21 20:22:58 UTC (rev 7377) +++ csw/mgar/pkg/coreutils/trunk/checksums 2009-11-22 02:04:18 UTC (rev 7378) @@ -1 +1 @@ -3d82f979229365f880da750642e67cf3 coreutils-7.6.tar.gz +4cde9f31604f4da188ed302ca55545ea coreutils-8.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 Nov 22 13:04:52 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 22 Nov 2009 12:04:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[7379] csw/mgar/pkg/nss/trunk Message-ID: Revision: 7379 http://gar.svn.sourceforge.net/gar/?rev=7379&view=rev Author: wahwah Date: 2009-11-22 12:04:52 +0000 (Sun, 22 Nov 2009) Log Message: ----------- nss: Adding runtime search paths via gsed. It still aborts. Help\! Modified Paths: -------------- csw/mgar/pkg/nss/trunk/Makefile csw/mgar/pkg/nss/trunk/checksums csw/mgar/pkg/nss/trunk/files/shared-libs.patch Added Paths: ----------- csw/mgar/pkg/nss/trunk/files/runtime-search-path.patch csw/mgar/pkg/nss/trunk/files/whoami.patch Modified: csw/mgar/pkg/nss/trunk/Makefile =================================================================== --- csw/mgar/pkg/nss/trunk/Makefile 2009-11-22 02:04:18 UTC (rev 7378) +++ csw/mgar/pkg/nss/trunk/Makefile 2009-11-22 12:04:52 UTC (rev 7379) @@ -2,6 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +GARFLAVOR = DBG + ## 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. @@ -13,6 +15,12 @@ ## # Based on: # http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/nss-3.12.4-r1.ebuild?view=markup +# and +# https://developer.mozilla.org/en/NSS_reference/Building_and_installing_NSS/Build_instructions +# and +# https://developer.mozilla.org/en/NSS_reference/NSS_environment_variables +# and +# https://developer.mozilla.org/en/NSS_reference/Building_and_installing_NSS/Installation_guide GARNAME = nss GARVERSION = 3.12.4 # http://www.gentoo-portage.com/AJAX/Ebuild/96014 @@ -58,6 +66,8 @@ PATCHFILES = nss-3.12.4.patch PATCHFILES += shared-libs.patch PATCHFILES += platlibs-sqlite3.patch +PATCHFILES += whoami.patch +PATCHFILES += runtime-search-path.patch ## PATCHFILES = freebl.patch ## ## Whitespace-separated list of files which comprise this build. mGAR will look @@ -190,10 +200,12 @@ ## EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -BUILD_OPT = 1 +ifeq (OPT,$(GARFLAVOR)) + BUILD_OPT = 1 +endif NSS_USE_SYSTEM_SQLITE = 1 NSPR_INCLUDE_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --cflags-only-I nspr | gsed 's/-I//') -NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//') +NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ') USE_SYSTEM_ZLIB = 1 ZLIB_LIBS = -lz NSDISTMODE = copy @@ -202,6 +214,7 @@ FREEBL_NO_DEPEND = 1 # DSO_LDOPTS = -R/opt/csw/lib/$$$$ISALIST -L/opt/csw/lib # export DSO_LDOPTS +LDOPTS = $(LD_OPTIONS) ifeq ($(MODULATION),isa-sparcv9) USE_64 = 1 export USE_64 @@ -215,16 +228,40 @@ include gar/category.mk -configure-nss: +configure-nss: respect-ldflags add-runtime-search-path + @$(MAKECOOKIE) + +respect-ldflags: (cd $(WORKSRC)/mozilla/security/coreconf \ && \ gsed -e 's:SOURCE_PREFIX = $$(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $$(CORE_DEPTH)/dist:' \ -i source.mk \ && \ - gsed -i -e 's/\$$(MKSHLIB) -o/\$$(MKSHLIB) \$$(LDFLAGS) -o/g' rules.mk \ - ) + gsed -i -e 's/\$$(MKSHLIB) -o/\$$(MKSHLIB) \$$(LDFLAGS) -o/g' rules.mk) @$(MAKECOOKIE) +add-runtime-search-path: + for f in \ + mozilla/security/nss/cmd/pk11mode/Makefile \ + mozilla/security/nss/cmd/platlibs.mk \ + mozilla/security/nss/cmd/shlibsign/Makefile \ + mozilla/security/nss/cmd/shlibsign/mangle/Makefile \ + mozilla/security/nss/lib/ckfw/builtins/Makefile \ + mozilla/security/nss/lib/ckfw/capi/Makefile \ + mozilla/security/nss/lib/ckfw/nssmkey/Makefile \ + mozilla/security/nss/lib/freebl/config.mk \ + mozilla/security/nss/lib/nss/config.mk \ + mozilla/security/nss/lib/smime/config.mk \ + mozilla/security/nss/lib/softoken/config.mk \ + mozilla/security/nss/lib/softoken/legacydb/config.mk \ + mozilla/security/nss/lib/ssl/config.mk \ + mozilla/security/nss/lib/util/config.mk; do \ + gsed -i -e 's|-L\$$(NSPR_LIB_DIR)|-L$$(NSPR_LIB_DIR) -R$$(NSPR_LIB_DIR)/$$$$ISALIST|' $(WORKSRC)/$$f; \ + done; + # A form of assert + ggrep -- -R $(WORKSRC)/mozilla/security/nss/lib/freebl/config.mk + @$(MAKECOOKIE) + build-nss: build-coreconf build-dbm build-nss-compile build-coreconf: @@ -250,3 +287,4 @@ && \ gmake -j1 CC="$(CC)") @$(MAKECOOKIE) + Modified: csw/mgar/pkg/nss/trunk/checksums =================================================================== --- csw/mgar/pkg/nss/trunk/checksums 2009-11-22 02:04:18 UTC (rev 7378) +++ csw/mgar/pkg/nss/trunk/checksums 2009-11-22 12:04:52 UTC (rev 7379) @@ -1,4 +1,6 @@ 8f76e381bf2339d731bfd5b8116c25a4 nss-3.12.4-with-nspr-4.8.tar.gz 39b9d2431d4ff717d103b742fcaefb81 nss-3.12.4.patch f0f40bd021423ab1680b4d87cd19c1db platlibs-sqlite3.patch -31aeaf6718c269812c445fb3e86f6ac6 shared-libs.patch +d41d8cd98f00b204e9800998ecf8427e runtime-search-path.patch +90b4d32437b3e3fdadcf4f16339aa2ed shared-libs.patch +221646aa1954b4a255ac03e7d8b0225d whoami.patch Modified: csw/mgar/pkg/nss/trunk/files/shared-libs.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/shared-libs.patch 2009-11-22 02:04:18 UTC (rev 7378) +++ csw/mgar/pkg/nss/trunk/files/shared-libs.patch 2009-11-22 12:04:52 UTC (rev 7379) @@ -1,20 +1,32 @@ ---- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/lib/softoken/config.mk.orig 2009-11-21 21:00:43.881431583 +0100 -+++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/lib/softoken/config.mk 2009-11-21 21:01:18.985608134 +0100 -@@ -54,6 +54,8 @@ +--- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/lib/softoken/config.mk.orig 2009-11-22 11:39:49.492474635 +0100 ++++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/lib/softoken/config.mk 2009-11-22 11:40:51.857227138 +0100 +@@ -54,10 +54,14 @@ ifdef NS_USE_GCC EXTRA_SHARED_LIBS += \ + -R/opt/csw/lib/$$ISALIST \ + -L/opt/csw/lib \ -L$(DIST)/lib \ ++ -R$(NSSUTIL_LIB_DIR)/$$ISALIST \ -L$(NSSUTIL_LIB_DIR) \ -lnssutil3 \ -@@ -80,6 +82,8 @@ + -lsqlite3 \ ++ -R$(NSPR_LIB_DIR)/$$ISALIST \ + -L$(NSPR_LIB_DIR) \ + -lplc4 \ + -lplds4 \ +@@ -80,10 +84,14 @@ # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS) # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX. EXTRA_SHARED_LIBS += \ + -R/opt/csw/lib/$$ISALIST \ + -L/opt/csw/lib \ -L$(DIST)/lib \ ++ -R$(NSSUTIL_LIB_DIR)/$$ISALIST \ -L$(NSSUTIL_LIB_DIR) \ -lnssutil3 \ + -lsqlite3 \ ++ -R$(NSPR_LIB_DIR)/$$ISALIST \ + -L$(NSPR_LIB_DIR) \ + -lplc4 \ + -lplds4 \ Added: csw/mgar/pkg/nss/trunk/files/whoami.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/whoami.patch (rev 0) +++ csw/mgar/pkg/nss/trunk/files/whoami.patch 2009-11-22 12:04:52 UTC (rev 7379) @@ -0,0 +1,11 @@ +--- nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/UNIX.mk.orig 2009-11-22 02:25:17.411354784 +0100 ++++ nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/UNIX.mk 2009-11-22 02:25:24.833876220 +0100 +@@ -46,7 +46,7 @@ + DEFINES += -UDEBUG -DNDEBUG + else + OPTIMIZER += -g +- USERNAME := $(shell whoami) ++ USERNAME := $(shell gwhoami) + USERNAME := $(subst -,_,$(USERNAME)) + DEFINES += -DDEBUG -UNDEBUG -DDEBUG_$(USERNAME) + endif 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 Nov 22 13:46:36 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 22 Nov 2009 12:46:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[7380] csw/mgar/pkg/nss/trunk/Makefile Message-ID: Revision: 7380 http://gar.svn.sourceforge.net/gar/?rev=7380&view=rev Author: wahwah Date: 2009-11-22 12:46:36 +0000 (Sun, 22 Nov 2009) Log Message: ----------- nss: Removing template comments from the Makefile Modified Paths: -------------- csw/mgar/pkg/nss/trunk/Makefile Modified: csw/mgar/pkg/nss/trunk/Makefile =================================================================== --- csw/mgar/pkg/nss/trunk/Makefile 2009-11-22 12:04:52 UTC (rev 7379) +++ csw/mgar/pkg/nss/trunk/Makefile 2009-11-22 12:46:36 UTC (rev 7380) @@ -4,15 +4,6 @@ GARFLAVOR = DBG -## 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 -## # Based on: # http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/nss-3.12.4-r1.ebuild?view=markup # and @@ -24,180 +15,33 @@ GARNAME = nss GARVERSION = 3.12.4 # http://www.gentoo-portage.com/AJAX/Ebuild/96014 -## -## 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 = Network Security Services library, implements PKI support -## -## 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 = http://www.mozilla.org/projects/security/pki/nss/ -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). # TODO: Generate RTM_NAME from GARVERSION RTM_NAME = NSS_3_12_4_RTM # MASTER_SITES = ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/ MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_4_RTM/src/ -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. # http://bugs.gentoo.org/show_bug.cgi?id=256102 PATCHFILES = nss-3.12.4.patch PATCHFILES += shared-libs.patch PATCHFILES += platlibs-sqlite3.patch PATCHFILES += whoami.patch PATCHFILES += runtime-search-path.patch -## PATCHFILES = freebl.patch -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). # DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES = $(GARNAME)-$(GARVERSION)-with-nspr-4.8.tar.gz DISTNAME = $(GARNAME)-$(GARVERSION)-with-nspr-4.8 -## -## We define upstream file regex so we can be notifed of new upstream software -## release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_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. REQUIRED_PKGS = CSWnspr CSWsqlite3 -## -## A list of packages necessary to build this package PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWsqlite3devel -## -## When using non-empty $(PACKAGES): -## REQUIRED_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 = nss BUILD_SCRIPTS = nss INSTALL_SCRIPTS = nss TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. CONFIGURE_ARGS = $(DIRPATHS) -## BUILD64 = 1 -## 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 -## EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib ifeq (OPT,$(GARFLAVOR)) @@ -212,8 +56,6 @@ NSS_ENABLE_ECC = 1 XCFLAGS=$(CFLAGS) FREEBL_NO_DEPEND = 1 -# DSO_LDOPTS = -R/opt/csw/lib/$$$$ISALIST -L/opt/csw/lib -# export DSO_LDOPTS LDOPTS = $(LD_OPTIONS) ifeq ($(MODULATION),isa-sparcv9) USE_64 = 1 @@ -241,6 +83,7 @@ @$(MAKECOOKIE) add-runtime-search-path: + # Make sure that the runtime search path is added for NSPR libraries. for f in \ mozilla/security/nss/cmd/pk11mode/Makefile \ mozilla/security/nss/cmd/platlibs.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 Sun Nov 22 15:50:31 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 22 Nov 2009 14:50:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7381] csw/mgar/pkg/nss/trunk Message-ID: Revision: 7381 http://gar.svn.sourceforge.net/gar/?rev=7381&view=rev Author: wahwah Date: 2009-11-22 14:50:31 +0000 (Sun, 22 Nov 2009) Log Message: ----------- nss: Tyding up the Makefile, added a patch showing how to debug shlibsign Modified Paths: -------------- csw/mgar/pkg/nss/trunk/Makefile csw/mgar/pkg/nss/trunk/checksums Added Paths: ----------- csw/mgar/pkg/nss/trunk/files/sign-under-dbx.patch Modified: csw/mgar/pkg/nss/trunk/Makefile =================================================================== --- csw/mgar/pkg/nss/trunk/Makefile 2009-11-22 12:46:36 UTC (rev 7380) +++ csw/mgar/pkg/nss/trunk/Makefile 2009-11-22 14:50:31 UTC (rev 7381) @@ -2,19 +2,18 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ + +# Based on the following resources: +# - http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/nss-3.12.4-r1.ebuild?view=markup +# - https://developer.mozilla.org/en/NSS_reference/Building_and_installing_NSS/Build_instructions +# - https://developer.mozilla.org/en/NSS_reference/NSS_environment_variables +# - https://developer.mozilla.org/en/NSS_reference/Building_and_installing_NSS/Installation_guide + +# Debugging mode, this is work in progress. GARFLAVOR = DBG -# Based on: -# http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/nss-3.12.4-r1.ebuild?view=markup -# and -# https://developer.mozilla.org/en/NSS_reference/Building_and_installing_NSS/Build_instructions -# and -# https://developer.mozilla.org/en/NSS_reference/NSS_environment_variables -# and -# https://developer.mozilla.org/en/NSS_reference/Building_and_installing_NSS/Installation_guide GARNAME = nss GARVERSION = 3.12.4 -# http://www.gentoo-portage.com/AJAX/Ebuild/96014 CATEGORIES = lib DESCRIPTION = Network Security Services library, implements PKI support define BLURB @@ -22,25 +21,24 @@ SPKG_SOURCEURL = http://www.mozilla.org/projects/security/pki/nss/ # TODO: Generate RTM_NAME from GARVERSION RTM_NAME = NSS_3_12_4_RTM -# MASTER_SITES = ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/ -MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_4_RTM/src/ -# http://bugs.gentoo.org/show_bug.cgi?id=256102 +MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/ +# This patch taken from http://bugs.gentoo.org/show_bug.cgi?id=256102 PATCHFILES = nss-3.12.4.patch PATCHFILES += shared-libs.patch PATCHFILES += platlibs-sqlite3.patch +PATCHFILES += platlibs-sunos.patch PATCHFILES += whoami.patch PATCHFILES += runtime-search-path.patch -# DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES = $(GARNAME)-$(GARVERSION)-with-nspr-4.8.tar.gz -DISTNAME = $(GARNAME)-$(GARVERSION)-with-nspr-4.8 -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +DIST_SUFFIX = -with-nspr-4.8 +DISTFILES = $(GARNAME)-$(GARVERSION)$(DIST_SUFFIX).tar.gz +DISTNAME = $(GARNAME)-$(GARVERSION)$(DIST_SUFFIX) +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)$(DIST_SUFFIX).tar.gz REQUIRED_PKGS = CSWnspr CSWsqlite3 PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWsqlite3devel CONFIGURE_SCRIPTS = nss BUILD_SCRIPTS = nss INSTALL_SCRIPTS = nss TEST_SCRIPTS = -CONFIGURE_ARGS = $(DIRPATHS) BUILD64 = 1 EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib @@ -54,7 +52,7 @@ ZLIB_LIBS = -lz NSDISTMODE = copy NSS_ENABLE_ECC = 1 -XCFLAGS=$(CFLAGS) +XCFLAGS = $(CFLAGS) FREEBL_NO_DEPEND = 1 LDOPTS = $(LD_OPTIONS) ifeq ($(MODULATION),isa-sparcv9) @@ -76,33 +74,19 @@ respect-ldflags: (cd $(WORKSRC)/mozilla/security/coreconf \ && \ - gsed -e 's:SOURCE_PREFIX = $$(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $$(CORE_DEPTH)/dist:' \ - -i source.mk \ + gsed -i -e 's:SOURCE_PREFIX = $$(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $$(CORE_DEPTH)/dist:' \ + source.mk \ && \ gsed -i -e 's/\$$(MKSHLIB) -o/\$$(MKSHLIB) \$$(LDFLAGS) -o/g' rules.mk) @$(MAKECOOKIE) add-runtime-search-path: - # Make sure that the runtime search path is added for NSPR libraries. - for f in \ - mozilla/security/nss/cmd/pk11mode/Makefile \ - mozilla/security/nss/cmd/platlibs.mk \ - mozilla/security/nss/cmd/shlibsign/Makefile \ - mozilla/security/nss/cmd/shlibsign/mangle/Makefile \ - mozilla/security/nss/lib/ckfw/builtins/Makefile \ - mozilla/security/nss/lib/ckfw/capi/Makefile \ - mozilla/security/nss/lib/ckfw/nssmkey/Makefile \ - mozilla/security/nss/lib/freebl/config.mk \ - mozilla/security/nss/lib/nss/config.mk \ - mozilla/security/nss/lib/smime/config.mk \ - mozilla/security/nss/lib/softoken/config.mk \ - mozilla/security/nss/lib/softoken/legacydb/config.mk \ - mozilla/security/nss/lib/ssl/config.mk \ - mozilla/security/nss/lib/util/config.mk; do \ - gsed -i -e 's|-L\$$(NSPR_LIB_DIR)|-L$$(NSPR_LIB_DIR) -R$$(NSPR_LIB_DIR)/$$$$ISALIST|' $(WORKSRC)/$$f; \ - done; + # Make sure that the runtime search path is added in all Makefiles. + gfind $(WORKSRC) \( -name Makefile -o -name '*.mk' \) \ + -exec gsed -i -e 's|-L\$$(NSPR_LIB_DIR)|-L$$(NSPR_LIB_DIR) -R$$(NSPR_LIB_DIR)/$$$$ISALIST|' \ + {} \; # A form of assert - ggrep -- -R $(WORKSRC)/mozilla/security/nss/lib/freebl/config.mk + gegrep -- '-R.*ISALIST' $(WORKSRC)/mozilla/security/nss/lib/freebl/config.mk @$(MAKECOOKIE) build-nss: build-coreconf build-dbm build-nss-compile Modified: csw/mgar/pkg/nss/trunk/checksums =================================================================== --- csw/mgar/pkg/nss/trunk/checksums 2009-11-22 12:46:36 UTC (rev 7380) +++ csw/mgar/pkg/nss/trunk/checksums 2009-11-22 14:50:31 UTC (rev 7381) @@ -1,6 +1,7 @@ 8f76e381bf2339d731bfd5b8116c25a4 nss-3.12.4-with-nspr-4.8.tar.gz 39b9d2431d4ff717d103b742fcaefb81 nss-3.12.4.patch f0f40bd021423ab1680b4d87cd19c1db platlibs-sqlite3.patch +441f12a9396a89841d384d8c89a052ff platlibs-sunos.patch d41d8cd98f00b204e9800998ecf8427e runtime-search-path.patch 90b4d32437b3e3fdadcf4f16339aa2ed shared-libs.patch 221646aa1954b4a255ac03e7d8b0225d whoami.patch Added: csw/mgar/pkg/nss/trunk/files/sign-under-dbx.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/sign-under-dbx.patch (rev 0) +++ csw/mgar/pkg/nss/trunk/files/sign-under-dbx.patch 2009-11-22 14:50:31 UTC (rev 7381) @@ -0,0 +1,15 @@ +This file shows how to run shlibsign under dbx, the Sun Studio debugger, to see +where it's aborting. + +--- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/shlibsign/./sign.sh.orig 2009-11-22 15:17:12.069116849 +0100 ++++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/shlibsign/./sign.sh 2009-11-22 15:17:54.559576926 +0100 +@@ -34,7 +34,7 @@ + export LIBRARY_PATH + ADDON_PATH=${1}/lib:${4}:$ADDON_PATH + export ADDON_PATH +- echo ${2}/shlibsign -v -i ${5} +- ${2}/shlibsign -v -i ${5} ++ echo /opt/studio/SOS11/SUNWspro/bin/dbx ${2}/shlibsign -v -i ${5} ++ /opt/studio/SOS11/SUNWspro/bin/dbx ${2}/shlibsign -v -i ${5} + ;; + esac This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Nov 22 16:58:46 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 22 Nov 2009 15:58:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7382] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 7382 http://gar.svn.sourceforge.net/gar/?rev=7382&view=rev Author: rthurner Date: 2009-11-22 15:58:46 +0000 (Sun, 22 Nov 2009) Log Message: ----------- update to hg-1.4 version checksums 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 2009-11-22 14:50:31 UTC (rev 7381) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2009-11-22 15:58:46 UTC (rev 7382) @@ -1,5 +1,5 @@ GARNAME = mercurial -GARVERSION = 1.3.1 +GARVERSION = 1.4 CATEGORIES = devel DESCRIPTION = Fast, lightweight Source Control Management system Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2009-11-22 14:50:31 UTC (rev 7381) +++ csw/mgar/pkg/mercurial/trunk/checksums 2009-11-22 15:58:46 UTC (rev 7382) @@ -1,3 +1,3 @@ -db884ecb306bcbf49b671f880d29c431 download/CSWmercurial.changelog.CSW -d280026d7687f061371e87ff306c97c2 download/CSWmercurial.gspec -6504f0dc32bd7ecf59a9f7f719432e76 download/mercurial-1.3.1.tar.gz +db884ecb306bcbf49b671f880d29c431 CSWmercurial.changelog.CSW +d280026d7687f061371e87ff306c97c2 CSWmercurial.gspec +951ebd4a8153eaa3c56fc0ce2575ab70 mercurial-1.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From glawsf at users.sourceforge.net Sun Nov 22 21:42:55 2009 From: glawsf at users.sourceforge.net (glawsf at users.sourceforge.net) Date: Sun, 22 Nov 2009 20:42:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[7383] csw/mgar/pkg/facter/trunk Message-ID: Revision: 7383 http://gar.svn.sourceforge.net/gar/?rev=7383&view=rev Author: glawsf Date: 2009-11-22 20:42:55 +0000 (Sun, 22 Nov 2009) Log Message: ----------- revved version 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 2009-11-22 15:58:46 UTC (rev 7382) +++ csw/mgar/pkg/facter/trunk/Makefile 2009-11-22 20:42:55 UTC (rev 7383) @@ -3,7 +3,7 @@ # $Id$ GARNAME = facter -GARVERSION = 1.5.6 +GARVERSION = 1.5.7 CATEGORIES = apps DESCRIPTION = a system fact gatherer Modified: csw/mgar/pkg/facter/trunk/checksums =================================================================== --- csw/mgar/pkg/facter/trunk/checksums 2009-11-22 15:58:46 UTC (rev 7382) +++ csw/mgar/pkg/facter/trunk/checksums 2009-11-22 20:42:55 UTC (rev 7383) @@ -1 +1 @@ -f2eda650cadfdaf549fab1a436c0db4d download/facter-1.5.6.tar.gz +21db7b613fe14a54e72ef062f3d5e190 facter-1.5.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 Nov 22 22:34:36 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 22 Nov 2009 21:34:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[7384] csw/mgar/pkg/autoconf/tags/autoconf-2.64, REV=2009.07 .29/ Message-ID: Revision: 7384 http://gar.svn.sourceforge.net/gar/?rev=7384&view=rev Author: dmichelsen Date: 2009-11-22 21:34:36 +0000 (Sun, 22 Nov 2009) Log Message: ----------- autoconf: Tag released version Added Paths: ----------- csw/mgar/pkg/autoconf/tags/autoconf-2.64,REV=2009.07.29/ 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 Nov 22 22:35:18 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 22 Nov 2009 21:35:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7385] csw/mgar/pkg/autoconf/trunk Message-ID: Revision: 7385 http://gar.svn.sourceforge.net/gar/?rev=7385&view=rev Author: dmichelsen Date: 2009-11-22 21:35:18 +0000 (Sun, 22 Nov 2009) Log Message: ----------- autoconf: Update to 2.65 Modified Paths: -------------- csw/mgar/pkg/autoconf/trunk/Makefile csw/mgar/pkg/autoconf/trunk/checksums Added Paths: ----------- csw/mgar/pkg/autoconf/trunk/files/0001-Prefer-CSW-tools.patch Removed Paths: ------------- csw/mgar/pkg/autoconf/trunk/files/CSWautoconf.depend csw/mgar/pkg/autoconf/trunk/files/use-csw-tools.patch Modified: csw/mgar/pkg/autoconf/trunk/Makefile =================================================================== --- csw/mgar/pkg/autoconf/trunk/Makefile 2009-11-22 21:34:36 UTC (rev 7384) +++ csw/mgar/pkg/autoconf/trunk/Makefile 2009-11-22 21:35:18 UTC (rev 7385) @@ -1,5 +1,5 @@ GARNAME = autoconf -GARVERSION = 2.64 +GARVERSION = 2.65 CATEGORIES = devel DESCRIPTION = GNU auto-configuration tool @@ -15,7 +15,7 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PATCHFILES = use-csw-tools.patch +PATCHFILES = 0001-Prefer-CSW-tools.patch PREREQUISITE_PKGS = CSWhelp2man REQUIRED_PKGS = CSWgawk CSWgm4 CSWperl @@ -38,6 +38,4 @@ post-install: @echo " ==> Fixing install anomalies" - - @rm -f $(DESTDIR)$(prefix)/share/info/dir @rm -f $(DESTDIR)$(prefix)/share/info/standards.info Modified: csw/mgar/pkg/autoconf/trunk/checksums =================================================================== --- csw/mgar/pkg/autoconf/trunk/checksums 2009-11-22 21:34:36 UTC (rev 7384) +++ csw/mgar/pkg/autoconf/trunk/checksums 2009-11-22 21:35:18 UTC (rev 7385) @@ -1,2 +1,2 @@ -30a198cef839471dd4926e92ab485361 download/autoconf-2.64.tar.gz -56db22eb8fa63698b15f6e2eeadb3caa download/use-csw-tools.patch +ac233d38923d5bebe91a64d68983c3c0 0001-Prefer-CSW-tools.patch +46cfb40e0babf4c64f8325f03da81c9b autoconf-2.65.tar.gz Copied: csw/mgar/pkg/autoconf/trunk/files/0001-Prefer-CSW-tools.patch (from rev 7360, csw/mgar/pkg/autoconf/trunk/files/use-csw-tools.patch) =================================================================== --- csw/mgar/pkg/autoconf/trunk/files/0001-Prefer-CSW-tools.patch (rev 0) +++ csw/mgar/pkg/autoconf/trunk/files/0001-Prefer-CSW-tools.patch 2009-11-22 21:35:18 UTC (rev 7385) @@ -0,0 +1,33 @@ +From bcf37e64f81ff412b506a4d1c0d52f1a7fc8a615 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sun, 22 Nov 2009 22:30:05 +0100 +Subject: [PATCH] Prefer CSW tools + +--- + bin/autoreconf.in | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/bin/autoreconf.in b/bin/autoreconf.in +index 9f82071..139bf34 100644 +--- a/bin/autoreconf.in ++++ b/bin/autoreconf.in +@@ -110,11 +110,11 @@ Written by David J. MacKenzie and Akim Demaille. + my $autoconf = $ENV{'AUTOCONF'} || '@bindir@/@autoconf-name@'; + my $autoheader = $ENV{'AUTOHEADER'} || '@bindir@/@autoheader-name@'; + my $autom4te = $ENV{'AUTOM4TE'} || '@bindir@/@autom4te-name@'; +-my $automake = $ENV{'AUTOMAKE'} || 'automake'; +-my $aclocal = $ENV{'ACLOCAL'} || 'aclocal'; +-my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize'; +-my $autopoint = $ENV{'AUTOPOINT'} || 'autopoint'; +-my $make = $ENV{'MAKE'} || 'make'; ++my $automake = $ENV{'AUTOMAKE'} || '@bindir@/automake'; ++my $aclocal = $ENV{'ACLOCAL'} || '@bindir@/aclocal'; ++my $libtoolize = $ENV{'LIBTOOLIZE'} || '@bindir@/libtoolize'; ++my $autopoint = $ENV{'AUTOPOINT'} || '@bindir@/gautopoint'; ++my $make = $ENV{'MAKE'} || '@bindir@/gmake'; + + # --install -- as --add-missing in other tools. + my $install = 0; +-- +1.6.5.1 + Deleted: csw/mgar/pkg/autoconf/trunk/files/CSWautoconf.depend =================================================================== --- csw/mgar/pkg/autoconf/trunk/files/CSWautoconf.depend 2009-11-22 21:34:36 UTC (rev 7384) +++ csw/mgar/pkg/autoconf/trunk/files/CSWautoconf.depend 2009-11-22 21:35:18 UTC (rev 7385) @@ -1,3 +0,0 @@ -P CSWgawk gawk - GNU AWK -P CSWgm4 gm4 - GNU m4 Unix macro processor -P CSWperl perl - A high-level, general-purpose programming language. Deleted: csw/mgar/pkg/autoconf/trunk/files/use-csw-tools.patch =================================================================== --- csw/mgar/pkg/autoconf/trunk/files/use-csw-tools.patch 2009-11-22 21:34:36 UTC (rev 7384) +++ csw/mgar/pkg/autoconf/trunk/files/use-csw-tools.patch 2009-11-22 21:35:18 UTC (rev 7385) @@ -1,20 +0,0 @@ -diff -Naur autoconf-2.63.orig/bin/autoreconf.in autoconf-2.63/bin/autoreconf.in ---- autoconf-2.63.orig/bin/autoreconf.in 2008-08-28 04:08:10.000000000 +0200 -+++ autoconf-2.63/bin/autoreconf.in 2008-09-18 18:22:49.127382000 +0200 -@@ -109,11 +109,11 @@ - # Lib files. - my $autoconf = $ENV{'AUTOCONF'} || '@bindir@/@autoconf-name@'; - my $autoheader = $ENV{'AUTOHEADER'} || '@bindir@/@autoheader-name@'; --my $automake = $ENV{'AUTOMAKE'} || 'automake'; --my $aclocal = $ENV{'ACLOCAL'} || 'aclocal'; --my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize'; --my $autopoint = $ENV{'AUTOPOINT'} || 'autopoint'; --my $make = $ENV{'MAKE'} || 'make'; -+my $automake = $ENV{'AUTOMAKE'} || '@bindir@/automake'; -+my $aclocal = $ENV{'ACLOCAL'} || '@bindir@/aclocal'; -+my $libtoolize = $ENV{'LIBTOOLIZE'} || '@bindir@/libtoolize'; -+my $autopoint = $ENV{'AUTOPOINT'} || '@bindir@/gautopoint'; -+my $make = $ENV{'MAKE'} || '@bindir@/gmake'; - - # --install -- as --add-missing in other tools. - my $install = 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 Sun Nov 22 23:02:52 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 22 Nov 2009 22:02:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[7386] csw/mgar/pkg/coreutils/trunk Message-ID: Revision: 7386 http://gar.svn.sourceforge.net/gar/?rev=7386&view=rev Author: bdwalton Date: 2009-11-22 22:02:52 +0000 (Sun, 22 Nov 2009) Log Message: ----------- coreutils: add patch to fix test breakages; add more configure options Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile csw/mgar/pkg/coreutils/trunk/checksums Added Paths: ----------- csw/mgar/pkg/coreutils/trunk/files/0001-Fix-solaris-acl-support-breakage.patch Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-22 21:35:18 UTC (rev 7385) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-22 22:02:52 UTC (rev 7386) @@ -9,9 +9,9 @@ Previously these utilities were offered as three individual sets of GNU utilities, Fileutils, Shellutils, and Textutils. Those three have been combined into a single set of utilities called Coreutils. endef - MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Fix-solaris-acl-support-breakage.patch PREREQUISITE_PKGS = CSWautomake CSWautoconf CSWbison CSWggettext CSWgit PREREQUISITE_PKGS += CSWgperf CSWgzip CSWperl CSWrsync CSWgtar CSWbash @@ -22,7 +22,9 @@ sysconfdir = /etc/opt/csw localstatedir = /var/opt/csw CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --disable-acl --program-prefix=g +CONFIGURE_ARGS += --program-prefix=g +CONFIGURE_ARGS += --with-libintl-prefix=/opt/csw/ +CONFIGURE_ARGS += --with-iconv-prefix=/opt/csw/ TEST_ARGS = check Modified: csw/mgar/pkg/coreutils/trunk/checksums =================================================================== --- csw/mgar/pkg/coreutils/trunk/checksums 2009-11-22 21:35:18 UTC (rev 7385) +++ csw/mgar/pkg/coreutils/trunk/checksums 2009-11-22 22:02:52 UTC (rev 7386) @@ -1 +1,2 @@ +ed529e3abbc0fb76d2e13f5202f59932 0001-Fix-solaris-acl-support-breakage.patch 4cde9f31604f4da188ed302ca55545ea coreutils-8.1.tar.gz Added: csw/mgar/pkg/coreutils/trunk/files/0001-Fix-solaris-acl-support-breakage.patch =================================================================== --- csw/mgar/pkg/coreutils/trunk/files/0001-Fix-solaris-acl-support-breakage.patch (rev 0) +++ csw/mgar/pkg/coreutils/trunk/files/0001-Fix-solaris-acl-support-breakage.patch 2009-11-22 22:02:52 UTC (rev 7386) @@ -0,0 +1,54 @@ +From 2f1eeb8502a426f38189d24760d52760448cd2ae Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sun, 22 Nov 2009 18:29:07 +0100 +Subject: [PATCH] Fix solaris acl support breakage + +In the standard solaris acl support, ENOSYS was handled cleanly. This +patch makes the code path handle EOPNOTSUPP identically to ENOSYS, +preventing errors when attempting to a pply acl's on filesystems that +don't implement the acl api (NFS). + +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..346dd5c 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 == EOPNOTSUPP || errno == EINVAL) + { + 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 ddac4df..fdc74f2 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.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From glawsf at users.sourceforge.net Mon Nov 23 00:49:37 2009 From: glawsf at users.sourceforge.net (glawsf at users.sourceforge.net) Date: Sun, 22 Nov 2009 23:49:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[7387] csw/mgar/pkg/puppet/trunk Message-ID: Revision: 7387 http://gar.svn.sourceforge.net/gar/?rev=7387&view=rev Author: glawsf Date: 2009-11-22 23:49:36 +0000 (Sun, 22 Nov 2009) Log Message: ----------- version bump Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/Makefile csw/mgar/pkg/puppet/trunk/checksums csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postremove Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2009-11-22 22:02:52 UTC (rev 7386) +++ csw/mgar/pkg/puppet/trunk/Makefile 2009-11-22 23:49:36 UTC (rev 7387) @@ -7,7 +7,7 @@ # [1] http://garylaw.net/packages/puppet-build.sh GARNAME = puppet -GARVERSION = 0.24.8 +GARVERSION = 0.25.1 CATEGORIES = apps define BLURB @@ -21,9 +21,9 @@ endef MASTER_SITES = http://reductivelabs.com/downloads/puppet/ -DISTFILES = $(GARNAME)-$(GARVERSION).tgz +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += cswpuppetd cswpuppetmasterd cswusergroup -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz SPKG_SOURCEURL = http://reductivelabs.com/products/puppet/ INITSMF = $(sysconfdir)/init\.d/cswpuppetd @@ -35,7 +35,7 @@ PACKAGES = CSWpuppet CSWpuppetmaster REQUIRED_PKGS = CSWfacter -PREREQUISITE_PKGS = $(REQUIRED_PKGS) +#PREREQUISITE_PKGS = $(REQUIRED_PKGS) REQUIRED_PKGS_CSWpuppetmaster = CSWpuppet PKGFILES_CSWpuppetmaster = $(sysconfdir)/init\.d/cswpuppetmasterd Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2009-11-22 22:02:52 UTC (rev 7386) +++ csw/mgar/pkg/puppet/trunk/checksums 2009-11-22 23:49:36 UTC (rev 7387) @@ -3,4 +3,4 @@ db0230ad9c2a8622c7f7e73c10f61dbc cswpuppetd fd5e49b7d2b7d288d5beb224d0cfa855 cswpuppetmasterd 3ab0d4f9801075bc78b68b766b496fc7 cswusergroup -288d46dee00acad64d0f3ecc6d8ba6fa puppet-0.24.8.tgz +55ced6102fe6ad8b2ecb2b1384008167 puppet-0.25.1.tar.gz Modified: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postremove =================================================================== --- csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postremove 2009-11-22 22:02:52 UTC (rev 7386) +++ csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postremove 2009-11-22 23:49:36 UTC (rev 7387) @@ -6,7 +6,6 @@ # Not sure if this cleanup is the right thing to do. TODO(maciej): review rm /etc/puppet || /bin/true -rm /opt/csw/etc/puppet || /bin/true +rmdir /opt/csw/etc/puppet || /bin/true rm /var/puppet || /bin/true -rm /opt/csw/var/puppet || /bin/true -rm -rf /opt/csw/lib/ruby/site_ruby/1.8/puppet +rmdir /opt/csw/var/puppet || /bin/true 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 Nov 23 01:35:23 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 23 Nov 2009 00:35:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7388] csw/mgar/pkg/nss/branches/upstream-work/ Message-ID: Revision: 7388 http://gar.svn.sourceforge.net/gar/?rev=7388&view=rev Author: wahwah Date: 2009-11-23 00:35:23 +0000 (Mon, 23 Nov 2009) Log Message: ----------- Branching off to work with the upstream guys. http://groups.google.com/group/mozilla.dev.tech.crypto/msg/14bff0519a1031c5 Added Paths: ----------- csw/mgar/pkg/nss/branches/upstream-work/ 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 Nov 23 01:59:26 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 23 Nov 2009 00:59:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[7389] csw/mgar/pkg/nss/branches/upstream-work Message-ID: Revision: 7389 http://gar.svn.sourceforge.net/gar/?rev=7389&view=rev Author: wahwah Date: 2009-11-23 00:59:26 +0000 (Mon, 23 Nov 2009) Log Message: ----------- nss/branches/upstream-work: The simplest version of the build, to work with the upstream developers. Modified Paths: -------------- csw/mgar/pkg/nss/branches/upstream-work/Makefile Removed Paths: ------------- csw/mgar/pkg/nss/branches/upstream-work/files/nss-3.12.4.patch csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3.patch csw/mgar/pkg/nss/branches/upstream-work/files/runtime-search-path.patch csw/mgar/pkg/nss/branches/upstream-work/files/shared-libs.patch csw/mgar/pkg/nss/branches/upstream-work/files/sign-under-dbx.patch csw/mgar/pkg/nss/branches/upstream-work/files/whoami.patch Modified: csw/mgar/pkg/nss/branches/upstream-work/Makefile =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/Makefile 2009-11-23 00:35:23 UTC (rev 7388) +++ csw/mgar/pkg/nss/branches/upstream-work/Makefile 2009-11-23 00:59:26 UTC (rev 7389) @@ -22,39 +22,29 @@ # TODO: Generate RTM_NAME from GARVERSION RTM_NAME = NSS_3_12_4_RTM MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/ -# This patch taken from http://bugs.gentoo.org/show_bug.cgi?id=256102 -PATCHFILES = nss-3.12.4.patch -PATCHFILES += shared-libs.patch -PATCHFILES += platlibs-sqlite3.patch -PATCHFILES += platlibs-sunos.patch -PATCHFILES += whoami.patch -PATCHFILES += runtime-search-path.patch DIST_SUFFIX = -with-nspr-4.8 DISTFILES = $(GARNAME)-$(GARVERSION)$(DIST_SUFFIX).tar.gz DISTNAME = $(GARNAME)-$(GARVERSION)$(DIST_SUFFIX) UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)$(DIST_SUFFIX).tar.gz REQUIRED_PKGS = CSWnspr CSWsqlite3 PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWsqlite3devel -CONFIGURE_SCRIPTS = nss +CONFIGURE_SCRIPTS = BUILD_SCRIPTS = nss INSTALL_SCRIPTS = nss TEST_SCRIPTS = BUILD64 = 1 -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib ifeq (OPT,$(GARFLAVOR)) BUILD_OPT = 1 endif -NSS_USE_SYSTEM_SQLITE = 1 + +# NSPR is installed in /opt/csw/lib/nspr, nspr.pc is in /opt/csw/lib/pkgconfig NSPR_INCLUDE_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --cflags-only-I nspr | gsed 's/-I//') +export NSPR_INCLUDE_DIR NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ') -USE_SYSTEM_ZLIB = 1 -ZLIB_LIBS = -lz -NSDISTMODE = copy -NSS_ENABLE_ECC = 1 -XCFLAGS = $(CFLAGS) -FREEBL_NO_DEPEND = 1 -LDOPTS = $(LD_OPTIONS) +export NSPR_LIB_DIR + +# 64-bit suppport ifeq ($(MODULATION),isa-sparcv9) USE_64 = 1 export USE_64 @@ -63,32 +53,9 @@ USE_64 = 1 export USE_64 endif -export BUILD_OPT NSS_USE_SYSTEM_SQLITE NSPR_INCLUDE_DIR NSPR_LIB_DIR -export USE_SYSTEM_ZLIB ZLIB_LIBS NSDISTMODE NSS_ENABLE_ECC XCFLAGS FREEBL_NO_DEPEND include gar/category.mk -configure-nss: respect-ldflags add-runtime-search-path - @$(MAKECOOKIE) - -respect-ldflags: - (cd $(WORKSRC)/mozilla/security/coreconf \ - && \ - gsed -i -e 's:SOURCE_PREFIX = $$(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $$(CORE_DEPTH)/dist:' \ - source.mk \ - && \ - gsed -i -e 's/\$$(MKSHLIB) -o/\$$(MKSHLIB) \$$(LDFLAGS) -o/g' rules.mk) - @$(MAKECOOKIE) - -add-runtime-search-path: - # Make sure that the runtime search path is added in all Makefiles. - gfind $(WORKSRC) \( -name Makefile -o -name '*.mk' \) \ - -exec gsed -i -e 's|-L\$$(NSPR_LIB_DIR)|-L$$(NSPR_LIB_DIR) -R$$(NSPR_LIB_DIR)/$$$$ISALIST|' \ - {} \; - # A form of assert - gegrep -- '-R.*ISALIST' $(WORKSRC)/mozilla/security/nss/lib/freebl/config.mk - @$(MAKECOOKIE) - build-nss: build-coreconf build-dbm build-nss-compile build-coreconf: @@ -114,4 +81,3 @@ && \ gmake -j1 CC="$(CC)") @$(MAKECOOKIE) - Deleted: csw/mgar/pkg/nss/branches/upstream-work/files/nss-3.12.4.patch =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/files/nss-3.12.4.patch 2009-11-23 00:35:23 UTC (rev 7388) +++ csw/mgar/pkg/nss/branches/upstream-work/files/nss-3.12.4.patch 2009-11-23 00:59:26 UTC (rev 7389) @@ -1,141 +0,0 @@ ---- mozilla/security/nss/lib/freebl/stubs.c.dist 2009-09-16 17:46:24.600678560 +0100 -+++ b/mozilla/security/nss/lib/freebl/stubs.c 2009-09-16 18:09:59.275307160 +0100 -@@ -70,9 +70,32 @@ - #include - #include - --#define FREEBL_NO_WEAK 1 -+#ifdef __sgi -+# include -+# ifndef _RLD_INTERFACE_DLFCN_H_DLADDR -+# define _RLD_INTERFACE_DLFCN_H_DLADDR -+ typedef struct Dl_info { -+ const char * dli_fname; -+ void * dli_fbase; -+ const char * dli_sname; -+ void * dli_saddr; -+ int dli_version; -+ int dli_reserved1; -+ long dli_reserved[4]; -+ } Dl_info; -+# endif -+# define _RLD_DLADDR 14 -+int dladdr(void *address, Dl_info *dl); -+ -+int dladdr(void *address, Dl_info *dl) -+{ -+ void *v; -+ v = _rld_new_interface(_RLD_DLADDR,address,dl); -+ return (int)v; -+} -+#endif - --#define WEAK __attribute__((weak)) -+#define FREEBL_NO_WEAK 1 - - #ifdef FREEBL_NO_WEAK - -@@ -93,17 +116,17 @@ - static type_##fn ptr_##fn = NULL - - #define STUB_SAFE_CALL0(fn) \ -- if (ptr_##fn) { return ptr_##fn(); } -+ if (ptr_##fn) { ptr_##fn(); } - #define STUB_SAFE_CALL1(fn,a1) \ -- if (ptr_##fn) { return ptr_##fn(a1); } -+ if (ptr_##fn) { ptr_##fn(a1); } - #define STUB_SAFE_CALL2(fn,a1,a2) \ -- if (ptr_##fn) { return ptr_##fn(a1,a2); } -+ if (ptr_##fn) { ptr_##fn(a1,a2); } - #define STUB_SAFE_CALL3(fn,a1,a2,a3) \ -- if (ptr_##fn) { return ptr_##fn(a1,a2,a3); } -+ if (ptr_##fn) { ptr_##fn(a1,a2,a3); } - #define STUB_SAFE_CALL4(fn,a1,a2,a3,a4) \ -- if (ptr_##fn) { return ptr_##fn(a1,a2,a3,a4); } -+ if (ptr_##fn) { ptr_##fn(a1,a2,a3,a4); } - #define STUB_SAFE_CALL6(fn,a1,a2,a3,a4,a5,a6) \ -- if (ptr_##fn) { return ptr_##fn(a1,a2,a3,a4,a5,a6); } -+ if (ptr_##fn) { ptr_##fn(a1,a2,a3,a4,a5,a6); } - - #define STUB_FETCH_FUNCTION(fn) \ - ptr_##fn = (type_##fn) dlsym(lib,#fn); \ -@@ -118,6 +141,8 @@ - * libutil will not resolve these symbols. - */ - -+#define WEAK __attribute__((weak)) -+ - #define STUB_DECLARE(ret, fn, args) \ - WEAK extern ret fn args - -@@ -200,7 +225,7 @@ extern void - PORT_Free_stub(void *ptr) - { - STUB_SAFE_CALL1(PORT_Free_Util, ptr); -- return free(ptr); -+ free(ptr); - } - - extern void * -@@ -220,14 +245,14 @@ PORT_ZFree_stub(void *ptr, size_t len) - { - STUB_SAFE_CALL2(PORT_ZFree_Util, ptr, len); - memset(ptr, 0, len); -- return free(ptr); -+ free(ptr); - } - - extern void - PR_Free_stub(void *ptr) - { - STUB_SAFE_CALL1(PR_Free, ptr); -- return free(ptr); -+ free(ptr); - } - - /* -@@ -530,7 +555,7 @@ freebl_InitNSSUtil(void *lib) - * fetch the library if it's loaded. For NSS it should already be loaded - */ - #define freebl_getLibrary(libName) \ -- dlopen (libName, RTLD_LAZY|RTLD_NOLOAD) -+ dlopen (libName, RTLD_LAZY) - - #define freebl_releaseLibrary(lib) \ - if (lib) dlclose(lib) -@@ -538,7 +563,7 @@ freebl_InitNSSUtil(void *lib) - static void * FREEBLnsprGlobalLib = NULL; - static void * FREEBLnssutilGlobalLib = NULL; - --void __attribute ((destructor)) FREEBL_unload() -+void FREEBL_unload() - { - freebl_releaseLibrary(FREEBLnsprGlobalLib); - freebl_releaseLibrary(FREEBLnssutilGlobalLib); ---- mozilla/security/nss/lib/freebl/nsslowhash.c.dist 2009-09-16 18:16:17.529500640 +0100 -+++ b/mozilla/security/nss/lib/freebl/nsslowhash.c 2009-09-16 18:16:37.634080480 +0100 -@@ -375,21 +375,21 @@ NSSLOWHASH_NewContext(NSSLOWInitContext - void - NSSLOWHASH_Begin(NSSLOWHASHContext *context) - { -- return context->hashObj->begin(context->hashCtxt); -+ context->hashObj->begin(context->hashCtxt); - } - - void - NSSLOWHASH_Update(NSSLOWHASHContext *context, const unsigned char *buf, - unsigned int len) - { -- return context->hashObj->update(context->hashCtxt, buf, len); -+ context->hashObj->update(context->hashCtxt, buf, len); - } - - void - NSSLOWHASH_End(NSSLOWHASHContext *context, unsigned char *buf, - unsigned int *ret, unsigned int len) - { -- return context->hashObj->end(context->hashCtxt, buf, ret, len); -+ context->hashObj->end(context->hashCtxt, buf, ret, len); - } - - void Deleted: csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3.patch =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3.patch 2009-11-23 00:35:23 UTC (rev 7388) +++ csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3.patch 2009-11-23 00:59:26 UTC (rev 7389) @@ -1,11 +0,0 @@ ---- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk.orig 2009-11-21 17:28:09.997982796 +0100 -+++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk 2009-11-21 17:28:32.107632453 +0100 -@@ -80,7 +80,7 @@ - endif - endif - --SQLITE=-lsqlite3 -+SQLITE=-R/opt/csw/lib/$$ISALIST -L/opt/csw/lib -lsqlite3 - - ifdef NSS_DISABLE_DBM - DBMLIB = $(NULL) Deleted: csw/mgar/pkg/nss/branches/upstream-work/files/shared-libs.patch =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/files/shared-libs.patch 2009-11-23 00:35:23 UTC (rev 7388) +++ csw/mgar/pkg/nss/branches/upstream-work/files/shared-libs.patch 2009-11-23 00:59:26 UTC (rev 7389) @@ -1,32 +0,0 @@ ---- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/lib/softoken/config.mk.orig 2009-11-22 11:39:49.492474635 +0100 -+++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/lib/softoken/config.mk 2009-11-22 11:40:51.857227138 +0100 -@@ -54,10 +54,14 @@ - - ifdef NS_USE_GCC - EXTRA_SHARED_LIBS += \ -+ -R/opt/csw/lib/$$ISALIST \ -+ -L/opt/csw/lib \ - -L$(DIST)/lib \ -+ -R$(NSSUTIL_LIB_DIR)/$$ISALIST \ - -L$(NSSUTIL_LIB_DIR) \ - -lnssutil3 \ - -lsqlite3 \ -+ -R$(NSPR_LIB_DIR)/$$ISALIST \ - -L$(NSPR_LIB_DIR) \ - -lplc4 \ - -lplds4 \ -@@ -80,10 +84,14 @@ - # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS) - # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX. - EXTRA_SHARED_LIBS += \ -+ -R/opt/csw/lib/$$ISALIST \ -+ -L/opt/csw/lib \ - -L$(DIST)/lib \ -+ -R$(NSSUTIL_LIB_DIR)/$$ISALIST \ - -L$(NSSUTIL_LIB_DIR) \ - -lnssutil3 \ - -lsqlite3 \ -+ -R$(NSPR_LIB_DIR)/$$ISALIST \ - -L$(NSPR_LIB_DIR) \ - -lplc4 \ - -lplds4 \ Deleted: csw/mgar/pkg/nss/branches/upstream-work/files/sign-under-dbx.patch =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/files/sign-under-dbx.patch 2009-11-23 00:35:23 UTC (rev 7388) +++ csw/mgar/pkg/nss/branches/upstream-work/files/sign-under-dbx.patch 2009-11-23 00:59:26 UTC (rev 7389) @@ -1,15 +0,0 @@ -This file shows how to run shlibsign under dbx, the Sun Studio debugger, to see -where it's aborting. - ---- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/shlibsign/./sign.sh.orig 2009-11-22 15:17:12.069116849 +0100 -+++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/shlibsign/./sign.sh 2009-11-22 15:17:54.559576926 +0100 -@@ -34,7 +34,7 @@ - export LIBRARY_PATH - ADDON_PATH=${1}/lib:${4}:$ADDON_PATH - export ADDON_PATH -- echo ${2}/shlibsign -v -i ${5} -- ${2}/shlibsign -v -i ${5} -+ echo /opt/studio/SOS11/SUNWspro/bin/dbx ${2}/shlibsign -v -i ${5} -+ /opt/studio/SOS11/SUNWspro/bin/dbx ${2}/shlibsign -v -i ${5} - ;; - esac Deleted: csw/mgar/pkg/nss/branches/upstream-work/files/whoami.patch =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/files/whoami.patch 2009-11-23 00:35:23 UTC (rev 7388) +++ csw/mgar/pkg/nss/branches/upstream-work/files/whoami.patch 2009-11-23 00:59:26 UTC (rev 7389) @@ -1,11 +0,0 @@ ---- nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/UNIX.mk.orig 2009-11-22 02:25:17.411354784 +0100 -+++ nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/UNIX.mk 2009-11-22 02:25:24.833876220 +0100 -@@ -46,7 +46,7 @@ - DEFINES += -UDEBUG -DNDEBUG - else - OPTIMIZER += -g -- USERNAME := $(shell whoami) -+ USERNAME := $(shell gwhoami) - USERNAME := $(subst -,_,$(USERNAME)) - DEFINES += -DDEBUG -UNDEBUG -DDEBUG_$(USERNAME) - endif 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 Nov 23 02:51:47 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 23 Nov 2009 01:51:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[7390] csw/mgar/pkg/coreutils/trunk/Makefile Message-ID: Revision: 7390 http://gar.svn.sourceforge.net/gar/?rev=7390&view=rev Author: bdwalton Date: 2009-11-23 01:51:46 +0000 (Mon, 23 Nov 2009) Log Message: ----------- coreutils: correct iconv configure argument Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-23 00:59:26 UTC (rev 7389) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-23 01:51:46 UTC (rev 7390) @@ -24,7 +24,7 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --program-prefix=g CONFIGURE_ARGS += --with-libintl-prefix=/opt/csw/ -CONFIGURE_ARGS += --with-iconv-prefix=/opt/csw/ +CONFIGURE_ARGS += --with-libiconv-prefix=/opt/csw/ TEST_ARGS = check 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 Nov 23 02:54:03 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 23 Nov 2009 01:54:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[7391] csw/mgar/pkg/nss/trunk Message-ID: Revision: 7391 http://gar.svn.sourceforge.net/gar/?rev=7391&view=rev Author: wahwah Date: 2009-11-23 01:54:03 +0000 (Mon, 23 Nov 2009) Log Message: ----------- nss: using the Gentoo patch to create nss-config and nss.pc Modified Paths: -------------- csw/mgar/pkg/nss/trunk/Makefile csw/mgar/pkg/nss/trunk/checksums Added Paths: ----------- csw/mgar/pkg/nss/trunk/files/csw-include.patch csw/mgar/pkg/nss/trunk/files/gln.patch csw/mgar/pkg/nss/trunk/files/nss-3.12.4-gentoo-fixups-1.diff csw/mgar/pkg/nss/trunk/files/platlibs-sunos.patch Modified: csw/mgar/pkg/nss/trunk/Makefile =================================================================== --- csw/mgar/pkg/nss/trunk/Makefile 2009-11-23 01:51:46 UTC (rev 7390) +++ csw/mgar/pkg/nss/trunk/Makefile 2009-11-23 01:54:03 UTC (rev 7391) @@ -13,7 +13,10 @@ GARFLAVOR = DBG GARNAME = nss -GARVERSION = 3.12.4 +MAJOR_VERSION = 3 +MINOR_VERSION = 12 +PATCHLEVEL = 4 +GARVERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(PATCHLEVEL) CATEGORIES = lib DESCRIPTION = Network Security Services library, implements PKI support define BLURB @@ -29,6 +32,9 @@ PATCHFILES += platlibs-sunos.patch PATCHFILES += whoami.patch PATCHFILES += runtime-search-path.patch +PATCHFILES += nss-3.12.4-gentoo-fixups-1.diff +PATCHFILES += csw-include.patch +PATCHFILES += gln.patch DIST_SUFFIX = -with-nspr-4.8 DISTFILES = $(GARNAME)-$(GARVERSION)$(DIST_SUFFIX).tar.gz DISTNAME = $(GARNAME)-$(GARVERSION)$(DIST_SUFFIX) @@ -41,6 +47,9 @@ TEST_SCRIPTS = BUILD64 = 1 +install_libdir = $(prefix)/lib/nss +includedir = $(prefix)/include/nss + EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib ifeq (OPT,$(GARFLAVOR)) BUILD_OPT = 1 @@ -53,7 +62,6 @@ NSDISTMODE = copy NSS_ENABLE_ECC = 1 XCFLAGS = $(CFLAGS) -FREEBL_NO_DEPEND = 1 LDOPTS = $(LD_OPTIONS) ifeq ($(MODULATION),isa-sparcv9) USE_64 = 1 @@ -64,7 +72,7 @@ export USE_64 endif export BUILD_OPT NSS_USE_SYSTEM_SQLITE NSPR_INCLUDE_DIR NSPR_LIB_DIR -export USE_SYSTEM_ZLIB ZLIB_LIBS NSDISTMODE NSS_ENABLE_ECC XCFLAGS FREEBL_NO_DEPEND +export USE_SYSTEM_ZLIB ZLIB_LIBS NSDISTMODE NSS_ENABLE_ECC XCFLAGS include gar/category.mk @@ -115,3 +123,23 @@ gmake -j1 CC="$(CC)") @$(MAKECOOKIE) +install-nss: + ginstall -d -m 755 $(DESTDIR)$(libdir) + gcp -a $(WORKSRC)/mozilla/security/dist/*/lib/*.so $(DESTDIR)$(libdir) + ginstall -d -m 755 $(DESTDIR)$(bindir) + gcp -a $(WORKSRC)/mozilla/security/dist/*/bin/nss-config $(DESTDIR)$(bindir) + ginstall -d -m 755 $(DESTDIR)/lib/pkgconfig + ginstall -m 644 \ + $(WORKSRC)/mozilla/security/dist/*/lib/pkgconfig/nss.pc \ + $(DESTDIR)/lib/pkgconfig + ginstall -d -m 755 $(DESTDIR)$(includedir) + gcp -a $(WORKSRC)/mozilla/security/dist/private/nss/*.h $(DESTDIR)$(includedir) + gcp -a $(WORKSRC)/mozilla/security/dist/public/nss/*.h $(DESTDIR)$(includedir) + (cd $(DESTDIR)$(libdir); for file in *.so; do \ + mv $${file} $$(file).$(MINOR_VERSION); \ + ln -s $${file}.$(MINOR_VERSION) $${file}; \ + done) + (for file in $(WORKSRC)/mozilla/security/dist/*/bin/*; do \ + ginstall -m 755 $${file} $(DESTDIR)$(bindir)/nss$$(basename $${file}); \ + done) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/nss/trunk/checksums =================================================================== --- csw/mgar/pkg/nss/trunk/checksums 2009-11-23 01:51:46 UTC (rev 7390) +++ csw/mgar/pkg/nss/trunk/checksums 2009-11-23 01:54:03 UTC (rev 7391) @@ -1,3 +1,6 @@ +a1ce38c03b142eb2bd54f1f111661e30 csw-include.patch +7116f8de3ac8b35104365c1b3fc6aea4 gln.patch +63476fb10c2d14f7e0585fe327ae9341 nss-3.12.4-gentoo-fixups-1.diff 8f76e381bf2339d731bfd5b8116c25a4 nss-3.12.4-with-nspr-4.8.tar.gz 39b9d2431d4ff717d103b742fcaefb81 nss-3.12.4.patch f0f40bd021423ab1680b4d87cd19c1db platlibs-sqlite3.patch Added: csw/mgar/pkg/nss/trunk/files/csw-include.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/csw-include.patch (rev 0) +++ csw/mgar/pkg/nss/trunk/files/csw-include.patch 2009-11-23 01:54:03 UTC (rev 7391) @@ -0,0 +1,11 @@ +--- nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/SunOS5.mk.orig 2009-11-23 02:33:18.896095984 +0100 ++++ nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/SunOS5.mk 2009-11-23 02:33:40.956347570 +0100 +@@ -104,7 +104,7 @@ + endif + endif + +-INCLUDES += -I/usr/dt/include -I/usr/openwin/include ++INCLUDES += -I/usr/dt/include -I/usr/openwin/include -I/opt/csw/include + + RANLIB = echo + CPU_ARCH = sparc Added: csw/mgar/pkg/nss/trunk/files/gln.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/gln.patch (rev 0) +++ csw/mgar/pkg/nss/trunk/files/gln.patch 2009-11-23 01:54:03 UTC (rev 7391) @@ -0,0 +1,35 @@ +--- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/config/Makefile.orig 2009-11-23 02:38:13.942222659 +0100 ++++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/config/Makefile 2009-11-23 02:38:42.759423711 +0100 +@@ -13,7 +13,7 @@ + export: + # Create the nss.pc file + mkdir -p $(DIST)/lib/pkgconfig +- sed -e "s, at prefix@,$(PREFIX)," \ ++ gsed -e "s, at prefix@,$(PREFIX)," \ + -e "s, at exec_prefix@,\$${prefix}," \ + -e "s, at libdir@,\$${prefix}/gentoo/nss," \ + -e "s, at includedir@,\$${prefix}/include/nss," \ +@@ -21,18 +21,18 @@ + -e "s, at NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ + -e "s, at NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ + nss.pc.in > nss.pc +- chmod 0644 nss.pc +- ln -sf ../../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig ++ gchmod 0644 nss.pc ++ gln -sf ../../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig + + # Create the nss-config script + mkdir -p $(DIST)/bin +- sed -e "s, at prefix@,$(PREFIX)," \ ++ gsed -e "s, at prefix@,$(PREFIX)," \ + -e "s, at NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \ + -e "s, at NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ + -e "s, at NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ + nss-config.in > nss-config +- chmod 0755 nss-config +- ln -sf ../../../../security/nss/config/nss-config $(DIST)/bin ++ gchmod 0755 nss-config ++ gln -sf ../../../../security/nss/config/nss-config $(DIST)/bin + + libs: + Added: csw/mgar/pkg/nss/trunk/files/nss-3.12.4-gentoo-fixups-1.diff =================================================================== --- csw/mgar/pkg/nss/trunk/files/nss-3.12.4-gentoo-fixups-1.diff (rev 0) +++ csw/mgar/pkg/nss/trunk/files/nss-3.12.4-gentoo-fixups-1.diff 2009-11-23 01:54:03 UTC (rev 7391) @@ -0,0 +1,245 @@ +diff -urN nss-3.12.4-orig/mozilla/security/nss/config/Makefile nss-3.12.4/mozilla/security/nss/config/Makefile +--- nss-3.12.4-orig/mozilla/security/nss/config/Makefile 1969-12-31 18:00:00.000000000 -0600 ++++ nss-3.12.4/mozilla/security/nss/config/Makefile 2009-09-14 21:45:45.619639265 -0500 +@@ -0,0 +1,40 @@ ++CORE_DEPTH = ../.. ++DEPTH = ../.. ++ ++include $(CORE_DEPTH)/coreconf/config.mk ++ ++NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'` ++NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'` ++NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'` ++PREFIX = /usr ++ ++all: export libs ++ ++export: ++ # Create the nss.pc file ++ mkdir -p $(DIST)/lib/pkgconfig ++ sed -e "s, at prefix@,$(PREFIX)," \ ++ -e "s, at exec_prefix@,\$${prefix}," \ ++ -e "s, at libdir@,\$${prefix}/gentoo/nss," \ ++ -e "s, at includedir@,\$${prefix}/include/nss," \ ++ -e "s, at NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \ ++ -e "s, at NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ ++ -e "s, at NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ ++ nss.pc.in > nss.pc ++ chmod 0644 nss.pc ++ ln -sf ../../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig ++ ++ # Create the nss-config script ++ mkdir -p $(DIST)/bin ++ sed -e "s, at prefix@,$(PREFIX)," \ ++ -e "s, at NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \ ++ -e "s, at NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ ++ -e "s, at NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ ++ nss-config.in > nss-config ++ chmod 0755 nss-config ++ ln -sf ../../../../security/nss/config/nss-config $(DIST)/bin ++ ++libs: ++ ++dummy: all export libs ++ +diff -urN nss-3.12.4-orig/mozilla/security/nss/config/nss-config.in nss-3.12.4/mozilla/security/nss/config/nss-config.in +--- nss-3.12.4-orig/mozilla/security/nss/config/nss-config.in 1969-12-31 18:00:00.000000000 -0600 ++++ nss-3.12.4/mozilla/security/nss/config/nss-config.in 2009-09-14 21:47:45.190638078 -0500 +@@ -0,0 +1,145 @@ ++#!/bin/sh ++ ++prefix=@prefix@ ++ ++major_version=@NSS_MAJOR_VERSION@ ++minor_version=@NSS_MINOR_VERSION@ ++patch_version=@NSS_PATCH_VERSION@ ++ ++usage() ++{ ++ cat <&2 ++fi ++ ++lib_ssl=yes ++lib_smime=yes ++lib_nss=yes ++lib_nssutil=yes ++ ++while test $# -gt 0; do ++ case "$1" in ++ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; ++ *) optarg= ;; ++ esac ++ ++ case $1 in ++ --prefix=*) ++ prefix=$optarg ++ ;; ++ --prefix) ++ echo_prefix=yes ++ ;; ++ --exec-prefix=*) ++ exec_prefix=$optarg ++ ;; ++ --exec-prefix) ++ echo_exec_prefix=yes ++ ;; ++ --includedir=*) ++ includedir=$optarg ++ ;; ++ --includedir) ++ echo_includedir=yes ++ ;; ++ --libdir=*) ++ libdir=$optarg ++ ;; ++ --libdir) ++ echo_libdir=yes ++ ;; ++ --version) ++ echo ${major_version}.${minor_version}.${patch_version} ++ ;; ++ --cflags) ++ echo_cflags=yes ++ ;; ++ --libs) ++ echo_libs=yes ++ ;; ++ ssl) ++ lib_ssl=yes ++ ;; ++ smime) ++ lib_smime=yes ++ ;; ++ nss) ++ lib_nss=yes ++ ;; ++ nssutil) ++ lib_nssutil=yes ++ ;; ++ *) ++ usage 1 1>&2 ++ ;; ++ esac ++ shift ++done ++ ++# Set variables that may be dependent upon other variables ++if test -z "$exec_prefix"; then ++ exec_prefix=`pkg-config --variable=exec_prefix nss` ++fi ++if test -z "$includedir"; then ++ includedir=`pkg-config --variable=includedir nss` ++fi ++if test -z "$libdir"; then ++ libdir=`pkg-config --variable=libdir nss` ++fi ++ ++if test "$echo_prefix" = "yes"; then ++ echo $prefix ++fi ++ ++if test "$echo_exec_prefix" = "yes"; then ++ echo $exec_prefix ++fi ++ ++if test "$echo_includedir" = "yes"; then ++ echo $includedir ++fi ++ ++if test "$echo_libdir" = "yes"; then ++ echo $libdir ++fi ++ ++if test "$echo_cflags" = "yes"; then ++ echo -I$includedir ++fi ++ ++if test "$echo_libs" = "yes"; then ++ libdirs="-Wl,-R$libdir -L$libdir" ++ if test -n "$lib_ssl"; then ++ libdirs="$libdirs -lssl${major_version}" ++ fi ++ if test -n "$lib_smime"; then ++ libdirs="$libdirs -lsmime${major_version}" ++ fi ++ if test -n "$lib_nss"; then ++ libdirs="$libdirs -lnss${major_version}" ++ fi ++ if test -n "$lib_nssutil"; then ++ libdirs="$libdirs -lnssutil${major_version}" ++ fi ++ echo $libdirs ++fi ++ +diff -urN nss-3.12.4-orig/mozilla/security/nss/config/nss.pc.in nss-3.12.4/mozilla/security/nss/config/nss.pc.in +--- nss-3.12.4-orig/mozilla/security/nss/config/nss.pc.in 1969-12-31 18:00:00.000000000 -0600 ++++ nss-3.12.4/mozilla/security/nss/config/nss.pc.in 2009-09-14 21:45:45.653637310 -0500 +@@ -0,0 +1,12 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: NSS ++Description: Network Security Services ++Version: @NSS_MAJOR_VERSION at .@NSS_MINOR_VERSION at .@NSS_PATCH_VERSION@ ++Requires: nspr >= 4.8 ++Libs: -L${libdir} -lssl3 -lsmime3 -lnssutil3 -lnss3 -Wl,-R${libdir} ++Cflags: -I${includedir} ++ +diff -urN nss-3.12.4-orig/mozilla/security/nss/Makefile nss-3.12.4/mozilla/security/nss/Makefile +--- nss-3.12.4-orig/mozilla/security/nss/Makefile 2008-12-02 17:24:39.000000000 -0600 ++++ nss-3.12.4/mozilla/security/nss/Makefile 2009-09-14 21:45:45.678657145 -0500 +@@ -78,7 +78,7 @@ + # (7) Execute "local" rules. (OPTIONAL). # + ####################################################################### + +-nss_build_all: build_coreconf build_nspr build_dbm all ++nss_build_all: build_coreconf build_dbm all + + nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber + +@@ -140,12 +140,6 @@ + --with-dist-prefix='$(NSPR_PREFIX)' \ + --with-dist-includedir='$(NSPR_PREFIX)/include' + +-build_nspr: $(NSPR_CONFIG_STATUS) +- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE) +- +-clobber_nspr: $(NSPR_CONFIG_STATUS) +- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE) clobber +- + build_dbm: + ifndef NSS_DISABLE_DBM + cd $(CORE_DEPTH)/dbm ; $(MAKE) export libs +diff -urN nss-3.12.4-orig/mozilla/security/nss/manifest.mn nss-3.12.4/mozilla/security/nss/manifest.mn +--- nss-3.12.4-orig/mozilla/security/nss/manifest.mn 2008-04-04 15:36:59.000000000 -0500 ++++ nss-3.12.4/mozilla/security/nss/manifest.mn 2009-09-14 21:45:45.703656167 -0500 +@@ -42,6 +42,6 @@ + + RELEASE = nss + +-DIRS = lib cmd ++DIRS = lib cmd config + + Added: csw/mgar/pkg/nss/trunk/files/platlibs-sunos.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/platlibs-sunos.patch (rev 0) +++ csw/mgar/pkg/nss/trunk/files/platlibs-sunos.patch 2009-11-23 01:54:03 UTC (rev 7391) @@ -0,0 +1,11 @@ +--- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk.orig 2009-11-22 14:31:53.252227901 +0100 ++++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk 2009-11-22 14:32:46.536330277 +0100 +@@ -48,6 +48,8 @@ + else + EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib' + endif ++EXTRA_SHARED_LIBS += -R/opt/csw/lib/$$ISALIST ++EXTRA_SHARED_LIBS += -R/opt/csw/lib/nspr/$$ISALIST + endif + + ifeq ($(OS_ARCH), Linux) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Mon Nov 23 11:52:47 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 23 Nov 2009 10:52:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[7392] csw/mgar/pkg/xterm/trunk/files/changelog.CSW Message-ID: Revision: 7392 http://gar.svn.sourceforge.net/gar/?rev=7392&view=rev Author: skayser Date: 2009-11-23 10:52:46 +0000 (Mon, 23 Nov 2009) Log Message: ----------- xterm: adjusted changelog.CSW Modified Paths: -------------- csw/mgar/pkg/xterm/trunk/files/changelog.CSW Modified: csw/mgar/pkg/xterm/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/xterm/trunk/files/changelog.CSW 2009-11-23 01:54:03 UTC (rev 7391) +++ csw/mgar/pkg/xterm/trunk/files/changelog.CSW 2009-11-23 10:52:46 UTC (rev 7392) @@ -1,5 +1,13 @@ -xterm (251,REV=2009.11.18) +xterm (251,REV=2009.11.23) - * Updated to 250. (Fixes #3937, #3856) + * Updated to 251. (Fixes #3937, #3856) + * Built with CSW X11 from /opt/csw/X11 (previously X11 from /usr/X11) + as both, libXft and libXrender, are now built against CSW X11. - -- Sebastian Kayser Wed, 18 Nov 2009 03:23:47 +0100 + -- Sebastian Kayser Mon, 23 Nov 2009 11:51:17 +0100 + +xterm (243,REV=2009.04.09) + + * Adopted and updated to 243. + + -- Sebastian Kayser Thu, 09 Apr 2009 12:03:42 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Mon Nov 23 13:23:24 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 23 Nov 2009 12:23:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7393] csw/mgar/pkg/axel/trunk/files/changelog.CSW Message-ID: Revision: 7393 http://gar.svn.sourceforge.net/gar/?rev=7393&view=rev Author: skayser Date: 2009-11-23 12:23:24 +0000 (Mon, 23 Nov 2009) Log Message: ----------- axel: updated changelog.CSW Modified Paths: -------------- csw/mgar/pkg/axel/trunk/files/changelog.CSW Modified: csw/mgar/pkg/axel/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/axel/trunk/files/changelog.CSW 2009-11-23 10:52:46 UTC (rev 7392) +++ csw/mgar/pkg/axel/trunk/files/changelog.CSW 2009-11-23 12:23:24 UTC (rev 7393) @@ -1,5 +1,5 @@ -axel (2.4,REV=2009.11.18) +axel (2.4,REV=2009.11.23) * Updated to 2.4. (Fixes #4032) - -- Sebastian Kayser Wed, 18 Nov 2009 16:13:33 +0100 + -- Sebastian Kayser Mon, 23 Nov 2009 12:39:17 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Mon Nov 23 13:27:12 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 23 Nov 2009 12:27:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7394] csw/mgar/pkg/axel/trunk/files/changelog.CSW Message-ID: Revision: 7394 http://gar.svn.sourceforge.net/gar/?rev=7394&view=rev Author: skayser Date: 2009-11-23 12:27:11 +0000 (Mon, 23 Nov 2009) Log Message: ----------- axel: updated changelog.CSW Modified Paths: -------------- csw/mgar/pkg/axel/trunk/files/changelog.CSW Modified: csw/mgar/pkg/axel/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/axel/trunk/files/changelog.CSW 2009-11-23 12:23:24 UTC (rev 7393) +++ csw/mgar/pkg/axel/trunk/files/changelog.CSW 2009-11-23 12:27:11 UTC (rev 7394) @@ -1,5 +1,6 @@ axel (2.4,REV=2009.11.23) * Updated to 2.4. (Fixes #4032) + * Migrated axelrc from /opt/csw/etc to /etc/opt/csw. -- Sebastian Kayser Mon, 23 Nov 2009 12:39:17 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Mon Nov 23 19:38:49 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 23 Nov 2009 18:38:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[7395] csw/mgar/pkg/mbuffer/trunk Message-ID: Revision: 7395 http://gar.svn.sourceforge.net/gar/?rev=7395&view=rev Author: skayser Date: 2009-11-23 18:38:49 +0000 (Mon, 23 Nov 2009) Log Message: ----------- mbuffer: version bump to 20091122, added TMPDIR cleanup on test failures Modified Paths: -------------- csw/mgar/pkg/mbuffer/trunk/Makefile csw/mgar/pkg/mbuffer/trunk/checksums Modified: csw/mgar/pkg/mbuffer/trunk/Makefile =================================================================== --- csw/mgar/pkg/mbuffer/trunk/Makefile 2009-11-23 12:27:11 UTC (rev 7394) +++ csw/mgar/pkg/mbuffer/trunk/Makefile 2009-11-23 18:38:49 UTC (rev 7395) @@ -1,12 +1,8 @@ # STATUS/TODO -# - 20090628 contained assertion failures in 64-bit code which have been fixed -# with 20091012, 20091012 introduced hickups with non-IPv6 systems when using -# -I / -O (and not explicitly specifying -4) -# - 20091110 does not work on Solaris 8 / 9 any more .. upstream informed -# - 20091110 dumps core on connection refused .. upstream informed - +# - provide feedback about -xarch=generic64 to upstream +# - verify that tests pass GARNAME = mbuffer -GARVERSION = 20091110 +GARVERSION = 20091122 CATEGORIES = utils DESCRIPTION = A tool for buffering data streams @@ -69,10 +65,17 @@ # Target test3 is skipped because it contains IPV6 tests which # are not supported by the build farm boxes (yet). - $(MAKE) -C $(TMPDIR) -o test3 check - rm -rf $(TMPDIR) + $(MAKE) -C $(TMPDIR) -o test3 check || rm -rf $(TMPDIR) && exit 1 + test -d $(TMPDIR) && rm -rf $(TMPDIR) @$(MAKECOOKIE) +# mbuffer-20091122 always tries to use -xarch=generic64, +# even for non-64bit builds +post-configure-modulated: + [ "$(GARCH)" -eq "i386" -o "$(GARCH)" -eq "sparcv8" ] && \ + gsed -ie 's/-xarch=generic64//' $(WORKSRC)/Makefile + @$(MAKECOOKIE) + post-install-modulated: DOCS = ChangeLog README AUTHORS post-install-modulated: DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME) post-install-modulated: Modified: csw/mgar/pkg/mbuffer/trunk/checksums =================================================================== --- csw/mgar/pkg/mbuffer/trunk/checksums 2009-11-23 12:27:11 UTC (rev 7394) +++ csw/mgar/pkg/mbuffer/trunk/checksums 2009-11-23 18:38:49 UTC (rev 7395) @@ -1 +1 @@ -1c2ba8b865c3a26c503bb680810142be mbuffer-20091110.tgz +3f05bd393ac749ed820636e5aaed7848 mbuffer-20091122.tgz 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 Nov 23 23:01:34 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 23 Nov 2009 22:01:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[7396] csw/mgar/pkg/nspr/trunk/Makefile Message-ID: Revision: 7396 http://gar.svn.sourceforge.net/gar/?rev=7396&view=rev Author: wahwah Date: 2009-11-23 22:01:34 +0000 (Mon, 23 Nov 2009) Log Message: ----------- nspr: Adding /opt/csw/lib/nspr/64 --> {amd64,sparcv9} symlinks Modified Paths: -------------- csw/mgar/pkg/nspr/trunk/Makefile Modified: csw/mgar/pkg/nspr/trunk/Makefile =================================================================== --- csw/mgar/pkg/nspr/trunk/Makefile 2009-11-23 18:38:49 UTC (rev 7395) +++ csw/mgar/pkg/nspr/trunk/Makefile 2009-11-23 22:01:34 UTC (rev 7396) @@ -60,12 +60,6 @@ CONFIGURE_ARGS_DBG += --enable-tests CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) -# These options I'm unsure about, are they really needed? -# EXTRA_LDFLAGS = -R'\$\$ORIGIN:\$\$ORIGIN/..' -R/opt/csw/lib -# prefix = /opt/csw/mozilla/nspr -# CONFIGURE_ARGS += --with-dist-prefix=$(DESTDIR)/opt/csw/mozilla/nspr -# CONFIGURE_ARGS += --with-dist-bindir=$(DESTDIR)/opt/csw/mozilla/nspr/lib - BUILD64 = 1 include gar/category.mk @@ -84,7 +78,7 @@ install-nspr: (cd $(WORKSRC)/build && $(INSTALL_ENV) gmake install DESTDIR=$(DESTDIR)) - (cd $(DESTDIR)/opt/csw/lib/nspr \ + (cd $(DESTDIR)$(libdir) \ && for file in *.so; do \ mv $${file} $${file}.$(MIN_VERSION); \ ln -s $${file}.$(MIN_VERSION) $${file}; \ @@ -95,6 +89,16 @@ ginstall -m 755 -d $(DESTDIR)$(prefix)/lib/pkgconfig ginstall -m 644 $(WORKSRC)/build/config/nspr.pc \ $(DESTDIR)$(prefix)/lib/pkgconfig - rm $(DESTDIR)$(bindir)/prerr.properties - rm $(DESTDIR)$(bindir)/nspr.pc + rm -f $(DESTDIR)$(bindir)/prerr.properties + rm -f $(DESTDIR)$(bindir)/nspr.pc @$(MAKECOOKIE) + +# Create symlinks allowing to use -L/opt/csw/lib/nspr/64 for 64-bit +# architectures. +post-merge: + if [ "$(GARCH)" = sparc ]; then \ + gln -sf sparcv9 $(PKGROOT)$(libdir)/64; \ + elif [ "$(GARCH)" = i386 ]; then \ + gln -sf amd64 $(PKGROOT)$(libdir)/64; \ + fi + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From glawsf at users.sourceforge.net Mon Nov 23 23:29:49 2009 From: glawsf at users.sourceforge.net (glawsf at users.sourceforge.net) Date: Mon, 23 Nov 2009 22:29:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[7397] csw/mgar/pkg/puppet/trunk Message-ID: Revision: 7397 http://gar.svn.sourceforge.net/gar/?rev=7397&view=rev Author: glawsf Date: 2009-11-23 22:29:49 +0000 (Mon, 23 Nov 2009) Log Message: ----------- changed binary locations; updated checksums Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/checksums csw/mgar/pkg/puppet/trunk/files/cswpuppetd csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2009-11-23 22:01:34 UTC (rev 7396) +++ csw/mgar/pkg/puppet/trunk/checksums 2009-11-23 22:29:49 UTC (rev 7397) @@ -1,6 +1,6 @@ abaa404420106f9f28e9e1218b4e365b 0001-pkgutil-support.patch 9c27c0cdca051eae986b56b91ef889ca 0002-Using-the-single-option-of-pkgutil.patch -db0230ad9c2a8622c7f7e73c10f61dbc cswpuppetd -fd5e49b7d2b7d288d5beb224d0cfa855 cswpuppetmasterd +6135a983b7f020bea07178801f261693 cswpuppetd +51156a9016cbc41c92e3bbd3ee1bdbb6 cswpuppetmasterd 3ab0d4f9801075bc78b68b766b496fc7 cswusergroup 55ced6102fe6ad8b2ecb2b1384008167 puppet-0.25.1.tar.gz Modified: csw/mgar/pkg/puppet/trunk/files/cswpuppetd =================================================================== --- csw/mgar/pkg/puppet/trunk/files/cswpuppetd 2009-11-23 22:01:34 UTC (rev 7396) +++ csw/mgar/pkg/puppet/trunk/files/cswpuppetd 2009-11-23 22:29:49 UTC (rev 7397) @@ -16,7 +16,7 @@ prefix="/opt/csw" exec_prefix="/opt/csw" sysconfdir="/etc/csw/opt" -sbindir="/opt/csw/bin" +sbindir="/opt/csw/sbin" localstatedir="/var/opt/csw" Modified: csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd =================================================================== --- csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd 2009-11-23 22:01:34 UTC (rev 7396) +++ csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd 2009-11-23 22:29:49 UTC (rev 7397) @@ -17,7 +17,7 @@ printf "Starting Puppet server services:" - /opt/csw/bin/puppetmasterd + /opt/csw/sbin/puppetmasterd printf " puppetmaster" echo "" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From glawsf at users.sourceforge.net Mon Nov 23 23:31:19 2009 From: glawsf at users.sourceforge.net (glawsf at users.sourceforge.net) Date: Mon, 23 Nov 2009 22:31:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[7398] csw/mgar/pkg/puppet/trunk/checksums Message-ID: Revision: 7398 http://gar.svn.sourceforge.net/gar/?rev=7398&view=rev Author: glawsf Date: 2009-11-23 22:31:19 +0000 (Mon, 23 Nov 2009) Log Message: ----------- changed binary locations; updated checksums Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/checksums Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2009-11-23 22:29:49 UTC (rev 7397) +++ csw/mgar/pkg/puppet/trunk/checksums 2009-11-23 22:31:19 UTC (rev 7398) @@ -1,6 +1,6 @@ abaa404420106f9f28e9e1218b4e365b 0001-pkgutil-support.patch 9c27c0cdca051eae986b56b91ef889ca 0002-Using-the-single-option-of-pkgutil.patch -6135a983b7f020bea07178801f261693 cswpuppetd -51156a9016cbc41c92e3bbd3ee1bdbb6 cswpuppetmasterd +0ccf353707349bdc9c04297a8bef1f3d cswpuppetd +aba2c79e589b9bd1c881a22aa663a213 cswpuppetmasterd 3ab0d4f9801075bc78b68b766b496fc7 cswusergroup 55ced6102fe6ad8b2ecb2b1384008167 puppet-0.25.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Nov 23 23:54:13 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 23 Nov 2009 22:54:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[7399] csw/mgar/pkg/firefox/trunk Message-ID: Revision: 7399 http://gar.svn.sourceforge.net/gar/?rev=7399&view=rev Author: wbonnet Date: 2009-11-23 22:54:13 +0000 (Mon, 23 Nov 2009) Log Message: ----------- Upgrade to 3.0.15 Modified Paths: -------------- csw/mgar/pkg/firefox/trunk/Makefile csw/mgar/pkg/firefox/trunk/checksums csw/mgar/pkg/firefox/trunk/files/nsWildCard.cpp.diff Modified: csw/mgar/pkg/firefox/trunk/Makefile =================================================================== --- csw/mgar/pkg/firefox/trunk/Makefile 2009-11-23 22:31:19 UTC (rev 7398) +++ csw/mgar/pkg/firefox/trunk/Makefile 2009-11-23 22:54:13 UTC (rev 7399) @@ -1,5 +1,5 @@ GARNAME = firefox -GARVERSION = 3.0.14 +GARVERSION = 3.0.15 CATEGORIES = x11 DISTNAME = $(GARNAME) @@ -20,6 +20,8 @@ CATALOGNAME_CSWfirefox = $(GARNAME) SPKG_DESC_CSWfirefox = $(DESCRIPTION) +PREREQUISITE_PKGS = CSWgtk2devel CSWlibdbusdev CSWdbusglibdev CSWsqlite3devel CSWkbproto CSWrenderproto + REQUIRED_PKGS_CSWfirefox = CSWdbusglib REQUIRED_PKGS_CSWfirefox += CSWfconfig REQUIRED_PKGS_CSWfirefox += CSWftype2 @@ -84,9 +86,9 @@ WORK_INSTALL = $(WORKROOTDIR)/install-$(firstword $(MODULATIONS)) post-extract: - @mv $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/mozilla $(WORK_BUILD) - @cp $(FILEDIR)/stdbool.h $(WORK_BUILD)/memory/jemalloc - @$(MAKECOOKIE) + mv $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/mozilla $(WORK_BUILD) + cp $(FILEDIR)/stdbool.h $(WORK_BUILD)/memory/jemalloc + $(MAKECOOKIE) pre-configure-modulated: @cp $(FILEDIR)/.mozconfig $(WORK_BUILD)/.mozconfig @@ -95,8 +97,8 @@ @grep openwin $(WORKSRC)/config/autoconf.mk && gpatch -d$(WORKSRC) --forward -p1 -F2 < download/autoconf.mk.diff || true pre-install-modulated: - @grep "LD_LIBRARY_PATH=.LD_LIBRARY_PATH:/usr/lib/lwp" $(WORKSRC)/browser/app/firefox || gpatch -d$(WORKSRC) --forward -p1 -F2 < download/firefox.diff - @grep "LD_LIBRARY_PATH=.LD_LIBRARY_PATH:/usr/lib/lwp" $(WORKSRC)/dist/bin/firefox || gpatch -d$(WORKSRC) --forward -p1 -F2 < download/firefox.dist.bin.diff + @grep "LD_LIBRARY_PATH=.LD_LIBRARY_PATH:/usr/lib/lwp" $(WORKSRC)/browser/app/firefox || gpatch -d$(WORKSRC) --forward -p1 -F2 < $(FILEDIR)/firefox.diff + @grep "LD_LIBRARY_PATH=.LD_LIBRARY_PATH:/usr/lib/lwp" $(WORKSRC)/dist/bin/firefox || gpatch -d$(WORKSRC) --forward -p1 -F2 < $(FILEDIR)/firefox.dist.bin.diff ( if [ ! -d $(WORK_INSTALL)/opt/csw/bin ] ; then mkdir -p $(WORK_INSTALL)/opt/csw/bin ; fi ) ( cd $(WORK_INSTALL)/opt/csw/bin ; rm -f firefox ; ln -sf ../mozilla/firefox/bin/firefox . ) ( mkdir -p $(WORK_INSTALL)/opt/csw/share/pixmaps ) Modified: csw/mgar/pkg/firefox/trunk/checksums =================================================================== --- csw/mgar/pkg/firefox/trunk/checksums 2009-11-23 22:31:19 UTC (rev 7398) +++ csw/mgar/pkg/firefox/trunk/checksums 2009-11-23 22:54:13 UTC (rev 7399) @@ -1,23 +1,23 @@ -f9c7fb69080051172bd7357370731ba3 download/CSWfirefox.postinstall -6ede39c29b3672fb1fc1d8fe397a7863 download/CSWfirefox.postremove -9eaa0433fd8d1d7a3b39442b4b4c3e14 download/SunOS5.mk.diff -03e4d0e627dd508ea895c99c5e7ed184 download/autoconf.mk.diff -45bba282258a321e5e4f73a742bcc31b download/autoconf.mk.in.diff -c869762735a41bb30f417e510ccb7f31 download/configure.diff -a71a4afaabc4d067f30d8fb184fea520 download/file_id.cc.diff -5a075644b1f8d5dbb23525803b6c81dd download/firefox-3.0.14-source.tar.bz2 -125a5da522c7b0cc834ba6d97694d162 download/firefox.diff -162d4cf2d198196e94f6878d60dc7a26 download/firefox.dist.bin.diff -a19792f0b67f28c9227d19d069369369 download/jemalloc.c.diff -b2f4390ca62446743829cf7e23fcbc6c download/legacydb.config.mk.diff -8b401ae856d5be4b9761444b66acdcd8 download/legacydb.manifest.mm.diff -18b0cdc902caa4172b7f2d473239c9a9 download/md5.h.diff -1a3d61e09378d28d9bc9f3df45a224bc download/nsExceptionHandler.cpp.diff -ca4162516d8c09deaa9f0b6f3b3ecffb download/nsMathUtils.h.diff -d8f7ec0df9f63317ff2d8578d9dbe3ff download/nsNativeApSuportUnix.cpp.diff -f562a935a0fb2c5ad38f95af114d0a49 download/nsPluginsDirUnix.cpp.diff -28b8272f0d0f49cf650c5acb212c3d4b download/nsWildCard.cpp.diff -d0d942fa0c012abcb2a45b1d0fc99051 download/packager.mk.diff -25efd55ebf8715e66a28f2b07b25f38a download/softoken.config.mk.diff -187c192196a8c721ac7ae93466614c95 download/softoken.manifest.mm.diff -29e0ca858fe3aef24d5be1300dc39735 download/solaris_lwp.h.diff +18e15c50f07ee3252a5ecec68026bfa9 CSWfirefox.postinstall +e458069bc47dfab03251da4042e99614 CSWfirefox.postremove +9eaa0433fd8d1d7a3b39442b4b4c3e14 SunOS5.mk.diff +03e4d0e627dd508ea895c99c5e7ed184 autoconf.mk.diff +45bba282258a321e5e4f73a742bcc31b autoconf.mk.in.diff +c869762735a41bb30f417e510ccb7f31 configure.diff +a71a4afaabc4d067f30d8fb184fea520 file_id.cc.diff +e28e30d74c1488c8a8e2ff8cd2c37439 firefox-3.0.15-source.tar.bz2 +125a5da522c7b0cc834ba6d97694d162 firefox.diff +162d4cf2d198196e94f6878d60dc7a26 firefox.dist.bin.diff +a19792f0b67f28c9227d19d069369369 jemalloc.c.diff +b2f4390ca62446743829cf7e23fcbc6c legacydb.config.mk.diff +8b401ae856d5be4b9761444b66acdcd8 legacydb.manifest.mm.diff +18b0cdc902caa4172b7f2d473239c9a9 md5.h.diff +1a3d61e09378d28d9bc9f3df45a224bc nsExceptionHandler.cpp.diff +ca4162516d8c09deaa9f0b6f3b3ecffb nsMathUtils.h.diff +d8f7ec0df9f63317ff2d8578d9dbe3ff nsNativeApSuportUnix.cpp.diff +f562a935a0fb2c5ad38f95af114d0a49 nsPluginsDirUnix.cpp.diff +32a26e077d300d4f3ae135a778e43525 nsWildCard.cpp.diff +d0d942fa0c012abcb2a45b1d0fc99051 packager.mk.diff +25efd55ebf8715e66a28f2b07b25f38a softoken.config.mk.diff +187c192196a8c721ac7ae93466614c95 softoken.manifest.mm.diff +29e0ca858fe3aef24d5be1300dc39735 solaris_lwp.h.diff Modified: csw/mgar/pkg/firefox/trunk/files/nsWildCard.cpp.diff =================================================================== --- csw/mgar/pkg/firefox/trunk/files/nsWildCard.cpp.diff 2009-11-23 22:31:19 UTC (rev 7398) +++ csw/mgar/pkg/firefox/trunk/files/nsWildCard.cpp.diff 2009-11-23 22:54:13 UTC (rev 7399) @@ -1,6 +1,6 @@ --- firefox.orig/xpfe/components/filepicker/src/nsWildCard.cpp 2009-09-12 11:39:56.098357687 +0200 -+++ firefox/xpfe/components/filepicker/src]nsWildCard.cpp 2009-09-12 16:06:48.580505412 +0200 -@@ -57,38 +57,34 @@ ++++ firefox/xpfe/components/filepicker/src/nsWildCard.cpp 2009-09-12 16:06:48.580505412 +0200 +@@ -57,40 +57,35 @@ typedef int static_assert_character_code_arrangement['a' > 'A' ? 1 : -1]; @@ -40,20 +40,36 @@ /* ----------------------------- _valid_subexp ---------------------------- */ -template -+template static int - _valid_subexp(const T *expr, T stop1, T stop2) +-_valid_subexp(const T *expr, T stop1, T stop2) ++_valid_subexp(const PRUnichar *expr, PRUnichar stop1, PRUnichar stop2) { -@@ -162,7 +158,7 @@ + register int x; + int nsc = 0; /* Number of special characters */ +@@ -132,7 +127,7 @@ + return INVALID_SXP; + np = -1; + do { +- int t = ::_valid_subexp(&expr[++x], T(')'), T('|')); ++ int t = ::_valid_subexp(&expr[++x], PRUnichar(')'), PRUnichar('|')); + if(t == 0 || t == INVALID_SXP) + return INVALID_SXP; + x+=t; +@@ -162,11 +157,10 @@ } -template -+template int - NS_WildCardValid_(const T *expr) +-NS_WildCardValid_(const T *expr) ++NS_WildCardValid_(const PRUnichar *expr) { -@@ -183,9 +179,8 @@ +- int x = ::_valid_subexp(expr, T('\0'), T('\0')); ++ int x = ::_valid_subexp(expr, PRUnichar('\0'), PRUnichar('\0')); + return (x < 0 ? x : VALID_SXP); + } + +@@ -183,9 +177,8 @@ #define NOMATCH 1 #define ABORTED -1 @@ -64,7 +80,7 @@ /** * Count characters until we reach a NUL character or either of the -@@ -196,9 +191,8 @@ +@@ -196,9 +189,8 @@ * Return index in input string of first stop found, or ABORTED if not found. * If "dest" is non-NULL, copy counted characters to it and NUL terminate. */ @@ -75,7 +91,7 @@ { register int sx; /* source index */ register char cc; -@@ -219,7 +213,7 @@ +@@ -219,7 +211,7 @@ } if (dest && sx) { /* Copy all but the closing delimiter. */ @@ -84,7 +100,7 @@ dest[sx] = 0; } return cc ? sx : ABORTED; /* index of closing delimiter */ -@@ -233,36 +227,35 @@ +@@ -233,36 +225,35 @@ * matches the input string. Repeat this until some alternative matches, * or we have an abort. */ @@ -127,7 +143,7 @@ ret = ::_shexp_match(str, e2, case_insensitive, level + 1); if (ret != NOMATCH || !expr[sx] || expr[sx] == ')') break; -@@ -284,9 +277,8 @@ +@@ -284,9 +275,8 @@ return map[lower(val)]; } @@ -138,7 +154,7 @@ unsigned int level) { register int x; /* input string index */ -@@ -326,7 +318,7 @@ +@@ -326,7 +316,7 @@ else return NOMATCH; case '[': { @@ -147,7 +163,7 @@ int i; neg = ((expr[++y] == '^') && (expr[y+1] != ']')); if (neg) -@@ -342,9 +334,9 @@ +@@ -342,9 +332,9 @@ } if (alphanumeric(end) && expr[i] == ']') { /* This is a range form: a-b */ @@ -159,7 +175,7 @@ end = start; start = tmp; } -@@ -405,21 +397,20 @@ +@@ -405,22 +395,21 @@ } @@ -177,7 +193,9 @@ return _shexp_match(str, xp, case_insensitive, 0); - expr = (T *) NS_Alloc((nsCharTraits::length(xp) + 1) * sizeof(T)); +- memcpy(expr, xp, (nsCharTraits::length(xp) + 1) * sizeof(T)); + expr = (PRUnichar *) NS_Alloc((nsCharTraits::length(xp) + 1) * sizeof(PRUnichar)); ++ memcpy(expr, xp, (nsCharTraits::length(xp) + 1) * sizeof(PRUnichar)); if(!expr) return NOMATCH; @@ -186,7 +204,7 @@ if (x != ABORTED && expr[x] == '~') { expr[x++] = '\0'; ret = ::_shexp_match(str, &expr[x], case_insensitive, 0); -@@ -436,9 +427,8 @@ +@@ -437,9 +426,8 @@ return ret; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From glawsf at users.sourceforge.net Mon Nov 23 23:56:10 2009 From: glawsf at users.sourceforge.net (glawsf at users.sourceforge.net) Date: Mon, 23 Nov 2009 22:56:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7400] csw/mgar/pkg/puppet/trunk Message-ID: Revision: 7400 http://gar.svn.sourceforge.net/gar/?rev=7400&view=rev Author: glawsf Date: 2009-11-23 22:56:10 +0000 (Mon, 23 Nov 2009) Log Message: ----------- path fixes Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/checksums csw/mgar/pkg/puppet/trunk/files/cswpuppetd Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2009-11-23 22:54:13 UTC (rev 7399) +++ csw/mgar/pkg/puppet/trunk/checksums 2009-11-23 22:56:10 UTC (rev 7400) @@ -1,6 +1,6 @@ abaa404420106f9f28e9e1218b4e365b 0001-pkgutil-support.patch 9c27c0cdca051eae986b56b91ef889ca 0002-Using-the-single-option-of-pkgutil.patch -0ccf353707349bdc9c04297a8bef1f3d cswpuppetd +36f8b54ed17847de7cdea6c5992ec0c5 cswpuppetd aba2c79e589b9bd1c881a22aa663a213 cswpuppetmasterd 3ab0d4f9801075bc78b68b766b496fc7 cswusergroup 55ced6102fe6ad8b2ecb2b1384008167 puppet-0.25.1.tar.gz Modified: csw/mgar/pkg/puppet/trunk/files/cswpuppetd =================================================================== --- csw/mgar/pkg/puppet/trunk/files/cswpuppetd 2009-11-23 22:54:13 UTC (rev 7399) +++ csw/mgar/pkg/puppet/trunk/files/cswpuppetd 2009-11-23 22:56:10 UTC (rev 7400) @@ -10,6 +10,9 @@ # * Distinguishing between reload and restart # * Made the script zone-friendly # * Supported custom pid file locations. +# +# 2009-11-23 Gary Law +# * changed sbindir . /lib/svc/share/smf_include.sh This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From glawsf at users.sourceforge.net Tue Nov 24 00:01:32 2009 From: glawsf at users.sourceforge.net (glawsf at users.sourceforge.net) Date: Mon, 23 Nov 2009 23:01:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7401] csw/mgar/pkg/puppet/trunk/checksums Message-ID: Revision: 7401 http://gar.svn.sourceforge.net/gar/?rev=7401&view=rev Author: glawsf Date: 2009-11-23 23:01:32 +0000 (Mon, 23 Nov 2009) Log Message: ----------- path fixes Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/checksums Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2009-11-23 22:56:10 UTC (rev 7400) +++ csw/mgar/pkg/puppet/trunk/checksums 2009-11-23 23:01:32 UTC (rev 7401) @@ -1,6 +1,6 @@ abaa404420106f9f28e9e1218b4e365b 0001-pkgutil-support.patch 9c27c0cdca051eae986b56b91ef889ca 0002-Using-the-single-option-of-pkgutil.patch -36f8b54ed17847de7cdea6c5992ec0c5 cswpuppetd +f4a95dece2231805abf4754d72471de4 cswpuppetd aba2c79e589b9bd1c881a22aa663a213 cswpuppetmasterd 3ab0d4f9801075bc78b68b766b496fc7 cswusergroup 55ced6102fe6ad8b2ecb2b1384008167 puppet-0.25.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 Tue Nov 24 09:54:15 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 24 Nov 2009 08:54:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[7402] csw/mgar/pkg/nss/branches/upstream-work Message-ID: Revision: 7402 http://gar.svn.sourceforge.net/gar/?rev=7402&view=rev Author: wahwah Date: 2009-11-24 08:54:15 +0000 (Tue, 24 Nov 2009) Log Message: ----------- nss: Switched to OPT build, added nss.pc Modified Paths: -------------- csw/mgar/pkg/nss/branches/upstream-work/Makefile csw/mgar/pkg/nss/branches/upstream-work/checksums Added Paths: ----------- csw/mgar/pkg/nss/branches/upstream-work/files/nss.pc Modified: csw/mgar/pkg/nss/branches/upstream-work/Makefile =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/Makefile 2009-11-23 23:01:32 UTC (rev 7401) +++ csw/mgar/pkg/nss/branches/upstream-work/Makefile 2009-11-24 08:54:15 UTC (rev 7402) @@ -1,19 +1,24 @@ # Copyright 2009 OpenCSW # Distributed under the terms of the GNU General Public License v2 # $Id$ - - +# # Based on the following resources: # - http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/nss-3.12.4-r1.ebuild?view=markup # - https://developer.mozilla.org/en/NSS_reference/Building_and_installing_NSS/Build_instructions # - https://developer.mozilla.org/en/NSS_reference/NSS_environment_variables # - https://developer.mozilla.org/en/NSS_reference/Building_and_installing_NSS/Installation_guide +# +# A discussion: +# - https://groups.google.com/group/mozilla.dev.tech.crypto/browse_thread/thread/709646e32fc4fad0# +# +# TODO: nss-config +# TODO: a better nss.pc -# Debugging mode, this is work in progress. -GARFLAVOR = DBG - GARNAME = nss -GARVERSION = 3.12.4 +MAJOR_VERSION = 3 +MINOR_VERSION = 12 +PATCHLEVEL = 4 +GARVERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(PATCHLEVEL) CATEGORIES = lib DESCRIPTION = Network Security Services library, implements PKI support define BLURB @@ -23,8 +28,8 @@ RTM_NAME = NSS_3_12_4_RTM MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/ DIST_SUFFIX = -with-nspr-4.8 -DISTFILES = $(GARNAME)-$(GARVERSION)$(DIST_SUFFIX).tar.gz -DISTNAME = $(GARNAME)-$(GARVERSION)$(DIST_SUFFIX) +DISTFILES = $(GARNAME)-$(GARVERSION)$(DIST_SUFFIX).tar.gz +DISTNAME = $(GARNAME)-$(GARVERSION)$(DIST_SUFFIX) UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)$(DIST_SUFFIX).tar.gz REQUIRED_PKGS = CSWnspr CSWsqlite3 PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWsqlite3devel @@ -34,29 +39,46 @@ TEST_SCRIPTS = BUILD64 = 1 +libdir_install = $(prefix)/lib/nss +# libdir = $(prefix)/lib/nss +includedir = $(prefix)/include/nss + ifeq (OPT,$(GARFLAVOR)) BUILD_OPT = 1 + export BUILD_OPT endif # NSPR is installed in /opt/csw/lib/nspr, nspr.pc is in /opt/csw/lib/pkgconfig NSPR_INCLUDE_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --cflags-only-I nspr | gsed 's/-I//') export NSPR_INCLUDE_DIR -NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ') -export NSPR_LIB_DIR +# To consider in the future. +# NSS_ENABLE_ECC = 1 +# export NSS_ENABLE_ECC + # 64-bit suppport ifeq ($(MODULATION),isa-sparcv9) USE_64 = 1 + NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ')/64 export USE_64 -endif +else ifeq ($(MODULATION),isa-amd64) USE_64 = 1 + NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ')/64 export USE_64 +else + NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ') endif +endif +export NSPR_LIB_DIR +# For DBG builds +PATCHFILES = whoami.patch + include gar/category.mk build-nss: build-coreconf build-dbm build-nss-compile + @$(MAKECOOKIE) build-coreconf: (cd $(WORKSRC)/mozilla/security/coreconf \ @@ -81,3 +103,50 @@ && \ gmake -j1 CC="$(CC)") @$(MAKECOOKIE) + +install-nss: + ginstall -d -m 755 $(DESTDIR)$(libdir) + for f in $(WORKSRC)/mozilla/dist/SunOS5*/lib/*.so; do \ + ginstall -m 755 $${f} $(DESTDIR)$(libdir); \ + done + ginstall -d -m 755 $(DESTDIR)$(bindir) + # TODO: nss-config + # gcp -a $(WORKSRC)/mozilla/dist/*/bin/nss-config $(DESTDIR)$(bindir) + ginstall -d -m 755 $(DESTDIR)$(includedir) + for f in \ + $(WORKSRC)/mozilla/dist/private/nss/*.h \ + $(WORKSRC)/mozilla/dist/public/nss/*.h; \ + do \ + ginstall -m 644 $${f} $(DESTDIR)$(includedir); \ + done + cd $(DESTDIR)$(libdir) && for file in *.so; do \ + if [ ! -h $${file} ]; then \ + gmv -v $${file} $${file}.$(MINOR_VERSION); \ + gln -s $${file}.$(MINOR_VERSION) $${file}; \ + fi; \ + done + for file in $(WORKSRC)/mozilla/dist/*/bin/* ; do \ + ginstall -m 755 $${file} $(DESTDIR)$(bindir)/nss`basename $${file}`; \ + done + # Asserting that we have the right version in the .pc file + ggrep "Version: $(GARVERSION)" $(FILEDIR)/nss.pc \ + || ( \ + echo "Please adjust nss version in $(FILEDIR)/nss.pc" \ + && \ + false \ + ) + ginstall -d -m 755 $(DESTDIR)$(prefix)/lib/pkgconfig + ginstall -m 644 \ + $(FILEDIR)/nss.pc \ + $(DESTDIR)$(prefix)/lib/pkgconfig + @$(MAKECOOKIE) + +# Create symlinks allowing to use -L/opt/csw/lib/nss/64 for 64-bit +# architectures. +post-merge: + if [ "$(GARCH)" = sparc ]; then \ + gln -sf sparcv9 $(PKGROOT)$(libdir)/64; \ + elif [ "$(GARCH)" = i386 ]; then \ + gln -sf amd64 $(PKGROOT)$(libdir)/64; \ + fi + @$(MAKECOOKIE) Modified: csw/mgar/pkg/nss/branches/upstream-work/checksums =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/checksums 2009-11-23 23:01:32 UTC (rev 7401) +++ csw/mgar/pkg/nss/branches/upstream-work/checksums 2009-11-24 08:54:15 UTC (rev 7402) @@ -1,7 +1,2 @@ 8f76e381bf2339d731bfd5b8116c25a4 nss-3.12.4-with-nspr-4.8.tar.gz -39b9d2431d4ff717d103b742fcaefb81 nss-3.12.4.patch -f0f40bd021423ab1680b4d87cd19c1db platlibs-sqlite3.patch -441f12a9396a89841d384d8c89a052ff platlibs-sunos.patch -d41d8cd98f00b204e9800998ecf8427e runtime-search-path.patch -90b4d32437b3e3fdadcf4f16339aa2ed shared-libs.patch 221646aa1954b4a255ac03e7d8b0225d whoami.patch Added: csw/mgar/pkg/nss/branches/upstream-work/files/nss.pc =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/files/nss.pc (rev 0) +++ csw/mgar/pkg/nss/branches/upstream-work/files/nss.pc 2009-11-24 08:54:15 UTC (rev 7402) @@ -0,0 +1,11 @@ +prefix=/opt/csw +exec_prefix=${prefix} +libdir=${prefix}/lib/nss +includedir=${prefix}/include/nss + +Name: NSS +Description: Network Security Services +Version: 3.12.4 +Requires: nspr >= 4.8.0 +Libs: -L${libdir} -lssl3 -lsmime3 -lnssutil3 -lnss3 -R${libdir} +Cflags: -I${includedir} 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 Nov 24 10:18:36 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 24 Nov 2009 09:18:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[7403] csw/mgar/pkg/nss/branches/upstream-work/files/whoami .patch Message-ID: Revision: 7403 http://gar.svn.sourceforge.net/gar/?rev=7403&view=rev Author: wahwah Date: 2009-11-24 09:18:35 +0000 (Tue, 24 Nov 2009) Log Message: ----------- nss: Adding back the whoami patch Added Paths: ----------- csw/mgar/pkg/nss/branches/upstream-work/files/whoami.patch Added: csw/mgar/pkg/nss/branches/upstream-work/files/whoami.patch =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/files/whoami.patch (rev 0) +++ csw/mgar/pkg/nss/branches/upstream-work/files/whoami.patch 2009-11-24 09:18:35 UTC (rev 7403) @@ -0,0 +1,11 @@ +--- nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/UNIX.mk.orig 2009-11-22 02:25:17.411354784 +0100 ++++ nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/UNIX.mk 2009-11-22 02:25:24.833876220 +0100 +@@ -46,7 +46,7 @@ + DEFINES += -UDEBUG -DNDEBUG + else + OPTIMIZER += -g +- USERNAME := $(shell whoami) ++ USERNAME := $(shell gwhoami) + USERNAME := $(subst -,_,$(USERNAME)) + DEFINES += -DDEBUG -UNDEBUG -DDEBUG_$(USERNAME) + endif 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 Nov 24 13:32:56 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 24 Nov 2009 12:32:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[7404] csw/mgar/pkg Message-ID: Revision: 7404 http://gar.svn.sourceforge.net/gar/?rev=7404&view=rev Author: wahwah Date: 2009-11-24 12:32:55 +0000 (Tue, 24 Nov 2009) Log Message: ----------- chromium: template copied Modified Paths: -------------- csw/mgar/pkg/chromium/trunk/Makefile csw/mgar/pkg/chromium/trunk/checksums Added Paths: ----------- csw/mgar/pkg/chromium/ Modified: csw/mgar/pkg/chromium/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-11-18 23:52:45 UTC (rev 7349) +++ csw/mgar/pkg/chromium/trunk/Makefile 2009-11-24 12:32:55 UTC (rev 7404) @@ -11,8 +11,9 @@ ## For more information about GAR variables, please see: ## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference ## -GARNAME = mypkg -GARVERSION = 1.0 +GARNAME = chromium +CHROMIUM_REVISION = 32797 +GARVERSION = 0.$(CHROMIUM_REVISION) ## ## The category that your software fits in. This is not a descriptive field, but ## influences the build process. Depending on the CATEGORIES setting, different @@ -25,12 +26,11 @@ CATEGORIES = lib ## ## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = +DESCRIPTION = An open-source web browser ## ## 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 @@ -39,7 +39,7 @@ ## ## Whitespace-separated list of URLs to download the source package from. ## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = +MASTER_SITES = http://build.chromium.org/buildbot/archives/ ## ## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the ## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge @@ -54,7 +54,7 @@ ## Whitespace-separated list of files which comprise this build. mGAR will look ## for the files in the $(FILEDIR) (trunk/files) directory and on the ## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = chromium.r$(CHROMIUM_REVISION).tgz ## ## We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -123,10 +123,10 @@ ## ETCSERVICES = ## INETDCONF = ## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = +REQUIRED_PKGS = CSWnspr CSWnss ## ## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWlibxcbdevel ## ## When using non-empty $(PACKAGES): ## REQUIRED_PKGS_CSWpkgname = @@ -145,10 +145,10 @@ ## 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 = +CONFIGURE_SCRIPTS = chromium +BUILD_SCRIPTS = chromium +INSTALL_SCRIPTS = chromium +TEST_SCRIPTS = chromium ## ## Compilation settings ## @@ -160,7 +160,7 @@ ## BUILD_ARGS = ## ## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) +## CONFIGURE_ARGS = $(DIRPATHS) ## ## BUILD64 = ## CONFIGURE_ENV = @@ -176,10 +176,19 @@ ## 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 -#include gar/category.mk +configure-chromium: depot-tools + false + @$(MAKECOOKIE) + +depot-tools: + (cd $(WORKDIR) \ + && \ + if [ -d depot_tools ]; then \ + (cd depot_tools; svn up); \ + else \ + svn co http://src.chromium.org/svn/trunk/tools/depot_tools; \ + fi \ + ) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/chromium/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-11-18 23:52:45 UTC (rev 7349) +++ csw/mgar/pkg/chromium/trunk/checksums 2009-11-24 12:32:55 UTC (rev 7404) @@ -0,0 +1 @@ +7c09ec3c1f8bc15184b6e9ee83e26925 chromium.r32797.tgz 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 Nov 24 16:27:07 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 24 Nov 2009 15:27:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7405] csw/mgar/pkg/chromium/trunk/Makefile Message-ID: Revision: 7405 http://gar.svn.sourceforge.net/gar/?rev=7405&view=rev Author: wahwah Date: 2009-11-24 15:27:07 +0000 (Tue, 24 Nov 2009) Log Message: ----------- chromium: got past the gclient runhooks stage. Stuck at ffmpeg. Modified Paths: -------------- csw/mgar/pkg/chromium/trunk/Makefile Modified: csw/mgar/pkg/chromium/trunk/Makefile =================================================================== --- csw/mgar/pkg/chromium/trunk/Makefile 2009-11-24 12:32:55 UTC (rev 7404) +++ csw/mgar/pkg/chromium/trunk/Makefile 2009-11-24 15:27:07 UTC (rev 7405) @@ -176,12 +176,49 @@ ## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. ## GARCOMPILER = SOS11 ## + +GYP_GENERATORS = make +export GYP_GENERATORS + +WORKSRC = $(WORKDIR)/home/chrome-svn/tarball/chromium +CHROMIUM_ROOT = $(WORKSRC) + +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +GARCOMPILER = GNU + include gar/category.mk -configure-chromium: depot-tools - false +$(WORKSRC)/.gclient: + (cd $(WORKSRC) && \ + PATH=$$PATH:$(abspath $(WORKDIR)/depot_tools) \ + GYP_GENERATORS=make \ + gclient config http://src.chromium.org/svn/trunk/src) + +# Skipping gclient sync for now; running only gclient runhooks. The build +# instructions say that we'll miss on some platform-specific depends, but +# I don't think there's anything platform-specific for Solaris in the source +# code repository. + +configure-chromium: depot-tools gclient-runhooks @$(MAKECOOKIE) +gclient-sync: $(WORKSRC)/.gclient + (cd $(WORKSRC) \ + && \ + PATH=$$PATH:$(abspath $(WORKDIR)/depot_tools):/opt/csw/gcc4/bin \ + GYP_GENERATORS=make \ + gclient sync) + @$(MAKECOOKIE) + +gclient-runhooks: $(WORKSRC)/.gclient + (cd $(WORKSRC) \ + && \ + PATH=$$PATH:$(abspath $(WORKDIR)/depot_tools):/opt/csw/gcc4/bin \ + GYP_GENERATORS=make \ + gclient runhooks --force) + @$(MAKECOOKIE) + depot-tools: (cd $(WORKDIR) \ && \ @@ -192,3 +229,9 @@ fi \ ) @$(MAKECOOKIE) + +build-chromium: + (cd $(CHROMIUM_ROOT)/src \ + && \ + PATH=$$PATH:$(abspath $(WORKDIR)/depot_tools):/opt/csw/gcc4/bin \ + gmake chrome) 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 Nov 24 17:17:03 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 24 Nov 2009 16:17:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[7406] csw/mgar/pkg/nspr/trunk/Makefile Message-ID: Revision: 7406 http://gar.svn.sourceforge.net/gar/?rev=7406&view=rev Author: wahwah Date: 2009-11-24 16:17:03 +0000 (Tue, 24 Nov 2009) Log Message: ----------- nspr: -devel package ARCHALL = 1, better 64 --> sparcv9 linking Modified Paths: -------------- csw/mgar/pkg/nspr/trunk/Makefile Modified: csw/mgar/pkg/nspr/trunk/Makefile =================================================================== --- csw/mgar/pkg/nspr/trunk/Makefile 2009-11-24 15:27:07 UTC (rev 7405) +++ csw/mgar/pkg/nspr/trunk/Makefile 2009-11-24 16:17:03 UTC (rev 7406) @@ -19,6 +19,8 @@ PKGFILES_CSWnspr-devel += .*/nspr\.pc PKGFILES_CSWnspr-devel += .*compile-et\.pl +ARCHALL_CSWnspr-devel = 1 + SPKG_DESC_CSWnspr = Netscape Portable Runtime SPKG_DESC_CSWnspr-devel = Netscape Portable Runtime development files CATALOGNAME_CSWnspr-devel = nspr_devel @@ -95,10 +97,6 @@ # Create symlinks allowing to use -L/opt/csw/lib/nspr/64 for 64-bit # architectures. -post-merge: - if [ "$(GARCH)" = sparc ]; then \ - gln -sf sparcv9 $(PKGROOT)$(libdir)/64; \ - elif [ "$(GARCH)" = i386 ]; then \ - gln -sf amd64 $(PKGROOT)$(libdir)/64; \ - fi +post-merge-modulated: + gln -s "$(ISA_DEFAULT_64)" "$(PKGROOT)$(libdir)/64" @$(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 Nov 24 17:29:41 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 24 Nov 2009 16:29:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[7407] csw/mgar/pkg/nspr/trunk/Makefile Message-ID: Revision: 7407 http://gar.svn.sourceforge.net/gar/?rev=7407&view=rev Author: wahwah Date: 2009-11-24 16:29:40 +0000 (Tue, 24 Nov 2009) Log Message: ----------- nspr: Revert to the dumb but working way of symlinking 64 --> sparcv9 Modified Paths: -------------- csw/mgar/pkg/nspr/trunk/Makefile Modified: csw/mgar/pkg/nspr/trunk/Makefile =================================================================== --- csw/mgar/pkg/nspr/trunk/Makefile 2009-11-24 16:17:03 UTC (rev 7406) +++ csw/mgar/pkg/nspr/trunk/Makefile 2009-11-24 16:29:40 UTC (rev 7407) @@ -97,6 +97,10 @@ # Create symlinks allowing to use -L/opt/csw/lib/nspr/64 for 64-bit # architectures. -post-merge-modulated: - gln -s "$(ISA_DEFAULT_64)" "$(PKGROOT)$(libdir)/64" +post-merge: + if [ "$(GARCH)" = sparc ]; then \ + gln -sf sparc9 $(PKGROOT)$(libdir)/64; \ + elif [ "$(GARCH)" = i386 ]; then \ + gln -sf amd64 $(PKGROOT)$(libdir)/64; \ + fi @$(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 Nov 24 20:18:52 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 24 Nov 2009 19:18:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[7408] csw/mgar/pkg Message-ID: Revision: 7408 http://gar.svn.sourceforge.net/gar/?rev=7408&view=rev Author: wahwah Date: 2009-11-24 19:18:52 +0000 (Tue, 24 Nov 2009) Log Message: ----------- gccgo: first commit, copying the template and checkout out gccgo svn repository Modified Paths: -------------- csw/mgar/pkg/gccgo/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/gccgo/ Modified: csw/mgar/pkg/gccgo/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-11-24 16:29:40 UTC (rev 7407) +++ csw/mgar/pkg/gccgo/trunk/Makefile 2009-11-24 19:18:52 UTC (rev 7408) @@ -11,8 +11,9 @@ ## For more information about GAR variables, please see: ## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference ## -GARNAME = mypkg -GARVERSION = 1.0 +GARNAME = gccgo +GARVERSION = 0.0.1 +# svn checkout svn://gcc.gnu.org/svn/gcc/branches/gccgo gccgo ## ## The category that your software fits in. This is not a descriptive field, but ## influences the build process. Depending on the CATEGORIES setting, different @@ -25,17 +26,16 @@ CATEGORIES = lib ## ## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = +DESCRIPTION = Go language compiler using gcc backend ## ## 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 = +SPKG_SOURCEURL = http://golang.org/doc/gccgo_install.html ## ## Whitespace-separated list of URLs to download the source package from. ## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). @@ -54,9 +54,8 @@ ## Whitespace-separated list of files which comprise this build. mGAR will look ## for the files in the $(FILEDIR) (trunk/files) directory and on the ## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz ## -## We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz ## ## Catalog name is the name to be used with pkg{-get,util} -i . @@ -145,10 +144,10 @@ ## 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 = +CONFIGURE_SCRIPTS = gccgo +BUILD_SCRIPTS = gccgo +INSTALL_SCRIPTS = gccgo +TEST_SCRIPTS = gccgo ## ## Compilation settings ## @@ -176,10 +175,7 @@ ## 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 -#include gar/category.mk +post-extract-modulated: + (cd $(WORKDIR) && svn checkout svn://gcc.gnu.org/svn/gcc/branches/gccgo gccgo) 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 Nov 24 20:36:10 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 24 Nov 2009 19:36:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7409] csw/mgar/pkg/gccgo/trunk/Makefile Message-ID: Revision: 7409 http://gar.svn.sourceforge.net/gar/?rev=7409&view=rev Author: wahwah Date: 2009-11-24 19:36:10 +0000 (Tue, 24 Nov 2009) Log Message: ----------- gccgo: stubs written, build fails on 'gcc: gengtype-lex.c: No such file or directory' Modified Paths: -------------- csw/mgar/pkg/gccgo/trunk/Makefile Modified: csw/mgar/pkg/gccgo/trunk/Makefile =================================================================== --- csw/mgar/pkg/gccgo/trunk/Makefile 2009-11-24 19:18:52 UTC (rev 7408) +++ csw/mgar/pkg/gccgo/trunk/Makefile 2009-11-24 19:36:10 UTC (rev 7409) @@ -145,8 +145,8 @@ ## this variable an empty value. The procedure works for configure, build, ## install and test steps. CONFIGURE_SCRIPTS = gccgo -BUILD_SCRIPTS = gccgo -INSTALL_SCRIPTS = gccgo +## BUILD_SCRIPTS = gccgo # using the default target +## INSTALL_SCRIPTS = gccgo # using the default target TEST_SCRIPTS = gccgo ## ## Compilation settings @@ -159,7 +159,8 @@ ## BUILD_ARGS = ## ## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-languages=c,c++,go ## ## BUILD64 = ## CONFIGURE_ENV = @@ -173,9 +174,29 @@ ## OPT_FLAGS_GCC = -O2 -pipe ## ## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## + +# Compiling gcc with gcc +GARCOMPILER = GNU + +WORKSRC = $(WORKDIR)/objdir + include gar/category.mk post-extract-modulated: - (cd $(WORKDIR) && svn checkout svn://gcc.gnu.org/svn/gcc/branches/gccgo gccgo) + (cd $(WORKDIR) && \ + if [ -d gccgo ]; then \ + (cd gccgo && svn up); \ + else \ + svn checkout svn://gcc.gnu.org/svn/gcc/branches/gccgo gccgo; \ + fi) + mkdir -p $(WORKSRC) + @$(MAKECOOKIE) + +configure-gccgo: + (cd $(WORKSRC) && $(CONFIGURE_ENV) ../gccgo/configure $(CONFIGURE_ARGS)) + @$(MAKECOOKIE) + +test-gccgo: + echo "Tests?" + false + @$(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 Nov 24 20:46:00 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 24 Nov 2009 19:46:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7410] csw/mgar/pkg/gccgo/trunk/Makefile Message-ID: Revision: 7410 http://gar.svn.sourceforge.net/gar/?rev=7410&view=rev Author: wahwah Date: 2009-11-24 19:46:00 +0000 (Tue, 24 Nov 2009) Log Message: ----------- gccgo: Added flex and bison as build dependencies Modified Paths: -------------- csw/mgar/pkg/gccgo/trunk/Makefile Modified: csw/mgar/pkg/gccgo/trunk/Makefile =================================================================== --- csw/mgar/pkg/gccgo/trunk/Makefile 2009-11-24 19:36:10 UTC (rev 7409) +++ csw/mgar/pkg/gccgo/trunk/Makefile 2009-11-24 19:46:00 UTC (rev 7410) @@ -122,10 +122,10 @@ ## ETCSERVICES = ## INETDCONF = ## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = +REQUIRED_PKGS = ## ## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWgcc CSWbison CSWflex ## ## When using non-empty $(PACKAGES): ## REQUIRED_PKGS_CSWpkgname = 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 Nov 24 21:53:20 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 24 Nov 2009 20:53:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[7411] csw/mgar/pkg/memcached/trunk/Makefile Message-ID: Revision: 7411 http://gar.svn.sourceforge.net/gar/?rev=7411&view=rev Author: dmichelsen Date: 2009-11-24 20:53:20 +0000 (Tue, 24 Nov 2009) Log Message: ----------- memcached: Start packaging on Solaris 9 Modified Paths: -------------- csw/mgar/pkg/memcached/trunk/Makefile Modified: csw/mgar/pkg/memcached/trunk/Makefile =================================================================== --- csw/mgar/pkg/memcached/trunk/Makefile 2009-11-24 19:46:00 UTC (rev 7410) +++ csw/mgar/pkg/memcached/trunk/Makefile 2009-11-24 20:53:20 UTC (rev 7411) @@ -20,10 +20,13 @@ PREREQUISITE_PKGS = CSWlibevent-devel REQUIRED_PKGS = CSWlibevent +# Solaris 8 Sparc does work, but Solaris 8 x86 has many failed tests due to +# errors in Solaris 8 itself. For consistency we build from Solaris 9 on for +# both ISAs. +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 + BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) -SKIPTEST = 1 - 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 Tue Nov 24 22:03:46 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 24 Nov 2009 21:03:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7412] csw/mgar/pkg/libntlm/trunk Message-ID: Revision: 7412 http://gar.svn.sourceforge.net/gar/?rev=7412&view=rev Author: dmichelsen Date: 2009-11-24 21:03:46 +0000 (Tue, 24 Nov 2009) Log Message: ----------- libntlm: Update to 1.2 Modified Paths: -------------- csw/mgar/pkg/libntlm/trunk/Makefile csw/mgar/pkg/libntlm/trunk/checksums Modified: csw/mgar/pkg/libntlm/trunk/Makefile =================================================================== --- csw/mgar/pkg/libntlm/trunk/Makefile 2009-11-24 20:53:20 UTC (rev 7411) +++ csw/mgar/pkg/libntlm/trunk/Makefile 2009-11-24 21:03:46 UTC (rev 7412) @@ -1,5 +1,5 @@ GARNAME = libntlm -GARVERSION = 20090924 +GARVERSION = 1.2 CATEGORIES = lib DESCRIPTION = Microsoft WinNT domain authentication library @@ -12,12 +12,13 @@ endef MASTER_SITES = http://josefsson.org/libntlm/releases/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -WORKSRC = $(WORKDIR)/libntlm-1.2 +DISTFILES = $(DISTNAME).tar.gz # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +SPKG_SOURCEURL = http://josefsson.org/libntlm/ + # We don't need it and if defined the test breaks LD_OPTIONS = @@ -26,6 +27,4 @@ TEST_TARGET = check -SPKG_SOURCEURL = http://josefsson.org/libntlm/ - include gar/category.mk Modified: csw/mgar/pkg/libntlm/trunk/checksums =================================================================== --- csw/mgar/pkg/libntlm/trunk/checksums 2009-11-24 20:53:20 UTC (rev 7411) +++ csw/mgar/pkg/libntlm/trunk/checksums 2009-11-24 21:03:46 UTC (rev 7412) @@ -1 +1 @@ -5fa3bc33be1be487de1b0f23db469d3f download/libntlm-20090924.tar.gz +13b40af721b29005652fb429a3ae9582 libntlm-1.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Nov 24 22:14:52 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 24 Nov 2009 21:14:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[7413] csw/mgar/pkg/memcached/trunk/Makefile Message-ID: Revision: 7413 http://gar.svn.sourceforge.net/gar/?rev=7413&view=rev Author: dmichelsen Date: 2009-11-24 21:14:52 +0000 (Tue, 24 Nov 2009) Log Message: ----------- memcached: Disable tests for now Modified Paths: -------------- csw/mgar/pkg/memcached/trunk/Makefile Modified: csw/mgar/pkg/memcached/trunk/Makefile =================================================================== --- csw/mgar/pkg/memcached/trunk/Makefile 2009-11-24 21:03:46 UTC (rev 7412) +++ csw/mgar/pkg/memcached/trunk/Makefile 2009-11-24 21:14:52 UTC (rev 7413) @@ -28,5 +28,7 @@ BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) +SKIPTEST ?= 1 + 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 Tue Nov 24 22:22:45 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 24 Nov 2009 21:22:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[7414] csw/mgar/pkg/liboggz/trunk Message-ID: Revision: 7414 http://gar.svn.sourceforge.net/gar/?rev=7414&view=rev Author: dmichelsen Date: 2009-11-24 21:22:44 +0000 (Tue, 24 Nov 2009) Log Message: ----------- liboggz: Add getopt.h patch Modified Paths: -------------- csw/mgar/pkg/liboggz/trunk/Makefile csw/mgar/pkg/liboggz/trunk/checksums csw/mgar/pkg/liboggz/trunk/files/0001-Remove-linker-version.patch Added Paths: ----------- csw/mgar/pkg/liboggz/trunk/files/0002-Add-getopt.h.patch Modified: csw/mgar/pkg/liboggz/trunk/Makefile =================================================================== --- csw/mgar/pkg/liboggz/trunk/Makefile 2009-11-24 21:14:52 UTC (rev 7413) +++ csw/mgar/pkg/liboggz/trunk/Makefile 2009-11-24 21:22:44 UTC (rev 7414) @@ -16,6 +16,7 @@ MASTER_SITES = http://downloads.xiph.org/releases/liboggz/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = 0001-Remove-linker-version.patch +PATCHFILES += 0002-Add-getopt.h.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/liboggz/trunk/checksums =================================================================== --- csw/mgar/pkg/liboggz/trunk/checksums 2009-11-24 21:14:52 UTC (rev 7413) +++ csw/mgar/pkg/liboggz/trunk/checksums 2009-11-24 21:22:44 UTC (rev 7414) @@ -1,2 +1,3 @@ -f4ec200018ed77f1cb44fee2c4687d49 0001-Remove-linker-version.patch +2bcd76f053e973f82df1593400ca94fb 0001-Remove-linker-version.patch +008aac5337ca7e23490927baa4a38589 0002-Add-getopt.h.patch f97f1d57820a9fc1d080409cf203b38a liboggz-1.1.0.tar.gz Modified: csw/mgar/pkg/liboggz/trunk/files/0001-Remove-linker-version.patch =================================================================== --- csw/mgar/pkg/liboggz/trunk/files/0001-Remove-linker-version.patch 2009-11-24 21:14:52 UTC (rev 7413) +++ csw/mgar/pkg/liboggz/trunk/files/0001-Remove-linker-version.patch 2009-11-24 21:22:44 UTC (rev 7414) @@ -27,29 +27,6 @@ # Checks for library functions. -diff --git a/configure.ac b/configure.ac -index bc9acb8..1098ca1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -396,18 +396,6 @@ if test "x${ac_enable_gcc_werror}" = xyes ; then - CFLAGS="-Werror $CFLAGS" - fi - --dnl --dnl Shared library symbol versioning and hiding --dnl -- --case "$target_os" in -- linux* | solaris*|k*bsd*-gnu*|gnu-*) -- SHLIB_VERSION_ARG="-Wl,--version-script=Version_script" -- ;; -- *) -- ;; --esac -- - # Checks for library functions. - - dnl -- 1.6.3.2 Added: csw/mgar/pkg/liboggz/trunk/files/0002-Add-getopt.h.patch =================================================================== --- csw/mgar/pkg/liboggz/trunk/files/0002-Add-getopt.h.patch (rev 0) +++ csw/mgar/pkg/liboggz/trunk/files/0002-Add-getopt.h.patch 2009-11-24 21:22:44 UTC (rev 7414) @@ -0,0 +1,38 @@ +From e404bd5d314bbd97a2d4579607679667bc4d099f Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 24 Nov 2009 22:12:30 +0100 +Subject: [PATCH] Add getopt.h + +--- + include/getopt.h | 19 +++++++++++++++++++ + 1 files changed, 19 insertions(+), 0 deletions(-) + create mode 100644 include/getopt.h + +diff --git a/include/getopt.h b/include/getopt.h +new file mode 100644 +index 0000000..0e98fed +--- /dev/null ++++ b/include/getopt.h +@@ -0,0 +1,19 @@ ++/** ++ * @file getopt.h ++ * @ingroup wbxml2xml_tool ++ * @ingroup xml2wbxml_tool ++ * ++ * @author Kannel Team (http://www.kannel.org/) ++ * ++ * @brief getopt() implementation ++ */ ++ ++#ifndef WBXML_GETOPT_H ++#define WBXML_GETOPT_H ++ ++extern int opterr; ++extern int optind; ++extern int optopt; ++extern char *optarg; ++ ++#endif +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Nov 24 22:31:39 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 24 Nov 2009 21:31:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[7415] csw/mgar/pkg/cpan/Archive-Tar/trunk Message-ID: Revision: 7415 http://gar.svn.sourceforge.net/gar/?rev=7415&view=rev Author: dmichelsen Date: 2009-11-24 21:31:38 +0000 (Tue, 24 Nov 2009) Log Message: ----------- cpan/Archive-Tar: Update to 1.54 Modified Paths: -------------- csw/mgar/pkg/cpan/Archive-Tar/trunk/Makefile csw/mgar/pkg/cpan/Archive-Tar/trunk/checksums Modified: csw/mgar/pkg/cpan/Archive-Tar/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Archive-Tar/trunk/Makefile 2009-11-24 21:22:44 UTC (rev 7414) +++ csw/mgar/pkg/cpan/Archive-Tar/trunk/Makefile 2009-11-24 21:31:38 UTC (rev 7415) @@ -1,7 +1,7 @@ GARNAME = Archive-Tar -GARVERSION = 1.52 +GARVERSION = 1.54 CATEGORIES = cpan -AUTHOR = KANE +AUTHOR = BINGOS DESCRIPTION = Module for manipulations of tar archives define BLURB Modified: csw/mgar/pkg/cpan/Archive-Tar/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Archive-Tar/trunk/checksums 2009-11-24 21:22:44 UTC (rev 7414) +++ csw/mgar/pkg/cpan/Archive-Tar/trunk/checksums 2009-11-24 21:31:38 UTC (rev 7415) @@ -1 +1 @@ -a2bcf46c095f6b4ea747fc978a72d0da download/Archive-Tar-1.52.tar.gz +093c6473c315119556919bd85de0bcb7 Archive-Tar-1.54.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 Nov 24 22:47:35 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 24 Nov 2009 21:47:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[7416] csw/mgar/pkg/websvn/trunk/Makefile Message-ID: Revision: 7416 http://gar.svn.sourceforge.net/gar/?rev=7416&view=rev Author: dmichelsen Date: 2009-11-24 21:47:35 +0000 (Tue, 24 Nov 2009) Log Message: ----------- websvn: Cleanup Makefile Modified Paths: -------------- csw/mgar/pkg/websvn/trunk/Makefile Modified: csw/mgar/pkg/websvn/trunk/Makefile =================================================================== --- csw/mgar/pkg/websvn/trunk/Makefile 2009-11-24 21:31:38 UTC (rev 7415) +++ csw/mgar/pkg/websvn/trunk/Makefile 2009-11-24 21:47:35 UTC (rev 7416) @@ -12,21 +12,14 @@ a particular revision. endef -# MASTER_SITES = svn-http://websvn.tigris.org/svn/$(GARNAME)/tags/ -# DISTFILES = $(GARVERSION) -# NOCHECKSUM = $(GARVERSION) -# SVNHTTP_CO_ARGS = --no-auth-cache --username guest --password guest - MASTER_SITES = http://websvn.tigris.org/files/documents/1380/45918/ DISTFILES = $(DISTNAME).tar.gz +PATCHFILES = websvn-csw-config.patch SPKG_SOURCEURL = http://websvn.tigris.org/ LICENSE = license.txt -# DISTFILES += $(call admfiles,CSWwebsvn,depend postinstall preremove) -PATCHFILES = websvn-csw-config.patch - REQUIRED_PKGS = CSWapache2 CSWdiffutils CSWsvn CSWenscript CSWgsed CSWgtar CSWgzip CONFIGURE_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 Nov 24 22:56:44 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 24 Nov 2009 21:56:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7417] csw/mgar/pkg/gccgo/trunk/Makefile Message-ID: Revision: 7417 http://gar.svn.sourceforge.net/gar/?rev=7417&view=rev Author: wahwah Date: 2009-11-24 21:56:44 +0000 (Tue, 24 Nov 2009) Log Message: ----------- gccgo: Removing bogus prerequisite Modified Paths: -------------- csw/mgar/pkg/gccgo/trunk/Makefile Modified: csw/mgar/pkg/gccgo/trunk/Makefile =================================================================== --- csw/mgar/pkg/gccgo/trunk/Makefile 2009-11-24 21:47:35 UTC (rev 7416) +++ csw/mgar/pkg/gccgo/trunk/Makefile 2009-11-24 21:56:44 UTC (rev 7417) @@ -125,7 +125,7 @@ REQUIRED_PKGS = ## ## A list of packages necessary to build this package -PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWgcc CSWbison CSWflex +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWbison CSWflex ## ## When using non-empty $(PACKAGES): ## REQUIRED_PKGS_CSWpkgname = 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 Nov 24 23:04:14 2009 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Tue, 24 Nov 2009 22:04:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[7418] csw/mgar/pkg/sdlimage/trunk Message-ID: Revision: 7418 http://gar.svn.sourceforge.net/gar/?rev=7418&view=rev Author: jake_goerzen Date: 2009-11-24 22:04:14 +0000 (Tue, 24 Nov 2009) Log Message: ----------- update to version 1.2.10 Modified Paths: -------------- csw/mgar/pkg/sdlimage/trunk/Makefile csw/mgar/pkg/sdlimage/trunk/checksums Modified: csw/mgar/pkg/sdlimage/trunk/Makefile =================================================================== --- csw/mgar/pkg/sdlimage/trunk/Makefile 2009-11-24 21:56:44 UTC (rev 7417) +++ csw/mgar/pkg/sdlimage/trunk/Makefile 2009-11-24 22:04:14 UTC (rev 7418) @@ -1,5 +1,5 @@ GARNAME = SDL_image -GARVERSION = 1.2.8 +GARVERSION = 1.2.10 CATEGORIES = lib DESCRIPTION = SDL image file loading library Modified: csw/mgar/pkg/sdlimage/trunk/checksums =================================================================== --- csw/mgar/pkg/sdlimage/trunk/checksums 2009-11-24 21:56:44 UTC (rev 7417) +++ csw/mgar/pkg/sdlimage/trunk/checksums 2009-11-24 22:04:14 UTC (rev 7418) @@ -1 +1 @@ -2e7c3efa0ec2acc039c46960e27c0792 SDL_image-1.2.8.tar.gz +6c06584b31559e2b59f2b982d0d1f628 SDL_image-1.2.10.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Tue Nov 24 23:16:10 2009 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Tue, 24 Nov 2009 22:16:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7419] csw/mgar/pkg/sdlmixer/trunk Message-ID: Revision: 7419 http://gar.svn.sourceforge.net/gar/?rev=7419&view=rev Author: jake_goerzen Date: 2009-11-24 22:16:10 +0000 (Tue, 24 Nov 2009) Log Message: ----------- update to version 1.2.11 Modified Paths: -------------- csw/mgar/pkg/sdlmixer/trunk/Makefile csw/mgar/pkg/sdlmixer/trunk/checksums Modified: csw/mgar/pkg/sdlmixer/trunk/Makefile =================================================================== --- csw/mgar/pkg/sdlmixer/trunk/Makefile 2009-11-24 22:04:14 UTC (rev 7418) +++ csw/mgar/pkg/sdlmixer/trunk/Makefile 2009-11-24 22:16:10 UTC (rev 7419) @@ -1,5 +1,5 @@ GARNAME = SDL_mixer -GARVERSION = 1.2.10 +GARVERSION = 1.2.11 CATEGORIES = lib DESCRIPTION = multi-channel audio mixer library Modified: csw/mgar/pkg/sdlmixer/trunk/checksums =================================================================== --- csw/mgar/pkg/sdlmixer/trunk/checksums 2009-11-24 22:04:14 UTC (rev 7418) +++ csw/mgar/pkg/sdlmixer/trunk/checksums 2009-11-24 22:16:10 UTC (rev 7419) @@ -1 +1 @@ -a357558552436b0b5ea0333b3e2327df SDL_mixer-1.2.10.tar.gz +65ada3d997fe85109191a5fb083f248c SDL_mixer-1.2.11.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 Nov 24 23:19:12 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 24 Nov 2009 22:19:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7420] csw/mgar/pkg Message-ID: Revision: 7420 http://gar.svn.sourceforge.net/gar/?rev=7420&view=rev Author: dmichelsen Date: 2009-11-24 22:19:12 +0000 (Tue, 24 Nov 2009) Log Message: ----------- sar2rrd: Initial commit Added Paths: ----------- csw/mgar/pkg/sar2rrd/ csw/mgar/pkg/sar2rrd/branches/ csw/mgar/pkg/sar2rrd/tags/ csw/mgar/pkg/sar2rrd/trunk/ csw/mgar/pkg/sar2rrd/trunk/Makefile csw/mgar/pkg/sar2rrd/trunk/checksums csw/mgar/pkg/sar2rrd/trunk/files/ Property changes on: csw/mgar/pkg/sar2rrd/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/sar2rrd/trunk/Makefile =================================================================== --- csw/mgar/pkg/sar2rrd/trunk/Makefile (rev 0) +++ csw/mgar/pkg/sar2rrd/trunk/Makefile 2009-11-24 22:19:12 UTC (rev 7420) @@ -0,0 +1,40 @@ +GARNAME = sar2rrd +GARVERSION = 2.4 +CATEGORIES = utils + +DESCRIPTION = Generate RRDTool graphs from sar output +define BLURB + It creates a PNG Graph for each statistics group collected by sar. + Version 2.0 handles both Linux and Solaris sar output. + Each statistics of the group is represented as a single line in the graph. +endef + +MASTER_SITES = http://www.trickytools.com/downloads/ +DISTFILES = $(GARNAME)-$(GARVERSION).pl +DISTFILES += $(GARNAME)-graph-$(GARVERSION).pl + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.trickytools.com/php/sar2rrd.php + +REQUIRED_PKGS = CSWrrd CSWperl CSWpmdatecalc + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +post-extract-modulated: + $(foreach F,$(DISTFILES),perl -pi \ + -e 's,/usr/bin/perl,/opt/csw/bin/perl,; s,/usr/local/rrdtool/bin/rrdtool,/opt/csw/bin/rrdtool,' \ + $(WORKDIR)/$F;) + @$(MAKECOOKIE) + +install-custom: + ginstall -d $(DESTDIR)$(bindir) + ginstall $(WORKDIR)/$(GARNAME)-$(GARVERSION).pl $(DESTDIR)$(bindir)/$(GARNAME) + ginstall $(WORKDIR)/$(GARNAME)-graph-$(GARVERSION).pl $(DESTDIR)$(bindir)/$(GARNAME)-graph + @$(MAKECOOKIE) Added: csw/mgar/pkg/sar2rrd/trunk/checksums =================================================================== --- csw/mgar/pkg/sar2rrd/trunk/checksums (rev 0) +++ csw/mgar/pkg/sar2rrd/trunk/checksums 2009-11-24 22:19:12 UTC (rev 7420) @@ -0,0 +1,2 @@ +d51bd231562376e034db26a471329842 sar2rrd-2.4.pl +c8d282e71afba0ddfd579debf0ef91a9 sar2rrd-graph-2.4.pl This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Nov 24 23:19:43 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 24 Nov 2009 22:19:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[7421] csw/mgar/pkg/sar2rrd/trunk/Makefile Message-ID: Revision: 7421 http://gar.svn.sourceforge.net/gar/?rev=7421&view=rev Author: dmichelsen Date: 2009-11-24 22:19:43 +0000 (Tue, 24 Nov 2009) Log Message: ----------- sar2rrd: Make package archall Modified Paths: -------------- csw/mgar/pkg/sar2rrd/trunk/Makefile Modified: csw/mgar/pkg/sar2rrd/trunk/Makefile =================================================================== --- csw/mgar/pkg/sar2rrd/trunk/Makefile 2009-11-24 22:19:12 UTC (rev 7420) +++ csw/mgar/pkg/sar2rrd/trunk/Makefile 2009-11-24 22:19:43 UTC (rev 7421) @@ -25,6 +25,8 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = custom +ARCHALL = 1 + include gar/category.mk post-extract-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Nov 24 23:27:18 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 24 Nov 2009 22:27:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7422] csw/mgar/pkg Message-ID: Revision: 7422 http://gar.svn.sourceforge.net/gar/?rev=7422&view=rev Author: dmichelsen Date: 2009-11-24 22:27:18 +0000 (Tue, 24 Nov 2009) Log Message: ----------- liboil: Initial commit Modified Paths: -------------- csw/mgar/pkg/liboil/trunk/Makefile csw/mgar/pkg/liboil/trunk/checksums Added Paths: ----------- csw/mgar/pkg/liboil/ Modified: csw/mgar/pkg/liboil/trunk/Makefile =================================================================== --- csw/mgar/pkg/libschroedinger/trunk/Makefile 2009-11-20 09:34:23 UTC (rev 7360) +++ csw/mgar/pkg/liboil/trunk/Makefile 2009-11-24 22:27:18 UTC (rev 7422) @@ -1,18 +1,18 @@ -GARNAME = libschroedinger -GARVERSION = 1.0.7 +GARNAME = liboil +GARVERSION = 0.3.16 CATEGORIES = lib -DESCRIPTION = A cross-platform implementation of the Dirac video compression specification +DESCRIPTION = A library of simple functions that are optimized for various CPUs define BLURB - A new release of Schr?dinger is available. Schr?dinger (o"schro" - for short) is a cross-platform implementation of the Dirac video - compression specification as a C library. Many media frameworks - such as GStreamer and ffmpeg use schro to encode and decode Dirac - video. + Liboil is a library of simple functions that are optimized for various CPUs. + These functions are generally loops implementing simple algorithms, such as + converting an array of N integers to floating-point numbers or multiplying + and summing an array of N numbers. Such functions are candidates for significant + optimization using various techniques, especially by using extended instructions + provided by modern CPUs (Altivec, MMX, SSE, etc.). endef -MASTER_SITES = http://diracvideo.org/download/schroedinger/ -DISTNAME = schroedinger-$(GARVERSION) +MASTER_SITES = http://liboil.freedesktop.org/download/ DISTFILES = $(DISTNAME).tar.gz # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/liboil/trunk/checksums =================================================================== --- csw/mgar/pkg/libschroedinger/trunk/checksums 2009-11-20 09:34:23 UTC (rev 7360) +++ csw/mgar/pkg/liboil/trunk/checksums 2009-11-24 22:27:18 UTC (rev 7422) @@ -0,0 +1 @@ +febb1d9f9bc4c440fcf622dc90f8b6b7 liboil-0.3.16.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Wed Nov 25 02:21:15 2009 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Wed, 25 Nov 2009 01:21:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[7423] csw/mgar/pkg Message-ID: Revision: 7423 http://gar.svn.sourceforge.net/gar/?rev=7423&view=rev Author: jake_goerzen Date: 2009-11-25 01:21:15 +0000 (Wed, 25 Nov 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/libmikmod/ csw/mgar/pkg/libmikmod/branches/ csw/mgar/pkg/libmikmod/tags/ csw/mgar/pkg/libmikmod/trunk/ csw/mgar/pkg/libmikmod/trunk/Makefile csw/mgar/pkg/libmikmod/trunk/checksums csw/mgar/pkg/libmikmod/trunk/files/ Property changes on: csw/mgar/pkg/libmikmod/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libmikmod/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmikmod/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libmikmod/trunk/Makefile 2009-11-25 01:21:15 UTC (rev 7423) @@ -0,0 +1,22 @@ +GARNAME = libmikmod +GARVERSION = 3.1.11 +CATEGORIES = lib + +DESCRIPTION = library for MOD audio files and other types +define BLURB + Long description +endef + +MASTER_SITES = http://mikmod.raphnet.net/files/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/libmikmod/trunk/checksums =================================================================== --- csw/mgar/pkg/libmikmod/trunk/checksums (rev 0) +++ csw/mgar/pkg/libmikmod/trunk/checksums 2009-11-25 01:21:15 UTC (rev 7423) @@ -0,0 +1 @@ +705106da305e8de191549f1e7393185c libmikmod-3.1.11.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 Nov 25 05:12:57 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 25 Nov 2009 04:12:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[7424] csw/mgar/pkg/coreutils/trunk Message-ID: Revision: 7424 http://gar.svn.sourceforge.net/gar/?rev=7424&view=rev Author: bdwalton Date: 2009-11-25 04:12:56 +0000 (Wed, 25 Nov 2009) Log Message: ----------- coreutils: update acl handling patch Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/checksums csw/mgar/pkg/coreutils/trunk/files/0001-Fix-solaris-acl-support-breakage.patch Modified: csw/mgar/pkg/coreutils/trunk/checksums =================================================================== --- csw/mgar/pkg/coreutils/trunk/checksums 2009-11-25 01:21:15 UTC (rev 7423) +++ csw/mgar/pkg/coreutils/trunk/checksums 2009-11-25 04:12:56 UTC (rev 7424) @@ -1,2 +1,2 @@ -ed529e3abbc0fb76d2e13f5202f59932 0001-Fix-solaris-acl-support-breakage.patch +0fde2b11f34c49995765566acf6cd5b4 0001-Fix-solaris-acl-support-breakage.patch 4cde9f31604f4da188ed302ca55545ea coreutils-8.1.tar.gz Modified: csw/mgar/pkg/coreutils/trunk/files/0001-Fix-solaris-acl-support-breakage.patch =================================================================== --- csw/mgar/pkg/coreutils/trunk/files/0001-Fix-solaris-acl-support-breakage.patch 2009-11-25 01:21:15 UTC (rev 7423) +++ csw/mgar/pkg/coreutils/trunk/files/0001-Fix-solaris-acl-support-breakage.patch 2009-11-25 04:12:56 UTC (rev 7424) @@ -1,32 +1,33 @@ -From 2f1eeb8502a426f38189d24760d52760448cd2ae Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Sun, 22 Nov 2009 18:29:07 +0100 -Subject: [PATCH] Fix solaris acl support breakage +From bd8c66a7789d05bee45a162adf3f6f488fde75bf Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Wed, 25 Nov 2009 04:59:51 +0100 +Subject: [PATCH 1/2] Fix solaris acl support breakage -In the standard solaris acl support, ENOSYS was handled cleanly. This -patch makes the code path handle EOPNOTSUPP identically to ENOSYS, -preventing errors when attempting to a pply acl's on filesystems that -don't implement the acl api (NFS). +Solaris has support for ACL's on NFS, but only in certain combinations +of client and server. When ACL operations are attempted in +unsupported situations, EOPNOTSUPP can be returned instead of ENOSYS. +This patch allows utilities that work with ACL's to handle the +difference properly. -Signed-off-by: Ben Walton +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..346dd5c 100644 +index af85a08..bfacf20 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, +@@ -294,7 +294,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name, - if (ace_count < 0) + if (count < 0) { -- if (errno == ENOSYS || errno == EINVAL) -+ if (errno == ENOSYS || errno == EOPNOTSUPP || errno == EINVAL) +- if (errno == ENOSYS || errno == ENOTSUP) ++ if (errno == ENOSYS || errno == EOPNOTSUPP || errno == ENOTSUP) { - ace_count = 0; - ace_entries = NULL; + count = 0; + 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) { 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 Nov 25 05:14:27 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 25 Nov 2009 04:14:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7425] csw/mgar/pkg/coreutils/trunk Message-ID: Revision: 7425 http://gar.svn.sourceforge.net/gar/?rev=7425&view=rev Author: bdwalton Date: 2009-11-25 04:14:27 +0000 (Wed, 25 Nov 2009) Log Message: ----------- coreutils: patch gnulib-tests Makefile to include -lintl where missing Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile csw/mgar/pkg/coreutils/trunk/checksums Added Paths: ----------- csw/mgar/pkg/coreutils/trunk/files/0002-Add-lintl-to-xalloc-die-LDADD-flags.patch Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-25 04:12:56 UTC (rev 7424) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-25 04:14:27 UTC (rev 7425) @@ -12,6 +12,7 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = 0001-Fix-solaris-acl-support-breakage.patch +PATCHFILES += 0002-Add-lintl-to-xalloc-die-LDADD-flags.patch PREREQUISITE_PKGS = CSWautomake CSWautoconf CSWbison CSWggettext CSWgit PREREQUISITE_PKGS += CSWgperf CSWgzip CSWperl CSWrsync CSWgtar CSWbash Modified: csw/mgar/pkg/coreutils/trunk/checksums =================================================================== --- csw/mgar/pkg/coreutils/trunk/checksums 2009-11-25 04:12:56 UTC (rev 7424) +++ csw/mgar/pkg/coreutils/trunk/checksums 2009-11-25 04:14:27 UTC (rev 7425) @@ -1,2 +1,3 @@ 0fde2b11f34c49995765566acf6cd5b4 0001-Fix-solaris-acl-support-breakage.patch +acbd08eef41092a7b348d03206dad625 0002-Add-lintl-to-xalloc-die-LDADD-flags.patch 4cde9f31604f4da188ed302ca55545ea coreutils-8.1.tar.gz Added: csw/mgar/pkg/coreutils/trunk/files/0002-Add-lintl-to-xalloc-die-LDADD-flags.patch =================================================================== --- csw/mgar/pkg/coreutils/trunk/files/0002-Add-lintl-to-xalloc-die-LDADD-flags.patch (rev 0) +++ csw/mgar/pkg/coreutils/trunk/files/0002-Add-lintl-to-xalloc-die-LDADD-flags.patch 2009-11-25 04:14:27 UTC (rev 7425) @@ -0,0 +1,29 @@ +From 686676e0661bab3d768b5b988e277f5907142e62 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Wed, 25 Nov 2009 05:08:58 +0100 +Subject: [PATCH 2/2] Add -lintl to xalloc-die LDADD flags + +This will allow the file to be linked properly during the gnulib-tests +phase. + +Signed-off-by: Ben Walton +--- + gnulib-tests/Makefile.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/gnulib-tests/Makefile.in b/gnulib-tests/Makefile.in +index 427cccd..641201e 100644 +--- a/gnulib-tests/Makefile.in ++++ b/gnulib-tests/Makefile.in +@@ -1185,7 +1185,7 @@ test_wcwidth_DEPENDENCIES = libtests.a ../lib/libcoreutils.a \ + libtests.a $(am__DEPENDENCIES_1) + test_xalloc_die_SOURCES = test-xalloc-die.c + test_xalloc_die_OBJECTS = test-xalloc-die.$(OBJEXT) +-test_xalloc_die_LDADD = $(LDADD) ++test_xalloc_die_LDADD = $(LDADD) $(LIBINTL) + test_xalloc_die_DEPENDENCIES = libtests.a ../lib/libcoreutils.a \ + libtests.a $(am__DEPENDENCIES_1) + test_xfprintf_posix_SOURCES = test-xfprintf-posix.c +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Nov 25 07:50:21 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Nov 2009 06:50:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[7426] csw/mgar/pkg/liboil/trunk Message-ID: Revision: 7426 http://gar.svn.sourceforge.net/gar/?rev=7426&view=rev Author: dmichelsen Date: 2009-11-25 06:50:07 +0000 (Wed, 25 Nov 2009) Log Message: ----------- liboil: Add patch Modified Paths: -------------- csw/mgar/pkg/liboil/trunk/Makefile csw/mgar/pkg/liboil/trunk/checksums Modified: csw/mgar/pkg/liboil/trunk/Makefile =================================================================== --- csw/mgar/pkg/liboil/trunk/Makefile 2009-11-25 04:14:27 UTC (rev 7425) +++ csw/mgar/pkg/liboil/trunk/Makefile 2009-11-25 06:50:07 UTC (rev 7426) @@ -14,12 +14,17 @@ MASTER_SITES = http://liboil.freedesktop.org/download/ DISTFILES = $(DISTNAME).tar.gz +PATCHFILES = 0001-Use-inttypes.h.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +SPKG_SOURCEURL = http://liboil.freedesktop.org/ + BUILD64 = 1 NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) +TEST_TARGET = check + include gar/category.mk Modified: csw/mgar/pkg/liboil/trunk/checksums =================================================================== --- csw/mgar/pkg/liboil/trunk/checksums 2009-11-25 04:14:27 UTC (rev 7425) +++ csw/mgar/pkg/liboil/trunk/checksums 2009-11-25 06:50:07 UTC (rev 7426) @@ -1 +1,2 @@ +4fb5c9be05a769cc606257a723ecf6cd 0001-Use-inttypes.h.patch febb1d9f9bc4c440fcf622dc90f8b6b7 liboil-0.3.16.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 Nov 25 07:52:08 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Nov 2009 06:52:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[7427] csw/mgar/pkg/liboil/trunk/files/0001-Use-inttypes.h. patch Message-ID: Revision: 7427 http://gar.svn.sourceforge.net/gar/?rev=7427&view=rev Author: dmichelsen Date: 2009-11-25 06:52:01 +0000 (Wed, 25 Nov 2009) Log Message: ----------- liboil: Add patch Added Paths: ----------- csw/mgar/pkg/liboil/trunk/files/0001-Use-inttypes.h.patch Added: csw/mgar/pkg/liboil/trunk/files/0001-Use-inttypes.h.patch =================================================================== --- csw/mgar/pkg/liboil/trunk/files/0001-Use-inttypes.h.patch (rev 0) +++ csw/mgar/pkg/liboil/trunk/files/0001-Use-inttypes.h.patch 2009-11-25 06:52:01 UTC (rev 7427) @@ -0,0 +1,25 @@ +From 85ebb1b1bf68211fd4ad8f0156aa146c6ab27ee7 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 24 Nov 2009 23:39:42 +0100 +Subject: [PATCH] Use inttypes.h + +--- + examples/jpeg/jpeg.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/examples/jpeg/jpeg.h b/examples/jpeg/jpeg.h +index 49eaf6a..a03b38c 100644 +--- a/examples/jpeg/jpeg.h ++++ b/examples/jpeg/jpeg.h +@@ -2,7 +2,7 @@ + #ifndef _JPEG_DECODER_H_ + #define _JPEG_DECODER_H_ + +-#include ++#include + + #define JPEG_MARKER_STUFFED 0x00 + #define JPEG_MARKER_TEM 0x01 +-- +1.6.5.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 Nov 25 12:33:04 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 25 Nov 2009 11:33:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[7428] csw/mgar/pkg/nspr/trunk Message-ID: Revision: 7428 http://gar.svn.sourceforge.net/gar/?rev=7428&view=rev Author: wahwah Date: 2009-11-25 11:33:00 +0000 (Wed, 25 Nov 2009) Log Message: ----------- nspr: Updates as per Wan-Teh Chang's review. Modified Paths: -------------- csw/mgar/pkg/nspr/trunk/Makefile csw/mgar/pkg/nspr/trunk/checksums csw/mgar/pkg/nspr/trunk/files/LICENSE Modified: csw/mgar/pkg/nspr/trunk/Makefile =================================================================== --- csw/mgar/pkg/nspr/trunk/Makefile 2009-11-25 06:52:01 UTC (rev 7427) +++ csw/mgar/pkg/nspr/trunk/Makefile 2009-11-25 11:33:00 UTC (rev 7428) @@ -1,6 +1,7 @@ GARNAME = nspr +MAJOR_VERSION = 4 MIN_VERSION = 8 -GARVERSION = 4.$(MIN_VERSION) +GARVERSION = $(MAJOR_VERSION).$(MIN_VERSION) CATEGORIES = lib define BLURB @@ -9,8 +10,9 @@ many of Red Hat's, Sun's, and other software offerings. endef -MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(GARVERSION)/src/ +MASTER_SITES = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(GARVERSION)/src/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += LICENSE PATCHFILES = nspr-4.6.1-config.patch PACKAGES = CSWnspr CSWnspr-devel @@ -22,15 +24,14 @@ ARCHALL_CSWnspr-devel = 1 SPKG_DESC_CSWnspr = Netscape Portable Runtime -SPKG_DESC_CSWnspr-devel = Netscape Portable Runtime development files +SPKG_DESC_CSWnspr-devel = Netscape Portable Runtime header files CATALOGNAME_CSWnspr-devel = nspr_devel REQUIRED_PKGS_CSWnspr-devel = CSWnspr UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz PERL = /opt/csw/bin/perl -EXTRA_CFLAGS = -xlibmil -EXTRA_CXXFLAGS = -xlibmil -xlibmopt -features=tmplife -norunpath + CONFIGURE_SCRIPTS = nspr BUILD_SCRIPTS = nspr TEST_SCRIPTS = @@ -38,7 +39,6 @@ export PERL -libdir_install = $(prefix)/lib/nspr localstatedir = /var/opt/csw sysconfdir = /etc/opt/csw # Move the include files to include/nspr to prevent polluting the main @@ -46,20 +46,16 @@ includedir = $(prefix)/include/nspr CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-mozilla -CONFIGURE_ARGS += --with-native-threads CONFIGURE_ARGS += --enable-ipv6 -CONFIGURE_ARGS += --enable-system-sqlite CONFIGURE_ARGS_isa-sparcv9 = --enable-64bit CONFIGURE_ARGS_isa-amd64 = --enable-64bit CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION)) -CONFIGURE_ARGS_OPT = --enable-optimize="-xO3" +# http://docs.sun.com/app/docs/doc/819-5265/bjaur?a=view +CONFIGURE_ARGS_OPT = --enable-optimize="-xO3 -xlibmil" CONFIGURE_ARGS_OPT += --disable-debug CONFIGURE_ARGS_OPT += --enable-strip -CONFIGURE_ARGS_OPT += --disable-tests CONFIGURE_ARGS_DBG = --enable-debug CONFIGURE_ARGS_DBG += --disable-strip -CONFIGURE_ARGS_DBG += --enable-tests CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) BUILD64 = 1 @@ -75,7 +71,7 @@ @$(MAKECOOKIE) build-nspr: - (cd $(WORKSRC)/build && $(BUILD_ENV) gmake CC=$(CC) CXX=$(CXX)) + (cd $(WORKSRC)/build && $(BUILD_ENV) gmake) @$(MAKECOOKIE) install-nspr: @@ -94,13 +90,3 @@ rm -f $(DESTDIR)$(bindir)/prerr.properties rm -f $(DESTDIR)$(bindir)/nspr.pc @$(MAKECOOKIE) - -# Create symlinks allowing to use -L/opt/csw/lib/nspr/64 for 64-bit -# architectures. -post-merge: - if [ "$(GARCH)" = sparc ]; then \ - gln -sf sparc9 $(PKGROOT)$(libdir)/64; \ - elif [ "$(GARCH)" = i386 ]; then \ - gln -sf amd64 $(PKGROOT)$(libdir)/64; \ - fi - @$(MAKECOOKIE) Modified: csw/mgar/pkg/nspr/trunk/checksums =================================================================== --- csw/mgar/pkg/nspr/trunk/checksums 2009-11-25 06:52:01 UTC (rev 7427) +++ csw/mgar/pkg/nspr/trunk/checksums 2009-11-25 11:33:00 UTC (rev 7428) @@ -1,2 +1,3 @@ +a932cf1d314e57b35153c4f672a95001 LICENSE 4720bb68a64bfa9188ac6318458b47d2 nspr-4.6.1-config.patch e0916a72bcc6c427551ea262183fdb26 nspr-4.8.tar.gz Modified: csw/mgar/pkg/nspr/trunk/files/LICENSE =================================================================== --- csw/mgar/pkg/nspr/trunk/files/LICENSE 2009-11-25 06:52:01 UTC (rev 7427) +++ csw/mgar/pkg/nspr/trunk/files/LICENSE 2009-11-25 11:33:00 UTC (rev 7428) @@ -1,567 +1,38 @@ - MOZILLA PUBLIC LICENSE - Version 1.1 +There is no single license file in the NSPR distribution, but each file +contains the following note: - --------------- - -1. Definitions. - - 1.0.1. "Commercial Use" means distribution or otherwise making the - Covered Code available to a third party. - - 1.1. "Contributor" means each entity that creates or contributes to - the creation of Modifications. - - 1.2. "Contributor Version" means the combination of the Original - Code, prior Modifications used by a Contributor, and the Modifications - made by that particular Contributor. - - 1.3. "Covered Code" means the Original Code or Modifications or the - combination of the Original Code and Modifications, in each case - including portions thereof. - - 1.4. "Electronic Distribution Mechanism" means a mechanism generally - accepted in the software development community for the electronic - transfer of data. - - 1.5. "Executable" means Covered Code in any form other than Source - Code. - - 1.6. "Initial Developer" means the individual or entity identified - as the Initial Developer in the Source Code notice required by Exhibit - A. - - 1.7. "Larger Work" means a work which combines Covered Code or - portions thereof with code not governed by the terms of this License. - - 1.8. "License" means this document. - - 1.8.1. "Licensable" means having the right to grant, to the maximum - extent possible, whether at the time of the initial grant or - subsequently acquired, any and all of the rights conveyed herein. - - 1.9. "Modifications" means any addition to or deletion from the - substance or structure of either the Original Code or any previous - Modifications. When Covered Code is released as a series of files, a - Modification is: - A. Any addition to or deletion from the contents of a file - containing Original Code or previous Modifications. - - B. Any new file that contains any part of the Original Code or - previous Modifications. - - 1.10. "Original Code" means Source Code of computer software code - which is described in the Source Code notice required by Exhibit A as - Original Code, and which, at the time of its release under this - License is not already Covered Code governed by this License. - - 1.10.1. "Patent Claims" means any patent claim(s), now owned or - hereafter acquired, including without limitation, method, process, - and apparatus claims, in any patent Licensable by grantor. - - 1.11. "Source Code" means the preferred form of the Covered Code for - making modifications to it, including all modules it contains, plus - any associated interface definition files, scripts used to control - compilation and installation of an Executable, or source code - differential comparisons against either the Original Code or another - well known, available Covered Code of the Contributor's choice. The - Source Code can be in a compressed or archival form, provided the - appropriate decompression or de-archiving software is widely available - for no charge. - - 1.12. "You" (or "Your") means an individual or a legal entity - exercising rights under, and complying with all of the terms of, this - License or a future version of this License issued under Section 6.1. - For legal entities, "You" includes any entity which controls, is - controlled by, or is under common control with You. For purposes of - this definition, "control" means (a) the power, direct or indirect, - to cause the direction or management of such entity, whether by - contract or otherwise, or (b) ownership of more than fifty percent - (50%) of the outstanding shares or beneficial ownership of such - entity. - -2. Source Code License. - - 2.1. The Initial Developer Grant. - The Initial Developer hereby grants You a world-wide, royalty-free, - non-exclusive license, subject to third party intellectual property - claims: - (a) under intellectual property rights (other than patent or - trademark) Licensable by Initial Developer to use, reproduce, - modify, display, perform, sublicense and distribute the Original - Code (or portions thereof) with or without Modifications, and/or - as part of a Larger Work; and - - (b) under Patents Claims infringed by the making, using or - selling of Original Code, to make, have made, use, practice, - sell, and offer for sale, and/or otherwise dispose of the - Original Code (or portions thereof). - - (c) the licenses granted in this Section 2.1(a) and (b) are - effective on the date Initial Developer first distributes - Original Code under the terms of this License. - - (d) Notwithstanding Section 2.1(b) above, no patent license is - granted: 1) for code that You delete from the Original Code; 2) - separate from the Original Code; or 3) for infringements caused - by: i) the modification of the Original Code or ii) the - combination of the Original Code with other software or devices. - - 2.2. Contributor Grant. - Subject to third party intellectual property claims, each Contributor - hereby grants You a world-wide, royalty-free, non-exclusive license - - (a) under intellectual property rights (other than patent or - trademark) Licensable by Contributor, to use, reproduce, modify, - display, perform, sublicense and distribute the Modifications - created by such Contributor (or portions thereof) either on an - unmodified basis, with other Modifications, as Covered Code - and/or as part of a Larger Work; and - - (b) under Patent Claims infringed by the making, using, or - selling of Modifications made by that Contributor either alone - and/or in combination with its Contributor Version (or portions - of such combination), to make, use, sell, offer for sale, have - made, and/or otherwise dispose of: 1) Modifications made by that - Contributor (or portions thereof); and 2) the combination of - Modifications made by that Contributor with its Contributor - Version (or portions of such combination). - - (c) the licenses granted in Sections 2.2(a) and 2.2(b) are - effective on the date Contributor first makes Commercial Use of - the Covered Code. - - (d) Notwithstanding Section 2.2(b) above, no patent license is - granted: 1) for any code that Contributor has deleted from the - Contributor Version; 2) separate from the Contributor Version; - 3) for infringements caused by: i) third party modifications of - Contributor Version or ii) the combination of Modifications made - by that Contributor with other software (except as part of the - Contributor Version) or other devices; or 4) under Patent Claims - infringed by Covered Code in the absence of Modifications made by - that Contributor. - -3. Distribution Obligations. - - 3.1. Application of License. - The Modifications which You create or to which You contribute are - governed by the terms of this License, including without limitation - Section 2.2. The Source Code version of Covered Code may be - distributed only under the terms of this License or a future version - of this License released under Section 6.1, and You must include a - copy of this License with every copy of the Source Code You - distribute. You may not offer or impose any terms on any Source Code - version that alters or restricts the applicable version of this - License or the recipients' rights hereunder. However, You may include - an additional document offering the additional rights described in - Section 3.5. - - 3.2. Availability of Source Code. - Any Modification which You create or to which You contribute must be - made available in Source Code form under the terms of this License - either on the same media as an Executable version or via an accepted - Electronic Distribution Mechanism to anyone to whom you made an - Executable version available; and if made available via Electronic - Distribution Mechanism, must remain available for at least twelve (12) - months after the date it initially became available, or at least six - (6) months after a subsequent version of that particular Modification - has been made available to such recipients. You are responsible for - ensuring that the Source Code version remains available even if the - Electronic Distribution Mechanism is maintained by a third party. - - 3.3. Description of Modifications. - You must cause all Covered Code to which You contribute to contain a - file documenting the changes You made to create that Covered Code and - the date of any change. You must include a prominent statement that - the Modification is derived, directly or indirectly, from Original - Code provided by the Initial Developer and including the name of the - Initial Developer in (a) the Source Code, and (b) in any notice in an - Executable version or related documentation in which You describe the - origin or ownership of the Covered Code. - - 3.4. Intellectual Property Matters - (a) Third Party Claims. - If Contributor has knowledge that a license under a third party's - intellectual property rights is required to exercise the rights - granted by such Contributor under Sections 2.1 or 2.2, - Contributor must include a text file with the Source Code - distribution titled "LEGAL" which describes the claim and the - party making the claim in sufficient detail that a recipient will - know whom to contact. If Contributor obtains such knowledge after - the Modification is made available as described in Section 3.2, - Contributor shall promptly modify the LEGAL file in all copies - Contributor makes available thereafter and shall take other steps - (such as notifying appropriate mailing lists or newsgroups) - reasonably calculated to inform those who received the Covered - Code that new knowledge has been obtained. - - (b) Contributor APIs. - If Contributor's Modifications include an application programming - interface and Contributor has knowledge of patent licenses which - are reasonably necessary to implement that API, Contributor must - also include this information in the LEGAL file. - - (c) Representations. - Contributor represents that, except as disclosed pursuant to - Section 3.4(a) above, Contributor believes that Contributor's - Modifications are Contributor's original creation(s) and/or - Contributor has sufficient rights to grant the rights conveyed by - this License. - - 3.5. Required Notices. - You must duplicate the notice in Exhibit A in each file of the Source - Code. If it is not possible to put such notice in a particular Source - Code file due to its structure, then You must include such notice in a - location (such as a relevant directory) where a user would be likely - to look for such a notice. If You created one or more Modification(s) - You may add your name as a Contributor to the notice described in - Exhibit A. You must also duplicate this License in any documentation - for the Source Code where You describe recipients' rights or ownership - rights relating to Covered Code. You may choose to offer, and to - charge a fee for, warranty, support, indemnity or liability - obligations to one or more recipients of Covered Code. However, You - may do so only on Your own behalf, and not on behalf of the Initial - Developer or any Contributor. You must make it absolutely clear than - any such warranty, support, indemnity or liability obligation is - offered by You alone, and You hereby agree to indemnify the Initial - Developer and every Contributor for any liability incurred by the - Initial Developer or such Contributor as a result of warranty, - support, indemnity or liability terms You offer. - - 3.6. Distribution of Executable Versions. - You may distribute Covered Code in Executable form only if the - requirements of Section 3.1-3.5 have been met for that Covered Code, - and if You include a notice stating that the Source Code version of - the Covered Code is available under the terms of this License, - including a description of how and where You have fulfilled the - obligations of Section 3.2. The notice must be conspicuously included - in any notice in an Executable version, related documentation or - collateral in which You describe recipients' rights relating to the - Covered Code. You may distribute the Executable version of Covered - Code or ownership rights under a license of Your choice, which may - contain terms different from this License, provided that You are in - compliance with the terms of this License and that the license for the - Executable version does not attempt to limit or alter the recipient's - rights in the Source Code version from the rights set forth in this - License. If You distribute the Executable version under a different - license You must make it absolutely clear that any terms which differ - from this License are offered by You alone, not by the Initial - Developer or any Contributor. You hereby agree to indemnify the - Initial Developer and every Contributor for any liability incurred by - the Initial Developer or such Contributor as a result of any such - terms You offer. - - 3.7. Larger Works. - You may create a Larger Work by combining Covered Code with other code - not governed by the terms of this License and distribute the Larger - Work as a single product. In such a case, You must make sure the - requirements of this License are fulfilled for the Covered Code. - -4. Inability to Comply Due to Statute or Regulation. - - If it is impossible for You to comply with any of the terms of this - License with respect to some or all of the Covered Code due to - statute, judicial order, or regulation then You must: (a) comply with - the terms of this License to the maximum extent possible; and (b) - describe the limitations and the code they affect. Such description - must be included in the LEGAL file described in Section 3.4 and must - be included with all distributions of the Source Code. Except to the - extent prohibited by statute or regulation, such description must be - sufficiently detailed for a recipient of ordinary skill to be able to - understand it. - -5. Application of this License. - - This License applies to code to which the Initial Developer has - attached the notice in Exhibit A and to related Covered Code. - -6. Versions of the License. - - 6.1. New Versions. - Netscape Communications Corporation ("Netscape") may publish revised - and/or new versions of the License from time to time. Each version - will be given a distinguishing version number. - - 6.2. Effect of New Versions. - Once Covered Code has been published under a particular version of the - License, You may always continue to use it under the terms of that - version. You may also choose to use such Covered Code under the terms - of any subsequent version of the License published by Netscape. No one - other than Netscape has the right to modify the terms applicable to - Covered Code created under this License. - - 6.3. Derivative Works. - If You create or use a modified version of this License (which you may - only do in order to apply it to code which is not already Covered Code - governed by this License), You must (a) rename Your license so that - the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", - "MPL", "NPL" or any confusingly similar phrase do not appear in your - license (except to note that your license differs from this License) - and (b) otherwise make it clear that Your version of the license - contains terms which differ from the Mozilla Public License and - Netscape Public License. (Filling in the name of the Initial - Developer, Original Code or Contributor in the notice described in - Exhibit A shall not of themselves be deemed to be modifications of - this License.) - -7. DISCLAIMER OF WARRANTY. - - COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, - WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF - DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. - THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE - IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, - YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE - COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER - OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF - ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. - -8. TERMINATION. - - 8.1. This License and the rights granted hereunder will terminate - automatically if You fail to comply with terms herein and fail to cure - such breach within 30 days of becoming aware of the breach. All - sublicenses to the Covered Code which are properly granted shall - survive any termination of this License. Provisions which, by their - nature, must remain in effect beyond the termination of this License - shall survive. - - 8.2. If You initiate litigation by asserting a patent infringement - claim (excluding declatory judgment actions) against Initial Developer - or a Contributor (the Initial Developer or Contributor against whom - You file such action is referred to as "Participant") alleging that: - - (a) such Participant's Contributor Version directly or indirectly - infringes any patent, then any and all rights granted by such - Participant to You under Sections 2.1 and/or 2.2 of this License - shall, upon 60 days notice from Participant terminate prospectively, - unless if within 60 days after receipt of notice You either: (i) - agree in writing to pay Participant a mutually agreeable reasonable - royalty for Your past and future use of Modifications made by such - Participant, or (ii) withdraw Your litigation claim with respect to - the Contributor Version against such Participant. If within 60 days - of notice, a reasonable royalty and payment arrangement are not - mutually agreed upon in writing by the parties or the litigation claim - is not withdrawn, the rights granted by Participant to You under - Sections 2.1 and/or 2.2 automatically terminate at the expiration of - the 60 day notice period specified above. - - (b) any software, hardware, or device, other than such Participant's - Contributor Version, directly or indirectly infringes any patent, then - any rights granted to You by such Participant under Sections 2.1(b) - and 2.2(b) are revoked effective as of the date You first made, used, - sold, distributed, or had made, Modifications made by that - Participant. - - 8.3. If You assert a patent infringement claim against Participant - alleging that such Participant's Contributor Version directly or - indirectly infringes any patent where such claim is resolved (such as - by license or settlement) prior to the initiation of patent - infringement litigation, then the reasonable value of the licenses - granted by such Participant under Sections 2.1 or 2.2 shall be taken - into account in determining the amount or value of any payment or - license. - - 8.4. In the event of termination under Sections 8.1 or 8.2 above, - all end user license agreements (excluding distributors and resellers) - which have been validly granted by You or any distributor hereunder - prior to termination shall survive termination. - -9. LIMITATION OF LIABILITY. - - UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT - (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL - DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, - OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR - ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY - CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, - WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER - COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN - INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF - LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY - RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW - PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE - EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO - THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. - -10. U.S. GOVERNMENT END USERS. - - The Covered Code is a "commercial item," as that term is defined in - 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer - software" and "commercial computer software documentation," as such - terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 - C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), - all U.S. Government End Users acquire Covered Code with only those - rights set forth herein. - -11. MISCELLANEOUS. - - This License represents the complete agreement concerning subject - matter hereof. If any provision of this License is held to be - unenforceable, such provision shall be reformed only to the extent - necessary to make it enforceable. This License shall be governed by - California law provisions (except to the extent applicable law, if - any, provides otherwise), excluding its conflict-of-law provisions. - With respect to disputes in which at least one party is a citizen of, - or an entity chartered or registered to do business in the United - States of America, any litigation relating to this License shall be - subject to the jurisdiction of the Federal Courts of the Northern - District of California, with venue lying in Santa Clara County, - California, with the losing party responsible for costs, including - without limitation, court costs and reasonable attorneys' fees and - expenses. The application of the United Nations Convention on - Contracts for the International Sale of Goods is expressly excluded. - Any law or regulation which provides that the language of a contract - shall be construed against the drafter shall not apply to this - License. - -12. RESPONSIBILITY FOR CLAIMS. - - As between Initial Developer and the Contributors, each party is - responsible for claims and damages arising, directly or indirectly, - out of its utilization of rights under this License and You agree to - work with Initial Developer and Contributors to distribute such - responsibility on an equitable basis. Nothing herein is intended or - shall be deemed to constitute any admission of liability. - -13. MULTIPLE-LICENSED CODE. - - Initial Developer may designate portions of the Covered Code as - "Multiple-Licensed". "Multiple-Licensed" means that the Initial - Developer permits you to utilize portions of the Covered Code under - Your choice of the NPL or the alternative licenses, if any, specified - by the Initial Developer in the file described in Exhibit A. - -EXHIBIT A -Mozilla Public License. - - ``The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. - - The Original Code is ______________________________________. - - The Initial Developer of the Original Code is ________________________. - Portions created by ______________________ are Copyright (C) ______ - _______________________. All Rights Reserved. - - Contributor(s): ______________________________________. - - Alternatively, the contents of this file may be used under the terms - of the _____ license (the "[___] License"), in which case the - provisions of [______] License are applicable instead of those - above. If you wish to allow use of your version of this file only - under the terms of the [____] License and not to allow others to use - your version of this file under the MPL, indicate your decision by - deleting the provisions above and replace them with the notice and - other provisions required by the [___] License. If you do not delete - the provisions above, a recipient may use your version of this file - under either the MPL or the [___] License." - - [NOTE: The text of this Exhibit A may differ slightly from the text of - the notices in the Source Code files of the Original Code. You should - use the text of this Exhibit A rather than the text found in the - Original Code Source Code for Your Modifications.] - - ---------------------------------------------------------------------- - - AMENDMENTS - - The Netscape Public License Version 1.1 ("NPL") consists of the - Mozilla Public License Version 1.1 with the following Amendments, - including Exhibit A-Netscape Public License. Files identified with - "Exhibit A-Netscape Public License" are governed by the Netscape - Public License Version 1.1. - - Additional Terms applicable to the Netscape Public License. - I. Effect. - These additional terms described in this Netscape Public - License -- Amendments shall apply to the Mozilla Communicator - client code and to all Covered Code under this License. - - II. "Netscape's Branded Code" means Covered Code that Netscape - distributes and/or permits others to distribute under one or more - trademark(s) which are controlled by Netscape but which are not - licensed for use under this License. - - III. Netscape and logo. - This License does not grant any rights to use the trademarks - "Netscape", the "Netscape N and horizon" logo or the "Netscape - lighthouse" logo, "Netcenter", "Gecko", "Java" or "JavaScript", - "Smart Browsing" even if such marks are included in the Original - Code or Modifications. - - IV. Inability to Comply Due to Contractual Obligation. - Prior to licensing the Original Code under this License, Netscape - has licensed third party code for use in Netscape's Branded Code. - To the extent that Netscape is limited contractually from making - such third party code available under this License, Netscape may - choose to reintegrate such code into Covered Code without being - required to distribute such code in Source Code form, even if - such code would otherwise be considered "Modifications" under - this License. - - V. Use of Modifications and Covered Code by Initial Developer. - V.1. In General. - The obligations of Section 3 apply to Netscape, except to - the extent specified in this Amendment, Section V.2 and V.3. - - V.2. Other Products. - Netscape may include Covered Code in products other than the - Netscape's Branded Code which are released by Netscape - during the two (2) years following the release date of the - Original Code, without such additional products becoming - subject to the terms of this License, and may license such - additional products on different terms from those contained - in this License. - - V.3. Alternative Licensing. - Netscape may license the Source Code of Netscape's Branded - Code, including Modifications incorporated therein, without - such Netscape Branded Code becoming subject to the terms of - this License, and may license such Netscape Branded Code on - different terms from those contained in this License. - - VI. Litigation. - Notwithstanding the limitations of Section 11 above, the - provisions regarding litigation in Section 11(a), (b) and (c) of - the License shall apply to all disputes relating to this License. - - EXHIBIT A-Netscape Public License. - - "The contents of this file are subject to the Netscape Public - License Version 1.1 (the "License"); you may not use this file - except in compliance with the License. You may obtain a copy of - the License at http://www.mozilla.org/NPL/ - - Software distributed under the License is distributed on an "AS - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - implied. See the License for the specific language governing - rights and limitations under the License. - - The Original Code is Mozilla Communicator client code, released - March 31, 1998. - - The Initial Developer of the Original Code is Netscape - Communications Corporation. Portions created by Netscape are - Copyright (C) 1998-1999 Netscape Communications Corporation. All - Rights Reserved. - - Contributor(s): ______________________________________. - - Alternatively, the contents of this file may be used under the - terms of the _____ license (the "[___] License"), in which case - the provisions of [______] License are applicable instead of - those above. If you wish to allow use of your version of this - file only under the terms of the [____] License and not to allow - others to use your version of this file under the NPL, indicate - your decision by deleting the provisions above and replace them - with the notice and other provisions required by the [___] - License. If you do not delete the provisions above, a recipient - may use your version of this file under either the NPL or the - [___] License." +# ***** BEGIN LICENSE BLOCK ***** +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Original Code is the Netscape Portable Runtime (NSPR). +# +# The Initial Developer of the Original Code is +# Netscape Communications Corporation. +# Portions created by the Initial Developer are Copyright (C) 1998-2000 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 2 or later (the "GPL"), or +# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +# in which case the provisions of the GPL or the LGPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL or the LGPL, and not to allow others to +# use your version of this file under the terms of the MPL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL or the LGPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the MPL, the GPL or the LGPL. +# +# ***** END LICENSE BLOCK ***** 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 Nov 25 12:58:40 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Nov 2009 11:58:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[7429] csw/mgar/pkg/liboil/trunk Message-ID: Revision: 7429 http://gar.svn.sourceforge.net/gar/?rev=7429&view=rev Author: dmichelsen Date: 2009-11-25 11:58:40 +0000 (Wed, 25 Nov 2009) Log Message: ----------- liboil: Add patch for Solaris 8/9 x86 Modified Paths: -------------- csw/mgar/pkg/liboil/trunk/Makefile csw/mgar/pkg/liboil/trunk/checksums Added Paths: ----------- csw/mgar/pkg/liboil/trunk/files/0002-Enable-getisax-only-for-Solaris-10.patch Modified: csw/mgar/pkg/liboil/trunk/Makefile =================================================================== --- csw/mgar/pkg/liboil/trunk/Makefile 2009-11-25 11:33:00 UTC (rev 7428) +++ csw/mgar/pkg/liboil/trunk/Makefile 2009-11-25 11:58:40 UTC (rev 7429) @@ -15,6 +15,7 @@ MASTER_SITES = http://liboil.freedesktop.org/download/ DISTFILES = $(DISTNAME).tar.gz PATCHFILES = 0001-Use-inttypes.h.patch +PATCHFILES += 0002-Enable-getisax-only-for-Solaris-10.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/liboil/trunk/checksums =================================================================== --- csw/mgar/pkg/liboil/trunk/checksums 2009-11-25 11:33:00 UTC (rev 7428) +++ csw/mgar/pkg/liboil/trunk/checksums 2009-11-25 11:58:40 UTC (rev 7429) @@ -1,2 +1,3 @@ 4fb5c9be05a769cc606257a723ecf6cd 0001-Use-inttypes.h.patch +dd92cada15fe42ef09f2bc6ed9d068db 0002-Enable-getisax-only-for-Solaris-10.patch febb1d9f9bc4c440fcf622dc90f8b6b7 liboil-0.3.16.tar.gz Added: csw/mgar/pkg/liboil/trunk/files/0002-Enable-getisax-only-for-Solaris-10.patch =================================================================== --- csw/mgar/pkg/liboil/trunk/files/0002-Enable-getisax-only-for-Solaris-10.patch (rev 0) +++ csw/mgar/pkg/liboil/trunk/files/0002-Enable-getisax-only-for-Solaris-10.patch 2009-11-25 11:58:40 UTC (rev 7429) @@ -0,0 +1,26 @@ +From 159a22dd99c2d86891fc5c1f76d35fdacec37368 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 25 Nov 2009 12:48:11 +0100 +Subject: [PATCH] Enable getisax only for Solaris 10 + +--- + liboil/liboilcpu-x86.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/liboil/liboilcpu-x86.c b/liboil/liboilcpu-x86.c +index e7a1978..9851209 100644 +--- a/liboil/liboilcpu-x86.c ++++ b/liboil/liboilcpu-x86.c +@@ -60,7 +60,9 @@ + /***** i386, amd64 *****/ + + #if defined(__sun) ++#if defined(_SYS_AUXV_386_H) + #define USE_I386_GETISAX ++#endif + #else + #define USE_I386_CPUID + #endif +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Nov 25 13:03:54 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Nov 2009 12:03:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[7430] csw/mgar/pkg/orca/trunk Message-ID: Revision: 7430 http://gar.svn.sourceforge.net/gar/?rev=7430&view=rev Author: dmichelsen Date: 2009-11-25 12:03:53 +0000 (Wed, 25 Nov 2009) Log Message: ----------- orca: Fix start script and package name Modified Paths: -------------- csw/mgar/pkg/orca/trunk/Makefile csw/mgar/pkg/orca/trunk/checksums Added Paths: ----------- csw/mgar/pkg/orca/trunk/files/csworca csw/mgar/pkg/orca/trunk/files/fix-start-orcallator.patch Modified: csw/mgar/pkg/orca/trunk/Makefile =================================================================== --- csw/mgar/pkg/orca/trunk/Makefile 2009-11-25 11:58:40 UTC (rev 7429) +++ csw/mgar/pkg/orca/trunk/Makefile 2009-11-25 12:03:53 UTC (rev 7430) @@ -30,17 +30,18 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += csworcallator csworcallator.xml svc-csworcallator DISTFILES += csworca_services +DISTFILES += csworca +PATCHFILES = $(GARNAME)-$(GARVERSION)-se-3.5.0.patch +PATCHFILES += fix-start-orcallator.patch -PACKAGES = CSWorca CSWorca-web +PACKAGES = CSWorca CSWorcaweb -CATALOGNAME_CSWorca = orca -CATALOGNAME_CSWorca-web = orca_web +CATALOGNAME_CSWorca = orca +CATALOGNAME_CSWorcaweb = orca_web SPKG_DESC_CSWorca = Performance Data Collector -SPKG_DESC_CSWorcs-web = Performance Data Viewer +SPKG_DESC_CSWorcaweb = Performance Data Viewer -PATCHFILES = $(GARNAME)-$(GARVERSION)-se-3.5.0.patch - SPKG_SOURCEURL = http://www.orcaware.com/orca # We define upstream file regex so we can be notifed of new upstream software release @@ -50,7 +51,7 @@ REQUIRED_PKGS_CSWorca = CSWsetoolkit CSWperl CSWpmtimedate REQUIRED_PKGS_CSWorca += CSWpmmathinterpolate CSWrrd CSWgawk CSWbzip2 -REQUIRED_PKGS_CSWorca-web = CSWperl CSWpmtimedate CSWpmmathinterpolate CSWrrd CSWapache2 +REQUIRED_PKGS_CSWorcaweb = CSWperl CSWpmtimedate CSWpmmathinterpolate CSWrrd CSWapache2 sysconfdir = /etc/opt/csw localstatedir = /var/opt/csw @@ -70,23 +71,26 @@ PRESERVECONF += /etc/opt/csw/procallator.cfg PRESERVECONF += /etc/opt/csw/orca_services.cfg -INITSMF = /etc/opt/csw/init.d/csworcallator +INITSMF = /etc/opt/csw/init.d/csworca +INITSMF += /etc/opt/csw/init.d/csworcallator ARCHALL = 1 -PKGFILES_CSWorca-web = $(prefix)/apache2/.* -PKGFILES_CSWorca-web += $(sharedstatedir)/www/orca/.* -PKGFILES_CSWorca-web += $(bindir)/orca -PKGFILES_CSWorca-web += $(sysconfdir)/.*\.cfg -PKGFILES_CSWorca-web += $(libdir)/perl/.* -PKGFILES_CSWorca-web += $(mandir)/man1/orca\.1 -PKGFILES_CSWorca-web += /var/opt/csw/.* +PKGFILES_CSWorcaweb = $(prefix)/apache2/.* +PKGFILES_CSWorcaweb += $(sharedstatedir)/www/orca/.* +PKGFILES_CSWorcaweb += $(bindir)/orca +PKGFILES_CSWorcaweb += $(sysconfdir)/.*\.cfg +PKGFILES_CSWorcaweb += $(libdir)/perl/.* +PKGFILES_CSWorcaweb += $(mandir)/man1/orca\.1 +PKGFILES_CSWorcaweb += /var/opt/csw/.* +PKGFILES_CSWorcaweb += /etc/opt/csw/init.d/csworca include gar/category.mk post-install-modulated: @ginstall -d $(DESTDIR)$(sysconfdir)/init.d @# TBD: Use custom manifest for Solaris 10 SMF support + @ginstall $(WORKDIR)/csworca $(DESTDIR)$(sysconfdir)/init.d/csworca @ginstall $(WORKDIR)/csworcallator $(DESTDIR)$(sysconfdir)/init.d/csworcallator @ginstall $(WORKDIR)/csworca_services $(DESTDIR)$(sysconfdir)/init.d/csworca_services @$(MAKE_COOKIE) Modified: csw/mgar/pkg/orca/trunk/checksums =================================================================== --- csw/mgar/pkg/orca/trunk/checksums 2009-11-25 11:58:40 UTC (rev 7429) +++ csw/mgar/pkg/orca/trunk/checksums 2009-11-25 12:03:53 UTC (rev 7430) @@ -1,6 +1,8 @@ +dcb171adb47a8a7d8c55ec4b7f9b5218 csworca 4c74f4f1449fabd0838d0cd71678144c csworca_services 72c1eaa8d3f1ab48363e7ed5792e2855 csworcallator a99644ffcc9164d9d0f4df2b44c61917 csworcallator.xml +22e921ee0ebc822479e99041d1045952 fix-start-orcallator.patch ce08f37aa52f7b27bc82cc9c976d56b4 orca-snapshot-r535-se-3.5.0.patch ba8e48e429008f53037e85fef2fcfe36 orca-snapshot-r535.tar.bz2 23a2b76456b96c5fcff4a1d92c02e140 svc-csworcallator Added: csw/mgar/pkg/orca/trunk/files/csworca =================================================================== --- csw/mgar/pkg/orca/trunk/files/csworca (rev 0) +++ csw/mgar/pkg/orca/trunk/files/csworca 2009-11-25 12:03:53 UTC (rev 7430) @@ -0,0 +1,33 @@ +#!/bin/sh + +prefix=/opt/csw +exec_prefix=/opt/csw +bindir=/opt/csw/bin + +orca="$bindir/orca" + +case "$1" in + start) + if test -x $orca; then + umask 022 + $orca -daemon -logfile /var/opt/csw/orca/orca.log /etc/opt/csw/orcallator.cfg & + echo $! >/var/run/orca.pid + else + echo "$0: $start_orcallator does not exist or is not executable." + fi + ;; + + stop) + if test -f /var/run/orca.pid; then + kill `cat /var/run/orca.pid` + rm -f /var/run/orca.pid + fi + ;; + + *) + echo "usage: $0 {start|stop}" + exit 1 + ;; +esac + +exit 0 Property changes on: csw/mgar/pkg/orca/trunk/files/csworca ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/orca/trunk/files/fix-start-orcallator.patch =================================================================== --- csw/mgar/pkg/orca/trunk/files/fix-start-orcallator.patch (rev 0) +++ csw/mgar/pkg/orca/trunk/files/fix-start-orcallator.patch 2009-11-25 12:03:53 UTC (rev 7430) @@ -0,0 +1,28 @@ +--- orca-snapshot-r535/data_gatherers/orcallator/start_orcallator.sh.in 2005-09-09 05:51:41.000000000 +0200 ++++ orca-snapshot-r535/data_gatherers/orcallator/start_orcallator.sh.in.new 2009-11-25 12:19:03.700007723 +0100 +@@ -118,7 +118,7 @@ + exit 1 + fi + +-echo "Writing data into $OUTDIR/" ++# echo "Writing data into $OUTDIR/" + if test "$WEB_LOG"; then + echo "Using www access log file $WEB_LOG" + fi +@@ -138,8 +138,8 @@ + fi + + # Now start the logging. +-echo "Starting logging" +-nohup $SE $SE_PATCHES -DWATCH_OS $WATCH_WEB -I$libdir/SE/$SE_VERSION $libdir/orcallator.se & ++# echo "Starting logging" ++nohup $SE $SE_PATCHES -DWATCH_OS $WATCH_WEB -I$libdir/SE/$SE_VERSION $libdir/orca/orcallator.se >$OUTDIR/orcallator.log 2>&1 & + + # Write the PID of orcallator to a file to make killing easier. + pid=$! +@@ -147,4 +147,4 @@ + + # Sleep for a couple of seconds to allow any orcallator startup + # warnings to appear on the terminal before exiting. +-sleep 5 ++# sleep 5 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 Nov 25 14:19:07 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Nov 2009 13:19:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7431] csw/mgar/pkg/libschroedinger/trunk Message-ID: Revision: 7431 http://gar.svn.sourceforge.net/gar/?rev=7431&view=rev Author: dmichelsen Date: 2009-11-25 13:19:07 +0000 (Wed, 25 Nov 2009) Log Message: ----------- libschroedinger: Add patch Modified Paths: -------------- csw/mgar/pkg/libschroedinger/trunk/Makefile csw/mgar/pkg/libschroedinger/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libschroedinger/trunk/files/0001-Avoid-using-FUNCTION-and-stdint.h.patch Modified: csw/mgar/pkg/libschroedinger/trunk/Makefile =================================================================== --- csw/mgar/pkg/libschroedinger/trunk/Makefile 2009-11-25 12:03:53 UTC (rev 7430) +++ csw/mgar/pkg/libschroedinger/trunk/Makefile 2009-11-25 13:19:07 UTC (rev 7431) @@ -14,12 +14,17 @@ MASTER_SITES = http://diracvideo.org/download/schroedinger/ DISTNAME = schroedinger-$(GARVERSION) DISTFILES = $(DISTNAME).tar.gz +PATCHFILES = 0001-Avoid-using-FUNCTION-and-stdint.h.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +REQUIRED_PKGS = CSWliboil + BUILD64 = 1 NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) +TEST_TARGET = check + include gar/category.mk Modified: csw/mgar/pkg/libschroedinger/trunk/checksums =================================================================== --- csw/mgar/pkg/libschroedinger/trunk/checksums 2009-11-25 12:03:53 UTC (rev 7430) +++ csw/mgar/pkg/libschroedinger/trunk/checksums 2009-11-25 13:19:07 UTC (rev 7431) @@ -0,0 +1,2 @@ +271143050dd2df0b7d6e00e07ddac3fc 0001-Avoid-using-FUNCTION-and-stdint.h.patch +9a1132c54a58a6a040514f754b53ee44 schroedinger-1.0.7.tar.gz Added: csw/mgar/pkg/libschroedinger/trunk/files/0001-Avoid-using-FUNCTION-and-stdint.h.patch =================================================================== --- csw/mgar/pkg/libschroedinger/trunk/files/0001-Avoid-using-FUNCTION-and-stdint.h.patch (rev 0) +++ csw/mgar/pkg/libschroedinger/trunk/files/0001-Avoid-using-FUNCTION-and-stdint.h.patch 2009-11-25 13:19:07 UTC (rev 7431) @@ -0,0 +1,39 @@ +From c9016f3e69fcfc75bb3256654c2128f2c56995ec Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 25 Nov 2009 13:40:09 +0100 +Subject: [PATCH] Avoid using FUNCTION and stdint.h + +--- + schroedinger/schrodebug.h | 2 +- + schroedinger/schroutils.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/schroedinger/schrodebug.h b/schroedinger/schrodebug.h +index 5a7edf0..835246e 100644 +--- a/schroedinger/schrodebug.h ++++ b/schroedinger/schrodebug.h +@@ -50,7 +50,7 @@ typedef void (*SchroDebugLogFunc) (int level, const char *file, + SCHRO_DEBUG_LEVEL(SCHRO_LEVEL_LOG, __VA_ARGS__) + + #define SCHRO_DEBUG_LEVEL(level,...) \ +- schro_debug_log ((level), __FILE__, __FUNCTION__, __LINE__, __VA_ARGS__) ++ schro_debug_log ((level), __FILE__, "", __LINE__, __VA_ARGS__) + + #define SCHRO_ASSERT(test) do { \ + if (!(test)) { \ +diff --git a/schroedinger/schroutils.h b/schroedinger/schroutils.h +index 17eda4b..4199c58 100644 +--- a/schroedinger/schroutils.h ++++ b/schroedinger/schroutils.h +@@ -12,7 +12,7 @@ typedef unsigned __int16 uint16_t; + typedef unsigned __int32 uint32_t; + #endif + #else +-#include ++#include + #endif + + #ifndef TRUE +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Nov 25 14:46:50 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Nov 2009 13:46:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[7433] csw/mgar/pkg Message-ID: Revision: 7433 http://gar.svn.sourceforge.net/gar/?rev=7433&view=rev Author: dmichelsen Date: 2009-11-25 13:46:50 +0000 (Wed, 25 Nov 2009) Log Message: ----------- libstatgrab: Initial commit Added Paths: ----------- csw/mgar/pkg/libstatgrab/ csw/mgar/pkg/libstatgrab/branches/ csw/mgar/pkg/libstatgrab/tags/ csw/mgar/pkg/libstatgrab/trunk/ csw/mgar/pkg/libstatgrab/trunk/Makefile csw/mgar/pkg/libstatgrab/trunk/checksums csw/mgar/pkg/libstatgrab/trunk/files/ Property changes on: csw/mgar/pkg/libstatgrab/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/libstatgrab/trunk/Makefile =================================================================== --- csw/mgar/pkg/libstatgrab/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libstatgrab/trunk/Makefile 2009-11-25 13:46:50 UTC (rev 7433) @@ -0,0 +1,24 @@ +GARNAME = libstatgrab +GARVERSION = 0.16 +CATEGORIES = lib + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = ftp://ftp.uk.i-scream.org/pub/i-scream/libstatsgrab/ +MASTER_SITES += http://dl.ambiweb.de/mirrors/ftp.i-scream.org/libstatgrab/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +REQUIRED_PKGS = CSWncurses + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/libstatgrab/trunk/checksums =================================================================== --- csw/mgar/pkg/libstatgrab/trunk/checksums (rev 0) +++ csw/mgar/pkg/libstatgrab/trunk/checksums 2009-11-25 13:46:50 UTC (rev 7433) @@ -0,0 +1 @@ +77582438274679a9641d043ddcccdd4e libstatgrab-0.16.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 Nov 25 14:45:16 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Nov 2009 13:45:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7432] csw/mgar/pkg/cpan Message-ID: Revision: 7432 http://gar.svn.sourceforge.net/gar/?rev=7432&view=rev Author: dmichelsen Date: 2009-11-25 13:45:16 +0000 (Wed, 25 Nov 2009) Log Message: ----------- cpan/Unix-Statgrab: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Unix-Statgrab/ csw/mgar/pkg/cpan/Unix-Statgrab/branches/ csw/mgar/pkg/cpan/Unix-Statgrab/tags/ csw/mgar/pkg/cpan/Unix-Statgrab/trunk/ csw/mgar/pkg/cpan/Unix-Statgrab/trunk/Makefile csw/mgar/pkg/cpan/Unix-Statgrab/trunk/checksums csw/mgar/pkg/cpan/Unix-Statgrab/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Unix-Statgrab/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/Unix-Statgrab/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Unix-Statgrab/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Unix-Statgrab/trunk/Makefile 2009-11-25 13:45:16 UTC (rev 7432) @@ -0,0 +1,16 @@ +GARNAME = Unix-Statgrab +GARVERSION = 0.04 +CATEGORIES = cpan +AUTHOR = VPARSEVAL + +DESCRIPTION = Perl extension for collecting information about the machine +define BLURB +endef + +PACKAGES = CSWpmunixstatgrab +CATALOGNAME = pm_unixstatgrab + +REQUIRED_PKGS = CSWlibstatgrab +PREREQUISITE_PKGS = $(REQUIRED_PKGS) + +include gar/category.mk Added: csw/mgar/pkg/cpan/Unix-Statgrab/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Unix-Statgrab/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Unix-Statgrab/trunk/checksums 2009-11-25 13:45:16 UTC (rev 7432) @@ -0,0 +1 @@ +94787010e27183ce5cf354c58c465d0d Unix-Statgrab-0.04.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 Nov 25 15:30:52 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Nov 2009 14:30:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[7434] csw/mgar/pkg/libspf2/trunk/Makefile Message-ID: Revision: 7434 http://gar.svn.sourceforge.net/gar/?rev=7434&view=rev Author: dmichelsen Date: 2009-11-25 14:30:51 +0000 (Wed, 25 Nov 2009) Log Message: ----------- libspf2: Add missing libraries Modified Paths: -------------- csw/mgar/pkg/libspf2/trunk/Makefile Modified: csw/mgar/pkg/libspf2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libspf2/trunk/Makefile 2009-11-25 13:46:50 UTC (rev 7433) +++ csw/mgar/pkg/libspf2/trunk/Makefile 2009-11-25 14:30:51 UTC (rev 7434) @@ -19,6 +19,16 @@ SPKG_SOURCEURL = http://www.libspf2.org +REQUIRED_PGKS = CSWggettextrt + +BUILD64 = 1 +NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) +EXTRA_LINKER_FLAGS = -lresolv -lsocket -lnsl + +TEST_TARGET = check + +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 Wed Nov 25 15:32:18 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Nov 2009 14:32:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7435] csw/mgar/pkg/libspf2/trunk/Makefile Message-ID: Revision: 7435 http://gar.svn.sourceforge.net/gar/?rev=7435&view=rev Author: dmichelsen Date: 2009-11-25 14:32:17 +0000 (Wed, 25 Nov 2009) Log Message: ----------- libspf2: Fix typo Modified Paths: -------------- csw/mgar/pkg/libspf2/trunk/Makefile Modified: csw/mgar/pkg/libspf2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libspf2/trunk/Makefile 2009-11-25 14:30:51 UTC (rev 7434) +++ csw/mgar/pkg/libspf2/trunk/Makefile 2009-11-25 14:32:17 UTC (rev 7435) @@ -19,7 +19,7 @@ SPKG_SOURCEURL = http://www.libspf2.org -REQUIRED_PGKS = CSWggettextrt +REQUIRED_PKGS = CSWggettextrt BUILD64 = 1 NO_ISAEXEC = 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 Wed Nov 25 15:42:11 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Nov 2009 14:42:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[7436] csw/mgar/pkg Message-ID: Revision: 7436 http://gar.svn.sourceforge.net/gar/?rev=7436&view=rev Author: dmichelsen Date: 2009-11-25 14:42:10 +0000 (Wed, 25 Nov 2009) Log Message: ----------- libsmi: Initial commit Added Paths: ----------- csw/mgar/pkg/libsmi/ csw/mgar/pkg/libsmi/branches/ csw/mgar/pkg/libsmi/tags/ csw/mgar/pkg/libsmi/trunk/ csw/mgar/pkg/libsmi/trunk/Makefile csw/mgar/pkg/libsmi/trunk/checksums csw/mgar/pkg/libsmi/trunk/files/ Property changes on: csw/mgar/pkg/libsmi/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/libsmi/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsmi/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libsmi/trunk/Makefile 2009-11-25 14:42:10 UTC (rev 7436) @@ -0,0 +1,43 @@ +GARNAME = libsmi +GARVERSION = 0.4.8 +CATEGORIES = lib + +DESCRIPTION = Allows management applications to access SMI MIB module definitions +define BLURB + The core of the libsmi distribution is a library that allows management applications + to access SMI MIB module definitions. On top of this library, there are tools to check, + analyze dump, convert, and compare MIB definitions. Finally, the distribution contains + a steadily maintained and revised archive of all IETF and IANA maintained standard MIB + and PIB modules. +endef + +MASTER_SITES = ftp://ftp.ibr.cs.tu-bs.de/pub/local/libsmi/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +PACKAGES = CSWlibsmi CSWlibsmimibs + +CATALOGNAME_CSWlibsmi = libsmi +CATALOGNAME_CSWlibsmimibs = libsmi_mibs + +SPKG_DESC_CSWlibsmi = Library to access SMI MIB module definitions +SPKG_DESC_CSWlibsmimibs = SMI MIB definitions + +SPKG_SOURCEURL = http://www.ibr.cs.tu-bs.de/projects/libsmi/ + +REQUIRED_PKGS_CSWlibsmi = CSWlibsmimibs + +BUILD64 = 1 +NO_ISAEXEC = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +EXTRA_CPPFLAGS = -Dfabsf=fabs + +MERGE_DIRS_isa-extra = $(libdir) + +PKGFILES_CSWlibsmimibs = $(sharedstatedir)/mibs/.* +PKGFILES_CSWlibsmimibs += $(sharedstatedir)/pibs/.* + +include gar/category.mk Added: csw/mgar/pkg/libsmi/trunk/checksums =================================================================== --- csw/mgar/pkg/libsmi/trunk/checksums (rev 0) +++ csw/mgar/pkg/libsmi/trunk/checksums 2009-11-25 14:42:10 UTC (rev 7436) @@ -0,0 +1 @@ +760b6b1070738158708649ed2c63425e libsmi-0.4.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 Wed Nov 25 15:53:53 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Nov 2009 14:53:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[7437] csw/mgar/pkg/cpan Message-ID: Revision: 7437 http://gar.svn.sourceforge.net/gar/?rev=7437&view=rev Author: dmichelsen Date: 2009-11-25 14:53:52 +0000 (Wed, 25 Nov 2009) Log Message: ----------- cpan/Net-DNS-Resolver-Programmable: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Net-DNS-Resolver-Programmable/ csw/mgar/pkg/cpan/Net-DNS-Resolver-Programmable/branches/ csw/mgar/pkg/cpan/Net-DNS-Resolver-Programmable/tags/ csw/mgar/pkg/cpan/Net-DNS-Resolver-Programmable/trunk/ csw/mgar/pkg/cpan/Net-DNS-Resolver-Programmable/trunk/Makefile csw/mgar/pkg/cpan/Net-DNS-Resolver-Programmable/trunk/checksums csw/mgar/pkg/cpan/Net-DNS-Resolver-Programmable/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Net-DNS-Resolver-Programmable/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/Net-DNS-Resolver-Programmable/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-DNS-Resolver-Programmable/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Net-DNS-Resolver-Programmable/trunk/Makefile 2009-11-25 14:53:52 UTC (rev 7437) @@ -0,0 +1,15 @@ +GARNAME = Net-DNS-Resolver-Programmable +GARVERSION = v0.003 +CATEGORIES = cpan +AUTHOR = JMEHNLE + +DESCRIPTION = Programmable DNS resolver class for offline emulation of DNS +define BLURB +endef + +PACKAGES = CSWpmnetdnsresp +CATALOGNAME = pm_netdnsresp + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Net-DNS-Resolver-Programmable/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-DNS-Resolver-Programmable/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Net-DNS-Resolver-Programmable/trunk/checksums 2009-11-25 14:53:52 UTC (rev 7437) @@ -0,0 +1 @@ +8d44bf331d6115e7fb4ea21f6cf4b96b Net-DNS-Resolver-Programmable-v0.003.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 Nov 25 16:02:15 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Nov 2009 15:02:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[7438] csw/mgar/pkg/libsmi/trunk/Makefile Message-ID: Revision: 7438 http://gar.svn.sourceforge.net/gar/?rev=7438&view=rev Author: dmichelsen Date: 2009-11-25 15:02:01 +0000 (Wed, 25 Nov 2009) Log Message: ----------- libsmi: Make MIBS archall Modified Paths: -------------- csw/mgar/pkg/libsmi/trunk/Makefile Modified: csw/mgar/pkg/libsmi/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsmi/trunk/Makefile 2009-11-25 14:53:52 UTC (rev 7437) +++ csw/mgar/pkg/libsmi/trunk/Makefile 2009-11-25 15:02:01 UTC (rev 7438) @@ -33,10 +33,15 @@ NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) -EXTRA_CPPFLAGS = -Dfabsf=fabs +EXTRA_CPPFLAGS_isa-sparcv8 = -Dfabsf=fabs +EXTRA_CPPFLAGS_isa-sparcv9 = -Dfabsf=fabs +EXTRA_CPPFLAGS_isa-i386 = -Dfabsf=fabs +EXTRA_CPPFLAGS = $(EXTRA_CPPFLAGS_isa-$(ISA)) MERGE_DIRS_isa-extra = $(libdir) +ARCHALL_CSWlibsmimibs = 1 + PKGFILES_CSWlibsmimibs = $(sharedstatedir)/mibs/.* PKGFILES_CSWlibsmimibs += $(sharedstatedir)/pibs/.* 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 Nov 25 16:40:24 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Nov 2009 15:40:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7439] csw/mgar/pkg Message-ID: Revision: 7439 http://gar.svn.sourceforge.net/gar/?rev=7439&view=rev Author: dmichelsen Date: 2009-11-25 15:40:23 +0000 (Wed, 25 Nov 2009) Log Message: ----------- handbrake: Initial commit Added Paths: ----------- csw/mgar/pkg/handbrake/ csw/mgar/pkg/handbrake/branches/ csw/mgar/pkg/handbrake/tags/ csw/mgar/pkg/handbrake/trunk/ csw/mgar/pkg/handbrake/trunk/Makefile csw/mgar/pkg/handbrake/trunk/checksums csw/mgar/pkg/handbrake/trunk/files/ Property changes on: csw/mgar/pkg/handbrake/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/handbrake/trunk/Makefile =================================================================== --- csw/mgar/pkg/handbrake/trunk/Makefile (rev 0) +++ csw/mgar/pkg/handbrake/trunk/Makefile 2009-11-25 15:40:23 UTC (rev 7439) @@ -0,0 +1,25 @@ +GARNAME = HandBrake +GARVERSION = 0.9.4 +CATEGORIES = apps + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = http://download.handbrake.fr/handbrake/releases/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +GARCOMPILER = GNU + +CONFIGURE_ARGS = --prefix=$(prefix) + +BUILD_SCRIPTS = $(WORKSRC)/build/Makefile + +BUILD_ARGS = M4.exe=/opt/csw/bin/gm4 + + +include gar/category.mk Added: csw/mgar/pkg/handbrake/trunk/checksums =================================================================== --- csw/mgar/pkg/handbrake/trunk/checksums (rev 0) +++ csw/mgar/pkg/handbrake/trunk/checksums 2009-11-25 15:40:23 UTC (rev 7439) @@ -0,0 +1 @@ +69f88b2e602550615da75947f914d7e6 HandBrake-0.9.4.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 Nov 25 17:14:19 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Nov 2009 16:14:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[7440] csw/mgar/pkg/a52dec/trunk Message-ID: Revision: 7440 http://gar.svn.sourceforge.net/gar/?rev=7440&view=rev Author: dmichelsen Date: 2009-11-25 16:14:19 +0000 (Wed, 25 Nov 2009) Log Message: ----------- a52dec: Move to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/a52dec/trunk/Makefile csw/mgar/pkg/a52dec/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/a52dec/trunk/files/CSWliba52.depend csw/mgar/pkg/a52dec/trunk/files/CSWliba52.gspec Property Changed: ---------------- csw/mgar/pkg/a52dec/trunk/ Property changes on: csw/mgar/pkg/a52dec/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/a52dec/trunk/Makefile =================================================================== --- csw/mgar/pkg/a52dec/trunk/Makefile 2009-11-25 15:40:23 UTC (rev 7439) +++ csw/mgar/pkg/a52dec/trunk/Makefile 2009-11-25 16:14:19 UTC (rev 7440) @@ -2,20 +2,29 @@ GARVERSION = 0.7.4 CATEGORIES = lib -DESCRIPTION = a free ATSC A/52 stream decoder +DESCRIPTION = A free ATSC A/52 stream decoder define BLURB liba52 is a free library for decoding ATSC A/52 streams. It is released under the terms of the GPL license. The A/52 standard is used in a variety of applications, including digital television and DVD. It is also known as AC-3. endef -UPSTREAM_MASTER_SITES = http://liba52.sourceforge.net/ MASTER_SITES = http://liba52.sourceforge.net/files/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWliba52, depend) # We define upstream file regex so we can be notifed of new upstream software release +UPSTREAM_MASTER_SITES = http://liba52.sourceforge.net/ UFILES_REGEX = (\d+(?:\.\d+)*) -CONFIGURE_ARGS = $(DIRPATHS) --enable-shared --disable-static +PACKAGES = CSWliba52 +CATALOGNAME = a52dec +EXTRA_LINKER_FLAGS = -lsunmath + +BUILD64 = 1 +NO_ISAEXEC = 1 +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-shared --disable-static + +MERGE_DIRS_isa-extra = $(libdir) + include gar/category.mk Modified: csw/mgar/pkg/a52dec/trunk/checksums =================================================================== --- csw/mgar/pkg/a52dec/trunk/checksums 2009-11-25 15:40:23 UTC (rev 7439) +++ csw/mgar/pkg/a52dec/trunk/checksums 2009-11-25 16:14:19 UTC (rev 7440) @@ -1,3 +1 @@ -caa9f5bc44232dc8aeea773fea56be80 download/a52dec-0.7.4.tar.gz -e8c579511a637db82d574dca101eae78 download/CSWliba52.gspec -dbd9108c1c824c0022ec25ec673ba4fa download/CSWliba52.depend +caa9f5bc44232dc8aeea773fea56be80 a52dec-0.7.4.tar.gz Deleted: csw/mgar/pkg/a52dec/trunk/files/CSWliba52.gspec =================================================================== --- csw/mgar/pkg/a52dec/trunk/files/CSWliba52.gspec 2009-11-25 15:40:23 UTC (rev 7439) +++ csw/mgar/pkg/a52dec/trunk/files/CSWliba52.gspec 2009-11-25 16:14:19 UTC (rev 7440) @@ -1,4 +0,0 @@ -%var bitname a52dec -%var pkgname CSWliba52 -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING 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 Nov 25 18:00:57 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Nov 2009 17:00:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[7441] csw/mgar/pkg Message-ID: Revision: 7441 http://gar.svn.sourceforge.net/gar/?rev=7441&view=rev Author: dmichelsen Date: 2009-11-25 17:00:57 +0000 (Wed, 25 Nov 2009) Log Message: ----------- mibdump: Initial commit Modified Paths: -------------- csw/mgar/pkg/mibdump/trunk/Makefile csw/mgar/pkg/mibdump/trunk/checksums Added Paths: ----------- csw/mgar/pkg/mibdump/ csw/mgar/pkg/mibdump/trunk/ Removed Paths: ------------- csw/mgar/pkg/mibdump/trunk/ Modified: csw/mgar/pkg/mibdump/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsmi/trunk/Makefile 2009-11-25 15:02:01 UTC (rev 7438) +++ csw/mgar/pkg/mibdump/trunk/Makefile 2009-11-25 17:00:57 UTC (rev 7441) @@ -1,6 +1,6 @@ -GARNAME = libsmi -GARVERSION = 0.4.8 -CATEGORIES = lib +GARNAME = mibdump +GARVERSION = 0.1.2 +CATEGORIES = utils DESCRIPTION = Allows management applications to access SMI MIB module definitions define BLURB @@ -17,32 +17,14 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWlibsmi CSWlibsmimibs - -CATALOGNAME_CSWlibsmi = libsmi -CATALOGNAME_CSWlibsmimibs = libsmi_mibs - -SPKG_DESC_CSWlibsmi = Library to access SMI MIB module definitions -SPKG_DESC_CSWlibsmimibs = SMI MIB definitions - SPKG_SOURCEURL = http://www.ibr.cs.tu-bs.de/projects/libsmi/ -REQUIRED_PKGS_CSWlibsmi = CSWlibsmimibs +REQUIRED_PKGS = CSWlibsmi BUILD64 = 1 NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) -EXTRA_CPPFLAGS_isa-sparcv8 = -Dfabsf=fabs -EXTRA_CPPFLAGS_isa-sparcv9 = -Dfabsf=fabs -EXTRA_CPPFLAGS_isa-i386 = -Dfabsf=fabs -EXTRA_CPPFLAGS = $(EXTRA_CPPFLAGS_isa-$(ISA)) - MERGE_DIRS_isa-extra = $(libdir) -ARCHALL_CSWlibsmimibs = 1 - -PKGFILES_CSWlibsmimibs = $(sharedstatedir)/mibs/.* -PKGFILES_CSWlibsmimibs += $(sharedstatedir)/pibs/.* - include gar/category.mk Modified: csw/mgar/pkg/mibdump/trunk/checksums =================================================================== --- csw/mgar/pkg/libsmi/trunk/checksums 2009-11-25 15:02:01 UTC (rev 7438) +++ csw/mgar/pkg/mibdump/trunk/checksums 2009-11-25 17:00:57 UTC (rev 7441) @@ -1 +1 @@ -760b6b1070738158708649ed2c63425e libsmi-0.4.8.tar.gz +724bf7632d649087439f5cb0f5b39c19 mibdump-0.1.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Nov 25 19:03:07 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Nov 2009 18:03:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7442] csw/mgar/pkg/orca/trunk/Makefile Message-ID: Revision: 7442 http://gar.svn.sourceforge.net/gar/?rev=7442&view=rev Author: dmichelsen Date: 2009-11-25 18:03:07 +0000 (Wed, 25 Nov 2009) Log Message: ----------- orca: Adjust version string Modified Paths: -------------- csw/mgar/pkg/orca/trunk/Makefile Modified: csw/mgar/pkg/orca/trunk/Makefile =================================================================== --- csw/mgar/pkg/orca/trunk/Makefile 2009-11-25 17:00:57 UTC (rev 7441) +++ csw/mgar/pkg/orca/trunk/Makefile 2009-11-25 18:03:07 UTC (rev 7442) @@ -1,6 +1,6 @@ GARNAME = orca GARVERSION = snapshot-r535 -SPKG_VERSION = r535 +SPKG_VERSION = snapshot_r535 CATEGORIES = utils DESCRIPTION = A system performance monitoring tool 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 Nov 25 21:50:28 2009 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Wed, 25 Nov 2009 20:50:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[7443] csw/mgar/pkg/libmikmod/trunk Message-ID: Revision: 7443 http://gar.svn.sourceforge.net/gar/?rev=7443&view=rev Author: jake_goerzen Date: 2009-11-25 20:50:27 +0000 (Wed, 25 Nov 2009) Log Message: ----------- clean up Makefile; add BUILD64 = 1 Modified Paths: -------------- csw/mgar/pkg/libmikmod/trunk/Makefile csw/mgar/pkg/libmikmod/trunk/checksums Modified: csw/mgar/pkg/libmikmod/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmikmod/trunk/Makefile 2009-11-25 18:03:07 UTC (rev 7442) +++ csw/mgar/pkg/libmikmod/trunk/Makefile 2009-11-25 20:50:27 UTC (rev 7443) @@ -1,22 +1,22 @@ GARNAME = libmikmod -GARVERSION = 3.1.11 +GARVERSION = 3.2.0 +RELEASE = beta2 +DISTVERSION = $(GARVERSION)-$(RELEASE) +DISTNAME = $(GARNAME)-$(DISTVERSION) CATEGORIES = lib - DESCRIPTION = library for MOD audio files and other types define BLURB - Long description + library supporting many formats, including mod, s3m, it, and xm. Originally a player for MS-DOS, endef MASTER_SITES = http://mikmod.raphnet.net/files/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION)-$(RELEASE).tar.gz # 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 = - +BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) +TEST_SCRIPTS = include gar/category.mk Modified: csw/mgar/pkg/libmikmod/trunk/checksums =================================================================== --- csw/mgar/pkg/libmikmod/trunk/checksums 2009-11-25 18:03:07 UTC (rev 7442) +++ csw/mgar/pkg/libmikmod/trunk/checksums 2009-11-25 20:50:27 UTC (rev 7443) @@ -1 +1 @@ -705106da305e8de191549f1e7393185c libmikmod-3.1.11.tar.gz +19fc0879aebd1610813a23bd84726362 libmikmod-3.2.0-beta2.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 Thu Nov 26 00:09:26 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 25 Nov 2009 23:09:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[7444] csw/mgar/pkg/nss/branches/upstream-work Message-ID: Revision: 7444 http://gar.svn.sourceforge.net/gar/?rev=7444&view=rev Author: wahwah Date: 2009-11-25 23:09:26 +0000 (Wed, 25 Nov 2009) Log Message: ----------- nss: Build update based on Wan-Teh Chang's review Modified Paths: -------------- csw/mgar/pkg/nss/branches/upstream-work/Makefile csw/mgar/pkg/nss/branches/upstream-work/files/nss.pc Modified: csw/mgar/pkg/nss/branches/upstream-work/Makefile =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/Makefile 2009-11-25 20:50:27 UTC (rev 7443) +++ csw/mgar/pkg/nss/branches/upstream-work/Makefile 2009-11-25 23:09:26 UTC (rev 7444) @@ -22,15 +22,19 @@ CATEGORIES = lib DESCRIPTION = Network Security Services library, implements PKI support define BLURB + Network Security Services (NSS) is a set of libraries designed to support + cross-platform development of security-enabled client and server + applications. Applications built with NSS can support SSL v2 and v3, TLS, + PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and + other security standards. endef SPKG_SOURCEURL = http://www.mozilla.org/projects/security/pki/nss/ # TODO: Generate RTM_NAME from GARVERSION RTM_NAME = NSS_3_12_4_RTM -MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/ -DIST_SUFFIX = -with-nspr-4.8 -DISTFILES = $(GARNAME)-$(GARVERSION)$(DIST_SUFFIX).tar.gz -DISTNAME = $(GARNAME)-$(GARVERSION)$(DIST_SUFFIX) -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)$(DIST_SUFFIX).tar.gz +MASTER_SITES = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTNAME = $(GARNAME)-$(GARVERSION) +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz REQUIRED_PKGS = CSWnspr CSWsqlite3 PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWsqlite3devel CONFIGURE_SCRIPTS = @@ -39,8 +43,7 @@ TEST_SCRIPTS = BUILD64 = 1 -libdir_install = $(prefix)/lib/nss -# libdir = $(prefix)/lib/nss +libdir_install = $(prefix)/lib includedir = $(prefix)/include/nss ifeq (OPT,$(GARFLAVOR)) @@ -52,20 +55,19 @@ NSPR_INCLUDE_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --cflags-only-I nspr | gsed 's/-I//') export NSPR_INCLUDE_DIR -# To consider in the future. -# NSS_ENABLE_ECC = 1 -# export NSS_ENABLE_ECC +NSS_ENABLE_ECC = 1 +export NSS_ENABLE_ECC # 64-bit suppport ifeq ($(MODULATION),isa-sparcv9) USE_64 = 1 + export USE_64 NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ')/64 - export USE_64 else ifeq ($(MODULATION),isa-amd64) USE_64 = 1 + export USE_64 NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ')/64 - export USE_64 else NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ') endif @@ -75,6 +77,16 @@ # For DBG builds PATCHFILES = whoami.patch +NSS_BINARIES = addbuiltin +NSS_BINARIES += certutil +NSS_BINARIES += cmsutil +NSS_BINARIES += crlutil +NSS_BINARIES += modutil +NSS_BINARIES += pk12util +NSS_BINARIES += signtool +NSS_BINARIES += signver +NSS_BINARIES += ssltap + include gar/category.mk build-nss: build-coreconf build-dbm build-nss-compile @@ -107,25 +119,23 @@ install-nss: ginstall -d -m 755 $(DESTDIR)$(libdir) for f in $(WORKSRC)/mozilla/dist/SunOS5*/lib/*.so; do \ - ginstall -m 755 $${f} $(DESTDIR)$(libdir); \ + ginstall -m 755 $${f} $(DESTDIR)$(libdir); \ + if [ -r $(WORKSRC)/mozilla/dist/SunOS5*/lib/`basename $${f} .so`.chk ]; then \ + ginstall -m 644 \ + $(WORKSRC)/mozilla/dist/SunOS5*/lib/`basename $${f} .so`.chk \ + $(DESTDIR)$(libdir); \ + fi \ done ginstall -d -m 755 $(DESTDIR)$(bindir) # TODO: nss-config # gcp -a $(WORKSRC)/mozilla/dist/*/bin/nss-config $(DESTDIR)$(bindir) ginstall -d -m 755 $(DESTDIR)$(includedir) for f in \ - $(WORKSRC)/mozilla/dist/private/nss/*.h \ $(WORKSRC)/mozilla/dist/public/nss/*.h; \ do \ ginstall -m 644 $${f} $(DESTDIR)$(includedir); \ done - cd $(DESTDIR)$(libdir) && for file in *.so; do \ - if [ ! -h $${file} ]; then \ - gmv -v $${file} $${file}.$(MINOR_VERSION); \ - gln -s $${file}.$(MINOR_VERSION) $${file}; \ - fi; \ - done - for file in $(WORKSRC)/mozilla/dist/*/bin/* ; do \ + for bin in in $(WORKSRC)/mozilla/dist/*/bin/* ; do \ ginstall -m 755 $${file} $(DESTDIR)$(bindir)/nss`basename $${file}`; \ done # Asserting that we have the right version in the .pc file @@ -140,13 +150,3 @@ $(FILEDIR)/nss.pc \ $(DESTDIR)$(prefix)/lib/pkgconfig @$(MAKECOOKIE) - -# Create symlinks allowing to use -L/opt/csw/lib/nss/64 for 64-bit -# architectures. -post-merge: - if [ "$(GARCH)" = sparc ]; then \ - gln -sf sparcv9 $(PKGROOT)$(libdir)/64; \ - elif [ "$(GARCH)" = i386 ]; then \ - gln -sf amd64 $(PKGROOT)$(libdir)/64; \ - fi - @$(MAKECOOKIE) Modified: csw/mgar/pkg/nss/branches/upstream-work/files/nss.pc =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/files/nss.pc 2009-11-25 20:50:27 UTC (rev 7443) +++ csw/mgar/pkg/nss/branches/upstream-work/files/nss.pc 2009-11-25 23:09:26 UTC (rev 7444) @@ -7,5 +7,5 @@ Description: Network Security Services Version: 3.12.4 Requires: nspr >= 4.8.0 -Libs: -L${libdir} -lssl3 -lsmime3 -lnssutil3 -lnss3 -R${libdir} +Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lnssutil3 -R${libdir} Cflags: -I${includedir} 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 Nov 26 01:37:10 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 26 Nov 2009 00:37:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7445] csw/mgar/pkg/nspr/trunk/Makefile Message-ID: Revision: 7445 http://gar.svn.sourceforge.net/gar/?rev=7445&view=rev Author: wahwah Date: 2009-11-26 00:37:10 +0000 (Thu, 26 Nov 2009) Log Message: ----------- nspr: Tried tests, they fail. Modified Paths: -------------- csw/mgar/pkg/nspr/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/nspr/trunk/Makefile Modified: csw/mgar/pkg/nspr/trunk/Makefile =================================================================== --- csw/mgar/pkg/nspr/trunk/Makefile 2009-11-25 23:09:26 UTC (rev 7444) +++ csw/mgar/pkg/nspr/trunk/Makefile 2009-11-26 00:37:10 UTC (rev 7445) @@ -1,3 +1,11 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# Based on the following resources: +# - http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nspr/nspr-4.8.ebuild?view=markup +# - https://developer.mozilla.org/En/NSPR_build_instructions + GARNAME = nspr MAJOR_VERSION = 4 MIN_VERSION = 8 @@ -34,6 +42,8 @@ CONFIGURE_SCRIPTS = nspr BUILD_SCRIPTS = nspr +# TEST_SCRIPTS = nspr +# Some tests are failing TEST_SCRIPTS = INSTALL_SCRIPTS = nspr @@ -46,12 +56,10 @@ includedir = $(prefix)/include/nspr CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --enable-ipv6 CONFIGURE_ARGS_isa-sparcv9 = --enable-64bit CONFIGURE_ARGS_isa-amd64 = --enable-64bit CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION)) -# http://docs.sun.com/app/docs/doc/819-5265/bjaur?a=view -CONFIGURE_ARGS_OPT = --enable-optimize="-xO3 -xlibmil" +CONFIGURE_ARGS_OPT = --enable-optimize="-xO3" CONFIGURE_ARGS_OPT += --disable-debug CONFIGURE_ARGS_OPT += --enable-strip CONFIGURE_ARGS_DBG = --enable-debug @@ -72,15 +80,21 @@ build-nspr: (cd $(WORKSRC)/build && $(BUILD_ENV) gmake) + (cd $(WORKSRC)/build/pr/tests && $(BUILD_ENV) gmake) @$(MAKECOOKIE) +test-nspr: test-accept test-runtests + +test-accept: + (cd $(WORKSRC)/build/pr/tests && DYLD_LIBRARY_PATH=../../dist/lib ./accept) + @$(MAKECOOKIE) + +test-runtests: + (cd $(WORKSRC)/build/pr/tests && DYLD_LIBRARY_PATH=../../dist/lib ../../../mozilla/nsprpub/pr/tests/runtests.sh) + @$(MAKECOOKIE) + install-nspr: (cd $(WORKSRC)/build && $(INSTALL_ENV) gmake install DESTDIR=$(DESTDIR)) - (cd $(DESTDIR)$(libdir) \ - && for file in *.so; do \ - mv $${file} $${file}.$(MIN_VERSION); \ - ln -s $${file}.$(MIN_VERSION) $${file}; \ - done) ginstall -m 755 -d $(DESTDIR)$(bindir) ginstall -m 755 $(WORKSRC)/build/config/nspr-config \ $(DESTDIR)$(bindir) Property changes on: csw/mgar/pkg/nspr/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Nov 26 03:59:28 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 26 Nov 2009 02:59:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[7446] csw/mgar/pkg Message-ID: Revision: 7446 http://gar.svn.sourceforge.net/gar/?rev=7446&view=rev Author: bdwalton Date: 2009-11-26 02:59:25 +0000 (Thu, 26 Nov 2009) Log Message: ----------- logwatch: port to GAR; _huge_ version bump Added Paths: ----------- csw/mgar/pkg/logwatch/ csw/mgar/pkg/logwatch/branches/ csw/mgar/pkg/logwatch/tags/ csw/mgar/pkg/logwatch/trunk/ csw/mgar/pkg/logwatch/trunk/Makefile csw/mgar/pkg/logwatch/trunk/checksums csw/mgar/pkg/logwatch/trunk/files/ csw/mgar/pkg/logwatch/trunk/files/logwatch.wrapper Property changes on: csw/mgar/pkg/logwatch/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/logwatch/trunk/Makefile =================================================================== --- csw/mgar/pkg/logwatch/trunk/Makefile (rev 0) +++ csw/mgar/pkg/logwatch/trunk/Makefile 2009-11-26 02:59:25 UTC (rev 7446) @@ -0,0 +1,103 @@ +GARNAME = logwatch +GARVERSION = 7.3.6 +CATEGORIES = utils + +ARCHALL = 1 +REQUIRED_PKGS = CSWperl CSWgnulinks CSWgfile CSWggrep CSWfortune CSWgawk + +LICENSE = License + +DESCRIPTION = Logwatch is a customizable log analysis system +define BLURB +Logwatch is a customizable log analysis system. Logwatch parses through your system's logs for a given period of time and creates a report analyzing areas that you specify, in as much detail as you require. Logwatch is easy to use and will work right out of the package on most systems. +endef + +MASTER_SITES = ftp://ftp.kaybee.org/pub/linux/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream +# software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# 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_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +INSTALL = /opt/csw/bin/ginstall +INSTALLDIR = $(INSTALL) -m 0755 -d +INSTALLEXE = $(INSTALL) -m 0755 +INSTALLDATA = $(INSTALL) -m 0644 + +BINDIR = $(bindir) +SHAREDIR = $(datadir)/$(GARNAME) +MANDIR = $(datadir)/man +DOCDIR = $(datadir)/doc/$(GARNAME) +CONFDIR = /etc/opt/csw/$(GARNAME) +TMPDIR = /var/opt/csw/$(GARNAME) + +post-extract-modulated: + cp $(FILEDIR)/logwatch.wrapper $(WORKSRC)/ + +install-custom: + (cd $(WORKSRC); \ + $(INSTALLDIR) $(DESTDIR)$(TMPDIR); \ + $(INSTALLDIR) $(DESTDIR)$(BINDIR); \ + $(INSTALLDIR) $(DESTDIR)$(CONFDIR); \ + $(INSTALLDIR) $(DESTDIR)$(CONFDIR)/conf; \ + $(INSTALLDIR) $(DESTDIR)$(CONFDIR)/scripts; \ + $(INSTALLDIR) $(DESTDIR)$(CONFDIR)/scripts/services; \ + $(INSTALLDIR) $(DESTDIR)$(CONFDIR)/scripts/conf; \ + $(INSTALLDIR) $(DESTDIR)$(CONFDIR)/scripts/conf/logfiles; \ + $(INSTALLDIR) $(DESTDIR)$(CONFDIR)/scripts/conf/services; \ + $(INSTALLDIR) $(DESTDIR)$(CONFDIR)/scripts/conf/html; \ + $(INSTALLDIR) $(DESTDIR)$(DOCDIR); \ + $(INSTALLDIR) $(DESTDIR)$(SHAREDIR); \ + $(INSTALLDIR) $(DESTDIR)$(SHAREDIR)/dist.conf; \ + $(INSTALLDIR) $(DESTDIR)$(SHAREDIR)/dist.conf/logfiles; \ + $(INSTALLDIR) $(DESTDIR)$(SHAREDIR)/dist.conf/services; \ + $(INSTALLDIR) $(DESTDIR)$(SHAREDIR)/default.conf; \ + $(INSTALLDIR) $(DESTDIR)$(SHAREDIR)/default.conf/logfiles; \ + $(INSTALLDIR) $(DESTDIR)$(SHAREDIR)/default.conf/services; \ + $(INSTALLDIR) $(DESTDIR)$(SHAREDIR)/default.conf/html; \ + $(INSTALLDIR) $(DESTDIR)$(SHAREDIR)/scripts; \ + $(INSTALLDIR) $(DESTDIR)$(SHAREDIR)/scripts/logfiles; \ + $(INSTALLDIR) $(DESTDIR)$(SHAREDIR)/scripts/services; \ + $(INSTALLDIR) $(DESTDIR)$(SHAREDIR)/scripts/shared; \ + $(INSTALLDIR) $(DESTDIR)$(SHAREDIR)/lib; \ + $(INSTALLDATA) README $(DESTDIR)$(DOCDIR)/README; \ + $(INSTALLDATA) HOWTO-Customize-LogWatch $(DESTDIR)$(DOCDIR)/HOWTO-Customize-LogWatch; \ + $(INSTALLDATA) conf/*.conf $(DESTDIR)$(SHAREDIR)/default.conf; \ + $(INSTALLDATA) conf/logfiles/* $(DESTDIR)$(SHAREDIR)/default.conf/logfiles/; \ + $(INSTALLDATA) conf/services/* $(DESTDIR)$(SHAREDIR)/default.conf/services/; \ + $(INSTALLDATA) conf/html/* $(DESTDIR)$(SHAREDIR)/default.conf/html/; \ + $(INSTALLEXE) scripts/logwatch.pl $(DESTDIR)$(BINDIR); \ + for i in scripts/logfiles/*; do \ + if [ `ls $$i | grep -v CVS | wc -l` -ne 0 ]; then \ + $(INSTALLDIR) $(DESTDIR)$(SHAREDIR)/$$i; \ + $(INSTALLDATA) $$i/* $(DESTDIR)$(SHAREDIR)/$$i; \ + fi; \ + done; \ + $(INSTALLDATA) scripts/shared/* $(DESTDIR)$(SHAREDIR)/scripts/shared; \ + $(INSTALLDATA) scripts/services/* $(DESTDIR)$(SHAREDIR)/scripts/services; \ + $(INSTALLDATA) lib/* $(DESTDIR)$(SHAREDIR)/lib; \ + touch $(DESTDIR)$(CONFDIR)/conf/logwatch.conf; \ + touch $(DESTDIR)$(CONFDIR)/conf/ignore.conf; \ + touch $(DESTDIR)$(CONFDIR)/conf/override.conf; \ + perl -pi -e "s%/usr/share%/opt/csw/share%" $(DESTDIR)$(BINDIR)/logwatch.pl; \ + perl -pi -e "s%/usr/bin/perl%/opt/csw/bin/perl%" $(DESTDIR)$(BINDIR)/logwatch.pl; \ + perl -pi -e "s%/etc/logwatch%/etc/opt/csw/logwatch%" $(DESTDIR)$(BINDIR)/logwatch.pl; \ + $(INSTALLDIR) $(DESTDIR)$(TMPDIR); \ + echo "TmpDir = $(TMPDIR)" >> $(DESTDIR)$(CONFDIR)/conf/logwatch.conf; \ + $(INSTALLDIR) $(DESTDIR)$(MANDIR)/man8; \ + $(INSTALLDATA) logwatch.8 $(DESTDIR)$(MANDIR)/man8; \ + $(INSTALLEXE) logwatch.wrapper $(DESTDIR)$(BINDIR)/logwatch ) + @$(MAKECOOKIE) \ No newline at end of file Added: csw/mgar/pkg/logwatch/trunk/checksums =================================================================== --- csw/mgar/pkg/logwatch/trunk/checksums (rev 0) +++ csw/mgar/pkg/logwatch/trunk/checksums 2009-11-26 02:59:25 UTC (rev 7446) @@ -0,0 +1 @@ +937d982006b2a76a83edfcfd2e5a9d7d logwatch-7.3.6.tar.gz Added: csw/mgar/pkg/logwatch/trunk/files/logwatch.wrapper =================================================================== --- csw/mgar/pkg/logwatch/trunk/files/logwatch.wrapper (rev 0) +++ csw/mgar/pkg/logwatch/trunk/files/logwatch.wrapper 2009-11-26 02:59:25 UTC (rev 7446) @@ -0,0 +1,6 @@ +#!/bin/sh + +PATH=/opt/csw/gnu:/opt/csw/bin:$PATH +export PATH + +exec /opt/csw/bin/logwatch.pl $* 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 Nov 26 04:15:32 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 26 Nov 2009 03:15:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7447] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7447 http://gar.svn.sourceforge.net/gar/?rev=7447&view=rev Author: bdwalton Date: 2009-11-26 03:15:29 +0000 (Thu, 26 Nov 2009) Log Message: ----------- mgar: add support for CRONTABS variable to set cswcrontab in prototype Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-11-26 02:59:25 UTC (rev 7446) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-11-26 03:15:29 UTC (rev 7447) @@ -185,10 +185,12 @@ SPKG_CLASSES := $(call _spkg_cond_add,PRESERVECONF,cswpreserveconf) SPKG_CLASSES := $(call _spkg_cond_add,ETCSERVICES,cswetcservices) SPKG_CLASSES := $(call _spkg_cond_add,USERGROUP,cswusergroup) +SPKG_CLASSES := $(call _spkg_cond_add,CRONTABS,cswcrontab) SPKG_CLASSES := $(call _spkg_cond_add,PYCOMPILE,cswpycompile) SPKG_CLASSES := $(call _spkg_cond_add,INETDCONF,cswinetd) SPKG_CLASSES := $(call _spkg_cond_add,INITSMF,cswinitsmf) + # This is the default path for texinfo pages to be picked up. Extend or replace as necessary. TEXINFO ?= $(infodir)/.*\.info(?:-\d+)? $(EXTRA_TEXINFO) @@ -201,6 +203,7 @@ $(foreach FILE,$(INETDCONF),$$F[1] = "cswinetd" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(INITSMF),$$F[1] = "cswinitsmf" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(USERGROUP),$$F[1] = "cswusergroup" if( $$F[2] =~ m(^$(FILE)$$) );)\ + $(foreach FILE,$(CRONTABS),$$F[1] = "cswcrontab" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(if $(PYCOMPILE),$(foreach FILE,$(_PYCOMPILE_FILES),$$F[1] = "cswpycompile" if( $$F[2] =~ m(^$(FILE)$$) );))\ $(foreach FILE,$(TEXINFO),$$F[1] = "cswtexinfo" if( $$F[2] =~ m(^$(FILE)$$) );)\ print join(" ", at F),"\n";' 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 Nov 26 04:18:44 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 26 Nov 2009 03:18:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7448] csw/mgar/pkg/logwatch/trunk/Makefile Message-ID: Revision: 7448 http://gar.svn.sourceforge.net/gar/?rev=7448&view=rev Author: bdwalton Date: 2009-11-26 03:18:44 +0000 (Thu, 26 Nov 2009) Log Message: ----------- logwatch: add cron support Modified Paths: -------------- csw/mgar/pkg/logwatch/trunk/Makefile Modified: csw/mgar/pkg/logwatch/trunk/Makefile =================================================================== --- csw/mgar/pkg/logwatch/trunk/Makefile 2009-11-26 03:15:29 UTC (rev 7447) +++ csw/mgar/pkg/logwatch/trunk/Makefile 2009-11-26 03:18:44 UTC (rev 7448) @@ -32,6 +32,10 @@ include gar/category.mk +sysconfdir = /etc/opt/csw +CRONDIR = $(sysconfdir)/CSW$(GARNAME)/crontabs +CRONTABS = $(CRONDIR)/root + INSTALL = /opt/csw/bin/ginstall INSTALLDIR = $(INSTALL) -m 0755 -d INSTALLEXE = $(INSTALL) -m 0755 @@ -41,7 +45,7 @@ SHAREDIR = $(datadir)/$(GARNAME) MANDIR = $(datadir)/man DOCDIR = $(datadir)/doc/$(GARNAME) -CONFDIR = /etc/opt/csw/$(GARNAME) +CONFDIR = $(sysconfdir)/$(GARNAME) TMPDIR = /var/opt/csw/$(GARNAME) post-extract-modulated: @@ -99,5 +103,7 @@ echo "TmpDir = $(TMPDIR)" >> $(DESTDIR)$(CONFDIR)/conf/logwatch.conf; \ $(INSTALLDIR) $(DESTDIR)$(MANDIR)/man8; \ $(INSTALLDATA) logwatch.8 $(DESTDIR)$(MANDIR)/man8; \ - $(INSTALLEXE) logwatch.wrapper $(DESTDIR)$(BINDIR)/logwatch ) + $(INSTALLEXE) logwatch.wrapper $(DESTDIR)$(BINDIR)/logwatch; \ + $(INSTALLDIR) $(DESTDIR)$(CRONDIR); \ + echo "02 4 * * * /opt/csw/sbin/logwatch" > $(DESTDIR)$(CRONTABS) ) @$(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 dmichelsen at users.sourceforge.net Thu Nov 26 10:20:21 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 26 Nov 2009 09:20:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[7449] csw/mgar/pkg Message-ID: Revision: 7449 http://gar.svn.sourceforge.net/gar/?rev=7449&view=rev Author: dmichelsen Date: 2009-11-26 09:20:20 +0000 (Thu, 26 Nov 2009) Log Message: ----------- mtools: Initial commit Added Paths: ----------- csw/mgar/pkg/mtools/ csw/mgar/pkg/mtools/branches/ csw/mgar/pkg/mtools/tags/ csw/mgar/pkg/mtools/trunk/ csw/mgar/pkg/mtools/trunk/Makefile csw/mgar/pkg/mtools/trunk/checksums csw/mgar/pkg/mtools/trunk/files/ csw/mgar/pkg/mtools/trunk/files/0001-Removeprototypes-unknown-to-Sun-Studio.patch Property changes on: csw/mgar/pkg/mtools/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/mtools/trunk/Makefile =================================================================== --- csw/mgar/pkg/mtools/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mtools/trunk/Makefile 2009-11-26 09:20:20 UTC (rev 7449) @@ -0,0 +1,29 @@ +GARNAME = mtools +GARVERSION = 4.0.12 +CATEGORIES = utils + +DESCRIPTION = read/write/list/format DOS disks under Unix +define BLURB + Mtools is a collection of utilities to access MS-DOS disks from GNU + and Unix without mounting them. It supports long file names, OS/2 Xdf + disks, ZIP/JAZ disks and 2m disks (store up to 1992k on a high density + 3 1/2 disk). +endef + +MASTER_SITES = http://ftp.gnu.org/gnu/mtools/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +PATCHFILES = 0001-Removeprototypes-unknown-to-Sun-Studio.patch + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +# X11 is also used, but Openwin X11 is sufficient. +REQUIRED_PKGS = CSWiconv + +EXTRA_LINKER_FLAGS = -liconv + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/mtools/trunk/checksums =================================================================== --- csw/mgar/pkg/mtools/trunk/checksums (rev 0) +++ csw/mgar/pkg/mtools/trunk/checksums 2009-11-26 09:20:20 UTC (rev 7449) @@ -0,0 +1,2 @@ +b3625d680ccc02b0a941e98c5bd36118 0001-Removeprototypes-unknown-to-Sun-Studio.patch +0ee77a14e5f113ad8136a867f8ed4c3a mtools-4.0.12.tar.bz2 Added: csw/mgar/pkg/mtools/trunk/files/0001-Removeprototypes-unknown-to-Sun-Studio.patch =================================================================== --- csw/mgar/pkg/mtools/trunk/files/0001-Removeprototypes-unknown-to-Sun-Studio.patch (rev 0) +++ csw/mgar/pkg/mtools/trunk/files/0001-Removeprototypes-unknown-to-Sun-Studio.patch 2009-11-26 09:20:20 UTC (rev 7449) @@ -0,0 +1,25 @@ +From acaf71a39ce5155d336b0fcdfea3a475952bcfdf Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 26 Nov 2009 10:10:13 +0100 +Subject: [PATCH] Removeprototypes unknown to Sun Studio + +--- + mtools.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/mtools.h b/mtools.h +index 0d4fa6f..94ffc63 100644 +--- a/mtools.h ++++ b/mtools.h +@@ -251,7 +251,7 @@ char getDrive(Stream_t *Stream); + + + void printOom(void); +-int ask_confirmation(const char *, ...) __attribute__ ((format (printf, 1, 2))); ++int ask_confirmation(const char *, ...); + + int helpFlag(int, char **); + +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Nov 26 10:42:20 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 26 Nov 2009 09:42:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[7450] csw/mgar/pkg/openldap/trunk Message-ID: Revision: 7450 http://gar.svn.sourceforge.net/gar/?rev=7450&view=rev Author: dmichelsen Date: 2009-11-26 09:42:20 +0000 (Thu, 26 Nov 2009) Log Message: ----------- openldap: Update merging Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/Makefile csw/mgar/pkg/openldap/trunk/checksums Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2009-11-26 09:20:20 UTC (rev 7449) +++ csw/mgar/pkg/openldap/trunk/Makefile 2009-11-26 09:42:20 UTC (rev 7450) @@ -1,8 +1,8 @@ GARNAME = openldap -GARVERSION = 2.4.18 +GARVERSION = 2.4.19 CATEGORIES = server EXTRA_MODULATORS = GARVERSION -MODULATIONS_GARVERSION = 2.3.43 2.4.18 +MODULATIONS_GARVERSION = 2.3.43 2.4.19 DESCRIPTION = Open source implementation of the Lightweight Directory Access Protocol define BLURB @@ -13,8 +13,6 @@ OpenLDAP Suite and its related documentation. endef -# Missing lib: ld.so.1: svn: fatal: libldap-2.3.so.0: open failed: No such file or directory - MASTER_SITES = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(GARNAME)-$(VERSION).tgz) DISTFILES = $(SOURCEFILES) @@ -22,13 +20,13 @@ DISTFILES += README.CSW openldaprc DISTFILES += cswopenldap openldap.xml svc-openldap -PATCHFILES_isa-sparcv8-garversion-2.4.18 = patch-oldap-2.4.16-ntlm.diff -PATCHFILES_isa-sparcv9-garversion-2.4.18 = patch-oldap-2.4.16-ntlm.diff -PATCHFILES_isa-i386-garversion-2.4.18 = patch-oldap-2.4.16-ntlm.diff -PATCHFILES_isa-amd64-garversion-2.4.18 = patch-oldap-2.4.16-ntlm.diff +PATCHFILES_isa-sparcv8-garversion-2.4.19 = patch-oldap-2.4.16-ntlm.diff +PATCHFILES_isa-sparcv9-garversion-2.4.19 = patch-oldap-2.4.16-ntlm.diff +PATCHFILES_isa-i386-garversion-2.4.19 = patch-oldap-2.4.16-ntlm.diff +PATCHFILES_isa-amd64-garversion-2.4.19 = patch-oldap-2.4.16-ntlm.diff +PATCHFILES += patch-libtool-64bit.diff DISTFILES += patch-oldap-2.4.16-ntlm.diff - NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tgz,$(SOURCEFILES)) LICENSE = COPYRIGHT @@ -45,7 +43,7 @@ SPKG_DESC_CSWoldapdevel = OpenLDAP development support SPKG_DESC_CSWoldaprt = OpenLDAP runtime libraries -REQUIRED_PKGS_CSWoldap = CSWbdb CSWiconv CSWlibnet CSWlibtoolrt CSWoldaprt +REQUIRED_PKGS_CSWoldap = CSWbdb47 CSWiconv CSWlibnet CSWlibtoolrt CSWoldaprt REQUIRED_PKGS_CSWoldap += CSWosslrt CSWsasl CSWtcpwrap CSWunixodbc CSWcswclassutils REQUIRED_PKGS_CSWoldap += CSWkrb5lib CSWlibicu CSWperl REQUIRED_PKGS_CSWoldapclient = CSWlibnet CSWoldaprt CSWosslrt CSWsasl CSWkrb5lib @@ -59,11 +57,20 @@ EXTRA_DOCS = README.CSW $(PATCHFILES) -# OpenLDAP 2.3 was bound to bdb44 -#EXTRA_LIB = $(prefix)/bdb44/lib -#EXTRA_INC = $(prefix)/bdb44/include +EXTRA_LIB_garversion-2.3.43 = $(prefix)/bdb44/lib +EXTRA_INC_garversion-2.3.43 = $(prefix)/bdb44/include +EXTRA_LIB_garversion-2.4.19 = $(prefix)/bdb47/lib +EXTRA_INC_garversion-2.4.19 = $(prefix)/bdb47/include +EXTRA_LIB = $(EXTRA_LIB_garversion-$(GARVERSION)) +EXTRA_INC = $(EXTRA_INC_garversion-$(GARVERSION)) +sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw + +MIGRATECONF = openldap + BUILD64 = 1 +NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-crypt CONFIGURE_ARGS += --enable-lmpasswd @@ -85,8 +92,17 @@ # Disable MySQL Cluster CONFIGURE_ARGS += --disable-ndb -TEST_SCRIPTS = +TEST_TARGET = check +MERGE_SCRIPTS_isa-default-garversion-2.3.43 = copy-only +MERGE_DIRS_isa-default-garversion-2.3.43 = $(libdir) +MERGE_SCRIPTS_isa-default64-garversion-2.3.43 = copy-relocated-only +MERGE_DIRS_isa-default64-garversion-2.3.43 = $(libdir) + +MERGE_SCRIPTS_isa-default-garversion-2.4.19 = copy-all +MERGE_SCRIPTS_isa-default64-garversion-2.4.19 = copy-relocated-only +MERGE_DIRS_isa-default64-garversion-2.4.19 = $(bindir) $(sbindir) $(libexecdir) $(libdir) + PKGFILES_CSWoldapclient = $(bindir)/.* PKGFILES_CSWoldapclient += $(mandir)/man1/.* @@ -98,7 +114,6 @@ PKGFILES_CSWoldaprt += $(mandir)/man5/ldap.conf.5 INITSMF = /etc/opt/csw/init.d/cswopenldap -#PROTOTYPE_FILTER = awk '$$$$3 ~/\/init.d\/cswopenldap$$$$/ { $$$$2 = "cswinitsmf" } { print }' include gar/category.mk @@ -109,4 +124,4 @@ ginstall -D $(DOWNLOADDIR)/cswopenldap \ $(PKGROOT)/etc/opt/csw/init.d/cswopenldap $(foreach F,$(EXTRA_DOCS),ginstall -D $(DOWNLOADDIR)/$F $(PKGROOT)$(docdir)/$(GARNAME)/$F;) - #@$(MAKECOOKIE) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/openldap/trunk/checksums =================================================================== --- csw/mgar/pkg/openldap/trunk/checksums 2009-11-26 09:20:20 UTC (rev 7449) +++ csw/mgar/pkg/openldap/trunk/checksums 2009-11-26 09:42:20 UTC (rev 7450) @@ -1,9 +1,10 @@ -2f6e6a8c9c3497f1c0c9d52ea2d1dafa download/CSWoldap.gspec -892dba5f625755be024c30ea0055fd55 download/README.CSW -c50f5c4040139b6cf57fcc08abffbee7 download/cswopenldap -1b25281086eb146b8e11ebd33de086dc download/openldap-2.3.43.tgz -fecd7a64b6d9a0eb79b817d2562956ed download/openldap-2.4.18.tgz -0e57547ad2b5fedca9f0bd4beaddfe39 download/openldap.xml -ab2ac7519b092ce8d16124c5270bfec0 download/openldaprc -d3dee9018137c39f357859b652e3a67c download/patch-oldap-2.4.16-ntlm.diff -e15c2020566e56f02118e75c89111f15 download/svc-openldap +2f6e6a8c9c3497f1c0c9d52ea2d1dafa CSWoldap.gspec +892dba5f625755be024c30ea0055fd55 README.CSW +c50f5c4040139b6cf57fcc08abffbee7 cswopenldap +1b25281086eb146b8e11ebd33de086dc openldap-2.3.43.tgz +4a6dab2711fcf141f19bb680bc335887 openldap-2.4.19.tgz +0e57547ad2b5fedca9f0bd4beaddfe39 openldap.xml +ab2ac7519b092ce8d16124c5270bfec0 openldaprc +93dc2a04fd943c198ad00edd4d88ce65 patch-libtool-64bit.diff +d3dee9018137c39f357859b652e3a67c patch-oldap-2.4.16-ntlm.diff +e15c2020566e56f02118e75c89111f15 svc-openldap 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 Nov 26 11:21:27 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 26 Nov 2009 10:21:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7451] csw/mgar/pkg/libstatgrab/trunk/Makefile Message-ID: Revision: 7451 http://gar.svn.sourceforge.net/gar/?rev=7451&view=rev Author: dmichelsen Date: 2009-11-26 10:21:26 +0000 (Thu, 26 Nov 2009) Log Message: ----------- libstatgrab: Use Solaris curses Modified Paths: -------------- csw/mgar/pkg/libstatgrab/trunk/Makefile Modified: csw/mgar/pkg/libstatgrab/trunk/Makefile =================================================================== --- csw/mgar/pkg/libstatgrab/trunk/Makefile 2009-11-26 09:42:20 UTC (rev 7450) +++ csw/mgar/pkg/libstatgrab/trunk/Makefile 2009-11-26 10:21:26 UTC (rev 7451) @@ -2,9 +2,13 @@ GARVERSION = 0.16 CATEGORIES = lib -DESCRIPTION = Brief description +DESCRIPTION = A library that provides cross platform access to statistics define BLURB - Long description + libstatgrab is a library that provides cross platform access to statistics + about the system on which it's run. It's written in C and presents a selection + of useful interfaces which can be used to access key system statistics. The + current list of statistics includes CPU usage, memory utilisation, disk usage, + process counts, network traffic, disk I/O, and more. endef MASTER_SITES = ftp://ftp.uk.i-scream.org/pub/i-scream/libstatsgrab/ @@ -14,10 +18,12 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS = CSWncurses +# Don't pull in ncurses from CSW +LINKER_FLAGS = BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-curses-prefix=/usr TEST_TARGET = check 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 Nov 26 11:42:26 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 26 Nov 2009 10:42:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[7452] csw/mgar/pkg/ffmpeg/trunk Message-ID: Revision: 7452 http://gar.svn.sourceforge.net/gar/?rev=7452&view=rev Author: wahwah Date: 2009-11-26 10:42:26 +0000 (Thu, 26 Nov 2009) Log Message: ----------- ffmpeg: better CONFIGURE_ARGS Modified Paths: -------------- csw/mgar/pkg/ffmpeg/trunk/Makefile csw/mgar/pkg/ffmpeg/trunk/checksums Added Paths: ----------- csw/mgar/pkg/ffmpeg/trunk/files/gnu-grep.patch Property Changed: ---------------- csw/mgar/pkg/ffmpeg/trunk/Makefile Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile 2009-11-26 10:21:26 UTC (rev 7451) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2009-11-26 10:42:26 UTC (rev 7452) @@ -1,3 +1,7 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + GARNAME = ffmpeg GARVERSION = 0.5 CATEGORIES = lib @@ -11,17 +15,17 @@ MASTER_SITES = http://ffmpeg.org/releases/ DISTFILES = $(DISTNAME).tar.bz2 -# We define upstream file regex so we can be notifed of new upstream software release +PATCHFILES = gnu-grep.patch + UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 BUILD64 = 1 NO_ISAEXEC = 1 -CONFIGURE_ARGS = --prefix=$(prefix) -CONFIGURE_ARGS += --bindir=$(bindir) -CONFIGURE_ARGS += --datadir=$(datadir) -CONFIGURE_ARGS += --libdir=$(libdir) -CONFIGURE_ARGS += --shlibdir=$(libdir) -CONFIGURE_ARGS += --incdir=$(includedir) -CONFIGURE_ARGS += --mandir=$(mandir) +FFMPEG_CONFIGURE_ARGS_1 = $(filter-out --exec_%,$(DIRPATHS)) +FFMPEG_CONFIGURE_ARGS_2 = $(filter-out --sbindir%,$(FFMPEG_CONFIGURE_ARGS_1)) +CONFIGURE_ARGS = $(FFMPEG_CONFIGURE_ARGS) + +GARCOMPILER = GNU + include gar/category.mk Property changes on: csw/mgar/pkg/ffmpeg/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/ffmpeg/trunk/checksums =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/checksums 2009-11-26 10:21:26 UTC (rev 7451) +++ csw/mgar/pkg/ffmpeg/trunk/checksums 2009-11-26 10:42:26 UTC (rev 7452) @@ -1 +1,2 @@ be8503f15c3b81ba00eb8379ca8dcf33 ffmpeg-0.5.tar.bz2 +aa4573b73656b4105abb209eab474680 gnu-grep.patch Added: csw/mgar/pkg/ffmpeg/trunk/files/gnu-grep.patch =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/files/gnu-grep.patch (rev 0) +++ csw/mgar/pkg/ffmpeg/trunk/files/gnu-grep.patch 2009-11-26 10:42:26 UTC (rev 7452) @@ -0,0 +1,74 @@ +--- ffmpeg-0.5/configure.orig 2009-11-25 00:00:57.441086148 +0100 ++++ ffmpeg-0.5/configure 2009-11-25 00:01:18.358790303 +0100 +@@ -1217,7 +1217,7 @@ + disable source_path_used + else + source_path="`cd \"$source_path\"; pwd`" +- echo "$source_path" | grep -q '[[:blank:]]' && ++ echo "$source_path" | ggrep -q '[[:blank:]]' && + die "Out of tree builds are impossible with whitespace in source path." + fi + +@@ -1363,13 +1363,13 @@ + fi + rm $TMPSH + +-if $cc --version 2>/dev/null | grep -qi gcc; then ++if $cc --version 2>/dev/null | ggrep -qi gcc; then + cc_type=gcc +-elif $cc --version 2>/dev/null | grep -q Intel; then ++elif $cc --version 2>/dev/null | ggrep -q Intel; then + cc_type=icc +-elif $cc -v 2>&1 | grep -q xlc; then ++elif $cc -v 2>&1 | ggrep -q xlc; then + cc_type=xlc +-elif $cc -V 2>/dev/null | grep -q Compaq; then ++elif $cc -V 2>/dev/null | ggrep -q Compaq; then + cc_type=ccc + DEPEND_CMD='$(CC) $(CFLAGS) -M $< | sed -e "/^\#.*/d" -e "s,^[[:space:]]*$(*F)\\.o,$(@D)/$(*F).o,"' + add_ldflags -Wl,-z,now # calls to libots crash without this +@@ -1488,7 +1488,7 @@ + # helps building libavcodec + add_cflags -DPIC -fomit-frame-pointer + # 3 gcc releases known for BeOS, each with ugly bugs +- gcc_version="`$cc -v 2>&1 | grep version | cut -d ' ' -f3-`" ++ gcc_version="`$cc -v 2>&1 | ggrep version | cut -d ' ' -f3-`" + case "$gcc_version" in + 2.9-beos-991026*|2.9-beos-000224*) echo "R5/GG gcc" + disable mmx +@@ -1503,7 +1503,7 @@ + # no need for libm, but the inet stuff + # Check for BONE + # XXX: actually should check for NOT net_server +- if echo $BEINCLUDES | grep -q 'headers/be/bone'; then ++ if echo $BEINCLUDES | ggrep -q 'headers/be/bone'; then + network_extralibs="-lbind -lsocket" + else + enable beos_netserver +@@ -1798,7 +1798,7 @@ + check_cc <> config.mak This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Thu Nov 26 13:02:04 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 26 Nov 2009 12:02:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[7453] csw/mgar/pkg/zlib/trunk/Makefile Message-ID: Revision: 7453 http://gar.svn.sourceforge.net/gar/?rev=7453&view=rev Author: hson Date: 2009-11-26 12:02:04 +0000 (Thu, 26 Nov 2009) Log Message: ----------- zlib: Add optmized libraries to packages Modified Paths: -------------- csw/mgar/pkg/zlib/trunk/Makefile Modified: csw/mgar/pkg/zlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/zlib/trunk/Makefile 2009-11-26 10:42:26 UTC (rev 7452) +++ csw/mgar/pkg/zlib/trunk/Makefile 2009-11-26 12:02:04 UTC (rev 7453) @@ -31,6 +31,7 @@ BUILD64 = 1 #NO_ISAEXEC = 1 +EXTRA_BUILD_ISAS = sparcv8plus sparcv8plus+vis pentium_pro+mmx pentium CONFIGURE_ARGS = --prefix=$(prefix) --exec_prefix=$(exec_prefix) CONFIGURE_ARGS += --libdir=$(libdir) --includedir=$(includedir) --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 Thu Nov 26 13:03:55 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 26 Nov 2009 12:03:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[7454] csw/mgar/pkg/fortune Message-ID: Revision: 7454 http://gar.svn.sourceforge.net/gar/?rev=7454&view=rev Author: dmichelsen Date: 2009-11-26 12:03:55 +0000 (Thu, 26 Nov 2009) Log Message: ----------- fortune: Move legacy to tags/ Added Paths: ----------- csw/mgar/pkg/fortune/branches/ csw/mgar/pkg/fortune/tags/ csw/mgar/pkg/fortune/tags/legacy/ Removed Paths: ------------- csw/mgar/pkg/fortune/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 Thu Nov 26 13:26:31 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 26 Nov 2009 12:26:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7455] csw/mgar/pkg Message-ID: Revision: 7455 http://gar.svn.sourceforge.net/gar/?rev=7455&view=rev Author: dmichelsen Date: 2009-11-26 12:26:31 +0000 (Thu, 26 Nov 2009) Log Message: ----------- fortune4all: Commit for now, not good, not finished Added Paths: ----------- csw/mgar/pkg/fortune4all/ csw/mgar/pkg/fortune4all/branches/ csw/mgar/pkg/fortune4all/tags/ csw/mgar/pkg/fortune4all/trunk/ csw/mgar/pkg/fortune4all/trunk/Makefile csw/mgar/pkg/fortune4all/trunk/checksums csw/mgar/pkg/fortune4all/trunk/files/ csw/mgar/pkg/fortune4all/trunk/files/0001-Fix-for-Sun-CC.patch Property changes on: csw/mgar/pkg/fortune4all/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/fortune4all/trunk/Makefile =================================================================== --- csw/mgar/pkg/fortune4all/trunk/Makefile (rev 0) +++ csw/mgar/pkg/fortune4all/trunk/Makefile 2009-11-26 12:26:31 UTC (rev 7455) @@ -0,0 +1,35 @@ +GARNAME = fortune4all +GARVERSION = 1023 +CATEGORIES = utils + +DESCRIPTION = +define BLURB + Long description +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = Fortune4All-src-$(GARVERSION).zip +#DISTFILES += fortune.zip +DISTFILES += fortune_big.zip +#DISTFILES += greek-fortunes.zip + +PATCHFILES = 0001-Fix-for-Sun-CC.patch + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +LICENSE = license + +DISTNAME = Fortune + +CONFIGURE_SCRIPTS = + +BUILD_ARGS = CC="$(CC)" CFLAGS="$(CFLAGS)" + +TEST_SCRIPTS = + +INSTALL_SCRIPTS = custom + +include gar/category.mk + + Added: csw/mgar/pkg/fortune4all/trunk/checksums =================================================================== --- csw/mgar/pkg/fortune4all/trunk/checksums (rev 0) +++ csw/mgar/pkg/fortune4all/trunk/checksums 2009-11-26 12:26:31 UTC (rev 7455) @@ -0,0 +1,3 @@ +c50398d1590b74bc2ab7bf1d966ec9ac 0001-Fix-for-Sun-CC.patch +4dedf3154ed693e0abd35e818ce577e8 Fortune4All-src-1023.zip +a187d3663fc9517e08785dd0f4bd2a0c fortune_big.zip Added: csw/mgar/pkg/fortune4all/trunk/files/0001-Fix-for-Sun-CC.patch =================================================================== --- csw/mgar/pkg/fortune4all/trunk/files/0001-Fix-for-Sun-CC.patch (rev 0) +++ csw/mgar/pkg/fortune4all/trunk/files/0001-Fix-for-Sun-CC.patch 2009-11-26 12:26:31 UTC (rev 7455) @@ -0,0 +1,38 @@ +From c2f3273c69fc4982a2429e03fdb8a952c7a6f166 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 26 Nov 2009 13:19:22 +0100 +Subject: [PATCH] Fix for Sun CC + +--- + Fortune.c | 2 +- + panic.c | 1 + + 2 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/Fortune.c b/Fortune.c +index 20538f5..096aa0d 100644 +--- a/Fortune.c ++++ b/Fortune.c +@@ -78,7 +78,7 @@ int main() + */ + (void)memset(data,'\0',DATA_SZ); + } +-#elif ++#endif + #else + (void)ReadFortune(data, cur_for++); + printf("%s\n\n\n",data); +diff --git a/panic.c b/panic.c +index 094df29..58bbfcf 100644 +--- a/panic.c ++++ b/panic.c +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include + + static char panic_buf[1024]; + /* +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Thu Nov 26 14:00:23 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 26 Nov 2009 13:00:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7456] csw/mgar/pkg/exiftool/trunk/Makefile Message-ID: Revision: 7456 http://gar.svn.sourceforge.net/gar/?rev=7456&view=rev Author: hson Date: 2009-11-26 13:00:20 +0000 (Thu, 26 Nov 2009) Log Message: ----------- exiftool: Update to 8.00 Modified Paths: -------------- csw/mgar/pkg/exiftool/trunk/Makefile Modified: csw/mgar/pkg/exiftool/trunk/Makefile =================================================================== --- csw/mgar/pkg/exiftool/trunk/Makefile 2009-11-26 12:26:31 UTC (rev 7455) +++ csw/mgar/pkg/exiftool/trunk/Makefile 2009-11-26 13:00:20 UTC (rev 7456) @@ -1,5 +1,5 @@ GARNAME = exiftool -GARVERSION = 7.99 +GARVERSION = 8.00 CATEGORIES = cpan DESCRIPTION = Read, Write and Edit Image File Meta Information This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Thu Nov 26 14:43:07 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 26 Nov 2009 13:43:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7457] csw/mgar/pkg/gengetopt/trunk Message-ID: Revision: 7457 http://gar.svn.sourceforge.net/gar/?rev=7457&view=rev Author: hson Date: 2009-11-26 13:43:06 +0000 (Thu, 26 Nov 2009) Log Message: ----------- gengetopt: Update to 2.22.3 Modified Paths: -------------- csw/mgar/pkg/gengetopt/trunk/Makefile csw/mgar/pkg/gengetopt/trunk/checksums Modified: csw/mgar/pkg/gengetopt/trunk/Makefile =================================================================== --- csw/mgar/pkg/gengetopt/trunk/Makefile 2009-11-26 13:00:20 UTC (rev 7456) +++ csw/mgar/pkg/gengetopt/trunk/Makefile 2009-11-26 13:43:06 UTC (rev 7457) @@ -1,5 +1,5 @@ GARNAME = gengetopt -GARVERSION = 2.22.2 +GARVERSION = 2.22.3 CATEGORIES = utils DESCRIPTION = parses the command line options Modified: csw/mgar/pkg/gengetopt/trunk/checksums =================================================================== --- csw/mgar/pkg/gengetopt/trunk/checksums 2009-11-26 13:00:20 UTC (rev 7456) +++ csw/mgar/pkg/gengetopt/trunk/checksums 2009-11-26 13:43:06 UTC (rev 7457) @@ -1 +1 @@ -99e3e7ff827fe8f1719c298b116a044e download/gengetopt-2.22.2.tar.gz +9f42beca6220df43812725c07d1e843c download/gengetopt-2.22.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 Thu Nov 26 15:31:58 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 26 Nov 2009 14:31:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7458] csw/mgar/pkg/liboggz/trunk/Makefile Message-ID: Revision: 7458 http://gar.svn.sourceforge.net/gar/?rev=7458&view=rev Author: dmichelsen Date: 2009-11-26 14:31:58 +0000 (Thu, 26 Nov 2009) Log Message: ----------- liboggz: Fix build on Solaris 10 Modified Paths: -------------- csw/mgar/pkg/liboggz/trunk/Makefile Modified: csw/mgar/pkg/liboggz/trunk/Makefile =================================================================== --- csw/mgar/pkg/liboggz/trunk/Makefile 2009-11-26 13:43:06 UTC (rev 7457) +++ csw/mgar/pkg/liboggz/trunk/Makefile 2009-11-26 14:31:58 UTC (rev 7458) @@ -33,3 +33,8 @@ MERGE_DIRS_isa-extra = $(libdir) include gar/category.mk + +# Solaris 10 does have getopt.h which interferes with the shipped one included first. +post-configure-isa-amd64: + rm -f $(WORKSRC)/include/getopt.h + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Nov 26 15:54:10 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 26 Nov 2009 14:54:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7459] csw/mgar/pkg Message-ID: Revision: 7459 http://gar.svn.sourceforge.net/gar/?rev=7459&view=rev Author: dmichelsen Date: 2009-11-26 14:54:10 +0000 (Thu, 26 Nov 2009) Log Message: ----------- libfishsound: Initial commit Added Paths: ----------- csw/mgar/pkg/libfishsound/ csw/mgar/pkg/libfishsound/branches/ csw/mgar/pkg/libfishsound/tags/ csw/mgar/pkg/libfishsound/trunk/ csw/mgar/pkg/libfishsound/trunk/Makefile csw/mgar/pkg/libfishsound/trunk/checksums csw/mgar/pkg/libfishsound/trunk/files/ Property changes on: csw/mgar/pkg/libfishsound/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/libfishsound/trunk/Makefile =================================================================== --- csw/mgar/pkg/libfishsound/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libfishsound/trunk/Makefile 2009-11-26 14:54:10 UTC (rev 7459) @@ -0,0 +1,35 @@ +GARNAME = libfishsound +GARVERSION = 0.9.2 +CATEGORIES = lib + +DESCRIPTION = Decoding and encoding audio data using the Xiph.org codecs +define BLURB + libfishsound provides a simple programming interface for decoding and encoding + audio data using the Xiph.org codecs (FLAC, Speex and Vorbis). +endef + +MASTER_SITES = http://downloads.xiph.org/releases/libfishsound/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.xiph.org/fishsound/ + +REQUIRED_PKGS = CSWflac CSWlibogg CSWspeex CSWvorbis +PREREQUISITE_PKGS = $(REQUIRED_PKGS) + +BUILD64 = 1 +NO_ISAEXEC = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +BUILD_ARGS = AM_CFLAGS= + +TEST_TARGET = check + +include gar/category.mk + +# UINTPTR_MAX is defined empty in Solaris, which breaks a constraint check +post-configure-modulated: + perl -pi -e 's,(.*HAVE_UINTPTR_T.*),/* \1 */,' $(WORKSRC)/config.h + @$(MAKECOOKIE) Added: csw/mgar/pkg/libfishsound/trunk/checksums =================================================================== --- csw/mgar/pkg/libfishsound/trunk/checksums (rev 0) +++ csw/mgar/pkg/libfishsound/trunk/checksums 2009-11-26 14:54:10 UTC (rev 7459) @@ -0,0 +1 @@ +92f5d4de8ecd9ab3333b77224f8d3efd libfishsound-0.9.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 Nov 26 16:04:55 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 26 Nov 2009 15:04:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[7460] csw/mgar/pkg/netsnmp/trunk Message-ID: Revision: 7460 http://gar.svn.sourceforge.net/gar/?rev=7460&view=rev Author: dmichelsen Date: 2009-11-26 15:04:55 +0000 (Thu, 26 Nov 2009) Log Message: ----------- netsnmp: Update to 5.5 and add 64 bit Modified Paths: -------------- csw/mgar/pkg/netsnmp/trunk/Makefile csw/mgar/pkg/netsnmp/trunk/checksums Modified: csw/mgar/pkg/netsnmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/netsnmp/trunk/Makefile 2009-11-26 14:54:10 UTC (rev 7459) +++ csw/mgar/pkg/netsnmp/trunk/Makefile 2009-11-26 15:04:55 UTC (rev 7460) @@ -1,10 +1,13 @@ GARNAME = netsnmp -GARVERSION = 5.4.2.1 +GARVERSION = 5.5 CATEGORIES = apps -DESCRIPTION = Brief description +DESCRIPTION = A suite of applications used to implement SNMP define BLURB - Long description + Simple Network Management Protocol (SNMP) is a widely used protocol for monitoring + the health and welfare of network equipment (eg. routers), computer equipment and + even devices like UPSs. Net-SNMP is a suite of applications used to implement + SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6. The suite includes: endef SF_PROJ = net-snmp @@ -24,6 +27,9 @@ UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) +BUILD64 = 1 +NO_ISAEXEC = 1 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-default-snmp-version=1 CONFIGURE_ARGS += --with-sys-contact=unknown Modified: csw/mgar/pkg/netsnmp/trunk/checksums =================================================================== --- csw/mgar/pkg/netsnmp/trunk/checksums 2009-11-26 14:54:10 UTC (rev 7459) +++ csw/mgar/pkg/netsnmp/trunk/checksums 2009-11-26 15:04:55 UTC (rev 7460) @@ -1,3 +1,3 @@ -984932520143f0c8bf7b7ce1fc9e1da1 download/net-snmp-5.4.2.1.tar.gz -01897895a960cd9cafbf2457c1aff065 download/perl_makefiles.diff -5e0ec3e4d3dd363437d85eca6b91951a download/Makefile.in.diff +5e0ec3e4d3dd363437d85eca6b91951a Makefile.in.diff +5b2551e7bd024fbbee84dca22a5f13a1 net-snmp-5.5.tar.gz +01897895a960cd9cafbf2457c1aff065 perl_makefiles.diff 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 Nov 26 16:49:32 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 26 Nov 2009 15:49:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7461] csw/mgar/pkg/a52dec/trunk Message-ID: Revision: 7461 http://gar.svn.sourceforge.net/gar/?rev=7461&view=rev Author: dmichelsen Date: 2009-11-26 15:49:22 +0000 (Thu, 26 Nov 2009) Log Message: ----------- liba52: Fix 64 bit Modified Paths: -------------- csw/mgar/pkg/a52dec/trunk/Makefile csw/mgar/pkg/a52dec/trunk/checksums Added Paths: ----------- csw/mgar/pkg/a52dec/trunk/files/0001-Fix-64-bit-libtool.patch csw/mgar/pkg/a52dec/trunk/files/liba52.pc-32 csw/mgar/pkg/a52dec/trunk/files/liba52.pc-64 Modified: csw/mgar/pkg/a52dec/trunk/Makefile =================================================================== --- csw/mgar/pkg/a52dec/trunk/Makefile 2009-11-26 15:04:55 UTC (rev 7460) +++ csw/mgar/pkg/a52dec/trunk/Makefile 2009-11-26 15:49:22 UTC (rev 7461) @@ -4,11 +4,14 @@ DESCRIPTION = A free ATSC A/52 stream decoder define BLURB - liba52 is a free library for decoding ATSC A/52 streams. It is released under the terms of the GPL license. The A/52 standard is used in a variety of applications, including digital television and DVD. It is also known as AC-3. + liba52 is a free library for decoding ATSC A/52 streams. It is released under the terms + of the GPL license. The A/52 standard is used in a variety of applications, including + digital television and DVD. It is also known as AC-3. endef MASTER_SITES = http://liba52.sourceforge.net/files/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += liba52.pc-32 liba52.pc-64 # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = http://liba52.sourceforge.net/ @@ -17,6 +20,7 @@ PACKAGES = CSWliba52 CATALOGNAME = a52dec +REQUIRED_PKGS = CSWsunmath EXTRA_LINKER_FLAGS = -lsunmath BUILD64 = 1 @@ -24,7 +28,15 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared --disable-static +# This stupid configure script adds '-fast' overwriting -xarch and +# especially activating 64 bit. +BUILD_ARGS = CFLAGS="$(CFLAGS)" + MERGE_DIRS_isa-extra = $(libdir) include gar/category.mk +post-install-modulated: + ginstall -d $(DESTDIR)$(libdir)/pkgconfig + ginstall $(WORKDIR)/liba52.pc-$(MEMORYMODEL) $(DESTDIR)$(libdir)/pkgconfig/liba52.pc + @$(MAKECOOKIE) Modified: csw/mgar/pkg/a52dec/trunk/checksums =================================================================== --- csw/mgar/pkg/a52dec/trunk/checksums 2009-11-26 15:04:55 UTC (rev 7460) +++ csw/mgar/pkg/a52dec/trunk/checksums 2009-11-26 15:49:22 UTC (rev 7461) @@ -1 +1,3 @@ caa9f5bc44232dc8aeea773fea56be80 a52dec-0.7.4.tar.gz +4bdd6062a5b602334c797a2e29c47eea liba52.pc-32 +85e441dbe0432db6925e15c60a1627ff liba52.pc-64 Added: csw/mgar/pkg/a52dec/trunk/files/0001-Fix-64-bit-libtool.patch =================================================================== --- csw/mgar/pkg/a52dec/trunk/files/0001-Fix-64-bit-libtool.patch (rev 0) +++ csw/mgar/pkg/a52dec/trunk/files/0001-Fix-64-bit-libtool.patch 2009-11-26 15:49:22 UTC (rev 7461) @@ -0,0 +1,27 @@ +From 16a37676464c7e728d930a8c044a8917c6198aa8 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 26 Nov 2009 16:11:48 +0100 +Subject: [PATCH] Fix 64 bit libtool + +--- + autotools/ltmain.sh | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/autotools/ltmain.sh b/autotools/ltmain.sh +index a926477..5b3be50 100644 +--- a/autotools/ltmain.sh ++++ b/autotools/ltmain.sh +@@ -1191,6 +1191,10 @@ compiler." + continue + ;; + ++ -xarch=*) ++ linker_flags="$linker_flags $flag" ++ # Fall through ++ + # Some other compiler flag. + -* | +*) + # Unknown arguments in both finalize_command and compile_command need +-- +1.6.5.1 + Added: csw/mgar/pkg/a52dec/trunk/files/liba52.pc-32 =================================================================== --- csw/mgar/pkg/a52dec/trunk/files/liba52.pc-32 (rev 0) +++ csw/mgar/pkg/a52dec/trunk/files/liba52.pc-32 2009-11-26 15:49:22 UTC (rev 7461) @@ -0,0 +1,10 @@ +prefix=/opt/csw +exec_prefix=/opt/csw +libdir=/opt/csw/lib +includedir=/opt/csw/include + +Name: liba52 +Description: A decoding library for ATSC A/52 streams. +Version: 0.7.4 +Libs: -L${libdir} -la52 +Cflags: -I${includedir}/a52dec Added: csw/mgar/pkg/a52dec/trunk/files/liba52.pc-64 =================================================================== --- csw/mgar/pkg/a52dec/trunk/files/liba52.pc-64 (rev 0) +++ csw/mgar/pkg/a52dec/trunk/files/liba52.pc-64 2009-11-26 15:49:22 UTC (rev 7461) @@ -0,0 +1,10 @@ +prefix=/opt/csw +exec_prefix=/opt/csw +libdir=/opt/csw/lib/64 +includedir=/opt/csw/include + +Name: liba52 +Description: A decoding library for ATSC A/52 streams. +Version: 0.7.4 +Libs: -L${libdir} -la52 +Cflags: -I${includedir}/a52dec 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 Nov 26 17:19:40 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 26 Nov 2009 16:19:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[7462] csw/mgar/pkg/gconf2 Message-ID: Revision: 7462 http://gar.svn.sourceforge.net/gar/?rev=7462&view=rev Author: dmichelsen Date: 2009-11-26 16:19:40 +0000 (Thu, 26 Nov 2009) Log Message: ----------- gconf2: Update to GAR Added Paths: ----------- csw/mgar/pkg/gconf2/branches/ csw/mgar/pkg/gconf2/tags/ csw/mgar/pkg/gconf2/tags/legacy/ csw/mgar/pkg/gconf2/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/gconf2/trunk/legacy/ Copied: csw/mgar/pkg/gconf2/trunk/Makefile (from rev 7360, csw/mgar/pkg/glib2/trunk/Makefile) =================================================================== --- csw/mgar/pkg/gconf2/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gconf2/trunk/Makefile 2009-11-26 16:19:40 UTC (rev 7462) @@ -0,0 +1,30 @@ +GARNAME = gconf2 +GNOME_PROJ = GConf +GARVERSION = 2.28.0 +CATEGORIES = lib + +DESCRIPTION = GNOME configuration database system +define BLURB + GConf is a system for storing application preferences. It is intended + for user preferences; not configuration of something like Apache, or + arbitrary data storage. +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTNAME = GConf-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.bz2 + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL = http://projects.gnome.org/gconf/ + +CONFIGURE_ARGS = $(DIRPATHS) + +BUILD64 = 1 +NO_ISAEXEC = 1 + +TEST_TARGET = check + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Nov 26 18:24:47 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 26 Nov 2009 17:24:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[7463] csw/mgar/pkg/x11/lib Message-ID: Revision: 7463 http://gar.svn.sourceforge.net/gar/?rev=7463&view=rev Author: wbonnet Date: 2009-11-26 17:24:46 +0000 (Thu, 26 Nov 2009) Log Message: ----------- Update to 7.5RC Modified Paths: -------------- csw/mgar/pkg/x11/lib/libdmx/trunk/Makefile csw/mgar/pkg/x11/lib/libdmx/trunk/checksums csw/mgar/pkg/x11/lib/libfs/trunk/Makefile csw/mgar/pkg/x11/lib/libfs/trunk/checksums csw/mgar/pkg/x11/lib/libice/trunk/Makefile csw/mgar/pkg/x11/lib/libice/trunk/checksums csw/mgar/pkg/x11/lib/libsm/trunk/Makefile csw/mgar/pkg/x11/lib/libsm/trunk/checksums csw/mgar/pkg/x11/lib/libxext/trunk/Makefile csw/mgar/pkg/x11/lib/libxext/trunk/checksums csw/mgar/pkg/x11/lib/libxi/trunk/Makefile csw/mgar/pkg/x11/lib/libxi/trunk/checksums csw/mgar/pkg/x11/lib/libxt/trunk/Makefile csw/mgar/pkg/x11/lib/libxt/trunk/checksums csw/mgar/pkg/x11/lib/xtrans/trunk/Makefile csw/mgar/pkg/x11/lib/xtrans/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/lib/xtrans/trunk/files/Makefile.am.diff csw/mgar/pkg/x11/lib/xtrans/trunk/files/Makefile.in.diff Modified: csw/mgar/pkg/x11/lib/libdmx/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libdmx/trunk/Makefile 2009-11-26 16:19:40 UTC (rev 7462) +++ csw/mgar/pkg/x11/lib/libdmx/trunk/Makefile 2009-11-26 17:24:46 UTC (rev 7463) @@ -1,5 +1,5 @@ GARNAME = libdmx -GARVERSION = 1.0.2 +GARVERSION = 1.1.0 CATEGORIES = x11 DESCRIPTION = X11 Distributed Multihead extension library Modified: csw/mgar/pkg/x11/lib/libdmx/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libdmx/trunk/checksums 2009-11-26 16:19:40 UTC (rev 7462) +++ csw/mgar/pkg/x11/lib/libdmx/trunk/checksums 2009-11-26 17:24:46 UTC (rev 7463) @@ -1 +1 @@ -4d866967210d06098fc9f302ed4c79b1 download/libdmx-1.0.2.tar.bz2 +a2fcf0382837888d3781b714489a8999 libdmx-1.1.0.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libfs/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libfs/trunk/Makefile 2009-11-26 16:19:40 UTC (rev 7462) +++ csw/mgar/pkg/x11/lib/libfs/trunk/Makefile 2009-11-26 17:24:46 UTC (rev 7463) @@ -1,5 +1,5 @@ GARNAME = libFS -GARVERSION = 1.0.1 +GARVERSION = 1.0.2 CATEGORIES = x11 DESCRIPTION = X11 Font Services library Modified: csw/mgar/pkg/x11/lib/libfs/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libfs/trunk/checksums 2009-11-26 16:19:40 UTC (rev 7462) +++ csw/mgar/pkg/x11/lib/libfs/trunk/checksums 2009-11-26 17:24:46 UTC (rev 7463) @@ -1 +1 @@ -81521249353fa33be7a4bb0062c2fbb9 download/libFS-1.0.1.tar.bz2 +ecf2d6a27da053500283e803efa2a808 libFS-1.0.2.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libice/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libice/trunk/Makefile 2009-11-26 16:19:40 UTC (rev 7462) +++ csw/mgar/pkg/x11/lib/libice/trunk/Makefile 2009-11-26 17:24:46 UTC (rev 7463) @@ -1,5 +1,5 @@ GARNAME = libICE -GARVERSION = 1.0.4 +GARVERSION = 1.0.6 CATEGORIES = x11 DESCRIPTION = X11 Inter-Client Exchange Library Modified: csw/mgar/pkg/x11/lib/libice/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libice/trunk/checksums 2009-11-26 16:19:40 UTC (rev 7462) +++ csw/mgar/pkg/x11/lib/libice/trunk/checksums 2009-11-26 17:24:46 UTC (rev 7463) @@ -1 +1 @@ -4ab4e67e0b8845aa201e984153087f4a download/libICE-1.0.4.tar.bz2 +2d39bc924af24325dae589e9a849180c libICE-1.0.6.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libsm/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libsm/trunk/Makefile 2009-11-26 16:19:40 UTC (rev 7462) +++ csw/mgar/pkg/x11/lib/libsm/trunk/Makefile 2009-11-26 17:24:46 UTC (rev 7463) @@ -1,5 +1,5 @@ GARNAME = libsm -GARVERSION = 1.1.0 +GARVERSION = 1.1.1 CATEGORIES = x11 DESCRIPTION = X11 Session Management library Modified: csw/mgar/pkg/x11/lib/libsm/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libsm/trunk/checksums 2009-11-26 16:19:40 UTC (rev 7462) +++ csw/mgar/pkg/x11/lib/libsm/trunk/checksums 2009-11-26 17:24:46 UTC (rev 7463) @@ -1 +1 @@ -05a04c2b6382fb0054f6c70494e22733 download/libSM-1.1.0.tar.bz2 +6889a455496aaaa65b1fa05fc518d179 libSM-1.1.1.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxext/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxext/trunk/Makefile 2009-11-26 16:19:40 UTC (rev 7462) +++ csw/mgar/pkg/x11/lib/libxext/trunk/Makefile 2009-11-26 17:24:46 UTC (rev 7463) @@ -1,5 +1,5 @@ GARNAME = libxext -GARVERSION = 1.0.4 +GARVERSION = 1.1.1 CATEGORIES = x11 DESCRIPTION = X11 miscellaneous extensions library1 Modified: csw/mgar/pkg/x11/lib/libxext/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxext/trunk/checksums 2009-11-26 16:19:40 UTC (rev 7462) +++ csw/mgar/pkg/x11/lib/libxext/trunk/checksums 2009-11-26 17:24:46 UTC (rev 7463) @@ -1 +1 @@ -a91f1f722ac80c597cf0b75dcb8b48c0 download/libXext-1.0.4.tar.bz2 +c417c0e8df39a067f90a2a2e7133637d libXext-1.1.1.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxi/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/Makefile 2009-11-26 16:19:40 UTC (rev 7462) +++ csw/mgar/pkg/x11/lib/libxi/trunk/Makefile 2009-11-26 17:24:46 UTC (rev 7463) @@ -1,5 +1,5 @@ GARNAME = libxi -GARVERSION = 1.1.3 +GARVERSION = 1.3 CATEGORIES = x11 DESCRIPTION = Client library for XInput Modified: csw/mgar/pkg/x11/lib/libxi/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/checksums 2009-11-26 16:19:40 UTC (rev 7462) +++ csw/mgar/pkg/x11/lib/libxi/trunk/checksums 2009-11-26 17:24:46 UTC (rev 7463) @@ -1 +1 @@ -7c510abb0cad8dc20493fb27ff7859d8 download/libXi-1.1.3.tar.bz2 +8df4ece9bd1efb02c28acb2b6f485e09 libXi-1.3.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxt/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxt/trunk/Makefile 2009-11-26 16:19:40 UTC (rev 7462) +++ csw/mgar/pkg/x11/lib/libxt/trunk/Makefile 2009-11-26 17:24:46 UTC (rev 7463) @@ -1,5 +1,5 @@ GARNAME = libxt -GARVERSION = 1.0.5 +GARVERSION = 1.0.7 CATEGORIES = x11 DESCRIPTION = X11 toolkit intrinsics library Modified: csw/mgar/pkg/x11/lib/libxt/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxt/trunk/checksums 2009-11-26 16:19:40 UTC (rev 7462) +++ csw/mgar/pkg/x11/lib/libxt/trunk/checksums 2009-11-26 17:24:46 UTC (rev 7463) @@ -1 +1 @@ -f3bdd67785ace8cd0b23249e9d8c9975 download/libXt-1.0.5.tar.bz2 +96f3c93434a93186d178b60d4a262496 libXt-1.0.7.tar.bz2 Modified: csw/mgar/pkg/x11/lib/xtrans/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/xtrans/trunk/Makefile 2009-11-26 16:19:40 UTC (rev 7462) +++ csw/mgar/pkg/x11/lib/xtrans/trunk/Makefile 2009-11-26 17:24:46 UTC (rev 7463) @@ -1,5 +1,5 @@ GARNAME = xtrans -GARVERSION = 1.2.1 +GARVERSION = 1.2.5 CATEGORIES = x11 DESCRIPTION = X transport library @@ -19,5 +19,8 @@ BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) +PATCHFILES = Makefile.am.diff +PATCHFILES += Makefile.in.diff + include gar/category.mk Modified: csw/mgar/pkg/x11/lib/xtrans/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/xtrans/trunk/checksums 2009-11-26 16:19:40 UTC (rev 7462) +++ csw/mgar/pkg/x11/lib/xtrans/trunk/checksums 2009-11-26 17:24:46 UTC (rev 7463) @@ -1 +1,3 @@ -5b7f447f6fe92cbc4f17441aaee0bf55 download/xtrans-1.2.1.tar.gz +1fbf46b5dc6a352a47c3390395c14bf3 Makefile.am.diff +52ee4a5f36f8c3729864d59a24971140 Makefile.in.diff +b2f47d49faf1f24e8294b624b21b9b93 xtrans-1.2.5.tar.gz Added: csw/mgar/pkg/x11/lib/xtrans/trunk/files/Makefile.am.diff =================================================================== --- csw/mgar/pkg/x11/lib/xtrans/trunk/files/Makefile.am.diff (rev 0) +++ csw/mgar/pkg/x11/lib/xtrans/trunk/files/Makefile.am.diff 2009-11-26 17:24:46 UTC (rev 7463) @@ -0,0 +1,11 @@ +--- xtrans-1.2.5/Makefile.am.orig 2009-11-26 15:05:04.598921126 +0100 ++++ xtrans-1.2.5/Makefile.am 2009-11-26 14:59:40.883565415 +0100 +@@ -12,7 +12,7 @@ + aclocaldir = $(datadir)/aclocal + aclocal_DATA = xtrans.m4 + +-pkgconfigdir = $(datadir)/pkgconfig ++pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = xtrans.pc + + EXTRA_DIST = xtrans.pc.in ${aclocal_DATA} ChangeLog Xtrans.mm Added: csw/mgar/pkg/x11/lib/xtrans/trunk/files/Makefile.in.diff =================================================================== --- csw/mgar/pkg/x11/lib/xtrans/trunk/files/Makefile.in.diff (rev 0) +++ csw/mgar/pkg/x11/lib/xtrans/trunk/files/Makefile.in.diff 2009-11-26 17:24:46 UTC (rev 7463) @@ -0,0 +1,11 @@ +--- xtrans-1.2.5/Makefile.in.orig 2009-11-26 15:01:50.752826994 +0100 ++++ xtrans-1.2.5/Makefile.in 2009-11-26 15:05:44.512854519 +0100 +@@ -222,7 +222,7 @@ + + aclocaldir = $(datadir)/aclocal + aclocal_DATA = xtrans.m4 +-pkgconfigdir = $(datadir)/pkgconfig ++pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = xtrans.pc + EXTRA_DIST = xtrans.pc.in ${aclocal_DATA} ChangeLog Xtrans.mm + MAINTAINERCLEANFILES = ChangeLog 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 Nov 26 19:34:32 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 26 Nov 2009 18:34:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7464] csw/mgar/pkg/bind/trunk Message-ID: Revision: 7464 http://gar.svn.sourceforge.net/gar/?rev=7464&view=rev Author: bonivart Date: 2009-11-26 18:34:30 +0000 (Thu, 26 Nov 2009) Log Message: ----------- bind: update to 9.6.1-P2 Modified Paths: -------------- csw/mgar/pkg/bind/trunk/Makefile csw/mgar/pkg/bind/trunk/checksums csw/mgar/pkg/bind/trunk/files/README.CSW csw/mgar/pkg/bind/trunk/files/cswusergroup Property Changed: ---------------- csw/mgar/pkg/bind/trunk/files/ Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2009-11-26 17:24:46 UTC (rev 7463) +++ csw/mgar/pkg/bind/trunk/Makefile 2009-11-26 18:34:30 UTC (rev 7464) @@ -1,6 +1,6 @@ GARNAME = bind GARVERSION = 9.6.1 -RELEASE = P1 +RELEASE = P2 DISTVERSION = $(GARVERSION)-$(RELEASE) DISTNAME = $(GARNAME)-$(DISTVERSION) WORKSRC = $(WORKDIR)/$(DISTNAME) @@ -20,11 +20,14 @@ #DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PACKAGES = CSWbind CSWbinddevel CSWlibbind CSWbindutils +#PACKAGES = CSWbind CSWbinddevel CSWlibbind CSWbindutils CSWbindchroot CATALOGNAME_CSWbinddevel = bind_devel CATALOGNAME_CSWbindutils = bind_utils +#CATALOGNAME_CSWbindchroot = bind_chroot ARCHALL_CSWbinddevel = 1 +#ARCHALL_CSWbindchroot = 1 LICENSE = COPYRIGHT @@ -32,11 +35,13 @@ SPKG_DESC_CSWbinddevel = ISC BIND DNS development package SPKG_DESC_CSWlibbind = ISC BIND DNS library package SPKG_DESC_CSWbindutils = ISC BIND DNS utilities package +#SPKG_DESC_CSWbindchroot = ISC BIND DNS chroot package -REQUIRED_PKGS_CSWbind = CSWlibbind CSWbindutils CSWcswclassutils CSWiconv CSWlibxml2 CSWosslrt CSWzlib +REQUIRED_PKGS_CSWbind = CSWlibbind CSWbindutils CSWiconv CSWlibxml2 CSWosslrt CSWzlib REQUIRED_PKGS_CSWbinddevel = CSWbind REQUIRED_PKGS_CSWlibbind = CSWiconv CSWlibxml2 CSWosslrt CSWzlib REQUIRED_PKGS_CSWbindutils = CSWlibbind CSWiconv CSWlibxml2 CSWosslrt CSWzlib +#REQUIRED_PKGS_CSWbindchroot = CSWbind # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = http://ftp.isc.org/isc/bind9/ @@ -55,20 +60,21 @@ PKGFILES_CSWbinddevel = $(PKGFILES_DEVEL) PKGFILES_CSWlibbind = $(libdir)/.* PKGFILES_CSWbindutils = $(bindir)/.* +#PKGFILES_CSWbindchroot = .*chroot.* -# checkpkg can't handle split packages -ENABLE_CHECK = 0 - INSTALL_SCRIPTS = custom PROTOTYPE_FILTER = awk ' \ - $$$$3 ~ /\/init.d\/cswnamed$$$$/ { $$$$2 = "cswinitsmf" } \ - $$$$3 ~ /\/named.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ $$$$3 ~ /\/var\/opt\/csw\/named/ { $$$$5 = "named" ; $$$$2 = "ugfiles" } \ - $$$$3 ~ /\/CSWbind\/cswusergroup$$$$/ { $$$$2 = "cswusergroup" } \ { print }' +INITSMF = .*/init.d/cswnamed +SAMPLECONF = .*/named.conf.CSW +USERGROUP = .*/CSWbind/cswusergroup + SPKG_SOURCEURL = http://www.isc.org/software/bind + +# Still needed because of ugfiles SPKG_CLASSES_CSWbind = none cswusergroup ugfiles cswcpsampleconf cswinitsmf include gar/category.mk @@ -79,15 +85,38 @@ install-custom: @echo " ==> Installing $(GARNAME) (custom)" - @ginstall -d $(DESTDIR)/etc/opt/csw/init.d + @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d @cp $(FILEDIR)/CSWbind.cswnamed $(DESTDIR)/etc/opt/csw/init.d/cswnamed @cp $(FILEDIR)/CSWbind.named.conf.CSW $(DESTDIR)/etc/opt/csw/named.conf.CSW - @ginstall -d $(DESTDIR)/opt/csw/etc/CSWbind + @ginstall -m 755 -d $(DESTDIR)/opt/csw/etc/CSWbind @cp $(FILEDIR)/cswusergroup $(DESTDIR)/opt/csw/etc/CSWbind/ - @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME) @$(foreach DOC,$(DOCLIST),cp $(FILEDIR)/$(DOC) $(DESTDIR)$(docdir)/$(GARNAME);) ( cd $(WORKSRC) ; \ gmake DESTDIR=$(DESTDIR) install ) - @ginstall -d $(DESTDIR)/var/opt/csw/named + @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/named @touch $(DESTDIR)/var/opt/csw/named/named.pid + @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/named/chroot/dev + @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/named/chroot/etc + @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/named/chroot/var/named @$(MAKECOOKIE) + +# run bind chroot'ed: +# (from CentOS 5.3) +# /var/named/chroot +# /var/named/chroot/dev +# /var/named/chroot/dev/null +# /var/named/chroot/dev/random +# /var/named/chroot/dev/zero +# /var/named/chroot/etc +# /var/named/chroot/etc/named.caching-nameserver.conf +# /var/named/chroot/etc/named.conf +# /var/named/chroot/etc/rndc.conf +# /var/named/chroot/var +# /var/named/chroot/var/log/named.log +# /var/named/chroot/var/named +# /var/named/chroot/var/named/data +# /var/named/chroot/var/named/slaves +# /var/named/chroot/var/run +# /var/named/chroot/var/run/named +# /var/named/chroot/var/tmp Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2009-11-26 17:24:46 UTC (rev 7463) +++ csw/mgar/pkg/bind/trunk/checksums 2009-11-26 18:34:30 UTC (rev 7464) @@ -1 +1 @@ -e6ce3b355c4e6bf5d66ef100f555da3f download/bind-9.6.1-P1.tar.gz +435bc2e26e470d46ddf2acb24abb6ea6 bind-9.6.1-P2.tar.gz Property changes on: csw/mgar/pkg/bind/trunk/files ___________________________________________________________________ Added: svn:ignore + CSWbindchroot.* Modified: csw/mgar/pkg/bind/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/bind/trunk/files/README.CSW 2009-11-26 17:24:46 UTC (rev 7463) +++ csw/mgar/pkg/bind/trunk/files/README.CSW 2009-11-26 18:34:30 UTC (rev 7464) @@ -10,11 +10,12 @@ ------------ 1. Modify the named.conf file in /etc/opt/csw. 2. Create the zone files you specified in named.conf. -3. Start Bind with "/etc/init.d/cswnamed start". +3. Start Bind with "/etc/init.d/cswnamed start" + or with SMF (Solaris 10+) "svcadm enable cswnamed". There's sample files to look at in this directory. More info here: http://www.isc.org/software/BIND/. -bonivart/081118 +bonivart/091119 Modified: csw/mgar/pkg/bind/trunk/files/cswusergroup =================================================================== --- csw/mgar/pkg/bind/trunk/files/cswusergroup 2009-11-26 17:24:46 UTC (rev 7463) +++ csw/mgar/pkg/bind/trunk/files/cswusergroup 2009-11-26 18:34:30 UTC (rev 7464) @@ -1 +1 @@ -named::CSW BIND DNS:/false:/bin/false:: +named:named:CSW BIND DNS:/false:/bin/false:::NP 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 Nov 26 20:26:06 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 26 Nov 2009 19:26:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7465] csw/mgar/pkg/bind/trunk/Makefile Message-ID: Revision: 7465 http://gar.svn.sourceforge.net/gar/?rev=7465&view=rev Author: bonivart Date: 2009-11-26 19:26:06 +0000 (Thu, 26 Nov 2009) Log Message: ----------- bind: fix version Modified Paths: -------------- csw/mgar/pkg/bind/trunk/Makefile Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2009-11-26 18:34:30 UTC (rev 7464) +++ csw/mgar/pkg/bind/trunk/Makefile 2009-11-26 19:26:06 UTC (rev 7465) @@ -2,7 +2,8 @@ GARVERSION = 9.6.1 RELEASE = P2 DISTVERSION = $(GARVERSION)-$(RELEASE) -DISTNAME = $(GARNAME)-$(DISTVERSION) +SPKG_VERSION = $(GARVERSION)$(RELEASE) +DISTNAME = $(GARNAME)-$(GARVERSION)-$(RELEASE) WORKSRC = $(WORKDIR)/$(DISTNAME) CATEGORIES = net @@ -15,7 +16,7 @@ endef MASTER_SITES = http://ftp.isc.org/isc/bind9/$(GARVERSION)-$(RELEASE)/ -DISTFILES = $(GARNAME)-$(GARVERSION)-$(RELEASE).tar.gz +DISTFILES = $(DISTNAME).tar.gz #MASTER_SITES = http://ftp.isc.org/isc/bind9/$(GARVERSION)/ #DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz @@ -79,8 +80,6 @@ include gar/category.mk -SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) - DOCLIST = README.CSW db.127.0.0 db.localhost named.conf named.root rndc.key install-custom: 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 Nov 27 01:16:15 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 27 Nov 2009 00:16:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[7466] csw/mgar/pkg/coreutils/trunk/Makefile Message-ID: Revision: 7466 http://gar.svn.sourceforge.net/gar/?rev=7466&view=rev Author: bdwalton Date: 2009-11-27 00:16:15 +0000 (Fri, 27 Nov 2009) Log Message: ----------- coreutils: change how tests get run to work around weird recursive make behaviour Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-26 19:26:06 UTC (rev 7465) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-27 00:16:15 UTC (rev 7466) @@ -27,7 +27,7 @@ CONFIGURE_ARGS += --with-libintl-prefix=/opt/csw/ CONFIGURE_ARGS += --with-libiconv-prefix=/opt/csw/ -TEST_ARGS = check +TEST_SCRIPTS = custom include gar/category.mk @@ -36,3 +36,7 @@ # @$(MAKECOOKIE) PATH := /opt/csw/gnu:/opt/csw/bin:$(PATH) + +test-custom: + @(cd $(WORKSRC); gmake check) + @$(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 Nov 27 02:33:04 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 27 Nov 2009 01:33:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[7467] csw/mgar/pkg/coreutils/trunk/Makefile Message-ID: Revision: 7467 http://gar.svn.sourceforge.net/gar/?rev=7467&view=rev Author: bdwalton Date: 2009-11-27 01:33:04 +0000 (Fri, 27 Nov 2009) Log Message: ----------- coreutils: setup gnu links as part of package Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-27 00:16:15 UTC (rev 7466) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-27 01:33:04 UTC (rev 7467) @@ -2,6 +2,10 @@ GARVERSION = 8.1 CATEGORIES = utils +SHELL = /opt/csw/bin/bash + +PREREQUISITE_PKGS = CSWbash + DESCRIPTION = GNU core utilities define BLURB The GNU Core Utilities are the basic file, shell and text manipulation utilities of the GNU operating system. These are the core utilities which are expected to exist on every operating system. @@ -31,12 +35,21 @@ include gar/category.mk -# pre-configure-modulated: -# @(cd $(WORKSRC); /opt/csw/bin/bash ./bootstrap; ) -# @$(MAKECOOKIE) - PATH := /opt/csw/gnu:/opt/csw/bin:$(PATH) test-custom: @(cd $(WORKSRC); gmake check) @$(MAKECOOKIE) + +post-install-modulated: + @echo Cleaning up install directory... + rm -rf $(DESTDIR)/$(libdir) + +post-merge: + @(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 ) \ 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 Fri Nov 27 02:44:49 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 27 Nov 2009 01:44:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[7468] csw/mgar/pkg/coreutils/trunk/Makefile Message-ID: Revision: 7468 http://gar.svn.sourceforge.net/gar/?rev=7468&view=rev Author: bdwalton Date: 2009-11-27 01:44:49 +0000 (Fri, 27 Nov 2009) Log Message: ----------- coreutils: override default util install exclude list Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-27 01:33:04 UTC (rev 7467) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-27 01:44:49 UTC (rev 7468) @@ -30,6 +30,7 @@ CONFIGURE_ARGS += --program-prefix=g CONFIGURE_ARGS += --with-libintl-prefix=/opt/csw/ CONFIGURE_ARGS += --with-libiconv-prefix=/opt/csw/ +CONFIGURE_ARGS += --enable-no-install-program=arch,hostname,su,chcon TEST_SCRIPTS = custom 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 Nov 27 03:18:27 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 27 Nov 2009 02:18:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7469] csw/mgar/pkg/coreutils/trunk/Makefile Message-ID: Revision: 7469 http://gar.svn.sourceforge.net/gar/?rev=7469&view=rev Author: bdwalton Date: 2009-11-27 02:18:27 +0000 (Fri, 27 Nov 2009) Log Message: ----------- coreutils: makecookie after creating gnu links Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-27 01:44:49 UTC (rev 7468) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-27 02:18:27 UTC (rev 7469) @@ -53,4 +53,5 @@ echo Linking $$f; \ base=$$(basename $$f); \ gln -s $$f ./$${base/g/}; \ - done ) \ No newline at end of file + done ) + @$(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 Nov 27 03:36:08 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 27 Nov 2009 02:36:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[7470] csw/mgar/pkg Message-ID: Revision: 7470 http://gar.svn.sourceforge.net/gar/?rev=7470&view=rev Author: bdwalton Date: 2009-11-27 02:36:07 +0000 (Fri, 27 Nov 2009) Log Message: ----------- colormake: port to gar Added Paths: ----------- csw/mgar/pkg/colormake/ csw/mgar/pkg/colormake/branches/ csw/mgar/pkg/colormake/tags/ csw/mgar/pkg/colormake/trunk/ csw/mgar/pkg/colormake/trunk/Makefile csw/mgar/pkg/colormake/trunk/checksums csw/mgar/pkg/colormake/trunk/files/ csw/mgar/pkg/colormake/trunk/files/0001-Update-Paths-and-Binary-Tool-Names-for-CSW.patch Property changes on: csw/mgar/pkg/colormake/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/colormake/trunk/Makefile =================================================================== --- csw/mgar/pkg/colormake/trunk/Makefile (rev 0) +++ csw/mgar/pkg/colormake/trunk/Makefile 2009-11-27 02:36:07 UTC (rev 7470) @@ -0,0 +1,44 @@ +GARNAME = colormake +GARVERSION = 0.2 +CATEGORIES = utils + +DESCRIPTION = A colorizer for make +define BLURB +This is a simple wrapper around "make" to make its output more readable. +endef + +MASTER_SITES = http://bre.klaki.net/programs/$(GARNAME)/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Update-Paths-and-Binary-Tool-Names-for-CSW.patch + +ARCHALL = 1 + +REQUIRED_PKGS = CSWgmake CSWshutils + +# We define upstream file regex so we can be notifed of new upstream +# software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of +# MASTER_SITES, then uncomment the next line. Otherwise it is set by +# default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +post-extract-modulated: + @cd $(WORKDIR_FIRSTMOD); mv $(GARNAME) $(GARNAME)-$(GARVERSION); + @$(MAKECOOKIE) + +install-custom: CMDD=$(docdir)/$(GARNAME) +install-custom: + @(cd $(WORKSRC); \ + ginstall -d -m 0755 $(DESTDIR)$(bindir) $(DESTDIR)$(CMDD); \ + ginstall -m 0755 colormake.pl cmake clmake $(DESTDIR)$(bindir); \ + ginstall -m 0644 AUTHORS README $(DESTDIR)$(CMDD) ) + @$(MAKECOOKIE) Added: csw/mgar/pkg/colormake/trunk/checksums =================================================================== --- csw/mgar/pkg/colormake/trunk/checksums (rev 0) +++ csw/mgar/pkg/colormake/trunk/checksums 2009-11-27 02:36:07 UTC (rev 7470) @@ -0,0 +1,2 @@ +80ba07d18bc3c409a2744e210b8f7ad7 0001-Update-Paths-and-Binary-Tool-Names-for-CSW.patch +1029dae70e7a23cff0f6a11f3ceffbe1 colormake-0.2.tar.gz Added: csw/mgar/pkg/colormake/trunk/files/0001-Update-Paths-and-Binary-Tool-Names-for-CSW.patch =================================================================== --- csw/mgar/pkg/colormake/trunk/files/0001-Update-Paths-and-Binary-Tool-Names-for-CSW.patch (rev 0) +++ csw/mgar/pkg/colormake/trunk/files/0001-Update-Paths-and-Binary-Tool-Names-for-CSW.patch 2009-11-27 02:36:07 UTC (rev 7470) @@ -0,0 +1,54 @@ +From df457b512ae24c966ac200c3910cf86e2599d8d8 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Fri, 27 Nov 2009 03:22:18 +0100 +Subject: [PATCH] Update Paths and Binary Tool Names for CSW + +/usr/bin/perl -> /opt/csw/bin/perl +export PATH=/opt/csw/bin:$PATH +make -> gmake +stty -> gstty + +Signed-off-by: Ben Walton +--- + clmake | 4 +++- + cmake | 4 +++- + colormake.pl | 2 +- + 3 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/clmake b/clmake +index c091e23..de484ea 100755 +--- a/clmake ++++ b/clmake +@@ -4,4 +4,6 @@ + # Jumps to the first gcc error that occurs during the build process. + # + +-make $* 2>&1 | colormake.pl `stty size` | less -r -pError ++export PATH=/opt/csw/bin:$PATH ++ ++gmake $* 2>&1 | colormake.pl `gstty size` | less -r -pError +diff --git a/cmake b/cmake +index 303e91e..4f2eabd 100755 +--- a/cmake ++++ b/cmake +@@ -4,4 +4,6 @@ + # Jumps to the first gcc error that occurs during the build process. + # + +-make $* 2>&1 | colormake.pl `stty size` ++export PATH=/opt/csw/bin:$PATH ++ ++gmake $* 2>&1 | colormake.pl `gstty size` +diff --git a/colormake.pl b/colormake.pl +index 1d9edb2..7d7b7d2 100755 +--- a/colormake.pl ++++ b/colormake.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl ++#!/opt/csw/bin/perl + # + # colormake.pl 0.3 + # +-- +1.6.5.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 Nov 27 03:41:14 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 27 Nov 2009 02:41:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[7471] csw/mgar/pkg/colormake/trunk/Makefile Message-ID: Revision: 7471 http://gar.svn.sourceforge.net/gar/?rev=7471&view=rev Author: bdwalton Date: 2009-11-27 02:41:14 +0000 (Fri, 27 Nov 2009) Log Message: ----------- colormake: use post-extract instead of post-extract-modulated Modified Paths: -------------- csw/mgar/pkg/colormake/trunk/Makefile Modified: csw/mgar/pkg/colormake/trunk/Makefile =================================================================== --- csw/mgar/pkg/colormake/trunk/Makefile 2009-11-27 02:36:07 UTC (rev 7470) +++ csw/mgar/pkg/colormake/trunk/Makefile 2009-11-27 02:41:14 UTC (rev 7471) @@ -31,7 +31,7 @@ include gar/category.mk -post-extract-modulated: +post-extract: @cd $(WORKDIR_FIRSTMOD); mv $(GARNAME) $(GARNAME)-$(GARVERSION); @$(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 Nov 27 04:00:03 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 27 Nov 2009 03:00:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[7472] csw/mgar/pkg/colormake/trunk Message-ID: Revision: 7472 http://gar.svn.sourceforge.net/gar/?rev=7472&view=rev Author: bdwalton Date: 2009-11-27 03:00:03 +0000 (Fri, 27 Nov 2009) Log Message: ----------- colormake: update patch to clean it up (some, still nasty) Modified Paths: -------------- csw/mgar/pkg/colormake/trunk/checksums csw/mgar/pkg/colormake/trunk/files/0001-Update-Paths-and-Binary-Tool-Names-for-CSW.patch Modified: csw/mgar/pkg/colormake/trunk/checksums =================================================================== --- csw/mgar/pkg/colormake/trunk/checksums 2009-11-27 02:41:14 UTC (rev 7471) +++ csw/mgar/pkg/colormake/trunk/checksums 2009-11-27 03:00:03 UTC (rev 7472) @@ -1,2 +1,2 @@ -80ba07d18bc3c409a2744e210b8f7ad7 0001-Update-Paths-and-Binary-Tool-Names-for-CSW.patch +db4549af77dc9f9583a3fd8b5ede602b 0001-Update-Paths-and-Binary-Tool-Names-for-CSW.patch 1029dae70e7a23cff0f6a11f3ceffbe1 colormake-0.2.tar.gz Modified: csw/mgar/pkg/colormake/trunk/files/0001-Update-Paths-and-Binary-Tool-Names-for-CSW.patch =================================================================== --- csw/mgar/pkg/colormake/trunk/files/0001-Update-Paths-and-Binary-Tool-Names-for-CSW.patch 2009-11-27 02:41:14 UTC (rev 7471) +++ csw/mgar/pkg/colormake/trunk/files/0001-Update-Paths-and-Binary-Tool-Names-for-CSW.patch 2009-11-27 03:00:03 UTC (rev 7472) @@ -1,4 +1,4 @@ -From df457b512ae24c966ac200c3910cf86e2599d8d8 Mon Sep 17 00:00:00 2001 +From d228a89afe97da43e3f03cd9c29509497b06336f Mon Sep 17 00:00:00 2001 From: Ben Walton Date: Fri, 27 Nov 2009 03:22:18 +0100 Subject: [PATCH] Update Paths and Binary Tool Names for CSW @@ -8,37 +8,44 @@ make -> gmake stty -> gstty +misc scripting cleanups. + Signed-off-by: Ben Walton --- - clmake | 4 +++- - cmake | 4 +++- + clmake | 6 +++++- + cmake | 7 ++++++- colormake.pl | 2 +- - 3 files changed, 7 insertions(+), 3 deletions(-) + 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/clmake b/clmake -index c091e23..de484ea 100755 +index c091e23..18c8758 100755 --- a/clmake +++ b/clmake -@@ -4,4 +4,6 @@ +@@ -4,4 +4,8 @@ # Jumps to the first gcc error that occurs during the build process. # -make $* 2>&1 | colormake.pl `stty size` | less -r -pError +export PATH=/opt/csw/bin:$PATH + -+gmake $* 2>&1 | colormake.pl `gstty size` | less -r -pError ++size=$(gstty size) ++ ++gmake $* 2>&1 | colormake.pl $size | less -r -pError diff --git a/cmake b/cmake -index 303e91e..4f2eabd 100755 +index 303e91e..6d3a674 100755 --- a/cmake +++ b/cmake -@@ -4,4 +4,6 @@ +@@ -4,4 +4,9 @@ # Jumps to the first gcc error that occurs during the build process. # -make $* 2>&1 | colormake.pl `stty size` +export PATH=/opt/csw/bin:$PATH + -+gmake $* 2>&1 | colormake.pl `gstty size` ++size=$(gstty size) ++ ++gmake $* 2>&1 | colormake.pl $size ++ diff --git a/colormake.pl b/colormake.pl index 1d9edb2..7d7b7d2 100755 --- a/colormake.pl 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 Nov 27 04:10:29 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 27 Nov 2009 03:10:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[7473] csw/mgar/pkg/colormake/trunk/Makefile Message-ID: Revision: 7473 http://gar.svn.sourceforge.net/gar/?rev=7473&view=rev Author: bdwalton Date: 2009-11-27 03:10:29 +0000 (Fri, 27 Nov 2009) Log Message: ----------- colormake: add remaining deps Modified Paths: -------------- csw/mgar/pkg/colormake/trunk/Makefile Modified: csw/mgar/pkg/colormake/trunk/Makefile =================================================================== --- csw/mgar/pkg/colormake/trunk/Makefile 2009-11-27 03:00:03 UTC (rev 7472) +++ csw/mgar/pkg/colormake/trunk/Makefile 2009-11-27 03:10:29 UTC (rev 7473) @@ -13,7 +13,7 @@ ARCHALL = 1 -REQUIRED_PKGS = CSWgmake CSWshutils +REQUIRED_PKGS = CSWgmake CSWshutils CSWperl CSWless # We define upstream file regex so we can be notifed of new upstream # software release This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Nov 27 10:10:10 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 27 Nov 2009 09:10:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7474] csw/mgar/pkg Message-ID: Revision: 7474 http://gar.svn.sourceforge.net/gar/?rev=7474&view=rev Author: dmichelsen Date: 2009-11-27 09:10:09 +0000 (Fri, 27 Nov 2009) Log Message: ----------- zebra: Initial commit Added Paths: ----------- csw/mgar/pkg/zebra/ csw/mgar/pkg/zebra/branches/ csw/mgar/pkg/zebra/tags/ csw/mgar/pkg/zebra/trunk/ csw/mgar/pkg/zebra/trunk/Makefile csw/mgar/pkg/zebra/trunk/checksums csw/mgar/pkg/zebra/trunk/files/ csw/mgar/pkg/zebra/trunk/files/0001-Fix-for-Sun-Studio.patch Property changes on: csw/mgar/pkg/zebra/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/zebra/trunk/Makefile =================================================================== --- csw/mgar/pkg/zebra/trunk/Makefile (rev 0) +++ csw/mgar/pkg/zebra/trunk/Makefile 2009-11-27 09:10:09 UTC (rev 7474) @@ -0,0 +1,38 @@ +GARNAME = zebra +GARVERSION = 0.95a +CATEGORIES = server + +DESCRIPTION = Manages TCP/IP Based Routing Protocols +define BLURB + GNU Zebra is free software that manages TCP/IP based routing protocols. + It is released as part of the GNU Project, and it is distributed under the + GNU General Public License. It supports BGP-4 protocol as described in RFC1771 + (A Border Gateway Protocol 4) as well as RIPv1, RIPv2 and OSPFv2. Unlike traditional, + monolithic architectures and even the so-called "new modular architectures" that + remove the burden of processing routing functions from the cpu and utilize special + ASIC chips instead, Zebra software offers true modularity. +endef + +MASTER_SITES = ftp://ftp.zebra.org/pub/zebra/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Fix-for-Sun-Studio.patch + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +EXTRA_PAX_ARGS = -s ",\.conf.sample\(.*\),.conf\1.CSW,p" + +SAMPLECONF = /etc/opt/csw/bgpd.conf +SAMPLECONF += /etc/opt/csw/bgpd.conf2 +SAMPLECONF += /etc/opt/csw/ospfd.conf +SAMPLECONF += /etc/opt/csw/ripd.conf +SAMPLECONF += /etc/opt/csw/zebra.conf + +include gar/category.mk Added: csw/mgar/pkg/zebra/trunk/checksums =================================================================== --- csw/mgar/pkg/zebra/trunk/checksums (rev 0) +++ csw/mgar/pkg/zebra/trunk/checksums 2009-11-27 09:10:09 UTC (rev 7474) @@ -0,0 +1,2 @@ +48b2c6d28b807b684e1b4cbdff96e0b2 0001-Fix-for-Sun-Studio.patch +9b8fec2d4f910334e50167414fcf193b zebra-0.95a.tar.gz Added: csw/mgar/pkg/zebra/trunk/files/0001-Fix-for-Sun-Studio.patch =================================================================== --- csw/mgar/pkg/zebra/trunk/files/0001-Fix-for-Sun-Studio.patch (rev 0) +++ csw/mgar/pkg/zebra/trunk/files/0001-Fix-for-Sun-Studio.patch 2009-11-27 09:10:09 UTC (rev 7474) @@ -0,0 +1,61 @@ +From 8fbae5034f3fcbb3c197cfa854bc37142e239967 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 27 Nov 2009 09:53:39 +0100 +Subject: [PATCH] Fix for Sun Studio + +--- + lib/prefix.h | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/lib/prefix.h b/lib/prefix.h +index 7d7cde6..60e8439 100644 +--- a/lib/prefix.h ++++ b/lib/prefix.h +@@ -41,7 +41,7 @@ struct prefix + struct in_addr adv_router; + } lp; + u_char val[8]; +- } u __attribute__ ((aligned (8))); ++ } u; + }; + + /* IPv4 prefix structure. */ +@@ -49,7 +49,7 @@ struct prefix_ipv4 + { + u_char family; + u_char prefixlen; +- struct in_addr prefix __attribute__ ((aligned (8))); ++ struct in_addr prefix; + }; + + /* IPv6 prefix structure. */ +@@ -58,7 +58,7 @@ struct prefix_ipv6 + { + u_char family; + u_char prefixlen; +- struct in6_addr prefix __attribute__ ((aligned (8))); ++ struct in6_addr prefix; + }; + #endif /* HAVE_IPV6 */ + +@@ -66,7 +66,7 @@ struct prefix_ls + { + u_char family; + u_char prefixlen; +- struct in_addr id __attribute__ ((aligned (8))); ++ struct in_addr id; + struct in_addr adv_router; + }; + +@@ -75,7 +75,7 @@ struct prefix_rd + { + u_char family; + u_char prefixlen; +- u_char val[8] __attribute__ ((aligned (8))); ++ u_char val[8]; + }; + + #ifndef INET_ADDRSTRLEN +-- +1.6.5.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 Fri Nov 27 10:35:36 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 27 Nov 2009 09:35:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[7475] csw/mgar/pkg/chromium/trunk/Makefile Message-ID: Revision: 7475 http://gar.svn.sourceforge.net/gar/?rev=7475&view=rev Author: wahwah Date: 2009-11-27 09:35:36 +0000 (Fri, 27 Nov 2009) Log Message: ----------- chromium: Using git sources Modified Paths: -------------- csw/mgar/pkg/chromium/trunk/Makefile Modified: csw/mgar/pkg/chromium/trunk/Makefile =================================================================== --- csw/mgar/pkg/chromium/trunk/Makefile 2009-11-27 09:10:09 UTC (rev 7474) +++ csw/mgar/pkg/chromium/trunk/Makefile 2009-11-27 09:35:36 UTC (rev 7475) @@ -54,7 +54,8 @@ ## 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 = chromium.r$(CHROMIUM_REVISION).tgz +# DISTFILES = chromium.r$(CHROMIUM_REVISION).tgz +DISTFILES = ## ## We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -123,10 +124,10 @@ ## ETCSERVICES = ## INETDCONF = ## A list of runtime package dependencies in the form of CSWfoo. -REQUIRED_PKGS = CSWnspr CSWnss +REQUIRED_PKGS = CSWnspr CSWnss CSWffmpeg ## ## A list of packages necessary to build this package -PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWlibxcbdevel +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWlibxcbdevel CSWffmpeg ## ## When using non-empty $(PACKAGES): ## REQUIRED_PKGS_CSWpkgname = @@ -180,13 +181,17 @@ GYP_GENERATORS = make export GYP_GENERATORS -WORKSRC = $(WORKDIR)/home/chrome-svn/tarball/chromium +# WORKSRC = $(WORKDIR)/home/chrome-svn/tarball/chromium +WORKSRC = $(WORKDIR)/chromium CHROMIUM_ROOT = $(WORKSRC) EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib GARCOMPILER = GNU +# Because of bashisms in Makefiles in Chromium +SHELL = /opt/csw/bin/bash + include gar/category.mk $(WORKSRC)/.gclient: @@ -195,20 +200,32 @@ GYP_GENERATORS=make \ gclient config http://src.chromium.org/svn/trunk/src) +post-extract-modulated: + mkdir -p $(WORKSRC) + (cd $(WORKSRC) \ + && \ + if [ -d src ]; then \ + (cd src && git fetch ); \ + else \ + git clone git://git.chromium.org/chromium.git src; \ + fi) + @$(MAKECOOKIE) + # Skipping gclient sync for now; running only gclient runhooks. The build # instructions say that we'll miss on some platform-specific depends, but # I don't think there's anything platform-specific for Solaris in the source # code repository. -configure-chromium: depot-tools gclient-runhooks - @$(MAKECOOKIE) +configure-chromium: depot-tools gclient-sync gclient-sync: $(WORKSRC)/.gclient (cd $(WORKSRC) \ && \ PATH=$$PATH:$(abspath $(WORKDIR)/depot_tools):/opt/csw/gcc4/bin \ + GYP_DEFINES="use_system_ffmpeg=1" \ GYP_GENERATORS=make \ - gclient sync) + gclient sync --revision src@$(CHROMIUM_REVISION)) + # gclient sync) @$(MAKECOOKIE) gclient-runhooks: $(WORKSRC)/.gclient @@ -216,6 +233,7 @@ && \ PATH=$$PATH:$(abspath $(WORKDIR)/depot_tools):/opt/csw/gcc4/bin \ GYP_GENERATORS=make \ + GYP_DEFINES="use_system_ffmpeg=1" \ gclient runhooks --force) @$(MAKECOOKIE) @@ -234,4 +252,4 @@ (cd $(CHROMIUM_ROOT)/src \ && \ PATH=$$PATH:$(abspath $(WORKDIR)/depot_tools):/opt/csw/gcc4/bin \ - gmake chrome) + gmake $(PARALLELMFLAGS) chrome) 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 Nov 27 10:56:37 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 27 Nov 2009 09:56:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[7476] csw/mgar/pkg/zebra/trunk/Makefile Message-ID: Revision: 7476 http://gar.svn.sourceforge.net/gar/?rev=7476&view=rev Author: dmichelsen Date: 2009-11-27 09:56:37 +0000 (Fri, 27 Nov 2009) Log Message: ----------- zebra: Migrate existing config files Modified Paths: -------------- csw/mgar/pkg/zebra/trunk/Makefile Modified: csw/mgar/pkg/zebra/trunk/Makefile =================================================================== --- csw/mgar/pkg/zebra/trunk/Makefile 2009-11-27 09:35:36 UTC (rev 7475) +++ csw/mgar/pkg/zebra/trunk/Makefile 2009-11-27 09:56:37 UTC (rev 7476) @@ -35,4 +35,6 @@ SAMPLECONF += /etc/opt/csw/ripd.conf SAMPLECONF += /etc/opt/csw/zebra.conf +MIGRATE_FILES = bgpd.conf ospfd.conf ripd.conf zebra.conf + 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 Fri Nov 27 11:58:48 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 27 Nov 2009 10:58:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[7477] csw/mgar/pkg/libgnomecanvas Message-ID: Revision: 7477 http://gar.svn.sourceforge.net/gar/?rev=7477&view=rev Author: dmichelsen Date: 2009-11-27 10:58:48 +0000 (Fri, 27 Nov 2009) Log Message: ----------- libgnomecanvas: Move to mGAR v2 Added Paths: ----------- csw/mgar/pkg/libgnomecanvas/branches/ csw/mgar/pkg/libgnomecanvas/tags/ csw/mgar/pkg/libgnomecanvas/tags/legacy/ csw/mgar/pkg/libgnomecanvas/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/libgnomecanvas/trunk/legacy/ Copied: csw/mgar/pkg/libgnomecanvas/trunk/Makefile (from rev 7462, csw/mgar/pkg/gconf2/trunk/Makefile) =================================================================== --- csw/mgar/pkg/libgnomecanvas/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libgnomecanvas/trunk/Makefile 2009-11-27 10:58:48 UTC (rev 7477) @@ -0,0 +1,25 @@ +GARNAME = libgnomecanvas +GARVERSION = 2.26.0 +CATEGORIES = lib + +DESCRIPTION = GNOME Canvas Lib +define BLURB + The libgnomecanvas package contains the GNOME canvas library. It is an engine + for structured graphics and one of the essential GNOME libraries. +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(DISTNAME).tar.bz2 + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +CONFIGURE_ARGS = $(DIRPATHS) + +BUILD64 = 1 +NO_ISAEXEC = 1 + +TEST_TARGET = check + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Nov 27 12:04:06 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 27 Nov 2009 11:04:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7478] csw/mgar/pkg Message-ID: Revision: 7478 http://gar.svn.sourceforge.net/gar/?rev=7478&view=rev Author: dmichelsen Date: 2009-11-27 11:04:06 +0000 (Fri, 27 Nov 2009) Log Message: ----------- xscreensaver: Initial commit Added Paths: ----------- csw/mgar/pkg/xscreensaver/ csw/mgar/pkg/xscreensaver/branches/ csw/mgar/pkg/xscreensaver/tags/ csw/mgar/pkg/xscreensaver/trunk/ csw/mgar/pkg/xscreensaver/trunk/Makefile csw/mgar/pkg/xscreensaver/trunk/checksums csw/mgar/pkg/xscreensaver/trunk/files/ Property changes on: csw/mgar/pkg/xscreensaver/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/xscreensaver/trunk/Makefile =================================================================== --- csw/mgar/pkg/xscreensaver/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xscreensaver/trunk/Makefile 2009-11-27 11:04:06 UTC (rev 7478) @@ -0,0 +1,21 @@ +GARNAME = xscreensaver +GARVERSION = 5.10 +CATEGORIES = utils + +DESCRIPTION = The ultimate screensaver collection +define BLURB + A collection of free screen savers for X11 and MacOS. +endef + +MASTER_SITES = http://www.jwz.org/xscreensaver/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +PACKAGES = CSWxsave +CATALOGNAME = xscreensaver + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/xscreensaver/trunk/checksums =================================================================== --- csw/mgar/pkg/xscreensaver/trunk/checksums (rev 0) +++ csw/mgar/pkg/xscreensaver/trunk/checksums 2009-11-27 11:04:06 UTC (rev 7478) @@ -0,0 +1 @@ +0d7205f9da8e3f1b83bcda549d73a7c4 xscreensaver-5.10.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 Nov 27 14:48:44 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 27 Nov 2009 13:48:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7479] csw/mgar/pkg/scummvm Message-ID: Revision: 7479 http://gar.svn.sourceforge.net/gar/?rev=7479&view=rev Author: dmichelsen Date: 2009-11-27 13:48:44 +0000 (Fri, 27 Nov 2009) Log Message: ----------- scummvm: Move to mGAR v2, wait for dependencies Added Paths: ----------- csw/mgar/pkg/scummvm/branches/ csw/mgar/pkg/scummvm/tags/ csw/mgar/pkg/scummvm/tags/legacy/ csw/mgar/pkg/scummvm/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/scummvm/trunk/legacy/ Copied: csw/mgar/pkg/scummvm/trunk/Makefile (from rev 7478, csw/mgar/pkg/xscreensaver/trunk/Makefile) =================================================================== --- csw/mgar/pkg/scummvm/trunk/Makefile (rev 0) +++ csw/mgar/pkg/scummvm/trunk/Makefile 2009-11-27 13:48:44 UTC (rev 7479) @@ -0,0 +1,26 @@ +GARNAME = scummvm +GARVERSION = 1.0.0 +CATEGORIES = apps + +DESCRIPTION = Virtual machine for several classic graphical point-and-click adventure games +define BLURB +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +GARCOMPILER = GCC4 + +# Custom configure +CONFIGURE_ARGS = --prefix=$(prefix) +CONFIGURE_ARGS += --bindir=$(bindir) +CONFIGURE_ARGS += --mandir=$(mandir) +CONFIGURE_ARGS += --datadir=$(datadir) +CONFIGURE_ARGS += --libdir=$(libdir) +CONFIGURE_ARGS += --enable-all-engines + + +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 Fri Nov 27 15:26:44 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 27 Nov 2009 14:26:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7480] csw/mgar/pkg/nss/branches/upstream-work Message-ID: Revision: 7480 http://gar.svn.sourceforge.net/gar/?rev=7480&view=rev Author: wahwah Date: 2009-11-27 14:26:44 +0000 (Fri, 27 Nov 2009) Log Message: ----------- nss: Added patches to make it use system sqlite3 and compile Modified Paths: -------------- csw/mgar/pkg/nss/branches/upstream-work/Makefile csw/mgar/pkg/nss/branches/upstream-work/checksums Added Paths: ----------- csw/mgar/pkg/nss/branches/upstream-work/files/include.patch csw/mgar/pkg/nss/branches/upstream-work/files/ld-options.patch csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3-64.patch csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3.patch csw/mgar/pkg/nss/branches/upstream-work/files/sqlite3-32.patch csw/mgar/pkg/nss/branches/upstream-work/files/sqlite3-64.patch Modified: csw/mgar/pkg/nss/branches/upstream-work/Makefile =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/Makefile 2009-11-27 13:48:44 UTC (rev 7479) +++ csw/mgar/pkg/nss/branches/upstream-work/Makefile 2009-11-27 14:26:44 UTC (rev 7480) @@ -14,6 +14,21 @@ # TODO: nss-config # TODO: a better nss.pc +# For DBG builds +PATCHFILES = whoami.patch +# I'll let Wan-Teh decide what and where to patch +PATCHFILES += include.patch +PATCHFILES += ld-options.patch +PATCHFILES += platlibs-sqlite3.patch +PATCHFILES_isa-sparcv8 = sqlite3-32.patch +PATCHFILES_isa-i386 = sqlite3-32.patch +PATCHFILES_isa-sparcv9 = sqlite3-64.patch +PATCHFILES_isa-sparcv9 += platlibs-sqlite3-64.patch +PATCHFILES_isa-amd64 = sqlite3-64.patch +PATCHFILES_isa-amd64 += platlibs-sqlite3-64.patch + + + GARNAME = nss MAJOR_VERSION = 3 MINOR_VERSION = 12 @@ -33,7 +48,6 @@ RTM_NAME = NSS_3_12_4_RTM MASTER_SITES = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTNAME = $(GARNAME)-$(GARVERSION) UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz REQUIRED_PKGS = CSWnspr CSWsqlite3 PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWsqlite3devel @@ -42,11 +56,12 @@ INSTALL_SCRIPTS = nss TEST_SCRIPTS = BUILD64 = 1 +EXTRA_INC = $(prefix)/include libdir_install = $(prefix)/lib includedir = $(prefix)/include/nss -ifeq (OPT,$(GARFLAVOR)) +ifneq (DBG,$(GARFLAVOR)) BUILD_OPT = 1 export BUILD_OPT endif @@ -58,6 +73,10 @@ NSS_ENABLE_ECC = 1 export NSS_ENABLE_ECC +# To avoid creating /opt/csw/lib/libsqlite3.so (already exists) +NSS_USE_SYSTEM_SQLITE = 1 +export NSS_USE_SYSTEM_SQLITE + # 64-bit suppport ifeq ($(MODULATION),isa-sparcv9) USE_64 = 1 @@ -74,9 +93,8 @@ endif export NSPR_LIB_DIR -# For DBG builds -PATCHFILES = whoami.patch - +# Based on: +# http://mxr.mozilla.org/security/source/security/nss/pkg/solaris/SUNWtlsu/prototype_com NSS_BINARIES = addbuiltin NSS_BINARIES += certutil NSS_BINARIES += cmsutil @@ -95,25 +113,24 @@ build-coreconf: (cd $(WORKSRC)/mozilla/security/coreconf \ && \ - $(BUILD_ENV) \ - && \ - gmake -j1 CC="$(CC)") + CPPFLAGS='$(CPPFLAGS)' LD_OPTIONS='$(LD_OPTIONS)' \ + gmake -j1) @$(MAKECOOKIE) build-dbm: (cd $(WORKSRC)/mozilla/security/dbm \ && \ - $(BUILD_ENV) \ - && \ - gmake -j1 CC="$(CC)") + CPPFLAGS='$(CPPFLAGS)' LD_OPTIONS='$(LD_OPTIONS)' \ + gmake -j1) @$(MAKECOOKIE) +# There's an extra interpolation somehwere inside nss' build system, so $$$$ +# needs to be used instead of $$. build-nss-compile: (cd $(WORKSRC)/mozilla/security/nss \ && \ - $(BUILD_ENV) \ - && \ - gmake -j1 CC="$(CC)") + CPPFLAGS='$(CPPFLAGS)' LD_OPTIONS='$(LD_OPTIONS) -R/opt/csw/lib/$$$$ISALIST' \ + gmake -j1) @$(MAKECOOKIE) install-nss: @@ -135,8 +152,10 @@ do \ ginstall -m 644 $${f} $(DESTDIR)$(includedir); \ done - for bin in in $(WORKSRC)/mozilla/dist/*/bin/* ; do \ - ginstall -m 755 $${file} $(DESTDIR)$(bindir)/nss`basename $${file}`; \ + for bin in $(NSS_BINARIES); do \ + ginstall -m 755 \ + $(WORKSRC)/mozilla/dist/*/bin/$${bin} \ + $(DESTDIR)$(bindir)/`basename $${file}`; \ done # Asserting that we have the right version in the .pc file ggrep "Version: $(GARVERSION)" $(FILEDIR)/nss.pc \ Modified: csw/mgar/pkg/nss/branches/upstream-work/checksums =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/checksums 2009-11-27 13:48:44 UTC (rev 7479) +++ csw/mgar/pkg/nss/branches/upstream-work/checksums 2009-11-27 14:26:44 UTC (rev 7480) @@ -1,2 +1,8 @@ -8f76e381bf2339d731bfd5b8116c25a4 nss-3.12.4-with-nspr-4.8.tar.gz +4b2246d07092fe8b2f29a1a01e9bc821 include.patch +79083e118f3d885957910fc845844c1c ld-options.patch +1ee3ed9c1900079319bd1de51388d856 nss-3.12.4.tar.gz +bd8d96c42238c7cfd07ec1ba21191066 platlibs-sqlite3-64.patch +f0f40bd021423ab1680b4d87cd19c1db platlibs-sqlite3.patch +cae46161d981e8aea822953b34339e60 sqlite3-32.patch +b07d3de42785866c3c4385846fd8eb52 sqlite3-64.patch 221646aa1954b4a255ac03e7d8b0225d whoami.patch Added: csw/mgar/pkg/nss/branches/upstream-work/files/include.patch =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/files/include.patch (rev 0) +++ csw/mgar/pkg/nss/branches/upstream-work/files/include.patch 2009-11-27 14:26:44 UTC (rev 7480) @@ -0,0 +1,11 @@ +--- a/mozilla/security/coreconf/SunOS5.mk.orig 2009-11-26 09:29:22.101030210 +0100 ++++ b/mozilla/security/coreconf/SunOS5.mk 2009-11-26 09:29:33.419484372 +0100 +@@ -104,7 +104,7 @@ + endif + endif + +-INCLUDES += -I/usr/dt/include -I/usr/openwin/include ++INCLUDES += -I/usr/dt/include -I/usr/openwin/include $(CPPFLAGS) + + RANLIB = echo + CPU_ARCH = sparc Added: csw/mgar/pkg/nss/branches/upstream-work/files/ld-options.patch =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/files/ld-options.patch (rev 0) +++ csw/mgar/pkg/nss/branches/upstream-work/files/ld-options.patch 2009-11-27 14:26:44 UTC (rev 7480) @@ -0,0 +1,10 @@ +--- a/mozilla/security/coreconf/SunOS5.mk.orig 2009-11-26 11:52:54.279684353 +0100 ++++ b/mozilla/security/coreconf/SunOS5.mk 2009-11-26 11:53:05.767884648 +0100 +@@ -175,6 +175,6 @@ + RPATH = -R '$$ORIGIN:/usr/lib/mps/secv1:/usr/lib/mps' + endif + else +-RPATH = -R '$$ORIGIN' ++RPATH = $(LDFLAGS) $(LD_OPTIONS) + endif + Added: csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3-64.patch =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3-64.patch (rev 0) +++ csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3-64.patch 2009-11-27 14:26:44 UTC (rev 7480) @@ -0,0 +1,11 @@ +--- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk.orig 2009-11-23 14:17:29.741267874 +0100 ++++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk 2009-11-23 14:17:41.292422026 +0100 +@@ -82,7 +82,7 @@ + endif + endif + +-SQLITE=-R/opt/csw/lib/$$ISALIST -L/opt/csw/lib -lsqlite3 ++SQLITE=-R/opt/csw/lib/$$ISALIST -L/opt/csw/lib/64 -lsqlite3 + + ifdef NSS_DISABLE_DBM + DBMLIB = $(NULL) Added: csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3.patch =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3.patch (rev 0) +++ csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3.patch 2009-11-27 14:26:44 UTC (rev 7480) @@ -0,0 +1,11 @@ +--- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk.orig 2009-11-21 17:28:09.997982796 +0100 ++++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk 2009-11-21 17:28:32.107632453 +0100 +@@ -80,7 +80,7 @@ + endif + endif + +-SQLITE=-lsqlite3 ++SQLITE=-R/opt/csw/lib/$$ISALIST -L/opt/csw/lib -lsqlite3 + + ifdef NSS_DISABLE_DBM + DBMLIB = $(NULL) Added: csw/mgar/pkg/nss/branches/upstream-work/files/sqlite3-32.patch =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/files/sqlite3-32.patch (rev 0) +++ csw/mgar/pkg/nss/branches/upstream-work/files/sqlite3-32.patch 2009-11-27 14:26:44 UTC (rev 7480) @@ -0,0 +1,18 @@ +--- a/mozilla/security/nss/lib/softoken/config.mk.orig 2009-11-27 00:13:49.173159939 +0100 ++++ b/mozilla/security/nss/lib/softoken/config.mk 2009-11-27 00:15:19.891579729 +0100 +@@ -57,6 +57,7 @@ + -L$(DIST)/lib \ + -L$(NSSUTIL_LIB_DIR) \ + -lnssutil3 \ ++ -L/opt/csw/lib \ + -lsqlite3 \ + -L$(NSPR_LIB_DIR) \ + -lplc4 \ +@@ -83,6 +84,7 @@ + -L$(DIST)/lib \ + -L$(NSSUTIL_LIB_DIR) \ + -lnssutil3 \ ++ -L/opt/csw/lib \ + -lsqlite3 \ + -L$(NSPR_LIB_DIR) \ + -lplc4 \ Added: csw/mgar/pkg/nss/branches/upstream-work/files/sqlite3-64.patch =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/files/sqlite3-64.patch (rev 0) +++ csw/mgar/pkg/nss/branches/upstream-work/files/sqlite3-64.patch 2009-11-27 14:26:44 UTC (rev 7480) @@ -0,0 +1,18 @@ +--- a/mozilla/security/nss/lib/softoken/config.mk.orig 2009-11-27 00:13:49.173159939 +0100 ++++ b/mozilla/security/nss/lib/softoken/config.mk 2009-11-27 00:15:48.846636621 +0100 +@@ -57,6 +57,7 @@ + -L$(DIST)/lib \ + -L$(NSSUTIL_LIB_DIR) \ + -lnssutil3 \ ++ -L/opt/csw/lib/64 \ + -lsqlite3 \ + -L$(NSPR_LIB_DIR) \ + -lplc4 \ +@@ -83,6 +84,7 @@ + -L$(DIST)/lib \ + -L$(NSSUTIL_LIB_DIR) \ + -lnssutil3 \ ++ -L/opt/csw/lib/64 \ + -lsqlite3 \ + -L$(NSPR_LIB_DIR) \ + -lplc4 \ 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 Nov 27 15:28:07 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 27 Nov 2009 14:28:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7481] csw/mgar/pkg/exiftool/trunk Message-ID: Revision: 7481 http://gar.svn.sourceforge.net/gar/?rev=7481&view=rev Author: dmichelsen Date: 2009-11-27 14:28:07 +0000 (Fri, 27 Nov 2009) Log Message: ----------- exiftool: Switch to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/exiftool/trunk/Makefile csw/mgar/pkg/exiftool/trunk/checksums Added Paths: ----------- csw/mgar/pkg/exiftool/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/exiftool/trunk/files/CSWexiftool.gspec Modified: csw/mgar/pkg/exiftool/trunk/Makefile =================================================================== --- csw/mgar/pkg/exiftool/trunk/Makefile 2009-11-27 14:26:44 UTC (rev 7480) +++ csw/mgar/pkg/exiftool/trunk/Makefile 2009-11-27 14:28:07 UTC (rev 7481) @@ -13,9 +13,9 @@ MASTER_SITES = http://owl.phy.queensu.ca/~phil/exiftool/ MODDIST = DISTFILES = $(DISTNAME).tar.gz -DISTFILES += $(call admfiles,CSWexiftool,) +DISTFILES += COPYING -REQUIRED_PKGS += CSWperl CSWpmiocompress +REQUIRED_PKGS = CSWpmiocompress # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = Image-ExifTool-(\d+(?:\.\d+)*).tar.gz @@ -26,4 +26,6 @@ CONFIGURE_ARGS = $(DIRPATHS) +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/exiftool/trunk/checksums =================================================================== --- csw/mgar/pkg/exiftool/trunk/checksums 2009-11-27 14:26:44 UTC (rev 7480) +++ csw/mgar/pkg/exiftool/trunk/checksums 2009-11-27 14:28:07 UTC (rev 7481) @@ -1,2 +1,2 @@ -13f9aae615a5de5e3c145b374950a75c download/CSWexiftool.gspec -f397ee071a01104e6c68da43f3bdd372 download/Image-ExifTool-7.99.tar.gz +13f9aae615a5de5e3c145b374950a75c COPYING +525f52712c2ab21c467ade83ceb567b8 Image-ExifTool-8.00.tar.gz Copied: csw/mgar/pkg/exiftool/trunk/files/COPYING (from rev 7479, csw/mgar/pkg/exiftool/trunk/files/CSWexiftool.gspec) =================================================================== --- csw/mgar/pkg/exiftool/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/exiftool/trunk/files/COPYING 2009-11-27 14:28:07 UTC (rev 7481) @@ -0,0 +1,9 @@ +%var bitname exiftool +%var pkgname CSWexiftool +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright +Copyright 2003-2009, Phil Harvey + +This is free software; you can redistribute it and/or modify it under the +same terms as Perl itself. Deleted: csw/mgar/pkg/exiftool/trunk/files/CSWexiftool.gspec =================================================================== --- csw/mgar/pkg/exiftool/trunk/files/CSWexiftool.gspec 2009-11-27 14:26:44 UTC (rev 7480) +++ csw/mgar/pkg/exiftool/trunk/files/CSWexiftool.gspec 2009-11-27 14:28:07 UTC (rev 7481) @@ -1,9 +0,0 @@ -%var bitname exiftool -%var pkgname CSWexiftool -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright -Copyright 2003-2009, Phil Harvey - -This 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 wahwah at users.sourceforge.net Fri Nov 27 15:45:45 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 27 Nov 2009 14:45:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[7482] csw/mgar/pkg/nss/branches/upstream-work/Makefile Message-ID: Revision: 7482 http://gar.svn.sourceforge.net/gar/?rev=7482&view=rev Author: wahwah Date: 2009-11-27 14:45:45 +0000 (Fri, 27 Nov 2009) Log Message: ----------- nss: Updated to use CSWsqlite3rt Modified Paths: -------------- csw/mgar/pkg/nss/branches/upstream-work/Makefile Modified: csw/mgar/pkg/nss/branches/upstream-work/Makefile =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/Makefile 2009-11-27 14:28:07 UTC (rev 7481) +++ csw/mgar/pkg/nss/branches/upstream-work/Makefile 2009-11-27 14:45:45 UTC (rev 7482) @@ -49,7 +49,7 @@ MASTER_SITES = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS = CSWnspr CSWsqlite3 +REQUIRED_PKGS = CSWnspr CSWsqlite3rt PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWsqlite3devel CONFIGURE_SCRIPTS = BUILD_SCRIPTS = nss 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 Nov 27 15:54:00 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 27 Nov 2009 14:54:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7483] csw/mgar/pkg/coreutils/trunk/Makefile Message-ID: Revision: 7483 http://gar.svn.sourceforge.net/gar/?rev=7483&view=rev Author: bdwalton Date: 2009-11-27 14:54:00 +0000 (Fri, 27 Nov 2009) Log Message: ----------- coreutils: use TEST_TARGET instead of awkward install-custom (thanks Dago) Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-27 14:45:45 UTC (rev 7482) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-27 14:54:00 UTC (rev 7483) @@ -32,16 +32,12 @@ CONFIGURE_ARGS += --with-libiconv-prefix=/opt/csw/ CONFIGURE_ARGS += --enable-no-install-program=arch,hostname,su,chcon -TEST_SCRIPTS = custom +TEST_TARGET = check include gar/category.mk PATH := /opt/csw/gnu:/opt/csw/bin:$(PATH) -test-custom: - @(cd $(WORKSRC); gmake check) - @$(MAKECOOKIE) - post-install-modulated: @echo Cleaning up install directory... rm -rf $(DESTDIR)/$(libdir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Nov 27 16:42:19 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 27 Nov 2009 15:42:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[7484] csw/mgar/pkg Message-ID: Revision: 7484 http://gar.svn.sourceforge.net/gar/?rev=7484&view=rev Author: dmichelsen Date: 2009-11-27 15:42:19 +0000 (Fri, 27 Nov 2009) Log Message: ----------- libmpeg2: Initial commit Added Paths: ----------- csw/mgar/pkg/libmpeg2/ csw/mgar/pkg/libmpeg2/branches/ csw/mgar/pkg/libmpeg2/tags/ csw/mgar/pkg/libmpeg2/trunk/ csw/mgar/pkg/libmpeg2/trunk/Makefile csw/mgar/pkg/libmpeg2/trunk/checksums csw/mgar/pkg/libmpeg2/trunk/files/ csw/mgar/pkg/libmpeg2/trunk/files/0001-Don-t-use-arm-specific-assembly-on-Sparc.patch Property changes on: csw/mgar/pkg/libmpeg2/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/libmpeg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmpeg2/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libmpeg2/trunk/Makefile 2009-11-27 15:42:19 UTC (rev 7484) @@ -0,0 +1,36 @@ +GARNAME = libmpeg2 +GARVERSION = 0.5.1 +CATEGORIES = lib + +DESCRIPTION = A free MPEG-2 video stream decoder +define BLURB +endef + +MASTER_SITES = http://libmpeg2.sourceforge.net/files/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Don-t-use-arm-specific-assembly-on-Sparc.patch + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +PACKAGES = CSWlibmpeg2 CSWmpeg2dec + +SPKG_DESC_CSWlibmpeg2 = A free MPEG-2 video stream library +SPKG_DESC_CSWmpeg2dec = A free MPEG-2 video stream decoder + +REQUIRED_PKGS_CSWmpeg2dec = CSWlibmpeg2 + +SPKG_SOURCEURL = http://libmpeg2.sourceforge.net + +# This stupid configure script adds '-fast' overwriting -xarch and +# especially activating 64 bit. +BUILD_ARGS = MPEG2DEC_CFLAGS= OPT_CFLAGS= + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) +# Do this only for sparcv8 and i386, otherwise make sure to compile on vis/mmx-enable ISA +CONFIGURE_ARGS += --disable-accel-detect + +PKGFILES_CSWmpeg2dec = $(bindir)/mpeg2dec + +include gar/category.mk Added: csw/mgar/pkg/libmpeg2/trunk/checksums =================================================================== --- csw/mgar/pkg/libmpeg2/trunk/checksums (rev 0) +++ csw/mgar/pkg/libmpeg2/trunk/checksums 2009-11-27 15:42:19 UTC (rev 7484) @@ -0,0 +1,2 @@ +92ebb653c36deb0a93fe597de10a546e 0001-Don-t-use-arm-specific-assembly-on-Sparc.patch +0f92c7454e58379b4a5a378485bbd8ef libmpeg2-0.5.1.tar.gz Added: csw/mgar/pkg/libmpeg2/trunk/files/0001-Don-t-use-arm-specific-assembly-on-Sparc.patch =================================================================== --- csw/mgar/pkg/libmpeg2/trunk/files/0001-Don-t-use-arm-specific-assembly-on-Sparc.patch (rev 0) +++ csw/mgar/pkg/libmpeg2/trunk/files/0001-Don-t-use-arm-specific-assembly-on-Sparc.patch 2009-11-27 15:42:19 UTC (rev 7484) @@ -0,0 +1,44184 @@ +From 38401a415b34a0751d5f7a48f9b35c2b23715f15 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 27 Nov 2009 15:50:03 +0100 +Subject: [PATCH] Don't use arm-specific assembly on Sparc + +--- + Makefile.in | 220 +- + aclocal.m4 | 6985 +----------- + configure |27651 ++++++++++++------------------------------ + configure.ac | 1 + + doc/Makefile.in | 115 +- + include/Makefile.in | 139 +- + include/config.h.in | 24 +- + libmpeg2/Makefile.in | 296 +- + libmpeg2/convert/Makefile.in | 177 +- + libvo/Makefile.in | 103 +- + src/Makefile.in | 266 +- + test/Makefile.in | 124 +- + vc++/Makefile.in | 71 +- + 13 files changed, 8818 insertions(+), 27354 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 2816117..10a972c 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,8 +16,9 @@ + @SET_MAKE@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ ++pkglibdir = $(libdir)/@PACKAGE@ ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -40,7 +42,10 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/cflags.m4 \ + $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/keywords.m4 \ +- $(top_srcdir)/m4/nonpic.m4 $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ ++ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ ++ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nonpic.m4 \ ++ $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ +@@ -48,6 +53,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/include/config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + SOURCES = + DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ +@@ -59,15 +65,43 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + ps-recursive uninstall-recursive + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ++AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ ++ distdir dist dist-all distcheck + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + distdir = $(PACKAGE)-$(VERSION) + top_distdir = $(distdir) + am__remove_distdir = \ +- { test ! -d $(distdir) \ +- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ +- && rm -fr $(distdir); }; } ++ { test ! -d "$(distdir)" \ ++ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ ++ && rm -fr "$(distdir)"; }; } ++am__relativize = \ ++ dir0=`pwd`; \ ++ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ ++ sed_rest='s,^[^/]*/*,,'; \ ++ sed_last='s,^.*/\([^/]*\)$$,\1,'; \ ++ sed_butlast='s,/*[^/]*$$,,'; \ ++ while test -n "$$dir1"; do \ ++ first=`echo "$$dir1" | sed -e "$$sed_first"`; \ ++ if test "$$first" != "."; then \ ++ if test "$$first" = ".."; then \ ++ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ ++ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ ++ else \ ++ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ ++ if test "$$first2" = "$$first"; then \ ++ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ ++ else \ ++ dir2="../$$dir2"; \ ++ fi; \ ++ dir0="$$dir0"/"$$first"; \ ++ fi; \ ++ fi; \ ++ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ ++ done; \ ++ reldir="$$dir2" + DIST_ARCHIVES = $(distdir).tar.gz + GZIP_ENV = --best + distuninstallcheck_listfiles = find . -type f -print +@@ -90,29 +124,25 @@ CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CXX = @CXX@ +-CXXCPP = @CXXCPP@ +-CXXDEPMODE = @CXXDEPMODE@ +-CXXFLAGS = @CXXFLAGS@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ + GREP = @GREP@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ++LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@ + LIBOBJS = @LIBOBJS@ +@@ -120,21 +150,26 @@ LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBVO_CFLAGS = @LIBVO_CFLAGS@ + LIBVO_LIBS = @LIBVO_LIBS@ ++LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ + MPEG2DEC_CFLAGS = @MPEG2DEC_CFLAGS@ ++NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OPT_CFLAGS = @OPT_CFLAGS@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + RANLIB = @RANLIB@ +@@ -154,8 +189,7 @@ abs_srcdir = @abs_srcdir@ + abs_top_builddir = @abs_top_builddir@ + abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ +-ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -186,6 +220,7 @@ libdir = @libdir@ + libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ +@@ -198,6 +233,7 @@ sharedstatedir = @sharedstatedir@ + srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + SUBDIRS = libmpeg2 include libvo src test vc++ +@@ -215,15 +251,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ +- cd $(srcdir) && $(AUTOMAKE) --foreign \ ++ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \ ++ $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --foreign Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -239,9 +275,10 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENC + $(SHELL) ./config.status --recheck + + $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(srcdir) && $(AUTOCONF) ++ $(am__cd) $(srcdir) && $(AUTOCONF) + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) ++ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) ++$(am__aclocal_m4_deps): + + mostlyclean-libtool: + -rm -f *.lo +@@ -250,7 +287,7 @@ clean-libtool: + -rm -rf .libs _libs + + distclean-libtool: +- -rm -f libtool ++ -rm -f libtool config.lt + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. +@@ -276,7 +313,7 @@ $(RECURSIVE_TARGETS): + else \ + local_target="$$target"; \ + fi; \ +- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ +@@ -310,16 +347,16 @@ $(RECURSIVE_CLEAN_TARGETS): + else \ + local_target="$$target"; \ + fi; \ +- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ ++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +@@ -327,14 +364,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +@@ -346,7 +383,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ +- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ ++ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +@@ -355,36 +392,41 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ + fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) + $(am__remove_distdir) +- test -d $(distdir) || mkdir $(distdir) ++ test -d "$(distdir)" || mkdir "$(distdir)" + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -400,38 +442,54 @@ distdir: $(DISTFILES) + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ +- (cd $$subdir && \ ++ fi; \ ++ done ++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ ++ $(am__relativize); \ ++ new_distdir=$$reldir; \ ++ dir1=$$subdir; dir2="$(top_distdir)"; \ ++ $(am__relativize); \ ++ new_top_distdir=$$reldir; \ ++ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ ++ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ ++ ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ ++ top_distdir="$$new_top_distdir" \ ++ distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ ++ am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done +- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ++ -test -n "$(am__skip_mode_fix)" \ ++ || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ +- || chmod -R a+r $(distdir) ++ || chmod -R a+r "$(distdir)" + dist-gzip: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) +@@ -444,6 +502,10 @@ dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + ++dist-xz: distdir ++ tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz ++ $(am__remove_distdir) ++ + dist-tarZ: distdir + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__remove_distdir) +@@ -472,6 +534,8 @@ distcheck: dist + bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ ++ *.tar.xz*) \ ++ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ +@@ -483,9 +547,11 @@ distcheck: dist + mkdir $(distdir)/_build + mkdir $(distdir)/_inst + chmod a-w $(distdir) ++ test -d $(distdir)/_build || exit 0; \ + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ +- && cd $(distdir)/_build \ ++ && am__cwd=`pwd` \ ++ && $(am__cd) $(distdir)/_build \ + && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(DISTCHECK_CONFIGURE_FLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) \ +@@ -507,13 +573,15 @@ distcheck: dist + && rm -rf "$$dc_destdir" \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && rm -rf $(DIST_ARCHIVES) \ +- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck ++ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ ++ && cd "$$am__cwd" \ ++ || exit 1 + $(am__remove_distdir) + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' + distuninstallcheck: +- @cd $(distuninstallcheck_dir) \ ++ @$(am__cd) '$(distuninstallcheck_dir)' \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ +@@ -555,6 +623,7 @@ clean-generic: + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -575,6 +644,8 @@ dvi-am: + + html: html-recursive + ++html-am: ++ + info: info-recursive + + info-am: +@@ -583,18 +654,28 @@ install-data-am: + + install-dvi: install-dvi-recursive + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-recursive + ++install-html-am: ++ + install-info: install-info-recursive + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-recursive + ++install-pdf-am: ++ + install-ps: install-ps-recursive + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -617,24 +698,25 @@ ps-am: + + uninstall-am: + +-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ +- install-strip ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ ++ install-am install-strip tags-recursive + + .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am am--refresh check check-am clean clean-generic \ + clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ +- dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \ +- distclean distclean-generic distclean-libtool distclean-tags \ +- distcleancheck distdir distuninstallcheck dvi dvi-am html \ +- html-am info info-am install install-am install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs installdirs-am maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ +- uninstall uninstall-am ++ dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ ++ distcheck distclean distclean-generic distclean-libtool \ ++ distclean-tags distcleancheck distdir distuninstallcheck dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs installdirs-am \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am ++ + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +diff --git a/aclocal.m4 b/aclocal.m4 +index f65e285..6aa0de9 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -1,7 +1,7 @@ +-# generated automatically by aclocal 1.10.1 -*- Autoconf -*- ++# generated automatically by aclocal 1.11 -*- Autoconf -*- + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +-# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -13,6665 +13,13 @@ + + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +-m4_if(AC_AUTOCONF_VERSION, [2.61],, +-[m4_warning([this file was generated for autoconf 2.61. ++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, ++[m4_warning([this file was generated for autoconf 2.65. + You have another version of autoconf. It may work, but is not guaranteed to. + If you have problems, you may need to regenerate the build system entirely. + To do so, use the procedure documented by the package, typically `autoreconf'.])]) + +-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- +- +-# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL +- +- +-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +-# ----------------------------------------------------------- +-# If this macro is not defined by Autoconf, define it here. +-m4_ifdef([AC_PROVIDE_IFELSE], +- [], +- [m4_define([AC_PROVIDE_IFELSE], +- [m4_ifdef([AC_PROVIDE_$1], +- [$2], [$3])])]) +- +- +-# AC_PROG_LIBTOOL +-# --------------- +-AC_DEFUN([AC_PROG_LIBTOOL], +-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl +-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX +-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. +- AC_PROVIDE_IFELSE([AC_PROG_CXX], +- [AC_LIBTOOL_CXX], +- [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX +- ])]) +-dnl And a similar setup for Fortran 77 support +- AC_PROVIDE_IFELSE([AC_PROG_F77], +- [AC_LIBTOOL_F77], +- [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 +-])]) +- +-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. +-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run +-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. +- AC_PROVIDE_IFELSE([AC_PROG_GCJ], +- [AC_LIBTOOL_GCJ], +- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], +- [AC_LIBTOOL_GCJ], +- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], +- [AC_LIBTOOL_GCJ], +- [ifdef([AC_PROG_GCJ], +- [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) +- ifdef([A][M_PROG_GCJ], +- [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) +- ifdef([LT_AC_PROG_GCJ], +- [define([LT_AC_PROG_GCJ], +- defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) +-])])# AC_PROG_LIBTOOL +- +- +-# _AC_PROG_LIBTOOL +-# ---------------- +-AC_DEFUN([_AC_PROG_LIBTOOL], +-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl +-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl +-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl +-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl +- +-# This can be used to rebuild libtool when needed +-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" +- +-# Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' +-AC_SUBST(LIBTOOL)dnl +- +-# Prevent multiple expansion +-define([AC_PROG_LIBTOOL], []) +-])# _AC_PROG_LIBTOOL +- +- +-# AC_LIBTOOL_SETUP +-# ---------------- +-AC_DEFUN([AC_LIBTOOL_SETUP], +-[AC_PREREQ(2.50)dnl +-AC_REQUIRE([AC_ENABLE_SHARED])dnl +-AC_REQUIRE([AC_ENABLE_STATIC])dnl +-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl +-AC_REQUIRE([AC_CANONICAL_HOST])dnl +-AC_REQUIRE([AC_CANONICAL_BUILD])dnl +-AC_REQUIRE([AC_PROG_CC])dnl +-AC_REQUIRE([AC_PROG_LD])dnl +-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl +-AC_REQUIRE([AC_PROG_NM])dnl +- +-AC_REQUIRE([AC_PROG_LN_S])dnl +-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl +-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! +-AC_REQUIRE([AC_OBJEXT])dnl +-AC_REQUIRE([AC_EXEEXT])dnl +-dnl +-AC_LIBTOOL_SYS_MAX_CMD_LEN +-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +-AC_LIBTOOL_OBJDIR +- +-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +-_LT_AC_PROG_ECHO_BACKSLASH +- +-case $host_os in +-aix3*) +- # AIX sometimes has problems with the GCC collect2 program. For some +- # reason, if we set the COLLECT_NAMES environment variable, the problems +- # vanish in a puff of smoke. +- if test "X${COLLECT_NAMES+set}" != Xset; then +- COLLECT_NAMES= +- export COLLECT_NAMES +- fi +- ;; +-esac +- +-# Sed substitution that helps us do robust quoting. It backslashifies +-# metacharacters that are still active within double-quoted strings. +-Xsed='sed -e 1s/^X//' +-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] +- +-# Same as above, but do not quote variable references. +-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] +- +-# Sed substitution to delay expansion of an escaped shell variable in a +-# double_quote_subst'ed string. +-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' +- +-# Sed substitution to avoid accidental globbing in evaled expressions +-no_glob_subst='s/\*/\\\*/g' +- +-# Constants: +-rm="rm -f" +- +-# Global variables: +-default_ofile=libtool +-can_build_shared=yes +- +-# All known linkers require a `.a' archive for static linking (except MSVC, +-# which needs '.lib'). +-libext=a +-ltmain="$ac_aux_dir/ltmain.sh" +-ofile="$default_ofile" +-with_gnu_ld="$lt_cv_prog_gnu_ld" +- +-AC_CHECK_TOOL(AR, ar, false) +-AC_CHECK_TOOL(RANLIB, ranlib, :) +-AC_CHECK_TOOL(STRIP, strip, :) +- +-old_CC="$CC" +-old_CFLAGS="$CFLAGS" +- +-# Set sane defaults for various variables +-test -z "$AR" && AR=ar +-test -z "$AR_FLAGS" && AR_FLAGS=cru +-test -z "$AS" && AS=as +-test -z "$CC" && CC=cc +-test -z "$LTCC" && LTCC=$CC +-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +-test -z "$DLLTOOL" && DLLTOOL=dlltool +-test -z "$LD" && LD=ld +-test -z "$LN_S" && LN_S="ln -s" +-test -z "$MAGIC_CMD" && MAGIC_CMD=file +-test -z "$NM" && NM=nm +-test -z "$SED" && SED=sed +-test -z "$OBJDUMP" && OBJDUMP=objdump +-test -z "$RANLIB" && RANLIB=: +-test -z "$STRIP" && STRIP=: +-test -z "$ac_objext" && ac_objext=o +- +-# Determine commands to create old-style static archives. +-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +-old_postinstall_cmds='chmod 644 $oldlib' +-old_postuninstall_cmds= +- +-if test -n "$RANLIB"; then +- case $host_os in +- openbsd*) +- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" +- ;; +- *) +- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" +- ;; +- esac +- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" +-fi +- +-_LT_CC_BASENAME([$compiler]) +- +-# Only perform the check for file, if the check method requires it +-case $deplibs_check_method in +-file_magic*) +- if test "$file_magic_cmd" = '$MAGIC_CMD'; then +- AC_PATH_MAGIC +- fi +- ;; +-esac +- +-_LT_REQUIRED_DARWIN_CHECKS +- +-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) +-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], +-enable_win32_dll=yes, enable_win32_dll=no) +- +-AC_ARG_ENABLE([libtool-lock], +- [AC_HELP_STRING([--disable-libtool-lock], +- [avoid locking (might break parallel builds)])]) +-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +- +-AC_ARG_WITH([pic], +- [AC_HELP_STRING([--with-pic], +- [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], +- [pic_mode="$withval"], +- [pic_mode=default]) +-test -z "$pic_mode" && pic_mode=default +- +-# Use C for the default configuration in the libtool script +-tagname= +-AC_LIBTOOL_LANG_C_CONFIG +-_LT_AC_TAGCONFIG +-])# AC_LIBTOOL_SETUP +- +- +-# _LT_AC_SYS_COMPILER +-# ------------------- +-AC_DEFUN([_LT_AC_SYS_COMPILER], +-[AC_REQUIRE([AC_PROG_CC])dnl +- +-# If no C compiler was specified, use CC. +-LTCC=${LTCC-"$CC"} +- +-# If no C compiler flags were specified, use CFLAGS. +-LTCFLAGS=${LTCFLAGS-"$CFLAGS"} +- +-# Allow CC to be a program name with arguments. +-compiler=$CC +-])# _LT_AC_SYS_COMPILER +- +- +-# _LT_CC_BASENAME(CC) +-# ------------------- +-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +-AC_DEFUN([_LT_CC_BASENAME], +-[for cc_temp in $1""; do +- case $cc_temp in +- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; +- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; +- \-*) ;; +- *) break;; +- esac +-done +-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +-]) +- +- +-# _LT_COMPILER_BOILERPLATE +-# ------------------------ +-# Check for compiler boilerplate output or warnings with +-# the simple compiler test code. +-AC_DEFUN([_LT_COMPILER_BOILERPLATE], +-[AC_REQUIRE([LT_AC_PROG_SED])dnl +-ac_outfile=conftest.$ac_objext +-echo "$lt_simple_compile_test_code" >conftest.$ac_ext +-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +-_lt_compiler_boilerplate=`cat conftest.err` +-$rm conftest* +-])# _LT_COMPILER_BOILERPLATE +- +- +-# _LT_LINKER_BOILERPLATE +-# ---------------------- +-# Check for linker boilerplate output or warnings with +-# the simple link test code. +-AC_DEFUN([_LT_LINKER_BOILERPLATE], +-[AC_REQUIRE([LT_AC_PROG_SED])dnl +-ac_outfile=conftest.$ac_objext +-echo "$lt_simple_link_test_code" >conftest.$ac_ext +-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +-_lt_linker_boilerplate=`cat conftest.err` +-$rm -r conftest* +-])# _LT_LINKER_BOILERPLATE +- +-# _LT_REQUIRED_DARWIN_CHECKS +-# -------------------------- +-# Check for some things on darwin +-AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ +- case $host_os in +- rhapsody* | darwin*) +- AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) +- AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) +- +- AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], +- [lt_cv_apple_cc_single_mod=no +- if test -z "${LT_MULTI_MODULE}"; then +- # By default we will add the -single_module flag. You can override +- # by either setting the environment variable LT_MULTI_MODULE +- # non-empty at configure time, or by adding -multi_module to the +- # link flags. +- echo "int foo(void){return 1;}" > conftest.c +- $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +- -dynamiclib ${wl}-single_module conftest.c +- if test -f libconftest.dylib; then +- lt_cv_apple_cc_single_mod=yes +- rm -rf libconftest.dylib* +- fi +- rm conftest.c +- fi]) +- AC_CACHE_CHECK([for -exported_symbols_list linker flag], +- [lt_cv_ld_exported_symbols_list], +- [lt_cv_ld_exported_symbols_list=no +- save_LDFLAGS=$LDFLAGS +- echo "_main" > conftest.sym +- LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" +- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], +- [lt_cv_ld_exported_symbols_list=yes], +- [lt_cv_ld_exported_symbols_list=no]) +- LDFLAGS="$save_LDFLAGS" +- ]) +- case $host_os in +- rhapsody* | darwin1.[[0123]]) +- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; +- darwin1.*) +- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; +- darwin*) +- # if running on 10.5 or later, the deployment target defaults +- # to the OS version, if on x86, and 10.4, the deployment +- # target defaults to 10.4. Don't you love it? +- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in +- 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) +- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; +- 10.[[012]]*) +- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; +- 10.*) +- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; +- esac +- ;; +- esac +- if test "$lt_cv_apple_cc_single_mod" = "yes"; then +- _lt_dar_single_mod='$single_module' +- fi +- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then +- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' +- else +- _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" +- fi +- if test "$DSYMUTIL" != ":"; then +- _lt_dsymutil="~$DSYMUTIL \$lib || :" +- else +- _lt_dsymutil= +- fi +- ;; +- esac +-]) +- +-# _LT_AC_SYS_LIBPATH_AIX +-# ---------------------- +-# Links a minimal program and checks the executable +-# for the system default hardcoded library path. In most cases, +-# this is /usr/lib:/lib, but when the MPI compilers are used +-# the location of the communication and MPI libs are included too. +-# If we don't find anything, use the default library path according +-# to the aix ld manual. +-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], +-[AC_REQUIRE([LT_AC_PROG_SED])dnl +-AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +-lt_aix_libpath_sed=' +- /Import File Strings/,/^$/ { +- /^0/ { +- s/^0 *\(.*\)$/\1/ +- p +- } +- }' +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then +- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-fi],[]) +-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +-])# _LT_AC_SYS_LIBPATH_AIX +- +- +-# _LT_AC_SHELL_INIT(ARG) +-# ---------------------- +-AC_DEFUN([_LT_AC_SHELL_INIT], +-[ifdef([AC_DIVERSION_NOTICE], +- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], +- [AC_DIVERT_PUSH(NOTICE)]) +-$1 +-AC_DIVERT_POP +-])# _LT_AC_SHELL_INIT +- +- +-# _LT_AC_PROG_ECHO_BACKSLASH +-# -------------------------- +-# Add some code to the start of the generated configure script which +-# will find an echo command which doesn't interpret backslashes. +-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], +-[_LT_AC_SHELL_INIT([ +-# Check that we are running under the correct shell. +-SHELL=${CONFIG_SHELL-/bin/sh} +- +-case X$ECHO in +-X*--fallback-echo) +- # Remove one level of quotation (which was required for Make). +- ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` +- ;; +-esac +- +-echo=${ECHO-echo} +-if test "X[$]1" = X--no-reexec; then +- # Discard the --no-reexec flag, and continue. +- shift +-elif test "X[$]1" = X--fallback-echo; then +- # Avoid inline document here, it may be left over +- : +-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then +- # Yippee, $echo works! +- : +-else +- # Restart under the correct shell. +- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} +-fi +- +-if test "X[$]1" = X--fallback-echo; then +- # used as fallback echo +- shift +- cat </dev/null 2>&1 && unset CDPATH +- +-if test -z "$ECHO"; then +-if test "X${echo_test_string+set}" != Xset; then +-# find a string as large as possible, as long as the shell can cope with it +- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do +- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... +- if (echo_test_string=`eval $cmd`) 2>/dev/null && +- echo_test_string=`eval $cmd` && +- (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null +- then +- break +- fi +- done +-fi +- +-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- : +-else +- # The Solaris, AIX, and Digital Unix default echo programs unquote +- # backslashes. This makes it impossible to quote backslashes using +- # echo "$something" | sed 's/\\/\\\\/g' +- # +- # So, first we look for a working echo in the user's PATH. +- +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for dir in $PATH /usr/ucb; do +- IFS="$lt_save_ifs" +- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && +- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- echo="$dir/echo" +- break +- fi +- done +- IFS="$lt_save_ifs" +- +- if test "X$echo" = Xecho; then +- # We didn't find a better echo, so look for alternatives. +- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- # This shell has a builtin print -r that does the trick. +- echo='print -r' +- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && +- test "X$CONFIG_SHELL" != X/bin/ksh; then +- # If we have ksh, try running configure again with it. +- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +- export ORIGINAL_CONFIG_SHELL +- CONFIG_SHELL=/bin/ksh +- export CONFIG_SHELL +- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} +- else +- # Try using printf. +- echo='printf %s\n' +- if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- # Cool, printf works +- : +- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && +- test "X$echo_testing_string" = 'X\t' && +- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL +- export CONFIG_SHELL +- SHELL="$CONFIG_SHELL" +- export SHELL +- echo="$CONFIG_SHELL [$]0 --fallback-echo" +- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && +- test "X$echo_testing_string" = 'X\t' && +- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- echo="$CONFIG_SHELL [$]0 --fallback-echo" +- else +- # maybe with a smaller string... +- prev=: +- +- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do +- if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null +- then +- break +- fi +- prev="$cmd" +- done +- +- if test "$prev" != 'sed 50q "[$]0"'; then +- echo_test_string=`eval $prev` +- export echo_test_string +- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} +- else +- # Oops. We lost completely, so just stick with echo. +- echo=echo +- fi +- fi +- fi +- fi +-fi +-fi +- +-# Copy echo and quote the copy suitably for passing to libtool from +-# the Makefile, instead of quoting the original, which is used later. +-ECHO=$echo +-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then +- ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" +-fi +- +-AC_SUBST(ECHO) +-])])# _LT_AC_PROG_ECHO_BACKSLASH +- +- +-# _LT_AC_LOCK +-# ----------- +-AC_DEFUN([_LT_AC_LOCK], +-[AC_ARG_ENABLE([libtool-lock], +- [AC_HELP_STRING([--disable-libtool-lock], +- [avoid locking (might break parallel builds)])]) +-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +- +-# Some flags need to be propagated to the compiler or linker for good +-# libtool support. +-case $host in +-ia64-*-hpux*) +- # Find out which ABI we are using. +- echo 'int i;' > conftest.$ac_ext +- if AC_TRY_EVAL(ac_compile); then +- case `/usr/bin/file conftest.$ac_objext` in +- *ELF-32*) +- HPUX_IA64_MODE="32" +- ;; +- *ELF-64*) +- HPUX_IA64_MODE="64" +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +-*-*-irix6*) +- # Find out which ABI we are using. +- echo '[#]line __oline__ "configure"' > conftest.$ac_ext +- if AC_TRY_EVAL(ac_compile); then +- if test "$lt_cv_prog_gnu_ld" = yes; then +- case `/usr/bin/file conftest.$ac_objext` in +- *32-bit*) +- LD="${LD-ld} -melf32bsmip" +- ;; +- *N32*) +- LD="${LD-ld} -melf32bmipn32" +- ;; +- *64-bit*) +- LD="${LD-ld} -melf64bmip" +- ;; +- esac +- else +- case `/usr/bin/file conftest.$ac_objext` in +- *32-bit*) +- LD="${LD-ld} -32" +- ;; +- *N32*) +- LD="${LD-ld} -n32" +- ;; +- *64-bit*) +- LD="${LD-ld} -64" +- ;; +- esac +- fi +- fi +- rm -rf conftest* +- ;; +- +-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +-s390*-*linux*|sparc*-*linux*) +- # Find out which ABI we are using. +- echo 'int i;' > conftest.$ac_ext +- if AC_TRY_EVAL(ac_compile); then +- case `/usr/bin/file conftest.o` in +- *32-bit*) +- case $host in +- x86_64-*kfreebsd*-gnu) +- LD="${LD-ld} -m elf_i386_fbsd" +- ;; +- x86_64-*linux*) +- LD="${LD-ld} -m elf_i386" +- ;; +- ppc64-*linux*|powerpc64-*linux*) +- LD="${LD-ld} -m elf32ppclinux" +- ;; +- s390x-*linux*) +- LD="${LD-ld} -m elf_s390" +- ;; +- sparc64-*linux*) +- LD="${LD-ld} -m elf32_sparc" +- ;; +- esac +- ;; +- *64-bit*) +- case $host in +- x86_64-*kfreebsd*-gnu) +- LD="${LD-ld} -m elf_x86_64_fbsd" +- ;; +- x86_64-*linux*) +- LD="${LD-ld} -m elf_x86_64" +- ;; +- ppc*-*linux*|powerpc*-*linux*) +- LD="${LD-ld} -m elf64ppc" +- ;; +- s390*-*linux*) +- LD="${LD-ld} -m elf64_s390" +- ;; +- sparc*-*linux*) +- LD="${LD-ld} -m elf64_sparc" +- ;; +- esac +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +- +-*-*-sco3.2v5*) +- # On SCO OpenServer 5, we need -belf to get full-featured binaries. +- SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -belf" +- AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, +- [AC_LANG_PUSH(C) +- AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) +- AC_LANG_POP]) +- if test x"$lt_cv_cc_needs_belf" != x"yes"; then +- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf +- CFLAGS="$SAVE_CFLAGS" +- fi +- ;; +-sparc*-*solaris*) +- # Find out which ABI we are using. +- echo 'int i;' > conftest.$ac_ext +- if AC_TRY_EVAL(ac_compile); then +- case `/usr/bin/file conftest.o` in +- *64-bit*) +- case $lt_cv_prog_gnu_ld in +- yes*) LD="${LD-ld} -m elf64_sparc" ;; +- *) +- if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then +- LD="${LD-ld} -64" +- fi +- ;; +- esac +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +- +-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], +-[*-*-cygwin* | *-*-mingw* | *-*-pw32*) +- AC_CHECK_TOOL(DLLTOOL, dlltool, false) +- AC_CHECK_TOOL(AS, as, false) +- AC_CHECK_TOOL(OBJDUMP, objdump, false) +- ;; +- ]) +-esac +- +-need_locks="$enable_libtool_lock" +- +-])# _LT_AC_LOCK +- +- +-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +-# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) +-# ---------------------------------------------------------------- +-# Check whether the given compiler option works +-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], +-[AC_REQUIRE([LT_AC_PROG_SED]) +-AC_CACHE_CHECK([$1], [$2], +- [$2=no +- ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) +- echo "$lt_simple_compile_test_code" > conftest.$ac_ext +- lt_compiler_flag="$3" +- # Insert the option either (1) after the last *FLAGS variable, or +- # (2) before a word containing "conftest.", or (3) at the end. +- # Note that $ac_compile itself does not contain backslashes and begins +- # with a dollar sign (not a hyphen), so the echo should work correctly. +- # The option is referenced via a variable to avoid confusing sed. +- lt_compile=`echo "$ac_compile" | $SED \ +- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ +- -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ +- -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) +- (eval "$lt_compile" 2>conftest.err) +- ac_status=$? +- cat conftest.err >&AS_MESSAGE_LOG_FD +- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD +- if (exit $ac_status) && test -s "$ac_outfile"; then +- # The compiler can only warn and ignore the option if not recognized +- # So say no if there are warnings other than the usual output. +- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp +- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 +- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then +- $2=yes +- fi +- fi +- $rm conftest* +-]) +- +-if test x"[$]$2" = xyes; then +- ifelse([$5], , :, [$5]) +-else +- ifelse([$6], , :, [$6]) +-fi +-])# AC_LIBTOOL_COMPILER_OPTION +- +- +-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +-# [ACTION-SUCCESS], [ACTION-FAILURE]) +-# ------------------------------------------------------------ +-# Check whether the given compiler option works +-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], +-[AC_REQUIRE([LT_AC_PROG_SED])dnl +-AC_CACHE_CHECK([$1], [$2], +- [$2=no +- save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS $3" +- echo "$lt_simple_link_test_code" > conftest.$ac_ext +- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then +- # The linker can only warn and ignore the option if not recognized +- # So say no if there are warnings +- if test -s conftest.err; then +- # Append any errors to the config.log. +- cat conftest.err 1>&AS_MESSAGE_LOG_FD +- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp +- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 +- if diff conftest.exp conftest.er2 >/dev/null; then +- $2=yes +- fi +- else +- $2=yes +- fi +- fi +- $rm -r conftest* +- LDFLAGS="$save_LDFLAGS" +-]) +- +-if test x"[$]$2" = xyes; then +- ifelse([$4], , :, [$4]) +-else +- ifelse([$5], , :, [$5]) +-fi +-])# AC_LIBTOOL_LINKER_OPTION +- +- +-# AC_LIBTOOL_SYS_MAX_CMD_LEN +-# -------------------------- +-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], +-[# find the maximum length of command line arguments +-AC_MSG_CHECKING([the maximum length of command line arguments]) +-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl +- i=0 +- teststring="ABCD" +- +- case $build_os in +- msdosdjgpp*) +- # On DJGPP, this test can blow up pretty badly due to problems in libc +- # (any single argument exceeding 2000 bytes causes a buffer overrun +- # during glob expansion). Even if it were fixed, the result of this +- # check would be larger than it should be. +- lt_cv_sys_max_cmd_len=12288; # 12K is about right +- ;; +- +- gnu*) +- # Under GNU Hurd, this test is not required because there is +- # no limit to the length of command line arguments. +- # Libtool will interpret -1 as no limit whatsoever +- lt_cv_sys_max_cmd_len=-1; +- ;; +- +- cygwin* | mingw*) +- # On Win9x/ME, this test blows up -- it succeeds, but takes +- # about 5 minutes as the teststring grows exponentially. +- # Worse, since 9x/ME are not pre-emptively multitasking, +- # you end up with a "frozen" computer, even though with patience +- # the test eventually succeeds (with a max line length of 256k). +- # Instead, let's just punt: use the minimum linelength reported by +- # all of the supported platforms: 8192 (on NT/2K/XP). +- lt_cv_sys_max_cmd_len=8192; +- ;; +- +- amigaos*) +- # On AmigaOS with pdksh, this test takes hours, literally. +- # So we just punt and use a minimum line length of 8192. +- lt_cv_sys_max_cmd_len=8192; +- ;; +- +- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) +- # This has been around since 386BSD, at least. Likely further. +- if test -x /sbin/sysctl; then +- lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` +- elif test -x /usr/sbin/sysctl; then +- lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` +- else +- lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs +- fi +- # And add a safety zone +- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` +- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` +- ;; +- +- interix*) +- # We know the value 262144 and hardcode it with a safety zone (like BSD) +- lt_cv_sys_max_cmd_len=196608 +- ;; +- +- osf*) +- # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure +- # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not +- # nice to cause kernel panics so lets avoid the loop below. +- # First set a reasonable default. +- lt_cv_sys_max_cmd_len=16384 +- # +- if test -x /sbin/sysconfig; then +- case `/sbin/sysconfig -q proc exec_disable_arg_limit` in +- *1*) lt_cv_sys_max_cmd_len=-1 ;; +- esac +- fi +- ;; +- sco3.2v5*) +- lt_cv_sys_max_cmd_len=102400 +- ;; +- sysv5* | sco5v6* | sysv4.2uw2*) +- kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` +- if test -n "$kargmax"; then +- lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` +- else +- lt_cv_sys_max_cmd_len=32768 +- fi +- ;; +- *) +- lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` +- if test -n "$lt_cv_sys_max_cmd_len"; then +- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` +- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` +- else +- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} +- while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ +- = "XX$teststring") >/dev/null 2>&1 && +- new_result=`expr "X$teststring" : ".*" 2>&1` && +- lt_cv_sys_max_cmd_len=$new_result && +- test $i != 17 # 1/2 MB should be enough +- do +- i=`expr $i + 1` +- teststring=$teststring$teststring +- done +- teststring= +- # Add a significant safety factor because C++ compilers can tack on massive +- # amounts of additional arguments before passing them to the linker. +- # It appears as though 1/2 is a usable value. +- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` +- fi +- ;; +- esac +-]) +-if test -n $lt_cv_sys_max_cmd_len ; then +- AC_MSG_RESULT($lt_cv_sys_max_cmd_len) +-else +- AC_MSG_RESULT(none) +-fi +-])# AC_LIBTOOL_SYS_MAX_CMD_LEN +- +- +-# _LT_AC_CHECK_DLFCN +-# ------------------ +-AC_DEFUN([_LT_AC_CHECK_DLFCN], +-[AC_CHECK_HEADERS(dlfcn.h)dnl +-])# _LT_AC_CHECK_DLFCN +- +- +-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, +-# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) +-# --------------------------------------------------------------------- +-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], +-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl +-if test "$cross_compiling" = yes; then : +- [$4] +-else +- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 +- lt_status=$lt_dlunknown +- cat > conftest.$ac_ext < +-#endif +- +-#include +- +-#ifdef RTLD_GLOBAL +-# define LT_DLGLOBAL RTLD_GLOBAL +-#else +-# ifdef DL_GLOBAL +-# define LT_DLGLOBAL DL_GLOBAL +-# else +-# define LT_DLGLOBAL 0 +-# endif +-#endif +- +-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we +- find out it does not work in some platform. */ +-#ifndef LT_DLLAZY_OR_NOW +-# ifdef RTLD_LAZY +-# define LT_DLLAZY_OR_NOW RTLD_LAZY +-# else +-# ifdef DL_LAZY +-# define LT_DLLAZY_OR_NOW DL_LAZY +-# else +-# ifdef RTLD_NOW +-# define LT_DLLAZY_OR_NOW RTLD_NOW +-# else +-# ifdef DL_NOW +-# define LT_DLLAZY_OR_NOW DL_NOW +-# else +-# define LT_DLLAZY_OR_NOW 0 +-# endif +-# endif +-# endif +-# endif +-#endif +- +-#ifdef __cplusplus +-extern "C" void exit (int); +-#endif +- +-void fnord() { int i=42;} +-int main () +-{ +- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); +- int status = $lt_dlunknown; +- +- if (self) +- { +- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; +- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; +- /* dlclose (self); */ +- } +- else +- puts (dlerror ()); +- +- exit (status); +-}] +-EOF +- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then +- (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null +- lt_status=$? +- case x$lt_status in +- x$lt_dlno_uscore) $1 ;; +- x$lt_dlneed_uscore) $2 ;; +- x$lt_dlunknown|x*) $3 ;; +- esac +- else : +- # compilation failed +- $3 +- fi +-fi +-rm -fr conftest* +-])# _LT_AC_TRY_DLOPEN_SELF +- +- +-# AC_LIBTOOL_DLOPEN_SELF +-# ---------------------- +-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], +-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl +-if test "x$enable_dlopen" != xyes; then +- enable_dlopen=unknown +- enable_dlopen_self=unknown +- enable_dlopen_self_static=unknown +-else +- lt_cv_dlopen=no +- lt_cv_dlopen_libs= +- +- case $host_os in +- beos*) +- lt_cv_dlopen="load_add_on" +- lt_cv_dlopen_libs= +- lt_cv_dlopen_self=yes +- ;; +- +- mingw* | pw32*) +- lt_cv_dlopen="LoadLibrary" +- lt_cv_dlopen_libs= +- ;; +- +- cygwin*) +- lt_cv_dlopen="dlopen" +- lt_cv_dlopen_libs= +- ;; +- +- darwin*) +- # if libdl is installed we need to link against it +- AC_CHECK_LIB([dl], [dlopen], +- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ +- lt_cv_dlopen="dyld" +- lt_cv_dlopen_libs= +- lt_cv_dlopen_self=yes +- ]) +- ;; +- +- *) +- AC_CHECK_FUNC([shl_load], +- [lt_cv_dlopen="shl_load"], +- [AC_CHECK_LIB([dld], [shl_load], +- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], +- [AC_CHECK_FUNC([dlopen], +- [lt_cv_dlopen="dlopen"], +- [AC_CHECK_LIB([dl], [dlopen], +- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], +- [AC_CHECK_LIB([svld], [dlopen], +- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], +- [AC_CHECK_LIB([dld], [dld_link], +- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) +- ]) +- ]) +- ]) +- ]) +- ]) +- ;; +- esac +- +- if test "x$lt_cv_dlopen" != xno; then +- enable_dlopen=yes +- else +- enable_dlopen=no +- fi +- +- case $lt_cv_dlopen in +- dlopen) +- save_CPPFLAGS="$CPPFLAGS" +- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" +- +- save_LDFLAGS="$LDFLAGS" +- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" +- +- save_LIBS="$LIBS" +- LIBS="$lt_cv_dlopen_libs $LIBS" +- +- AC_CACHE_CHECK([whether a program can dlopen itself], +- lt_cv_dlopen_self, [dnl +- _LT_AC_TRY_DLOPEN_SELF( +- lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, +- lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) +- ]) +- +- if test "x$lt_cv_dlopen_self" = xyes; then +- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" +- AC_CACHE_CHECK([whether a statically linked program can dlopen itself], +- lt_cv_dlopen_self_static, [dnl +- _LT_AC_TRY_DLOPEN_SELF( +- lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, +- lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) +- ]) +- fi +- +- CPPFLAGS="$save_CPPFLAGS" +- LDFLAGS="$save_LDFLAGS" +- LIBS="$save_LIBS" +- ;; +- esac +- +- case $lt_cv_dlopen_self in +- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; +- *) enable_dlopen_self=unknown ;; +- esac +- +- case $lt_cv_dlopen_self_static in +- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; +- *) enable_dlopen_self_static=unknown ;; +- esac +-fi +-])# AC_LIBTOOL_DLOPEN_SELF +- +- +-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) +-# --------------------------------- +-# Check to see if options -c and -o are simultaneously supported by compiler +-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], +-[AC_REQUIRE([LT_AC_PROG_SED])dnl +-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], +- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], +- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no +- $rm -r conftest 2>/dev/null +- mkdir conftest +- cd conftest +- mkdir out +- echo "$lt_simple_compile_test_code" > conftest.$ac_ext +- +- lt_compiler_flag="-o out/conftest2.$ac_objext" +- # Insert the option either (1) after the last *FLAGS variable, or +- # (2) before a word containing "conftest.", or (3) at the end. +- # Note that $ac_compile itself does not contain backslashes and begins +- # with a dollar sign (not a hyphen), so the echo should work correctly. +- lt_compile=`echo "$ac_compile" | $SED \ +- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ +- -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ +- -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) +- (eval "$lt_compile" 2>out/conftest.err) +- ac_status=$? +- cat out/conftest.err >&AS_MESSAGE_LOG_FD +- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD +- if (exit $ac_status) && test -s out/conftest2.$ac_objext +- then +- # The compiler can only warn and ignore the option if not recognized +- # So say no if there are warnings +- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp +- $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 +- if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then +- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes +- fi +- fi +- chmod u+w . 2>&AS_MESSAGE_LOG_FD +- $rm conftest* +- # SGI C++ compiler will create directory out/ii_files/ for +- # template instantiation +- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files +- $rm out/* && rmdir out +- cd .. +- rmdir conftest +- $rm conftest* +-]) +-])# AC_LIBTOOL_PROG_CC_C_O +- +- +-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) +-# ----------------------------------------- +-# Check to see if we can do hard links to lock some files if needed +-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], +-[AC_REQUIRE([_LT_AC_LOCK])dnl +- +-hard_links="nottested" +-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then +- # do not overwrite the value of need_locks provided by the user +- AC_MSG_CHECKING([if we can lock with hard links]) +- hard_links=yes +- $rm conftest* +- ln conftest.a conftest.b 2>/dev/null && hard_links=no +- touch conftest.a +- ln conftest.a conftest.b 2>&5 || hard_links=no +- ln conftest.a conftest.b 2>/dev/null && hard_links=no +- AC_MSG_RESULT([$hard_links]) +- if test "$hard_links" = no; then +- AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) +- need_locks=warn +- fi +-else +- need_locks=no +-fi +-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS +- +- +-# AC_LIBTOOL_OBJDIR +-# ----------------- +-AC_DEFUN([AC_LIBTOOL_OBJDIR], +-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], +-[rm -f .libs 2>/dev/null +-mkdir .libs 2>/dev/null +-if test -d .libs; then +- lt_cv_objdir=.libs +-else +- # MS-DOS does not allow filenames that begin with a dot. +- lt_cv_objdir=_libs +-fi +-rmdir .libs 2>/dev/null]) +-objdir=$lt_cv_objdir +-])# AC_LIBTOOL_OBJDIR +- +- +-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) +-# ---------------------------------------------- +-# Check hardcoding attributes. +-AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], +-[AC_MSG_CHECKING([how to hardcode library paths into programs]) +-_LT_AC_TAGVAR(hardcode_action, $1)= +-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ +- test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ +- test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then +- +- # We can hardcode non-existant directories. +- if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && +- # If the only mechanism to avoid hardcoding is shlibpath_var, we +- # have to relink, otherwise we might link with an installed library +- # when we should be linking with a yet-to-be-installed one +- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && +- test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then +- # Linking always hardcodes the temporary library directory. +- _LT_AC_TAGVAR(hardcode_action, $1)=relink +- else +- # We can link without hardcoding, and we can hardcode nonexisting dirs. +- _LT_AC_TAGVAR(hardcode_action, $1)=immediate +- fi +-else +- # We cannot hardcode anything, or else we can only hardcode existing +- # directories. +- _LT_AC_TAGVAR(hardcode_action, $1)=unsupported +-fi +-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) +- +-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then +- # Fast installation is not supported +- enable_fast_install=no +-elif test "$shlibpath_overrides_runpath" = yes || +- test "$enable_shared" = no; then +- # Fast installation is not necessary +- enable_fast_install=needless +-fi +-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH +- +- +-# AC_LIBTOOL_SYS_LIB_STRIP +-# ------------------------ +-AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], +-[striplib= +-old_striplib= +-AC_MSG_CHECKING([whether stripping libraries is possible]) +-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then +- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" +- test -z "$striplib" && striplib="$STRIP --strip-unneeded" +- AC_MSG_RESULT([yes]) +-else +-# FIXME - insert some real tests, host_os isn't really good enough +- case $host_os in +- darwin*) +- if test -n "$STRIP" ; then +- striplib="$STRIP -x" +- old_striplib="$STRIP -S" +- AC_MSG_RESULT([yes]) +- else +- AC_MSG_RESULT([no]) +-fi +- ;; +- *) +- AC_MSG_RESULT([no]) +- ;; +- esac +-fi +-])# AC_LIBTOOL_SYS_LIB_STRIP +- +- +-# AC_LIBTOOL_SYS_DYNAMIC_LINKER +-# ----------------------------- +-# PORTME Fill in your ld.so characteristics +-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], +-[AC_REQUIRE([LT_AC_PROG_SED])dnl +-AC_MSG_CHECKING([dynamic linker characteristics]) +-library_names_spec= +-libname_spec='lib$name' +-soname_spec= +-shrext_cmds=".so" +-postinstall_cmds= +-postuninstall_cmds= +-finish_cmds= +-finish_eval= +-shlibpath_var= +-shlibpath_overrides_runpath=unknown +-version_type=none +-dynamic_linker="$host_os ld.so" +-sys_lib_dlsearch_path_spec="/lib /usr/lib" +-m4_if($1,[],[ +-if test "$GCC" = yes; then +- case $host_os in +- darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; +- *) lt_awk_arg="/^libraries:/" ;; +- esac +- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then +- # if the path contains ";" then we assume it to be the separator +- # otherwise default to the standard path separator (i.e. ":") - it is +- # assumed that no part of a normal pathname contains ";" but that should +- # okay in the real world where ";" in dirpaths is itself problematic. +- lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` +- else +- lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` +- fi +- # Ok, now we have the path, separated by spaces, we can step through it +- # and add multilib dir if necessary. +- lt_tmp_lt_search_path_spec= +- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` +- for lt_sys_path in $lt_search_path_spec; do +- if test -d "$lt_sys_path/$lt_multi_os_dir"; then +- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" +- else +- test -d "$lt_sys_path" && \ +- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" +- fi +- done +- lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' +-BEGIN {RS=" "; FS="/|\n";} { +- lt_foo=""; +- lt_count=0; +- for (lt_i = NF; lt_i > 0; lt_i--) { +- if ($lt_i != "" && $lt_i != ".") { +- if ($lt_i == "..") { +- lt_count++; +- } else { +- if (lt_count == 0) { +- lt_foo="/" $lt_i lt_foo; +- } else { +- lt_count--; +- } +- } +- } +- } +- if (lt_foo != "") { lt_freq[[lt_foo]]++; } +- if (lt_freq[[lt_foo]] == 1) { print lt_foo; } +-}'` +- sys_lib_search_path_spec=`echo $lt_search_path_spec` +-else +- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +-fi]) +-need_lib_prefix=unknown +-hardcode_into_libs=no +- +-# when you set need_version to no, make sure it does not cause -set_version +-# flags to be left without arguments +-need_version=unknown +- +-case $host_os in +-aix3*) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' +- shlibpath_var=LIBPATH +- +- # AIX 3 has no versioning support, so we append a major version to the name. +- soname_spec='${libname}${release}${shared_ext}$major' +- ;; +- +-aix[[4-9]]*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- hardcode_into_libs=yes +- if test "$host_cpu" = ia64; then +- # AIX 5 supports IA64 +- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH +- else +- # With GCC up to 2.95.x, collect2 would create an import file +- # for dependence libraries. The import file would start with +- # the line `#! .'. This would cause the generated library to +- # depend on `.', always an invalid library. This was fixed in +- # development snapshots of GCC prior to 3.0. +- case $host_os in +- aix4 | aix4.[[01]] | aix4.[[01]].*) +- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' +- echo ' yes ' +- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then +- : +- else +- can_build_shared=no +- fi +- ;; +- esac +- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct +- # soname into executable. Probably we can add versioning support to +- # collect2, so additional links can be useful in future. +- if test "$aix_use_runtimelinking" = yes; then +- # If using run time linking (on AIX 4.2 or later) use lib.so +- # instead of lib.a to let people know that these are not +- # typical AIX shared libraries. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- else +- # We preserve .a as extension for shared libraries through AIX4.2 +- # and later when we are not doing run time linking. +- library_names_spec='${libname}${release}.a $libname.a' +- soname_spec='${libname}${release}${shared_ext}$major' +- fi +- shlibpath_var=LIBPATH +- fi +- ;; +- +-amigaos*) +- library_names_spec='$libname.ixlibrary $libname.a' +- # Create ${libname}_ixlibrary.a entries in /sys/libs. +- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' +- ;; +- +-beos*) +- library_names_spec='${libname}${shared_ext}' +- dynamic_linker="$host_os ld.so" +- shlibpath_var=LIBRARY_PATH +- ;; +- +-bsdi[[45]]*) +- version_type=linux +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" +- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" +- # the default ld.so.conf also contains /usr/contrib/lib and +- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow +- # libtool to hard-code these into programs +- ;; +- +-cygwin* | mingw* | pw32*) +- version_type=windows +- shrext_cmds=".dll" +- need_version=no +- need_lib_prefix=no +- +- case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32*) +- library_names_spec='$libname.dll.a' +- # DLL is installed to $(libdir)/../bin by postinstall_cmds +- postinstall_cmds='base_file=`basename \${file}`~ +- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ +- dldir=$destdir/`dirname \$dlpath`~ +- test -d \$dldir || mkdir -p \$dldir~ +- $install_prog $dir/$dlname \$dldir/$dlname~ +- chmod a+x \$dldir/$dlname' +- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ +- dlpath=$dir/\$dldll~ +- $rm \$dlpath' +- shlibpath_overrides_runpath=yes +- +- case $host_os in +- cygwin*) +- # Cygwin DLLs use 'cyg' prefix rather than 'lib' +- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' +- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" +- ;; +- mingw*) +- # MinGW DLLs use traditional 'lib' prefix +- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' +- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then +- # It is most probably a Windows format PATH printed by +- # mingw gcc, but we are running on Cygwin. Gcc prints its search +- # path with ; separators, and with drive letters. We can handle the +- # drive letters (cygwin fileutils understands them), so leave them, +- # especially as we might pass files found there to a mingw objdump, +- # which wouldn't understand a cygwinified path. Ahh. +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` +- else +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` +- fi +- ;; +- pw32*) +- # pw32 DLLs use 'pw' prefix rather than 'lib' +- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' +- ;; +- esac +- ;; +- +- *) +- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' +- ;; +- esac +- dynamic_linker='Win32 ld.exe' +- # FIXME: first we should search . and the directory the executable is in +- shlibpath_var=PATH +- ;; +- +-darwin* | rhapsody*) +- dynamic_linker="$host_os dyld" +- version_type=darwin +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' +- soname_spec='${libname}${release}${major}$shared_ext' +- shlibpath_overrides_runpath=yes +- shlibpath_var=DYLD_LIBRARY_PATH +- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +- m4_if([$1], [],[ +- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) +- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' +- ;; +- +-dgux*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- ;; +- +-freebsd1*) +- dynamic_linker=no +- ;; +- +-freebsd* | dragonfly*) +- # DragonFly does not have aout. When/if they implement a new +- # versioning mechanism, adjust this. +- if test -x /usr/bin/objformat; then +- objformat=`/usr/bin/objformat` +- else +- case $host_os in +- freebsd[[123]]*) objformat=aout ;; +- *) objformat=elf ;; +- esac +- fi +- version_type=freebsd-$objformat +- case $version_type in +- freebsd-elf*) +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' +- need_version=no +- need_lib_prefix=no +- ;; +- freebsd-*) +- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' +- need_version=yes +- ;; +- esac +- shlibpath_var=LD_LIBRARY_PATH +- case $host_os in +- freebsd2*) +- shlibpath_overrides_runpath=yes +- ;; +- freebsd3.[[01]]* | freebsdelf3.[[01]]*) +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- ;; +- freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ +- freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- ;; +- *) # from 4.6 on, and DragonFly +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- ;; +- esac +- ;; +- +-gnu*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- hardcode_into_libs=yes +- ;; +- +-hpux9* | hpux10* | hpux11*) +- # Give a soname corresponding to the major version so that dld.sl refuses to +- # link against other versions. +- version_type=sunos +- need_lib_prefix=no +- need_version=no +- case $host_cpu in +- ia64*) +- shrext_cmds='.so' +- hardcode_into_libs=yes +- dynamic_linker="$host_os dld.so" +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- if test "X$HPUX_IA64_MODE" = X32; then +- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" +- else +- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" +- fi +- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec +- ;; +- hppa*64*) +- shrext_cmds='.sl' +- hardcode_into_libs=yes +- dynamic_linker="$host_os dld.sl" +- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH +- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" +- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec +- ;; +- *) +- shrext_cmds='.sl' +- dynamic_linker="$host_os dld.sl" +- shlibpath_var=SHLIB_PATH +- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- ;; +- esac +- # HP-UX runs *really* slowly unless shared libraries are mode 555. +- postinstall_cmds='chmod 555 $lib' +- ;; +- +-interix[[3-9]]*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- ;; +- +-irix5* | irix6* | nonstopux*) +- case $host_os in +- nonstopux*) version_type=nonstopux ;; +- *) +- if test "$lt_cv_prog_gnu_ld" = yes; then +- version_type=linux +- else +- version_type=irix +- fi ;; +- esac +- need_lib_prefix=no +- need_version=no +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' +- case $host_os in +- irix5* | nonstopux*) +- libsuff= shlibsuff= +- ;; +- *) +- case $LD in # libtool.m4 will add one of these switches to LD +- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") +- libsuff= shlibsuff= libmagic=32-bit;; +- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") +- libsuff=32 shlibsuff=N32 libmagic=N32;; +- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") +- libsuff=64 shlibsuff=64 libmagic=64-bit;; +- *) libsuff= shlibsuff= libmagic=never-match;; +- esac +- ;; +- esac +- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH +- shlibpath_overrides_runpath=no +- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" +- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" +- hardcode_into_libs=yes +- ;; +- +-# No shared lib support for Linux oldld, aout, or coff. +-linux*oldld* | linux*aout* | linux*coff*) +- dynamic_linker=no +- ;; +- +-# This must be Linux ELF. +-linux* | k*bsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- # This implies no fast_install, which is unacceptable. +- # Some rework will be needed to allow for fast_install +- # before this can be enabled. +- hardcode_into_libs=yes +- +- # Append ld.so.conf contents to the search path +- if test -f /etc/ld.so.conf; then +- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" +- fi +- +- # We used to test for /lib/ld.so.1 and disable shared libraries on +- # powerpc, because MkLinux only supported shared libraries with the +- # GNU dynamic linker. Since this was broken with cross compilers, +- # most powerpc-linux boxes support dynamic linking these days and +- # people can always --disable-shared, the test was removed, and we +- # assume the GNU/Linux dynamic linker is in use. +- dynamic_linker='GNU/Linux ld.so' +- ;; +- +-netbsdelf*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='NetBSD ld.elf_so' +- ;; +- +-netbsd*) +- version_type=sunos +- need_lib_prefix=no +- need_version=no +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' +- dynamic_linker='NetBSD (a.out) ld.so' +- else +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- dynamic_linker='NetBSD ld.elf_so' +- fi +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- ;; +- +-newsos6) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- ;; +- +-nto-qnx*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- ;; +- +-openbsd*) +- version_type=sunos +- sys_lib_dlsearch_path_spec="/usr/lib" +- need_lib_prefix=no +- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. +- case $host_os in +- openbsd3.3 | openbsd3.3.*) need_version=yes ;; +- *) need_version=no ;; +- esac +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- case $host_os in +- openbsd2.[[89]] | openbsd2.[[89]].*) +- shlibpath_overrides_runpath=no +- ;; +- *) +- shlibpath_overrides_runpath=yes +- ;; +- esac +- else +- shlibpath_overrides_runpath=yes +- fi +- ;; +- +-os2*) +- libname_spec='$name' +- shrext_cmds=".dll" +- need_lib_prefix=no +- library_names_spec='$libname${shared_ext} $libname.a' +- dynamic_linker='OS/2 ld.exe' +- shlibpath_var=LIBPATH +- ;; +- +-osf3* | osf4* | osf5*) +- version_type=osf +- need_lib_prefix=no +- need_version=no +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH +- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" +- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" +- ;; +- +-rdos*) +- dynamic_linker=no +- ;; +- +-solaris*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- # ldd complains unless libraries are executable +- postinstall_cmds='chmod +x $lib' +- ;; +- +-sunos4*) +- version_type=sunos +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' +- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- if test "$with_gnu_ld" = yes; then +- need_lib_prefix=no +- fi +- need_version=yes +- ;; +- +-sysv4 | sysv4.3*) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- case $host_vendor in +- sni) +- shlibpath_overrides_runpath=no +- need_lib_prefix=no +- export_dynamic_flag_spec='${wl}-Blargedynsym' +- runpath_var=LD_RUN_PATH +- ;; +- siemens) +- need_lib_prefix=no +- ;; +- motorola) +- need_lib_prefix=no +- need_version=no +- shlibpath_overrides_runpath=no +- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' +- ;; +- esac +- ;; +- +-sysv4*MP*) +- if test -d /usr/nec ;then +- version_type=linux +- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' +- soname_spec='$libname${shared_ext}.$major' +- shlibpath_var=LD_LIBRARY_PATH +- fi +- ;; +- +-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) +- version_type=freebsd-elf +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- hardcode_into_libs=yes +- if test "$with_gnu_ld" = yes; then +- sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' +- shlibpath_overrides_runpath=no +- else +- sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' +- shlibpath_overrides_runpath=yes +- case $host_os in +- sco3.2v5*) +- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" +- ;; +- esac +- fi +- sys_lib_dlsearch_path_spec='/usr/lib' +- ;; +- +-uts4*) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- ;; +- +-*) +- dynamic_linker=no +- ;; +-esac +-AC_MSG_RESULT([$dynamic_linker]) +-test "$dynamic_linker" = no && can_build_shared=no +- +-AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], +-[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) +-sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +-AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], +-[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) +-sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" +- +-variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +-if test "$GCC" = yes; then +- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +-fi +-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER +- +- +-# _LT_AC_TAGCONFIG +-# ---------------- +-AC_DEFUN([_LT_AC_TAGCONFIG], +-[AC_REQUIRE([LT_AC_PROG_SED])dnl +-AC_ARG_WITH([tags], +- [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], +- [include additional configurations @<:@automatic@:>@])], +- [tagnames="$withval"]) +- +-if test -f "$ltmain" && test -n "$tagnames"; then +- if test ! -f "${ofile}"; then +- AC_MSG_WARN([output file `$ofile' does not exist]) +- fi +- +- if test -z "$LTCC"; then +- eval "`$SHELL ${ofile} --config | grep '^LTCC='`" +- if test -z "$LTCC"; then +- AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) +- else +- AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) +- fi +- fi +- if test -z "$LTCFLAGS"; then +- eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" +- fi +- +- # Extract list of available tagged configurations in $ofile. +- # Note that this assumes the entire list is on one line. +- available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` +- +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for tagname in $tagnames; do +- IFS="$lt_save_ifs" +- # Check whether tagname contains only valid characters +- case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in +- "") ;; +- *) AC_MSG_ERROR([invalid tag name: $tagname]) +- ;; +- esac +- +- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null +- then +- AC_MSG_ERROR([tag name \"$tagname\" already exists]) +- fi +- +- # Update the list of available tags. +- if test -n "$tagname"; then +- echo appending configuration tag \"$tagname\" to $ofile +- +- case $tagname in +- CXX) +- if test -n "$CXX" && ( test "X$CXX" != "Xno" && +- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || +- (test "X$CXX" != "Xg++"))) ; then +- AC_LIBTOOL_LANG_CXX_CONFIG +- else +- tagname="" +- fi +- ;; +- +- F77) +- if test -n "$F77" && test "X$F77" != "Xno"; then +- AC_LIBTOOL_LANG_F77_CONFIG +- else +- tagname="" +- fi +- ;; +- +- GCJ) +- if test -n "$GCJ" && test "X$GCJ" != "Xno"; then +- AC_LIBTOOL_LANG_GCJ_CONFIG +- else +- tagname="" +- fi +- ;; +- +- RC) +- AC_LIBTOOL_LANG_RC_CONFIG +- ;; +- +- *) +- AC_MSG_ERROR([Unsupported tag name: $tagname]) +- ;; +- esac +- +- # Append the new tag name to the list of available tags. +- if test -n "$tagname" ; then +- available_tags="$available_tags $tagname" +- fi +- fi +- done +- IFS="$lt_save_ifs" +- +- # Now substitute the updated list of available tags. +- if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then +- mv "${ofile}T" "$ofile" +- chmod +x "$ofile" +- else +- rm -f "${ofile}T" +- AC_MSG_ERROR([unable to update list of available tagged configurations.]) +- fi +-fi +-])# _LT_AC_TAGCONFIG +- +- +-# AC_LIBTOOL_DLOPEN +-# ----------------- +-# enable checks for dlopen support +-AC_DEFUN([AC_LIBTOOL_DLOPEN], +- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) +-])# AC_LIBTOOL_DLOPEN +- +- +-# AC_LIBTOOL_WIN32_DLL +-# -------------------- +-# declare package support for building win32 DLLs +-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], +-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) +-])# AC_LIBTOOL_WIN32_DLL +- +- +-# AC_ENABLE_SHARED([DEFAULT]) +-# --------------------------- +-# implement the --enable-shared flag +-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +-AC_DEFUN([AC_ENABLE_SHARED], +-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl +-AC_ARG_ENABLE([shared], +- [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], +- [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])], +- [p=${PACKAGE-default} +- case $enableval in +- yes) enable_shared=yes ;; +- no) enable_shared=no ;; +- *) +- enable_shared=no +- # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for pkg in $enableval; do +- IFS="$lt_save_ifs" +- if test "X$pkg" = "X$p"; then +- enable_shared=yes +- fi +- done +- IFS="$lt_save_ifs" +- ;; +- esac], +- [enable_shared=]AC_ENABLE_SHARED_DEFAULT) +-])# AC_ENABLE_SHARED +- +- +-# AC_DISABLE_SHARED +-# ----------------- +-# set the default shared flag to --disable-shared +-AC_DEFUN([AC_DISABLE_SHARED], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-AC_ENABLE_SHARED(no) +-])# AC_DISABLE_SHARED +- +- +-# AC_ENABLE_STATIC([DEFAULT]) +-# --------------------------- +-# implement the --enable-static flag +-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +-AC_DEFUN([AC_ENABLE_STATIC], +-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl +-AC_ARG_ENABLE([static], +- [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], +- [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])], +- [p=${PACKAGE-default} +- case $enableval in +- yes) enable_static=yes ;; +- no) enable_static=no ;; +- *) +- enable_static=no +- # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for pkg in $enableval; do +- IFS="$lt_save_ifs" +- if test "X$pkg" = "X$p"; then +- enable_static=yes +- fi +- done +- IFS="$lt_save_ifs" +- ;; +- esac], +- [enable_static=]AC_ENABLE_STATIC_DEFAULT) +-])# AC_ENABLE_STATIC +- +- +-# AC_DISABLE_STATIC +-# ----------------- +-# set the default static flag to --disable-static +-AC_DEFUN([AC_DISABLE_STATIC], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-AC_ENABLE_STATIC(no) +-])# AC_DISABLE_STATIC +- +- +-# AC_ENABLE_FAST_INSTALL([DEFAULT]) +-# --------------------------------- +-# implement the --enable-fast-install flag +-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +-AC_DEFUN([AC_ENABLE_FAST_INSTALL], +-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl +-AC_ARG_ENABLE([fast-install], +- [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], +- [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], +- [p=${PACKAGE-default} +- case $enableval in +- yes) enable_fast_install=yes ;; +- no) enable_fast_install=no ;; +- *) +- enable_fast_install=no +- # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for pkg in $enableval; do +- IFS="$lt_save_ifs" +- if test "X$pkg" = "X$p"; then +- enable_fast_install=yes +- fi +- done +- IFS="$lt_save_ifs" +- ;; +- esac], +- [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT) +-])# AC_ENABLE_FAST_INSTALL +- +- +-# AC_DISABLE_FAST_INSTALL +-# ----------------------- +-# set the default to --disable-fast-install +-AC_DEFUN([AC_DISABLE_FAST_INSTALL], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-AC_ENABLE_FAST_INSTALL(no) +-])# AC_DISABLE_FAST_INSTALL +- +- +-# AC_LIBTOOL_PICMODE([MODE]) +-# -------------------------- +-# implement the --with-pic flag +-# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +-AC_DEFUN([AC_LIBTOOL_PICMODE], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-pic_mode=ifelse($#,1,$1,default) +-])# AC_LIBTOOL_PICMODE +- +- +-# AC_PROG_EGREP +-# ------------- +-# This is predefined starting with Autoconf 2.54, so this conditional +-# definition can be removed once we require Autoconf 2.54 or later. +-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], +-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], +- [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 +- then ac_cv_prog_egrep='grep -E' +- else ac_cv_prog_egrep='egrep' +- fi]) +- EGREP=$ac_cv_prog_egrep +- AC_SUBST([EGREP]) +-])]) +- +- +-# AC_PATH_TOOL_PREFIX +-# ------------------- +-# find a file program which can recognize shared library +-AC_DEFUN([AC_PATH_TOOL_PREFIX], +-[AC_REQUIRE([AC_PROG_EGREP])dnl +-AC_MSG_CHECKING([for $1]) +-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, +-[case $MAGIC_CMD in +-[[\\/*] | ?:[\\/]*]) +- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. +- ;; +-*) +- lt_save_MAGIC_CMD="$MAGIC_CMD" +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +-dnl $ac_dummy forces splitting on constant user-supplied paths. +-dnl POSIX.2 word splitting is done only on the output of word expansions, +-dnl not every word. This closes a longstanding sh security hole. +- ac_dummy="ifelse([$2], , $PATH, [$2])" +- for ac_dir in $ac_dummy; do +- IFS="$lt_save_ifs" +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$1; then +- lt_cv_path_MAGIC_CMD="$ac_dir/$1" +- if test -n "$file_magic_test_file"; then +- case $deplibs_check_method in +- "file_magic "*) +- file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` +- MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +- if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | +- $EGREP "$file_magic_regex" > /dev/null; then +- : +- else +- cat <&2 +- +-*** Warning: the command libtool uses to detect shared libraries, +-*** $file_magic_cmd, produces output that libtool cannot recognize. +-*** The result is that libtool may fail to recognize shared libraries +-*** as such. This will affect the creation of libtool libraries that +-*** depend on shared libraries, but programs linked with such libtool +-*** libraries will work regardless of this problem. Nevertheless, you +-*** may want to report the problem to your system manager and/or to +-*** bug-libtool at gnu.org +- +-EOF +- fi ;; +- esac +- fi +- break +- fi +- done +- IFS="$lt_save_ifs" +- MAGIC_CMD="$lt_save_MAGIC_CMD" +- ;; +-esac]) +-MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +-if test -n "$MAGIC_CMD"; then +- AC_MSG_RESULT($MAGIC_CMD) +-else +- AC_MSG_RESULT(no) +-fi +-])# AC_PATH_TOOL_PREFIX +- +- +-# AC_PATH_MAGIC +-# ------------- +-# find a file program which can recognize a shared library +-AC_DEFUN([AC_PATH_MAGIC], +-[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) +-if test -z "$lt_cv_path_MAGIC_CMD"; then +- if test -n "$ac_tool_prefix"; then +- AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) +- else +- MAGIC_CMD=: +- fi +-fi +-])# AC_PATH_MAGIC +- +- +-# AC_PROG_LD +-# ---------- +-# find the pathname to the GNU or non-GNU linker +-AC_DEFUN([AC_PROG_LD], +-[AC_ARG_WITH([gnu-ld], +- [AC_HELP_STRING([--with-gnu-ld], +- [assume the C compiler uses GNU ld @<:@default=no@:>@])], +- [test "$withval" = no || with_gnu_ld=yes], +- [with_gnu_ld=no]) +-AC_REQUIRE([LT_AC_PROG_SED])dnl +-AC_REQUIRE([AC_PROG_CC])dnl +-AC_REQUIRE([AC_CANONICAL_HOST])dnl +-AC_REQUIRE([AC_CANONICAL_BUILD])dnl +-ac_prog=ld +-if test "$GCC" = yes; then +- # Check if gcc -print-prog-name=ld gives a path. +- AC_MSG_CHECKING([for ld used by $CC]) +- case $host in +- *-*-mingw*) +- # gcc leaves a trailing carriage return which upsets mingw +- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; +- *) +- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; +- esac +- case $ac_prog in +- # Accept absolute paths. +- [[\\/]]* | ?:[[\\/]]*) +- re_direlt='/[[^/]][[^/]]*/\.\./' +- # Canonicalize the pathname of ld +- ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` +- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do +- ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` +- done +- test -z "$LD" && LD="$ac_prog" +- ;; +- "") +- # If it fails, then pretend we aren't using GCC. +- ac_prog=ld +- ;; +- *) +- # If it is relative, then search for the first ld in PATH. +- with_gnu_ld=unknown +- ;; +- esac +-elif test "$with_gnu_ld" = yes; then +- AC_MSG_CHECKING([for GNU ld]) +-else +- AC_MSG_CHECKING([for non-GNU ld]) +-fi +-AC_CACHE_VAL(lt_cv_path_LD, +-[if test -z "$LD"; then +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for ac_dir in $PATH; do +- IFS="$lt_save_ifs" +- test -z "$ac_dir" && ac_dir=. +- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then +- lt_cv_path_LD="$ac_dir/$ac_prog" +- # Check to see if the program is GNU ld. I'd rather use --version, +- # but apparently some variants of GNU ld only accept -v. +- # Break only if it was the GNU/non-GNU ld that we prefer. +- case `"$lt_cv_path_LD" -v 2>&1 &1 Revision: 7485 http://gar.svn.sourceforge.net/gar/?rev=7485&view=rev Author: bonivart Date: 2009-11-27 16:21:59 +0000 (Fri, 27 Nov 2009) Log Message: ----------- pkgutil: update to 1.9 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 2009-11-27 15:42:19 UTC (rev 7484) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-11-27 16:21:59 UTC (rev 7485) @@ -1,5 +1,5 @@ GARNAME = pkgutil -GARVERSION = 1.9b2 +GARVERSION = 1.9 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily @@ -63,8 +63,8 @@ @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME) @ginstall $(WORKSRC)/readme $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)/ @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME)plus - @ginstall $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)plus/ - @ginstall $(WORKSRC)/readme.pkgutilplus $(DESTDIR)$(docdir)/$(GARNAME)plus/readme + @ginstall -m 444 $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)plus/ + @ginstall -m 444 $(WORKSRC)/readme.pkgutilplus $(DESTDIR)$(docdir)/$(GARNAME)plus/readme @ginstall -m 755 -d $(DESTDIR)$(mandir)/man1 @pod2man --section=1 $(WORKSRC)/$(GARNAME) > $(DESTDIR)$(mandir)/man1/pkgutil.1 @pod2man --section=1 $(WORKSRC)/bldcat > $(DESTDIR)$(mandir)/man1/bldcat.1 Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-11-27 15:42:19 UTC (rev 7484) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-11-27 16:21:59 UTC (rev 7485) @@ -1,5 +1,5 @@ a16c6f81bc537d6172fd65d8da1aeecc CSWpkgutil.gspec b93ce519cebdc48350eb0e2a22214827 CSWpkgutil.prototype 33f82561e1fcf3aaf22f66bac22afba1 i.cswpkgutil -2d9c8f2e8ed58c015bdcd73862c5d9f4 pkgutil-1.9b2.zip +bdc6afd165a5117c9d0f3a3a54109461 pkgutil-1.9.zip 6d472d94ea850b600fd29aba7a6fc4b3 r.cswpkgutil 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 Nov 27 17:29:07 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 27 Nov 2009 16:29:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7486] csw/mgar/pkg/gnome-terminal Message-ID: Revision: 7486 http://gar.svn.sourceforge.net/gar/?rev=7486&view=rev Author: wahwah Date: 2009-11-27 16:29:07 +0000 (Fri, 27 Nov 2009) Log Message: ----------- gnome-terminal: Moved the legacy dir to branches Added Paths: ----------- csw/mgar/pkg/gnome-terminal/branches/ csw/mgar/pkg/gnome-terminal/branches/legacy/ csw/mgar/pkg/gnome-terminal/tags/ Removed Paths: ------------- csw/mgar/pkg/gnome-terminal/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 Fri Nov 27 17:35:10 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 27 Nov 2009 16:35:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7487] csw/mgar/pkg/gnome-terminal/trunk/ Message-ID: Revision: 7487 http://gar.svn.sourceforge.net/gar/?rev=7487&view=rev Author: wahwah Date: 2009-11-27 16:35:10 +0000 (Fri, 27 Nov 2009) Log Message: ----------- gnome-terminal: removing trunk to replace it with a copy from the template Removed Paths: ------------- csw/mgar/pkg/gnome-terminal/trunk/ 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 Nov 27 17:35:11 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 27 Nov 2009 16:35:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[7488] csw/mgar/pkg/libmpeg2/trunk Message-ID: Revision: 7488 http://gar.svn.sourceforge.net/gar/?rev=7488&view=rev Author: dmichelsen Date: 2009-11-27 16:35:11 +0000 (Fri, 27 Nov 2009) Log Message: ----------- libmpeg2: Add more patches Modified Paths: -------------- csw/mgar/pkg/libmpeg2/trunk/Makefile csw/mgar/pkg/libmpeg2/trunk/checksums csw/mgar/pkg/libmpeg2/trunk/files/0001-Don-t-use-arm-specific-assembly-on-Sparc.patch Added Paths: ----------- csw/mgar/pkg/libmpeg2/trunk/files/0002-Fix-return-type-for-Sun-Studio.patch csw/mgar/pkg/libmpeg2/trunk/files/0003-Add-missing-m4-files.patch csw/mgar/pkg/libmpeg2/trunk/files/0004-Add-missing-libtool.patch csw/mgar/pkg/libmpeg2/trunk/files/0005-Add-missing-autostuff.patch Modified: csw/mgar/pkg/libmpeg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmpeg2/trunk/Makefile 2009-11-27 16:35:10 UTC (rev 7487) +++ csw/mgar/pkg/libmpeg2/trunk/Makefile 2009-11-27 16:35:11 UTC (rev 7488) @@ -8,7 +8,11 @@ MASTER_SITES = http://libmpeg2.sourceforge.net/files/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PATCHFILES = 0001-Don-t-use-arm-specific-assembly-on-Sparc.patch +PATCHFILES = 0001-Don-t-use-arm-specific-assembly-on-Sparc.patch +PATCHFILES += 0002-Fix-return-type-for-Sun-Studio.patch +PATCHFILES += 0003-Add-missing-m4-files.patch +PATCHFILES += 0004-Add-missing-libtool.patch +PATCHFILES += 0005-Add-missing-autostuff.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -27,10 +31,14 @@ BUILD_ARGS = MPEG2DEC_CFLAGS= OPT_CFLAGS= BUILD64 = 1 +NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) # Do this only for sparcv8 and i386, otherwise make sure to compile on vis/mmx-enable ISA CONFIGURE_ARGS += --disable-accel-detect -PKGFILES_CSWmpeg2dec = $(bindir)/mpeg2dec +MERGE_DIRS_isa-extra = $(libdir) +PKGFILES_CSWmpeg2dec = $(bindir)/.* +PKGFILES_CSWmpeg2dec += $(mandir)/man1/.* + include gar/category.mk Modified: csw/mgar/pkg/libmpeg2/trunk/checksums =================================================================== --- csw/mgar/pkg/libmpeg2/trunk/checksums 2009-11-27 16:35:10 UTC (rev 7487) +++ csw/mgar/pkg/libmpeg2/trunk/checksums 2009-11-27 16:35:11 UTC (rev 7488) @@ -1,2 +1,6 @@ -92ebb653c36deb0a93fe597de10a546e 0001-Don-t-use-arm-specific-assembly-on-Sparc.patch +1c38d557879a40e54ba4e80a2f7ebf23 0001-Don-t-use-arm-specific-assembly-on-Sparc.patch +333b714575b3a86d4a45141cef51e5f1 0002-Fix-return-type-for-Sun-Studio.patch +dc6400408df379128e8e46d2e552bad4 0003-Add-missing-m4-files.patch +ec86eac972d1c6e4b92a2e43150c7b85 0004-Add-missing-libtool.patch +1f472c14ffdc946564f4771d2a533896 0005-Add-missing-autostuff.patch 0f92c7454e58379b4a5a378485bbd8ef libmpeg2-0.5.1.tar.gz Modified: csw/mgar/pkg/libmpeg2/trunk/files/0001-Don-t-use-arm-specific-assembly-on-Sparc.patch =================================================================== --- csw/mgar/pkg/libmpeg2/trunk/files/0001-Don-t-use-arm-specific-assembly-on-Sparc.patch 2009-11-27 16:35:10 UTC (rev 7487) +++ csw/mgar/pkg/libmpeg2/trunk/files/0001-Don-t-use-arm-specific-assembly-on-Sparc.patch 2009-11-27 16:35:11 UTC (rev 7488) @@ -1,7 +1,7 @@ From 38401a415b34a0751d5f7a48f9b35c2b23715f15 Mon Sep 17 00:00:00 2001 From: Dagobert Michelsen Date: Fri, 27 Nov 2009 15:50:03 +0100 -Subject: [PATCH] Don't use arm-specific assembly on Sparc +Subject: [PATCH 1/3] Don't use arm-specific assembly on Sparc --- Makefile.in | 220 +- Added: csw/mgar/pkg/libmpeg2/trunk/files/0002-Fix-return-type-for-Sun-Studio.patch =================================================================== --- csw/mgar/pkg/libmpeg2/trunk/files/0002-Fix-return-type-for-Sun-Studio.patch (rev 0) +++ csw/mgar/pkg/libmpeg2/trunk/files/0002-Fix-return-type-for-Sun-Studio.patch 2009-11-27 16:35:11 UTC (rev 7488) @@ -0,0 +1,25 @@ +From 407d9df72c4125ab714052962574ddfb2baec694 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 27 Nov 2009 16:56:23 +0100 +Subject: [PATCH 2/3] Fix return type for Sun Studio + +--- + src/mpeg2dec.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/mpeg2dec.c b/src/mpeg2dec.c +index 59b36d7..e216ba5 100644 +--- a/src/mpeg2dec.c ++++ b/src/mpeg2dec.c +@@ -63,7 +63,7 @@ static RETSIGTYPE signal_handler (int sig) + { + sigint = 1; + signal (sig, SIG_DFL); +- return (RETSIGTYPE)0; ++ return; + } + + static void print_fps (int final) +-- +1.6.5.1 + Added: csw/mgar/pkg/libmpeg2/trunk/files/0003-Add-missing-m4-files.patch =================================================================== --- csw/mgar/pkg/libmpeg2/trunk/files/0003-Add-missing-m4-files.patch (rev 0) +++ csw/mgar/pkg/libmpeg2/trunk/files/0003-Add-missing-m4-files.patch 2009-11-27 16:35:11 UTC (rev 7488) @@ -0,0 +1,8014 @@ +From b84cf025ed00e56e934a22ae3e630e58315c7a5f Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 27 Nov 2009 16:58:21 +0100 +Subject: [PATCH 3/3] Add missing m4 files + +--- + m4/libtool.m4 | 7357 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + m4/ltoptions.m4 | 368 +++ + m4/ltsugar.m4 | 123 + + m4/ltversion.m4 | 23 + + m4/lt~obsolete.m4 | 92 + + 5 files changed, 7963 insertions(+), 0 deletions(-) + create mode 100644 m4/libtool.m4 + create mode 100644 m4/ltoptions.m4 + create mode 100644 m4/ltsugar.m4 + create mode 100644 m4/ltversion.m4 + create mode 100644 m4/lt~obsolete.m4 + +diff --git a/m4/libtool.m4 b/m4/libtool.m4 +new file mode 100644 +index 0000000..39ba996 +--- /dev/null ++++ b/m4/libtool.m4 +@@ -0,0 +1,7357 @@ ++# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- ++# ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, ++# 2006, 2007, 2008 Free Software Foundation, Inc. ++# Written by Gordon Matzigkeit, 1996 ++# ++# This file is free software; the Free Software Foundation gives ++# unlimited permission to copy and/or distribute it, with or without ++# modifications, as long as this notice is preserved. ++ ++m4_define([_LT_COPYING], [dnl ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, ++# 2006, 2007, 2008 Free Software Foundation, Inc. ++# Written by Gordon Matzigkeit, 1996 ++# ++# This file is part of GNU Libtool. ++# ++# GNU Libtool 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. ++# ++# As a special exception to the GNU General Public License, ++# if you distribute this file as part of a program or library that ++# is built using GNU Libtool, you may include this file under the ++# same distribution terms that you use for the rest of that program. ++# ++# GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy ++# can be downloaded from http://www.gnu.org/licenses/gpl.html, or ++# obtained by writing to the Free Software Foundation, Inc., ++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++]) ++ ++# serial 56 LT_INIT ++ ++ ++# LT_PREREQ(VERSION) ++# ------------------ ++# Complain and exit if this libtool version is less that VERSION. ++m4_defun([LT_PREREQ], ++[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, ++ [m4_default([$3], ++ [m4_fatal([Libtool version $1 or higher is required], ++ 63)])], ++ [$2])]) ++ ++ ++# _LT_CHECK_BUILDDIR ++# ------------------ ++# Complain if the absolute build directory name contains unusual characters ++m4_defun([_LT_CHECK_BUILDDIR], ++[case `pwd` in ++ *\ * | *\ *) ++ AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; ++esac ++]) ++ ++ ++# LT_INIT([OPTIONS]) ++# ------------------ ++AC_DEFUN([LT_INIT], ++[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT ++AC_BEFORE([$0], [LT_LANG])dnl ++AC_BEFORE([$0], [LT_OUTPUT])dnl ++AC_BEFORE([$0], [LTDL_INIT])dnl ++m4_require([_LT_CHECK_BUILDDIR])dnl ++ ++dnl Autoconf doesn't catch unexpanded LT_ macros by default: ++m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl ++m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl ++dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 ++dnl unless we require an AC_DEFUNed macro: ++AC_REQUIRE([LTOPTIONS_VERSION])dnl ++AC_REQUIRE([LTSUGAR_VERSION])dnl ++AC_REQUIRE([LTVERSION_VERSION])dnl ++AC_REQUIRE([LTOBSOLETE_VERSION])dnl ++m4_require([_LT_PROG_LTMAIN])dnl ++ ++dnl Parse OPTIONS ++_LT_SET_OPTIONS([$0], [$1]) ++ ++# This can be used to rebuild libtool when needed ++LIBTOOL_DEPS="$ltmain" ++ ++# Always use our own libtool. ++LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++AC_SUBST(LIBTOOL)dnl ++ ++_LT_SETUP ++ ++# Only expand once: ++m4_define([LT_INIT]) ++])# LT_INIT ++ ++# Old names: ++AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) ++AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_PROG_LIBTOOL], []) ++dnl AC_DEFUN([AM_PROG_LIBTOOL], []) ++ ++ ++# _LT_CC_BASENAME(CC) ++# ------------------- ++# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. ++m4_defun([_LT_CC_BASENAME], ++[for cc_temp in $1""; do ++ case $cc_temp in ++ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; ++ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; ++ \-*) ;; ++ *) break;; ++ esac ++done ++cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ++]) ++ ++ ++# _LT_FILEUTILS_DEFAULTS ++# ---------------------- ++# It is okay to use these file commands and assume they have been set ++# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. ++m4_defun([_LT_FILEUTILS_DEFAULTS], ++[: ${CP="cp -f"} ++: ${MV="mv -f"} ++: ${RM="rm -f"} ++])# _LT_FILEUTILS_DEFAULTS ++ ++ ++# _LT_SETUP ++# --------- ++m4_defun([_LT_SETUP], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++_LT_DECL([], [host_alias], [0], [The host system])dnl ++_LT_DECL([], [host], [0])dnl ++_LT_DECL([], [host_os], [0])dnl ++dnl ++_LT_DECL([], [build_alias], [0], [The build system])dnl ++_LT_DECL([], [build], [0])dnl ++_LT_DECL([], [build_os], [0])dnl ++dnl ++AC_REQUIRE([AC_PROG_CC])dnl ++AC_REQUIRE([LT_PATH_LD])dnl ++AC_REQUIRE([LT_PATH_NM])dnl ++dnl ++AC_REQUIRE([AC_PROG_LN_S])dnl ++test -z "$LN_S" && LN_S="ln -s" ++_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl ++dnl ++AC_REQUIRE([LT_CMD_MAX_LEN])dnl ++_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl ++_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl ++dnl ++m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_CHECK_SHELL_FEATURES])dnl ++m4_require([_LT_CMD_RELOAD])dnl ++m4_require([_LT_CHECK_MAGIC_METHOD])dnl ++m4_require([_LT_CMD_OLD_ARCHIVE])dnl ++m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl ++ ++_LT_CONFIG_LIBTOOL_INIT([ ++# See if we are running on zsh, and set the options which allow our ++# commands through without removal of \ escapes INIT. ++if test -n "\${ZSH_VERSION+set}" ; then ++ setopt NO_GLOB_SUBST ++fi ++]) ++if test -n "${ZSH_VERSION+set}" ; then ++ setopt NO_GLOB_SUBST ++fi ++ ++_LT_CHECK_OBJDIR ++ ++m4_require([_LT_TAG_COMPILER])dnl ++_LT_PROG_ECHO_BACKSLASH ++ ++case $host_os in ++aix3*) ++ # AIX sometimes has problems with the GCC collect2 program. For some ++ # reason, if we set the COLLECT_NAMES environment variable, the problems ++ # vanish in a puff of smoke. ++ if test "X${COLLECT_NAMES+set}" != Xset; then ++ COLLECT_NAMES= ++ export COLLECT_NAMES ++ fi ++ ;; ++esac ++ ++# Sed substitution that helps us do robust quoting. It backslashifies ++# metacharacters that are still active within double-quoted strings. ++sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' ++ ++# Same as above, but do not quote variable references. ++double_quote_subst='s/\([["`\\]]\)/\\\1/g' ++ ++# Sed substitution to delay expansion of an escaped shell variable in a ++# double_quote_subst'ed string. ++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' ++ ++# Sed substitution to delay expansion of an escaped single quote. ++delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' ++ ++# Sed substitution to avoid accidental globbing in evaled expressions ++no_glob_subst='s/\*/\\\*/g' ++ ++# Global variables: ++ofile=libtool ++can_build_shared=yes ++ ++# All known linkers require a `.a' archive for static linking (except MSVC, ++# which needs '.lib'). ++libext=a ++ ++with_gnu_ld="$lt_cv_prog_gnu_ld" ++ ++old_CC="$CC" ++old_CFLAGS="$CFLAGS" ++ ++# Set sane defaults for various variables ++test -z "$CC" && CC=cc ++test -z "$LTCC" && LTCC=$CC ++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS ++test -z "$LD" && LD=ld ++test -z "$ac_objext" && ac_objext=o ++ ++_LT_CC_BASENAME([$compiler]) ++ ++# Only perform the check for file, if the check method requires it ++test -z "$MAGIC_CMD" && MAGIC_CMD=file ++case $deplibs_check_method in ++file_magic*) ++ if test "$file_magic_cmd" = '$MAGIC_CMD'; then ++ _LT_PATH_MAGIC ++ fi ++ ;; ++esac ++ ++# Use C for the default configuration in the libtool script ++LT_SUPPORTED_TAG([CC]) ++_LT_LANG_C_CONFIG ++_LT_LANG_DEFAULT_CONFIG ++_LT_CONFIG_COMMANDS ++])# _LT_SETUP ++ ++ ++# _LT_PROG_LTMAIN ++# --------------- ++# Note that this code is called both from `configure', and `config.status' ++# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, ++# `config.status' has no value for ac_aux_dir unless we are using Automake, ++# so we pass a copy along to make sure it has a sensible value anyway. ++m4_defun([_LT_PROG_LTMAIN], ++[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl ++_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) ++ltmain="$ac_aux_dir/ltmain.sh" ++])# _LT_PROG_LTMAIN ++ ++ ++## ------------------------------------- ## ++## Accumulate code for creating libtool. ## ++## ------------------------------------- ## ++ ++# So that we can recreate a full libtool script including additional ++# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS ++# in macros and then make a single call at the end using the `libtool' ++# label. ++ ++ ++# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) ++# ---------------------------------------- ++# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. ++m4_define([_LT_CONFIG_LIBTOOL_INIT], ++[m4_ifval([$1], ++ [m4_append([_LT_OUTPUT_LIBTOOL_INIT], ++ [$1 ++])])]) ++ ++# Initialize. ++m4_define([_LT_OUTPUT_LIBTOOL_INIT]) ++ ++ ++# _LT_CONFIG_LIBTOOL([COMMANDS]) ++# ------------------------------ ++# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. ++m4_define([_LT_CONFIG_LIBTOOL], ++[m4_ifval([$1], ++ [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], ++ [$1 ++])])]) ++ ++# Initialize. ++m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) ++ ++ ++# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) ++# ----------------------------------------------------- ++m4_defun([_LT_CONFIG_SAVE_COMMANDS], ++[_LT_CONFIG_LIBTOOL([$1]) ++_LT_CONFIG_LIBTOOL_INIT([$2]) ++]) ++ ++ ++# _LT_FORMAT_COMMENT([COMMENT]) ++# ----------------------------- ++# Add leading comment marks to the start of each line, and a trailing ++# full-stop to the whole comment if one is not present already. ++m4_define([_LT_FORMAT_COMMENT], ++[m4_ifval([$1], [ ++m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], ++ [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) ++)]) ++ ++ ++ ++## ------------------------ ## ++## FIXME: Eliminate VARNAME ## ++## ------------------------ ## ++ ++ ++# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) ++# ------------------------------------------------------------------- ++# CONFIGNAME is the name given to the value in the libtool script. ++# VARNAME is the (base) name used in the configure script. ++# VALUE may be 0, 1 or 2 for a computed quote escaped value based on ++# VARNAME. Any other value will be used directly. ++m4_define([_LT_DECL], ++[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], ++ [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], ++ [m4_ifval([$1], [$1], [$2])]) ++ lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) ++ m4_ifval([$4], ++ [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) ++ lt_dict_add_subkey([lt_decl_dict], [$2], ++ [tagged?], [m4_ifval([$5], [yes], [no])])]) ++]) ++ ++ ++# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) ++# -------------------------------------------------------- ++m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) ++ ++ ++# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) ++# ------------------------------------------------ ++m4_define([lt_decl_tag_varnames], ++[_lt_decl_filter([tagged?], [yes], $@)]) ++ ++ ++# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) ++# --------------------------------------------------------- ++m4_define([_lt_decl_filter], ++[m4_case([$#], ++ [0], [m4_fatal([$0: too few arguments: $#])], ++ [1], [m4_fatal([$0: too few arguments: $#: $1])], ++ [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], ++ [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], ++ [lt_dict_filter([lt_decl_dict], $@)])[]dnl ++]) ++ ++ ++# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) ++# -------------------------------------------------- ++m4_define([lt_decl_quote_varnames], ++[_lt_decl_filter([value], [1], $@)]) ++ ++ ++# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) ++# --------------------------------------------------- ++m4_define([lt_decl_dquote_varnames], ++[_lt_decl_filter([value], [2], $@)]) ++ ++ ++# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) ++# --------------------------------------------------- ++m4_define([lt_decl_varnames_tagged], ++[m4_assert([$# <= 2])dnl ++_$0(m4_quote(m4_default([$1], [[, ]])), ++ m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), ++ m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) ++m4_define([_lt_decl_varnames_tagged], ++[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) ++ ++ ++# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) ++# ------------------------------------------------ ++m4_define([lt_decl_all_varnames], ++[_$0(m4_quote(m4_default([$1], [[, ]])), ++ m4_if([$2], [], ++ m4_quote(lt_decl_varnames), ++ m4_quote(m4_shift($@))))[]dnl ++]) ++m4_define([_lt_decl_all_varnames], ++[lt_join($@, lt_decl_varnames_tagged([$1], ++ lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl ++]) ++ ++ ++# _LT_CONFIG_STATUS_DECLARE([VARNAME]) ++# ------------------------------------ ++# Quote a variable value, and forward it to `config.status' so that its ++# declaration there will have the same value as in `configure'. VARNAME ++# must have a single quote delimited value for this to work. ++m4_define([_LT_CONFIG_STATUS_DECLARE], ++[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) ++ ++ ++# _LT_CONFIG_STATUS_DECLARATIONS ++# ------------------------------ ++# We delimit libtool config variables with single quotes, so when ++# we write them to config.status, we have to be sure to quote all ++# embedded single quotes properly. In configure, this macro expands ++# each variable declared with _LT_DECL (and _LT_TAGDECL) into: ++# ++# ='`$ECHO "X$" | $Xsed -e "$delay_single_quote_subst"`' ++m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], ++[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), ++ [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) ++ ++ ++# _LT_LIBTOOL_TAGS ++# ---------------- ++# Output comment and list of tags supported by the script ++m4_defun([_LT_LIBTOOL_TAGS], ++[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl ++available_tags="_LT_TAGS"dnl ++]) ++ ++ ++# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) ++# ----------------------------------- ++# Extract the dictionary values for VARNAME (optionally with TAG) and ++# expand to a commented shell variable setting: ++# ++# # Some comment about what VAR is for. ++# visible_name=$lt_internal_name ++m4_define([_LT_LIBTOOL_DECLARE], ++[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], ++ [description])))[]dnl ++m4_pushdef([_libtool_name], ++ m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl ++m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), ++ [0], [_libtool_name=[$]$1], ++ [1], [_libtool_name=$lt_[]$1], ++ [2], [_libtool_name=$lt_[]$1], ++ [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl ++m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl ++]) ++ ++ ++# _LT_LIBTOOL_CONFIG_VARS ++# ----------------------- ++# Produce commented declarations of non-tagged libtool config variables ++# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' ++# script. Tagged libtool config variables (even for the LIBTOOL CONFIG ++# section) are produced by _LT_LIBTOOL_TAG_VARS. ++m4_defun([_LT_LIBTOOL_CONFIG_VARS], ++[m4_foreach([_lt_var], ++ m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), ++ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) ++ ++ ++# _LT_LIBTOOL_TAG_VARS(TAG) ++# ------------------------- ++m4_define([_LT_LIBTOOL_TAG_VARS], ++[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), ++ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) ++ ++ ++# _LT_TAGVAR(VARNAME, [TAGNAME]) ++# ------------------------------ ++m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) ++ ++ ++# _LT_CONFIG_COMMANDS ++# ------------------- ++# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of ++# variables for single and double quote escaping we saved from calls ++# to _LT_DECL, we can put quote escaped variables declarations ++# into `config.status', and then the shell code to quote escape them in ++# for loops in `config.status'. Finally, any additional code accumulated ++# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. ++m4_defun([_LT_CONFIG_COMMANDS], ++[AC_PROVIDE_IFELSE([LT_OUTPUT], ++ dnl If the libtool generation code has been placed in $CONFIG_LT, ++ dnl instead of duplicating it all over again into config.status, ++ dnl then we will have config.status run $CONFIG_LT later, so it ++ dnl needs to know what name is stored there: ++ [AC_CONFIG_COMMANDS([libtool], ++ [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], ++ dnl If the libtool generation code is destined for config.status, ++ dnl expand the accumulated commands and init code now: ++ [AC_CONFIG_COMMANDS([libtool], ++ [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) ++])#_LT_CONFIG_COMMANDS ++ ++ ++# Initialize. ++m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], ++[ ++ ++# The HP-UX ksh and POSIX shell print the target directory to stdout ++# if CDPATH is set. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++sed_quote_subst='$sed_quote_subst' ++double_quote_subst='$double_quote_subst' ++delay_variable_subst='$delay_variable_subst' ++_LT_CONFIG_STATUS_DECLARATIONS ++LTCC='$LTCC' ++LTCFLAGS='$LTCFLAGS' ++compiler='$compiler_DEFAULT' ++ ++# Quote evaled strings. ++for var in lt_decl_all_varnames([[ \ ++]], lt_decl_quote_varnames); do ++ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in ++ *[[\\\\\\\`\\"\\\$]]*) ++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ++ ;; ++ *) ++ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" ++ ;; ++ esac ++done ++ ++# Double-quote double-evaled strings. ++for var in lt_decl_all_varnames([[ \ ++]], lt_decl_dquote_varnames); do ++ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in ++ *[[\\\\\\\`\\"\\\$]]*) ++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ++ ;; ++ *) ++ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" ++ ;; ++ esac ++done ++ ++# Fix-up fallback echo if it was mangled by the above quoting rules. ++case \$lt_ECHO in ++*'\\\[$]0 --fallback-echo"')dnl " ++ lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` ++ ;; ++esac ++ ++_LT_OUTPUT_LIBTOOL_INIT ++]) ++ ++ ++# LT_OUTPUT ++# --------- ++# This macro allows early generation of the libtool script (before ++# AC_OUTPUT is called), incase it is used in configure for compilation ++# tests. ++AC_DEFUN([LT_OUTPUT], ++[: ${CONFIG_LT=./config.lt} ++AC_MSG_NOTICE([creating $CONFIG_LT]) ++cat >"$CONFIG_LT" <<_LTEOF ++#! $SHELL ++# Generated by $as_me. ++# Run this file to recreate a libtool stub with the current configuration. ++ ++lt_cl_silent=false ++SHELL=\${CONFIG_SHELL-$SHELL} ++_LTEOF ++ ++cat >>"$CONFIG_LT" <<\_LTEOF ++AS_SHELL_SANITIZE ++_AS_PREPARE ++ ++exec AS_MESSAGE_FD>&1 ++exec AS_MESSAGE_LOG_FD>>config.log ++{ ++ echo ++ AS_BOX([Running $as_me.]) ++} >&AS_MESSAGE_LOG_FD ++ ++lt_cl_help="\ ++\`$as_me' creates a local libtool stub from the current configuration, ++for use in further configure time tests before the real libtool is ++generated. ++ ++Usage: $[0] [[OPTIONS]] ++ ++ -h, --help print this help, then exit ++ -V, --version print version number, then exit ++ -q, --quiet do not print progress messages ++ -d, --debug don't remove temporary files ++ ++Report bugs to ." ++ ++lt_cl_version="\ ++m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl ++m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) ++configured by $[0], generated by m4_PACKAGE_STRING. ++ ++Copyright (C) 2008 Free Software Foundation, Inc. ++This config.lt script is free software; the Free Software Foundation ++gives unlimited permision to copy, distribute and modify it." ++ ++while test $[#] != 0 ++do ++ case $[1] in ++ --version | --v* | -V ) ++ echo "$lt_cl_version"; exit 0 ;; ++ --help | --h* | -h ) ++ echo "$lt_cl_help"; exit 0 ;; ++ --debug | --d* | -d ) ++ debug=: ;; ++ --quiet | --q* | --silent | --s* | -q ) ++ lt_cl_silent=: ;; ++ ++ -*) AC_MSG_ERROR([unrecognized option: $[1] ++Try \`$[0] --help' for more information.]) ;; ++ ++ *) AC_MSG_ERROR([unrecognized argument: $[1] ++Try \`$[0] --help' for more information.]) ;; ++ esac ++ shift ++done ++ ++if $lt_cl_silent; then ++ exec AS_MESSAGE_FD>/dev/null ++fi ++_LTEOF ++ ++cat >>"$CONFIG_LT" <<_LTEOF ++_LT_OUTPUT_LIBTOOL_COMMANDS_INIT ++_LTEOF ++ ++cat >>"$CONFIG_LT" <<\_LTEOF ++AC_MSG_NOTICE([creating $ofile]) ++_LT_OUTPUT_LIBTOOL_COMMANDS ++AS_EXIT(0) ++_LTEOF ++chmod +x "$CONFIG_LT" ++ ++# configure is writing to config.log, but config.lt does its own redirection, ++# appending to config.log, which fails on DOS, as config.log is still kept ++# open by configure. Here we exec the FD to /dev/null, effectively closing ++# config.log, so it can be properly (re)opened and appended to by config.lt. ++if test "$no_create" != yes; then ++ lt_cl_success=: ++ test "$silent" = yes && ++ lt_config_lt_args="$lt_config_lt_args --quiet" ++ exec AS_MESSAGE_LOG_FD>/dev/null ++ $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false ++ exec AS_MESSAGE_LOG_FD>>config.log ++ $lt_cl_success || AS_EXIT(1) ++fi ++])# LT_OUTPUT ++ ++ ++# _LT_CONFIG(TAG) ++# --------------- ++# If TAG is the built-in tag, create an initial libtool script with a ++# default configuration from the untagged config vars. Otherwise add code ++# to config.status for appending the configuration named by TAG from the ++# matching tagged config vars. ++m4_defun([_LT_CONFIG], ++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++_LT_CONFIG_SAVE_COMMANDS([ ++ m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl ++ m4_if(_LT_TAG, [C], [ ++ # See if we are running on zsh, and set the options which allow our ++ # commands through without removal of \ escapes. ++ if test -n "${ZSH_VERSION+set}" ; then ++ setopt NO_GLOB_SUBST ++ fi ++ ++ cfgfile="${ofile}T" ++ trap "$RM \"$cfgfile\"; exit 1" 1 2 15 ++ $RM "$cfgfile" ++ ++ cat <<_LT_EOF >> "$cfgfile" ++#! $SHELL ++ ++# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. ++# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION ++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: ++# NOTE: Changes made to this file will be lost: look at ltmain.sh. ++# ++_LT_COPYING ++_LT_LIBTOOL_TAGS ++ ++# ### BEGIN LIBTOOL CONFIG ++_LT_LIBTOOL_CONFIG_VARS ++_LT_LIBTOOL_TAG_VARS ++# ### END LIBTOOL CONFIG ++ ++_LT_EOF ++ ++ case $host_os in ++ aix3*) ++ cat <<\_LT_EOF >> "$cfgfile" ++# AIX sometimes has problems with the GCC collect2 program. For some ++# reason, if we set the COLLECT_NAMES environment variable, the problems ++# vanish in a puff of smoke. ++if test "X${COLLECT_NAMES+set}" != Xset; then ++ COLLECT_NAMES= ++ export COLLECT_NAMES ++fi ++_LT_EOF ++ ;; ++ esac ++ ++ _LT_PROG_LTMAIN ++ ++ # We use sed instead of cat because bash on DJGPP gets confused if ++ # if finds mixed CR/LF and LF-only lines. Since sed operates in ++ # text mode, it properly converts lines to CR/LF. This bash problem ++ # is reportedly fixed, but why not run on old versions too? ++ sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) ++ ++ _LT_PROG_XSI_SHELLFNS ++ ++ sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) ++ ++ mv -f "$cfgfile" "$ofile" || ++ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") ++ chmod +x "$ofile" ++], ++[cat <<_LT_EOF >> "$ofile" ++ ++dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded ++dnl in a comment (ie after a #). ++# ### BEGIN LIBTOOL TAG CONFIG: $1 ++_LT_LIBTOOL_TAG_VARS(_LT_TAG) ++# ### END LIBTOOL TAG CONFIG: $1 ++_LT_EOF ++])dnl /m4_if ++], ++[m4_if([$1], [], [ ++ PACKAGE='$PACKAGE' ++ VERSION='$VERSION' ++ TIMESTAMP='$TIMESTAMP' ++ RM='$RM' ++ ofile='$ofile'], []) ++])dnl /_LT_CONFIG_SAVE_COMMANDS ++])# _LT_CONFIG ++ ++ ++# LT_SUPPORTED_TAG(TAG) ++# --------------------- ++# Trace this macro to discover what tags are supported by the libtool ++# --tag option, using: ++# autoconf --trace 'LT_SUPPORTED_TAG:$1' ++AC_DEFUN([LT_SUPPORTED_TAG], []) ++ ++ ++# C support is built-in for now ++m4_define([_LT_LANG_C_enabled], []) ++m4_define([_LT_TAGS], []) ++ ++ ++# LT_LANG(LANG) ++# ------------- ++# Enable libtool support for the given language if not already enabled. ++AC_DEFUN([LT_LANG], ++[AC_BEFORE([$0], [LT_OUTPUT])dnl ++m4_case([$1], ++ [C], [_LT_LANG(C)], ++ [C++], [_LT_LANG(CXX)], ++ [Java], [_LT_LANG(GCJ)], ++ [Fortran 77], [_LT_LANG(F77)], ++ [Fortran], [_LT_LANG(FC)], ++ [Windows Resource], [_LT_LANG(RC)], ++ [m4_ifdef([_LT_LANG_]$1[_CONFIG], ++ [_LT_LANG($1)], ++ [m4_fatal([$0: unsupported language: "$1"])])])dnl ++])# LT_LANG ++ ++ ++# _LT_LANG(LANGNAME) ++# ------------------ ++m4_defun([_LT_LANG], ++[m4_ifdef([_LT_LANG_]$1[_enabled], [], ++ [LT_SUPPORTED_TAG([$1])dnl ++ m4_append([_LT_TAGS], [$1 ])dnl ++ m4_define([_LT_LANG_]$1[_enabled], [])dnl ++ _LT_LANG_$1_CONFIG($1)])dnl ++])# _LT_LANG ++ ++ ++# _LT_LANG_DEFAULT_CONFIG ++# ----------------------- ++m4_defun([_LT_LANG_DEFAULT_CONFIG], ++[AC_PROVIDE_IFELSE([AC_PROG_CXX], ++ [LT_LANG(CXX)], ++ [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) ++ ++AC_PROVIDE_IFELSE([AC_PROG_F77], ++ [LT_LANG(F77)], ++ [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) ++ ++AC_PROVIDE_IFELSE([AC_PROG_FC], ++ [LT_LANG(FC)], ++ [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) ++ ++dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal ++dnl pulling things in needlessly. ++AC_PROVIDE_IFELSE([AC_PROG_GCJ], ++ [LT_LANG(GCJ)], ++ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], ++ [LT_LANG(GCJ)], ++ [AC_PROVIDE_IFELSE([LT_PROG_GCJ], ++ [LT_LANG(GCJ)], ++ [m4_ifdef([AC_PROG_GCJ], ++ [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) ++ m4_ifdef([A][M_PROG_GCJ], ++ [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) ++ m4_ifdef([LT_PROG_GCJ], ++ [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) ++ ++AC_PROVIDE_IFELSE([LT_PROG_RC], ++ [LT_LANG(RC)], ++ [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) ++])# _LT_LANG_DEFAULT_CONFIG ++ ++# Obsolete macros: ++AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) ++AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) ++AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) ++AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_CXX], []) ++dnl AC_DEFUN([AC_LIBTOOL_F77], []) ++dnl AC_DEFUN([AC_LIBTOOL_FC], []) ++dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) ++ ++ ++# _LT_TAG_COMPILER ++# ---------------- ++m4_defun([_LT_TAG_COMPILER], ++[AC_REQUIRE([AC_PROG_CC])dnl ++ ++_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl ++_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl ++_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl ++_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl ++ ++# If no C compiler was specified, use CC. ++LTCC=${LTCC-"$CC"} ++ ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++ ++# Allow CC to be a program name with arguments. ++compiler=$CC ++])# _LT_TAG_COMPILER ++ ++ ++# _LT_COMPILER_BOILERPLATE ++# ------------------------ ++# Check for compiler boilerplate output or warnings with ++# the simple compiler test code. ++m4_defun([_LT_COMPILER_BOILERPLATE], ++[m4_require([_LT_DECL_SED])dnl ++ac_outfile=conftest.$ac_objext ++echo "$lt_simple_compile_test_code" >conftest.$ac_ext ++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++_lt_compiler_boilerplate=`cat conftest.err` ++$RM conftest* ++])# _LT_COMPILER_BOILERPLATE ++ ++ ++# _LT_LINKER_BOILERPLATE ++# ---------------------- ++# Check for linker boilerplate output or warnings with ++# the simple link test code. ++m4_defun([_LT_LINKER_BOILERPLATE], ++[m4_require([_LT_DECL_SED])dnl ++ac_outfile=conftest.$ac_objext ++echo "$lt_simple_link_test_code" >conftest.$ac_ext ++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++_lt_linker_boilerplate=`cat conftest.err` ++$RM -r conftest* ++])# _LT_LINKER_BOILERPLATE ++ ++# _LT_REQUIRED_DARWIN_CHECKS ++# ------------------------- ++m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ ++ case $host_os in ++ rhapsody* | darwin*) ++ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) ++ AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) ++ AC_CHECK_TOOL([LIPO], [lipo], [:]) ++ AC_CHECK_TOOL([OTOOL], [otool], [:]) ++ AC_CHECK_TOOL([OTOOL64], [otool64], [:]) ++ _LT_DECL([], [DSYMUTIL], [1], ++ [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) ++ _LT_DECL([], [NMEDIT], [1], ++ [Tool to change global to local symbols on Mac OS X]) ++ _LT_DECL([], [LIPO], [1], ++ [Tool to manipulate fat objects and archives on Mac OS X]) ++ _LT_DECL([], [OTOOL], [1], ++ [ldd/readelf like tool for Mach-O binaries on Mac OS X]) ++ _LT_DECL([], [OTOOL64], [1], ++ [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) ++ ++ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], ++ [lt_cv_apple_cc_single_mod=no ++ if test -z "${LT_MULTI_MODULE}"; then ++ # By default we will add the -single_module flag. You can override ++ # by either setting the environment variable LT_MULTI_MODULE ++ # non-empty at configure time, or by adding -multi_module to the ++ # link flags. ++ rm -rf libconftest.dylib* ++ echo "int foo(void){return 1;}" > conftest.c ++ echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ++-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD ++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ++ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err ++ _lt_result=$? ++ if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then ++ lt_cv_apple_cc_single_mod=yes ++ else ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ fi ++ rm -rf libconftest.dylib* ++ rm -f conftest.* ++ fi]) ++ AC_CACHE_CHECK([for -exported_symbols_list linker flag], ++ [lt_cv_ld_exported_symbols_list], ++ [lt_cv_ld_exported_symbols_list=no ++ save_LDFLAGS=$LDFLAGS ++ echo "_main" > conftest.sym ++ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], ++ [lt_cv_ld_exported_symbols_list=yes], ++ [lt_cv_ld_exported_symbols_list=no]) ++ LDFLAGS="$save_LDFLAGS" ++ ]) ++ case $host_os in ++ rhapsody* | darwin1.[[012]]) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; ++ darwin1.*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ darwin*) # darwin 5.x on ++ # if running on 10.5 or later, the deployment target defaults ++ # to the OS version, if on x86, and 10.4, the deployment ++ # target defaults to 10.4. Don't you love it? ++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in ++ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ 10.[[012]]*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ 10.*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ esac ++ ;; ++ esac ++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then ++ _lt_dar_single_mod='$single_module' ++ fi ++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then ++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' ++ else ++ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ fi ++ if test "$DSYMUTIL" != ":"; then ++ _lt_dsymutil='~$DSYMUTIL $lib || :' ++ else ++ _lt_dsymutil= ++ fi ++ ;; ++ esac ++]) ++ ++ ++# _LT_DARWIN_LINKER_FEATURES ++# -------------------------- ++# Checks for linker and compiler features on darwin ++m4_defun([_LT_DARWIN_LINKER_FEATURES], ++[ ++ m4_require([_LT_REQUIRED_DARWIN_CHECKS]) ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_TAGVAR(hardcode_direct, $1)=no ++ _LT_TAGVAR(hardcode_automatic, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='' ++ _LT_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" ++ case $cc_basename in ++ ifort*) _lt_dar_can_shared=yes ;; ++ *) _lt_dar_can_shared=$GCC ;; ++ esac ++ if test "$_lt_dar_can_shared" = "yes"; then ++ output_verbose_link_cmd=echo ++ _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ m4_if([$1], [CXX], ++[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then ++ _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" ++ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" ++ fi ++],[]) ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++]) ++ ++# _LT_SYS_MODULE_PATH_AIX ++# ----------------------- ++# Links a minimal program and checks the executable ++# for the system default hardcoded library path. In most cases, ++# this is /usr/lib:/lib, but when the MPI compilers are used ++# the location of the communication and MPI libs are included too. ++# If we don't find anything, use the default library path according ++# to the aix ld manual. ++m4_defun([_LT_SYS_MODULE_PATH_AIX], ++[m4_require([_LT_DECL_SED])dnl ++AC_LINK_IFELSE(AC_LANG_PROGRAM,[ ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++# Check for a 64-bit object if we didn't find anything. ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi],[]) ++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++])# _LT_SYS_MODULE_PATH_AIX ++ ++ ++# _LT_SHELL_INIT(ARG) ++# ------------------- ++m4_define([_LT_SHELL_INIT], ++[ifdef([AC_DIVERSION_NOTICE], ++ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], ++ [AC_DIVERT_PUSH(NOTICE)]) ++$1 ++AC_DIVERT_POP ++])# _LT_SHELL_INIT ++ ++ ++# _LT_PROG_ECHO_BACKSLASH ++# ----------------------- ++# Add some code to the start of the generated configure script which ++# will find an echo command which doesn't interpret backslashes. ++m4_defun([_LT_PROG_ECHO_BACKSLASH], ++[_LT_SHELL_INIT([ ++# Check that we are running under the correct shell. ++SHELL=${CONFIG_SHELL-/bin/sh} ++ ++case X$lt_ECHO in ++X*--fallback-echo) ++ # Remove one level of quotation (which was required for Make). ++ ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` ++ ;; ++esac ++ ++ECHO=${lt_ECHO-echo} ++if test "X[$]1" = X--no-reexec; then ++ # Discard the --no-reexec flag, and continue. ++ shift ++elif test "X[$]1" = X--fallback-echo; then ++ # Avoid inline document here, it may be left over ++ : ++elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then ++ # Yippee, $ECHO works! ++ : ++else ++ # Restart under the correct shell. ++ exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} ++fi ++ ++if test "X[$]1" = X--fallback-echo; then ++ # used as fallback echo ++ shift ++ cat <<_LT_EOF ++[$]* ++_LT_EOF ++ exit 0 ++fi ++ ++# The HP-UX ksh and POSIX shell print the target directory to stdout ++# if CDPATH is set. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++if test -z "$lt_ECHO"; then ++ if test "X${echo_test_string+set}" != Xset; then ++ # find a string as large as possible, as long as the shell can cope with it ++ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do ++ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... ++ if { echo_test_string=`eval $cmd`; } 2>/dev/null && ++ { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null ++ then ++ break ++ fi ++ done ++ fi ++ ++ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ : ++ else ++ # The Solaris, AIX, and Digital Unix default echo programs unquote ++ # backslashes. This makes it impossible to quote backslashes using ++ # echo "$something" | sed 's/\\/\\\\/g' ++ # ++ # So, first we look for a working echo in the user's PATH. ++ ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for dir in $PATH /usr/ucb; do ++ IFS="$lt_save_ifs" ++ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && ++ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ ECHO="$dir/echo" ++ break ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ++ if test "X$ECHO" = Xecho; then ++ # We didn't find a better echo, so look for alternatives. ++ if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ # This shell has a builtin print -r that does the trick. ++ ECHO='print -r' ++ elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && ++ test "X$CONFIG_SHELL" != X/bin/ksh; then ++ # If we have ksh, try running configure again with it. ++ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} ++ export ORIGINAL_CONFIG_SHELL ++ CONFIG_SHELL=/bin/ksh ++ export CONFIG_SHELL ++ exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} ++ else ++ # Try using printf. ++ ECHO='printf %s\n' ++ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ # Cool, printf works ++ : ++ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && ++ test "X$echo_testing_string" = 'X\t' && ++ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL ++ export CONFIG_SHELL ++ SHELL="$CONFIG_SHELL" ++ export SHELL ++ ECHO="$CONFIG_SHELL [$]0 --fallback-echo" ++ elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && ++ test "X$echo_testing_string" = 'X\t' && ++ echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ ECHO="$CONFIG_SHELL [$]0 --fallback-echo" ++ else ++ # maybe with a smaller string... ++ prev=: ++ ++ for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do ++ if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null ++ then ++ break ++ fi ++ prev="$cmd" ++ done ++ ++ if test "$prev" != 'sed 50q "[$]0"'; then ++ echo_test_string=`eval $prev` ++ export echo_test_string ++ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} ++ else ++ # Oops. We lost completely, so just stick with echo. ++ ECHO=echo ++ fi ++ fi ++ fi ++ fi ++ fi ++fi ++ ++# Copy echo and quote the copy suitably for passing to libtool from ++# the Makefile, instead of quoting the original, which is used later. ++lt_ECHO=$ECHO ++if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then ++ lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" ++fi ++ ++AC_SUBST(lt_ECHO) ++]) ++_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) ++_LT_DECL([], [ECHO], [1], ++ [An echo program that does not interpret backslashes]) ++])# _LT_PROG_ECHO_BACKSLASH ++ ++ ++# _LT_ENABLE_LOCK ++# --------------- ++m4_defun([_LT_ENABLE_LOCK], ++[AC_ARG_ENABLE([libtool-lock], ++ [AS_HELP_STRING([--disable-libtool-lock], ++ [avoid locking (might break parallel builds)])]) ++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ++ ++# Some flags need to be propagated to the compiler or linker for good ++# libtool support. ++case $host in ++ia64-*-hpux*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *ELF-32*) ++ HPUX_IA64_MODE="32" ++ ;; ++ *ELF-64*) ++ HPUX_IA64_MODE="64" ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++*-*-irix6*) ++ # Find out which ABI we are using. ++ echo '[#]line __oline__ "configure"' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ if test "$lt_cv_prog_gnu_ld" = yes; then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -melf32bsmip" ++ ;; ++ *N32*) ++ LD="${LD-ld} -melf32bmipn32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -melf64bmip" ++ ;; ++ esac ++ else ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -32" ++ ;; ++ *N32*) ++ LD="${LD-ld} -n32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -64" ++ ;; ++ esac ++ fi ++ fi ++ rm -rf conftest* ++ ;; ++ ++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ ++s390*-*linux*|s390*-*tpf*|sparc*-*linux*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ case `/usr/bin/file conftest.o` in ++ *32-bit*) ++ case $host in ++ x86_64-*kfreebsd*-gnu) ++ LD="${LD-ld} -m elf_i386_fbsd" ++ ;; ++ x86_64-*linux*) ++ LD="${LD-ld} -m elf_i386" ++ ;; ++ ppc64-*linux*|powerpc64-*linux*) ++ LD="${LD-ld} -m elf32ppclinux" ++ ;; ++ s390x-*linux*) ++ LD="${LD-ld} -m elf_s390" ++ ;; ++ sparc64-*linux*) ++ LD="${LD-ld} -m elf32_sparc" ++ ;; ++ esac ++ ;; ++ *64-bit*) ++ case $host in ++ x86_64-*kfreebsd*-gnu) ++ LD="${LD-ld} -m elf_x86_64_fbsd" ++ ;; ++ x86_64-*linux*) ++ LD="${LD-ld} -m elf_x86_64" ++ ;; ++ ppc*-*linux*|powerpc*-*linux*) ++ LD="${LD-ld} -m elf64ppc" ++ ;; ++ s390*-*linux*|s390*-*tpf*) ++ LD="${LD-ld} -m elf64_s390" ++ ;; ++ sparc*-*linux*) ++ LD="${LD-ld} -m elf64_sparc" ++ ;; ++ esac ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++ ++*-*-sco3.2v5*) ++ # On SCO OpenServer 5, we need -belf to get full-featured binaries. ++ SAVE_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -belf" ++ AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, ++ [AC_LANG_PUSH(C) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) ++ AC_LANG_POP]) ++ if test x"$lt_cv_cc_needs_belf" != x"yes"; then ++ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf ++ CFLAGS="$SAVE_CFLAGS" ++ fi ++ ;; ++sparc*-*solaris*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ case `/usr/bin/file conftest.o` in ++ *64-bit*) ++ case $lt_cv_prog_gnu_ld in ++ yes*) LD="${LD-ld} -m elf64_sparc" ;; ++ *) ++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then ++ LD="${LD-ld} -64" ++ fi ++ ;; ++ esac ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++esac ++ ++need_locks="$enable_libtool_lock" ++])# _LT_ENABLE_LOCK ++ ++ ++# _LT_CMD_OLD_ARCHIVE ++# ------------------- ++m4_defun([_LT_CMD_OLD_ARCHIVE], ++[AC_CHECK_TOOL(AR, ar, false) ++test -z "$AR" && AR=ar ++test -z "$AR_FLAGS" && AR_FLAGS=cru ++_LT_DECL([], [AR], [1], [The archiver]) ++_LT_DECL([], [AR_FLAGS], [1]) ++ ++AC_CHECK_TOOL(STRIP, strip, :) ++test -z "$STRIP" && STRIP=: ++_LT_DECL([], [STRIP], [1], [A symbol stripping program]) ++ ++AC_CHECK_TOOL(RANLIB, ranlib, :) ++test -z "$RANLIB" && RANLIB=: ++_LT_DECL([], [RANLIB], [1], ++ [Commands used to install an old-style archive]) ++ ++# Determine commands to create old-style static archives. ++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' ++old_postinstall_cmds='chmod 644 $oldlib' ++old_postuninstall_cmds= ++ ++if test -n "$RANLIB"; then ++ case $host_os in ++ openbsd*) ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ++ ;; ++ *) ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ++ ;; ++ esac ++ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" ++fi ++_LT_DECL([], [old_postinstall_cmds], [2]) ++_LT_DECL([], [old_postuninstall_cmds], [2]) ++_LT_TAGDECL([], [old_archive_cmds], [2], ++ [Commands used to build an old-style archive]) ++])# _LT_CMD_OLD_ARCHIVE ++ ++ ++# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, ++# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) ++# ---------------------------------------------------------------- ++# Check whether the given compiler option works ++AC_DEFUN([_LT_COMPILER_OPTION], ++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_DECL_SED])dnl ++AC_CACHE_CHECK([$1], [$2], ++ [$2=no ++ m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ lt_compiler_flag="$3" ++ # Insert the option either (1) after the last *FLAGS variable, or ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ # The option is referenced via a variable to avoid confusing sed. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ ++ -e 's:$: $lt_compiler_flag:'` ++ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) ++ (eval "$lt_compile" 2>conftest.err) ++ ac_status=$? ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++ if (exit $ac_status) && test -s "$ac_outfile"; then ++ # The compiler can only warn and ignore the option if not recognized ++ # So say no if there are warnings other than the usual output. ++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then ++ $2=yes ++ fi ++ fi ++ $RM conftest* ++]) ++ ++if test x"[$]$2" = xyes; then ++ m4_if([$5], , :, [$5]) ++else ++ m4_if([$6], , :, [$6]) ++fi ++])# _LT_COMPILER_OPTION ++ ++# Old name: ++AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) ++ ++ ++# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, ++# [ACTION-SUCCESS], [ACTION-FAILURE]) ++# ---------------------------------------------------- ++# Check whether the given linker option works ++AC_DEFUN([_LT_LINKER_OPTION], ++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_DECL_SED])dnl ++AC_CACHE_CHECK([$1], [$2], ++ [$2=no ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS $3" ++ echo "$lt_simple_link_test_code" > conftest.$ac_ext ++ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then ++ # The linker can only warn and ignore the option if not recognized ++ # So say no if there are warnings ++ if test -s conftest.err; then ++ # Append any errors to the config.log. ++ cat conftest.err 1>&AS_MESSAGE_LOG_FD ++ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if diff conftest.exp conftest.er2 >/dev/null; then ++ $2=yes ++ fi ++ else ++ $2=yes ++ fi ++ fi ++ $RM -r conftest* ++ LDFLAGS="$save_LDFLAGS" ++]) ++ ++if test x"[$]$2" = xyes; then ++ m4_if([$4], , :, [$4]) ++else ++ m4_if([$5], , :, [$5]) ++fi ++])# _LT_LINKER_OPTION ++ ++# Old name: ++AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) ++ ++ ++# LT_CMD_MAX_LEN ++#--------------- ++AC_DEFUN([LT_CMD_MAX_LEN], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++# find the maximum length of command line arguments ++AC_MSG_CHECKING([the maximum length of command line arguments]) ++AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl ++ i=0 ++ teststring="ABCD" ++ ++ case $build_os in ++ msdosdjgpp*) ++ # On DJGPP, this test can blow up pretty badly due to problems in libc ++ # (any single argument exceeding 2000 bytes causes a buffer overrun ++ # during glob expansion). Even if it were fixed, the result of this ++ # check would be larger than it should be. ++ lt_cv_sys_max_cmd_len=12288; # 12K is about right ++ ;; ++ ++ gnu*) ++ # Under GNU Hurd, this test is not required because there is ++ # no limit to the length of command line arguments. ++ # Libtool will interpret -1 as no limit whatsoever ++ lt_cv_sys_max_cmd_len=-1; ++ ;; ++ ++ cygwin* | mingw* | cegcc*) ++ # On Win9x/ME, this test blows up -- it succeeds, but takes ++ # about 5 minutes as the teststring grows exponentially. ++ # Worse, since 9x/ME are not pre-emptively multitasking, ++ # you end up with a "frozen" computer, even though with patience ++ # the test eventually succeeds (with a max line length of 256k). ++ # Instead, let's just punt: use the minimum linelength reported by ++ # all of the supported platforms: 8192 (on NT/2K/XP). ++ lt_cv_sys_max_cmd_len=8192; ++ ;; ++ ++ amigaos*) ++ # On AmigaOS with pdksh, this test takes hours, literally. ++ # So we just punt and use a minimum line length of 8192. ++ lt_cv_sys_max_cmd_len=8192; ++ ;; ++ ++ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) ++ # This has been around since 386BSD, at least. Likely further. ++ if test -x /sbin/sysctl; then ++ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` ++ elif test -x /usr/sbin/sysctl; then ++ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` ++ else ++ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs ++ fi ++ # And add a safety zone ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ++ ;; ++ ++ interix*) ++ # We know the value 262144 and hardcode it with a safety zone (like BSD) ++ lt_cv_sys_max_cmd_len=196608 ++ ;; ++ ++ osf*) ++ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure ++ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not ++ # nice to cause kernel panics so lets avoid the loop below. ++ # First set a reasonable default. ++ lt_cv_sys_max_cmd_len=16384 ++ # ++ if test -x /sbin/sysconfig; then ++ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in ++ *1*) lt_cv_sys_max_cmd_len=-1 ;; ++ esac ++ fi ++ ;; ++ sco3.2v5*) ++ lt_cv_sys_max_cmd_len=102400 ++ ;; ++ sysv5* | sco5v6* | sysv4.2uw2*) ++ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` ++ if test -n "$kargmax"; then ++ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` ++ else ++ lt_cv_sys_max_cmd_len=32768 ++ fi ++ ;; ++ *) ++ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` ++ if test -n "$lt_cv_sys_max_cmd_len"; then ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ++ else ++ # Make teststring a little bigger before we do anything with it. ++ # a 1K string should be a reasonable start. ++ for i in 1 2 3 4 5 6 7 8 ; do ++ teststring=$teststring$teststring ++ done ++ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} ++ # If test is not a shell built-in, we'll probably end up computing a ++ # maximum length that is only half of the actual maximum length, but ++ # we can't tell. ++ while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ ++ = "XX$teststring$teststring"; } >/dev/null 2>&1 && ++ test $i != 17 # 1/2 MB should be enough ++ do ++ i=`expr $i + 1` ++ teststring=$teststring$teststring ++ done ++ # Only check the string length outside the loop. ++ lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` ++ teststring= ++ # Add a significant safety factor because C++ compilers can tack on ++ # massive amounts of additional arguments before passing them to the ++ # linker. It appears as though 1/2 is a usable value. ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` ++ fi ++ ;; ++ esac ++]) ++if test -n $lt_cv_sys_max_cmd_len ; then ++ AC_MSG_RESULT($lt_cv_sys_max_cmd_len) ++else ++ AC_MSG_RESULT(none) ++fi ++max_cmd_len=$lt_cv_sys_max_cmd_len ++_LT_DECL([], [max_cmd_len], [0], ++ [What is the maximum length of a command?]) ++])# LT_CMD_MAX_LEN ++ ++# Old name: ++AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) ++ ++ ++# _LT_HEADER_DLFCN ++# ---------------- ++m4_defun([_LT_HEADER_DLFCN], ++[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl ++])# _LT_HEADER_DLFCN ++ ++ ++# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, ++# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) ++# ---------------------------------------------------------------- ++m4_defun([_LT_TRY_DLOPEN_SELF], ++[m4_require([_LT_HEADER_DLFCN])dnl ++if test "$cross_compiling" = yes; then : ++ [$4] ++else ++ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 ++ lt_status=$lt_dlunknown ++ cat > conftest.$ac_ext <<_LT_EOF ++[#line __oline__ "configure" ++#include "confdefs.h" ++ ++#if HAVE_DLFCN_H ++#include ++#endif ++ ++#include ++ ++#ifdef RTLD_GLOBAL ++# define LT_DLGLOBAL RTLD_GLOBAL ++#else ++# ifdef DL_GLOBAL ++# define LT_DLGLOBAL DL_GLOBAL ++# else ++# define LT_DLGLOBAL 0 ++# endif ++#endif ++ ++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we ++ find out it does not work in some platform. */ ++#ifndef LT_DLLAZY_OR_NOW ++# ifdef RTLD_LAZY ++# define LT_DLLAZY_OR_NOW RTLD_LAZY ++# else ++# ifdef DL_LAZY ++# define LT_DLLAZY_OR_NOW DL_LAZY ++# else ++# ifdef RTLD_NOW ++# define LT_DLLAZY_OR_NOW RTLD_NOW ++# else ++# ifdef DL_NOW ++# define LT_DLLAZY_OR_NOW DL_NOW ++# else ++# define LT_DLLAZY_OR_NOW 0 ++# endif ++# endif ++# endif ++# endif ++#endif ++ ++void fnord() { int i=42;} ++int main () ++{ ++ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); ++ int status = $lt_dlunknown; ++ ++ if (self) ++ { ++ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; ++ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; ++ /* dlclose (self); */ ++ } ++ else ++ puts (dlerror ()); ++ ++ return status; ++}] ++_LT_EOF ++ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then ++ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null ++ lt_status=$? ++ case x$lt_status in ++ x$lt_dlno_uscore) $1 ;; ++ x$lt_dlneed_uscore) $2 ;; ++ x$lt_dlunknown|x*) $3 ;; ++ esac ++ else : ++ # compilation failed ++ $3 ++ fi ++fi ++rm -fr conftest* ++])# _LT_TRY_DLOPEN_SELF ++ ++ ++# LT_SYS_DLOPEN_SELF ++# ------------------ ++AC_DEFUN([LT_SYS_DLOPEN_SELF], ++[m4_require([_LT_HEADER_DLFCN])dnl ++if test "x$enable_dlopen" != xyes; then ++ enable_dlopen=unknown ++ enable_dlopen_self=unknown ++ enable_dlopen_self_static=unknown ++else ++ lt_cv_dlopen=no ++ lt_cv_dlopen_libs= ++ ++ case $host_os in ++ beos*) ++ lt_cv_dlopen="load_add_on" ++ lt_cv_dlopen_libs= ++ lt_cv_dlopen_self=yes ++ ;; ++ ++ mingw* | pw32* | cegcc*) ++ lt_cv_dlopen="LoadLibrary" ++ lt_cv_dlopen_libs= ++ ;; ++ ++ cygwin*) ++ lt_cv_dlopen="dlopen" ++ lt_cv_dlopen_libs= ++ ;; ++ ++ darwin*) ++ # if libdl is installed we need to link against it ++ AC_CHECK_LIB([dl], [dlopen], ++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ ++ lt_cv_dlopen="dyld" ++ lt_cv_dlopen_libs= ++ lt_cv_dlopen_self=yes ++ ]) ++ ;; ++ ++ *) ++ AC_CHECK_FUNC([shl_load], ++ [lt_cv_dlopen="shl_load"], ++ [AC_CHECK_LIB([dld], [shl_load], ++ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], ++ [AC_CHECK_FUNC([dlopen], ++ [lt_cv_dlopen="dlopen"], ++ [AC_CHECK_LIB([dl], [dlopen], ++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], ++ [AC_CHECK_LIB([svld], [dlopen], ++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], ++ [AC_CHECK_LIB([dld], [dld_link], ++ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) ++ ]) ++ ]) ++ ]) ++ ]) ++ ]) ++ ;; ++ esac ++ ++ if test "x$lt_cv_dlopen" != xno; then ++ enable_dlopen=yes ++ else ++ enable_dlopen=no ++ fi ++ ++ case $lt_cv_dlopen in ++ dlopen) ++ save_CPPFLAGS="$CPPFLAGS" ++ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" ++ ++ save_LDFLAGS="$LDFLAGS" ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" ++ ++ save_LIBS="$LIBS" ++ LIBS="$lt_cv_dlopen_libs $LIBS" ++ ++ AC_CACHE_CHECK([whether a program can dlopen itself], ++ lt_cv_dlopen_self, [dnl ++ _LT_TRY_DLOPEN_SELF( ++ lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, ++ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) ++ ]) ++ ++ if test "x$lt_cv_dlopen_self" = xyes; then ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" ++ AC_CACHE_CHECK([whether a statically linked program can dlopen itself], ++ lt_cv_dlopen_self_static, [dnl ++ _LT_TRY_DLOPEN_SELF( ++ lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, ++ lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) ++ ]) ++ fi ++ ++ CPPFLAGS="$save_CPPFLAGS" ++ LDFLAGS="$save_LDFLAGS" ++ LIBS="$save_LIBS" ++ ;; ++ esac ++ ++ case $lt_cv_dlopen_self in ++ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; ++ *) enable_dlopen_self=unknown ;; ++ esac ++ ++ case $lt_cv_dlopen_self_static in ++ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; ++ *) enable_dlopen_self_static=unknown ;; ++ esac ++fi ++_LT_DECL([dlopen_support], [enable_dlopen], [0], ++ [Whether dlopen is supported]) ++_LT_DECL([dlopen_self], [enable_dlopen_self], [0], ++ [Whether dlopen of programs is supported]) ++_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], ++ [Whether dlopen of statically linked programs is supported]) ++])# LT_SYS_DLOPEN_SELF ++ ++# Old name: ++AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) ++ ++ ++# _LT_COMPILER_C_O([TAGNAME]) ++# --------------------------- ++# Check to see if options -c and -o are simultaneously supported by compiler. ++# This macro does not hard code the compiler like AC_PROG_CC_C_O. ++m4_defun([_LT_COMPILER_C_O], ++[m4_require([_LT_DECL_SED])dnl ++m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_TAG_COMPILER])dnl ++AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], ++ [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], ++ [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no ++ $RM -r conftest 2>/dev/null ++ mkdir conftest ++ cd conftest ++ mkdir out ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ ++ lt_compiler_flag="-o out/conftest2.$ac_objext" ++ # Insert the option either (1) after the last *FLAGS variable, or ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ ++ -e 's:$: $lt_compiler_flag:'` ++ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) ++ (eval "$lt_compile" 2>out/conftest.err) ++ ac_status=$? ++ cat out/conftest.err >&AS_MESSAGE_LOG_FD ++ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++ if (exit $ac_status) && test -s out/conftest2.$ac_objext ++ then ++ # The compiler can only warn and ignore the option if not recognized ++ # So say no if there are warnings ++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp ++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 ++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then ++ _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes ++ fi ++ fi ++ chmod u+w . 2>&AS_MESSAGE_LOG_FD ++ $RM conftest* ++ # SGI C++ compiler will create directory out/ii_files/ for ++ # template instantiation ++ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files ++ $RM out/* && rmdir out ++ cd .. ++ $RM -r conftest ++ $RM conftest* ++]) ++_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], ++ [Does compiler simultaneously support -c and -o options?]) ++])# _LT_COMPILER_C_O ++ ++ ++# _LT_COMPILER_FILE_LOCKS([TAGNAME]) ++# ---------------------------------- ++# Check to see if we can do hard links to lock some files if needed ++m4_defun([_LT_COMPILER_FILE_LOCKS], ++[m4_require([_LT_ENABLE_LOCK])dnl ++m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++_LT_COMPILER_C_O([$1]) ++ ++hard_links="nottested" ++if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then ++ # do not overwrite the value of need_locks provided by the user ++ AC_MSG_CHECKING([if we can lock with hard links]) ++ hard_links=yes ++ $RM conftest* ++ ln conftest.a conftest.b 2>/dev/null && hard_links=no ++ touch conftest.a ++ ln conftest.a conftest.b 2>&5 || hard_links=no ++ ln conftest.a conftest.b 2>/dev/null && hard_links=no ++ AC_MSG_RESULT([$hard_links]) ++ if test "$hard_links" = no; then ++ AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) ++ need_locks=warn ++ fi ++else ++ need_locks=no ++fi ++_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) ++])# _LT_COMPILER_FILE_LOCKS ++ ++ ++# _LT_CHECK_OBJDIR ++# ---------------- ++m4_defun([_LT_CHECK_OBJDIR], ++[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], ++[rm -f .libs 2>/dev/null ++mkdir .libs 2>/dev/null ++if test -d .libs; then ++ lt_cv_objdir=.libs ++else ++ # MS-DOS does not allow filenames that begin with a dot. ++ lt_cv_objdir=_libs ++fi ++rmdir .libs 2>/dev/null]) ++objdir=$lt_cv_objdir ++_LT_DECL([], [objdir], [0], ++ [The name of the directory that contains temporary libtool files])dnl ++m4_pattern_allow([LT_OBJDIR])dnl ++AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", ++ [Define to the sub-directory in which libtool stores uninstalled libraries.]) ++])# _LT_CHECK_OBJDIR ++ ++ ++# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) ++# -------------------------------------- ++# Check hardcoding attributes. ++m4_defun([_LT_LINKER_HARDCODE_LIBPATH], ++[AC_MSG_CHECKING([how to hardcode library paths into programs]) ++_LT_TAGVAR(hardcode_action, $1)= ++if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || ++ test -n "$_LT_TAGVAR(runpath_var, $1)" || ++ test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then ++ ++ # We can hardcode non-existent directories. ++ if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && ++ # If the only mechanism to avoid hardcoding is shlibpath_var, we ++ # have to relink, otherwise we might link with an installed library ++ # when we should be linking with a yet-to-be-installed one ++ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && ++ test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then ++ # Linking always hardcodes the temporary library directory. ++ _LT_TAGVAR(hardcode_action, $1)=relink ++ else ++ # We can link without hardcoding, and we can hardcode nonexisting dirs. ++ _LT_TAGVAR(hardcode_action, $1)=immediate ++ fi ++else ++ # We cannot hardcode anything, or else we can only hardcode existing ++ # directories. ++ _LT_TAGVAR(hardcode_action, $1)=unsupported ++fi ++AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) ++ ++if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || ++ test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then ++ # Fast installation is not supported ++ enable_fast_install=no ++elif test "$shlibpath_overrides_runpath" = yes || ++ test "$enable_shared" = no; then ++ # Fast installation is not necessary ++ enable_fast_install=needless ++fi ++_LT_TAGDECL([], [hardcode_action], [0], ++ [How to hardcode a shared library path into an executable]) ++])# _LT_LINKER_HARDCODE_LIBPATH ++ ++ ++# _LT_CMD_STRIPLIB ++# ---------------- ++m4_defun([_LT_CMD_STRIPLIB], ++[m4_require([_LT_DECL_EGREP]) ++striplib= ++old_striplib= ++AC_MSG_CHECKING([whether stripping libraries is possible]) ++if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then ++ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" ++ test -z "$striplib" && striplib="$STRIP --strip-unneeded" ++ AC_MSG_RESULT([yes]) ++else ++# FIXME - insert some real tests, host_os isn't really good enough ++ case $host_os in ++ darwin*) ++ if test -n "$STRIP" ; then ++ striplib="$STRIP -x" ++ old_striplib="$STRIP -S" ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ fi ++ ;; ++ *) ++ AC_MSG_RESULT([no]) ++ ;; ++ esac ++fi ++_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) ++_LT_DECL([], [striplib], [1]) ++])# _LT_CMD_STRIPLIB ++ ++ ++# _LT_SYS_DYNAMIC_LINKER([TAG]) ++# ----------------------------- ++# PORTME Fill in your ld.so characteristics ++m4_defun([_LT_SYS_DYNAMIC_LINKER], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++m4_require([_LT_DECL_EGREP])dnl ++m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_DECL_OBJDUMP])dnl ++m4_require([_LT_DECL_SED])dnl ++AC_MSG_CHECKING([dynamic linker characteristics]) ++m4_if([$1], ++ [], [ ++if test "$GCC" = yes; then ++ case $host_os in ++ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; ++ *) lt_awk_arg="/^libraries:/" ;; ++ esac ++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++ if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then ++ # if the path contains ";" then we assume it to be the separator ++ # otherwise default to the standard path separator (i.e. ":") - it is ++ # assumed that no part of a normal pathname contains ";" but that should ++ # okay in the real world where ";" in dirpaths is itself problematic. ++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++ # Ok, now we have the path, separated by spaces, we can step through it ++ # and add multilib dir if necessary. ++ lt_tmp_lt_search_path_spec= ++ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` ++ for lt_sys_path in $lt_search_path_spec; do ++ if test -d "$lt_sys_path/$lt_multi_os_dir"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" ++ else ++ test -d "$lt_sys_path" && \ ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" ++ fi ++ done ++ lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' ++BEGIN {RS=" "; FS="/|\n";} { ++ lt_foo=""; ++ lt_count=0; ++ for (lt_i = NF; lt_i > 0; lt_i--) { ++ if ($lt_i != "" && $lt_i != ".") { ++ if ($lt_i == "..") { ++ lt_count++; ++ } else { ++ if (lt_count == 0) { ++ lt_foo="/" $lt_i lt_foo; ++ } else { ++ lt_count--; ++ } ++ } ++ } ++ } ++ if (lt_foo != "") { lt_freq[[lt_foo]]++; } ++ if (lt_freq[[lt_foo]] == 1) { print lt_foo; } ++}'` ++ sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` ++else ++ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" ++fi]) ++library_names_spec= ++libname_spec='lib$name' ++soname_spec= ++shrext_cmds=".so" ++postinstall_cmds= ++postuninstall_cmds= ++finish_cmds= ++finish_eval= ++shlibpath_var= ++shlibpath_overrides_runpath=unknown ++version_type=none ++dynamic_linker="$host_os ld.so" ++sys_lib_dlsearch_path_spec="/lib /usr/lib" ++need_lib_prefix=unknown ++hardcode_into_libs=no ++ ++# when you set need_version to no, make sure it does not cause -set_version ++# flags to be left without arguments ++need_version=unknown ++ ++case $host_os in ++aix3*) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' ++ shlibpath_var=LIBPATH ++ ++ # AIX 3 has no versioning support, so we append a major version to the name. ++ soname_spec='${libname}${release}${shared_ext}$major' ++ ;; ++ ++aix[[4-9]]*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ hardcode_into_libs=yes ++ if test "$host_cpu" = ia64; then ++ # AIX 5 supports IA64 ++ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ else ++ # With GCC up to 2.95.x, collect2 would create an import file ++ # for dependence libraries. The import file would start with ++ # the line `#! .'. This would cause the generated library to ++ # depend on `.', always an invalid library. This was fixed in ++ # development snapshots of GCC prior to 3.0. ++ case $host_os in ++ aix4 | aix4.[[01]] | aix4.[[01]].*) ++ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' ++ echo ' yes ' ++ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then ++ : ++ else ++ can_build_shared=no ++ fi ++ ;; ++ esac ++ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct ++ # soname into executable. Probably we can add versioning support to ++ # collect2, so additional links can be useful in future. ++ if test "$aix_use_runtimelinking" = yes; then ++ # If using run time linking (on AIX 4.2 or later) use lib.so ++ # instead of lib.a to let people know that these are not ++ # typical AIX shared libraries. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ else ++ # We preserve .a as extension for shared libraries through AIX4.2 ++ # and later when we are not doing run time linking. ++ library_names_spec='${libname}${release}.a $libname.a' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ fi ++ shlibpath_var=LIBPATH ++ fi ++ ;; ++ ++amigaos*) ++ case $host_cpu in ++ powerpc) ++ # Since July 2007 AmigaOS4 officially supports .so libraries. ++ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ ;; ++ m68k) ++ library_names_spec='$libname.ixlibrary $libname.a' ++ # Create ${libname}_ixlibrary.a entries in /sys/libs. ++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ++ ;; ++ esac ++ ;; ++ ++beos*) ++ library_names_spec='${libname}${shared_ext}' ++ dynamic_linker="$host_os ld.so" ++ shlibpath_var=LIBRARY_PATH ++ ;; ++ ++bsdi[[45]]*) ++ version_type=linux ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" ++ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" ++ # the default ld.so.conf also contains /usr/contrib/lib and ++ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow ++ # libtool to hard-code these into programs ++ ;; ++ ++cygwin* | mingw* | pw32* | cegcc*) ++ version_type=windows ++ shrext_cmds=".dll" ++ need_version=no ++ need_lib_prefix=no ++ ++ case $GCC,$host_os in ++ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) ++ library_names_spec='$libname.dll.a' ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename \${file}`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ ++ dldir=$destdir/`dirname \$dlpath`~ ++ test -d \$dldir || mkdir -p \$dldir~ ++ $install_prog $dir/$dlname \$dldir/$dlname~ ++ chmod a+x \$dldir/$dlname~ ++ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then ++ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; ++ fi' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ ++ dlpath=$dir/\$dldll~ ++ $RM \$dlpath' ++ shlibpath_overrides_runpath=yes ++ ++ case $host_os in ++ cygwin*) ++ # Cygwin DLLs use 'cyg' prefix rather than 'lib' ++ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ++ ;; ++ mingw* | cegcc*) ++ # MinGW DLLs use traditional 'lib' prefix ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then ++ # It is most probably a Windows format PATH printed by ++ # mingw gcc, but we are running on Cygwin. Gcc prints its search ++ # path with ; separators, and with drive letters. We can handle the ++ # drive letters (cygwin fileutils understands them), so leave them, ++ # especially as we might pass files found there to a mingw objdump, ++ # which wouldn't understand a cygwinified path. Ahh. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++ ;; ++ pw32*) ++ # pw32 DLLs use 'pw' prefix rather than 'lib' ++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++ ;; ++ esac ++ ;; ++ ++ *) ++ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' ++ ;; ++ esac ++ dynamic_linker='Win32 ld.exe' ++ # FIXME: first we should search . and the directory the executable is in ++ shlibpath_var=PATH ++ ;; ++ ++darwin* | rhapsody*) ++ dynamic_linker="$host_os dyld" ++ version_type=darwin ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' ++ soname_spec='${libname}${release}${major}$shared_ext' ++ shlibpath_overrides_runpath=yes ++ shlibpath_var=DYLD_LIBRARY_PATH ++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' ++m4_if([$1], [],[ ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) ++ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ++ ;; ++ ++dgux*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ ;; ++ ++freebsd1*) ++ dynamic_linker=no ++ ;; ++ ++freebsd* | dragonfly*) ++ # DragonFly does not have aout. When/if they implement a new ++ # versioning mechanism, adjust this. ++ if test -x /usr/bin/objformat; then ++ objformat=`/usr/bin/objformat` ++ else ++ case $host_os in ++ freebsd[[123]]*) objformat=aout ;; ++ *) objformat=elf ;; ++ esac ++ fi ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ need_version=no ++ need_lib_prefix=no ++ ;; ++ freebsd-*) ++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' ++ need_version=yes ++ ;; ++ esac ++ shlibpath_var=LD_LIBRARY_PATH ++ case $host_os in ++ freebsd2*) ++ shlibpath_overrides_runpath=yes ++ ;; ++ freebsd3.[[01]]* | freebsdelf3.[[01]]*) ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ ++ freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ *) # from 4.6 on, and DragonFly ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ esac ++ ;; ++ ++gnu*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ hardcode_into_libs=yes ++ ;; ++ ++hpux9* | hpux10* | hpux11*) ++ # Give a soname corresponding to the major version so that dld.sl refuses to ++ # link against other versions. ++ version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ case $host_cpu in ++ ia64*) ++ shrext_cmds='.so' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.so" ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ if test "X$HPUX_IA64_MODE" = X32; then ++ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" ++ else ++ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" ++ fi ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ hppa*64*) ++ shrext_cmds='.sl' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ *) ++ shrext_cmds='.sl' ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=SHLIB_PATH ++ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ ;; ++ esac ++ # HP-UX runs *really* slowly unless shared libraries are mode 555. ++ postinstall_cmds='chmod 555 $lib' ++ ;; ++ ++interix[[3-9]]*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ ++irix5* | irix6* | nonstopux*) ++ case $host_os in ++ nonstopux*) version_type=nonstopux ;; ++ *) ++ if test "$lt_cv_prog_gnu_ld" = yes; then ++ version_type=linux ++ else ++ version_type=irix ++ fi ;; ++ esac ++ need_lib_prefix=no ++ need_version=no ++ soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' ++ case $host_os in ++ irix5* | nonstopux*) ++ libsuff= shlibsuff= ++ ;; ++ *) ++ case $LD in # libtool.m4 will add one of these switches to LD ++ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") ++ libsuff= shlibsuff= libmagic=32-bit;; ++ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") ++ libsuff=32 shlibsuff=N32 libmagic=N32;; ++ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") ++ libsuff=64 shlibsuff=64 libmagic=64-bit;; ++ *) libsuff= shlibsuff= libmagic=never-match;; ++ esac ++ ;; ++ esac ++ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH ++ shlibpath_overrides_runpath=no ++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" ++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" ++ hardcode_into_libs=yes ++ ;; ++ ++# No shared lib support for Linux oldld, aout, or coff. ++linux*oldld* | linux*aout* | linux*coff*) ++ dynamic_linker=no ++ ;; ++ ++# This must be Linux ELF. ++linux* | k*bsd*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ # Some binutils ld are patched to set DT_RUNPATH ++ save_LDFLAGS=$LDFLAGS ++ save_libdir=$libdir ++ eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ ++ LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], ++ [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], ++ [shlibpath_overrides_runpath=yes])]) ++ LDFLAGS=$save_LDFLAGS ++ libdir=$save_libdir ++ ++ # This implies no fast_install, which is unacceptable. ++ # Some rework will be needed to allow for fast_install ++ # before this can be enabled. ++ hardcode_into_libs=yes ++ ++ # Append ld.so.conf contents to the search path ++ if test -f /etc/ld.so.conf; then ++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ fi ++ ++ # We used to test for /lib/ld.so.1 and disable shared libraries on ++ # powerpc, because MkLinux only supported shared libraries with the ++ # GNU dynamic linker. Since this was broken with cross compilers, ++ # most powerpc-linux boxes support dynamic linking these days and ++ # people can always --disable-shared, the test was removed, and we ++ # assume the GNU/Linux dynamic linker is in use. ++ dynamic_linker='GNU/Linux ld.so' ++ ;; ++ ++netbsd*) ++ version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++ dynamic_linker='NetBSD (a.out) ld.so' ++ else ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ dynamic_linker='NetBSD ld.elf_so' ++ fi ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ ++newsos6) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ ;; ++ ++*nto* | *qnx*) ++ version_type=qnx ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='ldqnx.so' ++ ;; ++ ++openbsd*) ++ version_type=sunos ++ sys_lib_dlsearch_path_spec="/usr/lib" ++ need_lib_prefix=no ++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. ++ case $host_os in ++ openbsd3.3 | openbsd3.3.*) need_version=yes ;; ++ *) need_version=no ;; ++ esac ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ case $host_os in ++ openbsd2.[[89]] | openbsd2.[[89]].*) ++ shlibpath_overrides_runpath=no ++ ;; ++ *) ++ shlibpath_overrides_runpath=yes ++ ;; ++ esac ++ else ++ shlibpath_overrides_runpath=yes ++ fi ++ ;; ++ ++os2*) ++ libname_spec='$name' ++ shrext_cmds=".dll" ++ need_lib_prefix=no ++ library_names_spec='$libname${shared_ext} $libname.a' ++ dynamic_linker='OS/2 ld.exe' ++ shlibpath_var=LIBPATH ++ ;; ++ ++osf3* | osf4* | osf5*) ++ version_type=osf ++ need_lib_prefix=no ++ need_version=no ++ soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" ++ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ++ ;; ++ ++rdos*) ++ dynamic_linker=no ++ ;; ++ ++solaris*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ # ldd complains unless libraries are executable ++ postinstall_cmds='chmod +x $lib' ++ ;; ++ ++sunos4*) ++ version_type=sunos ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ if test "$with_gnu_ld" = yes; then ++ need_lib_prefix=no ++ fi ++ need_version=yes ++ ;; ++ ++sysv4 | sysv4.3*) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ case $host_vendor in ++ sni) ++ shlibpath_overrides_runpath=no ++ need_lib_prefix=no ++ runpath_var=LD_RUN_PATH ++ ;; ++ siemens) ++ need_lib_prefix=no ++ ;; ++ motorola) ++ need_lib_prefix=no ++ need_version=no ++ shlibpath_overrides_runpath=no ++ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' ++ ;; ++ esac ++ ;; ++ ++sysv4*MP*) ++ if test -d /usr/nec ;then ++ version_type=linux ++ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' ++ soname_spec='$libname${shared_ext}.$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ fi ++ ;; ++ ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++ version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ if test "$with_gnu_ld" = yes; then ++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' ++ else ++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' ++ case $host_os in ++ sco3.2v5*) ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" ++ ;; ++ esac ++ fi ++ sys_lib_dlsearch_path_spec='/usr/lib' ++ ;; ++ ++tpf*) ++ # TPF is a cross-target only. Preferred cross-host = GNU/Linux. ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ ++uts4*) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ ;; ++ ++*) ++ dynamic_linker=no ++ ;; ++esac ++AC_MSG_RESULT([$dynamic_linker]) ++test "$dynamic_linker" = no && can_build_shared=no ++ ++variables_saved_for_relink="PATH $shlibpath_var $runpath_var" ++if test "$GCC" = yes; then ++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" ++fi ++ ++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then ++ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++fi ++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then ++ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++fi ++ ++_LT_DECL([], [variables_saved_for_relink], [1], ++ [Variables whose values should be saved in libtool wrapper scripts and ++ restored at link time]) ++_LT_DECL([], [need_lib_prefix], [0], ++ [Do we need the "lib" prefix for modules?]) ++_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) ++_LT_DECL([], [version_type], [0], [Library versioning type]) ++_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) ++_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) ++_LT_DECL([], [shlibpath_overrides_runpath], [0], ++ [Is shlibpath searched before the hard-coded library search path?]) ++_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) ++_LT_DECL([], [library_names_spec], [1], ++ [[List of archive names. First name is the real one, the rest are links. ++ The last name is the one that the linker finds with -lNAME]]) ++_LT_DECL([], [soname_spec], [1], ++ [[The coded name of the library, if different from the real name]]) ++_LT_DECL([], [postinstall_cmds], [2], ++ [Command to use after installation of a shared archive]) ++_LT_DECL([], [postuninstall_cmds], [2], ++ [Command to use after uninstallation of a shared archive]) ++_LT_DECL([], [finish_cmds], [2], ++ [Commands used to finish a libtool library installation in a directory]) ++_LT_DECL([], [finish_eval], [1], ++ [[As "finish_cmds", except a single script fragment to be evaled but ++ not shown]]) ++_LT_DECL([], [hardcode_into_libs], [0], ++ [Whether we should hardcode library paths into libraries]) ++_LT_DECL([], [sys_lib_search_path_spec], [2], ++ [Compile-time system search path for libraries]) ++_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], ++ [Run-time system search path for libraries]) ++])# _LT_SYS_DYNAMIC_LINKER ++ ++ ++# _LT_PATH_TOOL_PREFIX(TOOL) ++# -------------------------- ++# find a file program which can recognize shared library ++AC_DEFUN([_LT_PATH_TOOL_PREFIX], ++[m4_require([_LT_DECL_EGREP])dnl ++AC_MSG_CHECKING([for $1]) ++AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, ++[case $MAGIC_CMD in ++[[\\/*] | ?:[\\/]*]) ++ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. ++ ;; ++*) ++ lt_save_MAGIC_CMD="$MAGIC_CMD" ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++dnl $ac_dummy forces splitting on constant user-supplied paths. ++dnl POSIX.2 word splitting is done only on the output of word expansions, ++dnl not every word. This closes a longstanding sh security hole. ++ ac_dummy="m4_if([$2], , $PATH, [$2])" ++ for ac_dir in $ac_dummy; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$1; then ++ lt_cv_path_MAGIC_CMD="$ac_dir/$1" ++ if test -n "$file_magic_test_file"; then ++ case $deplibs_check_method in ++ "file_magic "*) ++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` ++ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | ++ $EGREP "$file_magic_regex" > /dev/null; then ++ : ++ else ++ cat <<_LT_EOF 1>&2 ++ ++*** Warning: the command libtool uses to detect shared libraries, ++*** $file_magic_cmd, produces output that libtool cannot recognize. ++*** The result is that libtool may fail to recognize shared libraries ++*** as such. This will affect the creation of libtool libraries that ++*** depend on shared libraries, but programs linked with such libtool ++*** libraries will work regardless of this problem. Nevertheless, you ++*** may want to report the problem to your system manager and/or to ++*** bug-libtool at gnu.org ++ ++_LT_EOF ++ fi ;; ++ esac ++ fi ++ break ++ fi ++ done ++ IFS="$lt_save_ifs" ++ MAGIC_CMD="$lt_save_MAGIC_CMD" ++ ;; ++esac]) ++MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++if test -n "$MAGIC_CMD"; then ++ AC_MSG_RESULT($MAGIC_CMD) ++else ++ AC_MSG_RESULT(no) ++fi ++_LT_DECL([], [MAGIC_CMD], [0], ++ [Used to examine libraries when file_magic_cmd begins with "file"])dnl ++])# _LT_PATH_TOOL_PREFIX ++ ++# Old name: ++AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) ++ ++ ++# _LT_PATH_MAGIC ++# -------------- ++# find a file program which can recognize a shared library ++m4_defun([_LT_PATH_MAGIC], ++[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) @@ 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 wahwah at users.sourceforge.net Fri Nov 27 21:26:39 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 27 Nov 2009 20:26:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[7489] csw/mgar/pkg/gnome-terminal Message-ID: Revision: 7489 http://gar.svn.sourceforge.net/gar/?rev=7489&view=rev Author: wahwah Date: 2009-11-27 20:26:39 +0000 (Fri, 27 Nov 2009) Log Message: ----------- gnome-terminal: a first sketch of a build file. vte needs upgrading. Modified Paths: -------------- csw/mgar/pkg/gnome-terminal/trunk/Makefile csw/mgar/pkg/gnome-terminal/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gnome-terminal/trunk/ Modified: csw/mgar/pkg/gnome-terminal/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-11-24 16:29:40 UTC (rev 7407) +++ csw/mgar/pkg/gnome-terminal/trunk/Makefile 2009-11-27 20:26:39 UTC (rev 7489) @@ -2,184 +2,33 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = gnome-terminal +GT_MAJOR_VERSION = 2 +GT_MINOR_VERSION = 22 +GT_PATCHLEVEL = 1 +GARVERSION = $(GT_MAJOR_VERSION).$(GT_MINOR_VERSION).$(GT_PATCHLEVEL) +CATEGORIES = gnome +DESCRIPTION = A terminal emulator, part of GNOME 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). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_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. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. +SPKG_SOURCEURL = http://www.gnome.org/ +MASTER_SITES = http://ftp.heanet.ie/pub/ftp.gnome.org/sources/gnome-terminal/$(GT_MAJOR_VERSION).$(GT_MINOR_VERSION)/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWlibxft2devel +TEST_SCRIPTS = 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 +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +MSGFMT= /opt/csw/bin/gmsgfmt +MSGMERGE= /opt/csw/bin/gmsgmerge +XGETTEXT = /opt/csw/bin/gxgettext +GETTEXT = /opt/csw/bin/ggettext +export MSGMERGE +export MSGFMT +export XGETTEXT +export GETTEXT + +include gar/category.mk + +# TODO: Update CSWvte Modified: csw/mgar/pkg/gnome-terminal/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-11-24 16:29:40 UTC (rev 7407) +++ csw/mgar/pkg/gnome-terminal/trunk/checksums 2009-11-27 20:26:39 UTC (rev 7489) @@ -0,0 +1 @@ +0e6c71def04b2a56e8d6725cef7950b4 gnome-terminal-2.22.1.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 Sat Nov 28 01:55:41 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 28 Nov 2009 00:55:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[7490] csw/mgar/pkg/gnulinks/trunk/Makefile Message-ID: Revision: 7490 http://gar.svn.sourceforge.net/gar/?rev=7490&view=rev Author: bdwalton Date: 2009-11-28 00:55:41 +0000 (Sat, 28 Nov 2009) Log Message: ----------- gnulinks: make creating an updated prototype sane; no longer include links from {sh,text,file}utils Modified Paths: -------------- csw/mgar/pkg/gnulinks/trunk/Makefile Modified: csw/mgar/pkg/gnulinks/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnulinks/trunk/Makefile 2009-11-27 20:26:39 UTC (rev 7489) +++ csw/mgar/pkg/gnulinks/trunk/Makefile 2009-11-28 00:55:41 UTC (rev 7490) @@ -2,6 +2,10 @@ GARVERSION = 1.2 CATEGORIES = xtra +GLINKPKGS = CSWdiffutils CSWggettext CSWggettextrt CSWbison CSWbinutils +GLINKPKGS += CSWggrep CSWgawk CSWgsed CSWggetopt CSWfindutils +PREREQUISITE_PKGS = $(GLINKPKGS) CSWpkgutil + SPKG_SOURCEURL = No Source DESCRIPTION = Creates native symlinks for GNU tools in /opt/csw/gnu @@ -20,7 +24,18 @@ include gar/category.mk + + newproto: - @/bin/ls -1 /opt/csw/bin/g* | pkgproto | \ - perl -plne 's,bin/g([\w\d-]+) 0755 root bin,gnu/$$1=../bin/g$$1 ? ? ?,' \ - > $(FILEDIR)/CSWgnulinks.prototype + @echo Generating new prototype... + @( { echo /opt/csw/gnu; \ + for p in $(GLINKPKGS); do \ + pkgutil -L $$p | grep /opt/csw/bin/g; \ + done } | \ + pkgproto | \ + perl -plne 's,f none /opt/csw/bin/g([\w\d-\+\.]+) 0755 root bin,s none /opt/csw/gnu/$$1=../bin/g$$1,' | \ + grep -v "^l " | sort > $(FILEDIR)/CSWgnulinks.prototype.new ) + @echo Installing new prototype. + @mv $(FILEDIR)/CSWgnulinks.prototype.new \ + $(FILEDIR)/CSWgnulinks.prototype + @$(MAKE) makesums 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 Nov 28 01:59:12 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 28 Nov 2009 00:59:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7491] csw/mgar/pkg/gnulinks/trunk/ Message-ID: Revision: 7491 http://gar.svn.sourceforge.net/gar/?rev=7491&view=rev Author: bdwalton Date: 2009-11-28 00:59:12 +0000 (Sat, 28 Nov 2009) Log Message: ----------- gnulinks: update ignore list so files that pkgutil creates are not worried about Property Changed: ---------------- csw/mgar/pkg/gnulinks/trunk/ Property changes on: csw/mgar/pkg/gnulinks/trunk ___________________________________________________________________ Modified: svn:ignore - cookies download work + catalog.* descriptions.* work cookies packages download 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 Nov 28 02:10:38 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 28 Nov 2009 01:10:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[7492] csw/mgar/pkg/gnulinks/trunk/Makefile Message-ID: Revision: 7492 http://gar.svn.sourceforge.net/gar/?rev=7492&view=rev Author: bdwalton Date: 2009-11-28 01:10:38 +0000 (Sat, 28 Nov 2009) Log Message: ----------- gnulinks: add other packages that were linked, readd *util packages for now to achieve historical parity Modified Paths: -------------- csw/mgar/pkg/gnulinks/trunk/Makefile Modified: csw/mgar/pkg/gnulinks/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnulinks/trunk/Makefile 2009-11-28 00:59:12 UTC (rev 7491) +++ csw/mgar/pkg/gnulinks/trunk/Makefile 2009-11-28 01:10:38 UTC (rev 7492) @@ -4,6 +4,8 @@ GLINKPKGS = CSWdiffutils CSWggettext CSWggettextrt CSWbison CSWbinutils GLINKPKGS += CSWggrep CSWgawk CSWgsed CSWggetopt CSWfindutils +GLINKPKGS += CSWgmake CSWgpatch CSWgm4 CSWgwhois CSWgtar +GLINKPKGS += CSWshutils CSWgfile CSWtextutils PREREQUISITE_PKGS = $(GLINKPKGS) CSWpkgutil SPKG_SOURCEURL = No Source 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 Nov 28 02:13:06 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 28 Nov 2009 01:13:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7493] csw/mgar/pkg/gnulinks/trunk/Makefile Message-ID: Revision: 7493 http://gar.svn.sourceforge.net/gar/?rev=7493&view=rev Author: bdwalton Date: 2009-11-28 01:13:06 +0000 (Sat, 28 Nov 2009) Log Message: ----------- gnulinks: tweak prototype generation rule to allow gsu to be captured properly Modified Paths: -------------- csw/mgar/pkg/gnulinks/trunk/Makefile Modified: csw/mgar/pkg/gnulinks/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnulinks/trunk/Makefile 2009-11-28 01:10:38 UTC (rev 7492) +++ csw/mgar/pkg/gnulinks/trunk/Makefile 2009-11-28 01:13:06 UTC (rev 7493) @@ -35,7 +35,7 @@ pkgutil -L $$p | grep /opt/csw/bin/g; \ done } | \ pkgproto | \ - perl -plne 's,f none /opt/csw/bin/g([\w\d-\+\.]+) 0755 root bin,s none /opt/csw/gnu/$$1=../bin/g$$1,' | \ + perl -plne 's,f none /opt/csw/bin/g([\w\d-\+\.]+) (45|07)55 root bin,s none /opt/csw/gnu/$$1=../bin/g$$1,' | \ grep -v "^l " | sort > $(FILEDIR)/CSWgnulinks.prototype.new ) @echo Installing new prototype. @mv $(FILEDIR)/CSWgnulinks.prototype.new \ 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 Nov 28 02:21:23 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 28 Nov 2009 01:21:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7494] csw/mgar/pkg/gnulinks/trunk Message-ID: Revision: 7494 http://gar.svn.sourceforge.net/gar/?rev=7494&view=rev Author: bdwalton Date: 2009-11-28 01:21:23 +0000 (Sat, 28 Nov 2009) Log Message: ----------- gnulinks: updated prototype with new dynamic generation Modified Paths: -------------- csw/mgar/pkg/gnulinks/trunk/checksums csw/mgar/pkg/gnulinks/trunk/files/CSWgnulinks.prototype Modified: csw/mgar/pkg/gnulinks/trunk/checksums =================================================================== --- csw/mgar/pkg/gnulinks/trunk/checksums 2009-11-28 01:13:06 UTC (rev 7493) +++ csw/mgar/pkg/gnulinks/trunk/checksums 2009-11-28 01:21:23 UTC (rev 7494) @@ -1,2 +1,2 @@ -28514c1726839b6e47728d188d2a1edd download/CSWgnulinks.gspec -0f630eb8dae8b4c155c10c95383822f6 download/CSWgnulinks.prototype +28514c1726839b6e47728d188d2a1edd CSWgnulinks.gspec +5d3b905f55423ae4f8b034171238a26a CSWgnulinks.prototype Modified: csw/mgar/pkg/gnulinks/trunk/files/CSWgnulinks.prototype =================================================================== --- csw/mgar/pkg/gnulinks/trunk/files/CSWgnulinks.prototype 2009-11-28 01:13:06 UTC (rev 7493) +++ csw/mgar/pkg/gnulinks/trunk/files/CSWgnulinks.prototype 2009-11-28 01:21:23 UTC (rev 7494) @@ -13,7 +13,6 @@ s none /opt/csw/gnu/chroot=../bin/gchroot s none /opt/csw/gnu/cksum=../bin/gcksum s none /opt/csw/gnu/cmp=../bin/gcmp -s none /opt/csw/gnu/cnmz=../bin/gcnmz s none /opt/csw/gnu/comm=../bin/gcomm s none /opt/csw/gnu/cp=../bin/gcp s none /opt/csw/gnu/csplit=../bin/gcsplit @@ -40,6 +39,7 @@ s none /opt/csw/gnu/fmt=../bin/gfmt s none /opt/csw/gnu/fold=../bin/gfold s none /opt/csw/gnu/getopt=../bin/ggetopt +s none /opt/csw/gnu/gettext.sh=../bin/ggettext.sh s none /opt/csw/gnu/gettext=../bin/ggettext s none /opt/csw/gnu/gettextize=../bin/ggettextize s none /opt/csw/gnu/gprof=../bin/ggprof @@ -97,6 +97,7 @@ s none /opt/csw/gnu/pwd=../bin/gpwd s none /opt/csw/gnu/ranlib=../bin/granlib s none /opt/csw/gnu/readelf=../bin/greadelf +s none /opt/csw/gnu/recode-sr-latin=../bin/grecode-sr-latin s none /opt/csw/gnu/rm=../bin/grm s none /opt/csw/gnu/rmdir=../bin/grmdir s none /opt/csw/gnu/sdiff=../bin/gsdiff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Nov 28 09:15:58 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 28 Nov 2009 08:15:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7495] csw/mgar/pkg/a52dec/trunk/Makefile Message-ID: Revision: 7495 http://gar.svn.sourceforge.net/gar/?rev=7495&view=rev Author: dmichelsen Date: 2009-11-28 08:15:58 +0000 (Sat, 28 Nov 2009) Log Message: ----------- a52dec: Fix catalog name Modified Paths: -------------- csw/mgar/pkg/a52dec/trunk/Makefile Modified: csw/mgar/pkg/a52dec/trunk/Makefile =================================================================== --- csw/mgar/pkg/a52dec/trunk/Makefile 2009-11-28 01:21:23 UTC (rev 7494) +++ csw/mgar/pkg/a52dec/trunk/Makefile 2009-11-28 08:15:58 UTC (rev 7495) @@ -18,7 +18,7 @@ UFILES_REGEX = (\d+(?:\.\d+)*) PACKAGES = CSWliba52 -CATALOGNAME = a52dec +CATALOGNAME = CSWliba52 REQUIRED_PKGS = CSWsunmath EXTRA_LINKER_FLAGS = -lsunmath This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Nov 28 09:18:26 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 28 Nov 2009 08:18:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[7496] csw/mgar/pkg/a52dec/trunk/Makefile Message-ID: Revision: 7496 http://gar.svn.sourceforge.net/gar/?rev=7496&view=rev Author: dmichelsen Date: 2009-11-28 08:18:25 +0000 (Sat, 28 Nov 2009) Log Message: ----------- a52dec: Fix catalog name Modified Paths: -------------- csw/mgar/pkg/a52dec/trunk/Makefile Modified: csw/mgar/pkg/a52dec/trunk/Makefile =================================================================== --- csw/mgar/pkg/a52dec/trunk/Makefile 2009-11-28 08:15:58 UTC (rev 7495) +++ csw/mgar/pkg/a52dec/trunk/Makefile 2009-11-28 08:18:25 UTC (rev 7496) @@ -18,7 +18,7 @@ UFILES_REGEX = (\d+(?:\.\d+)*) PACKAGES = CSWliba52 -CATALOGNAME = CSWliba52 +CATALOGNAME = liba52 REQUIRED_PKGS = CSWsunmath EXTRA_LINKER_FLAGS = -lsunmath 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 Nov 28 10:30:46 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 28 Nov 2009 09:30:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7497] csw/mgar/pkg/chromium/trunk/files/ xml_dom_minidom_test.py Message-ID: Revision: 7497 http://gar.svn.sourceforge.net/gar/?rev=7497&view=rev Author: wahwah Date: 2009-11-28 09:30:46 +0000 (Sat, 28 Nov 2009) Log Message: ----------- chromium: xml_dom_minidom_test.py -- why does it fail? Added Paths: ----------- csw/mgar/pkg/chromium/trunk/files/xml_dom_minidom_test.py Added: csw/mgar/pkg/chromium/trunk/files/xml_dom_minidom_test.py =================================================================== --- csw/mgar/pkg/chromium/trunk/files/xml_dom_minidom_test.py (rev 0) +++ csw/mgar/pkg/chromium/trunk/files/xml_dom_minidom_test.py 2009-11-28 09:30:46 UTC (rev 7497) @@ -0,0 +1,76 @@ +#!/usr/bin/env python +# coding=utf-8 + +"""There was this problem: + + +Traceback (most recent call last): + File "/export/home/blizinski/opencsw/pkg/chromium/trunk/work/build-isa-i386/depot_tools/gclient.py", line 1183, in + result = Main(sys.argv) + File "/export/home/blizinski/opencsw/pkg/chromium/trunk/work/build-isa-i386/depot_tools/gclient.py", line 1178, in Main + return DispatchCommand(command, options, args) + File "/export/home/blizinski/opencsw/pkg/chromium/trunk/work/build-isa-i386/depot_tools/gclient.py", line 1103, in DispatchCommand + return command_map[command](options, args) + File "/export/home/blizinski/opencsw/pkg/chromium/trunk/work/build-isa-i386/depot_tools/gclient.py", line 1020, in DoUpdate + return client.RunOnDeps('update', args) + File "/export/home/blizinski/opencsw/pkg/chromium/trunk/work/build-isa-i386/depot_tools/gclient.py", line 701, in RunOnDeps + scm.RunCommand(command, self._options, args, file_list) + File "/export/home/blizinski/opencsw/pkg/chromium/trunk/work/build-isa-i386/depot_tools/gclient_scm.py", line 79, in RunCommand + return getattr(self, command)(options, args, file_list) + File "/export/home/blizinski/opencsw/pkg/chromium/trunk/work/build-isa-i386/depot_tools/gclient_scm.py", line 275, in update + from_info = self.CaptureInfo(os.path.join(checkout_path, '.'), '.') + File "/export/home/blizinski/opencsw/pkg/chromium/trunk/work/build-isa-i386/depot_tools/scm.py", line 244, in CaptureInfo + dom = gclient_utils.ParseXML(output) + File "/export/home/blizinski/opencsw/pkg/chromium/trunk/work/build-isa-i386/depot_tools/gclient_utils.py", line 43, in ParseXML + return xml.dom.minidom.parseString(output) + File "/opt/csw/lib/python/site-packages/_xmlplus/dom/minidom.py", line 1925, in parseString + return expatbuilder.parseString(string) + File "/opt/csw/lib/python/site-packages/_xmlplus/dom/expatbuilder.py", line 942, in parseString + return builder.parseString(string) + File "/opt/csw/lib/python/site-packages/_xmlplus/dom/expatbuilder.py", line 223, in parseString + parser.Parse(string, True) + File "/opt/csw/lib/python/site-packages/_xmlplus/dom/expatbuilder.py", line 813, in end_element_handler + "element stack messed up - bad nodeName" +AssertionError: element stack messed up - bad nodeName +gmake[1]: *** [gclient-sync] Error 1 +gmake[1]: Leaving directory `/export/home/blizinski/opencsw/pkg/chromium/trunk' +gmake: *** [build-isa-i386] Error 2 +""" + +__author__ = 'Maciej Blizi?ski (blizinski at google.com)' + +import unittest + +XML_1 = """ + + +http://google-breakpad.googlecode.com/svn/trunk/src + +http://google-breakpad.googlecode.com/svn +4c0a9323-5329-0410-9bdc-e9ce6186880e + + +normal +infinity + + +nealsid +2009-11-18T13:59:01.095147Z + + +""" + +import xml.dom.minidom + +class XmlTest(unittest.TestCase): + + def testParseString(self): + result = xml.dom.minidom.parseString(XML_1) + + +if __name__ == '__main__': + unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Nov 28 16:59:39 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 28 Nov 2009 15:59:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[7498] csw/mgar/pkg/nss/trunk Message-ID: Revision: 7498 http://gar.svn.sourceforge.net/gar/?rev=7498&view=rev Author: wahwah Date: 2009-11-28 15:59:39 +0000 (Sat, 28 Nov 2009) Log Message: ----------- nss: Merged changes based on Wan-Teh Chang's comments. Modified Paths: -------------- csw/mgar/pkg/nss/trunk/Makefile csw/mgar/pkg/nss/trunk/checksums Added Paths: ----------- csw/mgar/pkg/nss/trunk/files/include.patch csw/mgar/pkg/nss/trunk/files/ld-options.patch csw/mgar/pkg/nss/trunk/files/nss.pc csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3-64.patch csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3.patch csw/mgar/pkg/nss/trunk/files/sqlite3-32.patch csw/mgar/pkg/nss/trunk/files/sqlite3-64.patch csw/mgar/pkg/nss/trunk/files/whoami.patch Removed Paths: ------------- csw/mgar/pkg/nss/trunk/files/csw-include.patch csw/mgar/pkg/nss/trunk/files/gln.patch csw/mgar/pkg/nss/trunk/files/nss-3.12.4-gentoo-fixups-1.diff csw/mgar/pkg/nss/trunk/files/nss-3.12.4.patch csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3.patch csw/mgar/pkg/nss/trunk/files/platlibs-sunos.patch csw/mgar/pkg/nss/trunk/files/runtime-search-path.patch csw/mgar/pkg/nss/trunk/files/shared-libs.patch csw/mgar/pkg/nss/trunk/files/sign-under-dbx.patch csw/mgar/pkg/nss/trunk/files/whoami.patch Property Changed: ---------------- csw/mgar/pkg/nss/trunk/ Property changes on: csw/mgar/pkg/nss/trunk ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/pkg/nss/branches/upstream-work:7389-7497 Modified: csw/mgar/pkg/nss/trunk/Makefile =================================================================== --- csw/mgar/pkg/nss/trunk/Makefile 2009-11-28 09:30:46 UTC (rev 7497) +++ csw/mgar/pkg/nss/trunk/Makefile 2009-11-28 15:59:39 UTC (rev 7498) @@ -1,145 +1,171 @@ # Copyright 2009 OpenCSW # Distributed under the terms of the GNU General Public License v2 # $Id$ - - +# # Based on the following resources: # - http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/nss-3.12.4-r1.ebuild?view=markup # - https://developer.mozilla.org/en/NSS_reference/Building_and_installing_NSS/Build_instructions # - https://developer.mozilla.org/en/NSS_reference/NSS_environment_variables # - https://developer.mozilla.org/en/NSS_reference/Building_and_installing_NSS/Installation_guide +# +# A discussion: +# - https://groups.google.com/group/mozilla.dev.tech.crypto/browse_thread/thread/709646e32fc4fad0# +# +# TODO: nss-config +# TODO: a better nss.pc -# Debugging mode, this is work in progress. -GARFLAVOR = DBG +# For DBG builds +PATCHFILES = whoami.patch +# I'll let Wan-Teh decide what and where to patch +PATCHFILES += include.patch +PATCHFILES += ld-options.patch +PATCHFILES += platlibs-sqlite3.patch +PATCHFILES_isa-sparcv8 = sqlite3-32.patch +PATCHFILES_isa-i386 = sqlite3-32.patch +PATCHFILES_isa-sparcv9 = sqlite3-64.patch +PATCHFILES_isa-sparcv9 += platlibs-sqlite3-64.patch +PATCHFILES_isa-amd64 = sqlite3-64.patch +PATCHFILES_isa-amd64 += platlibs-sqlite3-64.patch + + GARNAME = nss MAJOR_VERSION = 3 MINOR_VERSION = 12 -PATCHLEVEL = 4 +PATCHLEVEL = 4 GARVERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(PATCHLEVEL) CATEGORIES = lib DESCRIPTION = Network Security Services library, implements PKI support define BLURB + Network Security Services (NSS) is a set of libraries designed to support + cross-platform development of security-enabled client and server + applications. Applications built with NSS can support SSL v2 and v3, TLS, + PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and + other security standards. endef SPKG_SOURCEURL = http://www.mozilla.org/projects/security/pki/nss/ # TODO: Generate RTM_NAME from GARVERSION RTM_NAME = NSS_3_12_4_RTM -MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/ -# This patch taken from http://bugs.gentoo.org/show_bug.cgi?id=256102 -PATCHFILES = nss-3.12.4.patch -PATCHFILES += shared-libs.patch -PATCHFILES += platlibs-sqlite3.patch -PATCHFILES += platlibs-sunos.patch -PATCHFILES += whoami.patch -PATCHFILES += runtime-search-path.patch -PATCHFILES += nss-3.12.4-gentoo-fixups-1.diff -PATCHFILES += csw-include.patch -PATCHFILES += gln.patch -DIST_SUFFIX = -with-nspr-4.8 -DISTFILES = $(GARNAME)-$(GARVERSION)$(DIST_SUFFIX).tar.gz -DISTNAME = $(GARNAME)-$(GARVERSION)$(DIST_SUFFIX) -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)$(DIST_SUFFIX).tar.gz -REQUIRED_PKGS = CSWnspr CSWsqlite3 +MASTER_SITES = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +REQUIRED_PKGS = CSWnspr CSWsqlite3rt PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWsqlite3devel -CONFIGURE_SCRIPTS = nss +CONFIGURE_SCRIPTS = BUILD_SCRIPTS = nss INSTALL_SCRIPTS = nss TEST_SCRIPTS = BUILD64 = 1 +EXTRA_INC = $(prefix)/include -install_libdir = $(prefix)/lib/nss +libdir_install = $(prefix)/lib includedir = $(prefix)/include/nss -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -ifeq (OPT,$(GARFLAVOR)) +ifneq (DBG,$(GARFLAVOR)) BUILD_OPT = 1 + export BUILD_OPT endif -NSS_USE_SYSTEM_SQLITE = 1 + +# NSPR is installed in /opt/csw/lib/nspr, nspr.pc is in /opt/csw/lib/pkgconfig NSPR_INCLUDE_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --cflags-only-I nspr | gsed 's/-I//') -NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ') -USE_SYSTEM_ZLIB = 1 -ZLIB_LIBS = -lz -NSDISTMODE = copy +export NSPR_INCLUDE_DIR + NSS_ENABLE_ECC = 1 -XCFLAGS = $(CFLAGS) -LDOPTS = $(LD_OPTIONS) +export NSS_ENABLE_ECC + +# To avoid creating /opt/csw/lib/libsqlite3.so (already exists) +NSS_USE_SYSTEM_SQLITE = 1 +export NSS_USE_SYSTEM_SQLITE + +# 64-bit suppport ifeq ($(MODULATION),isa-sparcv9) USE_64 = 1 export USE_64 -endif + NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ')/64 +else ifeq ($(MODULATION),isa-amd64) USE_64 = 1 export USE_64 + NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ')/64 +else + NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ') endif -export BUILD_OPT NSS_USE_SYSTEM_SQLITE NSPR_INCLUDE_DIR NSPR_LIB_DIR -export USE_SYSTEM_ZLIB ZLIB_LIBS NSDISTMODE NSS_ENABLE_ECC XCFLAGS +endif +export NSPR_LIB_DIR +# Based on: +# http://mxr.mozilla.org/security/source/security/nss/pkg/solaris/SUNWtlsu/prototype_com +NSS_BINARIES = addbuiltin +NSS_BINARIES += certutil +NSS_BINARIES += cmsutil +NSS_BINARIES += crlutil +NSS_BINARIES += modutil +NSS_BINARIES += pk12util +NSS_BINARIES += signtool +NSS_BINARIES += signver +NSS_BINARIES += ssltap + include gar/category.mk -configure-nss: respect-ldflags add-runtime-search-path +build-nss: build-coreconf build-dbm build-nss-compile @$(MAKECOOKIE) -respect-ldflags: - (cd $(WORKSRC)/mozilla/security/coreconf \ - && \ - gsed -i -e 's:SOURCE_PREFIX = $$(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $$(CORE_DEPTH)/dist:' \ - source.mk \ - && \ - gsed -i -e 's/\$$(MKSHLIB) -o/\$$(MKSHLIB) \$$(LDFLAGS) -o/g' rules.mk) - @$(MAKECOOKIE) - -add-runtime-search-path: - # Make sure that the runtime search path is added in all Makefiles. - gfind $(WORKSRC) \( -name Makefile -o -name '*.mk' \) \ - -exec gsed -i -e 's|-L\$$(NSPR_LIB_DIR)|-L$$(NSPR_LIB_DIR) -R$$(NSPR_LIB_DIR)/$$$$ISALIST|' \ - {} \; - # A form of assert - gegrep -- '-R.*ISALIST' $(WORKSRC)/mozilla/security/nss/lib/freebl/config.mk - @$(MAKECOOKIE) - -build-nss: build-coreconf build-dbm build-nss-compile - build-coreconf: (cd $(WORKSRC)/mozilla/security/coreconf \ && \ - $(BUILD_ENV) \ - && \ - gmake -j1 CC="$(CC)") + CPPFLAGS='$(CPPFLAGS)' LD_OPTIONS='$(LD_OPTIONS)' \ + gmake -j1) @$(MAKECOOKIE) build-dbm: (cd $(WORKSRC)/mozilla/security/dbm \ && \ - $(BUILD_ENV) \ - && \ - gmake -j1 CC="$(CC)") + CPPFLAGS='$(CPPFLAGS)' LD_OPTIONS='$(LD_OPTIONS)' \ + gmake -j1) @$(MAKECOOKIE) +# There's an extra interpolation somehwere inside nss' build system, so $$$$ +# needs to be used instead of $$. build-nss-compile: (cd $(WORKSRC)/mozilla/security/nss \ && \ - $(BUILD_ENV) \ - && \ - gmake -j1 CC="$(CC)") + CPPFLAGS='$(CPPFLAGS)' LD_OPTIONS='$(LD_OPTIONS) -R/opt/csw/lib/$$$$ISALIST' \ + gmake -j1) @$(MAKECOOKIE) install-nss: ginstall -d -m 755 $(DESTDIR)$(libdir) - gcp -a $(WORKSRC)/mozilla/security/dist/*/lib/*.so $(DESTDIR)$(libdir) + for f in $(WORKSRC)/mozilla/dist/SunOS5*/lib/*.so; do \ + ginstall -m 755 $${f} $(DESTDIR)$(libdir); \ + if [ -r $(WORKSRC)/mozilla/dist/SunOS5*/lib/`basename $${f} .so`.chk ]; then \ + ginstall -m 644 \ + $(WORKSRC)/mozilla/dist/SunOS5*/lib/`basename $${f} .so`.chk \ + $(DESTDIR)$(libdir); \ + fi \ + done ginstall -d -m 755 $(DESTDIR)$(bindir) - gcp -a $(WORKSRC)/mozilla/security/dist/*/bin/nss-config $(DESTDIR)$(bindir) - ginstall -d -m 755 $(DESTDIR)/lib/pkgconfig + # TODO: nss-config + # gcp -a $(WORKSRC)/mozilla/dist/*/bin/nss-config $(DESTDIR)$(bindir) + ginstall -d -m 755 $(DESTDIR)$(includedir) + for f in \ + $(WORKSRC)/mozilla/dist/public/nss/*.h; \ + do \ + ginstall -m 644 $${f} $(DESTDIR)$(includedir); \ + done + for bin in $(NSS_BINARIES); do \ + ginstall -m 755 \ + $(WORKSRC)/mozilla/dist/*/bin/$${bin} \ + $(DESTDIR)$(bindir)/`basename $${file}`; \ + done + # Asserting that we have the right version in the .pc file + ggrep "Version: $(GARVERSION)" $(FILEDIR)/nss.pc \ + || ( \ + echo "Please adjust nss version in $(FILEDIR)/nss.pc" \ + && \ + false \ + ) + ginstall -d -m 755 $(DESTDIR)$(prefix)/lib/pkgconfig ginstall -m 644 \ - $(WORKSRC)/mozilla/security/dist/*/lib/pkgconfig/nss.pc \ - $(DESTDIR)/lib/pkgconfig - ginstall -d -m 755 $(DESTDIR)$(includedir) - gcp -a $(WORKSRC)/mozilla/security/dist/private/nss/*.h $(DESTDIR)$(includedir) - gcp -a $(WORKSRC)/mozilla/security/dist/public/nss/*.h $(DESTDIR)$(includedir) - (cd $(DESTDIR)$(libdir); for file in *.so; do \ - mv $${file} $$(file).$(MINOR_VERSION); \ - ln -s $${file}.$(MINOR_VERSION) $${file}; \ - done) - (for file in $(WORKSRC)/mozilla/security/dist/*/bin/*; do \ - ginstall -m 755 $${file} $(DESTDIR)$(bindir)/nss$$(basename $${file}); \ - done) + $(FILEDIR)/nss.pc \ + $(DESTDIR)$(prefix)/lib/pkgconfig @$(MAKECOOKIE) Modified: csw/mgar/pkg/nss/trunk/checksums =================================================================== --- csw/mgar/pkg/nss/trunk/checksums 2009-11-28 09:30:46 UTC (rev 7497) +++ csw/mgar/pkg/nss/trunk/checksums 2009-11-28 15:59:39 UTC (rev 7498) @@ -1,10 +1,8 @@ -a1ce38c03b142eb2bd54f1f111661e30 csw-include.patch -7116f8de3ac8b35104365c1b3fc6aea4 gln.patch -63476fb10c2d14f7e0585fe327ae9341 nss-3.12.4-gentoo-fixups-1.diff -8f76e381bf2339d731bfd5b8116c25a4 nss-3.12.4-with-nspr-4.8.tar.gz -39b9d2431d4ff717d103b742fcaefb81 nss-3.12.4.patch +4b2246d07092fe8b2f29a1a01e9bc821 include.patch +79083e118f3d885957910fc845844c1c ld-options.patch +1ee3ed9c1900079319bd1de51388d856 nss-3.12.4.tar.gz +bd8d96c42238c7cfd07ec1ba21191066 platlibs-sqlite3-64.patch f0f40bd021423ab1680b4d87cd19c1db platlibs-sqlite3.patch -441f12a9396a89841d384d8c89a052ff platlibs-sunos.patch -d41d8cd98f00b204e9800998ecf8427e runtime-search-path.patch -90b4d32437b3e3fdadcf4f16339aa2ed shared-libs.patch +cae46161d981e8aea822953b34339e60 sqlite3-32.patch +b07d3de42785866c3c4385846fd8eb52 sqlite3-64.patch 221646aa1954b4a255ac03e7d8b0225d whoami.patch Deleted: csw/mgar/pkg/nss/trunk/files/csw-include.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/csw-include.patch 2009-11-28 09:30:46 UTC (rev 7497) +++ csw/mgar/pkg/nss/trunk/files/csw-include.patch 2009-11-28 15:59:39 UTC (rev 7498) @@ -1,11 +0,0 @@ ---- nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/SunOS5.mk.orig 2009-11-23 02:33:18.896095984 +0100 -+++ nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/SunOS5.mk 2009-11-23 02:33:40.956347570 +0100 -@@ -104,7 +104,7 @@ - endif - endif - --INCLUDES += -I/usr/dt/include -I/usr/openwin/include -+INCLUDES += -I/usr/dt/include -I/usr/openwin/include -I/opt/csw/include - - RANLIB = echo - CPU_ARCH = sparc Deleted: csw/mgar/pkg/nss/trunk/files/gln.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/gln.patch 2009-11-28 09:30:46 UTC (rev 7497) +++ csw/mgar/pkg/nss/trunk/files/gln.patch 2009-11-28 15:59:39 UTC (rev 7498) @@ -1,35 +0,0 @@ ---- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/config/Makefile.orig 2009-11-23 02:38:13.942222659 +0100 -+++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/config/Makefile 2009-11-23 02:38:42.759423711 +0100 -@@ -13,7 +13,7 @@ - export: - # Create the nss.pc file - mkdir -p $(DIST)/lib/pkgconfig -- sed -e "s, at prefix@,$(PREFIX)," \ -+ gsed -e "s, at prefix@,$(PREFIX)," \ - -e "s, at exec_prefix@,\$${prefix}," \ - -e "s, at libdir@,\$${prefix}/gentoo/nss," \ - -e "s, at includedir@,\$${prefix}/include/nss," \ -@@ -21,18 +21,18 @@ - -e "s, at NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ - -e "s, at NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ - nss.pc.in > nss.pc -- chmod 0644 nss.pc -- ln -sf ../../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig -+ gchmod 0644 nss.pc -+ gln -sf ../../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig - - # Create the nss-config script - mkdir -p $(DIST)/bin -- sed -e "s, at prefix@,$(PREFIX)," \ -+ gsed -e "s, at prefix@,$(PREFIX)," \ - -e "s, at NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \ - -e "s, at NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ - -e "s, at NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ - nss-config.in > nss-config -- chmod 0755 nss-config -- ln -sf ../../../../security/nss/config/nss-config $(DIST)/bin -+ gchmod 0755 nss-config -+ gln -sf ../../../../security/nss/config/nss-config $(DIST)/bin - - libs: - Copied: csw/mgar/pkg/nss/trunk/files/include.patch (from rev 7497, csw/mgar/pkg/nss/branches/upstream-work/files/include.patch) =================================================================== --- csw/mgar/pkg/nss/trunk/files/include.patch (rev 0) +++ csw/mgar/pkg/nss/trunk/files/include.patch 2009-11-28 15:59:39 UTC (rev 7498) @@ -0,0 +1,11 @@ +--- a/mozilla/security/coreconf/SunOS5.mk.orig 2009-11-26 09:29:22.101030210 +0100 ++++ b/mozilla/security/coreconf/SunOS5.mk 2009-11-26 09:29:33.419484372 +0100 +@@ -104,7 +104,7 @@ + endif + endif + +-INCLUDES += -I/usr/dt/include -I/usr/openwin/include ++INCLUDES += -I/usr/dt/include -I/usr/openwin/include $(CPPFLAGS) + + RANLIB = echo + CPU_ARCH = sparc Copied: csw/mgar/pkg/nss/trunk/files/ld-options.patch (from rev 7497, csw/mgar/pkg/nss/branches/upstream-work/files/ld-options.patch) =================================================================== --- csw/mgar/pkg/nss/trunk/files/ld-options.patch (rev 0) +++ csw/mgar/pkg/nss/trunk/files/ld-options.patch 2009-11-28 15:59:39 UTC (rev 7498) @@ -0,0 +1,10 @@ +--- a/mozilla/security/coreconf/SunOS5.mk.orig 2009-11-26 11:52:54.279684353 +0100 ++++ b/mozilla/security/coreconf/SunOS5.mk 2009-11-26 11:53:05.767884648 +0100 +@@ -175,6 +175,6 @@ + RPATH = -R '$$ORIGIN:/usr/lib/mps/secv1:/usr/lib/mps' + endif + else +-RPATH = -R '$$ORIGIN' ++RPATH = $(LDFLAGS) $(LD_OPTIONS) + endif + Deleted: csw/mgar/pkg/nss/trunk/files/nss-3.12.4-gentoo-fixups-1.diff =================================================================== --- csw/mgar/pkg/nss/trunk/files/nss-3.12.4-gentoo-fixups-1.diff 2009-11-28 09:30:46 UTC (rev 7497) +++ csw/mgar/pkg/nss/trunk/files/nss-3.12.4-gentoo-fixups-1.diff 2009-11-28 15:59:39 UTC (rev 7498) @@ -1,245 +0,0 @@ -diff -urN nss-3.12.4-orig/mozilla/security/nss/config/Makefile nss-3.12.4/mozilla/security/nss/config/Makefile ---- nss-3.12.4-orig/mozilla/security/nss/config/Makefile 1969-12-31 18:00:00.000000000 -0600 -+++ nss-3.12.4/mozilla/security/nss/config/Makefile 2009-09-14 21:45:45.619639265 -0500 -@@ -0,0 +1,40 @@ -+CORE_DEPTH = ../.. -+DEPTH = ../.. -+ -+include $(CORE_DEPTH)/coreconf/config.mk -+ -+NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'` -+NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'` -+NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'` -+PREFIX = /usr -+ -+all: export libs -+ -+export: -+ # Create the nss.pc file -+ mkdir -p $(DIST)/lib/pkgconfig -+ sed -e "s, at prefix@,$(PREFIX)," \ -+ -e "s, at exec_prefix@,\$${prefix}," \ -+ -e "s, at libdir@,\$${prefix}/gentoo/nss," \ -+ -e "s, at includedir@,\$${prefix}/include/nss," \ -+ -e "s, at NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \ -+ -e "s, at NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ -+ -e "s, at NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ -+ nss.pc.in > nss.pc -+ chmod 0644 nss.pc -+ ln -sf ../../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig -+ -+ # Create the nss-config script -+ mkdir -p $(DIST)/bin -+ sed -e "s, at prefix@,$(PREFIX)," \ -+ -e "s, at NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \ -+ -e "s, at NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ -+ -e "s, at NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ -+ nss-config.in > nss-config -+ chmod 0755 nss-config -+ ln -sf ../../../../security/nss/config/nss-config $(DIST)/bin -+ -+libs: -+ -+dummy: all export libs -+ -diff -urN nss-3.12.4-orig/mozilla/security/nss/config/nss-config.in nss-3.12.4/mozilla/security/nss/config/nss-config.in ---- nss-3.12.4-orig/mozilla/security/nss/config/nss-config.in 1969-12-31 18:00:00.000000000 -0600 -+++ nss-3.12.4/mozilla/security/nss/config/nss-config.in 2009-09-14 21:47:45.190638078 -0500 -@@ -0,0 +1,145 @@ -+#!/bin/sh -+ -+prefix=@prefix@ -+ -+major_version=@NSS_MAJOR_VERSION@ -+minor_version=@NSS_MINOR_VERSION@ -+patch_version=@NSS_PATCH_VERSION@ -+ -+usage() -+{ -+ cat <&2 -+fi -+ -+lib_ssl=yes -+lib_smime=yes -+lib_nss=yes -+lib_nssutil=yes -+ -+while test $# -gt 0; do -+ case "$1" in -+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; -+ *) optarg= ;; -+ esac -+ -+ case $1 in -+ --prefix=*) -+ prefix=$optarg -+ ;; -+ --prefix) -+ echo_prefix=yes -+ ;; -+ --exec-prefix=*) -+ exec_prefix=$optarg -+ ;; -+ --exec-prefix) -+ echo_exec_prefix=yes -+ ;; -+ --includedir=*) -+ includedir=$optarg -+ ;; -+ --includedir) -+ echo_includedir=yes -+ ;; -+ --libdir=*) -+ libdir=$optarg -+ ;; -+ --libdir) -+ echo_libdir=yes -+ ;; -+ --version) -+ echo ${major_version}.${minor_version}.${patch_version} -+ ;; -+ --cflags) -+ echo_cflags=yes -+ ;; -+ --libs) -+ echo_libs=yes -+ ;; -+ ssl) -+ lib_ssl=yes -+ ;; -+ smime) -+ lib_smime=yes -+ ;; -+ nss) -+ lib_nss=yes -+ ;; -+ nssutil) -+ lib_nssutil=yes -+ ;; -+ *) -+ usage 1 1>&2 -+ ;; -+ esac -+ shift -+done -+ -+# Set variables that may be dependent upon other variables -+if test -z "$exec_prefix"; then -+ exec_prefix=`pkg-config --variable=exec_prefix nss` -+fi -+if test -z "$includedir"; then -+ includedir=`pkg-config --variable=includedir nss` -+fi -+if test -z "$libdir"; then -+ libdir=`pkg-config --variable=libdir nss` -+fi -+ -+if test "$echo_prefix" = "yes"; then -+ echo $prefix -+fi -+ -+if test "$echo_exec_prefix" = "yes"; then -+ echo $exec_prefix -+fi -+ -+if test "$echo_includedir" = "yes"; then -+ echo $includedir -+fi -+ -+if test "$echo_libdir" = "yes"; then -+ echo $libdir -+fi -+ -+if test "$echo_cflags" = "yes"; then -+ echo -I$includedir -+fi -+ -+if test "$echo_libs" = "yes"; then -+ libdirs="-Wl,-R$libdir -L$libdir" -+ if test -n "$lib_ssl"; then -+ libdirs="$libdirs -lssl${major_version}" -+ fi -+ if test -n "$lib_smime"; then -+ libdirs="$libdirs -lsmime${major_version}" -+ fi -+ if test -n "$lib_nss"; then -+ libdirs="$libdirs -lnss${major_version}" -+ fi -+ if test -n "$lib_nssutil"; then -+ libdirs="$libdirs -lnssutil${major_version}" -+ fi -+ echo $libdirs -+fi -+ -diff -urN nss-3.12.4-orig/mozilla/security/nss/config/nss.pc.in nss-3.12.4/mozilla/security/nss/config/nss.pc.in ---- nss-3.12.4-orig/mozilla/security/nss/config/nss.pc.in 1969-12-31 18:00:00.000000000 -0600 -+++ nss-3.12.4/mozilla/security/nss/config/nss.pc.in 2009-09-14 21:45:45.653637310 -0500 -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: NSS -+Description: Network Security Services -+Version: @NSS_MAJOR_VERSION at .@NSS_MINOR_VERSION at .@NSS_PATCH_VERSION@ -+Requires: nspr >= 4.8 -+Libs: -L${libdir} -lssl3 -lsmime3 -lnssutil3 -lnss3 -Wl,-R${libdir} -+Cflags: -I${includedir} -+ -diff -urN nss-3.12.4-orig/mozilla/security/nss/Makefile nss-3.12.4/mozilla/security/nss/Makefile ---- nss-3.12.4-orig/mozilla/security/nss/Makefile 2008-12-02 17:24:39.000000000 -0600 -+++ nss-3.12.4/mozilla/security/nss/Makefile 2009-09-14 21:45:45.678657145 -0500 -@@ -78,7 +78,7 @@ - # (7) Execute "local" rules. (OPTIONAL). # - ####################################################################### - --nss_build_all: build_coreconf build_nspr build_dbm all -+nss_build_all: build_coreconf build_dbm all - - nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber - -@@ -140,12 +140,6 @@ - --with-dist-prefix='$(NSPR_PREFIX)' \ - --with-dist-includedir='$(NSPR_PREFIX)/include' - --build_nspr: $(NSPR_CONFIG_STATUS) -- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE) -- --clobber_nspr: $(NSPR_CONFIG_STATUS) -- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE) clobber -- - build_dbm: - ifndef NSS_DISABLE_DBM - cd $(CORE_DEPTH)/dbm ; $(MAKE) export libs -diff -urN nss-3.12.4-orig/mozilla/security/nss/manifest.mn nss-3.12.4/mozilla/security/nss/manifest.mn ---- nss-3.12.4-orig/mozilla/security/nss/manifest.mn 2008-04-04 15:36:59.000000000 -0500 -+++ nss-3.12.4/mozilla/security/nss/manifest.mn 2009-09-14 21:45:45.703656167 -0500 -@@ -42,6 +42,6 @@ - - RELEASE = nss - --DIRS = lib cmd -+DIRS = lib cmd config - - Deleted: csw/mgar/pkg/nss/trunk/files/nss-3.12.4.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/nss-3.12.4.patch 2009-11-28 09:30:46 UTC (rev 7497) +++ csw/mgar/pkg/nss/trunk/files/nss-3.12.4.patch 2009-11-28 15:59:39 UTC (rev 7498) @@ -1,141 +0,0 @@ ---- mozilla/security/nss/lib/freebl/stubs.c.dist 2009-09-16 17:46:24.600678560 +0100 -+++ b/mozilla/security/nss/lib/freebl/stubs.c 2009-09-16 18:09:59.275307160 +0100 -@@ -70,9 +70,32 @@ - #include - #include - --#define FREEBL_NO_WEAK 1 -+#ifdef __sgi -+# include -+# ifndef _RLD_INTERFACE_DLFCN_H_DLADDR -+# define _RLD_INTERFACE_DLFCN_H_DLADDR -+ typedef struct Dl_info { -+ const char * dli_fname; -+ void * dli_fbase; -+ const char * dli_sname; -+ void * dli_saddr; -+ int dli_version; -+ int dli_reserved1; -+ long dli_reserved[4]; -+ } Dl_info; -+# endif -+# define _RLD_DLADDR 14 -+int dladdr(void *address, Dl_info *dl); -+ -+int dladdr(void *address, Dl_info *dl) -+{ -+ void *v; -+ v = _rld_new_interface(_RLD_DLADDR,address,dl); -+ return (int)v; -+} -+#endif - --#define WEAK __attribute__((weak)) -+#define FREEBL_NO_WEAK 1 - - #ifdef FREEBL_NO_WEAK - -@@ -93,17 +116,17 @@ - static type_##fn ptr_##fn = NULL - - #define STUB_SAFE_CALL0(fn) \ -- if (ptr_##fn) { return ptr_##fn(); } -+ if (ptr_##fn) { ptr_##fn(); } - #define STUB_SAFE_CALL1(fn,a1) \ -- if (ptr_##fn) { return ptr_##fn(a1); } -+ if (ptr_##fn) { ptr_##fn(a1); } - #define STUB_SAFE_CALL2(fn,a1,a2) \ -- if (ptr_##fn) { return ptr_##fn(a1,a2); } -+ if (ptr_##fn) { ptr_##fn(a1,a2); } - #define STUB_SAFE_CALL3(fn,a1,a2,a3) \ -- if (ptr_##fn) { return ptr_##fn(a1,a2,a3); } -+ if (ptr_##fn) { ptr_##fn(a1,a2,a3); } - #define STUB_SAFE_CALL4(fn,a1,a2,a3,a4) \ -- if (ptr_##fn) { return ptr_##fn(a1,a2,a3,a4); } -+ if (ptr_##fn) { ptr_##fn(a1,a2,a3,a4); } - #define STUB_SAFE_CALL6(fn,a1,a2,a3,a4,a5,a6) \ -- if (ptr_##fn) { return ptr_##fn(a1,a2,a3,a4,a5,a6); } -+ if (ptr_##fn) { ptr_##fn(a1,a2,a3,a4,a5,a6); } - - #define STUB_FETCH_FUNCTION(fn) \ - ptr_##fn = (type_##fn) dlsym(lib,#fn); \ -@@ -118,6 +141,8 @@ - * libutil will not resolve these symbols. - */ - -+#define WEAK __attribute__((weak)) -+ - #define STUB_DECLARE(ret, fn, args) \ - WEAK extern ret fn args - -@@ -200,7 +225,7 @@ extern void - PORT_Free_stub(void *ptr) - { - STUB_SAFE_CALL1(PORT_Free_Util, ptr); -- return free(ptr); -+ free(ptr); - } - - extern void * -@@ -220,14 +245,14 @@ PORT_ZFree_stub(void *ptr, size_t len) - { - STUB_SAFE_CALL2(PORT_ZFree_Util, ptr, len); - memset(ptr, 0, len); -- return free(ptr); -+ free(ptr); - } - - extern void - PR_Free_stub(void *ptr) - { - STUB_SAFE_CALL1(PR_Free, ptr); -- return free(ptr); -+ free(ptr); - } - - /* -@@ -530,7 +555,7 @@ freebl_InitNSSUtil(void *lib) - * fetch the library if it's loaded. For NSS it should already be loaded - */ - #define freebl_getLibrary(libName) \ -- dlopen (libName, RTLD_LAZY|RTLD_NOLOAD) -+ dlopen (libName, RTLD_LAZY) - - #define freebl_releaseLibrary(lib) \ - if (lib) dlclose(lib) -@@ -538,7 +563,7 @@ freebl_InitNSSUtil(void *lib) - static void * FREEBLnsprGlobalLib = NULL; - static void * FREEBLnssutilGlobalLib = NULL; - --void __attribute ((destructor)) FREEBL_unload() -+void FREEBL_unload() - { - freebl_releaseLibrary(FREEBLnsprGlobalLib); - freebl_releaseLibrary(FREEBLnssutilGlobalLib); ---- mozilla/security/nss/lib/freebl/nsslowhash.c.dist 2009-09-16 18:16:17.529500640 +0100 -+++ b/mozilla/security/nss/lib/freebl/nsslowhash.c 2009-09-16 18:16:37.634080480 +0100 -@@ -375,21 +375,21 @@ NSSLOWHASH_NewContext(NSSLOWInitContext - void - NSSLOWHASH_Begin(NSSLOWHASHContext *context) - { -- return context->hashObj->begin(context->hashCtxt); -+ context->hashObj->begin(context->hashCtxt); - } - - void - NSSLOWHASH_Update(NSSLOWHASHContext *context, const unsigned char *buf, - unsigned int len) - { -- return context->hashObj->update(context->hashCtxt, buf, len); -+ context->hashObj->update(context->hashCtxt, buf, len); - } - - void - NSSLOWHASH_End(NSSLOWHASHContext *context, unsigned char *buf, - unsigned int *ret, unsigned int len) - { -- return context->hashObj->end(context->hashCtxt, buf, ret, len); -+ context->hashObj->end(context->hashCtxt, buf, ret, len); - } - - void Copied: csw/mgar/pkg/nss/trunk/files/nss.pc (from rev 7497, csw/mgar/pkg/nss/branches/upstream-work/files/nss.pc) =================================================================== --- csw/mgar/pkg/nss/trunk/files/nss.pc (rev 0) +++ csw/mgar/pkg/nss/trunk/files/nss.pc 2009-11-28 15:59:39 UTC (rev 7498) @@ -0,0 +1,11 @@ +prefix=/opt/csw +exec_prefix=${prefix} +libdir=${prefix}/lib/nss +includedir=${prefix}/include/nss + +Name: NSS +Description: Network Security Services +Version: 3.12.4 +Requires: nspr >= 4.8.0 +Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lnssutil3 -R${libdir} +Cflags: -I${includedir} Copied: csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3-64.patch (from rev 7497, csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3-64.patch) =================================================================== --- csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3-64.patch (rev 0) +++ csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3-64.patch 2009-11-28 15:59:39 UTC (rev 7498) @@ -0,0 +1,11 @@ +--- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk.orig 2009-11-23 14:17:29.741267874 +0100 ++++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk 2009-11-23 14:17:41.292422026 +0100 +@@ -82,7 +82,7 @@ + endif + endif + +-SQLITE=-R/opt/csw/lib/$$ISALIST -L/opt/csw/lib -lsqlite3 ++SQLITE=-R/opt/csw/lib/$$ISALIST -L/opt/csw/lib/64 -lsqlite3 + + ifdef NSS_DISABLE_DBM + DBMLIB = $(NULL) Deleted: csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3.patch 2009-11-28 09:30:46 UTC (rev 7497) +++ csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3.patch 2009-11-28 15:59:39 UTC (rev 7498) @@ -1,11 +0,0 @@ ---- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk.orig 2009-11-21 17:28:09.997982796 +0100 -+++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk 2009-11-21 17:28:32.107632453 +0100 -@@ -80,7 +80,7 @@ - endif - endif - --SQLITE=-lsqlite3 -+SQLITE=-R/opt/csw/lib/$$ISALIST -L/opt/csw/lib -lsqlite3 - - ifdef NSS_DISABLE_DBM - DBMLIB = $(NULL) Copied: csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3.patch (from rev 7497, csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3.patch) =================================================================== --- csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3.patch (rev 0) +++ csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3.patch 2009-11-28 15:59:39 UTC (rev 7498) @@ -0,0 +1,11 @@ +--- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk.orig 2009-11-21 17:28:09.997982796 +0100 ++++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk 2009-11-21 17:28:32.107632453 +0100 +@@ -80,7 +80,7 @@ + endif + endif + +-SQLITE=-lsqlite3 ++SQLITE=-R/opt/csw/lib/$$ISALIST -L/opt/csw/lib -lsqlite3 + + ifdef NSS_DISABLE_DBM + DBMLIB = $(NULL) Deleted: csw/mgar/pkg/nss/trunk/files/platlibs-sunos.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/platlibs-sunos.patch 2009-11-28 09:30:46 UTC (rev 7497) +++ csw/mgar/pkg/nss/trunk/files/platlibs-sunos.patch 2009-11-28 15:59:39 UTC (rev 7498) @@ -1,11 +0,0 @@ ---- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk.orig 2009-11-22 14:31:53.252227901 +0100 -+++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk 2009-11-22 14:32:46.536330277 +0100 -@@ -48,6 +48,8 @@ - else - EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib' - endif -+EXTRA_SHARED_LIBS += -R/opt/csw/lib/$$ISALIST -+EXTRA_SHARED_LIBS += -R/opt/csw/lib/nspr/$$ISALIST - endif - - ifeq ($(OS_ARCH), Linux) Deleted: csw/mgar/pkg/nss/trunk/files/shared-libs.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/shared-libs.patch 2009-11-28 09:30:46 UTC (rev 7497) +++ csw/mgar/pkg/nss/trunk/files/shared-libs.patch 2009-11-28 15:59:39 UTC (rev 7498) @@ -1,32 +0,0 @@ ---- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/lib/softoken/config.mk.orig 2009-11-22 11:39:49.492474635 +0100 -+++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/lib/softoken/config.mk 2009-11-22 11:40:51.857227138 +0100 -@@ -54,10 +54,14 @@ - - ifdef NS_USE_GCC - EXTRA_SHARED_LIBS += \ -+ -R/opt/csw/lib/$$ISALIST \ -+ -L/opt/csw/lib \ - -L$(DIST)/lib \ -+ -R$(NSSUTIL_LIB_DIR)/$$ISALIST \ - -L$(NSSUTIL_LIB_DIR) \ - -lnssutil3 \ - -lsqlite3 \ -+ -R$(NSPR_LIB_DIR)/$$ISALIST \ - -L$(NSPR_LIB_DIR) \ - -lplc4 \ - -lplds4 \ -@@ -80,10 +84,14 @@ - # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS) - # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX. - EXTRA_SHARED_LIBS += \ -+ -R/opt/csw/lib/$$ISALIST \ -+ -L/opt/csw/lib \ - -L$(DIST)/lib \ -+ -R$(NSSUTIL_LIB_DIR)/$$ISALIST \ - -L$(NSSUTIL_LIB_DIR) \ - -lnssutil3 \ - -lsqlite3 \ -+ -R$(NSPR_LIB_DIR)/$$ISALIST \ - -L$(NSPR_LIB_DIR) \ - -lplc4 \ - -lplds4 \ Deleted: csw/mgar/pkg/nss/trunk/files/sign-under-dbx.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/sign-under-dbx.patch 2009-11-28 09:30:46 UTC (rev 7497) +++ csw/mgar/pkg/nss/trunk/files/sign-under-dbx.patch 2009-11-28 15:59:39 UTC (rev 7498) @@ -1,15 +0,0 @@ -This file shows how to run shlibsign under dbx, the Sun Studio debugger, to see -where it's aborting. - ---- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/shlibsign/./sign.sh.orig 2009-11-22 15:17:12.069116849 +0100 -+++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/shlibsign/./sign.sh 2009-11-22 15:17:54.559576926 +0100 -@@ -34,7 +34,7 @@ - export LIBRARY_PATH - ADDON_PATH=${1}/lib:${4}:$ADDON_PATH - export ADDON_PATH -- echo ${2}/shlibsign -v -i ${5} -- ${2}/shlibsign -v -i ${5} -+ echo /opt/studio/SOS11/SUNWspro/bin/dbx ${2}/shlibsign -v -i ${5} -+ /opt/studio/SOS11/SUNWspro/bin/dbx ${2}/shlibsign -v -i ${5} - ;; - esac Copied: csw/mgar/pkg/nss/trunk/files/sqlite3-32.patch (from rev 7497, csw/mgar/pkg/nss/branches/upstream-work/files/sqlite3-32.patch) =================================================================== --- csw/mgar/pkg/nss/trunk/files/sqlite3-32.patch (rev 0) +++ csw/mgar/pkg/nss/trunk/files/sqlite3-32.patch 2009-11-28 15:59:39 UTC (rev 7498) @@ -0,0 +1,18 @@ +--- a/mozilla/security/nss/lib/softoken/config.mk.orig 2009-11-27 00:13:49.173159939 +0100 ++++ b/mozilla/security/nss/lib/softoken/config.mk 2009-11-27 00:15:19.891579729 +0100 +@@ -57,6 +57,7 @@ + -L$(DIST)/lib \ + -L$(NSSUTIL_LIB_DIR) \ + -lnssutil3 \ ++ -L/opt/csw/lib \ + -lsqlite3 \ + -L$(NSPR_LIB_DIR) \ + -lplc4 \ +@@ -83,6 +84,7 @@ + -L$(DIST)/lib \ + -L$(NSSUTIL_LIB_DIR) \ + -lnssutil3 \ ++ -L/opt/csw/lib \ + -lsqlite3 \ + -L$(NSPR_LIB_DIR) \ + -lplc4 \ Copied: csw/mgar/pkg/nss/trunk/files/sqlite3-64.patch (from rev 7497, csw/mgar/pkg/nss/branches/upstream-work/files/sqlite3-64.patch) =================================================================== --- csw/mgar/pkg/nss/trunk/files/sqlite3-64.patch (rev 0) +++ csw/mgar/pkg/nss/trunk/files/sqlite3-64.patch 2009-11-28 15:59:39 UTC (rev 7498) @@ -0,0 +1,18 @@ +--- a/mozilla/security/nss/lib/softoken/config.mk.orig 2009-11-27 00:13:49.173159939 +0100 ++++ b/mozilla/security/nss/lib/softoken/config.mk 2009-11-27 00:15:48.846636621 +0100 +@@ -57,6 +57,7 @@ + -L$(DIST)/lib \ + -L$(NSSUTIL_LIB_DIR) \ + -lnssutil3 \ ++ -L/opt/csw/lib/64 \ + -lsqlite3 \ + -L$(NSPR_LIB_DIR) \ + -lplc4 \ +@@ -83,6 +84,7 @@ + -L$(DIST)/lib \ + -L$(NSSUTIL_LIB_DIR) \ + -lnssutil3 \ ++ -L/opt/csw/lib/64 \ + -lsqlite3 \ + -L$(NSPR_LIB_DIR) \ + -lplc4 \ Deleted: csw/mgar/pkg/nss/trunk/files/whoami.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/whoami.patch 2009-11-28 09:30:46 UTC (rev 7497) +++ csw/mgar/pkg/nss/trunk/files/whoami.patch 2009-11-28 15:59:39 UTC (rev 7498) @@ -1,11 +0,0 @@ ---- nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/UNIX.mk.orig 2009-11-22 02:25:17.411354784 +0100 -+++ nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/UNIX.mk 2009-11-22 02:25:24.833876220 +0100 -@@ -46,7 +46,7 @@ - DEFINES += -UDEBUG -DNDEBUG - else - OPTIMIZER += -g -- USERNAME := $(shell whoami) -+ USERNAME := $(shell gwhoami) - USERNAME := $(subst -,_,$(USERNAME)) - DEFINES += -DDEBUG -UNDEBUG -DDEBUG_$(USERNAME) - endif Copied: csw/mgar/pkg/nss/trunk/files/whoami.patch (from rev 7497, csw/mgar/pkg/nss/branches/upstream-work/files/whoami.patch) =================================================================== --- csw/mgar/pkg/nss/trunk/files/whoami.patch (rev 0) +++ csw/mgar/pkg/nss/trunk/files/whoami.patch 2009-11-28 15:59:39 UTC (rev 7498) @@ -0,0 +1,11 @@ +--- nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/UNIX.mk.orig 2009-11-22 02:25:17.411354784 +0100 ++++ nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/UNIX.mk 2009-11-22 02:25:24.833876220 +0100 +@@ -46,7 +46,7 @@ + DEFINES += -UDEBUG -DNDEBUG + else + OPTIMIZER += -g +- USERNAME := $(shell whoami) ++ USERNAME := $(shell gwhoami) + USERNAME := $(subst -,_,$(USERNAME)) + DEFINES += -DDEBUG -UNDEBUG -DDEBUG_$(USERNAME) + endif 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 Nov 29 11:48:26 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 29 Nov 2009 10:48:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[7503] csw/mgar/pkg/pius/trunk/Makefile Message-ID: Revision: 7503 http://gar.svn.sourceforge.net/gar/?rev=7503&view=rev Author: wahwah Date: 2009-11-29 10:48:26 +0000 (Sun, 29 Nov 2009) Log Message: ----------- pius: Added archall and a build dep Python Modified Paths: -------------- csw/mgar/pkg/pius/trunk/Makefile Modified: csw/mgar/pkg/pius/trunk/Makefile =================================================================== --- csw/mgar/pkg/pius/trunk/Makefile 2009-11-29 00:53:45 UTC (rev 7502) +++ csw/mgar/pkg/pius/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) @@ -14,10 +14,13 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 REQUIRED_PKGS = CSWpython +ARCHALL = 1 +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CONFIGURE_SCRIPTS = BUILD_SCRIPTS = INSTALL_SCRIPTS = pius TEST_SCRIPTS = + include gar/category.mk install-pius: 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 Nov 29 01:53:46 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 29 Nov 2009 00:53:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7502] csw/mgar/pkg/coreutils/trunk/Makefile Message-ID: Revision: 7502 http://gar.svn.sourceforge.net/gar/?rev=7502&view=rev Author: bdwalton Date: 2009-11-29 00:53:45 +0000 (Sun, 29 Nov 2009) Log Message: ----------- coreutils: solidfy include/exclude configure opts; setup gsu manual install Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-28 20:17:10 UTC (rev 7501) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-29 00:53:45 UTC (rev 7502) @@ -30,7 +30,7 @@ CONFIGURE_ARGS += --program-prefix=g CONFIGURE_ARGS += --with-libintl-prefix=/opt/csw/ CONFIGURE_ARGS += --with-libiconv-prefix=/opt/csw/ -CONFIGURE_ARGS += --enable-no-install-program=arch,hostname,su,chcon +CONFIGURE_ARGS += --enable-no-install-program=chcon TEST_TARGET = check @@ -41,6 +41,8 @@ post-install-modulated: @echo Cleaning up install directory... rm -rf $(DESTDIR)/$(libdir) + @echo Manually install gsu (so no root rights required) + cp $(WORKSRC)/src/su $(DESTDIR)$(bindir)/gsu post-merge: @(cd $(PKGROOT)$(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 Sat Nov 28 20:54:44 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 28 Nov 2009 19:54:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7500] csw/mgar/pkg/ruby/trunk/Makefile Message-ID: Revision: 7500 http://gar.svn.sourceforge.net/gar/?rev=7500&view=rev Author: bdwalton Date: 2009-11-28 19:54:43 +0000 (Sat, 28 Nov 2009) Log Message: ----------- ruby: add a few new makecookies Modified Paths: -------------- csw/mgar/pkg/ruby/trunk/Makefile Modified: csw/mgar/pkg/ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby/trunk/Makefile 2009-11-28 16:13:32 UTC (rev 7499) +++ csw/mgar/pkg/ruby/trunk/Makefile 2009-11-28 19:54:43 UTC (rev 7500) @@ -130,12 +130,14 @@ @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/ + @$(MAKECONFIG) rubymode: RMDIR=$(DESTDIR)/$(datadir)/emacs/site-lisp/ruby-mode rubymode: @echo " ===> Installing and Compilingn ruby-mode elisp" @(mkdir -p $(RMDIR); \ cp $(WORKSRC)/misc/*el $(RMDIR)) + @$(MAKECOOKIE) # Fix up rbconfig rbconfig: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Sat Nov 28 21:17:10 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sat, 28 Nov 2009 20:17:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7501] csw/mgar/pkg/munin/trunk Message-ID: Revision: 7501 http://gar.svn.sourceforge.net/gar/?rev=7501&view=rev Author: j_arndt Date: 2009-11-28 20:17:10 +0000 (Sat, 28 Nov 2009) Log Message: ----------- munin: update to new versiion 1.4, added package for common files Modified Paths: -------------- csw/mgar/pkg/munin/trunk/Makefile csw/mgar/pkg/munin/trunk/checksums csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.postinstall csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype csw/mgar/pkg/munin/trunk/files/CSWmuninnode.prototype csw/mgar/pkg/munin/trunk/files/makefile.config.diff csw/mgar/pkg/munin/trunk/files/makefile.diff csw/mgar/pkg/munin/trunk/files/munin-graph.in.diff csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.diff csw/mgar/pkg/munin/trunk/files/munin.conf.in.diff csw/mgar/pkg/munin/trunk/files/sunos_memory.in.diff Added Paths: ----------- csw/mgar/pkg/munin/trunk/files/CSWmunincommon.prototype csw/mgar/pkg/munin/trunk/files/perl.diff Removed Paths: ------------- csw/mgar/pkg/munin/trunk/files/munin-update.in.diff csw/mgar/pkg/munin/trunk/files/munindoc.in.diff csw/mgar/pkg/munin/trunk/files/perlpath.diff Modified: csw/mgar/pkg/munin/trunk/Makefile =================================================================== --- csw/mgar/pkg/munin/trunk/Makefile 2009-11-28 19:54:43 UTC (rev 7500) +++ csw/mgar/pkg/munin/trunk/Makefile 2009-11-28 20:17:10 UTC (rev 7501) @@ -1,9 +1,10 @@ GARNAME = munin -GARVERSION = 1.3.4 +GARVERSION = 1.4.0 CATEGORIES = apps SPKG_DESC_CSWmuninmaster = master component of the graphical network and system monitoring munin SPKG_DESC_CSWmuninnode = node component of the graphical network and system monitoring munin +SPKG_DESC_CSWmunincommin = common files for munin node and master define BLURB Munin the monitoring tool surveys all your computers and remembers what it saw. It presents all the information in graphs through a web interface. @@ -12,8 +13,10 @@ SF_PROJ = munin MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)_$(GARVERSION).tar.gz +DISTFILES += CSWmuninmaster.postinstall DISTFILES += CSWmuninmaster.prototype CSWmuninmaster.postinstall DISTFILES += CSWmuninnode.prototype cswmuninnode +DISTFILES += CSWmunincommon.prototype DISTFILES += cswusergroup DISTFILES += apache-munin.conf.CSW apache-munin-cgi.conf.CSW DISTFILES += README.CSW @@ -23,10 +26,8 @@ PATCHFILES += sunos_memory.in.diff PATCHFILES += munin-node.conf.in.diff PATCHFILES += munin.conf.in.diff -PATCHFILES += munin-graph.in.diff # use monospace instead of VeraMono.ttf -PATCHFILES += munin-update.in.diff # http://munin.projects.linpro.no/ticket/699 -PATCHFILES += munindoc.in.diff # PATH to perl set to /opt/csw/bin/perl -PATCHFILES += perlpath.diff # shebang changed to #!@@PERL@@ -w +PATCHFILES += munin-graph.in.diff # match some paths to /{etc|var}/opt/csw/munin +PATCHFILES += perl.diff # shebang correctly set # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz @@ -35,21 +36,27 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = -PACKAGES = CSWmuninmaster CSWmuninnode +PACKAGES = CSWmuninmaster CSWmuninnode CSWmunincommon CATALOGNAME_CSWmuninmaster = munin_master CATALOGNAME_CSWmuninnode = munin_node +CATALOGNAME_CSWmunincommon = munin_common ARCHALL_CSWmuninmaster = 1 ARCHALL_CSWmuninnode = 1 +ARCHALL_CSWmunincommon = 1 -REQUIRED_PKGS_CSWmuninmaster = CSWpmnetserver CSWperl CSWpython CSWpmparserecdescent -REQUIRED_PKGS_CSWmuninmaster += CSWpmhtmltmpl CSWpmdatemanip CSWpmmd5 CSWrrd CSWapache2 +REQUIRED_PKGS_CSWmuninmaster = CSWperl CSWpmhtmltmpl CSWpmprmsvldt CSWpmlog4perl CSWmunincommon +REQUIRED_PKGS_CSWmuninmaster += CSWrrd CSWapache2 REQUIRED_PKGS_CSWmuninmaster += CSWcswclassutils -REQUIRED_PKGS_CSWmuninnode = CSWpmdbi CSWpmnetsnmp CSWpmnetserver CSWperl CSWtop CSWcswclassutils +REQUIRED_PKGS_CSWmuninnode = CSWperl CSWpmnetsnmp CSWpmnetserver CSWmunincommon +REQUIRED_PKGS_CSWmuninnode += CSWcswclassutils +REQUIRED_PKGS_CSWmuninnode += CSWperl CSWpmnetssleay + SPKG_CLASSES_CSWmuninmaster = none cswusergroup cswpreserveconf ugfiles SPKG_CLASSES_CSWmuninnode = none cswusergroup ugfiles cswpreserveconf cswinitsmf +SPKG_CLASSES_CSWmunincommon = none CONFIGURE_ARGS = $(DIRPATHS) @@ -69,13 +76,13 @@ @$(MAKECOOKIE) install-custom: - cat $(WORKSRC)/Makefile.config | sed -e "s;$$(DESTDIR);$(DESTDIR);g" > $(WORKSRC)/Makefile.config.tmp - mv $(WORKSRC)/Makefile.config.tmp $(WORKSRC)/Makefile.config - ( cd $(WORKSRC); gmake -f Makefile install) + @cat $(WORKSRC)/Makefile.config | sed -e "s;$$(DESTDIR);$(DESTDIR);g" > $(WORKSRC)/Makefile.config.tmp + @mv $(WORKSRC)/Makefile.config.tmp $(WORKSRC)/Makefile.config + @( cd $(WORKSRC); gmake -f Makefile ; gmake -f Makefile install) #mv $(DESTDIR)/opt/csw/lib/plugins $(DESTDIR)/opt/csw/lib/munin_plugins - mv $(DESTDIR)/etc/opt/csw/munin/munin-node.conf $(DESTDIR)/etc/opt/csw/munin/munin-node.conf.CSW - mv $(DESTDIR)/etc/opt/csw/munin/munin.conf $(DESTDIR)/etc/opt/csw/munin/munin.conf.CSW - @ginstall -d $(DESTDIR)/opt/csw/munin + @mv $(DESTDIR)/etc/opt/csw/munin/munin-node.conf $(DESTDIR)/etc/opt/csw/munin/munin-node.conf.CSW + @mv $(DESTDIR)/etc/opt/csw/munin/munin.conf $(DESTDIR)/etc/opt/csw/munin/munin.conf.CSW + #@ginstall -d $(DESTDIR)/opt/csw/munin @ginstall -d $(DESTDIR)/etc/opt/csw/munin/apache @ginstall -m 644 $(FILEDIR)/apache-munin.conf.CSW $(DESTDIR)/etc/opt/csw/munin/apache/apache-munin.conf.CSW @ginstall -m 644 $(FILEDIR)/apache-munin-cgi.conf.CSW $(DESTDIR)/etc/opt/csw/munin/apache/apache-munin-cgi.conf.CSW Modified: csw/mgar/pkg/munin/trunk/checksums =================================================================== --- csw/mgar/pkg/munin/trunk/checksums 2009-11-28 19:54:43 UTC (rev 7500) +++ csw/mgar/pkg/munin/trunk/checksums 2009-11-28 20:17:10 UTC (rev 7501) @@ -1,18 +1,17 @@ -b494ca780b9becd6a8611e255e606dd4 download/CSWmuninmaster.postinstall -29939c1794e6c602d54effac74e5c89d download/CSWmuninmaster.prototype -6cb29ccba599b5ddcea7581197bf986d download/CSWmuninnode.prototype +58ab277c1a958459e5270da07f017fb3 download/CSWmunincommon.prototype +390277cc59e2c37d5b0bd4f2c3441996 download/CSWmuninmaster.postinstall +8bd7bf2d0356a424fe58c7b3058ee3b4 download/CSWmuninmaster.prototype +c4064b92df7835bf37b18e799aa6177e download/CSWmuninnode.prototype e6bafa4aa3cba7fc16e444ad168b4cd1 download/README.CSW 59409f4b412953283c3df4546fd4886c download/apache-munin-cgi.conf.CSW e701d132ba0b6f3dcc90190860f5aa6b download/apache-munin.conf.CSW 31aec7f9a9a452cc6c75c1096c937fdd download/cswmuninnode 50fa4a545f878d79e219891c6ac8d2d2 download/cswusergroup -4eb0923e09f12335da8249ab7923e250 download/makefile.config.diff -3ea1ba00633ac52c3a25306c3c9c52e0 download/makefile.diff -064e12aa12bc7d4cb312b576ae658d1e download/munin-graph.in.diff -ce97aa8e741383039fb365d1a322f3e7 download/munin-node.conf.in.diff -4688659429fbebf8cafcc8eb8a1ee870 download/munin-update.in.diff -737e3e3d2f68015dfb4e857909cde7da download/munin.conf.in.diff -e3a58e582407981d4f5c5aed59cbfc47 download/munin_1.3.4.tar.gz -8e21ff70a126779e33dd6457839184de download/munindoc.in.diff -d1623381c74f05a174aa4704896ef5b6 download/perlpath.diff -43db53191eaae75be35b3548a993c31e download/sunos_memory.in.diff +fd380babe0e8adeb2fdceb2ff38c8e14 download/makefile.config.diff +81ce1cb57e8331fad745635ad9f2debb download/makefile.diff +e5afa54ed754c43b0b53c57ebac31915 download/munin-graph.in.diff +a0754324697266f8ae3530fcbdf885c0 download/munin-node.conf.in.diff +fcecf75276f36a96027976fd7d0dfdf9 download/munin.conf.in.diff +95be0e6eb98c4c7b2a4f2f922b358414 download/munin_1.4.0.tar.gz +9dc05eea4250fc1bc61436493ab9de75 download/perl.diff +7cb3378da78576a51cacd5b753134ccf download/sunos_memory.in.diff Added: csw/mgar/pkg/munin/trunk/files/CSWmunincommon.prototype =================================================================== --- csw/mgar/pkg/munin/trunk/files/CSWmunincommon.prototype (rev 0) +++ csw/mgar/pkg/munin/trunk/files/CSWmunincommon.prototype 2009-11-28 20:17:10 UTC (rev 7501) @@ -0,0 +1,14 @@ +d none /opt/csw/share/man/man3 0755 root bin +f none /opt/csw/share/man/man3/Munin::Common::Config.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Common::Defaults.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Common::TLS.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Common::TLSClient.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Common::TLSServer.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Common::Timeout.3perl 0444 root bin +d none /opt/csw/share/perl/site_perl/Munin/Common 0755 root bin +f none /opt/csw/share/perl/site_perl/Munin/Common/Config.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Common/Defaults.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Common/TLS.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Common/TLSClient.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Common/TLSServer.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Common/Timeout.pm 0444 root bin Modified: csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.postinstall =================================================================== --- csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.postinstall 2009-11-28 19:54:43 UTC (rev 7500) +++ csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.postinstall 2009-11-28 20:17:10 UTC (rev 7501) @@ -3,10 +3,9 @@ passwd -N munin cat << EOF -# -# -# +======================================================================= + To get Munin running, please follow these steps: (1) Append the following line to the crontab of the user 'munin': @@ -31,7 +30,6 @@ svcadm restart cswapache2 -# -# -# +======================================================================= + EOF Modified: csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype =================================================================== --- csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype 2009-11-28 19:54:43 UTC (rev 7500) +++ csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype 2009-11-28 20:17:10 UTC (rev 7501) @@ -1,15 +1,14 @@ d none /etc/opt/csw/munin 0755 root bin d none /etc/opt/csw/munin/apache 0755 root bin +f cswpreserveconf /etc/opt/csw/munin/apache/apache-munin-cgi.conf.CSW 0644 root bin +f cswpreserveconf /etc/opt/csw/munin/apache/apache-munin.conf.CSW 0644 root bin +d none /etc/opt/csw/munin/munin-conf.d 0755 root bin f cswpreserveconf /etc/opt/csw/munin/munin.conf.CSW 0644 root bin -f none /opt/csw/bin/munin-check 0755 root bin -f none /opt/csw/bin/munin-cron 0755 root bin -f none /opt/csw/share/munin/fonts/VeraMono.ttf 0644 root bin -f none /opt/csw/libexec/munin/munin-graph 0755 root bin -f none /opt/csw/libexec/munin/munin-html 0755 root bin -f none /opt/csw/libexec/munin/munin-limits 0755 root bin -f none /opt/csw/libexec/munin/munin-update 0755 root bin +d none /etc/opt/csw/munin/plugin-conf.d 0755 root bin d ugfiles /etc/opt/csw/munin/templates 0755 munin munin f none /etc/opt/csw/munin/templates/definitions.html 0644 root bin +f none /etc/opt/csw/munin/templates/favicon.ico 0644 root bin +f none /etc/opt/csw/munin/templates/logo-h.png 0644 root bin f none /etc/opt/csw/munin/templates/logo.png 0644 root bin f none /etc/opt/csw/munin/templates/munin-comparison-day.tmpl 0644 root bin f none /etc/opt/csw/munin/templates/munin-comparison-month.tmpl 0644 root bin @@ -19,38 +18,82 @@ f none /etc/opt/csw/munin/templates/munin-nodeview.tmpl 0644 root bin f none /etc/opt/csw/munin/templates/munin-overview.tmpl 0644 root bin f none /etc/opt/csw/munin/templates/munin-serviceview.tmpl 0644 root bin +d none /etc/opt/csw/munin/templates/partial 0755 root bin +f none /etc/opt/csw/munin/templates/partial/bottom_navigation.tmpl 0644 root bin +f none /etc/opt/csw/munin/templates/partial/generated_by.tmpl 0644 root bin +f none /etc/opt/csw/munin/templates/partial/head.tmpl 0644 root bin +f none /etc/opt/csw/munin/templates/partial/logo_navigation.tmpl 0644 root bin +f none /etc/opt/csw/munin/templates/partial/logo_navigation_comparison.tmpl 0644 root bin +f none /etc/opt/csw/munin/templates/partial/logo_path.tmpl 0644 root bin +f none /etc/opt/csw/munin/templates/partial/path.tmpl 0644 root bin +f none /etc/opt/csw/munin/templates/style-1.2.css 0644 root bin f none /etc/opt/csw/munin/templates/style.css 0644 root bin +f none /opt/csw/bin/munin-check 0755 root bin +f none /opt/csw/bin/munin-cron 0755 root bin +d none /opt/csw/etc/pkg 0755 root bin +d none /opt/csw/etc/pkg/CSWmuninmaster 0755 root bin +f cswusergroup /opt/csw/etc/pkg/CSWmuninmaster/cswusergroup 0644 root bin +d none /opt/csw/libexec 0755 root bin +d none /opt/csw/libexec/munin 0755 root bin +f none /opt/csw/libexec/munin/munin-graph 0755 root bin +f none /opt/csw/libexec/munin/munin-html 0755 root bin +f none /opt/csw/libexec/munin/munin-limits 0755 root bin +f none /opt/csw/libexec/munin/munin-update 0755 root bin d none /opt/csw/share/doc/munin_master 0755 root bin +f none /opt/csw/share/doc/munin_master/README.CSW 0644 root bin f none /opt/csw/share/doc/munin_master/license 0644 root bin -f cswpreserveconf /etc/opt/csw/munin/apache/apache-munin.conf.CSW 0644 root bin -f cswpreserveconf /etc/opt/csw/munin/apache/apache-munin-cgi.conf.CSW 0644 root bin -f none /opt/csw/share/doc/munin_master/README.CSW 0644 root bin d none /opt/csw/share/man/man1 0755 root bin +d none /opt/csw/share/man/man3 0755 root bin +f none /opt/csw/share/man/man3/Munin::Master::Config.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Master::Group.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Master::GroupRepository.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Master::HTMLOld.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Master::Host.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Master::Logger.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Master::Node.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Master::ProcessManager.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Master::Update.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Master::UpdateWorker.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Master::Utils.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Master::Worker.3perl 0444 root bin d none /opt/csw/share/man/man5 0755 root bin f none /opt/csw/share/man/man5/munin.conf.5 0644 root bin d none /opt/csw/share/man/man8 0755 root bin +f none /opt/csw/share/man/man8/munin-check.8 0644 root bin f none /opt/csw/share/man/man8/munin-cron.8 0644 root bin f none /opt/csw/share/man/man8/munin-graph.8 0644 root bin f none /opt/csw/share/man/man8/munin-html.8 0644 root bin f none /opt/csw/share/man/man8/munin-limits.8 0644 root bin f none /opt/csw/share/man/man8/munin-update.8 0644 root bin +f none /opt/csw/share/man/man8/munin.8 0644 root bin +d none /opt/csw/share/munin 0755 root bin +d none /opt/csw/share/munin/fonts 0755 root bin +f none /opt/csw/share/munin/fonts/VeraMono.ttf 0644 root bin d none /opt/csw/share/perl 0755 root bin d none /opt/csw/share/perl/site_perl 0755 root bin d none /opt/csw/share/perl/site_perl/Munin 0755 root bin -f none /opt/csw/share/perl/site_perl/Munin.pm 0644 root bin -d none /opt/csw/share/perl/site_perl/Munin/Plugin 0755 root bin -d none /var/opt 0755 root sys -d none /var/opt/csw 0755 root bin -d none /var/opt/csw/munin 0755 root bin +d none /opt/csw/share/perl/site_perl/Munin/Master 0755 root bin +f none /opt/csw/share/perl/site_perl/Munin/Master/Config.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Master/GraphOld.pm 0555 root bin +f none /opt/csw/share/perl/site_perl/Munin/Master/Group.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Master/GroupRepository.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Master/HTMLOld.pm 0555 root bin +f none /opt/csw/share/perl/site_perl/Munin/Master/Host.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Master/LimitsOld.pm 0555 root bin +f none /opt/csw/share/perl/site_perl/Munin/Master/Logger.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Master/Node.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Master/ProcessManager.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Master/Update.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Master/UpdateWorker.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Master/Utils.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Master/Worker.pm 0444 root bin d ugfiles /var/opt/csw/munin/www 0755 munin munin -f ugfiles /var/opt/csw/munin/www/.htaccess 0644 munin munin d ugfiles /var/opt/csw/munin/www/cgi 0755 munin munin f ugfiles /var/opt/csw/munin/www/cgi/munin-cgi-graph 0755 munin munin -f ugfiles /var/opt/csw/munin/www/favicon.ico 0644 munin munin +f ugfiles /var/opt/csw/munin/www/cgi/munin-fastcgi-graph 0755 munin munin +d ugfiles /var/opt/csw/munin 0755 munin munin d ugfiles /var/opt/csw/munin/db 0755 munin munin -d ugfiles /var/opt/csw/munin/db/plugin-state 0755 munin munin d ugfiles /var/opt/csw/munin/log 0755 munin munin d ugfiles /var/opt/csw/munin/run 0755 munin munin -d none /opt/csw/etc/pkg 0755 root bin -d none /opt/csw/etc/pkg/CSWmuninmaster 0755 root bin -f cswusergroup /opt/csw/etc/pkg/CSWmuninmaster/cswusergroup 0644 root bin +d ugfiles /var/opt/csw/munin/www 0755 munin munin +f ugfiles /var/opt/csw/munin/www/.htaccess 0644 munin munin Modified: csw/mgar/pkg/munin/trunk/files/CSWmuninnode.prototype =================================================================== --- csw/mgar/pkg/munin/trunk/files/CSWmuninnode.prototype 2009-11-28 19:54:43 UTC (rev 7500) +++ csw/mgar/pkg/munin/trunk/files/CSWmuninnode.prototype 2009-11-28 20:17:10 UTC (rev 7501) @@ -1,3 +1,5 @@ +d none /etc/opt/csw/init.d 0755 root bin +f cswinitsmf /etc/opt/csw/init.d/cswmuninnode 0755 root bin d none /etc/opt/csw/munin 0755 root bin f cswpreserveconf /etc/opt/csw/munin/munin-node.conf.CSW 0644 root bin d none /etc/opt/csw/munin/plugin-conf.d 0755 root bin @@ -2,3 +4,8 @@ d none /etc/opt/csw/munin/plugins 0755 root bin -f none /opt/csw/bin/munindoc 0755 root bin +f none /opt/csw/bin/munindoc 0555 root bin +d none /opt/csw/etc/pkg 0755 root bin +d none /opt/csw/etc/pkg/CSWmuninnode 0755 root bin +f cswusergroup /opt/csw/etc/pkg/CSWmuninnode/cswusergroup 0644 root bin +d none /opt/csw/libexec 0755 root bin +d none /opt/csw/libexec/munin 0755 root bin d none /opt/csw/libexec/munin/plugins 0755 root bin @@ -10,6 +17,14 @@ f none /opt/csw/libexec/munin/plugins/apache_volume 0755 root bin f none /opt/csw/libexec/munin/plugins/apc_envunit_ 0755 root bin f none /opt/csw/libexec/munin/plugins/apc_nis 0755 root bin +f none /opt/csw/libexec/munin/plugins/asterisk_channels 0755 root bin +f none /opt/csw/libexec/munin/plugins/asterisk_channelstypes 0755 root bin +f none /opt/csw/libexec/munin/plugins/asterisk_codecs 0755 root bin +f none /opt/csw/libexec/munin/plugins/asterisk_meetme 0755 root bin +f none /opt/csw/libexec/munin/plugins/asterisk_meetmeusers 0755 root bin +f none /opt/csw/libexec/munin/plugins/asterisk_sipchannels 0755 root bin +f none /opt/csw/libexec/munin/plugins/asterisk_sippeers 0755 root bin +f none /opt/csw/libexec/munin/plugins/asterisk_voicemail 0755 root bin f none /opt/csw/libexec/munin/plugins/bind9 0755 root bin f none /opt/csw/libexec/munin/plugins/bind9_rndc 0755 root bin f none /opt/csw/libexec/munin/plugins/cmc_tc_sensor_ 0755 root bin @@ -24,37 +39,51 @@ f none /opt/csw/libexec/munin/plugins/df_inode 0755 root bin f none /opt/csw/libexec/munin/plugins/dhcpd3 0755 root bin f none /opt/csw/libexec/munin/plugins/digitemp_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/ejabberd_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/env 0755 root bin f none /opt/csw/libexec/munin/plugins/exim_mailqueue 0755 root bin f none /opt/csw/libexec/munin/plugins/exim_mailqueue_alt 0755 root bin f none /opt/csw/libexec/munin/plugins/exim_mailstats 0755 root bin +f none /opt/csw/libexec/munin/plugins/extinfo_tester 0755 root bin +f none /opt/csw/libexec/munin/plugins/fail2ban 0755 root bin f none /opt/csw/libexec/munin/plugins/foldingathome 0755 root bin f none /opt/csw/libexec/munin/plugins/foldingathome_rank 0755 root bin f none /opt/csw/libexec/munin/plugins/foldingathome_wu 0755 root bin +f none /opt/csw/libexec/munin/plugins/haproxy_ 0755 root bin f none /opt/csw/libexec/munin/plugins/hddtemp 0755 root bin f none /opt/csw/libexec/munin/plugins/hddtemp2 0755 root bin f none /opt/csw/libexec/munin/plugins/hddtemp_smartctl 0755 root bin f none /opt/csw/libexec/munin/plugins/hddtempd 0755 root bin f none /opt/csw/libexec/munin/plugins/http_loadtime 0755 root bin +f none /opt/csw/libexec/munin/plugins/id 0755 root bin f none /opt/csw/libexec/munin/plugins/if_ 0755 root bin -f none /opt/csw/libexec/munin/plugins/if_errcoll_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/if_err_ 0755 root bin f none /opt/csw/libexec/munin/plugins/ifx_concurrent_sessions_ 0755 root bin f none /opt/csw/libexec/munin/plugins/io_busy_ 0755 root bin f none /opt/csw/libexec/munin/plugins/io_bytes_ 0755 root bin f none /opt/csw/libexec/munin/plugins/io_ops_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/iostat 0755 root bin f none /opt/csw/libexec/munin/plugins/ipac-ng 0755 root bin +f none /opt/csw/libexec/munin/plugins/ipmi_sensor_ 0755 root bin f none /opt/csw/libexec/munin/plugins/ircu 0755 root bin +f none /opt/csw/libexec/munin/plugins/jmx_ 0755 root bin f none /opt/csw/libexec/munin/plugins/load 0755 root bin f none /opt/csw/libexec/munin/plugins/loggrep 0755 root bin f none /opt/csw/libexec/munin/plugins/lpstat 0755 root bin f none /opt/csw/libexec/munin/plugins/mailman 0755 root bin f none /opt/csw/libexec/munin/plugins/mailscanner 0755 root bin f none /opt/csw/libexec/munin/plugins/mbmon_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/memcached_ 0755 root bin f none /opt/csw/libexec/munin/plugins/memory 0755 root bin f none /opt/csw/libexec/munin/plugins/mhttping 0755 root bin +f none /opt/csw/libexec/munin/plugins/multigraph_tester 0755 root bin f none /opt/csw/libexec/munin/plugins/multiping 0755 root bin f none /opt/csw/libexec/munin/plugins/multips 0755 root bin f none /opt/csw/libexec/munin/plugins/munin_stats 0755 root bin +f none /opt/csw/libexec/munin/plugins/munin_update 0755 root bin +f none /opt/csw/libexec/munin/plugins/mysql_ 0755 root bin f none /opt/csw/libexec/munin/plugins/mysql_bytes 0755 root bin +f none /opt/csw/libexec/munin/plugins/mysql_innodb 0755 root bin f none /opt/csw/libexec/munin/plugins/mysql_isam_space_ 0755 root bin f none /opt/csw/libexec/munin/plugins/mysql_queries 0755 root bin f none /opt/csw/libexec/munin/plugins/mysql_slowqueries 0755 root bin @@ -62,6 +91,9 @@ f none /opt/csw/libexec/munin/plugins/named 0755 root bin f none /opt/csw/libexec/munin/plugins/netopia 0755 root bin f none /opt/csw/libexec/munin/plugins/netstat 0755 root bin +f none /opt/csw/libexec/munin/plugins/nginx_request 0755 root bin +f none /opt/csw/libexec/munin/plugins/nginx_status 0755 root bin +f none /opt/csw/libexec/munin/plugins/nomadix_users_ 0755 root bin f none /opt/csw/libexec/munin/plugins/ntp_ 0755 root bin f none /opt/csw/libexec/munin/plugins/ntp_kernel_err 0755 root bin f none /opt/csw/libexec/munin/plugins/ntp_kernel_pll_freq 0755 root bin @@ -72,6 +104,7 @@ f none /opt/csw/libexec/munin/plugins/nut_volts 0755 root bin f none /opt/csw/libexec/munin/plugins/nutups_ 0755 root bin f none /opt/csw/libexec/munin/plugins/nvidia_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/openvpn 0755 root bin f none /opt/csw/libexec/munin/plugins/paging_in 0755 root bin f none /opt/csw/libexec/munin/plugins/paging_out 0755 root bin f none /opt/csw/libexec/munin/plugins/perdition 0755 root bin @@ -83,23 +116,32 @@ f none /opt/csw/libexec/munin/plugins/postfix_mailqueue 0755 root bin f none /opt/csw/libexec/munin/plugins/postfix_mailstats 0755 root bin f none /opt/csw/libexec/munin/plugins/postfix_mailvolume 0755 root bin -f none /opt/csw/libexec/munin/plugins/postgres_block_read_ 0755 root bin -f none /opt/csw/libexec/munin/plugins/postgres_commits 0755 root bin -f none /opt/csw/libexec/munin/plugins/postgres_commits_ 0755 root bin -f none /opt/csw/libexec/munin/plugins/postgres_connections 0755 root bin -f none /opt/csw/libexec/munin/plugins/postgres_locks 0755 root bin -f none /opt/csw/libexec/munin/plugins/postgres_queries 0755 root bin -f none /opt/csw/libexec/munin/plugins/postgres_queries_ 0755 root bin -f none /opt/csw/libexec/munin/plugins/postgres_space_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/postgres_bgwriter 0755 root bin +f none /opt/csw/libexec/munin/plugins/postgres_cache_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/postgres_checkpoints 0755 root bin +f none /opt/csw/libexec/munin/plugins/postgres_connections_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/postgres_connections_db 0755 root bin +f none /opt/csw/libexec/munin/plugins/postgres_locks_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/postgres_querylength_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/postgres_scans_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/postgres_size_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/postgres_transactions_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/postgres_tuples_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/postgres_users 0755 root bin +f none /opt/csw/libexec/munin/plugins/postgres_xlog 0755 root bin f none /opt/csw/libexec/munin/plugins/processes 0755 root bin f none /opt/csw/libexec/munin/plugins/ps_ 0755 root bin f none /opt/csw/libexec/munin/plugins/psu_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/qmailqstat 0755 root bin f none /opt/csw/libexec/munin/plugins/qmailscan 0755 root bin f none /opt/csw/libexec/munin/plugins/qmailscan-simple 0755 root bin f none /opt/csw/libexec/munin/plugins/samba 0755 root bin f none /opt/csw/libexec/munin/plugins/sendmail_mailqueue 0755 root bin f none /opt/csw/libexec/munin/plugins/sendmail_mailstats 0755 root bin f none /opt/csw/libexec/munin/plugins/sendmail_mailtraffic 0755 root bin +f none /opt/csw/libexec/munin/plugins/slapd_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/slapd_bdb_cache_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/slony_lag_ 0755 root bin f none /opt/csw/libexec/munin/plugins/smart_ 0755 root bin f none /opt/csw/libexec/munin/plugins/snmp__cpuload 0755 root bin f none /opt/csw/libexec/munin/plugins/snmp__df 0755 root bin @@ -107,9 +149,14 @@ f none /opt/csw/libexec/munin/plugins/snmp__fc_if_err_ 0755 root bin f none /opt/csw/libexec/munin/plugins/snmp__if_ 0755 root bin f none /opt/csw/libexec/munin/plugins/snmp__if_err_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/snmp__if_multi 0755 root bin f none /opt/csw/libexec/munin/plugins/snmp__load 0755 root bin f none /opt/csw/libexec/munin/plugins/snmp__memory 0755 root bin +f none /opt/csw/libexec/munin/plugins/snmp__netapp_diskusage_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/snmp__netapp_inodeusage_ 0755 root bin f none /opt/csw/libexec/munin/plugins/snmp__netstat 0755 root bin +f none /opt/csw/libexec/munin/plugins/snmp__print_pages 0755 root bin +f none /opt/csw/libexec/munin/plugins/snmp__print_supplies 0755 root bin f none /opt/csw/libexec/munin/plugins/snmp__processes 0755 root bin f none /opt/csw/libexec/munin/plugins/snmp__rdp_users 0755 root bin f none /opt/csw/libexec/munin/plugins/snmp__sensors_fsc_bx_fan 0755 root bin @@ -124,7 +171,14 @@ f none /opt/csw/libexec/munin/plugins/snmp__users 0755 root bin f none /opt/csw/libexec/munin/plugins/snmp__winload 0755 root bin f none /opt/csw/libexec/munin/plugins/snmp__winmem 0755 root bin +f none /opt/csw/libexec/munin/plugins/snort_alerts 0755 root bin +f none /opt/csw/libexec/munin/plugins/snort_bytes_pkt 0755 root bin +f none /opt/csw/libexec/munin/plugins/snort_drop_rate 0755 root bin +f none /opt/csw/libexec/munin/plugins/snort_pattern_match 0755 root bin +f none /opt/csw/libexec/munin/plugins/snort_pkts 0755 root bin +f none /opt/csw/libexec/munin/plugins/snort_traffic 0755 root bin f none /opt/csw/libexec/munin/plugins/spamstats 0755 root bin +f none /opt/csw/libexec/munin/plugins/squeezebox_ 0755 root bin f none /opt/csw/libexec/munin/plugins/squid_cache 0755 root bin f none /opt/csw/libexec/munin/plugins/squid_icp 0755 root bin f none /opt/csw/libexec/munin/plugins/squid_objectsize 0755 root bin @@ -133,43 +187,76 @@ f none /opt/csw/libexec/munin/plugins/surfboard 0755 root bin f none /opt/csw/libexec/munin/plugins/sybase_space 0755 root bin f none /opt/csw/libexec/munin/plugins/temperature 0755 root bin +f none /opt/csw/libexec/munin/plugins/tomcat_ 0755 root bin f none /opt/csw/libexec/munin/plugins/tomcat_access 0755 root bin f none /opt/csw/libexec/munin/plugins/tomcat_jvm 0755 root bin f none /opt/csw/libexec/munin/plugins/tomcat_threads 0755 root bin f none /opt/csw/libexec/munin/plugins/tomcat_volume 0755 root bin f none /opt/csw/libexec/munin/plugins/uptime 0755 root bin f none /opt/csw/libexec/munin/plugins/users 0755 root bin +f none /opt/csw/libexec/munin/plugins/varnish_ 0755 root bin f none /opt/csw/libexec/munin/plugins/vmstat 0755 root bin -f none /opt/csw/sbin/munin-node 0755 root bin -f none /opt/csw/sbin/munin-node-configure 0755 root bin -f none /opt/csw/sbin/munin-node-configure-snmp 0755 root bin -f none /opt/csw/sbin/munin-run 0755 root bin +f none /opt/csw/libexec/munin/plugins/warning_tester 0755 root bin +f none /opt/csw/libexec/munin/plugins/zimbra_ 0755 root bin +f none /opt/csw/sbin/munin-node 0555 root bin +f none /opt/csw/sbin/munin-node-configure 0555 root bin +f none /opt/csw/sbin/munin-run 0555 root bin d none /opt/csw/share/doc/munin_node 0755 root bin f none /opt/csw/share/doc/munin_node/license 0644 root bin d none /opt/csw/share/man/man1 0755 root bin +f none /opt/csw/share/man/man1/munin-node-configure.1 0444 root bin +f none /opt/csw/share/man/man1/munin-node.1 0444 root bin +f none /opt/csw/share/man/man1/munin-run.1 0444 root bin +f none /opt/csw/share/man/man1/munindoc.1 0444 root bin +d none /opt/csw/share/man/man3 0755 root bin +f none /opt/csw/share/man/man3/Munin::Node::Config.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Node::Configure::Debug.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Node::Configure::History.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Node::Configure::HostEnumeration.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Node::Configure::Plugin.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Node::Configure::PluginList.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Node::Logger.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Node::OS.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Node::SNMPConfig.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Node::Server.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Node::Service.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Node::Session.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Node::Utils.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Plugin.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Plugin::Pgsql.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Plugin::SNMP.3perl 0444 root bin d none /opt/csw/share/man/man5 0755 root bin f none /opt/csw/share/man/man5/munin-node.conf.5 0644 root bin d none /opt/csw/share/man/man8 0755 root bin -f none /opt/csw/share/man/man8/munin-node-configure-snmp.8 0644 root bin -f none /opt/csw/share/man/man8/munin-node-configure.8 0644 root bin -f none /opt/csw/share/man/man8/munin-node.8 0644 root bin -f none /opt/csw/share/man/man8/munin-run.8 0644 root bin +f none /opt/csw/share/man/man8/munin.8 0644 root bin +d none /opt/csw/share/munin 0755 root bin d none /opt/csw/share/perl 0755 root bin d none /opt/csw/share/perl/site_perl 0755 root bin d none /opt/csw/share/perl/site_perl/Munin 0755 root bin +d none /opt/csw/share/perl/site_perl/Munin/Node 0755 root bin +f none /opt/csw/share/perl/site_perl/Munin/Node/Config.pm 0444 root bin +d none /opt/csw/share/perl/site_perl/Munin/Node/Configure 0755 root bin +f none /opt/csw/share/perl/site_perl/Munin/Node/Configure/Debug.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Node/Configure/History.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Node/Configure/HostEnumeration.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Node/Configure/Plugin.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Node/Configure/PluginList.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Node/Logger.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Node/OS.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Node/SNMPConfig.pm 0555 root bin +f none /opt/csw/share/perl/site_perl/Munin/Node/Server.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Node/Service.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Node/Session.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Node/Utils.pm 0444 root bin d none /opt/csw/share/perl/site_perl/Munin/Plugin 0755 root bin -f none /opt/csw/share/perl/site_perl/Munin/Plugin.pm 0644 root bin -d none /var/opt/csw/munin 0755 root bin +f none /opt/csw/share/perl/site_perl/Munin/Plugin.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Plugin/Pgsql.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Plugin/SNMP.pm 0444 root bin +d ugfiles /var/opt/csw/munin 0755 munin munin +d ugfiles /var/opt/csw/munin/db 0755 munin munin +d ugfiles /var/opt/csw/munin/log 0755 munin munin +d ugfiles /var/opt/csw/munin/run 0755 munin munin s none /etc/opt/csw/munin/plugins/load=/opt/csw/libexec/munin/plugins/load s none /etc/opt/csw/munin/plugins/uptime=/opt/csw/libexec/munin/plugins/uptime s none /etc/opt/csw/munin/plugins/cpu=/opt/csw/libexec/munin/plugins/cpu s none /etc/opt/csw/munin/plugins/df=/opt/csw/libexec/munin/plugins/df -d ugfiles /var/opt/csw/munin/log 0755 munin munin -d ugfiles /var/opt/csw/munin/run 0755 munin munin -d ugfiles /var/opt/csw/munin/db 0755 munin munin -d ugfiles /var/opt/csw/munin/db/plugin-state 0755 munin munin -d none /opt/csw/etc/pkg 0755 root bin -d none /opt/csw/etc/pkg/CSWmuninnode 0755 root bin -d none /etc/opt/csw/init.d 0755 root bin -f cswinitsmf /etc/opt/csw/init.d/cswmuninnode 0755 root bin -f cswusergroup /opt/csw/etc/pkg/CSWmuninnode/cswusergroup 0644 root bin Modified: csw/mgar/pkg/munin/trunk/files/makefile.config.diff =================================================================== --- csw/mgar/pkg/munin/trunk/files/makefile.config.diff 2009-11-28 19:54:43 UTC (rev 7500) +++ csw/mgar/pkg/munin/trunk/files/makefile.config.diff 2009-11-28 20:17:10 UTC (rev 7501) @@ -1,9 +1,9 @@ -diff --speed-large-files --minimal -Nru munin-1.3.4.orig/Makefile.config munin-1.3.4/Makefile.config ---- munin-1.3.4.orig/Makefile.config 2008-03-08 07:35:13.000000000 +0100 -+++ munin-1.3.4/Makefile.config 2009-07-05 11:01:24.956040045 +0200 -@@ -6,13 +6,15 @@ - # DESTDIR is empty during building, and optionally set to point to - # a shadow tree during make install. +diff --speed-large-files --minimal -Nru munin-1.4.0.orig/Makefile.config munin-1.4.0/Makefile.config +--- munin-1.4.0.orig/Makefile.config 2009-11-27 12:17:18.000000000 +0100 ++++ munin-1.4.0/Makefile.config 2009-11-28 16:51:45.380818848 +0100 +@@ -14,13 +14,15 @@ + # and LOGDIR as subdirectories. Today, DBDIR contains configured + # domains, as well as PLUGSTATE, and we risk collisions. +DESTDIR=$(DESTDIR) + @@ -19,7 +19,7 @@ # Server only - where to put munin-cron BINDIR = $(PREFIX)/bin -@@ -21,37 +23,37 @@ +@@ -29,17 +31,17 @@ SBINDIR = $(PREFIX)/sbin # Where to put text and html documentation @@ -35,10 +35,16 @@ +LIBDIR = $(PREFIX)/libexec/munin # Server only - Output directory --HTMLDIR = $(PREFIX)/var/www +-HTMLDIR = $(PREFIX)/www/docs +-CGIDIR = $(PREFIX)/www/cgi +HTMLDIR = /var/opt/csw/munin/www - CGIDIR = $(HTMLDIR)/cgi ++CGIDIR = /var/opt/csw/munin/www/cgi + # Server only - spool directory for data gathered from nodes by + # munin-gather - experimental. Place on ramdisk to make munin +@@ -52,24 +54,24 @@ + # SSPOOLDIR := /tmp/muninspool + # Client only - Where to put RRD files and other intenal data -DBDIR = $(DESTDIR)/var/opt/munin +DBDIR = /var/opt/csw/munin/db @@ -48,7 +54,7 @@ PLUGSTATE = $(DBDIR)/plugin-state # Where Munin should place its logs. --LOGDIR = $(DESTDIR)/var/log/munin +-LOGDIR = $(PREFIX)/log/munin +LOGDIR = /var/opt/csw/munin/log # Location of PID files and other statefiles. On the server, must be @@ -57,54 +63,54 @@ +STATEDIR = /var/opt/csw/munin/run # The perl interpreter to use --PERL = $(shell which perl) -+PERL = /opt/csw/bin/perl +-PERL := $(shell which perl) ++PERL := /opt/csw/bin/perl # The python interpreter to use (used by some plugins) --PYTHON = /usr/bin/env python -+PYTHON = /opt/csw/bin/python +-PYTHON := /usr/bin/env python ++PYTHON := /opt/csw/bin/python - # A modern (posix) shell. We're not looking for arrays, but $() and - # other modern stuff is expected. On a posix-system the expression -@@ -64,10 +66,10 @@ - GOODSH = $(shell PATH=`getconf PATH` sh -c 'type sh | sed "s/.* //"') + # The ruby interpreter to use (used by some plugins) + RUBY := /usr/bin/env ruby +@@ -95,11 +97,11 @@ + GOODSH := $(shell PATH=`getconf PATH` sh -c 'type sh | sed "s/.* //"') # Path of bash for bash specific plugins --BASH = /bin/bash -+BASH = /usr/bin/bash +-BASH := /bin/bash ++BASH := /usr/bin/bash # Server only - Where to install the perl libraries --PERLLIB = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d"'" -f2) + PERLSITELIB := $(shell $(PERL) -V:sitelib | cut -d"'" -f2) +-PERLLIB = $(DESTDIR)$(PERLSITELIB) +PERLLIB = $(shell $(PERL) -V:sitelib | cut -d"'" -f2) # Client only - Install plugins for this architecture - OSTYPE = $(shell uname | tr '[A-Z]' '[a-z]') -@@ -79,7 +81,7 @@ + OSTYPE := $(shell uname | tr '[A-Z]' '[a-z]') +@@ -111,7 +113,7 @@ # What is the safest way to create a tempfile. # Default is to figure it out by testing various methods. # Replace this with a known platform-specific method --MKTEMP = $(shell ./test-mktemp) -+MKTEMP = $(shell mktemp) +-MKTEMP := $(shell ./test-mktemp) ++MKTEMP := $(shell mktemp) # Munin version number. - VERSION = $(shell cat RELEASE) -@@ -94,9 +96,9 @@ + VERSION := $(shell ./getversion) +@@ -126,9 +128,9 @@ # Which command to use to check if the USER and GROUP to run Munin as, exists. # These will work on most modern OSes: # --GETENT = $(shell which getent || which true 2>/dev/null) --CHECKUSER = $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2")) --CHECKGROUP = $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2")) -+#GETENT = $(shell which getent || which true 2>/dev/null) -+#CHECKUSER = $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2")) -+#CHECKGROUP = $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2")) +-GETENT := $(shell which getent || which true 2>/dev/null) +-CHECKUSER := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) +-CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) ++#GETENT := $(shell which getent || which true 2>/dev/null) ++#CHECKUSER := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) ++#CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) # For OSX, comment out the previous two lines and comment in these # -@@ -117,5 +119,5 @@ - CHGRP = chgrp +@@ -159,4 +161,4 @@ + JCVALID := $(shell $(JC) -version >/dev/null 2>/dev/null && echo "yes") # Check whether setruid functionality can be used --HASSETR = $(shell perl -e 'use Config; my @vars=("d_setruid", "d_setreuid", "d_setresuid"); foreach my $$var (@vars) { if ($$Config{$$var} eq "define") { print "1\n"; exit 0; } } print "0\n"; exit 0;' ) -+HASSETR = $(shell /opt/csw/bin/perl -e 'use Config; my @vars=("d_setruid", "d_setreuid", "d_setresuid"); foreach my $$var (@vars) { if ($$Config{$$var} eq "define") { print "1\n"; exit 0; } } print "0\n"; exit 0;' ) - +-HASSETR := $(shell perl -e 'use Config; my @vars=("d_setruid", "d_setreuid", "d_setresuid"); foreach my $$var (@vars) { if ($$Config{$$var} eq "define") { print "1\n"; exit 0; } } print "0\n"; exit 0;' ) ++HASSETR := $(shell /opt/csw/bin/perl -e 'use Config; my @vars=("d_setruid", "d_setreuid", "d_setresuid"); foreach my $$var (@vars) { if ($$Config{$$var} eq "define") { print "1\n"; exit 0; } } print "0\n"; exit 0;' ) Modified: csw/mgar/pkg/munin/trunk/files/makefile.diff =================================================================== --- csw/mgar/pkg/munin/trunk/files/makefile.diff 2009-11-28 19:54:43 UTC (rev 7500) +++ csw/mgar/pkg/munin/trunk/files/makefile.diff 2009-11-28 20:17:10 UTC (rev 7501) @@ -1,293 +1,167 @@ -diff --speed-large-files --minimal -Nru munin-1.3.4.orig/Makefile munin-1.3.4/Makefile ---- munin-1.3.4.orig/Makefile 2008-03-08 07:50:16.000000000 +0100 -+++ munin-1.3.4/Makefile 2009-07-01 23:52:36.445587463 +0200 -@@ -28,74 +28,71 @@ +diff --speed-large-files --minimal -Nru munin-1.4.0.orig/Makefile munin-1.4.0/Makefile +--- munin-1.4.0.orig/Makefile 2009-11-27 12:17:18.000000000 +0100 ++++ munin-1.4.0/Makefile 2009-11-28 18:13:47.250778081 +0100 +@@ -49,8 +49,8 @@ # This removes the installed config so that the next install-pass installs - # a new config. Target suitable for maintainers + # a new config. Target _only_ suitable for maintainers. unconfig: - rm -f $(HTMLDIR)/.htaccess - rm -f $(CONFDIR)/munin.conf + rm -f $(DESTDIR)$(HTMLDIR)/.htaccess + rm -f $(DESTDIR)$(CONFDIR)/munin.conf - install-main: build -- $(CHECKUSER) + tags: + -rm -f TAGS +@@ -66,50 +66,47 @@ + + install-pre: Makefile Makefile.config + @$(CHECKUSER) +- mkdir -p $(LOGDIR) +- mkdir -p $(STATEDIR) +- mkdir -p $(CONFDIR) +- $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) ++ mkdir -p $(DESTDIR)$(LOGDIR) ++ mkdir -p $(DESTDIR)$(STATEDIR) ++ mkdir -p $(DESTDIR)$(CONFDIR) + + install-master-prime: $(INFILES_MASTER) install-pre install-master - mkdir -p $(CONFDIR)/templates +- mkdir -p $(CONFDIR)/templates/partial +- mkdir -p $(CONFDIR)/munin-conf.d - mkdir -p $(LIBDIR) - mkdir -p $(BINDIR) - mkdir -p $(PERLLIB) -- -- mkdir -p $(LOGDIR) -- mkdir -p $(STATEDIR) +- mkdir -p $(PERLLIB)/Munin/Master - mkdir -p $(HTMLDIR) - mkdir -p $(DBDIR) - mkdir -p $(CGIDIR) +- +- $(CHOWN) $(USER) $(HTMLDIR) $(DBDIR) + mkdir -p $(DESTDIR)$(CONFDIR)/templates ++ mkdir -p $(DESTDIR)$(CONFDIR)/templates/partial ++ mkdir -p $(DESTDIR)$(CONFDIR)/munin-conf.d + mkdir -p $(DESTDIR)$(LIBDIR) + mkdir -p $(DESTDIR)$(BINDIR) + mkdir -p $(DESTDIR)$(PERLLIB) - -- $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(RUNDIR) $(HTMLDIR) $(DBDIR) -+ mkdir -p $(DESTDIR)$(LOGDIR) -+ mkdir -p $(DESTDIR)$(STATEDIR) ++ mkdir -p $(DESTDIR)$(PERLLIB)/Munin/Master + mkdir -p $(DESTDIR)$(HTMLDIR) + mkdir -p $(DESTDIR)$(DBDIR) + mkdir -p $(DESTDIR)$(CGIDIR) - for p in build/server/*.tmpl; do \ + for p in master/www/*.tmpl master/www/*.png master/www/*.css resources/favicon.ico; do \ - $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \ + $(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/ ; \ done -- $(INSTALL) -m 0644 server/logo.png $(CONFDIR)/templates/ -- $(INSTALL) -m 0644 server/style.css $(CONFDIR)/templates/ -- $(INSTALL) -m 0644 server/definitions.html $(CONFDIR)/templates/ -- $(INSTALL) -m 0755 server/VeraMono.ttf $(LIBDIR)/ -- $(INSTALL) -m 0644 resources/favicon.ico $(HTMLDIR)/ -- test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/server/munin-htaccess $(HTMLDIR)/.htaccess -- test -f "$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/server/munin.conf $(CONFDIR)/ -- $(INSTALL) -m 0755 build/server/munin-cron $(BINDIR)/ -- $(INSTALL) -m 0755 build/server/munin-check $(BINDIR)/ -- $(INSTALL) -m 0755 build/server/munin-update $(LIBDIR)/ -- $(INSTALL) -m 0755 build/server/munin-graph $(LIBDIR)/ -- $(INSTALL) -m 0755 build/server/munin-html $(LIBDIR)/ -- $(INSTALL) -m 0755 build/server/munin-limits $(LIBDIR)/ -- $(INSTALL) -m 0755 build/server/munin-cgi-graph $(CGIDIR)/ -- $(INSTALL) -m 0644 build/server/Munin.pm $(PERLLIB)/ -+ $(INSTALL) -m 0644 server/logo.png $(DESTDIR)$(CONFDIR)/templates/ -+ $(INSTALL) -m 0644 server/style.css $(DESTDIR)$(CONFDIR)/templates/ -+ $(INSTALL) -m 0644 server/definitions.html $(DESTDIR)$(CONFDIR)/templates/ -+ $(INSTALL) -m 0755 server/VeraMono.ttf $(DESTDIR)$(LIBDIR)/ -+ $(INSTALL) -m 0644 resources/favicon.ico $(DESTDIR)$(HTMLDIR)/ -+ test -f $(DESTDIR)$(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/server/munin-htaccess $(DESTDIR)$(HTMLDIR)/.htaccess -+ test -f "$(DESTDIR)$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/server/munin.conf $(DESTDIR)$(CONFDIR)/ -+ $(INSTALL) -m 0755 build/server/munin-cron $(DESTDIR)$(BINDIR)/ -+ $(INSTALL) -m 0755 build/server/munin-check $(DESTDIR)$(BINDIR)/ -+ $(INSTALL) -m 0755 build/server/munin-update $(DESTDIR)$(LIBDIR)/ -+ $(INSTALL) -m 0755 build/server/munin-graph $(DESTDIR)$(LIBDIR)/ -+ $(INSTALL) -m 0755 build/server/munin-html $(DESTDIR)$(LIBDIR)/ -+ $(INSTALL) -m 0755 build/server/munin-limits $(DESTDIR)$(LIBDIR)/ -+ $(INSTALL) -m 0755 build/server/munin-cgi-graph $(DESTDIR)$(CGIDIR)/ -+ $(INSTALL) -m 0644 build/server/Munin.pm $(DESTDIR)$(PERLLIB)/ - uninstall-main: build - for p in build/server/*.tmpl; do \ -- rm -f $(CONFDIR)/templates/"$$p" ; \ -+ rm -f $(DESTDIR)$(CONFDIR)/templates/"$$p" ; \ + for p in master/www/partial/*.tmpl; do \ +- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/partial/ ; \ ++ $(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/partial/ ; \ done -- rm -f $(CONFDIR)/templates/logo.png -- rm -f $(CONFDIR)/templates/style.css -- rm -f $(CONFDIR)/templates/definitions.html -- rm -f $(HTMLDIR)/.htaccess -+ rm -f $(DESTDIR)$(CONFDIR)/templates/logo.png -+ rm -f $(DESTDIR)$(CONFDIR)/templates/style.css -+ rm -f $(DESTDIR)$(CONFDIR)/templates/definitions.html -+ rm -f $(DESTDIR)$(HTMLDIR)/.htaccess -- rm -f $(CONFDIR)/munin.conf -+ rm -f $(DESTDIR)$(CONFDIR)/munin.conf +- $(INSTALL) -m 0644 master/www/definitions.html $(CONFDIR)/templates/ +- $(INSTALL) -m 0755 master/VeraMono.ttf $(LIBDIR)/ ++ $(INSTALL) -m 0644 master/www/definitions.html $(DESTDIR)$(CONFDIR)/templates/ ++ $(INSTALL) -m 0755 master/VeraMono.ttf $(DESTDIR)$(LIBDIR)/ -- rm -f $(BINDIR)/munin-cron -- rm -f $(BINDIR)/munin-check -+ rm -f $(DESTDIR)$(BINDIR)/munin-cron -+ rm -f $(DESTDIR)$(BINDIR)/munin-check +- test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess +- test -f "$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/master/munin.conf $(CONFDIR)/ ++ test -f $(DESTDIR)$(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(DESTDIR)$(HTMLDIR)/.htaccess ++ test -f "$(DESTDIR)$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/master/munin.conf $(DESTDIR)$(CONFDIR)/ -- rm -f $(LIBDIR)/munin-update -- rm -f $(LIBDIR)/munin-graph -- rm -f $(LIBDIR)/munin-html -- rm -f $(LIBDIR)/munin-limits -+ rm -f $(DESTDIR)$(LIBDIR)/munin-update -+ rm -f $(DESTDIR)$(LIBDIR)/munin-graph -+ rm -f $(DESTDIR)$(LIBDIR)/munin-html -+ rm -f $(DESTDIR)$(LIBDIR)/munin-limits - rm -f $(CGIDIR)/munin-cgi-graph +- $(INSTALL) -m 0755 build/master/_bin/munin-cron $(BINDIR)/ +- $(INSTALL) -m 0755 build/master/_bin/munin-check $(BINDIR)/ +- $(INSTALL) -m 0755 build/master/_bin/munin-update $(LIBDIR)/ +- $(INSTALL) -m 0755 build/master/_bin/munin-graph $(LIBDIR)/ +- $(INSTALL) -m 0755 build/master/_bin/munin-html $(LIBDIR)/ +- $(INSTALL) -m 0755 build/master/_bin/munin-limits $(LIBDIR)/ +- $(INSTALL) -m 0755 build/master/_bin/munin-cgi-graph $(CGIDIR)/ +- $(INSTALL) -m 0755 build/master/_bin/munin-fastcgi-graph $(CGIDIR)/ ++ $(INSTALL) -m 0755 build/master/_bin/munin-cron $(DESTDIR)$(BINDIR)/ ++ $(INSTALL) -m 0755 build/master/_bin/munin-check $(DESTDIR)$(BINDIR)/ ++ $(INSTALL) -m 0755 build/master/_bin/munin-update $(DESTDIR)$(LIBDIR)/ ++ $(INSTALL) -m 0755 build/master/_bin/munin-graph $(DESTDIR)$(LIBDIR)/ ++ $(INSTALL) -m 0755 build/master/_bin/munin-html $(DESTDIR)$(LIBDIR)/ ++ $(INSTALL) -m 0755 build/master/_bin/munin-limits $(DESTDIR)$(LIBDIR)/ ++ $(INSTALL) -m 0755 build/master/_bin/munin-cgi-graph $(DESTDIR)$(CGIDIR)/ ++ $(INSTALL) -m 0755 build/master/_bin/munin-fastcgi-graph $(DESTDIR)$(CGIDIR)/ -- rm -f $(PERLLIB)/Munin.pm -- -rmdir $(CONFDIR)/templates -- -rmdir $(CONFDIR) -- -rmdir $(LIBDIR) -- -rmdir $(BINDIR) -+ rm -f $(DESTDIR)$(PERLLIB)/Munin.pm -+ -rmdir $(DESTDIR)$(CONFDIR)/templates -+ -rmdir $(DESTDIR)$(CONFDIR) -+ -rmdir $(DESTDIR)$(LIBDIR) -+ -rmdir $(DESTDIR)$(BINDIR) + # Not ready to be installed yet +-# $(INSTALL) -m 0755 build/master/_bin/munin-gather $(LIBDIR)/ ++# $(INSTALL) -m 0755 build/master/_bin/munin-gather $(DESTDIR)$(LIBDIR)/ -- -rmdir $(LOGDIR) -- -rmdir $(STATEDIR) -- -rmdir $(HTMLDIR) -- -rmdir $(DBDIR) -- -rmdir $(CGIDIR) -+ -rmdir $(DESTDIR)$(LOGDIR) -+ -rmdir $(DESTDIR)$(STATEDIR) -+ -rmdir $(DESTDIR)$(HTMLDIR) -+ -rmdir $(DESTDIR)$(DBDIR) -+ -rmdir $(DESTDIR)$(CGIDIR) + # ALWAYS DO THE OS SPECIFIC PLUGINS LAST! THAT WAY THEY OVERWRITE THE + # GENERIC ONES +@@ -120,28 +117,24 @@ + install-plugins-prime: install-plugins build $(PLUGINS) Makefile Makefile.config + @$(CHECKGROUP) - install-node: build install-node-non-snmp install-node-snmp install-munindoc - echo Done. -@@ -104,44 +101,43 @@ - echo Undone. - - install-node-snmp: build -- $(INSTALL) -m 0755 build/node/munin-node-configure-snmp $(SBINDIR)/ -+ $(INSTALL) -m 0755 build/node/munin-node-configure-snmp $(DESTDIR)$(SBINDIR)/ - - install-munindoc: build -- $(INSTALL) -m 0755 build/node/munindoc $(BINDIR)/ -+ $(INSTALL) -m 0755 build/node/munindoc $(DESTDIR)$(BINDIR)/ - - uninstall-node-snmp: build -- rm -f $(SBINDIR)/munin-node-configure-snmp -- -rmdir $(SBINDIR) -+ rm -f $(DESTDIR)$(SBINDIR)/munin-node-configure-snmp -+ -rmdir $(DESTDIR)$(SBINDIR) - - install-node-non-snmp: build - $(CHECKGROUP) - mkdir -p $(CONFDIR)/plugins - mkdir -p $(CONFDIR)/plugin-conf.d - mkdir -p $(LIBDIR)/plugins -- mkdir -p $(SBINDIR) -- mkdir -p $(PERLLIB)/Munin/Plugin + mkdir -p $(DESTDIR)$(CONFDIR)/plugins + mkdir -p $(DESTDIR)$(CONFDIR)/plugin-conf.d + mkdir -p $(DESTDIR)$(LIBDIR)/plugins -+ mkdir -p $(DESTDIR)$(SBINDIR) -+ mkdir -p $(DESTDIR)$(PERLLIB)/Munin/Plugin + mkdir -p $(PLUGSTATE) -- mkdir -p $(LOGDIR) -- mkdir -p $(STATEDIR) -- mkdir -p $(PLUGSTATE) -+ mkdir -p $(DESTDIR)$(LOGDIR) -+ mkdir -p $(DESTDIR)$(STATEDIR) -+ mkdir -p $(DESTDIR)$(PLUGSTATE) - - $(CHOWN) $(PLUGINUSER):$(GROUP) $(PLUGSTATE) - $(CHMOD) 0775 $(PLUGSTATE) - $(CHMOD) 0755 $(CONFDIR)/plugin-conf.d -+ $(CHMOD) 0775 $(DESTDIR)$(PLUGSTATE) -+ $(CHMOD) 0755 $(DESTDIR)$(CONFDIR)/plugin-conf.d - -- $(INSTALL) -m 0755 build/node/munin-node $(SBINDIR)/ -- $(INSTALL) -m 0755 build/node/munin-node-configure $(SBINDIR)/ -- test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/ -- $(INSTALL) -m 0755 build/node/munin-run $(SBINDIR)/ -+ $(INSTALL) -m 0755 build/node/munin-node $(DESTDIR)$(SBINDIR)/ -+ $(INSTALL) -m 0755 build/node/munin-node-configure $(DESTDIR)$(SBINDIR)/ -+ test -f "$(DESTDIR)$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(DESTDIR)$(CONFDIR)/ -+ $(INSTALL) -m 0755 build/node/munin-run $(DESTDIR)$(SBINDIR)/ - - uninstall-node-non-snmp: build -- rm -f $(SBINDIR)/munin-node -- rm -f $(SBINDIR)/munin-node-configure -- rm -f $(CONFDIR)/munin-node.conf -- rm -f $(SBINDIR)/munin-run -- -rmdir $(CONFDIR)/plugin-conf.d -- -rmdir $(CONFDIR) -- -rmdir $(SBINDIR) -+ rm -f $(DESTDIR)$(SBINDIR)/munin-node -+ rm -f $(DESTDIR)$(SBINDIR)/munin-node-configure -+ rm -f $(DESTDIR)$(CONFDIR)/munin-node.conf -+ rm -f $(DESTDIR)$(SBINDIR)/munin-run -+ -rmdir $(DESTDIR)$(CONFDIR)/plugin-conf.d -+ -rmdir $(DESTDIR)$(CONFDIR) -+ -rmdir $(DESTDIR)$(SBINDIR) - - - # ALWAYS DO THE OS SPECIFIC PLUGINS LAST! THAT WAY THEY OVERWRITE THE -@@ -156,67 +152,67 @@ - if echo $(INSTALL_PLUGINS) | \ - grep $$family >/dev/null; then \ - echo Installing $$p; \ -- $(INSTALL) -m 0755 $$p $(LIBDIR)/plugins/; \ -+ $(INSTALL) -m 0755 $$p $(DESTDIR)$(LIBDIR)/plugins/; \ - fi; \ - fi \ +- + for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \ + if test -f "$$p" ; then \ + echo Installing $$p; \ +- $(INSTALL) -m 0755 $$p $(LIBDIR)/plugins/; \ ++ $(INSTALL) -m 0755 $$p $(DESTDIR)$(LIBDIR)/plugins/; \ + fi \ done - -mv $(LIBDIR)/plugins/*.adv $(LIBDIR) -- -mkdir -p $(PLUGSTATE) -- $(CHOWN) $(PLUGINUSER):$(GROUP) $(PLUGSTATE) -- $(CHMOD) 0775 $(PLUGSTATE) -- $(INSTALL) -m 0644 build/node/plugins.history $(LIBDIR)/plugins/ -- $(INSTALL) -m 0644 build/node/plugin.sh $(LIBDIR)/plugins/ -- mkdir -p $(PERLLIB)/Munin -- $(INSTALL) -m 0644 build/node/Plugin.pm $(PERLLIB)/Munin/ -+ #-mv $(DESTDIR)$(LIBDIR)/plugins/*.adv $(LIBDIR) -+ -mkdir -p $(DESTDIR)$(PLUGSTATE) -+ #$(CHOWN) $(PLUGINUSER):$(GROUP) $(DESTDIR)$(PLUGSTATE) -+ $(CHMOD) 0775 $(DESTDIR)$(PLUGSTATE) -+ $(INSTALL) -m 0644 build/node/plugins.history $(DESTDIR)$(LIBDIR)/plugins/ -+ $(INSTALL) -m 0644 build/node/plugin.sh $(DESTDIR)$(LIBDIR)/plugins/ -+ mkdir -p $(DESTDIR)$(PERLLIB)/Munin -+ $(INSTALL) -m 0644 build/node/Plugin.pm $(DESTDIR)$(PERLLIB)/Munin/ +- $(INSTALL) -m 0644 build/plugins/plugins.history $(LIBDIR)/plugins/ +- $(INSTALL) -m 0644 build/plugins/plugin.sh $(LIBDIR)/plugins/ ++ -mv $(DESTDIR)$(LIBDIR)/plugins/*.adv $(DESTDIR)$(LIBDIR) ++ $(INSTALL) -m 0644 build/plugins/plugins.history $(DESTDIR)$(LIBDIR)/plugins/ ++ $(INSTALL) -m 0644 build/plugins/plugin.sh $(DESTDIR)$(LIBDIR)/plugins/ - uninstall-node-plugins: build $(PLUGINS) - for p in build/node/node.d.$(OSTYPE)/* build/node/node.d/*; do \ -- rm -f $(LIBDIR)/plugins/`basename $$p` \ -+ rm -f $(DESTDIR)$(LIBDIR)/plugins/`basename $$p` \ - done -- rm -f $(LIBDIR)/plugins/plugins.history -- rm -f $(LIBDIR)/plugins/plugin.sh -- -rm -f $(LIBDIR)/*.adv -+ rm -f $(DESTDIR)$(LIBDIR)/plugins/plugins.history -+ rm -f $(DESTDIR)$(LIBDIR)/plugins/plugin.sh -+ -rm -f $(DESTDIR)$(LIBDIR)/*.adv + install-plugins-java: build-plugins-java +- mkdir -p $(JAVALIBDIR) +- $(INSTALL) -m 0644 build/plugins/javalib/munin-jmx-plugins.jar $(JAVALIBDIR)/ ++ mkdir -p $(DESTDIR)$(JAVALIBDIR) ++ $(INSTALL) -m 0644 build/plugins/javalib/munin-jmx-plugins.jar $(DESTDIR)$(JAVALIBDIR)/ #TODO: # configure plugins. Or not. Better done under the direction of the installer - # or the packager. +@@ -150,30 +143,30 @@ + install-node-prime: install-node-pre install-node + install-node-pre: build/node/munin-node.conf install-pre +- test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/ ++ test -f "$(DESTDIR)$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(DESTDIR)$(CONFDIR)/ + + + install-common-prime: build-common install-common + + install-man: build-man Makefile Makefile.config - mkdir -p $(MANDIR)/man1 $(MANDIR)/man5 $(MANDIR)/man8 - $(INSTALL) -m 0644 build/doc/munin-node.conf.5 $(MANDIR)/man5/ - $(INSTALL) -m 0644 build/doc/munin.conf.5 $(MANDIR)/man5/ -- $(INSTALL) -m 0644 build/doc/munin-node.8 $(MANDIR)/man8/ -- $(INSTALL) -m 0644 build/doc/munin-node-configure.8 $(MANDIR)/man8/ -- $(INSTALL) -m 0644 build/doc/munin-node-configure-snmp.8 $(MANDIR)/man8/ -- $(INSTALL) -m 0644 build/doc/munin-run.8 $(MANDIR)/man8/ - $(INSTALL) -m 0644 build/doc/munin-graph.8 $(MANDIR)/man8/ - $(INSTALL) -m 0644 build/doc/munin-update.8 $(MANDIR)/man8/ - $(INSTALL) -m 0644 build/doc/munin-limits.8 $(MANDIR)/man8/ - $(INSTALL) -m 0644 build/doc/munin-html.8 $(MANDIR)/man8/ - $(INSTALL) -m 0644 build/doc/munin-cron.8 $(MANDIR)/man8/ +- $(INSTALL) -m 0644 build/doc/munin-check.8 $(MANDIR)/man8/ +- $(INSTALL) -m 0644 build/doc/munin.8 $(MANDIR)/man8/ + mkdir -p $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man8 + $(INSTALL) -m 0644 build/doc/munin-node.conf.5 $(DESTDIR)$(MANDIR)/man5/ + $(INSTALL) -m 0644 build/doc/munin.conf.5 $(DESTDIR)$(MANDIR)/man5/ -+ $(INSTALL) -m 0644 build/doc/munin-node.8 $(DESTDIR)$(MANDIR)/man8/ -+ $(INSTALL) -m 0644 build/doc/munin-node-configure.8 $(DESTDIR)$(MANDIR)/man8/ -+ $(INSTALL) -m 0644 build/doc/munin-node-configure-snmp.8 $(DESTDIR)$(MANDIR)/man8/ -+ $(INSTALL) -m 0644 build/doc/munin-run.8 $(DESTDIR)$(MANDIR)/man8/ + $(INSTALL) -m 0644 build/doc/munin-graph.8 $(DESTDIR)$(MANDIR)/man8/ + $(INSTALL) -m 0644 build/doc/munin-update.8 $(DESTDIR)$(MANDIR)/man8/ + $(INSTALL) -m 0644 build/doc/munin-limits.8 $(DESTDIR)$(MANDIR)/man8/ + $(INSTALL) -m 0644 build/doc/munin-html.8 $(DESTDIR)$(MANDIR)/man8/ + $(INSTALL) -m 0644 build/doc/munin-cron.8 $(DESTDIR)$(MANDIR)/man8/ ++ $(INSTALL) -m 0644 build/doc/munin-check.8 $(DESTDIR)$(MANDIR)/man8/ ++ $(INSTALL) -m 0644 build/doc/munin.8 $(DESTDIR)$(MANDIR)/man8/ - uninstall-man: build-man -- rm -f $(MANDIR)/man5/munin-node.conf.5 -- rm -f $(MANDIR)/man5/munin.conf.5 -- rm -f $(MANDIR)/man8/munin-node.8 -- rm -f $(MANDIR)/man8/munin-node-configure.8 -- rm -f $(MANDIR)/man8/munin-node-configure-snmp.8 -- rm -f $(MANDIR)/man8/munin-run.8 -- rm -f $(MANDIR)/man8/munin-graph.8 -- rm -f $(MANDIR)/man8/munin-update.8 -- rm -f $(MANDIR)/man8/munin-limits.8 -- rm -f $(MANDIR)/man8/munin-html.8 -- rm -f $(MANDIR)/man8/munin-cron.8 -- -rmdir $(MANDIR)/man1 $(MANDIR)/man5 $(MANDIR)/man8 $(MANDIR) -+ rm -f $(DESTDIR)$(MANDIR)/man5/munin-node.conf.5 -+ rm -f $(DESTDIR)$(MANDIR)/man5/munin.conf.5 -+ rm -f $(DESTDIR)$(MANDIR)/man8/munin-node.8 -+ rm -f $(DESTDIR)$(MANDIR)/man8/munin-node-configure.8 -+ rm -f $(DESTDIR)$(MANDIR)/man8/munin-node-configure-snmp.8 -+ rm -f $(DESTDIR)$(MANDIR)/man8/munin-run.8 -+ rm -f $(DESTDIR)$(MANDIR)/man8/munin-graph.8 -+ rm -f $(DESTDIR)$(MANDIR)/man8/munin-update.8 -+ rm -f $(DESTDIR)$(MANDIR)/man8/munin-limits.8 -+ rm -f $(DESTDIR)$(MANDIR)/man8/munin-html.8 -+ rm -f $(DESTDIR)$(MANDIR)/man8/munin-cron.8 -+ -rmdir $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR) install-doc: build-doc - mkdir -p $(DOCDIR)/resources @@ -299,18 +173,14 @@ + $(INSTALL) -m 0644 COPYING $(DESTDIR)$(DOCDIR)/ + $(INSTALL) -m 0644 build/resources/* $(DESTDIR)$(DOCDIR)/resources - uninstall-doc: build-doc -- rm -rf $(DOCDIR) -+ rm -rf $(DESTDIR)$(DOCDIR) + ###################################################################### - build: build-stamp - -@@ -363,20 +359,20 @@ +@@ -370,20 +363,20 @@ $(MAKE) $@ CONFIG=t/Makefile.config else test_plugins = id_default id_root env --test: t/*.t t/install $(addprefix $(CONFDIR)/plugins/,$(test_plugins)) -+test: t/*.t t/install $(addprefix $(DESTDIR)$(CONFDIR)/plugins/,$(test_plugins)) +-old-test: t/*.t t/install $(addprefix $(CONFDIR)/plugins/,$(test_plugins)) ++old-test: t/*.t t/install $(addprefix $(DESTDIR)$(CONFDIR)/plugins/,$(test_plugins)) @for test in t/*.t; do \ echo -n "$$test: "; \ - PERL5LIB=$(PERLLIB) $(PERL) $$test;\ @@ -334,3 +204,22 @@ echo 'Done?' t/install: +@@ -407,12 +400,12 @@ + # can't seem to find a way to persuade it to write otherwhere. + install-%: %/Build + cd $* && $(PERL) Build install \ +- --install_path lib=$(PERLLIB) \ +- --install_path bin=$(BINDIR) \ +- --install_path script=$(BINDIR) \ +- --install_path sbin=$(SBINDIR) \ +- --install_path bindoc=$(MANDIR)/man1 \ +- --install_path libdoc=$(MANDIR)/man3 \ ++ --install_path lib=$(DESTDIR)$(PERLLIB) \ ++ --install_path bin=$(DESTDIR)$(BINDIR) \ ++ --install_path script=$(DESTDIR)$(BINDIR) \ ++ --install_path sbin=$(DESTDIR)$(SBINDIR) \ ++ --install_path bindoc=$(DESTDIR)$(MANDIR)/man1 \ ++ --install_path libdoc=$(DESTDIR)$(MANDIR)/man3 \ + + test-%: %/Build + cd $* && $(PERL) Build test || true Modified: csw/mgar/pkg/munin/trunk/files/munin-graph.in.diff =================================================================== --- csw/mgar/pkg/munin/trunk/files/munin-graph.in.diff 2009-11-28 19:54:43 UTC (rev 7500) +++ csw/mgar/pkg/munin/trunk/files/munin-graph.in.diff 2009-11-28 20:17:10 UTC (rev 7501) @@ -1,16 +1,18 @@ -diff --speed-large-files --minimal -Nru munin-1.3.4.orig/server/munin-graph.in munin-1.3.4/server/munin-graph.in ---- munin-1.3.4.orig/server/munin-graph.in 2008-03-08 02:42:40.000000000 +0100 -+++ munin-1.3.4/server/munin-graph.in 2009-08-13 20:59:35.901535076 +0200 -@@ -827,9 +827,9 @@ - my @complete = (); - if ($RRDkludge) { - push (@complete, -- '--font' ,'LEGEND:7:@@LIBDIR@@/VeraMono.ttf', -- '--font' ,'UNIT:7:@@LIBDIR@@/VeraMono.ttf', -- '--font' ,'AXIS:7:@@LIBDIR@@/VeraMono.ttf'); -+ '--font' ,'LEGEND:7:@@LIBDIR@@/monospace', -+ '--font' ,'UNIT:7:/opt/csw/share/munin/fonts/VeraMono.ttf', -+ '--font' ,'AXIS:7:/opt/csw/share/munin/fonts/VeraMono.ttf'); - } - push(@complete,'-W', $watermark) if $RRDs::VERSION >= 1.2; +diff --speed-large-files --minimal -Nru munin-1.4.0.orig/master/_bin/munin-graph.in munin-1.4.0/master/_bin/munin-graph.in +--- munin-1.4.0.orig/master/_bin/munin-graph.in 2009-11-27 12:17:18.000000000 +0100 ++++ munin-1.4.0/master/_bin/munin-graph.in 2009-11-28 13:41:02.135025435 +0100 +@@ -135,10 +135,10 @@ + =head1 FILES + +- @@CONFDIR@@/munin.conf +- @@DBDIR@@/* +- @@LOGDIR@@/munin-graph +- @@STATEDIR@@/* ++ /etc/opt/csw/munin/munin.conf ++ /var/opt/csw/munin/* ++ /var/opt/csw/munin/munin-graph ++ /var/opt/csw/munin/* + + =head1 AUTHORS + Modified: csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.diff =================================================================== --- csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.diff 2009-11-28 19:54:43 UTC (rev 7500) +++ csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.diff 2009-11-28 20:17:10 UTC (rev 7501) @@ -1,7 +1,7 @@ -diff --speed-large-files --minimal -Nru munin-1.3.4.orig/node/munin-node.conf.in munin-1.3.4/node/munin-node.conf.in ---- munin-1.3.4.orig/node/munin-node.conf.in 2008-03-08 02:42:39.000000000 +0100 -+++ munin-1.3.4/node/munin-node.conf.in 2009-07-05 08:45:56.286530895 +0200 -@@ -25,7 +25,7 @@ +diff --speed-large-files --minimal -Nru munin-1.4.0.orig/node/munin-node.conf.in munin-1.4.0/node/munin-node.conf.in +--- munin-1.4.0.orig/node/munin-node.conf.in 2009-11-27 12:17:13.000000000 +0100 ++++ munin-1.4.0/node/munin-node.conf.in 2009-11-28 11:59:12.681167885 +0100 +@@ -26,7 +26,7 @@ # Set this if the client doesn't report the correct hostname when # telnetting to localhost, port 4949 # @@ -9,4 +9,4 @@ +#host_name yourhostname # A list of addresses that are allowed to connect. This must be a - # regular expression, due to brain damage in Net::Server, which + # regular expression, since Net::Server does not understand CIDR-style Deleted: csw/mgar/pkg/munin/trunk/files/munin-update.in.diff =================================================================== --- csw/mgar/pkg/munin/trunk/files/munin-update.in.diff 2009-11-28 19:54:43 UTC (rev 7500) +++ csw/mgar/pkg/munin/trunk/files/munin-update.in.diff 2009-11-28 20:17:10 UTC (rev 7501) @@ -1,12 +0,0 @@ -diff --speed-large-files --minimal -Nru munin-1.3.4.orig/server/munin-update.in munin-1.3.4/server/munin-update.in ---- munin-1.3.4.orig/server/munin-update.in 2008-03-08 02:42:40.000000000 +0100 -+++ munin-1.3.4/server/munin-update.in 2009-07-07 22:15:31.832187072 +0200 -@@ -931,7 +931,7 @@ - eval { - local $SIG{ALRM} = sub { die "Could not run list on $name ($fetchdomain): $!\n"}; - alarm 5; # Should be enough to check the list -- write_socket_single ($socket, "list $fetchdomain\n"); -+ write_socket_single ($socket, "list $name\n"); - my $list = read_socket_single ($socket); - exit 1 unless defined $list; - chomp $list; Modified: csw/mgar/pkg/munin/trunk/files/munin.conf.in.diff =================================================================== --- csw/mgar/pkg/munin/trunk/files/munin.conf.in.diff 2009-11-28 19:54:43 UTC (rev 7500) +++ csw/mgar/pkg/munin/trunk/files/munin.conf.in.diff 2009-11-28 20:17:10 UTC (rev 7501) @@ -1,12 +1,12 @@ -diff --speed-large-files --minimal -Nru munin-1.3.4.orig/server/munin.conf.in munin-1.3.4/server/munin.conf.in ---- munin-1.3.4.orig/server/munin.conf.in 2008-03-08 02:42:40.000000000 +0100 -+++ munin-1.3.4/server/munin.conf.in 2009-07-06 00:16:45.205126727 +0200 -@@ -31,7 +31,7 @@ +diff --speed-large-files --minimal -Nru munin-1.4.0.orig/master/munin.conf.in munin-1.4.0/master/munin.conf.in +--- munin-1.4.0.orig/master/munin.conf.in 2009-11-27 12:17:18.000000000 +0100 ++++ munin-1.4.0/master/munin.conf.in 2009-11-28 12:03:14.865737210 +0100 +@@ -57,7 +57,7 @@ #contact.nagios.command /usr/bin/send_nsca nagios.host.comm -c /etc/nsca.conf # a simple host tree -[@@HOSTNAME@@] -+[HOSTNAME] ++[yourhostname] address 127.0.0.1 use_node_name yes Deleted: csw/mgar/pkg/munin/trunk/files/munindoc.in.diff =================================================================== --- csw/mgar/pkg/munin/trunk/files/munindoc.in.diff 2009-11-28 19:54:43 UTC (rev 7500) +++ csw/mgar/pkg/munin/trunk/files/munindoc.in.diff 2009-11-28 20:17:10 UTC (rev 7501) @@ -1,9 +0,0 @@ -diff --speed-large-files --minimal -Nru munin-1.3.4.orig/node/munindoc.in munin-1.3.4/node/munindoc.in ---- munin-1.3.4.orig/node/munindoc.in 2008-03-08 02:42:39.000000000 +0100 -+++ munin-1.3.4/node/munindoc.in 2009-08-02 11:31:16.881795848 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -w -+#!@@PERL@@ -w - # -*- perl -*- - # - # This script provides the basis for a plugin documentation system for Added: csw/mgar/pkg/munin/trunk/files/perl.diff =================================================================== --- csw/mgar/pkg/munin/trunk/files/perl.diff (rev 0) +++ csw/mgar/pkg/munin/trunk/files/perl.diff 2009-11-28 20:17:10 UTC (rev 7501) @@ -0,0 +1,45 @@ +diff --speed-large-files --minimal -Nru munin-1.4.0.orig/master/_bin/munin-update.in munin-1.4.0/master/_bin/munin-update.in +--- munin-1.4.0.orig/master/_bin/munin-update.in 2009-11-27 12:17:18.000000000 +0100 ++++ munin-1.4.0/master/_bin/munin-update.in 2009-11-28 19:30:06.713647230 +0100 +@@ -1,4 +1,4 @@ +-#! /usr/bin/perl ++#!@@PERL@@ + + use warnings; + use strict; +diff --speed-large-files --minimal -Nru munin-1.4.0.orig/node/bin/munindoc munin-1.4.0/node/bin/munindoc +--- munin-1.4.0.orig/node/bin/munindoc 2009-11-27 12:17:13.000000000 +0100 ++++ munin-1.4.0/node/bin/munindoc 2009-11-28 19:28:26.453064302 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -w ++#!/opt/csw/bin/perl -w + # -*- perl -*- + # + # This script provides the basis for a plugin documentation system for +diff --speed-large-files --minimal -Nru munin-1.4.0.orig/node/sbin/munin-node munin-1.4.0/node/sbin/munin-node +--- munin-1.4.0.orig/node/sbin/munin-node 2009-11-27 12:17:13.000000000 +0100 ++++ munin-1.4.0/node/sbin/munin-node 2009-11-28 19:28:26.455172374 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -wT ++#!/opt/csw/bin/perl -wT + # -*- cperl -*- + # + # Copyright (C) 2002-2009 Audun Ytterdal, Jimmy Olsen, Tore Anderson, +diff --speed-large-files --minimal -Nru munin-1.4.0.orig/node/sbin/munin-node-configure munin-1.4.0/node/sbin/munin-node-configure +--- munin-1.4.0.orig/node/sbin/munin-node-configure 2009-11-27 12:17:13.000000000 +0100 ++++ munin-1.4.0/node/sbin/munin-node-configure 2009-11-28 19:28:26.457840168 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -w ++#!/opt/csw/bin/perl -w + # -*- cperl -*- + # + # Copyright (C) 2003-2006 Jimmy Olsen, Nicolai Langfeldt. +diff --speed-large-files --minimal -Nru munin-1.4.0.orig/node/sbin/munin-run munin-1.4.0/node/sbin/munin-run +--- munin-1.4.0.orig/node/sbin/munin-run 2009-11-27 12:17:13.000000000 +0100 ++++ munin-1.4.0/node/sbin/munin-run 2009-11-28 19:28:26.459939564 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -wT ++#!/opt/csw/bin/perl -wT + # -*- perl -*- + + # Copyright (C) 2004-2009 Deleted: csw/mgar/pkg/munin/trunk/files/perlpath.diff =================================================================== --- csw/mgar/pkg/munin/trunk/files/perlpath.diff 2009-11-28 19:54:43 UTC (rev 7500) +++ csw/mgar/pkg/munin/trunk/files/perlpath.diff 2009-11-28 20:17:10 UTC (rev 7501) @@ -1,26 +0,0 @@ -diff --speed-large-files --minimal -Nru munin-1.3.4.orig/node/node.d/exim_mailstats.in munin-1.3.4/node/node.d/exim_mailstats.in ---- munin-1.3.4.orig/node/node.d/exim_mailstats.in 2008-03-08 02:42:39.000000000 +0100 -+++ munin-1.3.4/node/node.d/exim_mailstats.in 2009-08-02 11:26:39.040437174 +0200 -@@ -1,4 +1,3 @@ --#!/usr/bin/perl -w - #!@@PERL@@ -w - # -*- perl -*- - -diff --speed-large-files --minimal -Nru munin-1.3.4.orig/node/node.d/lpstat.in munin-1.3.4/node/node.d/lpstat.in ---- munin-1.3.4.orig/node/node.d/lpstat.in 2008-03-08 02:42:39.000000000 +0100 -+++ munin-1.3.4/node/node.d/lpstat.in 2009-08-02 11:26:48.080049173 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -+#!@@PERL@@ -w - ############################################################################# - # # - # This script was initially developed by Anstat Pty Ltd for internal use # -diff --speed-large-files --minimal -Nru munin-1.3.4.orig/node/node.d/snmp__cpuload.in munin-1.3.4/node/node.d/snmp__cpuload.in ---- munin-1.3.4.orig/node/node.d/snmp__cpuload.in 2008-03-08 02:42:39.000000000 +0100 -+++ munin-1.3.4/node/node.d/snmp__cpuload.in 2009-08-02 11:26:57.614639171 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -w -+#!@@PERL@@ -w - # - # Copyright (C) 2006 Lars Strand - # Modified: csw/mgar/pkg/munin/trunk/files/sunos_memory.in.diff =================================================================== --- csw/mgar/pkg/munin/trunk/files/sunos_memory.in.diff 2009-11-28 19:54:43 UTC (rev 7500) +++ csw/mgar/pkg/munin/trunk/files/sunos_memory.in.diff 2009-11-28 20:17:10 UTC (rev 7501) @@ -1,10 +1,19 @@ -diff --speed-large-files --minimal -Nru munin-1.3.4.orig/node/node.d.sunos/memory.in munin-1.3.4/node/node.d.sunos/memory.in ---- munin-1.3.4.orig/node/node.d.sunos/memory.in 2008-03-08 02:42:39.000000000 +0100 -+++ munin-1.3.4/node/node.d.sunos/memory.in 2009-07-03 11:50:10.815859151 +0200 -@@ -11,7 +11,7 @@ - # FIXME1: Reporting size in MB is Wrong. Report bytes and let rrd scale units - # FIXME2: Using kstat would be much better! +diff --speed-large-files --minimal -Nru munin-1.4.0.orig/plugins/node.d.sunos/memory.in munin-1.4.0/plugins/node.d.sunos/memory.in +--- munin-1.4.0.orig/plugins/node.d.sunos/memory.in 2009-11-27 12:17:12.000000000 +0100 ++++ munin-1.4.0/plugins/node.d.sunos/memory.in 2009-11-28 11:53:12.048911726 +0100 +@@ -15,7 +15,7 @@ + =item top + +-The path to "top" (Default: "/usr/local/bin/top") ++The path to "top" (Default: "/opt/csw/bin/top") + + =back + +@@ -50,7 +50,7 @@ + + . $MUNIN_LIBDIR/plugins/plugin.sh + -TOP=${top:-/usr/local/bin/top} +TOP=${top:-/opt/csw/bin/top} 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 Nov 28 17:13:32 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 28 Nov 2009 16:13:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7499] csw/mgar/pkg/nss/branches/upstream-work/ Message-ID: Revision: 7499 http://gar.svn.sourceforge.net/gar/?rev=7499&view=rev Author: wahwah Date: 2009-11-28 16:13:32 +0000 (Sat, 28 Nov 2009) Log Message: ----------- Removing the merged NSS branch. Removed Paths: ------------- csw/mgar/pkg/nss/branches/upstream-work/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Nov 29 18:26:07 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 29 Nov 2009 17:26:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7504] csw/mgar/pkg/x11/lib Message-ID: Revision: 7504 http://gar.svn.sourceforge.net/gar/?rev=7504&view=rev Author: wbonnet Date: 2009-11-29 17:26:05 +0000 (Sun, 29 Nov 2009) Log Message: ----------- Upgrade to 7.5RC Modified Paths: -------------- csw/mgar/pkg/x11/lib/libfontenc/trunk/Makefile csw/mgar/pkg/x11/lib/libfontenc/trunk/checksums csw/mgar/pkg/x11/lib/libx11/trunk/Makefile csw/mgar/pkg/x11/lib/libx11/trunk/checksums csw/mgar/pkg/x11/lib/libxaw/trunk/Makefile csw/mgar/pkg/x11/lib/libxaw/trunk/checksums csw/mgar/pkg/x11/lib/libxcomposite/trunk/Makefile csw/mgar/pkg/x11/lib/libxcomposite/trunk/checksums csw/mgar/pkg/x11/lib/libxcursor/trunk/Makefile csw/mgar/pkg/x11/lib/libxcursor/trunk/checksums csw/mgar/pkg/x11/lib/libxdamage/trunk/Makefile csw/mgar/pkg/x11/lib/libxdamage/trunk/checksums csw/mgar/pkg/x11/lib/libxdmcp/trunk/Makefile csw/mgar/pkg/x11/lib/libxdmcp/trunk/checksums csw/mgar/pkg/x11/lib/libxfixes/trunk/Makefile csw/mgar/pkg/x11/lib/libxfixes/trunk/checksums csw/mgar/pkg/x11/lib/libxfont/trunk/Makefile csw/mgar/pkg/x11/lib/libxfont/trunk/checksums csw/mgar/pkg/x11/lib/libxft/trunk/Makefile csw/mgar/pkg/x11/lib/libxft/trunk/checksums csw/mgar/pkg/x11/lib/libxinerama/trunk/Makefile csw/mgar/pkg/x11/lib/libxinerama/trunk/checksums csw/mgar/pkg/x11/lib/libxkbfile/trunk/Makefile csw/mgar/pkg/x11/lib/libxkbfile/trunk/checksums csw/mgar/pkg/x11/lib/libxmu/trunk/Makefile csw/mgar/pkg/x11/lib/libxmu/trunk/checksums csw/mgar/pkg/x11/lib/libxpm/trunk/Makefile csw/mgar/pkg/x11/lib/libxpm/trunk/checksums csw/mgar/pkg/x11/lib/libxrandr/trunk/Makefile csw/mgar/pkg/x11/lib/libxrandr/trunk/checksums csw/mgar/pkg/x11/lib/libxres/trunk/Makefile csw/mgar/pkg/x11/lib/libxres/trunk/checksums csw/mgar/pkg/x11/lib/libxtst/trunk/Makefile csw/mgar/pkg/x11/lib/libxtst/trunk/checksums csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile csw/mgar/pkg/x11/lib/libxvmc/trunk/checksums csw/mgar/pkg/x11/lib/libxxf86dga/trunk/Makefile csw/mgar/pkg/x11/lib/libxxf86dga/trunk/checksums csw/mgar/pkg/x11/lib/libxxf86vm/trunk/Makefile csw/mgar/pkg/x11/lib/libxxf86vm/trunk/checksums csw/mgar/pkg/x11/lib/xrender/trunk/Makefile csw/mgar/pkg/x11/lib/xrender/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/lib/libxfont/trunk/files/pcfread.c.diff Modified: csw/mgar/pkg/x11/lib/libfontenc/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libfontenc/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libfontenc/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libfontenc -GARVERSION = 1.0.4 +GARVERSION = 1.0.5 CATEGORIES = x11 DESCRIPTION = X11 font encoding library Modified: csw/mgar/pkg/x11/lib/libfontenc/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libfontenc/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libfontenc/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1 @@ -5cd16a2e51ca7b96a3081c7486ff98b9 download/libfontenc-1.0.4.tar.bz2 +4f0d8191819be9f2bdf9dad49a65e43b libfontenc-1.0.5.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libx11/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libx11/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libx11/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libx11 -GARVERSION = 1.1.5 +GARVERSION = 1.3.2 CATEGORIES = x11 DESCRIPTION = X11 client-side library @@ -12,9 +12,9 @@ MASTER_SITES = $(X11_LIB_MASTER_SITE) DISTNAME = libX11-$(GARVERSION) DISTFILES = $(DISTNAME).tar.gz -# PATCHFILES = patch-stdint.diff +PATCHFILES = patch-stdint.diff # Add workaround for http://bugs.sourcemage.org/show_bug.cgi?id=13476 -# PATCHFILES += patch-xlib-sentinel.diff +PATCHFILES += patch-xlib-sentinel.diff # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/x11/lib/libx11/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libx11/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libx11/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1,3 @@ -2feb39a0de6f05b25c308268691d960c libX11-1.1.5.tar.gz +b68aebbfcac1174c4c95d260e9369766 libX11-1.3.2.tar.gz +667f63d38722e29d6fd36b6648bbb757 patch-stdint.diff +4e6f6f42902f849eba8d88ab15fa3697 patch-xlib-sentinel.diff Modified: csw/mgar/pkg/x11/lib/libxaw/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxaw/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxaw/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libxaw -GARVERSION = 1.0.4 +GARVERSION = 1.0.7 CATEGORIES = x11 DESCRIPTION = X Athena Widgets Modified: csw/mgar/pkg/x11/lib/libxaw/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxaw/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxaw/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1 @@ -73671d8f1cf36fdd81395328cc3539c9 download/libXaw-1.0.4.tar.bz2 +815e74de989ccda684e2baf8d12cf519 libXaw-1.0.7.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxcomposite/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxcomposite/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxcomposite/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libXcomposite -GARVERSION = 0.4.0 +GARVERSION = 0.4.1 CATEGORIES = x11 DESCRIPTION = X11 Composite extension library @@ -15,19 +15,19 @@ CONFIGURE_ARGS = $(DIRPATHS) -PACKAGES = CSWlibxcomposite CSWlibxcompositedevel +PACKAGES = CSWlibxcomposite CSWlibxcompositedev CATALOGNAME_CSWlibxcomposite = libxcomposite -CATALOGNAME_CSWlibxcompositedevel = libxcomposite_devel +CATALOGNAME_CSWlibxcompositedev = libxcomposite_devel SPKG_DESC_CSWlibxcomposite = $(DESCRIPTION) -SPKG_DESC_CSWlibxcompositedevel = $(DESCRIPTION) development files +SPKG_DESC_CSWlibxcompositedev = $(DESCRIPTION) development files # PREREQUISITE_PKGS = CSWcompositeproto -REQUIRED_PKGS_CSWlibxcompositedevel = CSWlibxcomposite -REQUIRED_PKGS_CSWlibxcomposite = CSWlibx11 CSWlibxext CSWlibxfixes +REQUIRED_PKGS_CSWlibxcompositedev = CSWlibxcomposite +REQUIRED_PKGS_CSWlibxcomposite = CSWlibx11 CSWlibxext CSWlibxfixes -PKGFILES_CSWlibxcompositedevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibxcompositedev = $(PKGFILES_DEVEL) BUILD64 = 1 NOISALIST = 1 Modified: csw/mgar/pkg/x11/lib/libxcomposite/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxcomposite/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxcomposite/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1 @@ -7e95395dea89be21bae929b9b7f16641 download/libXcomposite-0.4.0.tar.bz2 +0f1367f57fdf5df17a8dd71d0fa68248 libXcomposite-0.4.1.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxcursor/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxcursor/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxcursor/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libXcursor -GARVERSION = 1.1.9 +GARVERSION = 1.1.10 CATEGORIES = x11 DESCRIPTION = X client-side cursor loading library Modified: csw/mgar/pkg/x11/lib/libxcursor/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxcursor/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxcursor/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1 @@ -99b7554037a92b260891091e81815a0a download/libXcursor-1.1.9.tar.bz2 +7dcdad1c10daea872cb3355af414b2ca libXcursor-1.1.10.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxdamage/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxdamage/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxdamage/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libXdamage -GARVERSION = 1.1.1 +GARVERSION = 1.1.2 CATEGORIES = x11 DESCRIPTION = X11 Font Services library @@ -23,6 +23,7 @@ SPKG_DESC_CSWlibxdamage = $(DESCRIPTION) SPKG_DESC_CSWlibxdamagedevel = $(DESCRIPTION) development files +REQUIRED_PKGS_CSWlibxdamage = CSWlibx11 CSWlibxfixes REQUIRED_PKGS_CSWlibxdamagedevel = CSWlibxdamage # PREREQUISITE_PKGS = CSWdamageproto Modified: csw/mgar/pkg/x11/lib/libxdamage/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxdamage/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxdamage/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1 @@ -ac0ce6b0063a9858c8f24ddb4c60487d download/libXdamage-1.1.1.tar.bz2 +b42780bce703ec202a33e5693991c09d libXdamage-1.1.2.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxdmcp/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxdmcp/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxdmcp/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libxdmcp -GARVERSION = 1.0.2 +GARVERSION = 1.0.3 CATEGORIES = x11 DESCRIPTION = X11 display manager control protocol library Modified: csw/mgar/pkg/x11/lib/libxdmcp/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxdmcp/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxdmcp/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1 @@ -10facf2bc7cbd5e5c1a698b8a210a582 download/libXdmcp-1.0.2.tar.bz2 +d60941d471800f41a3f19b24bea855a7 libXdmcp-1.0.3.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxfixes/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxfixes/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxfixes/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libXfixes -GARVERSION = 4.0.3 +GARVERSION = 4.0.4 CATEGORIES = x11 DESCRIPTION = X11 miscellaneous 'fixes' extension library Modified: csw/mgar/pkg/x11/lib/libxfixes/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxfixes/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxfixes/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1 @@ -1990d19725a3c7f32290037f02d3737f download/libXfixes-4.0.3.tar.bz2 +7f2c40852eb337b237ad944ca5c30d49 libXfixes-4.0.4.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxfont/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxfont/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxfont/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libXfont -GARVERSION = 1.3.3 +GARVERSION = 1.4.1 CATEGORIES = x11 DESCRIPTION = X11 font rasterisation library @@ -23,6 +23,9 @@ SPKG_DESC_CSWlibxfont = $(DESCRIPTION) SPKG_DESC_CSWlibxfontdevel = $(DESCRIPTION) development files +PATCHFILES = pcfread.c.diff + +# # PREREQUISITE_PKGS = CSWlibfontencdevel REQUIRED_PKGS_CSWlibxfontdevel = CSWlibxfont REQUIRED_PKGS_CSWlibxfont = CSWftype2 CSWlibfontenc CSWzlib @@ -32,4 +35,6 @@ BUILD64 = 1 NOISALIST = 1 +EXTRA_CFLAGS = -D__solaris__ + include gar/category.mk Modified: csw/mgar/pkg/x11/lib/libxfont/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxfont/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxfont/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1,2 @@ -4f174b9613f87cf00d731da428a1b194 download/libXfont-1.3.3.tar.bz2 +4f2bed2a2be82e90a51a24bb3a22cdf0 libXfont-1.4.1.tar.bz2 +1a3b100fc51c834222de3a127ba89722 pcfread.c.diff Added: csw/mgar/pkg/x11/lib/libxfont/trunk/files/pcfread.c.diff =================================================================== --- csw/mgar/pkg/x11/lib/libxfont/trunk/files/pcfread.c.diff (rev 0) +++ csw/mgar/pkg/x11/lib/libxfont/trunk/files/pcfread.c.diff 2009-11-29 17:26:05 UTC (rev 7504) @@ -0,0 +1,14 @@ +--- libXfont-1.4.1.orig/src/bitmap/pcfread.c 2009-11-28 14:31:05.959205251 +0100 ++++ libXfont-1.4.1/src/bitmap/pcfread.c 2009-11-28 14:36:05.152906100 +0100 +@@ -44,7 +44,11 @@ + #endif + + #include ++#if defined(__solaris__) ++#include ++#else + #include ++#endif + + void + pcfError(const char* message, ...) Modified: csw/mgar/pkg/x11/lib/libxft/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxft/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxft/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libXft -GARVERSION = 2.1.13 +GARVERSION = 2.1.14 CATEGORIES = x11 DESCRIPTION = A client-side font API for X applications @@ -30,6 +30,9 @@ REQUIRED_PKGS_CSWlibxft2 = CSWzlib CSWfconfig CSWftype2 CSWlibx11 CSWlibxrender REQUIRED_PKGS_CSWlibxft2devel = CSWlibxft2 +SPKG_DESC_CSWlibxft2 = $(DESCRIPTION) +SPKG_DESC_CSWlibxft2devel = $(DESCRIPTION) development package + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/x11/lib/libxft/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxft/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxft/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,3 +1,3 @@ -40ebc53da7efd520e528fa7a564863db download/libXft-2.1.13.tar.gz -5e3b0eeedc8e2ed4926cb73de7b2bc06 download/libXft.so.2.1.2-i386 -637e1b24ae97f0070478c8096b81d81a download/libXft.so.2.1.2-sparc +7b6530be19ce88949c4c08405f23b29a libXft-2.1.14.tar.gz +5e3b0eeedc8e2ed4926cb73de7b2bc06 libXft.so.2.1.2-i386 +637e1b24ae97f0070478c8096b81d81a libXft.so.2.1.2-sparc Modified: csw/mgar/pkg/x11/lib/libxinerama/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxinerama/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxinerama/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libXinerama -GARVERSION = 1.0.3 +GARVERSION = 1.1 CATEGORIES = x11 DESCRIPTION = X11 Xinerama extension library @@ -23,7 +23,7 @@ SPKG_DESC_CSWlibxinerama = $(DESCRIPTION) SPKG_DESC_CSWlibxineramadevel = $(DESCRIPTION) development files -PREREQUISITE_PKGS = CSWxineramaproto +PREREQUISITE_PKGS = CSWx11xineramaproto REQUIRED_PKGS_CSWlibxineramadevel = CSWlibxinerama REQUIRED_PKGS_CSWlibxinerama = CSWlibx11 CSWlibxext Modified: csw/mgar/pkg/x11/lib/libxinerama/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxinerama/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxinerama/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1 @@ -cd9f7c46439ac40e0517a302d2434d2c download/libXinerama-1.0.3.tar.bz2 +a2ac01fc0426cdbb713c5d59cf9955ed libXinerama-1.1.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxkbfile/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxkbfile/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxkbfile/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libxkbfile -GARVERSION = 1.0.5 +GARVERSION = 1.0.6 CATEGORIES = x11 DESCRIPTION = X11 keyboard file manipulation library Modified: csw/mgar/pkg/x11/lib/libxkbfile/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxkbfile/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxkbfile/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1 @@ -0726a845fe5a56551de2718c9f6b0e35 download/libxkbfile-1.0.5.tar.bz2 +b01156e263eca8177e6b7f10441951c4 libxkbfile-1.0.6.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxmu/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxmu/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxmu/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libxmu -GARVERSION = 1.0.4 +GARVERSION = 1.0.5 CATEGORIES = x11 DESCRIPTION = A set of miscellaneous utility convenience functions for X libraries to use Modified: csw/mgar/pkg/x11/lib/libxmu/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxmu/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxmu/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1 @@ -48b432e84035c664ece80a33695d5254 download/libXmu-1.0.4.tar.gz +f49e3587cdc299707da0786a681f9c05 libXmu-1.0.5.tar.gz Modified: csw/mgar/pkg/x11/lib/libxpm/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxpm/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxpm/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libxpm -GARVERSION = 3.5.7 +GARVERSION = 3.5.8 CATEGORIES = x11 DESCRIPTION = X11 pixmap library Modified: csw/mgar/pkg/x11/lib/libxpm/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxpm/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxpm/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1 @@ -cd15ee542d9f515538b4462a6f79d977 download/libXpm-3.5.7.tar.bz2 +38e58e72d476a74298a59052fde185a3 libXpm-3.5.8.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxrandr/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxrandr/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxrandr/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libXrandr -GARVERSION = 1.2.3 +GARVERSION = 1.3.0 CATEGORIES = x11 DESCRIPTION = X11 RandR extension library Modified: csw/mgar/pkg/x11/lib/libxrandr/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxrandr/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxrandr/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1 @@ -5cd67cc02a50c9644ba0a1846ea3b08e download/libXrandr-1.2.3.tar.bz2 +68eb59c3b7524db6ffd78746ee893d1d libXrandr-1.3.0.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxres/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxres/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxres/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libXres -GARVERSION = 1.0.3 +GARVERSION = 1.0.4 CATEGORIES = x11 DESCRIPTION = X11 Resource extension library Modified: csw/mgar/pkg/x11/lib/libxres/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxres/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxres/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1 @@ -de66ffb657aba64c9d6dbdeabb757f3e download/libXres-1.0.3.tar.bz2 +4daf91f93d924e693f6f6ed276791be2 libXres-1.0.4.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxtst/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxtst/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxtst/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libxtst -GARVERSION = 1.0.3 +GARVERSION = 1.1.0 CATEGORIES = x11 DESCRIPTION = The Xtst Library Modified: csw/mgar/pkg/x11/lib/libxtst/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxtst/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxtst/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1 @@ -090c1ad04e34982eada5cf3b1a0792fd download/libXtst-1.0.3.tar.bz2 +dd6f3e20b87310187121539f9605d977 libXtst-1.1.0.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libXvMC -GARVERSION = 1.0.4 +GARVERSION = 1.0.5 CATEGORIES = x11 DESCRIPTION = XVideo Motion Compensation Library Modified: csw/mgar/pkg/x11/lib/libxvmc/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxvmc/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxvmc/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1 @@ -b54600573daf9d1a29b952e8d35b389e download/libXvMC-1.0.4.tar.bz2 +16c3a11add14979beb7510e44623cac6 libXvMC-1.0.5.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxxf86dga/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxxf86dga/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxxf86dga/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libXxf86dga -GARVERSION = 1.0.2 +GARVERSION = 1.1.1 CATEGORIES = x11 DESCRIPTION = X11 Direct Graphics Access extension library Modified: csw/mgar/pkg/x11/lib/libxxf86dga/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxxf86dga/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxxf86dga/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1 @@ -6f5f621804ee652b6cc6f2025c517c78 download/libXxf86dga-1.0.2.tar.bz2 +368837d3d7a4d3b4f70be48383e3544e libXxf86dga-1.1.1.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxxf86vm/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxxf86vm/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxxf86vm/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libXxf86vm -GARVERSION = 1.0.2 +GARVERSION = 1.1.0 CATEGORIES = x11 DESCRIPTION = X11 XFree86 video mode extension library @@ -23,7 +23,7 @@ SPKG_DESC_CSWlibxxf86vm = $(DESCRIPTION) SPKG_DESC_CSWlibxxf86vmdevel = $(DESCRIPTION) development files -PREREQUISITE_PKGS = CSWxf86vidmodeproto +PREREQUISITE_PKGS = CSWx11xf86vidmdproto REQUIRED_PKGS_CSWlibxxf86vm = CSWlibx11 CSWlibxext REQUIRED_PKGS_CSWlibxxf86vmdevel = CSWlibxxf86vm Modified: csw/mgar/pkg/x11/lib/libxxf86vm/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxxf86vm/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxxf86vm/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1 @@ -304d37bd0a10d9b58aa9b64469ad73e5 download/libXxf86vm-1.0.2.tar.bz2 +b431ad7084e1055fef99a9115237edd8 libXxf86vm-1.1.0.tar.bz2 Modified: csw/mgar/pkg/x11/lib/xrender/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/xrender/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/xrender/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libxrender -GARVERSION = 0.9.4 +GARVERSION = 0.9.5 CATEGORIES = x11 DESCRIPTION = X Render Extension Library @@ -31,7 +31,7 @@ CATALOGNAME_CSWlibxrender = libxrender CATALOGNAME_CSWlibxrenderdevel = libxrender_devel -PREREQUISITE_PKGS = CSWxrenderproto +PREREQUISITE_PKGS = CSWx11renderproto REQUIRED_PKGS_CSWlibxrenderdevel = CSWlibxrender REQUIRED_PKGS_CSWlibxrender = CSWx11common CSWlibx11 Modified: csw/mgar/pkg/x11/lib/xrender/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/xrender/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/xrender/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,3 +1,3 @@ -1d9cb49e6c9149d5a5eca118c9c2bcf6 download/libXrender-0.9.4.tar.gz -9000fe29fc6339a43ef43478ae763054 download/libXrender.so.1.2.2-i386 -0a3f6793408aca76dbde2e6e3772a029 download/libXrender.so.1.2.2-sparc +1791473c18a83a333a048b72d719fc55 libXrender-0.9.5.tar.gz +9000fe29fc6339a43ef43478ae763054 libXrender.so.1.2.2-i386 +0a3f6793408aca76dbde2e6e3772a029 libXrender.so.1.2.2-sparc 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 Nov 29 19:44:37 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 29 Nov 2009 18:44:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[7505] csw/mgar/pkg/wxwidgets/trunk Message-ID: Revision: 7505 http://gar.svn.sourceforge.net/gar/?rev=7505&view=rev Author: wahwah Date: 2009-11-29 18:44:36 +0000 (Sun, 29 Nov 2009) Log Message: ----------- wxwidgets: Adding the old binaries for backward compatibility. Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile csw/mgar/pkg/wxwidgets/trunk/checksums Added Paths: ----------- csw/mgar/pkg/wxwidgets/trunk/files/libwx_gtk2u-2.8.so.0.2.0-i386 csw/mgar/pkg/wxwidgets/trunk/files/libwx_gtk2u-2.8.so.0.2.0-sparc csw/mgar/pkg/wxwidgets/trunk/files/libwx_gtk2u_gl-2.8.so.0.2.0-i386 csw/mgar/pkg/wxwidgets/trunk/files/libwx_gtk2u_gl-2.8.so.0.2.0-sparc Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-29 18:44:36 UTC (rev 7505) @@ -19,7 +19,12 @@ PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 EXTRA_MODULATORS = GARVERSION -MODULATIONS_GARVERSION = 2.8.5 2.8.10 + +# Once upon a time, this build also supported the version 2.8.5 for backward +# compatibility. Unfortunately, it was segfaulting. As a workaround, binary +# files copied from the old package have been provided. +MODULATIONS_GARVERSION = 2.8.10 + MERGE_SCRIPTS_isa-i386-garversion-2.8.5 = copy-only MERGE_DIRS_isa-i386-garversion-2.8.5 = $(libdir) MERGE_SCRIPTS_isa-sparcv8-garversion-2.8.5 = copy-only @@ -30,6 +35,10 @@ SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(GARNAME)-$(VERSION).tar.gz) NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz,$(SOURCEFILES)) DISTFILES = $(SOURCEFILES) +DISTFILES += libwx_gtk2u-2.8.so.0.2.0-i386 +DISTFILES += libwx_gtk2u-2.8.so.0.2.0-sparc +DISTFILES += libwx_gtk2u_gl-2.8.so.0.2.0-i386 +DISTFILES += libwx_gtk2u_gl-2.8.so.0.2.0-sparc SPKG_SOURCEURL = http://www.wxwidgets.org/ MASTER_SITES = $(SF_MIRRORS) SF_PROJ = wxwindows @@ -143,3 +152,12 @@ (cd $(WORKSRC); $(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) install) (cd $(WORKSRC)/contrib; $(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) install) @$(MAKECOOKIE) + +post-merge: + ginstall -m 755 \ + $(FILEDIR)/libwx_gtk2u-2.8.so.0.2.0-$(GARCH) \ + $(PKGROOT)$(libdir)/libwx_gtk2u-2.8.so.0.2.0 + ginstall -m 755 \ + $(FILEDIR)/libwx_gtk2u_gl-2.8.so.0.2.0-$(GARCH) \ + $(PKGROOT)$(libdir)/libwx_gtk2u_gl-2.8.so.0.2.0 + @$(MAKECOOKIE) Modified: csw/mgar/pkg/wxwidgets/trunk/checksums =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) +++ csw/mgar/pkg/wxwidgets/trunk/checksums 2009-11-29 18:44:36 UTC (rev 7505) @@ -1,9 +1,9 @@ 7830ab8006ade9b14567341b5481eadd 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch 45df2933ed2fa53f229feda01467db81 0002-Fixing-retarded-checks-for-libGL.patch 225f6163a1c31d1f96a3b0548b338105 0003-vsscanf-support-via-ncursesw.patch -f073300d39ce7c88db1033bbce64cdca 0004-add-monodll_appbase.so-to-wxrc.patch 969c363847e675dc4d3ad6b8871b96db 0005-stupid-vwscanf-workaround.patch -75ecdc04af4392f918ff6856a3ba6605 0500-wxT-macro-first-iteration.patch -17d8d019fd2e4137b4cd44816b14e282 0501-a-possible-fix-to-wxchar.h.patch +d4a33d7a1a30965edf15b54bfb011174 libwx_gtk2u-2.8.so.0.2.0-i386 +6a5857bca9695738ba5e185aac4d26e7 libwx_gtk2u-2.8.so.0.2.0-sparc +9f2495b8a4b9b91998a74164efc9ca3a libwx_gtk2u_gl-2.8.so.0.2.0-i386 +5870955c6c23ec655c17b4da92548207 libwx_gtk2u_gl-2.8.so.0.2.0-sparc 05b32ca051651f4b1885a90f62969faf wxWidgets-2.8.10.tar.gz -43274231ee50eb1f35e04e693ebab902 wxWidgets-2.8.5.tar.gz Added: csw/mgar/pkg/wxwidgets/trunk/files/libwx_gtk2u-2.8.so.0.2.0-i386 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/wxwidgets/trunk/files/libwx_gtk2u-2.8.so.0.2.0-i386 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/wxwidgets/trunk/files/libwx_gtk2u-2.8.so.0.2.0-sparc =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/wxwidgets/trunk/files/libwx_gtk2u-2.8.so.0.2.0-sparc ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/wxwidgets/trunk/files/libwx_gtk2u_gl-2.8.so.0.2.0-i386 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/wxwidgets/trunk/files/libwx_gtk2u_gl-2.8.so.0.2.0-i386 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/wxwidgets/trunk/files/libwx_gtk2u_gl-2.8.so.0.2.0-sparc =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/wxwidgets/trunk/files/libwx_gtk2u_gl-2.8.so.0.2.0-sparc ___________________________________________________________________ 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 wahwah at users.sourceforge.net Mon Nov 30 01:35:28 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 30 Nov 2009 00:35:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[7506] csw/mgar/pkg/postgresql/trunk Message-ID: Revision: 7506 http://gar.svn.sourceforge.net/gar/?rev=7506&view=rev Author: wahwah Date: 2009-11-30 00:35:28 +0000 (Mon, 30 Nov 2009) Log Message: ----------- postgresql: Seems to be working with versioned directories. Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile csw/mgar/pkg/postgresql/trunk/checksums Added Paths: ----------- csw/mgar/pkg/postgresql/trunk/files/cswpostgres.tmpl csw/mgar/pkg/postgresql/trunk/files/cswusergroup.tmpl csw/mgar/pkg/postgresql/trunk/files/postgresql.conf.tmpl Removed Paths: ------------- csw/mgar/pkg/postgresql/trunk/files/cswpostgres csw/mgar/pkg/postgresql/trunk/files/cswusergroup csw/mgar/pkg/postgresql/trunk/files/postgresql.conf Property Changed: ---------------- csw/mgar/pkg/postgresql/trunk/Makefile Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2009-11-29 18:44:36 UTC (rev 7505) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2009-11-30 00:35:28 UTC (rev 7506) @@ -1,3 +1,7 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + GARNAME = postgresql BASE_VERSION = 8.4 PATCHLEVEL = 1 @@ -4,7 +8,12 @@ GARVERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = apps +# Useful when making a series of builds on the same day +GARFLAVOR = DBG + DESCRIPTION = An advanced open source database +SPKG_SOURCEURL = http://www.postgresql.org/ + define BLURB endef @@ -16,18 +25,21 @@ libdir_install =$(prefix)/lib/$(GARNAME)/$(BASE_VERSION) libexecdir_install =$(prefix)/libexec/$(GARNAME)/$(BASE_VERSION) lispdir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION)/emacs/site-lisp -localstatedir = /var/opt/csw/$(GARNAME)/$(BASE_VERSION) +localstatedir = /var$(prefix)/$(GARNAME)/$(BASE_VERSION) mandir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION)/man sbindir_install = $(prefix)/sbin/$(GARNAME)/$(BASE_VERSION) sharedstatedir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION) sourcedir=$(prefix)/src/$(GARNAME)/$(BASE_VERSION) -sysconfdir = /etc/opt/csw/$(GARNAME)/$(BASE_VERSION) +sysconfdir = /etc$(prefix)/$(GARNAME)/$(BASE_VERSION) +MIGRATE_FILES = postgresql.conf +MIGRATE_DEST_DIR = $(sysconfdir) + MASTER_SITES = http://wwwmaster.postgresql.org/redir/53/h/source/v$(GARVERSION)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += cswpostgres -DISTFILES += cswusergroup -DISTFILES += postgresql.conf +DISTFILES += cswpostgres.tmpl +DISTFILES += cswusergroup.tmpl +DISTFILES += postgresql.conf.tmpl DISTFILES += README-CSW.txt PACKAGES = CSWpostgresql CSWpostgresqldoc CSWpostgresqldevel CSWlibpq @@ -42,20 +54,32 @@ SPKG_DESC_CSWpostgresqldevel = PostgreSQL Developer Files SPKG_DESC_CSWlibpq = PostgreSQL Libraries -SPKG_SOURCEURL = http://www.postgresql.org/ - REQUIRED_PKGS_CSWpostgresql = CSWreadline CSWzlib CSWlibpq REQUIRED_PKGS_CSWpostgresqldevel = CSWpostgresql LICENSE = COPYRIGHT -# prefix = $(BUILD_PREFIX)/postgresql -# docdir = $(BUILD_PREFIX)/share/doc - EXTRA_INC = $(BUILD_PREFIX)/include EXTRA_LIB = $(BUILD_PREFIX)/lib +EXTRA_LD_OPTIONS = -R$(prefix)/lib/\$$ISALIST + BUILD64 = 1 + +# There was a discussion about whether to use ISAEXEC by default. The argument +# is that enabling 64-bit by default where possible (using isaexec) is a waste. +# I'm not completely convinced. Leaving this line commented out for future +# consideration. +# +# References: +# - http://lists.opencsw.org/pipermail/maintainers/2009-November/004903.html +# +# I'd like to get some hard data though. What is the difference in the memory +# footprint, and what is the difference in execution speed between 32 and +# 64-bit versions? +# +# NO_ISAEXEC = 1 + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check @@ -63,33 +87,66 @@ EXTRA_PAX_ARGS = -s ",^\./opt/csw/postgresql/share/doc,./opt/csw/share/doc/postgresql,p" PKGFILES_CSWpostgresqldoc = $(PKGFILES_DOC) -PKGFILES_CSWpostgresqldevel = $(PKGFILES_DEVEL) -PKGFILES_CSWlibpq = $(PKGFILES_RT) +PKGFILES_CSWpostgresqldevel = $(PKGFILES_DEVEL) +PKGFILES_CSWpostgresqldevel += $(prefix)/share/doc/postgresql/html.* +PKGFILES_CSWlibpq = $(PKGFILES_RT) +PKGFILES_CSWlibpq += $(libdir)/64 # -> TODO: start in rc3.d S10, Stop everywhere else in K90 -INITSMF = /etc/opt/csw/init\.d/cswpostgres-$(BASE_VERSION) +INITSMF = /etc$(prefix)/init\.d/cswpostgres-$(BASE_VERSION) -# -> TODO: Migrate /opt/csw/var/pgdata to /var/opt/csw/postgresql/pgdata -USERGROUP = /etc/opt/csw/pkg/postgresql-$(BASE_VERSION) +# -> TODO: Migrate $(prefix)/var/pgdata to /var$(prefix)/postgresql/pgdata +USERGROUP = /etc$(prefix)/pkg/postgresql-$(BASE_VERSION) -# -> TODO: Migrate /opt/csw/etc/postgresql.conf to /etc/opt/csw/postgresql.conf -PRESERVECONF = /opt/csw/etc/postgresql\.conf +# -> TODO: Migrate $(prefix)/etc/postgresql.conf to /etc$(prefix)/postgresql.conf +PRESERVECONF = $(sysconfdir)/postgresql\.conf +BIN_NAMES = clusterdb createdb createlang createuser dropdb droplang dropuser +BIN_NAMES += ecpg initdb pg_config pg_controldata pg_ctl pg_dump pg_dumpall +BIN_NAMES += pg_resetxlog pg_restore postgres postmaster psql reindexdb + +PGDATA = $(localstatedir)/pgdata + +PROTOTYPE_MODIFIERS = pgdata +PROTOTYPE_FILES_pgdata = $(PGDATA) +PROTOTYPE_USER_pgdata = postgres +PROTOTYPE_GROUP_pgdata = postgres +PROTOTYPE_PERMS_pgdata = 0700 +PROTOTYPE_CLASS_pgdata = ugfiles + +SPKG_CLASSES = none ugfiles + include gar/category.mk CFLAGS := $(filter-out -I%,$(CFLAGS)) post-merge: - ginstall -d $(PKGROOT)/etc/opt/csw/init.d + ginstall -d $(PKGROOT)/etc$(prefix)/init.d + sed -e 's+ at PGDATA@+$(PGDATA)+' \ + -e 's+ at sysconfdir@+$(sysconfdir)+' \ + -e 's+ at bindir@+$(bindir)+' \ + < $(FILEDIR)/cswpostgres.tmpl \ + > $(WORKDIR)/cswpostgres ginstall \ $(WORKDIR)/cswpostgres \ - $(PKGROOT)/etc/opt/csw/init.d/cswpostgres-$(BASE_VERSION) - ginstall -d $(PKGROOT)/etc/opt/csw/pkg/$(GARNAME) + $(PKGROOT)/etc$(prefix)/init.d/cswpostgres-$(BASE_VERSION) + ginstall -d $(PKGROOT)/etc$(prefix)/pkg/$(GARNAME) + sed -e 's+ at PGDATA@+$(PGDATA)+' \ + < $(FILEDIR)/cswusergroup.tmpl \ + > $(WORKDIR)/cswusergroup ginstall $(WORKDIR)/cswusergroup \ - $(PKGROOT)/etc/opt/csw/pkg/postgresql/$(GARNAME)-$(BASE_VERSION) - ginstall -d $(PKGROOT)/etc/opt/csw/$(GARNAME)-$(BASE_VERSION) + $(PKGROOT)/etc$(prefix)/pkg/$(GARNAME)/cswusergroup-$(BASE_VERSION) + ginstall -d $(PKGROOT)$(sysconfdir) + sed -e 's+ at PGDATA@+$(PGDATA)+' \ + < $(FILEDIR)/postgresql.conf.tmpl \ + > $(WORKDIR)/postgresql.conf ginstall $(WORKDIR)/postgresql.conf \ - $(PKGROOT)/etc/opt/csw/$(GARNAME)-$(BASE_VERSION) - ginstall -d $(PKGROOT)$(docdir)/$(GARNAME) - ginstall $(WORKDIR)/README-CSW.txt $(PKGROOT)$(docdir)/$(GARNAME)/ + $(PKGROOT)$(sysconfdir) + ginstall -d $(PKGROOT)$(docdir) + ginstall $(WORKDIR)/README-CSW.txt $(PKGROOT)$(docdir) + for b in $(BIN_NAMES); do \ + gln -s $(GARNAME)/$(BASE_VERSION)/$${b} $(PKGROOT)$(prefix)/bin/$${b}; \ + done + ginstall -d $(PKGROOT)$(PGDATA) + gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/postgresql/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/postgresql/trunk/checksums =================================================================== --- csw/mgar/pkg/postgresql/trunk/checksums 2009-11-29 18:44:36 UTC (rev 7505) +++ csw/mgar/pkg/postgresql/trunk/checksums 2009-11-30 00:35:28 UTC (rev 7506) @@ -1,5 +1,5 @@ 6e4e2a7755acf94bc83200a308e21ef3 README-CSW.txt -73f96aa85c8f99caf4d708c874e23dab cswpostgres -443171cc5303a8ea0f0a13cbb5e32189 cswusergroup +922febb720931220e272c2872ebf47e4 cswpostgres.tmpl +9e1e49d76fee70cb8e2d49304695ec89 cswusergroup.tmpl f2015af17bacbbfe140daf0d1067f9c9 postgresql-8.4.1.tar.bz2 -20c32ebdca7d585728b6078798fa1f50 postgresql.conf +8237c74666058f607f5418e3b57c74a9 postgresql.conf.tmpl Deleted: csw/mgar/pkg/postgresql/trunk/files/cswpostgres =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/cswpostgres 2009-11-29 18:44:36 UTC (rev 7505) +++ csw/mgar/pkg/postgresql/trunk/files/cswpostgres 2009-11-30 00:35:28 UTC (rev 7506) @@ -1,97 +0,0 @@ -#!/bin/sh -# PostgreSQL startup script - part of the CSWpostgresql package -# mark at blastwave.org - -# Read in the user configuration file -[ -s /opt/csw/etc/postgresql.conf ] && . /opt/csw/etc/postgresql.conf -[ -s /etc/opt/csw/postgresql.conf ] && . /etc/opt/csw/postgresql.conf - -# Defaults -[ -z "$PGDATA" ] && PGDATA=/opt/csw/var/pgdata -[ -z "$PGCTL" ] && PGCTL=/opt/csw/postgresql/bin/sparcv8/pg_ctl -[ -z "$PGINIT" ] && PGINIT=/opt/csw/postgresql/bin/sparcv8/initdb - - -# The following attempts to catch any mistakes in the server -# version - it checks if the 64-bit server was last run. If so, -# it forces the 64-bit server, otherwise it won't start up! -# And vice-versa for the 32-bit server... -if [ -f $PGDATA/postmaster.opts ]; then - grep 'sparcv9' $PGDATA/postmaster.opts > /dev/null - if [ $? -eq 0 ]; then - echo $PGCTL | grep "sparcv8" > /dev/null - if [ $? -eq 0 ]; then - echo "Warning: 32-bit server was specified in /etc/init.d/cswpostgres," - echo " but 64-bit version was last run. Using 64-bit server..." - fi - PGCTL=/opt/csw/postgresql/bin/sparcv9/pg_ctl - PGINIT=/opt/csw/postgresql/bin/sparcv9/initdb - else - # Did not detect 64-bit server last used - echo $PGCTL | grep "sparcv8" > /dev/null - if [ $? -ne 0 ]; then - echo "Warning: 64-bit server was specified in /etc/init.d/cswpostgres," - echo " but 32-bit version was last run. Using 32-bit server..." - fi - PGCTL=/opt/csw/postgresql/bin/sparcv8/pg_ctl - PGINIT=/opt/csw/postgresql/bin/sparcv8/initdb - fi -fi - -# Exit if postgres user hasn't been created. -grep '^postgres:' /etc/passwd >/dev/null -if [ $? -ne 0 ] ; then - getent passwd postgres >/dev/null - if [ $? -ne 0 ] ; then - exit 0 - fi -fi - -# Change to /var/tmp, as pgctl etc. need to be started from -# a directory that they can read -cd /var/tmp - -case "$1" in -start) - if [ -d $PGDATA -a `ls -l $PGDATA 2> /dev/null | wc -l` -gt 1 ]; then - # PostgreSQL data directory exists and is populated - echo "Starting PostgreSQL..." - su postgres -c "$PGCTL -D $PGDATA -l $PGDATA/postgresql.log start $SERVEROPTS" - fi - ;; - -stop) - echo "Stopping PostgreSQL database..." - su postgres -c "$PGCTL -D $PGDATA -l $PGDATA/postgresql.log stop" - ;; - -restart) - echo "Restarting PostgreSQL database..." - su postgres -c "$PGCTL -D $PGDATA -l $PGDATA/postgresql.log restart $SERVEROPTS" - ;; - -reload) - echo "Reloading PostgreSQL database..." - su postgres -c "$PGCTL -D $PGDATA -l $PGDATA/postgresql.log reload $SERVEROPTS" - ;; - -status) - su postgres -c "$PGCTL -D $PGDATA status" - ;; - -init) - # create and initialise data directory - echo "Creating PostgreSQL data directory at $PGDATA..." - # Create it, unless it's already there and empty - [ -d $PGDATA -a `ls -l $PGDATA 2> /dev/null | wc -l` -eq 1 ] || mkdir -p $PGDATA - chown postgres $PGDATA - echo "Initialising PostgreSQL database..." - su postgres -c "$PGINIT -D $PGDATA > /dev/null" - ;; - -*) - echo "Usage: $0 (init|start|stop|restart|reload|status)" - ;; - -esac - Copied: csw/mgar/pkg/postgresql/trunk/files/cswpostgres.tmpl (from rev 7363, csw/mgar/pkg/postgresql/trunk/files/cswpostgres) =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/cswpostgres.tmpl (rev 0) +++ csw/mgar/pkg/postgresql/trunk/files/cswpostgres.tmpl 2009-11-30 00:35:28 UTC (rev 7506) @@ -0,0 +1,113 @@ +#!/bin/sh +# $Id$ +# +# PostgreSQL startup script - part of the CSWpostgresql package +# mark at blastwave.org +# +# 2009-11-29: Parametrized file locations +# Maciej Blizinski (maciej at opencsw.org) +# +# Variables to substitute: +# - PGDATA +# - bindir +# - sysconfdir + + +# Read in the user configuration file +[ -s /opt/csw/etc/postgresql.conf ] && . /opt/csw/etc/postgresql.conf +[ -s @sysconfdir@/postgresql.conf ] && . @sysconfdir@/postgresql.conf + +# Defaults +[ -z "${PGDATA}" ] && PGDATA=@PGDATA@ +[ -z "${PGCTL}" ] && PGCTL=@bindir@/sparcv8/pg_ctl +[ -z "${PGINIT}" ] && PGINIT=@bindir@/sparcv8/initdb + + +# The following attempts to catch any mistakes in the server +# version - it checks if the 64-bit server was last run. If so, +# it forces the 64-bit server, otherwise it won't start up! +# And vice-versa for the 32-bit server... +if [ -f "${PGDATA}/postmaster.opts" ]; then + if grep 'sparcv9' ${PGDATA}/postmaster.opts > /dev/null; then + echo ${PGCTL} | grep "sparcv8" > /dev/null + if [ $? -eq 0 ]; then + echo "Warning: 32-bit server was specified in /etc/init.d/cswpostgres," + echo " but 64-bit version was last run. Using 64-bit server..." + fi + PGCTL=@bindir@/sparcv9/pg_ctl + PGINIT=@bindir@/sparcv9/initdb + elif grep 'sparcv8' ${PGDATA}/postmaster.opts > /dev/null; then + # Detected 32-bit server last used + echo "${PGCTL}" | grep "sparcv8" > /dev/null + if [ $? -ne 0 ]; then + echo "Warning: 64-bit server was specified in /etc/init.d/cswpostgres," + echo " but 32-bit version was last run. Using 32-bit server..." + fi + PGCTL=@bindir@/sparcv8/pg_ctl + PGINIT=@bindir@/sparcv8/initdb + else + echo "Couldn't detect whether the previously run version was 32 or 64-bit." + PGCTL=@bindir@/pg_ctl + PGINIT=@bindir@/initdb + fi +fi + +# Exit if postgres user hasn't been created. +grep '^postgres:' /etc/passwd >/dev/null +if [ $? -ne 0 ] ; then + getent passwd postgres >/dev/null + if [ $? -ne 0 ] ; then + exit 0 + fi +fi + +# Change to /var/tmp, as pgctl etc. need to be started from +# a directory that they can read +cd /var/tmp + +case "${1}" in +start) + if [ -d ${PGDATA} -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -gt 1 ]; then + # PostgreSQL data directory exists and is populated + echo "Starting PostgreSQL..." + su postgres -c "${PGCTL} -D ${PGDATA} -l ${PGDATA}/postgresql.log start ${SERVEROPTS}" + fi + ;; + +stop) + echo "Stopping PostgreSQL database..." + su postgres -c "${PGCTL} -D ${PGDATA} -l ${PGDATA}/postgresql.log stop" + ;; + +restart) + echo "Restarting PostgreSQL database..." + su postgres -c "${PGCTL} -D ${PGDATA} -l ${PGDATA}/postgresql.log restart ${SERVEROPTS}" + ;; + +reload) + echo "Reloading PostgreSQL database..." + su postgres -c "${PGCTL} -D ${PGDATA} -l ${PGDATA}/postgresql.log reload ${SERVEROPTS}" + ;; + +status) + su postgres -c "${PGCTL} -D ${PGDATA} status" + ;; + +init) + # create and initialise data directory + echo "Creating PostgreSQL data directory at ${PGDATA}..." + # Create it, unless it's already there and empty + [ -d ${PGDATA} -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -eq 1 ] || mkdir -p "${PGDATA}" + chown postgres "${PGDATA}" + chmod 0700 "${PGDATA}" + echo "Initialising PostgreSQL database..." + su postgres -c "${PGINIT} -D ${PGDATA} -E utf-8" + ;; + +*) + echo "Usage: ${0} (init|start|stop|restart|reload|status)" + ;; + +esac + +# vim:set sw=2 ts=2 sts=2 expandtab: Deleted: csw/mgar/pkg/postgresql/trunk/files/cswusergroup =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/cswusergroup 2009-11-29 18:44:36 UTC (rev 7505) +++ csw/mgar/pkg/postgresql/trunk/files/cswusergroup 2009-11-30 00:35:28 UTC (rev 7506) @@ -1 +0,0 @@ -postgres::CSW Postgres:/opt/csw/var/pgdata:/bin/sh:: Copied: csw/mgar/pkg/postgresql/trunk/files/cswusergroup.tmpl (from rev 7363, csw/mgar/pkg/postgresql/trunk/files/cswusergroup) =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/cswusergroup.tmpl (rev 0) +++ csw/mgar/pkg/postgresql/trunk/files/cswusergroup.tmpl 2009-11-30 00:35:28 UTC (rev 7506) @@ -0,0 +1 @@ +postgres::CSW Postgres:@PGDATA@:/bin/sh:: Deleted: csw/mgar/pkg/postgresql/trunk/files/postgresql.conf =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/postgresql.conf 2009-11-29 18:44:36 UTC (rev 7505) +++ csw/mgar/pkg/postgresql/trunk/files/postgresql.conf 2009-11-30 00:35:28 UTC (rev 7506) @@ -1,34 +0,0 @@ -# Example PostgreSQL server configuration file. -# Provided by the Blastwave package of PostgreSQL. -# This file is read by the /etc/init.d/cswpostgres startup script, -# and can be used to override the defaults. - -# The location of the data directory. -# Default : /opt/csw/var/pgdata -PGDATA=/opt/csw/var/pgdata - - -# Which binaries to use, 32- or 64-bit. -# Only use the 64-bit server if you're sure you need it. -# Make sure you have read /opt/csw/postgresql/share/doc/README-CSW.txt -# before changing these, as your databases may not work without -# a 'dump and restore' cycle ! - -# 32-bit server - default, and fine for most uses -PGCTL=/opt/csw/postgresql/bin/sparcv8/pg_ctl -PGINIT=/opt/csw/postgresql/bin/sparcv8/initdb - -# 64-bit server - uncomment these lines only if you really need them. -#PGCTL=/opt/csw/postgresql/bin/sparcv9/pg_ctl -#PGINIT=/opt/csw/postgresql/bin/sparcv9/initdb - - -# Additional options to pass to postmaster. -# These options will be passed to the postmaster program. The most common use of -# these is to allow network access to PostgreSQL from other hosts over TCP/IP. -# This is done by using the flags "-o -i", as in the example below. -# Uncomment this line to enable network access to PostgreSQL. -# Note that you will still need to configure authentication in the pg_hba.conf -# in your data directory. -# SERVEROPTS="-o -i" - Copied: csw/mgar/pkg/postgresql/trunk/files/postgresql.conf.tmpl (from rev 7363, csw/mgar/pkg/postgresql/trunk/files/postgresql.conf) =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/postgresql.conf.tmpl (rev 0) +++ csw/mgar/pkg/postgresql/trunk/files/postgresql.conf.tmpl 2009-11-30 00:35:28 UTC (rev 7506) @@ -0,0 +1,37 @@ +# Example PostgreSQL server configuration file. +# +# Provided by the OpenCSW package of PostgreSQL. This file is read by the +# /etc/opt/csw/init.d/cswpostgres startup script, and can be used to override +# the defaults. + +# The location of the data directory. +# Default : /opt/csw/var/pgdata +PGDATA=@PGDATA@ + +# Which binaries to use, 32- or 64-bit. Only use the 64-bit server if you're +# sure you need it. Make sure you have read +# /opt/csw/postgresql/share/doc/README-CSW.txt before changing these, as your +# databases may not work without a 'dump and restore' cycle! + +# 32-bit server - default, and fine for most uses +# +# PGCTL=/opt/csw/postgresql/bin/sparcv8/pg_ctl +# PGINIT=/opt/csw/postgresql/bin/sparcv8/initdb + +# 64-bit server - uncomment these lines only if you really need them. +# +# PGCTL=/opt/csw/postgresql/bin/sparcv9/pg_ctl +# PGINIT=/opt/csw/postgresql/bin/sparcv9/initdb + + +# Additional options to pass to postmaster. +# +# These options will be passed to the postmaster program. The most common use +# of these is to allow network access to PostgreSQL from other hosts over +# TCP/IP. This is done by using the flags "-o -i", as in the example below. +# Uncomment this line to enable network access to PostgreSQL. Note that you +# will still need to configure authentication in the pg_hba.conf in your data +# directory. +# +# SERVEROPTS="-o -i" + 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 Nov 30 01:52:31 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 30 Nov 2009 00:52:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7507] csw/mgar/pkg/postgresql/trunk Message-ID: Revision: 7507 http://gar.svn.sourceforge.net/gar/?rev=7507&view=rev Author: wahwah Date: 2009-11-30 00:52:31 +0000 (Mon, 30 Nov 2009) Log Message: ----------- postgresql: Setting the devel package ARCHALL Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/postgresql/trunk/files/cswusergroup.tmpl csw/mgar/pkg/postgresql/trunk/files/postgresql.conf.tmpl Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2009-11-30 00:35:28 UTC (rev 7506) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2009-11-30 00:52:31 UTC (rev 7507) @@ -57,6 +57,8 @@ REQUIRED_PKGS_CSWpostgresql = CSWreadline CSWzlib CSWlibpq REQUIRED_PKGS_CSWpostgresqldevel = CSWpostgresql +ARCHALL_CSWpostgresqldevel = 1 + LICENSE = COPYRIGHT EXTRA_INC = $(BUILD_PREFIX)/include @@ -92,13 +94,8 @@ PKGFILES_CSWlibpq = $(PKGFILES_RT) PKGFILES_CSWlibpq += $(libdir)/64 -# -> TODO: start in rc3.d S10, Stop everywhere else in K90 INITSMF = /etc$(prefix)/init\.d/cswpostgres-$(BASE_VERSION) - -# -> TODO: Migrate $(prefix)/var/pgdata to /var$(prefix)/postgresql/pgdata USERGROUP = /etc$(prefix)/pkg/postgresql-$(BASE_VERSION) - -# -> TODO: Migrate $(prefix)/etc/postgresql.conf to /etc$(prefix)/postgresql.conf PRESERVECONF = $(sysconfdir)/postgresql\.conf BIN_NAMES = clusterdb createdb createlang createuser dropdb droplang dropuser Property changes on: csw/mgar/pkg/postgresql/trunk/files/cswusergroup.tmpl ___________________________________________________________________ Added: svn:keywords + files/cswpostgres.tmpl Property changes on: csw/mgar/pkg/postgresql/trunk/files/postgresql.conf.tmpl ___________________________________________________________________ Added: svn:keywords + files/cswpostgres.tmpl 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 Nov 30 17:13:47 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 30 Nov 2009 16:13:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[7508] csw/mgar/pkg/bind/trunk Message-ID: Revision: 7508 http://gar.svn.sourceforge.net/gar/?rev=7508&view=rev Author: bonivart Date: 2009-11-30 16:13:46 +0000 (Mon, 30 Nov 2009) Log Message: ----------- bind: fix bug with config files having double extension, added chroot package Modified Paths: -------------- csw/mgar/pkg/bind/trunk/Makefile csw/mgar/pkg/bind/trunk/checksums csw/mgar/pkg/bind/trunk/files/CSWbind.cswnamed Added Paths: ----------- csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall csw/mgar/pkg/bind/trunk/files/bind.CSW Property Changed: ---------------- csw/mgar/pkg/bind/trunk/files/ Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2009-11-30 00:52:31 UTC (rev 7507) +++ csw/mgar/pkg/bind/trunk/Makefile 2009-11-30 16:13:46 UTC (rev 7508) @@ -19,16 +19,16 @@ DISTFILES = $(DISTNAME).tar.gz #MASTER_SITES = http://ftp.isc.org/isc/bind9/$(GARVERSION)/ #DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += CSWbindchroot.postinstall -PACKAGES = CSWbind CSWbinddevel CSWlibbind CSWbindutils -#PACKAGES = CSWbind CSWbinddevel CSWlibbind CSWbindutils CSWbindchroot +PACKAGES = CSWbind CSWbinddevel CSWlibbind CSWbindutils CSWbindchroot CATALOGNAME_CSWbinddevel = bind_devel CATALOGNAME_CSWbindutils = bind_utils -#CATALOGNAME_CSWbindchroot = bind_chroot +CATALOGNAME_CSWbindchroot = bind_chroot ARCHALL_CSWbinddevel = 1 -#ARCHALL_CSWbindchroot = 1 +ARCHALL_CSWbindchroot = 1 LICENSE = COPYRIGHT @@ -36,13 +36,13 @@ SPKG_DESC_CSWbinddevel = ISC BIND DNS development package SPKG_DESC_CSWlibbind = ISC BIND DNS library package SPKG_DESC_CSWbindutils = ISC BIND DNS utilities package -#SPKG_DESC_CSWbindchroot = ISC BIND DNS chroot package +SPKG_DESC_CSWbindchroot = ISC BIND DNS chroot package REQUIRED_PKGS_CSWbind = CSWlibbind CSWbindutils CSWiconv CSWlibxml2 CSWosslrt CSWzlib REQUIRED_PKGS_CSWbinddevel = CSWbind REQUIRED_PKGS_CSWlibbind = CSWiconv CSWlibxml2 CSWosslrt CSWzlib REQUIRED_PKGS_CSWbindutils = CSWlibbind CSWiconv CSWlibxml2 CSWosslrt CSWzlib -#REQUIRED_PKGS_CSWbindchroot = CSWbind +REQUIRED_PKGS_CSWbindchroot = CSWbind # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = http://ftp.isc.org/isc/bind9/ @@ -61,22 +61,23 @@ PKGFILES_CSWbinddevel = $(PKGFILES_DEVEL) PKGFILES_CSWlibbind = $(libdir)/.* PKGFILES_CSWbindutils = $(bindir)/.* -#PKGFILES_CSWbindchroot = .*chroot.* +PKGFILES_CSWbindchroot = .*chroot.* INSTALL_SCRIPTS = custom PROTOTYPE_FILTER = awk ' \ - $$$$3 ~ /\/var\/opt\/csw\/named/ { $$$$5 = "named" ; $$$$2 = "ugfiles" } \ + $$$$3 ~ /\/var\/opt\/csw\/named/ { $$$$2 = "ugfiles" ; $$$$5 = "named" ; $$$$6 = "named" } \ { print }' -INITSMF = .*/init.d/cswnamed -SAMPLECONF = .*/named.conf.CSW -USERGROUP = .*/CSWbind/cswusergroup +INITSMF = /etc/opt/csw/init.d/cswnamed +SAMPLECONF = /etc/opt/csw/named.conf /etc/opt/csw/CSWbind/bind +USERGROUP = /etc/opt/csw/CSWbind/cswusergroup SPKG_SOURCEURL = http://www.isc.org/software/bind # Still needed because of ugfiles SPKG_CLASSES_CSWbind = none cswusergroup ugfiles cswcpsampleconf cswinitsmf +SPKG_CLASSES_CSWbindchroot = none ugfiles include gar/category.mk @@ -85,10 +86,11 @@ install-custom: @echo " ==> Installing $(GARNAME) (custom)" @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d - @cp $(FILEDIR)/CSWbind.cswnamed $(DESTDIR)/etc/opt/csw/init.d/cswnamed - @cp $(FILEDIR)/CSWbind.named.conf.CSW $(DESTDIR)/etc/opt/csw/named.conf.CSW - @ginstall -m 755 -d $(DESTDIR)/opt/csw/etc/CSWbind - @cp $(FILEDIR)/cswusergroup $(DESTDIR)/opt/csw/etc/CSWbind/ + @ginstall -m 755 $(FILEDIR)/CSWbind.cswnamed $(DESTDIR)/etc/opt/csw/init.d/cswnamed + @ginstall -m 644 $(FILEDIR)/CSWbind.named.conf.CSW $(DESTDIR)/etc/opt/csw/named.conf + @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/CSWbind + @ginstall -m 444 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/CSWbind/ + @ginstall -m 644 $(FILEDIR)/bind.CSW $(DESTDIR)/etc/opt/csw/CSWbind/bind @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME) @$(foreach DOC,$(DOCLIST),cp $(FILEDIR)/$(DOC) $(DESTDIR)$(docdir)/$(GARNAME);) ( cd $(WORKSRC) ; \ @@ -96,26 +98,6 @@ @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/named @touch $(DESTDIR)/var/opt/csw/named/named.pid @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/named/chroot/dev - @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/named/chroot/etc + @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/named/chroot/etc/opt/csw @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/named/chroot/var/named @$(MAKECOOKIE) - -# run bind chroot'ed: -# (from CentOS 5.3) -# /var/named/chroot -# /var/named/chroot/dev -# /var/named/chroot/dev/null -# /var/named/chroot/dev/random -# /var/named/chroot/dev/zero -# /var/named/chroot/etc -# /var/named/chroot/etc/named.caching-nameserver.conf -# /var/named/chroot/etc/named.conf -# /var/named/chroot/etc/rndc.conf -# /var/named/chroot/var -# /var/named/chroot/var/log/named.log -# /var/named/chroot/var/named -# /var/named/chroot/var/named/data -# /var/named/chroot/var/named/slaves -# /var/named/chroot/var/run -# /var/named/chroot/var/run/named -# /var/named/chroot/var/tmp Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2009-11-30 00:52:31 UTC (rev 7507) +++ csw/mgar/pkg/bind/trunk/checksums 2009-11-30 16:13:46 UTC (rev 7508) @@ -1 +1,2 @@ +d6d238e2a0f583709f2d1076114cb0c5 CSWbindchroot.postinstall 435bc2e26e470d46ddf2acb24abb6ea6 bind-9.6.1-P2.tar.gz Property changes on: csw/mgar/pkg/bind/trunk/files ___________________________________________________________________ Modified: svn:ignore - CSWbindchroot.* + Modified: csw/mgar/pkg/bind/trunk/files/CSWbind.cswnamed =================================================================== --- csw/mgar/pkg/bind/trunk/files/CSWbind.cswnamed 2009-11-30 00:52:31 UTC (rev 7507) +++ csw/mgar/pkg/bind/trunk/files/CSWbind.cswnamed 2009-11-30 16:13:46 UTC (rev 7508) @@ -4,13 +4,22 @@ #RC_SLEV 2 # rc-script for CSW Bind -# Peter Bonivart, 2009-01-24 +# Peter Bonivart, 2009-11-30 USER=named #OPTIONS="-d 1" # debug mode #OPTIONS="-c /opt/csw/etc/named.conf" # use old location of conf file OPTIONS="-u $USER" +if [ -r /etc/opt/csw/pkg/CSWbind/bind && /bin/egrep -q '^ROOTDIR=' /etc/opt/csw/pkg/CSWbind/bind ]; then + :; +else + echo ROOTDIR="/var/named/chroot" >> /etc/sysconfig/named; +fi + +# Source config file +[ -r /etc/opt/csw/pkg/CSWbind/bind ] && . /etc/opt/csw/pkg/CSWbind/bind + ZONE= # used for initialization, do not change case "$1" in @@ -18,7 +27,7 @@ if [ -f /opt/csw/sbin/named -a -f /etc/opt/csw/named.conf ]; then echo 'Starting bind.' # ulimit -n 1024 - /opt/csw/sbin/named $OPTIONS & + /opt/csw/sbin/named $OPTIONS $ROOTDIR & fi ;; stop) Added: csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall =================================================================== --- csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall (rev 0) +++ csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall 2009-11-30 16:13:46 UTC (rev 7508) @@ -0,0 +1,34 @@ +#!/bin/sh + +ROOTDIR=/var/opt/csw/named/chroot + +# Create devices +DEVICELIST="null poll random zero" + +for i in $DEVICELIST +do + DEV=`ls -l /dev/$i | awk '{print $11}'` + DEVICE=`ls -l /dev/$DEV` + MAJOR=`echo $DEVICE | awk '{print $5}' | awk -F',' '{print $1}'` + MINOR=`echo $DEVICE | awk '{print $6}'` + echo "Creating device $i ($MAJOR,$MINOR)" + mknod $ROOTDIR/dev/$i $MAJOR $MINOR +done + +# Copy config from /etc/opt/csw +cp /etc/opt/csw/named.conf $ROOTDIR/etc/opt/csw + +# Timezone info +cp -p /etc/TIMEZONE $ROOTDIR/etc + +# change owner on all files/dirs under /var/opt/csw/named/chroot +chown -R named:named $ROOTDIR + +# show info about svc +echo +echo "System prepared for chrooted BIND." +echo +echo "Move your zone files into $ROOTDIR/var/named" +echo "and your rndc keys and so on into $ROOTDIR/etc/opt/csw." +echo +echo "The directory option in named.conf must be set to $ROOTDIR/var/named." Added: csw/mgar/pkg/bind/trunk/files/bind.CSW =================================================================== --- csw/mgar/pkg/bind/trunk/files/bind.CSW (rev 0) +++ csw/mgar/pkg/bind/trunk/files/bind.CSW 2009-11-30 16:13:46 UTC (rev 7508) @@ -0,0 +1,8 @@ +# This is where you customize some settings of your BIND installation so +# you don't have to edit the scripts themselves as they will be replaced during +# upgrades. +# +# Peter Bonivart, OpenCSW + +# Chroot directory +#ROOTDIR=/var/opt/csw/named/chroot 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 Nov 30 18:20:38 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 30 Nov 2009 17:20:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[7509] csw/mgar/pkg/bind/trunk Message-ID: Revision: 7509 http://gar.svn.sourceforge.net/gar/?rev=7509&view=rev Author: bonivart Date: 2009-11-30 17:20:19 +0000 (Mon, 30 Nov 2009) Log Message: ----------- bind: fix chroot stuff Modified Paths: -------------- csw/mgar/pkg/bind/trunk/Makefile csw/mgar/pkg/bind/trunk/files/CSWbind.cswnamed csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2009-11-30 16:13:46 UTC (rev 7508) +++ csw/mgar/pkg/bind/trunk/Makefile 2009-11-30 17:20:19 UTC (rev 7509) @@ -70,8 +70,8 @@ { print }' INITSMF = /etc/opt/csw/init.d/cswnamed -SAMPLECONF = /etc/opt/csw/named.conf /etc/opt/csw/CSWbind/bind -USERGROUP = /etc/opt/csw/CSWbind/cswusergroup +SAMPLECONF = /etc/opt/csw/named.conf /etc/opt/csw/pkg/CSWbind/bind +USERGROUP = /etc/opt/csw/pkg/CSWbind/cswusergroup SPKG_SOURCEURL = http://www.isc.org/software/bind @@ -88,9 +88,9 @@ @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d @ginstall -m 755 $(FILEDIR)/CSWbind.cswnamed $(DESTDIR)/etc/opt/csw/init.d/cswnamed @ginstall -m 644 $(FILEDIR)/CSWbind.named.conf.CSW $(DESTDIR)/etc/opt/csw/named.conf - @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/CSWbind - @ginstall -m 444 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/CSWbind/ - @ginstall -m 644 $(FILEDIR)/bind.CSW $(DESTDIR)/etc/opt/csw/CSWbind/bind + @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWbind + @ginstall -m 444 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWbind/ + @ginstall -m 644 $(FILEDIR)/bind.CSW $(DESTDIR)/etc/opt/csw/pkg/CSWbind/bind @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME) @$(foreach DOC,$(DOCLIST),cp $(FILEDIR)/$(DOC) $(DESTDIR)$(docdir)/$(GARNAME);) ( cd $(WORKSRC) ; \ Modified: csw/mgar/pkg/bind/trunk/files/CSWbind.cswnamed =================================================================== --- csw/mgar/pkg/bind/trunk/files/CSWbind.cswnamed 2009-11-30 16:13:46 UTC (rev 7508) +++ csw/mgar/pkg/bind/trunk/files/CSWbind.cswnamed 2009-11-30 17:20:19 UTC (rev 7509) @@ -11,12 +11,6 @@ #OPTIONS="-c /opt/csw/etc/named.conf" # use old location of conf file OPTIONS="-u $USER" -if [ -r /etc/opt/csw/pkg/CSWbind/bind && /bin/egrep -q '^ROOTDIR=' /etc/opt/csw/pkg/CSWbind/bind ]; then - :; -else - echo ROOTDIR="/var/named/chroot" >> /etc/sysconfig/named; -fi - # Source config file [ -r /etc/opt/csw/pkg/CSWbind/bind ] && . /etc/opt/csw/pkg/CSWbind/bind @@ -25,13 +19,17 @@ case "$1" in start) if [ -f /opt/csw/sbin/named -a -f /etc/opt/csw/named.conf ]; then - echo 'Starting bind.' + echo "Starting bind." + if [ -n "$ROOTDIR" ]; then + echo ROOTDIR set to $ROOTDIR + ROOTDIR="-t $ROOTDIR" + fi # ulimit -n 1024 /opt/csw/sbin/named $OPTIONS $ROOTDIR & fi ;; stop) - echo 'Shutting down bind.' + echo "Shutting down bind." if [ -x /usr/bin/zonename ]; then if [ "`/usr/bin/zonename`" = "global" ]; then ZONE="-z global" @@ -40,7 +38,7 @@ pkill $ZONE -x named ;; reload|refresh) - echo 'Reloading bind.' + echo "Reloading bind." if [ -x /usr/bin/zonename ]; then if [ "`/usr/bin/zonename`" = "global" ]; then ZONE="-z global" Modified: csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall =================================================================== --- csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall 2009-11-30 16:13:46 UTC (rev 7508) +++ csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall 2009-11-30 17:20:19 UTC (rev 7509) @@ -12,7 +12,7 @@ MAJOR=`echo $DEVICE | awk '{print $5}' | awk -F',' '{print $1}'` MINOR=`echo $DEVICE | awk '{print $6}'` echo "Creating device $i ($MAJOR,$MINOR)" - mknod $ROOTDIR/dev/$i $MAJOR $MINOR + mknod $ROOTDIR/dev/$i c $MAJOR $MINOR done # Copy config from /etc/opt/csw @@ -24,11 +24,11 @@ # change owner on all files/dirs under /var/opt/csw/named/chroot chown -R named:named $ROOTDIR -# show info about svc +# show info echo echo "System prepared for chrooted BIND." echo echo "Move your zone files into $ROOTDIR/var/named" -echo "and your rndc keys and so on into $ROOTDIR/etc/opt/csw." +echo "and your rndc key into $ROOTDIR/etc/opt/csw." echo -echo "The directory option in named.conf must be set to $ROOTDIR/var/named." +echo "The directory option in named.conf must be set to /var/named." 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 Nov 30 18:28:40 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 30 Nov 2009 17:28:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[7510] csw/mgar/pkg/bind/trunk/checksums Message-ID: Revision: 7510 http://gar.svn.sourceforge.net/gar/?rev=7510&view=rev Author: bonivart Date: 2009-11-30 17:28:39 +0000 (Mon, 30 Nov 2009) Log Message: ----------- bind: update checksums Modified Paths: -------------- csw/mgar/pkg/bind/trunk/checksums Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2009-11-30 17:20:19 UTC (rev 7509) +++ csw/mgar/pkg/bind/trunk/checksums 2009-11-30 17:28:39 UTC (rev 7510) @@ -1,2 +1,2 @@ -d6d238e2a0f583709f2d1076114cb0c5 CSWbindchroot.postinstall +c6ffb73202550e7c87d0561179fddccf CSWbindchroot.postinstall 435bc2e26e470d46ddf2acb24abb6ea6 bind-9.6.1-P2.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 Nov 30 21:05:20 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 30 Nov 2009 20:05:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[7511] csw/mgar/pkg/bind/trunk Message-ID: Revision: 7511 http://gar.svn.sourceforge.net/gar/?rev=7511&view=rev Author: bonivart Date: 2009-11-30 20:05:20 +0000 (Mon, 30 Nov 2009) Log Message: ----------- bind: fix more chroot stuff Modified Paths: -------------- csw/mgar/pkg/bind/trunk/checksums csw/mgar/pkg/bind/trunk/files/CSWbind.cswnamed csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall csw/mgar/pkg/bind/trunk/files/bind.CSW Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2009-11-30 17:28:39 UTC (rev 7510) +++ csw/mgar/pkg/bind/trunk/checksums 2009-11-30 20:05:20 UTC (rev 7511) @@ -1,2 +1,2 @@ -c6ffb73202550e7c87d0561179fddccf CSWbindchroot.postinstall +4e64ed13da0d0e18aa770d6279df834a CSWbindchroot.postinstall 435bc2e26e470d46ddf2acb24abb6ea6 bind-9.6.1-P2.tar.gz Modified: csw/mgar/pkg/bind/trunk/files/CSWbind.cswnamed =================================================================== --- csw/mgar/pkg/bind/trunk/files/CSWbind.cswnamed 2009-11-30 17:28:39 UTC (rev 7510) +++ csw/mgar/pkg/bind/trunk/files/CSWbind.cswnamed 2009-11-30 20:05:20 UTC (rev 7511) @@ -6,11 +6,6 @@ # rc-script for CSW Bind # Peter Bonivart, 2009-11-30 -USER=named -#OPTIONS="-d 1" # debug mode -#OPTIONS="-c /opt/csw/etc/named.conf" # use old location of conf file -OPTIONS="-u $USER" - # Source config file [ -r /etc/opt/csw/pkg/CSWbind/bind ] && . /etc/opt/csw/pkg/CSWbind/bind @@ -25,7 +20,7 @@ ROOTDIR="-t $ROOTDIR" fi # ulimit -n 1024 - /opt/csw/sbin/named $OPTIONS $ROOTDIR & + /opt/csw/sbin/named -u named $OPTIONS $ROOTDIR & fi ;; stop) Modified: csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall =================================================================== --- csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall 2009-11-30 17:28:39 UTC (rev 7510) +++ csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall 2009-11-30 20:05:20 UTC (rev 7511) @@ -32,3 +32,5 @@ echo "and your rndc key into $ROOTDIR/etc/opt/csw." echo echo "The directory option in named.conf must be set to /var/named." +echo +echo "Uncomment the ROOTDIR option in /etc/opt/csw/pkg/CSWbind/bind." Modified: csw/mgar/pkg/bind/trunk/files/bind.CSW =================================================================== --- csw/mgar/pkg/bind/trunk/files/bind.CSW 2009-11-30 17:28:39 UTC (rev 7510) +++ csw/mgar/pkg/bind/trunk/files/bind.CSW 2009-11-30 20:05:20 UTC (rev 7511) @@ -4,5 +4,8 @@ # # Peter Bonivart, OpenCSW +# Options +#OPTIONS="" + # Chroot directory #ROOTDIR=/var/opt/csw/named/chroot This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Nov 1 01:00:18 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 01 Nov 2009 00:00:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7051] csw/mgar/pkg/rlwrap/trunk/Makefile Message-ID: Revision: 7051 http://gar.svn.sourceforge.net/gar/?rev=7051&view=rev Author: chninkel Date: 2009-11-01 00:00:18 +0000 (Sun, 01 Nov 2009) Log Message: ----------- rlwrap: fixed package name Modified Paths: -------------- csw/mgar/pkg/rlwrap/trunk/Makefile Modified: csw/mgar/pkg/rlwrap/trunk/Makefile =================================================================== --- csw/mgar/pkg/rlwrap/trunk/Makefile 2009-10-30 15:11:29 UTC (rev 7050) +++ csw/mgar/pkg/rlwrap/trunk/Makefile 2009-11-01 00:00:18 UTC (rev 7051) @@ -21,7 +21,7 @@ rlwrap is a readline wrapper, a small utility that uses the GNU readline library to allow the editing of keyboard input for any other command. It maintains a separate input history for each command, and can TAB-expand words using all previously seen words and/or a user-specified file. endef -PACKAGES = rlwrap +PACKAGES = CSWrlwrap REQUIRED_PKGS = CSWreadline This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Nov 1 01:07:46 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 01 Nov 2009 00:07:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7052] csw/mgar/pkg/cyrus_imapd/trunk Message-ID: Revision: 7052 http://gar.svn.sourceforge.net/gar/?rev=7052&view=rev Author: chninkel Date: 2009-11-01 00:07:46 +0000 (Sun, 01 Nov 2009) Log Message: ----------- cyrus_imapd: explicit berkeleydb4.2 dependancy Modified Paths: -------------- csw/mgar/pkg/cyrus_imapd/trunk/Makefile csw/mgar/pkg/cyrus_imapd/trunk/checksums csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2009-11-01 00:00:18 UTC (rev 7051) +++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2009-11-01 00:07:46 UTC (rev 7052) @@ -33,17 +33,17 @@ SPKG_DESC_CSWcyrusimapd = Pop and Imap server from the Cyrus mail system CATALOGNAME_CSWcyrusimapd = cyrus_imapd -REQUIRED_PKGS_CSWcyrusimapd = CSWosslrt CSWsasl CSWbdb4 CSWkrb5lib CSWtcpwrap CSWnetsnmp CSWpcrert +REQUIRED_PKGS_CSWcyrusimapd = CSWosslrt CSWsasl CSWbdb42 CSWkrb5lib CSWtcpwrap CSWnetsnmp CSWpcrert SPKG_CLASSES_CSWcyrusimapd = none services cswpreserveconf cswinitsmf SPKG_DESC_CSWcyrusimapdutils = Various admin utilities for Cyrus Imapd/Popd CATALOGNAME_CSWcyrusimapdutils = cyrus_imapd_utils -REQUIRED_PKGS_CSWcyrusimapdutils = CSWpmcyrus CSWosslrt CSWsasl CSWbdb4 CSWkrb5lib CSWpcrert +REQUIRED_PKGS_CSWcyrusimapdutils = CSWpmcyrus CSWosslrt CSWsasl CSWbdb42 CSWkrb5lib CSWpcrert SPKG_CLASSES_CSWcyrusimapdutils = none SPKG_DESC_CSWpmcyrus = Perl interface to Cyrus Imap functions CATALOGNAME_CSWpmcyrus = pm_cyrus -REQUIRED_PKGS_CSWpmcyrus = CSWperl CSWbdb4 CSWosslrt CSWsasl +REQUIRED_PKGS_CSWpmcyrus = CSWperl CSWbdb42 CSWosslrt CSWsasl SPKG_CLASSES_CSWpmcyrus = none @@ -104,8 +104,8 @@ CONFIGURE_ARGS += --with-cyrus-prefix=$(prefix) CONFIGURE_ARGS += --with-service-path=$(libexecdir)/cyrus CONFIGURE_ARGS += --sysconfdir=$(sysconfdir)/cyrus -CONFIGURE_ARGS += --with-bdb-libdir=$(prefix)/bdb4/lib -CONFIGURE_ARGS += --with-bdb-incdir=$(prefix)/bdb4/include +CONFIGURE_ARGS += --with-bdb-libdir=$(prefix)/bdb42/lib +CONFIGURE_ARGS += --with-bdb-incdir=$(prefix)/bdb42/include CONFIGURE_ARGS += --with-openssl=$(prefix) CONFIGURE_ARGS += --with-sasl=$(prefix) CONFIGURE_ARGS += --with-perl=$(prefix)/bin/perl Modified: csw/mgar/pkg/cyrus_imapd/trunk/checksums =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/checksums 2009-11-01 00:00:18 UTC (rev 7051) +++ csw/mgar/pkg/cyrus_imapd/trunk/checksums 2009-11-01 00:07:46 UTC (rev 7052) @@ -13,14 +13,14 @@ b4c99489eacf0fb7befeef5e3098a5c1 cyrus-imapd-2.3.7-nobarenewlinescheck.patch 6127a7b62ec4679a54985f6a2d915e52 cyrus-imapd-acceptinvalidfrom.patch fdb3416ec41f3a56d1594ca25a6dcd7d cyrus.conf -e8868f4e344649d1f2939d5d00f3f800 cyrus_imapd.changelog.CSW -d722bfe708263b946d7bbc7f4d0ddf46 cyrus_imapd_utils.changelog.CSW +1228b6378951f1b5434bd785973cab34 cyrus_imapd.changelog.CSW +da92e9f3f78942431ad5ca9f9c842083 cyrus_imapd_utils.changelog.CSW 5375c25c8bc325a90553d0be87a64a04 et_c.awk d1d86e61463a1dfefccbadedb11a8604 et_h.awk 79211aee56db01e15566ced1ba4078da i.services 908dbf764d3ccd541c4de881ac81a6ae imapd.conf 14bb6e8c6d6914351f80df293982e88a install-upgrade -e6730668fa500fc77120ee007e535274 pm_cyrus.changelog.CSW +fc47edab821dfac970ca342b7f20bde8 pm_cyrus.changelog.CSW 149ac6b6d82ef9ef4bb1b314f1a1cac4 r.services dce627f9a464ae4efe8a66c8dbd358d5 restore_allowplaintext_default.patch 6dfee20f7c02139350caf9f75199e587 services Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW 2009-11-01 00:00:18 UTC (rev 7051) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW 2009-11-01 00:07:46 UTC (rev 7052) @@ -3,6 +3,7 @@ * New upstream version. * Switched to cswclassutils for SMF support and configuration file handling. * Removed devel files (.h and .a). + * Now depends explicitly on berkeleydb42 instead of berkeleydb4. -- Yann Rouillard Sun, 11 Oct 2009 00:47:17 +0200 Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW 2009-11-01 00:00:18 UTC (rev 7051) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW 2009-11-01 00:07:46 UTC (rev 7052) @@ -1,6 +1,7 @@ cyrus_imapd_utils (2.3.15,REV=2009.10.11) unstable * New upstream version. + * Now depends explicitly on berkeleydb42 instead of berkeleydb4. -- Yann Rouillard Sun, 11 Oct 2009 00:47:17 +0200 Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW 2009-11-01 00:00:18 UTC (rev 7051) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW 2009-11-01 00:07:46 UTC (rev 7052) @@ -1,6 +1,7 @@ pm_cyrus (2.3.15,REV=2009.10.11) unstable * New upstream version. + * Now depends explicitly on berkeleydb42 instead of berkeleydb4. -- Yann Rouillard Sun, 11 Oct 2009 00:47:17 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Nov 1 01:24:46 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 01 Nov 2009 00:24:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7053] csw/mgar/pkg/lftp/trunk Message-ID: Revision: 7053 http://gar.svn.sourceforge.net/gar/?rev=7053&view=rev Author: chninkel Date: 2009-11-01 00:24:46 +0000 (Sun, 01 Nov 2009) Log Message: ----------- lftp: updated to 4.0.3 Modified Paths: -------------- csw/mgar/pkg/lftp/trunk/Makefile csw/mgar/pkg/lftp/trunk/checksums csw/mgar/pkg/lftp/trunk/files/changelog.CSW Modified: csw/mgar/pkg/lftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/lftp/trunk/Makefile 2009-11-01 00:07:46 UTC (rev 7052) +++ csw/mgar/pkg/lftp/trunk/Makefile 2009-11-01 00:24:46 UTC (rev 7053) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = lftp -GARVERSION = 4.0.2 +GARVERSION = 4.0.3 CATEGORIES = net DESCRIPTION = sophisticated command-line ftp/http client Modified: csw/mgar/pkg/lftp/trunk/checksums =================================================================== --- csw/mgar/pkg/lftp/trunk/checksums 2009-11-01 00:07:46 UTC (rev 7052) +++ csw/mgar/pkg/lftp/trunk/checksums 2009-11-01 00:24:46 UTC (rev 7053) @@ -1,3 +1,3 @@ 5bc881a13c106b1c97f2137ff1755817 CSWlftp.prototype -90cfdf4e9b3481ab053e46a4baf82845 changelog.CSW -664fd567bb49e1e4dea1ba37430a8449 lftp-4.0.2.tar.gz +db4f98b7f4e325262647231ebba66b74 changelog.CSW +3dcda96e6567c0829055dc7e0f92ff5c lftp-4.0.3.tar.gz Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2009-11-01 00:07:46 UTC (rev 7052) +++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2009-11-01 00:24:46 UTC (rev 7053) @@ -1,3 +1,9 @@ +lftp (4.0.3,REV=2009.11.01) unstable + + * New upstream release. + + -- Yann Rouillard Sun, 01 Nov 2009 01:23:45 +0100 + lftp (4.0.2,REV=2009.10.11) unstable * New upstream release. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Nov 1 01:49:23 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 01 Nov 2009 00:49:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7054] csw/mgar/pkg/vsftpd/trunk Message-ID: Revision: 7054 http://gar.svn.sourceforge.net/gar/?rev=7054&view=rev Author: chninkel Date: 2009-11-01 00:49:23 +0000 (Sun, 01 Nov 2009) Log Message: ----------- vsftpd: updated to 2.2.1 Modified Paths: -------------- csw/mgar/pkg/vsftpd/trunk/Makefile csw/mgar/pkg/vsftpd/trunk/checksums csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW Modified: csw/mgar/pkg/vsftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/vsftpd/trunk/Makefile 2009-11-01 00:24:46 UTC (rev 7053) +++ csw/mgar/pkg/vsftpd/trunk/Makefile 2009-11-01 00:49:23 UTC (rev 7054) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = vsftpd -GARVERSION = 2.2.0 +GARVERSION = 2.2.1 CATEGORIES = server DESCRIPTION = A very secure and fast FTP server. Modified: csw/mgar/pkg/vsftpd/trunk/checksums =================================================================== --- csw/mgar/pkg/vsftpd/trunk/checksums 2009-11-01 00:24:46 UTC (rev 7053) +++ csw/mgar/pkg/vsftpd/trunk/checksums 2009-11-01 00:49:23 UTC (rev 7054) @@ -2,7 +2,7 @@ 8944fcd302add66d5b2b287d390b9c91 CSWvsftpd.prototype eeaf77528b2da0c7730323838f30b7ef README.CSW 281c51282cabd9475cceef363bbc699b build_options.patch -1680c237d8aa01a3571b80e426dba7a3 changelog.CSW +c402d9755c9ea931dec6f256aef16541 changelog.CSW 54c1c39c6bfa8747a4457f135fd5bca1 csw_build_system.patch a9e994d2b57999b76a0e03503745c01a csw_paths.patch 98e1d831801985daf5ce2ed01fbc0efd cswusergroup @@ -10,7 +10,7 @@ 93173edf9931b8eb835c6d0177a7c6bd cswvsftpd.xml 73e59f9ada47d3d20199f7c97849fb13 destdir.patch a9a65f55cbfd01f9d72d1de25e67148d set_priv_sep_user.patch -e4eb190af270ae65d57a84274a38ec31 vsftpd-2.2.0.tar.gz +a25e53dd86fada8d3897910b8f0efdb7 vsftpd-2.2.1.tar.gz f6ce22a6959b93e500a4ae800295c2ee vsftpd.conf 0d4a1cf36560892adb9eb9410a01c522 vsftpd.smf_wrapper 60c736802e2ce00c531953b01e4a26f6 vsftpd.userlist Modified: csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW 2009-11-01 00:24:46 UTC (rev 7053) +++ csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW 2009-11-01 00:49:23 UTC (rev 7054) @@ -1,3 +1,9 @@ +vsftpd (2.2.1,REV=2009.11.01) unstable + + * New upstream version. + + -- Yann Rouillard Sun, 01 Nov 2009 01:47:26 +0100 + vsftpd (2.2.0,REV=2009.10.10) unstable * New upstream version. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Nov 1 01:50:12 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 01 Nov 2009 00:50:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7055] csw/mgar/pkg/bash/trunk Message-ID: Revision: 7055 http://gar.svn.sourceforge.net/gar/?rev=7055&view=rev Author: chninkel Date: 2009-11-01 00:50:09 +0000 (Sun, 01 Nov 2009) Log Message: ----------- bash: updated to patch level 35 Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile csw/mgar/pkg/bash/trunk/checksums csw/mgar/pkg/bash/trunk/files/changelog.CSW Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2009-11-01 00:49:23 UTC (rev 7054) +++ csw/mgar/pkg/bash/trunk/Makefile 2009-11-01 00:50:09 UTC (rev 7055) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = bash -GARVERSION = 4.0.33 +GARVERSION = 4.0.35 CATEGORIES = devel DESCRIPTION = A sh-compatible command language interpreter Modified: csw/mgar/pkg/bash/trunk/checksums =================================================================== --- csw/mgar/pkg/bash/trunk/checksums 2009-11-01 00:49:23 UTC (rev 7054) +++ csw/mgar/pkg/bash/trunk/checksums 2009-11-01 00:50:09 UTC (rev 7055) @@ -33,6 +33,8 @@ 389635281133416de9d13295251cabc7 bash40-031 d646cb4aed8e0f0d1d47eea2ed5f3690 bash40-032 d3e77d2a0a051478aca8c30d13ded834 bash40-033 -2e65971f182336356e87af544a24ccfe changelog.CSW +05a54807fd388e71bac8912ad530ac6d bash40-034 +fc3d8fdb83ccc407ab7f6d1b7ac6a221 bash40-035 +52c58cea6ccac9d7e51fb63adffbbfb3 changelog.CSW 60956e6be20f69dafbb06fcc83bab88e shells 29607316cff22f7427322d8f190cbadf use_system_bashrc_and_logout.patch Modified: csw/mgar/pkg/bash/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash/trunk/files/changelog.CSW 2009-11-01 00:49:23 UTC (rev 7054) +++ csw/mgar/pkg/bash/trunk/files/changelog.CSW 2009-11-01 00:50:09 UTC (rev 7055) @@ -1,3 +1,9 @@ +bash (4.0.35,REV=2009.11.01) unstable + + * Added bash patches bash40-034 to bash40-035. + + -- Yann Rouillard Sun, 01 Nov 2009 01:11:48 +0100 + bash (4.0.33,REV=2009.10.11) unstable * Added bash patches bash40-029 to bash40-033. 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 Nov 1 02:04:38 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 01 Nov 2009 01:04:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[7056] csw/mgar/pkg/samba/trunk Message-ID: Revision: 7056 http://gar.svn.sourceforge.net/gar/?rev=7056&view=rev Author: bdwalton Date: 2009-11-01 01:04:38 +0000 (Sun, 01 Nov 2009) Log Message: ----------- samba: bump version, update some gar stuff, handle 3/4 source diffs for config/build scripts Modified Paths: -------------- csw/mgar/pkg/samba/trunk/Makefile csw/mgar/pkg/samba/trunk/checksums Modified: csw/mgar/pkg/samba/trunk/Makefile =================================================================== --- csw/mgar/pkg/samba/trunk/Makefile 2009-11-01 00:50:09 UTC (rev 7055) +++ csw/mgar/pkg/samba/trunk/Makefile 2009-11-01 01:04:38 UTC (rev 7056) @@ -1,5 +1,5 @@ GARNAME = samba -GARVERSION = 3.3.4 +GARVERSION = 3.4.3 CATEGORIES = apps DESCRIPTION = Tools to access a servers filespace and printers via SMB (server) @@ -13,13 +13,21 @@ PACKAGES = CSWsamba CSWsambaclient CSWsambacommon CSWsambadoc CSWsambalib CSWsambalibdev CSWsambaswat CSWsambawb CATALOGNAME_CSWsamba = samba +SPKG_DESC_CSWsamba = $(DESCRIPTION) CATALOGNAME_CSWsambaclient = samba_client +SPKG_DESC_CSWsambaclient = Client binaries for samba CATALOGNAME_CSWsambacommon = samba_common +SPKG_DESC_CSWsambacommon = Shared support files for samba CATALOGNAME_CSWsambadoc = samba_doc +SPKG_DESC_CSWsambadoc = Samba documentation CATALOGNAME_CSWsambalib = samba_lib +SPKG_DESC_CSWsambalib = Samba shared libraries CATALOGNAME_CSWsambalibdev = samba_libdev +SPKG_DESC_CSWsambalibdev = Development files for the samba libraries CATALOGNAME_CSWsambaswat = samba_swat +SPKG_DESC_CSWsambaswat = Web-based samba administration tools CATALOGNAME_CSWsambawb = samba_wb +SPKG_DESC_CSWsambawb = not sure what this is REQUIRED_PKGS_CSWsamba = CSWsasl CSWsambacommon CSWoldaprt CSWlibpopt CSWlibnet CSWlibcups CSWkrb5lib CSWiconv CSWggettext CSWfam REQUIRED_PKGS_CSWsambaclient = CSWsasl CSWsambacommon CSWreadline CSWlibpopt CSWlibnet CSWkrb5lib CSWiconv CSWggettext @@ -34,6 +42,9 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +CONFIGURE_SCRIPTS = $(WORKSRC)/source3/configure CONFIGURE_ARGS = $(DIRPATHS) +BUILD_SCRIPTS = $(WORKSRC)/source3/Makefile + include gar/category.mk Modified: csw/mgar/pkg/samba/trunk/checksums =================================================================== --- csw/mgar/pkg/samba/trunk/checksums 2009-11-01 00:50:09 UTC (rev 7055) +++ csw/mgar/pkg/samba/trunk/checksums 2009-11-01 01:04:38 UTC (rev 7056) @@ -1 +1 @@ -1443165edb7cb3f56f1e77aec1ee3266 download/samba-3.3.4.tar.gz +322379680c12057f57685652a35a6b05 samba-3.4.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Nov 1 02:10:36 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 01 Nov 2009 01:10:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[7057] csw/mgar/pkg/ca_certificates/trunk/checksums Message-ID: Revision: 7057 http://gar.svn.sourceforge.net/gar/?rev=7057&view=rev Author: chninkel Date: 2009-11-01 01:10:36 +0000 (Sun, 01 Nov 2009) Log Message: ----------- ca_certificates: updated checksum Modified Paths: -------------- csw/mgar/pkg/ca_certificates/trunk/checksums Modified: csw/mgar/pkg/ca_certificates/trunk/checksums =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/checksums 2009-11-01 01:04:38 UTC (rev 7056) +++ csw/mgar/pkg/ca_certificates/trunk/checksums 2009-11-01 01:10:36 UTC (rev 7057) @@ -1,4 +1,4 @@ -4dabeaecfd46395da152e51d312107e4 download/certdata.txt +dabe696bb410d748fbaedbc5f18b11e2 download/certdata.txt 77fe4c8feb1b341814a6ed03d4ff764a download/certdata2pem.pl 8163827375c4cb08f9734930adb06ee2 download/update-ca-certificates b4f6772525da6772d51eb30f90605d60 download/ca-certificates.conf 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 Nov 1 02:48:16 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 01 Nov 2009 01:48:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7058] csw/mgar/pkg/samba/trunk Message-ID: Revision: 7058 http://gar.svn.sourceforge.net/gar/?rev=7058&view=rev Author: bdwalton Date: 2009-11-01 01:48:15 +0000 (Sun, 01 Nov 2009) Log Message: ----------- samba: store old notes from phil Added Paths: ----------- csw/mgar/pkg/samba/trunk/legacy_notes/ csw/mgar/pkg/samba/trunk/legacy_notes/BUILD.NOTES csw/mgar/pkg/samba/trunk/legacy_notes/Makefile.patch csw/mgar/pkg/samba/trunk/legacy_notes/makepkg.sh.diff csw/mgar/pkg/samba/trunk/legacy_notes/pkginfo.master Added: csw/mgar/pkg/samba/trunk/legacy_notes/BUILD.NOTES =================================================================== --- csw/mgar/pkg/samba/trunk/legacy_notes/BUILD.NOTES (rev 0) +++ csw/mgar/pkg/samba/trunk/legacy_notes/BUILD.NOTES 2009-11-01 01:48:15 UTC (rev 7058) @@ -0,0 +1,55 @@ +INSTRUCTIONS (reasons for it lower down) + +# edit source/Makefile and change SHELL to /bin/bash +# patch <~/pkgs/samba/Makefile.patch + +cd packaging/Solaris +patch <~/pkgs/samba/makepkg.sh.diff + +# tweak pkginfo.master as desired, for test package +bash ./makepkg.sh build + +You should then manually KILL IT, when it starts the compile phase. + Then cd ../../source, and edit out -z text from Makefile, and + do a make. + + (Where does it come from!?!? It's not in Makefile.in ?!!) + +------------------------------------------------------------ + +PROBLEMS: + +bombs out after loong time, with error under + source/lib/ldb with reference or something + from ldb_module.o + +both gcc and cc die. +Apparently, it's because samba does "bad things" with +reallocation of what should be read-only code in shared libs. +This makes it 'inefficient', by itself. + Unfortunately,"-z text" makes it a fatal flaw.. so, have to + manually remove that flag from Makefile, after configure!! +http://docsun.cites.uiuc.edu/sun_docs/C/solaris_9/SUNWdev/LLM/p24.html + +Additionally, need to change SHELL=/bin/sh to SHELL=bin/bash in Makefile + +LD_OPTIONS='-R/opt/csw/lib/$ISALIST -R$ORIGIN/../lib -R/opt/csw/lib -L/opt/csw/lib' + + +TO PACKAGE UP THEIR WAY: +Need to patch paths, and use +packaging/Solaris/makepkg.sh.csw + +Which also has to hack LD_LIBRARY_PATH because they script does naughty things + +plus, errors in final packaging: + + no object for found in root directory + no object for found in root directory + no object for found in root directory + no object for found in root directory + no object for found in root directory +# libsmbclient libmsrpc + +Late note: patch the sample smb.conf.default to have /var/opt +instead of /usr/local/samba/var reference Added: csw/mgar/pkg/samba/trunk/legacy_notes/Makefile.patch =================================================================== --- csw/mgar/pkg/samba/trunk/legacy_notes/Makefile.patch (rev 0) +++ csw/mgar/pkg/samba/trunk/legacy_notes/Makefile.patch 2009-11-01 01:48:15 UTC (rev 7058) @@ -0,0 +1,4 @@ +86c86 +< SHELL=/bin/sh +--- +> SHELL=/bin/bash Added: csw/mgar/pkg/samba/trunk/legacy_notes/makepkg.sh.diff =================================================================== --- csw/mgar/pkg/samba/trunk/legacy_notes/makepkg.sh.diff (rev 0) +++ csw/mgar/pkg/samba/trunk/legacy_notes/makepkg.sh.diff 2009-11-01 01:48:15 UTC (rev 7058) @@ -0,0 +1,152 @@ +*** makepkg.sh Thu Sep 18 08:49:02 2008 +--- makepkg.sh.csw Mon Oct 27 18:57:08 2008 +*************** +*** 4,12 **** + # Copyright (C) Gerald Carter 2004 + # + # script for build solaris Samba package +! # + +! INSTALL_BASE=/opt/samba + + SBINPROGS="smbd nmbd winbindd swat" + BINPROGS="findsmb nmblookup eventlogadm pdbedit rpcclient smbclient smbcquotas smbspool smbtar tdbbackup testparm wbinfo net ntlm_auth profiles smbcacls smbcontrol smbpasswd smbstatus smbtree tdbdump" +--- 4,19 ---- + # Copyright (C) Gerald Carter 2004 + # + # script for build solaris Samba package +! # Modified slightly by Philip Brown, to adhere to CSW standards +! # http://www.opencsw.org/ +! +! # Even though the link flags are *NICE* and use -$ORIGIN/../lib, # +! # the build/install scripts do wierd things, and call smbd from its SOURCE TREE location. +! # which then breaks dynamic libs. arg. SO need to override only for install purposes. +! LD_LIBRARY_PATH='$ORIGIN:$ORIGIN/../lib' +! export LD_LIBRARY_PATH + +! INSTALL_BASE=/opt/csw + + SBINPROGS="smbd nmbd winbindd swat" + BINPROGS="findsmb nmblookup eventlogadm pdbedit rpcclient smbclient smbcquotas smbspool smbtar tdbbackup testparm wbinfo net ntlm_auth profiles smbcacls smbcontrol smbpasswd smbstatus smbtree tdbdump" +*************** +*** 50,62 **** + + echo "#\n# libsmbclient\n#" + echo f none lib/libsmbclient.so 0755 root other +! echo f none lib/libsmbclient.a 0755 root other + echo f none include/libsmbclient.h 0644 root other + + echo "#\n# libmsrpc\n#" +! echo f none lib/libmsrpc.so 0755 root other +! echo f none lib/libmsrpc.a 0755 root other +! echo f none include/libmsrpc.h 0644 root other + + if [ -f lib/smbwrapper.so -a -f bin/smbsh ]; then + echo "#\n# smbwrapper\n#" +--- 57,71 ---- + + echo "#\n# libsmbclient\n#" + echo f none lib/libsmbclient.so 0755 root other +! #static lib doesnt get built. rather than try to "fix" this, dont bother. --CSW +! # echo f none lib/libsmbclient.a 0755 root other + echo f none include/libsmbclient.h 0644 root other + ++ #libmsrpc doesnt seem to get built. so dont try to package it after all. --CSW + echo "#\n# libmsrpc\n#" +! # echo f none lib/libmsrpc.so 0755 root other +! # echo f none lib/libmsrpc.a 0755 root other +! # echo f none include/libmsrpc.h 0644 root other + + if [ -f lib/smbwrapper.so -a -f bin/smbsh ]; then + echo "#\n# smbwrapper\n#" +*************** +*** 76,92 **** + echo "#\n# man pages \n#" + + # Create directories for man page sections if nonexistent +! cd man + for i in 1 2 3 4 5 6 7 8 9; do + manpages=`ls man$i 2>/dev/null` + if [ $? -eq 0 ]; then +! echo d none man/man${i} ? ? ? + for manpage in $manpages; do +! echo f none man/man${i}/${manpage} 0644 root other + done + fi + done +! cd .. + + echo "#\n# SWAT \n#" + list=`find swat -type d | grep -v "/.svn$"` +--- 85,101 ---- + echo "#\n# man pages \n#" + + # Create directories for man page sections if nonexistent +! cd share/man + for i in 1 2 3 4 5 6 7 8 9; do + manpages=`ls man$i 2>/dev/null` + if [ $? -eq 0 ]; then +! echo d none share/man/man${i} ? ? ? + for manpage in $manpages; do +! echo f none share/man/man${i}/${manpage} 0644 root other + done + fi + done +! cd ../.. + + echo "#\n# SWAT \n#" + list=`find swat -type d | grep -v "/.svn$"` +*************** +*** 103,111 **** + fi + done + + # Create entries for docs for the beginner +! echo 's none docs/using_samba=$BASEDIR/swat/using_samba' +! for file in docs/*pdf; do + echo f none $file 0644 root other + done + } +--- 112,122 ---- + fi + done + ++ mkdir share/doc ++ mv docs share/doc/samba + # Create entries for docs for the beginner +! echo 's none share/doc/samba/using_samba=$BASEDIR/swat/using_samba' +! for file in share/doc/samba/*pdf; do + echo f none $file 0644 root other + done + } +*************** +*** 128,141 **** + + cd $DISTR_BASE/source + +! if test "x$1" = "xbuild" ]; then + ./configure --prefix=$INSTALL_BASE \ +! --localstatedir=/var/lib/samba \ + --with-piddir=/var/run \ + --with-logfilebase=/var/log/samba \ +! --with-privatedir=/etc/samba/private \ +! --with-configdir=/etc/samba \ +! --with-lockdir=/var/lib/samba \ + --with-pam --with-acl-support \ + --with-quotas --with-included-popt \ + && make +--- 139,152 ---- + + cd $DISTR_BASE/source + +! if test "x$1" = "xbuild" ; then + ./configure --prefix=$INSTALL_BASE \ +! --localstatedir=/var/opt/csw/samba \ + --with-piddir=/var/run \ + --with-logfilebase=/var/log/samba \ +! --with-privatedir=/etc/opt/csw/samba/private \ +! --with-configdir=/etc/opt/csw/samba \ +! --with-lockdir=/var/opt/csw/samba \ + --with-pam --with-acl-support \ + --with-quotas --with-included-popt \ + && make Added: csw/mgar/pkg/samba/trunk/legacy_notes/pkginfo.master =================================================================== --- csw/mgar/pkg/samba/trunk/legacy_notes/pkginfo.master (rev 0) +++ csw/mgar/pkg/samba/trunk/legacy_notes/pkginfo.master 2009-11-01 01:48:15 UTC (rev 7058) @@ -0,0 +1,11 @@ +PKG=samba +NAME=TEST PACKAGE FOR SAMBA 3.2.4 BINARIES +ARCH=__ARCH__ +VERSION=__VERSION__ +CATEGORY=system +EMAIL=phil at opencsw.org +CLASSES=none +INTONLY=1 +ISTATES="S s 1 2 3" +RSTATES="S s 1 2 3" +BASEDIR=__BASEDIR__ 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 Nov 1 03:41:44 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 01 Nov 2009 02:41:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7059] csw/mgar/pkg/samba/trunk/legacy_notes/BUILD.NOTES Message-ID: Revision: 7059 http://gar.svn.sourceforge.net/gar/?rev=7059&view=rev Author: bdwalton Date: 2009-11-01 02:41:43 +0000 (Sun, 01 Nov 2009) Log Message: ----------- samba: augment legacy build notes with a bit of info Modified Paths: -------------- csw/mgar/pkg/samba/trunk/legacy_notes/BUILD.NOTES Modified: csw/mgar/pkg/samba/trunk/legacy_notes/BUILD.NOTES =================================================================== --- csw/mgar/pkg/samba/trunk/legacy_notes/BUILD.NOTES 2009-11-01 01:48:15 UTC (rev 7058) +++ csw/mgar/pkg/samba/trunk/legacy_notes/BUILD.NOTES 2009-11-01 02:41:43 UTC (rev 7059) @@ -14,6 +14,8 @@ do a make. (Where does it come from!?!? It's not in Makefile.in ?!!) + - This is leaked in from a call to `krb5-config --libs` + 20091031 -bw ------------------------------------------------------------ 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 Nov 1 14:19:06 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 01 Nov 2009 13:19:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7060] csw/mgar/pkg Message-ID: Revision: 7060 http://gar.svn.sourceforge.net/gar/?rev=7060&view=rev Author: dmichelsen Date: 2009-11-01 13:19:06 +0000 (Sun, 01 Nov 2009) Log Message: ----------- gsm: Initial commit, shared libraries missing Added Paths: ----------- csw/mgar/pkg/gsm/ csw/mgar/pkg/gsm/branches/ csw/mgar/pkg/gsm/tags/ csw/mgar/pkg/gsm/trunk/ csw/mgar/pkg/gsm/trunk/Makefile csw/mgar/pkg/gsm/trunk/checksums csw/mgar/pkg/gsm/trunk/files/ Property changes on: csw/mgar/pkg/gsm/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/gsm/trunk/Makefile =================================================================== --- csw/mgar/pkg/gsm/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gsm/trunk/Makefile 2009-11-01 13:19:06 UTC (rev 7060) @@ -0,0 +1,47 @@ +GARNAME = gsm +GARVERSION = 1.0.13 +CATEGORIES = utils + +DESCRIPTION = GSM 06.10 lossy speech compression +define BLURB +endef + +MASTER_SITES = http://user.cs.tu-berlin.de/~jutta/gsm/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://user.cs.tu-berlin.de/~jutta/toast.html + +WORKSRC = $(WORKDIR)/gsm-1.0-pl13 + +# Stuff needed for Shared Library +# @$(MAKE) REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ +# LIBS="-lsocket -lnsl" RANLIB=/bin/true \ +# AR=ld ARFLAGS="-G -h libwrap.so.1 -o " \ +# LIB=libwrap.so.1 VSYSLOG= \ +# NETGROUP=-DNETGROUP AUX_OBJ="setenv.o sharedhack.o" TLI=-DTLI \ +# BUGS="$(BUGS) -DSOLARIS_24_GETHOSTBYNAME_BUG" IPV6="$(IPV6)" \ +# EXTRA_CFLAGS="-DUSE_STRERROR -Kpic" all + +BUILD64 = 1 + +CONFIGURE_SCRIPTS = + +BUILD_ARGS = CC="$(CC)" CFLAGS="-c $(CFLAGS) -Iinc" + +TEST_TARGET = tst addtst misc +TEST_ARGS = $(BUILD_ARGS) + +INSTALL_ARGS = TOAST_INSTALL_ROOT="$(DESTDIR)$(prefix)" +INSTALL_ARGS += GSM_INSTALL_ROOT="$(DESTDIR)$(prefix)" + +include gar/category.mk + +pre-install-modulated: + ginstall -d $(DESTDIR)$(bindir) + ginstall -d $(DESTDIR)$(libdir) + ginstall -d $(DESTDIR)$(prefix)/inc + ginstall -d $(DESTDIR)$(prefix)/man/man1 + @$(MAKECOOKIE) Added: csw/mgar/pkg/gsm/trunk/checksums =================================================================== --- csw/mgar/pkg/gsm/trunk/checksums (rev 0) +++ csw/mgar/pkg/gsm/trunk/checksums 2009-11-01 13:19:06 UTC (rev 7060) @@ -0,0 +1 @@ +c1ba392ce61dc4aff1c29ea4e92f6df4 gsm-1.0.13.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 Nov 1 14:26:10 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 01 Nov 2009 13:26:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7061] csw/mgar/pkg Message-ID: Revision: 7061 http://gar.svn.sourceforge.net/gar/?rev=7061&view=rev Author: dmichelsen Date: 2009-11-01 13:26:09 +0000 (Sun, 01 Nov 2009) Log Message: ----------- lpc10: Initial commit Added Paths: ----------- csw/mgar/pkg/lpc10/ csw/mgar/pkg/lpc10/branches/ csw/mgar/pkg/lpc10/tags/ csw/mgar/pkg/lpc10/trunk/ csw/mgar/pkg/lpc10/trunk/Makefile csw/mgar/pkg/lpc10/trunk/checksums csw/mgar/pkg/lpc10/trunk/files/ Property changes on: csw/mgar/pkg/lpc10/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/lpc10/trunk/Makefile =================================================================== --- csw/mgar/pkg/lpc10/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lpc10/trunk/Makefile 2009-11-01 13:26:09 UTC (rev 7061) @@ -0,0 +1,23 @@ +GARNAME = lpc10 +GARVERSION = 1.5 +CATEGORIES = apps + +DESCRIPTION = LPC-10 speech coder software +define BLURB +endef + +MASTER_SITES = http://www.arl.wustl.edu/~jaf/lpc/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.arl.wustl.edu/~jaf/lpc/ + +BUILD64 = 1 + +# Some way to go for the manual build + +CONFIGURE_SCRIPTS = + +include gar/category.mk Added: csw/mgar/pkg/lpc10/trunk/checksums =================================================================== --- csw/mgar/pkg/lpc10/trunk/checksums (rev 0) +++ csw/mgar/pkg/lpc10/trunk/checksums 2009-11-01 13:26:09 UTC (rev 7061) @@ -0,0 +1 @@ +c6d9174b78c4aafa67ae50b232a3aef3 lpc10-1.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 Sun Nov 1 14:31:40 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 01 Nov 2009 13:31:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[7062] csw/mgar/pkg/sox Message-ID: Revision: 7062 http://gar.svn.sourceforge.net/gar/?rev=7062&view=rev Author: dmichelsen Date: 2009-11-01 13:31:39 +0000 (Sun, 01 Nov 2009) Log Message: ----------- sox: Convert from legacy to mGAR v2 Added Paths: ----------- csw/mgar/pkg/sox/branches/ csw/mgar/pkg/sox/tags/ csw/mgar/pkg/sox/tags/legacy/ csw/mgar/pkg/sox/trunk/Makefile csw/mgar/pkg/sox/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/sox/trunk/legacy/ Property Changed: ---------------- csw/mgar/pkg/sox/trunk/ Property changes on: csw/mgar/pkg/sox/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Copied: csw/mgar/pkg/sox/trunk/Makefile (from rev 7018, csw/mgar/pkg/libmad/trunk/Makefile) =================================================================== --- csw/mgar/pkg/sox/trunk/Makefile (rev 0) +++ csw/mgar/pkg/sox/trunk/Makefile 2009-11-01 13:31:39 UTC (rev 7062) @@ -0,0 +1,26 @@ +GARNAME = sox +GARVERSION = 14.3.0 +CATEGORIES = apps + +DESCRIPTION = Sound Processing Tool +define BLURB +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(DISTNAME).tar.gz + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://sox.sourceforge.net/ + +# XXX: Add gsm, lpc10 and wavpack +REQUIRED_PKGS = CSWvorbis CSWlibogg CSWlibmad CSWlame CSWlibid3tag +PREREQUISITE_PKGS = $(REQUIRED_PKGS) + +CONFIGURE_ARGS = $(DIRPATHS) + +BUILD64 = 1 + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/sox/trunk/checksums =================================================================== --- csw/mgar/pkg/sox/trunk/checksums (rev 0) +++ csw/mgar/pkg/sox/trunk/checksums 2009-11-01 13:31:39 UTC (rev 7062) @@ -0,0 +1 @@ +8e3509804e6227273ef84092e1a2fea7 sox-14.3.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 Nov 1 14:32:53 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 01 Nov 2009 13:32:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[7063] csw/mgar/pkg Message-ID: Revision: 7063 http://gar.svn.sourceforge.net/gar/?rev=7063&view=rev Author: dmichelsen Date: 2009-11-01 13:32:53 +0000 (Sun, 01 Nov 2009) Log Message: ----------- wavpack: Initial commit Added Paths: ----------- csw/mgar/pkg/wavpack/ csw/mgar/pkg/wavpack/branches/ csw/mgar/pkg/wavpack/tags/ csw/mgar/pkg/wavpack/trunk/ csw/mgar/pkg/wavpack/trunk/Makefile csw/mgar/pkg/wavpack/trunk/checksums csw/mgar/pkg/wavpack/trunk/files/ Property changes on: csw/mgar/pkg/wavpack/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/wavpack/trunk/Makefile =================================================================== --- csw/mgar/pkg/wavpack/trunk/Makefile (rev 0) +++ csw/mgar/pkg/wavpack/trunk/Makefile 2009-11-01 13:32:53 UTC (rev 7063) @@ -0,0 +1,24 @@ +GARNAME = wavpack +GARVERSION = 4.60.0 +CATEGORIES = lib + +DESCRIPTION = Open audio compression format +define BLURB + WavPack is a completely open audio compression format providing lossless, + high-quality lossy, and a unique hybrid compression mode. Although the + technology is loosely based on previous versions of WavPack, the new version 4 + format has been designed from the ground up to offer unparalleled performance + and functionality. +endef + +MASTER_SITES = http://www.wavpack.com/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +BUILD64 = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/wavpack/trunk/checksums =================================================================== --- csw/mgar/pkg/wavpack/trunk/checksums (rev 0) +++ csw/mgar/pkg/wavpack/trunk/checksums 2009-11-01 13:32:53 UTC (rev 7063) @@ -0,0 +1 @@ +722f90393b292cd1413e8af8250a3783 wavpack-4.60.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Nov 1 14:42:53 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 01 Nov 2009 13:42:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[7064] csw/mgar/pkg/cgit/trunk/Makefile Message-ID: Revision: 7064 http://gar.svn.sourceforge.net/gar/?rev=7064&view=rev Author: trygvis Date: 2009-11-01 13:42:53 +0000 (Sun, 01 Nov 2009) Log Message: ----------- o PRESERVECONF should be without the .CSW suffix. Modified Paths: -------------- csw/mgar/pkg/cgit/trunk/Makefile Modified: csw/mgar/pkg/cgit/trunk/Makefile =================================================================== --- csw/mgar/pkg/cgit/trunk/Makefile 2009-11-01 13:32:53 UTC (rev 7063) +++ csw/mgar/pkg/cgit/trunk/Makefile 2009-11-01 13:42:53 UTC (rev 7064) @@ -47,8 +47,8 @@ # pdf-doc does not work yet INSTALL_ARGS += man-doc html-doc -PRESERVECONF = /etc/opt/csw/cgit/apache.conf.CSW -PRESERVECONF += /etc/opt/csw/cgit/cgitrc.CSW +PRESERVECONF = /etc/opt/csw/cgit/apache.conf +PRESERVECONF += /etc/opt/csw/cgit/cgitrc # Trick to get the gar+git support to export the source code pre-extract-modulated: git-extract-cgit 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 Nov 1 17:12:23 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 01 Nov 2009 16:12:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7065] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswinetd Message-ID: Revision: 7065 http://gar.svn.sourceforge.net/gar/?rev=7065&view=rev Author: bdwalton Date: 2009-11-01 16:12:23 +0000 (Sun, 01 Nov 2009) Log Message: ----------- cswclassutils: use canonical filename of inetd.conf (match r script) since the /etc/inetd.conf symlink is only important on opensolaris where inetadm/svcs will be used anyway Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd 2009-11-01 13:42:53 UTC (rev 7064) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd 2009-11-01 16:12:23 UTC (rev 7065) @@ -94,7 +94,7 @@ else [ -n "$DEBUG" ] && echo "For solaris 8 or 9" - inetdconf=$PKG_INSTALL_ROOT/etc/inetd.conf + inetdconf=$PKG_INSTALL_ROOT/etc/inet/inetd.conf echo "Installing '$svcname' into inetd.conf." echo "# $PKGINST: added by i.cswinetd" >> $inetdconf 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 Nov 1 17:46:43 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 01 Nov 2009 16:46:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[7066] csw/mgar/pkg/cvsproxy/trunk Message-ID: Revision: 7066 http://gar.svn.sourceforge.net/gar/?rev=7066&view=rev Author: bonivart Date: 2009-11-01 16:46:43 +0000 (Sun, 01 Nov 2009) Log Message: ----------- cvsproxy: update to new cswclassutils scripts Modified Paths: -------------- csw/mgar/pkg/cvsproxy/trunk/Makefile csw/mgar/pkg/cvsproxy/trunk/checksums Modified: csw/mgar/pkg/cvsproxy/trunk/Makefile =================================================================== --- csw/mgar/pkg/cvsproxy/trunk/Makefile 2009-11-01 16:12:23 UTC (rev 7065) +++ csw/mgar/pkg/cvsproxy/trunk/Makefile 2009-11-01 16:46:43 UTC (rev 7066) @@ -9,8 +9,6 @@ MASTER_SITES = http://www.sra.co.jp/people/m-kasahr/cvsproxy/src/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += CSWcvsproxy.postinstall -DISTFILES += CSWcvsproxy.preremove REQUIRED_PKGS = CSWtcpwrap SPKG_SOURCEURL = http://www.sra.co.jp/people/m-kasahr/cvsproxy @@ -22,16 +20,21 @@ TEST_TARGET = check +ETCSERVICES = /opt/csw/etc/pkg/$(GARNAME)/services +INETDCONF = /opt/csw/etc/pkg/$(GARNAME)/inetd.conf + include gar/category.mk post-install-modulated: @echo "==> Post-install fixes" - @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -d -m 755 $(DESTDIR)$(docdir)/$(GARNAME) @cp $(WORKSRC)/README $(DESTDIR)$(docdir)/$(GARNAME) @cp $(WORKSRC)/NEWS $(DESTDIR)$(docdir)/$(GARNAME) @cp $(WORKSRC)/ChangeLog $(DESTDIR)$(docdir)/$(GARNAME) @mv $(DESTDIR)/opt/csw/libexec/cvsproxy $(DESTDIR)/opt/csw/libexec/cvsproxy.tmp - @ginstall -d $(DESTDIR)/opt/csw/libexec/$(GARNAME) - @cp $(FILEDIR)/editconf.pl $(DESTDIR)/opt/csw/libexec/$(GARNAME) + @ginstall -d -m 755 $(DESTDIR)/opt/csw/libexec/$(GARNAME) @mv $(DESTDIR)/opt/csw/libexec/cvsproxy.tmp $(DESTDIR)/opt/csw/libexec/$(GARNAME)/cvsproxy + @ginstall -d -m 755 $(DESTDIR)/opt/csw/etc/pkg/$(GARNAME) + @cp $(FILEDIR)/services $(DESTDIR)/opt/csw/etc/pkg/$(GARNAME) + @cp $(FILEDIR)/inetd.conf $(DESTDIR)/opt/csw/etc/pkg/$(GARNAME) @$(MAKECOOKIE) Modified: csw/mgar/pkg/cvsproxy/trunk/checksums =================================================================== --- csw/mgar/pkg/cvsproxy/trunk/checksums 2009-11-01 16:12:23 UTC (rev 7065) +++ csw/mgar/pkg/cvsproxy/trunk/checksums 2009-11-01 16:46:43 UTC (rev 7066) @@ -1,3 +1 @@ -5095049b846e80cbe0745d85929af2d9 download/CSWcvsproxy.postinstall -3ce92c760a74f36d40acc02eb5e8e275 download/CSWcvsproxy.preremove -ceff47a655085497f5712e2da160c607 download/cvsproxy-1.0.1.tar.gz +ceff47a655085497f5712e2da160c607 cvsproxy-1.0.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 Sun Nov 1 17:49:38 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 01 Nov 2009 16:49:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[7067] csw/mgar/pkg/cvsproxy/trunk/files Message-ID: Revision: 7067 http://gar.svn.sourceforge.net/gar/?rev=7067&view=rev Author: bonivart Date: 2009-11-01 16:49:37 +0000 (Sun, 01 Nov 2009) Log Message: ----------- cvsproxy: changes in files dir Added Paths: ----------- csw/mgar/pkg/cvsproxy/trunk/files/inetd.conf csw/mgar/pkg/cvsproxy/trunk/files/services Removed Paths: ------------- csw/mgar/pkg/cvsproxy/trunk/files/CSWcvsproxy.postinstall csw/mgar/pkg/cvsproxy/trunk/files/CSWcvsproxy.preremove csw/mgar/pkg/cvsproxy/trunk/files/editconf.pl Deleted: csw/mgar/pkg/cvsproxy/trunk/files/CSWcvsproxy.postinstall =================================================================== --- csw/mgar/pkg/cvsproxy/trunk/files/CSWcvsproxy.postinstall 2009-11-01 16:46:43 UTC (rev 7066) +++ csw/mgar/pkg/cvsproxy/trunk/files/CSWcvsproxy.postinstall 2009-11-01 16:49:37 UTC (rev 7067) @@ -1,30 +0,0 @@ -#!/bin/sh - -# Mostly copied from CSWfam - -set -e - -if [ "$PKG_ROOT_DIR" = "" ]; then - PKG_ROOT_DIR=/; -fi - -CSWROOT=$PKG_ROOT_DIR/opt/csw -EDITCONF=$CSWROOT/libexec/cvsproxy/editconf.pl - - -echo "Adding cvsproxy to /etc/services" -"$EDITCONF" "$PKG_ROOT_DIR/etc/services" add '^cvsproxy\b' \ - "cvsproxy 2401/tcp # Transparent CVS proxy" \ - "cvsproxy 2401/udp # Transparent CVS proxy" - -echo "Adding cvsproxy to inetd.conf" -"$EDITCONF" "$PKG_ROOT_DIR/etc/inetd.conf" add 'Transparent CVS proxy' \ - "# Transparent CVS proxy" -"$EDITCONF" "$PKG_ROOT_DIR/etc/inetd.conf" add '^cvsproxy\b' \ - "cvsproxy stream tcp nowait nobody /opt/csw/libexec/tcpd /opt/csw/libexec/cvsproxy/cvsproxy" - - -echo "Restarting inetd..." -pkill -HUP inetd - -exit 0 Deleted: csw/mgar/pkg/cvsproxy/trunk/files/CSWcvsproxy.preremove =================================================================== --- csw/mgar/pkg/cvsproxy/trunk/files/CSWcvsproxy.preremove 2009-11-01 16:46:43 UTC (rev 7066) +++ csw/mgar/pkg/cvsproxy/trunk/files/CSWcvsproxy.preremove 2009-11-01 16:49:37 UTC (rev 7067) @@ -1,21 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$PKG_ROOT_DIR" = "" ]; then - PKG_ROOT_DIR=/; -fi - -EDITCONF="$PKG_ROOT_DIR/opt/csw/libexec/cvsproxy/editconf.pl" - -echo "Removing cvsproxy from /etc/services" -"$EDITCONF" "$PKG_ROOT_DIR/etc/services" remove '^cvsproxy' - -echo "Removing cvsproxy from inetd.conf" -"$EDITCONF" "$PKG_ROOT_DIR/etc/inetd.conf" remove '^cvsproxy' -"$EDITCONF" "$PKG_ROOT_DIR/etc/inetd.conf" remove 'Transparent CVS proxy' - -echo "Restarting inetd..." -pkill -HUP inetd - -exit 0 Deleted: csw/mgar/pkg/cvsproxy/trunk/files/editconf.pl =================================================================== --- csw/mgar/pkg/cvsproxy/trunk/files/editconf.pl 2009-11-01 16:46:43 UTC (rev 7066) +++ csw/mgar/pkg/cvsproxy/trunk/files/editconf.pl 2009-11-01 16:49:37 UTC (rev 7067) @@ -1,440 +0,0 @@ -#!/usr/bin/perl -w - -use strict; - -# $Id: editconf.perl,v 1.1 2000/05/19 22:44:34 rusty Exp $ -# -# This edits configuration files during software install/uninstall. -# Run with --help or see the text of the usage subroutine below for -# more information. -# -# Examples: -# -# Add fam to /etc/inetd.conf during install: -# editconf inetd.conf add '\bfam\b' \ -# "# fam, the File Alteration Monitor" \ -# "sgi_fam/1-2 stream rpc/tcp wait root /usr/local/bin/fam fam" -# -# Remove fam from /etc/inetd.conf during uninstall: -# editconf inetd.conf remove '\bfam\b' -# -# Add /usr/sysadm/lib to /etc/ld.so.conf# -# editconf ld.so.conf add '\bsysadm\b' /usr/sysadm/lib -# -# Add sysadmd to /usr/local/etc/tcpmux.conf: -# editconf tcpmux.conf add '\bsysadm\b' \ -# "# sysadmd, for system administration applications" \ -# "sgi_sysadm root /usr/sysadm/bin/sysadmd sysadmd" -# -# The main goal of this script is to "do no harm." We don't -# modify any files if it looks like we're going to mess with -# lines which have been edited by the user. The only time we -# change a file is when we're confident that we're adding new -# lines, or messing with lines which we ourselves added or -# removed during a previous invocation of the script. -# -# Well... that's not entirely true; the "remove" operation comments -# out any line that matches the given regexp. But it makes a backup! -# -# USING EDITCONF WITH AUTOMAKE AND RPM -# -# This prepends DESTDIR to the files it operates on (unless you pass -# it a file starting with \.{0,2}/, so it can be used during an -# automake "make install" into a non-root directory (as you would do -# while building an RPM package). Note that the file it attempts to -# operate on probably won't be present, though, so you'll probably -# need to ignore errors during the make install: -# -# make-install-hook: -# -$(EDITCONF) ld.so.conf add '\bsysadm\b' /usr/sysadm/lib -# -# This will probably fail when DESTDIR is set, as ld.so.conf probably -# doesn't exist under DESTDIR; the only reason to have this line in the -# Makefile.am is so that a normal "make install" will update the -# configuration files. -# -# In order to have your configuration files updated during the install/ -# uninstall of an rpm package, you'll need to add something like this -# to your spec file: -# -# # this is %preun rather than %postun because we want to use our -# # script before it gets uninstalled. -# %preun -# perl /usr/local/lib/fam/editconf.perl ld.so.conf remove '\bsysadm\b' -# -# -sub usage { - my($msg) = @_; - $msg && ($msg ne "help") && print STDERR "$msg\n\n"; - print STDERR <<"EOF"; -Usage: - $0 [options] file \"add\" regexp lines... - $0 [options] file \"remove\" regexp [comment] - $0 --help - -Options: - -n No-exec (don't change any files) - -v Verbose - -s Silent - -- End argument processing (in case your new config file lines - start with -) -EOF - - if($msg eq "help") { - print STDERR <<"EOF"; - -This edits configuration files. Given a file name, it looks -in a list of directories (see below) for the file. (If the file -name starts with "/" or ".", the path list is not searched.) -Once the file is found, the given regular expression is searched -for in the file to determine whether the option or service we're -adding/removing already exists. - -If we're adding new lines to the file, there are four possible -outcomes: - - - If the regexp isn't found in the file, we figure our lines - haven't been added before, and we add them. - - - If the regexp is found in the file, and indeed the exact lines - we were going to add are already there, we're happy, and we - don't change the file. - - - If the regexp is found in the file, and the lines we were going - to add are present but commented out, we uncomment them. - - - If the regexp is found in the file, but in lines which are - different than the lines we were going to add, we figure the - option or service we were going to add has already been configured - differently; in this case, we make our changes in a new copy - of the file and print a warning message saying that someone - should compare the two files. (We don't change the - configuration of the system in this case.) - -If we're removing lines from the file, there are two possible -outcomes: - - - If the regexp isn't found in the file, we're happy, and we - don't change the file. - - - If the regexp is found in the file, we make a backup of the - file, and comment out the lines containing the regexp in the - original file. - -EOF - print STDERR "Configuration file paths:\n"; - foreach (@::paths) { print STDERR " $_\n"; } - } - - exit 1; -} - - -# See if DESTDIR is set, to have us operate on files not in / -my $DESTDIR = $ENV{'DESTDIR'} ? $ENV{'DESTDIR'} : ""; - -# This is the list of places we'll look for the configuration file -# if we weren't given an absolute path. -@::paths = ("$DESTDIR/etc", "$DESTDIR/usr/etc", "$DESTDIR/usr/local/etc"); - -my $comment = '#'; -my $verbose = &splicegrep('^-v$', \@ARGV, '^--$'); -my $noexec = &splicegrep('^-n$', \@ARGV, '^--$'); -my $silent = &splicegrep('^-s$', \@ARGV, '^--$'); -&splicegrep('^--?h', \@ARGV, '^--$') && &usage("help"); -&splicegrep('^-', \@ARGV, '^--$') && &usage(); -&splicegrep('^--$', \@ARGV); - -my $file; # the name of the file passed on the command line -my $regexp; # the pattern passed on the command line -my $op; # the operation being performed (add|remove) - -($file = shift) || &usage("The config file name is required!"); -(($op = shift) && ($op =~ /^(add|remove)$/)) || &usage("\"add\" or \"remove\" is required!"); -($regexp = shift) || &usage("The regexp to search for is required!"); -my @lines = @ARGV; - - -# -# Does the file name start with /, ./, or ../? -# -if ($file =~ m#^\.{0,2}/#) { - # Danger! Not applying $DESTDIR to $path here! - &shaketh_thy_booty($op, $file, $regexp, @lines); - exit 0; -} -# -# No, so we'll search for the file name in the list of paths. -# -$verbose && $DESTDIR && print "Using DESTDIR \"$DESTDIR\"\n"; -my($p, $path); -foreach $p (@::paths) { - $path = "$p/$file"; - $verbose && print STDERR "Looking for $path...\n"; - if (-f $path) { - &shaketh_thy_booty($op, $path, $regexp, @lines); - exit 0; - } -} -die("Couldn't find $file in " . join(" ", @::paths) . "\n"); - - -# -# Once we know what file we're attacking, this does the actual work. -# -sub shaketh_thy_booty { # or is it "thine"? - my($op, $path, $regexp, @lines) = @_; - $noexec || -w $path || die("I don't have write permission on $path!\n"); - # Might as well snort it into memory. Hopefully it's a small file, ha ha. - open(CFG, "<$path") || die("Couldn't open $path for input!\n"); - my @wholefile = ; - close(CFG); - - my $matched = 0; - if (!grep /$regexp/, @wholefile) { - if ($op eq 'add') { - # It doesn't contain our regexp, so append our lines and - # exit happily. - if ($noexec) { - print "I would have added the following lines to $path:\n"; - foreach (@lines) { print "$_\n"; } - } else { - open(CFG, ">>$path") || die("Couldn't open $path for append!\n"); - $silent || print "Added the following lines to $path:\n"; - foreach (@lines) { - $silent || print "$_\n"; - print CFG "$_\n"; - } - $silent || print "(end of lines added to $path)\n"; - } - exit 0; - } elsif ($op eq 'remove') { - # It doesn't contain our regexp, so we don't need to remove it, - # so we're happy. - exit 0; - } else { die("bad op \"$op\""); } - } - - if ($op eq "remove") { - # Since we're still here, and we're removing this entry, comment out - # all lines matching our regexp. - if ($noexec) { - print "I would have commented out the following lines in $path:\n"; - grep { - /$regexp/ && print; - } @wholefile; - } else { - my $tmpnm = &tmpnam("$path.$$"); - my $comment_re = quotemeta $comment; - my @commented_out; - open(CFG, ">$tmpnm") || die("Couldn't open $tmpnm for output!\n"); - foreach (@wholefile) { - # We care if it matches, and isn't already commented out. - if ((/$regexp/) && (!/^$comment_re/)) { - push @commented_out, $_; - print CFG $comment; - } - print CFG; - } - if ($#commented_out == -1) { - # We didn't actually need to comment anything out! - # Apparently all the lines that matched our regexp were - # already commented out. - $verbose && print "All the lines matching our regexp were ", - "already commented out, so we're not doing ", - "anything!\n"; - unlink $tmpnm; - exit 0; - } -# $silent || print "Commented out the following lines in $path:\n"; -# $silent || grep { print; } @commented_out; -# $silent || print "(end of lines commented out in $path)\n"; - my $bak = &tmpnam("$path.O"); - rename($path, $bak) || die("Couldn't rename $path to $bak!\n"); - rename($tmpnm, $path) || die("Couldn't rename $tmpnm to $path!\n"); - $silent || print "Original file saved as $bak\n"; - } - exit 0; - } - - # just a sanity check... - ($op eq "add") || die("bad op \"\$op\""); - - # We're still here, so we found our regexp, which suggests that the - # entry we're adding might already be in the file. Do our new lines - # match existing lines exactly? - $verbose && print "The file contains our regular expression, so let's see ", - "if it has our lines...\n"; - $matched = 1; - my $re; - foreach (@lines) { - $re = quotemeta $_; - $verbose && print " Looking for \"$re\"\n"; - if (! grep /^$re$/, @wholefile) { - $verbose && print " Didn't find it!\n"; - $matched = 0; - last; - } - } - if ($matched) { - # The lines we would have added are already in the file, so - # we can all go home early. - $verbose && print "$path already contains the lines we would have ", - "added.\n"; - exit 0; - } - - # All right, we're still here, so let's see if the lines we would have - # added are in the file, but commented out. This is slightly complicated - # by the possibility that lines we're adding start with comments; if so, - # we don't want to require that they be preceded by another comment - # character. - $verbose && print "Let's see if it has our lines, but commented out...\n"; - $re = quotemeta $comment; - my @linesre = @lines; - grep { - # If it starts with a comment, require make an additional starting - # comment optional. (the ($re.*)? as opposed to $re.*) - $_ = (/^$re/) ? "^($re.*)?" . quotemeta $_ : "^$re.*" . quotemeta $_; - } @linesre; - $matched = 1; - foreach $re (@linesre) { - # This loop through @linesre isn't done in the grep above because - # we want that to iterate through every element, while this loop - # can bail as soon as it fails to find a line it's looking for. - $verbose && print " Looking for \"$re\"\n"; - # If you change this next line, make sure you make the same changes - # in the substitution below. - if (! grep /$re$/, @wholefile) { - $verbose && print " Didn't find it!\n"; - $matched = 0; - last; - } - } - if ($matched) { - # The lines we would have added are already in the file, but - # commented out. Let's uncomment them into a temp file, and then - # replace the existing file with the temp file. - if ($noexec) { - print "I would have uncommented the following lines in $path:\n"; - foreach (@lines) { print "$_\n"; } - exit 0; - } - # This is crude. For every line in the file, if it matches the - # commented-out version of any of the lines we're adding, replace - # it with the corresponding non-commented-out line. - my $idx; - foreach (@wholefile) { - foreach $idx (0..$#lines) { - s/$linesre[$idx]$/$lines[$idx]/ && last; - } - } - # isn't there a perl tmpnam? this open/die is stupid. - my $tmpnm = &tmpnam("$path.$$"); - open(CFG, ">$tmpnm") || die("Couldn't open $tmpnm for output!\n"); - print CFG @wholefile; - close(CFG) || die("Couldn't close $tmpnm after writing!\n"); - rename($tmpnm, $path) || die("Couldn't replace $path with $tmpnm " . - "after writing!\n"); - exit 0; - } - - # We're still here, so it looks like our configuration lines are in the - # file, but they're different than what we would have added. Nuts! - # Comment out everything matching our regexp and append our new lines, - # but do it into a new file so that we don't stomp any existing - # configuration. - my $tmpnm = &tmpnam("$path.N"); - if ($noexec) { - print "I would have copied $path to $tmpnm and commented out the following lines in $tmpnm:\n"; - grep { - /$regexp/ && print; - } @wholefile; - print "...and added the following lines to $tmpnm:\n"; - foreach (@lines) { print "$_\n"; } - exit 0; - } - grep { - /$regexp/ && ($_ = ($comment . $_)); - } @wholefile; - # Now append our new stuff - foreach (@lines) { - push @wholefile, "$_\n"; - } - open(CFG, ">$tmpnm") || die("Couldn't open $tmpnm for output!\n"); - print CFG @wholefile; - close(CFG) || die("Couldn't close $tmpnm after writing!\n"); - # Just for fun, if $path.N already existed, let's see if it's the - # same as what we just wrote. - &diff($tmpnm, "$path.N", \@wholefile) || ($tmpnm = "$path.N"); - - print STDERR <<"EOF"; - -********************************************************************** -Configuration changes to $file have not been made -automatically because there appears to be a conflict between the -file's current contents and the lines which would have been added. - -Original file: $path -New file: $tmpnm - -Please compare these two files and update the original file as needed. -********************************************************************** - -EOF - exit 0; -} - - -# Returns the array of elements matching the given re in the given array, -# and removes those elements from the array. If $bre is set, we only -# search through the array until an element matching $bre is encountered. -sub splicegrep { - my($re, $a, $bre) = @_; - my @ta = (); - my @ra = (); - my $skip = 0; - $a || ($a = \@ARGV); - # sub-optimal but our argv should be short - grep { - $bre && /$bre/ && ($skip = 1); - ((!$skip) && /$re/) ? push @ra, $_ : push @ta, $_; - } @{$a}; - @{$a} = @ta; - return @ra; -} - - -# This is kind of stupid. -sub tmpnam { - my($base) = @_; - my $hope = $base; - my $count = 0; - while(-e $hope) { - $hope = "$base$count"; - ++$count; - } - return $hope; -} - - -# Returns 0 if we know the two files are the same, 1 if we're not sure. -sub diff { - my($fn1, $fn2, $fc1) = @_; - ($fn1 eq $fn2) && return 0; # same file name! - my $sz1 = (stat $fn1)[7]; # size $sstuff[7]; # size - my $sz2 = (stat $fn2)[7]; # size $sstuff[7]; # size - $sz1 && ($sz1 != $sz2) && return 1; # different sizes; they're different - # Nuts, they're the same size, so we have to compare them. - open(FH2, "<$fn2") || return 1; - my @snort2 = ; - close(FH2); - # Same number of lines? - ($#snort2 == $#{$fc1}) || return 1; - my $i = $#snort2; - while ($i >= 0) { - ($snort2[$i] eq $fc1->[$i]) || return 1; - --$i; - } - return 0; -} Added: csw/mgar/pkg/cvsproxy/trunk/files/inetd.conf =================================================================== --- csw/mgar/pkg/cvsproxy/trunk/files/inetd.conf (rev 0) +++ csw/mgar/pkg/cvsproxy/trunk/files/inetd.conf 2009-11-01 16:49:37 UTC (rev 7067) @@ -0,0 +1 @@ +cvsproxy stream tcp nowait nobody /opt/csw/libexec/tcpd /opt/csw/libexec/cvsproxy/cvsproxy Added: csw/mgar/pkg/cvsproxy/trunk/files/services =================================================================== --- csw/mgar/pkg/cvsproxy/trunk/files/services (rev 0) +++ csw/mgar/pkg/cvsproxy/trunk/files/services 2009-11-01 16:49:37 UTC (rev 7067) @@ -0,0 +1,2 @@ +cvsproxy 2401/tcp +cvsproxy 2401/udp 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 Nov 1 23:17:33 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 01 Nov 2009 22:17:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[7068] csw/mgar/pkg Message-ID: Revision: 7068 http://gar.svn.sourceforge.net/gar/?rev=7068&view=rev Author: dmichelsen Date: 2009-11-01 22:17:33 +0000 (Sun, 01 Nov 2009) Log Message: ----------- unrar: Initial commit Added Paths: ----------- csw/mgar/pkg/unrar/ csw/mgar/pkg/unrar/branches/ csw/mgar/pkg/unrar/tags/ csw/mgar/pkg/unrar/trunk/ csw/mgar/pkg/unrar/trunk/Makefile csw/mgar/pkg/unrar/trunk/checksums csw/mgar/pkg/unrar/trunk/files/ csw/mgar/pkg/unrar/trunk/files/unrar.1 Property changes on: csw/mgar/pkg/unrar/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/unrar/trunk/Makefile =================================================================== --- csw/mgar/pkg/unrar/trunk/Makefile (rev 0) +++ csw/mgar/pkg/unrar/trunk/Makefile 2009-11-01 22:17:33 UTC (rev 7068) @@ -0,0 +1,48 @@ +GARNAME = unrar +GARVERSION = 3.9.6 +CATEGORIES = utils + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = http://www.rarlab.com/rar/ +DISTFILES = unrarsrc-$(GARVERSION).tar.gz +DISTFILES += unrar.1 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.rarlab.com/rar_add.htm + +LICENSE = license.txt + +DISTNAME = unrar + +CONFIGURE_SCRIPTS = + +OPT_FLAGS_SOS = -fast -erroff=wvarhidemem + +#BUILD_SCRIPTS = $(WORKSRC)/makefile.unix +BUILD_ARGS = -f makefile.unix CXX=$(CXX) CXXFLAGS="$(CXXFLAGS)" DEFINES="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" STRIP=strip + +TEST_SCRIPTS = + +INSTALL_SCRIPTS = custom + +#CXXFLAGS=-fast -erroff=wvarhidemem +#DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE +#STRIP=strip +#DESTDIR=/usr + +include gar/category.mk + +install-custom: + ginstall -d $(DESTDIR)$(mandir)/man1 + ginstall $(WORKDIR)/unrar.1 $(DESTDIR)$(mandir)/man1/ + ginstall -d $(DESTDIR)$(bindir) + ginstall $(WORKSRC)/unrar $(DESTDIR)$(bindir) + ginstall -d $(DESTDIR)$(docdir)/unrar + ginstall $(WORKSRC)/readme.txt $(DESTDIR)$(docdir)/unrar + @$(MAKECOOKIE) Added: csw/mgar/pkg/unrar/trunk/checksums =================================================================== --- csw/mgar/pkg/unrar/trunk/checksums (rev 0) +++ csw/mgar/pkg/unrar/trunk/checksums 2009-11-01 22:17:33 UTC (rev 7068) @@ -0,0 +1,2 @@ +16edfaa469364b9f3dce70ea557f62ea unrar.1 +07d7c5dd3d3b778fc1870a981c43a3d3 unrarsrc-3.9.6.tar.gz Added: csw/mgar/pkg/unrar/trunk/files/unrar.1 =================================================================== --- csw/mgar/pkg/unrar/trunk/files/unrar.1 (rev 0) +++ csw/mgar/pkg/unrar/trunk/files/unrar.1 2009-11-01 22:17:33 UTC (rev 7068) @@ -0,0 +1,98 @@ +.TH UNRAR 1 02.11.1999 "" "RAR archiver" +.SH NAME +unrar \- extract files from rar archives +.SH SYNOPSIS +.B unrar +.I " [- -] archive [files...] [path\...]" +.SH "DESCRIPTION" +This manual page documents briefly the +.BR unrar +command. +.br +This manual page was written for the Debian GNU/Linux distribution +because the original program does not have a manual page. +.br +Commands and options described here are as of unrar 2.02. +.SH OPTIONS +After the program name comes a command and then optional switches with +dashes before them. +A summary of commands is included below. +For a complete description, run +.BR unrar +without options. +.TP +.B e +Extract files to current directory. +.TP +.B l +List archive content. +.TP +.B p +Print file to stdout. +.TP +.B t +Test archive files. +.TP +.B v +Verbosely list archive. +.TP +.B x +Extract files with full path. +.SH SWITCHES +.BR NOTE: +Every switch must be separated by a whitespace. You cannot put them +together. +.TP +.B -av- +Disable Authenticity Verification check. +.TP +.B -c- +Disable comments show. +.TP +.B -f +Freshen files. +.TP +.B -kb +Keep broken extracted files. +.TP +.B -ierr +Send all messages to stderr. +.TP +.B -inul +Disable all messages. +.TP +.B -o+ +Overwrite existing files. +.TP +.B -o- +Do not overwrite existing files. +.TP +.B -p +Set password. +.TP +.B -p- +Do not query password. +.TP +.B -r +Recurse subdirectories. +.TP +.B -u +Update files. +.TP +.B -v +List all volumes. +.TP +.B -x +Exclude specified file. +.TP +.B -x@ +Exclude files in specified list file. +.TP +.B -x@ +Read file names to exclude from stdin. +.TP +.B -y +Assume Yes on all queries. +.SH AUTHOR +This manual page was written by Petr Cech according +to "unrar \-h" for the Debian GNU/Linux system (but may be used by others). 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 Nov 1 23:18:25 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 01 Nov 2009 22:18:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7069] csw/mgar/pkg/unrar/trunk/checksums Message-ID: Revision: 7069 http://gar.svn.sourceforge.net/gar/?rev=7069&view=rev Author: dmichelsen Date: 2009-11-01 22:18:24 +0000 (Sun, 01 Nov 2009) Log Message: ----------- unrar: Fix checksum Modified Paths: -------------- csw/mgar/pkg/unrar/trunk/checksums Modified: csw/mgar/pkg/unrar/trunk/checksums =================================================================== --- csw/mgar/pkg/unrar/trunk/checksums 2009-11-01 22:17:33 UTC (rev 7068) +++ csw/mgar/pkg/unrar/trunk/checksums 2009-11-01 22:18:24 UTC (rev 7069) @@ -1,2 +1,2 @@ -16edfaa469364b9f3dce70ea557f62ea unrar.1 +594b777453751ee331ef241160f31499 unrar.1 07d7c5dd3d3b778fc1870a981c43a3d3 unrarsrc-3.9.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Mon Nov 2 09:42:21 2009 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Mon, 02 Nov 2009 08:42:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[7070] csw/mgar/pkg/denyhosts/trunk Message-ID: Revision: 7070 http://gar.svn.sourceforge.net/gar/?rev=7070&view=rev Author: bensons Date: 2009-11-02 08:42:21 +0000 (Mon, 02 Nov 2009) Log Message: ----------- denyhosts: initial package version Modified Paths: -------------- csw/mgar/pkg/denyhosts/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/denyhosts/trunk/files/cswdenyhosts Modified: csw/mgar/pkg/denyhosts/trunk/Makefile =================================================================== --- csw/mgar/pkg/denyhosts/trunk/Makefile 2009-11-01 22:18:24 UTC (rev 7069) +++ csw/mgar/pkg/denyhosts/trunk/Makefile 2009-11-02 08:42:21 UTC (rev 7070) @@ -1,6 +1,3 @@ -# TODO -# - Integrate into SMF, do we need daemon-control-dist at all? -# - Test the package GARNAME = denyhosts GARVERSION = 2.6 CATEGORIES = python @@ -26,6 +23,7 @@ DISTFILES = $(DISTNAME).tar.gz LICENSE = LICENSE.txt ARCHALL = 1 +INITSMF = /etc/opt/csw/init.d/cswdenyhosts # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -49,6 +47,7 @@ post-install-modulated: ginstall -d $(DOCDEST) ginstall -d $(DESTDIR)$(sysconfdir) + ginstall -d $(DESTDIR)$(sysconfdir)/init.d ginstall -d $(DESTDIR)$(localstatedir)/$(GARNAME) mv $(DESTDIR)$(bindir)/denyhosts.py $(DESTDIR)$(bindir)/denyhosts rm $(DESTDIR)$(datadir)/$(GARNAME)/README.txt @@ -57,17 +56,18 @@ mv $(DESTDIR)$(datadir)/$(GARNAME)/CHANGELOG.txt $(DOCDEST)/changelog mv $(DESTDIR)$(datadir)/$(GARNAME)/denyhosts.cfg-dist \ $(DESTDIR)$(sysconfdir)/denyhosts.cfg + ginstall -m 0755 $(FILEDIR)/cswdenyhosts $(DESTDIR)$(sysconfdir)/init.d #Adjust config to match Solaris paths + our package paths gsed -i \ -e 's,/var/log/secure,path to ssh log,' \ -e 's,/usr/share/denyhosts/data,$(localstatedir)/$(GARNAME),' \ - -e 's,/var/lock/subsys/denyhosts,/var/run/denyhosts.pid,' \ - -e 's,/var/log/denyhosts,$(localestatedir)/$(GARNAME)/$(GARNAME).log,' \ + -e 's,/var/lock/subsys/denyhosts,/var/opt/csw/run/denyhosts.pid,' \ + -e 's,/var/log/denyhosts,$(localstatedir)/$(GARNAME)/$(GARNAME).log,' \ $(DESTDIR)$(sysconfdir)/denyhosts.cfg gsed -i \ - -e 's,denyhosts.cfg,$(sysconfdir)/denyhosts.cfg' \ + -e 's,denyhosts.cfg,$(sysconfdir)/denyhosts.cfg,' \ $(DESTDIR)/opt/csw/lib/python/site-packages/DenyHosts/constants.py #Adjust daemon-control-dist wrapper script to match our package paths Added: csw/mgar/pkg/denyhosts/trunk/files/cswdenyhosts =================================================================== --- csw/mgar/pkg/denyhosts/trunk/files/cswdenyhosts (rev 0) +++ csw/mgar/pkg/denyhosts/trunk/files/cswdenyhosts 2009-11-02 08:42:21 UTC (rev 7070) @@ -0,0 +1,67 @@ +#! /bin/sh +# +# Init script for denyhosts +# + +PATH=/opt/csw/bin:$PATH +NAME=denyhosts +PROG=/opt/csw/bin/$NAME +PYTHON=/opt/csw/bin/python +PIDFILE=/var/opt/csw/run/denyhosts.pid +CONFIG=/etc/opt/csw/denyhosts.cfg +FLAGS="--purge --config=$CONFIG" + +# start denyhosts +start() { + test -x $PYTHON || exit 5 + test -f $CONFIG || { + echo "$CONFIG does not exist!" + exit 1 + } + + HOSTS_DENY=`grep '^HOSTS_DENY' $CONFIG | cut -d = -f 2` + test -f $HOSTS_DENY || touch $HOSTS_DENY + + if [ -f $PIDFILE ]; then + pid=`cat $PIDFILE` + if kill -0 "$pid" > /dev/null; then + echo "$NAME already running" + return + else + echo "Removing stale PID file $PIDFILE." + rm -f $PIDFILE + fi + fi + $PYTHON $PROG --daemon --purge --config=$CONFIG + [ $? -eq 0 ] && echo "started $NAME" || echo "start $NAME failed" +} + +# stop denyhosts +stop() { + if [ -f $PIDFILE ]; then + pid=`cat $PIDFILE` + if kill -0 "$pid" > /dev/null; then + kill `cat $PIDFILE` + [ $? -eq 0 ] && echo "stopped $NAME" || echo "stop $NAME failed" + else + echo "stop $NAME failed" + rm -f $PIDFILE + fi + fi +} + +# start or stop denyhosts +case "$1" in + start) + start + ;; + stop) + stop + ;; + *) + echo "Usage: $NAME {start|stop}" >&2 + exit 3 + ;; +esac + +exit 0 Property changes on: csw/mgar/pkg/denyhosts/trunk/files/cswdenyhosts ___________________________________________________________________ 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 Mon Nov 2 13:03:23 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 02 Nov 2009 12:03:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7071] csw/mgar/pkg/libevent/trunk Message-ID: Revision: 7071 http://gar.svn.sourceforge.net/gar/?rev=7071&view=rev Author: dmichelsen Date: 2009-11-02 12:03:23 +0000 (Mon, 02 Nov 2009) Log Message: ----------- libevent: Update to version modulate on 1.1b and add 64 bit for latest version Modified Paths: -------------- csw/mgar/pkg/libevent/trunk/Makefile csw/mgar/pkg/libevent/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/libevent/trunk/files/CSWlibevent-devel.depend csw/mgar/pkg/libevent/trunk/files/CSWlibevent-devel.gspec csw/mgar/pkg/libevent/trunk/files/CSWlibevent-devel.prototype csw/mgar/pkg/libevent/trunk/files/CSWlibevent.depend csw/mgar/pkg/libevent/trunk/files/CSWlibevent.gspec csw/mgar/pkg/libevent/trunk/files/CSWlibevent.prototype csw/mgar/pkg/libevent/trunk/files/stdint.diff csw/mgar/pkg/libevent/trunk/files/testsh.diff Modified: csw/mgar/pkg/libevent/trunk/Makefile =================================================================== --- csw/mgar/pkg/libevent/trunk/Makefile 2009-11-02 08:42:21 UTC (rev 7070) +++ csw/mgar/pkg/libevent/trunk/Makefile 2009-11-02 12:03:23 UTC (rev 7071) @@ -1,9 +1,17 @@ GARNAME = libevent GARVERSION = 1.4.12 -DISTVERSION = $(GARVERSION)-stable CATEGORIES = lib -DESCRIPTION = event notification library +EXTRA_MODULATORS = GARVERSION +MODULATIONS_GARVERSION = 1.1b 1.4.12 + +SKIP_MODULATIONS = isa-sparcv9-garversion-1.1b +SKIP_MODULATIONS += isa-amd64-garversion-1.1b + +DISTVERSION-1.1b = 1.1b +DISTVERSION-1.4.12 = 1.4.12-stable + +DESCRIPTION = Event notification library define BLURB The libevent API provides a mechanism to execute a callback function when a specific event occurs on a file descriptor or after a timeout has been @@ -12,21 +20,51 @@ endef MASTER_SITES = http://www.monkey.org/~provos/ -DISTFILES = $(GARNAME)-$(DISTVERSION).tar.gz -#DISTFILES += $(call admfiles,CSWlibevent,depend prototype) -#DISTFILES += $(call admfiles,CSWlibevent-devel,depend prototype) +SOURCEFILES = $(foreach V,$(MODULATIONS_GARVERSION),$(GARNAME)-$(DISTVERSION-$V).tar.gz) +DISTFILES += $(SOURCEFILES) +NOEXTRACT = $(filter-out $(GARNAME)-$(DISTVERSION-$(GARVERSION)).tar.gz,$(SOURCEFILES)) + +PACKAGES = CSWlibevent CSWlibevent-devel + +REQUIRED_PKGS_CSWlibevent-devel = CSWlibevent + +CATALOGNAME_CSWlibevent = libevent +CATALOGNAME_CSWlibevent-devel = libevent_devel + +SPKG_DESC_CSWlibevent = Event notification library +SPKG_DESC_CSWlibevent-devel = Event notification library header files + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-stable.tar.gz -WORKSRC = $(WORKDIR)/$(GARNAME)-$(DISTVERSION) +SPKG_SOURCEURL = http://www.monkey.org/~provos/libevent/ +WORKSRC = $(WORKDIR)/$(GARNAME)-$(DISTVERSION-$(GARVERSION)) + +BUILD64 = 1 +NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = verify +MERGE_SCRIPTS_isa-default-garversion-1.1b = copy-only +MERGE_DIRS_isa-default-garversion-1.1b = $(libdir) +MERGE_SCRIPTS_isa-extra-garversion-1.1b = copy-relocated-only +MERGE_DIRS_isa-extra-garversion-1.1b = $(libdir) + +MERGE_SCRIPTS_isa-default-garversion-1.4.12 = copy-all +MERGE_SCRIPTS_isa-extra-garversion-1.4.12 = copy-relocated-only +MERGE_DIRS_isa-extra-garversion-1.4.12 = $(libdir) + +PKGFILES_CSWlibevent-devel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibevent-devel += $(bindir)/.* + include gar/category.mk #LIBS += -lresolv -lnsl #export LIBS +post-extract-modulated: + perl -pi -e 's,#!/bin/sh,#!/bin/bash,' $(WORKSRC)/test/test.sh + @$(MAKECOOKIE) Modified: csw/mgar/pkg/libevent/trunk/checksums =================================================================== --- csw/mgar/pkg/libevent/trunk/checksums 2009-11-02 08:42:21 UTC (rev 7070) +++ csw/mgar/pkg/libevent/trunk/checksums 2009-11-02 12:03:23 UTC (rev 7071) @@ -1 +1,2 @@ -77b0d8b9885496871bb083165b35ba11 download/libevent-1.4.12-stable.tar.gz +ec8dac612aa43ed172f300f396fcec49 libevent-1.1b.tar.gz +77b0d8b9885496871bb083165b35ba11 libevent-1.4.12-stable.tar.gz Deleted: csw/mgar/pkg/libevent/trunk/files/CSWlibevent-devel.depend =================================================================== --- csw/mgar/pkg/libevent/trunk/files/CSWlibevent-devel.depend 2009-11-02 08:42:21 UTC (rev 7070) +++ csw/mgar/pkg/libevent/trunk/files/CSWlibevent-devel.depend 2009-11-02 12:03:23 UTC (rev 7071) @@ -1 +0,0 @@ -P CSWlibevent libevent - event notification library Deleted: csw/mgar/pkg/libevent/trunk/files/CSWlibevent-devel.gspec =================================================================== --- csw/mgar/pkg/libevent/trunk/files/CSWlibevent-devel.gspec 2009-11-02 08:42:21 UTC (rev 7070) +++ csw/mgar/pkg/libevent/trunk/files/CSWlibevent-devel.gspec 2009-11-02 12:03:23 UTC (rev 7071) @@ -1,29 +0,0 @@ -%var bitname libevent_devel -%var pkgname CSWlibevent-devel -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%var desc libevent development support -%copyright -Copyright (c) 2000-2004 Niels Provos -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Deleted: csw/mgar/pkg/libevent/trunk/files/CSWlibevent-devel.prototype =================================================================== --- csw/mgar/pkg/libevent/trunk/files/CSWlibevent-devel.prototype 2009-11-02 08:42:21 UTC (rev 7070) +++ csw/mgar/pkg/libevent/trunk/files/CSWlibevent-devel.prototype 2009-11-02 12:03:23 UTC (rev 7071) @@ -1,14 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/event_rpcgen.py 0755 root bin -d none /opt/csw/include 0755 root bin -f none /opt/csw/include/evdns.h 0644 root bin -f none /opt/csw/include/event.h 0644 root bin -f none /opt/csw/include/evhttp.h 0644 root bin -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libevent.a 0644 root bin -f none /opt/csw/lib/libevent.la 0755 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/evdns.3 0644 root bin -f none /opt/csw/share/man/man3/event.3 0644 root bin Deleted: csw/mgar/pkg/libevent/trunk/files/CSWlibevent.depend =================================================================== --- csw/mgar/pkg/libevent/trunk/files/CSWlibevent.depend 2009-11-02 08:42:21 UTC (rev 7070) +++ csw/mgar/pkg/libevent/trunk/files/CSWlibevent.depend 2009-11-02 12:03:23 UTC (rev 7071) @@ -1 +0,0 @@ -P CSWgcc4corert gcc4corert - GNU C Compiler Run Time Deleted: csw/mgar/pkg/libevent/trunk/files/CSWlibevent.gspec =================================================================== --- csw/mgar/pkg/libevent/trunk/files/CSWlibevent.gspec 2009-11-02 08:42:21 UTC (rev 7070) +++ csw/mgar/pkg/libevent/trunk/files/CSWlibevent.gspec 2009-11-02 12:03:23 UTC (rev 7071) @@ -1,28 +0,0 @@ -%var bitname libevent -%var pkgname CSWlibevent -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright -Copyright (c) 2000-2004 Niels Provos -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Deleted: csw/mgar/pkg/libevent/trunk/files/CSWlibevent.prototype =================================================================== --- csw/mgar/pkg/libevent/trunk/files/CSWlibevent.prototype 2009-11-02 08:42:21 UTC (rev 7070) +++ csw/mgar/pkg/libevent/trunk/files/CSWlibevent.prototype 2009-11-02 12:03:23 UTC (rev 7071) @@ -1,4 +0,0 @@ -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libevent-1.3e.so.1.0.3 0755 root bin -s none /opt/csw/lib/libevent-1.3e.so.1=libevent-1.3e.so.1.0.3 -s none /opt/csw/lib/libevent.so=libevent-1.3e.so.1.0.3 Deleted: csw/mgar/pkg/libevent/trunk/files/stdint.diff =================================================================== --- csw/mgar/pkg/libevent/trunk/files/stdint.diff 2009-11-02 08:42:21 UTC (rev 7070) +++ csw/mgar/pkg/libevent/trunk/files/stdint.diff 2009-11-02 12:03:23 UTC (rev 7071) @@ -1,72 +0,0 @@ -diff --speed-large-files --minimal -Nru libevent-1.3e.orig/epoll.c libevent-1.3e/epoll.c ---- libevent-1.3e.orig/epoll.c 2007-07-30 23:41:07.000000000 -0400 -+++ libevent-1.3e/epoll.c 2007-10-18 02:04:33.404892000 -0400 -@@ -28,7 +28,7 @@ - #include "config.h" - #endif - --#include -+//#include - #include - #include - #include -diff --speed-large-files --minimal -Nru libevent-1.3e.orig/epoll_sub.c libevent-1.3e/epoll_sub.c ---- libevent-1.3e.orig/epoll_sub.c 2007-02-15 19:48:32.000000000 -0500 -+++ libevent-1.3e/epoll_sub.c 2007-10-18 02:04:33.429501000 -0400 -@@ -24,7 +24,7 @@ - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ --#include -+//#include - - #include - #include -diff --speed-large-files --minimal -Nru libevent-1.3e.orig/evdns.c libevent-1.3e/evdns.c ---- libevent-1.3e.orig/evdns.c 2007-09-12 18:20:34.000000000 -0400 -+++ libevent-1.3e/evdns.c 2007-10-18 02:04:33.481063000 -0400 -@@ -80,7 +80,7 @@ - #include - #include - #ifdef HAVE_STDINT_H --#include -+//#include - #endif - #include - #include -diff --speed-large-files --minimal -Nru libevent-1.3e.orig/event.h libevent-1.3e/event.h ---- libevent-1.3e.orig/event.h 2007-07-30 23:41:09.000000000 -0400 -+++ libevent-1.3e/event.h 2007-10-18 02:04:33.528924000 -0400 -@@ -32,7 +32,7 @@ - #endif - - #include --#include -+//#include - #include - - #ifdef WIN32 -diff --speed-large-files --minimal -Nru libevent-1.3e.orig/event_rpcgen.py libevent-1.3e/event_rpcgen.py ---- libevent-1.3e.orig/event_rpcgen.py 2007-07-30 23:41:04.000000000 -0400 -+++ libevent-1.3e/event_rpcgen.py 2007-10-18 02:04:33.561748000 -0400 -@@ -1296,7 +1296,7 @@ - name, guard, guard) - - # insert stdint.h - let's hope everyone has it -- pre += '#include \n' -+ #pre += '#include \n' - - for statement in headerdirect: - pre += '%s\n' % statement -diff --speed-large-files --minimal -Nru libevent-1.3e.orig/test/regress.gen.h libevent-1.3e/test/regress.gen.h ---- libevent-1.3e.orig/test/regress.gen.h 2007-09-24 23:59:03.000000000 -0400 -+++ libevent-1.3e/test/regress.gen.h 2007-10-18 02:05:43.526021000 -0400 -@@ -5,7 +5,7 @@ - #ifndef _REGRESS_RPC_ - #define _REGRESS_RPC_ - --#include -+//#include - #define EVTAG_HAS(msg, member) ((msg)->member##_set == 1) - #define EVTAG_ASSIGN(msg, member, args...) (*(msg)->member##_assign)(msg, ## args) - #define EVTAG_GET(msg, member, args...) (*(msg)->member##_get)(msg, ## args) Deleted: csw/mgar/pkg/libevent/trunk/files/testsh.diff =================================================================== --- csw/mgar/pkg/libevent/trunk/files/testsh.diff 2009-11-02 08:42:21 UTC (rev 7070) +++ csw/mgar/pkg/libevent/trunk/files/testsh.diff 2009-11-02 12:03:23 UTC (rev 7071) @@ -1,9 +0,0 @@ -diff --speed-large-files --minimal -Nru libevent-1.2a.orig/test/test.sh libevent-1.2a/test/test.sh ---- libevent-1.2a.orig/test/test.sh 2006-10-27 23:28:57.000000000 -0400 -+++ libevent-1.2a/test/test.sh 2007-01-31 02:01:39.633670000 -0500 -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/bin/bash - - setup () { - EVENT_NOKQUEUE=yes; export EVENT_NOKQUEUE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Mon Nov 2 15:17:30 2009 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Mon, 02 Nov 2009 14:17:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[7072] csw/mgar/pkg/denyhosts/trunk Message-ID: Revision: 7072 http://gar.svn.sourceforge.net/gar/?rev=7072&view=rev Author: bensons Date: 2009-11-02 14:17:30 +0000 (Mon, 02 Nov 2009) Log Message: ----------- denyhosts: no AAUTOSTART for the smf script Modified Paths: -------------- csw/mgar/pkg/denyhosts/trunk/Makefile csw/mgar/pkg/denyhosts/trunk/files/cswdenyhosts Modified: csw/mgar/pkg/denyhosts/trunk/Makefile =================================================================== --- csw/mgar/pkg/denyhosts/trunk/Makefile 2009-11-02 12:03:23 UTC (rev 7071) +++ csw/mgar/pkg/denyhosts/trunk/Makefile 2009-11-02 14:17:30 UTC (rev 7072) @@ -57,6 +57,7 @@ mv $(DESTDIR)$(datadir)/$(GARNAME)/denyhosts.cfg-dist \ $(DESTDIR)$(sysconfdir)/denyhosts.cfg ginstall -m 0755 $(FILEDIR)/cswdenyhosts $(DESTDIR)$(sysconfdir)/init.d + ginstall -m 0644 $(FILEDIR)/readme $(DOCDEST) #Adjust config to match Solaris paths + our package paths gsed -i \ Modified: csw/mgar/pkg/denyhosts/trunk/files/cswdenyhosts =================================================================== --- csw/mgar/pkg/denyhosts/trunk/files/cswdenyhosts 2009-11-02 12:03:23 UTC (rev 7071) +++ csw/mgar/pkg/denyhosts/trunk/files/cswdenyhosts 2009-11-02 14:17:30 UTC (rev 7072) @@ -2,6 +2,7 @@ # # Init script for denyhosts # +# AUTOENABLE no PATH=/opt/csw/bin:$PATH NAME=denyhosts This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Mon Nov 2 15:18:00 2009 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Mon, 02 Nov 2009 14:18:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7073] csw/mgar/pkg/denyhosts/trunk/files/readme Message-ID: Revision: 7073 http://gar.svn.sourceforge.net/gar/?rev=7073&view=rev Author: bensons Date: 2009-11-02 14:17:59 +0000 (Mon, 02 Nov 2009) Log Message: ----------- denyhosts: added readme Added Paths: ----------- csw/mgar/pkg/denyhosts/trunk/files/readme Added: csw/mgar/pkg/denyhosts/trunk/files/readme =================================================================== --- csw/mgar/pkg/denyhosts/trunk/files/readme (rev 0) +++ csw/mgar/pkg/denyhosts/trunk/files/readme 2009-11-02 14:17:59 UTC (rev 7073) @@ -0,0 +1,17 @@ +### opencsw denyhosts readme + +Please make sure, you have configured syslogd and sshd +to log the auth messages. +Sshd defaults to auth.info on Solaris, so an entry for +/etc/syslog.conf could look like: + +[snip] +auth.info /var/log/authlog +[snap] + +Please configure /etc/opt/csw/denyhosts.cfg accordingly: +[snip] +SECURE_LOG = /var/log/authlog +[snap] + +Restart syslogd and denyhosts for the changes to take effect. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Mon Nov 2 15:19:50 2009 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Mon, 02 Nov 2009 14:19:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[7074] csw/mgar/pkg/denyhosts/trunk/Makefile Message-ID: Revision: 7074 http://gar.svn.sourceforge.net/gar/?rev=7074&view=rev Author: bensons Date: 2009-11-02 14:19:50 +0000 (Mon, 02 Nov 2009) Log Message: ----------- denyhosts: added pkg requirement CSWpython Modified Paths: -------------- csw/mgar/pkg/denyhosts/trunk/Makefile Modified: csw/mgar/pkg/denyhosts/trunk/Makefile =================================================================== --- csw/mgar/pkg/denyhosts/trunk/Makefile 2009-11-02 14:17:59 UTC (rev 7073) +++ csw/mgar/pkg/denyhosts/trunk/Makefile 2009-11-02 14:19:50 UTC (rev 7074) @@ -24,6 +24,7 @@ LICENSE = LICENSE.txt ARCHALL = 1 INITSMF = /etc/opt/csw/init.d/cswdenyhosts +REQUIRED_PKGS = CSWpython # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).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 Nov 2 16:02:31 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 02 Nov 2009 15:02:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7075] csw/mgar/pkg/octave/trunk Message-ID: Revision: 7075 http://gar.svn.sourceforge.net/gar/?rev=7075&view=rev Author: dmichelsen Date: 2009-11-02 15:02:31 +0000 (Mon, 02 Nov 2009) Log Message: ----------- octave: Initial commit, release delayed as a ton of dependencies is missing Added Paths: ----------- csw/mgar/pkg/octave/trunk/Makefile csw/mgar/pkg/octave/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/octave/trunk/ Property changes on: csw/mgar/pkg/octave/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Copied: csw/mgar/pkg/octave/trunk/Makefile (from rev 7015, csw/mgar/pkg/gperf/trunk/Makefile) =================================================================== --- csw/mgar/pkg/octave/trunk/Makefile (rev 0) +++ csw/mgar/pkg/octave/trunk/Makefile 2009-11-02 15:02:31 UTC (rev 7075) @@ -0,0 +1,20 @@ +GARNAME = octave +GARVERSION = 3.2.3 +CATEGORIES = apps + +DESCRIPTION = The GNU Octave language for numerical computations +define BLURB +endef + +MASTER_SITES = $(GNU_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + Added: csw/mgar/pkg/octave/trunk/checksums =================================================================== --- csw/mgar/pkg/octave/trunk/checksums (rev 0) +++ csw/mgar/pkg/octave/trunk/checksums 2009-11-02 15:02:31 UTC (rev 7075) @@ -0,0 +1 @@ +eecaa1a3b2da3b94fa7bcebbc4f1a1f2 octave-3.2.3.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Mon Nov 2 16:13:57 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 02 Nov 2009 15:13:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[7076] csw/mgar/pkg/xterm/trunk Message-ID: Revision: 7076 http://gar.svn.sourceforge.net/gar/?rev=7076&view=rev Author: skayser Date: 2009-11-02 15:13:57 +0000 (Mon, 02 Nov 2009) Log Message: ----------- xterm: working copy towards version 250 Modified Paths: -------------- csw/mgar/pkg/xterm/trunk/Makefile csw/mgar/pkg/xterm/trunk/checksums Added Paths: ----------- csw/mgar/pkg/xterm/trunk/files/changelog.CSW Modified: csw/mgar/pkg/xterm/trunk/Makefile =================================================================== --- csw/mgar/pkg/xterm/trunk/Makefile 2009-11-02 15:02:31 UTC (rev 7075) +++ csw/mgar/pkg/xterm/trunk/Makefile 2009-11-02 15:13:57 UTC (rev 7076) @@ -1,20 +1,23 @@ GARNAME = xterm -GARVERSION = 248 +GARVERSION = 250 CATEGORIES = apps DESCRIPTION = Terminal emulator for the X Window System define BLURB -The xterm program is a terminal emulator for the X Window System. It provides -DEC VT102 and Tektronix 4014 compatible terminals for programs that can't use -the window system directly. This version implements ISO/ANSI colors using the -"new" color model (i.e., background color erase). It also implements most of -the control sequences for VT220. + The xterm program is a terminal emulator for the X Window System. It provides + DEC VT102 and Tektronix 4014 compatible terminals for programs that can't use + the window system directly. This version implements ISO/ANSI colors using the + "new" color model (i.e., background color erase). It also implements most of + the control sequences for VT220. endef MASTER_SITES = ftp://invisible-island.net/xterm/ DISTFILES = $(GARNAME)-$(GARVERSION).tgz REQUIRED_PKGS = CSWfconfig CSWlibxft2 +# We needed to switch to CSW-built X11 (build against Solaris X11 was broken +# on the build boxes, ) and these came along as dependencies. +REQUIRED_PKGS += CSWlibice CSWlibx11 CSWlibxaw CSWlibxmu CSWlibxt # enable -mk_width per default to address unicode form character width woes, # can be taken out once upstream enhances wcwidth() sanity checking @@ -54,9 +57,15 @@ CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) CONFIGURE_ARGS_DBG = --enable-trace --enable-warnings +# The need for the following extra flags also came along with the switch +# to CSW X11, didn't yet investigate what exactly broke ./configure +EXTRA_LDFLAGS = -L$(libdir) -lfontconfig + include gar/category.mk +post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(CATALOGNAME) post-install-modulated: - @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) - @cp $(FILEDIR)/README.CSW $(DESTDIR)$(docdir)/$(GARNAME) + ginstall -d $(DOCDEST) + cp $(FILEDIR)/README.CSW $(DOCDEST) + cp $(FILEDIR)/changelog.CSW $(DOCDEST) @$(MAKECOOKIE) Modified: csw/mgar/pkg/xterm/trunk/checksums =================================================================== --- csw/mgar/pkg/xterm/trunk/checksums 2009-11-02 15:02:31 UTC (rev 7075) +++ csw/mgar/pkg/xterm/trunk/checksums 2009-11-02 15:13:57 UTC (rev 7076) @@ -1 +1 @@ -70771a21fbc54a79f68374cebb49935a download/xterm-248.tgz +962ce117f65daf6bf376b6697b2cd02d download/xterm-250.tgz Added: csw/mgar/pkg/xterm/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/xterm/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/xterm/trunk/files/changelog.CSW 2009-11-02 15:13:57 UTC (rev 7076) @@ -0,0 +1,5 @@ +xterm (250,REV=2009.11.02) + + * Updated to 250. (Fixes #3937, #3856) + + -- Sebastian Kayser Mon, 2 Nov 2009 16:11:49 +0100 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 Nov 2 16:31:22 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 02 Nov 2009 15:31:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[7077] csw/mgar/pkg Message-ID: Revision: 7077 http://gar.svn.sourceforge.net/gar/?rev=7077&view=rev Author: dmichelsen Date: 2009-11-02 15:31:22 +0000 (Mon, 02 Nov 2009) Log Message: ----------- glpk: Initial commit Added Paths: ----------- csw/mgar/pkg/glpk/ csw/mgar/pkg/glpk/branches/ csw/mgar/pkg/glpk/tags/ csw/mgar/pkg/glpk/trunk/ csw/mgar/pkg/glpk/trunk/Makefile csw/mgar/pkg/glpk/trunk/checksums csw/mgar/pkg/glpk/trunk/files/ Property changes on: csw/mgar/pkg/glpk/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/glpk/trunk/Makefile =================================================================== --- csw/mgar/pkg/glpk/trunk/Makefile (rev 0) +++ csw/mgar/pkg/glpk/trunk/Makefile 2009-11-02 15:31:22 UTC (rev 7077) @@ -0,0 +1,28 @@ +GARNAME = glpk +GARVERSION = 4.39 +CATEGORIES = lib + +DESCRIPTION = GNU Linear Programming Kit +define BLURB + The GLPK (GNU Linear Programming Kit) package is intended for solving large-scale + linear programming (LP), mixed integer programming (MIP), and other related problems. + It is a set of routines written in ANSI C and organized in the form of a callable library. +endef + +MASTER_SITES = $(GNU_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +PACKAGES = CSWlibglpk + +BUILD64 = 1 +NO_ISAEXEC = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +MERGE_DIRS_isa-extra = $(libdir) + +include gar/category.mk Added: csw/mgar/pkg/glpk/trunk/checksums =================================================================== --- csw/mgar/pkg/glpk/trunk/checksums (rev 0) +++ csw/mgar/pkg/glpk/trunk/checksums 2009-11-02 15:31:22 UTC (rev 7077) @@ -0,0 +1 @@ +95f276ef6c94c6de1eb689f161f525f3 glpk-4.39.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 Nov 2 16:54:31 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 02 Nov 2009 15:54:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7078] csw/mgar/pkg Message-ID: Revision: 7078 http://gar.svn.sourceforge.net/gar/?rev=7078&view=rev Author: dmichelsen Date: 2009-11-02 15:54:31 +0000 (Mon, 02 Nov 2009) Log Message: ----------- fftw: Initial commit for fftw3 Added Paths: ----------- csw/mgar/pkg/fftw/ csw/mgar/pkg/fftw/branches/ csw/mgar/pkg/fftw/tags/ csw/mgar/pkg/fftw/trunk/ csw/mgar/pkg/fftw/trunk/Makefile csw/mgar/pkg/fftw/trunk/checksums csw/mgar/pkg/fftw/trunk/files/ Property changes on: csw/mgar/pkg/fftw/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/fftw/trunk/Makefile =================================================================== --- csw/mgar/pkg/fftw/trunk/Makefile (rev 0) +++ csw/mgar/pkg/fftw/trunk/Makefile 2009-11-02 15:54:31 UTC (rev 7078) @@ -0,0 +1,27 @@ +GARNAME = fftw +GARVERSION = 3.2.2 +CATEGORIES = lib + +DESCRIPTION = Library for computing the discrete Fourier transform (DFT) +define BLURB + FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) + in one or more dimensions, of arbitrary input size, and of both real and complex + data (as well as of even/odd data, i.e. the discrete cosine/sine transforms or + DCT/DST). We believe that FFTW, which is free software, should become the FFT + library of choice for most applications. +endef + +MASTER_SITES = http://www.fftw.org/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.fftw.org/ + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/fftw/trunk/checksums =================================================================== --- csw/mgar/pkg/fftw/trunk/checksums (rev 0) +++ csw/mgar/pkg/fftw/trunk/checksums 2009-11-02 15:54:31 UTC (rev 7078) @@ -0,0 +1 @@ +b616e5c91218cc778b5aa735fefb61ae fftw-3.2.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 Mon Nov 2 16:55:45 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 02 Nov 2009 15:55:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[7079] csw/mgar/pkg/fftw/trunk/Makefile Message-ID: Revision: 7079 http://gar.svn.sourceforge.net/gar/?rev=7079&view=rev Author: dmichelsen Date: 2009-11-02 15:55:44 +0000 (Mon, 02 Nov 2009) Log Message: ----------- fftw: Don't use isaexec Modified Paths: -------------- csw/mgar/pkg/fftw/trunk/Makefile Modified: csw/mgar/pkg/fftw/trunk/Makefile =================================================================== --- csw/mgar/pkg/fftw/trunk/Makefile 2009-11-02 15:54:31 UTC (rev 7078) +++ csw/mgar/pkg/fftw/trunk/Makefile 2009-11-02 15:55:44 UTC (rev 7079) @@ -20,8 +20,11 @@ SPKG_SOURCEURL = http://www.fftw.org/ BUILD64 = 1 +NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check +MERGE_DIRS_isa-extra = $(bindir) + 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 Nov 2 17:21:55 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 02 Nov 2009 16:21:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[7080] csw/mgar/pkg/hdf5 Message-ID: Revision: 7080 http://gar.svn.sourceforge.net/gar/?rev=7080&view=rev Author: dmichelsen Date: 2009-11-02 16:21:53 +0000 (Mon, 02 Nov 2009) Log Message: ----------- hdf5: Move to mGAR v2 and 1.8.3 with legacy version modulations Added Paths: ----------- csw/mgar/pkg/hdf5/tags/ csw/mgar/pkg/hdf5/trunk/Makefile csw/mgar/pkg/hdf5/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/hdf5/trunk/legacy/ Property Changed: ---------------- csw/mgar/pkg/hdf5/trunk/ Property changes on: csw/mgar/pkg/hdf5/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Copied: csw/mgar/pkg/hdf5/trunk/Makefile (from rev 7071, csw/mgar/pkg/libevent/trunk/Makefile) =================================================================== --- csw/mgar/pkg/hdf5/trunk/Makefile (rev 0) +++ csw/mgar/pkg/hdf5/trunk/Makefile 2009-11-02 16:21:53 UTC (rev 7080) @@ -0,0 +1,64 @@ +GARNAME = hdf5 +GARVERSION = 1.8.3 +CATEGORIES = lib + +EXTRA_MODULATORS = GARVERSION +MODULATIONS_GARVERSION = 1.6.9 1.8.3 + +SKIP_MODULATIONS = isa-sparcv9-garversion-1.6.9 +SKIP_MODULATIONS += isa-amd64-garversion-1.6.9 + +DESCRIPTION = Event notification library +define BLURB + The libevent API provides a mechanism to execute a callback function when a + specific event occurs on a file descriptor or after a timeout has been + reached. Furthermore, libevent also support callbacks due to signals or + regular timeouts. +endef + +MASTER_SITES = http://www.hdfgroup.org/ftp/HDF5/current/src/ +MASTER_SITES += http://www.hdfgroup.org/ftp/HDF5/current16/src/ +SOURCEFILES = $(foreach V,$(MODULATIONS_GARVERSION),$(GARNAME)-$V.tar.gz) +DISTFILES += $(SOURCEFILES) + +NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz,$(SOURCEFILES)) + +PACKAGES = CSWhdf5 CSWhdf5rt + +REQUIRED_PKGS_CSWhdf5rt = CSWhdf5 + +CATALOGNAME_CSWhdf5 = hdf5 +CATALOGNAME_CSWhdf5rt = hdf5_rt + +SPKG_DESC_CSWhdf5 = HDF5 (Hierarchical Data Format 5) Software Utilities +SPKG_DESC_CSWhdf5rt = HDF5 (Hierarchical Data Format 5) Software Runtime Libraries + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.hdfgroup.org/HDF5/ + +BUILD64 = 1 +NO_ISAEXEC = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +MERGE_SCRIPTS_isa-default-garversion-1.6.9 = copy-only +MERGE_DIRS_isa-default-garversion-1.6.9 = $(libdir) +MERGE_SCRIPTS_isa-extra-garversion-1.6.9 = copy-relocated-only +MERGE_DIRS_isa-extra-garversion-1.6.9 = $(libdir) + +MERGE_SCRIPTS_isa-default-garversion-1.8.3 = copy-all +MERGE_SCRIPTS_isa-extra-garversion-1.8.3 = copy-relocated-only +MERGE_DIRS_isa-extra-garversion-1.8.3 = $(libdir) + +PKGFILES_CSWhdf5rt = $(PKGFILES_RT) + +include gar/category.mk + +pre-install-modulated: + ginstall -d $(DESTDIR)$(libdir) + ginstall -d $(DESTDIR)$(includedir) + ginstall -d $(DESTDIR)$(bindir) + @$(MAKECOOKIE) Added: csw/mgar/pkg/hdf5/trunk/checksums =================================================================== --- csw/mgar/pkg/hdf5/trunk/checksums (rev 0) +++ csw/mgar/pkg/hdf5/trunk/checksums 2009-11-02 16:21:53 UTC (rev 7080) @@ -0,0 +1,2 @@ +751eb3317a47e7c58978e1c3a13a93fc hdf5-1.6.9.tar.gz +5ce228d860bf9e797ca40ab1a823c380 hdf5-1.8.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 Nov 2 17:23:47 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 02 Nov 2009 16:23:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[7081] csw/mgar/pkg/gsm/trunk Message-ID: Revision: 7081 http://gar.svn.sourceforge.net/gar/?rev=7081&view=rev Author: dmichelsen Date: 2009-11-02 16:23:45 +0000 (Mon, 02 Nov 2009) Log Message: ----------- gsm: Add patches for 64 bit compilation Modified Paths: -------------- csw/mgar/pkg/gsm/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/gsm/trunk/files/0001-Fix-types-for-64-bit.patch csw/mgar/pkg/gsm/trunk/files/0002-Don-t-throw-errors-if-removed-files-don-t-exist.patch Modified: csw/mgar/pkg/gsm/trunk/Makefile =================================================================== --- csw/mgar/pkg/gsm/trunk/Makefile 2009-11-02 16:21:53 UTC (rev 7080) +++ csw/mgar/pkg/gsm/trunk/Makefile 2009-11-02 16:23:45 UTC (rev 7081) @@ -34,14 +34,25 @@ TEST_TARGET = tst addtst misc TEST_ARGS = $(BUILD_ARGS) -INSTALL_ARGS = TOAST_INSTALL_ROOT="$(DESTDIR)$(prefix)" -INSTALL_ARGS += GSM_INSTALL_ROOT="$(DESTDIR)$(prefix)" +INSTALL_SCRIPTS = custom +#INSTALL_ARGS = TOAST_INSTALL_ROOT="$(DESTDIR)$(prefix)" +#INSTALL_ARGS += GSM_INSTALL_ROOT="$(DESTDIR)$(prefix)" include gar/category.mk -pre-install-modulated: +post-build-modulated: + +install-custom: ginstall -d $(DESTDIR)$(bindir) + ginstall $(WORKSRC)/bin/toast $(DESTDIR)$(bindir) + gln untoast $(DESTDIR)$(bindir)/toast + gln tcat $(DESTDIR)$(bindir)/toast ginstall -d $(DESTDIR)$(libdir) - ginstall -d $(DESTDIR)$(prefix)/inc - ginstall -d $(DESTDIR)$(prefix)/man/man1 + ginstall $(WORKSRC)/lib/libgsm.a $(DESTDIR)$(libdir) + ginstall -d $(DESTDIR)$(includedir) + ginstall $(WORKSRC)/inc/gsm.h $(DESTDIR)$(includedir) + ginstall -d $(DESTDIR)$(mandir)/man1 + ginstall $(WORKSRC)/man/toast.1 $(DESTDIR)$(mandir)/man1 + ginstall -d $(DESTDIR)$(mandir)/man3 + ginstall $(WORKSRC)/man/*.3 $(DESTDIR)$(mandir)/man3 @$(MAKECOOKIE) Added: csw/mgar/pkg/gsm/trunk/files/0001-Fix-types-for-64-bit.patch =================================================================== --- csw/mgar/pkg/gsm/trunk/files/0001-Fix-types-for-64-bit.patch (rev 0) +++ csw/mgar/pkg/gsm/trunk/files/0001-Fix-types-for-64-bit.patch 2009-11-02 16:23:45 UTC (rev 7081) @@ -0,0 +1,34 @@ +From 3da2e2e562fc914c6f908cebf4e6c29210615136 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 2 Nov 2009 09:41:10 +0100 +Subject: [PATCH 1/2] Fix types for 64 bit + +--- + inc/private.h | 10 ++++++---- + 1 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/inc/private.h b/inc/private.h +index 0c94255..316c328 100644 +--- a/inc/private.h ++++ b/inc/private.h +@@ -9,11 +9,13 @@ + #ifndef PRIVATE_H + #define PRIVATE_H + +-typedef short word; /* 16 bit signed int */ +-typedef long longword; /* 32 bit signed int */ ++#include + +-typedef unsigned short uword; /* unsigned word */ +-typedef unsigned long ulongword; /* unsigned longword */ ++typedef int16_t word; /* 16 bit signed int */ ++typedef int32_t longword; /* 32 bit signed int */ ++ ++typedef uint16_t uword; /* unsigned word */ ++typedef uint32_t ulongword; /* unsigned longword */ + + struct gsm_state { + +-- +1.6.5 + Added: csw/mgar/pkg/gsm/trunk/files/0002-Don-t-throw-errors-if-removed-files-don-t-exist.patch =================================================================== --- csw/mgar/pkg/gsm/trunk/files/0002-Don-t-throw-errors-if-removed-files-don-t-exist.patch (rev 0) +++ csw/mgar/pkg/gsm/trunk/files/0002-Don-t-throw-errors-if-removed-files-don-t-exist.patch 2009-11-02 16:23:45 UTC (rev 7081) @@ -0,0 +1,140 @@ +From 158e510f219f29090b4fda509dc5372f9bdd98c7 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 2 Nov 2009 09:42:37 +0100 +Subject: [PATCH 2/2] Don't throw errors if removed files don't exist + +--- + Makefile | 38 +++++++++++++++++++------------------- + 1 files changed, 19 insertions(+), 19 deletions(-) + +diff --git a/Makefile b/Makefile +index cfab74f..571eb5a 100644 +--- a/Makefile ++++ b/Makefile +@@ -17,7 +17,7 @@ SASR = -DSASR + + # LTP_CUT = -DLTP_CUT + LTP_CUT = +-######### Define to enable the GSM library's long-term correlation ++######### Define to enable the GSM library's long-term -f correlation + ######### approximation option---faster, but worse; works for + ######### both integer and floating point multiplications. + ######### This flag is still in the experimental stage. +@@ -300,7 +300,7 @@ install: toastinstall gsminstall + # The basic API: libgsm + + $(LIBGSM): $(LIB) $(GSM_OBJECTS) +- -rm $(RMFLAGS) $(LIBGSM) ++ -rm -f $(RMFLAGS) $(LIBGSM) + $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS) + $(RANLIB) $(LIBGSM) + +@@ -311,11 +311,11 @@ $(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM) + $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB) + + $(UNTOAST): $(BIN) $(TOAST) +- -rm $(RMFLAGS) $(UNTOAST) ++ -rm -f $(RMFLAGS) $(UNTOAST) + $(LN) $(TOAST) $(UNTOAST) + + $(TCAT): $(BIN) $(TOAST) +- -rm $(RMFLAGS) $(TCAT) ++ -rm -f $(RMFLAGS) $(TCAT) + $(LN) $(TOAST) $(TCAT) + + +@@ -342,59 +342,59 @@ toastinstall: + + gsmuninstall: + -if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then \ +- rm $(RMFLAGS) $(GSM_INSTALL_TARGETS) ; \ ++ rm -f $(RMFLAGS) $(GSM_INSTALL_TARGETS) ; \ + fi + + toastuninstall: + -if [ x"$(TOAST_INSTALL_ROOT)" != x ] ; then \ +- rm $(RMFLAGS) $(TOAST_INSTALL_TARGETS); \ ++ rm -f $(RMFLAGS) $(TOAST_INSTALL_TARGETS); \ + fi + + $(TOAST_INSTALL_BIN)/toast: $(TOAST) +- -rm $@ ++ -rm -f $@ + cp $(TOAST) $@ + chmod 755 $@ + + $(TOAST_INSTALL_BIN)/untoast: $(TOAST_INSTALL_BIN)/toast +- -rm $@ ++ -rm -f $@ + ln $? $@ + + $(TOAST_INSTALL_BIN)/tcat: $(TOAST_INSTALL_BIN)/toast +- -rm $@ ++ -rm -f $@ + ln $? $@ + + $(TOAST_INSTALL_MAN)/toast.1: $(MAN)/toast.1 +- -rm $@ ++ -rm -f $@ + cp $? $@ + chmod 444 $@ + + $(GSM_INSTALL_MAN)/gsm.3: $(MAN)/gsm.3 +- -rm $@ ++ -rm -f $@ + cp $? $@ + chmod 444 $@ + + $(GSM_INSTALL_MAN)/gsm_option.3: $(MAN)/gsm_option.3 +- -rm $@ ++ -rm -f $@ + cp $? $@ + chmod 444 $@ + + $(GSM_INSTALL_MAN)/gsm_explode.3: $(MAN)/gsm_explode.3 +- -rm $@ ++ -rm -f $@ + cp $? $@ + chmod 444 $@ + + $(GSM_INSTALL_MAN)/gsm_print.3: $(MAN)/gsm_print.3 +- -rm $@ ++ -rm -f $@ + cp $? $@ + chmod 444 $@ + + $(GSM_INSTALL_INC)/gsm.h: $(INC)/gsm.h +- -rm $@ ++ -rm -f $@ + cp $? $@ + chmod 444 $@ + + $(GSM_INSTALL_LIB)/libgsm.a: $(LIBGSM) +- -rm $@ ++ -rm -f $@ + cp $? $@ + chmod 444 $@ + +@@ -416,16 +416,16 @@ uninstall: toastuninstall gsmuninstall + @-echo uninstall: Done. + + semi-clean: +- -rm $(RMFLAGS) */*.o \ ++ -rm -f $(RMFLAGS) */*.o \ + $(TST)/lin2cod $(TST)/lin2txt \ + $(TST)/cod2lin $(TST)/cod2txt \ + $(TST)/gsm2cod \ + $(TST)/*.*.* + -$(FIND) . \( -name core -o -name foo \) \ +- -print | xargs rm $(RMFLAGS) ++ -print | xargs rm -f $(RMFLAGS) + + clean: semi-clean +- -rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add \ ++ -rm -f $(RMFLAGS) $(LIBGSM) $(ADDTST)/add \ + $(TOAST) $(TCAT) $(UNTOAST) \ + $(ROOT)/gsm-1.0.tar.Z + +-- +1.6.5 + 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 Nov 2 19:29:02 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 02 Nov 2009 18:29:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[7082] csw/mgar/gar/v2-migrateconf/ Message-ID: Revision: 7082 http://gar.svn.sourceforge.net/gar/?rev=7082&view=rev Author: wahwah Date: 2009-11-02 18:28:45 +0000 (Mon, 02 Nov 2009) Log Message: ----------- Branching out to implement a shortcut for cswmigrateconf. Added Paths: ----------- csw/mgar/gar/v2-migrateconf/ Property changes on: csw/mgar/gar/v2-migrateconf ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-skayser:6087-6132 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 Nov 3 11:29:36 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 03 Nov 2009 10:29:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[7083] csw/mgar/gar/v2-migrateconf/gar.pkg.mk Message-ID: Revision: 7083 http://gar.svn.sourceforge.net/gar/?rev=7083&view=rev Author: wahwah Date: 2009-11-03 10:29:36 +0000 (Tue, 03 Nov 2009) Log Message: ----------- gar/v2-migrateconf: preliminary support in GAR Modified Paths: -------------- csw/mgar/gar/v2-migrateconf/gar.pkg.mk Modified: csw/mgar/gar/v2-migrateconf/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-migrateconf/gar.pkg.mk 2009-11-02 18:28:45 UTC (rev 7082) +++ csw/mgar/gar/v2-migrateconf/gar.pkg.mk 2009-11-03 10:29:36 UTC (rev 7083) @@ -171,6 +171,7 @@ # and able to be consumed by a service that might be started. SPKG_CLASSES := $(call _spkg_cond_add,SAMPLECONF,cswcpsampleconf) SPKG_CLASSES := $(call _spkg_cond_add,PRESERVECONF,cswpreserveconf) +SPKG_CLASSES := $(call _spkg_cond_add,MIGRATECONF,cswpycompile) SPKG_CLASSES := $(call _spkg_cond_add,ETCSERVICES,cswetcservices) SPKG_CLASSES := $(call _spkg_cond_add,USERGROUP,cswusergroup) SPKG_CLASSES := $(call _spkg_cond_add,PYCOMPILE,cswpycompile) @@ -178,10 +179,11 @@ SPKG_CLASSES := $(call _spkg_cond_add,INITSMF,cswinitsmf) # - set class for all config files -ifneq ($(SAMPLECONF)$(PRESERVECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),) +ifneq ($(SAMPLECONF)$(PRESERVECONF)$(MIGRATECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),) _CSWCLASS_FILTER = | perl -ane '\ $(foreach FILE,$(SAMPLECONF:%\.CSW=%),$$F[1] = "cswcpsampleconf" if ( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ $(foreach FILE,$(PRESERVECONF:%\.CSW=%),$$F[1] = "cswpreserveconf" if( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ + $(foreach FILE,$(MIGRATECONF),$$F[1] = "cswmigrateconf" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(ETCSERVICES),$$F[1] = "cswetcservices" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(INETDCONF),$$F[1] = "cswinetd" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(INITSMF),$$F[1] = "cswinitsmf" if( $$F[2] =~ m(^$(FILE)$$) );)\ 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 Nov 3 12:46:10 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 03 Nov 2009 11:46:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7084] csw/mgar/pkg/mbuffer/trunk Message-ID: Revision: 7084 http://gar.svn.sourceforge.net/gar/?rev=7084&view=rev Author: skayser Date: 2009-11-03 11:46:07 +0000 (Tue, 03 Nov 2009) Log Message: ----------- mbuffer: working copy, testing unofficial upstream release Modified Paths: -------------- csw/mgar/pkg/mbuffer/trunk/Makefile csw/mgar/pkg/mbuffer/trunk/checksums Modified: csw/mgar/pkg/mbuffer/trunk/Makefile =================================================================== --- csw/mgar/pkg/mbuffer/trunk/Makefile 2009-11-03 10:29:36 UTC (rev 7083) +++ csw/mgar/pkg/mbuffer/trunk/Makefile 2009-11-03 11:46:07 UTC (rev 7084) @@ -14,7 +14,7 @@ # GARNAME = mbuffer -GARVERSION = 20090628 +GARVERSION = 20091103 CATEGORIES = utils DESCRIPTION = A tool for buffering data streams Modified: csw/mgar/pkg/mbuffer/trunk/checksums =================================================================== --- csw/mgar/pkg/mbuffer/trunk/checksums 2009-11-03 10:29:36 UTC (rev 7083) +++ csw/mgar/pkg/mbuffer/trunk/checksums 2009-11-03 11:46:07 UTC (rev 7084) @@ -1 +1 @@ -66a39f6e3289f2e181b4861e6a301b01 download/mbuffer-20090628.tgz +c3f8fe27edb333d4df02cbe1d0f5f4f5 download/mbuffer-20091103.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Tue Nov 3 14:09:58 2009 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Tue, 03 Nov 2009 13:09:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7085] csw/mgar/pkg/denyhosts/trunk/files Message-ID: Revision: 7085 http://gar.svn.sourceforge.net/gar/?rev=7085&view=rev Author: bensons Date: 2009-11-03 13:09:58 +0000 (Tue, 03 Nov 2009) Log Message: ----------- denyhosts: adjusted README.CSW Added Paths: ----------- csw/mgar/pkg/denyhosts/trunk/files/README.CSW Removed Paths: ------------- csw/mgar/pkg/denyhosts/trunk/files/readme Added: csw/mgar/pkg/denyhosts/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/denyhosts/trunk/files/README.CSW (rev 0) +++ csw/mgar/pkg/denyhosts/trunk/files/README.CSW 2009-11-03 13:09:58 UTC (rev 7085) @@ -0,0 +1,18 @@ +### OpenCSW denyhosts README + +Please make sure, you have configured syslogd and sshd +to log the auth messages. +sshd defaults to auth.info on Solaris, so an entry for +/etc/syslog.conf could look like: + +[snip] +auth.info /var/log/authlog +[snap] + +Please configure /etc/opt/csw/denyhosts.cfg accordingly: + +[snip] +SECURE_LOG = /var/log/authlog +[snap] + +Restart syslogd and denyhosts for the changes to take effect. Deleted: csw/mgar/pkg/denyhosts/trunk/files/readme =================================================================== --- csw/mgar/pkg/denyhosts/trunk/files/readme 2009-11-03 11:46:07 UTC (rev 7084) +++ csw/mgar/pkg/denyhosts/trunk/files/readme 2009-11-03 13:09:58 UTC (rev 7085) @@ -1,17 +0,0 @@ -### opencsw denyhosts readme - -Please make sure, you have configured syslogd and sshd -to log the auth messages. -Sshd defaults to auth.info on Solaris, so an entry for -/etc/syslog.conf could look like: - -[snip] -auth.info /var/log/authlog -[snap] - -Please configure /etc/opt/csw/denyhosts.cfg accordingly: -[snip] -SECURE_LOG = /var/log/authlog -[snap] - -Restart syslogd and denyhosts for the changes to take effect. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Tue Nov 3 14:15:07 2009 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Tue, 03 Nov 2009 13:15:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7086] csw/mgar/pkg/denyhosts/trunk/Makefile Message-ID: Revision: 7086 http://gar.svn.sourceforge.net/gar/?rev=7086&view=rev Author: bensons Date: 2009-11-03 13:15:07 +0000 (Tue, 03 Nov 2009) Log Message: ----------- denyhosts: adjusted README.CSW Modified Paths: -------------- csw/mgar/pkg/denyhosts/trunk/Makefile Modified: csw/mgar/pkg/denyhosts/trunk/Makefile =================================================================== --- csw/mgar/pkg/denyhosts/trunk/Makefile 2009-11-03 13:09:58 UTC (rev 7085) +++ csw/mgar/pkg/denyhosts/trunk/Makefile 2009-11-03 13:15:07 UTC (rev 7086) @@ -58,7 +58,7 @@ mv $(DESTDIR)$(datadir)/$(GARNAME)/denyhosts.cfg-dist \ $(DESTDIR)$(sysconfdir)/denyhosts.cfg ginstall -m 0755 $(FILEDIR)/cswdenyhosts $(DESTDIR)$(sysconfdir)/init.d - ginstall -m 0644 $(FILEDIR)/readme $(DOCDEST) + ginstall -m 0644 $(FILEDIR)/README.CSW $(DOCDEST) #Adjust config to match Solaris paths + our package paths gsed -i \ 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 Nov 3 15:30:56 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 03 Nov 2009 14:30:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[7087] csw/mgar/pkg/aide/trunk Message-ID: Revision: 7087 http://gar.svn.sourceforge.net/gar/?rev=7087&view=rev Author: dmichelsen Date: 2009-11-03 14:30:56 +0000 (Tue, 03 Nov 2009) Log Message: ----------- aide: Relocate config-file to /etc/opt/csw and provide example Modified Paths: -------------- csw/mgar/pkg/aide/trunk/Makefile csw/mgar/pkg/aide/trunk/checksums Added Paths: ----------- csw/mgar/pkg/aide/trunk/files/aide.conf Modified: csw/mgar/pkg/aide/trunk/Makefile =================================================================== --- csw/mgar/pkg/aide/trunk/Makefile 2009-11-03 13:15:07 UTC (rev 7086) +++ csw/mgar/pkg/aide/trunk/Makefile 2009-11-03 14:30:56 UTC (rev 7087) @@ -11,6 +11,7 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += aide.conf # Disable Sun ACLs for now until bug #2887984 is fixed: # http://sourceforge.net/tracker/?func=detail&aid=2887984&group_id=86976&atid=581579 @@ -26,6 +27,9 @@ REQUIRED_PKGS = CSWcurlrt CSWgcrypt CSWgpgerr CSWlibidn CSWlibmhash CSWlibpq REQUIRED_PKGS += CSWoldaprt CSWosslrt CSWzlib +sysconfdir = /etc/opt/csw/aide +PRESERVECONF = $(sysconfdir)/aide.conf + EXTRA_LIB = $(prefix)/postgresql/lib EXTRA_INC = $(prefix)/postgresql/include @@ -48,3 +52,7 @@ TEST_SCRIPTS = include gar/category.mk + +post-install-modulated: + ginstall -d $(DESTDIR)/etc/opt/csw/aide + ginstall $(WORKDIR)/aide.conf $(DESTDIR)/etc/opt/csw/aide/ Modified: csw/mgar/pkg/aide/trunk/checksums =================================================================== --- csw/mgar/pkg/aide/trunk/checksums 2009-11-03 13:15:07 UTC (rev 7086) +++ csw/mgar/pkg/aide/trunk/checksums 2009-11-03 14:30:56 UTC (rev 7087) @@ -1,2 +1,3 @@ c0fe56738d4f293c4d5a8de164a2a01c 0002-Add-missing-prototypes-for-db_sql.patch 27978cc6bca4f0fbf3f6f5a1b330661c aide-0.13.1.tar.gz +d23d52d1464b957c0d64f75e7e1ec862 aide.conf Added: csw/mgar/pkg/aide/trunk/files/aide.conf =================================================================== --- csw/mgar/pkg/aide/trunk/files/aide.conf (rev 0) +++ csw/mgar/pkg/aide/trunk/files/aide.conf 2009-11-03 14:30:56 UTC (rev 7087) @@ -0,0 +1,166 @@ +# From http://www.mail-archive.com/aide at cs.tut.fi/msg00234.html +# +# "This is the one I used when I was still running Solaris 8. +# You will probably need to do some tweaking of the /devices +# directory depending on the hardware you have installed." +# Richard van den Berg +# +# The files has been adjusted to suite OpenCSW directory layout. +# Dagobert Michelsen (dam at opencsw.org) + +# Here are all the things we can check - these are the default rules +# +#p: permissions +#i: inode +#n: number of links +#u: user +#g: group +#s: size +#b: block count +#m: mtime +#a: atime +#c: ctime +#S: check for growing size +#md5: md5 checksum +#sha1: sha1 checksum +#rmd160: rmd160 checksum +#tiger: tiger checksum +#R: p+i+n+u+g+s+m+c+md5 +#L: p+i+n+u+g +#E: Empty group +#>: Growing logfile p+u+g+i+n+S + +# Place of databases +# +gzip_dbout = yes +#database = file:///etc/aide/aide.db.gz +database = file:///floppy/aidedb/aide.db.gz +database_out = file:///opt/csw/etc/aide/aide.db.new.gz +database_new = file:///opt/csw/etc/aide/aide.db.new.gz + +# Custom rules +# +Default = p+i+n+u+g+s+b+m+c+md5+sha1 +C = p+i+n +T = p+i+u+g +F = i+n+u+g +Y = i+n + +# Configutations +/etc Default +/etc/.*pipe$ L +/etc/.name_service_door$ n+u+g+p +/etc/mnttab T +!/etc/ppp/resolv.conf$ +!/etc/cron.d/FIFO$ +/usr/local/etc Default +/usr/.*/etc.* Default +/usr/local/.*/etc.* Default +!/usr/local/etc/.*.cache$ +/opt/.*/etc Default +!/etc/rmtab$ +!/etc/Master.ini$ + +# Executables + +/usr/bin Default +/usr/ucb Default +/usr/.*/bin.* Default +/usr/local/.*/bin.* Default +/sbin Default +/usr/sbin Default +/usr/.*/sbin.* Default +/usr/local/.*/sbin.* Default +/opt/.*/bin.* Default +/opt/.*/sbin.* Default + +# Libraries + +/usr/lib Default +/usr/.*/lib.* Default +/usr/local/.*/lib.* Default +/opt/.*/lib.* Default + +/var Default +/var/audit$ L +!/var/audit/.* +/var/log$ L +!/var/log/.* +/var/mail$ L +!/var/mail/.* +/var/squid$ L +!/var/squid/.* +/var/cron/log$ L +!/var/cron/log/.* +/var/adm$ L +!/var/adm/.*log +/var/dt$ L +!/var/dt/.* +/var/dhcp$ L +!/var/dhcp/\..* +!/var/dhcp/SUNWfiles1_192_168_0_0 +!/var/adm/messages.* +!/var/spool/.* +!/var/adm/utmpx$ +!/var/adm/wtmpx$ +/var/spool/lp/tmp$ L +!/var/spool/lp/tmp/.* +!/var/preserve/sunpcilogs.* +/var/adm/X10msgs > + + +# Critical devices + +/dev/dsk Default +/dev/rdsk Default +/devices Default +/devices/pseudo/pts.* Y +/devices/pseudo/.*tty.* Y +/devices/pseudo/[EMAIL PROTECTED]:console C +/devices/pseudo/cons.* C +/devices/pseudo/random.* L +#/devices/[EMAIL PROTECTED],0/.* L +/devices/[EMAIL PROTECTED],0/sound.* C +/devices/[EMAIL PROTECTED],0/[EMAIL PROTECTED]:sound,audioctl Y +/devices/[EMAIL PROTECTED],0/SUNW,[EMAIL PROTECTED]:m640 C +/devices/[EMAIL PROTECTED],0/[EMAIL PROTECTED]/[EMAIL PROTECTED],0/floppy* F +/devices/[EMAIL PROTECTED],0/[EMAIL PROTECTED]/[EMAIL PROTECTED],3f8:a L +/devices/[EMAIL PROTECTED],0/[EMAIL PROTECTED]/pci108e,[EMAIL PROTECTED]:sunpci2drv L +/dev/kmem Default +/dev/mem Default +/dev/null Default +/dev/zero Default +/devices/pseudo/[EMAIL PROTECTED]:kmem L +/devices/pseudo/[EMAIL PROTECTED]:mem Default +/devices/pseudo/[EMAIL PROTECTED]:null L +/devices/pseudo/[EMAIL PROTECTED]:zero L + +# Other critical + +/kernel Default + +# Temporary directories +/usr/tmp$ T +!/usr/tmp/.* +/var/tmp$ T +!/var/tmp/.* +/var/run$ T +!/var/run/.* +/var/dt/tmp$ T +!/var/dt/tmp/.* +/tmp$ T +!/tmp/.* +/usr/aset/tmp$ T +!/usr/aset/tmp/.* +/usr/oasys/tmp$ T +!/usr/oasys/tmp/.* + +# Aide stuff + +/opt/csw/etc/aide$ L +!/opt/csw/etc/aide/.*\.log +!/opt/csw/etc/aide/.*\.new +!/opt/csw/etc/aide/.*\.db +/opt/csw/etc/aide/aide.conf Default +#/opt/csw/etc/aide/aide.db Default + 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 Nov 3 15:52:57 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 03 Nov 2009 14:52:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[7088] csw/mgar/pkg Message-ID: Revision: 7088 http://gar.svn.sourceforge.net/gar/?rev=7088&view=rev Author: dmichelsen Date: 2009-11-03 14:52:56 +0000 (Tue, 03 Nov 2009) Log Message: ----------- qhull: Initial commit Added Paths: ----------- csw/mgar/pkg/libqhull/ csw/mgar/pkg/libqhull/branches/ csw/mgar/pkg/libqhull/tags/ csw/mgar/pkg/libqhull/trunk/ csw/mgar/pkg/libqhull/trunk/Makefile csw/mgar/pkg/libqhull/trunk/checksums csw/mgar/pkg/libqhull/trunk/files/ Property changes on: csw/mgar/pkg/libqhull/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/libqhull/trunk/Makefile =================================================================== --- csw/mgar/pkg/libqhull/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libqhull/trunk/Makefile 2009-11-03 14:52:56 UTC (rev 7088) @@ -0,0 +1,43 @@ +GARNAME = qhull +GARVERSION = 2003.1 +CATEGORIES = lib + +DESCRIPTION = Qhull computes the convex hull and other hulls +define BLURB + Qhull computes the convex hull, Delaunay triangulation, Voronoi diagram, + halfspace intersection about a point, furthest-site Delaunay triangulation, + and furthest-site Voronoi diagram. The source code runs in 2-d, 3-d, 4-d, + and higher dimensions. Qhull implements the Quickhull algorithm for computing + the convex hull. It handles roundoff errors from floating point arithmetic. + It computes volumes, surface areas, and approximations to the convex hull. + Qhull does not support constrained Delaunay triangulations, triangulation + of non-convex surfaces, mesh generation of non-convex objects, or + medium-sized inputs in 9-D and higher. +endef + +MASTER_SITES = http://www.qhull.org/download/ +DISTFILES = $(DISTNAME).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +PACKAGES = CSWqhull CSWqhullrt + +CATALOGNAME_CSWqhull = qhull +CATALOGNAME_CSWqhullrt = qhull_rt + +SPKG_DESC_CSWqhull = Qhull computes the convex hull and other hulls +SPKG_DESC_CSWqhullrt = Qhull runtime libraries + +PKGFILES_CSWqhullrt = $(PKGFILES_RT) + +REQUIRED_PKGS_CSWqhull = CSWqhullrt + +SPKG_SOURCEURL = http://www.qhull.org/ + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/libqhull/trunk/checksums =================================================================== --- csw/mgar/pkg/libqhull/trunk/checksums (rev 0) +++ csw/mgar/pkg/libqhull/trunk/checksums 2009-11-03 14:52:56 UTC (rev 7088) @@ -0,0 +1 @@ +48228e26422bff85ef1f45df5b6e3314 qhull-2003.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 Nov 3 15:55:23 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 03 Nov 2009 14:55:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7089] csw/mgar/pkg Message-ID: Revision: 7089 http://gar.svn.sourceforge.net/gar/?rev=7089&view=rev Author: dmichelsen Date: 2009-11-03 14:55:23 +0000 (Tue, 03 Nov 2009) Log Message: ----------- qhull: Rename to match project name Added Paths: ----------- csw/mgar/pkg/qhull/ Removed Paths: ------------- csw/mgar/pkg/libqhull/ 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 Nov 3 15:58:51 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 03 Nov 2009 14:58:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[7090] csw/mgar/pkg/hdf5/trunk/Makefile Message-ID: Revision: 7090 http://gar.svn.sourceforge.net/gar/?rev=7090&view=rev Author: dmichelsen Date: 2009-11-03 14:58:50 +0000 (Tue, 03 Nov 2009) Log Message: ----------- hdf5: Fix package dependencies Modified Paths: -------------- csw/mgar/pkg/hdf5/trunk/Makefile Modified: csw/mgar/pkg/hdf5/trunk/Makefile =================================================================== --- csw/mgar/pkg/hdf5/trunk/Makefile 2009-11-03 14:55:23 UTC (rev 7089) +++ csw/mgar/pkg/hdf5/trunk/Makefile 2009-11-03 14:58:50 UTC (rev 7090) @@ -23,9 +23,9 @@ NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz,$(SOURCEFILES)) -PACKAGES = CSWhdf5 CSWhdf5rt +PACKAGES = CSWhdf5rt CSWhdf5 -REQUIRED_PKGS_CSWhdf5rt = CSWhdf5 +REQUIRED_PKGS_CSWhdf5 = CSWhdf5rt CATALOGNAME_CSWhdf5 = hdf5 CATALOGNAME_CSWhdf5rt = hdf5_rt 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 Nov 3 16:52:45 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 03 Nov 2009 15:52:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[7091] csw/mgar/pkg/aide/trunk Message-ID: Revision: 7091 http://gar.svn.sourceforge.net/gar/?rev=7091&view=rev Author: dmichelsen Date: 2009-11-03 15:52:45 +0000 (Tue, 03 Nov 2009) Log Message: ----------- aide: Adjust aide.conf Modified Paths: -------------- csw/mgar/pkg/aide/trunk/checksums csw/mgar/pkg/aide/trunk/files/aide.conf Modified: csw/mgar/pkg/aide/trunk/checksums =================================================================== --- csw/mgar/pkg/aide/trunk/checksums 2009-11-03 14:58:50 UTC (rev 7090) +++ csw/mgar/pkg/aide/trunk/checksums 2009-11-03 15:52:45 UTC (rev 7091) @@ -1,3 +1,3 @@ c0fe56738d4f293c4d5a8de164a2a01c 0002-Add-missing-prototypes-for-db_sql.patch 27978cc6bca4f0fbf3f6f5a1b330661c aide-0.13.1.tar.gz -d23d52d1464b957c0d64f75e7e1ec862 aide.conf +a488b910d69ebf4edf65e350994ccbba aide.conf Modified: csw/mgar/pkg/aide/trunk/files/aide.conf =================================================================== --- csw/mgar/pkg/aide/trunk/files/aide.conf 2009-11-03 14:58:50 UTC (rev 7090) +++ csw/mgar/pkg/aide/trunk/files/aide.conf 2009-11-03 15:52:45 UTC (rev 7091) @@ -35,8 +35,8 @@ gzip_dbout = yes #database = file:///etc/aide/aide.db.gz database = file:///floppy/aidedb/aide.db.gz -database_out = file:///opt/csw/etc/aide/aide.db.new.gz -database_new = file:///opt/csw/etc/aide/aide.db.new.gz +database_out = file:///etc/opt/csw/aide/aide.db.new.gz +database_new = file:///etc/opt/csw/aide/aide.db.new.gz # Custom rules # @@ -98,7 +98,6 @@ !/var/dt/.* /var/dhcp$ L !/var/dhcp/\..* -!/var/dhcp/SUNWfiles1_192_168_0_0 !/var/adm/messages.* !/var/spool/.* !/var/adm/utmpx$ @@ -116,24 +115,17 @@ /devices Default /devices/pseudo/pts.* Y /devices/pseudo/.*tty.* Y -/devices/pseudo/[EMAIL PROTECTED]:console C +/devices/pseudo/cn at 0:console C /devices/pseudo/cons.* C /devices/pseudo/random.* L -#/devices/[EMAIL PROTECTED],0/.* L -/devices/[EMAIL PROTECTED],0/sound.* C -/devices/[EMAIL PROTECTED],0/[EMAIL PROTECTED]:sound,audioctl Y -/devices/[EMAIL PROTECTED],0/SUNW,[EMAIL PROTECTED]:m640 C -/devices/[EMAIL PROTECTED],0/[EMAIL PROTECTED]/[EMAIL PROTECTED],0/floppy* F -/devices/[EMAIL PROTECTED],0/[EMAIL PROTECTED]/[EMAIL PROTECTED],3f8:a L -/devices/[EMAIL PROTECTED],0/[EMAIL PROTECTED]/pci108e,[EMAIL PROTECTED]:sunpci2drv L /dev/kmem Default /dev/mem Default /dev/null Default /dev/zero Default -/devices/pseudo/[EMAIL PROTECTED]:kmem L -/devices/pseudo/[EMAIL PROTECTED]:mem Default -/devices/pseudo/[EMAIL PROTECTED]:null L -/devices/pseudo/[EMAIL PROTECTED]:zero L +/devices/pseudo/mm at 0:kmem L +/devices/pseudo/mm at 0:mem Default +/devices/pseudo/mm at 0:null L +/devices/pseudo/mm at 0:zero L # Other critical 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 Nov 3 18:36:59 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 03 Nov 2009 17:36:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[7092] csw/mgar/pkg/websvn/trunk Message-ID: Revision: 7092 http://gar.svn.sourceforge.net/gar/?rev=7092&view=rev Author: dmichelsen Date: 2009-11-03 17:36:58 +0000 (Tue, 03 Nov 2009) Log Message: ----------- websvn: Move to mGAR v2 and update to 2.2.1 Modified Paths: -------------- csw/mgar/pkg/websvn/trunk/Makefile csw/mgar/pkg/websvn/trunk/checksums csw/mgar/pkg/websvn/trunk/files/websvn-csw-config.patch Removed Paths: ------------- csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.depend csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.gspec csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.postinstall csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.preremove Property Changed: ---------------- csw/mgar/pkg/websvn/trunk/ Property changes on: csw/mgar/pkg/websvn/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/websvn/trunk/Makefile =================================================================== --- csw/mgar/pkg/websvn/trunk/Makefile 2009-11-03 15:52:45 UTC (rev 7091) +++ csw/mgar/pkg/websvn/trunk/Makefile 2009-11-03 17:36:58 UTC (rev 7092) @@ -1,5 +1,5 @@ GARNAME = websvn -GARVERSION = 2.0 +GARVERSION = 2.2.1 CATEGORIES = apps DESCRIPTION = PHP based web interface of Subversion repositories @@ -12,31 +12,36 @@ a particular revision. endef -MASTER_SITES = svn-http://websvn.tigris.org/svn/$(GARNAME)/tags/ -DISTFILES = $(GARVERSION) -NOCHECKSUM = $(GARVERSION) -SVNHTTP_CO_ARGS = --no-auth-cache --username guest --password guest +# MASTER_SITES = svn-http://websvn.tigris.org/svn/$(GARNAME)/tags/ +# DISTFILES = $(GARVERSION) +# NOCHECKSUM = $(GARVERSION) +# SVNHTTP_CO_ARGS = --no-auth-cache --username guest --password guest +MASTER_SITES = http://websvn.tigris.org/files/documents/1380/45918/ +DISTFILES = $(DISTNAME).tar.gz + SPKG_SOURCEURL = http://websvn.tigris.org/ -DISTFILES += $(call admfiles,CSWwebsvn,depend postinstall preremove) +LICENSE = license.txt + +# DISTFILES += $(call admfiles,CSWwebsvn,depend postinstall preremove) PATCHFILES = websvn-csw-config.patch -WORKSRC = $(WORKDIR)/$(GARVERSION) +REQUIRED_PKGS = CSWapache2 CSWdiffutils CSWsvn CSWenscript CSWgsed CSWgtar CSWgzip CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = INSTALL_SCRIPTS = custom +EXTRA_PAX_ARGS += -s ',^\.\(.*\)/distconfig.php$$,.\1/config.php,' + +PRESERVECONF = $(sharedstatedir)/www/websvn/include/config.php + +ARCHALL = 1 + include gar/category.mk -post-extract: - @echo " ==> Preparing include/config.php.CSW" - @cp $(WORKSRC)/include/distconfig.php \ - $(WORKSRC)/include/config.php.CSW - @$(MAKECOOKIE) - install-custom: @echo " ==> Installing $(GARNAME)" @rm -rf $(DESTDIR)$(sharedstatedir)/www/websvn Modified: csw/mgar/pkg/websvn/trunk/checksums =================================================================== --- csw/mgar/pkg/websvn/trunk/checksums 2009-11-03 15:52:45 UTC (rev 7091) +++ csw/mgar/pkg/websvn/trunk/checksums 2009-11-03 17:36:58 UTC (rev 7092) @@ -1,5 +1,2 @@ -953d95d8a7ee6451acfb7ebb06893ae8 download/CSWwebsvn.gspec -858def27dd10cc82f447b7220b3473f1 download/CSWwebsvn.depend -afea5f097c11a1d4e3da2b790dd65fdf download/CSWwebsvn.postinstall -67cef58e940c379cddd8a61e6023a6da download/CSWwebsvn.preremove -b380450f1a5135649a0588cb8eaa10e4 download/websvn-csw-config.patch +f7eb3d57840aa3d1917bb0c645794601 websvn-2.2.1.tar.gz +c9e2b0372fe02393c2376c0ea707c522 websvn-csw-config.patch Deleted: csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.depend =================================================================== --- csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.depend 2009-11-03 15:52:45 UTC (rev 7091) +++ csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.depend 2009-11-03 17:36:58 UTC (rev 7092) @@ -1,7 +0,0 @@ -P CSWapache2 apache2 - Apache 2.2 web server -P CSWdiffutils diffutils - GNU diff and related utils -P CSWsvn subversion - Version control rethought -P CSWenscript enscript - convert text files to PostScript -P CSWgsed gsed - The GNU non-interactive text Stream-oriented EDitor (sed) -P CSWgtar gtar - GNU tape archiver -P CSWgzip gzip - GNU compression utility (replacement for compress) Deleted: csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.gspec =================================================================== --- csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.gspec 2009-11-03 15:52:45 UTC (rev 7091) +++ csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.gspec 2009-11-03 17:36:58 UTC (rev 7092) @@ -1,5 +0,0 @@ -%var bitname websvn -%var pkgname CSWwebsvn -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/licence.txt Deleted: csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.postinstall =================================================================== --- csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.postinstall 2009-11-03 15:52:45 UTC (rev 7091) +++ csw/mgar/pkg/websvn/trunk/files/CSWwebsvn.postinstall 2009-11-03 17:36:58 UTC (rev 7092) @@ -1,29 +0,0 @@ -#!/bin/sh - -CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw -CONFDIR=${CSW_PREFIX}/apache2/share/htdocs/websvn/include - -# Copy templates -template_list="config.php" - -echo Copying CSW templates: -for file in $template_list -do - filepath=${CONFDIR}/$file - if [ ! -f "$filepath" ] && [ -f "$filepath.CSW" ]; then - echo " creating $filepath" - cp $filepath.CSW $filepath - else - echo " preserving $filepath" - fi -done - -/usr/bin/cat < Revision: 7093 http://gar.svn.sourceforge.net/gar/?rev=7093&view=rev Author: wahwah Date: 2009-11-03 18:40:12 +0000 (Tue, 03 Nov 2009) Log Message: ----------- gar/v2-migrateconf: A fix, replacing a copied pycompile line with migrateconf Modified Paths: -------------- csw/mgar/gar/v2-migrateconf/gar.pkg.mk Modified: csw/mgar/gar/v2-migrateconf/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-migrateconf/gar.pkg.mk 2009-11-03 17:36:58 UTC (rev 7092) +++ csw/mgar/gar/v2-migrateconf/gar.pkg.mk 2009-11-03 18:40:12 UTC (rev 7093) @@ -171,7 +171,7 @@ # and able to be consumed by a service that might be started. SPKG_CLASSES := $(call _spkg_cond_add,SAMPLECONF,cswcpsampleconf) SPKG_CLASSES := $(call _spkg_cond_add,PRESERVECONF,cswpreserveconf) -SPKG_CLASSES := $(call _spkg_cond_add,MIGRATECONF,cswpycompile) +SPKG_CLASSES := $(call _spkg_cond_add,MIGRATECONF,cswmigrateconf) SPKG_CLASSES := $(call _spkg_cond_add,ETCSERVICES,cswetcservices) SPKG_CLASSES := $(call _spkg_cond_add,USERGROUP,cswusergroup) SPKG_CLASSES := $(call _spkg_cond_add,PYCOMPILE,cswpycompile) 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 Nov 3 19:41:09 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 03 Nov 2009 18:41:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[7094] csw/mgar/pkg/unixodbc/trunk Message-ID: Revision: 7094 http://gar.svn.sourceforge.net/gar/?rev=7094&view=rev Author: wahwah Date: 2009-11-03 18:41:09 +0000 (Tue, 03 Nov 2009) Log Message: ----------- unixodbc: Using cswmigrateconf Modified Paths: -------------- csw/mgar/pkg/unixodbc/trunk/Makefile csw/mgar/pkg/unixodbc/trunk/checksums Added Paths: ----------- csw/mgar/pkg/unixodbc/trunk/files/cswmigrateconf Property Changed: ---------------- csw/mgar/pkg/unixodbc/trunk/ Property changes on: csw/mgar/pkg/unixodbc/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-migrateconf Modified: csw/mgar/pkg/unixodbc/trunk/Makefile =================================================================== --- csw/mgar/pkg/unixodbc/trunk/Makefile 2009-11-03 18:40:12 UTC (rev 7093) +++ csw/mgar/pkg/unixodbc/trunk/Makefile 2009-11-03 18:41:09 UTC (rev 7094) @@ -8,13 +8,11 @@ DESCRIPTION = ODBC drivers for Unix systems define BLURB - It does stuff with things endef DL_NAME = unixODBC MASTER_SITES = http://www.unixodbc.org/ DISTFILES = $(DL_NAME)-$(GARVERSION).tar.gz -# The configuration migratin is pending decision. -# DISTFILES += CSWunixodbc.postinstall +DISTFILES += cswmigrateconf WORKSRC = $(WORKDIR)/$(DL_NAME)-$(GARVERSION) UFILES_REGEX = $(DL_NAME)-(\d+(?:\.\d+)*).tar.gz REQUIRED_PKGS = CSWiconv @@ -23,14 +21,17 @@ localstatedir = /var/opt/csw CONFIGURE_ARGS = $(DIRPATHS) --enable-gui=no BUILD64 = 1 -SAMPLECONF = /\/etc\/opt\/csw\/.*\.CSW +SAMPLECONF = \/etc\/opt\/csw\/odbc(inst|).ini +MIGRATECONF = \/etc\/opt\/csw\/pkg\/$(GARNAME)\/cswmigrateconf TEST_SCRIPTS = post-install-modulated: (cd $(DESTDIR)$(sysconfdir); \ - for f in ODBCDataSources odbc.ini odbcinst.ini; do \ + for f in odbc.ini odbcinst.ini; do \ mv "$${f}" "$${f}.CSW"; \ done) + ginstall -d -m 755 $(DESTDIR)$(sysconfdir)/pkg/$(GARNAME) + ginstall -m 644 $(FILEDIR)/cswmigrateconf $(DESTDIR)$(sysconfdir)/pkg/$(GARNAME) @$(MAKECOOKIE) include gar/category.mk Modified: csw/mgar/pkg/unixodbc/trunk/checksums =================================================================== --- csw/mgar/pkg/unixodbc/trunk/checksums 2009-11-03 18:40:12 UTC (rev 7093) +++ csw/mgar/pkg/unixodbc/trunk/checksums 2009-11-03 18:41:09 UTC (rev 7094) @@ -1 +1,2 @@ -f47c2efb28618ecf5f33319140a7acd0 download/unixODBC-2.2.14.tar.gz +8359050c8b7b37641805301da4d230c2 cswmigrateconf +f47c2efb28618ecf5f33319140a7acd0 unixODBC-2.2.14.tar.gz Added: csw/mgar/pkg/unixodbc/trunk/files/cswmigrateconf =================================================================== --- csw/mgar/pkg/unixodbc/trunk/files/cswmigrateconf (rev 0) +++ csw/mgar/pkg/unixodbc/trunk/files/cswmigrateconf 2009-11-03 18:41:09 UTC (rev 7094) @@ -0,0 +1,3 @@ +# $Id$ + +MIGRATE_FILES="odbc.ini odbcinst.ini ODBCDataSources" Property changes on: csw/mgar/pkg/unixodbc/trunk/files/cswmigrateconf ___________________________________________________________________ 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 Tue Nov 3 19:42:04 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 03 Nov 2009 18:42:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[7095] csw/mgar/pkg/unixodbc/trunk/checksums Message-ID: Revision: 7095 http://gar.svn.sourceforge.net/gar/?rev=7095&view=rev Author: wahwah Date: 2009-11-03 18:42:04 +0000 (Tue, 03 Nov 2009) Log Message: ----------- unixodbc: Updating the checksum of cswmigrateconf Modified Paths: -------------- csw/mgar/pkg/unixodbc/trunk/checksums Modified: csw/mgar/pkg/unixodbc/trunk/checksums =================================================================== --- csw/mgar/pkg/unixodbc/trunk/checksums 2009-11-03 18:41:09 UTC (rev 7094) +++ csw/mgar/pkg/unixodbc/trunk/checksums 2009-11-03 18:42:04 UTC (rev 7095) @@ -1,2 +1,2 @@ -8359050c8b7b37641805301da4d230c2 cswmigrateconf +fb47ac973383744b50cbd5af320a8dc2 cswmigrateconf f47c2efb28618ecf5f33319140a7acd0 unixODBC-2.2.14.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 Nov 3 21:18:12 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 03 Nov 2009 20:18:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7096] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 7096 http://gar.svn.sourceforge.net/gar/?rev=7096&view=rev Author: dmichelsen Date: 2009-11-03 20:18:12 +0000 (Tue, 03 Nov 2009) Log Message: ----------- mGAR v2: Add libpath as linker path if BUILD_PREFIX != prefix Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2009-11-03 18:42:04 UTC (rev 7095) +++ csw/mgar/gar/v2/gar.conf.mk 2009-11-03 20:18:12 UTC (rev 7096) @@ -492,7 +492,7 @@ RUNPATH_LINKER_FLAGS ?= $(foreach D,$(RUNPATH_DIRS),$(addprefix -R,$(addsuffix /\$$ISALIST,$(filter $D,$(RUNPATH_ISALIST))) $(abspath $D/$(MM_LIBDIR)))) $(addprefix -R,$(filter-out $(RUNPATH_DIRS),$(RUNPATH_ISALIST))) $(EXTRA_RUNPATH_LINKER_FLAGS) endif -LINKER_FLAGS ?= $(foreach ELIB,$(libdir_install) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR))) $(EXTRA_LINKER_FLAGS) +LINKER_FLAGS ?= $(foreach ELIB,$(libpath_install) $(filter-out $(libpath_install),$(libdir_install)) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR))) $(EXTRA_LINKER_FLAGS) CC_HOME = $($(GARCOMPILER)_CC_HOME) CC = $($(GARCOMPILER)_CC) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Nov 3 21:19:16 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 03 Nov 2009 20:19:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7097] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 7097 http://gar.svn.sourceforge.net/gar/?rev=7097&view=rev Author: dmichelsen Date: 2009-11-03 20:19:16 +0000 (Tue, 03 Nov 2009) Log Message: ----------- mysql-5.0.x: Tweak Makefile 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 2009-11-03 20:18:12 UTC (rev 7096) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-11-03 20:19:16 UTC (rev 7097) @@ -51,8 +51,6 @@ SPKG_DESC_CSWmysql5rt = MySQL 5 runtime files SPKG_DESC_CSWmysql5test = MySQL 5 testing files -support64 = (/(amd64|i386))? - # Defining the client programs, which are going to pick up the 32- and 64-bit # binaries, symbolic links, isaexec stuff and man pages. CSWmysql5client_programs = myisamlog @@ -75,11 +73,11 @@ PKGFILES_CSWmysql5bench = $(prefix)/sql-bench.* PKGFILES_CSWmysql5client = $(bindir) -PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(bindir)$(support64)/$(bin_name)) +PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(call baseisadirs,$(bindir),$(bin_name))) PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(mandir)/man1/$(bin_name)\.1) PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),/opt/csw/bin/$(bin_name)) PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),/opt/csw/sbin/$(bin_name)) -PKGFILES_CSWmysql5devel += $(bindir)$(support64)/mysql_config +PKGFILES_CSWmysql5devel += $(call baseisadirs,$(bindir),mysql_config) PKGFILES_CSWmysql5devel += $(mandir)/man1/mysql_config\.1 PKGFILES_CSWmysql5devel = $(prefix)/include.* PKGFILES_CSWmysql5rt = $(prefix)/lib/.*\.so.* @@ -105,11 +103,11 @@ # because we alter the prefix. this gets us proper linking as well as # LD_OPTIONS (RPATH) -EXTRA_LIB = /opt/csw/lib -EXTRA_INC = /opt/csw/include +# EXTRA_LIB = /opt/csw/lib +# EXTRA_INC = /opt/csw/include EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ -EXTRA_LIB = /opt/csw/mysql5/lib/$$ISALIST/mysql +# EXTRA_LIB = /opt/csw/mysql5/lib/$$ISALIST/mysql # Set ./configure options CONFIGURE_ARGS = $(DIRPATHS) @@ -130,14 +128,16 @@ BUILD64 = 1 USERGROUP = /etc/opt/csw/pkg/CSWmysql5/cswusergroup -PROTOTYPE_FILTER = awk ' \ - $$$$3 ~ /\/var\/opt\/csw\/mysql5$$$$/ { $$$$2 = "ugfiles"; \ - $$$$4 = "0700"; \ - $$$$5 = "mysql"; \ - $$$$6 = "mysql" } \ - { print }' -SPKG_CLASSES = none cswusergroup ugfiles +PROTOTYPE_MODIFIERS = ownmysql +PROTOTYPE_FILES_ownmysql = /var/opt/csw/mysql5 +PROTOTYPE_USER_ownmysql = mysql +PROTOTYPE_GROUP_ownmysql = mysql +PROTOTYPE_PERMS_ownmysql = 0700 +PROTOTYPE_CLASS_ownmysql = ugfiles + +SPKG_CLASSES = none ugfiles + include gar/category.mk post-install-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Nov 4 10:45:49 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 Nov 2009 09:45:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[7098] csw/mgar/gar/v2/bin/checkpkg Message-ID: Revision: 7098 http://gar.svn.sourceforge.net/gar/?rev=7098&view=rev Author: dmichelsen Date: 2009-11-04 09:45:49 +0000 (Wed, 04 Nov 2009) Log Message: ----------- mGAR v2: Replace xpg4/grep with bin/grep in checkpkg Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2009-11-03 20:19:16 UTC (rev 7097) +++ csw/mgar/gar/v2/bin/checkpkg 2009-11-04 09:45:49 UTC (rev 7098) @@ -451,7 +451,7 @@ if [[ $? -ne 0 ]]; then #if we've already looked at the package named $dep, #it'll be in the file. - awk "\$1 == \"$dep\" {print}" $SETDEPS | /usr/xpg4/bin/grep -q $dep + awk "\$1 == \"$dep\" {print}" $SETDEPS | /usr/bin/grep $dep >/dev/null if [[ $? -ne 0 ]]; then #we haven't yet seen this package in our set echo "Can't validate dependence on $dep. Storing for delayed validation." #store for validation at the end. @@ -530,7 +530,7 @@ while read mdep; do dep=`echo $mdep | nawk '{print $1}'` pkg=`echo $mdep | nawk '{print $2}'` - /usr/xpg4/bin/grep -q $dep $SETDEPS + /usr/bin/grep $dep $SETDEPS >/dev/null if [ $? -ne 0 ]; then errmsg "Couldn't validate $dep as a dependency in package $pkg" else @@ -545,7 +545,7 @@ lib=`echo $ldep | nawk '{print $1}'` [ "$lib" = "libm.so.2" ] && continue pkg=`echo $ldep | nawk '{print $2}'` - /usr/xpg4/bin/grep -q "[/=]$lib[ =]" $SETLIBS + /usr/bin/grep -q "[/=]$lib[ =]" $SETLIBS >/dev/null if [ $? -ne 0 ]; then errmsg "Couldn't find a package providing $lib" else 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 Nov 4 10:55:29 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 Nov 2009 09:55:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[7099] csw/mgar/pkg/ldns/trunk/Makefile Message-ID: Revision: 7099 http://gar.svn.sourceforge.net/gar/?rev=7099&view=rev Author: dmichelsen Date: 2009-11-04 09:55:29 +0000 (Wed, 04 Nov 2009) Log Message: ----------- ldns: Minor fixes with download URL Modified Paths: -------------- csw/mgar/pkg/ldns/trunk/Makefile Modified: csw/mgar/pkg/ldns/trunk/Makefile =================================================================== --- csw/mgar/pkg/ldns/trunk/Makefile 2009-11-04 09:45:49 UTC (rev 7098) +++ csw/mgar/pkg/ldns/trunk/Makefile 2009-11-04 09:55:29 UTC (rev 7099) @@ -11,7 +11,7 @@ scripting languages. endef -MASTER_SITES = http://www.nlnetlabs.nl/projects/ldns/ +MASTER_SITES = http://www.nlnetlabs.nl/downloads/ldns/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += CSWldns.doxyparse.diff @@ -22,12 +22,14 @@ SPKG_DESC_CSWldns = $(DESCRIPTION) SPKG_DESC_CSWldnsdevel = $(DESCRIPTION) development package +SPKG_SOURCEURL = http://www.nlnetlabs.nl/projects/ldns/ + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz # If the url used to check for software update is different of MASTER_SITES, then # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -UPSTREAM_MASTER_SITES = http://www.nlnetlabs.nl/downloads/ldns\ +UPSTREAM_MASTER_SITES = http://www.nlnetlabs.nl/downloads/ldns BUILD64 = 1 EXTRA_BUILD_ISAS_i386 = pentium_pro 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 Nov 4 12:52:27 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 Nov 2009 11:52:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7100] csw/mgar/pkg/libevent/trunk/Makefile Message-ID: Revision: 7100 http://gar.svn.sourceforge.net/gar/?rev=7100&view=rev Author: dmichelsen Date: 2009-11-04 11:52:27 +0000 (Wed, 04 Nov 2009) Log Message: ----------- libevent: Downgrade from 1.1b to 1.1a as the existing binaries link to it Modified Paths: -------------- csw/mgar/pkg/libevent/trunk/Makefile Modified: csw/mgar/pkg/libevent/trunk/Makefile =================================================================== --- csw/mgar/pkg/libevent/trunk/Makefile 2009-11-04 09:55:29 UTC (rev 7099) +++ csw/mgar/pkg/libevent/trunk/Makefile 2009-11-04 11:52:27 UTC (rev 7100) @@ -3,12 +3,12 @@ CATEGORIES = lib EXTRA_MODULATORS = GARVERSION -MODULATIONS_GARVERSION = 1.1b 1.4.12 +MODULATIONS_GARVERSION = 1.1a 1.4.12 -SKIP_MODULATIONS = isa-sparcv9-garversion-1.1b -SKIP_MODULATIONS += isa-amd64-garversion-1.1b +SKIP_MODULATIONS = isa-sparcv9-garversion-1.1a +SKIP_MODULATIONS += isa-amd64-garversion-1.1a -DISTVERSION-1.1b = 1.1b +DISTVERSION-1.1a = 1.1a DISTVERSION-1.4.12 = 1.4.12-stable DESCRIPTION = Event notification library @@ -48,10 +48,10 @@ TEST_TARGET = verify -MERGE_SCRIPTS_isa-default-garversion-1.1b = copy-only -MERGE_DIRS_isa-default-garversion-1.1b = $(libdir) -MERGE_SCRIPTS_isa-extra-garversion-1.1b = copy-relocated-only -MERGE_DIRS_isa-extra-garversion-1.1b = $(libdir) +MERGE_SCRIPTS_isa-default-garversion-1.1a = copy-only +MERGE_DIRS_isa-default-garversion-1.1a = $(libdir) +MERGE_SCRIPTS_isa-extra-garversion-1.1a = copy-relocated-only +MERGE_DIRS_isa-extra-garversion-1.1a = $(libdir) MERGE_SCRIPTS_isa-default-garversion-1.4.12 = copy-all MERGE_SCRIPTS_isa-extra-garversion-1.4.12 = copy-relocated-only 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 Nov 4 12:55:59 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 Nov 2009 11:55:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[7101] csw/mgar/pkg/libevent/trunk/checksums Message-ID: Revision: 7101 http://gar.svn.sourceforge.net/gar/?rev=7101&view=rev Author: dmichelsen Date: 2009-11-04 11:55:57 +0000 (Wed, 04 Nov 2009) Log Message: ----------- libevent: Update checksum Modified Paths: -------------- csw/mgar/pkg/libevent/trunk/checksums Modified: csw/mgar/pkg/libevent/trunk/checksums =================================================================== --- csw/mgar/pkg/libevent/trunk/checksums 2009-11-04 11:52:27 UTC (rev 7100) +++ csw/mgar/pkg/libevent/trunk/checksums 2009-11-04 11:55:57 UTC (rev 7101) @@ -1,2 +1,2 @@ -ec8dac612aa43ed172f300f396fcec49 libevent-1.1b.tar.gz +6cc776458ecaf9247550863702a44d7c libevent-1.1a.tar.gz 77b0d8b9885496871bb083165b35ba11 libevent-1.4.12-stable.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 Nov 4 12:58:11 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 Nov 2009 11:58:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[7102] csw/mgar/pkg/libevent/trunk/Makefile Message-ID: Revision: 7102 http://gar.svn.sourceforge.net/gar/?rev=7102&view=rev Author: dmichelsen Date: 2009-11-04 11:58:11 +0000 (Wed, 04 Nov 2009) Log Message: ----------- libevent: Enhance fix of test Modified Paths: -------------- csw/mgar/pkg/libevent/trunk/Makefile Modified: csw/mgar/pkg/libevent/trunk/Makefile =================================================================== --- csw/mgar/pkg/libevent/trunk/Makefile 2009-11-04 11:55:57 UTC (rev 7101) +++ csw/mgar/pkg/libevent/trunk/Makefile 2009-11-04 11:58:11 UTC (rev 7102) @@ -66,5 +66,5 @@ #export LIBS post-extract-modulated: - perl -pi -e 's,#!/bin/sh,#!/bin/bash,' $(WORKSRC)/test/test.sh + test -f $(WORKSRC)/test/test.sh && perl -pi -e 's,#!/bin/sh,#!/bin/bash,' $(WORKSRC)/test/test.sh @$(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 Nov 4 13:18:55 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 Nov 2009 12:18:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[7103] csw/mgar/pkg/libevent/trunk/Makefile Message-ID: Revision: 7103 http://gar.svn.sourceforge.net/gar/?rev=7103&view=rev Author: dmichelsen Date: 2009-11-04 12:18:55 +0000 (Wed, 04 Nov 2009) Log Message: ----------- libevent: Fix typo Modified Paths: -------------- csw/mgar/pkg/libevent/trunk/Makefile Modified: csw/mgar/pkg/libevent/trunk/Makefile =================================================================== --- csw/mgar/pkg/libevent/trunk/Makefile 2009-11-04 11:58:11 UTC (rev 7102) +++ csw/mgar/pkg/libevent/trunk/Makefile 2009-11-04 12:18:55 UTC (rev 7103) @@ -66,5 +66,5 @@ #export LIBS post-extract-modulated: - test -f $(WORKSRC)/test/test.sh && perl -pi -e 's,#!/bin/sh,#!/bin/bash,' $(WORKSRC)/test/test.sh + -test -f $(WORKSRC)/test/test.sh && perl -pi -e 's,#!/bin/sh,#!/bin/bash,' $(WORKSRC)/test/test.sh @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Nov 4 15:02:32 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 04 Nov 2009 14:02:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7104] csw/mgar/pkg/sudo/trunk/Makefile Message-ID: Revision: 7104 http://gar.svn.sourceforge.net/gar/?rev=7104&view=rev Author: wahwah Date: 2009-11-04 14:02:26 +0000 (Wed, 04 Nov 2009) Log Message: ----------- sudo: Moving the sudo symlink to the CSWsudo package Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2009-11-04 12:18:55 UTC (rev 7103) +++ csw/mgar/pkg/sudo/trunk/Makefile 2009-11-04 14:02:26 UTC (rev 7104) @@ -50,10 +50,11 @@ TEST_TARGET = check FIXCONFIG_DIRS = $(DESTDIR)$(libexecdir) +PKGFILES_CSWsudo = $(bindir)/sudo.minimal +PKGFILES_CSWsudo += $(bindir)/sudo + include gar/category.mk -PKGFILES_CSWsudo = .*$(bindir).*/sudo.minimal - post-install-modulated: @( cd $(DESTDIR)$(bindir) ; gmv sudo sudo.minimal ) @( cd $(DESTDIR)$(bindir) ; gln -s sudo.minimal sudo ) @@ -68,4 +69,3 @@ @$(MAKECOOKIE) SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) - 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 Nov 4 16:19:06 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 Nov 2009 15:19:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7105] csw/mgar/pkg/libgmp/trunk/Makefile Message-ID: Revision: 7105 http://gar.svn.sourceforge.net/gar/?rev=7105&view=rev Author: dmichelsen Date: 2009-11-04 15:19:06 +0000 (Wed, 04 Nov 2009) Log Message: ----------- libgmp: Fix ARCHFLAGS and required pkgs Modified Paths: -------------- csw/mgar/pkg/libgmp/trunk/Makefile Modified: csw/mgar/pkg/libgmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgmp/trunk/Makefile 2009-11-04 14:02:26 UTC (rev 7104) +++ csw/mgar/pkg/libgmp/trunk/Makefile 2009-11-04 15:19:06 UTC (rev 7105) @@ -55,11 +55,14 @@ PACKAGES = CSWlibgmp +REQUIRED_PKGS = CSWgcc4rt + include gar/category.mk + ifeq ($(ISA), sparcv8plus) ARCHFLAGS_$(GARCOMPILER)_$(ISA) = -mcpu=v9 -mv8plus endif ifeq ($(ISA), sparcv8plus+vis) - ARCHFLAGS_$(GARCOMPILER)_$(ISA) = -mcpu=v9 -mvis + ARCHFLAGS_$(GARCOMPILER)_$(ISA) = -mcpu=ultrasparc -mvis endif 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 Nov 4 16:20:24 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 Nov 2009 15:20:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7106] csw/mgar/pkg/libgmp/tags Message-ID: Revision: 7106 http://gar.svn.sourceforge.net/gar/?rev=7106&view=rev Author: dmichelsen Date: 2009-11-04 15:20:24 +0000 (Wed, 04 Nov 2009) Log Message: ----------- libgmp: Add legacy patches for 4.2.1 Added Paths: ----------- csw/mgar/pkg/libgmp/tags/legacy/ csw/mgar/pkg/libgmp/tags/legacy/patches-4.2.1-p5 Added: csw/mgar/pkg/libgmp/tags/legacy/patches-4.2.1-p5 =================================================================== --- csw/mgar/pkg/libgmp/tags/legacy/patches-4.2.1-p5 (rev 0) +++ csw/mgar/pkg/libgmp/tags/legacy/patches-4.2.1-p5 2009-11-04 15:20:24 UTC (rev 7106) @@ -0,0 +1,266 @@ +Index: mpn/generic/addsub_n.c +=================================================================== +RCS file: /home/cvsfiles/gmp42/mpn/generic/addsub_n.c,v +retrieving revision 1.1 +retrieving revision 1.2 +diff -p -2 -r1.1 -r1.2 +*** mpn/generic/addsub_n.c 14 Mar 2006 15:57:54 -0000 1.1 +--- mpn/generic/addsub_n.c 15 May 2006 22:38:42 -0000 1.2 +*************** +*** 1,5 **** + /* mpn_addsub_n -- Add and Subtract two limb vectors of equal, non-zero length. + +! Copyright 1999, 2000, 2001 Free Software Foundation, Inc. + + This file is part of the GNU MP Library. +--- 1,5 ---- + /* mpn_addsub_n -- Add and Subtract two limb vectors of equal, non-zero length. + +! Copyright 1999, 2000, 2001, 2006 Free Software Foundation, Inc. + + This file is part of the GNU MP Library. +*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp +*** 59,63 **** + { + this_n = MIN (n - off, PART_SIZE); +! #if HAVE_NATIVE_mpn_add_nc || !HAVE_NATIVE_mpn_add_n + acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo); + #else +--- 59,63 ---- + { + this_n = MIN (n - off, PART_SIZE); +! #if HAVE_NATIVE_mpn_add_nc + acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo); + #else +*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp +*** 65,69 **** + acyo = acyn + mpn_add_1 (r1p + off, r1p + off, this_n, acyo); + #endif +! #if HAVE_NATIVE_mpn_sub_nc || !HAVE_NATIVE_mpn_sub_n + scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo); + #else +--- 65,69 ---- + acyo = acyn + mpn_add_1 (r1p + off, r1p + off, this_n, acyo); + #endif +! #if HAVE_NATIVE_mpn_sub_nc + scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo); + #else +*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp +*** 82,86 **** + { + this_n = MIN (n - off, PART_SIZE); +! #if HAVE_NATIVE_mpn_sub_nc || !HAVE_NATIVE_mpn_sub_n + scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo); + #else +--- 82,86 ---- + { + this_n = MIN (n - off, PART_SIZE); +! #if HAVE_NATIVE_mpn_sub_nc + scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo); + #else +*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp +*** 88,92 **** + scyo = scyn + mpn_sub_1 (r2p + off, r2p + off, this_n, scyo); + #endif +! #if HAVE_NATIVE_mpn_add_nc || !HAVE_NATIVE_mpn_add_n + acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo); + #else +--- 88,92 ---- + scyo = scyn + mpn_sub_1 (r2p + off, r2p + off, this_n, scyo); + #endif +! #if HAVE_NATIVE_mpn_add_nc + acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo); + #else +*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp +*** 98,102 **** + else + { +! /* r1 and r2 are identical to s1 and s2 (r1==s1 and r2=s2 or vice versa) + Need temporary storage. */ + mp_limb_t tp[PART_SIZE]; +--- 98,102 ---- + else + { +! /* r1 and r2 are identical to s1 and s2 (r1==s1 and r2==s2 or vice versa) + Need temporary storage. */ + mp_limb_t tp[PART_SIZE]; +*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp +*** 106,110 **** + { + this_n = MIN (n - off, PART_SIZE); +! #if HAVE_NATIVE_mpn_add_nc || !HAVE_NATIVE_mpn_add_n + acyo = mpn_add_nc (tp, s1p + off, s2p + off, this_n, acyo); + #else +--- 106,110 ---- + { + this_n = MIN (n - off, PART_SIZE); +! #if HAVE_NATIVE_mpn_add_nc + acyo = mpn_add_nc (tp, s1p + off, s2p + off, this_n, acyo); + #else +*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp +*** 112,116 **** + acyo = acyn + mpn_add_1 (tp, tp, this_n, acyo); + #endif +! #if HAVE_NATIVE_mpn_sub_nc || !HAVE_NATIVE_mpn_sub_n + scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo); + #else +--- 112,116 ---- + acyo = acyn + mpn_add_1 (tp, tp, this_n, acyo); + #endif +! #if HAVE_NATIVE_mpn_sub_nc + scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo); + #else +Index: configure +=================================================================== +RCS file: /home/cvsfiles/gmp42/configure,v +retrieving revision 1.13 +retrieving revision 1.14 +diff -p -2 -r1.13 -r1.14 +*** configure 12 May 2006 16:00:27 -0000 1.13 +--- configure 17 May 2006 10:27:28 -0000 1.14 +*************** echo "include_mpn(\`sparc32/sparc-defs.m +*** 3555,3560 **** + esac + +! # If the user asked for a fat build, override the path set above + if test $enable_fat = yes; then + extra_functions="$extra_functions fat fat_entry" + path="x86/fat x86" +--- 3555,3562 ---- + esac + +! # If the user asked for a fat build, override the path and flags set above + if test $enable_fat = yes; then ++ gcc_cflags_cpu="" ++ gcc_cflags_arch="" + extra_functions="$extra_functions fat fat_entry" + path="x86/fat x86" +Index: configure +=================================================================== +RCS file: /home/cvsfiles/gmp42/configure,v +retrieving revision 1.11 +retrieving revision 1.13 +diff -p -2 -r1.11 -r1.13 +*** configure 4 May 2006 16:25:33 -0000 1.11 +--- configure 12 May 2006 16:00:27 -0000 1.13 +*************** _ACEOF +*** 2963,2969 **** + cc_cflags="-O2" + gcc_cflags="-O2 -mpowerpc" +! gcc_cflags_optlist="precomp subtype cpu" + gcc_cflags_precomp="-no-cpp-precomp" + gcc_cflags_subtype="-force_cpusubtype_ALL" # for vmx on darwin + + # grab this object, though it's not a true cycle counter routine +--- 2963,2971 ---- + cc_cflags="-O2" + gcc_cflags="-O2 -mpowerpc" +! gcc_cflags_optlist="precomp subtype asm cpu" + gcc_cflags_precomp="-no-cpp-precomp" + gcc_cflags_subtype="-force_cpusubtype_ALL" # for vmx on darwin ++ gcc_cflags_asm="" ++ gcc_cflags_cpu="" + + # grab this object, though it's not a true cycle counter routine +*************** _ACEOF +*** 2976,2980 **** + powerpc7400) + path="powerpc32/vmx powerpc32/750 powerpc32" ;; +! powerpc745?) + path="powerpc32/vmx powerpc32 powerpc32" ;; + *) +--- 2978,2982 ---- + powerpc7400) + path="powerpc32/vmx powerpc32/750 powerpc32" ;; +! powerpc74[45]?) + path="powerpc32/vmx powerpc32 powerpc32" ;; + *) +*************** _ACEOF +*** 3010,3015 **** + powerpc740) gcc_cflags_cpu="-mcpu=740" ;; + powerpc7400 | powerpc7410) + gcc_cflags_cpu="-mcpu=7400 -mcpu=750" ;; +! powerpc745?) gcc_cflags_cpu="-mcpu=7450" ;; + powerpc750) gcc_cflags_cpu="-mcpu=750" ;; + powerpc801) gcc_cflags_cpu="-mcpu=801" ;; +--- 3012,3020 ---- + powerpc740) gcc_cflags_cpu="-mcpu=740" ;; + powerpc7400 | powerpc7410) ++ gcc_cflags_asm="-Wa,-maltivec" + gcc_cflags_cpu="-mcpu=7400 -mcpu=750" ;; +! powerpc74[45]?) +! gcc_cflags_asm="-Wa,-maltivec" +! gcc_cflags_cpu="-mcpu=7450" ;; + powerpc750) gcc_cflags_cpu="-mcpu=750" ;; + powerpc801) gcc_cflags_cpu="-mcpu=801" ;; +Index: mpn/powerpc32/aix.m4 +=================================================================== +RCS file: /home/cvsfiles/gmp42/mpn/powerpc32/aix.m4,v +retrieving revision 1.3 +retrieving revision 1.4 +diff -p -2 -r1.3 -r1.4 +*** mpn/powerpc32/aix.m4 19 Apr 2006 08:40:28 -0000 1.3 +--- mpn/powerpc32/aix.m4 8 May 2006 09:47:12 -0000 1.4 +*************** m4_assert_numargs(2) +*** 52,56 **** + ` .toc + tc$2: +! .tc $2[TC], $2[RW]')' + ` lwz $1, tc$2(2)') + +--- 52,56 ---- + ` .toc + tc$2: +! .tc $2[TC], $2')' + ` lwz $1, tc$2(2)') + +Index: mpn/ia64/popcount.asm +=================================================================== +RCS file: /home/cvsfiles/gmp42/mpn/ia64/popcount.asm,v +retrieving revision 1.2 +retrieving revision 1.3 +diff -p -2 -r1.2 -r1.3 +*** mpn/ia64/popcount.asm 20 Mar 2006 14:00:18 -0000 1.2 +--- mpn/ia64/popcount.asm 19 May 2006 22:24:32 -0000 1.3 +*************** dnl to write mpn_hamdist with the same +*** 26,29 **** +--- 26,33 ---- + include(`../config.m4') + ++ define(ABI32, ++ m4_assert_onearg() ++ `ifdef(`HAVE_ABI_32',`$1')') ++ + C INPUT PARAMETERS + C sp = r32 +*************** PROLOGUE(mpn_popcount) +*** 34,39 **** + .prologue + .save ar.lc, r2 +! mov r2 = ar.lc + .body + and r22 = 3, r33 + shr.u r23 = r33, 2 ;; +--- 38,47 ---- + .prologue + .save ar.lc, r2 +! ABI32(` addp4 r32 = 0, r32') C M src extend +! mov r2 = ar.lc C I0 +! ABI32(` zxt4 r33 = r33') C I1 size extend +! ;; + .body ++ + and r22 = 3, r33 + shr.u r23 = r33, 2 ;; +*** mpz/set_d.c 14 Mar 2006 15:57:54 -0000 1.1 +--- mpz/set_d.c 31 May 2006 14:50:05 -0000 1.2 +*************** mpz_set_d (mpz_ptr r, double d) +*** 57,60 **** +--- 58,64 ---- + _mpz_realloc (r, rn); + ++ if (rn <= 0) ++ rn = 0; ++ + rp = PTR (r); + 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 Nov 4 16:24:26 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 Nov 2009 15:24:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[7107] csw/mgar/pkg/libgmp/trunk/Makefile Message-ID: Revision: 7107 http://gar.svn.sourceforge.net/gar/?rev=7107&view=rev Author: dmichelsen Date: 2009-11-04 15:24:26 +0000 (Wed, 04 Nov 2009) Log Message: ----------- libgmp: Fix typo Modified Paths: -------------- csw/mgar/pkg/libgmp/trunk/Makefile Modified: csw/mgar/pkg/libgmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgmp/trunk/Makefile 2009-11-04 15:20:24 UTC (rev 7106) +++ csw/mgar/pkg/libgmp/trunk/Makefile 2009-11-04 15:24:26 UTC (rev 7107) @@ -55,7 +55,7 @@ PACKAGES = CSWlibgmp -REQUIRED_PKGS = CSWgcc4rt +REQUIRED_PKGS = CSWgcc4corert include gar/category.mk 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 Nov 4 16:45:56 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Wed, 04 Nov 2009 15:45:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[7108] csw/mgar/pkg/unbound/trunk/Makefile Message-ID: Revision: 7108 http://gar.svn.sourceforge.net/gar/?rev=7108&view=rev Author: idogan23 Date: 2009-11-04 15:45:55 +0000 (Wed, 04 Nov 2009) Log Message: ----------- unbound: bump version to 1.3.4 Modified Paths: -------------- csw/mgar/pkg/unbound/trunk/Makefile Modified: csw/mgar/pkg/unbound/trunk/Makefile =================================================================== --- csw/mgar/pkg/unbound/trunk/Makefile 2009-11-04 15:24:26 UTC (rev 7107) +++ csw/mgar/pkg/unbound/trunk/Makefile 2009-11-04 15:45:55 UTC (rev 7108) @@ -28,6 +28,9 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = +PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 + ifeq ($(shell uname -r),5.8) GARCOMPILER = GCC4 REQUIRED_PKGS += CSWgcc4corert @@ -39,6 +42,7 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGUTE_ARGS += --with-solaris-threads +CONFIGURE_ARGS += --with-ldns=/opt/csw CONFIGURE_ARGS += --with-ssl=/opt/csw CONFIGURE_ARGS += --with-pidfile=/var/run/unbound.pid CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw 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 Nov 4 21:23:48 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 Nov 2009 20:23:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[7109] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 7109 http://gar.svn.sourceforge.net/gar/?rev=7109&view=rev Author: dmichelsen Date: 2009-11-04 20:23:48 +0000 (Wed, 04 Nov 2009) Log Message: ----------- cswclassutils: Add classes for texinfo and crontab Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/checksums csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.README.CSW Added Paths: ----------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcrontab csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswtexinfo csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcrontab csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswtexinfo Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2009-11-04 15:45:55 UTC (rev 7108) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2009-11-04 20:23:48 UTC (rev 7109) @@ -1,17 +1,21 @@ 48a97af56d55bc90ce90303228ed8cc3 COPYING fe030911decab669145b3017ed4fdf10 CSWcswclassutils.i.cswcpsampleconf +9a6f5ad4919b78e4083491edcd86db0c CSWcswclassutils.i.cswcrontab 56900bb1fc9f40f7c227877eca32b1f8 CSWcswclassutils.i.cswetcservices -0dec9b16f322a26b4fa5cc6c89dfd418 CSWcswclassutils.i.cswinetd +b363134a7c70a342195badc942a23b9d CSWcswclassutils.i.cswinetd fa318ca696e80a9a9f2efbf35cb69080 CSWcswclassutils.i.cswinitsmf 42668b41c7c886091a8ca44992b90806 CSWcswclassutils.i.cswmigrateconf c875d62c8ddaad0de2e18fff7946e1e8 CSWcswclassutils.i.cswpreserveconf 927297d22360707afd804c4ce58ed0a9 CSWcswclassutils.i.cswpycompile +1282bef941c49d98a061b3701a1fda7c CSWcswclassutils.i.cswtexinfo 7f04b24b421f3afbf3c61845941ef5dd CSWcswclassutils.i.cswusergroup d278a28a6f901c4ff5f07c583b4cff3d CSWcswclassutils.r.cswcpsampleconf +a204ca80139dd1d79e1a3af3e8bad7cb CSWcswclassutils.r.cswcrontab d60261ddc46e2cc83ecbbfc586a7e686 CSWcswclassutils.r.cswetcservices 9039ea60ad4c3f8994205fb242a49a72 CSWcswclassutils.r.cswinetd 791db9c2f6685aca67043820d260fc60 CSWcswclassutils.r.cswinitsmf f7a2a10bbf0f88c1909a31141e6d83ce CSWcswclassutils.r.cswmigrateconf 96453922952c92c6c5a024e54ed8525f CSWcswclassutils.r.cswpreserveconf 02326250b63d3c75c45a8ff81768e923 CSWcswclassutils.r.cswpycompile +ed76f47b045b000ab78154a90cf90ed4 CSWcswclassutils.r.cswtexinfo 752c74048ee18ae3a3c2c7b1d15e40f2 CSWcswclassutils.r.cswusergroup Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.README.CSW =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.README.CSW 2009-11-04 15:45:55 UTC (rev 7108) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.README.CSW 2009-11-04 20:23:48 UTC (rev 7109) @@ -53,6 +53,19 @@ /etc/services file. It is a one way manipulation. At package removal, the service entries are left behind. +- cswtexinfo + + This class takes care of keeping the info/dir page of CSWtexinfo + in sync with all texinfo pages installed. It adds entries on + package installation and removes them on package removal. + +- cswcrontab + + This class allows adding entries to the crontab for arbitrary users. + The entries will be tagged with the package name and removed on + package removal. If the entries have been changed manually they will + not be preserved. + Read more on the wiki: http://wiki.opencsw.org/cswclassutils-package. -- Added: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcrontab =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcrontab (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcrontab 2009-11-04 20:23:48 UTC (rev 7109) @@ -0,0 +1,50 @@ +#!/bin/sh +# +# i.cswcrontab - Class action script +# for registration of crontab entries +# +# Written and maintained by Dagobert Michelsen +# + +# set DEBUG to any value to enable trace output +DEBUG= + +echo "Installing class ..." + +while read src dest; do + + echo $dest + /usr/bin/cp $src $dest || exit 2 + + USERNAME=`/usr/bin/basename $dest` + echo "The following lines will be added to the crontab of the user '${USERNAME}':" + cat $dest + + TMPFILE=/tmp/cswcrontab.${PKGINST}.$$ + + umask 600 + /usr/bin/crontab -l ${USERNAME} | /usr/bin/grep -v "# Added by ${PKGINST}\$" > ${TMPFILE} + + if [ -n "$DEBUG" ]; then + echo "DEBUG: Contents of ${TMPFILE} after removing old lines from this package:" >&2 + cat ${TMPFILE} >&2 + fi + + cat $dest | while read LINE; do + echo "${LINE} % Added by ${PKGINST}" >> ${TMPFILE} + if [ -n "$DEBUG" ]; then + echo "DEBUG: Adding '${LINE} % Added by ${PKGINST}' to the end of the crontab" >&2 + fi + done + + if [ -n "$DEBUG" ]; then + echo "DEBUG: Installing crontab for user '${USERNAME}'" >&2 + cat ${TMPFILE} >&2 + fi + + su ${USERNAME} /usr/bin/crontab ${TMPFILE} + rm -f ${TMPFILE} + +done + +exit 0 Added: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswtexinfo =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswtexinfo (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswtexinfo 2009-11-04 20:23:48 UTC (rev 7109) @@ -0,0 +1,24 @@ +#!/bin/sh +# +# i.cswtexinfo - Class action script +# for registration of info pages to CSWtexinfo +# +# Written and maintained by Dagobert Michelsen +# +# 2009-11-04 Initial release + +echo "Installing class ..." + +while read src dest; do + + echo $dest + /usr/bin/cp $src $dest || exit 2 + + if [ -x ${PKG_INSTALL_ROOT}/opt/csw/bin/install-info ]; then + ${PKG_INSTALL_ROOT}/opt/csw/bin/install-info $dest ${PKG_INSTALL_ROOT}/opt/csw/info/dir + else + echo "CSWtexinfo couldn't be found." + fi +done + +exit 0 Added: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcrontab =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcrontab (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcrontab 2009-11-04 20:23:48 UTC (rev 7109) @@ -0,0 +1,33 @@ +#!/bin/sh +# +# r.cswcrontab - Class action script +# for registration of crontab entries +# +# Written and maintained by Dagobert Michelsen +# + +echo "Removing class ..." + +while read dest; do + echo $dest + rm -f $dest + + USERNAME=`/usr/bin/basename $dest` + TMPFILE=/tmp/cswcrontab.${PKGINST}.$$ + + umask 600 + + echo "The following lines will be removed from the crontab of the user '${USERNAME}':" + /usr/bin/crontab -l ${USERNAME} | /usr/bin/grep "# Added by ${PKGINST}\$" + + /usr/bin/crontab -l ${USERNAME} | /usr/bin/grep -v "# Added by ${PKGINST}\$" > ${TMPFILE} + + if [ -n "$DEBUG" ]; then + echo "DEBUG: Installing crontab for user '${USERNAME}'" >&2 + cat ${TMPFILE} >&2 + fi + + su ${USERNAME} /usr/bin/crontab ${TMPFILE} + rm -f ${TMPFILE} + +done Added: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswtexinfo =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswtexinfo (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswtexinfo 2009-11-04 20:23:48 UTC (rev 7109) @@ -0,0 +1,26 @@ +#!/bin/sh +# +# r.cswetcservices - Class action script +# for registration of info pages to CSWtexinfo +# +# Written and maintained by Dagobert Michelsen +# +# 2009-11-04 Initial release + +echo "Removing class ..." + +while read dest; do + + echo $dest + + if [ -x ${PKG_INSTALL_ROOT}/opt/csw/bin/install-info ]; then + ${PKG_INSTALL_ROOT}/opt/csw/bin/install-info --delete $dest ${PKG_INSTALL_ROOT}/opt/csw/info/dir + else + echo "CSWtexinfo couldn't be found." + fi + + rm -f $dest + +done + +exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Nov 4 21:33:03 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 Nov 2009 20:33:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[7110] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7110 http://gar.svn.sourceforge.net/gar/?rev=7110&view=rev Author: dmichelsen Date: 2009-11-04 20:33:03 +0000 (Wed, 04 Nov 2009) Log Message: ----------- mGAR v2: Fix repackage so it doesn't delete package-relevant files from DISTFILES Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-11-04 20:23:48 UTC (rev 7109) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-11-04 20:33:03 UTC (rev 7110) @@ -662,10 +662,9 @@ pkgreset-%: @echo " ==> Reset packaging state for $* ($(DESTIMG))" - @rm -rf $(foreach T,extract checksum package pkgcheck,$(COOKIEDIR)/*$(T)-$**) - @rm -rf $(COOKIEDIR)/pre-package $(COOKIEDIR)/post-package - @rm -rf $(WORKDIR)/$*.* $(WORKDIR)/prototype - @rm -f $(WORKDIR)/copyright $(WORKDIR)/*.copyright + $(_DBG)rm -rf $(foreach T,extract checksum package pkgcheck,$(COOKIEDIR)/*$(T)-$**) + $(_DBG)rm -rf $(COOKIEDIR)/pre-package $(COOKIEDIR)/post-package + $(_DBG)rm -rf $(addprefix $(WORKDIR)/,$(filter-out $(DISTFILES),$(patsubst $(WORKDIR)/%,%,$(wildcard $(WORKDIR)/$*.*)) prototype copyright $*.copyright)) repackage: pkgreset package 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 Nov 4 21:35:45 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 Nov 2009 20:35:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[7111] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7111 http://gar.svn.sourceforge.net/gar/?rev=7111&view=rev Author: dmichelsen Date: 2009-11-04 20:35:45 +0000 (Wed, 04 Nov 2009) Log Message: ----------- mGAR v2: Fix repackage so it doesn't delete package-relevant files from DISTFILES Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-11-04 20:33:03 UTC (rev 7110) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-11-04 20:35:45 UTC (rev 7111) @@ -660,6 +660,8 @@ reset-package: pkgreset +# Make sure we don't delete files we deliberately added with DISTFILES. They +# will not be copied to WORKDIR again. pkgreset-%: @echo " ==> Reset packaging state for $* ($(DESTIMG))" $(_DBG)rm -rf $(foreach T,extract checksum package pkgcheck,$(COOKIEDIR)/*$(T)-$**) 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 Nov 4 21:58:48 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 04 Nov 2009 20:58:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[7112] csw/mgar/pkg/cswclassutils/trunk/Makefile Message-ID: Revision: 7112 http://gar.svn.sourceforge.net/gar/?rev=7112&view=rev Author: bonivart Date: 2009-11-04 20:58:48 +0000 (Wed, 04 Nov 2009) Log Message: ----------- cswclassutils: add crontab and texinfo scripts Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-11-04 20:35:45 UTC (rev 7111) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-11-04 20:58:48 UTC (rev 7112) @@ -1,7 +1,7 @@ # $Id$ GARNAME = cswclassutils -GARVERSION = 1.27 +GARVERSION = 1.28 CATEGORIES = utils DESCRIPTION = CSW class action utilities This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Nov 5 09:50:56 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 Nov 2009 08:50:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[7113] csw/mgar/pkg/cpan Message-ID: Revision: 7113 http://gar.svn.sourceforge.net/gar/?rev=7113&view=rev Author: dmichelsen Date: 2009-11-05 08:50:56 +0000 (Thu, 05 Nov 2009) Log Message: ----------- cpan/Email-Date-Format: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Email-Date-Format/ csw/mgar/pkg/cpan/Email-Date-Format/branches/ csw/mgar/pkg/cpan/Email-Date-Format/tags/ csw/mgar/pkg/cpan/Email-Date-Format/trunk/ csw/mgar/pkg/cpan/Email-Date-Format/trunk/Makefile csw/mgar/pkg/cpan/Email-Date-Format/trunk/checksums csw/mgar/pkg/cpan/Email-Date-Format/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Email-Date-Format/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/Email-Date-Format/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Email-Date-Format/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Email-Date-Format/trunk/Makefile 2009-11-05 08:50:56 UTC (rev 7113) @@ -0,0 +1,15 @@ +GARNAME = Email-Date-Format +GARVERSION = 1.002 +CATEGORIES = cpan +AUTHOR = RJBS + +DESCRIPTION = Perl Email::Date::Format module to emit RFC 2822 style date strings +define BLURB +endef + +PACKAGES = CSWpmemaildateformat +CATALOGNAME = pm_emaildateformat + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Email-Date-Format/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Email-Date-Format/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Email-Date-Format/trunk/checksums 2009-11-05 08:50:56 UTC (rev 7113) @@ -0,0 +1 @@ +7ae25275da6ab272aa8b40141eac9f82 Email-Date-Format-1.002.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 Nov 5 09:52:26 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 Nov 2009 08:52:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[7114] csw/mgar/pkg/cpan/Email-Simple/trunk Message-ID: Revision: 7114 http://gar.svn.sourceforge.net/gar/?rev=7114&view=rev Author: dmichelsen Date: 2009-11-05 08:52:26 +0000 (Thu, 05 Nov 2009) Log Message: ----------- cpan/Email-Simple: Update to 2.100 Modified Paths: -------------- csw/mgar/pkg/cpan/Email-Simple/trunk/Makefile csw/mgar/pkg/cpan/Email-Simple/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Email-Simple/trunk/files/ Property Changed: ---------------- csw/mgar/pkg/cpan/Email-Simple/trunk/ Property changes on: csw/mgar/pkg/cpan/Email-Simple/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Email-Simple/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Email-Simple/trunk/Makefile 2009-11-05 08:50:56 UTC (rev 7113) +++ csw/mgar/pkg/cpan/Email-Simple/trunk/Makefile 2009-11-05 08:52:26 UTC (rev 7114) @@ -1,12 +1,19 @@ GARNAME = Email-Simple -GARVERSION = 2.005 +GARVERSION = 2.100 CATEGORIES = cpan AUTHOR = RJBS -DESCRIPTION = simple parsing of RFC2822 message format and headers +DESCRIPTION = Perl Email::Simple module for RFC2822 message format and headers define BLURB endef -DISTFILES += CSWpmemailsimple.gspec +REQUIRED_PKGS = CSWpmemaildateformat +PACKAGES = CSWpmemailsimple +CATALOGNAME = pm_emailsimple + +LICENSE = LICENSE + +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/Email-Simple/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Email-Simple/trunk/checksums 2009-11-05 08:50:56 UTC (rev 7113) +++ csw/mgar/pkg/cpan/Email-Simple/trunk/checksums 2009-11-05 08:52:26 UTC (rev 7114) @@ -1,2 +1 @@ -c694874fd890d5ad6f963a6d207fd4dd download/CSWpmemailsimple.gspec -945a8a487ba7aea909b01b84ceb1c678 download/Email-Simple-2.005.tar.gz +38205400f9b6b5f1d9b6ae45183cb71f Email-Simple-2.100.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 Nov 5 10:20:16 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 Nov 2009 09:20:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7115] csw/mgar/pkg/curl/trunk Message-ID: Revision: 7115 http://gar.svn.sourceforge.net/gar/?rev=7115&view=rev Author: dmichelsen Date: 2009-11-05 09:20:16 +0000 (Thu, 05 Nov 2009) Log Message: ----------- curl: Update to 7.19.7 Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile csw/mgar/pkg/curl/trunk/checksums Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2009-11-05 08:52:26 UTC (rev 7114) +++ csw/mgar/pkg/curl/trunk/Makefile 2009-11-05 09:20:16 UTC (rev 7115) @@ -1,5 +1,5 @@ GARNAME = curl -GARVERSION = 7.19.6 +GARVERSION = 7.19.7 CATEGORIES = net DESCRIPTION = Command line tool and library for client-side URL transfers. Modified: csw/mgar/pkg/curl/trunk/checksums =================================================================== --- csw/mgar/pkg/curl/trunk/checksums 2009-11-05 08:52:26 UTC (rev 7114) +++ csw/mgar/pkg/curl/trunk/checksums 2009-11-05 09:20:16 UTC (rev 7115) @@ -1,6 +1,6 @@ -8402c1f654c51ad7287aad57c3aa79be download/curl-7.19.6.tar.bz2 -f6e1a6d234d7f6811bb1c598ba9b7c8f download/curlbuild.h -a09fcad6dfcd9636061dfab7598357be download/libcurl.so.2.0.2.i -b46b41659b805013740eeb76e759af4b download/libcurl.so.2.0.2.s -30e826ef67b6ce799b32154250014dd9 download/libcurl.so.3.0.0.i -b63de55fb90feba487b1fd21e751d248 download/libcurl.so.3.0.0.s +79a8fbb2eed5464b97bdf94bee109380 curl-7.19.7.tar.bz2 +f6e1a6d234d7f6811bb1c598ba9b7c8f curlbuild.h +a09fcad6dfcd9636061dfab7598357be libcurl.so.2.0.2.i +b46b41659b805013740eeb76e759af4b libcurl.so.2.0.2.s +30e826ef67b6ce799b32154250014dd9 libcurl.so.3.0.0.i +b63de55fb90feba487b1fd21e751d248 libcurl.so.3.0.0.s 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 Nov 5 10:51:37 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 Nov 2009 09:51:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[7116] csw/mgar/pkg/unrar/trunk/Makefile Message-ID: Revision: 7116 http://gar.svn.sourceforge.net/gar/?rev=7116&view=rev Author: dmichelsen Date: 2009-11-05 09:51:37 +0000 (Thu, 05 Nov 2009) Log Message: ----------- unrar: Fix description Modified Paths: -------------- csw/mgar/pkg/unrar/trunk/Makefile Modified: csw/mgar/pkg/unrar/trunk/Makefile =================================================================== --- csw/mgar/pkg/unrar/trunk/Makefile 2009-11-05 09:20:16 UTC (rev 7115) +++ csw/mgar/pkg/unrar/trunk/Makefile 2009-11-05 09:51:37 UTC (rev 7116) @@ -2,9 +2,12 @@ GARVERSION = 3.9.6 CATEGORIES = utils -DESCRIPTION = Brief description +DESCRIPTION = RAR archive extractor define BLURB - Long description + WinRAR is a powerful archive manager. It can backup your data and reduce the size + of email attachments, decompress RAR, ZIP and other files downloaded from Internet + and create new archives in RAR and ZIP file format. You can try WinRAR before buy, + its trial version is available in downloads. endef MASTER_SITES = http://www.rarlab.com/rar/ @@ -24,18 +27,12 @@ OPT_FLAGS_SOS = -fast -erroff=wvarhidemem -#BUILD_SCRIPTS = $(WORKSRC)/makefile.unix BUILD_ARGS = -f makefile.unix CXX=$(CXX) CXXFLAGS="$(CXXFLAGS)" DEFINES="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" STRIP=strip TEST_SCRIPTS = INSTALL_SCRIPTS = custom -#CXXFLAGS=-fast -erroff=wvarhidemem -#DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -#STRIP=strip -#DESTDIR=/usr - include gar/category.mk install-custom: 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 Nov 5 11:10:54 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 Nov 2009 10:10:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[7117] csw/mgar/pkg/texinfo/trunk Message-ID: Revision: 7117 http://gar.svn.sourceforge.net/gar/?rev=7117&view=rev Author: dmichelsen Date: 2009-11-05 10:10:53 +0000 (Thu, 05 Nov 2009) Log Message: ----------- texinfo: Rework revision and make sure existing .info-files are registered Modified Paths: -------------- csw/mgar/pkg/texinfo/trunk/Makefile csw/mgar/pkg/texinfo/trunk/checksums Added Paths: ----------- csw/mgar/pkg/texinfo/trunk/files/CSWtexinfo.postinstall Modified: csw/mgar/pkg/texinfo/trunk/Makefile =================================================================== --- csw/mgar/pkg/texinfo/trunk/Makefile 2009-11-05 09:51:37 UTC (rev 7116) +++ csw/mgar/pkg/texinfo/trunk/Makefile 2009-11-05 10:10:53 UTC (rev 7117) @@ -1,7 +1,5 @@ GARNAME = texinfo -RELEASE = a -GARVERSION = 4.13 -DISTVERSION = $(GARVERSION)$(RELEASE) +GARVERSION = 4.13a CATEGORIES = utils DESCRIPTION = The GNU Documentation System @@ -11,7 +9,8 @@ endef MASTER_SITES = $(GNU_MIRROR) -DISTFILES = $(GARNAME)-$(DISTVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += CSWtexinfo.postinstall DISTFILES += mkdirentries SPKG_SOURCEURL = http://www.gnu.org/software/texinfo/ @@ -20,12 +19,16 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz REQUIRED_PKGS = CSWbash CSWgsed CSWncurses CSWiconv CSWggettextrt +# CSWgzip is needed for zdiff +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWgzip +DISTNAME = $(GARNAME)-4.13 + CONFIGURE_ARGS = $(DIRPATHS) # /opt/csw/lib is added automatically during the build and the # required libraries don't offer optimized versions, hence no $ISALIST. -RUNPATH_LINKER_FLAGS = +NORUNPATH = 1 TEST_TARGET = check @@ -33,12 +36,13 @@ include gar/category.mk -SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) - post-extract-modulated: perl -pi -e "s(#! /bin/sh)(#!/opt/csw/bin/bash)" $(WORKSRC)/util/texi2dvi @$(MAKECOOKIE) +# Some older packages execute this on postinstall. +# It can be removed when the last package using this has been updated with the +# cswtexinfo class. post-install-modulated: ginstall -d $(DESTDIR)$(sbindir) ginstall -m 755 $(WORKDIR)/mkdirentries $(DESTDIR)$(sbindir)/mkdirentries Modified: csw/mgar/pkg/texinfo/trunk/checksums =================================================================== --- csw/mgar/pkg/texinfo/trunk/checksums 2009-11-05 09:51:37 UTC (rev 7116) +++ csw/mgar/pkg/texinfo/trunk/checksums 2009-11-05 10:10:53 UTC (rev 7117) @@ -1,2 +1,3 @@ -71ba711519209b5fb583fed2b3d86fcb download/texinfo-4.13a.tar.gz -f5860ae7b0ff06605975c93e2f59fc07 download/mkdirentries +e125eda2f15f31ec8d4b0d34be449aae CSWtexinfo.postinstall +f5860ae7b0ff06605975c93e2f59fc07 mkdirentries +71ba711519209b5fb583fed2b3d86fcb texinfo-4.13a.tar.gz Copied: csw/mgar/pkg/texinfo/trunk/files/CSWtexinfo.postinstall (from rev 6855, csw/mgar/pkg/texinfo/trunk/files/mkdirentries) =================================================================== --- csw/mgar/pkg/texinfo/trunk/files/CSWtexinfo.postinstall (rev 0) +++ csw/mgar/pkg/texinfo/trunk/files/CSWtexinfo.postinstall 2009-11-05 10:10:53 UTC (rev 7117) @@ -0,0 +1,12 @@ +#!/bin/sh + +BASE=${PKG_INSTALL_ROOT}/opt/csw + +echo "Registering existing texinfo-files..." + +FILES=`ls $BASE/share/info/*.info $BASE/share/info/*.info-*` + +for i in $FILES; do + /opt/csw/bin/install-info $i $BASE/share/info/dir 2> /dev/null +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 Thu Nov 5 12:47:14 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 Nov 2009 11:47:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[7118] csw/mgar/pkg/libtasn1/trunk Message-ID: Revision: 7118 http://gar.svn.sourceforge.net/gar/?rev=7118&view=rev Author: dmichelsen Date: 2009-11-05 11:47:14 +0000 (Thu, 05 Nov 2009) Log Message: ----------- libtasn1: Update to 2.2 Modified Paths: -------------- csw/mgar/pkg/libtasn1/trunk/Makefile csw/mgar/pkg/libtasn1/trunk/checksums Modified: csw/mgar/pkg/libtasn1/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtasn1/trunk/Makefile 2009-11-05 10:10:53 UTC (rev 7117) +++ csw/mgar/pkg/libtasn1/trunk/Makefile 2009-11-05 11:47:14 UTC (rev 7118) @@ -1,5 +1,5 @@ GARNAME = libtasn1 -GARVERSION = 2.1 +GARVERSION = 2.2 CATEGORIES = lib DESCRIPTION = GNU ASN1 library Modified: csw/mgar/pkg/libtasn1/trunk/checksums =================================================================== --- csw/mgar/pkg/libtasn1/trunk/checksums 2009-11-05 10:10:53 UTC (rev 7117) +++ csw/mgar/pkg/libtasn1/trunk/checksums 2009-11-05 11:47:14 UTC (rev 7118) @@ -1 +1 @@ -9c6869cca08b7392415c7939ffd2bbae download/libtasn1-2.1.tar.gz +14cc361500d2e768a8a6ec538ce3fecb libtasn1-2.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 Nov 5 13:54:09 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 Nov 2009 12:54:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[7119] csw/mgar/pkg/gnutls/trunk Message-ID: Revision: 7119 http://gar.svn.sourceforge.net/gar/?rev=7119&view=rev Author: dmichelsen Date: 2009-11-05 12:54:09 +0000 (Thu, 05 Nov 2009) Log Message: ----------- gnutls: Update to 2.8.5 and switch to Sun Studio Modified Paths: -------------- csw/mgar/pkg/gnutls/trunk/Makefile csw/mgar/pkg/gnutls/trunk/checksums Modified: csw/mgar/pkg/gnutls/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnutls/trunk/Makefile 2009-11-05 11:47:14 UTC (rev 7118) +++ csw/mgar/pkg/gnutls/trunk/Makefile 2009-11-05 12:54:09 UTC (rev 7119) @@ -1,5 +1,5 @@ GARNAME = gnutls -GARVERSION = 2.6.5 +GARVERSION = 2.8.5 CATEGORIES = lib DESCRIPTION = GNU Transport Layer Security libraries and tools @@ -22,23 +22,21 @@ DISTFILES += libgnutls.so.13.i DISTFILES += libgnutls.so.13.s -GARCOMPILER = GNU - SPKG_SOURCEURL = http://www.gnu.org/software/gnutls/ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -#Waiting on gcc4 for amd64 -#BUILD64 = 1 -EXTRA_BUILD_ISAS_sparc = sparcv9 +BUILD64 = 1 NO_ISAEXEC = 1 +EXTRA_LDFLAGS = -L$(libdir) -lgpg-error -lsocket -lnsl + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check -REQUIRED_PKGS_CSWgnutls = CSWgcc4corert CSWgcc4g++rt CSWgcrypt CSWggettextrt +REQUIRED_PKGS_CSWgnutls = CSWgcrypt CSWggettextrt REQUIRED_PKGS_CSWgnutls += CSWgpgerr CSWlibtasn1 CSWreadline CSWzlib CSWiconv REQUIRED_PKGS_CSWgnutlsdevel = CSWgnutls Modified: csw/mgar/pkg/gnutls/trunk/checksums =================================================================== --- csw/mgar/pkg/gnutls/trunk/checksums 2009-11-05 11:47:14 UTC (rev 7118) +++ csw/mgar/pkg/gnutls/trunk/checksums 2009-11-05 12:54:09 UTC (rev 7119) @@ -1,5 +1,5 @@ -92b92c36b616aa8bd69a9a0fb2b8eb24 download/gnutls-2.6.5.tar.bz2 -073c509902375c40b885f5adc9f7dba9 download/libgnutls-openssl.so.13.i -02e4011d400d262b8d4b5c7311d8a5b0 download/libgnutls-openssl.so.13.s -b0eee0d29e3d260a146e626c6ca75b16 download/libgnutls.so.13.i -76f0d841ec6c4a3612ca2410c793e104 download/libgnutls.so.13.s +e3b2788b79bfc82acbe717e3c54d4e92 gnutls-2.8.5.tar.bz2 +073c509902375c40b885f5adc9f7dba9 libgnutls-openssl.so.13.i +02e4011d400d262b8d4b5c7311d8a5b0 libgnutls-openssl.so.13.s +b0eee0d29e3d260a146e626c6ca75b16 libgnutls.so.13.i +76f0d841ec6c4a3612ca2410c793e104 libgnutls.so.13.s This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From a_o_m at users.sourceforge.net Thu Nov 5 13:57:31 2009 From: a_o_m at users.sourceforge.net (a_o_m at users.sourceforge.net) Date: Thu, 05 Nov 2009 12:57:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7120] csw/mgar/pkg/scala/trunk Message-ID: Revision: 7120 http://gar.svn.sourceforge.net/gar/?rev=7120&view=rev Author: a_o_m Date: 2009-11-05 12:57:31 +0000 (Thu, 05 Nov 2009) Log Message: ----------- Scala: Update to 2.7.7 Modified Paths: -------------- csw/mgar/pkg/scala/trunk/Makefile csw/mgar/pkg/scala/trunk/checksums Modified: csw/mgar/pkg/scala/trunk/Makefile =================================================================== --- csw/mgar/pkg/scala/trunk/Makefile 2009-11-05 12:54:09 UTC (rev 7119) +++ csw/mgar/pkg/scala/trunk/Makefile 2009-11-05 12:57:31 UTC (rev 7120) @@ -1,7 +1,5 @@ -# Todo -# * Non-maintainer upload, needs to be checked by Alexander GARNAME = scala -GARVERSION = 2.7.4 +GARVERSION = 2.7.7 CATEGORIES = java DESCRIPTION = The Scala programming language @@ -12,7 +10,7 @@ languages. It is also fully interoperable with Java. endef -MASTER_SITES = http://www.scala-lang.org/sites/default/files/linuxsoft_archives/downloads/distrib/files/ +MASTER_SITES = http://www.scala-lang.org/downloads/distrib/files/ DISTFILES = $(GARNAME)-$(GARVERSION).final.tgz DISTNAME = $(GARNAME)-$(GARVERSION).final Modified: csw/mgar/pkg/scala/trunk/checksums =================================================================== --- csw/mgar/pkg/scala/trunk/checksums 2009-11-05 12:54:09 UTC (rev 7119) +++ csw/mgar/pkg/scala/trunk/checksums 2009-11-05 12:57:31 UTC (rev 7120) @@ -1 +1 @@ -9077f5d083c59f591f044b5295eb2011 download/scala-2.7.4.final.tgz +5d2294d5aab72fec869c0ba666d28b7e scala-2.7.7.final.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 Thu Nov 5 14:20:24 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 Nov 2009 13:20:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7121] csw/mgar/pkg/libsndfile/trunk Message-ID: Revision: 7121 http://gar.svn.sourceforge.net/gar/?rev=7121&view=rev Author: dmichelsen Date: 2009-11-05 13:20:24 +0000 (Thu, 05 Nov 2009) Log Message: ----------- libsndfile: Add possible enhancement Modified Paths: -------------- csw/mgar/pkg/libsndfile/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/libsndfile/trunk/files/sunpro-extensions.patch Modified: csw/mgar/pkg/libsndfile/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsndfile/trunk/Makefile 2009-11-05 12:57:31 UTC (rev 7120) +++ csw/mgar/pkg/libsndfile/trunk/Makefile 2009-11-05 13:20:24 UTC (rev 7121) @@ -38,6 +38,10 @@ PATCHFILES += 0003-Workaround-mising-stdint.h-and-Sun-Studio-shortcomin.patch PATCHFILES += 0004-Disable-stop-on-error-until-cpp_test-refcount-error-.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 + REQUIRED_PKGS = CSWvorbis CSWflac CSWlibogg CSWsqlite3rt PREREQUISITE_PKGS = $(REQUIRED_PKGS) Added: csw/mgar/pkg/libsndfile/trunk/files/sunpro-extensions.patch =================================================================== --- csw/mgar/pkg/libsndfile/trunk/files/sunpro-extensions.patch (rev 0) +++ csw/mgar/pkg/libsndfile/trunk/files/sunpro-extensions.patch 2009-11-05 13:20:24 UTC (rev 7121) @@ -0,0 +1,27 @@ +--- Makefile.orig 2009-05-18 13:08:50.608183737 +0200 ++++ Makefile +@@ -36,6 +36,11 @@ CONFIGURE_ENV+= ac_cv_c_struct_hack=yes + BUILDLINK_PASSTHRU_DIRS+= /Developer + .endif + ++# Needed for sun studio having __func__ defined ++.if ${PKGSRC_COMPILER} == "sunpro" ++CFLAGS+= -features=extensions ++.endif ++ + .include "../../audio/flac/buildlink3.mk" + #BUILDLINK_API_DEPENDS.libvorbis+= libvorbis>=1.2.1 + .include "../../audio/libvorbis/buildlink3.mk" +$NetBSD$ + +--- src/common.h.orig 2009-02-13 22:24:08.000000000 +0100 ++++ src/common.h +@@ -39,7 +39,7 @@ + + #if (SIZEOF_LONG == 8) + # define SF_PLATFORM_S64(x) x##l +-#elif COMPILER_IS_GCC ++#elif COMPILER_IS_GCC || __SUNPRO_C + # define SF_PLATFORM_S64(x) x##ll + #elif OS_IS_WIN32 + # define SF_PLATFORM_S64(x) x##I64 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 Nov 5 15:18:29 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 Nov 2009 14:18:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[7122] csw/mgar/pkg/cpan/Event-Lib/trunk Message-ID: Revision: 7122 http://gar.svn.sourceforge.net/gar/?rev=7122&view=rev Author: dmichelsen Date: 2009-11-05 14:18:29 +0000 (Thu, 05 Nov 2009) Log Message: ----------- cpan/Event-Lib: Update to 1.03 Modified Paths: -------------- csw/mgar/pkg/cpan/Event-Lib/trunk/Makefile csw/mgar/pkg/cpan/Event-Lib/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Event-Lib/trunk/files/CSWpmeventlib.depend csw/mgar/pkg/cpan/Event-Lib/trunk/files/CSWpmeventlib.gspec csw/mgar/pkg/cpan/Event-Lib/trunk/files/CSWpmeventlib.prototype Property Changed: ---------------- csw/mgar/pkg/cpan/Event-Lib/trunk/ Property changes on: csw/mgar/pkg/cpan/Event-Lib/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Event-Lib/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Event-Lib/trunk/Makefile 2009-11-05 13:20:24 UTC (rev 7121) +++ csw/mgar/pkg/cpan/Event-Lib/trunk/Makefile 2009-11-05 14:18:29 UTC (rev 7122) @@ -1,5 +1,5 @@ GARNAME = Event-Lib -GARVERSION = 1.01 +GARVERSION = 1.03 CATEGORIES = cpan AUTHOR = VPARSEVAL @@ -11,12 +11,21 @@ is received. endef -DISTFILES += $(call admfiles,CSWpmeventlib,depend prototype) +PACKAGES = CSWpmeventlib +CATALOGNAME = pm_eventlib +PREREQUISITE_PKGS = CSWlibevent-devel +REQUIRED_PKGS = CSWlibevent + # Sun cc inline function patch -PATCHFILES += inline.diff +PATCHFILES = inline.diff CONFIGURE_ARGS += LIBS="-L$(libdir) -levent" CONFIGURE_ARGS += INC="-I$(includedir)" +# Skip tests as some of them are failing. Remove after the +# issues have been resolved: +# https://rt.cpan.org/Ticket/Display.html?id=51129 +SKIPTEST = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/Event-Lib/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Event-Lib/trunk/checksums 2009-11-05 13:20:24 UTC (rev 7121) +++ csw/mgar/pkg/cpan/Event-Lib/trunk/checksums 2009-11-05 14:18:29 UTC (rev 7122) @@ -1,5 +1,2 @@ -f1ed7e6f920585b36e6d389648485fcb download/CSWpmeventlib.gspec -d777f90dbe31da0493a5cfa76b58e8ef download/CSWpmeventlib.depend -1b43841a2d0b4bc572c9acbb2e3ae1ae download/CSWpmeventlib.prototype -28ed9996dd6f4e2598cd5e94c549acf7 download/Event-Lib-1.01.tar.gz -c47167e36a0c8fb1289ca1b7e0751a34 download/inline.diff +90b60028f7f5836072e95c6d5b1d069e Event-Lib-1.03.tar.gz +c47167e36a0c8fb1289ca1b7e0751a34 inline.diff Deleted: csw/mgar/pkg/cpan/Event-Lib/trunk/files/CSWpmeventlib.depend =================================================================== --- csw/mgar/pkg/cpan/Event-Lib/trunk/files/CSWpmeventlib.depend 2009-11-05 13:20:24 UTC (rev 7121) +++ csw/mgar/pkg/cpan/Event-Lib/trunk/files/CSWpmeventlib.depend 2009-11-05 14:18:29 UTC (rev 7122) @@ -1 +0,0 @@ -P CSWlibevent libevent - event notification library Deleted: csw/mgar/pkg/cpan/Event-Lib/trunk/files/CSWpmeventlib.gspec =================================================================== --- csw/mgar/pkg/cpan/Event-Lib/trunk/files/CSWpmeventlib.gspec 2009-11-05 13:20:24 UTC (rev 7121) +++ csw/mgar/pkg/cpan/Event-Lib/trunk/files/CSWpmeventlib.gspec 2009-11-05 14:18:29 UTC (rev 7122) @@ -1,9 +0,0 @@ -%var bitname pm_eventlib -%var pkgname CSWpmeventlib -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (C) 2004-2005 by Tassilo von Parseval - -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.4 or, -at your option, any later version of Perl 5 you may have available. Deleted: csw/mgar/pkg/cpan/Event-Lib/trunk/files/CSWpmeventlib.prototype =================================================================== --- csw/mgar/pkg/cpan/Event-Lib/trunk/files/CSWpmeventlib.prototype 2009-11-05 13:20:24 UTC (rev 7121) +++ csw/mgar/pkg/cpan/Event-Lib/trunk/files/CSWpmeventlib.prototype 2009-11-05 14:18:29 UTC (rev 7122) @@ -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/Event 0755 root bin -f none /opt/csw/lib/perl/csw/Event/Lib.pm 0444 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Event 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Event/Lib 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Event/Lib/.packlist 0644 root bin -f none /opt/csw/lib/perl/csw/auto/Event/Lib/Lib.bs 0444 root bin -f none /opt/csw/lib/perl/csw/auto/Event/Lib/Lib.so 0555 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/Event::Lib.3perl 0444 root bin 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 Nov 5 15:59:23 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 Nov 2009 14:59:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7123] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7123 http://gar.svn.sourceforge.net/gar/?rev=7123&view=rev Author: dmichelsen Date: 2009-11-05 14:59:22 +0000 (Thu, 05 Nov 2009) Log Message: ----------- mGAR v2: Check all packages at the same time Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-11-05 14:18:29 UTC (rev 7122) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-11-05 14:59:22 UTC (rev 7123) @@ -579,12 +579,6 @@ # package - Use the mkpackage utility to create Solaris packages # -ifneq ($(ENABLE_CHECK),0) -PACKAGE_TARGETS = $(foreach SPEC,$(_PKG_SPECS), package-$(SPEC) pkgcheck-$(SPEC)) -else -PACKAGE_TARGETS = $(foreach SPEC,$(_PKG_SPECS), package-$(SPEC)) -endif - SPKG_DESTDIRS = $(SPKG_SPOOLDIR) $(SPKG_EXPORT) $(SPKG_DESTDIRS): @@ -610,7 +604,8 @@ # We depend on extract as the additional package files (like .gspec) must be # unpacked to global/ for packaging. E. g. 'merge' depends only on the specific # modulations and does not fill global/. -_package: validateplatform extract-global merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package +_package: validateplatform extract-global merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package $(if $(filter-out 0,$(ENABLE_CHECK)),pkgcheck) + @$(MAKECOOKIE) package: _package @echo @@ -642,13 +637,10 @@ # pkgcheck - check if the package is compliant # -pkgcheck: $(addprefix pkgcheck-,$(_PKG_SPECS)) - @$(DONADA) +pkgcheck: $(foreach SPEC,$(_PKG_SPECS),package-$(SPEC)) + $(_DBG)( LC_ALL=C $(GARBIN)/checkpkg $(foreach SPEC,$(_PKG_SPECS),$(SPKG_EXPORT)/`$(call _PKG_ENV,$(SPEC)) mkpackage -qs $(WORKDIR)/$(SPEC).gspec -D pkgfile`.gz ) || exit 2;) + @$(MAKECOOKIE) -pkgcheck-%: - @echo " ==> Checking compliance: $*" - @( LC_ALL=C $(GARBIN)/checkpkg $(SPKG_EXPORT)/`$(call _PKG_ENV,$1) mkpackage -qs $(WORKDIR)/$*.gspec -D pkgfile`.gz ) || exit 2 - pkgcheck-p: @$(foreach COOKIEFILE,$(PKGCHECK_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) 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 Nov 5 16:27:02 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 Nov 2009 15:27:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[7124] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7124 http://gar.svn.sourceforge.net/gar/?rev=7124&view=rev Author: dmichelsen Date: 2009-11-05 15:27:02 +0000 (Thu, 05 Nov 2009) Log Message: ----------- mGAR v2: Add missing target specification Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-11-05 14:59:22 UTC (rev 7123) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-11-05 15:27:02 UTC (rev 7124) @@ -579,6 +579,8 @@ # package - Use the mkpackage utility to create Solaris packages # +PACKAGE_TARGETS = $(foreach SPEC,$(_PKG_SPECS), package-$(SPEC)) + SPKG_DESTDIRS = $(SPKG_SPOOLDIR) $(SPKG_EXPORT) $(SPKG_DESTDIRS): 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 Nov 5 16:31:41 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 05 Nov 2009 15:31:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[7125] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 7125 http://gar.svn.sourceforge.net/gar/?rev=7125&view=rev Author: bonivart Date: 2009-11-05 15:31:40 +0000 (Thu, 05 Nov 2009) Log Message: ----------- pkgutil: update to 1.9 beta 1 Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype Added Paths: ----------- csw/mgar/pkg/pkgutil/trunk/files/i.cswpkgutil csw/mgar/pkg/pkgutil/trunk/files/r.cswpkgutil Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2009-11-05 15:27:02 UTC (rev 7124) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-11-05 15:31:40 UTC (rev 7125) @@ -1,5 +1,5 @@ GARNAME = pkgutil -GARVERSION = 1.8 +GARVERSION = 1.9b1 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily @@ -12,8 +12,9 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).zip -DISTFILES += $(call admfiles,CSWpkgutil,prototype postinstall preremove) -#DISTFILES += $(call admfiles,CSWpkgutil,postinstall preremove) +DISTFILES += $(call admfiles,CSWpkgutil,prototype) +DISTFILES += i.cswpkgutil +DISTFILES += r.cswpkgutil PACKAGES = CSWpkgutil CSWpkgutilplus @@ -40,35 +41,29 @@ WORKSRC = $(WORKDIR) SPKG_SOURCEURL = http://pkgutil.wikidot.com/ -#SPKG_CLASSES = none cswpkgutil +SPKG_CLASSES_CSWpkgutil = none cswpkgutil install-custom: @echo " ==> Installing $(GARNAME) (custom)" @rm -rf $(DESTDIR) @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg-hooks/preargproc.d - @cp $(WORKSRC)/$(GARNAME).conf $(DESTDIR)/etc/opt/csw/$(GARNAME).conf.CSW - @cp $(WORKSRC)/pkgutillog $(DESTDIR)/etc/opt/csw/pkg-hooks/preargproc.d/01-CSW$(GARNAME)plus-log + @ginstall $(WORKSRC)/$(GARNAME).conf $(DESTDIR)/etc/opt/csw/$(GARNAME).conf.CSW + @ginstall -m 755 $(WORKSRC)/pkgutillog $(DESTDIR)/etc/opt/csw/pkg-hooks/preargproc.d/01-CSW$(GARNAME)plus-log @ginstall -m 755 -d $(DESTDIR)$(bindir) - @cp $(WORKSRC)/$(GARNAME) $(DESTDIR)$(bindir) - @cp $(WORKSRC)/bldcat $(DESTDIR)$(bindir) - @cp $(WORKSRC)/chkcat $(DESTDIR)$(bindir) + @ginstall $(WORKSRC)/$(GARNAME) $(WORKSRC)/bldcat $(WORKSRC)/chkcat $(DESTDIR)$(bindir) @ginstall -m 755 -d $(DESTDIR)$(sysconfdir) - @cp $(WORKSRC)/$(GARNAME).conf $(DESTDIR)$(sysconfdir)/$(GARNAME).conf.CSW + @ginstall $(WORKSRC)/$(GARNAME).conf $(DESTDIR)$(sysconfdir)/$(GARNAME).conf.CSW @ginstall -m 755 -d $(DESTDIR)/opt/csw/libexec/$(GARNAME) - @cp $(WORKSRC)/wget-`uname -p` $(DESTDIR)/opt/csw/libexec/$(GARNAME)/wget + @ginstall $(WORKSRC)/wget-`uname -p` $(DESTDIR)/opt/csw/libexec/$(GARNAME)/wget @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME) - @cp $(WORKSRC)/readme $(DESTDIR)$(docdir)/$(GARNAME)/ - @cp $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)/ + @ginstall $(WORKSRC)/readme $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)/ @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME)plus - @cp $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)plus/ - @cp $(WORKSRC)/readme.pkgutilplus $(DESTDIR)$(docdir)/$(GARNAME)plus/readme + @ginstall $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)plus/ + @ginstall $(WORKSRC)/readme.pkgutilplus $(DESTDIR)$(docdir)/$(GARNAME)plus/readme @ginstall -m 755 -d $(DESTDIR)$(mandir)/man1 @pod2man --section=1 $(WORKSRC)/$(GARNAME) > $(DESTDIR)$(mandir)/man1/pkgutil.1 @pod2man --section=1 $(WORKSRC)/bldcat > $(DESTDIR)$(mandir)/man1/bldcat.1 @pod2man --section=1 $(WORKSRC)/chkcat > $(DESTDIR)$(mandir)/man1/chkcat.1 @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/$(GARNAME)/packages - @cp $(WORKSRC)/admin $(DESTDIR)/var/opt/csw/$(GARNAME)/admin.CSW -# @ginstall -m 755 -d $(DESTDIR)/usr/sadm/install/scripts -# @cp $(FILEDIR)/CSWpkgutil.i.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/i.cswpkgutil -# @cp $(FILEDIR)/CSWpkgutil.r.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/r.cswpkgutil + @ginstall $(WORKSRC)/admin $(DESTDIR)/var/opt/csw/$(GARNAME)/admin.CSW @$(MAKECOOKIE) Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-11-05 15:27:02 UTC (rev 7124) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-11-05 15:31:40 UTC (rev 7125) @@ -1,5 +1,5 @@ a16c6f81bc537d6172fd65d8da1aeecc CSWpkgutil.gspec -e1407c24d47306dbc4cea22dcb291f1d CSWpkgutil.postinstall -2fb6c94a2d212f08b71d462082a2d31a CSWpkgutil.preremove -951b11e347d6f3f49cc8617ecab4ad62 CSWpkgutil.prototype -f65b4c116cb03bc95c148a8488472515 pkgutil-1.8.zip +a9bd66f3cfaef5ec3df946363e80085f CSWpkgutil.prototype +443c6cb0435cefc046629a3e68e7fe61 i.cswpkgutil +15dcb525af077847f98ea51d1c6f4162 pkgutil-1.9b1.zip +c8a3a8c4ed123f229dbd60cd4722fd03 r.cswpkgutil Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype 2009-11-05 15:27:02 UTC (rev 7124) +++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype 2009-11-05 15:31:40 UTC (rev 7125) @@ -1,14 +1,14 @@ i pkginfo=CSWpkgutil.pkginfo i copyright=CSWpkgutil.copyright -i postinstall=CSWpkgutil.postinstall -i preremove=CSWpkgutil.preremove +i i.cswpkgutil +i r.cswpkgutil d none /etc/opt/csw 0755 root bin -f none /etc/opt/csw/pkgutil.conf.CSW 644 root bin +f cswpkgutil /etc/opt/csw/pkgutil.conf.CSW 644 root bin d none /opt/csw 0755 root bin d none /opt/csw/bin 0755 root bin f none /opt/csw/bin/pkgutil 755 root bin d none /opt/csw/etc 0755 root bin -f none /opt/csw/etc/pkgutil.conf.CSW 644 root bin +f cswpkgutil /opt/csw/etc/pkgutil.conf.CSW 644 root bin d none /opt/csw/libexec 0755 root bin d none /opt/csw/libexec/pkgutil 0755 root bin f none /opt/csw/libexec/pkgutil/wget 755 root bin @@ -22,5 +22,5 @@ f none /opt/csw/share/man/man1/pkgutil.1 644 root bin d none /var/opt/csw 0755 root bin d none /var/opt/csw/pkgutil 0755 root bin -f none /var/opt/csw/pkgutil/admin.CSW 644 root bin +f cswpkgutil /var/opt/csw/pkgutil/admin.CSW 644 root bin d none /var/opt/csw/pkgutil/packages 0755 root bin Added: csw/mgar/pkg/pkgutil/trunk/files/i.cswpkgutil =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/i.cswpkgutil (rev 0) +++ csw/mgar/pkg/pkgutil/trunk/files/i.cswpkgutil 2009-11-05 15:31:40 UTC (rev 7125) @@ -0,0 +1,12 @@ +#!/bin/sh + +while read src dest +do + cp $src $dest + conf=`echo $dest | sed 's/.CSW$//'` + if [-f "$conf"]; then + echo "$conf already exists, will not copy $dest to it." + else + cp $dest $conf + fi +done Added: csw/mgar/pkg/pkgutil/trunk/files/r.cswpkgutil =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/r.cswpkgutil (rev 0) +++ csw/mgar/pkg/pkgutil/trunk/files/r.cswpkgutil 2009-11-05 15:31:40 UTC (rev 7125) @@ -0,0 +1,12 @@ +#!/bin/sh + +while read dest +do + conf=`echo $dest | sed 's/.CSW$//'` + if [ "`cmp "$conf" "$dest" > /dev/null`" ]; then + rm $conf + else + echo "$conf modified, will not remove it." + fi + rm $dest +done 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 Nov 5 16:51:08 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 05 Nov 2009 15:51:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[7126] csw/mgar/pkg/autoproject/trunk/Makefile Message-ID: Revision: 7126 http://gar.svn.sourceforge.net/gar/?rev=7126&view=rev Author: wahwah Date: 2009-11-05 15:51:08 +0000 (Thu, 05 Nov 2009) Log Message: ----------- autoproject: Rewritten description, due to Phil's request Modified Paths: -------------- csw/mgar/pkg/autoproject/trunk/Makefile Modified: csw/mgar/pkg/autoproject/trunk/Makefile =================================================================== --- csw/mgar/pkg/autoproject/trunk/Makefile 2009-11-05 15:31:40 UTC (rev 7125) +++ csw/mgar/pkg/autoproject/trunk/Makefile 2009-11-05 15:51:08 UTC (rev 7126) @@ -6,7 +6,7 @@ GARVERSION = 0.20 CATEGORIES = apps -DESCRIPTION = creates a source package which follows the GNU programming standards +DESCRIPTION = A utility for automated configuration of GNU autotools define BLURB autoproject interviews the user, then creates a source package for a new 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 Nov 5 17:30:35 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 Nov 2009 16:30:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[7127] csw/mgar/pkg/doxygen/trunk Message-ID: Revision: 7127 http://gar.svn.sourceforge.net/gar/?rev=7127&view=rev Author: dmichelsen Date: 2009-11-05 16:30:35 +0000 (Thu, 05 Nov 2009) Log Message: ----------- doxygen: Update to 1.6.1 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 2009-11-05 15:51:08 UTC (rev 7126) +++ csw/mgar/pkg/doxygen/trunk/Makefile 2009-11-05 16:30:35 UTC (rev 7127) @@ -27,12 +27,13 @@ # GARNAME = doxygen -GARVERSION = 1.5.9 +GARVERSION = 1.6.1 CATEGORIES = utils DESCRIPTION = A documentation system for programming languages define BLURB - Long description + Doxygen is a documentation system for C++, C, Java, Objective-C, Python, + IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D. endef MASTER_SITES = http://ftp.stack.nl/pub/users/dimitri/ @@ -43,6 +44,8 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).src.tar.gz UPSTREAM_MASTER_SITES = $(SPKG_SOURCEURL) +PREREQUISITE_PKGS = CSWgraphviz2 + CONFIGURE_ARGS = $(subst =, ,$(filter --prefix=% , $(DIRPATHS))) CONFIGURE_ARGS += --docdir $(docdir) CONFIGURE_ARGS += --platform solaris-cc @@ -51,6 +54,9 @@ include gar/category.mk +# For 'dot' +PATH := $(PATH):/opt/csw/graphviz2/bin + post-extract-modulated: perl -pi -e 'if (/^TMAKE_CXXFLAGS_RELEASE/) { \ s|= .*|= $(filter-out -I/opt/csw/include, $(CXXFLAGS)) -norunpath|; }' \ Modified: csw/mgar/pkg/doxygen/trunk/checksums =================================================================== --- csw/mgar/pkg/doxygen/trunk/checksums 2009-11-05 15:51:08 UTC (rev 7126) +++ csw/mgar/pkg/doxygen/trunk/checksums 2009-11-05 16:30:35 UTC (rev 7127) @@ -1 +1 @@ -33c5598fa6d24cbc55849eaf89652557 download/doxygen-1.5.9.src.tar.gz +2ec343643e134f0d3ce2069420bcb4f0 doxygen-1.6.1.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 Nov 5 17:38:13 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 Nov 2009 16:38:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[7128] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 7128 http://gar.svn.sourceforge.net/gar/?rev=7128&view=rev Author: dmichelsen Date: 2009-11-05 16:38:13 +0000 (Thu, 05 Nov 2009) Log Message: ----------- mGAR v2: Adjust GCC flags for mcpu as v9 is invalid together with -mvis Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2009-11-05 16:30:35 UTC (rev 7127) +++ csw/mgar/gar/v2/gar.conf.mk 2009-11-05 16:38:13 UTC (rev 7128) @@ -203,8 +203,8 @@ ARCHFLAGS_SOS11_sparcv9+vis = -xarch=v9a ARCHFLAGS_SOS12_sparcv9+vis = -m64 -xarch=sparcvis - ARCHFLAGS_GCC3_sparcv9+vis = -m64 -mcpu=v9 -mvis - ARCHFLAGS_GCC4_sparcv9+vis = -m64 -mcpu=v9 -mvis + ARCHFLAGS_GCC3_sparcv9+vis = -m64 -mcpu=ultrasparc -mvis + ARCHFLAGS_GCC4_sparcv9+vis = -m64 -mcpu=ultrasparc -mvis MEMORYMODEL_sparcv9+vis = 64 ARCHFLAGS_SOS11_sparcv9 = -xarch=v9 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Nov 5 18:33:34 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 05 Nov 2009 17:33:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[7129] csw/mgar/pkg/cyrus_imapd/trunk/Makefile Message-ID: Revision: 7129 http://gar.svn.sourceforge.net/gar/?rev=7129&view=rev Author: chninkel Date: 2009-11-05 17:33:33 +0000 (Thu, 05 Nov 2009) Log Message: ----------- cyrus_imapd: reenable check Modified Paths: -------------- csw/mgar/pkg/cyrus_imapd/trunk/Makefile Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2009-11-05 16:38:13 UTC (rev 7128) +++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2009-11-05 17:33:33 UTC (rev 7129) @@ -120,9 +120,6 @@ TEST_SCRIPTS = -# Disable package check for now as pmcyrus dependancy is not recognized -ENABLE_CHECK=0 - include gar/category.mk # compile_et is missing so we want our to be used This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Nov 5 19:00:28 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 05 Nov 2009 18:00:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[7130] csw/mgar/pkg/openssl/trunk Message-ID: Revision: 7130 http://gar.svn.sourceforge.net/gar/?rev=7130&view=rev Author: chninkel Date: 2009-11-05 18:00:28 +0000 (Thu, 05 Nov 2009) Log Message: ----------- openssl: switch to dynamic gspec and depend file Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/openssl/trunk/files/CSWossl.depend csw/mgar/pkg/openssl/trunk/files/CSWossl.gspec csw/mgar/pkg/openssl/trunk/files/CSWossldevel.depend csw/mgar/pkg/openssl/trunk/files/CSWossldevel.gspec csw/mgar/pkg/openssl/trunk/files/CSWosslrt.depend csw/mgar/pkg/openssl/trunk/files/CSWosslrt.gspec csw/mgar/pkg/openssl/trunk/files/CSWosslutils.depend csw/mgar/pkg/openssl/trunk/files/CSWosslutils.gspec Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2009-11-05 17:33:33 UTC (rev 7129) +++ csw/mgar/pkg/openssl/trunk/Makefile 2009-11-05 18:00:28 UTC (rev 7130) @@ -1,9 +1,22 @@ +##################################################################### +# OpenCSW build recipe for OpenSSL +# +# Copyright 2009 Yann Rouillard +# All rights reserved. Use is subject to license terms. +# +# Redistribution and/or use, with or without modification, is +# permitted. This software is without warranty of any kind. The +# author(s) shall not be liable in the event that use of the +# software causes damage. +##################################################################### + +###### Package information ####### + GARNAME = openssl GARVERSION = 0.9.8k -CATEGORIES = lib - OPENSSL_VERSION := $(shell echo $(GARVERSION) | sed -e 's/[a-z]//g') OPENSSL_RELEASE := $(shell echo $(GARVERSION) | sed -e 's/[^a-z]//g') +CATEGORIES = lib DESCRIPTION = The Open Source toolkit for SSL and TLS define BLURB @@ -13,6 +26,28 @@ as a full-strength general-purpose cryptography library. endef +PACKAGES = CSWossl CSWosslrt CSWossldevel CSWosslutils + +SPKG_DESC_CSWossl = Openssl meta package +CATALOGNAME_CSWossl = openssl +REQUIRED_PKGS_CSWossl = CSWossldevel CSWosslutils CSWosslrt + +SPKG_DESC_CSWosslrt = Openssl runtime libraries +CATALOGNAME_CSWosslrt = openssl_rt +REQUIRED_PKGS_CSWosslrt = CSWcacertificates + +SPKG_DESC_CSWossldevel = Openssl development files +CATALOGNAME_CSWossldevel = openssl_devel +REQUIRED_PKGS_CSWossldevel = CSWosslrt + +SPKG_DESC_CSWosslutils = Openssl binaries and related tools +CATALOGNAME_CSWosslutils = openssl_utils +REQUIRED_PKGS_CSWosslutils = CSWosslrt +SPKG_CLASSES_CSWosslutils = none conf + + +###### Upstream and opencsw files information ####### + MASTER_SITES = http://www.openssl.org/source/ http://openssl.org/news/ # We define upstream file regex so we can be notifed of new upstream software release @@ -20,19 +55,20 @@ DISTNAME = $(GARNAME)-$(GARVERSION) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWossl,depend prototype) -DISTFILES += $(call admfiles,CSWosslrt,checkinstall preinstall postinstall depend prototype-i386 prototype-sparc) -DISTFILES += $(call admfiles,CSWossldevel,depend prototype-i386 prototype-sparc) -DISTFILES += $(call admfiles,CSWosslutils,depend prototype) +DISTFILES += CSWossl.prototype +DISTFILES += CSWosslrt.checkinstall CSWosslrt.preinstall CSWosslrt.postinstall CSWosslrt.prototype-i386 CSWosslrt.prototype-sparc +DISTFILES += CSWossldevel.prototype-i386 CSWossldevel.prototype-sparc +DISTFILES += CSWosslutils.prototype DISTFILES += changelog.CSW README.CSW DISTFILES += i.conf r.conf DOCFILES = CHANGES CHANGES.SSLeay PROBLEMS README FAQ README.ASN1 INSTALL NEWS README.ENGINE -SPKG_CLASSES = none conf - PATCHFILES = openssl.$(OPENSSL_VERSION).patch + +##### Build and installation information ##### + GARCOMPILER = SOS11 # The list of instructions set for which we will @@ -84,7 +120,6 @@ SKIPTEST = 1 - # support for pkcs11 engine http://blogs.sun.com/chichang1/entry/how_to_integrate_pkcs11_engine ifdef PKCS11 PATCHFILES += pkcs11_engine-0.9.8h.patch.2008-07-29 Deleted: csw/mgar/pkg/openssl/trunk/files/CSWossl.depend =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWossl.depend 2009-11-05 17:33:33 UTC (rev 7129) +++ csw/mgar/pkg/openssl/trunk/files/CSWossl.depend 2009-11-05 18:00:28 UTC (rev 7130) @@ -1,3 +0,0 @@ -P CSWossldevel openssl_devel Openssl development support -P CSWosslutils openssl_utils Openssl binaries and related files -P CSWosslrt openssl_rt Openssl runtime libraries Deleted: csw/mgar/pkg/openssl/trunk/files/CSWossl.gspec =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWossl.gspec 2009-11-05 17:33:33 UTC (rev 7129) +++ csw/mgar/pkg/openssl/trunk/files/CSWossl.gspec 2009-11-05 18:00:28 UTC (rev 7130) @@ -1,7 +0,0 @@ -%var bitname openssl -%var pkgname CSWossl -%var arch all -%var desc Openssl meta package -%var pkgfile %{bitname}-%{SPKG_VERSION}%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-all-CSW.pkg -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Deleted: csw/mgar/pkg/openssl/trunk/files/CSWossldevel.depend =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWossldevel.depend 2009-11-05 17:33:33 UTC (rev 7129) +++ csw/mgar/pkg/openssl/trunk/files/CSWossldevel.depend 2009-11-05 18:00:28 UTC (rev 7130) @@ -1 +0,0 @@ -P CSWosslrt openssl_rt - Openssl runtime libraries Deleted: csw/mgar/pkg/openssl/trunk/files/CSWossldevel.gspec =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWossldevel.gspec 2009-11-05 17:33:33 UTC (rev 7129) +++ csw/mgar/pkg/openssl/trunk/files/CSWossldevel.gspec 2009-11-05 18:00:28 UTC (rev 7130) @@ -1,5 +0,0 @@ -%var bitname openssl_devel -%var pkgname CSWossldevel -%var desc Openssl development support -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Deleted: csw/mgar/pkg/openssl/trunk/files/CSWosslrt.depend =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWosslrt.depend 2009-11-05 17:33:33 UTC (rev 7129) +++ csw/mgar/pkg/openssl/trunk/files/CSWosslrt.depend 2009-11-05 18:00:28 UTC (rev 7130) @@ -1 +0,0 @@ -P CSWcacertificates Deleted: csw/mgar/pkg/openssl/trunk/files/CSWosslrt.gspec =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWosslrt.gspec 2009-11-05 17:33:33 UTC (rev 7129) +++ csw/mgar/pkg/openssl/trunk/files/CSWosslrt.gspec 2009-11-05 18:00:28 UTC (rev 7130) @@ -1,5 +0,0 @@ -%var bitname openssl_rt -%var pkgname CSWosslrt -%var desc Openssl runtime libraries -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Deleted: csw/mgar/pkg/openssl/trunk/files/CSWosslutils.depend =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWosslutils.depend 2009-11-05 17:33:33 UTC (rev 7129) +++ csw/mgar/pkg/openssl/trunk/files/CSWosslutils.depend 2009-11-05 18:00:28 UTC (rev 7130) @@ -1 +0,0 @@ -P CSWosslrt openssl_rt - Openssl runtime libraries Deleted: csw/mgar/pkg/openssl/trunk/files/CSWosslutils.gspec =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWosslutils.gspec 2009-11-05 17:33:33 UTC (rev 7129) +++ csw/mgar/pkg/openssl/trunk/files/CSWosslutils.gspec 2009-11-05 18:00:28 UTC (rev 7130) @@ -1,5 +0,0 @@ -%var bitname openssl_utils -%var pkgname CSWosslutils -%var desc Openssl binaries and related tools -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Nov 5 19:02:46 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 05 Nov 2009 18:02:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7131] csw/mgar/pkg/openssl/trunk/Makefile Message-ID: Revision: 7131 http://gar.svn.sourceforge.net/gar/?rev=7131&view=rev Author: chninkel Date: 2009-11-05 18:02:46 +0000 (Thu, 05 Nov 2009) Log Message: ----------- openssl: switched to standard version scheme Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2009-11-05 18:00:28 UTC (rev 7130) +++ csw/mgar/pkg/openssl/trunk/Makefile 2009-11-05 18:02:46 UTC (rev 7131) @@ -140,11 +140,7 @@ include gar/category.mk -# we redefine the timestamp to fulfill opencsw standard -SPKG_VERSION := $(OPENSSL_VERSION) -SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(OPENSSL_RELEASE) - pre-configure-modulated: echo " ==> Creating configure script" cd $(WORKSRC) && ln -nf Configure configure This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Nov 5 19:17:23 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 05 Nov 2009 18:17:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7132] csw/mgar/pkg/openssl/trunk Message-ID: Revision: 7132 http://gar.svn.sourceforge.net/gar/?rev=7132&view=rev Author: chninkel Date: 2009-11-05 18:17:23 +0000 (Thu, 05 Nov 2009) Log Message: ----------- openssl: switched to cswpreserveconf for configuration file handling Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile csw/mgar/pkg/openssl/trunk/checksums csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype Removed Paths: ------------- csw/mgar/pkg/openssl/trunk/files/i.conf csw/mgar/pkg/openssl/trunk/files/r.conf Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2009-11-05 18:02:46 UTC (rev 7131) +++ csw/mgar/pkg/openssl/trunk/Makefile 2009-11-05 18:17:23 UTC (rev 7132) @@ -43,7 +43,7 @@ SPKG_DESC_CSWosslutils = Openssl binaries and related tools CATALOGNAME_CSWosslutils = openssl_utils REQUIRED_PKGS_CSWosslutils = CSWosslrt -SPKG_CLASSES_CSWosslutils = none conf +SPKG_CLASSES_CSWosslutils = none cswpreserveconf ###### Upstream and opencsw files information ####### @@ -60,7 +60,6 @@ DISTFILES += CSWossldevel.prototype-i386 CSWossldevel.prototype-sparc DISTFILES += CSWosslutils.prototype DISTFILES += changelog.CSW README.CSW -DISTFILES += i.conf r.conf DOCFILES = CHANGES CHANGES.SSLeay PROBLEMS README FAQ README.ASN1 INSTALL NEWS README.ENGINE @@ -164,7 +163,7 @@ install-certs: [ -f $(PKGROOT)$(prefix)/ssl/openssl.cnf ] && \ - ginstall -D $(PKGROOT)$(prefix)/ssl/openssl.cnf $(PKGROOT)$(sysconfdir)/ssl/openssl.cnf + ginstall -D $(PKGROOT)$(prefix)/ssl/openssl.cnf $(PKGROOT)$(sysconfdir)/ssl/openssl.cnf.CSW install-oldlibs: $(addprefix install-oldlibs-,$(OLDLIBS)) install-oldlibs-%: Modified: csw/mgar/pkg/openssl/trunk/checksums =================================================================== --- csw/mgar/pkg/openssl/trunk/checksums 2009-11-05 18:02:46 UTC (rev 7131) +++ csw/mgar/pkg/openssl/trunk/checksums 2009-11-05 18:17:23 UTC (rev 7132) @@ -1,23 +1,13 @@ -e555c6d58d276aec7fdc53363e338ab3 download/openssl-0.9.8k.tar.gz -b5ded4412606a0996595015bc2ff6974 download/CSWossl.gspec -05b45e7124833dee48e5f3c45591e95b download/CSWossl.depend -bd9bb4dfb9602fba461b21fa37f97765 download/CSWossl.prototype -83480e01971e71d037bd44fa5ed4e4e5 download/CSWosslrt.gspec -05ace5330714d6cd9c0e076b6ae2518f download/CSWosslrt.checkinstall -c9de908daad1a31fca20329cb043ad3c download/CSWosslrt.preinstall -1c3f600eaf942a18ecab3637e1fc32bd download/CSWosslrt.postinstall -cbf34987267073fb1f60bff86492dd8b download/CSWosslrt.depend -463d53d6fcab5f33e2e204a831d47ccc download/CSWosslrt.prototype-i386 -ec547e9a56e0933a928fd9d505c19333 download/CSWosslrt.prototype-sparc -2ac43ebf4689d236540e22171541be4e download/CSWossldevel.gspec -37995caa7f4155066b00fb7503e853da download/CSWossldevel.depend -da3116a1d8dfd2bd3e4f2a11f4fb5f8b download/CSWossldevel.prototype-i386 -bd40fcb60dfef960da30c718b718149d download/CSWossldevel.prototype-sparc -eec77249fb642c525cad67dcd055fb77 download/CSWosslutils.gspec -37995caa7f4155066b00fb7503e853da download/CSWosslutils.depend -a441995e4e3c95497e77aa613d2c673c download/CSWosslutils.prototype -904ceefa66b6b7b7e93ae0e9bc58bac8 download/changelog.CSW -b78faa440d6f6a2a07663de331678648 download/README.CSW -7fdc09cd3c11db459c83c8946f7872f6 download/i.conf -a454ac09091085813ec8900f5a0c917c download/r.conf -64f7c3f3a6cae483209b69c31c82557d download/openssl.0.9.8.patch +bd9bb4dfb9602fba461b21fa37f97765 CSWossl.prototype +da3116a1d8dfd2bd3e4f2a11f4fb5f8b CSWossldevel.prototype-i386 +bd40fcb60dfef960da30c718b718149d CSWossldevel.prototype-sparc +05ace5330714d6cd9c0e076b6ae2518f CSWosslrt.checkinstall +1c3f600eaf942a18ecab3637e1fc32bd CSWosslrt.postinstall +c9de908daad1a31fca20329cb043ad3c CSWosslrt.preinstall +463d53d6fcab5f33e2e204a831d47ccc CSWosslrt.prototype-i386 +ec547e9a56e0933a928fd9d505c19333 CSWosslrt.prototype-sparc +89ccb44272d2a4eb33fd4086c3348f3e CSWosslutils.prototype +b78faa440d6f6a2a07663de331678648 README.CSW +904ceefa66b6b7b7e93ae0e9bc58bac8 changelog.CSW +e555c6d58d276aec7fdc53363e338ab3 openssl-0.9.8k.tar.gz +64f7c3f3a6cae483209b69c31c82557d openssl.0.9.8.patch Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype 2009-11-05 18:02:46 UTC (rev 7131) +++ csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype 2009-11-05 18:17:23 UTC (rev 7132) @@ -62,7 +62,7 @@ f none /opt/csw/ssl/misc/c_name 0755 root bin s none /opt/csw/ssl/openssl.cnf=/opt/csw/etc/ssl/openssl.cnf 0644 root bin d none /opt/csw/etc/ssl 0755 root bin -e conf /opt/csw/etc/ssl/openssl.cnf 0644 root bin +f cswpreserveconf /opt/csw/etc/ssl/openssl.cnf.CSW 0644 root bin f none /opt/csw/share/doc/openssl_utils/changelog.CSW=changelog.CSW 644 root bin f none /opt/csw/share/doc/openssl_utils/CHANGES=CHANGES 644 root bin f none /opt/csw/share/doc/openssl_utils/CHANGES.SSLeay=CHANGES 644 root bin Deleted: csw/mgar/pkg/openssl/trunk/files/i.conf =================================================================== --- csw/mgar/pkg/openssl/trunk/files/i.conf 2009-11-05 18:02:46 UTC (rev 7131) +++ csw/mgar/pkg/openssl/trunk/files/i.conf 2009-11-05 18:17:23 UTC (rev 7132) @@ -1,54 +0,0 @@ -# -# Copyright 2006 Yann Rouillard -# All rights reserved. Use is subject to license terms. -# -# Redistribution and/or use, with or without modification, is -# permitted. This code is without warranty of any kind. The -# author(s) shall not be liable in the event that use of the -# software causes damage. -# -# i.conf - class script which install configuration files -# -# If the configuration file already exists on the filesystem, -# this script will let the existing file intact and will -# install a copy of the file provided in the package suffixed -# with .CSW -# except for service configuration files which are always installed -# CSW suffixed under Solaris 9 as they are used to enable/disable -# a service according to opencsw standards. -# -umask 0022 - -if [ -z "$PKG_INSTALL_ROOT" ]; then - PKG_INSTALL_ROOT=/ -fi - -while read SRC DEST; do - if [ -f "${PKG_INSTALL_ROOT}/$DEST" ]; then - cp "$SRC" "${PKG_INSTALL_ROOT}/$DEST.CSW" - else - cp "$SRC" "${PKG_INSTALL_ROOT}/$DEST" - fi -done - -# Unfortunately pkgadd doesn't backup the source file if the destination file is identical. -# It's a problem with zones installation where pkgadd try to find the backup files, so -# we do the backup manually -awk '{ if ( $3 == "conf" ) print $2,$3,$4,$5,$6,$7 }' $INST_DATADIR/$PKG/pkgmap | \ - while read FTYPE CLASS FPATH MODE OWNER GROUP; do - if echo $FPATH | grep "^/" >/dev/null; then - INST_PATH="$INST_DATADIR/$PKG/root/$FPATH" - SAVE_PATH="$PKGSAV/pspool/$PKG/root/$FPATH" - else - INST_PATH="$INST_DATADIR/$PKG/reloc/$FPATH" - SAVE_PATH="$PKGSAV/pspool/$PKG/reloc/$FPATH" - fi - - if [ ! -f "$SAVE_PATH" ]; then - mkdir -p "`LANG=C dirname $SAVE_PATH`" - cp "$INST_PATH" "$SAVE_PATH" - fi - done - -exit 0 - Deleted: csw/mgar/pkg/openssl/trunk/files/r.conf =================================================================== --- csw/mgar/pkg/openssl/trunk/files/r.conf 2009-11-05 18:02:46 UTC (rev 7131) +++ csw/mgar/pkg/openssl/trunk/files/r.conf 2009-11-05 18:17:23 UTC (rev 7132) @@ -1,21 +0,0 @@ -# -# Copyright 2006 Yann Rouillard -# All rights reserved. Use is subject to license terms. -# -# Redistribution and/or use, with or without modification, is -# permitted. This code is without warranty of any kind. The -# author(s) shall not be liable in the event that use of the -# software causes damage. -# -# r.conf - class script which removes configuration files -# -# This script doesn't delete config file, only backup ones -# installed by the package. -# - -while read DEST; do - if [ -f "$DEST.CSW" ]; then - rm "$DEST.CSW" - fi -done - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Thu Nov 5 23:21:12 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Thu, 05 Nov 2009 22:21:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7133] csw/mgar/pkg/php5/trunk Message-ID: Revision: 7133 http://gar.svn.sourceforge.net/gar/?rev=7133&view=rev Author: valholla Date: 2009-11-05 22:21:12 +0000 (Thu, 05 Nov 2009) Log Message: ----------- update to 5.2.11 Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile csw/mgar/pkg/php5/trunk/checksums Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2009-11-05 18:17:23 UTC (rev 7132) +++ csw/mgar/pkg/php5/trunk/Makefile 2009-11-05 22:21:12 UTC (rev 7133) @@ -1,5 +1,5 @@ GARNAME = php5 -GARVERSION = 5.2.10 +GARVERSION = 5.2.11 CATEGORIES = lang SF_PROJ = $(shell echo $(GARNAME) | sed -e 's/[0-9]//g') DISTNAME = $(SF_PROJ)-$(GARVERSION) @@ -82,7 +82,7 @@ # Disable Tests (report submitted to PHP QA) SKIPTEST = 1 -ENABLE_CHECK = 0 +#ENABLE_CHECK = 0 include files/scripts.mk include gar/category.mk Modified: csw/mgar/pkg/php5/trunk/checksums =================================================================== --- csw/mgar/pkg/php5/trunk/checksums 2009-11-05 18:17:23 UTC (rev 7132) +++ csw/mgar/pkg/php5/trunk/checksums 2009-11-05 22:21:12 UTC (rev 7133) @@ -1,17 +1,17 @@ -632cb357e102e18e04bb5666825a912f download/CSWap2modphp5.postinstall -e1381a4ba49e46b2097b76286a1b36fb download/CSWap2modphp5.preremove -0dd379f20ceb32fc77bb3a9bf045097f download/CSWap2modphp5.space -5f0046fe1b3f8e2228fdb165bdbbe73a download/CSWmodphp5.postinstall -2e5dbed2c9dd5e24c331753984946822 download/CSWmodphp5.preremove -0dd379f20ceb32fc77bb3a9bf045097f download/CSWmodphp5.space -98c6458b20eca91982b67c80a0554586 download/CSWphp5.postinstall -91060cc7c31aa917d88cd537d3d5bb42 download/configure.diff -a71677d80f5cfd1aeb03547dfdeb705a download/httpd-php5.conf.CSW -2206431e47c2075c0b9c4a12de5cf791 download/odbc.diff -230126f76ee6400ccf225bb6a8243532 download/pdopgsql.diff -d4c93751890b989c5a7b04acb5845fd9 download/pear.conf.CSW -13db46097c9686302bebf160e2d26ed2 download/pgsql.diff -15c7b5a87f57332d6fc683528e28247b download/php-5.2.10.tar.bz2 -a450a46ce0ea9fd0c0abe432e750a873 download/php-bug-45557-fix.diff -670b8fbf4cf9105d72f22dbf4b1e29cd download/php.ini.CSW -6251f3adcefc6ffa61d6339ac6b2d1eb download/phpext +632cb357e102e18e04bb5666825a912f CSWap2modphp5.postinstall +e1381a4ba49e46b2097b76286a1b36fb CSWap2modphp5.preremove +0dd379f20ceb32fc77bb3a9bf045097f CSWap2modphp5.space +5f0046fe1b3f8e2228fdb165bdbbe73a CSWmodphp5.postinstall +2e5dbed2c9dd5e24c331753984946822 CSWmodphp5.preremove +0dd379f20ceb32fc77bb3a9bf045097f CSWmodphp5.space +98c6458b20eca91982b67c80a0554586 CSWphp5.postinstall +91060cc7c31aa917d88cd537d3d5bb42 configure.diff +a71677d80f5cfd1aeb03547dfdeb705a httpd-php5.conf.CSW +2206431e47c2075c0b9c4a12de5cf791 odbc.diff +230126f76ee6400ccf225bb6a8243532 pdopgsql.diff +d4c93751890b989c5a7b04acb5845fd9 pear.conf.CSW +13db46097c9686302bebf160e2d26ed2 pgsql.diff +286bf34630f5643c25ebcedfec5e0a09 php-5.2.11.tar.bz2 +a450a46ce0ea9fd0c0abe432e750a873 php-bug-45557-fix.diff +670b8fbf4cf9105d72f22dbf4b1e29cd php.ini.CSW +6251f3adcefc6ffa61d6339ac6b2d1eb phpext This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Thu Nov 5 23:24:34 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Thu, 05 Nov 2009 22:24:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[7134] csw/mgar/pkg/php5/trunk/Makefile.cswdir Message-ID: Revision: 7134 http://gar.svn.sourceforge.net/gar/?rev=7134&view=rev Author: valholla Date: 2009-11-05 22:24:34 +0000 (Thu, 05 Nov 2009) Log Message: ----------- update to 5.2.11 Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile.cswdir Modified: csw/mgar/pkg/php5/trunk/Makefile.cswdir =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile.cswdir 2009-11-05 22:21:12 UTC (rev 7133) +++ csw/mgar/pkg/php5/trunk/Makefile.cswdir 2009-11-05 22:24:34 UTC (rev 7134) @@ -1,5 +1,5 @@ GARNAME = php5 -GARVERSION = 5.2.9 +GARVERSION = 5.2.11 CATEGORIES = lang SF_PROJ = $(shell echo $(GARNAME) | sed -e 's/[0-9]//g') DISTNAME = $(SF_PROJ)-$(GARVERSION) @@ -32,8 +32,9 @@ SPKG_DESC_CSWphp5 = A High-Level Scripting Languages CATALOGNAME_CSWphp5devel = php5_devel SPKG_DESC_CSWphp5devel = Development files for php5 -REQUIRED_PKGS_CSWphp5 = CSWexpat CSWggettextrt CSWiconv -REQUIRED_PKGS_CSWphp5 += CSWlibxml2 CSWzlib CSWmysql5rt +REQUIRED_PKGS_CSWphp5 = CSWexpat CSWggettextrt CSWiconv CSWpng CSWsqlite +REQUIRED_PKGS_CSWphp5 += CSWlibxml2 CSWzlib CSWmysql5rt CSWxpm CSWt1lib +REQUIRED_PKGS_CSWphp5 += CSWftype2 CSWgd CSWjpeg CSWlibmm REQUIRED_PKGS_CSWphp5devel = CSWphp5 PKGFILES_CSWphp5devel = $(bindir)/php-config @@ -81,7 +82,7 @@ # Disable Tests (report submitted to PHP QA) SKIPTEST = 1 -ENABLE_CHECK = 0 +#ENABLE_CHECK = 0 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 Fri Nov 6 02:58:39 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 06 Nov 2009 01:58:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[7135] csw/mgar/pkg/coreutils/trunk Message-ID: Revision: 7135 http://gar.svn.sourceforge.net/gar/?rev=7135&view=rev Author: bdwalton Date: 2009-11-06 01:58:39 +0000 (Fri, 06 Nov 2009) Log Message: ----------- coreutils: intial commit; 5 tests fail Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile csw/mgar/pkg/coreutils/trunk/checksums Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-05 22:24:34 UTC (rev 7134) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-06 01:58:39 UTC (rev 7135) @@ -2,32 +2,33 @@ GARVERSION = 7.6 CATEGORIES = utils -DESCRIPTION = Basic file, shell and text manipulation utilities +DESCRIPTION = GNU core utilities define BLURB -The GNU Core Utilities are the basic file, shell and text manipulation -utilities of the GNU operating system. These are the core utilities which -are expected to exist on every operating system. +The GNU Core Utilities are the basic file, shell and text manipulation utilities of the GNU operating system. These are the core utilities which are expected to exist on every operating system. -Previously these utilities were offered as three individual sets of GNU -utilities, fileutils, shellutils, and textutils. Those three have been -combined into a single set of utilities called the coreutils. +Previously these utilities were offered as three individual sets of GNU utilities, Fileutils, Shellutils, and Textutils. Those three have been combined into a single set of utilities called Coreutils. endef + MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -# We define upstream file regex so we can be notifed of new upstream -# software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +PREREQUISITE_PKGS = CSWautomake CSWautoconf CSWbison CSWggettext CSWgit +PREREQUISITE_PKGS += CSWgperf CSWgzip CSWperl CSWrsync CSWgtar CSWbash -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --program-prefix=g -CONFIGURE_ARGS += --enable-silent-rules -CONFIGURE_ARGS += --disable-libcap -CONFIGURE_ARGS += --with-packager="$(SPKG_PACKAGER) <$(SPKG_EMAIL)>" +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw +CONFIGURE_ARGS = $(DIRPATHS) + TEST_ARGS = check -GARCOMPILER = GNU +include gar/category.mk -include gar/category.mk +# pre-configure-modulated: +# @(cd $(WORKSRC); /opt/csw/bin/bash ./bootstrap; ) +# @$(MAKECOOKIE) + +PATH := /opt/csw/gnu:/opt/csw/bin:$(PATH) Modified: csw/mgar/pkg/coreutils/trunk/checksums =================================================================== --- csw/mgar/pkg/coreutils/trunk/checksums 2009-11-05 22:24:34 UTC (rev 7134) +++ csw/mgar/pkg/coreutils/trunk/checksums 2009-11-06 01:58:39 UTC (rev 7135) @@ -1 +1 @@ -3d82f979229365f880da750642e67cf3 download/coreutils-7.6.tar.gz +3d82f979229365f880da750642e67cf3 coreutils-7.6.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 Nov 6 03:02:16 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 06 Nov 2009 02:02:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7136] csw/mgar/pkg/cswpkgloghooks/ Message-ID: Revision: 7136 http://gar.svn.sourceforge.net/gar/?rev=7136&view=rev Author: bdwalton Date: 2009-11-06 02:02:16 +0000 (Fri, 06 Nov 2009) Log Message: ----------- cswpkgloghooks: renamed package Added Paths: ----------- csw/mgar/pkg/cswpkgloghooks/ 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 Nov 6 03:02:41 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 06 Nov 2009 02:02:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[7137] csw/mgar/pkg/cswpkgsyslog/ Message-ID: Revision: 7137 http://gar.svn.sourceforge.net/gar/?rev=7137&view=rev Author: bdwalton Date: 2009-11-06 02:02:40 +0000 (Fri, 06 Nov 2009) Log Message: ----------- cswpkgsyslog: renamed to pkgloghooks Removed Paths: ------------- csw/mgar/pkg/cswpkgsyslog/ 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 Nov 6 03:10:32 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 06 Nov 2009 02:10:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7138] csw/mgar/pkg/cswpkgloghooks/trunk Message-ID: Revision: 7138 http://gar.svn.sourceforge.net/gar/?rev=7138&view=rev Author: bdwalton Date: 2009-11-06 02:10:32 +0000 (Fri, 06 Nov 2009) Log Message: ----------- cswpkgloghooks: update files, file content to reflect rename Modified Paths: -------------- csw/mgar/pkg/cswpkgloghooks/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgloghooks-postupgrade csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgloghooks-preupgrade Removed Paths: ------------- csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgsyslog-postupgrade csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgsyslog-preupgrade Modified: csw/mgar/pkg/cswpkgloghooks/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswpkgloghooks/trunk/Makefile 2009-11-06 02:02:40 UTC (rev 7137) +++ csw/mgar/pkg/cswpkgloghooks/trunk/Makefile 2009-11-06 02:10:32 UTC (rev 7138) @@ -1,4 +1,4 @@ -GARNAME = cswpkgsyslog +GARNAME = cswpkgloghooks GARVERSION = 1.0 CATEGORIES = utils Copied: csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgloghooks-postupgrade (from rev 7136, csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgsyslog-postupgrade) =================================================================== --- csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgloghooks-postupgrade (rev 0) +++ csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgloghooks-postupgrade 2009-11-06 02:10:32 UTC (rev 7138) @@ -0,0 +1,62 @@ +#!/opt/csw/bin/bash + +script=$0 + +set -- ${1/-/ } +PKG=$1 +VER=$2 + +function logdie() { + logger -t "cswpkgloghooks" "$1" + exit 0 +} + +function success() { + case ${script} in + *install) MSG="installed ${PKG} ${VER}";; + *upgrade) MSG="upgraded ${PKG} to ${VER} (from: $1)";; + *remove) MSG="removed ${PKG} ${VER}";; + esac + + logdie "${MSG}" +} + +function failure() { + case ${script} in + *install) MSG="Failed to install ${PKG} ${VER}";; + *upgrade) MSG="Failed to upgrade ${PKG} ${VER} (current: $1)";; + *remove) MSG="Failed to remove ${PKG} ${VER}";; + esac + + logdie "${MSG}" +} + +if [ -d /var/sadm/pkg/${PKG} ]; then + SYSTEMVER=$(pkgparam ${PKG} VERSION 2>/dev/null) + pf=/var/opt/csw/pkg-hooks/CSWcswpkgloghooks.upgrade.${PKG} + if [ -f ${pf} ]; then + PREVVER=$(cat ${pf} 2>/dev/null) + rm -f ${pf} + fi + + case ${script} in + *remove) + failure + ;; + *install|*upgrade) + case "${VER}" in + ${SYSTEMVER}) success ${PREVVER};; + *) failure ${SYSTEMVER};; + esac + ;; + esac +else + case ${script} in + *remove) + success + ;; + *install|*upgrade) + failure + ;; + esac +fi Copied: csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgloghooks-preupgrade (from rev 7136, csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgsyslog-preupgrade) =================================================================== --- csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgloghooks-preupgrade (rev 0) +++ csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgloghooks-preupgrade 2009-11-06 02:10:32 UTC (rev 7138) @@ -0,0 +1,11 @@ +#!/opt/csw/bin/bash + +set -- ${1/-/ } + +PKG=$1 +VER=$2 + +SYSTEMVER=$(pkgparam ${PKG} VERSION) + +# store previous version so we can log smarter things if upgrade fails. +echo ${SYSTEMVER} > /var/opt/csw/pkg-hooks/CSWcswpkgloghooks.upgrade.${PKG} Deleted: csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgsyslog-postupgrade =================================================================== --- csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgsyslog-postupgrade 2009-11-06 02:02:40 UTC (rev 7137) +++ csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgsyslog-postupgrade 2009-11-06 02:10:32 UTC (rev 7138) @@ -1,62 +0,0 @@ -#!/opt/csw/bin/bash - -script=$0 - -set -- ${1/-/ } -PKG=$1 -VER=$2 - -function logdie() { - logger -t "cswpkgsyslog" "$1" - exit 0 -} - -function success() { - case ${script} in - *install) MSG="installed ${PKG} ${VER}";; - *upgrade) MSG="upgraded ${PKG} to ${VER} (from: $1)";; - *remove) MSG="removed ${PKG} ${VER}";; - esac - - logdie "${MSG}" -} - -function failure() { - case ${script} in - *install) MSG="Failed to install ${PKG} ${VER}";; - *upgrade) MSG="Failed to upgrade ${PKG} ${VER} (current: $1)";; - *remove) MSG="Failed to remove ${PKG} ${VER}";; - esac - - logdie "${MSG}" -} - -if [ -d /var/sadm/pkg/${PKG} ]; then - SYSTEMVER=$(pkgparam ${PKG} VERSION 2>/dev/null) - pf=/var/opt/csw/pkg-hooks/CSWcswpkgsyslog.upgrade.${PKG} - if [ -f ${pf} ]; then - PREVVER=$(cat ${pf} 2>/dev/null) - rm -f ${pf} - fi - - case ${script} in - *remove) - failure - ;; - *install|*upgrade) - case "${VER}" in - ${SYSTEMVER}) success ${PREVVER};; - *) failure ${SYSTEMVER};; - esac - ;; - esac -else - case ${script} in - *remove) - success - ;; - *install|*upgrade) - failure - ;; - esac -fi Deleted: csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgsyslog-preupgrade =================================================================== --- csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgsyslog-preupgrade 2009-11-06 02:02:40 UTC (rev 7137) +++ csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgsyslog-preupgrade 2009-11-06 02:10:32 UTC (rev 7138) @@ -1,11 +0,0 @@ -#!/opt/csw/bin/bash - -set -- ${1/-/ } - -PKG=$1 -VER=$2 - -SYSTEMVER=$(pkgparam ${PKG} VERSION) - -# store previous version so we can log smarter things if upgrade fails. -echo ${SYSTEMVER} > /var/opt/csw/pkg-hooks/CSWcswpkgsyslog.upgrade.${PKG} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Fri Nov 6 09:34:23 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 06 Nov 2009 08:34:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7139] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7139 http://gar.svn.sourceforge.net/gar/?rev=7139&view=rev Author: idogan23 Date: 2009-11-06 08:34:23 +0000 (Fri, 06 Nov 2009) Log Message: ----------- mGAR v2: Force /opt/csw/bin to be in the PATH to search for $MAKE Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-11-06 02:10:32 UTC (rev 7138) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-11-06 08:34:23 UTC (rev 7139) @@ -671,7 +671,7 @@ $(if $(PACKAGING_HOST_$P),\ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ $(MAKE) PLATFORM=$P _package && ,\ - $(SSH) -t $(PACKAGING_HOST_$P) "$(MAKE) -C $(CURDIR) PLATFORM=$P _package" && \ + $(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) PLATFORM=$P _package" && \ ),\ $(error *** No host has been defined for platform $P)\ )\ @@ -685,7 +685,7 @@ echo " (built on this host)";\ $(MAKE) -s PLATFORM=$P _pkgshow;echo;,\ echo " (built on host '$(PACKAGING_HOST_$P)')";\ - $(SSH) $(PACKAGING_HOST_$P) "$(MAKE) -C $(CURDIR) -s PLATFORM=$P _pkgshow";echo;\ + $(SSH) $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) -s PLATFORM=$P _pkgshow";echo;\ )\ ) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Fri Nov 6 11:14:53 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 06 Nov 2009 10:14:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[7140] csw/mgar/pkg/openssl/trunk Message-ID: Revision: 7140 http://gar.svn.sourceforge.net/gar/?rev=7140&view=rev Author: chninkel Date: 2009-11-06 10:14:52 +0000 (Fri, 06 Nov 2009) Log Message: ----------- openssl: followed some dago's advices Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile csw/mgar/pkg/openssl/trunk/checksums csw/mgar/pkg/openssl/trunk/files/CSWossl.prototype csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386 csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386 csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype Added Paths: ----------- csw/mgar/pkg/openssl/trunk/files/more_configure_targets.patch Removed Paths: ------------- csw/mgar/pkg/openssl/trunk/files/oldlibs.list.0.9.7m-i386 csw/mgar/pkg/openssl/trunk/files/oldlibs.list.0.9.7m-sparc csw/mgar/pkg/openssl/trunk/files/openssl.0.9.7.patch csw/mgar/pkg/openssl/trunk/files/openssl.0.9.8.patch Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2009-11-06 08:34:23 UTC (rev 7139) +++ csw/mgar/pkg/openssl/trunk/Makefile 2009-11-06 10:14:52 UTC (rev 7140) @@ -14,8 +14,6 @@ GARNAME = openssl GARVERSION = 0.9.8k -OPENSSL_VERSION := $(shell echo $(GARVERSION) | sed -e 's/[a-z]//g') -OPENSSL_RELEASE := $(shell echo $(GARVERSION) | sed -e 's/[^a-z]//g') CATEGORIES = lib DESCRIPTION = The Open Source toolkit for SSL and TLS @@ -53,7 +51,6 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*[a-z]?).tar.gz -DISTNAME = $(GARNAME)-$(GARVERSION) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += CSWossl.prototype DISTFILES += CSWosslrt.checkinstall CSWosslrt.preinstall CSWosslrt.postinstall CSWosslrt.prototype-i386 CSWosslrt.prototype-sparc @@ -63,13 +60,16 @@ DOCFILES = CHANGES CHANGES.SSLeay PROBLEMS README FAQ README.ASN1 INSTALL NEWS README.ENGINE -PATCHFILES = openssl.$(OPENSSL_VERSION).patch +# This patch add optimised build targets for some solaris isa, ie: +# solaris-386-cc, solaris-pentium-cc, solaris-pentium_pro-cc, solaris-sparcv9+vis-cc +PATCHFILES = more_configure_targets.patch ##### Build and installation information ##### GARCOMPILER = SOS11 + # The list of instructions set for which we will # provide optimized libraries and binaries EXTRA_BUILD_ISAS_i386 = pentium_pro amd64 @@ -78,14 +78,15 @@ # we don't yet use isaexec support so we disable # isa relocation for default isa NO_ISAEXEC = 1 + # GAR wants and puts sparcv9 in lib/64 but openssl build system # isn't the standard autoconf/automake one so we disable this # relocation for now ISALIBDIR_sparcv9 = . libdir = /opt/csw/lib -# we redefine the default merge exclude so *.a files are not excluded -MERGE_EXCLUDE_DEFAULT = $(MERGE_EXCLUDE_INFODIR) +# we include *.a files in the devel package so we don't want them excluded +MERGE_EXCLUDE_STATICLIBS = # The corresponding os/compiler to pass to the # openssl Configure script @@ -117,24 +118,10 @@ # we include previous release of libraries file for comptability purpose OLDLIBS = 0.9.7m -SKIPTEST = 1 - # support for pkcs11 engine http://blogs.sun.com/chichang1/entry/how_to_integrate_pkcs11_engine ifdef PKCS11 PATCHFILES += pkcs11_engine-0.9.8h.patch.2008-07-29 - ifeq ($(GARCH),sparc) - ifeq ($(ISA),sparcv9) - CONFIGURE_ARGS += --pk11-libname=/usr/lib/sparcv9/libpkcs11.so - else - CONFIGURE_ARGS += --pk11-libname=/usr/lib/libpkcs11.so - endif - else - ifeq ($(ISA),amd64) - CONFIGURE_ARGS += --pk11-libname=/usr/lib/sparcv9/libpkcs11.so - else - CONFIGURE_ARGS += --pk11-libname=/usr/lib/libpkcs11.so - endif - endif + CONFIGURE_ARGS += --pk11-libname=$(abspath /usr/lib/$(MM_LIBDIR)) endif include gar/category.mk @@ -153,12 +140,17 @@ find $(DESTDIR)$(libdir) -name "*.so*" -exec strip -x '{}' ';' install-changelog: - ginstall -D $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/changelog.CSW $(SPKG_PKGBASE)/changelog.CSW + for CATALOGNAME in $(foreach PKG, $(PACKAGES), $(call catalogname,$(PKG))); do \ + ginstall -D $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)/$(docdir)/$$CATALOGNAME/changelog.CSW; \ + done @$(MAKECOOKIE) install-doc: - cd $(WORKSRC_FIRSTMOD)/ && ginstall $(DOCFILES) $(SPKG_PKGBASE)/ - ginstall -D $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/README.CSW $(SPKG_PKGBASE)/README.CSW + for CATALOGNAME in $(foreach PKG, $(PACKAGES), $(call catalogname,$(PKG))); do \ + ginstall -d $(DOCFILES) $(PKGROOT)/$(docdir)/$$CATALOGNAME; \ + (cd $(WORKSRC_FIRSTMOD)/ && ginstall $(DOCFILES) $(PKGROOT)/$(docdir)/$$CATALOGNAME/); \ + ginstall -D $(WORKDIR_FIRSTMOD)/README.CSW $(PKGROOT)/$(docdir)/$$CATALOGNAME/README.CSW; \ + done @$(MAKECOOKIE) install-certs: Modified: csw/mgar/pkg/openssl/trunk/checksums =================================================================== --- csw/mgar/pkg/openssl/trunk/checksums 2009-11-06 08:34:23 UTC (rev 7139) +++ csw/mgar/pkg/openssl/trunk/checksums 2009-11-06 10:14:52 UTC (rev 7140) @@ -1,13 +1,13 @@ -bd9bb4dfb9602fba461b21fa37f97765 CSWossl.prototype -da3116a1d8dfd2bd3e4f2a11f4fb5f8b CSWossldevel.prototype-i386 -bd40fcb60dfef960da30c718b718149d CSWossldevel.prototype-sparc +66ea60c5a5446d9ac900b39bc36f6afa CSWossl.prototype +84293971f7dee23869728b6434b02abe CSWossldevel.prototype-i386 +b5193ec99f643aa22156f62ee965aa82 CSWossldevel.prototype-sparc 05ace5330714d6cd9c0e076b6ae2518f CSWosslrt.checkinstall 1c3f600eaf942a18ecab3637e1fc32bd CSWosslrt.postinstall c9de908daad1a31fca20329cb043ad3c CSWosslrt.preinstall -463d53d6fcab5f33e2e204a831d47ccc CSWosslrt.prototype-i386 +8b14ea8718a295d97ace5d7933a957d1 CSWosslrt.prototype-i386 ec547e9a56e0933a928fd9d505c19333 CSWosslrt.prototype-sparc -89ccb44272d2a4eb33fd4086c3348f3e CSWosslutils.prototype +88634d81695a173bdb35df1a80cc9761 CSWosslutils.prototype b78faa440d6f6a2a07663de331678648 README.CSW 904ceefa66b6b7b7e93ae0e9bc58bac8 changelog.CSW +64f7c3f3a6cae483209b69c31c82557d more_configure_targets.patch e555c6d58d276aec7fdc53363e338ab3 openssl-0.9.8k.tar.gz -64f7c3f3a6cae483209b69c31c82557d openssl.0.9.8.patch Modified: csw/mgar/pkg/openssl/trunk/files/CSWossl.prototype =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWossl.prototype 2009-11-06 08:34:23 UTC (rev 7139) +++ csw/mgar/pkg/openssl/trunk/files/CSWossl.prototype 2009-11-06 10:14:52 UTC (rev 7140) @@ -1,12 +1,12 @@ d none /opt/csw/share/doc/openssl 0755 root bin -f none /opt/csw/share/doc/openssl/changelog.CSW=changelog.CSW 644 root bin -f none /opt/csw/share/doc/openssl/CHANGES=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl/CHANGES.SSLeay=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl/PROBLEMS=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl/README=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl/FAQ=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl/README.ASN1=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl/INSTALL=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl/NEWS=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl/README.ENGINE=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl/README.CSW=README.CSW 644 root bin +f none /opt/csw/share/doc/openssl/changelog.CSW 644 root bin +f none /opt/csw/share/doc/openssl/CHANGES 644 root bin +f none /opt/csw/share/doc/openssl/CHANGES.SSLeay 644 root bin +f none /opt/csw/share/doc/openssl/PROBLEMS 644 root bin +f none /opt/csw/share/doc/openssl/README 644 root bin +f none /opt/csw/share/doc/openssl/FAQ 644 root bin +f none /opt/csw/share/doc/openssl/README.ASN1 644 root bin +f none /opt/csw/share/doc/openssl/INSTALL 644 root bin +f none /opt/csw/share/doc/openssl/NEWS 644 root bin +f none /opt/csw/share/doc/openssl/README.ENGINE 644 root bin +f none /opt/csw/share/doc/openssl/README.CSW 644 root bin Modified: csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386 =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386 2009-11-06 08:34:23 UTC (rev 7139) +++ csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386 2009-11-06 10:14:52 UTC (rev 7140) @@ -1041,14 +1041,14 @@ f none /opt/csw/share/man/man3/ui.3 0644 root bin f none /opt/csw/share/man/man3/ui_compat.3 0644 root bin f none /opt/csw/share/man/man3/x509.3 0644 root bin -f none /opt/csw/share/doc/openssl_devel/changelog.CSW=changelog.CSW 644 root bin -f none /opt/csw/share/doc/openssl_devel/CHANGES=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/CHANGES.SSLeay=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/PROBLEMS=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/README=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/FAQ=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/README.ASN1=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/INSTALL=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/NEWS=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/README.ENGINE=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/README.CSW=README.CSW 644 root bin +f none /opt/csw/share/doc/openssl_devel/changelog.CSW 644 root bin +f none /opt/csw/share/doc/openssl_devel/CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/CHANGES.SSLeay 644 root bin +f none /opt/csw/share/doc/openssl_devel/PROBLEMS 644 root bin +f none /opt/csw/share/doc/openssl_devel/README 644 root bin +f none /opt/csw/share/doc/openssl_devel/FAQ 644 root bin +f none /opt/csw/share/doc/openssl_devel/README.ASN1 644 root bin +f none /opt/csw/share/doc/openssl_devel/INSTALL 644 root bin +f none /opt/csw/share/doc/openssl_devel/NEWS 644 root bin +f none /opt/csw/share/doc/openssl_devel/README.ENGINE 644 root bin +f none /opt/csw/share/doc/openssl_devel/README.CSW 644 root bin Modified: csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc 2009-11-06 08:34:23 UTC (rev 7139) +++ csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc 2009-11-06 10:14:52 UTC (rev 7140) @@ -1041,14 +1041,14 @@ f none /opt/csw/share/man/man3/ui.3 0644 root bin f none /opt/csw/share/man/man3/ui_compat.3 0644 root bin f none /opt/csw/share/man/man3/x509.3 0644 root bin -f none /opt/csw/share/doc/openssl_devel/changelog.CSW=changelog.CSW 644 root bin -f none /opt/csw/share/doc/openssl_devel/CHANGES=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/CHANGES.SSLeay=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/PROBLEMS=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/README=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/FAQ=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/README.ASN1=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/INSTALL=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/NEWS=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/README.ENGINE=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_devel/README.CSW=README.CSW 644 root bin +f none /opt/csw/share/doc/openssl_devel/changelog.CSW 644 root bin +f none /opt/csw/share/doc/openssl_devel/CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/CHANGES.SSLeay 644 root bin +f none /opt/csw/share/doc/openssl_devel/PROBLEMS 644 root bin +f none /opt/csw/share/doc/openssl_devel/README 644 root bin +f none /opt/csw/share/doc/openssl_devel/FAQ 644 root bin +f none /opt/csw/share/doc/openssl_devel/README.ASN1 644 root bin +f none /opt/csw/share/doc/openssl_devel/INSTALL 644 root bin +f none /opt/csw/share/doc/openssl_devel/NEWS 644 root bin +f none /opt/csw/share/doc/openssl_devel/README.ENGINE 644 root bin +f none /opt/csw/share/doc/openssl_devel/README.CSW 644 root bin Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386 =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386 2009-11-06 08:34:23 UTC (rev 7139) +++ csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386 2009-11-06 10:14:52 UTC (rev 7140) @@ -30,14 +30,14 @@ s none /opt/csw/ssl/private=../../../etc/opt/csw/ssl/private d none /etc/opt/csw/ssl/private 0700 root bin s none /opt/csw/etc/ssl/private=../../../../etc/opt/csw/ssl/private -f none /opt/csw/share/doc/openssl_rt/changelog.CSW=changelog.CSW 644 root bin -f none /opt/csw/share/doc/openssl_rt/CHANGES=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_rt/CHANGES.SSLeay=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_rt/PROBLEMS=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_rt/README=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_rt/FAQ=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_rt/README.ASN1=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_rt/INSTALL=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_rt/NEWS=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_rt/README.ENGINE=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_rt/README.CSW=README.CSW 644 root bin +f none /opt/csw/share/doc/openssl_rt/changelog.CSW 644 root bin +f none /opt/csw/share/doc/openssl_rt/CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_rt/CHANGES.SSLeay 644 root bin +f none /opt/csw/share/doc/openssl_rt/PROBLEMS 644 root bin +f none /opt/csw/share/doc/openssl_rt/README 644 root bin +f none /opt/csw/share/doc/openssl_rt/FAQ 644 root bin +f none /opt/csw/share/doc/openssl_rt/README.ASN1 644 root bin +f none /opt/csw/share/doc/openssl_rt/INSTALL 644 root bin +f none /opt/csw/share/doc/openssl_rt/NEWS 644 root bin +f none /opt/csw/share/doc/openssl_rt/README.ENGINE 644 root bin +f none /opt/csw/share/doc/openssl_rt/README.CSW 644 root bin Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype 2009-11-06 08:34:23 UTC (rev 7139) +++ csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype 2009-11-06 10:14:52 UTC (rev 7140) @@ -63,14 +63,14 @@ s none /opt/csw/ssl/openssl.cnf=/opt/csw/etc/ssl/openssl.cnf 0644 root bin d none /opt/csw/etc/ssl 0755 root bin f cswpreserveconf /opt/csw/etc/ssl/openssl.cnf.CSW 0644 root bin -f none /opt/csw/share/doc/openssl_utils/changelog.CSW=changelog.CSW 644 root bin -f none /opt/csw/share/doc/openssl_utils/CHANGES=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_utils/CHANGES.SSLeay=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_utils/PROBLEMS=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_utils/README=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_utils/FAQ=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_utils/README.ASN1=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_utils/INSTALL=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_utils/NEWS=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_utils/README.ENGINE=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_utils/README.CSW=README.CSW 644 root bin +f none /opt/csw/share/doc/openssl_utils/changelog.CSW 644 root bin +f none /opt/csw/share/doc/openssl_utils/CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_utils/CHANGES.SSLeay 644 root bin +f none /opt/csw/share/doc/openssl_utils/PROBLEMS 644 root bin +f none /opt/csw/share/doc/openssl_utils/README 644 root bin +f none /opt/csw/share/doc/openssl_utils/FAQ 644 root bin +f none /opt/csw/share/doc/openssl_utils/README.ASN1 644 root bin +f none /opt/csw/share/doc/openssl_utils/INSTALL 644 root bin +f none /opt/csw/share/doc/openssl_utils/NEWS 644 root bin +f none /opt/csw/share/doc/openssl_utils/README.ENGINE 644 root bin +f none /opt/csw/share/doc/openssl_utils/README.CSW 644 root bin Copied: csw/mgar/pkg/openssl/trunk/files/more_configure_targets.patch (from rev 7128, csw/mgar/pkg/openssl/trunk/files/openssl.0.9.8.patch) =================================================================== --- csw/mgar/pkg/openssl/trunk/files/more_configure_targets.patch (rev 0) +++ csw/mgar/pkg/openssl/trunk/files/more_configure_targets.patch 2009-11-06 10:14:52 UTC (rev 7140) @@ -0,0 +1,26 @@ +diff -ur openssl-0.9.8i.orig/Configure openssl-0.9.8i/Configure +--- openssl-0.9.8i.orig/Configure 2008-09-12 16:47:00.000000000 +0200 ++++ openssl-0.9.8i/Configure 2008-09-26 21:39:48.373741600 +0200 +@@ -199,8 +199,12 @@ + "solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN -DMD32_REG_T=int::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + + #### Solaris x86 with Sun C setups +-"solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +-"solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"solaris-x86-cc","cc:-fast -xdepend=no -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"solaris-386-cc","cc:-fast -xdepend=no -xarch=386 -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR ++RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"solaris-pentium-cc","cc:-fast -xdepend=no -xpentium -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"solaris-pentium_pro-cc","cc:-fast -xdepend=no -xarch=pentium_pro -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"solaris64-x86_64-cc","cc:-fast -xdepend=no -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + + #### SPARC Solaris with GNU C setups + "solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +@@ -219,6 +223,7 @@ + "solaris-sparcv7-cc","cc:-xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "solaris-sparcv8-cc","cc:-xarch=v8 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "solaris-sparcv9-cc","cc:-xtarget=ultra -xarch=v8plus -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"solaris-sparcv9+vis-cc","cc:-xtarget=ultra -xarch=v8plusa -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:::des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-KPIC:-xarch=v9 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs", + #### + "debug-solaris-sparcv8-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG_ALL -xarch=v8 -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8.o::::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", Deleted: csw/mgar/pkg/openssl/trunk/files/oldlibs.list.0.9.7m-i386 =================================================================== --- csw/mgar/pkg/openssl/trunk/files/oldlibs.list.0.9.7m-i386 2009-11-06 08:34:23 UTC (rev 7139) +++ csw/mgar/pkg/openssl/trunk/files/oldlibs.list.0.9.7m-i386 2009-11-06 10:14:52 UTC (rev 7140) @@ -1,4 +0,0 @@ -opt/csw/lib/libcrypto.so.0.9.7 -opt/csw/lib/libssl.so.0.9.7 -opt/csw/lib/pentium_pro/libcrypto.so.0.9.7 -opt/csw/lib/pentium_pro/libssl.so.0.9.7 Deleted: csw/mgar/pkg/openssl/trunk/files/oldlibs.list.0.9.7m-sparc =================================================================== --- csw/mgar/pkg/openssl/trunk/files/oldlibs.list.0.9.7m-sparc 2009-11-06 08:34:23 UTC (rev 7139) +++ csw/mgar/pkg/openssl/trunk/files/oldlibs.list.0.9.7m-sparc 2009-11-06 10:14:52 UTC (rev 7140) @@ -1,6 +0,0 @@ -opt/csw/lib/libcrypto.so.0.9.7 -opt/csw/lib/libssl.so.0.9.7 -opt/csw/lib/sparcv8plus+vis/libcrypto.so.0.9.7 -opt/csw/lib/sparcv8plus+vis/libssl.so.0.9.7 -opt/csw/lib/sparcv9/libcrypto.so.0.9.7 -opt/csw/lib/sparcv9/libssl.so.0.9.7 Deleted: csw/mgar/pkg/openssl/trunk/files/openssl.0.9.7.patch =================================================================== --- csw/mgar/pkg/openssl/trunk/files/openssl.0.9.7.patch 2009-11-06 08:34:23 UTC (rev 7139) +++ csw/mgar/pkg/openssl/trunk/files/openssl.0.9.7.patch 2009-11-06 10:14:52 UTC (rev 7140) @@ -1,68 +0,0 @@ -diff --speed-large-files --minimal -Nru openssl-0.9.7m.orig/Configure openssl-0.9.7m/Configure ---- openssl-0.9.7m.orig/Configure 2007-02-22 17:30:49.000000000 -0500 -+++ openssl-0.9.7m/Configure 2007-05-08 10:48:55.638232000 -0400 -@@ -180,8 +180,11 @@ - "solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN -DMD32_REG_T=int::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:asm/x86_64-gcc.o::::::asm/rc4-x86_64.o:::dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - - #### Solaris x86 with Sun C setups --"solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", --"solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL::::::::::dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"solaris-x86-cc","cc:-fast -xdepend=no -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"solaris-386-cc","cc:-fast -xdepend=no -xarch=386 -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"solaris-pentium-cc","cc:-fast -xdepend=no -xpentium -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"solaris-pentium_pro-cc","cc:-fast -xdepend=no -xarch=pentium_pro -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"solaris64-x86_64-cc","cc:-fast -xdepend=no -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL::::::::::dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - - #### SPARC Solaris with GNU C setups - "solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -@@ -207,6 +210,7 @@ - "solaris-sparcv7-cc","cc:-xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "solaris-sparcv8-cc","cc:-xarch=v8 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "solaris-sparcv9-cc","cc:-xtarget=ultra -xarch=v8plus -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"solaris-sparcv9+vis-cc","cc:-xtarget=ultra -xarch=v8plusa -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::asm/md5-sparcv9.o::::::dlfcn:solaris-shared:-KPIC:-xarch=v9 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs", - #### - "debug-solaris-sparcv8-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xarch=v8 -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -diff -ur openssl-0.9.7m.orig/ssl/ssl_lib.c openssl-0.9.7m/ssl/ssl_lib.c ---- openssl-0.9.7m.orig/ssl/ssl_lib.c 2006-09-28 07:53:51.000000000 -0400 -+++ openssl-0.9.7m/ssl/ssl_lib.c 2007-10-03 03:51:42.100016000 -0400 -@@ -1169,7 +1169,6 @@ - char *SSL_get_shared_ciphers(const SSL *s,char *buf,int len) - { - char *p; -- const char *cp; - STACK_OF(SSL_CIPHER) *sk; - SSL_CIPHER *c; - int i; -@@ -1182,20 +1181,21 @@ - sk=s->session->ciphers; - for (i=0; iname; *cp; ) -+ n=strlen(c->name); -+ if (n+1 > len) - { -- if (len-- <= 0) -- { -- *p='\0'; -- return(buf); -- } -- else -- *(p++)= *(cp++); -+ if (p != buf) -+ --p; -+ *p='\0'; -+ return buf; - } -+ strcpy(p,c->name); -+ p+=n; - *(p++)=':'; -+ len-=n+1; - } - p[-1]='\0'; - return(buf); Deleted: csw/mgar/pkg/openssl/trunk/files/openssl.0.9.8.patch =================================================================== --- csw/mgar/pkg/openssl/trunk/files/openssl.0.9.8.patch 2009-11-06 08:34:23 UTC (rev 7139) +++ csw/mgar/pkg/openssl/trunk/files/openssl.0.9.8.patch 2009-11-06 10:14:52 UTC (rev 7140) @@ -1,26 +0,0 @@ -diff -ur openssl-0.9.8i.orig/Configure openssl-0.9.8i/Configure ---- openssl-0.9.8i.orig/Configure 2008-09-12 16:47:00.000000000 +0200 -+++ openssl-0.9.8i/Configure 2008-09-26 21:39:48.373741600 +0200 -@@ -199,8 +199,12 @@ - "solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN -DMD32_REG_T=int::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - - #### Solaris x86 with Sun C setups --"solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", --"solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"solaris-x86-cc","cc:-fast -xdepend=no -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"solaris-386-cc","cc:-fast -xdepend=no -xarch=386 -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR -+RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"solaris-pentium-cc","cc:-fast -xdepend=no -xpentium -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"solaris-pentium_pro-cc","cc:-fast -xdepend=no -xarch=pentium_pro -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"solaris64-x86_64-cc","cc:-fast -xdepend=no -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - - #### SPARC Solaris with GNU C setups - "solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -@@ -219,6 +223,7 @@ - "solaris-sparcv7-cc","cc:-xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "solaris-sparcv8-cc","cc:-xarch=v8 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "solaris-sparcv9-cc","cc:-xtarget=ultra -xarch=v8plus -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"solaris-sparcv9+vis-cc","cc:-xtarget=ultra -xarch=v8plusa -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:::des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-KPIC:-xarch=v9 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs", - #### - "debug-solaris-sparcv8-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG_ALL -xarch=v8 -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8.o::::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 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 Nov 6 11:56:47 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 06 Nov 2009 10:56:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[7141] csw/mgar/pkg/mysql5/branches/mysql-5.0.x Message-ID: Revision: 7141 http://gar.svn.sourceforge.net/gar/?rev=7141&view=rev Author: wahwah Date: 2009-11-06 10:56:47 +0000 (Fri, 06 Nov 2009) Log Message: ----------- mysql5-5.0.x: Adjusting the quick start file, adjusting the startup script, shuffling files around the packages (mysql_config in mysql5devel), adding symlinks from /opt/csw/include/mysql and /opt/csw/lib/mysql Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/ChangeLog csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW Removed Paths: ------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW Property Changed: ---------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-11-06 10:14:52 UTC (rev 7140) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-11-06 10:56:47 UTC (rev 7141) @@ -70,16 +70,39 @@ CSWmysql5client_programs += perror CSWmysql5client_programs += replace +CSWmysql5devel_programs += mysql_config + PKGFILES_CSWmysql5bench = $(prefix)/sql-bench.* PKGFILES_CSWmysql5client = $(bindir) PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(call baseisadirs,$(bindir),$(bin_name))) PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(mandir)/man1/$(bin_name)\.1) PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),/opt/csw/bin/$(bin_name)) PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),/opt/csw/sbin/$(bin_name)) -PKGFILES_CSWmysql5devel += $(call baseisadirs,$(bindir),mysql_config) +PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),$(call baseisadirs,$(bindir),$(bin_name))) +PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),$(mandir)/man1/$(bin_name)\.1) +PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),/opt/csw/bin/$(bin_name)) +PKGFILES_CSWmysql5devel += $(foreach bin_name,$(CSWmysql5devel_programs),/opt/csw/sbin/$(bin_name)) PKGFILES_CSWmysql5devel += $(mandir)/man1/mysql_config\.1 -PKGFILES_CSWmysql5devel = $(prefix)/include.* +PKGFILES_CSWmysql5devel += $(prefix)/include.* +PKGFILES_CSWmysql5devel += /opt/csw/include/mysql + +# -/opt/csw/include/mysql --> ../mysql5/include/mysql +# -/opt/csw/mysql5/bin +# -/opt/csw/mysql5/bin/mysql_config +# +# /opt/csw/bin/mysql_config=../mysql5/bin/mysql_config +# /opt/csw/mysql5/bin/amd64/mysql_config 0755 root bin +# /opt/csw/mysql5/bin/i386/mysql_config=/opt/csw/mysql5/bin/mysql_config 0755 root bin +# /opt/csw/mysql5/bin/mysql_config=/opt/csw/bin/isaexec 0755 root bin +# /opt/csw/mysql5/share/man/man1/mysql_config.1 0644 root bin + + +# work/build-global/CSWmysql5client.prototype:s none /opt/csw/bin/mysql_config=../mysql5/bin/mysql_config +# work/build-global/CSWmysql5client.prototype:f none /opt/csw/mysql5/bin/amd64/mysql_config 0755 root bin +# work/build-global/CSWmysql5client.prototype:f none /opt/csw/mysql5/bin/mysql_config 0755 root bin +# work/build-global/CSWmysql5client.prototype:f none /opt/csw/mysql5/share/man/man1/mysql_config.1 0644 root bin + PKGFILES_CSWmysql5rt = $(prefix)/lib/.*\.so.* PKGFILES_CSWmysql5test = $(prefix)/mysql-test.* @@ -91,7 +114,7 @@ MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.0/ DISTFILES = mysql-$(GARVERSION).tar.gz -DISTFILES += cswmysql5 quick_start-csw README.CSW +DISTFILES += cswmysql5 quick_start-csw README.CSW ChangeLog DISTFILES += CSWmysql5.preinstall DISTFILES += CSWmysql5.postinstall DISTFILES += cswusergroup @@ -101,13 +124,8 @@ REQUIRED_PKGS = CSWncurses CSWzlib PREREQUISITE_PKGS = $(REQUIRED_PKGS) -# because we alter the prefix. this gets us proper linking as well as -# LD_OPTIONS (RPATH) -# EXTRA_LIB = /opt/csw/lib -# EXTRA_INC = /opt/csw/include EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ -# EXTRA_LIB = /opt/csw/mysql5/lib/$$ISALIST/mysql # Set ./configure options CONFIGURE_ARGS = $(DIRPATHS) @@ -122,6 +140,7 @@ CONFIGURE_ARGS += --with-ssl=/opt/csw CONFIGURE_ARGS += --with-plugins=max-no-ndb +# TODO: Make the tests pass. They don't at the moment. TEST_SCRIPTS = # Enable 64 bits build @@ -143,6 +162,7 @@ post-install-modulated: ginstall -m 755 -d $(DESTDIR)$(localstatedir) ginstall -m 755 -d $(DESTDIR)$(datadir)/mysql/doc + ginstall -m 644 $(FILEDIR)/ChangeLog $(DESTDIR)$(datadir)/mysql/doc ginstall -m 644 $(FILEDIR)/README.CSW $(DESTDIR)$(datadir)/mysql/doc ginstall -m 755 -d $(DESTDIR)/opt/csw/share/mysql/doc ln -sf ../../../mysql5/share/mysql/doc/README.CSW \ @@ -153,8 +173,10 @@ ginstall -m 755 -d $(DESTDIR)$(global_sysconfdir)/pkg/CSWmysql5 ginstall -m 644 $(FILEDIR)/cswusergroup \ $(DESTDIR)$(global_sysconfdir)/pkg/CSWmysql5 - - # Create symlinks + # A symlink for mysql5 include files + ginstall -m 755 -d $(DESTDIR)/opt/csw/include + ln -s ../mysql5/include/mysql $(DESTDIR)/opt/csw/include/mysql + # Create symlinks to binaries ginstall -m 755 -d $(DESTDIR)$(global_bindir) for f in $(DESTDIR)$(bindir)/*; do \ ln -s ../mysql5/bin/`basename $$f` $(DESTDIR)$(global_bindir)/`basename $$f`; \ Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-11-06 10:14:52 UTC (rev 7140) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-11-06 10:56:47 UTC (rev 7141) @@ -1,11 +1,12 @@ -a0b98a7320bce2da3e1f90da704d3c85 download/0001-Use-libc-not-libcrypt.patch -1414d06fab1530484a508927a0de4154 download/0002-cast-user_info-pw_gid-to-gid_t.patch -5415f365f1b0f7a179d1efc25f45bbee download/0003-OpenCSW-perl-for-tests.patch -8ab232cd4d232b3cda3bbced93f80237 download/0004-basedir-and-datadir-in-the-cnf-files.patch -9b5511de728fec4394eca7dd0097fb43 download/CSWmysql5.postinstall -cc2a219abbe7dc6049775cff070a27a5 download/CSWmysql5.preinstall -70d7860bfa776dfc5510fc11d7c14203 download/README.CSW -9e86a7c581edf83eac11ceb827c318a2 download/cswmysql5 -67228e1f096fe08a94f4267439a4ec36 download/cswusergroup -671348f1a5b078da9ca76f97e1fda325 download/mysql-5.0.84.tar.gz -52ad413f019717b89bd5aa33babdedc3 download/quick_start-csw +a0b98a7320bce2da3e1f90da704d3c85 0001-Use-libc-not-libcrypt.patch +1414d06fab1530484a508927a0de4154 0002-cast-user_info-pw_gid-to-gid_t.patch +5415f365f1b0f7a179d1efc25f45bbee 0003-OpenCSW-perl-for-tests.patch +8ab232cd4d232b3cda3bbced93f80237 0004-basedir-and-datadir-in-the-cnf-files.patch +9b5511de728fec4394eca7dd0097fb43 CSWmysql5.postinstall +cc2a219abbe7dc6049775cff070a27a5 CSWmysql5.preinstall +e691b0cf00a3925ac55c1844045d6e30 ChangeLog +e42afb5ec1b1ab02d2ec3b46d0922636 README.CSW +33387959f9de060dc0af915c9c49bca8 cswmysql5 +67228e1f096fe08a94f4267439a4ec36 cswusergroup +671348f1a5b078da9ca76f97e1fda325 mysql-5.0.84.tar.gz +ca622220c7c3ab7427eb1604ddecded6 quick_start-csw Copied: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/ChangeLog (from rev 7097, csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW) =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/ChangeLog (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/ChangeLog 2009-11-06 10:56:47 UTC (rev 7141) @@ -0,0 +1,37 @@ +2009-11-05 Maciej Blizi?ski + + * Makefile: Reworked the package from ground up, using GAR. + +2007-06-17 Alex Moore + + * Version 5.1: MySQL 5.1 is still in beta. This package is released + for your testing only. + +2007-06-03 Alex Moore + + * Startup script: This update fixes a startup script problem that + caused the script to not work when --datadir is not the default. This + update also adds amd64 mysqld and client libraries. + +2006-12-29 Alex Moore + + * csw.conf: This update adds support for csw.conf. See the following + url for details. http://www.blastwave.org/standards/csw.conf.html The + daemon specific name for this package is mysql5. + *** IMPORTANT *** + If you are using mysql5rc; please move your options to my.cnf and + eliminate mysql5rc. A future release will remove mysql5rc. my.cnf is + more flexible and any new or missing options will not be added to + mysql5rc. quick_start-csw is changed with this release to Not write + mysql5rc. Options for --basedir and --datadir are included in the + default my.cnf files. + *** END OF IMPORTANT *** + +2006-04-16 Alex Moore + + * quick_start-csw: This update fixes some problems with + quick_start-csw and svc-mysql5. I have also corrected some issues + when using a database directory that is not /opt/csw/mysql5/var If you + are not using the default location for --datadir, package installation + will NOT start CSWmysql5. More code is needed for that. I welcome + patches. Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW 2009-11-06 10:14:52 UTC (rev 7140) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW 2009-11-06 10:56:47 UTC (rev 7141) @@ -1,62 +0,0 @@ -2007-06-17 -MySQL 5.1 is still in beta. This package is released for your testing -only. - -2007-06-03 -This update fixes a startup script problem that caused the script to not -work when --datadir is not the default. - -This update also adds amd64 mysqld and client libraries. - -2006-12-29 -This update adds support for csw.conf. See the following url for details. -http://www.blastwave.org/standards/csw.conf.html -The daemon specific name for this package is mysql5. - -*** IMPORTANT *** -If you are using mysql5rc; please move your options to my.cnf and eliminate - mysql5rc. A future release will remove mysql5rc. -my.cnf is more flexible and any new or missing options will not be added to - mysql5rc. -quick_start-csw is changed with this release to Not write mysql5rc. Options - for --basedir and --datadir are included in the default my.cnf files. -*** END OF IMPORTANT *** - -2006-04-16 -This update fixes some problems with quick_start-csw and svc-mysql5. -I have also corrected some issues when using a database directory that - is not /opt/csw/mysql5/var - -If you are not using the default location for --datadir, package installation - will NOT start CSWmysql5. More code is needed for that. I welcome patches. - -If you are not using the default location for --datadir, you will find - that CSWmysql5 works much better when you create /etc/my.cnf with at - least the entries that follow. You may also want some entries in this - global options file for client programs that you use. - For example: --datadir is /db/mysql5/var - Create /etc/my.cnf with the following entries: - # Global MySQL options file. - [mysqld] - datadir = /db/mysql5/var - basedir = /opt/csw/mysql5 - -I also changed the option for --defaults-file to --defaults-extra-file - in the startup script. - This allows your options file to be read after the global options file - /etc/my.cnf. - -Note that if you are using the default location for --datadir, you do not - really need /etc/opt/csw/mysql5rc. In this case, you should put any options - in the appropriate group in my.cnf. See the MySQL documentation for - details. -If you are not using the default location for --datadir, you only need - /etc/opt/csw/mysql5rc for the startup script options for - --defaults-extra-file and possibly --pid-file. All other options may be - put in the appropriate group in my.cnf - -Click 'Views and info' on the package page at - http://www.blastwave.org/packages.php/mysql5 -for the latest information. - -Alex Moore Added: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW 2009-11-06 10:56:47 UTC (rev 7141) @@ -0,0 +1,58 @@ +MySQL 5 OpenCSW package +======================= + +* http://www.opencsw.org/packages/mysql5 + +The package has been reworked from the ground up, using GAR. Up until this +moment, the mysql5 package was in the version from before the fork. The new +packages are created so that they are as close to the original ones as +possible, but some changes are inevitable, and some other changes were +considered necessary. + +* Read only /opt/csw support + - data in /var/opt/csw + - configuration in /etc/opt/csw +* The prefix is still /opt/csw/mysql5, but all the binaries are now linked from + /opt/csw, so that the standard PATH setting allows to use them +* The startup script is now in /etc/opt/csw/init.d +* SMF support is handled by cswclassutils + + +Here are the old notes from the previous maintainer, Alex Moore: + +--------------8<----------------8<--------------------8<------------------------ + +If you are not using the default location for --datadir, package installation + will NOT start CSWmysql5. More code is needed for that. I welcome patches. + +If you are not using the default location for --datadir, you will find + that CSWmysql5 works much better when you create /etc/my.cnf with at + least the entries that follow. You may also want some entries in this + global options file for client programs that you use. + For example: --datadir is /db/mysql5/var + Create /etc/my.cnf with the following entries: + # Global MySQL options file. + [mysqld] + datadir = /db/mysql5/var + basedir = /opt/csw/mysql5 + +I also changed the option for --defaults-file to --defaults-extra-file + in the startup script. + This allows your options file to be read after the global options file + /etc/my.cnf. + +Note that if you are using the default location for --datadir, you do not + really need /etc/opt/csw/mysql5rc. In this case, you should put any options + in the appropriate group in my.cnf. See the MySQL documentation for + details. + +If you are not using the default location for --datadir, you only need + /etc/opt/csw/mysql5rc for the startup script options for + --defaults-extra-file and possibly --pid-file. All other options may be + put in the appropriate group in my.cnf + +Click 'Views and info' on the package page at + http://www.opencsw.org/packages.php/mysql5 +for the latest information. + +Alex Moore Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 2009-11-06 10:14:52 UTC (rev 7140) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 2009-11-06 10:56:47 UTC (rev 7141) @@ -1,30 +1,33 @@ #!/bin/sh -# Start script for CSW www.blastwave.org package of MySQL database. # -# NOTE: Make sure DB_DIR is owned BY the mysql user and group and chmod +# $Id$ +# Start script for MySQL database. +# +# NOTE: Make sure DB_DIR is owned BY the mysql user and group and chmod # 700. # # First time installation can use quick_start-csw in # /opt/csw/mysql5/share/mysql to build the mysql database for the # grant tables. Or create the initial database yourself. # -# Use my.cnf for startup options. See MySQL documention +# Use my.cnf for startup options. See MySQL documention # for 'Using Option Files'. # Support for mysql5rc still remains in this startup script. # RETVAL=0 MYSQLHOME=/opt/csw/mysql5 -MYSQLD_DATADIR=/var/opt/csw/mysql5 -MYSQLD_PID_FILE=$MYSQLHOME/var/mysql.pid -CONFFILE=$MYSQLHOME/my.cnf +MYSQL_VAR=/var/opt/csw/mysql5 +MYSQLD_DATADIR=$MYSQL_VAR +MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid +CONFFILE=$MYSQL_VAR/my.cnf # # Source configuration [ -r /opt/csw/mysql5/etc/mysql5rc ] && . /opt/csw/mysql5/etc/mysql5rc [ -r /etc/opt/csw/mysql5rc ] && . /etc/opt/csw/mysql5rc -# To get started quickly, copy a sample configuration file from +# To get started quickly, copy a sample configuration file from # $MYSQLHOME/share/mysql # For example, # cp /opt/csw/mysql5/share/mysql/my-medium.cnf /opt/csw/mysql5/var/my.cnf @@ -42,95 +45,95 @@ fi # If CONFFILE is the server default file, unset CONFFILE -if [ x"$CONFFILE" = x"$MYSQLHOME/my.cnf" ]; then +if [ x"$CONFFILE" = x"$MYSQL_VAR/my.cnf" ]; then CONFFILE= fi # If MYSQLD_DATADIR does not contain a mysql directory, unset MYSQLD_DATADIR # Also, check that MYSQLD_DATADIR contains a mysql directory -if [ ! -d "$MYSQLHOME/var/mysql" -a ! -d "$MYSQLD_DATADIR/mysql" ] ; then +if [ ! -d "$MYSQL_VAR/mysql" -a ! -d "$MYSQLD_DATADIR/mysql" ] ; then MYSQLD_DATADIR= fi # Make sure required vars are set -MYSQLD_PID_FILE=${MYSQLD_PID_FILE:=$MYSQLHOME/var/mysql.pid} +MYSQLD_PID_FILE=${MYSQLD_PID_FILE:=$MYSQL_VAR/mysql.pid} # If a database already exists, start whether or not there is a conf file. # If no conf file, the database will just use internal defaults for everything. start_it() { if test -r $MYSQLD_PID_FILE ; then - if kill -0 `cat $MYSQLD_PID_FILE` > /dev/null 2>&1 ; then - echo "mysqld (`cat $MYSQLD_PID_FILE`) seems to be running." - return 1 - fi + if kill -0 `cat $MYSQLD_PID_FILE` > /dev/null 2>&1 ; then + echo "mysqld (`cat $MYSQLD_PID_FILE`) seems to be running." + return 1 + fi fi printf "%-60s" "Starting mysqld: " # 2006-03-11 -# This script no longer creates the default database. You may create the +# This script no longer creates the default database. You may create the # default database manually or use /opt/csw/mysql5/share/mysql/quick_start-csw # if [ ! -d "$MYSQLHOME/var/mysql" ] ; then # echo MySQL core database has not been created. # echo Creating it now... -# $MYSQLHOME/bin/mysql_install_db -# chown -R mysql:mysql $MYSQLHOME/var +# $MYSQLHOME/bin/mysql_install_db +# chown -R mysql:mysql $MYSQLHOME/var # fi -# 2006-04-16 --defaults-file is changed to --defaults-extra-file +# 2006-04-16 --defaults-file is changed to --defaults-extra-file $MYSQLHOME/bin/mysqld_safe \ `[ -n "$CONFFILE" ] && echo "--defaults-extra-file=$CONFFILE"` \ - --pid-file=$MYSQLD_PID_FILE \ - `[ -n "$MYSQLD_PROG" ] && echo "--mysqld=$MYSQLD_PROG"` \ - `[ -n "$MYSQLD_ANSI" ] && echo "--ansi"` \ - `[ -n "$MYSQLD_BASEDIR" ] && echo "--basedir=$MYSQLD_BASEDIR"` \ - `[ -n "$MYSQLD_BIG_TABLES" ] && echo "--big-tables"` \ - `[ -n "$MYSQLD_BIND_ADDRESS" ] && echo "--bind-address=$MYSQLD_BIND_ADDRESS"` \ - `[ -n "$MYSQLD_CHARACTER_SETS" ] && echo "--character-sets-dir=$MYSQLD_CHARACTER_SETS"` \ - `[ -n "$MYSQLD_CHROOT" ] && echo "--chroot=$MYSQLD_CHROOT"` \ - `[ -n "$MYSQLD_DATADIR" ] && echo "--datadir=$MYSQLD_DATADIR"` \ - `[ -n "$MYSQLD_DEFAULT_CHARSET" ] && echo "--default-character-set=$MYSQLD_DEFAULT_CHARSET"` \ - `[ -n "$MYSQLD_DEFAULT_TABLE_TYPE" ] && echo "--default-table-type=$MYSQLD_DEFAULT_TABLE_TYPE"` \ - `[ -n "$MYSQLD_DELAY_KEY_WRITE_TABLES" ] && echo "--delay-key-write-for-all-tables"` \ - `[ -n "$MYSQLD_ENABLE_LOCKING" ] && echo "--enable-locking"` \ - `[ -n "$MYSQLD_EXIT_INFO" ] && echo "--exit-info"` \ - `[ -n "$MYSQLD_FLUSH" ] && echo "--flush"` \ - `[ -n "$MYSQLD_INIT_FILE" ] && echo "--init-file=$MYSQLD_INIT_FILE"` \ - `[ -n "$MYSQLD_LANGUAGE" ] && echo "--language=$MYSQLD_LANGUAGE"` \ - `[ -n "$MYSQLD_LOG" ] && echo "--log=$MYSQLD_LOG"` \ - `[ -n "$MYSQLD_LOG_ISAM" ] && echo "--log-isam=$MYSQLD_LOG_ISAM"` \ - `[ -n "$MYSQLD_LOG_SLOW_QUERIES" ] && echo "--log-slow-queries=$MYSQLD_LOG_SLOW_QUERIES"` \ - `[ -n "$MYSQLD_LOG_UPDATE" ] && echo "--log-update=$MYSQLD_LOG_UPDATE"` \ - `[ -n "$MYSQLD_LOG_LONG_FORMAT" ] && echo "--log-long-format"` \ - `[ -n "$MYSQLD_LOW_PRIORITY_UPDATES" ] && echo "--low-priority-updates"` \ - `[ -n "$MYSQLD_MEMLOCK" ] && echo "--memlock"` \ - `[ -n "$MYSQLD_MYISAM_RECOVER" ] && echo "--myisam-recover=$MYSQLD_MYISAM_RECOVER"` \ - `[ -n "$MYSQLD_PORT" ] && echo "--port=$MYSQLD_PORT"` \ - `[ -n "$MYSQLD_OLD_PROTOCOL" ] && echo "--old-protocol"` \ - `[ -n "$MYSQLD_ONE_THREAD" ] && echo "--one-thread"` \ - `[ -n "$MYSQLD_SET_VARIABLE" ] && echo "--set-variablevar=$MYSQLD_SET_VARIABLE"` \ - `[ -n "$MYSQLD_SKIP_GRANT_TABLES" ] && echo "--skip-grant-tables"` \ - `[ -n "$MYSQLD_SAFE_MODE" ] && echo "--safe-mode"` \ - `[ -n "$MYSQLD_SECURE" ] && echo "--secure"` \ - `[ -n "$MYSQLD_SKIP_CONCURRENT_INSERT" ] && echo "--skip-concurrent-insert"` \ - `[ -n "$MYSQLD_SKIP_DELAY_KEY_WRITE" ] && echo "--skip-delay-key-write"` \ - `[ -n "$MYSQLD_SKIP_LOCKING" ] && echo "--skip-locking"` \ - `[ -n "$MYSQLD_SKIP_NAME_RESOLVE" ] && echo "--skip-name-resolve"` \ - `[ -n "$MYSQLD_SKIP_NETWORKING" ] && echo "--skip-networking"` \ - `[ -n "$MYSQLD_SKIP_NEW" ] && echo "--skip-new"` \ - `[ -n "$MYSQLD_SKIP_HOST_CACHE" ] && echo "--skip-host-cache"` \ - `[ -n "$MYSQLD_SKIP_SHOW_DATABASE" ] && echo "--skip-show-database"` \ - `[ -n "$MYSQLD_SKIP_THREAD_PRIORITY" ] && echo "--skip-thread-priority"` \ - `[ -n "$MYSQLD_SOCKET" ] && echo "--socket=$MYSQLD_SOCKET"` \ - `[ -n "$MYSQLD_TMPDIR" ] && echo "--tmpdir=$MYSQLD_TMPDIR"` \ - `[ -n "$MYSQLD_USER" ] && echo "--user=$MYSQLD_USER"` \ - & >/dev/null 2>&1 + --pid-file=$MYSQLD_PID_FILE \ + `[ -n "$MYSQLD_PROG" ] && echo "--mysqld=$MYSQLD_PROG"` \ + `[ -n "$MYSQLD_ANSI" ] && echo "--ansi"` \ + `[ -n "$MYSQLD_BASEDIR" ] && echo "--basedir=$MYSQLD_BASEDIR"` \ + `[ -n "$MYSQLD_BIG_TABLES" ] && echo "--big-tables"` \ + `[ -n "$MYSQLD_BIND_ADDRESS" ] && echo "--bind-address=$MYSQLD_BIND_ADDRESS"` \ + `[ -n "$MYSQLD_CHARACTER_SETS" ] && echo "--character-sets-dir=$MYSQLD_CHARACTER_SETS"` \ + `[ -n "$MYSQLD_CHROOT" ] && echo "--chroot=$MYSQLD_CHROOT"` \ + `[ -n "$MYSQLD_DATADIR" ] && echo "--datadir=$MYSQLD_DATADIR"` \ + `[ -n "$MYSQLD_DEFAULT_CHARSET" ] && echo "--default-character-set=$MYSQLD_DEFAULT_CHARSET"` \ + `[ -n "$MYSQLD_DEFAULT_TABLE_TYPE" ] && echo "--default-table-type=$MYSQLD_DEFAULT_TABLE_TYPE"` \ + `[ -n "$MYSQLD_DELAY_KEY_WRITE_TABLES" ] && echo "--delay-key-write-for-all-tables"` \ + `[ -n "$MYSQLD_ENABLE_LOCKING" ] && echo "--enable-locking"` \ + `[ -n "$MYSQLD_EXIT_INFO" ] && echo "--exit-info"` \ + `[ -n "$MYSQLD_FLUSH" ] && echo "--flush"` \ + `[ -n "$MYSQLD_INIT_FILE" ] && echo "--init-file=$MYSQLD_INIT_FILE"` \ + `[ -n "$MYSQLD_LANGUAGE" ] && echo "--language=$MYSQLD_LANGUAGE"` \ + `[ -n "$MYSQLD_LOG" ] && echo "--log=$MYSQLD_LOG"` \ + `[ -n "$MYSQLD_LOG_ISAM" ] && echo "--log-isam=$MYSQLD_LOG_ISAM"` \ + `[ -n "$MYSQLD_LOG_SLOW_QUERIES" ] && echo "--log-slow-queries=$MYSQLD_LOG_SLOW_QUERIES"` \ + `[ -n "$MYSQLD_LOG_UPDATE" ] && echo "--log-update=$MYSQLD_LOG_UPDATE"` \ + `[ -n "$MYSQLD_LOG_LONG_FORMAT" ] && echo "--log-long-format"` \ + `[ -n "$MYSQLD_LOW_PRIORITY_UPDATES" ] && echo "--low-priority-updates"` \ + `[ -n "$MYSQLD_MEMLOCK" ] && echo "--memlock"` \ + `[ -n "$MYSQLD_MYISAM_RECOVER" ] && echo "--myisam-recover=$MYSQLD_MYISAM_RECOVER"` \ + `[ -n "$MYSQLD_PORT" ] && echo "--port=$MYSQLD_PORT"` \ + `[ -n "$MYSQLD_OLD_PROTOCOL" ] && echo "--old-protocol"` \ + `[ -n "$MYSQLD_ONE_THREAD" ] && echo "--one-thread"` \ + `[ -n "$MYSQLD_SET_VARIABLE" ] && echo "--set-variablevar=$MYSQLD_SET_VARIABLE"` \ + `[ -n "$MYSQLD_SKIP_GRANT_TABLES" ] && echo "--skip-grant-tables"` \ + `[ -n "$MYSQLD_SAFE_MODE" ] && echo "--safe-mode"` \ + `[ -n "$MYSQLD_SECURE" ] && echo "--secure"` \ + `[ -n "$MYSQLD_SKIP_CONCURRENT_INSERT" ] && echo "--skip-concurrent-insert"` \ + `[ -n "$MYSQLD_SKIP_DELAY_KEY_WRITE" ] && echo "--skip-delay-key-write"` \ + `[ -n "$MYSQLD_SKIP_LOCKING" ] && echo "--skip-locking"` \ + `[ -n "$MYSQLD_SKIP_NAME_RESOLVE" ] && echo "--skip-name-resolve"` \ + `[ -n "$MYSQLD_SKIP_NETWORKING" ] && echo "--skip-networking"` \ + `[ -n "$MYSQLD_SKIP_NEW" ] && echo "--skip-new"` \ + `[ -n "$MYSQLD_SKIP_HOST_CACHE" ] && echo "--skip-host-cache"` \ + `[ -n "$MYSQLD_SKIP_SHOW_DATABASE" ] && echo "--skip-show-database"` \ + `[ -n "$MYSQLD_SKIP_THREAD_PRIORITY" ] && echo "--skip-thread-priority"` \ + `[ -n "$MYSQLD_SOCKET" ] && echo "--socket=$MYSQLD_SOCKET"` \ + `[ -n "$MYSQLD_TMPDIR" ] && echo "--tmpdir=$MYSQLD_TMPDIR"` \ + `[ -n "$MYSQLD_USER" ] && echo "--user=$MYSQLD_USER"` \ + & >/dev/null 2>&1 RETVAL=$? if [ $RETVAL = 0 ] ; then - echo "[ OK ]" + echo "[ OK ]" else - echo "[FAILED]" - return 1 + echo "[FAILED]" + return 1 fi return 0 } @@ -139,16 +142,16 @@ printf "%-60s" "Shutting down mysqld: " if test -f "$MYSQLD_PID_FILE" ; then - pkill mysqld_safe >/dev/null 2>&1 - kill `cat $MYSQLD_PID_FILE` >/dev/null 2>&1 - RETVAL=$? + pkill mysqld_safe >/dev/null 2>&1 + kill `cat $MYSQLD_PID_FILE` >/dev/null 2>&1 + RETVAL=$? else - RETVAL=1 + RETVAL=1 fi if [ $RETVAL = 0 ] ; then - echo "[ OK ]" + echo "[ OK ]" else - echo "[FAILED]" + echo "[FAILED]" fi echo "" return 0 Property changes on: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw 2009-11-06 10:14:52 UTC (rev 7140) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw 2009-11-06 10:56:47 UTC (rev 7141) @@ -1,21 +1,24 @@ #!/bin/ksh -p +# +# $Id$ +# # initial version for blastwave.org by Alex Moore 2006.02.25 # Revised 2006.03.25 - see bug report 0001542 # # This script creates a default database with the small-memory footprint. # Input may be provided for DATADIR and DEFAULTS_FILE -# # BASEDIR=/opt/csw/mysql5 +MYSQL_VAR=/var/opt/csw/mysql5 DEFAULTS_FILE=$BASEDIR/my.cnf -SAVE_DEFAULTS_FILE=$BASEDIR/my.cnf +SAVE_DEFAULTS_FILE=$MYSQL_VAR/my.cnf MYSQLD_USER=mysql # # Provide a default data directory -MYSQLD_DATADIR=/var/opt/csw/mysql5 +MYSQLD_DATADIR=$MYSQL_VAR # echo -echo "This is the blastwave quick start script to setup a MySQL5 database" +echo "This is the start script to setup a MySQL-5 database" echo " directory." echo echo " The base directory is $BASEDIR." @@ -48,11 +51,11 @@ ` || exit $? if [ $usrin = "[default]" ]; then if [ ! -f "$DEFAULTS_FILE" ]; then - IN_DEFAULTS_FILE=$BASEDIR/share/mysql/my-small.cnf - echo "Using $IN_DEFAULTS_FILE to create the options file." + IN_DEFAULTS_FILE=$BASEDIR/share/mysql/my-small.cnf + echo "Using $IN_DEFAULTS_FILE to create the options file." else - IN_DEFAULTS_FILE=$DEFAULTS_FILE - echo "Using $DEFAULTS_FILE as the options file." + IN_DEFAULTS_FILE=$DEFAULTS_FILE + echo "Using $DEFAULTS_FILE as the options file." fi else IN_DEFAULTS_FILE=$usrin Property changes on: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw ___________________________________________________________________ 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 Fri Nov 6 11:57:57 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 06 Nov 2009 10:57:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[7142] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums Message-ID: Revision: 7142 http://gar.svn.sourceforge.net/gar/?rev=7142&view=rev Author: wahwah Date: 2009-11-06 10:57:56 +0000 (Fri, 06 Nov 2009) Log Message: ----------- mysql5-5.0.x: Submitting checksum for files with the Id tag Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-11-06 10:56:47 UTC (rev 7141) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-11-06 10:57:56 UTC (rev 7142) @@ -6,7 +6,7 @@ cc2a219abbe7dc6049775cff070a27a5 CSWmysql5.preinstall e691b0cf00a3925ac55c1844045d6e30 ChangeLog e42afb5ec1b1ab02d2ec3b46d0922636 README.CSW -33387959f9de060dc0af915c9c49bca8 cswmysql5 +aaca748fc044834e71ad544ab293c494 cswmysql5 67228e1f096fe08a94f4267439a4ec36 cswusergroup 671348f1a5b078da9ca76f97e1fda325 mysql-5.0.84.tar.gz -ca622220c7c3ab7427eb1604ddecded6 quick_start-csw +fe747c88f7e6bd6a9636ba8ef2e96871 quick_start-csw 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 Nov 6 13:52:23 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 06 Nov 2009 12:52:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7143] csw/mgar/pkg/doxygen/trunk Message-ID: Revision: 7143 http://gar.svn.sourceforge.net/gar/?rev=7143&view=rev Author: dmichelsen Date: 2009-11-06 12:52:23 +0000 (Fri, 06 Nov 2009) Log Message: ----------- doxygen: Add patch for Solaris iconv Modified Paths: -------------- csw/mgar/pkg/doxygen/trunk/Makefile csw/mgar/pkg/doxygen/trunk/checksums Added Paths: ----------- csw/mgar/pkg/doxygen/trunk/files/0001-Add-suggested-iconv-patch-from-bug-599128.patch Modified: csw/mgar/pkg/doxygen/trunk/Makefile =================================================================== --- csw/mgar/pkg/doxygen/trunk/Makefile 2009-11-06 10:57:56 UTC (rev 7142) +++ csw/mgar/pkg/doxygen/trunk/Makefile 2009-11-06 12:52:23 UTC (rev 7143) @@ -1,31 +1,3 @@ -# Todo (feel free to take over): -# - gmake docs segfaults, check why -# (related to libiconv? Might change with libiconv 1.13+) -# - platform makefile doesn't honor our CCFLAGS -# work/build-isa-i386/doxygen-1.5.9/tmake/lib/solaris-cc/tmake.conf -# results in: CC -c -O2 -I.. -# -# Adding members to index pages... -# Generating style sheet... -# Generating index page... -# Generating page index... -# Segmentation Fault - core dumped -# gmake[1]: *** [all] Error 139 -# gmake[1]: Leaving directory `/home/skayser/mgar/pkg/doxygen/trunk/work/build-isa-i386/doxygen-1.5.9/doc' -# -# $ pstack work/build-isa-i386/doxygen-1.5.9/doc/core -# core 'work/build-isa-i386/doxygen-1.5.9/doc/core' of 20317: /home/skayser/mgar/pkg/doxygen/trunk/work/build-isa-i386/doxygen-1.5.9 -# df945898 iconv (ffffffff, 80478d8, 80478d0, 80478dc, 80478d4) + 38 -# 083d2e52 portable_iconv (ffffffff, 80478d8, 80478d0, 80478dc, 80478d4) + 1a -# 081c1ec2 __1cIHtmlHelpGrecode6MrknIQdDCString__1_ (804790c, 8da4210, 8047910) + 6a -# 081c1fe6 __1cIHtmlHelpPaddContentsItem6Mbpkc222_v_ (8da4210, 0, 8de85a8, 0, 8de85c8, 0) + b2 -# 08198b75 __1cJIndexListHforeach4CbCpkcC2C2C2_6MmJIndexIntf_MTATBTCTDTE_v34567_v_ (85fa380, 81d2af4, 0, 0, 8de85a8, 0, 8de85c8, 0) + 99 -# 081ccec6 __1cOwritePageIndex6FrnKOutputList__v_ (8d97f50) + 372 -# 081920c3 __1cOgenerateOutput6F_v_ () + a27 -# 08169d11 main (1, 8047ad8, 8047ae0) + 2d -# 08169c56 _start () + 7a -# - GARNAME = doxygen GARVERSION = 1.6.1 CATEGORIES = utils @@ -38,6 +10,19 @@ MASTER_SITES = http://ftp.stack.nl/pub/users/dimitri/ DISTFILES = $(GARNAME)-$(GARVERSION).src.tar.gz + +# Patch taken from +# https://bugzilla.gnome.org/show_bug.cgi?id=599128 +PATCHFILES = 0001-Add-suggested-iconv-patch-from-bug-599128.patch + +PACKAGES = CSWdoxygen CSWdoxygendoc + +CATALOGNAME_CSWdoxygen = doxygen +CATALOGNAME_CSWdoxygendoc = doxygen_doc + +SPKG_DESC_CSWdoxygen = A documentation system for programming languages +SPKG_DESC_CSWdoxygendoc = doxygen documentation + SPKG_SOURCEURL = http://www.stack.nl/~dimitri/doxygen/ # We define upstream file regex so we can be notifed of new upstream software release @@ -46,21 +31,23 @@ PREREQUISITE_PKGS = CSWgraphviz2 -CONFIGURE_ARGS = $(subst =, ,$(filter --prefix=% , $(DIRPATHS))) -CONFIGURE_ARGS += --docdir $(docdir) +CONFIGURE_ARGS = --prefix $(prefix) +CONFIGURE_ARGS += --release +CONFIGURE_ARGS += --docdir $(docdir)/doxygen +CONFIGURE_ARGS += --dot /opt/csw/graphviz2/bin/dot CONFIGURE_ARGS += --platform solaris-cc -TEST_SCRIPTS = +TEST_SCRIPTS = +INSTALL_ARGS = install_docs + +PKGFILES_CSWdoxygendoc = $(PKGFILES_DOC) + include gar/category.mk # For 'dot' PATH := $(PATH):/opt/csw/graphviz2/bin post-extract-modulated: - perl -pi -e 'if (/^TMAKE_CXXFLAGS_RELEASE/) { \ - s|= .*|= $(filter-out -I/opt/csw/include, $(CXXFLAGS)) -norunpath|; }' \ - $(WORKSRC)/tmake/lib/solaris-cc/tmake.conf - perl -pi -e 'if (/^TMAKE_CFLAGS_DEBUG/) { s|= .*|= $(filter-out -I/opt/csw/include,$(CFLAGS))|; }' \ - $(WORKSRC)/tmake/lib/solaris-cc/tmake.conf + perl -pi -e ' s,(TMAKE_CFLAGS_RELEASE\s*=\s*)(.*),\1$(filter-out -I/opt/csw/include,$(CFLAGS)),; s,(TMAKE_CXXFLAGS_RELEASE\s*=\s*)(.*),\1$(filter-out -I/opt/csw/include,$(CXXFLAGS)) -norunpath,; ' $(WORKSRC)/tmake/lib/solaris-cc/tmake.conf @$(MAKECOOKIE) Modified: csw/mgar/pkg/doxygen/trunk/checksums =================================================================== --- csw/mgar/pkg/doxygen/trunk/checksums 2009-11-06 10:57:56 UTC (rev 7142) +++ csw/mgar/pkg/doxygen/trunk/checksums 2009-11-06 12:52:23 UTC (rev 7143) @@ -1 +1,2 @@ +699b5b642fe694d7f6f0d142e0394b4d 0001-Add-suggested-iconv-patch-from-bug-599128.patch 2ec343643e134f0d3ce2069420bcb4f0 doxygen-1.6.1.src.tar.gz Added: csw/mgar/pkg/doxygen/trunk/files/0001-Add-suggested-iconv-patch-from-bug-599128.patch =================================================================== --- csw/mgar/pkg/doxygen/trunk/files/0001-Add-suggested-iconv-patch-from-bug-599128.patch (rev 0) +++ csw/mgar/pkg/doxygen/trunk/files/0001-Add-suggested-iconv-patch-from-bug-599128.patch 2009-11-06 12:52:23 UTC (rev 7143) @@ -0,0 +1,25 @@ +From af9b36d8e00b4db23c2d5dfb5657cf12c269d296 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 6 Nov 2009 10:57:44 +0100 +Subject: [PATCH] Add suggested iconv patch from bug #599128 + +--- + src/htmlhelp.cpp | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/htmlhelp.cpp b/src/htmlhelp.cpp +index f120a93..7283eb9 100644 +--- a/src/htmlhelp.cpp ++++ b/src/htmlhelp.cpp +@@ -302,7 +302,7 @@ static QDict s_languageDict; + void HtmlHelp::initialize() + { + const char *str = Config_getString("CHM_INDEX_ENCODING"); +- if(!str) str = "Windows-1250"; ++ if(!str) str = "CP1250"; + m_fromUtf8 = portable_iconv_open(str,"UTF-8"); + + /* open the contents file */ +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Nov 6 14:18:25 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 06 Nov 2009 13:18:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7144] csw/mgar/pkg/wavpack/trunk Message-ID: Revision: 7144 http://gar.svn.sourceforge.net/gar/?rev=7144&view=rev Author: dmichelsen Date: 2009-11-06 13:18:25 +0000 (Fri, 06 Nov 2009) Log Message: ----------- wavpack: Add necessary patch Modified Paths: -------------- csw/mgar/pkg/wavpack/trunk/Makefile csw/mgar/pkg/wavpack/trunk/checksums Added Paths: ----------- csw/mgar/pkg/wavpack/trunk/files/0001-Add-support-for-Sun-Studio-compiler.patch Modified: csw/mgar/pkg/wavpack/trunk/Makefile =================================================================== --- csw/mgar/pkg/wavpack/trunk/Makefile 2009-11-06 12:52:23 UTC (rev 7143) +++ csw/mgar/pkg/wavpack/trunk/Makefile 2009-11-06 13:18:25 UTC (rev 7144) @@ -13,12 +13,19 @@ MASTER_SITES = http://www.wavpack.com/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +PATCHFILES += 0001-Add-support-for-Sun-Studio-compiler.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +REQUIRED_PKGS = CSWiconv + BUILD64 = 1 - +NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) +TEST_TARGET = check + +MERGE_DIRS_isa-extra = $(libdir) + include gar/category.mk Modified: csw/mgar/pkg/wavpack/trunk/checksums =================================================================== --- csw/mgar/pkg/wavpack/trunk/checksums 2009-11-06 12:52:23 UTC (rev 7143) +++ csw/mgar/pkg/wavpack/trunk/checksums 2009-11-06 13:18:25 UTC (rev 7144) @@ -1 +1,2 @@ +a8cbb0b205d3865731e359f24341bd7d 0001-Add-support-for-Sun-Studio-compiler.patch 722f90393b292cd1413e8af8250a3783 wavpack-4.60.0.tar.bz2 Added: csw/mgar/pkg/wavpack/trunk/files/0001-Add-support-for-Sun-Studio-compiler.patch =================================================================== --- csw/mgar/pkg/wavpack/trunk/files/0001-Add-support-for-Sun-Studio-compiler.patch (rev 0) +++ csw/mgar/pkg/wavpack/trunk/files/0001-Add-support-for-Sun-Studio-compiler.patch 2009-11-06 13:18:25 UTC (rev 7144) @@ -0,0 +1,48 @@ +From e4e9a2384beca0d8be8f2742ec5c9b6607b20f10 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 6 Nov 2009 13:49:55 +0100 +Subject: [PATCH] Add support for Sun Studio compiler + +--- + cli/utils.c | 4 ++-- + include/wavpack.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/cli/utils.c b/cli/utils.c +index 6094f52..442685b 100644 +--- a/cli/utils.c ++++ b/cli/utils.c +@@ -16,7 +16,7 @@ + #include + #include + #include +-#elif defined(__GNUC__) ++#elif defined(__GNUC__) || defined(__sun) + #include + #include + #endif +@@ -164,7 +164,7 @@ char *filespec_ext (char *filespec) + // returned. // + ////////////////////////////////////////////////////////////////////////////// + +-#if defined(__GNUC__) && !defined(WIN32) ++#if (defined(__GNUC__) || defined(__sun)) && !defined(WIN32) + + char *filespec_path (char *filespec) + { +diff --git a/include/wavpack.h b/include/wavpack.h +index d264bdc..92caa48 100644 +--- a/include/wavpack.h ++++ b/include/wavpack.h +@@ -33,7 +33,7 @@ typedef float float32_t; + + typedef unsigned char uchar; + +-#if !defined(__GNUC__) || defined(WIN32) ++#if (!defined(__GNUC__) && !defined(__sun)) || defined(WIN32) + typedef unsigned short ushort; + typedef unsigned int uint; + #endif +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Nov 6 14:56:34 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 06 Nov 2009 13:56:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[7145] csw/mgar/pkg/doxygen/trunk/Makefile Message-ID: Revision: 7145 http://gar.svn.sourceforge.net/gar/?rev=7145&view=rev Author: dmichelsen Date: 2009-11-06 13:56:34 +0000 (Fri, 06 Nov 2009) Log Message: ----------- doxygen: Relocate manpage to proper location Modified Paths: -------------- csw/mgar/pkg/doxygen/trunk/Makefile Modified: csw/mgar/pkg/doxygen/trunk/Makefile =================================================================== --- csw/mgar/pkg/doxygen/trunk/Makefile 2009-11-06 13:18:25 UTC (rev 7144) +++ csw/mgar/pkg/doxygen/trunk/Makefile 2009-11-06 13:56:34 UTC (rev 7145) @@ -41,6 +41,8 @@ INSTALL_ARGS = install_docs +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/man,.$(mandir),' + PKGFILES_CSWdoxygendoc = $(PKGFILES_DOC) 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 Fri Nov 6 15:01:38 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 06 Nov 2009 14:01:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[7146] csw/mgar/pkg/memcached/trunk Message-ID: Revision: 7146 http://gar.svn.sourceforge.net/gar/?rev=7146&view=rev Author: dmichelsen Date: 2009-11-06 14:01:38 +0000 (Fri, 06 Nov 2009) Log Message: ----------- memcached: Forward to latest working devel tag Modified Paths: -------------- csw/mgar/pkg/memcached/trunk/Makefile csw/mgar/pkg/memcached/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/memcached/trunk/files/CSWmemcached.depend csw/mgar/pkg/memcached/trunk/files/CSWmemcached.gspec csw/mgar/pkg/memcached/trunk/files/CSWmemcached.prototype csw/mgar/pkg/memcached/trunk/files/Makefile.in csw/mgar/pkg/memcached/trunk/files/daemon.c csw/mgar/pkg/memcached/trunk/files/daemon.h csw/mgar/pkg/memcached/trunk/files/memcached.c csw/mgar/pkg/memcached/trunk/files/memcached.h csw/mgar/pkg/memcached/trunk/files/solaris.diff Modified: csw/mgar/pkg/memcached/trunk/Makefile =================================================================== --- csw/mgar/pkg/memcached/trunk/Makefile 2009-11-06 13:56:34 UTC (rev 7145) +++ csw/mgar/pkg/memcached/trunk/Makefile 2009-11-06 14:01:38 UTC (rev 7146) @@ -1,31 +1,27 @@ GARNAME = memcached -GARVERSION = 1.2.2 +GARVERSION = 1.4.3_rc2_2_g8c0a108 CATEGORIES = net -DESCRIPTION = distributed memory object caching system +DESCRIPTION = Distributed memory object caching system define BLURB memcached is a high-performance, distributed memory object caching system, generic in nature, but intended for use in speeding up dynamic web applications by alleviating database load. endef -MASTER_SITES = http://www.danga.com/memcached/dist/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWmemcached,depend prototype) +MASTER_SITES = http://memcached.googlecode.com/files/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -GARCOMPILER = GNU +SPKG_SOURCEURL = http://www.danga.com/memcached/ -DEPENDS += lib/libevent +PREREQUISITE_PKGS = CSWlibevent-devel +REQUIRED_PKGS = CSWlibevent -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --disable-dependency-tracking -CONFIGURE_ARGS += --with-libevent=$(prefix) +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) -# No test suite -TEST_SCRIPTS = - include gar/category.mk Modified: csw/mgar/pkg/memcached/trunk/checksums =================================================================== --- csw/mgar/pkg/memcached/trunk/checksums 2009-11-06 13:56:34 UTC (rev 7145) +++ csw/mgar/pkg/memcached/trunk/checksums 2009-11-06 14:01:38 UTC (rev 7146) @@ -1,7 +1 @@ -a08851f7fa7b15e92ee6320b7a79c321 download/memcached-1.2.2.tar.gz -b8864491e6eba79a2af3e3b2ad7fae85 download/CSWmemcached.gspec -fb52e1653adbc7d07e97a42dac3bcfee download/CSWmemcached.depend -5625832835a8377d55ab5e5c8791d042 download/CSWmemcached.prototype -c6c43cc3c0da436ba55716d287e0ba44 download/daemon.c -51969a2161c429524dfe4ae1e8b11f7b download/daemon.h -365b8479afe297a36e1491b2500fba3a download/solaris.diff +a2f988a668317fc3cfd91b22b05ab929 memcached-1.4.3_rc2_2_g8c0a108.tar.gz Deleted: csw/mgar/pkg/memcached/trunk/files/CSWmemcached.depend =================================================================== --- csw/mgar/pkg/memcached/trunk/files/CSWmemcached.depend 2009-11-06 13:56:34 UTC (rev 7145) +++ csw/mgar/pkg/memcached/trunk/files/CSWmemcached.depend 2009-11-06 14:01:38 UTC (rev 7146) @@ -1 +0,0 @@ -P CSWlibevent libevent - event notification library Deleted: csw/mgar/pkg/memcached/trunk/files/CSWmemcached.gspec =================================================================== --- csw/mgar/pkg/memcached/trunk/files/CSWmemcached.gspec 2009-11-06 13:56:34 UTC (rev 7145) +++ csw/mgar/pkg/memcached/trunk/files/CSWmemcached.gspec 2009-11-06 14:01:38 UTC (rev 7146) @@ -1,4 +0,0 @@ -%var bitname memcached -%var pkgname CSWmemcached -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/memcached/trunk/files/CSWmemcached.prototype =================================================================== --- csw/mgar/pkg/memcached/trunk/files/CSWmemcached.prototype 2009-11-06 13:56:34 UTC (rev 7145) +++ csw/mgar/pkg/memcached/trunk/files/CSWmemcached.prototype 2009-11-06 14:01:38 UTC (rev 7146) @@ -1,6 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/memcached 0755 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/memcached.1 0644 root bin Deleted: csw/mgar/pkg/memcached/trunk/files/Makefile.in =================================================================== --- csw/mgar/pkg/memcached/trunk/files/Makefile.in 2009-11-06 13:56:34 UTC (rev 7145) +++ csw/mgar/pkg/memcached/trunk/files/Makefile.in 2009-11-06 14:01:38 UTC (rev 7146) @@ -1,446 +0,0 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = - -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = . - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_alias = @build_alias@ -build_triplet = @build@ -host_alias = @host_alias@ -host_triplet = @host@ -target_alias = @target_alias@ -target_triplet = @target@ -CC = @CC@ -HAVE_LIB = @HAVE_LIB@ -LIB = @LIB@ -LTLIB = @LTLIB@ -MAKEINFO = @MAKEINFO@ -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - -bin_PROGRAMS = memcached - -memcached_SOURCES = memcached.c slabs.c items.c memcached.h assoc.c daemon.c - -SUBDIRS = doc -DIST_DIRS = scripts -EXTRA_DIST = doc scripts TODO - -AM_CFLAGS = -DNDEBUG -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = -PROGRAMS = $(bin_PROGRAMS) - - -DEFS = @DEFS@ -I. -I$(srcdir) -I. -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ -lsocket -lresolv -lmalloc -memcached_OBJECTS = memcached.o slabs.o items.o assoc.o daemon.o -memcached_LDADD = $(LDADD) -memcached_DEPENDENCIES = -memcached_LDFLAGS = -CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \ -Makefile.am Makefile.in NEWS TODO aclocal.m4 config.guess config.h.in \ -config.sub configure configure.ac install-sh missing mkinstalldirs - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -SOURCES = $(memcached_SOURCES) -OBJECTS = $(memcached_OBJECTS) - -all: all-redirect -.SUFFIXES: -.SUFFIXES: .S .c .o .s -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status - -$(ACLOCAL_M4): configure.ac - cd $(srcdir) && $(ACLOCAL) - -config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck -$(srcdir)/configure: $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) - cd $(srcdir) && $(AUTOCONF) - -config.h: stamp-h - @if test ! -f $@; then \ - rm -f stamp-h; \ - $(MAKE) stamp-h; \ - else :; fi -stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES= CONFIG_HEADERS=config.h \ - $(SHELL) ./config.status - @echo timestamp > stamp-h 2> /dev/null -$(srcdir)/config.h.in: $(srcdir)/stamp-h.in - @if test ! -f $@; then \ - rm -f $(srcdir)/stamp-h.in; \ - $(MAKE) $(srcdir)/stamp-h.in; \ - else :; fi -$(srcdir)/stamp-h.in: $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOHEADER) - @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null - -mostlyclean-hdr: - -clean-hdr: - -distclean-hdr: - -rm -f config.h - -maintainer-clean-hdr: - -mostlyclean-binPROGRAMS: - -clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) - -distclean-binPROGRAMS: - -maintainer-clean-binPROGRAMS: - -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ - else :; fi; \ - done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - list='$(bin_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ - done - -.c.o: - $(COMPILE) -c $< - -.s.o: - $(COMPILE) -c $< - -.S.o: - $(COMPILE) -c $< - -mostlyclean-compile: - -rm -f *.o core *.core - -clean-compile: - -distclean-compile: - -rm -f *.tab.c - -maintainer-clean-compile: - -memcached: $(memcached_OBJECTS) $(memcached_DEPENDENCIES) - @rm -f memcached - $(LINK) $(memcached_LDFLAGS) $(memcached_OBJECTS) $(memcached_LDADD) $(LIBS) - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. - - at SET_MAKE@ - -all-recursive install-data-recursive install-exec-recursive \ -installdirs-recursive install-recursive uninstall-recursive \ -check-recursive installcheck-recursive info-recursive dvi-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ - rev="$$subdir $$rev"; \ - test "$$subdir" != "." || dot_seen=yes; \ - done; \ - test "$$dot_seen" = "no" && rev=". $$rev"; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done - -tags: TAGS - -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) - -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP)) - -mostlyclean-tags: - -clean-tags: - -distclean-tags: - -rm -f TAGS ID - -maintainer-clean-tags: - -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) - -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - -rm -rf $(distdir) - GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz - mkdir $(distdir)/=build - mkdir $(distdir)/=inst - dc_install_base=`cd $(distdir)/=inst && pwd`; \ - cd $(distdir)/=build \ - && ../configure --srcdir=.. --prefix=$$dc_install_base \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) dist - -rm -rf $(distdir) - @banner="$(distdir).tar.gz is ready for distribution"; \ - dashes=`echo "$$banner" | sed s/./=/g`; \ - echo "$$dashes"; \ - echo "$$banner"; \ - echo "$$dashes" -dist: distdir - -chmod -R a+r $(distdir) - GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) - -rm -rf $(distdir) -dist-all: distdir - -chmod -R a+r $(distdir) - GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) - -rm -rf $(distdir) -distdir: $(DISTFILES) - -rm -rf $(distdir) - mkdir $(distdir) - -chmod 777 $(distdir) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done - for subdir in $(SUBDIRS); do \ - if test "$$subdir" = .; then :; else \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ - || exit 1; \ - fi; \ - done -assoc.o: assoc.c memcached.h -items.o: items.c memcached.h -memcached.o: memcached.c config.h memcached.h -slabs.o: slabs.c memcached.h - -info-am: -info: info-recursive -dvi-am: -dvi: dvi-recursive -check-am: all-am -check: check-recursive -installcheck-am: -installcheck: installcheck-recursive -all-recursive-am: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - -install-exec-am: install-binPROGRAMS -install-exec: install-exec-recursive - -install-data-am: -install-data: install-data-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-recursive -uninstall-am: uninstall-binPROGRAMS -uninstall: uninstall-recursive -all-am: Makefile $(PROGRAMS) config.h -all-redirect: all-recursive-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: installdirs-recursive -installdirs-am: - $(mkinstalldirs) $(DESTDIR)$(bindir) - - -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-hdr mostlyclean-binPROGRAMS \ - mostlyclean-compile mostlyclean-tags \ - mostlyclean-generic - -mostlyclean: mostlyclean-recursive - -clean-am: clean-hdr clean-binPROGRAMS clean-compile clean-tags \ - clean-generic mostlyclean-am - -clean: clean-recursive - -distclean-am: distclean-hdr distclean-binPROGRAMS distclean-compile \ - distclean-tags distclean-generic clean-am - -distclean: distclean-recursive - -rm -f config.status - -maintainer-clean-am: maintainer-clean-hdr maintainer-clean-binPROGRAMS \ - maintainer-clean-compile maintainer-clean-tags \ - maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-recursive - -rm -f config.status - -.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ -mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ -maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ -mostlyclean-compile distclean-compile clean-compile \ -maintainer-clean-compile install-data-recursive \ -uninstall-data-recursive install-exec-recursive \ -uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ -all-recursive check-recursive installcheck-recursive info-recursive \ -dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ -maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \ -install-exec-am install-exec install-data-am install-data install-am \ -install uninstall-am uninstall all-redirect all-am all installdirs-am \ -installdirs mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: Deleted: csw/mgar/pkg/memcached/trunk/files/daemon.c =================================================================== --- csw/mgar/pkg/memcached/trunk/files/daemon.c 2009-11-06 13:56:34 UTC (rev 7145) +++ csw/mgar/pkg/memcached/trunk/files/daemon.c 2009-11-06 14:01:38 UTC (rev 7146) @@ -1,89 +0,0 @@ -/*- - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include -#include -#include - -#ifndef HAVE_DAEMON - -#if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: daemon.c,v 1.2 1996/08/19 08:22:13 tholo Exp $"; -#endif /* LIBC_SCCS and not lint */ - -int -daemon(nochdir, noclose) - int nochdir, noclose; -{ - int fd; - - switch (fork()) { - case -1: - return (-1); - case 0: -#ifdef HAVE_CYGWIN - register_9x_service(); -#endif - break; - default: -#ifdef HAVE_CYGWIN - /* - * This sleep avoids a race condition which kills the - * child process if parent is started by a NT/W2K service. - */ - sleep(1); -#endif - _exit(0); - } - - if (setsid() == -1) - return (-1); - - if (!nochdir) - (void)chdir("/"); - - if (!noclose && (fd = open("/dev/null", O_RDWR, 0)) != -1) { - (void)dup2(fd, STDIN_FILENO); - (void)dup2(fd, STDOUT_FILENO); - (void)dup2(fd, STDERR_FILENO); - if (fd > 2) - (void)close (fd); - } - return (0); -} - -#endif /* !HAVE_DAEMON */ - - -#pragma ident "@(#)daemon.c 1.4 03/11/19 SMI" Deleted: csw/mgar/pkg/memcached/trunk/files/daemon.h =================================================================== --- csw/mgar/pkg/memcached/trunk/files/daemon.h 2009-11-06 13:56:34 UTC (rev 7145) +++ csw/mgar/pkg/memcached/trunk/files/daemon.h 2009-11-06 14:01:38 UTC (rev 7146) @@ -1,4 +0,0 @@ -#ifndef _DAEMON_H -#define _DAEMON_H -int daemon(int, int); -#endif /* _DAEMON_H */ Deleted: csw/mgar/pkg/memcached/trunk/files/memcached.c =================================================================== --- csw/mgar/pkg/memcached/trunk/files/memcached.c 2009-11-06 13:56:34 UTC (rev 7145) +++ csw/mgar/pkg/memcached/trunk/files/memcached.c 2009-11-06 14:01:38 UTC (rev 7146) @@ -1,1553 +0,0 @@ -/* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -/* - * memcached - memory caching daemon - * - * http://www.danga.com/memcached/ - * - * Copyright 2003 Danga Interactive, Inc. All rights reserved. - * - * Use and distribution licensed under the BSD license. See - * the LICENSE file for full text. - * - * Authors: - * Anatoly Vorobey - * Brad Fitzpatrick - * - * $Id: memcached.c,v 1.56 2005/04/05 00:10:26 bradfitz Exp $ - */ - -#include "daemon.h" -#include "config.h" -#include -#include -#include -#include -#include -#include -#include -/* some POSIX systems need the following definition - * to get mlockall flags out of sys/mman.h. */ -#ifndef _P1003_1B_VISIBLE -#define _P1003_1B_VISIBLE -#endif -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef HAVE_MALLOC_H -#include -#endif - -#include "memcached.h" - -struct stats stats; -struct settings settings; - -static item **todelete = 0; -static int delcurr; -static int deltotal; - -time_t realtime(time_t exptime) { - time_t now; - - /* no. of seconds in 30 days - largest possible delta exptime */ - #define REALTIME_MAXDELTA 60*60*24*30 - - if (exptime == 0) return 0; /* 0 means never expire */ - - if (exptime > REALTIME_MAXDELTA) - return exptime; - else { - now = time(0); - return exptime + now; - } -} - -void stats_init(void) { - stats.curr_items = stats.total_items = stats.curr_conns = stats.total_conns = stats.conn_structs = 0; - stats.get_cmds = stats.set_cmds = stats.get_hits = stats.get_misses = 0; - stats.curr_bytes = stats.bytes_read = stats.bytes_written = 0; - stats.started = time(0); -} - -void stats_reset(void) { - stats.total_items = stats.total_conns = 0; - stats.get_cmds = stats.set_cmds = stats.get_hits = stats.get_misses = 0; - stats.bytes_read = stats.bytes_written = 0; -} - -void settings_init(void) { - settings.port = 11211; - settings.interface.s_addr = htonl(INADDR_ANY); - settings.maxbytes = 64*1024*1024; /* default is 64MB */ - settings.maxconns = 1024; /* to limit connections-related memory to about 5MB */ - settings.verbose = 0; - settings.oldest_live = 0; - settings.evict_to_free = 1; /* push old items out of cache when memory runs out */ -} - -conn **freeconns; -int freetotal; -int freecurr; - -void set_cork (conn *c, int val) { - if (c->is_corked == val) return; - c->is_corked = val; -#ifdef TCP_NOPUSH - setsockopt(c->sfd, IPPROTO_TCP, TCP_NOPUSH, &val, sizeof(val)); -#endif -} - -void conn_init(void) { - freetotal = 200; - freecurr = 0; - freeconns = (conn **)malloc(sizeof (conn *)*freetotal); - return; -} - -conn *conn_new(int sfd, int init_state, int event_flags) { - conn *c; - - /* do we have a free conn structure from a previous close? */ - if (freecurr > 0) { - c = freeconns[--freecurr]; - } else { /* allocate a new one */ - if (!(c = (conn *)malloc(sizeof(conn)))) { - perror("malloc()"); - return 0; - } - c->rbuf = c->wbuf = 0; - c->ilist = 0; - - c->rbuf = (char *) malloc(DATA_BUFFER_SIZE); - c->wbuf = (char *) malloc(DATA_BUFFER_SIZE); - c->ilist = (item **) malloc(sizeof(item *)*200); - - if (c->rbuf == 0 || c->wbuf == 0 || c->ilist == 0) { - if (c->rbuf != 0) free(c->rbuf); - if (c->wbuf != 0) free(c->wbuf); - if (c->ilist !=0) free(c->ilist); - free(c); - perror("malloc()"); - return 0; - } - c->rsize = c->wsize = DATA_BUFFER_SIZE; - c->isize = 200; - stats.conn_structs++; - } - - if (settings.verbose > 1) { - if (init_state == conn_listening) - fprintf(stderr, "<%d server listening\n", sfd); - else - fprintf(stderr, "<%d new client connection\n", sfd); - } - - c->sfd = sfd; - c->state = init_state; - c->rlbytes = 0; - c->rbytes = c->wbytes = 0; - c->wcurr = c->wbuf; - c->rcurr = c->rbuf; - c->icurr = c->ilist; - c->ileft = 0; - c->iptr = c->ibuf; - c->ibytes = 0; - - c->write_and_go = conn_read; - c->write_and_free = 0; - c->item = 0; - - c->is_corked = 0; - - event_set(&c->event, sfd, event_flags, event_handler, (void *)c); - c->ev_flags = event_flags; - - if (event_add(&c->event, 0) == -1) { - if (freecurr < freetotal) { - freeconns[freecurr++] = c; - } else { - free (c->rbuf); - free (c->wbuf); - free (c->ilist); - free (c); - } - return 0; - } - - stats.curr_conns++; - stats.total_conns++; - - return c; -} - -void conn_close(conn *c) { - /* delete the event, the socket and the conn */ - event_del(&c->event); - - if (settings.verbose > 1) - fprintf(stderr, "<%d connection closed.\n", c->sfd); - - close(c->sfd); - - if (c->item) { - item_free(c->item); - } - - if (c->ileft) { - for (; c->ileft > 0; c->ileft--,c->icurr++) { - item_remove(*(c->icurr)); - } - } - - if (c->write_and_free) { - free(c->write_and_free); - } - - /* if we have enough space in the free connections array, put the structure there */ - if (freecurr < freetotal) { - freeconns[freecurr++] = c; - } else { - /* try to enlarge free connections array */ - conn **new_freeconns = realloc(freeconns, sizeof(conn *)*freetotal*2); - if (new_freeconns) { - freetotal *= 2; - freeconns = new_freeconns; - freeconns[freecurr++] = c; - } else { - free(c->rbuf); - free(c->wbuf); - free(c->ilist); - free(c); - } - } - - stats.curr_conns--; - - return; -} - -void out_string(conn *c, char *str) { - int len; - - if (settings.verbose > 1) - fprintf(stderr, ">%d %s\n", c->sfd, str); - - len = strlen(str); - if (len + 2 > c->wsize) { - /* ought to be always enough. just fail for simplicity */ - str = "SERVER_ERROR output line too long"; - len = strlen(str); - } - - strcpy(c->wbuf, str); - strcat(c->wbuf, "\r\n"); - c->wbytes = len + 2; - c->wcurr = c->wbuf; - - c->state = conn_write; - c->write_and_go = conn_read; - return; -} - -/* - * we get here after reading the value in set/add/replace commands. The command - * has been stored in c->item_comm, and the item is ready in c->item. - */ - -void complete_nread(conn *c) { - item *it = c->item; - int comm = c->item_comm; - item *old_it; - time_t now = time(0); - - stats.set_cmds++; - - while(1) { - if (strncmp(ITEM_data(it) + it->nbytes - 2, "\r\n", 2) != 0) { - out_string(c, "CLIENT_ERROR bad data chunk"); - break; - } - - old_it = assoc_find(ITEM_key(it)); - - if (old_it && settings.oldest_live && - old_it->time <= settings.oldest_live) { - item_unlink(old_it); - old_it = 0; - } - - if (old_it && old_it->exptime && old_it->exptime < now) { - item_unlink(old_it); - old_it = 0; - } - - if (old_it && comm==NREAD_ADD) { - item_update(old_it); - out_string(c, "NOT_STORED"); - break; - } - - if (!old_it && comm == NREAD_REPLACE) { - out_string(c, "NOT_STORED"); - break; - } - - if (old_it && (old_it->it_flags & ITEM_DELETED) && (comm == NREAD_REPLACE || comm == NREAD_ADD)) { - out_string(c, "NOT_STORED"); - break; - } - - if (old_it) { - item_replace(old_it, it); - } else item_link(it); - - c->item = 0; - out_string(c, "STORED"); - return; - } - - item_free(it); - c->item = 0; - return; -} - -void process_stat(conn *c, char *command) { - time_t now = time(0); - - if (strcmp(command, "stats") == 0) { - char temp[1024]; - pid_t pid = getpid(); - char *pos = temp; - struct rusage usage; - - getrusage(RUSAGE_SELF, &usage); - - pos += sprintf(pos, "STAT pid %u\r\n", pid); - pos += sprintf(pos, "STAT uptime %lu\r\n", now - stats.started); - pos += sprintf(pos, "STAT time %ld\r\n", now); - pos += sprintf(pos, "STAT version " VERSION "\r\n"); - pos += sprintf(pos, "STAT rusage_user %ld.%06ld\r\n", usage.ru_utime.tv_sec, usage.ru_utime.tv_usec); - pos += sprintf(pos, "STAT rusage_system %ld.%06ld\r\n", usage.ru_stime.tv_sec, usage.ru_stime.tv_usec); - pos += sprintf(pos, "STAT curr_items %u\r\n", stats.curr_items); - pos += sprintf(pos, "STAT total_items %u\r\n", stats.total_items); - pos += sprintf(pos, "STAT bytes %llu\r\n", stats.curr_bytes); - pos += sprintf(pos, "STAT curr_connections %u\r\n", stats.curr_conns - 1); /* ignore listening conn */ - pos += sprintf(pos, "STAT total_connections %u\r\n", stats.total_conns); - pos += sprintf(pos, "STAT connection_structures %u\r\n", stats.conn_structs); - pos += sprintf(pos, "STAT cmd_get %u\r\n", stats.get_cmds); - pos += sprintf(pos, "STAT cmd_set %u\r\n", stats.set_cmds); - pos += sprintf(pos, "STAT get_hits %u\r\n", stats.get_hits); - pos += sprintf(pos, "STAT get_misses %u\r\n", stats.get_misses); - pos += sprintf(pos, "STAT bytes_read %llu\r\n", stats.bytes_read); - pos += sprintf(pos, "STAT bytes_written %llu\r\n", stats.bytes_written); - pos += sprintf(pos, "STAT limit_maxbytes %u\r\n", settings.maxbytes); - pos += sprintf(pos, "END"); - out_string(c, temp); - return; - } - - if (strcmp(command, "stats reset") == 0) { - stats_reset(); - out_string(c, "RESET"); - return; - } - -#ifdef HAVE_MALLOC_H -#ifdef HAVE_STRUCT_MALLINFO - if (strcmp(command, "stats malloc") == 0) { - char temp[512]; - struct mallinfo info; - char *pos = temp; - - info = mallinfo(); - pos += sprintf(pos, "STAT arena_size %d\r\n", info.arena); - pos += sprintf(pos, "STAT free_chunks %d\r\n", info.ordblks); - pos += sprintf(pos, "STAT fastbin_blocks %d\r\n", info.smblks); - pos += sprintf(pos, "STAT mmapped_regions %d\r\n", info.hblks); - pos += sprintf(pos, "STAT mmapped_space %d\r\n", info.hblkhd); - pos += sprintf(pos, "STAT max_total_alloc %d\r\n", info.usmblks); - pos += sprintf(pos, "STAT fastbin_space %d\r\n", info.fsmblks); - pos += sprintf(pos, "STAT total_alloc %d\r\n", info.uordblks); - pos += sprintf(pos, "STAT total_free %d\r\n", info.fordblks); - pos += sprintf(pos, "STAT releasable_space %d\r\nEND", info.keepcost); - out_string(c, temp); - return; - } -#endif /* HAVE_STRUCT_MALLINFO */ -#endif /* HAVE_MALLOC_H */ - - if (strcmp(command, "stats maps") == 0) { - char *wbuf; - int wsize = 8192; /* should be enough */ - int fd; - int res; - - wbuf = (char *)malloc(wsize); - if (wbuf == 0) { - out_string(c, "SERVER_ERROR out of memory"); - return; - } - - fd = open("/proc/self/maps", O_RDONLY); - if (fd == -1) { - out_string(c, "SERVER_ERROR cannot open the maps file"); - free(wbuf); - return; - } - - res = read(fd, wbuf, wsize - 6); /* 6 = END\r\n\0 */ - if (res == wsize - 6) { - out_string(c, "SERVER_ERROR buffer overflow"); - free(wbuf); close(fd); - return; - } - if (res == 0 || res == -1) { - out_string(c, "SERVER_ERROR can't read the maps file"); - free(wbuf); close(fd); - return; - } - strcpy(wbuf + res, "END\r\n"); - c->write_and_free=wbuf; - c->wcurr=wbuf; - c->wbytes = res + 6; - c->state = conn_write; - c->write_and_go = conn_read; - close(fd); - return; - } - - if (strncmp(command, "stats cachedump", 15) == 0) { - char *buf; - unsigned int bytes, id, limit = 0; - char *start = command + 15; - if (sscanf(start, "%u %u\r\n", &id, &limit) < 1) { - out_string(c, "CLIENT_ERROR bad command line"); - return; - } - - buf = item_cachedump(id, limit, &bytes); - if (buf == 0) { - out_string(c, "SERVER_ERROR out of memory"); - return; - } - - c->write_and_free = buf; - c->wcurr = buf; - c->wbytes = bytes; - c->state = conn_write; - c->write_and_go = conn_read; - return; - } - - if (strcmp(command, "stats slabs")==0) { - int bytes = 0; - char *buf = slabs_stats(&bytes); - if (!buf) { - out_string(c, "SERVER_ERROR out of memory"); - return; - } - c->write_and_free = buf; - c->wcurr = buf; - c->wbytes = bytes; - c->state = conn_write; - c->write_and_go = conn_read; - return; - } - - if (strcmp(command, "stats items")==0) { - char buffer[4096]; - item_stats(buffer, 4096); - out_string(c, buffer); - return; - } - - if (strcmp(command, "stats sizes")==0) { - int bytes = 0; - char *buf = item_stats_sizes(&bytes); - if (! buf) { - out_string(c, "SERVER_ERROR out of memory"); - return; - } - - c->write_and_free = buf; - c->wcurr = buf; - c->wbytes = bytes; - c->state = conn_write; - c->write_and_go = conn_read; - return; - } - - out_string(c, "ERROR"); -} - -void process_command(conn *c, char *command) { - - int comm = 0; - int incr = 0; - - /* - * for commands set/add/replace, we build an item and read the data - * directly into it, then continue in nread_complete(). - */ - - if (settings.verbose > 1) - fprintf(stderr, "<%d %s\n", c->sfd, command); - - /* All incoming commands will require a response, so we cork at the beginning, - and uncork at the very end (usually by means of out_string) */ - set_cork(c, 1); - - if ((strncmp(command, "add ", 4) == 0 && (comm = NREAD_ADD)) || - (strncmp(command, "set ", 4) == 0 && (comm = NREAD_SET)) || - (strncmp(command, "replace ", 8) == 0 && (comm = NREAD_REPLACE))) { - - char key[251]; - int flags; - time_t expire; - int len, res; - item *it; - - res = sscanf(command, "%*s %250s %u %ld %d\n", key, &flags, &expire, &len); - if (res!=4 || strlen(key)==0 ) { - out_string(c, "CLIENT_ERROR bad command line format"); - return; - } - expire = realtime(expire); - it = item_alloc(key, flags, expire, len+2); - if (it == 0) { - out_string(c, "SERVER_ERROR out of memory"); - /* swallow the data line */ - c->write_and_go = conn_swallow; - c->sbytes = len+2; - return; - } - - c->item_comm = comm; - c->item = it; - c->rcurr = ITEM_data(it); - c->rlbytes = it->nbytes; - c->state = conn_nread; - return; - } - - if ((strncmp(command, "incr ", 5) == 0 && (incr = 1)) || - (strncmp(command, "decr ", 5) == 0)) { - char temp[32]; - unsigned int value; - item *it; - unsigned int delta; - char key[251]; - int res; - char *ptr; - time_t now = time(0); - - res = sscanf(command, "%*s %250s %u\n", key, &delta); - if (res!=2 || strlen(key)==0 ) { - out_string(c, "CLIENT_ERROR bad command line format"); - return; - } - - it = assoc_find(key); - if (it && (it->it_flags & ITEM_DELETED)) { - it = 0; - } - if (it && it->exptime && it->exptime < now) { - item_unlink(it); - it = 0; - } - - if (!it) { - out_string(c, "NOT_FOUND"); - return; - } - - ptr = ITEM_data(it); - while (*ptr && (*ptr<'0' && *ptr>'9')) ptr++; - - value = atoi(ptr); - - if (incr) - value+=delta; - else { - if (delta >= value) value = 0; - else value-=delta; - } - - sprintf(temp, "%u", value); - res = strlen(temp); - if (res + 2 > it->nbytes) { /* need to realloc */ - item *new_it; - new_it = item_alloc(ITEM_key(it), it->flags, it->exptime, res + 2 ); - if (new_it == 0) { - out_string(c, "SERVER_ERROR out of memory"); - return; - } - memcpy(ITEM_data(new_it), temp, res); - memcpy(ITEM_data(new_it) + res, "\r\n", 2); - item_replace(it, new_it); - } else { /* replace in-place */ - memcpy(ITEM_data(it), temp, res); - memset(ITEM_data(it) + res, ' ', it->nbytes-res-2); - } - out_string(c, temp); - return; - } - - if (strncmp(command, "get ", 4) == 0) { - - char *start = command + 4; - char key[251]; - int next; - int i = 0; - item *it; - time_t now = time(0); - - while(sscanf(start, " %250s%n", key, &next) >= 1) { - start+=next; - stats.get_cmds++; - it = assoc_find(key); - if (it && (it->it_flags & ITEM_DELETED)) { - it = 0; - } - if (settings.oldest_live && it && - it->time <= settings.oldest_live) { - item_unlink(it); - it = 0; - } - if (it && it->exptime && it->exptime < now) { - item_unlink(it); - it = 0; - } - - if (it) { - if (i >= c->isize) { - item **new_list = realloc(c->ilist, sizeof(item *)*c->isize*2); - if (new_list) { - c->isize *= 2; - c->ilist = new_list; - } else break; - } - stats.get_hits++; - it->refcount++; - item_update(it); - *(c->ilist + i) = it; - i++; - } else stats.get_misses++; - } - c->icurr = c->ilist; - c->ileft = i; - if (c->ileft) { - c->ipart = 0; - c->state = conn_mwrite; - c->ibytes = 0; - return; - } else { - out_string(c, "END"); - return; - } - } - - if (strncmp(command, "delete ", 7) == 0) { - char key[251]; - item *it; - int res; - time_t exptime = 0; - - res = sscanf(command, "%*s %250s %ld", key, &exptime); - it = assoc_find(key); - if (!it) { - out_string(c, "NOT_FOUND"); - return; - } - - if (exptime == 0) { - item_unlink(it); - out_string(c, "DELETED"); - return; - } - - if (delcurr >= deltotal) { - item **new_delete = realloc(todelete, sizeof(item *) * deltotal * 2); - if (new_delete) { - todelete = new_delete; - deltotal *= 2; - } else { - /* - * can't delete it immediately, user wants a delay, - * but we ran out of memory for the delete queue - */ - out_string(c, "SERVER_ERROR out of memory"); - return; - } - } - - exptime = realtime(exptime); - - it->refcount++; - /* use its expiration time as its deletion time now */ - it->exptime = exptime; - it->it_flags |= ITEM_DELETED; - todelete[delcurr++] = it; - out_string(c, "DELETED"); - return; - } - - if (strncmp(command, "stats", 5) == 0) { - process_stat(c, command); - return; - } - - if (strcmp(command, "flush_all") == 0) { - settings.oldest_live = time(0); - out_string(c, "OK"); - return; - } - - if (strcmp(command, "version") == 0) { - out_string(c, "VERSION " VERSION); - return; - } - - if (strcmp(command, "quit") == 0) { - c->state = conn_closing; - return; - } - - if (strncmp(command, "slabs reassign ", 15) == 0) { - int src, dst; - char *start = command+15; - if (sscanf(start, "%u %u\r\n", &src, &dst) == 2) { - int rv = slabs_reassign(src, dst); - if (rv == 1) { - out_string(c, "DONE"); - return; - } - if (rv == 0) { - out_string(c, "CANT"); - return; - } - if (rv == -1) { - out_string(c, "BUSY"); - return; - } - } - out_string(c, "CLIENT_ERROR bogus command"); - return; - } - - out_string(c, "ERROR"); - return; -} - -/* - * if we have a complete line in the buffer, process it and move whatever - * remains in the buffer to its beginning. - */ -int try_read_command(conn *c) { - char *el, *cont; - - if (!c->rbytes) - return 0; - el = memchr(c->rbuf, '\n', c->rbytes); - if (!el) - return 0; - cont = el + 1; - if (el - c->rbuf > 1 && *(el - 1) == '\r') { - el--; - } - *el = '\0'; - - process_command(c, c->rbuf); - - if (cont - c->rbuf < c->rbytes) { /* more stuff in the buffer */ - memmove(c->rbuf, cont, c->rbytes - (cont - c->rbuf)); - } - c->rbytes -= (cont - c->rbuf); - return 1; -} - -/* - * read from network as much as we can, handle buffer overflow and connection - * close. - * return 0 if there's nothing to read on the first read. - */ -int try_read_network(conn *c) { - int gotdata = 0; - int res; - while (1) { - if (c->rbytes >= c->rsize) { - char *new_rbuf = realloc(c->rbuf, c->rsize*2); - if (!new_rbuf) { - if (settings.verbose > 0) - fprintf(stderr, "Couldn't realloc input buffer\n"); - c->rbytes = 0; /* ignore what we read */ - out_string(c, "SERVER_ERROR out of memory"); - c->write_and_go = conn_closing; - return 1; - } - c->rbuf = new_rbuf; c->rsize *= 2; - } - res = read(c->sfd, c->rbuf + c->rbytes, c->rsize - c->rbytes); - if (res > 0) { - stats.bytes_read += res; - gotdata = 1; - c->rbytes += res; - continue; - } - if (res == 0) { - /* connection closed */ - c->state = conn_closing; - return 1; - } - if (res == -1) { - if (errno == EAGAIN || errno == EWOULDBLOCK) break; - else return 0; - } - } - return gotdata; -} - -int update_event(conn *c, int new_flags) { - if (c->ev_flags == new_flags) - return 1; - if (event_del(&c->event) == -1) return 0; - event_set(&c->event, c->sfd, new_flags, event_handler, (void *)c); - c->ev_flags = new_flags; - if (event_add(&c->event, 0) == -1) return 0; - return 1; -} - -void drive_machine(conn *c) { - - int exit = 0; - int sfd, flags = 1; - socklen_t addrlen; - struct sockaddr addr; - conn *newc; - int res; - - while (!exit) { - /* printf("state %d\n", c->state);*/ - switch(c->state) { - case conn_listening: - addrlen = sizeof(addr); - if ((sfd = accept(c->sfd, &addr, &addrlen)) == -1) { - if (errno == EAGAIN || errno == EWOULDBLOCK) { - exit = 1; - break; - } else { - perror("accept()"); - } - break; - } - if ((flags = fcntl(sfd, F_GETFL, 0)) < 0 || - fcntl(sfd, F_SETFL, flags | O_NONBLOCK) < 0) { - perror("setting O_NONBLOCK"); - close(sfd); - break; - } - newc = conn_new(sfd, conn_read, EV_READ | EV_PERSIST); - if (!newc) { - if (settings.verbose > 0) - fprintf(stderr, "couldn't create new connection\n"); - close(sfd); - break; - } - - break; - - case conn_read: - if (try_read_command(c)) { - continue; - } - if (try_read_network(c)) { - continue; - } - /* we have no command line and no data to read from network */ - if (!update_event(c, EV_READ | EV_PERSIST)) { - if (settings.verbose > 0) - fprintf(stderr, "Couldn't update event\n"); - c->state = conn_closing; - break; - } - exit = 1; - break; - - case conn_nread: - /* we are reading rlbytes into rcurr; */ - if (c->rlbytes == 0) { - complete_nread(c); - break; - } - /* first check if we have leftovers in the conn_read buffer */ - if (c->rbytes > 0) { - int tocopy = c->rbytes > c->rlbytes ? c->rlbytes : c->rbytes; - memcpy(c->rcurr, c->rbuf, tocopy); - c->rcurr += tocopy; - c->rlbytes -= tocopy; - if (c->rbytes > tocopy) { - memmove(c->rbuf, c->rbuf+tocopy, c->rbytes - tocopy); - } - c->rbytes -= tocopy; - break; - } - - /* now try reading from the socket */ - res = read(c->sfd, c->rcurr, c->rlbytes); - if (res > 0) { - stats.bytes_read += res; - c->rcurr += res; - c->rlbytes -= res; - break; - } - if (res == 0) { /* end of stream */ - c->state = conn_closing; - break; - } - if (res == -1 && (errno == EAGAIN || errno == EWOULDBLOCK)) { - if (!update_event(c, EV_READ | EV_PERSIST)) { - if (settings.verbose > 0) - fprintf(stderr, "Couldn't update event\n"); - c->state = conn_closing; - break; - } - exit = 1; - break; - } - /* otherwise we have a real error, on which we close the connection */ - if (settings.verbose > 0) - fprintf(stderr, "Failed to read, and not due to blocking\n"); - c->state = conn_closing; - break; - - case conn_swallow: - /* we are reading sbytes and throwing them away */ - if (c->sbytes == 0) { - c->state = conn_read; - break; - } - - /* first check if we have leftovers in the conn_read buffer */ - if (c->rbytes > 0) { - int tocopy = c->rbytes > c->sbytes ? c->sbytes : c->rbytes; - c->sbytes -= tocopy; - if (c->rbytes > tocopy) { - memmove(c->rbuf, c->rbuf+tocopy, c->rbytes - tocopy); - } - c->rbytes -= tocopy; - break; - } - - /* now try reading from the socket */ - res = read(c->sfd, c->rbuf, c->rsize > c->sbytes ? c->sbytes : c->rsize); - if (res > 0) { - stats.bytes_read += res; - c->sbytes -= res; - break; - } - if (res == 0) { /* end of stream */ - c->state = conn_closing; - break; - } - if (res == -1 && (errno == EAGAIN || errno == EWOULDBLOCK)) { - if (!update_event(c, EV_READ | EV_PERSIST)) { - if (settings.verbose > 0) - fprintf(stderr, "Couldn't update event\n"); - c->state = conn_closing; - break; - } - exit = 1; - break; - } - /* otherwise we have a real error, on which we close the connection */ - if (settings.verbose > 0) - fprintf(stderr, "Failed to read, and not due to blocking\n"); - c->state = conn_closing; - break; - - case conn_write: - /* we are writing wbytes bytes starting from wcurr */ - if (c->wbytes == 0) { - if (c->write_and_free) { - free(c->write_and_free); - c->write_and_free = 0; - } - c->state = c->write_and_go; - if (c->state == conn_read) - set_cork(c, 0); - break; - } - res = write(c->sfd, c->wcurr, c->wbytes); - if (res > 0) { - stats.bytes_written += res; - c->wcurr += res; - c->wbytes -= res; - break; - } - if (res == -1 && (errno == EAGAIN || errno == EWOULDBLOCK)) { - if (!update_event(c, EV_WRITE | EV_PERSIST)) { - if (settings.verbose > 0) - fprintf(stderr, "Couldn't update event\n"); - c->state = conn_closing; - break; - } - exit = 1; - break; - } - /* if res==0 or res==-1 and error is not EAGAIN or EWOULDBLOCK, - we have a real error, on which we close the connection */ - if (settings.verbose > 0) - fprintf(stderr, "Failed to write, and not due to blocking\n"); - c->state = conn_closing; - break; - case conn_mwrite: - /* - * we're writing ibytes bytes from iptr. iptr alternates between - * ibuf, where we build a string "VALUE...", and ITEM_data(it) for the - * current item. When we finish a chunk, we choose the next one using - * ipart, which has the following semantics: 0 - start the loop, 1 - - * we finished ibuf, go to current ITEM_data(it); 2 - we finished ITEM_data(it), - * move to the next item and build its ibuf; 3 - we finished all items, - * write "END". - */ - if (c->ibytes > 0) { - res = write(c->sfd, c->iptr, c->ibytes); - if (res > 0) { - stats.bytes_written += res; - c->iptr += res; - c->ibytes -= res; - break; - } - if (res == -1 && (errno == EAGAIN || errno == EWOULDBLOCK)) { - if (!update_event(c, EV_WRITE | EV_PERSIST)) { - if (settings.verbose > 0) - fprintf(stderr, "Couldn't update event\n"); - c->state = conn_closing; - break; - } - exit = 1; - break; - } - /* if res==0 or res==-1 and error is not EAGAIN or EWOULDBLOCK, - we have a real error, on which we close the connection */ - if (settings.verbose > 0) - fprintf(stderr, "Failed to write, and not due to blocking\n"); - c->state = conn_closing; - break; - } else { - item *it; - /* we finished a chunk, decide what to do next */ - switch (c->ipart) { - case 1: - it = *(c->icurr); - assert((it->it_flags & ITEM_SLABBED) == 0); - c->iptr = ITEM_data(it); - c->ibytes = it->nbytes; - c->ipart = 2; - break; - case 2: - it = *(c->icurr); - item_remove(it); - c->ileft--; - if (c->ileft <= 0) { - c->ipart = 3; - break; - } else { - c->icurr++; - } - /* FALL THROUGH */ - case 0: - it = *(c->icurr); - assert((it->it_flags & ITEM_SLABBED) == 0); - c->ibytes = sprintf(c->ibuf, "VALUE %s %u %u\r\n", ITEM_key(it), it->flags, it->nbytes - 2); - if (settings.verbose > 1) - fprintf(stderr, ">%d sending key %s\n", c->sfd, ITEM_key(it)); - c->iptr = c->ibuf; - c->ipart = 1; - break; - case 3: - out_string(c, "END"); - break; - } - } - break; - - case conn_closing: - conn_close(c); - exit = 1; - break; - } - - } - - return; -} - - -void event_handler(int fd, short which, void *arg) { - conn *c; - - c = (conn *)arg; - c->which = which; - - /* sanity */ - if (fd != c->sfd) { - if (settings.verbose > 0) - fprintf(stderr, "Catastrophic: event fd doesn't match conn fd!\n"); - conn_close(c); - return; - } - - /* do as much I/O as possible until we block */ - drive_machine(c); - - /* wait for next event */ - return; -} - -int new_socket(void) { - int sfd; - int flags; - - if ((sfd = socket(AF_INET, SOCK_STREAM, 0)) == -1) { - perror("socket()"); - return -1; - } - - if ((flags = fcntl(sfd, F_GETFL, 0)) < 0 || - fcntl(sfd, F_SETFL, flags | O_NONBLOCK) < 0) { - perror("setting O_NONBLOCK"); - close(sfd); - return -1; - } - return sfd; -} - -int server_socket(int port) { - int sfd; - struct linger ling = {0, 0}; - struct sockaddr_in addr; - int flags =1; - - if ((sfd = new_socket()) == -1) { - return -1; - } - - setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &flags, sizeof(flags)); - setsockopt(sfd, SOL_SOCKET, SO_KEEPALIVE, &flags, sizeof(flags)); - setsockopt(sfd, SOL_SOCKET, SO_LINGER, &ling, sizeof(ling)); -#if !defined(TCP_NOPUSH) - setsockopt(sfd, IPPROTO_TCP, TCP_NODELAY, &flags, sizeof(flags)); -#endif - - /* - * the memset call clears nonstandard fields in some impementations - * that otherwise mess things up. - */ - memset(&addr, 0, sizeof(addr)); - - addr.sin_family = AF_INET; - addr.sin_port = htons(port); - addr.sin_addr = settings.interface; - if (bind(sfd, (struct sockaddr *) &addr, sizeof(addr)) == -1) { - perror("bind()"); - close(sfd); - return -1; - } - if (listen(sfd, 1024) == -1) { - perror("listen()"); - close(sfd); - return -1; - } - return sfd; -} - -/* invoke right before gdb is called, on assert */ -void pre_gdb () { - int i = 0; - if(l_socket) close(l_socket); - for (i=3; i<=500; i++) close(i); /* so lame */ - kill(getpid(), SIGABRT); -} - -struct event deleteevent; - -void delete_handler(int fd, short which, void *arg) { - struct timeval t; - static int initialized = 0; - - if (initialized) { - /* some versions of libevent don't like deleting events that don't exist, - so only delete once we know this event has been added. */ - evtimer_del(&deleteevent); - } else { - initialized = 1; - } - - evtimer_set(&deleteevent, delete_handler, 0); - t.tv_sec = 5; t.tv_usec=0; - evtimer_add(&deleteevent, &t); - - { - int i, j=0; - time_t now = time(0); - for (i=0; iexptime < now) { - assert(it->refcount > 0); - it->it_flags &= ~ITEM_DELETED; - item_unlink(it); - item_remove(it); - } else { - todelete[j++] = it; - } - } - delcurr = j; - } - - return; -} - -void usage(void) { - printf(PACKAGE " " VERSION "\n"); - printf("-p port number to listen on\n"); - printf("-l interface to listen on, default is INDRR_ANY\n"); - printf("-d run as a daemon\n"); - printf("-r maximize core file limit\n"); - printf("-u assume identity of (only when run as root)\n"); - printf("-m max memory to use for items in megabytes, default is 64 MB\n"); - printf("-M return error on memory exhausted (rather than removing items)\n"); - printf("-c max simultaneous connections, default is 1024\n"); - printf("-k lock down all paged memory\n"); - printf("-v verbose (print errors/warnings while in event loop)\n"); - printf("-vv very verbose (also print client commands/reponses)\n"); - printf("-h print this help and exit\n"); - printf("-i print memcached and libevent license\n"); - printf("-P save PID in , only used with -d option\n"); - return; -} - -void usage_license(void) { - printf(PACKAGE " " VERSION "\n\n"); - printf( - "Copyright (c) 2003, Danga Interactive, Inc. \n" - "All rights reserved.\n" - "\n" - "Redistribution and use in source and binary forms, with or without\n" - "modification, are permitted provided that the following conditions are\n" - "met:\n" - "\n" - " * Redistributions of source code must retain the above copyright\n" - "notice, this list of conditions and the following disclaimer.\n" - "\n" - " * Redistributions in binary form must reproduce the above\n" - "copyright notice, this list of conditions and the following disclaimer\n" - "in the documentation and/or other materials provided with the\n" - "distribution.\n" - "\n" - " * Neither the name of the Danga Interactive nor the names of its\n" - "contributors may be used to endorse or promote products derived from\n" - "this software without specific prior written permission.\n" - "\n" - "THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n" - "\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n" - "LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n" - "A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n" - "OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n" - "SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n" - "LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n" - "DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n" - "THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n" - "(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n" - "OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" - "\n" - "\n" - "This product includes software developed by Niels Provos.\n" - "\n" - "[ libevent ]\n" - "\n" - "Copyright 2000-2003 Niels Provos \n" - "All rights reserved.\n" - "\n" - "Redistribution and use in source and binary forms, with or without\n" - "modification, are permitted provided that the following conditions\n" - "are met:\n" - "1. Redistributions of source code must retain the above copyright\n" - " notice, this list of conditions and the following disclaimer.\n" - "2. Redistributions in binary form must reproduce the above copyright\n" - " notice, this list of conditions and the following disclaimer in the\n" - " documentation and/or other materials provided with the distribution.\n" - "3. All advertising materials mentioning features or use of this software\n" - " must display the following acknowledgement:\n" - " This product includes software developed by Niels Provos.\n" - "4. The name of the author may not be used to endorse or promote products\n" - " derived from this software without specific prior written permission.\n" - "\n" - "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR\n" - "IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES\n" - "OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.\n" - "IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,\n" - "INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\n" - "NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n" - "DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n" - "THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n" - "(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF\n" - "THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" - ); - - return; -} - -void save_pid(pid_t pid,char *pid_file) { - FILE *fp; - if (!pid_file) - return; - - if (!(fp = fopen(pid_file,"w"))) { - fprintf(stderr,"Could not open the pid file %s for writing\n",pid_file); - return; - } - - fprintf(fp,"%ld\n",(long) pid); - if (fclose(fp) == -1) { - fprintf(stderr,"Could not close the pid file %s.\n",pid_file); - return; - } -} - -void remove_pidfile(char *pid_file) { - if (!pid_file) - return; - - if (unlink(pid_file)) { - fprintf(stderr,"Could not remove the pid file %s.\n",pid_file); - } - -} - -int l_socket=0; - -int main (int argc, char **argv) { - int c; - conn *l_conn; - struct in_addr addr; - int lock_memory = 0; - int daemonize = 0; - int maxcore = 0; - char *username = 0; - struct passwd *pw; - struct sigaction sa; - struct rlimit rlim; - char *pid_file = NULL; - - /* init settings */ - settings_init(); - - /* process arguments */ - while ((c = getopt(argc, argv, "p:m:Mc:khirvdl:u:P:")) != -1) { - switch (c) { - case 'p': - settings.port = atoi(optarg); - break; - case 'm': - settings.maxbytes = atoi(optarg)*1024*1024; - break; - case 'M': - settings.evict_to_free = 0; - break; - case 'c': - settings.maxconns = atoi(optarg); - break; - case 'h': - usage(); - exit(0); - case 'i': - usage_license(); - exit(0); - case 'k': - lock_memory = 1; - break; - case 'v': - settings.verbose++; - break; - case 'l': - if (!inet_aton(optarg, &addr)) { - fprintf(stderr, "Illegal address: %s\n", optarg); - return 1; - } else { - settings.interface = addr; - } - break; - case 'd': - daemonize = 1; - break; - case 'r': - maxcore = 1; - break; - case 'u': - username = optarg; - break; - case 'P': - pid_file = optarg; - break; - default: - fprintf(stderr, "Illegal argument \"%c\"\n", c); - return 1; - } - } - - if (maxcore) { - struct rlimit rlim_new; - /* - * First try raising to infinity; if that fails, try bringing - * the soft limit to the hard. - */ - if (getrlimit(RLIMIT_CORE, &rlim)==0) { - rlim_new.rlim_cur = rlim_new.rlim_max = RLIM_INFINITY; - if (setrlimit(RLIMIT_CORE, &rlim_new)!=0) { - /* failed. try raising just to the old max */ - rlim_new.rlim_cur = rlim_new.rlim_max = - rlim.rlim_max; - (void) setrlimit(RLIMIT_CORE, &rlim_new); - } - } - /* - * getrlimit again to see what we ended up with. Only fail if - * the soft limit ends up 0, because then no core files will be - * created at all. - */ - - if ((getrlimit(RLIMIT_CORE, &rlim)!=0) || rlim.rlim_cur==0) { - fprintf(stderr, "failed to ensure corefile creation\n"); - exit(1); - } - } - - /* - * If needed, increase rlimits to allow as many connections - * as needed. - */ - - if (getrlimit(RLIMIT_NOFILE, &rlim) != 0) { - fprintf(stderr, "failed to getrlimit number of files\n"); - exit(1); - } else { - int maxfiles = settings.maxconns; - if (rlim.rlim_cur < maxfiles) - rlim.rlim_cur = maxfiles + 3; - if (rlim.rlim_max < rlim.rlim_cur) - rlim.rlim_max = rlim.rlim_cur; - if (setrlimit(RLIMIT_NOFILE, &rlim) != 0) { - fprintf(stderr, "failed to set rlimit for open files. Try running as root or requesting smaller maxconns value.\n"); - exit(1); - } - } - - /* - * initialization order: first create the listening socket - * (may need root on low ports), then drop root if needed, - * then daemonise if needed, then init libevent (in some cases - * descriptors created by libevent wouldn't survive forking). - */ - - /* create the listening socket and bind it */ - l_socket = server_socket(settings.port); - if (l_socket == -1) { - fprintf(stderr, "failed to listen\n"); - exit(1); - } - - /* lose root privileges if we have them */ - if (getuid()== 0 || geteuid()==0) { - if (username==0 || *username=='\0') { - fprintf(stderr, "can't run as root without the -u switch\n"); - return 1; - } - if ((pw = getpwnam(username)) == 0) { - fprintf(stderr, "can't find the user %s to switch to\n", username); - return 1; - } - if (setgid(pw->pw_gid)<0 || setuid(pw->pw_uid)<0) { - fprintf(stderr, "failed to assume identity of user %s\n", username); - return 1; - } - } - - /* daemonize if requested */ - /* if we want to ensure our ability to dump core, don't chdir to / */ - if (daemonize) { - int res; - res = daemon(maxcore, settings.verbose); - if (res == -1) { - fprintf(stderr, "failed to daemon() in order to daemonize\n"); - return 1; - } - } - - - /* initialize other stuff */ - item_init(); - event_init(); - stats_init(); - assoc_init(); - conn_init(); - slabs_init(settings.maxbytes); - - /* lock paged memory if needed */ - if (lock_memory) { -#ifdef HAVE_MLOCKALL - mlockall(MCL_CURRENT | MCL_FUTURE); -#else - fprintf(stderr, "warning: mlockall() not supported on this platform. proceeding without.\n"); -#endif - } - - /* - * ignore SIGPIPE signals; we can use errno==EPIPE if we - * need that information - */ - sa.sa_handler = SIG_IGN; - sa.sa_flags = 0; - if (sigemptyset(&sa.sa_mask) == -1 || - sigaction(SIGPIPE, &sa, 0) == -1) { - perror("failed to ignore SIGPIPE; sigaction"); - exit(1); - } - - /* create the initial listening connection */ - if (!(l_conn = conn_new(l_socket, conn_listening, EV_READ | EV_PERSIST))) { - fprintf(stderr, "failed to create listening connection"); - exit(1); - } - - /* initialise deletion array and timer event */ - deltotal = 200; delcurr = 0; - todelete = malloc(sizeof(item *)*deltotal); - delete_handler(0,0,0); /* sets up the event */ - - /* save the PID in if we're a daemon */ - if (daemonize) - save_pid(getpid(),pid_file); - - /* enter the loop */ - event_loop(0); - - /* remove the PID file if we're a daemon */ - if (daemonize) - remove_pidfile(pid_file); - - return 0; -} - Deleted: csw/mgar/pkg/memcached/trunk/files/memcached.h =================================================================== --- csw/mgar/pkg/memcached/trunk/files/memcached.h 2009-11-06 13:56:34 UTC (rev 7145) +++ csw/mgar/pkg/memcached/trunk/files/memcached.h 2009-11-06 14:01:38 UTC (rev 7146) @@ -1,212 +0,0 @@ -/* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -/* $Id: memcached.h,v 1.21 2004/02/24 23:42:02 bradfitz Exp $ */ - -#define DATA_BUFFER_SIZE 2048 - -#if defined(TCP_CORK) && !defined(TCP_NOPUSH) -#define TCP_NOPUSH TCP_CORK -#endif - -struct stats { - unsigned int curr_items; - unsigned int total_items; - unsigned long long curr_bytes; - unsigned int curr_conns; - unsigned int total_conns; - unsigned int conn_structs; - unsigned int get_cmds; - unsigned int set_cmds; - unsigned int get_hits; - unsigned int get_misses; - time_t started; /* when the process was started */ - unsigned long long bytes_read; - unsigned long long bytes_written; -}; - -struct settings { - unsigned int maxbytes; - int maxconns; - int port; - struct in_addr interface; - int verbose; - time_t oldest_live; /* ignore existing items older than this */ - int evict_to_free; -}; - -extern struct stats stats; -extern struct settings settings; - -#define ITEM_LINKED 1 -#define ITEM_DELETED 2 - -/* temp */ -#define ITEM_SLABBED 4 - -typedef struct _stritem { - struct _stritem *next; - struct _stritem *prev; - struct _stritem *h_next; /* hash chain next */ - unsigned short refcount; - unsigned short flags; - int nbytes; /* size of data */ - time_t time; /* least recent access */ - time_t exptime; /* expire time */ - unsigned char it_flags; /* ITEM_* above */ - unsigned char slabs_clsid; - unsigned char nkey; /* key length, with terminating null and padding */ - unsigned char dummy1; - void *end; -} item; - -#define ITEM_key(item) ((char*)&((item)->end)) - -/* warning: don't use these macros with a function, as it evals its arg twice */ -#define ITEM_data(item) ((char*) &((item)->end) + (item)->nkey) -#define ITEM_ntotal(item) (sizeof(struct _stritem) + (item)->nkey + (item)->nbytes) - -enum conn_states { - conn_listening, /* the socket which listens for connections */ - conn_read, /* reading in a command line */ - conn_write, /* writing out a simple response */ - conn_nread, /* reading in a fixed number of bytes */ - conn_swallow, /* swallowing unnecessary bytes w/o storing */ - conn_closing, /* closing this connection */ - conn_mwrite /* writing out many items sequentially */ -}; - -#define NREAD_ADD 1 -#define NREAD_SET 2 -#define NREAD_REPLACE 3 - -typedef struct { - int sfd; - int state; - struct event event; - short ev_flags; - short which; /* which events were just triggered */ - - char *rbuf; - int rsize; - int rbytes; - - char *wbuf; - char *wcurr; - int wsize; - int wbytes; - int write_and_go; /* which state to go into after finishing current write */ - void *write_and_free; /* free this memory after finishing writing */ - char is_corked; /* boolean, connection is corked */ - - char *rcurr; - int rlbytes; - - /* data for the nread state */ - - /* - * item is used to hold an item structure created after reading the command - * line of set/add/replace commands, but before we finished reading the actual - * data. The data is read into ITEM_data(item) to avoid extra copying. - */ - - void *item; /* for commands set/add/replace */ - int item_comm; /* which one is it: set/add/replace */ - - /* data for the swallow state */ - int sbytes; /* how many bytes to swallow */ - - /* data for the mwrite state */ - item **ilist; /* list of items to write out */ - int isize; - item **icurr; - int ileft; - int ipart; /* 1 if we're writing a VALUE line, 2 if we're writing data */ - char ibuf[300]; /* for VALUE lines */ - char *iptr; - int ibytes; - -} conn; - -/* listening socket */ -extern int l_socket; - -/* temporary hack */ -/* #define assert(x) if(!(x)) { printf("assert failure: %s\n", #x); pre_gdb(); } - void pre_gdb (); */ - -/* - * Functions - */ - -/* - * given time value that's either unix time or delta from current unix time, return - * unix time. Use the fact that delta can't exceed one month (and real time value can't - * be that low). - */ - -time_t realtime(time_t exptime); - -/* slabs memory allocation */ - -/* Init the subsystem. The argument is the limit on no. of bytes to allocate, 0 if no limit */ -void slabs_init(unsigned int limit); - -/* Given object size, return id to use when allocating/freeing memory for object */ -/* 0 means error: can't store such a large object */ -unsigned int slabs_clsid(unsigned int size); - -/* Allocate object of given length. 0 on error */ -void *slabs_alloc(unsigned int size); - -/* Free previously allocated object */ -void slabs_free(void *ptr, unsigned int size); - -/* Fill buffer with stats */ -char* slabs_stats(int *buflen); - -/* Request some slab be moved between classes - 1 = success - 0 = fail - -1 = tried. busy. send again shortly. */ -int slabs_reassign(unsigned char srcid, unsigned char dstid); - -/* event handling, network IO */ -void event_handler(int fd, short which, void *arg); -conn *conn_new(int sfd, int init_state, int event_flags); -void conn_close(conn *c); -void conn_init(void); -void drive_machine(conn *c); -int new_socket(void); -int server_socket(int port); -int update_event(conn *c, int new_flags); -int try_read_command(conn *c); -int try_read_network(conn *c); -void complete_nread(conn *c); -void process_command(conn *c, char *command); - -/* stats */ -void stats_reset(void); -void stats_init(void); - -/* defaults */ -void settings_init(void); - -/* associative array */ -void assoc_init(void); -item *assoc_find(char *key); -int assoc_insert(char *key, item *item); -void assoc_delete(char *key); - - -void item_init(void); -item *item_alloc(char *key, int flags, time_t exptime, int nbytes); -void item_free(item *it); - -int item_link(item *it); /* may fail if transgresses limits */ -void item_unlink(item *it); -void item_remove(item *it); - -void item_update(item *it); /* update LRU time to current and reposition */ -int item_replace(item *it, item *new_it); -char *item_cachedump(unsigned int slabs_clsid, unsigned int limit, unsigned int *bytes); -char *item_stats_sizes(int *bytes); -void item_stats(char *buffer, int buflen); Deleted: csw/mgar/pkg/memcached/trunk/files/solaris.diff =================================================================== --- csw/mgar/pkg/memcached/trunk/files/solaris.diff 2009-11-06 13:56:34 UTC (rev 7145) +++ csw/mgar/pkg/memcached/trunk/files/solaris.diff 2009-11-06 14:01:38 UTC (rev 7146) @@ -1,56 +0,0 @@ -diff --speed-large-files --minimal -Nru memcached-1.1.12.orig/Makefile.in memcached-1.1.12/Makefile.in ---- memcached-1.1.12.orig/Makefile.in 2005-12-13 03:33:09.453997000 -0500 -+++ memcached-1.1.12/Makefile.in 2005-12-13 03:32:52.961025000 -0500 -@@ -73,7 +73,7 @@ - - bin_PROGRAMS = memcached - --memcached_SOURCES = memcached.c slabs.c items.c memcached.h assoc.c -+memcached_SOURCES = memcached.c slabs.c items.c memcached.h assoc.c daemon.c - - SUBDIRS = doc - DIST_DIRS = scripts -@@ -90,8 +90,8 @@ - DEFS = @DEFS@ -I. -I$(srcdir) -I. - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ --LIBS = @LIBS@ --memcached_OBJECTS = memcached.o slabs.o items.o assoc.o -+LIBS = @LIBS@ -lsocket -lresolv -lmalloc -+memcached_OBJECTS = memcached.o slabs.o items.o assoc.o daemon.o - memcached_LDADD = $(LDADD) - memcached_DEPENDENCIES = - memcached_LDFLAGS = -diff --speed-large-files --minimal -Nru memcached-1.1.12.orig/memcached.c memcached-1.1.12/memcached.c ---- memcached-1.1.12.orig/memcached.c 2005-12-13 03:33:09.998675000 -0500 -+++ memcached-1.1.12/memcached.c 2005-12-13 03:32:48.075669000 -0500 -@@ -16,7 +16,9 @@ - * $Id: memcached.c,v 1.56 2005/04/05 00:10:26 bradfitz Exp $ - */ - -+#include "daemon.h" - #include "config.h" -+#include - #include - #include - #include -diff --speed-large-files --minimal -Nru memcached-1.1.12.orig/memcached.h memcached-1.1.12/memcached.h ---- memcached-1.1.12.orig/memcached.h 2005-12-13 03:33:10.090457000 -0500 -+++ memcached-1.1.12/memcached.h 2005-12-13 03:32:48.110122000 -0500 -@@ -55,13 +55,13 @@ - unsigned char slabs_clsid; - unsigned char nkey; /* key length, with terminating null and padding */ - unsigned char dummy1; -- void * end[0]; -+ void *end; - } item; - --#define ITEM_key(item) ((char*)&((item)->end[0])) -+#define ITEM_key(item) ((char*)&((item)->end)) - - /* warning: don't use these macros with a function, as it evals its arg twice */ --#define ITEM_data(item) ((char*) &((item)->end[0]) + (item)->nkey) -+#define ITEM_data(item) ((char*) &((item)->end) + (item)->nkey) - #define ITEM_ntotal(item) (sizeof(struct _stritem) + (item)->nkey + (item)->nbytes) - - enum conn_states { 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 Nov 6 15:30:24 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 06 Nov 2009 14:30:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7147] csw/mgar/pkg/memcached/trunk/Makefile Message-ID: Revision: 7147 http://gar.svn.sourceforge.net/gar/?rev=7147&view=rev Author: dmichelsen Date: 2009-11-06 14:30:24 +0000 (Fri, 06 Nov 2009) Log Message: ----------- memcached: Disable tests for now Modified Paths: -------------- csw/mgar/pkg/memcached/trunk/Makefile Modified: csw/mgar/pkg/memcached/trunk/Makefile =================================================================== --- csw/mgar/pkg/memcached/trunk/Makefile 2009-11-06 14:01:38 UTC (rev 7146) +++ csw/mgar/pkg/memcached/trunk/Makefile 2009-11-06 14:30:24 UTC (rev 7147) @@ -23,5 +23,7 @@ BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) +SKIPTEST = 1 + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Fri Nov 6 15:40:07 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 06 Nov 2009 14:40:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7148] csw/mgar/pkg/openssl/trunk Message-ID: Revision: 7148 http://gar.svn.sourceforge.net/gar/?rev=7148&view=rev Author: chninkel Date: 2009-11-06 14:40:06 +0000 (Fri, 06 Nov 2009) Log Message: ----------- openssl: updated to 0.9.8l Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile csw/mgar/pkg/openssl/trunk/checksums csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc csw/mgar/pkg/openssl/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2009-11-06 14:30:24 UTC (rev 7147) +++ csw/mgar/pkg/openssl/trunk/Makefile 2009-11-06 14:40:06 UTC (rev 7148) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = openssl -GARVERSION = 0.9.8k +GARVERSION = 0.9.8l CATEGORIES = lib DESCRIPTION = The Open Source toolkit for SSL and TLS Modified: csw/mgar/pkg/openssl/trunk/checksums =================================================================== --- csw/mgar/pkg/openssl/trunk/checksums 2009-11-06 14:30:24 UTC (rev 7147) +++ csw/mgar/pkg/openssl/trunk/checksums 2009-11-06 14:40:06 UTC (rev 7148) @@ -5,9 +5,9 @@ 1c3f600eaf942a18ecab3637e1fc32bd CSWosslrt.postinstall c9de908daad1a31fca20329cb043ad3c CSWosslrt.preinstall 8b14ea8718a295d97ace5d7933a957d1 CSWosslrt.prototype-i386 -ec547e9a56e0933a928fd9d505c19333 CSWosslrt.prototype-sparc +521028d0016ae5a4cc8fd5e0b0add53f CSWosslrt.prototype-sparc 88634d81695a173bdb35df1a80cc9761 CSWosslutils.prototype b78faa440d6f6a2a07663de331678648 README.CSW -904ceefa66b6b7b7e93ae0e9bc58bac8 changelog.CSW +5c447b39d30f5ae4ede50d53dfcdfb58 changelog.CSW 64f7c3f3a6cae483209b69c31c82557d more_configure_targets.patch -e555c6d58d276aec7fdc53363e338ab3 openssl-0.9.8k.tar.gz +05a0ece1372392a2cf310ebb96333025 openssl-0.9.8l.tar.gz Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc 2009-11-06 14:30:24 UTC (rev 7147) +++ csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc 2009-11-06 14:40:06 UTC (rev 7148) @@ -34,14 +34,14 @@ s none /opt/csw/ssl/private=../../../etc/opt/csw/ssl/private d none /etc/opt/csw/ssl/private 0700 root bin s none /opt/csw/etc/ssl/private=../../../../etc/opt/csw/ssl/private -f none /opt/csw/share/doc/openssl_rt/changelog.CSW=changelog.CSW 644 root bin -f none /opt/csw/share/doc/openssl_rt/CHANGES=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_rt/CHANGES.SSLeay=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_rt/PROBLEMS=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_rt/README=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_rt/FAQ=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_rt/README.ASN1=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_rt/INSTALL=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_rt/NEWS=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_rt/README.ENGINE=CHANGES 644 root bin -f none /opt/csw/share/doc/openssl_rt/README.CSW=README.CSW 644 root bin +f none /opt/csw/share/doc/openssl_rt/changelog.CSW 644 root bin +f none /opt/csw/share/doc/openssl_rt/CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_rt/CHANGES.SSLeay 644 root bin +f none /opt/csw/share/doc/openssl_rt/PROBLEMS 644 root bin +f none /opt/csw/share/doc/openssl_rt/README 644 root bin +f none /opt/csw/share/doc/openssl_rt/FAQ 644 root bin +f none /opt/csw/share/doc/openssl_rt/README.ASN1 644 root bin +f none /opt/csw/share/doc/openssl_rt/INSTALL 644 root bin +f none /opt/csw/share/doc/openssl_rt/NEWS 644 root bin +f none /opt/csw/share/doc/openssl_rt/README.ENGINE 644 root bin +f none /opt/csw/share/doc/openssl_rt/README.CSW 644 root bin Modified: csw/mgar/pkg/openssl/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2009-11-06 14:30:24 UTC (rev 7147) +++ csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2009-11-06 14:40:06 UTC (rev 7148) @@ -1,17 +1,24 @@ -openssl (0.9.8,rev=2009.03.27_rev=k) unstable +openssl (0.9.8l,REV=2009.03.27) unstable * New upstream version. + * Changed package version numbering scheme. + -- Yann Rouillard Fri, 06 Nov 2009 11:16:03 +0100 + +openssl (0.9.8,REV=2009.03.27_rev=k) unstable + + * New upstream version. + -- Yann Rouillard Wed, 25 Mar 2009 22:57:40 +0100 -openssl (0.9.8,rev=2009.01.28_rev=j) unstable +openssl (0.9.8,REV=2009.01.28_rev=j) unstable * Fixed checkinstall bug, -h should be used instead of -L to test symlink because old sh doesn't know -L. -- Yann Rouillard Wed, 28 Jan 2009 10:37:43 +0100 -openssl (0.9.8,rev=2009.01.07_rev=j) unstable +openssl (0.9.8,REV=2009.01.07_rev=j) unstable * New upstream version. * Made the private directory local by symlinking it to @@ -19,7 +26,7 @@ -- Yann Rouillard Wed, 07 Jan 2009 19:07:01 +0100 -openssl (0.9.8,rev=2009.01.01_rev=i) unstable +openssl (0.9.8,REV=2009.01.01_rev=i) unstable * Removed CA and added dependancy on ca_certificates. * Added openssl documentation files. @@ -28,7 +35,7 @@ -- Yann Rouillard Sat, 13 Dec 2008 14:28:14 +0100 -openssl (0.9.8,rev=2008.10.05_rev=i) unstable +openssl (0.9.8,REV=2008.10.05_rev=i) unstable * New upstream version. * Added ca certs that were removed in 0.9.8h. 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 Nov 6 16:10:15 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 06 Nov 2009 15:10:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[7149] csw/mgar/pkg/sox/trunk Message-ID: Revision: 7149 http://gar.svn.sourceforge.net/gar/?rev=7149&view=rev Author: dmichelsen Date: 2009-11-06 15:10:15 +0000 (Fri, 06 Nov 2009) Log Message: ----------- sox: Add patch to allow 64 bit compilation Modified Paths: -------------- csw/mgar/pkg/sox/trunk/Makefile csw/mgar/pkg/sox/trunk/checksums Added Paths: ----------- csw/mgar/pkg/sox/trunk/files/ csw/mgar/pkg/sox/trunk/files/0001-Disable-stdio-hack-to-rewind-pipes.patch Modified: csw/mgar/pkg/sox/trunk/Makefile =================================================================== --- csw/mgar/pkg/sox/trunk/Makefile 2009-11-06 14:40:06 UTC (rev 7148) +++ csw/mgar/pkg/sox/trunk/Makefile 2009-11-06 15:10:15 UTC (rev 7149) @@ -9,6 +9,11 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(DISTNAME).tar.gz +# There is a hack in there to rewind pipes when detecting file formats. +# As the FILE struct is opaque in 64 bit we must disable this for 64 bit. +# But as we only need the library in 64 bit anyway this shouldn't hurt. +PATCHFILES = 0001-Disable-stdio-hack-to-rewind-pipes.patch + UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz SPKG_SOURCEURL = http://sox.sourceforge.net/ @@ -18,9 +23,12 @@ PREREQUISITE_PKGS = $(REQUIRED_PKGS) CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --without-libltdl BUILD64 = 1 - +NO_ISAEXEC = 1 TEST_TARGET = check +MERGE_DIRS_isa-extra = $(libdir) + include gar/category.mk Modified: csw/mgar/pkg/sox/trunk/checksums =================================================================== --- csw/mgar/pkg/sox/trunk/checksums 2009-11-06 14:40:06 UTC (rev 7148) +++ csw/mgar/pkg/sox/trunk/checksums 2009-11-06 15:10:15 UTC (rev 7149) @@ -1 +1,2 @@ +ce1fa27946b99c023d2b37bb0d5800c4 0001-Disable-stdio-hack-to-rewind-pipes.patch 8e3509804e6227273ef84092e1a2fea7 sox-14.3.0.tar.gz Added: csw/mgar/pkg/sox/trunk/files/0001-Disable-stdio-hack-to-rewind-pipes.patch =================================================================== --- csw/mgar/pkg/sox/trunk/files/0001-Disable-stdio-hack-to-rewind-pipes.patch (rev 0) +++ csw/mgar/pkg/sox/trunk/files/0001-Disable-stdio-hack-to-rewind-pipes.patch 2009-11-06 15:10:15 UTC (rev 7149) @@ -0,0 +1,31 @@ +From 91792a0837969dd584dd469c06874111d80cfcec Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 6 Nov 2009 16:05:59 +0100 +Subject: [PATCH] Disable stdio hack to rewind pipes + +--- + src/formats.c | 3 +-- + 1 files changed, 1 insertions(+), 2 deletions(-) + +diff --git a/src/formats.c b/src/formats.c +index 556f611..f238929 100644 +--- a/src/formats.c ++++ b/src/formats.c +@@ -397,13 +397,12 @@ static void UNUSED rewind_pipe(FILE * fp) + fp->_r += AUTO_DETECT_SIZE; + #elif defined __GLIBC__ + fp->_IO_read_ptr = fp->_IO_read_base; +-#elif defined _MSC_VER || defined __MINGW_H || defined _ISO_STDIO_ISO_H ++#elif !defined _LP64 && (defined _MSC_VER || defined __MINGW_H || defined _ISO_STDIO_ISO_H) + fp->_ptr = fp->_base; + #else + /* To fix this #error, either simply remove the #error line and live without + * file-type detection with pipes, or add support for your compiler in the + * lines above. Test with cat monkey.au | ./sox --info - */ +- #error FIX NEEDED HERE + #define NO_REWIND_PIPE + (void)fp; + #endif +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Nov 6 16:36:38 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 06 Nov 2009 15:36:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[7150] csw/mgar/pkg/balance/trunk Message-ID: Revision: 7150 http://gar.svn.sourceforge.net/gar/?rev=7150&view=rev Author: dmichelsen Date: 2009-11-06 15:36:38 +0000 (Fri, 06 Nov 2009) Log Message: ----------- balance: Update to 3.42 Modified Paths: -------------- csw/mgar/pkg/balance/trunk/Makefile csw/mgar/pkg/balance/trunk/checksums Added Paths: ----------- csw/mgar/pkg/balance/trunk/files/0001-Adjust-Makefile.patch Removed Paths: ------------- csw/mgar/pkg/balance/trunk/files/CSWbalance.gspec csw/mgar/pkg/balance/trunk/files/build.diff Property Changed: ---------------- csw/mgar/pkg/balance/trunk/ Property changes on: csw/mgar/pkg/balance/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/balance/trunk/Makefile =================================================================== --- csw/mgar/pkg/balance/trunk/Makefile 2009-11-06 15:10:15 UTC (rev 7149) +++ csw/mgar/pkg/balance/trunk/Makefile 2009-11-06 15:36:38 UTC (rev 7150) @@ -1,8 +1,8 @@ GARNAME = balance -GARVERSION = 3.11 +GARVERSION = 3.42 CATEGORIES = net -DESCRIPTION = A TCP proxy and load balancer. +DESCRIPTION = A TCP proxy and load balancer define BLURB Balance is a simple but powerful generic TCP proxy with round-robin load balancing and failover mechanisms. Its behaviour can be controlled at runtime @@ -11,15 +11,13 @@ MASTER_SITES = http://www.inlab.de/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWbalance,) +PATCHFILES = 0001-Adjust-Makefile.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# Configure for build with SunONE -PATCHFILES = build.diff - CONFIGURE_SCRIPTS = + TEST_SCRIPTS = include gar/category.mk Modified: csw/mgar/pkg/balance/trunk/checksums =================================================================== --- csw/mgar/pkg/balance/trunk/checksums 2009-11-06 15:10:15 UTC (rev 7149) +++ csw/mgar/pkg/balance/trunk/checksums 2009-11-06 15:36:38 UTC (rev 7150) @@ -1,3 +1,2 @@ -b3ab07862a1e25dc63c1f5f2a006f474 download/balance-3.11.tar.gz -3c06491c6dc775fc8883ef7346427343 download/CSWbalance.gspec -8dfddaec5c9b69f163e581447f1b592b download/build.diff +dff93af413acf3cfe6e54f9f8ec99327 0001-Adjust-Makefile.patch +24bc4063e8af298471d7d0a2ac7462a6 balance-3.42.tar.gz Added: csw/mgar/pkg/balance/trunk/files/0001-Adjust-Makefile.patch =================================================================== --- csw/mgar/pkg/balance/trunk/files/0001-Adjust-Makefile.patch (rev 0) +++ csw/mgar/pkg/balance/trunk/files/0001-Adjust-Makefile.patch 2009-11-06 15:36:38 UTC (rev 7150) @@ -0,0 +1,65 @@ +From f39ca105749c5c407c8e0ff6d53ed0a1fee12470 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 6 Nov 2009 16:33:53 +0100 +Subject: [PATCH] Adjust Makefile + +--- + Makefile | 20 ++++++++++++-------- + 1 files changed, 12 insertions(+), 8 deletions(-) + +diff --git a/Makefile b/Makefile +index 90a4b47..3c549ce 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,26 +1,28 @@ + # $Id: Makefile,v 1.45 2008/04/08 17:39:08 tommy Exp $ + + #CFLAGS=-g -I. +-CFLAGS=-O2 -Wall -Wstrict-prototypes -Wuninitialized ++# CFLAGS=-O2 -Wall -Wstrict-prototypes -Wuninitialized + + # uncomment for any OS other than Cygwin + BALANCE=balance + ROOT=root + INSTALL=install +-BINDIR=/usr/sbin +-MANDIR=${BINDIR}/../man/man1 ++# BINDIR=/usr/sbin ++# MANDIR=${BINDIR}/../man/man1 + + # uncomment for Solaris +-# LIBRARIES=-lsocket -lnsl +-# INSTALL=/usr/ucb/install ++LIBRARIES=-lsocket -lnsl ++INSTALL=/usr/ucb/install + # BINDIR=/usr/local/libexec ++BINDIR=/opt/csw/sbin ++MANDIR=/opt/csw/share/man/man1 + + # uncomment for Cygwin + # LIBRARIES=-L/usr/local/lib -lcygipc + # BALANCE=balance.exe + # ROOT=Administrators + +-CC=gcc ++# CC=gcc + RELEASE=3.42 + + all: balance +@@ -48,9 +50,11 @@ clean: + rm -f $(BALANCE) *.o balance.ps balance.pdf + + install: +- $(INSTALL) -o $(ROOT) -g $(ROOT) -m 755 $(BALANCE) \ ++ $(INSTALL) -d $(DESTDIR)$(BINDIR) ++ $(INSTALL) -m 755 $(BALANCE) \ + $(DESTDIR)$(BINDIR)/$(BALANCE) +- $(INSTALL) -o $(ROOT) -g $(ROOT) -m 755 balance.1 \ ++ $(INSTALL) -d $(DESTDIR)$(MANDIR) ++ $(INSTALL) -m 755 balance.1 \ + $(DESTDIR)$(MANDIR) + mkdir -p $(DESTDIR)/var/run/balance + chmod 1777 $(DESTDIR)/var/run/balance +-- +1.6.5.1 + Deleted: csw/mgar/pkg/balance/trunk/files/CSWbalance.gspec =================================================================== --- csw/mgar/pkg/balance/trunk/files/CSWbalance.gspec 2009-11-06 15:10:15 UTC (rev 7149) +++ csw/mgar/pkg/balance/trunk/files/CSWbalance.gspec 2009-11-06 15:36:38 UTC (rev 7150) @@ -1,4 +0,0 @@ -%var bitname balance -%var pkgname CSWbalance -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYRIGHT Deleted: csw/mgar/pkg/balance/trunk/files/build.diff =================================================================== --- csw/mgar/pkg/balance/trunk/files/build.diff 2009-11-06 15:10:15 UTC (rev 7149) +++ csw/mgar/pkg/balance/trunk/files/build.diff 2009-11-06 15:36:38 UTC (rev 7150) @@ -1,28 +0,0 @@ ---- balance-3.11.orig/Makefile 2003-10-04 02:41:44.000000000 -0700 -+++ balance-3.11/Makefile 2004-05-14 13:02:03.201642000 -0700 -@@ -1,12 +1,8 @@ - # $Id: build.diff,v 1.1.1.1 2004/08/17 17:07:34 comand Exp $ - --#CFLAGS=-g -I. --CFLAGS=-O2 -- - # uncomment for Solaris: --# LIBRARIES=-lsocket -lnsl -+LIBRARIES=-lsocket -lnsl - --CC=gcc - RELEASE=3.11 - - balance: balance.c butils.o balance.h -@@ -24,8 +20,9 @@ - rm -f balance - - install: -- install -o root -g root -m 755 balance /usr/sbin/balance -- install -o root -g root -m 755 balance.1 /usr/man/man1 -+ install -d $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir)/man1 -+ install -o root -g root -m 755 balance $(DESTDIR)$(sbindir)/balance -+ install -o root -g root -m 755 balance.1 $(DESTDIR)$(mandir)/man1 - mkdir -p /var/run/balance - chmod 1777 /var/run/balance - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Fri Nov 6 18:24:41 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 06 Nov 2009 17:24:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[7151] csw/mgar/pkg/openssl/trunk/Makefile Message-ID: Revision: 7151 http://gar.svn.sourceforge.net/gar/?rev=7151&view=rev Author: chninkel Date: 2009-11-06 17:24:41 +0000 (Fri, 06 Nov 2009) Log Message: ----------- openssl: fixed doc installation Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2009-11-06 15:36:38 UTC (rev 7150) +++ csw/mgar/pkg/openssl/trunk/Makefile 2009-11-06 17:24:41 UTC (rev 7151) @@ -147,7 +147,7 @@ install-doc: for CATALOGNAME in $(foreach PKG, $(PACKAGES), $(call catalogname,$(PKG))); do \ - ginstall -d $(DOCFILES) $(PKGROOT)/$(docdir)/$$CATALOGNAME; \ + ginstall -d $(PKGROOT)/$(docdir)/$$CATALOGNAME; \ (cd $(WORKSRC_FIRSTMOD)/ && ginstall $(DOCFILES) $(PKGROOT)/$(docdir)/$$CATALOGNAME/); \ ginstall -D $(WORKDIR_FIRSTMOD)/README.CSW $(PKGROOT)/$(docdir)/$$CATALOGNAME/README.CSW; \ 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 Fri Nov 6 21:19:29 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 06 Nov 2009 20:19:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[7152] csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile Message-ID: Revision: 7152 http://gar.svn.sourceforge.net/gar/?rev=7152&view=rev Author: dmichelsen Date: 2009-11-06 20:19:28 +0000 (Fri, 06 Nov 2009) Log Message: ----------- cpan/Text-CSV_XS: Fix name Modified Paths: -------------- csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile Modified: csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile 2009-11-06 17:24:41 UTC (rev 7151) +++ csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile 2009-11-06 20:19:28 UTC (rev 7152) @@ -10,11 +10,12 @@ fields into a CSV string and parse a CSV string into fields. endef -# XXX: This package name contains a type, it was released this way a long time -# ago and should be renamed sometime. -PACKAGES = CSWpmttextcsvxs +PACKAGES = CSWpmtextcsvxs CATALOGNAME = pm_textcsvxs +# This was the previous name. Note the typo! +INCOMPATIBLE_PKGS = CSWpmttextcsvxs + # This module uses .tgz instead of .tar.gz :-( MODDIST = $(GARNAME)-$(GARVERSION).tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Fri Nov 6 23:20:16 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Fri, 06 Nov 2009 22:20:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7153] csw/mgar/pkg Message-ID: Revision: 7153 http://gar.svn.sourceforge.net/gar/?rev=7153&view=rev Author: trygvis Date: 2009-11-06 22:20:16 +0000 (Fri, 06 Nov 2009) Log Message: ----------- o Adding an initial commit of qucs, not complete yet. Added Paths: ----------- csw/mgar/pkg/qucs/ csw/mgar/pkg/qucs/branches/ csw/mgar/pkg/qucs/tags/ csw/mgar/pkg/qucs/trunk/ csw/mgar/pkg/qucs/trunk/Makefile csw/mgar/pkg/qucs/trunk/checksums csw/mgar/pkg/qucs/trunk/files/ csw/mgar/pkg/qucs/trunk/files/0000-Missing-include.patch csw/mgar/pkg/qucs/trunk/files/0001-Replace-bin-sh-with-bin-bash.patch Property changes on: csw/mgar/pkg/qucs/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/qucs/trunk/Makefile =================================================================== --- csw/mgar/pkg/qucs/trunk/Makefile (rev 0) +++ csw/mgar/pkg/qucs/trunk/Makefile 2009-11-06 22:20:16 UTC (rev 7153) @@ -0,0 +1,35 @@ +GARNAME = qucs +GARVERSION = 0.0.15 +CATEGORIES = devel + +DESCRIPTION = Integrated circuit simulator +#define BLURB +# Long description +#endef + +SF_PROJ = $(GARNAME) +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0000-Missing-include.patch +PATCHFILES += 0001-Replace-bin-sh-with-bin-bash.patch + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +GARCOMPILER = GNU + +CONFIGURE_ENV = QTDIR=/opt/csw +CONFIGURE_ENV += LD_LIBRARY_PATH=/opt/csw/gcc4/lib +CONFIGURE_ENV += LDFLAGS="-L/opt/csw/kde-gcc/lib -L/opt/csw/gcc4/lib" +# -lstdc++" +CONFIGURE_ENV := $(CONFIGURE_ENV) +#LD_LIBRARY_PATH=/opt/csw/gcc4/lib QTDIR=/opt/csw CC=/opt/csw/gcc4/bin/gcc LDFLAGS="-L/opt/csw/kde-gcc/lib/ -lstdc++" CFLAGS="-I/opt/csw/kde-gcc/include -I/opt/csw/include" +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_SCRIPTS = + +include gar/category.mk Added: csw/mgar/pkg/qucs/trunk/checksums =================================================================== --- csw/mgar/pkg/qucs/trunk/checksums (rev 0) +++ csw/mgar/pkg/qucs/trunk/checksums 2009-11-06 22:20:16 UTC (rev 7153) @@ -0,0 +1,3 @@ +2c90464d784a2d26f833541731cc8874 0000-Missing-include.patch +7e60614d494bfb343cf07d2b33ee4c17 0001-Replace-bin-sh-with-bin-bash.patch +5a35eee790c92eba97de181b12794823 qucs-0.0.15.tar.gz Added: csw/mgar/pkg/qucs/trunk/files/0000-Missing-include.patch =================================================================== --- csw/mgar/pkg/qucs/trunk/files/0000-Missing-include.patch (rev 0) +++ csw/mgar/pkg/qucs/trunk/files/0000-Missing-include.patch 2009-11-06 22:20:16 UTC (rev 7153) @@ -0,0 +1,11 @@ +diff -u -r qucs-0.0.15/qucs-transcalc/coplanar.cpp qucs-0.0.15.ok/qucs-transcalc/coplanar.cpp +--- qucs-0.0.15/qucs-transcalc/coplanar.cpp 2008-04-10 14:44:26.000000000 +0200 ++++ qucs-0.0.15.ok/qucs-transcalc/coplanar.cpp 2009-11-06 17:26:59.389086865 +0100 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + #ifdef __MINGW32__ + # define finite(x) _finite(x) Added: csw/mgar/pkg/qucs/trunk/files/0001-Replace-bin-sh-with-bin-bash.patch =================================================================== --- csw/mgar/pkg/qucs/trunk/files/0001-Replace-bin-sh-with-bin-bash.patch (rev 0) +++ csw/mgar/pkg/qucs/trunk/files/0001-Replace-bin-sh-with-bin-bash.patch 2009-11-06 22:20:16 UTC (rev 7153) @@ -0,0 +1,29 @@ +diff -u -r qucs-0.0.15/qucs/qucsdigi qucs-0.0.15.ok/qucs/qucsdigi +--- qucs-0.0.15/qucs/qucsdigi 2008-09-25 21:15:57.000000000 +0200 ++++ qucs-0.0.15.ok/qucs/qucsdigi 2009-11-06 23:02:04.765281763 +0100 +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#! /bin/bash + # + # qucsdigi - wrapper script for digital simulation + # +diff -u -r qucs-0.0.15/qucs/qucsveri qucs-0.0.15.ok/qucs/qucsveri +--- qucs-0.0.15/qucs/qucsveri 2007-03-26 21:39:25.000000000 +0200 ++++ qucs-0.0.15.ok/qucs/qucsveri 2009-11-06 23:01:59.453243209 +0100 +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#! /bin/bash + # + # qucsveri - wrapper script for digital simulation + # +diff -u -r qucs-0.0.15/qucs-transcalc/coplanar.cpp qucs-0.0.15.ok/qucs-transcalc/coplanar.cpp +--- qucs-0.0.15/qucs-transcalc/coplanar.cpp 2008-04-10 14:44:26.000000000 +0200 ++++ qucs-0.0.15.ok/qucs-transcalc/coplanar.cpp 2009-11-06 23:01:31.414290151 +0100 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + #ifdef __MINGW32__ + # define finite(x) _finite(x) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Fri Nov 6 23:20:33 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Fri, 06 Nov 2009 22:20:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[7154] csw/mgar/pkg Message-ID: Revision: 7154 http://gar.svn.sourceforge.net/gar/?rev=7154&view=rev Author: trygvis Date: 2009-11-06 22:20:33 +0000 (Fri, 06 Nov 2009) Log Message: ----------- o Adding an initial commit of freehdl, not complete yet. Added Paths: ----------- csw/mgar/pkg/freehdl/ csw/mgar/pkg/freehdl/branches/ csw/mgar/pkg/freehdl/tags/ csw/mgar/pkg/freehdl/trunk/ csw/mgar/pkg/freehdl/trunk/Makefile csw/mgar/pkg/freehdl/trunk/checksums csw/mgar/pkg/freehdl/trunk/files/ csw/mgar/pkg/freehdl/trunk/files/0000-Mirring-strings.h-include.patch Property changes on: csw/mgar/pkg/freehdl/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/freehdl/trunk/Makefile =================================================================== --- csw/mgar/pkg/freehdl/trunk/Makefile (rev 0) +++ csw/mgar/pkg/freehdl/trunk/Makefile 2009-11-06 22:20:33 UTC (rev 7154) @@ -0,0 +1,32 @@ +GARNAME = freehdl +GARVERSION = 0.0.7 +CATEGORIES = devel + +DESCRIPTION = A project to develop a free, open source, GPL'ed VHDL simulator for Linux! +define BLURB +To develop a VHDL simulator that: + o Has a graphical waveform viewer. + o Has a source level debugger. + o Is VHDL-93 compliant. + o Is of commercial quality. (on par with, say, V-System - it'll take us a while to get there, but that should be our aim) + o Is freely distributable - both source and binaries - like Linux itself. (Under the Gnu General Public License (GPL)). +endef + +MASTER_SITES = http://freehdl.seul.org/~enaroska/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0000-Mirring-strings.h-include.patch + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +GARCOMPILER = GNU + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_SCRIPTS = + +include gar/category.mk Added: csw/mgar/pkg/freehdl/trunk/checksums =================================================================== --- csw/mgar/pkg/freehdl/trunk/checksums (rev 0) +++ csw/mgar/pkg/freehdl/trunk/checksums 2009-11-06 22:20:33 UTC (rev 7154) @@ -0,0 +1 @@ +6d702aa188fb2c62f8cfca5a2f66d956 freehdl-0.0.7.tar.gz Added: csw/mgar/pkg/freehdl/trunk/files/0000-Mirring-strings.h-include.patch =================================================================== --- csw/mgar/pkg/freehdl/trunk/files/0000-Mirring-strings.h-include.patch (rev 0) +++ csw/mgar/pkg/freehdl/trunk/files/0000-Mirring-strings.h-include.patch 2009-11-06 22:20:33 UTC (rev 7154) @@ -0,0 +1,11 @@ +diff -r -u freehdl-0.0.7/kernel/fhdl_stream.cc freehdl-0.0.7.fixed/kernel/fhdl_stream.cc +--- freehdl-0.0.7/kernel/fhdl_stream.cc 2006-01-12 09:05:01.000000000 +0100 ++++ freehdl-0.0.7.fixed/kernel/fhdl_stream.cc 2009-11-06 23:04:00.469398404 +0100 +@@ -6,6 +6,7 @@ + #include + #include + #include ++#include + + + // Error stream to output error messages generated by the kernel, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Nov 7 00:07:29 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 06 Nov 2009 23:07:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[7155] csw/mgar/pkg/openssl1/trunk Message-ID: Revision: 7155 http://gar.svn.sourceforge.net/gar/?rev=7155&view=rev Author: chninkel Date: 2009-11-06 23:07:28 +0000 (Fri, 06 Nov 2009) Log Message: ----------- openssl1: updated to 1.0.0-beta3 Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/openssl1/trunk/files/i.conf csw/mgar/pkg/openssl1/trunk/files/pkcs11_engine-0.9.8h.patch.2008-07-29 csw/mgar/pkg/openssl1/trunk/files/r.conf Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2009-11-06 22:20:33 UTC (rev 7154) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2009-11-06 23:07:28 UTC (rev 7155) @@ -1,5 +1,5 @@ ##################################################################### -# OpenCSW build recipe for openssl 1.x +# OpenCSW build recipe for OpenSSL # # Copyright 2009 Yann Rouillard # All rights reserved. Use is subject to license terms. @@ -13,12 +13,9 @@ ###### Package information ####### GARNAME = openssl -GARVERSION = 1.0.0-beta2 +GARVERSION = 1.0.0-beta3 CATEGORIES = lib -OPENSSL_VERSION := $(shell echo $(GARVERSION) | cut -d- -f1) -OPENSSL_RELEASE := $(shell echo $(GARVERSION) | cut -d- -f2) - DESCRIPTION = The Open Source toolkit for SSL and TLS define BLURB The OpenSSL Project is a collaborative effort to develop a robust, @@ -32,18 +29,29 @@ CATALOGNAME_CSWossl1rt = openssl1_rt REQUIRED_PKGS_CSWossl1rt = CSWcacertificates SPKG_DESC_CSWossl1rt = Openssl 1.0 runtime libraries -PKGFILES_CSWossl1rt = $(PKGFILES_RT) +PKGFILES_CSWossl1rt = $(libdir).*\.so(\.\d+)* +PKGFILES_CSWossl1rt += $(sysconfdir)/etc/ssl/private $(prefix)/ssl/private $(prefix)/ssl/certs /etc/$(prefix)/ssl/private +PKGFILES_CSWossl1rt += $(docdir)/openssl1_rt/.* CATALOGNAME_CSWossl1devel = openssl1_devel REQUIRED_PKGS_CSWossl1devel = CSWossl1rt SPKG_DESC_CSWossl1devel = Openssl 1.0 development support files -PKGFILES_CSWossl1devel = $(PKGFILES_DEVEL) +PKGFILES_CSWossl1devel = $(PKGFILES_DEVEL) +PKGFILES_CSWossl1devel += $(docdir)/openssl1_devel/.* CATALOGNAME_CSWossl1utils = openssl1_utils REQUIRED_PKGS_CSWossl1utils = CSWossl1rt SPKG_DESC_CSWossl1utils = Openssl 1.0 binaries and related tools +SPKG_CLASSES_CSWossl1utils = none cswpreserveconf +PKGFILES_CSWossl1utils = $(bindir)/[^/]* $(mandir)/man1/.* $(mandir)/man5/.* $(mandir)/man7/.* +PKGFILES_CSWossl1utils += $(prefix)/ssl/misc/.* +PKGFILES_CSWossl1utils += $(prefix)/ssl/openssl\.cnf $(sysconfdir)/ssl/openssl\.cnf.* +PKGFILES_CSWossl1utils += $(docdir)/openssl1_utils/.* -SPKG_CLASSES = none conf +PROTOTYPE_MODIFIERS = conf +PROTOTYPE_FILES_conf = $(sysconfdir)/ssl/openssl.cnf.CSW +PROTOTYPE_CLASS_conf = cswpreserveconf +PROTOTYPE_PERMS_conf = 0644 ###### Upstream and opencsw files information ####### @@ -53,22 +61,19 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*[a-z]?).tar.gz -DISTNAME = $(GARNAME)-$(GARVERSION) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += CSWossl1rt.checkinstall CSWossl1rt.preinstall CSWossl1rt.postinstall +DISTFILES += CSWossl1rt.checkinstall CSWossl1rt.preinstall CSWossl1rt.postinstall DISTFILES += changelog.CSW README.CSW -DISTFILES += i.conf r.conf DOCFILES = CHANGES CHANGES.SSLeay PROBLEMS README FAQ README.ASN1 INSTALL NEWS README.ENGINE -# add ... -PATCHFILES += more_configure_targets.patch +# This patch add optimised build targets for some solaris isa, ie: +# solaris-pentium_pro-cc and solaris-sparcv9+vis-cc +PATCHFILES = more_configure_targets.patch ##### Build and installation information ##### -ENABLE_CHECK = 0 - # The list of instructions set for which we will # provide optimized libraries and binaries EXTRA_BUILD_ISAS_i386 = pentium_pro amd64 @@ -77,18 +82,20 @@ # we don't yet use isaexec support so we disable # isa relocation for default isa NO_ISAEXEC = 1 + # GAR wants and puts sparcv9 in lib/64 but openssl build system # isn't the standard autoconf/automake one so we disable this # relocation for now ISALIBDIR_sparcv9 = . libdir = /opt/csw/lib -# we redefine the default merge exclude so *.a files are not excluded -MERGE_EXCLUDE_DEFAULT = $(MERGE_EXCLUDE_INFODIR) +# we include *.a files in the devel package so we don't want them excluded +MERGE_EXCLUDE_STATICLIBS = # The corresponding os/compiler to pass to the # openssl Configure script i386_OS_COMPILER = solaris-x86-cc +pentium_OS_COMPILER = solaris-pentium-cc pentium_pro_OS_COMPILER = solaris-pentium_pro-cc amd64_OS_COMPILER = solaris64-x86_64-cc @@ -112,16 +119,9 @@ # /opt/csw/ssl/man, but we want them under /opt/csw/share/man INSTALL_ARGS += MANDIR=$(mandir) -SKIPTEST = 1 - - include gar/category.mk -# we redefine the timestamp to fulfill opencsw standard -SPKG_VERSION := $(OPENSSL_VERSION) -SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(OPENSSL_RELEASE) - pre-configure-modulated: echo " ==> Creating configure script" cd $(WORKSRC) && ln -nf Configure configure @@ -142,7 +142,7 @@ install-doc: for CATALOGNAME in $(foreach PKG, $(PACKAGES), $(call catalogname,$(PKG))); do \ - ginstall -d $(DOCFILES) $(PKGROOT)/$(docdir)/$$CATALOGNAME; \ + ginstall -d $(PKGROOT)/$(docdir)/$$CATALOGNAME; \ (cd $(WORKSRC_FIRSTMOD)/ && ginstall $(DOCFILES) $(PKGROOT)/$(docdir)/$$CATALOGNAME/); \ ginstall -D $(WORKDIR_FIRSTMOD)/README.CSW $(PKGROOT)/$(docdir)/$$CATALOGNAME/README.CSW; \ done @@ -150,7 +150,12 @@ install-certs: [ -f $(PKGROOT)$(prefix)/ssl/openssl.cnf ] && \ - ginstall -D $(PKGROOT)$(prefix)/ssl/openssl.cnf $(PKGROOT)$(sysconfdir)/ssl/openssl.cnf + ginstall -D $(PKGROOT)$(prefix)/ssl/openssl.cnf $(PKGROOT)$(sysconfdir)/ssl/openssl.cnf.CSW + ginstall -d $(PKGROOT)/etc/$(prefix)/ssl/private + rm -rf $(PKGROOT)/$(prefix)/ssl/openssl.cnf && ln -s ../etc/ssl/openssl.cnf $(PKGROOT)/$(prefix)/ssl/openssl.cnf + rm -rf $(PKGROOT)/$(prefix)/ssl/certs && ln -s ../etc/ssl/certs $(PKGROOT)/$(prefix)/ssl/certs + rm -rf $(PKGROOT)/$(prefix)/ssl/private && ln -s ../../../etc/opt/csw/ssl/private $(PKGROOT)/$(prefix)/ssl/private + rm -rf $(PKGROOT)/$(prefix)/etc/ssl/private && ln -s ../../../../etc/opt/csw/ssl/private $(PKGROOT)/$(prefix)/etc/ssl/private + @$(MAKECOOKIE) post-merge: install-certs install-changelog install-doc - Deleted: csw/mgar/pkg/openssl1/trunk/files/i.conf =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/i.conf 2009-11-06 22:20:33 UTC (rev 7154) +++ csw/mgar/pkg/openssl1/trunk/files/i.conf 2009-11-06 23:07:28 UTC (rev 7155) @@ -1,54 +0,0 @@ -# -# Copyright 2006 Yann Rouillard -# All rights reserved. Use is subject to license terms. -# -# Redistribution and/or use, with or without modification, is -# permitted. This code is without warranty of any kind. The -# author(s) shall not be liable in the event that use of the -# software causes damage. -# -# i.conf - class script which install configuration files -# -# If the configuration file already exists on the filesystem, -# this script will let the existing file intact and will -# install a copy of the file provided in the package suffixed -# with .CSW -# except for service configuration files which are always installed -# CSW suffixed under Solaris 9 as they are used to enable/disable -# a service according to opencsw standards. -# -umask 0022 - -if [ -z "$PKG_INSTALL_ROOT" ]; then - PKG_INSTALL_ROOT=/ -fi - -while read SRC DEST; do - if [ -f "${PKG_INSTALL_ROOT}/$DEST" ]; then - cp "$SRC" "${PKG_INSTALL_ROOT}/$DEST.CSW" - else - cp "$SRC" "${PKG_INSTALL_ROOT}/$DEST" - fi -done - -# Unfortunately pkgadd doesn't backup the source file if the destination file is identical. -# It's a problem with zones installation where pkgadd try to find the backup files, so -# we do the backup manually -awk '{ if ( $3 == "conf" ) print $2,$3,$4,$5,$6,$7 }' $INST_DATADIR/$PKG/pkgmap | \ - while read FTYPE CLASS FPATH MODE OWNER GROUP; do - if echo $FPATH | grep "^/" >/dev/null; then - INST_PATH="$INST_DATADIR/$PKG/root/$FPATH" - SAVE_PATH="$PKGSAV/pspool/$PKG/root/$FPATH" - else - INST_PATH="$INST_DATADIR/$PKG/reloc/$FPATH" - SAVE_PATH="$PKGSAV/pspool/$PKG/reloc/$FPATH" - fi - - if [ ! -f "$SAVE_PATH" ]; then - mkdir -p "`LANG=C dirname $SAVE_PATH`" - cp "$INST_PATH" "$SAVE_PATH" - fi - done - -exit 0 - Deleted: csw/mgar/pkg/openssl1/trunk/files/pkcs11_engine-0.9.8h.patch.2008-07-29 =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/pkcs11_engine-0.9.8h.patch.2008-07-29 2009-11-06 22:20:33 UTC (rev 7154) +++ csw/mgar/pkg/openssl1/trunk/files/pkcs11_engine-0.9.8h.patch.2008-07-29 2009-11-06 23:07:28 UTC (rev 7155) @@ -1,10168 +0,0 @@ -diff -urN openssl-0.9.8j/Configure openssl-0.9.8j.new/Configure ---- openssl-0.9.8j/Configure 2008-12-29 01:18:23.000000000 +0100 -+++ openssl-0.9.8j.new/Configure 2009-02-15 22:26:02.669766669 +0100 -@@ -21,6 +21,9 @@ - # --prefix prefix for the OpenSSL include, lib and bin directories - # (Default: the OPENSSLDIR directory) - # -+# --pk11-libname PKCS#11 library name. -+# (Default: none) -+# - # --install_prefix Additional prefix for package builders (empty by - # default). This needn't be set in advance, you can - # just as well use "make INSTALL_PREFIX=/whatever install". -@@ -575,6 +578,8 @@ - my $idx_ranlib = $idx++; - my $idx_arflags = $idx++; - -+my $pk11_libname=""; -+ - my $prefix=""; - my $openssldir=""; - my $exe_ext=""; -@@ -807,6 +812,10 @@ - { - $flags.=$_." "; - } -+ elsif (/^--pk11-libname=(.*)$/) -+ { -+ $pk11_libname=$1; -+ } - elsif (/^--prefix=(.*)$/) - { - $prefix=$1; -@@ -938,6 +947,13 @@ - exit 0; - } - -+if (! $pk11_libname) -+ { -+ print STDERR "You must set --pk11-libname for PKCS#11 library.\n"; -+ print STDERR "See README.pkcs11 for more information.\n"; -+ exit 1; -+ } -+ - if ($target =~ m/^CygWin32(-.*)$/) { - $target = "Cygwin".$1; - } -@@ -1095,6 +1111,8 @@ - if ($flags ne "") { $cflags="$flags$cflags"; } - else { $no_user_cflags=1; } - -+$cflags="-DPK11_LIB_LOCATION=\"$pk11_libname\" $cflags"; -+ - # Kerberos settings. The flavor must be provided from outside, either through - # the script "config" or manually. - if (!$no_krb5) -@@ -1446,6 +1464,7 @@ - s/^VERSION=.*/VERSION=$version/; - s/^MAJOR=.*/MAJOR=$major/; - s/^MINOR=.*/MINOR=$minor/; -+ s/^PK11_LIB_LOCATION=.*/PK11_LIB_LOCATION=$pk11_libname/; - s/^SHLIB_VERSION_NUMBER=.*/SHLIB_VERSION_NUMBER=$shlib_version_number/; - s/^SHLIB_VERSION_HISTORY=.*/SHLIB_VERSION_HISTORY=$shlib_version_history/; - s/^SHLIB_MAJOR=.*/SHLIB_MAJOR=$shlib_major/; -diff -urN openssl-0.9.8j/Makefile.org openssl-0.9.8j.new/Makefile.org ---- openssl-0.9.8j/Makefile.org 2008-12-30 14:26:26.000000000 +0100 -+++ openssl-0.9.8j.new/Makefile.org 2009-02-15 22:26:02.673236044 +0100 -@@ -26,6 +26,9 @@ - INSTALL_PREFIX= - INSTALLTOP=/usr/local/ssl - -+# You must set this through --pk11-libname configure option. -+PK11_LIB_LOCATION= -+ - # Do not edit this manually. Use Configure --openssldir=DIR do change this! - OPENSSLDIR=/usr/local/ssl - -diff -urN openssl-0.9.8j/README.pkcs11 openssl-0.9.8j.new/README.pkcs11 ---- openssl-0.9.8j/README.pkcs11 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-0.9.8j.new/README.pkcs11 2009-02-15 22:26:02.675891756 +0100 -@@ -0,0 +1,159 @@ -+PKCS#11 engine support for OpenSSL 0.9.8h -+========================================= -+ -+[July 29, 2008] -+ -+This patch containing code available in OpenSolaris adds support for PKCS#11 -+engine into OpenSSL and implements PKCS#11 v2.20. It is to be applied against -+OpenSSL 0.9.8h source code distribution as shipped by OpenSSL.Org. Your system -+must provide PKCS#11 backend otherwise the patch is useless. You provide the -+PKCS#11 library name during the build configuration phase, see below. -+ -+Patch can be applied like this: -+ -+ # NOTE: use gtar if on Solaris -+ tar xfzv openssl-0.9.8h.tar.gz -+ # now download the patch to the current directory -+ # ... -+ cd openssl-0.9.8h -+ # NOTE: use gpatch if on Solaris -+ patch -p1 < ../pkcs11_engine-0.9.8h.patch.2008-07-29 -+ -+It is designed to support pure acceleration for RSA, DSA, DH and all the -+symetric ciphers and message digest algorithms that PKCS#11 and OpenSSL share -+except for missing support for patented algorithms MDC2, RC3, RC5 and IDEA. -+ -+According to the PKCS#11 providers installed on your machine, it can support -+following mechanisms: -+ -+ RSA, DSA, DH, RAND, DES-CBC, DES-EDE3-CBC, DES-ECB, DES-EDE3, RC4, -+ AES-128-CBC, AES-192-CBC, AES-256-CBC, AES-128-ECB, AES-192-ECB, -+ AES-256-ECB, AES-128-CTR, AES-192-CTR, AES-256-CTR, MD5, SHA1, SHA224, -+ SHA256, SHA384, SHA512 -+ -+Note that for AES counter mode the application must provide their own EVP -+functions since OpenSSL doesn't support counter mode through EVP yet. You may -+see OpenSSH source code (cipher.c) to get the idea how to do that. -+ -++------------------------------------------------------------------------------+ -+| NOTE: this patch version does NOT contain experimental code for accessing | -+| RSA keys stored in pkcs#11 key stores by reference. Some problems were found | -+| (thanks to all who wrote me!) and due to my ENOTIME problem I'll address | -+| those issues in the next version of the patch that will have that code back, | -+| hopefully fixed. | -++------------------------------------------------------------------------------+ -+ -+You must provide the location of PKCS#11 library in your system to the -+configure script. You will be instructed to do that when you try to run the -+config script: -+ -+ $ ./config -+ Operating system: i86pc-whatever-solaris2 -+ Configuring for solaris-x86-cc -+ You must set --pk11-libname for PKCS#11 library. -+ See README.pkcs11 for more information. -+ -+Taking openCryptoki project on Linux AMD64 box as an example, you would run -+configure like this: -+ -+ ./config --pk11-libname=/usr/lib64/pkcs11/PKCS11_API.so -+ -+To check whether newly built openssl really supports PKCS#11 it's enough to -+run "apps/openssl engine" and look for "(pkcs11) PKCS #11 engine support" in -+the output. -+ -+This patch was tested on Solaris against PKCS#11 engine available from Solaris -+Cryptographic Framework (Solaris 10 and OpenSolaris) and also on Linux using -+PKCS#11 libraries from openCryptoki project (see openCryptoki website -+http://sourceforge.net/projects/opencryptoki for more information). Some Linux -+distributions even ship those libraries with the system. The patch should work -+on any system that is supported by OpenSSL itself and has functional PKCS#11 -+library. -+ -+The patch contains "RSA Security Inc. PKCS #11 Cryptographic Token Interface -+(Cryptoki)" - files cryptoki.h, pkcs11.h, pkcs11f.h and pkcs11t.h which are -+copyrighted by RSA Security Inc., see pkcs11.h for more information. -+ -+Other added/modified code in this patch is copyrighted by Sun Microsystems, -+Inc. and is released under the OpenSSL license (see LICENSE file for more -+information). -+ -+Revisions of patch for 0.9.8 branch -+=================================== -+ -+2008-07-29 -+- update the patch to OpenSSL 0.9.8h version -+- pkcs11t.h updated to the latest version: -+ -+ 6545665 make CKM_AES_CTR available to non-kernel users -+ -+- fixed bugs in the engine code: -+ -+ 6602801 PK11_SESSION cache has to employ reference counting scheme for -+ asymmetric key operations -+ 6605538 pkcs11 functions C_FindObjects[{Init,Final}]() not called -+ atomically -+ 6607307 pkcs#11 engine can't read RSA private keys -+ 6652362 pk11_RSA_finish() is cutting corners -+ 6662112 pk11_destroy_{rsa,dsa,dh}_key_objects() use locking in -+ suboptimal way -+ 6666625 pk11_destroy_{rsa,dsa,dh}_key_objects() should be more -+ resilient to destroy failures -+ 6667273 OpenSSL engine should not use free() but OPENSSL_free() -+ 6670363 PKCS#11 engine fails to reuse existing symmetric keys -+ 6678135 memory corruption in pk11_DH_generate_key() in pkcs#11 engine -+ 6678503 DSA signature conversion in pk11_dsa_do_verify() ignores size -+ of big numbers leading to failures -+ 6706562 pk11_DH_compute_key() returns 0 in case of failure instead of -+ -1 -+ 6706622 pk11_load_{pub,priv}key create corrupted RSA key references -+ 6707129 return values from BN_new() in pk11_DH_generate_key() are not -+ checked -+ 6707274 DSA/RSA/DH PKCS#11 engine operations need to be resistant to -+ structure reuse -+ 6707782 OpenSSL PKCS#11 engine pretends to be aware of -+ OPENSSL_NO_{RSA,DSA,DH} -+ defines but fails miserably -+ 6709966 make check_new_*() to return values to indicate cache hit/miss -+ 6705200 pk11_dh struct initialization in PKCS#11 engine is missing -+ generate_params parameter -+ 6709513 PKCS#11 engine sets IV length even for ECB modes -+ 6728296 buffer length not initialized for C_(En|De)crypt_Final() in the -+ PKCS#11 engine -+ 6728871 PKCS#11 engine must reset global_session in pk11_finish() -+ -+- new features and enhancements: -+ -+ 6562155 OpenSSL pkcs#11 engine needs support for SHA224/256/384/512 -+ 6685012 OpenSSL pkcs#11 engine needs support for new cipher modes -+ 6725903 OpenSSL PKCS#11 engine shouldn't use soft token for symmetric -+ ciphers and digests -+ -+2007-10-15 -+- update for 0.9.8f version -+- update for "6607670 teach pkcs#11 engine how to use keys be reference" -+ -+2007-10-02 -+- draft for "6607670 teach pkcs#11 engine how to use keys be reference" -+- draft for "6607307 pkcs#11 engine can't read RSA private keys" -+ -+2007-09-26 -+- 6375348 Using pkcs11 as the SSLCryptoDevice with Apache/OpenSSL causes -+ significant performance drop -+- 6573196 memory is leaked when OpenSSL is used with PKCS#11 engine -+ -+2007-05-25 -+- 6558630 race in OpenSSL pkcs11 engine when using symetric block ciphers -+ -+2007-05-19 -+- initial patch for 0.9.8e using latest OpenSolaris code -+ -+ -+Feedback -+======== -+ -+Please send feedback to security-discuss at opensolaris.org. The patch was -+created by Jan.Pechanec at Sun.COM from code available in OpenSolaris. -+ -+Latest version should be always available on http://blogs.sun.com/janp. -+ -diff -urN openssl-0.9.8j/crypto/engine/Makefile openssl-0.9.8j.new/crypto/engine/Makefile ---- openssl-0.9.8j/crypto/engine/Makefile 2008-09-17 19:10:59.000000000 +0200 -+++ openssl-0.9.8j.new/crypto/engine/Makefile 2009-02-15 22:29:36.590747863 +0100 -@@ -21,12 +21,14 @@ - eng_table.c eng_pkey.c eng_fat.c eng_all.c \ - tb_rsa.c tb_dsa.c tb_ecdsa.c tb_dh.c tb_ecdh.c tb_rand.c tb_store.c \ - tb_cipher.c tb_digest.c \ -- eng_openssl.c eng_cnf.c eng_dyn.c eng_cryptodev.c eng_padlock.c -+ eng_openssl.c eng_cnf.c eng_dyn.c eng_cryptodev.c eng_padlock.c \ -+ hw_pk11.c hw_pk11_pub.c - LIBOBJ= eng_err.o eng_lib.o eng_list.o eng_init.o eng_ctrl.o \ - eng_table.o eng_pkey.o eng_fat.o eng_all.o \ - tb_rsa.o tb_dsa.o tb_ecdsa.o tb_dh.o tb_ecdh.o tb_rand.o tb_store.o \ - tb_cipher.o tb_digest.o \ -- eng_openssl.o eng_cnf.o eng_dyn.o eng_cryptodev.o eng_padlock.o -+ eng_openssl.o eng_cnf.o eng_dyn.o eng_cryptodev.o eng_padlock.o \ -+ hw_pk11.o hw_pk11_pub.o - - SRC= $(LIBSRC) - -@@ -286,6 +288,54 @@ - eng_table.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h - eng_table.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h - eng_table.o: eng_table.c -+hw_pk11.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -+hw_pk11.o: ../../include/openssl/engine.h ../../include/openssl/ossl_typ.h -+hw_pk11.o: ../../include/openssl/bn.h ../../include/openssl/rsa.h -+hw_pk11.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -+hw_pk11.o: ../../include/openssl/crypto.h ../../include/openssl/stack.h -+hw_pk11.o: ../../include/openssl/safestack.h ../../include/openssl/opensslv.h -+hw_pk11.o: ../../include/openssl/symhacks.h ../../include/openssl/dsa.h -+hw_pk11.o: ../../include/openssl/dh.h ../../include/openssl/rand.h -+hw_pk11.o: ../../include/openssl/ui.h ../../include/openssl/err.h -+hw_pk11.o: ../../include/openssl/lhash.h ../../include/openssl/dso.h -+hw_pk11.o: ../../include/openssl/pem.h ../../include/openssl/evp.h -+hw_pk11.o: ../../include/openssl/md2.h ../../include/openssl/md4.h -+hw_pk11.o: ../../include/openssl/md5.h ../../include/openssl/sha.h -+hw_pk11.o: ../../include/openssl/ripemd.h ../../include/openssl/des.h -+hw_pk11.o: ../../include/openssl/des_old.h ../../include/openssl/ui_compat.h -+hw_pk11.o: ../../include/openssl/rc4.h ../../include/openssl/rc2.h -+hw_pk11.o: ../../crypto/rc5/rc5.h ../../include/openssl/blowfish.h -+hw_pk11.o: ../../include/openssl/cast.h ../../include/openssl/idea.h -+hw_pk11.o: ../../crypto/mdc2/mdc2.h ../../include/openssl/aes.h -+hw_pk11.o: ../../include/openssl/objects.h ../../include/openssl/obj_mac.h -+hw_pk11.o: ../../include/openssl/x509.h ../../include/openssl/buffer.h -+hw_pk11.o: ../../include/openssl/x509_vfy.h ../../include/openssl/pkcs7.h -+hw_pk11.o: ../../include/openssl/pem2.h ../cryptlib.h -+hw_pk11.o: ../../e_os.h hw_pk11_err.c hw_pk11_err.h hw_pk11.c -+hw_pk11_pub.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -+hw_pk11_pub.o: ../../include/openssl/engine.h ../../include/openssl/ossl_typ.h -+hw_pk11_pub.o: ../../include/openssl/bn.h ../../include/openssl/rsa.h -+hw_pk11_pub.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -+hw_pk11_pub.o: ../../include/openssl/crypto.h ../../include/openssl/stack.h -+hw_pk11_pub.o: ../../include/openssl/safestack.h ../../include/openssl/opensslv.h -+hw_pk11_pub.o: ../../include/openssl/symhacks.h ../../include/openssl/dsa.h -+hw_pk11_pub.o: ../../include/openssl/dh.h ../../include/openssl/rand.h -+hw_pk11_pub.o: ../../include/openssl/ui.h ../../include/openssl/err.h -+hw_pk11_pub.o: ../../include/openssl/lhash.h ../../include/openssl/dso.h -+hw_pk11_pub.o: ../../include/openssl/pem.h ../../include/openssl/evp.h -+hw_pk11_pub.o: ../../include/openssl/md2.h ../../include/openssl/md4.h -+hw_pk11_pub.o: ../../include/openssl/md5.h ../../include/openssl/sha.h -+hw_pk11_pub.o: ../../include/openssl/ripemd.h ../../include/openssl/des.h -+hw_pk11_pub.o: ../../include/openssl/des_old.h ../../include/openssl/ui_compat.h -+hw_pk11_pub.o: ../../include/openssl/rc4.h ../../include/openssl/rc2.h -+hw_pk11_pub.o: ../../crypto/rc5/rc5.h ../../include/openssl/blowfish.h -+hw_pk11_pub.o: ../../include/openssl/cast.h ../../include/openssl/idea.h -+hw_pk11_pub.o: ../../crypto/mdc2/mdc2.h ../../include/openssl/aes.h -+hw_pk11_pub.o: ../../include/openssl/objects.h ../../include/openssl/obj_mac.h -+hw_pk11_pub.o: ../../include/openssl/x509.h ../../include/openssl/buffer.h -+hw_pk11_pub.o: ../../include/openssl/x509_vfy.h ../../include/openssl/pkcs7.h -+hw_pk11_pub.o: ../../include/openssl/pem2.h ../cryptlib.h -+hw_pk11_pub.o: ../../e_os.h hw_pk11_err.c hw_pk11_err.h hw_pk11_pub.c - tb_cipher.o: ../../e_os.h ../../include/openssl/asn1.h - tb_cipher.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h - tb_cipher.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -diff -urN openssl-0.9.8j/crypto/engine/cryptoki.h openssl-0.9.8j.new/crypto/engine/cryptoki.h ---- openssl-0.9.8j/crypto/engine/cryptoki.h 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-0.9.8j.new/crypto/engine/cryptoki.h 2009-02-15 22:26:02.684405873 +0100 -@@ -0,0 +1,103 @@ -+/* -+ * CDDL HEADER START -+ * -+ * The contents of this file are subject to the terms of the -+ * Common Development and Distribution License, Version 1.0 only -+ * (the "License"). You may not use this file except in compliance -+ * with the License. -+ * -+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -+ * or http://www.opensolaris.org/os/licensing. -+ * See the License for the specific language governing permissions -+ * and limitations under the License. -+ * -+ * When distributing Covered Code, include this CDDL HEADER in each -+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE. -+ * If applicable, add the following below this CDDL HEADER, with the -+ * fields enclosed by brackets "[]" replaced with your own identifying -+ * information: Portions Copyright [yyyy] [name of copyright owner] -+ * -+ * CDDL HEADER END -+ */ -+/* -+ * Copyright 2003 Sun Microsystems, Inc. All rights reserved. -+ * Use is subject to license terms. -+ */ -+ -+#ifndef _CRYPTOKI_H -+#define _CRYPTOKI_H -+ -+#pragma ident "@(#)cryptoki.h 1.2 05/06/08 SMI" -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+#ifndef CK_PTR -+#define CK_PTR * -+#endif -+ -+#ifndef CK_DEFINE_FUNCTION -+#define CK_DEFINE_FUNCTION(returnType, name) returnType name -+#endif -+ -+#ifndef CK_DECLARE_FUNCTION -+#define CK_DECLARE_FUNCTION(returnType, name) returnType name -+#endif -+ -+#ifndef CK_DECLARE_FUNCTION_POINTER -+#define CK_DECLARE_FUNCTION_POINTER(returnType, name) returnType (* name) -+#endif -+ -+#ifndef CK_CALLBACK_FUNCTION -+#define CK_CALLBACK_FUNCTION(returnType, name) returnType (* name) -+#endif -+ -+#ifndef NULL_PTR -+#include /* For NULL */ -+#define NULL_PTR NULL -+#endif -+ -+/* -+ * pkcs11t.h defines TRUE and FALSE in a way that upsets lint -+ */ -+#ifndef CK_DISABLE_TRUE_FALSE -+#define CK_DISABLE_TRUE_FALSE -+#ifndef TRUE -+#define TRUE 1 -+#endif /* TRUE */ -+#ifndef FALSE -+#define FALSE 0 -+#endif /* FALSE */ -+#endif /* CK_DISABLE_TRUE_FALSE */ -+ -+#undef CK_PKCS11_FUNCTION_INFO -+ -+#include "pkcs11.h" -+ -+/* Solaris specific functions */ -+ -+#include -+ -+/* -+ * SUNW_C_GetMechSession will initialize the framework and do all -+ * the necessary PKCS#11 calls to create a session capable of -+ * providing operations on the requested mechanism -+ */ -+CK_RV SUNW_C_GetMechSession(CK_MECHANISM_TYPE mech, -+ CK_SESSION_HANDLE_PTR hSession); -+ -+/* -+ * SUNW_C_KeyToObject will create a secret key object for the given -+ * mechanism from the rawkey data. -+ */ -+CK_RV SUNW_C_KeyToObject(CK_SESSION_HANDLE hSession, -+ CK_MECHANISM_TYPE mech, const void *rawkey, size_t rawkey_len, -+ CK_OBJECT_HANDLE_PTR obj); -+ -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif /* _CRYPTOKI_H */ -diff -urN openssl-0.9.8j/crypto/engine/eng_all.c openssl-0.9.8j.new/crypto/engine/eng_all.c ---- openssl-0.9.8j/crypto/engine/eng_all.c 2008-06-04 20:01:39.000000000 +0200 -+++ openssl-0.9.8j.new/crypto/engine/eng_all.c 2009-02-15 22:26:02.687356494 +0100 -@@ -110,6 +110,9 @@ - #if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG) - ENGINE_load_capi(); - #endif -+#ifndef OPENSSL_NO_HW_PKCS11 -+ ENGINE_load_pk11(); -+#endif - #endif - } - -diff -urN openssl-0.9.8j/crypto/engine/engine.h openssl-0.9.8j.new/crypto/engine/engine.h ---- openssl-0.9.8j/crypto/engine/engine.h 2008-06-04 20:01:40.000000000 +0200 -+++ openssl-0.9.8j.new/crypto/engine/engine.h 2009-02-15 22:26:02.691825491 +0100 -@@ -337,6 +337,7 @@ - void ENGINE_load_ubsec(void); - #endif - void ENGINE_load_cryptodev(void); -+void ENGINE_load_pk11(void); - void ENGINE_load_padlock(void); - void ENGINE_load_builtin_engines(void); - #ifndef OPENSSL_NO_CAPIENG -diff -urN openssl-0.9.8j/crypto/engine/hw_pk11.c openssl-0.9.8j.new/crypto/engine/hw_pk11.c ---- openssl-0.9.8j/crypto/engine/hw_pk11.c 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-0.9.8j.new/crypto/engine/hw_pk11.c 2009-02-15 22:26:02.715171244 +0100 -@@ -0,0 +1,3382 @@ -+/* -+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved. -+ * Use is subject to license terms. -+ */ -+ -+#pragma ident "@(#)hw_pk11.c 1.14 08/07/28 SMI" -+ -+/* crypto/engine/hw_pk11.c */ -+/* This product includes software developed by the OpenSSL Project for -+ * use in the OpenSSL Toolkit (http://www.openssl.org/). -+ * -+ * This project also referenced hw_pkcs11-0.9.7b.patch written by -+ * Afchine Madjlessi. -+ */ -+/* ==================================================================== -+ * Copyright (c) 2000-2001 The OpenSSL Project. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in -+ * the documentation and/or other materials provided with the -+ * distribution. -+ * -+ * 3. All advertising materials mentioning features or use of this -+ * software must display the following acknowledgment: -+ * "This product includes software developed by the OpenSSL Project -+ * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" -+ * -+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to -+ * endorse or promote products derived from this software without -+ * prior written permission. For written permission, please contact -+ * licensing at OpenSSL.org. -+ * -+ * 5. Products derived from this software may not be called "OpenSSL" -+ * nor may "OpenSSL" appear in their names without prior written -+ * permission of the OpenSSL Project. -+ * -+ * 6. Redistributions of any form whatsoever must retain the following -+ * acknowledgment: -+ * "This product includes software developed by the OpenSSL Project -+ * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY -+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR -+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -+ * OF THE POSSIBILITY OF SUCH DAMAGE. -+ * ==================================================================== -+ * -+ * This product includes cryptographic software written by Eric Young -+ * (eay at cryptsoft.com). This product includes software written by Tim -+ * Hudson (tjh at cryptsoft.com). -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#ifndef OPENSSL_NO_RSA -+#include -+#endif -+#ifndef OPENSSL_NO_DSA -+#include -+#endif -+#ifndef OPENSSL_NO_DH -+#include -+#endif -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#ifndef OPENSSL_NO_HW -+#ifndef OPENSSL_NO_HW_PK11 -+ -+/* label for debug messages printed on stderr */ -+#define PK11_DBG "PKCS#11 ENGINE DEBUG" -+/* prints a lot of debug messages on stderr about slot selection process */ -+#undef DEBUG_SLOT_SELECTION -+/* -+ * Solaris specific code. See comment at check_hw_mechanisms() for more -+ * information. -+ */ -+#undef SOLARIS_HW_SLOT_SELECTION -+ -+/* -+ * AES counter mode is not supported in the OpenSSL EVP API yet and neither -+ * there are official OIDs for mechanisms based on this mode. With our changes, -+ * an application can define its own EVP calls for AES counter mode and then -+ * it can make use of hardware acceleration through this engine. However, it's -+ * better if we keep AES CTR support code under ifdef's. -+ */ -+#define SOLARIS_AES_CTR -+ -+#include "cryptoki.h" -+#include "pkcs11.h" -+#include "hw_pk11_err.c" -+ -+#ifdef SOLARIS_AES_CTR -+/* -+ * NIDs for AES counter mode that will be defined during the engine -+ * initialization. -+ */ -+int NID_aes_128_ctr = NID_undef; -+int NID_aes_192_ctr = NID_undef; -+int NID_aes_256_ctr = NID_undef; -+#endif /* SOLARIS_AES_CTR */ -+ -+#ifdef SOLARIS_HW_SLOT_SELECTION -+/* -+ * Tables for symmetric ciphers and digest mechs found in the pkcs11_kernel -+ * library. See comment at check_hw_mechanisms() for more information. -+ */ -+int *hw_cnids; -+int *hw_dnids; -+#endif /* SOLARIS_HW_SLOT_SELECTION */ -+ -+/* -+ * Heads of the free PK11 session lists. We have three groups of algorithms in -+ * the engine. Public key mechanisms, random operations, and symetric ciphers -+ * and digests. We can use a different slot for each group so we must keep a -+ * separate cache of sessions for them. -+ */ -+static struct PK11_SESSION_st *pubkey_free_session = NULL; -+static struct PK11_SESSION_st *rand_free_session = NULL; -+static struct PK11_SESSION_st *free_session = NULL; -+ -+/* Create all secret key objects in a global session so that they are available -+ * to use for other sessions. These other sessions may be opened or closed -+ * without losing the secret key objects */ -+static CK_SESSION_HANDLE global_session = CK_INVALID_HANDLE; -+ -+/* ENGINE level stuff */ -+static int pk11_init(ENGINE *e); -+static int pk11_library_init(ENGINE *e); -+static int pk11_finish(ENGINE *e); -+static int pk11_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)()); -+static int pk11_destroy(ENGINE *e); -+ -+/* RAND stuff */ -+static void pk11_rand_seed(const void *buf, int num); -+static void pk11_rand_add(const void *buf, int num, double add_entropy); -+static void pk11_rand_cleanup(void); -+static int pk11_rand_bytes(unsigned char *buf, int num); -+static int pk11_rand_status(void); -+ -+/* These functions are also used in other files */ -+PK11_SESSION *pk11_get_session(PK11_OPTYPE optype); -+void pk11_return_session(PK11_SESSION *sp, PK11_OPTYPE optype); -+ -+/* active list manipulation functions used here */ -+int pk11_active_delete(CK_OBJECT_HANDLE h); -+ -+#ifndef OPENSSL_NO_RSA -+int pk11_destroy_rsa_key_objects(PK11_SESSION *session); -+int pk11_destroy_rsa_object_pub(PK11_SESSION *sp, CK_BBOOL uselock); -+int pk11_destroy_rsa_object_priv(PK11_SESSION *sp, CK_BBOOL uselock); -+#endif -+#ifndef OPENSSL_NO_DSA -+int pk11_destroy_dsa_key_objects(PK11_SESSION *session); -+int pk11_destroy_dsa_object_pub(PK11_SESSION *sp, CK_BBOOL uselock); -+int pk11_destroy_dsa_object_priv(PK11_SESSION *sp, CK_BBOOL uselock); -+#endif -+#ifndef OPENSSL_NO_DH -+int pk11_destroy_dh_key_objects(PK11_SESSION *session); -+int pk11_destroy_dh_object(PK11_SESSION *session, CK_BBOOL uselock); -+#endif -+ -+/* Local helper functions */ -+static int pk11_free_all_sessions(void); -+static int pk11_free_session_list(PK11_SESSION **sp); -+static int pk11_setup_session(PK11_SESSION *sp, PK11_OPTYPE optype); -+static int pk11_destroy_cipher_key_objects(PK11_SESSION *session); -+static int pk11_destroy_object(CK_SESSION_HANDLE session, -+ CK_OBJECT_HANDLE oh); -+static const char *get_PK11_LIBNAME(void); -+static void free_PK11_LIBNAME(void); -+static long set_PK11_LIBNAME(const char *name); -+ -+/* Symmetric cipher and digest support functions */ -+static int cipher_nid_to_pk11(int nid); -+#ifdef SOLARIS_AES_CTR -+static int pk11_add_NID(char *sn, char *ln); -+static int pk11_add_aes_ctr_NIDs(void); -+#endif /* SOLARIS_AES_CTR */ -+static int pk11_usable_ciphers(const int **nids); -+static int pk11_usable_digests(const int **nids); -+static int pk11_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key, -+ const unsigned char *iv, int enc); -+static int pk11_cipher_final(PK11_SESSION *sp); -+static int pk11_cipher_do_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, -+ const unsigned char *in, unsigned int inl); -+static int pk11_cipher_cleanup(EVP_CIPHER_CTX *ctx); -+static int pk11_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher, -+ const int **nids, int nid); -+static int pk11_engine_digests(ENGINE *e, const EVP_MD **digest, -+ const int **nids, int nid); -+static CK_OBJECT_HANDLE pk11_get_cipher_key(EVP_CIPHER_CTX *ctx, -+ const unsigned char *key, CK_KEY_TYPE key_type, PK11_SESSION *sp); -+static int check_new_cipher_key(PK11_SESSION *sp, const unsigned char *key, -+ int key_len); -+static int md_nid_to_pk11(int nid); -+static int pk11_digest_init(EVP_MD_CTX *ctx); -+static int pk11_digest_update(EVP_MD_CTX *ctx,const void *data, -+ size_t count); -+static int pk11_digest_final(EVP_MD_CTX *ctx,unsigned char *md); -+static int pk11_digest_copy(EVP_MD_CTX *to,const EVP_MD_CTX *from); -+static int pk11_digest_cleanup(EVP_MD_CTX *ctx); -+ -+static int pk11_choose_slots(int *any_slot_found); -+static void pk11_find_symmetric_ciphers(CK_FUNCTION_LIST_PTR pflist, -+ CK_SLOT_ID current_slot, int *current_slot_n_cipher, -+ int *local_cipher_nids); -+static void pk11_find_digests(CK_FUNCTION_LIST_PTR pflist, -+ CK_SLOT_ID current_slot, int *current_slot_n_digest, -+ int *local_digest_nids); -+static void pk11_get_symmetric_cipher(CK_FUNCTION_LIST_PTR, int slot_id, -+ CK_MECHANISM_TYPE mech, int *current_slot_n_cipher, int *local_cipher_nids, -+ int id); -+static void pk11_get_digest(CK_FUNCTION_LIST_PTR pflist, int slot_id, -+ CK_MECHANISM_TYPE mech, int *current_slot_n_digest, int *local_digest_nids, -+ int id); -+ -+#ifdef SOLARIS_HW_SLOT_SELECTION -+static int check_hw_mechanisms(void); -+static int nid_in_table(int nid, int *nid_table); -+#endif /* SOLARIS_HW_SLOT_SELECTION */ -+ -+/* Index for the supported ciphers */ -+enum pk11_cipher_id { -+ PK11_DES_CBC, -+ PK11_DES3_CBC, -+ PK11_DES_ECB, -+ PK11_DES3_ECB, -+ PK11_RC4, -+ PK11_AES_128_CBC, -+ PK11_AES_192_CBC, -+ PK11_AES_256_CBC, -+ PK11_AES_128_ECB, -+ PK11_AES_192_ECB, -+ PK11_AES_256_ECB, -+ PK11_BLOWFISH_CBC, -+#ifdef SOLARIS_AES_CTR -+ PK11_AES_128_CTR, -+ PK11_AES_192_CTR, -+ PK11_AES_256_CTR, -+#endif /* SOLARIS_AES_CTR */ -+ PK11_CIPHER_MAX -+}; -+ -+/* Index for the supported digests */ -+enum pk11_digest_id { -+ PK11_MD5, -+ PK11_SHA1, -+ PK11_SHA224, -+ PK11_SHA256, -+ PK11_SHA384, -+ PK11_SHA512, -+ PK11_DIGEST_MAX -+}; -+ -+#define TRY_OBJ_DESTROY(sess_hdl, obj_hdl, retval, uselock) \ -+ { \ -+ if (uselock) \ -+ CRYPTO_w_lock(CRYPTO_LOCK_PK11_ENGINE); \ -+ if (pk11_active_delete(obj_hdl) == 1) \ -+ { \ -+ retval = pk11_destroy_object(sess_hdl, obj_hdl); \ -+ } \ -+ if (uselock) \ -+ CRYPTO_w_unlock(CRYPTO_LOCK_PK11_ENGINE); \ -+ } -+ -+static int cipher_nids[PK11_CIPHER_MAX]; -+static int digest_nids[PK11_DIGEST_MAX]; -+static int cipher_count = 0; -+static int digest_count = 0; -+static CK_BBOOL pk11_have_rsa = CK_FALSE; -+static CK_BBOOL pk11_have_dsa = CK_FALSE; -+static CK_BBOOL pk11_have_dh = CK_FALSE; -+static CK_BBOOL pk11_have_random = CK_FALSE; -+ -+typedef struct PK11_CIPHER_st -+ { -+ enum pk11_cipher_id id; -+ int nid; -+ int iv_len; -+ int key_len; -+ CK_KEY_TYPE key_type; -+ CK_MECHANISM_TYPE mech_type; -+ } PK11_CIPHER; -+ -+static PK11_CIPHER ciphers[] = -+ { -+ {PK11_DES_CBC, NID_des_cbc, 8, 8, CKK_DES, CKM_DES_CBC, }, -+ {PK11_DES3_CBC, NID_des_ede3_cbc, 8, 24, CKK_DES3, CKM_DES3_CBC, }, -+ {PK11_DES_ECB, NID_des_ecb, 0, 8, CKK_DES, CKM_DES_ECB, }, -+ {PK11_DES3_ECB, NID_des_ede3_ecb, 0, 24, CKK_DES3, CKM_DES3_ECB, }, -+ {PK11_RC4, NID_rc4, 0, 16, CKK_RC4, CKM_RC4, }, -+ {PK11_AES_128_CBC, NID_aes_128_cbc, 16, 16, CKK_AES, CKM_AES_CBC, }, -+ {PK11_AES_192_CBC, NID_aes_192_cbc, 16, 24, CKK_AES, CKM_AES_CBC, }, -+ {PK11_AES_256_CBC, NID_aes_256_cbc, 16, 32, CKK_AES, CKM_AES_CBC, }, -+ {PK11_AES_128_ECB, NID_aes_128_ecb, 0, 16, CKK_AES, CKM_AES_ECB, }, -+ {PK11_AES_192_ECB, NID_aes_192_ecb, 0, 24, CKK_AES, CKM_AES_ECB, }, -+ {PK11_AES_256_ECB, NID_aes_256_ecb, 0, 32, CKK_AES, CKM_AES_ECB, }, -+ {PK11_BLOWFISH_CBC,NID_bf_cbc, 8, 16, CKK_BLOWFISH, CKM_BLOWFISH_CBC,}, -+#ifdef SOLARIS_AES_CTR -+ /* we don't know the correct NIDs until the engine is initialized */ -+ {PK11_AES_128_CTR, NID_undef, 16, 16, CKK_AES, CKM_AES_CTR, }, -+ {PK11_AES_192_CTR, NID_undef, 16, 24, CKK_AES, CKM_AES_CTR, }, -+ {PK11_AES_256_CTR, NID_undef, 16, 32, CKK_AES, CKM_AES_CTR, }, -+#endif /* SOLARIS_AES_CTR */ -+ }; -+ -+typedef struct PK11_DIGEST_st -+ { -+ enum pk11_digest_id id; -+ int nid; -+ CK_MECHANISM_TYPE mech_type; -+ } PK11_DIGEST; -+ -+static PK11_DIGEST digests[] = -+ { -+ {PK11_MD5, NID_md5, CKM_MD5, }, -+ {PK11_SHA1, NID_sha1, CKM_SHA_1, }, -+ {PK11_SHA224, NID_sha224, CKM_SHA224, }, -+ {PK11_SHA256, NID_sha256, CKM_SHA256, }, -+ {PK11_SHA384, NID_sha384, CKM_SHA384, }, -+ {PK11_SHA512, NID_sha512, CKM_SHA512, }, -+ {0, NID_undef, 0xFFFF, }, -+ }; -+ -+/* Structure to be used for the cipher_data/md_data in -+ * EVP_CIPHER_CTX/EVP_MD_CTX structures in order to use the same -+ * pk11 session in multiple cipher_update calls -+ */ -+typedef struct PK11_CIPHER_STATE_st -+ { -+ PK11_SESSION *sp; -+ } PK11_CIPHER_STATE; -+ -+ -+/* -+ * libcrypto EVP stuff - this is how we get wired to EVP so the engine gets -+ * called when libcrypto requests a cipher NID. -+ * -+ * Note how the PK11_CIPHER_STATE is used here. -+ */ -+ -+/* DES CBC EVP */ -+static const EVP_CIPHER pk11_des_cbc = -+ { -+ NID_des_cbc, -+ 8, 8, 8, -+ EVP_CIPH_CBC_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof(PK11_CIPHER_STATE), -+ EVP_CIPHER_set_asn1_iv, -+ EVP_CIPHER_get_asn1_iv, -+ NULL -+ }; -+ -+/* 3DES CBC EVP */ -+static const EVP_CIPHER pk11_3des_cbc = -+ { -+ NID_des_ede3_cbc, -+ 8, 24, 8, -+ EVP_CIPH_CBC_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof(PK11_CIPHER_STATE), -+ EVP_CIPHER_set_asn1_iv, -+ EVP_CIPHER_get_asn1_iv, -+ NULL -+ }; -+ -+/* -+ * ECB modes don't use an Initial Vector so that's why set_asn1_parameters and -+ * get_asn1_parameters fields are set to NULL. -+ */ -+static const EVP_CIPHER pk11_des_ecb = -+ { -+ NID_des_ecb, -+ 8, 8, 8, -+ EVP_CIPH_ECB_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof(PK11_CIPHER_STATE), -+ NULL, -+ NULL, -+ NULL -+ }; -+ -+static const EVP_CIPHER pk11_3des_ecb = -+ { -+ NID_des_ede3_ecb, -+ 8, 24, 8, -+ EVP_CIPH_ECB_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof(PK11_CIPHER_STATE), -+ NULL, -+ NULL, -+ NULL -+ }; -+ -+ -+static const EVP_CIPHER pk11_aes_128_cbc = -+ { -+ NID_aes_128_cbc, -+ 16, 16, 16, -+ EVP_CIPH_CBC_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof(PK11_CIPHER_STATE), -+ EVP_CIPHER_set_asn1_iv, -+ EVP_CIPHER_get_asn1_iv, -+ NULL -+ }; -+ -+static const EVP_CIPHER pk11_aes_192_cbc = -+ { -+ NID_aes_192_cbc, -+ 16, 24, 16, -+ EVP_CIPH_CBC_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof(PK11_CIPHER_STATE), -+ EVP_CIPHER_set_asn1_iv, -+ EVP_CIPHER_get_asn1_iv, -+ NULL -+ }; -+ -+static const EVP_CIPHER pk11_aes_256_cbc = -+ { -+ NID_aes_256_cbc, -+ 16, 32, 16, -+ EVP_CIPH_CBC_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof(PK11_CIPHER_STATE), -+ EVP_CIPHER_set_asn1_iv, -+ EVP_CIPHER_get_asn1_iv, -+ NULL -+ }; -+ -+/* -+ * ECB modes don't use IV so that's why set_asn1_parameters and -+ * get_asn1_parameters are set to NULL. -+ */ -+static const EVP_CIPHER pk11_aes_128_ecb = -+ { -+ NID_aes_128_ecb, -+ 16, 16, 0, -+ EVP_CIPH_ECB_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof(PK11_CIPHER_STATE), -+ NULL, -+ NULL, -+ NULL -+ }; -+ -+static const EVP_CIPHER pk11_aes_192_ecb = -+ { -+ NID_aes_192_ecb, -+ 16, 24, 0, -+ EVP_CIPH_ECB_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof(PK11_CIPHER_STATE), -+ NULL, -+ NULL, -+ NULL -+ }; -+ -+static const EVP_CIPHER pk11_aes_256_ecb = -+ { -+ NID_aes_256_ecb, -+ 16, 32, 0, -+ EVP_CIPH_ECB_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof(PK11_CIPHER_STATE), -+ NULL, -+ NULL, -+ NULL -+ }; -+ -+#ifdef SOLARIS_AES_CTR -+/* -+ * NID_undef's will be changed to the AES counter mode NIDs as soon they are -+ * created in pk11_library_init(). Note that the need to change these structures -+ * is the reason why we don't define them with the const keyword. -+ */ -+static EVP_CIPHER pk11_aes_128_ctr = -+ { -+ NID_undef, -+ 16, 16, 16, -+ EVP_CIPH_CBC_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof(PK11_CIPHER_STATE), -+ EVP_CIPHER_set_asn1_iv, -+ EVP_CIPHER_get_asn1_iv, -+ NULL -+ }; -+ -+static EVP_CIPHER pk11_aes_192_ctr = -+ { -+ NID_undef, -+ 16, 24, 16, -+ EVP_CIPH_CBC_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof(PK11_CIPHER_STATE), -+ EVP_CIPHER_set_asn1_iv, -+ EVP_CIPHER_get_asn1_iv, -+ NULL -+ }; -+ -+static EVP_CIPHER pk11_aes_256_ctr = -+ { -+ NID_undef, -+ 16, 32, 16, -+ EVP_CIPH_CBC_MODE, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof(PK11_CIPHER_STATE), -+ EVP_CIPHER_set_asn1_iv, -+ EVP_CIPHER_get_asn1_iv, -+ NULL -+ }; -+#endif /* SOLARIS_AES_CTR */ -+ -+static const EVP_CIPHER pk11_bf_cbc = -+ { -+ NID_bf_cbc, -+ 8, 16, 8, -+ EVP_CIPH_VARIABLE_LENGTH, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof(PK11_CIPHER_STATE), -+ EVP_CIPHER_set_asn1_iv, -+ EVP_CIPHER_get_asn1_iv, -+ NULL -+ }; -+ -+static const EVP_CIPHER pk11_rc4 = -+ { -+ NID_rc4, -+ 1, 16, 0, -+ EVP_CIPH_VARIABLE_LENGTH, -+ pk11_cipher_init, -+ pk11_cipher_do_cipher, -+ pk11_cipher_cleanup, -+ sizeof(PK11_CIPHER_STATE), -+ NULL, -+ NULL, -+ NULL -+ }; -+ -+static const EVP_MD pk11_md5 = -+ { -+ NID_md5, -+ NID_md5WithRSAEncryption, -+ MD5_DIGEST_LENGTH, -+ 0, -+ pk11_digest_init, -+ pk11_digest_update, -+ pk11_digest_final, -+ pk11_digest_copy, -+ pk11_digest_cleanup, -+ EVP_PKEY_RSA_method, -+ MD5_CBLOCK, -+ sizeof(PK11_CIPHER_STATE), -+ }; -+ -+static const EVP_MD pk11_sha1 = -+ { -+ NID_sha1, -+ NID_sha1WithRSAEncryption, -+ SHA_DIGEST_LENGTH, -+ 0, -+ pk11_digest_init, -+ pk11_digest_update, -+ pk11_digest_final, -+ pk11_digest_copy, -+ pk11_digest_cleanup, -+ EVP_PKEY_RSA_method, -+ SHA_CBLOCK, -+ sizeof(PK11_CIPHER_STATE), -+ }; -+ -+static const EVP_MD pk11_sha224 = -+ { -+ NID_sha224, -+ NID_sha224WithRSAEncryption, -+ SHA224_DIGEST_LENGTH, -+ 0, -+ pk11_digest_init, -+ pk11_digest_update, -+ pk11_digest_final, -+ pk11_digest_copy, -+ pk11_digest_cleanup, -+ EVP_PKEY_RSA_method, -+ /* SHA-224 uses the same cblock size as SHA-256 */ -+ SHA256_CBLOCK, -+ sizeof(PK11_CIPHER_STATE), -+ }; -+ -+static const EVP_MD pk11_sha256 = -+ { -+ NID_sha256, -+ NID_sha256WithRSAEncryption, -+ SHA256_DIGEST_LENGTH, -+ 0, -+ pk11_digest_init, -+ pk11_digest_update, -+ pk11_digest_final, -+ pk11_digest_copy, -+ pk11_digest_cleanup, -+ EVP_PKEY_RSA_method, -+ SHA256_CBLOCK, -+ sizeof(PK11_CIPHER_STATE), -+ }; -+ -+static const EVP_MD pk11_sha384 = -+ { -+ NID_sha384, -+ NID_sha384WithRSAEncryption, -+ SHA384_DIGEST_LENGTH, -+ 0, -+ pk11_digest_init, -+ pk11_digest_update, -+ pk11_digest_final, -+ pk11_digest_copy, -+ pk11_digest_cleanup, -+ EVP_PKEY_RSA_method, -+ /* SHA-384 uses the same cblock size as SHA-512 */ -+ SHA512_CBLOCK, -+ sizeof(PK11_CIPHER_STATE), -+ }; -+ -+static const EVP_MD pk11_sha512 = -+ { -+ NID_sha512, -+ NID_sha512WithRSAEncryption, -+ SHA512_DIGEST_LENGTH, -+ 0, -+ pk11_digest_init, -+ pk11_digest_update, -+ pk11_digest_final, -+ pk11_digest_copy, -+ pk11_digest_cleanup, -+ EVP_PKEY_RSA_method, -+ SHA512_CBLOCK, -+ sizeof(PK11_CIPHER_STATE), -+ }; -+ -+/* Initialization function. Sets up various pk11 library components. -+ */ -+/* The definitions for control commands specific to this engine -+ */ -+#define PK11_CMD_SO_PATH ENGINE_CMD_BASE -+static const ENGINE_CMD_DEFN pk11_cmd_defns[] = -+ { -+ { -+ PK11_CMD_SO_PATH, -+ "SO_PATH", -+ "Specifies the path to the 'pkcs#11' shared library", -+ ENGINE_CMD_FLAG_STRING -+ }, -+ {0, NULL, NULL, 0} -+ }; -+ -+ -+static RAND_METHOD pk11_random = -+ { -+ pk11_rand_seed, -+ pk11_rand_bytes, -+ pk11_rand_cleanup, -+ pk11_rand_add, -+ pk11_rand_bytes, -+ pk11_rand_status -+ }; -+ -+ -+/* Constants used when creating the ENGINE -+ */ -+static const char *engine_pk11_id = "pkcs11"; -+static const char *engine_pk11_name = "PKCS #11 engine support"; -+ -+CK_FUNCTION_LIST_PTR pFuncList = NULL; -+static const char PK11_GET_FUNCTION_LIST[] = "C_GetFunctionList"; -+ -+/* Cryptoki library -+ */ -+static const char def_PK11_LIBNAME[] = PK11_LIB_LOCATION; -+ -+static CK_BBOOL true = TRUE; -+static CK_BBOOL false = FALSE; -+static CK_SLOT_ID pubkey_SLOTID = 0; -+static CK_SLOT_ID rand_SLOTID = 0; -+static CK_SLOT_ID SLOTID = 0; -+static int pk11_library_initialized = 0; -+static int pk11_pid = 0; -+ -+static DSO *pk11_dso = NULL; -+ -+/* -+ * This internal function is used by ENGINE_pk11() and "dynamic" ENGINE support. -+ */ -+static int bind_pk11(ENGINE *e) -+ { -+#ifndef OPENSSL_NO_RSA -+ const RSA_METHOD *rsa = NULL; -+ RSA_METHOD *pk11_rsa = PK11_RSA(); -+#endif /* OPENSSL_NO_RSA */ -+ if (!pk11_library_initialized) -+ pk11_library_init(e); -+ -+ if(!ENGINE_set_id(e, engine_pk11_id) || -+ !ENGINE_set_name(e, engine_pk11_name) || -+ !ENGINE_set_ciphers(e, pk11_engine_ciphers) || -+ !ENGINE_set_digests(e, pk11_engine_digests)) -+ return 0; -+#ifndef OPENSSL_NO_RSA -+ if(pk11_have_rsa == CK_TRUE) -+ { -+ if(!ENGINE_set_RSA(e, PK11_RSA()) || -+ !ENGINE_set_load_privkey_function(e, pk11_load_privkey) || -+ !ENGINE_set_load_pubkey_function(e, pk11_load_pubkey)) -+ return 0; -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: registered RSA\n", PK11_DBG); -+#endif /* DEBUG_SLOT_SELECTION */ -+ } -+#endif /* OPENSSL_NO_RSA */ -+#ifndef OPENSSL_NO_DSA -+ if(pk11_have_dsa == CK_TRUE) -+ { -+ if (!ENGINE_set_DSA(e, PK11_DSA())) -+ return 0; -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: registered DSA\n", PK11_DBG); -+#endif /* DEBUG_SLOT_SELECTION */ -+ } -+#endif /* OPENSSL_NO_DSA */ -+#ifndef OPENSSL_NO_DH -+ if(pk11_have_dh == CK_TRUE) -+ { -+ if (!ENGINE_set_DH(e, PK11_DH())) -+ return 0; -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: registered DH\n", PK11_DBG); -+#endif /* DEBUG_SLOT_SELECTION */ -+ } -+#endif /* OPENSSL_NO_DH */ -+ if(pk11_have_random) -+ { -+ if(!ENGINE_set_RAND(e, &pk11_random)) -+ return 0; -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: registered random\n", PK11_DBG); -+#endif /* DEBUG_SLOT_SELECTION */ -+ } -+ if(!ENGINE_set_init_function(e, pk11_init) || -+ !ENGINE_set_destroy_function(e, pk11_destroy) || -+ !ENGINE_set_finish_function(e, pk11_finish) || -+ !ENGINE_set_ctrl_function(e, pk11_ctrl) || -+ !ENGINE_set_cmd_defns(e, pk11_cmd_defns)) -+ return 0; -+ -+/* Apache calls OpenSSL function RSA_blinding_on() once during startup -+ * which in turn calls bn_mod_exp. Since we do not implement bn_mod_exp -+ * here, we wire it back to the OpenSSL software implementation. -+ * Since it is used only once, performance is not a concern. */ -+#ifndef OPENSSL_NO_RSA -+ rsa = RSA_PKCS1_SSLeay(); -+ pk11_rsa->rsa_mod_exp = rsa->rsa_mod_exp; -+ pk11_rsa->bn_mod_exp = rsa->bn_mod_exp; -+#endif /* OPENSSL_NO_RSA */ -+ -+ /* Ensure the pk11 error handling is set up */ -+ ERR_load_pk11_strings(); -+ -+ return 1; -+ } -+ -+/* Dynamic engine support is disabled at a higher level for Solaris -+ */ -+#ifdef ENGINE_DYNAMIC_SUPPORT -+static int bind_helper(ENGINE *e, const char *id) -+ { -+ if (id && (strcmp(id, engine_pk11_id) != 0)) -+ return 0; -+ -+ if (!bind_pk11(e)) -+ return 0; -+ -+ return 1; -+ } -+ -+IMPLEMENT_DYNAMIC_CHECK_FN() -+IMPLEMENT_DYNAMIC_BIND_FN(bind_helper) -+ -+#else -+static ENGINE *engine_pk11(void) -+ { -+ ENGINE *ret = ENGINE_new(); -+ -+ if (!ret) -+ return NULL; -+ -+ if (!bind_pk11(ret)) -+ { -+ ENGINE_free(ret); -+ return NULL; -+ } -+ -+ return ret; -+ } -+ -+void ENGINE_load_pk11(void) -+ { -+ ENGINE *e_pk11 = NULL; -+ -+ /* Do not use dynamic PKCS#11 library on Solaris due to -+ * security reasons. We will link it in statically -+ */ -+ /* Attempt to load PKCS#11 library -+ */ -+ if (!pk11_dso) -+ pk11_dso = DSO_load(NULL, get_PK11_LIBNAME(), NULL, 0); -+ -+ if (pk11_dso == NULL) -+ { -+ PK11err(PK11_F_LOAD, PK11_R_DSO_FAILURE); -+ return; -+ } -+ -+ e_pk11 = engine_pk11(); -+ if (!e_pk11) -+ { -+ DSO_free(pk11_dso); -+ pk11_dso = NULL; -+ return; -+ } -+ -+ /* At this point, the pk11 shared library is either dynamically -+ * loaded or statically linked in. So, initialize the pk11 -+ * library before calling ENGINE_set_default since the latter -+ * needs cipher and digest algorithm information -+ */ -+ if (!pk11_library_init(e_pk11)) -+ { -+ DSO_free(pk11_dso); -+ pk11_dso = NULL; -+ ENGINE_free(e_pk11); -+ return; -+ } -+ -+ ENGINE_add(e_pk11); -+ -+ ENGINE_free(e_pk11); -+ ERR_clear_error(); -+ } -+#endif /* ENGINE_DYNAMIC_SUPPORT */ -+ -+/* These are the static string constants for the DSO file name and -+ * the function symbol names to bind to. -+ */ -+static const char *PK11_LIBNAME = NULL; -+ -+static const char *get_PK11_LIBNAME(void) -+ { -+ if (PK11_LIBNAME) -+ return PK11_LIBNAME; -+ -+ return def_PK11_LIBNAME; -+ } -+ -+static void free_PK11_LIBNAME(void) -+ { -+ if (PK11_LIBNAME) -+ OPENSSL_free((void*)PK11_LIBNAME); -+ -+ PK11_LIBNAME = NULL; -+ } -+ -+static long set_PK11_LIBNAME(const char *name) -+ { -+ free_PK11_LIBNAME(); -+ -+ return ((PK11_LIBNAME = BUF_strdup(name)) != NULL ? 1 : 0); -+ } -+ -+/* Initialization function for the pk11 engine */ -+static int pk11_init(ENGINE *e) -+{ -+ return pk11_library_init(e); -+} -+ -+/* Initialization function. Sets up various pk11 library components. -+ * It selects a slot based on predefined critiera. In the process, it also -+ * count how many ciphers and digests to support. Since the cipher and -+ * digest information is needed when setting default engine, this function -+ * needs to be called before calling ENGINE_set_default. -+ */ -+static int pk11_library_init(ENGINE *e) -+ { -+ CK_C_GetFunctionList p; -+ CK_RV rv = CKR_OK; -+ CK_INFO info; -+ CK_ULONG ul_state_len; -+ int any_slot_found; -+ -+ /* -+ * pk11_library_initialized is set to 0 in pk11_finish() which is called -+ * from ENGINE_finish(). However, if there is still at least one -+ * existing functional reference to the engine (see engine(3) for more -+ * information), pk11_finish() is skipped. For example, this can happen -+ * if an application forgets to clear one cipher context. In case of a -+ * fork() when the application is finishing the engine so that it can be -+ * reinitialized in the child, forgotten functional reference causes -+ * pk11_library_initialized to stay 1. In that case we need the PID -+ * check so that we properly initialize the engine again. -+ */ -+ if (pk11_library_initialized) -+ { -+ if (pk11_pid == getpid()) -+ return 1; -+ else -+ global_session = CK_INVALID_HANDLE; -+ } -+ -+ if (pk11_dso == NULL) -+ { -+ PK11err(PK11_F_LIBRARY_INIT, PK11_R_DSO_FAILURE); -+ goto err; -+ } -+ -+#ifdef SOLARIS_AES_CTR -+ /* -+ * We must do this before we start working with slots since we need all -+ * NIDs there. -+ */ -+ if (pk11_add_aes_ctr_NIDs() == 0) -+ goto err; -+#endif /* SOLARIS_AES_CTR */ -+ -+#ifdef SOLARIS_HW_SLOT_SELECTION -+ if (check_hw_mechanisms() == 0) -+ goto err; -+#endif /* SOLARIS_HW_SLOT_SELECTION */ -+ -+ /* get the C_GetFunctionList function from the loaded library -+ */ -+ p = (CK_C_GetFunctionList)DSO_bind_func(pk11_dso, -+ PK11_GET_FUNCTION_LIST); -+ if ( !p ) -+ { -+ PK11err(PK11_F_LIBRARY_INIT, PK11_R_DSO_FAILURE); -+ goto err; -+ } -+ -+ /* get the full function list from the loaded library -+ */ -+ rv = p(&pFuncList); -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_LIBRARY_INIT, PK11_R_DSO_FAILURE, rv); -+ goto err; -+ } -+ -+ rv = pFuncList->C_Initialize(NULL_PTR); -+ if ((rv != CKR_OK) && (rv != CKR_CRYPTOKI_ALREADY_INITIALIZED)) -+ { -+ PK11err_add_data(PK11_F_LIBRARY_INIT, PK11_R_INITIALIZE, rv); -+ goto err; -+ } -+ -+ rv = pFuncList->C_GetInfo(&info); -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_LIBRARY_INIT, PK11_R_GETINFO, rv); -+ goto err; -+ } -+ -+ if (pk11_choose_slots(&any_slot_found) == 0) -+ goto err; -+ -+ /* -+ * The library we use, set in def_PK11_LIBNAME, may not offer any -+ * slot(s). In that case, we must not proceed but we must not return an -+ * error. The reason is that applications that try to set up the PKCS#11 -+ * engine don't exit on error during the engine initialization just -+ * because no slot was present. -+ */ -+ if (any_slot_found == 0) -+ return 1; -+ -+ if (global_session == CK_INVALID_HANDLE) -+ { -+ /* Open the global_session for the new process */ -+ rv = pFuncList->C_OpenSession(SLOTID, CKF_SERIAL_SESSION, -+ NULL_PTR, NULL_PTR, &global_session); -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_LIBRARY_INIT, -+ PK11_R_OPENSESSION, rv); -+ goto err; -+ } -+ } -+ -+ /* Disable digest if C_GetOperationState is not supported since -+ * this function is required by OpenSSL digest copy function */ -+ if (pFuncList->C_GetOperationState(global_session, NULL, &ul_state_len) -+ == CKR_FUNCTION_NOT_SUPPORTED) { -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: C_GetOperationState() not supported, " -+ "setting digest_count to 0\n", PK11_DBG); -+#endif /* DEBUG_SLOT_SELECTION */ -+ digest_count = 0; -+ } -+ -+ pk11_library_initialized = 1; -+ pk11_pid = getpid(); -+ return 1; -+ -+err: -+ return 0; -+ } -+ -+/* Destructor (complements the "ENGINE_pk11()" constructor) -+ */ -+static int pk11_destroy(ENGINE *e) -+ { -+ free_PK11_LIBNAME(); -+ ERR_unload_pk11_strings(); -+ return 1; -+ } -+ -+/* Termination function to clean up the session, the token, and -+ * the pk11 library. -+ */ -+static int pk11_finish(ENGINE *e) -+ { -+ if (pk11_dso == NULL) -+ { -+ PK11err(PK11_F_FINISH, PK11_R_NOT_LOADED); -+ goto err; -+ } -+ -+ OPENSSL_assert(pFuncList != NULL); -+ -+ if (pk11_free_all_sessions() == 0) -+ goto err; -+ -+ pFuncList->C_CloseSession(global_session); -+ global_session = CK_INVALID_HANDLE; -+ -+ /* -+ * Since we are part of a library (libcrypto.so), calling this function -+ * may have side-effects. -+ */ -+#if 0 -+ pFuncList->C_Finalize(NULL); -+#endif -+ -+ if (!DSO_free(pk11_dso)) -+ { -+ PK11err(PK11_F_FINISH, PK11_R_DSO_FAILURE); -+ goto err; -+ } -+ pk11_dso = NULL; -+ pFuncList = NULL; -+ pk11_library_initialized = 0; -+ pk11_pid = 0; -+ -+ return 1; -+ -+err: -+ return 0; -+ } -+ -+/* Standard engine interface function to set the dynamic library path */ -+static int pk11_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)()) -+ { -+ int initialized = ((pk11_dso == NULL) ? 0 : 1); -+ -+ switch(cmd) -+ { -+ case PK11_CMD_SO_PATH: -+ if (p == NULL) -+ { -+ PK11err(PK11_F_CTRL, ERR_R_PASSED_NULL_PARAMETER); -+ return 0; -+ } -+ -+ if (initialized) -+ { -+ PK11err(PK11_F_CTRL, PK11_R_ALREADY_LOADED); -+ return 0; -+ } -+ -+ return set_PK11_LIBNAME((const char*)p); -+ default: -+ break; -+ } -+ -+ PK11err(PK11_F_CTRL,PK11_R_CTRL_COMMAND_NOT_IMPLEMENTED); -+ -+ return 0; -+ } -+ -+ -+/* Required function by the engine random interface. It does nothing here -+ */ -+static void pk11_rand_cleanup(void) -+ { -+ return; -+ } -+ -+static void pk11_rand_add(const void *buf, int num, double add) -+ { -+ PK11_SESSION *sp; -+ -+ if ((sp = pk11_get_session(OP_RAND)) == NULL) -+ return; -+ -+ /* Ignore any errors (e.g. CKR_RANDOM_SEED_NOT_SUPPORTED) since -+ * the calling functions do not care anyway -+ */ -+ pFuncList->C_SeedRandom(sp->session, (unsigned char *) buf, num); -+ pk11_return_session(sp, OP_RAND); -+ -+ return; -+ } -+ -+static void pk11_rand_seed(const void *buf, int num) -+ { -+ pk11_rand_add(buf, num, 0); -+ } -+ -+static int pk11_rand_bytes(unsigned char *buf, int num) -+ { -+ CK_RV rv; -+ PK11_SESSION *sp; -+ -+ if ((sp = pk11_get_session(OP_RAND)) == NULL) -+ return 0; -+ -+ rv = pFuncList->C_GenerateRandom(sp->session, buf, num); -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_RAND_BYTES, PK11_R_GENERATERANDOM, rv); -+ pk11_return_session(sp, OP_RAND); -+ return 0; -+ } -+ -+ pk11_return_session(sp, OP_RAND); -+ return 1; -+ } -+ -+/* Required function by the engine random interface. It does nothing here -+ */ -+static int pk11_rand_status(void) -+ { -+ return 1; -+ } -+ -+/* -+ * Free all BIGNUM structures from PK11_SESSION. -+ */ -+static void pk11_free_nums(PK11_SESSION *sp) -+ { -+#ifndef OPENSSL_NO_RSA -+ if (sp->rsa_n_num != NULL) -+ BN_free(sp->rsa_n_num); -+ if (sp->rsa_e_num != NULL) -+ BN_free(sp->rsa_e_num); -+ if (sp->rsa_d_num != NULL) -+ BN_free(sp->rsa_d_num); -+#endif -+#ifndef OPENSSL_NO_DSA -+ if (sp->dsa_pub_num != NULL) -+ BN_free(sp->dsa_pub_num); -+ if (sp->dsa_priv_num != NULL) -+ BN_free(sp->dsa_priv_num); -+#endif -+#ifndef OPENSSL_NO_DH -+ if (sp->dh_priv_num != NULL) -+ BN_free(sp->dh_priv_num); -+#endif -+ } -+ -+/* -+ * Get new PK11_SESSION structure ready for use. Every process must have -+ * its own freelist of PK11_SESSION structures so handle fork() here -+ * by destroying the old and creating new freelist. -+ * The returned PK11_SESSION structure is disconnected from the freelist. -+ */ -+PK11_SESSION *pk11_get_session(PK11_OPTYPE optype) -+ { -+ PK11_SESSION *sp, *sp1, *freelist; -+ CK_RV rv; -+ -+ CRYPTO_w_lock(CRYPTO_LOCK_PK11_ENGINE); -+ switch (optype) -+ { -+ case OP_PUBKEY: -+ freelist = pubkey_free_session; -+ break; -+ case OP_RAND: -+ freelist = rand_free_session; -+ break; -+ case OP_DIGEST: -+ case OP_CIPHER: -+ freelist = free_session; -+ break; -+ default: -+ PK11err(PK11_F_GET_SESSION, -+ PK11_R_INVALID_OPERATION_TYPE); -+ goto err; -+ } -+ sp = freelist; -+ -+ /* -+ * If the free list is empty, allocate new unitialized (filled -+ * with zeroes) PK11_SESSION structure otherwise return first -+ * structure from the freelist. -+ */ -+ if (sp == NULL) -+ { -+ if ((sp = OPENSSL_malloc(sizeof(PK11_SESSION))) == NULL) -+ { -+ PK11err(PK11_F_GET_SESSION, -+ PK11_R_MALLOC_FAILURE); -+ goto err; -+ } -+ memset(sp, 0, sizeof(PK11_SESSION)); -+ } -+ else -+ { -+ freelist = sp->next; -+ } -+ -+ if (sp->pid != 0 && sp->pid != getpid()) -+ { -+ /* -+ * We are a new process and thus need to free any inherited -+ * PK11_SESSION objects. -+ */ -+ while ((sp1 = freelist) != NULL) -+ { -+ freelist = sp1->next; -+ /* -+ * NOTE: we do not want to call pk11_free_all_sessions() -+ * here because it would close underlying PKCS#11 -+ * sessions and destroy all objects. -+ */ -+ pk11_free_nums(sp1); -+ OPENSSL_free(sp1); -+ } -+ -+ /* Initialize the process */ -+ rv = pFuncList->C_Initialize(NULL_PTR); -+ if ((rv != CKR_OK) && (rv != CKR_CRYPTOKI_ALREADY_INITIALIZED)) -+ { -+ PK11err_add_data(PK11_F_GET_SESSION, PK11_R_INITIALIZE, -+ rv); -+ OPENSSL_free(sp); -+ sp = NULL; -+ goto err; -+ } -+ -+ /* -+ * Choose slot here since the slot table is different on this -+ * process. If we are here then we must have found at least one -+ * usable slot before so we don't need to check any_slot_found. -+ * See pk11_library_init()'s usage of this function for more -+ * information. -+ */ -+#ifdef SOLARIS_HW_SLOT_SELECTION -+ if (check_hw_mechanisms() == 0) -+ goto err; -+#endif /* SOLARIS_HW_SLOT_SELECTION */ -+ if (pk11_choose_slots(NULL) == 0) -+ goto err; -+ -+ /* Open the global_session for the new process */ -+ rv = pFuncList->C_OpenSession(SLOTID, CKF_SERIAL_SESSION, -+ NULL_PTR, NULL_PTR, &global_session); -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_GET_SESSION, PK11_R_OPENSESSION, -+ rv); -+ OPENSSL_free(sp); -+ sp = NULL; -+ goto err; -+ } -+ -+ /* It is an inherited session and needs re-initialization. -+ */ -+ if (pk11_setup_session(sp, optype) == 0) -+ { -+ OPENSSL_free(sp); -+ sp = NULL; -+ } -+ } -+ else if (sp->pid == 0) -+ { -+ /* It is a new session and needs initialization. */ -+ if (pk11_setup_session(sp, optype) == 0) -+ { -+ OPENSSL_free(sp); -+ sp = NULL; -+ } -+ } -+ -+ switch (optype) -+ { -+ case OP_PUBKEY: -+ pubkey_free_session = freelist; -+ break; -+ case OP_RAND: -+ rand_free_session = freelist; -+ break; -+ case OP_DIGEST: -+ case OP_CIPHER: -+ free_session = freelist; -+ break; -+ } -+ -+err: -+ if (sp != NULL) -+ sp->next = NULL; -+ -+ CRYPTO_w_unlock(CRYPTO_LOCK_PK11_ENGINE); -+ -+ return sp; -+ } -+ -+ -+void pk11_return_session(PK11_SESSION *sp, PK11_OPTYPE optype) -+ { -+ if (sp == NULL || sp->pid != getpid()) -+ return; -+ -+ CRYPTO_w_lock(CRYPTO_LOCK_PK11_ENGINE); -+ -+ switch (optype) -+ { -+ case OP_PUBKEY: -+ sp->next = pubkey_free_session; -+ pubkey_free_session = sp; -+ break; -+ case OP_RAND: -+ sp->next = rand_free_session; -+ rand_free_session = sp; -+ break; -+ case OP_DIGEST: -+ case OP_CIPHER: -+ sp->next = free_session; -+ free_session = sp; -+ break; -+ } -+ -+ CRYPTO_w_unlock(CRYPTO_LOCK_PK11_ENGINE); -+ } -+ -+ -+/* Destroy all objects. This function is called when the engine is finished -+ */ -+static int pk11_free_all_sessions() -+ { -+ int ret = 1; -+ -+#ifndef OPENSSL_NO_RSA -+ (void) pk11_destroy_rsa_key_objects(NULL); -+#endif /* OPENSSL_NO_RSA */ -+#ifndef OPENSSL_NO_DSA -+ (void) pk11_destroy_dsa_key_objects(NULL); -+#endif /* OPENSSL_NO_DSA */ -+#ifndef OPENSSL_NO_DH -+ (void) pk11_destroy_dh_key_objects(NULL); -+#endif /* OPENSSL_NO_DH */ -+ (void) pk11_destroy_cipher_key_objects(NULL); -+ -+ /* -+ * We try to release as much as we can but any error means that we will -+ * return 0 on exit. -+ */ -+ if (pk11_free_session_list(&free_session) == 0) -+ ret = 0; -+ if (pk11_free_session_list(&pubkey_free_session) == 0) -+ ret = 0; -+ if (pk11_free_session_list(&rand_free_session) == 0) -+ ret = 0; -+ -+ return ret; -+ } -+ -+/* -+ * Destroy session structures from the specified linked list. Free as many -+ * sessions as possible but any failure in C_CloseSession() means that we return -+ * an error on return. -+ */ -+static int pk11_free_session_list(PK11_SESSION **sessions) -+ { -+ CK_RV rv; -+ PK11_SESSION *sp = NULL; -+ pid_t mypid = getpid(); -+ int ret = 1; -+ -+ CRYPTO_w_lock(CRYPTO_LOCK_PK11_ENGINE); -+ while ((sp = *sessions) != NULL) -+ { -+ if (sp->session != CK_INVALID_HANDLE && sp->pid == mypid) -+ { -+ rv = pFuncList->C_CloseSession(sp->session); -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_FREE_ALL_SESSIONS, -+ PK11_R_CLOSESESSION, rv); -+ ret = 0; -+ } -+ } -+ if (sp->session_cipher != CK_INVALID_HANDLE && sp->pid == mypid) -+ { -+ rv = pFuncList->C_CloseSession(sp->session_cipher); -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_FREE_ALL_SESSIONS, -+ PK11_R_CLOSESESSION, rv); -+ ret = 0; -+ } -+ } -+ *sessions = sp->next; -+ pk11_free_nums(sp); -+ OPENSSL_free(sp); -+ } -+ -+ CRYPTO_w_unlock(CRYPTO_LOCK_PK11_ENGINE); -+ return ret; -+ } -+ -+ -+static int pk11_setup_session(PK11_SESSION *sp, PK11_OPTYPE optype) -+ { -+ CK_RV rv; -+ CK_SLOT_ID myslot; -+ -+ switch (optype) -+ { -+ case OP_PUBKEY: -+ myslot = pubkey_SLOTID; -+ break; -+ case OP_RAND: -+ myslot = rand_SLOTID; -+ break; -+ case OP_DIGEST: -+ case OP_CIPHER: -+ myslot = SLOTID; -+ break; -+ default: -+ PK11err(PK11_F_SETUP_SESSION, -+ PK11_R_INVALID_OPERATION_TYPE); -+ return 0; -+ } -+ -+ sp->session = CK_INVALID_HANDLE; -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: myslot=%d optype=%d\n", PK11_DBG, myslot, optype); -+#endif /* DEBUG_SLOT_SELECTION */ -+ rv = pFuncList->C_OpenSession(myslot, CKF_SERIAL_SESSION, -+ NULL_PTR, NULL_PTR, &sp->session); -+ if (rv == CKR_CRYPTOKI_NOT_INITIALIZED) -+ { -+ /* -+ * We are probably a child process so force the -+ * reinitialize of the session -+ */ -+ pk11_library_initialized = 0; -+ (void) pk11_library_init(NULL); -+ rv = pFuncList->C_OpenSession(myslot, CKF_SERIAL_SESSION, -+ NULL_PTR, NULL_PTR, &sp->session); -+ } -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_SETUP_SESSION, PK11_R_OPENSESSION, rv); -+ return 0; -+ } -+ -+ sp->session_cipher = CK_INVALID_HANDLE; -+ rv = pFuncList->C_OpenSession(myslot, CKF_SERIAL_SESSION, -+ NULL_PTR, NULL_PTR, &sp->session_cipher); -+ if (rv != CKR_OK) -+ { -+ (void) pFuncList->C_CloseSession(sp->session); -+ sp->session = CK_INVALID_HANDLE; -+ -+ PK11err_add_data(PK11_F_SETUP_SESSION, PK11_R_OPENSESSION, rv); -+ return 0; -+ } -+ -+ sp->pid = getpid(); -+ sp->rsa_pub_key = CK_INVALID_HANDLE; -+ sp->rsa_priv_key = CK_INVALID_HANDLE; -+ sp->dsa_pub_key = CK_INVALID_HANDLE; -+ sp->dsa_priv_key = CK_INVALID_HANDLE; -+ sp->dh_key = CK_INVALID_HANDLE; -+ sp->cipher_key = CK_INVALID_HANDLE; -+#ifndef OPENSSL_NO_RSA -+ sp->rsa_pub = NULL; -+ sp->rsa_n_num = NULL; -+ sp->rsa_e_num = NULL; -+ sp->rsa_priv = NULL; -+ sp->rsa_d_num = NULL; -+#endif /* OPENSSL_NO_RSA */ -+#ifndef OPENSSL_NO_DSA -+ sp->dsa_pub = NULL; -+ sp->dsa_pub_num = NULL; -+ sp->dsa_priv = NULL; -+ sp->dsa_priv_num = NULL; -+#endif /* OPENSSL_NO_DSA */ -+#ifndef OPENSSL_NO_DH -+ sp->dh = NULL; -+ sp->dh_priv_num = NULL; -+#endif /* OPENSSL_NO_DH */ -+ sp->encrypt = -1; -+ -+ return 1; -+ } -+ -+#ifndef OPENSSL_NO_RSA -+/* Destroy RSA public key from single session. */ -+int pk11_destroy_rsa_object_pub(PK11_SESSION *sp, CK_BBOOL uselock) -+ { -+ int ret = 0; -+ -+ if (sp->rsa_pub_key != CK_INVALID_HANDLE) -+ { -+ TRY_OBJ_DESTROY(sp->session, sp->rsa_pub_key, ret, uselock); -+ sp->rsa_pub_key = CK_INVALID_HANDLE; -+ sp->rsa_pub = NULL; -+ if (sp->rsa_n_num != NULL) -+ BN_free(sp->rsa_n_num); -+ sp->rsa_n_num = NULL; -+ if (sp->rsa_e_num != NULL) -+ BN_free(sp->rsa_e_num); -+ sp->rsa_e_num = NULL; -+ } -+ -+ return (ret); -+ } -+ -+/* Destroy RSA private key from single session. */ -+int pk11_destroy_rsa_object_priv(PK11_SESSION *sp, CK_BBOOL uselock) -+ { -+ int ret = 0; -+ -+ if (sp->rsa_priv_key != CK_INVALID_HANDLE) -+ { -+ TRY_OBJ_DESTROY(sp->session, sp->rsa_priv_key, ret, uselock); -+ sp->rsa_priv_key = CK_INVALID_HANDLE; -+ sp->rsa_priv = NULL; -+ if (sp->rsa_d_num != NULL) -+ BN_free(sp->rsa_d_num); -+ sp->rsa_d_num = NULL; -+ } -+ -+ return (ret); -+ } -+ -+/* -+ * Destroy RSA key object wrapper. If session is NULL, try to destroy all -+ * objects in the free list. -+ */ -+int pk11_destroy_rsa_key_objects(PK11_SESSION *session) -+ { -+ int ret = 1; -+ PK11_SESSION *sp = NULL; -+ PK11_SESSION *local_free_session; -+ CK_BBOOL uselock = TRUE; -+ -+ if (session != NULL) -+ local_free_session = session; -+ else -+ { -+ CRYPTO_w_lock(CRYPTO_LOCK_PK11_ENGINE); -+ local_free_session = pubkey_free_session; -+ uselock = FALSE; -+ } -+ -+ /* -+ * go through the list of sessions and delete key objects -+ */ -+ while ((sp = local_free_session) != NULL) -+ { -+ local_free_session = sp->next; -+ -+ /* -+ * Do not terminate list traversal if one of the -+ * destroy operations fails. -+ */ -+ if (pk11_destroy_rsa_object_pub(sp, uselock) == 0) -+ { -+ ret = 0; -+ continue; -+ } -+ if (pk11_destroy_rsa_object_priv(sp, uselock) == 0) -+ { -+ ret = 0; -+ continue; -+ } -+ } -+ -+ if (session == NULL) -+ CRYPTO_w_unlock(CRYPTO_LOCK_PK11_ENGINE); -+ -+ return ret; -+ } -+#endif /* OPENSSL_NO_RSA */ -+ -+#ifndef OPENSSL_NO_DSA -+/* Destroy DSA public key from single session. */ -+int pk11_destroy_dsa_object_pub(PK11_SESSION *sp, CK_BBOOL uselock) -+ { -+ int ret = 0; -+ -+ if (sp->dsa_pub_key != CK_INVALID_HANDLE) -+ { -+ TRY_OBJ_DESTROY(sp->session, sp->dsa_pub_key, ret, uselock); -+ sp->dsa_pub_key = CK_INVALID_HANDLE; -+ sp->dsa_pub = NULL; -+ if (sp->dsa_pub_num != NULL) -+ BN_free(sp->dsa_pub_num); -+ sp->dsa_pub_num = NULL; -+ } -+ -+ return (ret); -+ } -+ -+/* Destroy DSA private key from single session. */ -+int pk11_destroy_dsa_object_priv(PK11_SESSION *sp, CK_BBOOL uselock) -+ { -+ int ret = 0; -+ -+ if (sp->dsa_priv_key != CK_INVALID_HANDLE) -+ { -+ TRY_OBJ_DESTROY(sp->session, sp->dsa_priv_key, ret, uselock); -+ sp->dsa_priv_key = CK_INVALID_HANDLE; -+ sp->dsa_priv = NULL; -+ if (sp->dsa_priv_num != NULL) -+ BN_free(sp->dsa_priv_num); -+ sp->dsa_priv_num = NULL; -+ } -+ -+ return (ret); -+ } -+ -+/* -+ * Destroy DSA key object wrapper. If session is NULL, try to destroy all -+ * objects in the free list. -+ */ -+int pk11_destroy_dsa_key_objects(PK11_SESSION *session) -+ { -+ int ret = 1; -+ PK11_SESSION *sp = NULL; -+ PK11_SESSION *local_free_session; -+ CK_BBOOL uselock = TRUE; -+ -+ if (session != NULL) -+ local_free_session = session; -+ else -+ { -+ CRYPTO_w_lock(CRYPTO_LOCK_PK11_ENGINE); -+ local_free_session = pubkey_free_session; -+ uselock = FALSE; -+ } -+ -+ /* -+ * go through the list of sessions and delete key objects -+ */ -+ while ((sp = local_free_session) != NULL) -+ { -+ local_free_session = sp->next; -+ -+ /* -+ * Do not terminate list traversal if one of the -+ * destroy operations fails. -+ */ -+ if (pk11_destroy_dsa_object_pub(sp, uselock) == 0) -+ { -+ ret = 0; -+ continue; -+ } -+ if (pk11_destroy_dsa_object_priv(sp, uselock) == 0) -+ { -+ ret = 0; -+ continue; -+ } -+ } -+ -+ if (session == NULL) -+ CRYPTO_w_unlock(CRYPTO_LOCK_PK11_ENGINE); -+ -+ return ret; -+ } -+#endif /* OPENSSL_NO_DSA */ -+ -+#ifndef OPENSSL_NO_DH -+/* Destroy DH key from single session. */ -+int pk11_destroy_dh_object(PK11_SESSION *sp, CK_BBOOL uselock) -+ { -+ int ret = 0; -+ -+ if (sp->dh_key != CK_INVALID_HANDLE) -+ { -+ TRY_OBJ_DESTROY(sp->session, sp->dh_key, ret, uselock); -+ sp->dh_key = CK_INVALID_HANDLE; -+ sp->dh = NULL; -+ if (sp->dh_priv_num != NULL) -+ BN_free(sp->dh_priv_num); -+ sp->dh_priv_num = NULL; -+ } -+ -+ return (ret); -+ } -+ -+/* -+ * Destroy DH key object wrapper. -+ * -+ * arg0: pointer to PKCS#11 engine session structure -+ * if session is NULL, try to destroy all objects in the free list -+ */ -+int pk11_destroy_dh_key_objects(PK11_SESSION *session) -+ { -+ int ret = 1; -+ PK11_SESSION *sp = NULL; -+ PK11_SESSION *local_free_session; -+ CK_BBOOL uselock = TRUE; -+ -+ if (session != NULL) -+ local_free_session = session; -+ else -+ { -+ CRYPTO_w_lock(CRYPTO_LOCK_PK11_ENGINE); -+ local_free_session = pubkey_free_session; -+ uselock = FALSE; -+ } -+ -+ while ((sp = local_free_session) != NULL) -+ { -+ local_free_session = sp->next; -+ -+ /* -+ * Do not terminate list traversal if one of the -+ * destroy operations fails. -+ */ -+ if (pk11_destroy_dh_object(sp, uselock) == 0) -+ { -+ ret = 0; -+ continue; -+ } -+ } -+err: -+ if (session == NULL) -+ CRYPTO_w_unlock(CRYPTO_LOCK_PK11_ENGINE); -+ -+ return ret; -+ } -+#endif /* OPENSSL_NO_DH */ -+ -+static int pk11_destroy_object(CK_SESSION_HANDLE session, CK_OBJECT_HANDLE oh) -+ { -+ CK_RV rv; -+ rv = pFuncList->C_DestroyObject(session, oh); -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_DESTROY_OBJECT, PK11_R_DESTROYOBJECT, -+ rv); -+ return 0; -+ } -+ -+ return 1; -+ } -+ -+ -+/* Symmetric ciphers and digests support functions -+ */ -+ -+static int -+cipher_nid_to_pk11(int nid) -+ { -+ int i; -+ -+ for (i = 0; i < PK11_CIPHER_MAX; i++) -+ if (ciphers[i].nid == nid) -+ return (ciphers[i].id); -+ return (-1); -+ } -+ -+static int -+pk11_usable_ciphers(const int **nids) -+ { -+ if (cipher_count > 0) -+ *nids = cipher_nids; -+ else -+ *nids = NULL; -+ return (cipher_count); -+ } -+ -+static int -+pk11_usable_digests(const int **nids) -+ { -+ if (digest_count > 0) -+ *nids = digest_nids; -+ else -+ *nids = NULL; -+ return (digest_count); -+ } -+ -+/* -+ * Init context for encryption or decryption using a symmetric key. -+ */ -+static int pk11_init_symmetric(EVP_CIPHER_CTX *ctx, PK11_CIPHER *pcipher, -+ PK11_SESSION *sp, CK_MECHANISM_PTR pmech) -+ { -+ CK_RV rv; -+#ifdef SOLARIS_AES_CTR -+ CK_AES_CTR_PARAMS ctr_params; -+#endif /* SOLARIS_AES_CTR */ -+ -+ /* -+ * We expect pmech->mechanism to be already set and -+ * pParameter/ulParameterLen initialized to NULL/0 before -+ * pk11_init_symetric() is called. -+ */ -+ OPENSSL_assert(pmech->mechanism != NULL); -+ OPENSSL_assert(pmech->pParameter == NULL); -+ OPENSSL_assert(pmech->ulParameterLen == 0); -+ -+#ifdef SOLARIS_AES_CTR -+ if (ctx->cipher->nid == NID_aes_128_ctr || -+ ctx->cipher->nid == NID_aes_192_ctr || -+ ctx->cipher->nid == NID_aes_256_ctr) -+ { -+ pmech->pParameter = (void *)(&ctr_params); -+ pmech->ulParameterLen = sizeof(ctr_params); -+ /* -+ * For now, we are limited to the fixed length of the counter, -+ * it covers the whole counter block. That's what RFC 4344 -+ * needs. For more information on internal structure of the -+ * counter block, see RFC 3686. If needed in the future, we can -+ * add code so that the counter length can be set via -+ * ENGINE_ctrl() function. -+ */ -+ ctr_params.ulCounterBits = AES_BLOCK_SIZE * 8; -+ OPENSSL_assert(pcipher->iv_len == AES_BLOCK_SIZE); -+ memcpy(ctr_params.cb, ctx->iv, AES_BLOCK_SIZE); -+ } -+ else -+#endif /* SOLARIS_AES_CTR */ -+ { -+ if (pcipher->iv_len > 0) -+ { -+ pmech->pParameter = (void *)ctx->iv; -+ pmech->ulParameterLen = pcipher->iv_len; -+ } -+ } -+ -+ /* if we get here, the encryption needs to be reinitialized */ -+ if (ctx->encrypt) -+ rv = pFuncList->C_EncryptInit(sp->session_cipher, pmech, -+ sp->cipher_key); -+ else -+ rv = pFuncList->C_DecryptInit(sp->session_cipher, pmech, -+ sp->cipher_key); -+ -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_CIPHER_INIT, ctx->encrypt ? -+ PK11_R_ENCRYPTINIT : PK11_R_DECRYPTINIT, rv); -+ pk11_return_session(sp, OP_CIPHER); -+ return (0); -+ } -+ -+ return (1); -+ } -+ -+static int -+pk11_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key, -+ const unsigned char *iv, int enc) -+ { -+ CK_MECHANISM mech; -+ int index; -+ PK11_CIPHER_STATE *state = (PK11_CIPHER_STATE *) ctx->cipher_data; -+ PK11_SESSION *sp; -+ PK11_CIPHER *p_ciph_table_row; -+ -+ state->sp = NULL; -+ -+ index = cipher_nid_to_pk11(ctx->cipher->nid); -+ if (index < 0 || index >= PK11_CIPHER_MAX) -+ return 0; -+ -+ p_ciph_table_row = &ciphers[index]; -+ /* -+ * iv_len in the ctx->cipher structure is the maximum IV length for the -+ * current cipher and it must be less or equal to the IV length in our -+ * ciphers table. The key length must match precisely. Every application -+ * can define its own EVP functions so this code serves as a sanity -+ * check. -+ * -+ * Note that the reason why the IV length in ctx->cipher might be -+ * greater than the actual length is that OpenSSL uses BLOCK_CIPHER_defs -+ * macro to define functions that return EVP structures for all DES -+ * modes. So, even ECB modes get 8 byte IV. -+ */ -+ if (ctx->cipher->iv_len < p_ciph_table_row->iv_len || -+ ctx->key_len != p_ciph_table_row->key_len) -+ { -+ PK11err(PK11_F_CIPHER_INIT, PK11_R_KEY_OR_IV_LEN_PROBLEM); -+ return 0; -+ } -+ -+ if ((sp = pk11_get_session(OP_CIPHER)) == NULL) -+ return 0; -+ -+ /* if applicable, the mechanism parameter is used for IV */ -+ mech.mechanism = p_ciph_table_row->mech_type; -+ mech.pParameter = NULL; -+ mech.ulParameterLen = 0; -+ -+ /* The key object is destroyed here if it is not the current key -+ */ -+ (void) check_new_cipher_key(sp, key, p_ciph_table_row->key_len); -+ -+ /* If the key is the same and the encryption is also the same, -+ * then just reuse it. However, we must not forget to reinitialize the -+ * context that was finalized in pk11_cipher_cleanup(). -+ */ -+ if (sp->cipher_key != CK_INVALID_HANDLE && sp->encrypt == ctx->encrypt) -+ { -+ state->sp = sp; -+ if (pk11_init_symmetric(ctx, p_ciph_table_row, sp, &mech) == 0) -+ return (0); -+ -+ return (1); -+ } -+ -+ /* Check if the key has been invalidated. If so, a new key object -+ * needs to be created. -+ */ -+ if (sp->cipher_key == CK_INVALID_HANDLE) -+ { -+ sp->cipher_key = pk11_get_cipher_key( -+ ctx, key, p_ciph_table_row->key_type, sp); -+ } -+ -+ if (sp->encrypt != ctx->encrypt && sp->encrypt != -1) -+ { -+ /* The previous encryption/decryption -+ * is different. Need to terminate the previous -+ * active encryption/decryption here -+ */ -+ if (!pk11_cipher_final(sp)) -+ { -+ pk11_return_session(sp, OP_CIPHER); -+ return 0; -+ } -+ } -+ -+ if (sp->cipher_key == CK_INVALID_HANDLE) -+ { -+ pk11_return_session(sp, OP_CIPHER); -+ return 0; -+ } -+ -+ /* now initialize the context with a new key */ -+ if (pk11_init_symmetric(ctx, p_ciph_table_row, sp, &mech) == 0) -+ return (0); -+ -+ sp->encrypt = ctx->encrypt; -+ state->sp = sp; -+ -+ return 1; -+ } -+ -+/* When reusing the same key in an encryption/decryption session for a -+ * decryption/encryption session, we need to close the active session -+ * and recreate a new one. Note that the key is in the global session so -+ * that it needs not be recreated. -+ * -+ * It is more appropriate to use C_En/DecryptFinish here. At the time of this -+ * development, these two functions in the PKCS#11 libraries used return -+ * unexpected errors when passing in 0 length output. It may be a good -+ * idea to try them again if performance is a problem here and fix -+ * C_En/DecryptFinial if there are bugs there causing the problem. -+ */ -+static int -+pk11_cipher_final(PK11_SESSION *sp) -+ { -+ CK_RV rv; -+ -+ rv = pFuncList->C_CloseSession(sp->session_cipher); -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_CIPHER_FINAL, PK11_R_CLOSESESSION, rv); -+ return 0; -+ } -+ -+ rv = pFuncList->C_OpenSession(SLOTID, CKF_SERIAL_SESSION, -+ NULL_PTR, NULL_PTR, &sp->session_cipher); -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_CIPHER_FINAL, PK11_R_OPENSESSION, rv); -+ return 0; -+ } -+ -+ return 1; -+ } -+ -+/* An engine interface function. The calling function allocates sufficient -+ * memory for the output buffer "out" to hold the results */ -+static int -+pk11_cipher_do_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, -+ const unsigned char *in, unsigned int inl) -+ { -+ PK11_CIPHER_STATE *state = (PK11_CIPHER_STATE *) ctx->cipher_data; -+ PK11_SESSION *sp; -+ CK_RV rv; -+ unsigned long outl = inl; -+ -+ if (state == NULL || state->sp == NULL) -+ return 0; -+ -+ sp = (PK11_SESSION *) state->sp; -+ -+ if (!inl) -+ return 1; -+ -+ /* RC4 is the only stream cipher we support */ -+ if (ctx->cipher->nid != NID_rc4 && (inl % ctx->cipher->block_size) != 0) -+ return 0; -+ -+ if (ctx->encrypt) -+ { -+ rv = pFuncList->C_EncryptUpdate(sp->session_cipher, -+ (unsigned char *)in, inl, out, &outl); -+ -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_CIPHER_DO_CIPHER, -+ PK11_R_ENCRYPTUPDATE, rv); -+ return 0; -+ } -+ } -+ else -+ { -+ rv = pFuncList->C_DecryptUpdate(sp->session_cipher, -+ (unsigned char *)in, inl, out, &outl); -+ -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_CIPHER_DO_CIPHER, -+ PK11_R_DECRYPTUPDATE, rv); -+ return 0; -+ } -+ } -+ -+ /* for DES_CBC, DES3_CBC, AES_CBC, and RC4, the output size is always -+ * the same size of input -+ * The application has guaranteed to call the block ciphers with -+ * correctly aligned buffers. -+ */ -+ if (inl != outl) -+ return 0; -+ -+ return 1; -+ } -+ -+/* -+ * Return the session to the pool. Calling C_EncryptFinal() and C_DecryptFinal() -+ * here is the right thing because in EVP_DecryptFinal_ex(), engine's -+ * do_cipher() is not even called, and in EVP_EncryptFinal_ex() it is called but -+ * the engine can't find out that it's the finalizing call. We wouldn't -+ * necessarily have to finalize the context here since reinitializing it with -+ * C_(Encrypt|Decrypt)Init() should be fine but for the sake of correctness, -+ * let's do it. Some implementations might leak memory if the previously used -+ * context is initialized without finalizing it first. -+ */ -+static int -+pk11_cipher_cleanup(EVP_CIPHER_CTX *ctx) -+ { -+ CK_RV rv; -+ CK_ULONG len = EVP_MAX_BLOCK_LENGTH; -+ CK_BYTE buf[EVP_MAX_BLOCK_LENGTH]; -+ PK11_CIPHER_STATE *state = ctx->cipher_data; -+ -+ if (state != NULL && state->sp != NULL) -+ { -+ /* -+ * We are not interested in the data here, we just need to get -+ * rid of the context. -+ */ -+ if (ctx->encrypt) -+ rv = pFuncList->C_EncryptFinal( -+ state->sp->session_cipher, buf, &len); -+ else -+ rv = pFuncList->C_DecryptFinal( -+ state->sp->session_cipher, buf, &len); -+ -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_CIPHER_CLEANUP, ctx->encrypt ? -+ PK11_R_ENCRYPTFINAL : PK11_R_DECRYPTFINAL, rv); -+ pk11_return_session(state->sp, OP_CIPHER); -+ return (0); -+ } -+ -+ pk11_return_session(state->sp, OP_CIPHER); -+ state->sp = NULL; -+ } -+ -+ return (1); -+ } -+ -+/* Registered by the ENGINE when used to find out how to deal with -+ * a particular NID in the ENGINE. This says what we'll do at the -+ * top level - note, that list is restricted by what we answer with -+ */ -+static int -+pk11_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher, -+ const int **nids, int nid) -+ { -+ if (!cipher) -+ return (pk11_usable_ciphers(nids)); -+ -+ switch (nid) -+ { -+ case NID_des_ede3_cbc: -+ *cipher = &pk11_3des_cbc; -+ break; -+ case NID_des_cbc: -+ *cipher = &pk11_des_cbc; -+ break; -+ case NID_des_ede3_ecb: -+ *cipher = &pk11_3des_ecb; -+ break; -+ case NID_des_ecb: -+ *cipher = &pk11_des_ecb; -+ break; -+ case NID_aes_128_cbc: -+ *cipher = &pk11_aes_128_cbc; -+ break; -+ case NID_aes_192_cbc: -+ *cipher = &pk11_aes_192_cbc; -+ break; -+ case NID_aes_256_cbc: -+ *cipher = &pk11_aes_256_cbc; -+ break; -+ case NID_aes_128_ecb: -+ *cipher = &pk11_aes_128_ecb; -+ break; -+ case NID_aes_192_ecb: -+ *cipher = &pk11_aes_192_ecb; -+ break; -+ case NID_aes_256_ecb: -+ *cipher = &pk11_aes_256_ecb; -+ break; -+ case NID_bf_cbc: -+ *cipher = &pk11_bf_cbc; -+ break; -+ case NID_rc4: -+ *cipher = &pk11_rc4; -+ break; -+ default: -+#ifdef SOLARIS_AES_CTR -+ /* -+ * These can't be in separated cases because the NIDs -+ * here are not constants. -+ */ -+ if (nid == NID_aes_128_ctr) -+ *cipher = &pk11_aes_128_ctr; -+ else if (nid == NID_aes_192_ctr) -+ *cipher = &pk11_aes_192_ctr; -+ else if (nid == NID_aes_256_ctr) -+ *cipher = &pk11_aes_256_ctr; -+ else -+#endif /* SOLARIS_AES_CTR */ -+ *cipher = NULL; -+ break; -+ } -+ return (*cipher != NULL); -+ } -+ -+static int -+pk11_engine_digests(ENGINE *e, const EVP_MD **digest, -+ const int **nids, int nid) -+ { -+ if (!digest) -+ return (pk11_usable_digests(nids)); -+ -+ switch (nid) -+ { -+ case NID_md5: -+ *digest = &pk11_md5; -+ break; -+ case NID_sha1: -+ *digest = &pk11_sha1; -+ break; -+ case NID_sha224: -+ *digest = &pk11_sha224; -+ break; -+ case NID_sha256: -+ *digest = &pk11_sha256; -+ break; -+ case NID_sha384: -+ *digest = &pk11_sha384; -+ break; -+ case NID_sha512: -+ *digest = &pk11_sha512; -+ break; -+ default: -+ *digest = NULL; -+ break; -+ } -+ return (*digest != NULL); -+ } -+ -+ -+/* Create a secret key object in a PKCS#11 session -+ */ -+static CK_OBJECT_HANDLE pk11_get_cipher_key(EVP_CIPHER_CTX *ctx, -+ const unsigned char *key, CK_KEY_TYPE key_type, PK11_SESSION *sp) -+ { -+ CK_RV rv; -+ CK_OBJECT_HANDLE h_key = CK_INVALID_HANDLE; -+ CK_OBJECT_CLASS obj_key = CKO_SECRET_KEY; -+ CK_ULONG ul_key_attr_count = 6; -+ -+ CK_ATTRIBUTE a_key_template[] = -+ { -+ {CKA_CLASS, (void*) NULL, sizeof(CK_OBJECT_CLASS)}, -+ {CKA_KEY_TYPE, (void*) NULL, sizeof(CK_KEY_TYPE)}, -+ {CKA_TOKEN, &false, sizeof(false)}, -+ {CKA_ENCRYPT, &true, sizeof(true)}, -+ {CKA_DECRYPT, &true, sizeof(true)}, -+ {CKA_VALUE, (void*) NULL, 0}, -+ }; -+ -+ /* Create secret key object in global_session. All other sessions -+ * can use the key handles. Here is why: -+ * OpenSSL will call EncryptInit and EncryptUpdate using a secret key. -+ * It may then call DecryptInit and DecryptUpdate using the same key. -+ * To use the same key object, we need to call EncryptFinal with -+ * a 0 length message. Currently, this does not work for 3DES -+ * mechanism. To get around this problem, we close the session and -+ * then create a new session to use the same key object. When a session -+ * is closed, all the object handles will be invalid. Thus, create key -+ * objects in a global session, an individual session may be closed to -+ * terminate the active operation. -+ */ -+ CK_SESSION_HANDLE session = global_session; -+ a_key_template[0].pValue = &obj_key; -+ a_key_template[1].pValue = &key_type; -+ a_key_template[5].pValue = (void *) key; -+ a_key_template[5].ulValueLen = (unsigned long) ctx->key_len; -+ -+ rv = pFuncList->C_CreateObject(session, -+ a_key_template, ul_key_attr_count, &h_key); -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_GET_CIPHER_KEY, PK11_R_CREATEOBJECT, -+ rv); -+ goto err; -+ } -+ -+ /* Save the key information used in this session. -+ * The max can be saved is PK11_KEY_LEN_MAX. -+ */ -+ sp->key_len = ctx->key_len > PK11_KEY_LEN_MAX ? -+ PK11_KEY_LEN_MAX : ctx->key_len; -+ memcpy(sp->key, key, sp->key_len); -+err: -+ -+ return h_key; -+ } -+ -+static int -+md_nid_to_pk11(int nid) -+ { -+ int i; -+ -+ for (i = 0; i < PK11_DIGEST_MAX; i++) -+ if (digests[i].nid == nid) -+ return (digests[i].id); -+ return (-1); -+ } -+ -+static int -+pk11_digest_init(EVP_MD_CTX *ctx) -+ { -+ CK_RV rv; -+ CK_MECHANISM mech; -+ int index; -+ PK11_SESSION *sp; -+ PK11_DIGEST *pdp; -+ PK11_CIPHER_STATE *state = (PK11_CIPHER_STATE *) ctx->md_data; -+ -+ state->sp = NULL; -+ -+ index = md_nid_to_pk11(ctx->digest->type); -+ if (index < 0 || index >= PK11_DIGEST_MAX) -+ return 0; -+ -+ pdp = &digests[index]; -+ if ((sp = pk11_get_session(OP_DIGEST)) == NULL) -+ return 0; -+ -+ /* at present, no parameter is needed for supported digests */ -+ mech.mechanism = pdp->mech_type; -+ mech.pParameter = NULL; -+ mech.ulParameterLen = 0; -+ -+ rv = pFuncList->C_DigestInit(sp->session, &mech); -+ -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_DIGEST_INIT, PK11_R_DIGESTINIT, rv); -+ pk11_return_session(sp, OP_DIGEST); -+ return 0; -+ } -+ -+ state->sp = sp; -+ -+ return 1; -+ } -+ -+static int -+pk11_digest_update(EVP_MD_CTX *ctx,const void *data,size_t count) -+ { -+ CK_RV rv; -+ PK11_CIPHER_STATE *state = (PK11_CIPHER_STATE *) ctx->md_data; -+ -+ /* 0 length message will cause a failure in C_DigestFinal */ -+ if (count == 0) -+ return 1; -+ -+ if (state == NULL || state->sp == NULL) -+ return 0; -+ -+ rv = pFuncList->C_DigestUpdate(state->sp->session, (CK_BYTE *) data, -+ count); -+ -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_DIGEST_UPDATE, PK11_R_DIGESTUPDATE, rv); -+ pk11_return_session(state->sp, OP_DIGEST); -+ state->sp = NULL; -+ return 0; -+ } -+ -+ return 1; -+ } -+ -+static int -+pk11_digest_final(EVP_MD_CTX *ctx,unsigned char *md) -+ { -+ CK_RV rv; -+ unsigned long len; -+ PK11_CIPHER_STATE *state = (PK11_CIPHER_STATE *) ctx->md_data; -+ len = ctx->digest->md_size; -+ -+ if (state == NULL || state->sp == NULL) -+ return 0; -+ -+ rv = pFuncList->C_DigestFinal(state->sp->session, md, &len); -+ -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_DIGEST_FINAL, PK11_R_DIGESTFINAL, rv); -+ pk11_return_session(state->sp, OP_DIGEST); -+ state->sp = NULL; -+ return 0; -+ } -+ -+ if (ctx->digest->md_size != len) -+ return 0; -+ -+ /* Final is called and digest is returned, so return the session -+ * to the pool -+ */ -+ pk11_return_session(state->sp, OP_DIGEST); -+ state->sp = NULL; -+ -+ return 1; -+ } -+ -+static int -+pk11_digest_copy(EVP_MD_CTX *to,const EVP_MD_CTX *from) -+ { -+ CK_RV rv; -+ int ret = 0; -+ PK11_CIPHER_STATE *state, *state_to; -+ CK_BYTE_PTR pstate = NULL; -+ CK_ULONG ul_state_len; -+ -+ /* The copy-from state */ -+ state = (PK11_CIPHER_STATE *) from->md_data; -+ if (state == NULL || state->sp == NULL) -+ goto err; -+ -+ /* Initialize the copy-to state */ -+ if (!pk11_digest_init(to)) -+ goto err; -+ state_to = (PK11_CIPHER_STATE *) to->md_data; -+ -+ /* Get the size of the operation state of the copy-from session */ -+ rv = pFuncList->C_GetOperationState(state->sp->session, NULL, -+ &ul_state_len); -+ -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_DIGEST_COPY, PK11_R_GET_OPERATION_STATE, -+ rv); -+ goto err; -+ } -+ if (ul_state_len == 0) -+ { -+ goto err; -+ } -+ -+ pstate = OPENSSL_malloc(ul_state_len); -+ if (pstate == NULL) -+ { -+ PK11err(PK11_F_DIGEST_COPY, PK11_R_MALLOC_FAILURE); -+ goto err; -+ } -+ -+ /* Get the operation state of the copy-from session */ -+ rv = pFuncList->C_GetOperationState(state->sp->session, pstate, -+ &ul_state_len); -+ -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_DIGEST_COPY, PK11_R_GET_OPERATION_STATE, -+ rv); -+ goto err; -+ } -+ -+ /* Set the operation state of the copy-to session */ -+ rv = pFuncList->C_SetOperationState(state_to->sp->session, pstate, -+ ul_state_len, 0, 0); -+ -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_DIGEST_COPY, PK11_R_SET_OPERATION_STATE, rv); -+ goto err; -+ } -+ -+ ret = 1; -+err: -+ if (pstate != NULL) -+ OPENSSL_free(pstate); -+ -+ return ret; -+ } -+ -+/* Return any pending session state to the pool */ -+static int -+pk11_digest_cleanup(EVP_MD_CTX *ctx) -+ { -+ PK11_CIPHER_STATE *state = ctx->md_data; -+ unsigned char buf[EVP_MAX_MD_SIZE]; -+ -+ if (state != NULL && state->sp != NULL) -+ { -+ /* -+ * If state->sp is not NULL then pk11_digest_final() has not -+ * been called yet. We must call it now to free any memory -+ * that might have been allocated in the token when -+ * pk11_digest_init() was called. -+ */ -+ (void) pk11_digest_final(ctx,buf); -+ pk11_return_session(state->sp, OP_DIGEST); -+ state->sp = NULL; -+ } -+ -+ return 1; -+ } -+ -+/* -+ * Check if the new key is the same as the key object in the session. If the key -+ * is the same, no need to create a new key object. Otherwise, the old key -+ * object needs to be destroyed and a new one will be created. Return 1 for -+ * cache hit, 0 for cache miss. Note that we must check the key length first -+ * otherwise we could end up reusing a different, longer key with the same -+ * prefix. -+ */ -+static int check_new_cipher_key(PK11_SESSION *sp, const unsigned char *key, -+ int key_len) -+ { -+ if (sp->key_len != key_len || memcmp(sp->key, key, key_len) != 0) -+ { -+ (void) pk11_destroy_cipher_key_objects(sp); -+ return (0); -+ } -+ return (1); -+ } -+ -+/* Destroy one or more secret key objects. -+ */ -+static int pk11_destroy_cipher_key_objects(PK11_SESSION *session) -+ { -+ int ret = 0; -+ PK11_SESSION *sp = NULL; -+ PK11_SESSION *local_free_session; -+ -+ CRYPTO_w_lock(CRYPTO_LOCK_PK11_ENGINE); -+ if (session) -+ local_free_session = session; -+ else -+ local_free_session = free_session; -+ while ((sp = local_free_session) != NULL) -+ { -+ local_free_session = sp->next; -+ -+ if (sp->cipher_key != CK_INVALID_HANDLE) -+ { -+ /* The secret key object is created in the -+ * global_session. See pk11_get_cipher_key -+ */ -+ if (pk11_destroy_object(global_session, -+ sp->cipher_key) == 0) -+ goto err; -+ sp->cipher_key = CK_INVALID_HANDLE; -+ } -+ } -+ ret = 1; -+err: -+ CRYPTO_w_unlock(CRYPTO_LOCK_PK11_ENGINE); -+ -+ return ret; -+ } -+ -+ -+/* -+ * Public key mechanisms optionally supported -+ * -+ * CKM_RSA_X_509 -+ * CKM_RSA_PKCS -+ * CKM_DSA -+ * -+ * The first slot that supports at least one of those mechanisms is chosen as a -+ * public key slot. -+ * -+ * Symmetric ciphers optionally supported -+ * -+ * CKM_DES3_CBC -+ * CKM_DES_CBC -+ * CKM_AES_CBC -+ * CKM_DES3_ECB -+ * CKM_DES_ECB -+ * CKM_AES_ECB -+ * CKM_AES_CTR -+ * CKM_RC4 -+ * CKM_BLOWFISH_CBC -+ * -+ * Digests optionally supported -+ * -+ * CKM_MD5 -+ * CKM_SHA_1 -+ * CKM_SHA224 -+ * CKM_SHA256 -+ * CKM_SHA384 -+ * CKM_SHA512 -+ * -+ * The output of this function is a set of global variables indicating which -+ * mechanisms from RSA, DSA, DH and RAND are present, and also two arrays of -+ * mechanisms, one for symmetric ciphers and one for digests. Also, 3 global -+ * variables carry information about which slot was chosen for (a) public key -+ * mechanisms, (b) random operations, and (c) symmetric ciphers and digests. -+ */ -+static int -+pk11_choose_slots(int *any_slot_found) -+ { -+ CK_SLOT_ID_PTR pSlotList = NULL_PTR; -+ CK_ULONG ulSlotCount = 0; -+ CK_MECHANISM_INFO mech_info; -+ CK_TOKEN_INFO token_info; -+ int i; -+ CK_RV rv; -+ CK_SLOT_ID best_slot_sofar; -+ CK_BBOOL found_candidate_slot = CK_FALSE; -+ int slot_n_cipher = 0; -+ int slot_n_digest = 0; -+ CK_SLOT_ID current_slot = 0; -+ int current_slot_n_cipher = 0; -+ int current_slot_n_digest = 0; -+ -+ int local_cipher_nids[PK11_CIPHER_MAX]; -+ int local_digest_nids[PK11_DIGEST_MAX]; -+ -+ /* let's initialize the output parameter */ -+ if (any_slot_found != NULL) -+ *any_slot_found = 0; -+ -+ /* Get slot list for memory allocation */ -+ rv = pFuncList->C_GetSlotList(0, NULL_PTR, &ulSlotCount); -+ -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_CHOOSE_SLOT, PK11_R_GETSLOTLIST, rv); -+ return 0; -+ } -+ -+ /* it's not an error if we didn't find any providers */ -+ if (ulSlotCount == 0) -+ { -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: no crypto providers found\n", PK11_DBG); -+#endif /* DEBUG_SLOT_SELECTION */ -+ return 1; -+ } -+ -+ pSlotList = OPENSSL_malloc(ulSlotCount * sizeof (CK_SLOT_ID)); -+ -+ if (pSlotList == NULL) -+ { -+ PK11err(PK11_F_CHOOSE_SLOT, PK11_R_MALLOC_FAILURE); -+ return 0; -+ } -+ -+ /* Get the slot list for processing */ -+ rv = pFuncList->C_GetSlotList(0, pSlotList, &ulSlotCount); -+ if (rv != CKR_OK) -+ { -+ PK11err_add_data(PK11_F_CHOOSE_SLOT, PK11_R_GETSLOTLIST, rv); -+ OPENSSL_free(pSlotList); -+ return 0; -+ } -+ -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: provider: %s\n", PK11_DBG, def_PK11_LIBNAME); -+ fprintf(stderr, "%s: number of slots: %d\n", PK11_DBG, ulSlotCount); -+ -+ fprintf(stderr, "%s: == checking rand slots ==\n", PK11_DBG); -+#endif /* DEBUG_SLOT_SELECTION */ -+ for (i = 0; i < ulSlotCount; i++) -+ { -+ current_slot = pSlotList[i]; -+ -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: checking slot: %d\n", PK11_DBG, i); -+#endif /* DEBUG_SLOT_SELECTION */ -+ /* Check if slot has random support. */ -+ rv = pFuncList->C_GetTokenInfo(current_slot, &token_info); -+ if (rv != CKR_OK) -+ continue; -+ -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: token label: %.32s\n", PK11_DBG, token_info.label); -+#endif /* DEBUG_SLOT_SELECTION */ -+ -+ if (token_info.flags & CKF_RNG) -+ { -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: this token has CKF_RNG flag\n", PK11_DBG); -+#endif /* DEBUG_SLOT_SELECTION */ -+ pk11_have_random = CK_TRUE; -+ break; -+ } -+ } -+ -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: == checking pubkey slots ==\n", PK11_DBG); -+#endif /* DEBUG_SLOT_SELECTION */ -+ for (i = 0; i < ulSlotCount; i++) -+ { -+ CK_BBOOL slot_has_rsa = CK_FALSE; -+ CK_BBOOL slot_has_dsa = CK_FALSE; -+ CK_BBOOL slot_has_dh = CK_FALSE; -+ current_slot = pSlotList[i]; -+ -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: checking slot: %d\n", PK11_DBG, i); -+#endif /* DEBUG_SLOT_SELECTION */ -+ rv = pFuncList->C_GetTokenInfo(current_slot, &token_info); -+ if (rv != CKR_OK) -+ continue; -+ -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: token label: %.32s\n", PK11_DBG, token_info.label); -+#endif /* DEBUG_SLOT_SELECTION */ -+ -+#ifndef OPENSSL_NO_RSA -+ /* -+ * Check if this slot is capable of signing and -+ * verifying with CKM_RSA_PKCS. -+ */ -+ rv = pFuncList->C_GetMechanismInfo(current_slot, CKM_RSA_PKCS, -+ &mech_info); -+ -+ if (rv == CKR_OK && ((mech_info.flags & CKF_SIGN) && -+ (mech_info.flags & CKF_VERIFY))) -+ { -+ /* -+ * Check if this slot is capable of encryption, -+ * decryption, sign, and verify with CKM_RSA_X_509. -+ */ -+ rv = pFuncList->C_GetMechanismInfo(current_slot, -+ CKM_RSA_X_509, &mech_info); -+ -+ if (rv == CKR_OK && ((mech_info.flags & CKF_SIGN) && -+ (mech_info.flags & CKF_VERIFY) && -+ (mech_info.flags & CKF_ENCRYPT) && -+ (mech_info.flags & CKF_VERIFY_RECOVER) && -+ (mech_info.flags & CKF_DECRYPT))) -+ { -+ slot_has_rsa = CK_TRUE; -+ } -+ } -+#endif /* OPENSSL_NO_RSA */ -+ -+#ifndef OPENSSL_NO_DSA -+ /* -+ * Check if this slot is capable of signing and -+ * verifying with CKM_DSA. -+ */ -+ rv = pFuncList->C_GetMechanismInfo(current_slot, CKM_DSA, -+ &mech_info); -+ if (rv == CKR_OK && ((mech_info.flags & CKF_SIGN) && -+ (mech_info.flags & CKF_VERIFY))) -+ { -+ slot_has_dsa = CK_TRUE; -+ } -+#endif /* OPENSSL_NO_DSA */ -+ -+#ifndef OPENSSL_NO_DH -+ /* -+ * Check if this slot is capable of DH key generataion and -+ * derivation. -+ */ -+ rv = pFuncList->C_GetMechanismInfo(current_slot, -+ CKM_DH_PKCS_KEY_PAIR_GEN, &mech_info); -+ -+ if (rv == CKR_OK && (mech_info.flags & CKF_GENERATE_KEY_PAIR)) -+ { -+ rv = pFuncList->C_GetMechanismInfo(current_slot, -+ CKM_DH_PKCS_DERIVE, &mech_info); -+ if (rv == CKR_OK && (mech_info.flags & CKF_DERIVE)) -+ { -+ slot_has_dh = CK_TRUE; -+ } -+ } -+#endif /* OPENSSL_NO_DH */ -+ -+ if (!found_candidate_slot && -+ (slot_has_rsa || slot_has_dsa || slot_has_dh)) -+ { -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, -+ "%s: potential slot: %d\n", PK11_DBG, current_slot); -+#endif /* DEBUG_SLOT_SELECTION */ -+ best_slot_sofar = current_slot; -+ pk11_have_rsa = slot_has_rsa; -+ pk11_have_dsa = slot_has_dsa; -+ pk11_have_dh = slot_has_dh; -+ found_candidate_slot = CK_TRUE; -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, -+ "%s: setting found_candidate_slot to CK_TRUE\n", -+ PK11_DBG); -+ fprintf(stderr, -+ "%s: best so far slot: %d\n", PK11_DBG, -+ best_slot_sofar); -+ } -+ else -+ { -+ fprintf(stderr, -+ "%s: no rsa/dsa/dh\n", PK11_DBG); -+ } -+#else -+ } /* if */ -+#endif /* DEBUG_SLOT_SELECTION */ -+ } /* for */ -+ -+ if (found_candidate_slot) -+ { -+ pubkey_SLOTID = best_slot_sofar; -+ } -+ -+ found_candidate_slot = CK_FALSE; -+ best_slot_sofar = 0; -+ -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: == checking cipher/digest ==\n", PK11_DBG); -+#endif /* DEBUG_SLOT_SELECTION */ -+ for (i = 0; i < ulSlotCount; i++) -+ { -+#ifdef DEBUG_SLOT_SELECTION -+ fprintf(stderr, "%s: checking slot: %d\n", PK11_DBG, i); -+#endif /* DEBUG_SLOT_SELECTION */ -+ -+ current_slot = pSlotList[i]; -+ current_slot_n_cipher = 0; @@ 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 chninkel at users.sourceforge.net Sat Nov 7 00:11:06 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 06 Nov 2009 23:11:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7156] csw/mgar/pkg/openssl1/trunk/checksums Message-ID: Revision: 7156 http://gar.svn.sourceforge.net/gar/?rev=7156&view=rev Author: chninkel Date: 2009-11-06 23:11:06 +0000 (Fri, 06 Nov 2009) Log Message: ----------- openssl1: added checksums file Added Paths: ----------- csw/mgar/pkg/openssl1/trunk/checksums Added: csw/mgar/pkg/openssl1/trunk/checksums =================================================================== --- csw/mgar/pkg/openssl1/trunk/checksums (rev 0) +++ csw/mgar/pkg/openssl1/trunk/checksums 2009-11-06 23:11:06 UTC (rev 7156) @@ -0,0 +1,7 @@ +05ace5330714d6cd9c0e076b6ae2518f CSWossl1rt.checkinstall +1c3f600eaf942a18ecab3637e1fc32bd CSWossl1rt.postinstall +c9de908daad1a31fca20329cb043ad3c CSWossl1rt.preinstall +b78faa440d6f6a2a07663de331678648 README.CSW +904ceefa66b6b7b7e93ae0e9bc58bac8 changelog.CSW +a15d8b6511963d2e67448a88b0667fce more_configure_targets.patch +cf5a32016bb9da0b9578099727bf15c9 openssl-1.0.0-beta3.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 Nov 7 15:16:14 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 07 Nov 2009 14:16:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[7157] csw/mgar/pkg/mysql5/branches/mysql-5.0.x Message-ID: Revision: 7157 http://gar.svn.sourceforge.net/gar/?rev=7157&view=rev Author: wahwah Date: 2009-11-07 14:16:14 +0000 (Sat, 07 Nov 2009) Log Message: ----------- mysql5-5.0.x: Fixing a problem with the runtime library path. Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw Property Changed: ---------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.preinstall Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-11-06 23:11:06 UTC (rev 7156) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-11-07 14:16:14 UTC (rev 7157) @@ -72,7 +72,6 @@ CSWmysql5devel_programs += mysql_config - PKGFILES_CSWmysql5bench = $(prefix)/sql-bench.* PKGFILES_CSWmysql5client = $(bindir) PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(call baseisadirs,$(bindir),$(bin_name))) @@ -87,22 +86,6 @@ PKGFILES_CSWmysql5devel += $(prefix)/include.* PKGFILES_CSWmysql5devel += /opt/csw/include/mysql -# -/opt/csw/include/mysql --> ../mysql5/include/mysql -# -/opt/csw/mysql5/bin -# -/opt/csw/mysql5/bin/mysql_config -# -# /opt/csw/bin/mysql_config=../mysql5/bin/mysql_config -# /opt/csw/mysql5/bin/amd64/mysql_config 0755 root bin -# /opt/csw/mysql5/bin/i386/mysql_config=/opt/csw/mysql5/bin/mysql_config 0755 root bin -# /opt/csw/mysql5/bin/mysql_config=/opt/csw/bin/isaexec 0755 root bin -# /opt/csw/mysql5/share/man/man1/mysql_config.1 0644 root bin - - -# work/build-global/CSWmysql5client.prototype:s none /opt/csw/bin/mysql_config=../mysql5/bin/mysql_config -# work/build-global/CSWmysql5client.prototype:f none /opt/csw/mysql5/bin/amd64/mysql_config 0755 root bin -# work/build-global/CSWmysql5client.prototype:f none /opt/csw/mysql5/bin/mysql_config 0755 root bin -# work/build-global/CSWmysql5client.prototype:f none /opt/csw/mysql5/share/man/man1/mysql_config.1 0644 root bin - PKGFILES_CSWmysql5rt = $(prefix)/lib/.*\.so.* PKGFILES_CSWmysql5test = $(prefix)/mysql-test.* @@ -119,7 +102,7 @@ DISTFILES += CSWmysql5.postinstall DISTFILES += cswusergroup -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = mysql-(\d+(?:\.\d+)*).tar.gz REQUIRED_PKGS = CSWncurses CSWzlib PREREQUISITE_PKGS = $(REQUIRED_PKGS) @@ -127,6 +110,16 @@ EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ +# 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/mysql5/lib/amd64/libmysqlclient.so.15 +# The library is at: +# /opt/csw/mysql5/lib/amd64/mysql/libmysqlclient.so.15 +EXTRA_LD_OPTIONS = -R/opt/csw/mysql5/lib/\$$ISALIST/mysql + # Set ./configure options CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-assembler Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-11-06 23:11:06 UTC (rev 7156) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-11-07 14:16:14 UTC (rev 7157) @@ -2,11 +2,11 @@ 1414d06fab1530484a508927a0de4154 0002-cast-user_info-pw_gid-to-gid_t.patch 5415f365f1b0f7a179d1efc25f45bbee 0003-OpenCSW-perl-for-tests.patch 8ab232cd4d232b3cda3bbced93f80237 0004-basedir-and-datadir-in-the-cnf-files.patch -9b5511de728fec4394eca7dd0097fb43 CSWmysql5.postinstall +d5272c16bcc250df520ffe44bd60ef2a CSWmysql5.postinstall cc2a219abbe7dc6049775cff070a27a5 CSWmysql5.preinstall e691b0cf00a3925ac55c1844045d6e30 ChangeLog e42afb5ec1b1ab02d2ec3b46d0922636 README.CSW aaca748fc044834e71ad544ab293c494 cswmysql5 67228e1f096fe08a94f4267439a4ec36 cswusergroup 671348f1a5b078da9ca76f97e1fda325 mysql-5.0.84.tar.gz -fe747c88f7e6bd6a9636ba8ef2e96871 quick_start-csw +6342b90f82fbcdb85cd7f8269c0f860d quick_start-csw Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall 2009-11-06 23:11:06 UTC (rev 7156) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall 2009-11-07 14:16:14 UTC (rev 7157) @@ -5,7 +5,8 @@ MYSQLDATADIR=/var/opt/csw/mysql5 if [ ! -d "${MYSQLDATADIR}/mysql" ] ; then - echo "No database directory found in the default location." + echo "No database directory found in the default location:" + echo "${MYSQLDATADIR}/mysql" echo "If you need to build the initial database directory," echo " see /opt/csw/mysql5/share/mysql/quick_start-csw" echo "If you are using a non-default database directory location," Property changes on: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall ___________________________________________________________________ Added: svn:keywords + Id Property changes on: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.preinstall ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw 2009-11-06 23:11:06 UTC (rev 7156) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw 2009-11-07 14:16:14 UTC (rev 7157) @@ -102,7 +102,11 @@ echo "Creating MySQL core database in $MYSQLD_DATADIR" echo echo "### The following messages are from mysql_install_db." -$BASEDIR/bin/mysql_install_db --defaults-extra-file=$DEFAULTS_FILE --user=$MYSQLD_USER --basedir=$BASEDIR --datadir=$MYSQLD_DATADIR +$BASEDIR/bin/mysql_install_db \ + --defaults-extra-file=$DEFAULTS_FILE \ + --user=$MYSQLD_USER \ + --basedir=$BASEDIR \ + --datadir=$MYSQLD_DATADIR # # Fix permissions on the data directory @@ -125,7 +129,7 @@ echo " for starting CSWmysql5." smf=no if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ] ; then smf=yes ; fi -if [ $smf = yes ] +if [ $smf = yes ] then echo "To start mysqld; run \`svcadm enable cswmysql5\` on Solaris 10 or later" else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Nov 7 15:18:24 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 07 Nov 2009 14:18:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7158] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums Message-ID: Revision: 7158 http://gar.svn.sourceforge.net/gar/?rev=7158&view=rev Author: wahwah Date: 2009-11-07 14:18:24 +0000 (Sat, 07 Nov 2009) Log Message: ----------- mysql5-5.0.x: Setting the checksums of files with the Id tag Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-11-07 14:16:14 UTC (rev 7157) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-11-07 14:18:24 UTC (rev 7158) @@ -2,11 +2,11 @@ 1414d06fab1530484a508927a0de4154 0002-cast-user_info-pw_gid-to-gid_t.patch 5415f365f1b0f7a179d1efc25f45bbee 0003-OpenCSW-perl-for-tests.patch 8ab232cd4d232b3cda3bbced93f80237 0004-basedir-and-datadir-in-the-cnf-files.patch -d5272c16bcc250df520ffe44bd60ef2a CSWmysql5.postinstall -cc2a219abbe7dc6049775cff070a27a5 CSWmysql5.preinstall +747637bc4be42207974ae845d832ae65 CSWmysql5.postinstall +60162ea667507a6a487027e7c389ca55 CSWmysql5.preinstall e691b0cf00a3925ac55c1844045d6e30 ChangeLog e42afb5ec1b1ab02d2ec3b46d0922636 README.CSW aaca748fc044834e71ad544ab293c494 cswmysql5 67228e1f096fe08a94f4267439a4ec36 cswusergroup 671348f1a5b078da9ca76f97e1fda325 mysql-5.0.84.tar.gz -6342b90f82fbcdb85cd7f8269c0f860d quick_start-csw +90b7cfcd11ab56e021a195a6a085fa21 quick_start-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 Nov 7 18:43:50 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 07 Nov 2009 17:43:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[7159] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 7159 http://gar.svn.sourceforge.net/gar/?rev=7159&view=rev Author: wahwah Date: 2009-11-07 17:43:49 +0000 (Sat, 07 Nov 2009) Log Message: ----------- mysql-5.0.x: Added CSWperl as a dependency for CSWmysql5devel 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 2009-11-07 14:18:24 UTC (rev 7158) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-11-07 17:43:49 UTC (rev 7159) @@ -93,7 +93,7 @@ REQUIRED_PKGS_CSWmysql5client = CSWmysql5rt REQUIRED_PKGS_CSWmysql5 = CSWmysql5client CSWmysql5rt REQUIRED_PKGS_CSWmysql5devel = CSWmysql5 -REQUIRED_PKGS_CSWmysql5test = CSWmysql5 +REQUIRED_PKGS_CSWmysql5test = CSWmysql5 CSWperl MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.0/ DISTFILES = mysql-$(GARVERSION).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sat Nov 7 23:12:07 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sat, 07 Nov 2009 22:12:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7160] csw/mgar/pkg/cpan/Convert-UUlib/trunk/ Message-ID: Revision: 7160 http://gar.svn.sourceforge.net/gar/?rev=7160&view=rev Author: idogan23 Date: 2009-11-07 22:11:29 +0000 (Sat, 07 Nov 2009) Log Message: ----------- pm_convertuulib: Changed to mGAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Convert-UUlib/trunk/ Property changes on: csw/mgar/pkg/cpan/Convert-UUlib/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 idogan23 at users.sourceforge.net Sat Nov 7 23:34:30 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sat, 07 Nov 2009 22:34:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[7161] csw/mgar/pkg/cpan/Convert-UUlib/trunk Message-ID: Revision: 7161 http://gar.svn.sourceforge.net/gar/?rev=7161&view=rev Author: idogan23 Date: 2009-11-07 22:34:12 +0000 (Sat, 07 Nov 2009) Log Message: ----------- pm_convertuulib: Switch to dynamic gspec Modified Paths: -------------- csw/mgar/pkg/cpan/Convert-UUlib/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/cpan/Convert-UUlib/trunk/files/CSWpmconvertuulib.gspec Modified: csw/mgar/pkg/cpan/Convert-UUlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Convert-UUlib/trunk/Makefile 2009-11-07 22:11:29 UTC (rev 7160) +++ csw/mgar/pkg/cpan/Convert-UUlib/trunk/Makefile 2009-11-07 22:34:12 UTC (rev 7161) @@ -5,9 +5,12 @@ DESCRIPTION = Perl interface to the uulib library define BLURB - Includes Convert::UUlib + Convert::UUlib is a versatile and powerful decoder/encoder library + for a variety of encodings used in Usenet and Mail (uuencode, + xxencode, b64, binhex...). endef -DISTFILES += $(call admfiles,CSWpmconvertuulib,) +PACKAGES = CSWpmconvertuulib +CATALOGNAME = pm_convertuulib include gar/category.mk Deleted: csw/mgar/pkg/cpan/Convert-UUlib/trunk/files/CSWpmconvertuulib.gspec =================================================================== --- csw/mgar/pkg/cpan/Convert-UUlib/trunk/files/CSWpmconvertuulib.gspec 2009-11-07 22:11:29 UTC (rev 7160) +++ csw/mgar/pkg/cpan/Convert-UUlib/trunk/files/CSWpmconvertuulib.gspec 2009-11-07 22:34:12 UTC (rev 7161) @@ -1,4 +0,0 @@ -%var bitname pm_convertuulib -%var pkgname CSWpmconvertuulib -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright url file://%{WORKSRC}/COPYING.GNU This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sat Nov 7 23:42:48 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sat, 07 Nov 2009 22:42:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[7162] csw/mgar/pkg/cpan/Convert-UUlib/trunk Message-ID: Revision: 7162 http://gar.svn.sourceforge.net/gar/?rev=7162&view=rev Author: idogan23 Date: 2009-11-07 22:42:22 +0000 (Sat, 07 Nov 2009) Log Message: ----------- pm_convertuulib: bump version to 1.33 Modified Paths: -------------- csw/mgar/pkg/cpan/Convert-UUlib/trunk/Makefile csw/mgar/pkg/cpan/Convert-UUlib/trunk/checksums Modified: csw/mgar/pkg/cpan/Convert-UUlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Convert-UUlib/trunk/Makefile 2009-11-07 22:34:12 UTC (rev 7161) +++ csw/mgar/pkg/cpan/Convert-UUlib/trunk/Makefile 2009-11-07 22:42:22 UTC (rev 7162) @@ -1,5 +1,5 @@ GARNAME = Convert-UUlib -GARVERSION = 1.12 +GARVERSION = 1.33 CATEGORIES = cpan AUTHOR = MLEHMANN Modified: csw/mgar/pkg/cpan/Convert-UUlib/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Convert-UUlib/trunk/checksums 2009-11-07 22:34:12 UTC (rev 7161) +++ csw/mgar/pkg/cpan/Convert-UUlib/trunk/checksums 2009-11-07 22:42:22 UTC (rev 7162) @@ -1,2 +1 @@ -67c14375b70d8b1a701e76b5f6e1172e download/CSWpmconvertuulib.gspec -360d29db09aa7692d8873b336b7ec9d7 download/Convert-UUlib-1.12.tar.gz +d4e3330562e5d4f6c022b0a0619a2c71 Convert-UUlib-1.33.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 Nov 8 10:22:46 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 08 Nov 2009 09:22:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7163] csw/mgar/pkg/diffstat/trunk Message-ID: Revision: 7163 http://gar.svn.sourceforge.net/gar/?rev=7163&view=rev Author: dmichelsen Date: 2009-11-08 09:22:45 +0000 (Sun, 08 Nov 2009) Log Message: ----------- diffstat: Update to 1.51 Modified Paths: -------------- csw/mgar/pkg/diffstat/trunk/Makefile csw/mgar/pkg/diffstat/trunk/checksums Modified: csw/mgar/pkg/diffstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/diffstat/trunk/Makefile 2009-11-07 22:42:22 UTC (rev 7162) +++ csw/mgar/pkg/diffstat/trunk/Makefile 2009-11-08 09:22:45 UTC (rev 7163) @@ -1,5 +1,5 @@ GARNAME = diffstat -GARVERSION = 1.50 +GARVERSION = 1.51 CATEGORIES = utils DESCRIPTION = A utility which provides statistics based on the output of diff Modified: csw/mgar/pkg/diffstat/trunk/checksums =================================================================== --- csw/mgar/pkg/diffstat/trunk/checksums 2009-11-07 22:42:22 UTC (rev 7162) +++ csw/mgar/pkg/diffstat/trunk/checksums 2009-11-08 09:22:45 UTC (rev 7163) @@ -1 +1 @@ -ece8f6a380d30cf2355ebb27375350d7 diffstat-1.50.tgz +a7d3fd1ba2a9a6c9e2b32e867b5e8792 diffstat-1.51.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 Nov 8 10:45:11 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 08 Nov 2009 09:45:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[7164] csw/mgar/pkg/diffstat Message-ID: Revision: 7164 http://gar.svn.sourceforge.net/gar/?rev=7164&view=rev Author: dmichelsen Date: 2009-11-08 09:45:11 +0000 (Sun, 08 Nov 2009) Log Message: ----------- diffutils: Move legacy to tags Added Paths: ----------- csw/mgar/pkg/diffstat/tags/legacy/ Removed Paths: ------------- csw/mgar/pkg/diffstat/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 Sun Nov 8 10:45:31 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 08 Nov 2009 09:45:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7165] csw/mgar/pkg/diffstat/trunk/Makefile Message-ID: Revision: 7165 http://gar.svn.sourceforge.net/gar/?rev=7165&view=rev Author: dmichelsen Date: 2009-11-08 09:45:30 +0000 (Sun, 08 Nov 2009) Log Message: ----------- diffstat: Add copyright notice Modified Paths: -------------- csw/mgar/pkg/diffstat/trunk/Makefile Modified: csw/mgar/pkg/diffstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/diffstat/trunk/Makefile 2009-11-08 09:45:11 UTC (rev 7164) +++ csw/mgar/pkg/diffstat/trunk/Makefile 2009-11-08 09:45:30 UTC (rev 7165) @@ -20,3 +20,7 @@ TEST_TARGET = check include gar/category.mk + +post-extract-modulated: + -test -f $(WORKSRC)/diffstat.1 && perl -n -e 'next if( !/^\.\\"/ ); s/\.\\"//; print "*$$_"' $(WORKSRC)/diffstat.1 >$(WORKSRC)/COPYING + @$(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 Nov 8 11:48:54 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 08 Nov 2009 10:48:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[7166] csw/mgar/pkg/memcached/trunk Message-ID: Revision: 7166 http://gar.svn.sourceforge.net/gar/?rev=7166&view=rev Author: dmichelsen Date: 2009-11-08 10:48:54 +0000 (Sun, 08 Nov 2009) Log Message: ----------- memcached: Update to 1.4.3 Modified Paths: -------------- csw/mgar/pkg/memcached/trunk/Makefile csw/mgar/pkg/memcached/trunk/checksums Modified: csw/mgar/pkg/memcached/trunk/Makefile =================================================================== --- csw/mgar/pkg/memcached/trunk/Makefile 2009-11-08 09:45:30 UTC (rev 7165) +++ csw/mgar/pkg/memcached/trunk/Makefile 2009-11-08 10:48:54 UTC (rev 7166) @@ -1,5 +1,5 @@ GARNAME = memcached -GARVERSION = 1.4.3_rc2_2_g8c0a108 +GARVERSION = 1.4.3 CATEGORIES = net DESCRIPTION = Distributed memory object caching system Modified: csw/mgar/pkg/memcached/trunk/checksums =================================================================== --- csw/mgar/pkg/memcached/trunk/checksums 2009-11-08 09:45:30 UTC (rev 7165) +++ csw/mgar/pkg/memcached/trunk/checksums 2009-11-08 10:48:54 UTC (rev 7166) @@ -1 +1 @@ -a2f988a668317fc3cfd91b22b05ab929 memcached-1.4.3_rc2_2_g8c0a108.tar.gz +83c6cc6bad9612536b5acbbbddab3eb3 memcached-1.4.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Nov 8 14:18:06 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 08 Nov 2009 13:18:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7167] csw/mgar/pkg Message-ID: Revision: 7167 http://gar.svn.sourceforge.net/gar/?rev=7167&view=rev Author: trygvis Date: 2009-11-08 13:18:06 +0000 (Sun, 08 Nov 2009) Log Message: ----------- tofrodos: Initial commit. Added Paths: ----------- csw/mgar/pkg/tofrodos/ csw/mgar/pkg/tofrodos/branches/ csw/mgar/pkg/tofrodos/tags/ csw/mgar/pkg/tofrodos/trunk/ csw/mgar/pkg/tofrodos/trunk/Makefile csw/mgar/pkg/tofrodos/trunk/checksums csw/mgar/pkg/tofrodos/trunk/files/ Property changes on: csw/mgar/pkg/tofrodos/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/tofrodos/trunk/Makefile =================================================================== --- csw/mgar/pkg/tofrodos/trunk/Makefile (rev 0) +++ csw/mgar/pkg/tofrodos/trunk/Makefile 2009-11-08 13:18:06 UTC (rev 7167) @@ -0,0 +1,43 @@ +GARNAME = tofrodos +GARVERSION = 1.7.8 +CATEGORIES = utils + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +WORKSRC ?= $(WORKDIR)/$(GARNAME)/src +MASTER_SITES = http://tofrodos.sourceforge.net/download/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_SCRIPTS = + +#BUILD_ARGS = CC=$(CC) LD=$(CC) MAKE=$(MAKE) CDEBUG= CFLAGS="$(CFLAGS) -c" +BUILD_ARGS = CC=$(CC) LD=$(CC) MAKE=$(MAKE) CDEBUG= CFLAGS="$(CFLAGS) -c -Dstricmp=strcasecmp" + +TEST_SCRIPTS = + +INSTALL_ARGS = BINDIR=$(DESTDIR)$(bindir) MANDIR=$(DESTDIR)$(mandir)/man1 INSTALL=$(bindir)/ginstall + +pre-install-modulated: + @echo "Creating directories" + mkdir -p $(DESTDIR)$(bindir) + mkdir -p $(DESTDIR)$(mandir)/man1 + +post-install-modulated: + @echo "Creating links" + ln -s ./fromdos $(DESTDIR)$(bindir)/dos2unix + ln -s ./fromdos $(DESTDIR)$(bindir)/unix2dos + ln -s ./fromdos.1 $(DESTDIR)$(mandir)/man1/dos2unix + ln -s ./fromdos.1 $(DESTDIR)$(mandir)/man1/unix2dos + +include gar/category.mk Added: csw/mgar/pkg/tofrodos/trunk/checksums =================================================================== --- csw/mgar/pkg/tofrodos/trunk/checksums (rev 0) +++ csw/mgar/pkg/tofrodos/trunk/checksums 2009-11-08 13:18:06 UTC (rev 7167) @@ -0,0 +1 @@ +aaa044f9817a048e126d9eb7a7535e96 tofrodos-1.7.8.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Nov 8 14:23:46 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 08 Nov 2009 13:23:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7168] csw/mgar/pkg/tofrodos/trunk/Makefile Message-ID: Revision: 7168 http://gar.svn.sourceforge.net/gar/?rev=7168&view=rev Author: trygvis Date: 2009-11-08 13:23:45 +0000 (Sun, 08 Nov 2009) Log Message: ----------- o Adding blurb. Modified Paths: -------------- csw/mgar/pkg/tofrodos/trunk/Makefile Modified: csw/mgar/pkg/tofrodos/trunk/Makefile =================================================================== --- csw/mgar/pkg/tofrodos/trunk/Makefile 2009-11-08 13:18:06 UTC (rev 7167) +++ csw/mgar/pkg/tofrodos/trunk/Makefile 2009-11-08 13:23:45 UTC (rev 7168) @@ -2,9 +2,12 @@ GARVERSION = 1.7.8 CATEGORIES = utils -DESCRIPTION = Brief description +DESCRIPTION = Text file conversion utility that converts ASCII files between the MSDOS (or Windows) to Unix format. define BLURB - Long description +It is a useful utility to have around when you have to convert files between +MSDOS (or Windows) and Unix/Linux/BSD (and her clones and variants). It comes +standard with a number of systems and is often found on the system as "todos", +"fromdos", "dos2unix" and "unix2dos". endef WORKSRC ?= $(WORKDIR)/$(GARNAME)/src This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Nov 8 15:07:01 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 08 Nov 2009 14:07:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[7169] csw/mgar/pkg/tofrodos/trunk/Makefile Message-ID: Revision: 7169 http://gar.svn.sourceforge.net/gar/?rev=7169&view=rev Author: trygvis Date: 2009-11-08 14:07:01 +0000 (Sun, 08 Nov 2009) Log Message: ----------- tofrodos: Shortening DESCRIPTION. Modified Paths: -------------- csw/mgar/pkg/tofrodos/trunk/Makefile Modified: csw/mgar/pkg/tofrodos/trunk/Makefile =================================================================== --- csw/mgar/pkg/tofrodos/trunk/Makefile 2009-11-08 13:23:45 UTC (rev 7168) +++ csw/mgar/pkg/tofrodos/trunk/Makefile 2009-11-08 14:07:01 UTC (rev 7169) @@ -2,7 +2,7 @@ GARVERSION = 1.7.8 CATEGORIES = utils -DESCRIPTION = Text file conversion utility that converts ASCII files between the MSDOS (or Windows) to Unix format. +DESCRIPTION = Text file utility that converts files between MSDOS and Unix format. define BLURB It is a useful utility to have around when you have to convert files between MSDOS (or Windows) and Unix/Linux/BSD (and her clones and variants). It comes This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Nov 8 15:45:10 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 08 Nov 2009 14:45:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7170] csw/mgar/pkg Message-ID: Revision: 7170 http://gar.svn.sourceforge.net/gar/?rev=7170&view=rev Author: trygvis Date: 2009-11-08 14:45:10 +0000 (Sun, 08 Nov 2009) Log Message: ----------- gtkwave: Initial commit. Added Paths: ----------- csw/mgar/pkg/gtkwave/ csw/mgar/pkg/gtkwave/branches/ csw/mgar/pkg/gtkwave/tags/ csw/mgar/pkg/gtkwave/trunk/ csw/mgar/pkg/gtkwave/trunk/Makefile csw/mgar/pkg/gtkwave/trunk/checksums csw/mgar/pkg/gtkwave/trunk/files/ Property changes on: csw/mgar/pkg/gtkwave/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/gtkwave/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtkwave/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gtkwave/trunk/Makefile 2009-11-08 14:45:10 UTC (rev 7170) @@ -0,0 +1,33 @@ +GARNAME = gtkwave +GARVERSION = 3.2.3 +CATEGORIES = devel + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +SF_PROJ = $(GARNAME) +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +PREREQUISITE_BASE_PKGS = CSWtofrodos + +GARCOMPILER = GNU + +CONFIGURE_ARGS = $(DIRPATHS) LDFLAGS=-lintl + +pre-build-modulated: + find $(WORKSRC) -type f | xargs -I _ /opt/csw/bin/dos2unix _ _ + @$(MAKECOOKIE) + +TEST_SCRIPTS = + +include gar/category.mk Added: csw/mgar/pkg/gtkwave/trunk/checksums =================================================================== --- csw/mgar/pkg/gtkwave/trunk/checksums (rev 0) +++ csw/mgar/pkg/gtkwave/trunk/checksums 2009-11-08 14:45:10 UTC (rev 7170) @@ -0,0 +1 @@ +dcc427903a8f5e958c099f108958dce8 gtkwave-3.2.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Nov 8 16:16:52 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 08 Nov 2009 15:16:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[7171] csw/mgar/pkg/freehdl/trunk Message-ID: Revision: 7171 http://gar.svn.sourceforge.net/gar/?rev=7171&view=rev Author: trygvis Date: 2009-11-08 15:16:52 +0000 (Sun, 08 Nov 2009) Log Message: ----------- o Adding patch to use OpenCSW's pkg-config. Modified Paths: -------------- csw/mgar/pkg/freehdl/trunk/Makefile csw/mgar/pkg/freehdl/trunk/checksums Added Paths: ----------- csw/mgar/pkg/freehdl/trunk/files/0001-Use-OpenCSW-pkg-config.patch Modified: csw/mgar/pkg/freehdl/trunk/Makefile =================================================================== --- csw/mgar/pkg/freehdl/trunk/Makefile 2009-11-08 14:45:10 UTC (rev 7170) +++ csw/mgar/pkg/freehdl/trunk/Makefile 2009-11-08 15:16:52 UTC (rev 7171) @@ -14,7 +14,8 @@ MASTER_SITES = http://freehdl.seul.org/~enaroska/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PATCHFILES = 0000-Mirring-strings.h-include.patch +PATCHFILES = 0000-Mirring-strings.h-include.patch +PATCHFILES += 0001-Use-OpenCSW-pkg-config.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -29,4 +30,7 @@ TEST_SCRIPTS = +REQUIRED_PKGS = CSWgcc4corert CSWgcc4g++ CSWgcc4g++rt CSWpkgconfig +#CSWgcc3core CSWgcc3corert CSWgcc3g++ CSWgcc3g++rt + include gar/category.mk Modified: csw/mgar/pkg/freehdl/trunk/checksums =================================================================== --- csw/mgar/pkg/freehdl/trunk/checksums 2009-11-08 14:45:10 UTC (rev 7170) +++ csw/mgar/pkg/freehdl/trunk/checksums 2009-11-08 15:16:52 UTC (rev 7171) @@ -1 +1,3 @@ +75dd38573b84d23a93a10c028051305d 0000-Mirring-strings.h-include.patch +2950515cac5a87c43c97b264195ff5f7 0001-Use-OpenCSW-pkg-config.patch 6d702aa188fb2c62f8cfca5a2f66d956 freehdl-0.0.7.tar.gz Added: csw/mgar/pkg/freehdl/trunk/files/0001-Use-OpenCSW-pkg-config.patch =================================================================== --- csw/mgar/pkg/freehdl/trunk/files/0001-Use-OpenCSW-pkg-config.patch (rev 0) +++ csw/mgar/pkg/freehdl/trunk/files/0001-Use-OpenCSW-pkg-config.patch 2009-11-08 15:16:52 UTC (rev 7171) @@ -0,0 +1,25 @@ +--- ./freehdl/freehdl-config.orig 2009-11-08 16:03:07.101570078 +0100 ++++ ./freehdl/freehdl-config 2009-11-08 16:03:21.400958210 +0100 +@@ -21,14 +21,14 @@ + # + + option="$1" +-prefix=`pkg-config --variable prefix freehdl` +-exec_prefix=`pkg-config --variable exec_prefix freehdl` +-includedir=`pkg-config --variable includedir freehdl` +-libdir=`pkg-config --variable libdir freehdl` +-version=`pkg-config --modversion freehdl` +-cxxflags=`pkg-config --variable cxxflags freehdl` +-cxx=`pkg-config --variable cxx freehdl` +-linker=`pkg-config --variable libtool freehdl` ++prefix=`/opt/csw/bin/pkg-config --variable prefix freehdl` ++exec_prefix=`/opt/csw/bin/pkg-config --variable exec_prefix freehdl` ++includedir=`/opt/csw/bin/pkg-config --variable includedir freehdl` ++libdir=`/opt/csw/bin/pkg-config --variable libdir freehdl` ++version=`/opt/csw/bin/pkg-config --modversion freehdl` ++cxxflags=`/opt/csw/bin/pkg-config --variable cxxflags freehdl` ++cxx=`/opt/csw/bin/pkg-config --variable cxx freehdl` ++linker=`/opt/csw/bin/pkg-config --variable libtool freehdl` + + case "$option" in + 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 Nov 8 21:31:57 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 08 Nov 2009 20:31:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[7172] csw/mgar/pkg/doxygen/trunk/Makefile Message-ID: Revision: 7172 http://gar.svn.sourceforge.net/gar/?rev=7172&view=rev Author: dmichelsen Date: 2009-11-08 20:31:57 +0000 (Sun, 08 Nov 2009) Log Message: ----------- doxygen: Add license and make docs ARCHALL Modified Paths: -------------- csw/mgar/pkg/doxygen/trunk/Makefile Modified: csw/mgar/pkg/doxygen/trunk/Makefile =================================================================== --- csw/mgar/pkg/doxygen/trunk/Makefile 2009-11-08 15:16:52 UTC (rev 7171) +++ csw/mgar/pkg/doxygen/trunk/Makefile 2009-11-08 20:31:57 UTC (rev 7172) @@ -23,6 +23,8 @@ SPKG_DESC_CSWdoxygen = A documentation system for programming languages SPKG_DESC_CSWdoxygendoc = doxygen documentation +LICENSE = LICENSE + SPKG_SOURCEURL = http://www.stack.nl/~dimitri/doxygen/ # We define upstream file regex so we can be notifed of new upstream software release @@ -43,6 +45,7 @@ EXTRA_PAX_ARGS += -s ',^\.$(prefix)/man,.$(mandir),' +ARCHALL_CSWdoxygendoc = 1 PKGFILES_CSWdoxygendoc = $(PKGFILES_DOC) 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 Nov 9 09:16:45 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 09 Nov 2009 08:16:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[7173] csw/mgar/pkg Message-ID: Revision: 7173 http://gar.svn.sourceforge.net/gar/?rev=7173&view=rev Author: wahwah Date: 2009-11-09 08:16:45 +0000 (Mon, 09 Nov 2009) Log Message: ----------- cheetah: Initial commit Modified Paths: -------------- csw/mgar/pkg/cheetah/trunk/Makefile csw/mgar/pkg/cheetah/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cheetah/ Modified: csw/mgar/pkg/cheetah/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-11-08 20:31:57 UTC (rev 7172) +++ csw/mgar/pkg/cheetah/trunk/Makefile 2009-11-09 08:16:45 UTC (rev 7173) @@ -2,181 +2,23 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = cheetah +GARVERSION = 2.4.0 +CATEGORIES = python +DESCRIPTION = A template engine and code generation tool define BLURB - + Cheetah is an open source template engine and code generation tool, written + in Python. It can be used standalone or combined with other tools and + frameworks. Web development is its principle use, but Cheetah is very + flexible and is also being used to generate C++ game code, Java, sql, form + emails and even Python code. endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +SPKG_SOURCEURL = http://www.cheetahtemplate.org/ +MASTER_SITES = http://pypi.python.org/packages/source/C/Cheetah/ +DL_NAME = Cheetah +DISTNAME = $(DL_NAME)-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz +UFILES_REGEX = $(DL_NAME)-(\d+(?:\.\d+)*).tar.gz +CATALOGNAME = py_cheetah +PACKAGES = CSWpycheetah +include gar/category.mk Modified: csw/mgar/pkg/cheetah/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-11-08 20:31:57 UTC (rev 7172) +++ csw/mgar/pkg/cheetah/trunk/checksums 2009-11-09 08:16:45 UTC (rev 7173) @@ -0,0 +1 @@ +873f5440676355512f176fc4ac01011e Cheetah-2.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 Mon Nov 9 14:31:29 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 09 Nov 2009 13:31:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[7174] csw/mgar/pkg Message-ID: Revision: 7174 http://gar.svn.sourceforge.net/gar/?rev=7174&view=rev Author: dmichelsen Date: 2009-11-09 13:31:29 +0000 (Mon, 09 Nov 2009) Log Message: ----------- imlib: Initial commit Added Paths: ----------- csw/mgar/pkg/imlib/ csw/mgar/pkg/imlib/branches/ csw/mgar/pkg/imlib/tags/ csw/mgar/pkg/imlib/trunk/ csw/mgar/pkg/imlib/trunk/Makefile csw/mgar/pkg/imlib/trunk/checksums csw/mgar/pkg/imlib/trunk/files/ Property changes on: csw/mgar/pkg/imlib/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/imlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/imlib/trunk/Makefile (rev 0) +++ csw/mgar/pkg/imlib/trunk/Makefile 2009-11-09 13:31:29 UTC (rev 7174) @@ -0,0 +1,28 @@ +GARNAME = imlib +GARVERSION = 1.9.15 +CATEGORIES = lib + +DESCRIPTION = An advanced replacement library for libraries like libXpm +define BLURB +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +# EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --x-include=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/imlib/trunk/checksums =================================================================== --- csw/mgar/pkg/imlib/trunk/checksums (rev 0) +++ csw/mgar/pkg/imlib/trunk/checksums 2009-11-09 13:31:29 UTC (rev 7174) @@ -0,0 +1 @@ +7db987e6c52e4daf70d7d0f471238eae download/imlib-1.9.15.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 Nov 9 15:57:04 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 09 Nov 2009 14:57:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[7175] csw/mgar/pkg Message-ID: Revision: 7175 http://gar.svn.sourceforge.net/gar/?rev=7175&view=rev Author: wahwah Date: 2009-11-09 14:57:04 +0000 (Mon, 09 Nov 2009) Log Message: ----------- p4: Initial commit. Modified Paths: -------------- csw/mgar/pkg/p4/trunk/Makefile csw/mgar/pkg/p4/trunk/checksums Added Paths: ----------- csw/mgar/pkg/p4/ Modified: csw/mgar/pkg/p4/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-11-04 15:45:55 UTC (rev 7108) +++ csw/mgar/pkg/p4/trunk/Makefile 2009-11-09 14:57:04 UTC (rev 7175) @@ -2,181 +2,72 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = p4 +GARVERSION = 09.1 +CATEGORIES = utils +DESCRIPTION = Perforce command-line client define BLURB - + The purpose of this build to be able to easily package it up for in-house + distribution. It's not intended to be used to distribute p4 client as part + of the OpenCSW catalog. endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true +SPKG_SOURCEURL = http://www.perforce.com +P4OS_5.8 = solaris8 +P4OS_5.9 = solaris9 +P4OS_5.10 = solaris10 +P4OS = $(P4OS_$(GAROSREL)) -#include gar/category.mk +P4ARCH_i386 = x86 +P4ARCH_amd64 = x86_64 +P4ARCH_sparcv8 = sparc +P4ARCH_sparcv9 = sparc64 +P4ARCH = $(P4ARCH_$(KERNELISA)) +# MASTER_SITES = http://www.perforce.com/downloads/perforce/r$(GARVERSION)/bin.$(P4OS)$(P4ARCH)/ +MASTER_SITES += http://www.perforce.com/perforce/contracts/ +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +DISTFILES = +DISTFILES += p4-$(GARVERSION)-solaris10x86 +DISTFILES += p4-$(GARVERSION)-solaris10x86_64 +DISTFILES += p4-$(GARVERSION)-solaris10sparc +DISTFILES += p4-$(GARVERSION)-solaris10sparc64 +DISTFILES += commercial.pdf + +work/solaris%/download/p4-$(GARVERSION)-solaris10x86: + wget http://www.perforce.com/downloads/perforce/r$(GARVERSION)/bin.solaris10x86/p4 \ + -P $(PARTIALDIR) \ + -O $@ + +work/solaris%/download/p4-$(GARVERSION)-solaris10x86_64: + wget http://www.perforce.com/downloads/perforce/r$(GARVERSION)/bin.solaris10x86_64/p4 \ + -P $(PARTIALDIR) \ + -O $@ + +work/solaris%/download/p4-$(GARVERSION)-solaris10sparc: + wget http://www.perforce.com/downloads/perforce/r$(GARVERSION)/bin.solaris10sparc/p4 \ + -P $(PARTIALDIR) \ + -O $@ + +work/solaris%/download/p4-$(GARVERSION)-solaris10sparc64: + wget http://www.perforce.com/downloads/perforce/r$(GARVERSION)/bin.solaris10sparc64/p4 \ + -P $(PARTIALDIR) \ + -O $@ + +LICENSE = commercial.txt +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = p4 +INSTALL_SCRIPTS = p4 +TEST_SCRIPTS = +BUILD64 = 1 +include gar/category.mk + +build-p4: + pdftotext $(WORKDIR)/commercial.pdf + @$(MAKECOOKIE) + +install-p4: + ginstall -m 755 -d $(DESTDIR)$(bindir) + ginstall -m 755 $(WORKDIR)/p4-$(GARVERSION)-$(P4OS)$(P4ARCH) $(DESTDIR)$(bindir)/p4 + ginstall -m 755 -d $(DESTDIR)$(docdir)/p4 + ginstall -m 644 $(DOWNLOADDIR)/commercial.pdf $(DESTDIR)$(docdir)/p4 + @$(MAKECOOKIE) Modified: csw/mgar/pkg/p4/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-11-04 15:45:55 UTC (rev 7108) +++ csw/mgar/pkg/p4/trunk/checksums 2009-11-09 14:57:04 UTC (rev 7175) @@ -0,0 +1,5 @@ +ef4ef2c443c8c638c671b5c4e4bdd42f commercial.pdf +71704b52a8af0559d5319c6c3469de77 p4-09.1-solaris10sparc +ddc03484fd0fbcfb8129401644c1a76f p4-09.1-solaris10sparc64 +349d5e8d61389da2e23af8b31ec4fc9d p4-09.1-solaris10x86 +13c9469198f515ba57f5237ba5e428f6 p4-09.1-solaris10x86_64 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 Nov 9 16:00:59 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 09 Nov 2009 15:00:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[7176] csw/mgar/pkg/p4/trunk/Makefile Message-ID: Revision: 7176 http://gar.svn.sourceforge.net/gar/?rev=7176&view=rev Author: wahwah Date: 2009-11-09 15:00:59 +0000 (Mon, 09 Nov 2009) Log Message: ----------- p4: Fixing a problem in which GAROSREL is 5.8 on build10x Modified Paths: -------------- csw/mgar/pkg/p4/trunk/Makefile Modified: csw/mgar/pkg/p4/trunk/Makefile =================================================================== --- csw/mgar/pkg/p4/trunk/Makefile 2009-11-09 14:57:04 UTC (rev 7175) +++ csw/mgar/pkg/p4/trunk/Makefile 2009-11-09 15:00:59 UTC (rev 7176) @@ -67,7 +67,7 @@ install-p4: ginstall -m 755 -d $(DESTDIR)$(bindir) - ginstall -m 755 $(WORKDIR)/p4-$(GARVERSION)-$(P4OS)$(P4ARCH) $(DESTDIR)$(bindir)/p4 + ginstall -m 755 $(WORKDIR)/p4-$(GARVERSION)-solaris10$(P4ARCH) $(DESTDIR)$(bindir)/p4 ginstall -m 755 -d $(DESTDIR)$(docdir)/p4 ginstall -m 644 $(DOWNLOADDIR)/commercial.pdf $(DESTDIR)$(docdir)/p4 @$(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 Nov 9 16:43:43 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 09 Nov 2009 15:43:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[7177] csw/mgar/pkg Message-ID: Revision: 7177 http://gar.svn.sourceforge.net/gar/?rev=7177&view=rev Author: dmichelsen Date: 2009-11-09 15:43:43 +0000 (Mon, 09 Nov 2009) Log Message: ----------- ffmpeg: Initial commit Added Paths: ----------- csw/mgar/pkg/ffmpeg/ csw/mgar/pkg/ffmpeg/branches/ csw/mgar/pkg/ffmpeg/tags/ csw/mgar/pkg/ffmpeg/trunk/ csw/mgar/pkg/ffmpeg/trunk/Makefile csw/mgar/pkg/ffmpeg/trunk/checksums csw/mgar/pkg/ffmpeg/trunk/files/ Property changes on: csw/mgar/pkg/ffmpeg/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/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2009-11-09 15:43:43 UTC (rev 7177) @@ -0,0 +1,21 @@ +GARNAME = ffmpeg +GARVERSION = 0.5 +CATEGORIES = lib + +DESCRIPTION = Very fast video and audio converter (includes libavcodec) +define BLURB + FFmpeg is a complete, cross-platform solution to record, convert and stream + audio and video. It includes libavcodec - the leading audio/video codec library. +endef + +MASTER_SITES = http://ffmpeg.org/releases/ +DISTFILES = $(DISTNAME).tar.bz2 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +BUILD64 = 1 +NO_ISAEXEC = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/ffmpeg/trunk/checksums =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/checksums (rev 0) +++ csw/mgar/pkg/ffmpeg/trunk/checksums 2009-11-09 15:43:43 UTC (rev 7177) @@ -0,0 +1 @@ +be8503f15c3b81ba00eb8379ca8dcf33 ffmpeg-0.5.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 Nov 9 17:03:22 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 09 Nov 2009 16:03:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[7178] csw/mgar/pkg/bdb3/tags Message-ID: Revision: 7178 http://gar.svn.sourceforge.net/gar/?rev=7178&view=rev Author: wahwah Date: 2009-11-09 16:03:22 +0000 (Mon, 09 Nov 2009) Log Message: ----------- bdb: s/sf.net/sourceforge.net/ for the SSL certificates Property Changed: ---------------- csw/mgar/pkg/bdb3/tags/bdb-consolidation-4.4.20,REV=2009.07.28/ csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED/ Property changes on: csw/mgar/pkg/bdb3/tags/bdb-consolidation-4.4.20,REV=2009.07.28 ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/bdb3/tags/bdb3-stub-to-bdb33-UNRELEASED ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Nov 9 17:06:40 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 09 Nov 2009 16:06:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[7179] csw/mgar/pkg Message-ID: Revision: 7179 http://gar.svn.sourceforge.net/gar/?rev=7179&view=rev Author: dmichelsen Date: 2009-11-09 16:06:40 +0000 (Mon, 09 Nov 2009) Log Message: ----------- imlib2: Initial commit Modified Paths: -------------- csw/mgar/pkg/imlib2/trunk/Makefile csw/mgar/pkg/imlib2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/imlib2/ Modified: csw/mgar/pkg/imlib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/imlib/trunk/Makefile 2009-11-09 13:31:29 UTC (rev 7174) +++ csw/mgar/pkg/imlib2/trunk/Makefile 2009-11-09 16:06:40 UTC (rev 7179) @@ -1,27 +1,34 @@ -GARNAME = imlib -GARVERSION = 1.9.15 +GARNAME = imlib2 +GARVERSION = 1.4.2 CATEGORIES = lib -DESCRIPTION = An advanced replacement library for libraries like libXpm +DESCRIPTION = Imlib 2 is the successor to Imlib, a powerful graphics library define BLURB + Imlib 2 is the successor to Imlib. It is NOT a newer version -- it is a completely new library. + Imlib 2 can be installed alongside Imlib 1.x without any problems since they are effectively + different libraries which have very similar functionality. Please see the homepage for the + long description of the differences. endef +SF_PROJ = enlightenment MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTFILES += $(GARNAME)_loaders-$(GARVERSION).tar.bz2 # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -EXTRA_INC = $(prefix)/X11/include -EXTRA_LIB = $(prefix)/X11/lib -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +REQUIRED_PKGS = CSWbzip2 CSWftype2 CSWgiflibrt CSWjpeg CSWlibid3tag +REQUIRED_PKGS += CSWlibxext CSWpng CSWtiff CSWzlib -# EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so +#EXTRA_INC = $(prefix)/X11/include +#EXTRA_LIB = $(prefix)/X11/lib +#EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --x-include=$(prefix)/X11/include -CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +#CONFIGURE_ARGS += --x-include=$(prefix)/X11/include +#CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) TEST_TARGET = check Modified: csw/mgar/pkg/imlib2/trunk/checksums =================================================================== --- csw/mgar/pkg/imlib/trunk/checksums 2009-11-09 13:31:29 UTC (rev 7174) +++ csw/mgar/pkg/imlib2/trunk/checksums 2009-11-09 16:06:40 UTC (rev 7179) @@ -1 +1,2 @@ -7db987e6c52e4daf70d7d0f471238eae download/imlib-1.9.15.tar.bz2 +9f15568e76ebda9092c571e0df261f54 imlib2-1.4.2.tar.bz2 +972f64c179035014b72243ccd6245c5e imlib2_loaders-1.4.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 Nov 9 17:10:53 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 09 Nov 2009 16:10:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[7180] csw/mgar/pkg/sox/trunk/Makefile Message-ID: Revision: 7180 http://gar.svn.sourceforge.net/gar/?rev=7180&view=rev Author: dmichelsen Date: 2009-11-09 16:10:53 +0000 (Mon, 09 Nov 2009) Log Message: ----------- sox: Add dependencies Modified Paths: -------------- csw/mgar/pkg/sox/trunk/Makefile Modified: csw/mgar/pkg/sox/trunk/Makefile =================================================================== --- csw/mgar/pkg/sox/trunk/Makefile 2009-11-09 16:06:40 UTC (rev 7179) +++ csw/mgar/pkg/sox/trunk/Makefile 2009-11-09 16:10:53 UTC (rev 7180) @@ -20,6 +20,8 @@ # XXX: Add gsm, lpc10 and wavpack REQUIRED_PKGS = CSWvorbis CSWlibogg CSWlibmad CSWlame CSWlibid3tag +REQUIRED_PKGS += CSWflac CSWlibao CSWlibsndfile CSWpng CSWwavpack CSWzlib + PREREQUISITE_PKGS = $(REQUIRED_PKGS) 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 Mon Nov 9 17:13:59 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 09 Nov 2009 16:13:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[7181] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7181 http://gar.svn.sourceforge.net/gar/?rev=7181&view=rev Author: dmichelsen Date: 2009-11-09 16:13:59 +0000 (Mon, 09 Nov 2009) Log Message: ----------- mGAR v2: Activate pkgcheck after false check Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-11-09 16:10:53 UTC (rev 7180) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-11-09 16:13:59 UTC (rev 7181) @@ -606,7 +606,8 @@ # We depend on extract as the additional package files (like .gspec) must be # unpacked to global/ for packaging. E. g. 'merge' depends only on the specific # modulations and does not fill global/. -_package: validateplatform extract-global merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package $(if $(filter-out 0,$(ENABLE_CHECK)),pkgcheck) +ENABLE_CHECK ?= 1 +_package: validateplatform extract-global merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package $(if $(ENABLE_CHECK),pkgcheck) @$(MAKECOOKIE) package: _package 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 Nov 9 17:26:43 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 09 Nov 2009 16:26:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[7182] csw/mgar/pkg/ffmpeg/trunk/Makefile Message-ID: Revision: 7182 http://gar.svn.sourceforge.net/gar/?rev=7182&view=rev Author: dmichelsen Date: 2009-11-09 16:26:43 +0000 (Mon, 09 Nov 2009) Log Message: ----------- ffmpeg: Adjust configure flags Modified Paths: -------------- csw/mgar/pkg/ffmpeg/trunk/Makefile Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile 2009-11-09 16:13:59 UTC (rev 7181) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2009-11-09 16:26:43 UTC (rev 7182) @@ -16,6 +16,12 @@ BUILD64 = 1 NO_ISAEXEC = 1 -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = --prefix=$(prefix) +CONFIGURE_ARGS += --bindir=$(bindir) +CONFIGURE_ARGS += --datadir=$(datadir) +CONFIGURE_ARGS += --libdir=$(libdir) +CONFIGURE_ARGS += --shlibdir=$(libdir) +CONFIGURE_ARGS += --incdir=$(includedir) +CONFIGURE_ARGS += --mandir=$(mandir) 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 Nov 9 17:36:06 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 09 Nov 2009 16:36:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7183] csw/mgar/gar/v2 Message-ID: Revision: 7183 http://gar.svn.sourceforge.net/gar/?rev=7183&view=rev Author: dmichelsen Date: 2009-11-09 16:36:06 +0000 (Mon, 09 Nov 2009) Log Message: ----------- mGAR v2: Update excluded commondirs Modified Paths: -------------- csw/mgar/gar/v2/bin/update-commondirs csw/mgar/gar/v2/etc/commondirs-i386 csw/mgar/gar/v2/etc/commondirs-sparc Modified: csw/mgar/gar/v2/bin/update-commondirs =================================================================== --- csw/mgar/gar/v2/bin/update-commondirs 2009-11-09 16:26:43 UTC (rev 7182) +++ csw/mgar/gar/v2/bin/update-commondirs 2009-11-09 16:36:06 UTC (rev 7183) @@ -19,17 +19,17 @@ mkdir $TMPDIR ( cd $TMPDIR - wget http://mirror.opencsw.org/opencsw/current/$1/5.8/common-1.4.6,REV=2008.04.28-SunOS5.8-$1-CSW.pkg.gz - gzip -c -d common-* | pkgtrans /dev/fd/0 $TMPDIR all + wget http://mirror.opencsw.org/opencsw/current/$1/5.8/common-1.4.7,REV=2009.09.20-SunOS5.8-$1-CSW.pkg + cat common-* | pkgtrans /dev/fd/0 $TMPDIR all ) - perl -ne ' + ( perl -ne ' my @l = split; if( $l[1] =~ /^[ds]$/ ) { print ($l[3] =~ /([^=]*)/); print "\n"; } - ' $TMPDIR/CSWcommon/pkgmap > ../etc/commondirs-$1 + ' $TMPDIR/CSWcommon/pkgmap; echo "/var"; echo "/var/run") > ../etc/commondirs-$1 rm -rf $TMPDIR } Modified: csw/mgar/gar/v2/etc/commondirs-i386 =================================================================== --- csw/mgar/gar/v2/etc/commondirs-i386 2009-11-09 16:26:43 UTC (rev 7182) +++ csw/mgar/gar/v2/etc/commondirs-i386 2009-11-09 16:36:06 UTC (rev 7183) @@ -1,4 +1,17 @@ /etc/opt/csw +/etc/opt/csw/pkg-hooks +/etc/opt/csw/pkg-hooks/postbatchinstall.d +/etc/opt/csw/pkg-hooks/postbatchremove.d +/etc/opt/csw/pkg-hooks/postbatchupgrade.d +/etc/opt/csw/pkg-hooks/postinstall.d +/etc/opt/csw/pkg-hooks/postremove.d +/etc/opt/csw/pkg-hooks/postupgrade.d +/etc/opt/csw/pkg-hooks/prebatchinstall.d +/etc/opt/csw/pkg-hooks/prebatchremove.d +/etc/opt/csw/pkg-hooks/prebatchupgrade.d +/etc/opt/csw/pkg-hooks/preinstall.d +/etc/opt/csw/pkg-hooks/preremove.d +/etc/opt/csw/pkg-hooks/preupgrade.d /opt/csw /opt/csw/bin /opt/csw/bin/amd64 @@ -140,3 +153,6 @@ /opt/csw/share/man /opt/csw/var /var/opt/csw +/var/opt/csw/pkg-hooks +/var +/var/run Modified: csw/mgar/gar/v2/etc/commondirs-sparc =================================================================== --- csw/mgar/gar/v2/etc/commondirs-sparc 2009-11-09 16:26:43 UTC (rev 7182) +++ csw/mgar/gar/v2/etc/commondirs-sparc 2009-11-09 16:36:06 UTC (rev 7183) @@ -1,4 +1,17 @@ /etc/opt/csw +/etc/opt/csw/pkg-hooks +/etc/opt/csw/pkg-hooks/postbatchinstall.d +/etc/opt/csw/pkg-hooks/postbatchremove.d +/etc/opt/csw/pkg-hooks/postbatchupgrade.d +/etc/opt/csw/pkg-hooks/postinstall.d +/etc/opt/csw/pkg-hooks/postremove.d +/etc/opt/csw/pkg-hooks/postupgrade.d +/etc/opt/csw/pkg-hooks/prebatchinstall.d +/etc/opt/csw/pkg-hooks/prebatchremove.d +/etc/opt/csw/pkg-hooks/prebatchupgrade.d +/etc/opt/csw/pkg-hooks/preinstall.d +/etc/opt/csw/pkg-hooks/preremove.d +/etc/opt/csw/pkg-hooks/preupgrade.d /opt/csw /opt/csw/bin /opt/csw/bin/sparc @@ -144,3 +157,6 @@ /opt/csw/share/man /opt/csw/var /var/opt/csw +/var/opt/csw/pkg-hooks +/var +/var/run 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 Nov 9 17:59:07 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 09 Nov 2009 16:59:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7184] csw/mgar/gar/v2/categories Message-ID: Revision: 7184 http://gar.svn.sourceforge.net/gar/?rev=7184&view=rev Author: wahwah Date: 2009-11-09 16:59:07 +0000 (Mon, 09 Nov 2009) Log Message: ----------- gar-v2: Adding 'loose' category Added Paths: ----------- csw/mgar/gar/v2/categories/loose/ csw/mgar/gar/v2/categories/loose/category.mk Added: csw/mgar/gar/v2/categories/loose/category.mk =================================================================== --- csw/mgar/gar/v2/categories/loose/category.mk (rev 0) +++ csw/mgar/gar/v2/categories/loose/category.mk 2009-11-09 16:59:07 UTC (rev 7184) @@ -0,0 +1,28 @@ +# $Id$ +# +# Building packages from loose files, laid out in a directory. + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = loose +TEST_SCRIPTS = + +MASTER_SITES += $(sort $(addprefix file://$(LOCAL_SRC)/,$(dir $(FILES)))) +DISTFILES += $(notdir $(FILES)) + +include gar/gar.mk + +ifndef LOCAL_SRC +$(error "Please set the LOCAL_SRC variable to the root of your source code tree") +endif + +ifndef FILES +$(error "Please set the FILES variable to the list of files to include") +endif + +install-loose: + $(foreach F,$(FILES),ginstall \ + -d $(DESTDIR)$(prefix)/$(dir $F) \ + && ginstall $(WORKDIR)/$(notdir $F) \ + $(DESTDIR)$(prefix)/$(dir $F);) + @$(MAKECOOKIE) Property changes on: csw/mgar/gar/v2/categories/loose/category.mk ___________________________________________________________________ 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 Mon Nov 9 18:03:49 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 09 Nov 2009 17:03:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[7185] csw/mgar/pkg/gar/Makefile Message-ID: Revision: 7185 http://gar.svn.sourceforge.net/gar/?rev=7185&view=rev Author: wahwah Date: 2009-11-09 17:03:46 +0000 (Mon, 09 Nov 2009) Log Message: ----------- gar: Adding package-level Makefile Added Paths: ----------- csw/mgar/pkg/gar/Makefile Copied: csw/mgar/pkg/gar/Makefile (from rev 7172, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gar/Makefile (rev 0) +++ csw/mgar/pkg/gar/Makefile 2009-11-09 17:03:46 UTC (rev 7185) @@ -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) 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 Nov 9 19:02:45 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 09 Nov 2009 18:02:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[7186] csw/mgar/gar/v2/bin/checkpkg Message-ID: Revision: 7186 http://gar.svn.sourceforge.net/gar/?rev=7186&view=rev Author: wahwah Date: 2009-11-09 18:02:45 +0000 (Mon, 09 Nov 2009) Log Message: ----------- gar-v2/checkpkg: Using rot13 so that it can check itself without failing. Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2009-11-09 17:03:46 UTC (rev 7185) +++ csw/mgar/gar/v2/bin/checkpkg 2009-11-09 18:02:45 UTC (rev 7186) @@ -97,7 +97,10 @@ # Need to rewrite this whole thing to also # check for badly set RUNPATHs. sigh. # - for badpath in /export/medusa /opt/build ; do + # Using rot13 so that checkpkg can check itself without reporting + # an error. + badpaths="$(echo /rkcbeg/zrqhfn /bcg/ohvyq | gtr a-mn-z n-za-m)" + for badpath in $badpaths ; do GREP=/bin/grep gzgrep "$badpath" $f if [[ $? -eq 0 ]] ; then print "" 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 Nov 9 20:36:02 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 09 Nov 2009 19:36:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[7187] csw/mgar/pkg/cswutils/trunk/files/checkpkg Message-ID: Revision: 7187 http://gar.svn.sourceforge.net/gar/?rev=7187&view=rev Author: wahwah Date: 2009-11-09 19:36:02 +0000 (Mon, 09 Nov 2009) Log Message: ----------- cswutils/checkpkg: Using rot13 to allow checkpkg to check itself Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/files/checkpkg Modified: csw/mgar/pkg/cswutils/trunk/files/checkpkg =================================================================== --- csw/mgar/pkg/cswutils/trunk/files/checkpkg 2009-11-09 18:02:45 UTC (rev 7186) +++ csw/mgar/pkg/cswutils/trunk/files/checkpkg 2009-11-09 19:36:02 UTC (rev 7187) @@ -88,7 +88,8 @@ # Need to rewrite this whole thing to also # check for badly set RUNPATHs. sigh. # - for badpath in /export/medusa /opt/build ; do + badpaths="$(echo /rkcbeg/zrqhfn /bcg/ohvyq | gtr a-mn-z n-za-m)" + for badpath in $(badpaths) ; do GREP=/bin/grep gzgrep "$badpath" $f if [[ $? -eq 0 ]] ; then print "" 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 Nov 9 20:39:25 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 09 Nov 2009 19:39:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7188] csw/mgar/pkg/cswutils/trunk Message-ID: Revision: 7188 http://gar.svn.sourceforge.net/gar/?rev=7188&view=rev Author: wahwah Date: 2009-11-09 19:39:25 +0000 (Mon, 09 Nov 2009) Log Message: ----------- cswutils: Updating submitpkg, updating checksums, version bump to 1.14.6 Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile csw/mgar/pkg/cswutils/trunk/checksums Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2009-11-09 19:36:02 UTC (rev 7187) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2009-11-09 19:39:25 UTC (rev 7188) @@ -1,7 +1,7 @@ # $Id$ GARNAME = cswutils -GARVERSION = 1.14.5 +GARVERSION = 1.14.6 CATEGORIES = utils DESCRIPTION = Utilities for CSW maintainers @@ -9,7 +9,7 @@ endef SVNROOT = http://opencsw.svn.sourceforge.net/svnroot/opencsw/utilities/ -SVN_REV = 93 +SVN_REV = 96 MASTER_SITES = SVN_FILES = submit_to_newpkgs.py compare_pkgs.py opencsw_lib.py Modified: csw/mgar/pkg/cswutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswutils/trunk/checksums 2009-11-09 19:36:02 UTC (rev 7187) +++ csw/mgar/pkg/cswutils/trunk/checksums 2009-11-09 19:39:25 UTC (rev 7188) @@ -1,11 +1,11 @@ 091b12575ebc0e45cf8c3d8b43d8b638 COPYING -30b6598a4453e3ce0c1fabeede5eb5f8 checkpkg +59c261b5337c61ddda9146a2a97efc3d checkpkg 6ec3b6597e04714430987ccc199db3c4 checkpkg.8 -24881eb553044a5b437b7293f4138ba4 compare_pkgs.py-r93 +24881eb553044a5b437b7293f4138ba4 compare_pkgs.py-r96 9a637f6546cc50974159a987302d91c0 cpan2pkg 93b6a811d303ce3be0050c5a7b3c8e69 createpkg a605598f30195f9ab1b29fc3944d3b31 createpkg.8 -a60abc5eb12251c187086856be2c3470 opencsw_lib.py-r93 +6af12950bab350ecd2a14fe1e347b18b opencsw_lib.py-r96 cd4496ee27bf86d5c8bc656c9c5974be stagepkg 8908a0a898aa07a7a928b2b8bd8384f0 stagepkg.8 -3b102386ad1d2086dbe8f3be9d173fda submit_to_newpkgs.py-r93 +bb90fa5379bcae922a499333951f5796 submit_to_newpkgs.py-r96 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 Nov 9 22:08:13 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 09 Nov 2009 21:08:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[7189] csw/mgar/gar/v1/bin Message-ID: Revision: 7189 http://gar.svn.sourceforge.net/gar/?rev=7189&view=rev Author: dmichelsen Date: 2009-11-09 21:08:13 +0000 (Mon, 09 Nov 2009) Log Message: ----------- mGAR v1: Apply r7186 (check itself) to v1 Modified Paths: -------------- csw/mgar/gar/v1/bin/checkpkg Property Changed: ---------------- csw/mgar/gar/v1/bin/ Property changes on: csw/mgar/gar/v1/bin ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/gar/v2/bin:7186 Modified: csw/mgar/gar/v1/bin/checkpkg =================================================================== --- csw/mgar/gar/v1/bin/checkpkg 2009-11-09 19:39:25 UTC (rev 7188) +++ csw/mgar/gar/v1/bin/checkpkg 2009-11-09 21:08:13 UTC (rev 7189) @@ -85,7 +85,10 @@ # Need to rewrite this whole thing to also # check for badly set RUNPATHs. sigh. # - for badpath in /export/medusa /opt/build ; do + # Using rot13 so that checkpkg can check itself without reporting + # an error. + badpaths="$(echo /rkcbeg/zrqhfn /bcg/ohvyq | gtr a-mn-z n-za-m)" + for badpath in $badpaths ; do GREP=/bin/grep gzgrep "$badpath" $f if [[ $? -eq 0 ]] ; then print "" 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 Nov 9 22:10:35 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 09 Nov 2009 21:10:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[7190] csw/mgar/pkg/gar/trunk/Makefile Message-ID: Revision: 7190 http://gar.svn.sourceforge.net/gar/?rev=7190&view=rev Author: dmichelsen Date: 2009-11-09 21:10:30 +0000 (Mon, 09 Nov 2009) Log Message: ----------- gar: Remove check as checkpkg doesn't bail out on checking itself after r7186 Modified Paths: -------------- csw/mgar/pkg/gar/trunk/Makefile Modified: csw/mgar/pkg/gar/trunk/Makefile =================================================================== --- csw/mgar/pkg/gar/trunk/Makefile 2009-11-09 21:08:13 UTC (rev 7189) +++ csw/mgar/pkg/gar/trunk/Makefile 2009-11-09 21:10:30 UTC (rev 7190) @@ -35,9 +35,6 @@ ARCHALL = 1 -# Because the bad pathes are in the bad pathes check we cannot check ourselves -ENABLE_CHECK = 0 - include gar/category.mk install-gar: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Nov 10 01:56:04 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 10 Nov 2009 00:56:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[7191] csw/mgar/gar/v2/bin/checkpkg Message-ID: Revision: 7191 http://gar.svn.sourceforge.net/gar/?rev=7191&view=rev Author: wahwah Date: 2009-11-10 00:56:04 +0000 (Tue, 10 Nov 2009) Log Message: ----------- gar/checkpkg: Verifying that the package doesn't have double depends Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2009-11-09 21:10:30 UTC (rev 7190) +++ csw/mgar/gar/v2/bin/checkpkg 2009-11-10 00:56:04 UTC (rev 7191) @@ -443,6 +443,15 @@ exit 1 fi +# Verify that there are no double depends +repeated_depends="$(awk '{print $2}' $EXTRACTDIR/$pkgname/install/depend \ + | sort | uniq -c | awk '{print $1}' | sort | uniq | wc -l)" +if [[ "$repeated_depends" -ne 1 ]]; then + cat $EXTRACTDIR/$pkgname/install/depend + print ERROR: $pkgname has double depends + exit 1 +fi + #to retain a record of all packages currently being examined from $@ echo $pkgname >> $SETDEPS 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 Nov 10 02:25:32 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 10 Nov 2009 01:25:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7192] csw/mgar/gar/v2/bin/checkpkg Message-ID: Revision: 7192 http://gar.svn.sourceforge.net/gar/?rev=7192&view=rev Author: wahwah Date: 2009-11-10 01:25:32 +0000 (Tue, 10 Nov 2009) Log Message: ----------- gar/checkpkg: removing option -q from /usr/bin/grep invocation (/usr/bin/grep does not support -q) Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2009-11-10 00:56:04 UTC (rev 7191) +++ csw/mgar/gar/v2/bin/checkpkg 2009-11-10 01:25:32 UTC (rev 7192) @@ -557,7 +557,7 @@ lib=`echo $ldep | nawk '{print $1}'` [ "$lib" = "libm.so.2" ] && continue pkg=`echo $ldep | nawk '{print $2}'` - /usr/bin/grep -q "[/=]$lib[ =]" $SETLIBS >/dev/null + /usr/bin/grep "[/=]$lib[ =]" $SETLIBS >/dev/null if [ $? -ne 0 ]; then errmsg "Couldn't find a package providing $lib" else 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 Nov 10 02:54:17 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 10 Nov 2009 01:54:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[7193] csw/mgar/pkg/chmlib/trunk Message-ID: Revision: 7193 http://gar.svn.sourceforge.net/gar/?rev=7193&view=rev Author: bdwalton Date: 2009-11-10 01:54:17 +0000 (Tue, 10 Nov 2009) Log Message: ----------- chmlib: patch in working gnulib support and other autoconf fixes Modified Paths: -------------- csw/mgar/pkg/chmlib/trunk/Makefile csw/mgar/pkg/chmlib/trunk/checksums Added Paths: ----------- csw/mgar/pkg/chmlib/trunk/files/0001-gnulib-import-getopt-posix.patch csw/mgar/pkg/chmlib/trunk/files/0002-integrate-gnulib-into-the-auto-tool-files.patch csw/mgar/pkg/chmlib/trunk/files/0003-add-dummy-config.h-file.patch csw/mgar/pkg/chmlib/trunk/files/0004-add-autoconf-checks-for-lnsl-and-lsocket.patch Modified: csw/mgar/pkg/chmlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/chmlib/trunk/Makefile 2009-11-10 01:25:32 UTC (rev 7192) +++ csw/mgar/pkg/chmlib/trunk/Makefile 2009-11-10 01:54:17 UTC (rev 7193) @@ -14,7 +14,10 @@ MASTER_SITES = http://www.jedrea.com/chmlib/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -PATCHFILES = 0001-Add-autoconf-support-from-gnulib-for-getopt.h.patch +PATCHFILES = 0001-gnulib-import-getopt-posix.patch +PATCHFILES += 0002-integrate-gnulib-into-the-auto-tool-files.patch +PATCHFILES += 0003-add-dummy-config.h-file.patch +PATCHFILES += 0004-add-autoconf-checks-for-lnsl-and-lsocket.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 @@ -29,6 +32,10 @@ include gar/category.mk +pre-configure-modulated: + @(cd $(WORKSRC); aclocal -I gnulib/m4; autoconf -I gnulib/m4; automake) + @$(MAKECOOKIE) + post-install-modulated: ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) $(foreach D,$(DOCS),ginstall $(WORKSRC)/$D $(DESTDIR)$(docdir)/$(GARNAME)/$D;) Modified: csw/mgar/pkg/chmlib/trunk/checksums =================================================================== --- csw/mgar/pkg/chmlib/trunk/checksums 2009-11-10 01:25:32 UTC (rev 7192) +++ csw/mgar/pkg/chmlib/trunk/checksums 2009-11-10 01:54:17 UTC (rev 7193) @@ -1,2 +1,5 @@ -b7276bc25fffbf7044018f94ebe1baf9 download/0001-Add-autoconf-support-from-gnulib-for-getopt.h.patch -7ea49ed8c335215c1edc6fae83e6b912 download/chmlib-0.40.tar.bz2 +b454cb00abe8653f2e3c11318a884e0e 0001-gnulib-import-getopt-posix.patch +c181447a053d0c5a83099af4a68a5510 0002-integrate-gnulib-into-the-auto-tool-files.patch +b96303db2702dd6696ea45dfba2de5dc 0003-add-dummy-config.h-file.patch +883567051286cd6984b7a1b23fa8e783 0004-add-autoconf-checks-for-lnsl-and-lsocket.patch +7ea49ed8c335215c1edc6fae83e6b912 chmlib-0.40.tar.bz2 Added: csw/mgar/pkg/chmlib/trunk/files/0001-gnulib-import-getopt-posix.patch =================================================================== --- csw/mgar/pkg/chmlib/trunk/files/0001-gnulib-import-getopt-posix.patch (rev 0) +++ csw/mgar/pkg/chmlib/trunk/files/0001-gnulib-import-getopt-posix.patch 2009-11-10 01:54:17 UTC (rev 7193) @@ -0,0 +1,4596 @@ +From 23637dad0fc9fb0e5e0755744d5d3726536068ee Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Thu, 15 Oct 2009 21:32:41 +0200 +Subject: [PATCH 1/4] gnulib --import getopt-posix + +--- + gnulib/Makefile.am | 207 ++++++++ + gnulib/dummy.c | 42 ++ + gnulib/getopt.c | 1186 ++++++++++++++++++++++++++++++++++++++++++++ + gnulib/getopt.in.h | 242 +++++++++ + gnulib/getopt1.c | 170 +++++++ + gnulib/getopt_int.h | 130 +++++ + gnulib/gettext.h | 279 +++++++++++ + gnulib/m4/00gnulib.m4 | 30 ++ + gnulib/m4/extensions.m4 | 104 ++++ + gnulib/m4/getopt.m4 | 250 ++++++++++ + gnulib/m4/gnulib-cache.m4 | 36 ++ + gnulib/m4/gnulib-common.m4 | 124 +++++ + gnulib/m4/gnulib-comp.m4 | 197 ++++++++ + gnulib/m4/gnulib-tool.m4 | 57 +++ + gnulib/m4/include_next.m4 | 187 +++++++ + gnulib/m4/onceonly.m4 | 90 ++++ + gnulib/m4/stddef_h.m4 | 45 ++ + gnulib/m4/unistd_h.m4 | 115 +++++ + gnulib/m4/wchar_t.m4 | 20 + + gnulib/stddef.in.h | 86 ++++ + gnulib/unistd.in.h | 784 +++++++++++++++++++++++++++++ + link-warning.h | 28 + + 22 files changed, 4409 insertions(+), 0 deletions(-) + create mode 100644 gnulib/Makefile.am + create mode 100644 gnulib/dummy.c + create mode 100644 gnulib/getopt.c + create mode 100644 gnulib/getopt.in.h + create mode 100644 gnulib/getopt1.c + create mode 100644 gnulib/getopt_int.h + create mode 100644 gnulib/gettext.h + create mode 100644 gnulib/m4/00gnulib.m4 + create mode 100644 gnulib/m4/extensions.m4 + create mode 100644 gnulib/m4/getopt.m4 + create mode 100644 gnulib/m4/gnulib-cache.m4 + create mode 100644 gnulib/m4/gnulib-common.m4 + create mode 100644 gnulib/m4/gnulib-comp.m4 + create mode 100644 gnulib/m4/gnulib-tool.m4 + create mode 100644 gnulib/m4/include_next.m4 + create mode 100644 gnulib/m4/onceonly.m4 + create mode 100644 gnulib/m4/stddef_h.m4 + create mode 100644 gnulib/m4/unistd_h.m4 + create mode 100644 gnulib/m4/wchar_t.m4 + create mode 100644 gnulib/stddef.in.h + create mode 100644 gnulib/unistd.in.h + create mode 100644 link-warning.h + +diff --git a/gnulib/Makefile.am b/gnulib/Makefile.am +new file mode 100644 +index 0000000..ddcdb88 +--- /dev/null ++++ b/gnulib/Makefile.am +@@ -0,0 +1,207 @@ ++## 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=gnulib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=. --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 = ++EXTRA_DIST += m4/gnulib-cache.m4 ++ ++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 ++ ++## 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)/./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 ++ ++## 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_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_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_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ ++ -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \ ++ -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|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 ++ ++## 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/gnulib/dummy.c b/gnulib/dummy.c +new file mode 100644 +index 0000000..ccb5c26 +--- /dev/null ++++ b/gnulib/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/gnulib/getopt.c b/gnulib/getopt.c +new file mode 100644 +index 0000000..f1e6d1f +--- /dev/null ++++ b/gnulib/getopt.c +@@ -0,0 +1,1186 @@ ++/* 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 ++ 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, char **argv, 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/gnulib/getopt.in.h b/gnulib/getopt.in.h +new file mode 100644 +index 0000000..15c213f +--- /dev/null ++++ b/gnulib/getopt.in.h +@@ -0,0 +1,242 @@ ++/* 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. */ ++#if @HAVE_GETOPT_H@ ++# @INCLUDE_NEXT@ @NEXT_GETOPT_H@ ++#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) ++#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/gnulib/getopt1.c b/gnulib/getopt1.c +new file mode 100644 +index 0000000..ba115c4 +--- /dev/null ++++ b/gnulib/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/gnulib/getopt_int.h b/gnulib/getopt_int.h +new file mode 100644 +index 0000000..3c6628b +--- /dev/null ++++ b/gnulib/getopt_int.h +@@ -0,0 +1,130 @@ ++/* Internal declarations for getopt. ++ Copyright (C) 1989-1994,1996-1999,2001,2003,2004 ++ 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 ++ ++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/gnulib/gettext.h b/gnulib/gettext.h +new file mode 100644 +index 0000000..8cf2dca +--- /dev/null ++++ b/gnulib/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 3, 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/gnulib/m4/00gnulib.m4 b/gnulib/m4/00gnulib.m4 +new file mode 100644 +index 0000000..d4d04d1 +--- /dev/null ++++ b/gnulib/m4/00gnulib.m4 +@@ -0,0 +1,30 @@ ++# 00gnulib.m4 serial 2 ++dnl Copyright (C) 2009 Free Software Foundation, Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. ++ ++dnl This file must be named something that sorts before all other ++dnl gnulib-provided .m4 files. It is needed until such time as we can ++dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE semantics. ++ ++# AC_DEFUN_ONCE([NAME], VALUE) ++# ---------------------------- ++# Define NAME to expand to VALUE on the first use (whether by direct ++# expansion, or by AC_REQUIRE), and to nothing on all subsequent uses. ++# Avoid bugs in AC_REQUIRE in Autoconf 2.63 and earlier. This ++# definition is slower than the version in Autoconf 2.64, because it ++# can only use interfaces that existed since 2.59; but it achieves the ++# same effect. Quoting is necessary to avoid confusing Automake. ++m4_version_prereq([2.63.263], [], ++[m4_define([AC][_DEFUN_ONCE], ++ [AC][_DEFUN([$1], ++ [AC_REQUIRE([_gl_DEFUN_ONCE([$1])], ++ [m4_indir([_gl_DEFUN_ONCE([$1])])])])]dnl ++[AC][_DEFUN([_gl_DEFUN_ONCE([$1])], [$2])])]) ++ ++# gl_00GNULIB ++# ----------- ++# Witness macro that this file has been included. Needed to force ++# Automake to include this file prior to all other gnulib .m4 files. ++AC_DEFUN([gl_00GNULIB]) +diff --git a/gnulib/m4/extensions.m4 b/gnulib/m4/extensions.m4 +new file mode 100644 +index 0000000..ba6d5e1 +--- /dev/null ++++ b/gnulib/m4/extensions.m4 +@@ -0,0 +1,104 @@ ++# serial 8 -*- Autoconf -*- ++# Enable extensions on systems that normally disable them. ++ ++# Copyright (C) 2003, 2006-2009 Free Software Foundation, Inc. ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This definition of AC_USE_SYSTEM_EXTENSIONS is stolen from CVS ++# Autoconf. Perhaps we can remove this once we can assume Autoconf ++# 2.62 or later everywhere, but since CVS Autoconf mutates rapidly ++# enough in this area it's likely we'll need to redefine ++# AC_USE_SYSTEM_EXTENSIONS for quite some time. ++ ++# AC_USE_SYSTEM_EXTENSIONS ++# ------------------------ ++# Enable extensions on systems that normally disable them, ++# typically due to standards-conformance issues. ++# Remember that #undef in AH_VERBATIM gets replaced with #define by ++# AC_DEFINE. The goal here is to define all known feature-enabling ++# macros, then, if reports of conflicts are made, disable macros that ++# cause problems on some platforms (such as __EXTENSIONS__). ++AC_DEFUN_ONCE([AC_USE_SYSTEM_EXTENSIONS], ++[AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl ++AC_BEFORE([$0], [AC_RUN_IFELSE])dnl ++ ++ AC_REQUIRE([AC_CANONICAL_HOST]) ++ ++ AC_CHECK_HEADER([minix/config.h], [MINIX=yes], [MINIX=]) ++ if test "$MINIX" = yes; then ++ AC_DEFINE([_POSIX_SOURCE], [1], ++ [Define to 1 if you need to in order for `stat' and other ++ things to work.]) ++ AC_DEFINE([_POSIX_1_SOURCE], [2], ++ [Define to 2 if the system does not provide POSIX.1 features ++ except with this defined.]) ++ AC_DEFINE([_MINIX], [1], ++ [Define to 1 if on MINIX.]) ++ fi ++ ++ dnl HP-UX 11.11 defines mbstate_t only if _XOPEN_SOURCE is defined to 500, ++ dnl regardless of whether the flags -Ae or _D_HPUX_SOURCE=1 are already ++ dnl provided. ++ case "$host_os" in ++ hpux*) ++ AC_DEFINE([_XOPEN_SOURCE], [500], ++ [Define to 500 only on HP-UX.]) ++ ;; ++ esac ++ ++ AH_VERBATIM([__EXTENSIONS__], ++[/* Enable extensions on AIX 3, Interix. */ ++#ifndef _ALL_SOURCE ++# undef _ALL_SOURCE ++#endif ++/* Enable GNU extensions on systems that have them. */ ++#ifndef _GNU_SOURCE ++# undef _GNU_SOURCE ++#endif ++/* Enable threading extensions on Solaris. */ ++#ifndef _POSIX_PTHREAD_SEMANTICS ++# undef _POSIX_PTHREAD_SEMANTICS ++#endif ++/* Enable extensions on HP NonStop. */ ++#ifndef _TANDEM_SOURCE ++# undef _TANDEM_SOURCE ++#endif ++/* Enable general extensions on Solaris. */ ++#ifndef __EXTENSIONS__ ++# undef __EXTENSIONS__ ++#endif ++]) ++ AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__], ++ [ac_cv_safe_to_define___extensions__], ++ [AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM([[ ++# define __EXTENSIONS__ 1 ++ ]AC_INCLUDES_DEFAULT])], ++ [ac_cv_safe_to_define___extensions__=yes], ++ [ac_cv_safe_to_define___extensions__=no])]) ++ test $ac_cv_safe_to_define___extensions__ = yes && ++ AC_DEFINE([__EXTENSIONS__]) ++ AC_DEFINE([_ALL_SOURCE]) ++ AC_DEFINE([_GNU_SOURCE]) ++ AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) ++ AC_DEFINE([_TANDEM_SOURCE]) ++])# AC_USE_SYSTEM_EXTENSIONS ++ ++# gl_USE_SYSTEM_EXTENSIONS ++# ------------------------ ++# Enable extensions on systems that normally disable them, ++# typically due to standards-conformance issues. ++AC_DEFUN_ONCE([gl_USE_SYSTEM_EXTENSIONS], ++[ ++ dnl Require this macro before AC_USE_SYSTEM_EXTENSIONS. ++ dnl gnulib does not need it. But if it gets required by third-party macros ++ dnl after AC_USE_SYSTEM_EXTENSIONS is required, autoconf 2.62..2.63 emit a ++ dnl warning: "AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS". ++ dnl Note: We can do this only for one of the macros AC_AIX, AC_GNU_SOURCE, ++ dnl AC_MINIX. If people still use AC_AIX or AC_MINIX, they are out of luck. ++ AC_REQUIRE([AC_GNU_SOURCE]) ++ ++ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) ++]) +diff --git a/gnulib/m4/getopt.m4 b/gnulib/m4/getopt.m4 +new file mode 100644 +index 0000000..53a1a7e +--- /dev/null ++++ b/gnulib/m4/getopt.m4 +@@ -0,0 +1,250 @@ ++# getopt.m4 serial 22 ++dnl Copyright (C) 2002-2006, 2008-2009 Free Software Foundation, Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. ++ ++# Request a POSIX compliant getopt function. ++AC_DEFUN([gl_FUNC_GETOPT_POSIX], ++[ ++ m4_divert_text([DEFAULTS], [gl_getopt_required=POSIX]) ++ AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) ++ gl_GETOPT_IFELSE([ ++ gl_REPLACE_GETOPT ++ ], ++ []) ++]) ++ ++# Request a POSIX compliant getopt function with GNU extensions (such as ++# options with optional arguments) and the functions getopt_long, ++# getopt_long_only. ++AC_DEFUN([gl_FUNC_GETOPT_GNU], ++[ ++ m4_divert_text([INIT_PREPARE], [gl_getopt_required=GNU]) ++ ++ AC_REQUIRE([gl_FUNC_GETOPT_POSIX]) ++]) ++ ++# Request the gnulib implementation of the getopt functions unconditionally. ++# argp.m4 uses this. ++AC_DEFUN([gl_REPLACE_GETOPT], ++[ ++ dnl Arrange for getopt.h to be created. ++ gl_GETOPT_SUBSTITUTE_HEADER ++ dnl Arrange for unistd.h to include getopt.h. ++ GNULIB_UNISTD_H_GETOPT=1 ++ dnl Arrange to compile the getopt implementation. ++ AC_LIBOBJ([getopt]) ++ AC_LIBOBJ([getopt1]) ++ gl_PREREQ_GETOPT ++]) ++ ++# emacs' configure.in uses this. ++AC_DEFUN([gl_GETOPT_IFELSE], ++[ ++ AC_REQUIRE([gl_GETOPT_CHECK_HEADERS]) ++ AS_IF([test -n "$gl_replace_getopt"], [$1], [$2]) ++]) ++ ++# Determine whether to replace the entire getopt facility. ++AC_DEFUN([gl_GETOPT_CHECK_HEADERS], ++[ ++ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles ++ ++ dnl Persuade Solaris to declare optarg, optind, opterr, optopt. ++ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) ++ ++ gl_CHECK_NEXT_HEADERS([getopt.h]) ++ AC_CHECK_HEADERS_ONCE([getopt.h]) ++ if test $ac_cv_header_getopt_h = yes; then ++ HAVE_GETOPT_H=1 ++ else ++ HAVE_GETOPT_H=0 ++ fi ++ AC_SUBST([HAVE_GETOPT_H]) ++ ++ gl_replace_getopt= ++ ++ dnl Test whether is available. ++ if test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then ++ AC_CHECK_HEADERS([getopt.h], [], [gl_replace_getopt=yes]) ++ fi ++ ++ dnl Test whether the function getopt_long is available. ++ if test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then ++ AC_CHECK_FUNCS([getopt_long_only], [], [gl_replace_getopt=yes]) ++ fi ++ ++ dnl BSD getopt_long uses an incompatible method to reset option processing, ++ dnl but the testsuite does not show a need to use this 'optreset' variable. ++ if false && test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then ++ AC_CHECK_DECL([optreset], [gl_replace_getopt=yes], [], ++ [#include ]) ++ fi ++ ++ dnl mingw's getopt (in libmingwex.a) does weird things when the options ++ dnl strings starts with '+' and it's not the first call. Some internal state ++ dnl is left over from earlier calls, and neither setting optind = 0 nor ++ dnl setting optreset = 1 get rid of this internal state. ++ if test -z "$gl_replace_getopt"; then ++ AC_CACHE_CHECK([whether getopt is POSIX compatible], ++ [gl_cv_func_getopt_posix], ++ [ ++ dnl This test fails on mingw and succeeds on all other platforms. ++ AC_RUN_IFELSE([AC_LANG_SOURCE([[ ++#include ++#include ++#include ++ ++/* The glibc implementation of getopt supports setting optind = 0 as a means ++ of clearing the internal state, but other implementations don't. */ ++#if (__GLIBC__ >= 2) ++# define OPTIND_MIN 0 ++#else ++# define OPTIND_MIN 1 ++#endif ++ ++int ++main () ++{ ++ { ++ int argc = 0; ++ char *argv[10]; ++ int c; ++ ++ argv[argc++] = "program"; ++ argv[argc++] = "-a"; ++ argv[argc++] = "foo"; ++ argv[argc++] = "bar"; ++ optind = OPTIND_MIN; ++ opterr = 0; ++ ++ c = getopt (argc, argv, "ab"); ++ if (!(c == 'a')) ++ return 1; ++ c = getopt (argc, argv, "ab"); ++ if (!(c == -1)) ++ return 2; ++ if (!(optind == 2)) ++ return 3; ++ } ++ /* Some internal state exists at this point. */ ++ { ++ int argc = 0; ++ char *argv[10]; ++ int c; ++ ++ argv[argc++] = "program"; ++ argv[argc++] = "donald"; ++ argv[argc++] = "-p"; ++ argv[argc++] = "billy"; ++ argv[argc++] = "duck"; ++ argv[argc++] = "-a"; ++ argv[argc++] = "bar"; ++ optind = OPTIND_MIN; ++ opterr = 0; ++ ++ c = getopt (argc, argv, "+abp:q:"); ++ if (!(c == -1)) ++ return 4; ++ if (!(strcmp (argv[0], "program") == 0)) ++ return 5; ++ if (!(strcmp (argv[1], "donald") == 0)) ++ return 6; ++ if (!(strcmp (argv[2], "-p") == 0)) ++ return 7; ++ if (!(strcmp (argv[3], "billy") == 0)) ++ return 8; ++ if (!(strcmp (argv[4], "duck") == 0)) ++ return 9; ++ if (!(strcmp (argv[5], "-a") == 0)) ++ return 10; ++ if (!(strcmp (argv[6], "bar") == 0)) ++ return 11; ++ if (!(optind == 1)) ++ return 12; ++ } ++ ++ return 0; ++} ++]])], ++ [gl_cv_func_getopt_posix=yes], [gl_cv_func_getopt_posix=no], ++ [case "$host_os" in ++ mingw*) gl_cv_func_getopt_posix="guessing no";; ++ *) gl_cv_func_getopt_posix="guessing yes";; ++ esac ++ ]) ++ ]) ++ case "$gl_cv_func_getopt_posix" in ++ *no) gl_replace_getopt=yes ;; ++ esac ++ fi ++ ++ if test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then ++ AC_CACHE_CHECK([for working GNU getopt function], [gl_cv_func_getopt_gnu], ++ [AC_RUN_IFELSE( ++ [AC_LANG_PROGRAM([[#include ++ #include ++ #include ]], ++ [[ ++ /* This code succeeds on glibc 2.8, OpenBSD 4.0, Cygwin, mingw, ++ and fails on MacOS X 10.5, AIX 5.2, HP-UX 11, IRIX 6.5, ++ OSF/1 5.1, Solaris 10. */ ++ { ++ char *myargv[3]; ++ myargv[0] = "conftest"; ++ myargv[1] = "-+"; ++ myargv[2] = 0; ++ opterr = 0; ++ if (getopt (2, myargv, "+a") != '?') ++ return 1; ++ } ++ /* This code succeeds on glibc 2.8, mingw, ++ and fails on MacOS X 10.5, OpenBSD 4.0, AIX 5.2, HP-UX 11, ++ IRIX 6.5, OSF/1 5.1, Solaris 10, Cygwin. */ ++ { ++ char *argv[] = { "program", "-p", "foo", "bar" }; ++ ++ optind = 1; ++ if (getopt (4, argv, "p::") != 'p') ++ return 2; ++ if (optarg != NULL) ++ return 3; ++ if (getopt (4, argv, "p::") != -1) ++ return 4; ++ if (optind != 2) ++ return 5; ++ } ++ return 0; ++ ]])], ++ [gl_cv_func_getopt_gnu=yes], ++ [gl_cv_func_getopt_gnu=no], ++ [dnl Cross compiling. Guess based on host and declarations. ++ case "$host_os" in ++ *-gnu* | mingw*) gl_cv_func_getopt_gnu=no;; ++ *) gl_cv_func_getopt_gnu=yes;; ++ esac ++ ]) ++ ]) ++ if test "$gl_cv_func_getopt_gnu" = "no"; then ++ gl_replace_getopt=yes ++ fi ++ fi ++]) ++ ++# emacs' configure.in uses this. ++AC_DEFUN([gl_GETOPT_SUBSTITUTE_HEADER], ++[ ++ GETOPT_H=getopt.h ++ AC_DEFINE([__GETOPT_PREFIX], [[rpl_]], ++ [Define to rpl_ if the getopt replacement functions and variables ++ should be used.]) ++ AC_SUBST([GETOPT_H]) ++]) ++ ++# Prerequisites of lib/getopt*. ++# emacs' configure.in uses this. ++AC_DEFUN([gl_PREREQ_GETOPT], ++[ ++ AC_CHECK_DECLS_ONCE([getenv]) ++]) +diff --git a/gnulib/m4/gnulib-cache.m4 b/gnulib/m4/gnulib-cache.m4 +new file mode 100644 +index 0000000..56a554b +--- /dev/null ++++ b/gnulib/m4/gnulib-cache.m4 +@@ -0,0 +1,36 @@ ++# 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. ++# ++# This file represents the specification of how gnulib-tool is used. ++# It acts as a cache: It is written and read by gnulib-tool. ++# In projects using CVS, this file is meant to be stored in CVS, ++# like the configure.ac and various Makefile.am files. ++ ++ ++# Specification in the form of a command-line invocation: ++# gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=. --libtool --macro-prefix=gl --no-vc-files getopt-gnu ++ ++# Specification in the form of a few gnulib-tool.m4 macro invocations: ++gl_LOCAL_DIR([]) ++gl_MODULES([ ++ getopt-gnu ++]) ++gl_AVOID([]) ++gl_SOURCE_BASE([gnulib]) ++gl_M4_BASE([gnulib/m4]) ++gl_PO_BASE([]) ++gl_DOC_BASE([doc]) ++gl_TESTS_BASE([tests]) ++gl_LIB([libgnu]) ++gl_MAKEFILE_NAME([]) ++gl_LIBTOOL ++gl_MACRO_PREFIX([gl]) ++gl_PO_DOMAIN([]) ++gl_VC_FILES([false]) +diff --git a/gnulib/m4/gnulib-common.m4 b/gnulib/m4/gnulib-common.m4 +new file mode 100644 +index 0000000..c8fda20 +--- /dev/null ++++ b/gnulib/m4/gnulib-common.m4 +@@ -0,0 +1,124 @@ ++# gnulib-common.m4 serial 11 ++dnl Copyright (C) 2007-2009 Free Software Foundation, Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. ++ ++# gl_COMMON ++# is expanded unconditionally through gnulib-tool magic. ++AC_DEFUN([gl_COMMON], [ ++ dnl Use AC_REQUIRE here, so that the code is expanded once only. ++ AC_REQUIRE([gl_00GNULIB]) ++ AC_REQUIRE([gl_COMMON_BODY]) ++]) ++AC_DEFUN([gl_COMMON_BODY], [ ++ AH_VERBATIM([isoc99_inline], ++[/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports ++ the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of ++ earlier versions), but does not display it by setting __GNUC_STDC_INLINE__. ++ __APPLE__ && __MACH__ test for MacOS X. ++ __APPLE_CC__ tests for the Apple compiler and its version. ++ __STDC_VERSION__ tests for the C99 mode. */ ++#if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__ ++# define __GNUC_STDC_INLINE__ 1 ++#endif]) ++ AH_VERBATIM([unused_parameter], ++[/* Define as a marker that can be attached to function parameter declarations ++ for parameters that are not used. This helps to reduce warnings, such as ++ from GCC -Wunused-parameter. */ ++#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) ++# define _UNUSED_PARAMETER_ __attribute__ ((__unused__)) ++#else ++# define _UNUSED_PARAMETER_ ++#endif ++]) ++]) ++ ++# gl_MODULE_INDICATOR([modulename]) ++# defines a C macro indicating the presence of the given module. ++AC_DEFUN([gl_MODULE_INDICATOR], ++[ ++ AC_DEFINE([GNULIB_]translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___]), [1], ++ [Define to 1 when using the gnulib module ]$1[.]) ++]) ++ ++# m4_foreach_w ++# is a backport of autoconf-2.59c's m4_foreach_w. ++# Remove this macro when we can assume autoconf >= 2.60. ++m4_ifndef([m4_foreach_w], ++ [m4_define([m4_foreach_w], ++ [m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])]) ++ ++# AC_PROG_MKDIR_P ++# is a backport of autoconf-2.60's AC_PROG_MKDIR_P. ++# Remove this macro when we can assume autoconf >= 2.60. ++m4_ifdef([AC_PROG_MKDIR_P], [], [ ++ AC_DEFUN_ONCE([AC_PROG_MKDIR_P], ++ [AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake ++ MKDIR_P='$(mkdir_p)' ++ AC_SUBST([MKDIR_P])])]) ++ ++# AC_C_RESTRICT ++# This definition overrides the AC_C_RESTRICT macro from autoconf 2.60..2.61, ++# so that mixed use of GNU C and GNU C++ and mixed use of Sun C and Sun C++ ++# works. ++# This definition can be removed once autoconf >= 2.62 can be assumed. ++AC_DEFUN([AC_C_RESTRICT], ++[AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict], ++ [ac_cv_c_restrict=no ++ # The order here caters to the fact that C++ does not require restrict. ++ for ac_kw in __restrict __restrict__ _Restrict restrict; do ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM( ++ [[typedef int * int_ptr; ++ int foo (int_ptr $ac_kw ip) { ++ return ip[0]; ++ }]], ++ [[int s[1]; ++ int * $ac_kw t = s; ++ t[0] = 0; ++ return foo(t)]])], ++ [ac_cv_c_restrict=$ac_kw]) ++ test "$ac_cv_c_restrict" != no && break ++ done ++ ]) ++ AH_VERBATIM([restrict], ++[/* Define to the equivalent of the C99 'restrict' keyword, or to ++ nothing if this is not supported. Do not define if restrict is ++ supported directly. */ ++#undef restrict ++/* Work around a bug in Sun C++: it does not support _Restrict, even ++ though the corresponding Sun C compiler does, which causes ++ "#define restrict _Restrict" in the previous line. Perhaps some future ++ version of Sun C++ will work with _Restrict; if so, it'll probably ++ define __RESTRICT, just as Sun C does. */ ++#if defined __SUNPRO_CC && !defined __RESTRICT ++# define _Restrict ++#endif]) ++ case $ac_cv_c_restrict in ++ restrict) ;; ++ no) AC_DEFINE([restrict], []) ;; ++ *) AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;; ++ esac ++]) ++ ++# gl_BIGENDIAN ++# is like AC_C_BIGENDIAN, except that it can be AC_REQUIREd. ++# Note that AC_REQUIRE([AC_C_BIGENDIAN]) does not work reliably because some ++# macros invoke AC_C_BIGENDIAN with arguments. ++AC_DEFUN([gl_BIGENDIAN], ++[ ++ AC_C_BIGENDIAN ++]) ++ ++# gl_CACHE_VAL_SILENT(cache-id, command-to-set-it) ++# is like AC_CACHE_VAL(cache-id, command-to-set-it), except that it does not ++# output a spurious "(cached)" mark in the midst of other configure output. ++# This macro should be used instead of AC_CACHE_VAL when it is not surrounded ++# by an AC_MSG_CHECKING/AC_MSG_RESULT pair. ++AC_DEFUN([gl_CACHE_VAL_SILENT], ++[ ++ saved_as_echo_n="$as_echo_n" ++ as_echo_n=':' ++ AC_CACHE_VAL([$1], [$2]) ++ as_echo_n="$saved_as_echo_n" ++]) +diff --git a/gnulib/m4/gnulib-comp.m4 b/gnulib/m4/gnulib-comp.m4 +new file mode 100644 +index 0000000..6514552 +--- /dev/null ++++ b/gnulib/m4/gnulib-comp.m4 +@@ -0,0 +1,197 @@ ++# DO NOT EDIT! GENERATED AUTOMATICALLY! ++# 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. ++# ++# This file represents the compiled summary of the specification in ++# gnulib-cache.m4. It lists the computed macro invocations that need ++# to be invoked from configure.ac. ++# In projects using CVS, this file can be treated like other built files. ++ ++ ++# This macro should be invoked from ./configure.in, in the section ++# "Checks for programs", right after AC_PROG_CC, and certainly before ++# any checks for libraries, header files, types and library functions. ++AC_DEFUN([gl_EARLY], ++[ ++ m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace ++ m4_pattern_allow([^gl_ES$])dnl a valid locale name ++ m4_pattern_allow([^gl_LIBOBJS$])dnl a variable ++ m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable ++ AC_REQUIRE([AC_PROG_RANLIB]) ++ AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) ++]) ++ ++# This macro should be invoked from ./configure.in, in the section ++# "Check for header files, types and library functions". ++AC_DEFUN([gl_INIT], ++[ ++ AM_CONDITIONAL([GL_COND_LIBTOOL], [true]) ++ gl_cond_libtool=true ++ m4_pushdef([AC_LIBOBJ], m4_defn([gl_LIBOBJ])) ++ m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gl_REPLACE_FUNCS])) ++ m4_pushdef([AC_LIBSOURCES], m4_defn([gl_LIBSOURCES])) ++ m4_pushdef([gl_LIBSOURCES_LIST], []) ++ m4_pushdef([gl_LIBSOURCES_DIR], []) ++ gl_COMMON ++ gl_source_base='gnulib' ++ gl_FUNC_GETOPT_GNU ++ gl_MODULE_INDICATOR([getopt-gnu]) ++ gl_FUNC_GETOPT_POSIX ++ AC_SUBST([LIBINTL]) ++ AC_SUBST([LTLIBINTL]) ++ gl_STDDEF_H ++ gl_UNISTD_H ++ m4_ifval(gl_LIBSOURCES_LIST, [ ++ m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ || ++ for gl_file in ]gl_LIBSOURCES_LIST[ ; do ++ if test ! -r ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file ; then ++ echo "missing file ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file" >&2 ++ exit 1 ++ fi ++ done])dnl ++ m4_if(m4_sysval, [0], [], ++ [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])]) ++ ]) ++ m4_popdef([gl_LIBSOURCES_DIR]) ++ m4_popdef([gl_LIBSOURCES_LIST]) ++ m4_popdef([AC_LIBSOURCES]) ++ m4_popdef([AC_REPLACE_FUNCS]) ++ m4_popdef([AC_LIBOBJ]) ++ AC_CONFIG_COMMANDS_PRE([ ++ gl_libobjs= ++ gl_ltlibobjs= ++ if test -n "$gl_LIBOBJS"; then ++ # Remove the extension. ++ sed_drop_objext='s/\.o$//;s/\.obj$//' ++ for i in `for i in $gl_LIBOBJS; do echo "$i"; done | sed "$sed_drop_objext" | sort | uniq`; do ++ gl_libobjs="$gl_libobjs $i.$ac_objext" ++ gl_ltlibobjs="$gl_ltlibobjs $i.lo" ++ done ++ fi ++ AC_SUBST([gl_LIBOBJS], [$gl_libobjs]) ++ AC_SUBST([gl_LTLIBOBJS], [$gl_ltlibobjs]) ++ ]) ++ gltests_libdeps= ++ gltests_ltlibdeps= ++ m4_pushdef([AC_LIBOBJ], m4_defn([gltests_LIBOBJ])) ++ m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gltests_REPLACE_FUNCS])) ++ m4_pushdef([AC_LIBSOURCES], m4_defn([gltests_LIBSOURCES])) ++ m4_pushdef([gltests_LIBSOURCES_LIST], []) ++ m4_pushdef([gltests_LIBSOURCES_DIR], []) ++ gl_COMMON ++ gl_source_base='tests' ++ m4_ifval(gltests_LIBSOURCES_LIST, [ ++ m4_syscmd([test ! -d ]m4_defn([gltests_LIBSOURCES_DIR])[ || ++ for gl_file in ]gltests_LIBSOURCES_LIST[ ; do @@ 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 Nov 10 03:01:49 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 10 Nov 2009 02:01:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[7194] csw/mgar/pkg/template/trunk/Makefile Message-ID: Revision: 7194 http://gar.svn.sourceforge.net/gar/?rev=7194&view=rev Author: bdwalton Date: 2009-11-10 02:01:49 +0000 (Tue, 10 Nov 2009) Log Message: ----------- template: note availability of ETCSERVCIES and INETDCONF Modified Paths: -------------- csw/mgar/pkg/template/trunk/Makefile Modified: csw/mgar/pkg/template/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-11-10 01:54:17 UTC (rev 7193) +++ csw/mgar/pkg/template/trunk/Makefile 2009-11-10 02:01:49 UTC (rev 7194) @@ -111,6 +111,7 @@ ## ## 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 REQUIRED_PKGS. ## SPKG_CLASSES = none @@ -119,6 +120,8 @@ ## SAMPLECONF = ## INITSMF = ## USERGROUP = +## ETCSERVICES = +## INETDCONF = ## A list of runtime package dependencies in the form of CSWfoo. ## REQUIRED_PKGS = ## 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 Nov 10 03:22:01 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 10 Nov 2009 02:22:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[7195] csw/mgar/gar/v2/bin/checkpkg Message-ID: Revision: 7195 http://gar.svn.sourceforge.net/gar/?rev=7195&view=rev Author: bdwalton Date: 2009-11-10 02:22:01 +0000 (Tue, 10 Nov 2009) Log Message: ----------- gar: checkpkg should allow for packages with no deps Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2009-11-10 02:01:49 UTC (rev 7194) +++ csw/mgar/gar/v2/bin/checkpkg 2009-11-10 02:22:01 UTC (rev 7195) @@ -446,7 +446,7 @@ # Verify that there are no double depends repeated_depends="$(awk '{print $2}' $EXTRACTDIR/$pkgname/install/depend \ | sort | uniq -c | awk '{print $1}' | sort | uniq | wc -l)" -if [[ "$repeated_depends" -ne 1 ]]; then +if [[ "$repeated_depends" -gt 1 ]]; then cat $EXTRACTDIR/$pkgname/install/depend print ERROR: $pkgname has double depends exit 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 Nov 10 03:42:35 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 10 Nov 2009 02:42:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[7196] csw/mgar/gar/v2 Message-ID: Revision: 7196 http://gar.svn.sourceforge.net/gar/?rev=7196&view=rev Author: bdwalton Date: 2009-11-10 02:42:35 +0000 (Tue, 10 Nov 2009) Log Message: ----------- gar: change the way CSWcommon is handled, making it optional with a COMMON_PKG_DEPENDS Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk csw/mgar/gar/v2/gar.mk csw/mgar/gar/v2/pkglib/csw_dyngspec.gspec Removed Paths: ------------- csw/mgar/gar/v2/pkglib/csw/depend Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2009-11-10 02:22:01 UTC (rev 7195) +++ csw/mgar/gar/v2/gar.conf.mk 2009-11-10 02:42:35 UTC (rev 7196) @@ -164,6 +164,8 @@ DESTIMG ?= $(LOGNAME)-$(shell hostname) +# A default list of packages that everyone will depend on +COMMON_PKG_DEPENDS ?= CSWcommon # These are the core packages which must be installed for GAR to function correctly DEF_BASE_PKGS = CSWgmake CSWgtar CSWggrep CSWdiffutils CSWgfile CSWtextutils CSWwget CSWfindutils CSWgsed CSWgawk CSWbzip2 Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-11-10 02:22:01 UTC (rev 7195) +++ csw/mgar/gar/v2/gar.mk 2009-11-10 02:42:35 UTC (rev 7196) @@ -619,6 +619,10 @@ if test -f "$$F" -a \! -h "$$F"; then echo $$F; fi; \ done)),) +ifneq ($(COMMON_PKG_DEPENDS),) +_EXTRA_GAR_PKGS += $(COMMON_PKG_DEPENDS) +endif + ifneq ($(ISAEXEC_FILES),) _EXTRA_GAR_PKGS += CSWisaexec endif Deleted: csw/mgar/gar/v2/pkglib/csw/depend =================================================================== --- csw/mgar/gar/v2/pkglib/csw/depend 2009-11-10 02:22:01 UTC (rev 7195) +++ csw/mgar/gar/v2/pkglib/csw/depend 2009-11-10 02:42:35 UTC (rev 7196) @@ -1 +0,0 @@ -P CSWcommon common - common files and dirs for CSW packages Modified: csw/mgar/gar/v2/pkglib/csw_dyngspec.gspec =================================================================== --- csw/mgar/gar/v2/pkglib/csw_dyngspec.gspec 2009-11-10 02:22:01 UTC (rev 7195) +++ csw/mgar/gar/v2/pkglib/csw_dyngspec.gspec 2009-11-10 02:42:35 UTC (rev 7196) @@ -1,5 +1,4 @@ %include url file://%{PKGLIB}/csw_vars.gspec %include url file://%{PKGLIB}/csw_prototype.gspec %pkginfo url file://%{WORKSRC}/csw/pkginfo -%depend:merge url file://%{PKGLIB}/csw/depend %include url file://%{PKGLIB}/std_depend.gspec 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 Nov 10 03:49:30 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 10 Nov 2009 02:49:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[7197] csw/mgar/pkg/pkgutil/trunk/Makefile Message-ID: Revision: 7197 http://gar.svn.sourceforge.net/gar/?rev=7197&view=rev Author: bdwalton Date: 2009-11-10 02:49:30 +0000 (Tue, 10 Nov 2009) Log Message: ----------- pkgutil: use new CSWcommon disable feature Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2009-11-10 02:42:35 UTC (rev 7196) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-11-10 02:49:30 UTC (rev 7197) @@ -10,6 +10,9 @@ package automatically. endef +# Disable inclusion of CSWcommon by default. +COMMON_PKG_DEPENDS = + MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).zip DISTFILES += $(call admfiles,CSWpkgutil,prototype) @@ -21,7 +24,8 @@ SPKG_DESC_CSWpkgutil = $(DESCRIPTION) SPKG_DESC_CSWpkgutilplus = Extends pkgutil functionality -REQUIRED_PKGS_CSWpkgutilplus = CSWperl CSWgnupg CSWpkgutil +# Explicitly depend on CSWcommon here since it's not the default +REQUIRED_PKGS_CSWpkgutilplus = CSWcommon CSWperl CSWgnupg CSWpkgutil PKGFILES_CSWpkgutilplus = .*bldcat.* PKGFILES_CSWpkgutilplus += .*chkcat.* 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 Nov 10 09:29:20 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 10 Nov 2009 08:29:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[7198] csw/mgar/pkg/mysql5/branches/mysql-5.1.x/ Message-ID: Revision: 7198 http://gar.svn.sourceforge.net/gar/?rev=7198&view=rev Author: wahwah Date: 2009-11-10 08:29:19 +0000 (Tue, 10 Nov 2009) Log Message: ----------- mysql-5.1.x: Branching out to package mysql-5.1.x (among other things, fix the tests) Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/ 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 Nov 10 09:46:18 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 10 Nov 2009 08:46:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7199] csw/mgar/pkg/cups/trunk/Makefile Message-ID: Revision: 7199 http://gar.svn.sourceforge.net/gar/?rev=7199&view=rev Author: wahwah Date: 2009-11-10 08:46:18 +0000 (Tue, 10 Nov 2009) Log Message: ----------- cups: Removing explicit dependencies on CSWcswclassutils to avoid double depends Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2009-11-10 08:29:19 UTC (rev 7198) +++ csw/mgar/pkg/cups/trunk/Makefile 2009-11-10 08:46:18 UTC (rev 7199) @@ -76,17 +76,17 @@ ARCHALL_CSWcupsdoc = 1 ARCHALL_CSWcupsdev = 1 -REQUIRED_PKGS_CSWcups = CSWcswclassutils CSWcupsd CSWcupsclient -REQUIRED_PKGS_CSWcupsd = CSWcswclassutils CSWlibcups CSWoldaprt CSWzlib +REQUIRED_PKGS_CSWcups = CSWcupsd CSWcupsclient +REQUIRED_PKGS_CSWcupsd = CSWlibcups CSWoldaprt CSWzlib REQUIRED_PKGS_CSWcupsd += CSWjpeg CSWpng CSWtiff CSWlibtasn1 REQUIRED_PKGS_CSWcupsd += CSWgcrypt CSWgnutls CSWgpgerr CSWlibdbus REQUIRED_PKGS_CSWcupsd += CSWkrb5lib CSWosslrt CSWcupsdoc REQUIRED_PKGS_CSWcupsd += CSWdbusglib CSWggettextrt CSWglib2 -REQUIRED_PKGS_CSWcupsclient = CSWcswclassutils CSWlibcups CSWoldaprt CSWzlib +REQUIRED_PKGS_CSWcupsclient = CSWlibcups CSWoldaprt CSWzlib REQUIRED_PKGS_CSWcupsclient += CSWgcrypt CSWgnutls CSWgpgerr CSWlibtasn1 CSWosslrt -REQUIRED_PKGS_CSWcupsdoc = CSWcswclassutils -REQUIRED_PKGS_CSWcupsdev = CSWcswclassutils -REQUIRED_PKGS_CSWlibcups = CSWcswclassutils CSWjpeg CSWpng CSWtiff CSWzlib +REQUIRED_PKGS_CSWcupsdoc = +REQUIRED_PKGS_CSWcupsdev = +REQUIRED_PKGS_CSWlibcups = CSWjpeg CSWpng CSWtiff CSWzlib REQUIRED_PKGS_CSWlibcups += CSWgcrypt CSWgnutls CSWgpgerr CSWlibtasn1 CSWosslrt PKGFILES_CSWlibcups = $(libdir)/libcups.* 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 Nov 10 11:21:09 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 10 Nov 2009 10:21:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[7200] csw/mgar/gar/v2/pkglib/csw/depend Message-ID: Revision: 7200 http://gar.svn.sourceforge.net/gar/?rev=7200&view=rev Author: dmichelsen Date: 2009-11-10 10:21:09 +0000 (Tue, 10 Nov 2009) Log Message: ----------- mGAR v2: Re-add csw/depend after mistakenly delete from r7196 Added Paths: ----------- csw/mgar/gar/v2/pkglib/csw/depend Copied: csw/mgar/gar/v2/pkglib/csw/depend (from rev 7195, csw/mgar/gar/v2/pkglib/csw/depend) =================================================================== --- csw/mgar/gar/v2/pkglib/csw/depend (rev 0) +++ csw/mgar/gar/v2/pkglib/csw/depend 2009-11-10 10:21:09 UTC (rev 7200) @@ -0,0 +1 @@ +P CSWcommon common - common files and dirs for CSW packages Property changes on: csw/mgar/gar/v2/pkglib/csw/depend ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/gar/v2/pkglib/csw/depend:4936-6678 /csw/mgar/gar/v2-collapsed-modulations/pkglib/csw/depend:6895 /csw/mgar/gar/v2-skayser/pkglib/csw/depend:6087-6132 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Nov 10 12:31:56 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 10 Nov 2009 11:31:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[7202] csw/mgar/pkg/chmlib/trunk/Makefile Message-ID: Revision: 7202 http://gar.svn.sourceforge.net/gar/?rev=7202&view=rev Author: dmichelsen Date: 2009-11-10 11:31:56 +0000 (Tue, 10 Nov 2009) Log Message: ----------- chmlib: Add 64 bit Modified Paths: -------------- csw/mgar/pkg/chmlib/trunk/Makefile Modified: csw/mgar/pkg/chmlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/chmlib/trunk/Makefile 2009-11-10 11:31:47 UTC (rev 7201) +++ csw/mgar/pkg/chmlib/trunk/Makefile 2009-11-10 11:31:56 UTC (rev 7202) @@ -22,11 +22,15 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +BUILD64 = 1 +NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-examples TEST_TARGET = check +MERGE_DIRS_isa-extra = $(libdir) + DOCS = NEWS README DOCS += ChmLib-ds6.zip ChmLib-ce.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 Tue Nov 10 12:31:47 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 10 Nov 2009 11:31:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[7201] csw/mgar/pkg/chmlib/trunk/files/ 0001-Add-autoconf-support-from-gnulib-for-getopt.h.patch Message-ID: Revision: 7201 http://gar.svn.sourceforge.net/gar/?rev=7201&view=rev Author: dmichelsen Date: 2009-11-10 11:31:47 +0000 (Tue, 10 Nov 2009) Log Message: ----------- chmlib: Remove old patch Removed Paths: ------------- csw/mgar/pkg/chmlib/trunk/files/0001-Add-autoconf-support-from-gnulib-for-getopt.h.patch Deleted: csw/mgar/pkg/chmlib/trunk/files/0001-Add-autoconf-support-from-gnulib-for-getopt.h.patch =================================================================== --- csw/mgar/pkg/chmlib/trunk/files/0001-Add-autoconf-support-from-gnulib-for-getopt.h.patch 2009-11-10 10:21:09 UTC (rev 7200) +++ csw/mgar/pkg/chmlib/trunk/files/0001-Add-autoconf-support-from-gnulib-for-getopt.h.patch 2009-11-10 11:31:47 UTC (rev 7201) @@ -1,3298 +0,0 @@ -From a1225b04a6c45c2d3b923b54708ede187e760c0d Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Wed, 30 Sep 2009 15:46:12 +0200 -Subject: [PATCH] Add autoconf support from gnulib for getopt.h - ---- - Makefile.am | 5 +- - autoinit.sh | 6 + - configure.in | 3 + - lib/Makefile.am | 206 +++++++++ - lib/dummy.c | 42 ++ - lib/getopt.c | 1186 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - lib/getopt.in.h | 242 +++++++++++ - lib/getopt1.c | 170 ++++++++ - lib/getopt_int.h | 130 ++++++ - lib/gettext.h | 279 ++++++++++++ - lib/stddef.in.h | 86 ++++ - lib/unistd.in.h | 784 ++++++++++++++++++++++++++++++++++ - m4/gnulib-cache.m4 | 35 ++ - 13 files changed, 3172 insertions(+), 2 deletions(-) - create mode 100755 autoinit.sh - 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/gnulib-cache.m4 - -diff --git a/Makefile.am b/Makefile.am -index 3150987..dcaa91c 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,3 +1,4 @@ - AUTOMAKE_OPTIONS=1.6 dist-bzip2 dist-zip --SUBDIRS=src --EXTRA_DIST=ChmLib-ce.zip ChmLib-ds6.zip contrib -+SUBDIRS=lib src -+EXTRA_DIST=m4_gnulib-cache.m4 ChmLib-ce.zip ChmLib-ds6.zip contrib -+ACLOCAL_AMFLAGS=-I m4 -diff --git a/autoinit.sh b/autoinit.sh -new file mode 100755 -index 0000000..d5d5881 ---- /dev/null -+++ b/autoinit.sh -@@ -0,0 +1,6 @@ -+#!/bin/sh -+ -+aclocal -+autoconf -+autoheader -+automake --add-missing --foreign -diff --git a/configure.in b/configure.in -index b39413a..885e4a8 100644 ---- a/configure.in -+++ b/configure.in -@@ -2,12 +2,15 @@ dnl Process this file with autoconf to produce a configure script. - AC_INIT([chmlib],[0.40]) - dnl,[Jed Wing ]) - AC_CONFIG_SRCDIR(src/chm_lib.c) -+AC_CONFIG_FILES(lib/Makefile) - AM_INIT_AUTOMAKE - AM_MAINTAINER_MODE - - - dnl Checks for programs. - AC_PROG_CC -+gl_EARLY -+gl_INIT - AC_PROG_LD - AM_PROG_LIBTOOL - AC_PROG_INSTALL -diff --git a/lib/Makefile.am b/lib/Makefile.am -new file mode 100644 -index 0000000..fb6ec4e ---- /dev/null -+++ b/lib/Makefile.am -@@ -0,0 +1,206 @@ -+## 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=. --libtool --macro-prefix=gl getopt -+ -+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 -+ -+## 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)/./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 -+ -+## 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_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_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_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ -+ -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \ -+ -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|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 -+ -+## 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/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..f1e6d1f ---- /dev/null -+++ b/lib/getopt.c -@@ -0,0 +1,1186 @@ -+/* 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 -+ 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, char **argv, 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..15c213f ---- /dev/null -+++ b/lib/getopt.in.h -@@ -0,0 +1,242 @@ -+/* 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. */ -+#if @HAVE_GETOPT_H@ -+# @INCLUDE_NEXT@ @NEXT_GETOPT_H@ -+#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) -+#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..3c6628b ---- /dev/null -+++ b/lib/getopt_int.h -@@ -0,0 +1,130 @@ -+/* Internal declarations for getopt. -+ Copyright (C) 1989-1994,1996-1999,2001,2003,2004 -+ 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 -+ -+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..8a96e79 ---- /dev/null -+++ b/lib/unistd.in.h -@@ -0,0 +1,784 @@ -+/* 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@ -+# 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 is 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_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@ -+/* 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@ -+extern int linkat (int fd1, const char *path1, int fd2, const char *path2, -+ int flag); -+# endif -+#elif defined GNULIB_POSIXCHECK -+# undef linkat -+# define link(f1,path1,f2,path2,f) \ -+ (GL_LINK_WARNING ("linkat is unportable - " \ -+ "use gnulib module linkat for portability"), \ -+ linkat (f1, path1, f2, path2,f)) -+#endif -+ -+#if @GNULIB_LSEEK@ -+# if @REPLACE_LSEEK@ -+/* Set the offset of FD relative to SEEK_SET, SEEK_CUR, or SEEK_END. -+ Return the new offset if successful, otherwise -1 and errno set. -+ See the POSIX:2001 specification -+ . */ -+# define lseek rpl_lseek -+ extern off_t lseek (int fd, off_t offset, int whence); -+# endif -+#elif defined GNULIB_POSIXCHECK -+# undef lseek -+# define lseek(f,o,w) \ -+ (GL_LINK_WARNING ("lseek does not fail with ESPIPE on pipes on some " \ -+ "systems - use gnulib module lseek for portability"), \ -+ lseek (f, o, w)) -+#endif -+ -+ -+#if @GNULIB_PIPE2@ -+/* Create a pipe, applying the given flags when opening the read-end of the -+ pipe and the write-end of the pipe. -+ The flags are a bitmask, possibly including O_CLOEXEC (defined in ) -+ and O_TEXT, O_BINARY (defined in "binary-io.h"). -+ Store the read-end as fd[0] and the write-end as fd[1]. -+ Return 0 upon success, or -1 with errno set upon failure. -+ See also the Linux man page at -+ . */ -+# if @HAVE_PIPE2@ -+# define pipe2 rpl_pipe2 -+# endif -+extern int pipe2 (int fd[2], int flags); -+#elif defined GNULIB_POSIXCHECK -+# undef pipe2 -+# define pipe2(f,o) \ -+ (GL_LINK_WARNING ("pipe2 is unportable - " \ -+ "use gnulib module pipe2 for portability"), \ -+ pipe2 (f, o)) -+#endif -+ -+ -+#if @GNULIB_READLINK@ -+# if @REPLACE_READLINK@ -+# define readlink rpl_readlink -+# endif -+/* Read the contents of the symbolic link FILE and place the first BUFSIZE -+ bytes of it into BUF. Return the number of bytes placed into BUF if -+ successful, otherwise -1 and errno set. -+ See the POSIX:2001 specification -+ . */ -+# if !@HAVE_READLINK@ || @REPLACE_READLINK@ -+extern ssize_t readlink (const char *file, char *buf, size_t bufsize); -+# endif -+#elif defined GNULIB_POSIXCHECK -+# undef readlink -+# define readlink(f,b,s) \ -+ (GL_LINK_WARNING ("readlink is unportable - " \ -+ "use gnulib module readlink for portability"), \ -+ readlink (f, b, s)) -+#endif -+ -+ -+#if @GNULIB_READLINKAT@ -+# if !@HAVE_READLINKAT@ -+ssize_t readlinkat (int fd, char const *file, char *buf, size_t len); -+# endif -+#elif defined GNULIB_POSIXCHECK -+# undef readlinkat -+# define readlinkat(d,n,b,l) \ -+ (GL_LINK_WARNING ("readlinkat is not portable - " \ -+ "use gnulib module symlinkat for portability"), \ -+ readlinkat (d, n, b, l)) -+#endif -+ -+ -+#if @GNULIB_RMDIR@ -+# if @REPLACE_RMDIR@ -+# define rmdir rpl_rmdir -+/* Remove the directory DIR. */ -+extern int rmdir (char const *name); -+# endif -+#elif defined GNULIB_POSIXCHECK -+# undef rmdir -+# define rmdir(n) \ -+ (GL_LINK_WARNING ("rmdir is unportable - " \ @@ 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 dmichelsen at users.sourceforge.net Tue Nov 10 13:38:29 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 10 Nov 2009 12:38:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[7203] csw/mgar/pkg/gnutls/trunk Message-ID: Revision: 7203 http://gar.svn.sourceforge.net/gar/?rev=7203&view=rev Author: dmichelsen Date: 2009-11-10 12:38:28 +0000 (Tue, 10 Nov 2009) Log Message: ----------- gnutls: Test 2.9.9, revert back later to 2.8.x as 2.9 is experimental. Reported bugs are fixed upstream Modified Paths: -------------- csw/mgar/pkg/gnutls/trunk/Makefile csw/mgar/pkg/gnutls/trunk/checksums Modified: csw/mgar/pkg/gnutls/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnutls/trunk/Makefile 2009-11-10 11:31:56 UTC (rev 7202) +++ csw/mgar/pkg/gnutls/trunk/Makefile 2009-11-10 12:38:28 UTC (rev 7203) @@ -1,5 +1,5 @@ GARNAME = gnutls -GARVERSION = 2.8.5 +GARVERSION = 2.9.9 CATEGORIES = lib DESCRIPTION = GNU Transport Layer Security libraries and tools @@ -16,6 +16,7 @@ SPKG_DESC_CSWgnutlsdevel = GNU Transport Layer Security development headers and tools MASTER_SITES = $(GNU_MIRROR) +MASTER_SITES += http://alpha.gnu.org/gnu/gnutls/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += libgnutls-openssl.so.13.i DISTFILES += libgnutls-openssl.so.13.s @@ -27,11 +28,11 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +# We don't need it and if defined the test breaks +LD_OPTIONS = + BUILD64 = 1 NO_ISAEXEC = 1 - -EXTRA_LDFLAGS = -L$(libdir) -lgpg-error -lsocket -lnsl - CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check @@ -44,6 +45,10 @@ include gar/category.mk +# This is needed as tests/rfc2253-escape-test calls 'grep' instead of $GREP +# and uses option '-q' +PATH := /opt/csw/gnu:$(PATH) + post-install-isa-sparcv8: @cp $(FILEDIR)/libgnutls.so.13.s $(INSTALLISADIR)/opt/csw/lib/libgnutls.so.13 @cp $(FILEDIR)/libgnutls-openssl.so.13.s $(INSTALLISADIR)/opt/csw/lib/libgnutls-openssl.so.13 Modified: csw/mgar/pkg/gnutls/trunk/checksums =================================================================== --- csw/mgar/pkg/gnutls/trunk/checksums 2009-11-10 11:31:56 UTC (rev 7202) +++ csw/mgar/pkg/gnutls/trunk/checksums 2009-11-10 12:38:28 UTC (rev 7203) @@ -1,4 +1,4 @@ -e3b2788b79bfc82acbe717e3c54d4e92 gnutls-2.8.5.tar.bz2 +0d144230c388b74ba2339ac096e21823 gnutls-2.9.9.tar.bz2 073c509902375c40b885f5adc9f7dba9 libgnutls-openssl.so.13.i 02e4011d400d262b8d4b5c7311d8a5b0 libgnutls-openssl.so.13.s b0eee0d29e3d260a146e626c6ca75b16 libgnutls.so.13.i 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 Nov 10 13:53:31 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 10 Nov 2009 12:53:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7204] csw/mgar/pkg/mysql5/branches/mysql-5.1.x Message-ID: Revision: 7204 http://gar.svn.sourceforge.net/gar/?rev=7204&view=rev Author: wahwah Date: 2009-11-10 12:53:31 +0000 (Tue, 10 Nov 2009) Log Message: ----------- mysql-5.1.x: It builds, but the tests are failing Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums Property Changed: ---------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/ Property changes on: csw/mgar/pkg/mysql5/branches/mysql-5.1.x ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-git Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile 2009-11-10 12:38:28 UTC (rev 7203) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile 2009-11-10 12:53:31 UTC (rev 7204) @@ -3,7 +3,7 @@ # $Id$ GARNAME = mysql5 -GARVERSION = 5.0.84 +GARVERSION = 5.1.40 CATEGORIES = server DISTNAME = mysql-$(GARVERSION) @@ -95,7 +95,7 @@ REQUIRED_PKGS_CSWmysql5devel = CSWmysql5 REQUIRED_PKGS_CSWmysql5test = CSWmysql5 CSWperl -MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.0/ +MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.1/ DISTFILES = mysql-$(GARVERSION).tar.gz DISTFILES += cswmysql5 quick_start-csw README.CSW ChangeLog DISTFILES += CSWmysql5.preinstall @@ -107,6 +107,9 @@ REQUIRED_PKGS = CSWncurses CSWzlib PREREQUISITE_PKGS = $(REQUIRED_PKGS) +# MySQL-5.1.40 doesn't compile without setting EXTRA_INC. +EXTRA_INC = /opt/csw/include +EXTRA_LIB = /opt/csw/lib EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ @@ -134,7 +137,8 @@ CONFIGURE_ARGS += --with-plugins=max-no-ndb # TODO: Make the tests pass. They don't at the moment. -TEST_SCRIPTS = +# TEST_SCRIPTS = +TEST_TARGETS = check # Enable 64 bits build BUILD64 = 1 Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums 2009-11-10 12:38:28 UTC (rev 7203) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums 2009-11-10 12:53:31 UTC (rev 7204) @@ -8,5 +8,5 @@ e42afb5ec1b1ab02d2ec3b46d0922636 README.CSW aaca748fc044834e71ad544ab293c494 cswmysql5 67228e1f096fe08a94f4267439a4ec36 cswusergroup -671348f1a5b078da9ca76f97e1fda325 mysql-5.0.84.tar.gz +32e7373c16271606007374396e6742ad mysql-5.1.40.tar.gz 90b7cfcd11ab56e021a195a6a085fa21 quick_start-csw 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 Nov 10 14:56:39 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 10 Nov 2009 13:56:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[7205] csw/mgar/pkg/libthai/trunk Message-ID: Revision: 7205 http://gar.svn.sourceforge.net/gar/?rev=7205&view=rev Author: dmichelsen Date: 2009-11-10 13:56:39 +0000 (Tue, 10 Nov 2009) Log Message: ----------- libthai: Fixup Makefile Modified Paths: -------------- csw/mgar/pkg/libthai/trunk/Makefile csw/mgar/pkg/libthai/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libthai/trunk/files/0001-Remove-unknown-compiler-macro.patch Modified: csw/mgar/pkg/libthai/trunk/Makefile =================================================================== --- csw/mgar/pkg/libthai/trunk/Makefile 2009-11-10 12:53:31 UTC (rev 7204) +++ csw/mgar/pkg/libthai/trunk/Makefile 2009-11-10 13:56:39 UTC (rev 7205) @@ -1,5 +1,5 @@ GARNAME = libthai -GARVERSION = 0.1.4 +GARVERSION = 0.1.12 CATEGORIES = lib DESCRIPTION = Thai language support routines @@ -12,8 +12,9 @@ Thai Linux Working Group and opened for all contributors. endef -MASTER_SITES = $(SF_MIRRORS) +MASTER_SITES = http://linux.thai.net/pub/thailinux/software/libthai/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Remove-unknown-compiler-macro.patch UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=34448 UPSTREAM_USE_SF = 1 @@ -21,8 +22,10 @@ SPKG_SOURCEURL = http://linux.thai.net/projects/libthai/ +REQUIRED_PKGS = CSWlibdatrie +PREREQUISUITE_PKGS = $(REQUIRED_PKGS) + BUILD64 = 1 -NORUNPATH = 1 CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/libthai/trunk/checksums =================================================================== --- csw/mgar/pkg/libthai/trunk/checksums 2009-11-10 12:53:31 UTC (rev 7204) +++ csw/mgar/pkg/libthai/trunk/checksums 2009-11-10 13:56:39 UTC (rev 7205) @@ -1 +1,2 @@ -844dad9f8e7b915b4791409611fe816b download/libthai-0.1.4.tar.gz +11c46f4c6a8a3525861b750f890fee5e 0001-Remove-unknown-compiler-macro.patch +e206313d5a60ce98bc3be83d60373554 libthai-0.1.12.tar.gz Added: csw/mgar/pkg/libthai/trunk/files/0001-Remove-unknown-compiler-macro.patch =================================================================== --- csw/mgar/pkg/libthai/trunk/files/0001-Remove-unknown-compiler-macro.patch (rev 0) +++ csw/mgar/pkg/libthai/trunk/files/0001-Remove-unknown-compiler-macro.patch 2009-11-10 13:56:39 UTC (rev 7205) @@ -0,0 +1,25 @@ +From 89c9fcf2d67a3be06fb2f687fb8c7a231529bd24 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 10 Nov 2009 14:04:11 +0100 +Subject: [PATCH] Remove unknown compiler macro + +--- + src/libthai.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/libthai.c b/src/libthai.c +index bb7e8e0..91ae32a 100644 +--- a/src/libthai.c ++++ b/src/libthai.c +@@ -7,7 +7,7 @@ + + #include "thbrk/thbrk-private.h" + +-__attribute__ ((destructor)) void ++/* __attribute__ ((destructor)) */ void + _libthai_on_unload () + { + thbrk_on_unload (); +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Nov 10 15:06:31 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 10 Nov 2009 14:06:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7206] csw/mgar/pkg/libthai/trunk/Makefile Message-ID: Revision: 7206 http://gar.svn.sourceforge.net/gar/?rev=7206&view=rev Author: dmichelsen Date: 2009-11-10 14:06:31 +0000 (Tue, 10 Nov 2009) Log Message: ----------- libthai: Split off devel package Modified Paths: -------------- csw/mgar/pkg/libthai/trunk/Makefile Modified: csw/mgar/pkg/libthai/trunk/Makefile =================================================================== --- csw/mgar/pkg/libthai/trunk/Makefile 2009-11-10 13:56:39 UTC (rev 7205) +++ csw/mgar/pkg/libthai/trunk/Makefile 2009-11-10 14:06:31 UTC (rev 7206) @@ -20,14 +20,26 @@ UPSTREAM_USE_SF = 1 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWlibthai CSWlibthaidevel + +CATALOGNAME_CSWlibthai = libthai +CATALOGNAME_CSWlibthaidevel = libthai_devel + +SPKG_DESC_CSWlibthai = Thai language support routines +SPKG_DESC_CSWlibthaidevel = Thai language support routines development files + SPKG_SOURCEURL = http://linux.thai.net/projects/libthai/ -REQUIRED_PKGS = CSWlibdatrie -PREREQUISUITE_PKGS = $(REQUIRED_PKGS) +REQUIRED_PKGS_CSWlibthai = CSWlibdatrie +REQUIRED_PKGS_CSWlibthaidevel = CSWlibthai +PREREQUISUITE_PKGS = $(REQUIRED_PKGS_CSWlibthai) BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check +PKGFILES_CSWlibthaidevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibthaidevel += $(docdir)/.* + 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 Tue Nov 10 16:11:30 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 10 Nov 2009 15:11:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[7207] csw/mgar/pkg Message-ID: Revision: 7207 http://gar.svn.sourceforge.net/gar/?rev=7207&view=rev Author: dmichelsen Date: 2009-11-10 15:11:27 +0000 (Tue, 10 Nov 2009) Log Message: ----------- nfswatch: Initial commit Added Paths: ----------- csw/mgar/pkg/nfswatch/ csw/mgar/pkg/nfswatch/branches/ csw/mgar/pkg/nfswatch/tags/ csw/mgar/pkg/nfswatch/trunk/ csw/mgar/pkg/nfswatch/trunk/Makefile csw/mgar/pkg/nfswatch/trunk/checksums csw/mgar/pkg/nfswatch/trunk/files/ csw/mgar/pkg/nfswatch/trunk/files/0001-Add-missing-ifdefs-to-shield-Linux.patch Property changes on: csw/mgar/pkg/nfswatch/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/nfswatch/trunk/Makefile =================================================================== --- csw/mgar/pkg/nfswatch/trunk/Makefile (rev 0) +++ csw/mgar/pkg/nfswatch/trunk/Makefile 2009-11-10 15:11:27 UTC (rev 7207) @@ -0,0 +1,37 @@ +GARNAME = nfswatch +GARVERSION = 4.99.10 +CATEGORIES = utils + +DESCRIPTION = Monitors NFS client traffic and response time +define BLURB + NFSwatch lets you monitor NFS requests to any givenmachine, or the entire + local network. It mostly monitors NFS client traffic (NFS requests); it also + monitors the NFS reply traffic from a server inorder to measure the response + time for each RPC. +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Add-missing-ifdefs-to-shield-Linux.patch + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://nfswatch.sourceforge.net/ + +LICENSE = LICENSE + +CONFIGURE_SCRIPTS = + +BUILD_ARGS = CFLAGS="-DSUNOS58 -DSUNOS5 $(CFLAGS)" +BUILD_ARGS += LIBS="-lcurses -lnsl -lsocket -lm" +BUILD_ARGS += nfswatch nfslogsum + +TEST_SCRIPTS = + +INSTALL_OVERRIDE_VARS = INSTALL BINDIR MANDIR +INSTALL_OVERRIDE_VAR_INSTALL = /usr/ucb/install +INSTALL_OVERRIDE_VAR_BINDIR = $(bindir) +INSTALL_OVERRIDE_VAR_MANDIR = $(mandir)/man8 + +include gar/category.mk Added: csw/mgar/pkg/nfswatch/trunk/checksums =================================================================== --- csw/mgar/pkg/nfswatch/trunk/checksums (rev 0) +++ csw/mgar/pkg/nfswatch/trunk/checksums 2009-11-10 15:11:27 UTC (rev 7207) @@ -0,0 +1,2 @@ +645f230be6f77138c97fac9a1afa6ccf 0001-Add-missing-ifdefs-to-shield-Linux.patch +c20e510464f12384fdac330d8c84d127 nfswatch-4.99.10.tar.gz Added: csw/mgar/pkg/nfswatch/trunk/files/0001-Add-missing-ifdefs-to-shield-Linux.patch =================================================================== --- csw/mgar/pkg/nfswatch/trunk/files/0001-Add-missing-ifdefs-to-shield-Linux.patch (rev 0) +++ csw/mgar/pkg/nfswatch/trunk/files/0001-Add-missing-ifdefs-to-shield-Linux.patch 2009-11-10 15:11:27 UTC (rev 7207) @@ -0,0 +1,51 @@ +From 500575a6535481ebb2b5067c7e47ada6d7338152 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 10 Nov 2009 16:02:20 +0100 +Subject: [PATCH] Add missing ifdefs to shield Linux + +--- + nfswatch.c | 2 +- + pktfilter.c | 2 ++ + 2 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/nfswatch.c b/nfswatch.c +index abb595e..0607b4e 100644 +--- a/nfswatch.c ++++ b/nfswatch.c +@@ -637,12 +637,12 @@ main(int argc, char **argv) + finish(-1); + } + } +-#endif /* USE_LINUX */ + + if (ls.pcap == NULL) { + fprintf(stderr, "%s: no valid interfaces.\n", pname); + finish(-1); + } ++#endif /* USE_LINUX */ + + /* + * Now lose super-user permission, since we +diff --git a/pktfilter.c b/pktfilter.c +index 2005012..eafcc63 100644 +--- a/pktfilter.c ++++ b/pktfilter.c +@@ -196,6 +196,7 @@ pkt_filter_fddi(char *cp, u_int length, struct timeval *tstamp) + pkt_dispatch(packet, bdcst, etype, tstamp); + } + ++#ifdef LINUX + /* + * A DLT_LINUX_SLL fake link-layer header. + */ +@@ -244,6 +245,7 @@ pkt_filter_sll(char *cp, u_int length, struct timeval *tstamp) + */ + pkt_dispatch(packet, bdcst, sheader.sll_protocol, tstamp); + } ++#endif + + /* + * pkt_dispatch - count a packet, and pass it off to the appropriate filter. +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Nov 10 16:18:58 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 10 Nov 2009 15:18:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7208] csw/mgar/pkg/nfswatch/trunk/Makefile Message-ID: Revision: 7208 http://gar.svn.sourceforge.net/gar/?rev=7208&view=rev Author: dmichelsen Date: 2009-11-10 15:18:57 +0000 (Tue, 10 Nov 2009) Log Message: ----------- nfswatch: Fix install locations Modified Paths: -------------- csw/mgar/pkg/nfswatch/trunk/Makefile Modified: csw/mgar/pkg/nfswatch/trunk/Makefile =================================================================== --- csw/mgar/pkg/nfswatch/trunk/Makefile 2009-11-10 15:11:27 UTC (rev 7207) +++ csw/mgar/pkg/nfswatch/trunk/Makefile 2009-11-10 15:18:57 UTC (rev 7208) @@ -29,9 +29,10 @@ TEST_SCRIPTS = -INSTALL_OVERRIDE_VARS = INSTALL BINDIR MANDIR +INSTALL_OVERRIDE_VARS = INSTALL BINDIR MANDIR MANSUF INSTALL_OVERRIDE_VAR_INSTALL = /usr/ucb/install -INSTALL_OVERRIDE_VAR_BINDIR = $(bindir) +INSTALL_OVERRIDE_VAR_BINDIR = $(sbindir) INSTALL_OVERRIDE_VAR_MANDIR = $(mandir)/man8 +INSTALL_OVERRIDE_VAR_MANSUF = 8 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 Tue Nov 10 17:13:10 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 10 Nov 2009 16:13:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7209] csw/mgar/gar/v2-migrateconf Message-ID: Revision: 7209 http://gar.svn.sourceforge.net/gar/?rev=7209&view=rev Author: dmichelsen Date: 2009-11-10 16:13:05 +0000 (Tue, 10 Nov 2009) Log Message: ----------- mGAR v2-migrateconf: Add GAR support Modified Paths: -------------- csw/mgar/gar/v2-migrateconf/gar.mk csw/mgar/gar/v2-migrateconf/gar.pkg.mk Modified: csw/mgar/gar/v2-migrateconf/gar.mk =================================================================== --- csw/mgar/gar/v2-migrateconf/gar.mk 2009-11-10 15:18:57 UTC (rev 7208) +++ csw/mgar/gar/v2-migrateconf/gar.mk 2009-11-10 16:13:05 UTC (rev 7209) @@ -46,14 +46,16 @@ DISTNAME ?= $(GARNAME)-$(GARVERSION) DYNSCRIPTS = $(foreach PKG,$(SPKG_SPECS),$(foreach SCR,$(ADMSCRIPTS),$(if $(value $(PKG)_$(SCR)), $(PKG).$(SCR)))) -_NOCHECKSUM += $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))) +_NOCHECKSUM += $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))) $(_EXTRA_GAR_NOCHECKSUM) +DISTFILES += $(_EXTRA_GAR_DISTFILES) + # Allow overriding of only specific components of ALLFILES by clearing e. g. 'ALLFILES_DYNSCRIPTS = ' ALLFILES_DISTFILES ?= $(DISTFILES) ALLFILES_PATCHFILES ?= $(PATCHFILES) $(foreach M,$(MODULATIONS),$(PATCHFILES_$M)) ALLFILES_DYNSCRIPTS ?= $(DYNSCRIPTS) ALLFILES_GIT_REPOS ?= $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))) -ALLFILES ?= $(sort $(ALLFILES_DISTFILES) $(ALLFILES_PATCHFILES) $(ALLFILES_DYNSCRIPTS) $(ALLFILES_GIT_REPOS) $(EXTRA_ALLFILES)) +ALLFILES ?= $(sort $(ALLFILES_DISTFILES) $(ALLFILES_PATCHFILES) $(ALLFILES_DYNSCRIPTS) $(ALLFILES_GIT_REPOS) $(EXTRA_ALLFILES) $(_EXTRA_GAR_ALLFILES)) ifeq ($(MAKE_INSTALL_DIRS),1) INSTALL_DIRS = $(addprefix $(DESTDIR),$(prefix) $(exec_prefix) $(bindir) $(sbindir) $(libexecdir) $(datadir) $(sysconfdir) $(sharedstatedir) $(localstatedir) $(libdir) $(infodir) $(lispdir) $(includedir) $(mandir) $(foreach NUM,1 2 3 4 5 6 7 8, $(mandir)/man$(NUM)) $(sourcedir)) @@ -704,7 +706,7 @@ # The basic merge merges the compiles for all ISAs on the current architecture -merge: checksum pre-merge merge-do merge-license $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) post-merge +merge: checksum pre-merge merge-do merge-license merge-migrateconf $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) post-merge @$(DONADA) merge-do: $(if $(PARALLELMODULATIONS),merge-parallel,merge-sequential) Modified: csw/mgar/gar/v2-migrateconf/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-migrateconf/gar.pkg.mk 2009-11-10 15:18:57 UTC (rev 7208) +++ csw/mgar/gar/v2-migrateconf/gar.pkg.mk 2009-11-10 16:13:05 UTC (rev 7209) @@ -159,6 +159,24 @@ SPKG_PKGFILE ?= %{bitname}-%{SPKG_VERSION},%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-%{arch}-$(or $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),CSW).pkg +# Migration default +ifneq ($(MIGRATE_FILES),) +MIGRATECONF ?= /etc/opt/csw/pkg/$(call catalogname,$(firstword $(SPKG_SPECS)))/cswmigrateconf +_EXTRA_GAR_DISTFILES += cswmigrateconf +_EXTRA_GAR_NOCHECKSUM += cswmigrateconf + +$(DOWNLOADDIR)/cswmigrateconf: + @echo "[ Generating cswmigrateconf ]" + @(echo "MIGRATE_FILES=\"$(MIGRATE_FILES)\"";\ + $(foreach F,$(MIGRATE_FILES),\ + $(if $(MIGRATE_SOURCE_DIR_$F),echo "SOURCE_DIR_$(subst .,_,$F)=\"$(MIGRATE_SOURCE_DIR_$F)\"";)\ + $(if $(MIGRATE_DEST_DIR_$F),echo "DEST_DIR_$(subst .,_,$F)=\"$(MIGRATE_DEST_DIR_$F)\"";)\ + )\ + ) >$@ + + +endif + # Handle cswclassutils # append $2 to SPKG_CLASSES if $1 is non-null define _spkg_cond_add @@ -374,7 +392,7 @@ $(foreach S,$(filter-out $*,$(SPKG_SPECS)),-X $(call licensedir,$S)/license) \ $(foreach FILE,$(_PKGFILES_INCLUDE),-i '$(FILE)') \ $(if $(_PKGFILES_INCLUDE),-x '.*',$(foreach FILE,$(_PKGFILES_EXCLUDE),-x '$(FILE)')) \ - $(foreach IE,$(abspath $(ISAEXEC_FILES_$*) $(ISAEXEC_FILES)), \ + $(foreach IE,$(abspath $(ISAEXEC_FILES_$*) $(ISAEXEC_FILES)), \ -e '$(IE)=$(dir $(IE))$(ISA_DEFAULT)/$(notdir $(IE))' \ ) \ <$(PROTOTYPE); \ @@ -563,6 +581,12 @@ @rm -f $(COOKIEDIR)/merge-license $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-license-$(SPEC)) @$(DONADA) +merge-migrateconf: $(WORKDIR) + $(if $(MIGRATECONF),\ + ginstall -d $(PKGROOT)$(dir $(MIGRATECONF));\ + ginstall $(DOWNLOADDIR)/cswmigrateconf $(PKGROOT)$(MIGRATECONF)\ + ) + @$(MAKECOOKIE) merge-src: _SRCDIR=$(PKGROOT)$(sourcedir)/$(call catalogname,$(SRCPACKAGE_BASE)) merge-src: fetch 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 Nov 10 17:17:00 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 10 Nov 2009 16:17:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7210] csw/mgar/gar/v2-migrateconf/gar.pkg.mk Message-ID: Revision: 7210 http://gar.svn.sourceforge.net/gar/?rev=7210&view=rev Author: dmichelsen Date: 2009-11-10 16:17:00 +0000 (Tue, 10 Nov 2009) Log Message: ----------- mGAR v2-migrateconf: First do migrateconf, than sampleconf Modified Paths: -------------- csw/mgar/gar/v2-migrateconf/gar.pkg.mk Modified: csw/mgar/gar/v2-migrateconf/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-migrateconf/gar.pkg.mk 2009-11-10 16:13:05 UTC (rev 7209) +++ csw/mgar/gar/v2-migrateconf/gar.pkg.mk 2009-11-10 16:17:00 UTC (rev 7210) @@ -187,9 +187,9 @@ # always be the last two added. The reason for this is that # you need to ensure any binaries and config files are already on disk # and able to be consumed by a service that might be started. +SPKG_CLASSES := $(call _spkg_cond_add,MIGRATECONF,cswmigrateconf) SPKG_CLASSES := $(call _spkg_cond_add,SAMPLECONF,cswcpsampleconf) SPKG_CLASSES := $(call _spkg_cond_add,PRESERVECONF,cswpreserveconf) -SPKG_CLASSES := $(call _spkg_cond_add,MIGRATECONF,cswmigrateconf) SPKG_CLASSES := $(call _spkg_cond_add,ETCSERVICES,cswetcservices) SPKG_CLASSES := $(call _spkg_cond_add,USERGROUP,cswusergroup) SPKG_CLASSES := $(call _spkg_cond_add,PYCOMPILE,cswpycompile) @@ -199,9 +199,9 @@ # - set class for all config files ifneq ($(SAMPLECONF)$(PRESERVECONF)$(MIGRATECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),) _CSWCLASS_FILTER = | perl -ane '\ + $(foreach FILE,$(MIGRATECONF),$$F[1] = "cswmigrateconf" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(SAMPLECONF:%\.CSW=%),$$F[1] = "cswcpsampleconf" if ( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ $(foreach FILE,$(PRESERVECONF:%\.CSW=%),$$F[1] = "cswpreserveconf" if( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ - $(foreach FILE,$(MIGRATECONF),$$F[1] = "cswmigrateconf" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(ETCSERVICES),$$F[1] = "cswetcservices" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(INETDCONF),$$F[1] = "cswinetd" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(INITSMF),$$F[1] = "cswinitsmf" if( $$F[2] =~ m(^$(FILE)$$) );)\ 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 Nov 10 17:17:46 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 10 Nov 2009 16:17:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7211] csw/mgar/pkg/esound/trunk/Makefile Message-ID: Revision: 7211 http://gar.svn.sourceforge.net/gar/?rev=7211&view=rev Author: dmichelsen Date: 2009-11-10 16:17:46 +0000 (Tue, 10 Nov 2009) Log Message: ----------- esound: Use cswmigrateconf Modified Paths: -------------- csw/mgar/pkg/esound/trunk/Makefile Modified: csw/mgar/pkg/esound/trunk/Makefile =================================================================== --- csw/mgar/pkg/esound/trunk/Makefile 2009-11-10 16:17:00 UTC (rev 7210) +++ csw/mgar/pkg/esound/trunk/Makefile 2009-11-10 16:17:46 UTC (rev 7211) @@ -23,9 +23,17 @@ # - Document the location in esd(1) # - Skip 64 binaries +sysconfdir = /etc/opt/csw + +PRESERVECONF = $(sysconfdir)/esd.conf +MIGRATE_FILES = esd.conf + BUILD64 = 1 +NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check +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 Tue Nov 10 17:38:34 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 10 Nov 2009 16:38:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[7212] csw/mgar/gar/v2 Message-ID: Revision: 7212 http://gar.svn.sourceforge.net/gar/?rev=7212&view=rev Author: dmichelsen Date: 2009-11-10 16:38:34 +0000 (Tue, 10 Nov 2009) Log Message: ----------- mGAR v2: Merge in cswmigrateconf support Modified Paths: -------------- csw/mgar/gar/v2/gar.mk csw/mgar/gar/v2/gar.pkg.mk Property Changed: ---------------- csw/mgar/gar/v2/ Property changes on: csw/mgar/gar/v2 ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-skayser:6087-6132 + /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-skayser:6087-6132 Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-11-10 16:17:46 UTC (rev 7211) +++ csw/mgar/gar/v2/gar.mk 2009-11-10 16:38:34 UTC (rev 7212) @@ -46,14 +46,16 @@ DISTNAME ?= $(GARNAME)-$(GARVERSION) DYNSCRIPTS = $(foreach PKG,$(SPKG_SPECS),$(foreach SCR,$(ADMSCRIPTS),$(if $(value $(PKG)_$(SCR)), $(PKG).$(SCR)))) -_NOCHECKSUM += $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))) +_NOCHECKSUM += $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))) $(_EXTRA_GAR_NOCHECKSUM) +DISTFILES += $(_EXTRA_GAR_DISTFILES) + # Allow overriding of only specific components of ALLFILES by clearing e. g. 'ALLFILES_DYNSCRIPTS = ' ALLFILES_DISTFILES ?= $(DISTFILES) ALLFILES_PATCHFILES ?= $(PATCHFILES) $(foreach M,$(MODULATIONS),$(PATCHFILES_$M)) ALLFILES_DYNSCRIPTS ?= $(DYNSCRIPTS) ALLFILES_GIT_REPOS ?= $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))) -ALLFILES ?= $(sort $(ALLFILES_DISTFILES) $(ALLFILES_PATCHFILES) $(ALLFILES_DYNSCRIPTS) $(ALLFILES_GIT_REPOS) $(EXTRA_ALLFILES)) +ALLFILES ?= $(sort $(ALLFILES_DISTFILES) $(ALLFILES_PATCHFILES) $(ALLFILES_DYNSCRIPTS) $(ALLFILES_GIT_REPOS) $(EXTRA_ALLFILES) $(_EXTRA_GAR_ALLFILES)) ifeq ($(MAKE_INSTALL_DIRS),1) INSTALL_DIRS = $(addprefix $(DESTDIR),$(prefix) $(exec_prefix) $(bindir) $(sbindir) $(libexecdir) $(datadir) $(sysconfdir) $(sharedstatedir) $(localstatedir) $(libdir) $(infodir) $(lispdir) $(includedir) $(mandir) $(foreach NUM,1 2 3 4 5 6 7 8, $(mandir)/man$(NUM)) $(sourcedir)) @@ -708,7 +710,7 @@ # The basic merge merges the compiles for all ISAs on the current architecture -merge: checksum pre-merge merge-do merge-license $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) post-merge +merge: checksum pre-merge merge-do merge-license merge-migrateconf $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) post-merge @$(DONADA) merge-do: $(if $(PARALLELMODULATIONS),merge-parallel,merge-sequential) Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-11-10 16:17:46 UTC (rev 7211) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-11-10 16:38:34 UTC (rev 7212) @@ -159,6 +159,24 @@ SPKG_PKGFILE ?= %{bitname}-%{SPKG_VERSION},%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-%{arch}-$(or $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),CSW).pkg +# Migration default +ifneq ($(MIGRATE_FILES),) +MIGRATECONF ?= /etc/opt/csw/pkg/$(call catalogname,$(firstword $(SPKG_SPECS)))/cswmigrateconf +_EXTRA_GAR_DISTFILES += cswmigrateconf +_EXTRA_GAR_NOCHECKSUM += cswmigrateconf + +$(DOWNLOADDIR)/cswmigrateconf: + @echo "[ Generating cswmigrateconf ]" + @(echo "MIGRATE_FILES=\"$(MIGRATE_FILES)\"";\ + $(foreach F,$(MIGRATE_FILES),\ + $(if $(MIGRATE_SOURCE_DIR_$F),echo "SOURCE_DIR_$(subst .,_,$F)=\"$(MIGRATE_SOURCE_DIR_$F)\"";)\ + $(if $(MIGRATE_DEST_DIR_$F),echo "DEST_DIR_$(subst .,_,$F)=\"$(MIGRATE_DEST_DIR_$F)\"";)\ + )\ + ) >$@ + + +endif + # Handle cswclassutils # append $2 to SPKG_CLASSES if $1 is non-null define _spkg_cond_add @@ -169,6 +187,7 @@ # always be the last two added. The reason for this is that # you need to ensure any binaries and config files are already on disk # and able to be consumed by a service that might be started. +SPKG_CLASSES := $(call _spkg_cond_add,MIGRATECONF,cswmigrateconf) SPKG_CLASSES := $(call _spkg_cond_add,SAMPLECONF,cswcpsampleconf) SPKG_CLASSES := $(call _spkg_cond_add,PRESERVECONF,cswpreserveconf) SPKG_CLASSES := $(call _spkg_cond_add,ETCSERVICES,cswetcservices) @@ -178,8 +197,9 @@ SPKG_CLASSES := $(call _spkg_cond_add,INITSMF,cswinitsmf) # - set class for all config files -ifneq ($(SAMPLECONF)$(PRESERVECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),) +ifneq ($(SAMPLECONF)$(PRESERVECONF)$(MIGRATECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),) _CSWCLASS_FILTER = | perl -ane '\ + $(foreach FILE,$(MIGRATECONF),$$F[1] = "cswmigrateconf" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(SAMPLECONF:%\.CSW=%),$$F[1] = "cswcpsampleconf" if ( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ $(foreach FILE,$(PRESERVECONF:%\.CSW=%),$$F[1] = "cswpreserveconf" if( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ $(foreach FILE,$(ETCSERVICES),$$F[1] = "cswetcservices" if( $$F[2] =~ m(^$(FILE)$$) );)\ @@ -561,6 +581,12 @@ @rm -f $(COOKIEDIR)/merge-license $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-license-$(SPEC)) @$(DONADA) +merge-migrateconf: $(WORKDIR) + $(if $(MIGRATECONF),\ + ginstall -d $(PKGROOT)$(dir $(MIGRATECONF));\ + ginstall $(DOWNLOADDIR)/cswmigrateconf $(PKGROOT)$(MIGRATECONF)\ + ) + @$(MAKECOOKIE) merge-src: _SRCDIR=$(PKGROOT)$(sourcedir)/$(call catalogname,$(SRCPACKAGE_BASE)) merge-src: fetch 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 Nov 10 18:27:10 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 10 Nov 2009 17:27:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7213] csw/mgar/pkg/cfengine/trunk Message-ID: Revision: 7213 http://gar.svn.sourceforge.net/gar/?rev=7213&view=rev Author: bonivart Date: 2009-11-10 17:27:10 +0000 (Tue, 10 Nov 2009) Log Message: ----------- cfengine: update to 2.2.10, initial commit Modified Paths: -------------- csw/mgar/pkg/cfengine/trunk/Makefile csw/mgar/pkg/cfengine/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cfengine/trunk/files/CSWcfengine.gspec Property Changed: ---------------- csw/mgar/pkg/cfengine/trunk/ Property changes on: csw/mgar/pkg/cfengine/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cfengine/trunk/Makefile =================================================================== --- csw/mgar/pkg/cfengine/trunk/Makefile 2009-11-10 16:38:34 UTC (rev 7212) +++ csw/mgar/pkg/cfengine/trunk/Makefile 2009-11-10 17:27:10 UTC (rev 7213) @@ -1,5 +1,5 @@ GARNAME = cfengine -GARVERSION = 2.1.20 +GARVERSION = 2.2.10 CATEGORIES = utils DESCRIPTION = A tool for administering Networks of Diverse Machines @@ -13,21 +13,21 @@ scripts. You can also use it as a netwide front-end for `cron'. endef -MASTER_SITES = ftp://ftp.iu.hio.no/pub/$(GARNAME)/ +MASTER_SITES = http://www.cfengine.org/tarballs/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWcfengine,) +REQUIRED_PKGS = CSWosslrt CSWbdb3 + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# Requires GNU texi -PATCHFILES = nodoc.diff - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-DCE -CONFIGURE_ARGS += --with-berkeleydb=$(tool_prefix) -CONFIGURE_ARGS += --with-openssl=$(tool_prefix) +CONFIGURE_ARGS += --with-docs +CONFIGURE_ARGS += --with-berkeleydb=/opt/csw/bdb33 +GARCOMPILER = GCC3 + TEST_TARGET = check include gar/category.mk Modified: csw/mgar/pkg/cfengine/trunk/checksums =================================================================== --- csw/mgar/pkg/cfengine/trunk/checksums 2009-11-10 16:38:34 UTC (rev 7212) +++ csw/mgar/pkg/cfengine/trunk/checksums 2009-11-10 17:27:10 UTC (rev 7213) @@ -1,3 +1 @@ -2510349fef9ccc47d80f133d4a35322e download/cfengine-2.1.20.tar.gz -c96af1ce2a565fd3c212c510e96ea8cf download/CSWcfengine.gspec -35a189bc99c288ed21fbe0ea793f26a7 download/nodoc.diff +3b90ff8bf2ec941cd33cfb65f5012f16 cfengine-2.2.10.tar.gz Deleted: csw/mgar/pkg/cfengine/trunk/files/CSWcfengine.gspec =================================================================== --- csw/mgar/pkg/cfengine/trunk/files/CSWcfengine.gspec 2009-11-10 16:38:34 UTC (rev 7212) +++ csw/mgar/pkg/cfengine/trunk/files/CSWcfengine.gspec 2009-11-10 17:27:10 UTC (rev 7213) @@ -1,4 +0,0 @@ -%var bitname cfengine -%var pkgname CSWcfengine -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYRIGHT 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 Nov 11 09:44:48 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 11 Nov 2009 08:44:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[7214] csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile Message-ID: Revision: 7214 http://gar.svn.sourceforge.net/gar/?rev=7214&view=rev Author: wahwah Date: 2009-11-11 08:44:48 +0000 (Wed, 11 Nov 2009) Log Message: ----------- mysql-5.1.x: Building a debugging version by default. Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile 2009-11-10 17:27:10 UTC (rev 7213) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile 2009-11-11 08:44:48 UTC (rev 7214) @@ -14,6 +14,8 @@ (Structured Query Language) database server. endef +GARFLAVOR = DBG + # Change prefix to /opt/csw/mysql5 prefix = /opt/csw/mysql5 sysconfdir = /etc/opt/csw/mysql5 @@ -135,6 +137,9 @@ CONFIGURE_ARGS += --with-zlib-dir=/opt/csw CONFIGURE_ARGS += --with-ssl=/opt/csw CONFIGURE_ARGS += --with-plugins=max-no-ndb +CONFIGURE_ARGS += --with-comment +CONFIGURE_ARGS_DBG = --with-debug +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) # TODO: Make the tests pass. They don't at the moment. # TEST_SCRIPTS = 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 Nov 11 10:51:59 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 11 Nov 2009 09:51:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[7215] csw/mgar/pkg/cfengine/trunk/Makefile Message-ID: Revision: 7215 http://gar.svn.sourceforge.net/gar/?rev=7215&view=rev Author: bonivart Date: 2009-11-11 09:51:59 +0000 (Wed, 11 Nov 2009) Log Message: ----------- cfengine: split into main and doc pkg, half size Modified Paths: -------------- csw/mgar/pkg/cfengine/trunk/Makefile Modified: csw/mgar/pkg/cfengine/trunk/Makefile =================================================================== --- csw/mgar/pkg/cfengine/trunk/Makefile 2009-11-11 08:44:48 UTC (rev 7214) +++ csw/mgar/pkg/cfengine/trunk/Makefile 2009-11-11 09:51:59 UTC (rev 7215) @@ -16,8 +16,18 @@ MASTER_SITES = http://www.cfengine.org/tarballs/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -REQUIRED_PKGS = CSWosslrt CSWbdb3 +PACKAGES = CSWcfengine CSWcfenginedoc +PKGFILES_CSWcfenginedoc = .*/share/info/.* +PKGFILES_CSWcfenginedoc += .*/share/cfengine/.* +CATALOGNAME_CSWcfengine = cfengine +SPKG_DESC_CSWcfengine = A tool for administering Networks of Diverse Machines +REQUIRED_PKGS_CSWcfengine = CSWosslrt CSWbdb3 + +CATALOGNAME_CSWcfenginedoc = cfengine_doc +SPKG_DESC_CSWcfenginedoc = Cfengine documentation +ARCHALL_CSWcfenginedoc = 1 + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\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 Wed Nov 11 11:22:47 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 11 Nov 2009 10:22:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[7216] csw/mgar/pkg/tightvnc/trunk Message-ID: Revision: 7216 http://gar.svn.sourceforge.net/gar/?rev=7216&view=rev Author: wahwah Date: 2009-11-11 10:22:47 +0000 (Wed, 11 Nov 2009) Log Message: ----------- tightvnc: Adding MIGRATE_FILES and INITSMF Modified Paths: -------------- csw/mgar/pkg/tightvnc/trunk/Makefile csw/mgar/pkg/tightvnc/trunk/checksums Added Paths: ----------- csw/mgar/pkg/tightvnc/trunk/files/cswvncserver Modified: csw/mgar/pkg/tightvnc/trunk/Makefile =================================================================== --- csw/mgar/pkg/tightvnc/trunk/Makefile 2009-11-11 09:51:59 UTC (rev 7215) +++ csw/mgar/pkg/tightvnc/trunk/Makefile 2009-11-11 10:22:47 UTC (rev 7216) @@ -14,6 +14,7 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION)_unixsrc.tar.bz2 DISTFILES += vncservers +DISTFILES += cswvncserver PACKAGES = CSWvncs CSWvncv CATALOGNAME_CSWvncs = vncserver CATALOGNAME_CSWvncv = vncviewer @@ -27,7 +28,17 @@ SPKG_DESC_CSWvncs = TightVNC server SPKG_DESC_CSWvncv = TightVNC viewer -REQUIRED_PKGS = CSWjpeg CSWtcpwrap CSWzlib +MIGRATE_FILES_CSWvncs = vncservers +INITSMF = /etc/opt/csw/init.d/cswvncserver + +REQUIRED_PKGS = CSWbash +REQUIRED_PKGS += CSWjpeg +REQUIRED_PKGS += CSWlibice +REQUIRED_PKGS += CSWlibsm +REQUIRED_PKGS += CSWlibxext +REQUIRED_PKGS += CSWtcpwrap +REQUIRED_PKGS += CSWzlib + PREREQUISITE_PKGS = $(REQUIRED_PKGS) sysconfdir = /etc/opt/csw @@ -87,3 +98,5 @@ #install -m755 vncserver.init %{buildroot}/etc/rc.d/init.d/vncserver ginstall -d $(DESTDIR)$(sysconfdir)/vncservers ginstall -m 644 $(WORKDIR)/vncservers $(DESTDIR)$(sysconfdir)/vncservers + ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d + ginstall -m 644 $(FILEDIR)/cswvncserver $(DESTDIR)/etc/opt/csw/init.d Modified: csw/mgar/pkg/tightvnc/trunk/checksums =================================================================== --- csw/mgar/pkg/tightvnc/trunk/checksums 2009-11-11 09:51:59 UTC (rev 7215) +++ csw/mgar/pkg/tightvnc/trunk/checksums 2009-11-11 10:22:47 UTC (rev 7216) @@ -1,6 +1,7 @@ -38a4eaded4a6418f5547fa57cefb97f9 download/0001-Force-the-use-of-libwrap.patch -76166d097bf2e70627cb6c87d312bca5 download/0001-Sun-compiler-in-sun.cf.patch -1264014c1ce47a119a724f17a6e0a768 download/0003-GNU-make-by-default.patch -c5e9c3e4017caa65d14a0b98858043b9 download/0003-libdix.a-after-libos.a.patch -397b35faad32d5246b6d44b142f8304f download/tightvnc-1.3.10_unixsrc.tar.bz2 -56c09be17c17184e96193c13246fd649 download/vncservers +38a4eaded4a6418f5547fa57cefb97f9 0001-Force-the-use-of-libwrap.patch +76166d097bf2e70627cb6c87d312bca5 0001-Sun-compiler-in-sun.cf.patch +1264014c1ce47a119a724f17a6e0a768 0003-GNU-make-by-default.patch +c5e9c3e4017caa65d14a0b98858043b9 0003-libdix.a-after-libos.a.patch +824d150d2462568531788b04f239d573 cswvncserver +397b35faad32d5246b6d44b142f8304f tightvnc-1.3.10_unixsrc.tar.bz2 +56c09be17c17184e96193c13246fd649 vncservers Added: csw/mgar/pkg/tightvnc/trunk/files/cswvncserver =================================================================== --- csw/mgar/pkg/tightvnc/trunk/files/cswvncserver (rev 0) +++ csw/mgar/pkg/tightvnc/trunk/files/cswvncserver 2009-11-11 10:22:47 UTC (rev 7216) @@ -0,0 +1,63 @@ +#!/opt/csw/bin/bash +# +# $Id$ +# +# description: Starts and stops vncserver. \ +# used to provide remote X administration services. + +VNCSERVERS="" +ARGS="" +if [ -f /etc/opt/csw/vncservers ] ; then + . /etc/opt/csw/vncservers +fi + +prog="VNC server" + +start() { + echo "Starting $prog: " + ulimit -c 0 >/dev/null 2>&1 + RETVAL=0 + for display in ${VNCSERVERS} + do + echo "${display} " + su ${display##*:} -c "cd ~ && [ -f .vnc/passwd ] && vncserver ${ARGS} :${display%%:*}" + RETVAL=$? + [ "$RETVAL" -ne 0 ] && break + done + [ "$RETVAL" -eq 0 ] && touch /var/spool/locks/vncserver +} + +stop() { + echo "Shutting down $prog: " + for display in ${VNCSERVERS} + do + echo "${display} " + su ${display##*:} -c "vncserver -kill :${display%%:*} >/dev/null 2>&1" + RETVAL=$? + done + [ "$RETVAL" -eq 0 ] && rm -f /var/spool/locks/vncserver +} + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|reload) + stop + start + ;; + condrestart) + if [ -f /var/spool/locks/vncserver ]; then + stop + start + fi + ;; + *) + echo $"Usage: $0 {start|stop|restart|condrestart}" + exit 1 +esac + Property changes on: csw/mgar/pkg/tightvnc/trunk/files/cswvncserver ___________________________________________________________________ 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 Nov 11 11:23:18 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 11 Nov 2009 10:23:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7217] csw/mgar/pkg/tightvnc/trunk/checksums Message-ID: Revision: 7217 http://gar.svn.sourceforge.net/gar/?rev=7217&view=rev Author: wahwah Date: 2009-11-11 10:23:18 +0000 (Wed, 11 Nov 2009) Log Message: ----------- tightvnc: makesum for files with Id tags Modified Paths: -------------- csw/mgar/pkg/tightvnc/trunk/checksums Modified: csw/mgar/pkg/tightvnc/trunk/checksums =================================================================== --- csw/mgar/pkg/tightvnc/trunk/checksums 2009-11-11 10:22:47 UTC (rev 7216) +++ csw/mgar/pkg/tightvnc/trunk/checksums 2009-11-11 10:23:18 UTC (rev 7217) @@ -2,6 +2,6 @@ 76166d097bf2e70627cb6c87d312bca5 0001-Sun-compiler-in-sun.cf.patch 1264014c1ce47a119a724f17a6e0a768 0003-GNU-make-by-default.patch c5e9c3e4017caa65d14a0b98858043b9 0003-libdix.a-after-libos.a.patch -824d150d2462568531788b04f239d573 cswvncserver +000dc2f69bed5ab7f7ca86d5730e9c6e cswvncserver 397b35faad32d5246b6d44b142f8304f tightvnc-1.3.10_unixsrc.tar.bz2 56c09be17c17184e96193c13246fd649 vncservers 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 Nov 11 11:47:50 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 11 Nov 2009 10:47:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[7218] csw/mgar/pkg/syslog_ng/trunk/files Message-ID: Revision: 7218 http://gar.svn.sourceforge.net/gar/?rev=7218&view=rev Author: wahwah Date: 2009-11-11 10:47:49 +0000 (Wed, 11 Nov 2009) Log Message: ----------- syslog-ng: A bugfix for the preinstall script, http://www.opencsw.org/bugtrack/view.php?id=4005 Modified Paths: -------------- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.postremove csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall Property Changed: ---------------- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.postremove csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall Modified: csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.postremove =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.postremove 2009-11-11 10:23:18 UTC (rev 7217) +++ csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.postremove 2009-11-11 10:47:49 UTC (rev 7218) @@ -1,4 +1,7 @@ #!/bin/sh +# +# $Id$ +# if [ -x /usr/sbin/svcadm ]; then echo "Enabling svc:/system/system-log:default" Property changes on: csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.postremove ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall 2009-11-11 10:23:18 UTC (rev 7217) +++ csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall 2009-11-11 10:47:49 UTC (rev 7218) @@ -1,4 +1,7 @@ #!/bin/sh +# +# $Id$ +# if [ -x /usr/sbin/svcadm ]; then echo "Disabling svc:/system/system-log:default" @@ -9,8 +12,10 @@ # first. The -f option is for the rm command not to complain if it can't remove # the file. for f in /opt/csw/var/syslog-ng.{ctl,persist}; do - if [ -r "${f}" ]; + if [ -r "${f}" ]; then echo "Removing an obsolete file: '${f}'." rm -f "${f}" fi done + +exit 0 Property changes on: csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.preinstall ___________________________________________________________________ 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 Nov 11 11:48:58 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 11 Nov 2009 10:48:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7219] csw/mgar/pkg/tightvnc/trunk/files/cswvncserver Message-ID: Revision: 7219 http://gar.svn.sourceforge.net/gar/?rev=7219&view=rev Author: wahwah Date: 2009-11-11 10:48:57 +0000 (Wed, 11 Nov 2009) Log Message: ----------- tightvnc: Adjusting the vncservers path Modified Paths: -------------- csw/mgar/pkg/tightvnc/trunk/files/cswvncserver Modified: csw/mgar/pkg/tightvnc/trunk/files/cswvncserver =================================================================== --- csw/mgar/pkg/tightvnc/trunk/files/cswvncserver 2009-11-11 10:47:49 UTC (rev 7218) +++ csw/mgar/pkg/tightvnc/trunk/files/cswvncserver 2009-11-11 10:48:57 UTC (rev 7219) @@ -7,8 +7,9 @@ VNCSERVERS="" ARGS="" -if [ -f /etc/opt/csw/vncservers ] ; then - . /etc/opt/csw/vncservers +VNCSERVERS_CONF="/etc/opt/csw/vncservers/vncservers" +if [ -f "${VNCSERVERS_CONF}" ] ; then + . "${VNCSERVERS_CONF}" fi prog="VNC server" 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 Nov 11 11:51:32 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 11 Nov 2009 10:51:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7221] csw/mgar/pkg/syslog_ng/trunk/checksums Message-ID: Revision: 7221 http://gar.svn.sourceforge.net/gar/?rev=7221&view=rev Author: wahwah Date: 2009-11-11 10:51:32 +0000 (Wed, 11 Nov 2009) Log Message: ----------- syslog_ng: setting the checksum for files with Id tags Modified Paths: -------------- csw/mgar/pkg/syslog_ng/trunk/checksums Modified: csw/mgar/pkg/syslog_ng/trunk/checksums =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/checksums 2009-11-11 10:49:46 UTC (rev 7220) +++ csw/mgar/pkg/syslog_ng/trunk/checksums 2009-11-11 10:51:32 UTC (rev 7221) @@ -1,5 +1,5 @@ -91e692a52c4c9668e3bcf8b8816425c3 CSWsyslogng.postremove -c3da292b828f03158c7227f5b35feb12 CSWsyslogng.preinstall +ab950f80af5ca165ef3f5ba2df04f9be CSWsyslogng.postremove +d58b011085f44206053562078c012857 CSWsyslogng.preinstall fcd5effdaa96da8abf9788bc5745bda3 cswsyslog_ng 69bad95775b98d26e52db8a8292e2790 syslog-ng.conf.CSW 86c39779261545d2289e9c309e262b8d syslog-ng_3.0.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 Wed Nov 11 11:49:46 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 11 Nov 2009 10:49:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7220] csw/mgar/pkg/tightvnc/trunk/checksums Message-ID: Revision: 7220 http://gar.svn.sourceforge.net/gar/?rev=7220&view=rev Author: wahwah Date: 2009-11-11 10:49:46 +0000 (Wed, 11 Nov 2009) Log Message: ----------- tightvnc: Setting the checksum for files with the Id tag Modified Paths: -------------- csw/mgar/pkg/tightvnc/trunk/checksums Modified: csw/mgar/pkg/tightvnc/trunk/checksums =================================================================== --- csw/mgar/pkg/tightvnc/trunk/checksums 2009-11-11 10:48:57 UTC (rev 7219) +++ csw/mgar/pkg/tightvnc/trunk/checksums 2009-11-11 10:49:46 UTC (rev 7220) @@ -2,6 +2,6 @@ 76166d097bf2e70627cb6c87d312bca5 0001-Sun-compiler-in-sun.cf.patch 1264014c1ce47a119a724f17a6e0a768 0003-GNU-make-by-default.patch c5e9c3e4017caa65d14a0b98858043b9 0003-libdix.a-after-libos.a.patch -000dc2f69bed5ab7f7ca86d5730e9c6e cswvncserver +20c9ead98ffb7b739fdb63429c3bac85 cswvncserver 397b35faad32d5246b6d44b142f8304f tightvnc-1.3.10_unixsrc.tar.bz2 56c09be17c17184e96193c13246fd649 vncservers 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 Nov 11 12:02:28 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 11 Nov 2009 11:02:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[7222] csw/mgar/pkg/syslog_ng/trunk/Makefile Message-ID: Revision: 7222 http://gar.svn.sourceforge.net/gar/?rev=7222&view=rev Author: wahwah Date: 2009-11-11 11:02:28 +0000 (Wed, 11 Nov 2009) Log Message: ----------- syslog_ng: Removing the explicit dependency on CSWclassutils to avoid double depends Modified Paths: -------------- csw/mgar/pkg/syslog_ng/trunk/Makefile Modified: csw/mgar/pkg/syslog_ng/trunk/Makefile =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/Makefile 2009-11-11 10:51:32 UTC (rev 7221) +++ csw/mgar/pkg/syslog_ng/trunk/Makefile 2009-11-11 11:02:28 UTC (rev 7222) @@ -38,7 +38,6 @@ REQUIRED_PKGS += CSWggettextrt REQUIRED_PKGS += CSWglib2 REQUIRED_PKGS += CSWtcpwrap -REQUIRED_PKGS += CSWcswclassutils PREREQUISITE_PKGS = $(REQUIRED_PKGS) PREREQUISITE_PKGS += CSWggettext 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 Nov 11 13:31:00 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 11 Nov 2009 12:31:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7223] csw/mgar/pkg/tightvnc/trunk/Makefile Message-ID: Revision: 7223 http://gar.svn.sourceforge.net/gar/?rev=7223&view=rev Author: dmichelsen Date: 2009-11-11 12:31:00 +0000 (Wed, 11 Nov 2009) Log Message: ----------- tightvnc: Add cookies to custom phases Modified Paths: -------------- csw/mgar/pkg/tightvnc/trunk/Makefile Modified: csw/mgar/pkg/tightvnc/trunk/Makefile =================================================================== --- csw/mgar/pkg/tightvnc/trunk/Makefile 2009-11-11 11:02:28 UTC (rev 7222) +++ csw/mgar/pkg/tightvnc/trunk/Makefile 2009-11-11 12:31:00 UTC (rev 7223) @@ -87,6 +87,7 @@ LOCAL_LDFLAGS="-L/opt/csw/lib" \ EXTRA_INCLUDES="-I/opt/csw/include" \ $(MAKE)) + @$(MAKECOOKIE) install-vnc: ginstall -d $(DESTDIR)$(bindir) @@ -100,3 +101,4 @@ ginstall -m 644 $(WORKDIR)/vncservers $(DESTDIR)$(sysconfdir)/vncservers ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d ginstall -m 644 $(FILEDIR)/cswvncserver $(DESTDIR)/etc/opt/csw/init.d + @$(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 Nov 11 14:12:18 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 11 Nov 2009 13:12:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7224] csw/mgar/gar/v2 Message-ID: Revision: 7224 http://gar.svn.sourceforge.net/gar/?rev=7224&view=rev Author: dmichelsen Date: 2009-11-11 13:12:15 +0000 (Wed, 11 Nov 2009) Log Message: ----------- mGAR v2: Enhance cswmigrateconf support to be useful when building multiple packages 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 2009-11-11 12:31:00 UTC (rev 7223) +++ csw/mgar/gar/v2/gar.mk 2009-11-11 13:12:15 UTC (rev 7224) @@ -786,7 +786,7 @@ .PHONY: remerge reset-merge reset-merge-modulated remerge: reset-merge merge -reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-src +reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-migrateconf reset-merge-src @rm -f $(COOKIEDIR)/pre-merge $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge $(COOKIEDIR)/post-merge @rm -rf $(PKGROOT) @$(DONADA) Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-11-11 12:31:00 UTC (rev 7223) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-11-11 13:12:15 UTC (rev 7224) @@ -159,30 +159,14 @@ SPKG_PKGFILE ?= %{bitname}-%{SPKG_VERSION},%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-%{arch}-$(or $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),CSW).pkg -# Migration default -ifneq ($(MIGRATE_FILES),) -MIGRATECONF ?= /etc/opt/csw/pkg/$(call catalogname,$(firstword $(SPKG_SPECS)))/cswmigrateconf -_EXTRA_GAR_DISTFILES += cswmigrateconf -_EXTRA_GAR_NOCHECKSUM += cswmigrateconf - -$(DOWNLOADDIR)/cswmigrateconf: - @echo "[ Generating cswmigrateconf ]" - @(echo "MIGRATE_FILES=\"$(MIGRATE_FILES)\"";\ - $(foreach F,$(MIGRATE_FILES),\ - $(if $(MIGRATE_SOURCE_DIR_$F),echo "SOURCE_DIR_$(subst .,_,$F)=\"$(MIGRATE_SOURCE_DIR_$F)\"";)\ - $(if $(MIGRATE_DEST_DIR_$F),echo "DEST_DIR_$(subst .,_,$F)=\"$(MIGRATE_DEST_DIR_$F)\"";)\ - )\ - ) >$@ - - -endif - # Handle cswclassutils # append $2 to SPKG_CLASSES if $1 is non-null define _spkg_cond_add $(SPKG_CLASSES) $(if $($(1)),$(if $(filter $(2),$(SPKG_CLASSES)),,$(2))) endef +MIGRATECONF ?= $(foreach S,$(SPKG_SPECS),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),/etc/opt/csw/pkg/$S/cswmigrateconf)) + # NOTE: Order _can_ be important here. cswinitsmf and cswinetd should # always be the last two added. The reason for this is that # you need to ensure any binaries and config files are already on disk @@ -388,8 +372,8 @@ -n "$(_PKGFILES_EXCLUDE)" -o \ -n "$(ISAEXEC_FILES_$*)" -o \ -n "$(ISAEXEC_FILES)" ]; then \ - (pathfilter $(if $(or $(_PKGFILES_EXCLUDE),$(_PKGFILES_INCLUDE)),-I $(call licensedir,$*)/license) \ - $(foreach S,$(filter-out $*,$(SPKG_SPECS)),-X $(call licensedir,$S)/license) \ + (pathfilter $(if $(or $(_PKGFILES_EXCLUDE),$(_PKGFILES_INCLUDE)),-I $(call licensedir,$*)/license -I /etc/opt/csw/pkg/$*/cswmigrateconf) \ + $(foreach S,$(filter-out $*,$(SPKG_SPECS)),-X $(call licensedir,$S)/license -X /etc/opt/csw/pkg/$S/cswmigrateconf) \ $(foreach FILE,$(_PKGFILES_INCLUDE),-i '$(FILE)') \ $(if $(_PKGFILES_INCLUDE),-x '.*',$(foreach FILE,$(_PKGFILES_EXCLUDE),-x '$(FILE)')) \ $(foreach IE,$(abspath $(ISAEXEC_FILES_$*) $(ISAEXEC_FILES)), \ @@ -579,15 +563,29 @@ reset-merge-license: @rm -f $(COOKIEDIR)/merge-license $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-license-$(SPEC)) - @$(DONADA) -merge-migrateconf: $(WORKDIR) - $(if $(MIGRATECONF),\ - ginstall -d $(PKGROOT)$(dir $(MIGRATECONF));\ - ginstall $(DOWNLOADDIR)/cswmigrateconf $(PKGROOT)$(MIGRATECONF)\ - ) +merge-migrateconf: $(foreach S,$(SPKG_SPECS),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),merge-migrateconf-$S)) @$(MAKECOOKIE) +merge-migrateconf-%: MIGRATE_FILES_$* ?= $(MIGRATE_FILES) +merge-migrateconf-%: MIGRATE_SOURCE_DIR_$* ?= $(MIGRATE_SOURCE_DIR) +merge-migrateconf-%: MIGRATE_DEST_DIR_$* ?= $(MIGRATE_DEST_DIR) +merge-migrateconf-%: + @echo "[ Generating cswmigrateconf for package $* ]" + $(_DBG)ginstall -d $(PKGROOT)/etc/opt/csw/pkg/$* + $(_DBG)(echo "MIGRATE_FILES=\"$(MIGRATE_FILES_$*)\"";\ + $(if $(MIGRATE_SOURCE_DIR_$*),echo "SOURCE_DIR___default__=\"$(MIGRATE_SOURCE_DIR_$*)\"";)\ + $(if $(MIGRATE_DEST_DIR_$*),echo "DEST_DIR___default__=\"$(MIGRATE_DEST_DIR_$*)\"";)\ + $(foreach F,$(MIGRATE_FILES_$*),\ + $(if $(MIGRATE_SOURCE_DIR_$F),echo "SOURCE_DIR_$(subst .,_,$F)=\"$(MIGRATE_SOURCE_DIR_$F)\"";)\ + $(if $(MIGRATE_DEST_DIR_$F),echo "DEST_DIR_$(subst .,_,$F)=\"$(MIGRATE_DEST_DIR_$F)\"";)\ + )\ + ) >$(PKGROOT)/etc/opt/csw/pkg/$*/cswmigrateconf + @$(MAKECOOKIE) + +reset-merge-migrateconf: + @rm -f $(COOKIEDIR)/merge-migrateconf $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-migrateconf-$(SPEC)) + merge-src: _SRCDIR=$(PKGROOT)$(sourcedir)/$(call catalogname,$(SRCPACKAGE_BASE)) merge-src: fetch $(_DBG)mkdir -p $(_SRCDIR)/files 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 Nov 11 15:48:33 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 11 Nov 2009 14:48:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[7225] csw/mgar/pkg/orca/trunk/Makefile Message-ID: Revision: 7225 http://gar.svn.sourceforge.net/gar/?rev=7225&view=rev Author: dmichelsen Date: 2009-11-11 14:48:33 +0000 (Wed, 11 Nov 2009) Log Message: ----------- orca: Activate startscript Modified Paths: -------------- csw/mgar/pkg/orca/trunk/Makefile Modified: csw/mgar/pkg/orca/trunk/Makefile =================================================================== --- csw/mgar/pkg/orca/trunk/Makefile 2009-11-11 13:12:15 UTC (rev 7224) +++ csw/mgar/pkg/orca/trunk/Makefile 2009-11-11 14:48:33 UTC (rev 7225) @@ -87,8 +87,8 @@ post-install-modulated: @ginstall -d $(DESTDIR)$(sysconfdir)/init.d @# TBD: Use custom manifest for Solaris 10 SMF support - @#ginstall $(WORKDIR)/csworcallator $(DESTDIR)$(sysconfdir)/init.d/csworcallator - @#ginstall $(WORKDIR)/csworca_services $(DESTDIR)$(sysconfdir)/init.d/csworca_services + @ginstall $(WORKDIR)/csworcallator $(DESTDIR)$(sysconfdir)/init.d/csworcallator + @ginstall $(WORKDIR)/csworca_services $(DESTDIR)$(sysconfdir)/init.d/csworca_services @$(MAKE_COOKIE) post-merge: 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 Nov 11 15:53:54 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 11 Nov 2009 14:53:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[7226] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7226 http://gar.svn.sourceforge.net/gar/?rev=7226&view=rev Author: dmichelsen Date: 2009-11-11 14:53:54 +0000 (Wed, 11 Nov 2009) Log Message: ----------- mGAR v2: Add automatic setting of cswtexinfo class Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-11-11 14:48:33 UTC (rev 7225) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-11-11 14:53:54 UTC (rev 7226) @@ -180,6 +180,9 @@ SPKG_CLASSES := $(call _spkg_cond_add,INETDCONF,cswinetd) SPKG_CLASSES := $(call _spkg_cond_add,INITSMF,cswinitsmf) +# This is the default path for texinfo pages to be picked up. Extend or replace as necessary. +TEXINFO ?= $(infodir)/.*\.info(?:-\d+)? $(EXTRA_TEXINFO) + # - set class for all config files ifneq ($(SAMPLECONF)$(PRESERVECONF)$(MIGRATECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),) _CSWCLASS_FILTER = | perl -ane '\ @@ -191,7 +194,9 @@ $(foreach FILE,$(INITSMF),$$F[1] = "cswinitsmf" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(USERGROUP),$$F[1] = "cswusergroup" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(if $(PYCOMPILE),$(foreach FILE,$(_PYCOMPILE_FILES),$$F[1] = "cswpycompile" if( $$F[2] =~ m(^$(FILE)$$) );))\ + $(foreach FILE,$(TEXINFO),$$F[1] = "cswtexinfo" if( $$F[2] =~ m(^$(FILE)$$) );)\ print join(" ", at F),"\n";' + _EXTRA_GAR_PKGS += CSWcswclassutils # Make sure the configuration files always have a .CSW suffix and rename the # configuration files to this if necessary during merge. @@ -405,6 +410,13 @@ # $_EXTRA_GAR_PKGS is for dynamic dependencies added by GAR itself (like CSWisaexec or CSWcswclassutils) .PRECIOUS: $(WORKDIR)/%.depend + +# The texinfo filter has been taken out of the normal filters as TEXINFO has a default. +# The dependencies to CSWcswclassutils and CSWtexinfo are only added if there are files +# actually matching the _TEXINFO_FILTER. This is done at the prototype-level. +$(WORKDIR)/%.depend: $(WORKDIR)/$*.prototype +$(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach FILE,$(TEXINFO),print "$$F[2]\n" if( $$F[2] =~ m(^$(FILE)$$) );)'),CSWcswclassutils) + $(WORKDIR)/%.depend: $(WORKDIR) $(_DBG)$(if $(_EXTRA_GAR_PKGS)$(REQUIRED_PKGS_$*)$(REQUIRED_PKGS)$(INCOMPATIBLE_PKGS)$(INCOMPATIBLE_PKGS_$*), \ ($(foreach PKG,$(INCOMPATIBLE_PKGS_$*) $(INCOMPATIBLE_PKGS),\ @@ -493,7 +505,7 @@ endef define pkgvar -$(if $($(1)_$(2)),$($(1)_$(2)),$($(1))) +$(strip $(if $($(1)_$(2)),$($(1)_$(2)),$($(1)))) endef # Make sure every producable package contains specific descriptions. @@ -505,6 +517,11 @@ ))) .PRECIOUS: $(WORKDIR)/%.pkginfo + +# The texinfo filter has been taken out of the normal filters as TEXINFO has a default. +$(WORKDIR)/%.pkginfo: $(WORKDIR)/%.prototype +$(WORKDIR)/%.pkginfo: SPKG_CLASSES += $(if $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach FILE,$(TEXINFO),print "$$F[2]\n" if( $$F[2] =~ m(^$(FILE)$$) );)'),cswtexinfo) + $(WORKDIR)/%.pkginfo: $(WORKDIR) $(_DBG)(echo "PKG=$*"; \ echo "NAME=$(call catalogname,$*) - $(call pkgvar,SPKG_DESC,$*)"; \ @@ -646,7 +663,7 @@ @$(foreach SPEC,$(_PKG_SPECS),printf " %-20s %s\n" $(SPEC) $(SPKG_EXPORT)/$(shell $(call _PKG_ENV,$(SPEC)) $(GARBIN)/mkpackage -qs $(WORKDIR)/$(SPEC).gspec -D pkgfile).gz;) # The dynamic pkginfo is only generated for dynamic gspec-files -package-%: $(WORKDIR)/%.gspec $(if $(findstring %.gspec,$(DISTFILES)),,$(WORKDIR)/%.pkginfo) $(WORKDIR)/%.prototype-$(GARCH) $(WORKDIR)/%.depend +package-%: $(WORKDIR)/%.gspec $(WORKDIR)/%.prototype-$(GARCH) $(WORKDIR)/%.depend $(if $(findstring %.gspec,$(DISTFILES)),,$(WORKDIR)/%.pkginfo) @echo " ==> Processing $*.gspec" $(_DBG)( $(call _PKG_ENV,$*) mkpackage --spec $(WORKDIR)/$*.gspec \ --spooldir $(SPKG_SPOOLDIR) \ 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 Nov 11 16:05:07 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 11 Nov 2009 15:05:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7227] csw/mgar/pkg/wxwidgets/trunk/Makefile Message-ID: Revision: 7227 http://gar.svn.sourceforge.net/gar/?rev=7227&view=rev Author: dmichelsen Date: 2009-11-11 15:05:07 +0000 (Wed, 11 Nov 2009) Log Message: ----------- wxwidgets: Add dependency to sun libXext Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-11 14:53:54 UTC (rev 7226) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-11 15:05:07 UTC (rev 7227) @@ -88,6 +88,9 @@ CATALOGNAME_CSWwxwidgetsdevel = wxwidgets_devel CATALOGNAME_CSWwxwidgetsgtk2 = wxwidgets_gtk2 TEST_SCRIPTS = + +EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-gtk=2 CONFIGURE_ARGS += --with-gtk-prefix=/opt/csw 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 Nov 11 17:12:13 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 11 Nov 2009 16:12:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[7228] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7228 http://gar.svn.sourceforge.net/gar/?rev=7228&view=rev Author: dmichelsen Date: 2009-11-11 16:12:13 +0000 (Wed, 11 Nov 2009) Log Message: ----------- mGAR v2: Experimental addition of EXTRA_PKGFILES_INCLUDED Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-11-11 15:05:07 UTC (rev 7227) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-11-11 16:12:13 UTC (rev 7228) @@ -377,7 +377,7 @@ -n "$(_PKGFILES_EXCLUDE)" -o \ -n "$(ISAEXEC_FILES_$*)" -o \ -n "$(ISAEXEC_FILES)" ]; then \ - (pathfilter $(if $(or $(_PKGFILES_EXCLUDE),$(_PKGFILES_INCLUDE)),-I $(call licensedir,$*)/license -I /etc/opt/csw/pkg/$*/cswmigrateconf) \ + (pathfilter $(if $(or $(_PKGFILES_EXCLUDE),$(_PKGFILES_INCLUDE)),-I $(call licensedir,$*)/license -I /etc/opt/csw/pkg/$*/cswmigrateconf $(foreach I,$(EXTRA_PKGFILES_INCLUDED) $(EXTRA_PKGFILES_INCLUDED_$*),-I $I)) \ $(foreach S,$(filter-out $*,$(SPKG_SPECS)),-X $(call licensedir,$S)/license -X /etc/opt/csw/pkg/$S/cswmigrateconf) \ $(foreach FILE,$(_PKGFILES_INCLUDE),-i '$(FILE)') \ $(if $(_PKGFILES_INCLUDE),-x '.*',$(foreach FILE,$(_PKGFILES_EXCLUDE),-x '$(FILE)')) \ 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 Nov 11 17:50:27 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 11 Nov 2009 16:50:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7229] csw/mgar/pkg/perl/trunk/Makefile Message-ID: Revision: 7229 http://gar.svn.sourceforge.net/gar/?rev=7229&view=rev Author: bonivart Date: 2009-11-11 16:50:25 +0000 (Wed, 11 Nov 2009) Log Message: ----------- perl: add EXTRA_PKGFILES_EXCLUDED and EXTRA_PKGFILES_INCLUDED Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2009-11-11 16:12:13 UTC (rev 7228) +++ csw/mgar/pkg/perl/trunk/Makefile 2009-11-11 16:50:25 UTC (rev 7229) @@ -116,6 +116,8 @@ EXTRA_MERGE_EXCLUDE_FILES = .*\/perllocal.pod PKGFILES_CSWperldoc = .*\/pod\/.*\.pod .*\/man\/man.\/.* +EXTRA_PKGFILES_EXCLUDED_CSWperldoc = .*\/perldiag.pod +EXTRA_PKGFILES_INCLUDED_CSWperl = .*\/perldiag.pod # Tests take a long time 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 Wed Nov 11 18:30:00 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 11 Nov 2009 17:30:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7230] csw/mgar/pkg/tightvnc/trunk/ Message-ID: Revision: 7230 http://gar.svn.sourceforge.net/gar/?rev=7230&view=rev Author: wahwah Date: 2009-11-11 17:30:00 +0000 (Wed, 11 Nov 2009) Log Message: ----------- tightvnc: adding old-pkgs to the svn:ignore property Property Changed: ---------------- csw/mgar/pkg/tightvnc/trunk/ Property changes on: csw/mgar/pkg/tightvnc/trunk ___________________________________________________________________ Modified: svn:ignore - cookies download work + cookies download work old-pkgs 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 Nov 11 18:32:23 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 11 Nov 2009 17:32:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7231] csw/mgar/pkg/wxwidgets/ Message-ID: Revision: 7231 http://gar.svn.sourceforge.net/gar/?rev=7231&view=rev Author: wahwah Date: 2009-11-11 17:32:23 +0000 (Wed, 11 Nov 2009) Log Message: ----------- wxwidgets: Ignoring a source code directory Property Changed: ---------------- csw/mgar/pkg/wxwidgets/ Property changes on: csw/mgar/pkg/wxwidgets ___________________________________________________________________ Added: svn:ignore + wxWidgets-2.8.10 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 Nov 11 18:58:12 2009 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Wed, 11 Nov 2009 17:58:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7232] csw/mgar/pkg/sdlimage/trunk Message-ID: Revision: 7232 http://gar.svn.sourceforge.net/gar/?rev=7232&view=rev Author: jake_goerzen Date: 2009-11-11 17:58:12 +0000 (Wed, 11 Nov 2009) Log Message: ----------- sdlimage: Changed to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/sdlimage/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/sdlimage/trunk/ Property changes on: csw/mgar/pkg/sdlimage/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/sdlimage/trunk/Makefile =================================================================== --- csw/mgar/pkg/sdlimage/trunk/Makefile 2009-11-11 17:32:23 UTC (rev 7231) +++ csw/mgar/pkg/sdlimage/trunk/Makefile 2009-11-11 17:58:12 UTC (rev 7232) @@ -1,5 +1,5 @@ GARNAME = SDL_image -GARVERSION = 1.2.7 +GARVERSION = 1.2.8 CATEGORIES = lib DESCRIPTION = SDL image file loading library @@ -9,7 +9,6 @@ MASTER_SITES = http://www.libsdl.org/projects/SDL_image/release/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWsdlimage, prototype) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Wed Nov 11 19:58:14 2009 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Wed, 11 Nov 2009 18:58:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[7233] csw/mgar/pkg/sdlimage/trunk Message-ID: Revision: 7233 http://gar.svn.sourceforge.net/gar/?rev=7233&view=rev Author: jake_goerzen Date: 2009-11-11 18:58:14 +0000 (Wed, 11 Nov 2009) Log Message: ----------- update Makefile for mGAR v2 remove files .gspec and .depend Modified Paths: -------------- csw/mgar/pkg/sdlimage/trunk/Makefile csw/mgar/pkg/sdlimage/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/sdlimage/trunk/files/CSWsdlimage.gspec csw/mgar/pkg/sdlimage/trunk/files/CSWsdlimage.prototype Modified: csw/mgar/pkg/sdlimage/trunk/Makefile =================================================================== --- csw/mgar/pkg/sdlimage/trunk/Makefile 2009-11-11 17:58:12 UTC (rev 7232) +++ csw/mgar/pkg/sdlimage/trunk/Makefile 2009-11-11 18:58:14 UTC (rev 7233) @@ -1,4 +1,4 @@ -GARNAME = SDL_image +GARNAME = sdlimage GARVERSION = 1.2.8 CATEGORIES = lib @@ -7,13 +7,15 @@ SDL image library loads images as SDL surfaces, and supports the following formats: BMP, PNM, XPM, LBM, PCX, GIF, JPEG, PNG, TGA. endef +DISTNAME = SDL_image-$(GARVERSION) + MASTER_SITES = http://www.libsdl.org/projects/SDL_image/release/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = SDL_image-$(GARVERSION).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release +REQUIRED_PKGS = CSWlibsdl + UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz CONFIGURE_ARGS = $(DIRPATHS) --disable-static TEST_SCRIPTS = include gar/category.mk - Modified: csw/mgar/pkg/sdlimage/trunk/checksums =================================================================== --- csw/mgar/pkg/sdlimage/trunk/checksums 2009-11-11 17:58:12 UTC (rev 7232) +++ csw/mgar/pkg/sdlimage/trunk/checksums 2009-11-11 18:58:14 UTC (rev 7233) @@ -1,3 +1 @@ -a729ff61f74f0a45ec7fe36354cf938e download/SDL_image-1.2.7.tar.gz -c4a710e474cafa63d2fe24f9b376254c download/CSWsdlimage.gspec -50aad500d2b2d642733542ad8f931e7c download/CSWsdlimage.prototype +2e7c3efa0ec2acc039c46960e27c0792 SDL_image-1.2.8.tar.gz Deleted: csw/mgar/pkg/sdlimage/trunk/files/CSWsdlimage.gspec =================================================================== --- csw/mgar/pkg/sdlimage/trunk/files/CSWsdlimage.gspec 2009-11-11 17:58:12 UTC (rev 7232) +++ csw/mgar/pkg/sdlimage/trunk/files/CSWsdlimage.gspec 2009-11-11 18:58:14 UTC (rev 7233) @@ -1,4 +0,0 @@ -%var bitname sdlimage -%var pkgname CSWsdlimage -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/sdlimage/trunk/files/CSWsdlimage.prototype =================================================================== --- csw/mgar/pkg/sdlimage/trunk/files/CSWsdlimage.prototype 2009-11-11 17:58:12 UTC (rev 7232) +++ csw/mgar/pkg/sdlimage/trunk/files/CSWsdlimage.prototype 2009-11-11 18:58:14 UTC (rev 7233) @@ -1,10 +0,0 @@ -d none /opt/csw/include 0755 root bin -d none /opt/csw/include/SDL 0755 root bin -f none /opt/csw/include/SDL/SDL_image.h 0644 root bin -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libSDL_image-1.2.so.0.1.6 0755 root bin -s none /opt/csw/lib/libSDL_image-1.2.so.0=libSDL_image-1.2.so.0.1.6 -s none /opt/csw/lib/libSDL_image.so=libSDL_image-1.2.so.0.1.6 -i copyright=CSWsdlimage.copyright -i depend=CSWsdlimage.depend -i pkginfo=CSWsdlimage.pkginfo 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 Nov 12 08:54:15 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 12 Nov 2009 07:54:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[7234] csw/mgar/pkg/wxwidgets/trunk/Makefile Message-ID: Revision: 7234 http://gar.svn.sourceforge.net/gar/?rev=7234&view=rev Author: wahwah Date: 2009-11-12 07:54:15 +0000 (Thu, 12 Nov 2009) Log Message: ----------- wxwidgets: Added two more dependent packages Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-11 18:58:14 UTC (rev 7233) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-12 07:54:15 UTC (rev 7234) @@ -56,6 +56,8 @@ REQUIRED_PKGS += CSWiconv REQUIRED_PKGS += CSWjpeg REQUIRED_PKGS += CSWlibatk +REQUIRED_PKGS += CSWlibsm +REQUIRED_PKGS += CSWlibxext REQUIRED_PKGS += CSWmesa REQUIRED_PKGS += CSWpango REQUIRED_PKGS += CSWpng 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 Nov 12 09:26:17 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 12 Nov 2009 08:26:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[7235] csw/mgar/pkg/mbuffer/trunk Message-ID: Revision: 7235 http://gar.svn.sourceforge.net/gar/?rev=7235&view=rev Author: skayser Date: 2009-11-12 08:26:17 +0000 (Thu, 12 Nov 2009) Log Message: ----------- mbuffer: updated to 20091110, still broken Modified Paths: -------------- csw/mgar/pkg/mbuffer/trunk/Makefile csw/mgar/pkg/mbuffer/trunk/checksums Modified: csw/mgar/pkg/mbuffer/trunk/Makefile =================================================================== --- csw/mgar/pkg/mbuffer/trunk/Makefile 2009-11-12 07:54:15 UTC (rev 7234) +++ csw/mgar/pkg/mbuffer/trunk/Makefile 2009-11-12 08:26:17 UTC (rev 7235) @@ -1,20 +1,12 @@ -# TODO -# - sparcv9 (64-bit) tests fail with assertion failures (we have had this before, -# upstream doesn't test 64-bit builds) --> report upstream: -# -# ./mbuffer -q -I :8000 | openssl md5 > test2.md5 & -# sleep 1 -# rm -f test2.tar -# ./mbuffer -i test.tar -o /dev/null -O localhost:8000 -o test2.tar -H -# mbuffer: warning: error connecting localhost:8000: Network is unreachable -# -# mbuffer: warning: error connecting localhost:8000: Network is unreachable -# Assertion failed: (err == 0) && (bsize == sizeof(osize)), file network.c, line 64 -# Assertion failed: (err == 0) && (bsize == sizeof(osize)), file network.c, line 64 -# +# STATUS/TODO +# - 20090628 contained assertion failures in 64-bit code which have been fixed +# with 20091012, 20091012 introduced hickups with non-IPv6 systems when using +# -I / -O (and not explicitly specifying -4) +# - 20091110 does not work on Solaris 8 / 9 any more .. upstream informed +# - 20091110 dumps core on connection refused .. upstream informed GARNAME = mbuffer -GARVERSION = 20091103 +GARVERSION = 20091110 CATEGORIES = utils DESCRIPTION = A tool for buffering data streams @@ -27,19 +19,18 @@ if used correctly and speed up the whole backup process. endef -MASTER_SITES = http://www.maier-komor.de/software/mbuffer/ -DISTFILES = $(GARNAME)-$(GARVERSION).tgz +MASTER_SITES = http://www.maier-komor.de/software/mbuffer/ +DISTFILES = $(GARNAME)-$(GARVERSION).tgz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +SPKG_SOURCEURL = http://www.maier-komor.de/mbuffer.html + LICENSE = LICENSE # Required during packaging (for the "test" target) PREREQUISITE_PKGS = CSWmktemp CSWgcc4core -REQUIRED_PKGS = CSWosslrt +REQUIRED_PKGS = CSWosslrt CSWlibmhash -# We define upstream file regex so we can be notifed of new upstream software -# release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz - # To build the mixed package for x86 you have to do the following # 1) build8x: gmake merge # 2) build10x: gmake merge @@ -55,6 +46,12 @@ TEST_SCRIPTS = custom +# Required for updated libmhash (mbuffer builds against it) which allows for +# flexible const/non-const definitions. There should be a more intelligent +# way to do this than to just put it into every build recipe which requires +# libmhash though ... +EXTRA_CPPFLAGS = -D__const=const + include gar/category.mk # The test scripts do file IO and this is so sloooooow when being run @@ -76,19 +73,10 @@ rm -rf $(TMPDIR) @$(MAKECOOKIE) -# Solaris 10 on build10x has libm.so which points to libm.so.2. libm.so.2 -# is however not available on Solaris 8. So we have to explicitly use -# libm.so.1 during linking and get rid of the -lm reference. Otherwise -# the package check on build8x (when running "gmake package") fails. -post-configure-isa-amd64: - @echo "Patching Makefile to use /lib/64/libm.so.1 instead of -lm" - @perl -pi -e 's#-lm#/lib/64/libm.so.1#' $(WORKSRC)/Makefile - @$(MAKECOOKIE) - post-install-modulated: DOCS = ChangeLog README AUTHORS post-install-modulated: DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME) post-install-modulated: - @ginstall -d $(DOCDEST) - @$(foreach DOC,$(DOCS),cp $(WORKSRC)/$(DOC) $(DOCDEST);) - @cp $(FILEDIR)/changelog.CSW $(DOCDEST) + ginstall -d $(DOCDEST) + $(foreach DOC,$(DOCS),cp $(WORKSRC)/$(DOC) $(DOCDEST);) + cp $(FILEDIR)/changelog.CSW $(DOCDEST) @$(MAKECOOKIE) Modified: csw/mgar/pkg/mbuffer/trunk/checksums =================================================================== --- csw/mgar/pkg/mbuffer/trunk/checksums 2009-11-12 07:54:15 UTC (rev 7234) +++ csw/mgar/pkg/mbuffer/trunk/checksums 2009-11-12 08:26:17 UTC (rev 7235) @@ -1 +1 @@ -c3f8fe27edb333d4df02cbe1d0f5f4f5 download/mbuffer-20091103.tgz +1c2ba8b865c3a26c503bb680810142be mbuffer-20091110.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 Thu Nov 12 10:11:28 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Nov 2009 09:11:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[7236] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7236 http://gar.svn.sourceforge.net/gar/?rev=7236&view=rev Author: dmichelsen Date: 2009-11-12 09:11:28 +0000 (Thu, 12 Nov 2009) Log Message: ----------- mGAR v2: Reorder pathfilter args for EXTRA_PKGFILES_* Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-11-12 08:26:17 UTC (rev 7235) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-11-12 09:11:28 UTC (rev 7236) @@ -283,9 +283,6 @@ $(strip $(foreach S,$(filter-out $(1),$(_PKG_SPECS)), $(PKGFILES_$(S)) - $(EXTRA_PKGFILES_EXCLUDED) - $(EXTRA_PKGFILES_EXCLUDED_$(1)) - $(_EXTRA_PKGFILES_EXCLUDED) ) ) endef @@ -377,8 +374,10 @@ -n "$(_PKGFILES_EXCLUDE)" -o \ -n "$(ISAEXEC_FILES_$*)" -o \ -n "$(ISAEXEC_FILES)" ]; then \ - (pathfilter $(if $(or $(_PKGFILES_EXCLUDE),$(_PKGFILES_INCLUDE)),-I $(call licensedir,$*)/license -I /etc/opt/csw/pkg/$*/cswmigrateconf $(foreach I,$(EXTRA_PKGFILES_INCLUDED) $(EXTRA_PKGFILES_INCLUDED_$*),-I $I)) \ + (pathfilter $(if $(or $(_PKGFILES_EXCLUDE),$(_PKGFILES_INCLUDE)),-I $(call licensedir,$*)/license -I /etc/opt/csw/pkg/$*/cswmigrateconf) \ $(foreach S,$(filter-out $*,$(SPKG_SPECS)),-X $(call licensedir,$S)/license -X /etc/opt/csw/pkg/$S/cswmigrateconf) \ + $(foreach I,$(EXTRA_PKGFILES_INCLUDED) $(EXTRA_PKGFILES_INCLUDED_$*),-i '$I') \ + $(foreach X,$(EXTRA_PKGFILES_EXCLUDED) $(EXTRA_PKGFILES_EXCLUDED_$*),-x '$X') \ $(foreach FILE,$(_PKGFILES_INCLUDE),-i '$(FILE)') \ $(if $(_PKGFILES_INCLUDE),-x '.*',$(foreach FILE,$(_PKGFILES_EXCLUDE),-x '$(FILE)')) \ $(foreach IE,$(abspath $(ISAEXEC_FILES_$*) $(ISAEXEC_FILES)), \ 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 Nov 12 10:13:25 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Nov 2009 09:13:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7237] csw/mgar/pkg/perl/trunk/Makefile Message-ID: Revision: 7237 http://gar.svn.sourceforge.net/gar/?rev=7237&view=rev Author: dmichelsen Date: 2009-11-12 09:13:24 +0000 (Thu, 12 Nov 2009) Log Message: ----------- perl: Clarify inclusion of perldiag.pod to CSWperl instead of docs Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2009-11-12 09:11:28 UTC (rev 7236) +++ csw/mgar/pkg/perl/trunk/Makefile 2009-11-12 09:13:24 UTC (rev 7237) @@ -116,6 +116,9 @@ 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 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 Nov 12 11:00:51 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Nov 2009 10:00:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[7238] csw/mgar/pkg Message-ID: Revision: 7238 http://gar.svn.sourceforge.net/gar/?rev=7238&view=rev Author: dmichelsen Date: 2009-11-12 10:00:50 +0000 (Thu, 12 Nov 2009) Log Message: ----------- xchm: Initial commit Added Paths: ----------- csw/mgar/pkg/xchm/ csw/mgar/pkg/xchm/branches/ csw/mgar/pkg/xchm/tags/ csw/mgar/pkg/xchm/trunk/ csw/mgar/pkg/xchm/trunk/Makefile csw/mgar/pkg/xchm/trunk/checksums csw/mgar/pkg/xchm/trunk/files/ csw/mgar/pkg/xchm/trunk/files/0001-Fix-extra-comma-at-end-of-enum.patch csw/mgar/pkg/xchm/trunk/files/0002-Remove-W-Wall-for-Sun-Studio.patch csw/mgar/pkg/xchm/trunk/files/0003-Use-inttypes.h-instead-of-stdint.h.patch Property changes on: csw/mgar/pkg/xchm/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/xchm/trunk/Makefile =================================================================== --- csw/mgar/pkg/xchm/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xchm/trunk/Makefile 2009-11-12 10:00:50 UTC (rev 7238) @@ -0,0 +1,28 @@ +GARNAME = xchm +GARVERSION = 1.17 +CATEGORIES = utils + +DESCRIPTION = Cross-platform GUI front-end to chmlib (.chm reader) +define BLURB + xCHM is a cross-platform GUI front-end to chmlib, with borrowed bits from Pabs' chmdeco project. + xCHM can show the content tree if one is available, print pages, change font face and size, + remember bookmarks, display a searchable index, and search for words in the current page and the whole book. +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Fix-extra-comma-at-end-of-enum.patch +PATCHFILES += 0002-Remove-W-Wall-for-Sun-Studio.patch +PATCHFILES += 0003-Use-inttypes.h-instead-of-stdint.h.patch + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +REQUIRED_PKGS = CSWchmlib CSWwxwidgetscommon CSWwxwidgetsgtk2 +PREREQUISITE_PKGS = $(REQUIRED_PGKS) CSWwxwidgetsdevel + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_SCRIPTS = + +include gar/category.mk Added: csw/mgar/pkg/xchm/trunk/checksums =================================================================== --- csw/mgar/pkg/xchm/trunk/checksums (rev 0) +++ csw/mgar/pkg/xchm/trunk/checksums 2009-11-12 10:00:50 UTC (rev 7238) @@ -0,0 +1,4 @@ +3dd1f6628a7ecfd1d65f0b93451fad48 0001-Fix-extra-comma-at-end-of-enum.patch +c9e7de423f7a79f280aee0ed3dc3e0f7 0002-Remove-W-Wall-for-Sun-Studio.patch +6b248d3b57a9b479be69a7c8475bdc66 0003-Use-inttypes.h-instead-of-stdint.h.patch +4f34bc046fcc59f1af590d8eb1e08934 xchm-1.17.tar.gz Added: csw/mgar/pkg/xchm/trunk/files/0001-Fix-extra-comma-at-end-of-enum.patch =================================================================== --- csw/mgar/pkg/xchm/trunk/files/0001-Fix-extra-comma-at-end-of-enum.patch (rev 0) +++ csw/mgar/pkg/xchm/trunk/files/0001-Fix-extra-comma-at-end-of-enum.patch 2009-11-12 10:00:50 UTC (rev 7238) @@ -0,0 +1,25 @@ +From f327a8fe2df06b49bb7ad3dcec2f75108bea1e3c Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 12 Nov 2009 10:39:08 +0100 +Subject: [PATCH 1/3] Fix extra comma at end of enum + +--- + src/chmframe.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/chmframe.h b/src/chmframe.h +index 62a3f52..1dc59a1 100644 +--- a/src/chmframe.h ++++ b/src/chmframe.h +@@ -79,7 +79,7 @@ enum + ID_RegisterExtension, + ID_CloseTab, + ID_NewTab, +- ID_TreeCtrl = 1000, ++ ID_TreeCtrl = 1000 + }; + + +-- +1.6.5 + Added: csw/mgar/pkg/xchm/trunk/files/0002-Remove-W-Wall-for-Sun-Studio.patch =================================================================== --- csw/mgar/pkg/xchm/trunk/files/0002-Remove-W-Wall-for-Sun-Studio.patch (rev 0) +++ csw/mgar/pkg/xchm/trunk/files/0002-Remove-W-Wall-for-Sun-Studio.patch 2009-11-12 10:00:50 UTC (rev 7238) @@ -0,0 +1,39 @@ +From 042ab4f6497309a3488d73538f816e9a88c851de Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 12 Nov 2009 10:41:55 +0100 +Subject: [PATCH 2/3] Remove -W -Wall for Sun Studio + +--- + configure | 2 +- + configure.in | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/configure b/configure +index 50a3330..c5da2c9 100755 +--- a/configure ++++ b/configure +@@ -5385,7 +5385,7 @@ wx_config_minor_version=`echo $WX_VERSION | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` + + CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" +-CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY -W -Wall" ++CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY" + CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" + + +diff --git a/configure.in b/configure.in +index 82e4125..6b108d3 100644 +--- a/configure.in ++++ b/configure.in +@@ -34,7 +34,7 @@ wx_config_minor_version=`echo $WX_VERSION | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + + CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" +-CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY -W -Wall" ++CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY" + CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" + + +-- +1.6.5 + Added: csw/mgar/pkg/xchm/trunk/files/0003-Use-inttypes.h-instead-of-stdint.h.patch =================================================================== --- csw/mgar/pkg/xchm/trunk/files/0003-Use-inttypes.h-instead-of-stdint.h.patch (rev 0) +++ csw/mgar/pkg/xchm/trunk/files/0003-Use-inttypes.h-instead-of-stdint.h.patch 2009-11-12 10:00:50 UTC (rev 7238) @@ -0,0 +1,39 @@ +From 514f5e2682428b392fb5027b04f4557a837dbb64 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 12 Nov 2009 10:42:32 +0100 +Subject: [PATCH 3/3] Use inttypes.h instead of stdint.h + +--- + src/bitfiddle.inl | 2 +- + src/chmfile.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/bitfiddle.inl b/src/bitfiddle.inl +index 3edd779..6bbb2ae 100644 +--- a/src/bitfiddle.inl ++++ b/src/bitfiddle.inl +@@ -23,7 +23,7 @@ + + + #include +-#include ++#include + + + #define FIXENDIAN16(x) (x = wxUINT16_SWAP_ON_BE(x)) +diff --git a/src/chmfile.h b/src/chmfile.h +index dc00013..d740d20 100644 +--- a/src/chmfile.h ++++ b/src/chmfile.h +@@ -24,7 +24,7 @@ + #define __CHMFILE_H_ + + #include +-#include ++#include + #include + #include + #include +-- +1.6.5 + 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 Nov 12 12:14:36 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 12 Nov 2009 11:14:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[7239] csw/mgar/pkg/mysql5/branches/mysql-5.0.x Message-ID: Revision: 7239 http://gar.svn.sourceforge.net/gar/?rev=7239&view=rev Author: wahwah Date: 2009-11-12 11:14:36 +0000 (Thu, 12 Nov 2009) Log Message: ----------- mysql5: 5.0 version bump up to 5.0.87 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-11-12 10:00:50 UTC (rev 7238) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-11-12 11:14:36 UTC (rev 7239) @@ -3,7 +3,7 @@ # $Id$ GARNAME = mysql5 -GARVERSION = 5.0.84 +GARVERSION = 5.0.87 CATEGORIES = server DISTNAME = mysql-$(GARVERSION) Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-11-12 10:00:50 UTC (rev 7238) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-11-12 11:14:36 UTC (rev 7239) @@ -8,5 +8,5 @@ e42afb5ec1b1ab02d2ec3b46d0922636 README.CSW aaca748fc044834e71ad544ab293c494 cswmysql5 67228e1f096fe08a94f4267439a4ec36 cswusergroup -671348f1a5b078da9ca76f97e1fda325 mysql-5.0.84.tar.gz +65e6229cc98b6a8d4c5206d7fe16c7be mysql-5.0.87.tar.gz 90b7cfcd11ab56e021a195a6a085fa21 quick_start-csw 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 Nov 12 12:29:27 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Nov 2009 11:29:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7240] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7240 http://gar.svn.sourceforge.net/gar/?rev=7240&view=rev Author: dmichelsen Date: 2009-11-12 11:29:27 +0000 (Thu, 12 Nov 2009) Log Message: ----------- mGAR v2: Fix additional space forcing cswmigrateconf even when empty Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-11-12 11:14:36 UTC (rev 7239) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-11-12 11:29:27 UTC (rev 7240) @@ -165,7 +165,7 @@ $(SPKG_CLASSES) $(if $($(1)),$(if $(filter $(2),$(SPKG_CLASSES)),,$(2))) endef -MIGRATECONF ?= $(foreach S,$(SPKG_SPECS),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),/etc/opt/csw/pkg/$S/cswmigrateconf)) +MIGRATECONF ?= $(strip $(foreach S,$(SPKG_SPECS),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),/etc/opt/csw/pkg/$S/cswmigrateconf))) # NOTE: Order _can_ be important here. cswinitsmf and cswinetd should # always be the last two added. The reason for this is that 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 Nov 12 13:17:41 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 12 Nov 2009 12:17:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[7241] csw/mgar/pkg/perl/trunk/files Message-ID: Revision: 7241 http://gar.svn.sourceforge.net/gar/?rev=7241&view=rev Author: bonivart Date: 2009-11-12 12:17:41 +0000 (Thu, 12 Nov 2009) Log Message: ----------- perl: remove obsolete gspec, depend and prototype files Removed Paths: ------------- csw/mgar/pkg/perl/trunk/files/CSWperl.depend csw/mgar/pkg/perl/trunk/files/CSWperl.gspec csw/mgar/pkg/perl/trunk/files/CSWperl.prototype csw/mgar/pkg/perl/trunk/files/CSWperldoc.depend csw/mgar/pkg/perl/trunk/files/CSWperldoc.gspec csw/mgar/pkg/perl/trunk/files/CSWperldoc.prototype Deleted: csw/mgar/pkg/perl/trunk/files/CSWperl.depend =================================================================== --- csw/mgar/pkg/perl/trunk/files/CSWperl.depend 2009-11-12 11:29:27 UTC (rev 7240) +++ csw/mgar/pkg/perl/trunk/files/CSWperl.depend 2009-11-12 12:17:41 UTC (rev 7241) @@ -1,5 +0,0 @@ -I CSWperlmods -I CSWpmdigest -I CSWpmi18nlangtags -P CSWbdb44 berkeleydb44 - embedded database libraries and utilities -P CSWgdbm gdbm - GNU dbm Deleted: csw/mgar/pkg/perl/trunk/files/CSWperl.gspec =================================================================== --- csw/mgar/pkg/perl/trunk/files/CSWperl.gspec 2009-11-12 11:29:27 UTC (rev 7240) +++ csw/mgar/pkg/perl/trunk/files/CSWperl.gspec 2009-11-12 12:17:41 UTC (rev 7241) @@ -1,4 +0,0 @@ -%var bitname perl -%var pkgname CSWperl -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/Copying Deleted: csw/mgar/pkg/perl/trunk/files/CSWperl.prototype =================================================================== --- csw/mgar/pkg/perl/trunk/files/CSWperl.prototype 2009-11-12 11:29:27 UTC (rev 7240) +++ csw/mgar/pkg/perl/trunk/files/CSWperl.prototype 2009-11-12 12:17:41 UTC (rev 7241) @@ -1,1487 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/a2p 0755 root bin -f none /opt/csw/bin/c2ph 0755 root bin -f none /opt/csw/bin/cpan 0755 root bin -f none /opt/csw/bin/dprofpp 0755 root bin -f none /opt/csw/bin/enc2xs 0755 root bin -f none /opt/csw/bin/find2perl 0755 root bin -f none /opt/csw/bin/h2ph 0755 root bin -f none /opt/csw/bin/h2xs 0755 root bin -f none /opt/csw/bin/instmodsh 0755 root bin -f none /opt/csw/bin/libnetcfg 0755 root bin -f none /opt/csw/bin/perl5.8.8 0755 root bin -l none /opt/csw/bin/perl=perl5.8.8 -f none /opt/csw/bin/perlbug 0755 root bin -f none /opt/csw/bin/perlcc 0755 root bin -f none /opt/csw/bin/perldoc 0755 root bin -f none /opt/csw/bin/perlivp 0755 root bin -f none /opt/csw/bin/piconv 0755 root bin -f none /opt/csw/bin/pl2pm 0755 root bin -f none /opt/csw/bin/pod2html 0755 root bin -f none /opt/csw/bin/pod2latex 0755 root bin -f none /opt/csw/bin/pod2man 0755 root bin -f none /opt/csw/bin/pod2text 0755 root bin -f none /opt/csw/bin/pod2usage 0755 root bin -f none /opt/csw/bin/podchecker 0755 root bin -f none /opt/csw/bin/podselect 0755 root bin -f none /opt/csw/bin/prove 0755 root bin -l none /opt/csw/bin/psed=s2p -l none /opt/csw/bin/pstruct=c2ph -f none /opt/csw/bin/s2p 0755 root bin -f none /opt/csw/bin/splain 0755 root bin -f none /opt/csw/bin/xsubpp 0755 root bin -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libperl.so.5.8.8 0755 root bin -s none /opt/csw/lib/libperl.so.5.8=libperl.so.5.8.8 -s none /opt/csw/lib/libperl.so=libperl.so.5.8.8 -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/5.8.8 0755 root bin -f none /opt/csw/lib/perl/5.8.8/.packlist 0644 root bin -d none /opt/csw/lib/perl/5.8.8/B 0755 root bin -f none /opt/csw/lib/perl/5.8.8/B.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/B/Asmdata.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/B/Assembler.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/B/Bblock.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/B/Bytecode.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/B/C.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/B/CC.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/B/Concise.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/B/Debug.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/B/Deparse.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/B/Disassembler.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/B/Lint.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/B/Showlex.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/B/Stackobj.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/B/Stash.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/B/Terse.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/B/Xref.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/ByteLoader.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/CORE 0755 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/EXTERN.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/INTERN.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/XSUB.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/av.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/cc_runtime.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/config.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/cop.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/cv.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/dosish.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/embed.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/embedvar.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/fakesdio.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/fakethr.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/form.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/gv.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/handy.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/hv.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/intrpvar.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/iperlsys.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/keywords.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/malloc_ctl.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/mg.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/nostdio.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/op.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/opcode.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/opnames.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/pad.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/patchlevel.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/perl.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/perlapi.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/perlio.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/perliol.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/perlsdio.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/perlsfio.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/perlvars.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/perly.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/pp.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/pp_proto.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/proto.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/reentr.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/reentr.inc 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/regcomp.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/regexp.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/regnodes.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/scope.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/sv.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/thrdvar.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/thread.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/uconfig.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/unixish.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/utf8.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/utfebcdic.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/util.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/CORE/warnings.h 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Config.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Config.pod 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Config_heavy.pl 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Cwd.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/DB_File.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/Data 0755 root bin -f none /opt/csw/lib/perl/5.8.8/Data/Dumper.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/Devel 0755 root bin -f none /opt/csw/lib/perl/5.8.8/Devel/DProf.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Devel/PPPort.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Devel/Peek.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/Digest 0755 root bin -f none /opt/csw/lib/perl/5.8.8/Digest/MD5.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/DynaLoader.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/Encode 0755 root bin -f none /opt/csw/lib/perl/5.8.8/Encode.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Encode/Alias.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Encode/Byte.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Encode/CJKConstants.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Encode/CN.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Encode/Config.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Encode/EBCDIC.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Encode/Encoder.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Encode/Encoding.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Encode/Guess.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Encode/JP.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Encode/KR.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Encode/Symbol.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Encode/TW.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Encode/Unicode.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Errno.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Fcntl.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/File 0755 root bin -f none /opt/csw/lib/perl/5.8.8/File/Glob.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/File/Spec 0755 root bin -f none /opt/csw/lib/perl/5.8.8/File/Spec.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/File/Spec/Cygwin.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/File/Spec/Epoc.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/File/Spec/Functions.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/File/Spec/Mac.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/File/Spec/OS2.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/File/Spec/Unix.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/File/Spec/VMS.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/File/Spec/Win32.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/Filter 0755 root bin -d none /opt/csw/lib/perl/5.8.8/Filter/Util 0755 root bin -f none /opt/csw/lib/perl/5.8.8/Filter/Util/Call.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/GDBM_File.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/I18N 0755 root bin -f none /opt/csw/lib/perl/5.8.8/I18N/Langinfo.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/IO 0755 root bin -f none /opt/csw/lib/perl/5.8.8/IO.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/IO/Dir.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/IO/File.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/IO/Handle.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/IO/Pipe.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/IO/Poll.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/IO/Seekable.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/IO/Select.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/IO/Socket.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/IO/Socket 0755 root bin -f none /opt/csw/lib/perl/5.8.8/IO/Socket/INET.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/IO/Socket/UNIX.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/IPC 0755 root bin -f none /opt/csw/lib/perl/5.8.8/IPC/Msg.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/IPC/Semaphore.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/IPC/SysV.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/MIME 0755 root bin -f none /opt/csw/lib/perl/5.8.8/MIME/Base64.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/MIME/QuotedPrint.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/NDBM_File.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/O.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/ODBM_File.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Opcode.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/POSIX.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/POSIX.pod 0444 root bin -d none /opt/csw/lib/perl/5.8.8/PerlIO 0755 root bin -f none /opt/csw/lib/perl/5.8.8/PerlIO/encoding.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/PerlIO/scalar.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/PerlIO/via.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/SDBM_File.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Safe.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Socket.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Storable.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/Sys 0755 root bin -f none /opt/csw/lib/perl/5.8.8/Sys/Hostname.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/Sys/Syslog.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/Time 0755 root bin -f none /opt/csw/lib/perl/5.8.8/Time/HiRes.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/Unicode 0755 root bin -f none /opt/csw/lib/perl/5.8.8/Unicode/Normalize.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/XS 0755 root bin -f none /opt/csw/lib/perl/5.8.8/XS/APItest.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/XS/Typemap.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/XSLoader.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/attrs.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/auto 0755 root bin -d none /opt/csw/lib/perl/5.8.8/auto/B 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/B/B.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/B/B.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/B/C 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/B/C/C.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/B/C/C.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/ByteLoader 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/ByteLoader/ByteLoader.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/ByteLoader/ByteLoader.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Cwd 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Cwd/Cwd.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Cwd/Cwd.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/DB_File 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/DB_File/DB_File.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/DB_File/DB_File.so 0555 root bin -f none /opt/csw/lib/perl/5.8.8/auto/DB_File/autosplit.ix 0444 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Data 0755 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Data/Dumper 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Data/Dumper/Dumper.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Data/Dumper/Dumper.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Devel 0755 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Devel/DProf 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Devel/DProf/DProf.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Devel/DProf/DProf.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Devel/PPPort 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Devel/PPPort/PPPort.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Devel/PPPort/PPPort.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Devel/Peek 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Devel/Peek/Peek.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Devel/Peek/Peek.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Digest 0755 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Digest/MD5 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Digest/MD5/MD5.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Digest/MD5/MD5.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/DynaLoader 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/DynaLoader/DynaLoader.a 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/DynaLoader/autosplit.ix 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/DynaLoader/dl_expandspec.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/DynaLoader/dl_find_symbol_anywhere.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/DynaLoader/dl_findfile.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/DynaLoader/extralibs.ld 0444 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Encode 0755 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Encode/Byte 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Encode/Byte/Byte.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Encode/Byte/Byte.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Encode/CN 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Encode/CN/CN.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Encode/CN/CN.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Encode/EBCDIC 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Encode/EBCDIC/EBCDIC.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Encode/EBCDIC/EBCDIC.so 0555 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Encode/Encode.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Encode/Encode.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Encode/JP 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Encode/JP/JP.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Encode/JP/JP.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Encode/KR 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Encode/KR/KR.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Encode/KR/KR.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Encode/Symbol 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Encode/Symbol/Symbol.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Encode/Symbol/Symbol.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Encode/TW 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Encode/TW/TW.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Encode/TW/TW.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Encode/Unicode 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Encode/Unicode/Unicode.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Encode/Unicode/Unicode.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Fcntl 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Fcntl/Fcntl.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Fcntl/Fcntl.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/File 0755 root bin -d none /opt/csw/lib/perl/5.8.8/auto/File/Glob 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/File/Glob/Glob.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/File/Glob/Glob.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Filter 0755 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Filter/Util 0755 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Filter/Util/Call 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Filter/Util/Call/Call.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Filter/Util/Call/Call.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/GDBM_File 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/GDBM_File/GDBM_File.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/GDBM_File/GDBM_File.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/I18N 0755 root bin -d none /opt/csw/lib/perl/5.8.8/auto/I18N/Langinfo 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/I18N/Langinfo/Langinfo.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/I18N/Langinfo/Langinfo.so 0555 root bin -f none /opt/csw/lib/perl/5.8.8/auto/I18N/Langinfo/autosplit.ix 0444 root bin -d none /opt/csw/lib/perl/5.8.8/auto/IO 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/IO/IO.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/IO/IO.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/IPC 0755 root bin -d none /opt/csw/lib/perl/5.8.8/auto/IPC/SysV 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/IPC/SysV/SysV.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/IPC/SysV/SysV.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/List 0755 root bin -d none /opt/csw/lib/perl/5.8.8/auto/List/Util 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/List/Util/Util.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/List/Util/Util.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/MIME 0755 root bin -d none /opt/csw/lib/perl/5.8.8/auto/MIME/Base64 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/MIME/Base64/Base64.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/MIME/Base64/Base64.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/NDBM_File 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/NDBM_File/NDBM_File.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/NDBM_File/NDBM_File.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/ODBM_File 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/ODBM_File/ODBM_File.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/ODBM_File/ODBM_File.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Opcode 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Opcode/Opcode.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Opcode/Opcode.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/POSIX 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/POSIX.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/POSIX.so 0555 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/abs.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/alarm.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/assert.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/atan2.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/atexit.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/atof.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/atoi.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/atol.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/autosplit.ix 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/bsearch.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/calloc.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/chdir.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/chmod.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/chown.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/clearerr.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/closedir.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/cos.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/creat.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/div.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/errno.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/execl.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/execle.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/execlp.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/execv.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/execve.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/execvp.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/exit.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/exp.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fabs.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fclose.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fcntl.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fdopen.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/feof.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/ferror.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fflush.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fgetc.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fgetpos.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fgets.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fileno.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fopen.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fork.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fprintf.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fputc.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fputs.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fread.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/free.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/freopen.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fscanf.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fseek.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fsetpos.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fstat.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fsync.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/ftell.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/fwrite.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/getc.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/getchar.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/getegid.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/getenv.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/geteuid.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/getgid.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/getgrgid.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/getgrnam.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/getgroups.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/getlogin.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/getpgrp.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/getpid.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/getppid.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/getpwnam.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/getpwuid.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/gets.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/getuid.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/gmtime.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/isatty.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/kill.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/labs.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/ldiv.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/link.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/load_imports.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/localtime.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/log.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/longjmp.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/malloc.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/memchr.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/memcmp.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/memcpy.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/memmove.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/memset.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/mkdir.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/offsetof.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/opendir.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/perror.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/pow.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/printf.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/putc.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/putchar.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/puts.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/qsort.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/raise.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/rand.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/readdir.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/realloc.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/redef.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/remove.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/rename.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/rewind.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/rewinddir.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/rmdir.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/scanf.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/setbuf.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/setjmp.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/setvbuf.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/siglongjmp.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/sigsetjmp.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/sin.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/sleep.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/sprintf.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/sqrt.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/srand.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/sscanf.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/stat.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/strcat.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/strchr.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/strcmp.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/strcpy.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/strcspn.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/strerror.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/strlen.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/strncat.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/strncmp.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/strncpy.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/strpbrk.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/strrchr.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/strspn.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/strstr.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/strtok.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/system.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/time.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/tmpfile.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/tolower.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/toupper.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/umask.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/ungetc.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/unimpl.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/unlink.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/usage.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/utime.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/vfprintf.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/vprintf.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/vsprintf.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/wait.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/POSIX/waitpid.al 0444 root bin -d none /opt/csw/lib/perl/5.8.8/auto/PerlIO 0755 root bin -d none /opt/csw/lib/perl/5.8.8/auto/PerlIO/encoding 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/PerlIO/encoding/encoding.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/PerlIO/encoding/encoding.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/PerlIO/scalar 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/PerlIO/scalar/scalar.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/PerlIO/scalar/scalar.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/PerlIO/via 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/PerlIO/via/via.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/PerlIO/via/via.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/SDBM_File 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/SDBM_File/SDBM_File.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/SDBM_File/SDBM_File.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Socket 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Socket/Socket.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Socket/Socket.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Storable 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/CAN_FLOCK.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/Storable.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/Storable.so 0555 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/_freeze.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/_retrieve.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/_store.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/_store_fd.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/autosplit.ix 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/fd_retrieve.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/freeze.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/lock_nstore.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/lock_retrieve.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/lock_store.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/logcarp.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/logcroak.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/nfreeze.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/nstore.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/nstore_fd.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/read_magic.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/retrieve.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/show_file_magic.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/store.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/store_fd.al 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Storable/thaw.al 0444 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Sys 0755 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Sys/Hostname 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Sys/Hostname/Hostname.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Sys/Hostname/Hostname.so 0555 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Sys/Hostname/autosplit.ix 0444 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Sys/Syslog 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Sys/Syslog/Syslog.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Sys/Syslog/Syslog.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Time 0755 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Time/HiRes 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Time/HiRes/HiRes.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Time/HiRes/HiRes.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Unicode 0755 root bin -d none /opt/csw/lib/perl/5.8.8/auto/Unicode/Normalize 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Unicode/Normalize/Normalize.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/Unicode/Normalize/Normalize.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/XS 0755 root bin -d none /opt/csw/lib/perl/5.8.8/auto/XS/APItest 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/XS/APItest/APItest.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/XS/APItest/APItest.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/XS/Typemap 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/XS/Typemap/Typemap.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/XS/Typemap/Typemap.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/attrs 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/attrs/attrs.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/attrs/attrs.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/re 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/re/re.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/re/re.so 0555 root bin -d none /opt/csw/lib/perl/5.8.8/auto/sdbm 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/sdbm/extralibs.ld 0444 root bin -d none /opt/csw/lib/perl/5.8.8/auto/threads 0755 root bin -d none /opt/csw/lib/perl/5.8.8/auto/threads/shared 0755 root bin -f none /opt/csw/lib/perl/5.8.8/auto/threads/shared/shared.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/threads/shared/shared.so 0555 root bin -f none /opt/csw/lib/perl/5.8.8/auto/threads/threads.bs 0444 root bin -f none /opt/csw/lib/perl/5.8.8/auto/threads/threads.so 0555 root bin -f none /opt/csw/lib/perl/5.8.8/encoding.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/lib.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/ops.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/re.pm 0444 root bin -d none /opt/csw/lib/perl/5.8.8/threads 0755 root bin -f none /opt/csw/lib/perl/5.8.8/threads.pm 0444 root bin -f none /opt/csw/lib/perl/5.8.8/threads/shared.pm 0444 root bin -d none /opt/csw/lib/perl/site_perl 0755 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/a2p.1 0644 root bin -l none /opt/csw/share/man/man1/c2ph.1=pstruct.1 -f none /opt/csw/share/man/man1/cpan.1 0644 root bin -f none /opt/csw/share/man/man1/dprofpp.1 0644 root bin -f none /opt/csw/share/man/man1/enc2xs.1 0644 root bin -f none /opt/csw/share/man/man1/find2perl.1 0644 root bin -f none /opt/csw/share/man/man1/h2ph.1 0644 root bin -f none /opt/csw/share/man/man1/h2xs.1 0644 root bin -f none /opt/csw/share/man/man1/perl.1 0644 root bin -f none /opt/csw/share/man/man1/perlbug.1 0644 root bin -f none /opt/csw/share/man/man1/perlcc.1 0644 root bin -f none /opt/csw/share/man/man1/perldoc.1 0644 root bin -f none /opt/csw/share/man/man1/perlivp.1 0644 root bin -f none /opt/csw/share/man/man1/piconv.1 0644 root bin -f none /opt/csw/share/man/man1/pl2pm.1 0644 root bin -f none /opt/csw/share/man/man1/pod2html.1 0644 root bin -f none /opt/csw/share/man/man1/pod2latex.1 0644 root bin -f none /opt/csw/share/man/man1/pod2man.1 0644 root bin -f none /opt/csw/share/man/man1/pod2text.1 0644 root bin -f none /opt/csw/share/man/man1/pod2usage.1 0644 root bin -f none /opt/csw/share/man/man1/podchecker.1 0644 root bin -f none /opt/csw/share/man/man1/podselect.1 0644 root bin -f none /opt/csw/share/man/man1/prove.1 0644 root bin -f none /opt/csw/share/man/man1/psed.1 0644 root bin -f none /opt/csw/share/man/man1/pstruct.1 0644 root bin -l none /opt/csw/share/man/man1/s2p.1=psed.1 -f none /opt/csw/share/man/man1/splain.1 0644 root bin -f none /opt/csw/share/man/man1/xsubpp.1 0644 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/5.8.8 0755 root bin -f none /opt/csw/share/perl/5.8.8/AnyDBM_File.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Attribute 0755 root bin -f none /opt/csw/share/perl/5.8.8/Attribute/Handlers.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/AutoLoader.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/AutoSplit.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/B 0755 root bin -f none /opt/csw/share/perl/5.8.8/B/assemble 0444 root bin -f none /opt/csw/share/perl/5.8.8/B/cc_harness 0444 root bin -f none /opt/csw/share/perl/5.8.8/B/disassemble 0444 root bin -f none /opt/csw/share/perl/5.8.8/B/makeliblinks 0444 root bin -f none /opt/csw/share/perl/5.8.8/Benchmark.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/CGI 0755 root bin -f none /opt/csw/share/perl/5.8.8/CGI.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/CGI/Apache.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/CGI/Carp.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/CGI/Cookie.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/CGI/Fast.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/CGI/Pretty.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/CGI/Push.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/CGI/Switch.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/CGI/Util.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/CPAN 0755 root bin -f none /opt/csw/share/perl/5.8.8/CPAN.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/CPAN/FirstTime.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/CPAN/Nox.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/CPAN/PAUSE2003.pub 0444 root bin -f none /opt/csw/share/perl/5.8.8/CPAN/SIGNATURE 0444 root bin -d none /opt/csw/share/perl/5.8.8/Carp 0755 root bin -f none /opt/csw/share/perl/5.8.8/Carp.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Carp/Heavy.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Class 0755 root bin -f none /opt/csw/share/perl/5.8.8/Class/ISA.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Class/Struct.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/DB.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/DBM_Filter 0755 root bin -f none /opt/csw/share/perl/5.8.8/DBM_Filter.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/DBM_Filter/compress.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/DBM_Filter/encode.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/DBM_Filter/int32.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/DBM_Filter/null.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/DBM_Filter/utf8.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Devel 0755 root bin -f none /opt/csw/share/perl/5.8.8/Devel/SelfStubber.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Digest 0755 root bin -f none /opt/csw/share/perl/5.8.8/Digest.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Digest/base.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Digest/file.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/DirHandle.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Dumpvalue.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Encode 0755 root bin -d none /opt/csw/share/perl/5.8.8/Encode/CN 0755 root bin -f none /opt/csw/share/perl/5.8.8/Encode/CN/HZ.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Encode/Changes.e2x 0444 root bin -f none /opt/csw/share/perl/5.8.8/Encode/ConfigLocal_PM.e2x 0444 root bin -d none /opt/csw/share/perl/5.8.8/Encode/JP 0755 root bin -f none /opt/csw/share/perl/5.8.8/Encode/JP/H2Z.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Encode/JP/JIS7.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Encode/KR 0755 root bin -f none /opt/csw/share/perl/5.8.8/Encode/KR/2022_KR.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Encode/MIME 0755 root bin -d none /opt/csw/share/perl/5.8.8/Encode/MIME/Header 0755 root bin -f none /opt/csw/share/perl/5.8.8/Encode/MIME/Header.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Encode/MIME/Header/ISO_2022_JP.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Encode/Makefile_PL.e2x 0444 root bin -f none /opt/csw/share/perl/5.8.8/Encode/PerlIO.pod 0444 root bin -f none /opt/csw/share/perl/5.8.8/Encode/README.e2x 0444 root bin -f none /opt/csw/share/perl/5.8.8/Encode/Supported.pod 0444 root bin -d none /opt/csw/share/perl/5.8.8/Encode/Unicode 0755 root bin -f none /opt/csw/share/perl/5.8.8/Encode/Unicode/UTF7.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Encode/_PM.e2x 0444 root bin -f none /opt/csw/share/perl/5.8.8/Encode/_T.e2x 0444 root bin -f none /opt/csw/share/perl/5.8.8/Encode/encode.h 0444 root bin -f none /opt/csw/share/perl/5.8.8/English.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Env.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Exporter 0755 root bin -f none /opt/csw/share/perl/5.8.8/Exporter.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Exporter/Heavy.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/ExtUtils 0755 root bin -d none /opt/csw/share/perl/5.8.8/ExtUtils/Command 0755 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/Command.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/Command/MM.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/ExtUtils/Constant 0755 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/Constant.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/Constant/Base.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/Constant/Utils.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/Constant/XS.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/Embed.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/Install.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/Installed.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/ExtUtils/Liblist 0755 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/Liblist.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/Liblist/Kid.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MANIFEST.SKIP 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MM.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MM_AIX.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MM_Any.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MM_BeOS.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MM_Cygwin.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MM_DOS.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MM_MacOS.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MM_NW5.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MM_OS2.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MM_QNX.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MM_UWIN.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MM_Unix.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MM_VMS.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MM_VOS.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MM_Win32.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MM_Win95.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MY.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/ExtUtils/MakeMaker 0755 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MakeMaker.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MakeMaker/Config.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MakeMaker/FAQ.pod 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MakeMaker/Tutorial.pod 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MakeMaker/bytes.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/MakeMaker/vmsish.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/Manifest.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/Miniperl.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/Mkbootstrap.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/Mksymlists.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/NOTES 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/PATCHING 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/Packlist.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/testlib.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/typemap 0444 root bin -f none /opt/csw/share/perl/5.8.8/ExtUtils/xsubpp 0444 root bin -f none /opt/csw/share/perl/5.8.8/Fatal.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/File 0755 root bin -f none /opt/csw/share/perl/5.8.8/File/Basename.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/File/CheckTree.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/File/Compare.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/File/Copy.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/File/DosGlob.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/File/Find.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/File/Path.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/File/Temp.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/File/stat.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/FileCache.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/FileHandle.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Filter 0755 root bin -f none /opt/csw/share/perl/5.8.8/Filter/Simple.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/FindBin.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Getopt 0755 root bin -f none /opt/csw/share/perl/5.8.8/Getopt/Long.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Getopt/Std.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Hash 0755 root bin -f none /opt/csw/share/perl/5.8.8/Hash/Util.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/I18N 0755 root bin -f none /opt/csw/share/perl/5.8.8/I18N/Collate.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/I18N/LangTags 0755 root bin -f none /opt/csw/share/perl/5.8.8/I18N/LangTags.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/I18N/LangTags/Detect.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/I18N/LangTags/List.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/IPC 0755 root bin -f none /opt/csw/share/perl/5.8.8/IPC/Open2.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/IPC/Open3.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/List 0755 root bin -f none /opt/csw/share/perl/5.8.8/List/Util.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Locale 0755 root bin -f none /opt/csw/share/perl/5.8.8/Locale/Constants.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Locale/Constants.pod 0444 root bin -f none /opt/csw/share/perl/5.8.8/Locale/Country.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Locale/Country.pod 0444 root bin -f none /opt/csw/share/perl/5.8.8/Locale/Currency.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Locale/Currency.pod 0444 root bin -f none /opt/csw/share/perl/5.8.8/Locale/Language.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Locale/Language.pod 0444 root bin -d none /opt/csw/share/perl/5.8.8/Locale/Maketext 0755 root bin -f none /opt/csw/share/perl/5.8.8/Locale/Maketext.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Locale/Maketext.pod 0444 root bin -f none /opt/csw/share/perl/5.8.8/Locale/Maketext/Guts.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Locale/Maketext/GutsLoader.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Locale/Maketext/TPJ13.pod 0444 root bin -f none /opt/csw/share/perl/5.8.8/Locale/Script.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Locale/Script.pod 0444 root bin -d none /opt/csw/share/perl/5.8.8/Math 0755 root bin -d none /opt/csw/share/perl/5.8.8/Math/BigFloat 0755 root bin -f none /opt/csw/share/perl/5.8.8/Math/BigFloat.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Math/BigFloat/Trace.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Math/BigInt 0755 root bin -f none /opt/csw/share/perl/5.8.8/Math/BigInt.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Math/BigInt/Calc.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Math/BigInt/CalcEmu.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Math/BigInt/Trace.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Math/BigRat.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Math/Complex.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Math/Trig.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Memoize 0755 root bin -f none /opt/csw/share/perl/5.8.8/Memoize.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Memoize/AnyDBM_File.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Memoize/Expire.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Memoize/ExpireFile.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Memoize/ExpireTest.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Memoize/NDBM_File.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Memoize/SDBM_File.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Memoize/Storable.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/NEXT.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Net 0755 root bin -f none /opt/csw/share/perl/5.8.8/Net/Cmd.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/Config.eg 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/Config.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/Domain.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Net/FTP 0755 root bin -f none /opt/csw/share/perl/5.8.8/Net/FTP.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/FTP/A.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/FTP/E.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/FTP/I.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/FTP/L.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/FTP/dataconn.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/Hostname.eg 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/NNTP.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/Netrc.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/POP3.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/Ping.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/SMTP.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/Time.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/hostent.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/libnetFAQ.pod 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/netent.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/protoent.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Net/servent.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/PerlIO 0755 root bin -f none /opt/csw/share/perl/5.8.8/PerlIO.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/PerlIO/via 0755 root bin -f none /opt/csw/share/perl/5.8.8/PerlIO/via/QuotedPrint.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Pod 0755 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Checker.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Find.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Functions.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Html.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/InputObjects.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/LaTeX.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Man.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/ParseLink.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/ParseUtils.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Parser.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Pod/Perldoc 0755 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Perldoc.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Perldoc/BaseTo.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Perldoc/GetOptsOO.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Perldoc/ToChecker.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Perldoc/ToMan.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Perldoc/ToNroff.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Perldoc/ToPod.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Perldoc/ToRtf.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Perldoc/ToText.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Perldoc/ToTk.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Perldoc/ToXml.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/PlainText.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Plainer.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Select.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Pod/Text 0755 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Text.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Text/Color.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Text/Overstrike.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Text/Termcap.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Pod/Usage.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Scalar 0755 root bin -f none /opt/csw/share/perl/5.8.8/Scalar/Util.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Search 0755 root bin -f none /opt/csw/share/perl/5.8.8/Search/Dict.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/SelectSaver.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/SelfLoader.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Shell.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Switch.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Symbol.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Term 0755 root bin -f none /opt/csw/share/perl/5.8.8/Term/ANSIColor.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Term/Cap.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Term/Complete.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Term/ReadLine.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Test 0755 root bin -f none /opt/csw/share/perl/5.8.8/Test.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Test/Builder 0755 root bin -f none /opt/csw/share/perl/5.8.8/Test/Builder.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Test/Builder/Module.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Test/Builder/Tester 0755 root bin -f none /opt/csw/share/perl/5.8.8/Test/Builder/Tester.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Test/Builder/Tester/Color.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Test/Harness 0755 root bin -f none /opt/csw/share/perl/5.8.8/Test/Harness.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Test/Harness/Assert.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Test/Harness/Iterator.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Test/Harness/Point.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Test/Harness/Straps.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Test/Harness/TAP.pod 0444 root bin -f none /opt/csw/share/perl/5.8.8/Test/More.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Test/Simple.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Test/Tutorial.pod 0444 root bin -d none /opt/csw/share/perl/5.8.8/Text 0755 root bin -f none /opt/csw/share/perl/5.8.8/Text/Abbrev.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Text/Balanced.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Text/ParseWords.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Text/Soundex.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Text/Tabs.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Text/Wrap.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Thread 0755 root bin -f none /opt/csw/share/perl/5.8.8/Thread.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Thread/Queue.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Thread/Semaphore.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Tie 0755 root bin -f none /opt/csw/share/perl/5.8.8/Tie/Array.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Tie/File.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Tie/Handle.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Tie/Hash.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Tie/Memoize.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Tie/RefHash.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Tie/Scalar.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Tie/SubstrHash.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Time 0755 root bin -f none /opt/csw/share/perl/5.8.8/Time/Local.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Time/gmtime.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Time/localtime.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Time/tm.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/UNIVERSAL.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/Unicode 0755 root bin -d none /opt/csw/share/perl/5.8.8/Unicode/Collate 0755 root bin -f none /opt/csw/share/perl/5.8.8/Unicode/Collate.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/Unicode/Collate/keys.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/Unicode/UCD.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/User 0755 root bin -f none /opt/csw/share/perl/5.8.8/User/grent.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/User/pwent.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/abbrev.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/assert.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/attributes.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/auto 0755 root bin -d none /opt/csw/share/perl/5.8.8/auto/POSIX 0755 root bin -d none /opt/csw/share/perl/5.8.8/auto/POSIX/SigAction 0755 root bin -f none /opt/csw/share/perl/5.8.8/auto/POSIX/SigAction/flags.al 0444 root bin -f none /opt/csw/share/perl/5.8.8/auto/POSIX/SigAction/handler.al 0444 root bin -f none /opt/csw/share/perl/5.8.8/auto/POSIX/SigAction/mask.al 0444 root bin -f none /opt/csw/share/perl/5.8.8/auto/POSIX/SigAction/safe.al 0444 root bin -f none /opt/csw/share/perl/5.8.8/autouse.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/base.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/bigfloat.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/bigint.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/bigint.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/bignum.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/bigrat.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/bigrat.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/blib.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/bytes.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/bytes_heavy.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/cacheout.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/charnames.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/complete.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/constant.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/ctime.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/dbm_filter_util.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/diagnostics.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/dotsh.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/dumpvar.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/exceptions.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/fastcwd.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/fields.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/filetest.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/find.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/finddepth.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/flush.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/getcwd.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/getopt.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/getopts.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/hostname.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/if.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/importenv.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/integer.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/less.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/locale.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/look.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/newgetopt.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/open.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/open2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/open3.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/overload.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/perl5db.pl 0444 root bin -d none /opt/csw/share/perl/5.8.8/pod 0755 root bin -f none /opt/csw/share/perl/5.8.8/pod/perldiag.pod 0644 root bin -f none /opt/csw/share/perl/5.8.8/pwd.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/shellwords.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/sigtrap.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/sort.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/stat.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/strict.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/subs.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/syslog.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/tainted.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/termcap.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/timelocal.pl 0444 root bin -d none /opt/csw/share/perl/5.8.8/unicore 0755 root bin -f none /opt/csw/share/perl/5.8.8/unicore/ArabicShaping.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/BidiMirroring.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/Blocks.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/Canonical.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/CaseFolding.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/CombiningClass.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/CompositionExclusions.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/Decomposition.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/EastAsianWidth.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/Exact.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/HangulSyllableType.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/Index.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/Jamo.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/LineBreak.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/Name.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/NamedSequences.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/NamesList.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/NormalizationCorrections.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/PVA.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/PropList.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/PropValueAliases.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/Properties 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/PropertyAliases.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/ReadMe.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/Scripts.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/SpecialCasing.txt 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/StandardizedVariants.txt 0444 root bin -d none /opt/csw/share/perl/5.8.8/unicore/To 0755 root bin -f none /opt/csw/share/perl/5.8.8/unicore/To/Digit.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/To/Fold.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/To/Lower.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/To/Title.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/To/Upper.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/UnicodeData.txt 0444 root bin -d none /opt/csw/share/perl/5.8.8/unicore/lib 0755 root bin -d none /opt/csw/share/perl/5.8.8/unicore/lib/bc 0755 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/AL.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/AN.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/B.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/BN.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/CS.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/EN.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/ES.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/ET.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/L.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/LRE.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/LRO.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/NSM.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/ON.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/PDF.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/R.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/RLE.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/RLO.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/S.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/bc/WS.pl 0444 root bin -d none /opt/csw/share/perl/5.8.8/unicore/lib/ccc 0755 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/A.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/AL.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/AR.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/ATAR.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/ATB.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/ATBL.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/B.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/BL.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/BR.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/DA.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/DB.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/IS.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/KV.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/L.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/NK.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/NR.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/OV.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/R.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ccc/VR.pl 0444 root bin -d none /opt/csw/share/perl/5.8.8/unicore/lib/dt 0755 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/dt/can.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/dt/com.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/dt/enc.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/dt/fin.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/dt/font.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/dt/fra.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/dt/init.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/dt/iso.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/dt/med.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/dt/nar.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/dt/nb.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/dt/sml.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/dt/sqr.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/dt/sub.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/dt/sup.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/dt/vert.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/dt/wide.pl 0444 root bin -d none /opt/csw/share/perl/5.8.8/unicore/lib/ea 0755 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ea/A.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ea/F.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ea/H.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ea/N.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ea/Na.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/ea/W.pl 0444 root bin -d none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc 0755 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/AHex.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/ASCII.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Alnum.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Alpha.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Alphabet.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Any.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Arab.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Armn.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/AsciiHex.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Assigned.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Beng.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/BidiC.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/BidiCont.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Blank.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Bopo.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Brai.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Bugi.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Buhd.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/C.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Canadian.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Cc.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Cf.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Cher.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Cn.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Cntrl.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Co.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Copt.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Cprt.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Cs.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Cyrl.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Dash.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Dash2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Dep.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Deprecat.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Deva.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Dia.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Diacriti.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Digit.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Dsrt.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Ethi.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Ext.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Extender.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Geor.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Glag.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Goth.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/GrLink.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Graph.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Grapheme.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Grek.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Gujr.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Guru.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Hang.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Hani.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Hano.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Hebr.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Hex.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/HexDigit.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Hira.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Hyphen.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Hyphen2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/IDSB.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/IDST.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/IdContin.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/IdStart.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Ideo.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Ideograp.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/IdsBinar.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/IdsTrina.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InAegean.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InAlphab.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InAncie2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InAncien.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InArabi2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InArabi3.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InArabi4.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InArabic.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InArmeni.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InArrows.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InBasicL.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InBengal.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InBlockE.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InBopom2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InBopomo.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InBoxDra.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InBraill.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InBugine.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InBuhid.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InByzant.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCherok.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCjkCo2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCjkCo3.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCjkCo4.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCjkCom.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCjkRad.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCjkStr.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCjkSym.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCjkUn2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCjkUn3.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCjkUni.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCombi2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCombi3.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCombi4.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCombin.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InContro.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCoptic.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCurren.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCyprio.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCyril2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InCyrill.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InDesere.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InDevana.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InDingba.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InEnclo2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InEnclos.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InEthio2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InEthio3.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InEthiop.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InGenera.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InGeomet.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InGeorg2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InGeorgi.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InGlagol.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InGothic.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InGreekA.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InGreekE.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InGujara.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InGurmuk.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InHalfwi.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InHangu2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InHangu3.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InHangul.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InHanuno.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InHebrew.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InHighPr.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InHighSu.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InHiraga.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InIdeogr.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InIpaExt.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InKanbun.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InKangxi.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InKannad.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InKatak2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InKataka.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InKharos.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InKhmer.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InKhmerS.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InLao.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InLatin1.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InLatin2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InLatin3.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InLatinE.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InLetter.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InLimbu.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InLinea2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InLinear.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InLowSur.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InMalaya.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InMathe2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InMathem.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InMisce2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InMisce3.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InMisce4.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InMisce5.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InMiscel.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InModifi.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InMongol.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InMusica.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InMyanma.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InNewTai.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InNumber.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InOgham.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InOldIta.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InOldPer.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InOptica.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InOriya.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InOsmany.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InPhone2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InPhonet.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InPrivat.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InRunic.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InShavia.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InSinhal.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InSmallF.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InSpacin.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InSpecia.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InSupers.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InSuppl2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InSuppl3.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InSuppl4.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InSuppl5.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InSuppl6.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InSupple.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InSyloti.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InSyriac.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InTagalo.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InTagban.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InTags.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InTaiLe.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InTaiXua.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InTamil.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InTelugu.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InThaana.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InThai.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InTibeta.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InTifina.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InUgarit.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InUnifie.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InVaria2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InVariat.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InVertic.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InYiRadi.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InYiSyll.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/InYijing.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/JoinC.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/JoinCont.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Kana.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Khar.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Khmr.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Knda.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/L.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/LC.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/LOE.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Laoo.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Latn.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Limb.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/LinearB.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Ll.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Lm.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Lo.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/LogicalO.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Lower.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Lowercas.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Lt.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Lu.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/M.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Math.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Mc.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Me.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Mlym.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Mn.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Mong.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Mymr.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/N.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/NChar.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Nd.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/NewTaiLu.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Nl.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/No.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Nonchara.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/OAlpha.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/ODI.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/OGrExt.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/OIDC.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/OIDS.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/OLower.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/OMath.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/OUpper.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Ogam.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/OldItali.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/OldPersi.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Orya.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Osma.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/OtherAlp.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/OtherDef.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/OtherGra.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/OtherIdC.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/OtherIdS.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/OtherLow.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/OtherMat.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/OtherUpp.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/P.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/PatSyn.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/PatWS.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/PatternS.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/PatternW.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Pc.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Pd.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Pe.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Pf.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Pi.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Po.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Print.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Ps.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Punct.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/QMark.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Qaai.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Quotatio.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Radical.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Radical2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Runr.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/S.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/SD.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/STerm.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Sc.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Shaw.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Sinh.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Sk.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Sm.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/So.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/SoftDott.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Space.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/SpacePer.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Sterm2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/SylotiNa.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Syrc.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Tagb.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/TaiLe.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Taml.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Telu.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Term.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Terminal.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Tfng.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Tglg.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Thaa.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Thai.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Tibt.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Title.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/UIdeo.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Ugar.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/UnifiedI.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Upper.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Uppercas.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/VS.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Variatio.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/WSpace.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/WhiteSpa.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Word.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/XDigit.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Yiii.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Z.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Zl.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Zp.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Zs.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/Zyyy.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/_CanonDC.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/_CaseIgn.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/gc_sc/_CombAbo.pl 0444 root bin -d none /opt/csw/share/perl/5.8.8/unicore/lib/hst 0755 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/hst/L.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/hst/LV.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/hst/LVT.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/hst/T.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/hst/V.pl 0444 root bin -d none /opt/csw/share/perl/5.8.8/unicore/lib/jt 0755 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/jt/C.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/jt/D.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/jt/R.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/jt/U.pl 0444 root bin -d none /opt/csw/share/perl/5.8.8/unicore/lib/lb 0755 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/AI.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/AL.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/B2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/BA.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/BB.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/BK.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/CB.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/CL.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/CM.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/CR.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/EX.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/GL.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/H2.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/H3.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/HY.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/ID.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/IN.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/IS.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/JL.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/JT.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/JV.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/LF.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/NL.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/NS.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/NU.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/OP.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/PO.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/PR.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/QU.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/SA.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/SG.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/SP.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/SY.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/WJ.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/XX.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/lb/ZW.pl 0444 root bin -d none /opt/csw/share/perl/5.8.8/unicore/lib/nt 0755 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/nt/De.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/nt/Di.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/lib/nt/Nu.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/mktables 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/mktables.lst 0444 root bin -f none /opt/csw/share/perl/5.8.8/unicore/version 0444 root bin -f none /opt/csw/share/perl/5.8.8/utf8.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/utf8_heavy.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/validate.pl 0444 root bin -f none /opt/csw/share/perl/5.8.8/vars.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/vmsish.pm 0444 root bin -d none /opt/csw/share/perl/5.8.8/warnings 0755 root bin -f none /opt/csw/share/perl/5.8.8/warnings.pm 0444 root bin -f none /opt/csw/share/perl/5.8.8/warnings/register.pm 0444 root bin Deleted: csw/mgar/pkg/perl/trunk/files/CSWperldoc.depend =================================================================== --- csw/mgar/pkg/perl/trunk/files/CSWperldoc.depend 2009-11-12 11:29:27 UTC (rev 7240) +++ csw/mgar/pkg/perl/trunk/files/CSWperldoc.depend 2009-11-12 12:17:41 UTC (rev 7241) @@ -1 +0,0 @@ -P CSWperl perl - A high-level, general-purpose programming language. Deleted: csw/mgar/pkg/perl/trunk/files/CSWperldoc.gspec =================================================================== --- csw/mgar/pkg/perl/trunk/files/CSWperldoc.gspec 2009-11-12 11:29:27 UTC (rev 7240) +++ csw/mgar/pkg/perl/trunk/files/CSWperldoc.gspec 2009-11-12 12:17:41 UTC (rev 7241) @@ -1,6 +0,0 @@ -%var bitname perldoc -%var pkgname CSWperldoc -%var arch all -%include url file://%{PKGLIB}/csw_standard.gspec -%var desc Perl documentation -%copyright url file://%{WORKSRC}/Copying Deleted: csw/mgar/pkg/perl/trunk/files/CSWperldoc.prototype =================================================================== --- csw/mgar/pkg/perl/trunk/files/CSWperldoc.prototype 2009-11-12 11:29:27 UTC (rev 7240) +++ csw/mgar/pkg/perl/trunk/files/CSWperldoc.prototype 2009-11-12 12:17:41 UTC (rev 7241) @@ -1,641 +0,0 @@ -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/instmodsh.1 0644 root bin -f none /opt/csw/share/man/man1/libnetcfg.1 0644 root bin -f none /opt/csw/share/man/man1/perl5004delta.1 0644 root bin -f none /opt/csw/share/man/man1/perl5005delta.1 0644 root bin @@ 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 bonivart at users.sourceforge.net Thu Nov 12 14:56:34 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 12 Nov 2009 13:56:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[7242] csw/mgar/pkg/perl/trunk/Makefile Message-ID: Revision: 7242 http://gar.svn.sourceforge.net/gar/?rev=7242&view=rev Author: bonivart Date: 2009-11-12 13:56:34 +0000 (Thu, 12 Nov 2009) Log Message: ----------- perl: add I-deps Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2009-11-12 12:17:41 UTC (rev 7241) +++ csw/mgar/pkg/perl/trunk/Makefile 2009-11-12 13:56:34 UTC (rev 7242) @@ -21,6 +21,7 @@ ARCHALL_CSWperldoc = 1 REQUIRED_PKGS_CSWperl = CSWbdb47 CSWgdbm REQUIRED_PKGS_CSWperldoc = CSWperl +INCOMPATIBLE_PKGS_CSWperl = CSWperlmods CSWpmdigest CSWpmi18nlangtags SPKG_DESC_CSWperl = $(DESCRIPTION) SPKG_DESC_CSWperldoc = Perl 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 Thu Nov 12 16:04:29 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Nov 2009 15:04:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[7243] csw/mgar/pkg/wireshark/trunk Message-ID: Revision: 7243 http://gar.svn.sourceforge.net/gar/?rev=7243&view=rev Author: dmichelsen Date: 2009-11-12 15:04:29 +0000 (Thu, 12 Nov 2009) Log Message: ----------- wireshark: Some more fixes Modified Paths: -------------- csw/mgar/pkg/wireshark/trunk/Makefile csw/mgar/pkg/wireshark/trunk/checksums Modified: csw/mgar/pkg/wireshark/trunk/Makefile =================================================================== --- csw/mgar/pkg/wireshark/trunk/Makefile 2009-11-12 13:56:34 UTC (rev 7242) +++ csw/mgar/pkg/wireshark/trunk/Makefile 2009-11-12 15:04:29 UTC (rev 7243) @@ -1,9 +1,12 @@ GARNAME = wireshark -GARVERSION = 1.2.2 +GARVERSION = 1.2.3 CATEGORIES = apps DESCRIPTION = Wireshark (was Ethereal) is a free network protocol analyzer define BLURB + Wireshark is the world's foremost network protocol analyzer, and is the + de facto (and often de jure) standard across many industries and + educational institutions. endef MASTER_SITES = $(SF_MIRRORS) @@ -17,7 +20,11 @@ #SED = /opt/csw/bin/gsed #EXTRA_COMMON_EXPORTS = SED -EXTRA_INC = /opt/csw/include/gtk-2.0 +#EXTRA_INC = $(prefix)/X11/include +#EXTRA_LIB = $(prefix)/X11/lib +#EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +EXTRA_INC += /opt/csw/include/gtk-2.0 EXTRA_INC += /opt/csw/lib/gtk-2.0/include EXTRA_INC += /opt/csw/include/glib-2.0 EXTRA_INC += /opt/csw/lib/glib-2.0/include @@ -25,7 +32,7 @@ EXTRA_INC += /opt/csw/include/pango-1.0 EXTRA_INC += /opt/csw/include/atk-1.0 -EXTRA_LINKER_FLAGS = -lgtk-x11-2.0 +EXTRA_LINKER_FLAGS = -lgtk-x11-2.0 -lX11 /usr/openwin/lib/libXext.so CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/wireshark/trunk/checksums =================================================================== --- csw/mgar/pkg/wireshark/trunk/checksums 2009-11-12 13:56:34 UTC (rev 7242) +++ csw/mgar/pkg/wireshark/trunk/checksums 2009-11-12 15:04:29 UTC (rev 7243) @@ -1 +1 @@ -bb5c09b8cffd461ced4d3251fddb217b wireshark-1.2.2.tar.bz2 +c2dfc197e485a0b0072ca64b8ac4d24c wireshark-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 Thu Nov 12 16:09:10 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Nov 2009 15:09:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7244] csw/mgar/gar/v2 Message-ID: Revision: 7244 http://gar.svn.sourceforge.net/gar/?rev=7244&view=rev Author: dmichelsen Date: 2009-11-12 15:09:10 +0000 (Thu, 12 Nov 2009) Log Message: ----------- mGAR v2: Add support for inline-definitions of cswusergroup, cswinetdconf and cswetcservices 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 2009-11-12 15:04:29 UTC (rev 7243) +++ csw/mgar/gar/v2/gar.mk 2009-11-12 15:09:10 UTC (rev 7244) @@ -710,7 +710,7 @@ # The basic merge merges the compiles for all ISAs on the current architecture -merge: checksum pre-merge merge-do merge-license merge-migrateconf $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) post-merge +merge: checksum pre-merge merge-do merge-license merge-classutils $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) post-merge @$(DONADA) merge-do: $(if $(PARALLELMODULATIONS),merge-parallel,merge-sequential) @@ -786,7 +786,7 @@ .PHONY: remerge reset-merge reset-merge-modulated remerge: reset-merge merge -reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-migrateconf reset-merge-src +reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-classutils reset-merge-src @rm -f $(COOKIEDIR)/pre-merge $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge $(COOKIEDIR)/post-merge @rm -rf $(PKGROOT) @$(DONADA) Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-11-12 15:04:29 UTC (rev 7243) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-11-12 15:09:10 UTC (rev 7244) @@ -167,6 +167,15 @@ MIGRATECONF ?= $(strip $(foreach S,$(SPKG_SPECS),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),/etc/opt/csw/pkg/$S/cswmigrateconf))) +# It is NOT sufficient to change the pathes here, they must be adjusted in merge-* also +_USERGROUP_FILES ?= $(strip $(foreach S,$(SPKG_SPECS),$(if $(value $(S)_usergroup),/etc/opt/csw/pkg/$S/cswusergroup))) +_INETDCONF_FILES ?= $(strip $(foreach S,$(SPKG_SPECS),$(if $(value $(S)_inetdconf),/etc/opt/csw/pkg/$S/inetd.conf))) +_ETCSERVICES_FILES ?= $(strip $(foreach S,$(SPKG_SPECS),$(if $(value $(S)_etcservices),/etc/opt/csw/pkg/$S/services))) + +USERGROUP += $(_USERGROUP_FILES) +INETDCONF += $(_INETDCONF_FILES) +ETCSERVICES += $(_ETCSERVICES_FILES) + # NOTE: Order _can_ be important here. cswinitsmf and cswinetd should # always be the last two added. The reason for this is that # you need to ensure any binaries and config files are already on disk @@ -580,6 +589,10 @@ reset-merge-license: @rm -f $(COOKIEDIR)/merge-license $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-license-$(SPEC)) +merge-classutils: merge-migrateconf merge-usergroup merge-inetdconf merge-etcservices + +reset-merge-classutils: reset-merge-migrateconf reset-merge-usergroup reset-merge-inetdconf reset-merge-etcservices + merge-migrateconf: $(foreach S,$(SPKG_SPECS),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),merge-migrateconf-$S)) @$(MAKECOOKIE) @@ -602,6 +615,43 @@ reset-merge-migrateconf: @rm -f $(COOKIEDIR)/merge-migrateconf $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-migrateconf-$(SPEC)) +_show_classutilvar//%: + $($*) + +merge-usergroup: $(foreach S,$(SPKG_SPECS),$(if $(value $(S)_usergroup),merge-usergroup-$S)) + @$(MAKECOOKIE) + +merge-usergroup-%: + @echo "[ Generating cswusergroup for package $* ]" + $(_DBG)ginstall -d $(PKGROOT)/etc/opt/csw/pkg/$* + $(_DBG)$(MAKE) --no-print-directory -n _show_classutilvar//$*_usergroup >$(PKGROOT)/etc/opt/csw/pkg/$*/cswusergroup + @$(MAKECOOKIE) + +reset-merge-usergroup: + @rm -f $(COOKIEDIR)/merge-usergroup $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-usergroup-$(SPEC)) + +merge-inetdconf: $(foreach S,$(SPKG_SPECS),$(if $(value $(S)_inetdconf),merge-inetdconf-$S)) + +merge-inetdconf-%: + @echo "[ Generating inetd.conf for package $* ]" + $(_DBG)ginstall -d $(PKGROOT)/etc/opt/csw/pkg/$* + $(_DBG)$(MAKE) --no-print-directory -n _show_classutilvar//$*_inetdconf >$(PKGROOT)/etc/opt/csw/pkg/$*/inetd.conf + @$(MAKECOOKIE) + +reset-merge-inetdconf: + @rm -f $(COOKIEDIR)/merge-inetdconf $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-inetdconf-$(SPEC)) + +merge-etcservices: $(foreach S,$(SPKG_SPECS),$(if $(value $(S)_etcservices),merge-etcservices-$S)) + +merge-etcservices-%: + @echo "[ Generating services for package $* ]" + $(_DBG)ginstall -d $(PKGROOT)/etc/opt/csw/pkg/$* + $(_DBG)$(MAKE) --no-print-directory -n _show_classutilvar//$*_etcservices >$(PKGROOT)/etc/opt/csw/pkg/$*/services + @$(MAKECOOKIE) + +reset-merge-etcservices: + @rm -f $(COOKIEDIR)/merge-etcservices $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-etcservices-$(SPEC)) + merge-src: _SRCDIR=$(PKGROOT)$(sourcedir)/$(call catalogname,$(SRCPACKAGE_BASE)) merge-src: fetch $(_DBG)mkdir -p $(_SRCDIR)/files 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 Nov 12 16:43:58 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Nov 2009 15:43:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7245] csw/mgar/pkg Message-ID: Revision: 7245 http://gar.svn.sourceforge.net/gar/?rev=7245&view=rev Author: dmichelsen Date: 2009-11-12 15:43:58 +0000 (Thu, 12 Nov 2009) Log Message: ----------- cvs2svn: Initial commit Added Paths: ----------- csw/mgar/pkg/cvs2svn/ csw/mgar/pkg/cvs2svn/branches/ csw/mgar/pkg/cvs2svn/tags/ csw/mgar/pkg/cvs2svn/trunk/ csw/mgar/pkg/cvs2svn/trunk/Makefile csw/mgar/pkg/cvs2svn/trunk/checksums csw/mgar/pkg/cvs2svn/trunk/files/ Property changes on: csw/mgar/pkg/cvs2svn/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/cvs2svn/trunk/Makefile =================================================================== --- csw/mgar/pkg/cvs2svn/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cvs2svn/trunk/Makefile 2009-11-12 15:43:58 UTC (rev 7245) @@ -0,0 +1,29 @@ +GARNAME = cvs2svn +GARVERSION = 2.3.0 +CATEGORIES = utils + +DESCRIPTION = CVS to svn/git/hg/bzr Repository Converter +define BLURB + cvs2svn is a tool for migrating a CVS repository to Subversion or git. The main design goals + are robustness and 100% data preservation. cvs2svn can convert just about any CVS repository + we've ever seen, including gcc, Mozilla, FreeBSD, KDE, GNOME... +endef + +MASTER_SITES = http://cvs2svn.tigris.org/files/documents/1462/46528/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +REQUIRED_PKGS = CSWpython + +SPKG_SOURCEURL = http://cvs2svn.tigris.org/ + +CONFIGURE_SCRIPTS = + +BUILD_ARGS = man + +TEST_TARGET = check + +include gar/category.mk + Added: csw/mgar/pkg/cvs2svn/trunk/checksums =================================================================== --- csw/mgar/pkg/cvs2svn/trunk/checksums (rev 0) +++ csw/mgar/pkg/cvs2svn/trunk/checksums 2009-11-12 15:43:58 UTC (rev 7245) @@ -0,0 +1 @@ +6c412baec974f3ff64b9145944682a15 cvs2svn-2.3.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 Nov 12 16:47:55 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Nov 2009 15:47:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[7246] csw/mgar/pkg/cvs2svn/trunk/Makefile Message-ID: Revision: 7246 http://gar.svn.sourceforge.net/gar/?rev=7246&view=rev Author: dmichelsen Date: 2009-11-12 15:47:55 +0000 (Thu, 12 Nov 2009) Log Message: ----------- cvs2svn: Use PYCOMPILE Modified Paths: -------------- csw/mgar/pkg/cvs2svn/trunk/Makefile Modified: csw/mgar/pkg/cvs2svn/trunk/Makefile =================================================================== --- csw/mgar/pkg/cvs2svn/trunk/Makefile 2009-11-12 15:43:58 UTC (rev 7245) +++ csw/mgar/pkg/cvs2svn/trunk/Makefile 2009-11-12 15:47:55 UTC (rev 7246) @@ -15,10 +15,12 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +SPKG_SOURCEURL = http://cvs2svn.tigris.org/ + +ARCHALL = 1 +PYCOMPILE = 1 REQUIRED_PKGS = CSWpython -SPKG_SOURCEURL = http://cvs2svn.tigris.org/ - CONFIGURE_SCRIPTS = BUILD_ARGS = 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 Thu Nov 12 17:23:05 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Nov 2009 16:23:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[7247] csw/mgar/pkg/cvs2svn/trunk/Makefile Message-ID: Revision: 7247 http://gar.svn.sourceforge.net/gar/?rev=7247&view=rev Author: dmichelsen Date: 2009-11-12 16:23:05 +0000 (Thu, 12 Nov 2009) Log Message: ----------- cvs2svn: Add requirements Modified Paths: -------------- csw/mgar/pkg/cvs2svn/trunk/Makefile Modified: csw/mgar/pkg/cvs2svn/trunk/Makefile =================================================================== --- csw/mgar/pkg/cvs2svn/trunk/Makefile 2009-11-12 15:47:55 UTC (rev 7246) +++ csw/mgar/pkg/cvs2svn/trunk/Makefile 2009-11-12 16:23:05 UTC (rev 7247) @@ -19,7 +19,8 @@ ARCHALL = 1 PYCOMPILE = 1 -REQUIRED_PKGS = CSWpython +REQUIRED_PKGS = CSWpython CSWrcs +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CONFIGURE_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 Thu Nov 12 17:56:46 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 12 Nov 2009 16:56:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7248] csw/mgar/pkg/cups/trunk Message-ID: Revision: 7248 http://gar.svn.sourceforge.net/gar/?rev=7248&view=rev Author: wahwah Date: 2009-11-12 16:56:46 +0000 (Thu, 12 Nov 2009) Log Message: ----------- cups: Upgrade to 1.4.2 Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile csw/mgar/pkg/cups/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cups/trunk/files/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2009-11-12 16:23:05 UTC (rev 7247) +++ csw/mgar/pkg/cups/trunk/Makefile 2009-11-12 16:56:46 UTC (rev 7248) @@ -3,7 +3,7 @@ # $Id$ GARNAME = cups -GARVERSION = 1.4.1 +GARVERSION = 1.4.2 CATEGORIES = net define BLURB @@ -51,7 +51,6 @@ PATCHFILES = 0001-cswcups-for-service-name.patch PATCHFILES += 0002-Adding-the-refcount-member-to-mime_type_t.patch PATCHFILES += 0003-Reference-counting-for-printers-only.patch -PATCHFILES += 0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch PATCHFILES += 0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch PATCHFILES += 0006-Fail-compilation-if-no-SSL-impl-chosen.patch PATCHFILES += 0007-Solaris-zone-support-in-init-script.patch Modified: csw/mgar/pkg/cups/trunk/checksums =================================================================== --- csw/mgar/pkg/cups/trunk/checksums 2009-11-12 16:23:05 UTC (rev 7247) +++ csw/mgar/pkg/cups/trunk/checksums 2009-11-12 16:56:46 UTC (rev 7248) @@ -1,11 +1,11 @@ -1e5e54a2b503cfdeeda1b683bcccab83 download/0001-cswcups-for-service-name.patch -0da4ea6bf72d61adfc4316a738b90ab5 download/0002-Adding-the-refcount-member-to-mime_type_t.patch -a80b8543633e2f9b3b1e531ac2289306 download/0003-Reference-counting-for-printers-only.patch -193912518565c7052724420e7899930b download/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch -bbf0295c76cd06b5311ac3a3467fd431 download/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch -0dd35cc0938696577104852781ec1df6 download/0006-Fail-compilation-if-no-SSL-impl-chosen.patch -44ff410e237d6f4f9f0fe650ba2c7fa0 download/0007-Solaris-zone-support-in-init-script.patch -cf6a3fe902545aac1ab2303e41c08a3e download/CSWcupsclient.preinstall -ca7718998e56c320c08a77cfefe046f6 download/CSWcupsd.postremove -cf6a3fe902545aac1ab2303e41c08a3e download/CSWcupsd.preinstall -587a58039c112ecb3c932e048c8a7b01 download/cups-1.4.1-source.tar.bz2 +1e5e54a2b503cfdeeda1b683bcccab83 0001-cswcups-for-service-name.patch +0da4ea6bf72d61adfc4316a738b90ab5 0002-Adding-the-refcount-member-to-mime_type_t.patch +a80b8543633e2f9b3b1e531ac2289306 0003-Reference-counting-for-printers-only.patch +193912518565c7052724420e7899930b 0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch +bbf0295c76cd06b5311ac3a3467fd431 0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch +0dd35cc0938696577104852781ec1df6 0006-Fail-compilation-if-no-SSL-impl-chosen.patch +44ff410e237d6f4f9f0fe650ba2c7fa0 0007-Solaris-zone-support-in-init-script.patch +cf6a3fe902545aac1ab2303e41c08a3e CSWcupsclient.preinstall +ca7718998e56c320c08a77cfefe046f6 CSWcupsd.postremove +cf6a3fe902545aac1ab2303e41c08a3e CSWcupsd.preinstall +d95e2d588e3d36e563027a963b117b1b cups-1.4.2-source.tar.bz2 Deleted: csw/mgar/pkg/cups/trunk/files/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch =================================================================== --- csw/mgar/pkg/cups/trunk/files/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch 2009-11-12 16:23:05 UTC (rev 7247) +++ csw/mgar/pkg/cups/trunk/files/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch 2009-11-12 16:56:46 UTC (rev 7248) @@ -1,25 +0,0 @@ -From df22eb20fe2b75a3a39384c11fd57194a8977a27 Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= -Date: Mon, 19 Oct 2009 13:22:37 +0100 -Subject: [PATCH] Fix for usb-unix.c, from http://www.cups.org/str.php?L3332 - ---- - backend/usb-unix.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/backend/usb-unix.c b/backend/usb-unix.c -index c749253..8ce92b9 100644 ---- a/backend/usb-unix.c -+++ b/backend/usb-unix.c -@@ -560,7 +560,7 @@ open_device(const char *uri, /* I - Device URI */ - * 'side_cb()' - Handle side-channel requests... - */ - --static void -+static int /* O - 0 on success, -1 on error */ - side_cb(int print_fd, /* I - Print file */ - int device_fd, /* I - Device file */ - int snmp_fd, /* I - SNMP socket (unused) */ --- -1.6.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 Thu Nov 12 18:45:17 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 12 Nov 2009 17:45:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[7249] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 7249 http://gar.svn.sourceforge.net/gar/?rev=7249&view=rev Author: wahwah Date: 2009-11-12 17:45:17 +0000 (Thu, 12 Nov 2009) Log Message: ----------- mysql-5.0.x: Using post-install instead of post-install-modulated 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 2009-11-12 16:56:46 UTC (rev 7248) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-11-12 17:45:17 UTC (rev 7249) @@ -152,7 +152,7 @@ include gar/category.mk -post-install-modulated: +post-install: ginstall -m 755 -d $(DESTDIR)$(localstatedir) ginstall -m 755 -d $(DESTDIR)$(datadir)/mysql/doc ginstall -m 644 $(FILEDIR)/ChangeLog $(DESTDIR)$(datadir)/mysql/doc 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 Nov 12 19:38:14 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 12 Nov 2009 18:38:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[7250] csw/mgar/pkg/pyantlrrt/trunk/Makefile Message-ID: Revision: 7250 http://gar.svn.sourceforge.net/gar/?rev=7250&view=rev Author: wahwah Date: 2009-11-12 18:38:13 +0000 (Thu, 12 Nov 2009) Log Message: ----------- pyantlr: Renaming the package in the Makefile Modified Paths: -------------- csw/mgar/pkg/pyantlrrt/trunk/Makefile Modified: csw/mgar/pkg/pyantlrrt/trunk/Makefile =================================================================== --- csw/mgar/pkg/pyantlrrt/trunk/Makefile 2009-11-12 17:45:17 UTC (rev 7249) +++ csw/mgar/pkg/pyantlrrt/trunk/Makefile 2009-11-12 18:38:13 UTC (rev 7250) @@ -2,9 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -GARNAME = pyantlrrt +GARNAME = py_antlr GARVERSION = 3.1.1 -CATEGORIES = lib +CATEGORIES = python DESCRIPTION = Python ANTLR runtime define BLURB @@ -16,28 +16,23 @@ WORKSRC = $(WORKDIR)/antlr_python_runtime-$(GARVERSION) -REQUIRED_PKGS = CSWcswclassutils CSWpython CSWpython-rt -PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWpysetuptools +PACKAGES = CSWpy-antlr +CATALOGNAME = py_antlr +PREREQUISITE_PKGS = CSWpysetuptools UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_CLASSES = none cswpycompile ARCHALL = 1 -PROTOTYPE_FILTER = awk ' \ - $$$$3 ~/.*\.py$$$$/ { $$$$2 = "pycompile" } \ - { print }' +# BUILD_SCRIPTS = $(WORKSRC)/setup.py -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = $(WORKSRC)/setup.py +# INSTALL_SCRIPTS = $(WORKSRC)/setup.py +# INSTALL_ARGS += --root=$(DESTDIR) --prefix=$(prefix) -INSTALL_SCRIPTS = $(WORKSRC)/setup.py -INSTALL_ARGS += --root=$(DESTDIR) --prefix=$(prefix) - TEST_SCRIPTS = -post-install-modulated: +include gar/category.mk + +post-install: gfind $(DESTDIR) -type f -name '*.pyc' -exec rm {} \; @$(MAKECOOKIE) - -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 Nov 12 19:44:45 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 12 Nov 2009 18:44:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[7251] csw/mgar/pkg Message-ID: Revision: 7251 http://gar.svn.sourceforge.net/gar/?rev=7251&view=rev Author: wahwah Date: 2009-11-12 18:44:45 +0000 (Thu, 12 Nov 2009) Log Message: ----------- py_antlr: Renaming the directory in GAR. Added Paths: ----------- csw/mgar/pkg/py_antlr/ Removed Paths: ------------- csw/mgar/pkg/pyantlrrt/ 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 Nov 12 21:19:46 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Nov 2009 20:19:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7252] csw/mgar/pkg Message-ID: Revision: 7252 http://gar.svn.sourceforge.net/gar/?rev=7252&view=rev Author: dmichelsen Date: 2009-11-12 20:19:46 +0000 (Thu, 12 Nov 2009) Log Message: ----------- dnstracer: Initial commit Added Paths: ----------- csw/mgar/pkg/dnstracer/ csw/mgar/pkg/dnstracer/branches/ csw/mgar/pkg/dnstracer/tags/ csw/mgar/pkg/dnstracer/trunk/ csw/mgar/pkg/dnstracer/trunk/Makefile csw/mgar/pkg/dnstracer/trunk/checksums csw/mgar/pkg/dnstracer/trunk/files/ Property changes on: csw/mgar/pkg/dnstracer/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/dnstracer/trunk/Makefile =================================================================== --- csw/mgar/pkg/dnstracer/trunk/Makefile (rev 0) +++ csw/mgar/pkg/dnstracer/trunk/Makefile 2009-11-12 20:19:46 UTC (rev 7252) @@ -0,0 +1,29 @@ +GARNAME = dnstracer +GARVERSION = 1.9 +CATEGORIES = apps + +DESCRIPTION = Trace a chain of DNS servers to the source +define BLURB + Dnstracer determines where a given Domain Name Server (DNS) gets its + information from, and follows the chain of DNS servers back to the + servers which know the data. +endef + +MASTER_SITES = http://www.mavetju.org/download/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +LICENSE = LICENSE + +SPKG_SOURCEURL = http://www.mavetju.org/unix/general.php + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --disable-ipv6 + +EXTRA_LDFLAGS = -lresolv + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/dnstracer/trunk/checksums =================================================================== --- csw/mgar/pkg/dnstracer/trunk/checksums (rev 0) +++ csw/mgar/pkg/dnstracer/trunk/checksums 2009-11-12 20:19:46 UTC (rev 7252) @@ -0,0 +1 @@ +7db73ce3070119c98049a617fe52ea84 dnstracer-1.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 Nov 12 21:44:19 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Nov 2009 20:44:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[7253] csw/mgar/pkg Message-ID: Revision: 7253 http://gar.svn.sourceforge.net/gar/?rev=7253&view=rev Author: dmichelsen Date: 2009-11-12 20:44:19 +0000 (Thu, 12 Nov 2009) Log Message: ----------- euler: Initial commit Added Paths: ----------- csw/mgar/pkg/euler/ csw/mgar/pkg/euler/branches/ csw/mgar/pkg/euler/tags/ csw/mgar/pkg/euler/trunk/ csw/mgar/pkg/euler/trunk/Makefile csw/mgar/pkg/euler/trunk/checksums csw/mgar/pkg/euler/trunk/files/ Property changes on: csw/mgar/pkg/euler/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/euler/trunk/Makefile =================================================================== --- csw/mgar/pkg/euler/trunk/Makefile (rev 0) +++ csw/mgar/pkg/euler/trunk/Makefile 2009-11-12 20:44:19 UTC (rev 7253) @@ -0,0 +1,27 @@ +GARNAME = euler +GARVERSION = 1.61.0 +CATEGORIES = apps + +DESCRIPTION = EULER interactive computing with real, complex numbers and matrices +define BLURB + This is the GTK+ based version of EULER for Unix / Linux systems. It has been ported + to GTK+ by Eric Bouchar? (bouchare dot eric at wanadoo dot fr) on the base of Dr Ren + Grothmann's X11 version. Euler was started by Dr Grothmann. He also maintains a version + for Windows systems. + + EULER is a program for quickly and interactively computing with real and complex + numbers and matrices, or with intervals, in the style of MatLab, Octave,... + It can draw and animate your functions in two and three dimensions. +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tgz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tz + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/euler/trunk/checksums =================================================================== --- csw/mgar/pkg/euler/trunk/checksums (rev 0) +++ csw/mgar/pkg/euler/trunk/checksums 2009-11-12 20:44:19 UTC (rev 7253) @@ -0,0 +1 @@ +4a45d7aaba2b73c7978e6d5623141103 euler-1.61.0.tgz 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 Nov 12 21:57:45 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 12 Nov 2009 20:57:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[7254] csw/mgar/pkg/wxwidgets/trunk Message-ID: Revision: 7254 http://gar.svn.sourceforge.net/gar/?rev=7254&view=rev Author: wahwah Date: 2009-11-12 20:57:45 +0000 (Thu, 12 Nov 2009) Log Message: ----------- wxwidgets: Enabling Solaris 9 builds, making 2.8.5 build monolithic Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/wxwidgets/trunk/ Property changes on: csw/mgar/pkg/wxwidgets/trunk ___________________________________________________________________ Modified: svn:ignore - cookies download work + cookies download work old-pkgs Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-12 20:44:19 UTC (rev 7253) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-12 20:57:45 UTC (rev 7254) @@ -12,6 +12,12 @@ wxWidgets applications look and feel native. This is because wxWidgets uses the platform's own native controls rather than emulating them. endef + +# The unicode version can't be currently built on Solaris 8. Doing separate +# builds on Solaris 8 and Solaris 9. Unicode support will start in Solaris 9. +# More details below, look for 'unicode'. +PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 solaris9-sparc solaris9-i386 + EXTRA_MODULATORS = GARVERSION MODULATIONS_GARVERSION = 2.8.5 2.8.10 MERGE_SCRIPTS_isa-i386-garversion-2.8.5 = copy-only @@ -112,11 +118,16 @@ EXTRA_LIB = /opt/csw/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +# The 2.8.5 version has been compiled as a monolithic library. Building it the +# same way for backwards compatibility. +CONFIGURE_ARGS_garversion-2.8.5 = --enable-monolithic +CONFIGURE_ARGS += $(CONFIGURE_ARGS_garversion-$(GARVERSION)) + INSTALL_SCRIPTS = wxwidgets +include gar/category.mk + install-wxwidgets: (cd $(WORKSRC); $(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) install) (cd $(WORKSRC)/contrib; $(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) install) @$(MAKECOOKIE) - -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 Fri Nov 13 00:47:43 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 12 Nov 2009 23:47:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[7255] csw/mgar/pkg/libyaml/trunk Message-ID: Revision: 7255 http://gar.svn.sourceforge.net/gar/?rev=7255&view=rev Author: wahwah Date: 2009-11-12 23:47:43 +0000 (Thu, 12 Nov 2009) Log Message: ----------- libyaml: Upgrade to 0.1.3 Modified Paths: -------------- csw/mgar/pkg/libyaml/trunk/Makefile csw/mgar/pkg/libyaml/trunk/checksums Modified: csw/mgar/pkg/libyaml/trunk/Makefile =================================================================== --- csw/mgar/pkg/libyaml/trunk/Makefile 2009-11-12 20:57:45 UTC (rev 7254) +++ csw/mgar/pkg/libyaml/trunk/Makefile 2009-11-12 23:47:43 UTC (rev 7255) @@ -3,7 +3,7 @@ # $Id$ GARNAME = libyaml -GARVERSION = 0.1.2 +GARVERSION = 0.1.3 CATEGORIES = lib DESCRIPTION = a YAML 1.1 parser and emitter written in C define BLURB Modified: csw/mgar/pkg/libyaml/trunk/checksums =================================================================== --- csw/mgar/pkg/libyaml/trunk/checksums 2009-11-12 20:57:45 UTC (rev 7254) +++ csw/mgar/pkg/libyaml/trunk/checksums 2009-11-12 23:47:43 UTC (rev 7255) @@ -1 +1 @@ -f6c9b5c2b0f6919abd79f5fd059b01dc download/yaml-0.1.2.tar.gz +b8ab9064e8e0330423fe640de76608cd download/yaml-0.1.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 Fri Nov 13 00:48:44 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 12 Nov 2009 23:48:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7256] csw/mgar/pkg/pyyaml/trunk Message-ID: Revision: 7256 http://gar.svn.sourceforge.net/gar/?rev=7256&view=rev Author: wahwah Date: 2009-11-12 23:48:44 +0000 (Thu, 12 Nov 2009) Log Message: ----------- pyyaml: Updating package names, version bump to 3.09 Modified Paths: -------------- csw/mgar/pkg/pyyaml/trunk/Makefile csw/mgar/pkg/pyyaml/trunk/checksums Modified: csw/mgar/pkg/pyyaml/trunk/Makefile =================================================================== --- csw/mgar/pkg/pyyaml/trunk/Makefile 2009-11-12 23:47:43 UTC (rev 7255) +++ csw/mgar/pkg/pyyaml/trunk/Makefile 2009-11-12 23:48:44 UTC (rev 7256) @@ -3,7 +3,7 @@ # $Header$ GARNAME = pyyaml -GARVERSION = 3.08 +GARVERSION = 3.09 CATEGORIES = python PROJ_NAME = PyYAML @@ -32,26 +32,26 @@ DISTFILES = $(PROJ_NAME)-$(GARVERSION).tar.gz WORKSRC = $(WORKDIR)/$(PROJ_NAME)-$(GARVERSION) SPKG_SOURCEURL = http://pyyaml.org/wiki/PyYAML -SPKG_CLASSES = none cswpycompile -PACKAGES = CSWpyyaml CSWpyyamlrt -CATALOGNAME_CSWpyyaml = py_pyyaml -CATALOGNAME_CSWpyyamlrt = py_pyyaml_rt +PACKAGES = CSWpy-yaml CSWpy-yaml-rt +CATALOGNAME_CSWpy-yaml = py_yaml +CATALOGNAME_CSWpy-yaml-rt = py_yaml_rt -REQUIRED_PKGS_CSWpyyamlrt = CSWpython-rt CSWlibyaml -PREREQUISITE_PKGS = CSWpython CSWlibyaml +REQUIRED_PKGS_CSWpy-yaml = CSWpython +REQUIRED_PKGS_CSWpy-yaml-rt = CSWpython-rt CSWlibyaml +PREREQUISITE_PKGS = $(REQUIRED_PKGS_CSWpy-yaml) $(REQUIRED_PKGS_CSWpy-yaml-rt) -SPKG_DESC_CSWpyyaml = YAML parser and emitter for Python -SPKG_DESC_CSWpyyamlrt = Runtime libraries for YAML parser and emitter +SPKG_DESC_CSWpy-yaml = YAML parser and emitter for Python +SPKG_DESC_CSWpy-yaml-rt = Runtime libraries for YAML parser and emitter -ARCHALL_CSWpyyaml = 1 -PKGFILES_CSWpyyamlrt = /opt/csw/lib/python/site-packages/.*\.so +ARCHALL_CSWpy-yaml = 1 +PKGFILES_CSWpy-yaml-rt = /opt/csw/lib/python/site-packages/.*\.so UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -BUILD_SCRIPTS = pyyaml +BUILD_SCRIPTS = py-yaml -build-pyyaml: +build-py-yaml: (cd $(WORKSRC); $(BUILD_ENV) python setup.py --with-libyaml build) @$(MAKECOOKIE) Modified: csw/mgar/pkg/pyyaml/trunk/checksums =================================================================== --- csw/mgar/pkg/pyyaml/trunk/checksums 2009-11-12 23:47:43 UTC (rev 7255) +++ csw/mgar/pkg/pyyaml/trunk/checksums 2009-11-12 23:48:44 UTC (rev 7256) @@ -1 +1 @@ -a4163a2017fa57f448c66815511fa555 download/PyYAML-3.08.tar.gz +f219af2361e87fdc5e85e95b84c11d87 download/PyYAML-3.09.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 Nov 13 00:55:15 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 12 Nov 2009 23:55:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[7257] csw/mgar/pkg/libyaml/trunk/Makefile Message-ID: Revision: 7257 http://gar.svn.sourceforge.net/gar/?rev=7257&view=rev Author: wahwah Date: 2009-11-12 23:55:15 +0000 (Thu, 12 Nov 2009) Log Message: ----------- libyaml: enabling 64-bit build Modified Paths: -------------- csw/mgar/pkg/libyaml/trunk/Makefile Modified: csw/mgar/pkg/libyaml/trunk/Makefile =================================================================== --- csw/mgar/pkg/libyaml/trunk/Makefile 2009-11-12 23:48:44 UTC (rev 7256) +++ csw/mgar/pkg/libyaml/trunk/Makefile 2009-11-12 23:55:15 UTC (rev 7257) @@ -14,5 +14,6 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) +BUILD64 = 1 WORKSRC = $(WORKDIR)/yaml-$(GARVERSION) 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 Fri Nov 13 00:55:55 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 12 Nov 2009 23:55:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[7258] csw/mgar/pkg/pyyaml/trunk/Makefile Message-ID: Revision: 7258 http://gar.svn.sourceforge.net/gar/?rev=7258&view=rev Author: wahwah Date: 2009-11-12 23:55:55 +0000 (Thu, 12 Nov 2009) Log Message: ----------- pyyaml: enabling 64-bit build Modified Paths: -------------- csw/mgar/pkg/pyyaml/trunk/Makefile Modified: csw/mgar/pkg/pyyaml/trunk/Makefile =================================================================== --- csw/mgar/pkg/pyyaml/trunk/Makefile 2009-11-12 23:55:15 UTC (rev 7257) +++ csw/mgar/pkg/pyyaml/trunk/Makefile 2009-11-12 23:55:55 UTC (rev 7258) @@ -44,6 +44,7 @@ SPKG_DESC_CSWpy-yaml = YAML parser and emitter for Python SPKG_DESC_CSWpy-yaml-rt = Runtime libraries for YAML parser and emitter +BUILD64 = 1 ARCHALL_CSWpy-yaml = 1 PKGFILES_CSWpy-yaml-rt = /opt/csw/lib/python/site-packages/.*\.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 Fri Nov 13 12:43:23 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 13 Nov 2009 11:43:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7259] csw/mgar/pkg/euler/trunk Message-ID: Revision: 7259 http://gar.svn.sourceforge.net/gar/?rev=7259&view=rev Author: dmichelsen Date: 2009-11-13 11:43:23 +0000 (Fri, 13 Nov 2009) Log Message: ----------- euler: Fix linkage and set dependencies Modified Paths: -------------- csw/mgar/pkg/euler/trunk/Makefile csw/mgar/pkg/euler/trunk/checksums Added Paths: ----------- csw/mgar/pkg/euler/trunk/files/0001-Remove-static-setting-of-CFLAGS.patch Modified: csw/mgar/pkg/euler/trunk/Makefile =================================================================== --- csw/mgar/pkg/euler/trunk/Makefile 2009-11-12 23:55:55 UTC (rev 7258) +++ csw/mgar/pkg/euler/trunk/Makefile 2009-11-13 11:43:23 UTC (rev 7259) @@ -16,10 +16,24 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tgz +PATCHFILES = 0001-Remove-static-setting-of-CFLAGS.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tz +REQUIRED_PKGS = CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWgtk2 +REQUIRED_PKGS += CSWlibatk CSWlibcairo CSWlibxext CSWpango +PREREQUISITE_PKGS = $(REQUIRED_PKGS) +PREREQUISITE_PKGS += CSWglib2devel CSWgtk2devel +PREREQUISITE_PKGS += CSWlibcairodevel CSWlibxextdevel CSWpangodevel + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +EXTRA_LDFLAGS = -lm /usr/openwin/lib/libXext.so + +BUILD_OVERRIDE_DIRS = CFLAGS CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/euler/trunk/checksums =================================================================== --- csw/mgar/pkg/euler/trunk/checksums 2009-11-12 23:55:55 UTC (rev 7258) +++ csw/mgar/pkg/euler/trunk/checksums 2009-11-13 11:43:23 UTC (rev 7259) @@ -1 +1,2 @@ +6a755d3f19921a0527b84e615fcfb8f6 0001-Remove-static-setting-of-CFLAGS.patch 4a45d7aaba2b73c7978e6d5623141103 euler-1.61.0.tgz Added: csw/mgar/pkg/euler/trunk/files/0001-Remove-static-setting-of-CFLAGS.patch =================================================================== --- csw/mgar/pkg/euler/trunk/files/0001-Remove-static-setting-of-CFLAGS.patch (rev 0) +++ csw/mgar/pkg/euler/trunk/files/0001-Remove-static-setting-of-CFLAGS.patch 2009-11-13 11:43:23 UTC (rev 7259) @@ -0,0 +1,43 @@ +From f860746c9111658622bf8f524c421fb9fc6a4064 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 13 Nov 2009 12:31:27 +0100 +Subject: [PATCH] Remove static setting of CFLAGS + +--- + src/Makefile.am | 4 ---- + src/Makefile.in | 4 ---- + 2 files changed, 0 insertions(+), 8 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index d061923..38006c7 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -7,10 +7,6 @@ + INCLUDES = \ + $(GTK_CFLAGS) + +-AM_CFLAGS =\ +- -Wall\ +- -O3 +- + bin_PROGRAMS = euler + + euler_SOURCES = \ +diff --git a/src/Makefile.in b/src/Makefile.in +index f4fbb7b..db80e65 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -193,10 +193,6 @@ target_alias = @target_alias@ + INCLUDES = \ + $(GTK_CFLAGS) + +-AM_CFLAGS = \ +- -Wall\ +- -O3 +- + euler_SOURCES = \ + main.c\ + binary.c\ +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Nov 13 13:34:44 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 13 Nov 2009 12:34:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7260] csw/mgar/pkg/exiftool/trunk/Makefile Message-ID: Revision: 7260 http://gar.svn.sourceforge.net/gar/?rev=7260&view=rev Author: hson Date: 2009-11-13 12:34:44 +0000 (Fri, 13 Nov 2009) Log Message: ----------- exiftool: Update to 7.99 Modified Paths: -------------- csw/mgar/pkg/exiftool/trunk/Makefile Modified: csw/mgar/pkg/exiftool/trunk/Makefile =================================================================== --- csw/mgar/pkg/exiftool/trunk/Makefile 2009-11-13 11:43:23 UTC (rev 7259) +++ csw/mgar/pkg/exiftool/trunk/Makefile 2009-11-13 12:34:44 UTC (rev 7260) @@ -1,5 +1,5 @@ GARNAME = exiftool -GARVERSION = 7.93 +GARVERSION = 7.99 CATEGORIES = cpan DESCRIPTION = Read, Write and Edit Image File Meta Information This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Nov 13 13:37:46 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 13 Nov 2009 12:37:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7261] csw/mgar/pkg/exiftool/trunk/checksums Message-ID: Revision: 7261 http://gar.svn.sourceforge.net/gar/?rev=7261&view=rev Author: hson Date: 2009-11-13 12:37:46 +0000 (Fri, 13 Nov 2009) Log Message: ----------- exiftool: commit checksum file Modified Paths: -------------- csw/mgar/pkg/exiftool/trunk/checksums Modified: csw/mgar/pkg/exiftool/trunk/checksums =================================================================== --- csw/mgar/pkg/exiftool/trunk/checksums 2009-11-13 12:34:44 UTC (rev 7260) +++ csw/mgar/pkg/exiftool/trunk/checksums 2009-11-13 12:37:46 UTC (rev 7261) @@ -1,2 +1,2 @@ 13f9aae615a5de5e3c145b374950a75c download/CSWexiftool.gspec -da1077cc9a8910f38b97cf5475a37360 download/Image-ExifTool-7.93.tar.gz +f397ee071a01104e6c68da43f3bdd372 download/Image-ExifTool-7.99.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 Nov 13 15:02:34 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 13 Nov 2009 14:02:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[7262] csw/mgar/pkg/tightvnc/trunk/files/cswvncserver Message-ID: Revision: 7262 http://gar.svn.sourceforge.net/gar/?rev=7262&view=rev Author: wahwah Date: 2009-11-13 14:02:32 +0000 (Fri, 13 Nov 2009) Log Message: ----------- vncserver: Fixing a startup script bug Modified Paths: -------------- csw/mgar/pkg/tightvnc/trunk/files/cswvncserver Modified: csw/mgar/pkg/tightvnc/trunk/files/cswvncserver =================================================================== --- csw/mgar/pkg/tightvnc/trunk/files/cswvncserver 2009-11-13 12:37:46 UTC (rev 7261) +++ csw/mgar/pkg/tightvnc/trunk/files/cswvncserver 2009-11-13 14:02:32 UTC (rev 7262) @@ -30,6 +30,7 @@ stop() { echo "Shutting down $prog: " + RETVAL=0 for display in ${VNCSERVERS} do echo "${display} " 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 Nov 13 15:03:33 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 13 Nov 2009 14:03:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[7263] csw/mgar/pkg/tightvnc/trunk/files/cswvncserver Message-ID: Revision: 7263 http://gar.svn.sourceforge.net/gar/?rev=7263&view=rev Author: wahwah Date: 2009-11-13 14:03:33 +0000 (Fri, 13 Nov 2009) Log Message: ----------- vncserver: startup script standarizing on spaces Modified Paths: -------------- csw/mgar/pkg/tightvnc/trunk/files/cswvncserver Modified: csw/mgar/pkg/tightvnc/trunk/files/cswvncserver =================================================================== --- csw/mgar/pkg/tightvnc/trunk/files/cswvncserver 2009-11-13 14:02:32 UTC (rev 7262) +++ csw/mgar/pkg/tightvnc/trunk/files/cswvncserver 2009-11-13 14:03:33 UTC (rev 7263) @@ -1,9 +1,10 @@ #!/opt/csw/bin/bash +# vim:set ft=4 sw=4 sts=4 expandtab: # # $Id$ # # description: Starts and stops vncserver. \ -# used to provide remote X administration services. +# used to provide remote X administration services. VNCSERVERS="" ARGS="" @@ -34,7 +35,7 @@ for display in ${VNCSERVERS} do echo "${display} " - su ${display##*:} -c "vncserver -kill :${display%%:*} >/dev/null 2>&1" + su ${display##*:} -c "vncserver -kill :${display%%:*} >/dev/null 2>&1" RETVAL=$? done [ "$RETVAL" -eq 0 ] && rm -f /var/spool/locks/vncserver @@ -43,23 +44,23 @@ # See how we were called. case "$1" in start) - start - ;; + start + ;; stop) - stop - ;; + stop + ;; restart|reload) - stop - start - ;; + stop + start + ;; condrestart) - if [ -f /var/spool/locks/vncserver ]; then - stop - start - fi - ;; + if [ -f /var/spool/locks/vncserver ]; then + stop + start + fi + ;; *) - echo $"Usage: $0 {start|stop|restart|condrestart}" - exit 1 + echo $"Usage: $0 {start|stop|restart|condrestart}" + 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 Fri Nov 13 15:25:08 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 13 Nov 2009 14:25:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[7264] csw/mgar/pkg/libfaac/trunk Message-ID: Revision: 7264 http://gar.svn.sourceforge.net/gar/?rev=7264&view=rev Author: dmichelsen Date: 2009-11-13 14:25:08 +0000 (Fri, 13 Nov 2009) Log Message: ----------- libfaac: Add 64 bit support Modified Paths: -------------- csw/mgar/pkg/libfaac/trunk/Makefile csw/mgar/pkg/libfaac/trunk/checksums Modified: csw/mgar/pkg/libfaac/trunk/Makefile =================================================================== --- csw/mgar/pkg/libfaac/trunk/Makefile 2009-11-13 14:03:33 UTC (rev 7263) +++ csw/mgar/pkg/libfaac/trunk/Makefile 2009-11-13 14:25:08 UTC (rev 7264) @@ -4,7 +4,7 @@ DESCRIPTION = AAC encoder library and tool define BLURB - FAAC is an open source MPEG-4 and MPEG-2 AAC encoder + FAAC is an open source MPEG-4 and MPEG-2 AAC encoder endef SF_PROJ = faac @@ -28,8 +28,12 @@ PATCHFILES += input.c.diff ltp.c.diff mp4property.h.diff mp4util.h.diff PATCHFILES += mpeg4ip.h.diff psych.h.diff +BUILD64 = 1 +NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check +MERGE_DIRS_isa-extra = $(libdir) + include gar/category.mk Modified: csw/mgar/pkg/libfaac/trunk/checksums =================================================================== --- csw/mgar/pkg/libfaac/trunk/checksums 2009-11-13 14:03:33 UTC (rev 7263) +++ csw/mgar/pkg/libfaac/trunk/checksums 2009-11-13 14:25:08 UTC (rev 7264) @@ -1,16 +1,16 @@ -c5dde68840cefe46532089c9392d1df0 download/faac-1.28.tar.bz2 -eb7e2cee261c71ac4a8d718b5498777e download/Makefile.in.frontend.diff -3d7c0f7936dcc1c4833d693860720adf download/Makefile.in.common.mp4v2.diff -19f2eebe3df5300ab4a1a16e43593663 download/aacquant.c.diff -2af64ce38f023774fb0c8f691b98c564 download/aacquant.h.diff -ea8508703521e663e637382231d4c13b download/config.h.in.diff -027ebf052052128c67f0749e610f4acb download/configure.diff -56f2c5e28e1177e3b6956aaf83a10e13 download/faac.h.diff -268d60a6a1304fa1758a962a20731c1c download/faaccfg.h.diff -29fe6485d9ebe7fd0892c18ed450bac5 download/frame.h.diff -a4e382e8b7123a144c1cf1c10a7e1725 download/input.c.diff -bf65a158a69527826c5e9fff74d10e83 download/ltp.c.diff -dee39c5250880eb427a11269ececa205 download/mp4property.h.diff -e97db55385453a0482ab2673056d4022 download/mp4util.h.diff -ff5300984a0b097a08d66cb39d8a3ef0 download/mpeg4ip.h.diff -46b44023ce14bce4f0ed981ee5514c5c download/psych.h.diff +3d7c0f7936dcc1c4833d693860720adf Makefile.in.common.mp4v2.diff +eb7e2cee261c71ac4a8d718b5498777e Makefile.in.frontend.diff +19f2eebe3df5300ab4a1a16e43593663 aacquant.c.diff +2af64ce38f023774fb0c8f691b98c564 aacquant.h.diff +ea8508703521e663e637382231d4c13b config.h.in.diff +027ebf052052128c67f0749e610f4acb configure.diff +c5dde68840cefe46532089c9392d1df0 faac-1.28.tar.bz2 +56f2c5e28e1177e3b6956aaf83a10e13 faac.h.diff +268d60a6a1304fa1758a962a20731c1c faaccfg.h.diff +29fe6485d9ebe7fd0892c18ed450bac5 frame.h.diff +a4e382e8b7123a144c1cf1c10a7e1725 input.c.diff +bf65a158a69527826c5e9fff74d10e83 ltp.c.diff +dee39c5250880eb427a11269ececa205 mp4property.h.diff +e97db55385453a0482ab2673056d4022 mp4util.h.diff +ff5300984a0b097a08d66cb39d8a3ef0 mpeg4ip.h.diff +46b44023ce14bce4f0ed981ee5514c5c psych.h.diff 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 Nov 13 15:51:25 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 13 Nov 2009 14:51:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7265] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswpycompile Message-ID: Revision: 7265 http://gar.svn.sourceforge.net/gar/?rev=7265&view=rev Author: bdwalton Date: 2009-11-13 14:51:25 +0000 (Fri, 13 Nov 2009) Log Message: ----------- cswclassutils: correct exception handling for python compilation Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile 2009-11-13 14:25:08 UTC (rev 7264) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile 2009-11-13 14:51:25 UTC (rev 7265) @@ -49,7 +49,7 @@ for f in pyfiles: try: py_compile.compile(f, doraise=True) - except PyCompileError: + except py_compile.PyCompileError: print "Error compiling: %s" % f EOF 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 Nov 13 16:06:19 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 13 Nov 2009 15:06:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[7266] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswpycompile Message-ID: Revision: 7266 http://gar.svn.sourceforge.net/gar/?rev=7266&view=rev Author: bdwalton Date: 2009-11-13 15:06:19 +0000 (Fri, 13 Nov 2009) Log Message: ----------- cswclassutils: pycompile -> make python only warn about space/tab mix instead of error out Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile 2009-11-13 14:51:25 UTC (rev 7265) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile 2009-11-13 15:06:19 UTC (rev 7266) @@ -61,10 +61,10 @@ fi echo "Compiling py files to normal bytecode ..." -${PY_BINDIR}/python -Wi -tt $TMPPY +${PY_BINDIR}/python -Wi -t $TMPPY echo "Compiling py files to optimized bytecode ..." -${PY_BINDIR}/python -Wi -tt -O $TMPPY +${PY_BINDIR}/python -Wi -t -O $TMPPY rm $TMPPY 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 Nov 13 16:14:12 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 13 Nov 2009 15:14:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7267] csw/mgar/pkg Message-ID: Revision: 7267 http://gar.svn.sourceforge.net/gar/?rev=7267&view=rev Author: bonivart Date: 2009-11-13 15:14:11 +0000 (Fri, 13 Nov 2009) Log Message: ----------- spamass-milter: initial checkin Added Paths: ----------- csw/mgar/pkg/spamass-milter/ csw/mgar/pkg/spamass-milter/branches/ csw/mgar/pkg/spamass-milter/tags/ csw/mgar/pkg/spamass-milter/trunk/ csw/mgar/pkg/spamass-milter/trunk/Makefile csw/mgar/pkg/spamass-milter/trunk/checksums csw/mgar/pkg/spamass-milter/trunk/files/ csw/mgar/pkg/spamass-milter/trunk/files/COPYING Property changes on: csw/mgar/pkg/spamass-milter/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/spamass-milter/trunk/Makefile =================================================================== --- csw/mgar/pkg/spamass-milter/trunk/Makefile (rev 0) +++ csw/mgar/pkg/spamass-milter/trunk/Makefile 2009-11-13 15:14:11 UTC (rev 7267) @@ -0,0 +1,36 @@ +GARNAME = spamass-milter +GARVERSION = 0.3.1 +CATEGORIES = net + +DESCRIPTION = Plugin for the Sendmail Milter library for SpamAssassin +define BLURB + Plugin for the Sendmail Milter library for SpamAssassin +endef + +MASTER_SITES = http://mirrors.aixtools.net/sv/spamass-milt/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += COPYING + +PACKAGES = CSWspamass-milter +CATALOGNAME = spamass_milter +REQUIRED_PKGS = CSWspamassassin + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + +DOCLIST = AUTHORS Changelog NEWS README TODO + +install-custom: + @echo " ==> Installing $(GARNAME) (custom)" + @( cd $(WORKSRC) ; \ + gmake DESTDIR=$(DESTDIR) install ) + @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME) + @$(foreach DOC,$(DOCLIST),ginstall -m 444 $(WORKSRC)/$(DOC) $(DESTDIR)$(docdir)/$(GARNAME);) + @$(MAKECOOKIE) Added: csw/mgar/pkg/spamass-milter/trunk/checksums =================================================================== --- csw/mgar/pkg/spamass-milter/trunk/checksums (rev 0) +++ csw/mgar/pkg/spamass-milter/trunk/checksums 2009-11-13 15:14:11 UTC (rev 7267) @@ -0,0 +1,2 @@ +751419260aa954499f7abaabaa882bbe COPYING +ca6bf6a9c88db74a6bfea41f499c0ba6 spamass-milter-0.3.1.tar.gz Added: csw/mgar/pkg/spamass-milter/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/spamass-milter/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/spamass-milter/trunk/files/COPYING 2009-11-13 15:14:11 UTC (rev 7267) @@ -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. 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 Nov 13 16:18:10 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 13 Nov 2009 15:18:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7268] csw/mgar/pkg/cswclassutils/trunk/Makefile Message-ID: Revision: 7268 http://gar.svn.sourceforge.net/gar/?rev=7268&view=rev Author: bonivart Date: 2009-11-13 15:18:09 +0000 (Fri, 13 Nov 2009) Log Message: ----------- cswclassutils: update to 1.29, fixed i.cswpycompile Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-11-13 15:14:11 UTC (rev 7267) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-11-13 15:18:09 UTC (rev 7268) @@ -1,7 +1,7 @@ # $Id$ GARNAME = cswclassutils -GARVERSION = 1.28 +GARVERSION = 1.29 CATEGORIES = utils DESCRIPTION = CSW class action utilities This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Nov 13 16:22:12 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 13 Nov 2009 15:22:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7269] csw/mgar/pkg/cswclassutils/trunk/checksums Message-ID: Revision: 7269 http://gar.svn.sourceforge.net/gar/?rev=7269&view=rev Author: bonivart Date: 2009-11-13 15:22:12 +0000 (Fri, 13 Nov 2009) Log Message: ----------- cswclassutils: update checksums Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/checksums Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2009-11-13 15:18:09 UTC (rev 7268) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2009-11-13 15:22:12 UTC (rev 7269) @@ -6,7 +6,7 @@ fa318ca696e80a9a9f2efbf35cb69080 CSWcswclassutils.i.cswinitsmf 42668b41c7c886091a8ca44992b90806 CSWcswclassutils.i.cswmigrateconf c875d62c8ddaad0de2e18fff7946e1e8 CSWcswclassutils.i.cswpreserveconf -927297d22360707afd804c4ce58ed0a9 CSWcswclassutils.i.cswpycompile +9018419febe06c12e89d66cc76e7261f CSWcswclassutils.i.cswpycompile 1282bef941c49d98a061b3701a1fda7c CSWcswclassutils.i.cswtexinfo 7f04b24b421f3afbf3c61845941ef5dd CSWcswclassutils.i.cswusergroup d278a28a6f901c4ff5f07c583b4cff3d CSWcswclassutils.r.cswcpsampleconf 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 Nov 13 16:22:58 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 13 Nov 2009 15:22:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7270] csw/mgar/pkg Message-ID: Revision: 7270 http://gar.svn.sourceforge.net/gar/?rev=7270&view=rev Author: dmichelsen Date: 2009-11-13 15:22:57 +0000 (Fri, 13 Nov 2009) Log Message: ----------- gcpio: Initial checkin Modified Paths: -------------- csw/mgar/pkg/gcpio/trunk/Makefile csw/mgar/pkg/gcpio/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gcpio/ csw/mgar/pkg/gcpio/trunk/files/non-gnu-compiler.patch Modified: csw/mgar/pkg/gcpio/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtar/trunk/Makefile 2009-05-27 21:50:22 UTC (rev 5079) +++ csw/mgar/pkg/gcpio/trunk/Makefile 2009-11-13 15:22:57 UTC (rev 7270) @@ -1,35 +1,31 @@ -GARNAME = tar -GARVERSION = 1.22 +GARNAME = cpio +GARVERSION = 2.10 CATEGORIES = utils -DESCRIPTION = GNU tape archiver +DESCRIPTION = GNU cpio define BLURB - GNU 'tar' saves many files together into a single tape or disk archive, - and can restore individual files from the archive. It includes - multivolume support, the ability to archive sparse files, automatic - archive compression/decompression, remote archives and special features - that allow 'tar' to be used for incremental and full backups. This - distribution also includes 'rmt', the remote tape server. The 'mt' tape - drive control program is in the GNU 'cpio' distribution. GNU 'tar' is - derived from John Gilmore's public domain 'tar'. endef MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PACKAGES = CSWgtar +# From http://bugs.gentoo.org/275295 +PATCHFILES = non-gnu-compiler.patch +PATCHDIRLEVEL = 0 +PACKAGES = CSWgcpio + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_SOURCEURL = http://www.gnu.org/software/tar/ +SPKG_SOURCEURL = http://www.gnu.org/software/cpio/ -REQUIRED_PKGS = CSWggettextrt CSWiconv +REQUIRED_PKGS = NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) --program-prefix=g TEST_SCRIPTS = -EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias +#EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias include gar/category.mk Modified: csw/mgar/pkg/gcpio/trunk/checksums =================================================================== --- csw/mgar/pkg/gtar/trunk/checksums 2009-05-27 21:50:22 UTC (rev 5079) +++ csw/mgar/pkg/gcpio/trunk/checksums 2009-11-13 15:22:57 UTC (rev 7270) @@ -1 +1,2 @@ -efafad1b256e3de410f4fce5335d9c9d download/tar-1.22.tar.gz +351ab3d38d8949913e478cc23b9d6ad4 cpio-2.10.tar.gz +ff86aab1185277a2ae53928e4bd01692 non-gnu-compiler.patch Added: csw/mgar/pkg/gcpio/trunk/files/non-gnu-compiler.patch =================================================================== --- csw/mgar/pkg/gcpio/trunk/files/non-gnu-compiler.patch (rev 0) +++ csw/mgar/pkg/gcpio/trunk/files/non-gnu-compiler.patch 2009-11-13 15:22:57 UTC (rev 7270) @@ -0,0 +1,12 @@ +--- src/cpiohdr.h.dist 2009-06-24 15:41:26.983725240 +0100 ++++ src/cpiohdr.h 2009-06-24 15:41:59.753567720 +0100 +@@ -24,6 +24,8 @@ + + #ifdef HAVE_ATTRIB_PACKED + #define ATTRIB_PACKED __attribute__((packed)) ++#else ++#define ATTRIB_PACKED + #endif + + #ifdef HAVE_PRAGMA_PACK + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Nov 13 16:30:50 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 13 Nov 2009 15:30:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[7271] csw/mgar/pkg/libexif/trunk Message-ID: Revision: 7271 http://gar.svn.sourceforge.net/gar/?rev=7271&view=rev Author: hson Date: 2009-11-13 15:30:50 +0000 (Fri, 13 Nov 2009) Log Message: ----------- libexif: update to 0.6.19 Modified Paths: -------------- csw/mgar/pkg/libexif/trunk/Makefile csw/mgar/pkg/libexif/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libexif/trunk/files/exif-tag.patch Modified: csw/mgar/pkg/libexif/trunk/Makefile =================================================================== --- csw/mgar/pkg/libexif/trunk/Makefile 2009-11-13 15:22:57 UTC (rev 7270) +++ csw/mgar/pkg/libexif/trunk/Makefile 2009-11-13 15:30:50 UTC (rev 7271) @@ -1,5 +1,5 @@ GARNAME = libexif -GARVERSION = 0.6.17 +GARVERSION = 0.6.19 CATEGORIES = lib DESCRIPTION = EXIF Tag Parsing Library @@ -28,6 +28,7 @@ # UPSTREAM_MASTER_SITES = PATCHFILES = Makefile.patch +PATCHFILES += exif-tag.patch CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/libexif/trunk/checksums =================================================================== --- csw/mgar/pkg/libexif/trunk/checksums 2009-11-13 15:22:57 UTC (rev 7270) +++ csw/mgar/pkg/libexif/trunk/checksums 2009-11-13 15:30:50 UTC (rev 7271) @@ -1,2 +1,3 @@ -f7cf4e623a48c9a3b13f7f95f0a41015 download/libexif-0.6.17.tar.bz2 19e4a8ace576426613e54b5a267c2548 download/Makefile.patch +e7bf07b7e1012f6a32b17cf43389dd94 download/exif-tag.patch +56144a030a4c875c600b1ccf713f69f7 download/libexif-0.6.19.tar.bz2 Added: csw/mgar/pkg/libexif/trunk/files/exif-tag.patch =================================================================== --- csw/mgar/pkg/libexif/trunk/files/exif-tag.patch (rev 0) +++ csw/mgar/pkg/libexif/trunk/files/exif-tag.patch 2009-11-13 15:30:50 UTC (rev 7271) @@ -0,0 +1,11 @@ +--- libexif-0.6.19.orig/libexif/exif-tag.c 2009-11-08 07:13:41.000000000 +0100 ++++ libexif-0.6.19/libexif/exif-tag.c 2009-11-13 14:06:20.669421347 +0100 +@@ -870,7 +870,7 @@ + * Return the number of entries in the EXIF tag table, including the + * terminating NULL entry. + */ +-inline unsigned int ++unsigned int + exif_tag_table_count (void) + { + return sizeof (ExifTagTable) / sizeof (ExifTagTable[0]); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Nov 13 16:38:21 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 13 Nov 2009 15:38:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[7272] csw/mgar/pkg/libglade2/trunk/Makefile Message-ID: Revision: 7272 http://gar.svn.sourceforge.net/gar/?rev=7272&view=rev Author: dmichelsen Date: 2009-11-13 15:38:21 +0000 (Fri, 13 Nov 2009) Log Message: ----------- libglade2: Fix pathes to csw X11 Modified Paths: -------------- csw/mgar/pkg/libglade2/trunk/Makefile Modified: csw/mgar/pkg/libglade2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libglade2/trunk/Makefile 2009-11-13 15:30:50 UTC (rev 7271) +++ csw/mgar/pkg/libglade2/trunk/Makefile 2009-11-13 15:38:21 UTC (rev 7272) @@ -23,11 +23,18 @@ # new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -PKG_CONFIG_PATH = /opt/csw/lib/pkgconfig:/opt/csw/X11/lib/pkgconfig -EXTRA_EXPORTS = PKG_CONFIG_PATH +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -STRIP_LIBTOOL = 1 +SUNX11SUB_sparcv9 = sparcv9/ +SUNX11SUB_amd64 = amd64/ +EXTRA_LDFLAGS = -lm /usr/openwin/lib/$(SUNX11SUB_$(ISA))libXext.so + +BUILD64 = 1 +NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check + 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 Fri Nov 13 16:56:24 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 13 Nov 2009 15:56:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7273] csw/mgar/pkg/puppet/trunk Message-ID: Revision: 7273 http://gar.svn.sourceforge.net/gar/?rev=7273&view=rev Author: wahwah Date: 2009-11-13 15:56:23 +0000 (Fri, 13 Nov 2009) Log Message: ----------- puppet: Using the --single option of pkgutil Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/Makefile csw/mgar/pkg/puppet/trunk/checksums Added Paths: ----------- csw/mgar/pkg/puppet/trunk/files/0002-Using-the-single-option-of-pkgutil.patch Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2009-11-13 15:38:21 UTC (rev 7272) +++ csw/mgar/pkg/puppet/trunk/Makefile 2009-11-13 15:56:23 UTC (rev 7273) @@ -53,6 +53,7 @@ INSTALL_SCRIPTS = puppet PATCHFILES = 0001-pkgutil-support.patch +PATCHFILES += 0002-Using-the-single-option-of-pkgutil.patch include gar/category.mk Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2009-11-13 15:38:21 UTC (rev 7272) +++ csw/mgar/pkg/puppet/trunk/checksums 2009-11-13 15:56:23 UTC (rev 7273) @@ -1,5 +1,6 @@ abaa404420106f9f28e9e1218b4e365b 0001-pkgutil-support.patch -3b7da4c98895e944262ed684e48e3b08 cswpuppetd +9c27c0cdca051eae986b56b91ef889ca 0002-Using-the-single-option-of-pkgutil.patch +db0230ad9c2a8622c7f7e73c10f61dbc cswpuppetd fd5e49b7d2b7d288d5beb224d0cfa855 cswpuppetmasterd 3ab0d4f9801075bc78b68b766b496fc7 cswusergroup 288d46dee00acad64d0f3ecc6d8ba6fa puppet-0.24.8.tgz Added: csw/mgar/pkg/puppet/trunk/files/0002-Using-the-single-option-of-pkgutil.patch =================================================================== --- csw/mgar/pkg/puppet/trunk/files/0002-Using-the-single-option-of-pkgutil.patch (rev 0) +++ csw/mgar/pkg/puppet/trunk/files/0002-Using-the-single-option-of-pkgutil.patch 2009-11-13 15:56:23 UTC (rev 7273) @@ -0,0 +1,57 @@ +From bf4be0c98f180175dbadeaf3d841bd426b23752e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= +Date: Fri, 13 Nov 2009 15:44:24 +0000 +Subject: [PATCH] Using the --single option of pkgutil. + +--- + lib/puppet/provider/package/apt.rb | 1 + + lib/puppet/provider/package/pkgutil.rb | 5 ++++- + 2 files changed, 5 insertions(+), 1 deletions(-) + +diff --git a/lib/puppet/provider/package/apt.rb b/lib/puppet/provider/package/apt.rb +index a99ee4c..91e0121 100755 +--- a/lib/puppet/provider/package/apt.rb ++++ b/lib/puppet/provider/package/apt.rb +@@ -1,3 +1,4 @@ ++# vim:set sw=4 ts=4 sts=4: + Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do + # Provide sorting functionality + include Puppet::Util::Package +diff --git a/lib/puppet/provider/package/pkgutil.rb b/lib/puppet/provider/package/pkgutil.rb +index cde7482..c2489cc 100755 +--- a/lib/puppet/provider/package/pkgutil.rb ++++ b/lib/puppet/provider/package/pkgutil.rb +@@ -1,4 +1,5 @@ + # Packaging using pkgutil from http://pkgutil.wikidot.com/ ++# vim:set sw=4 ts=4 sts=4: + Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun do + desc "Package management using ``pkgutil`` command on Solaris." + pkgutil = "pkgutil" +@@ -20,6 +21,7 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d + end + end + ++ # It's a class method. Returns a list of instances of this class. + def self.instances(hash = {}) + blastlist(hash).collect do |bhash| + bhash.delete(:avail) +@@ -32,6 +34,7 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d + command = ["-c"] + + if hash[:justme] ++ command << ["--single"] + command << hash[:justme] + end + +@@ -86,7 +89,7 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d + pkgutil "-y", "--install", @resource[:name] + end + +- # Retrieve the version from the current package file. ++ # What's the latest version of the package available? + def latest + hash = self.class.blastlist(:justme => @resource[:name]) + hash[:avail] +-- +1.6.5.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 Fri Nov 13 17:17:53 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 13 Nov 2009 16:17:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[7274] csw/mgar/pkg/pyyaml/trunk/Makefile Message-ID: Revision: 7274 http://gar.svn.sourceforge.net/gar/?rev=7274&view=rev Author: wahwah Date: 2009-11-13 16:17:53 +0000 (Fri, 13 Nov 2009) Log Message: ----------- pyyaml: Disabling the 64-bit build. Modified Paths: -------------- csw/mgar/pkg/pyyaml/trunk/Makefile Modified: csw/mgar/pkg/pyyaml/trunk/Makefile =================================================================== --- csw/mgar/pkg/pyyaml/trunk/Makefile 2009-11-13 15:56:23 UTC (rev 7273) +++ csw/mgar/pkg/pyyaml/trunk/Makefile 2009-11-13 16:17:53 UTC (rev 7274) @@ -44,7 +44,6 @@ SPKG_DESC_CSWpy-yaml = YAML parser and emitter for Python SPKG_DESC_CSWpy-yaml-rt = Runtime libraries for YAML parser and emitter -BUILD64 = 1 ARCHALL_CSWpy-yaml = 1 PKGFILES_CSWpy-yaml-rt = /opt/csw/lib/python/site-packages/.*\.so 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 Nov 13 17:27:07 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 13 Nov 2009 16:27:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7275] csw/mgar/pkg/pyyaml/trunk/Makefile Message-ID: Revision: 7275 http://gar.svn.sourceforge.net/gar/?rev=7275&view=rev Author: wahwah Date: 2009-11-13 16:27:04 +0000 (Fri, 13 Nov 2009) Log Message: ----------- pyyaml: removing an explicit dependency to avoid double depends Modified Paths: -------------- csw/mgar/pkg/pyyaml/trunk/Makefile Modified: csw/mgar/pkg/pyyaml/trunk/Makefile =================================================================== --- csw/mgar/pkg/pyyaml/trunk/Makefile 2009-11-13 16:17:53 UTC (rev 7274) +++ csw/mgar/pkg/pyyaml/trunk/Makefile 2009-11-13 16:27:04 UTC (rev 7275) @@ -37,7 +37,7 @@ CATALOGNAME_CSWpy-yaml = py_yaml CATALOGNAME_CSWpy-yaml-rt = py_yaml_rt -REQUIRED_PKGS_CSWpy-yaml = CSWpython +REQUIRED_PKGS_CSWpy-yaml = REQUIRED_PKGS_CSWpy-yaml-rt = CSWpython-rt CSWlibyaml PREREQUISITE_PKGS = $(REQUIRED_PKGS_CSWpy-yaml) $(REQUIRED_PKGS_CSWpy-yaml-rt) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Nov 13 17:27:16 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 13 Nov 2009 16:27:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7276] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 7276 http://gar.svn.sourceforge.net/gar/?rev=7276&view=rev Author: bonivart Date: 2009-11-13 16:27:16 +0000 (Fri, 13 Nov 2009) Log Message: ----------- pkgutil: 1.9 beta 2 Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype csw/mgar/pkg/pkgutil/trunk/files/i.cswpkgutil csw/mgar/pkg/pkgutil/trunk/files/r.cswpkgutil Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2009-11-13 16:27:04 UTC (rev 7275) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-11-13 16:27:16 UTC (rev 7276) @@ -1,5 +1,5 @@ GARNAME = pkgutil -GARVERSION = 1.9b1 +GARVERSION = 1.9b2 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily @@ -68,6 +68,7 @@ @pod2man --section=1 $(WORKSRC)/$(GARNAME) > $(DESTDIR)$(mandir)/man1/pkgutil.1 @pod2man --section=1 $(WORKSRC)/bldcat > $(DESTDIR)$(mandir)/man1/bldcat.1 @pod2man --section=1 $(WORKSRC)/chkcat > $(DESTDIR)$(mandir)/man1/chkcat.1 + @chmod 444 $(DESTDIR)$(mandir)/man1/* @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/$(GARNAME)/packages @ginstall $(WORKSRC)/admin $(DESTDIR)/var/opt/csw/$(GARNAME)/admin.CSW @$(MAKECOOKIE) Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-11-13 16:27:04 UTC (rev 7275) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-11-13 16:27:16 UTC (rev 7276) @@ -1,5 +1,5 @@ a16c6f81bc537d6172fd65d8da1aeecc CSWpkgutil.gspec -a9bd66f3cfaef5ec3df946363e80085f CSWpkgutil.prototype -443c6cb0435cefc046629a3e68e7fe61 i.cswpkgutil +b93ce519cebdc48350eb0e2a22214827 CSWpkgutil.prototype +33f82561e1fcf3aaf22f66bac22afba1 i.cswpkgutil 15dcb525af077847f98ea51d1c6f4162 pkgutil-1.9b1.zip -c8a3a8c4ed123f229dbd60cd4722fd03 r.cswpkgutil +6d472d94ea850b600fd29aba7a6fc4b3 r.cswpkgutil Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype 2009-11-13 16:27:04 UTC (rev 7275) +++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype 2009-11-13 16:27:16 UTC (rev 7276) @@ -15,11 +15,11 @@ d none /opt/csw/share 0755 root bin d none /opt/csw/share/doc 0755 root bin d none /opt/csw/share/doc/pkgutil 0755 root bin -f none /opt/csw/share/doc/pkgutil/license 644 root bin -f none /opt/csw/share/doc/pkgutil/readme 644 root bin +f none /opt/csw/share/doc/pkgutil/license 444 root bin +f none /opt/csw/share/doc/pkgutil/readme 444 root bin d none /opt/csw/share/man 0755 root bin d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/pkgutil.1 644 root bin +f none /opt/csw/share/man/man1/pkgutil.1 444 root bin d none /var/opt/csw 0755 root bin d none /var/opt/csw/pkgutil 0755 root bin f cswpkgutil /var/opt/csw/pkgutil/admin.CSW 644 root bin Modified: csw/mgar/pkg/pkgutil/trunk/files/i.cswpkgutil =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/i.cswpkgutil 2009-11-13 16:27:04 UTC (rev 7275) +++ csw/mgar/pkg/pkgutil/trunk/files/i.cswpkgutil 2009-11-13 16:27:16 UTC (rev 7276) @@ -4,7 +4,7 @@ do cp $src $dest conf=`echo $dest | sed 's/.CSW$//'` - if [-f "$conf"]; then + if [ -f "$conf" ]; then echo "$conf already exists, will not copy $dest to it." else cp $dest $conf Modified: csw/mgar/pkg/pkgutil/trunk/files/r.cswpkgutil =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/r.cswpkgutil 2009-11-13 16:27:04 UTC (rev 7275) +++ csw/mgar/pkg/pkgutil/trunk/files/r.cswpkgutil 2009-11-13 16:27:16 UTC (rev 7276) @@ -4,9 +4,9 @@ do conf=`echo $dest | sed 's/.CSW$//'` if [ "`cmp "$conf" "$dest" > /dev/null`" ]; then - rm $conf + rm -f $conf else echo "$conf modified, will not remove it." fi - rm $dest + rm -f $dest 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 Fri Nov 13 17:36:50 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 13 Nov 2009 16:36:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[7277] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 7277 http://gar.svn.sourceforge.net/gar/?rev=7277&view=rev Author: bonivart Date: 2009-11-13 16:36:50 +0000 (Fri, 13 Nov 2009) Log Message: ----------- pkgutil: fix checksum 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 2009-11-13 16:27:16 UTC (rev 7276) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-11-13 16:36:50 UTC (rev 7277) @@ -25,6 +25,7 @@ SPKG_DESC_CSWpkgutilplus = Extends pkgutil functionality # Explicitly depend on CSWcommon here since it's not the default +#REQUIRED_PKGS_CSWpkgutilplus = CSWcommon CSWperl CSWgnupg CSWpkgutil CSWpmwwwcurl REQUIRED_PKGS_CSWpkgutilplus = CSWcommon CSWperl CSWgnupg CSWpkgutil PKGFILES_CSWpkgutilplus = .*bldcat.* Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-11-13 16:27:16 UTC (rev 7276) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-11-13 16:36:50 UTC (rev 7277) @@ -1,5 +1,5 @@ a16c6f81bc537d6172fd65d8da1aeecc CSWpkgutil.gspec b93ce519cebdc48350eb0e2a22214827 CSWpkgutil.prototype 33f82561e1fcf3aaf22f66bac22afba1 i.cswpkgutil -15dcb525af077847f98ea51d1c6f4162 pkgutil-1.9b1.zip +2d9c8f2e8ed58c015bdcd73862c5d9f4 pkgutil-1.9b2.zip 6d472d94ea850b600fd29aba7a6fc4b3 r.cswpkgutil 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 Nov 13 21:12:43 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 13 Nov 2009 20:12:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[7278] csw/mgar/pkg/rapidsvn/trunk Message-ID: Revision: 7278 http://gar.svn.sourceforge.net/gar/?rev=7278&view=rev Author: dmichelsen Date: 2009-11-13 20:12:43 +0000 (Fri, 13 Nov 2009) Log Message: ----------- rapidsvn: Update to 0.12 Modified Paths: -------------- csw/mgar/pkg/rapidsvn/trunk/Makefile csw/mgar/pkg/rapidsvn/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/rapidsvn/trunk/ Property changes on: csw/mgar/pkg/rapidsvn/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/rapidsvn/trunk/Makefile =================================================================== --- csw/mgar/pkg/rapidsvn/trunk/Makefile 2009-11-13 16:36:50 UTC (rev 7277) +++ csw/mgar/pkg/rapidsvn/trunk/Makefile 2009-11-13 20:12:43 UTC (rev 7278) @@ -1,62 +1,65 @@ GARNAME = rapidsvn -GARVERSION = 0.9.1 +GARVERSION = 0.12.0-1 CATEGORIES = utils -DESCRIPTION = Subversion GUI +DESCRIPTION = GUI front-end for the Subversion revision system define BLURB - # TODO: Insert Blurb + This is the developer site for RapidSVN. You have access to the source code + of RapidSVN, the issue tracker and the mailing lists. If you are a user of + RapidSVN you might want to take a look at http://www.rapidsvn.org where we + are working on the Documentation and Online Help of RapidSVN endef -MASTER_SITES = http://www.rapidsvn.org/download/ +MASTER_SITES = http://www.rapidsvn.org/download/release/0.12/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWrapidsvn,depend prototype) -DISTFILES += $(call admfiles,CSWsvncpp,depend prototype) +# DISTFILES += $(call admfiles,CSWrapidsvn,depend prototype) +# DISTFILES += $(call admfiles,CSWsvncpp,depend prototype) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +SPKG_SOURCEURL = http://rapidsvn.tigris.org/ + # RapidSVN 0.9.1 omits the manpage from the dist archive -DISTFILES += rapidsvn.xml +# DISTFILES += rapidsvn.xml # Remove gcc C/CXXFLAGS, and fix autoconf tests -PATCHFILES += configure.diff +# PATCHFILES += configure.diff # This should be separated out of CSWkdelibsgcc -KSGML = $(prefix)/kde-gcc/share/apps/ksgmltools2 -DOCBOOK_MANPAGE = $(KSGML)/docbook/xsl/manpages/docbook.xsl +# KSGML = $(prefix)/kde-gcc/share/apps/ksgmltools2 +# DOCBOOK_MANPAGE = $(KSGML)/docbook/xsl/manpages/docbook.xsl -SVNLIB = $(prefix)/lib/svn - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-apr-config=$(prefix)/apache2/bin/apr-1-config CONFIGURE_ARGS += --with-apu-config=$(prefix)/apache2/bin/apu-1-config -CONFIGURE_ARGS += --with-svn-lib=$(SVNLIB) +CONFIGURE_ARGS += --with-svn-lib=$(libdir)/svn CONFIGURE_ARGS += --with-svn-include=$(includedir) -CONFIGURE_ARGS += --with-docbook-xsl-manpages=$(DOCBOOK_MANPAGE) +# CONFIGURE_ARGS += --with-docbook-xsl-manpages=$(DOCBOOK_MANPAGE) -EXTRA_LIB = $(prefix)/bdb43/lib $(SVNLIB) -EXTRA_INC = $(prefix)/bdb43/include +# EXTRA_LIB = $(prefix)/bdb43/lib $(SVNLIB) +# EXTRA_INC = $(prefix)/bdb43/include TEST_TARGET = check include gar/category.mk -pre-configure: - @echo " ==> Regenerating build tools..." - @(cd $(WORKSRC) ; \ - aclocal && \ - autoconf && \ - libtoolize --automake --force && \ - aclocal && \ - automake -a ) - @$(MAKECOOKIE) +# pre-configure: +# @echo " ==> Regenerating build tools..." +# @(cd $(WORKSRC) ; \ +# aclocal && \ +# autoconf && \ +# libtoolize --automake --force && \ +# aclocal && \ +# automake -a ) +# @$(MAKECOOKIE) -pre-build: - @cp $(WORKDIR)/rapidsvn.xml $(WORKSRC)/doc/manpage +# pre-build: +# @cp $(WORKDIR)/rapidsvn.xml $(WORKSRC)/doc/manpage -post-install: - install -d $(DESTDIR)$(mandir)/man1 - ( cd $(WORKSRC)/doc/manpage ; make manpage-yes ) - install $(WORKSRC)/doc/manpage/rapidsvn.1 $(DESTDIR)$(mandir)/man1 - @$(MAKECOOKIE) +# post-install: +# install -d $(DESTDIR)$(mandir)/man1 +# ( cd $(WORKSRC)/doc/manpage ; make manpage-yes ) +# install $(WORKSRC)/doc/manpage/rapidsvn.1 $(DESTDIR)$(mandir)/man1 +# @$(MAKECOOKIE) Modified: csw/mgar/pkg/rapidsvn/trunk/checksums =================================================================== --- csw/mgar/pkg/rapidsvn/trunk/checksums 2009-11-13 16:36:50 UTC (rev 7277) +++ csw/mgar/pkg/rapidsvn/trunk/checksums 2009-11-13 20:12:43 UTC (rev 7278) @@ -1,9 +1 @@ -ba03034db35912c7b51b146cc7e6090e download/rapidsvn-0.9.1.tar.gz -7791a3a0681b1daff320f531948c0fe6 download/CSWrapidsvn.gspec -554c43f3c3086a8229bd4021be747aed download/CSWrapidsvn.depend -e5194b3eebe3f418ff6dc7267a0c043e download/CSWrapidsvn.prototype -6b161aa8e8c9342e20116451b8ab35cd download/CSWsvncpp.gspec -b2d74eb6645f9d95b2fd0b9506efb91b download/CSWsvncpp.depend -f18368ee36c8208b76d0e2d980f23ecd download/CSWsvncpp.prototype -58f6f5a25173450f037563fd52dc3eef download/rapidsvn.xml -a7fa20da2caebf270134b381346e1424 download/configure.diff +8ec54104fca32d81e396a68e25324263 rapidsvn-0.12.0-1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Fri Nov 13 22:46:07 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Fri, 13 Nov 2009 21:46:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7279] csw/mgar/pkg/java/ajccollections/trunk/Makefile Message-ID: Revision: 7279 http://gar.svn.sourceforge.net/gar/?rev=7279&view=rev Author: wbonnet Date: 2009-11-13 21:46:06 +0000 (Fri, 13 Nov 2009) Log Message: ----------- Remove extra dependencies to fix cyclic depend Modified Paths: -------------- csw/mgar/pkg/java/ajccollections/trunk/Makefile Modified: csw/mgar/pkg/java/ajccollections/trunk/Makefile =================================================================== --- csw/mgar/pkg/java/ajccollections/trunk/Makefile 2009-11-13 20:12:43 UTC (rev 7278) +++ csw/mgar/pkg/java/ajccollections/trunk/Makefile 2009-11-13 21:46:06 UTC (rev 7279) @@ -24,7 +24,7 @@ SPKG_DESC_CSWajccollectdoc = $(DESCRIPTION) documentation package # Defines dependencies -REQUIRED_PKGS_CSWajccollect = CSWajcconfig CSWajcdigester CSWajcemail CSWajcnet +REQUIRED_PKGS_CSWajccollect = CSWajcdigester # Defines package content PKGFILES_CSWajccollect = $(prefix)/share/doc/$(GARNAME)/LICENSE.txt 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 Nov 14 02:12:46 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 14 Nov 2009 01:12:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7280] csw/mgar/pkg/ruby/trunk Message-ID: Revision: 7280 http://gar.svn.sourceforge.net/gar/?rev=7280&view=rev Author: bdwalton Date: 2009-11-14 01:12:46 +0000 (Sat, 14 Nov 2009) Log Message: ----------- ruby: ensure we use $ARCH specific rbconfig.rb for GCC4 alternate Modified Paths: -------------- csw/mgar/pkg/ruby/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.i386 csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.sparc Removed Paths: ------------- csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4 Modified: csw/mgar/pkg/ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby/trunk/Makefile 2009-11-13 21:46:06 UTC (rev 7279) +++ csw/mgar/pkg/ruby/trunk/Makefile 2009-11-14 01:12:46 UTC (rev 7280) @@ -124,7 +124,7 @@ multiconfig: @echo "Setting up the CSW rbconfig stuff so we can switch between compilers" @mv $(DESTDIR)$(RBCONFIG) $(DESTDIR)$(RBCONFIG).SOS11 - @gcp $(FILEDIR)/rbconfig.rb.GCC4 $(DESTDIR)/$(RBCONFIG).GCC4 + @gcp $(FILEDIR)/rbconfig.rb.GCC4.$(GARCH) $(DESTDIR)/$(RBCONFIG).GCC4 @gln -s $(RBCONFIG).SOS11 $(DESTDIR)$(RBCONFIG) @gcp $(FILEDIR)/cswrbconfig $(DESTDIR)/opt/csw/bin/ @chmod 755 $(DESTDIR)/opt/csw/bin/cswrbconfig Deleted: csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4 =================================================================== --- csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4 2009-11-13 21:46:06 UTC (rev 7279) +++ csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4 2009-11-14 01:12:46 UTC (rev 7280) @@ -1,182 +0,0 @@ - -# This file was created by mkconfig.rb when ruby was built. Any -# changes made to this file will be lost the next time ruby is built. - -module Config - RUBY_VERSION == "1.8.7" or - raise "ruby lib version (1.8.7) doesn't match executable version (#{RUBY_VERSION})" - - TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/1.8/i386-solaris2.8") - DESTDIR = '' unless defined? DESTDIR - CONFIG = {} - CONFIG["DESTDIR"] = DESTDIR - CONFIG["INSTALL"] = '/opt/csw/bin/ginstall -c' - CONFIG["prefix"] = (TOPDIR || DESTDIR + "/opt/csw") - CONFIG["EXEEXT"] = "" - CONFIG["ruby_install_name"] = "ruby" - CONFIG["RUBY_INSTALL_NAME"] = "ruby" - CONFIG["RUBY_SO_NAME"] = "ruby" - CONFIG["SHELL"] = "/bin/bash" - CONFIG["PATH_SEPARATOR"] = ":" - CONFIG["PACKAGE_NAME"] = "" - CONFIG["PACKAGE_TARNAME"] = "" - CONFIG["PACKAGE_VERSION"] = "" - CONFIG["PACKAGE_STRING"] = "" - CONFIG["PACKAGE_BUGREPORT"] = "" - CONFIG["exec_prefix"] = "$(DESTDIR)/opt/csw" - CONFIG["bindir"] = "$(DESTDIR)/opt/csw/bin" - CONFIG["sbindir"] = "$(DESTDIR)/opt/csw/sbin" - CONFIG["libexecdir"] = "$(DESTDIR)/opt/csw/libexec" - CONFIG["datarootdir"] = "$(prefix)/share" - CONFIG["datadir"] = "$(DESTDIR)/opt/csw/share" - CONFIG["sysconfdir"] = "$(DESTDIR)/opt/csw/etc" - CONFIG["sharedstatedir"] = "$(DESTDIR)/opt/csw/share" - CONFIG["localstatedir"] = "$(DESTDIR)/opt/csw/var" - CONFIG["includedir"] = "$(DESTDIR)/opt/csw/include" - CONFIG["oldincludedir"] = "/usr/include" - CONFIG["docdir"] = "$(datarootdir)/doc/$(PACKAGE)" - CONFIG["infodir"] = "$(DESTDIR)/opt/csw/share/info" - CONFIG["htmldir"] = "$(docdir)" - CONFIG["dvidir"] = "$(docdir)" - CONFIG["pdfdir"] = "$(docdir)" - CONFIG["psdir"] = "$(docdir)" - CONFIG["libdir"] = "$(DESTDIR)/opt/csw/lib" - CONFIG["localedir"] = "$(datarootdir)/locale" - CONFIG["mandir"] = "$(DESTDIR)/opt/csw/share/man" - CONFIG["DEFS"] = "-D_FILE_OFFSET_BITS=64" - CONFIG["ECHO_C"] = "" - CONFIG["ECHO_N"] = "-n" - CONFIG["ECHO_T"] = "" - CONFIG["LIBS"] = "-lpthread -lrt -ldl -lcrypt -lm " - CONFIG["build_alias"] = "" - CONFIG["host_alias"] = "" - CONFIG["target_alias"] = "" - CONFIG["MAJOR"] = "1" - CONFIG["MINOR"] = "8" - CONFIG["TEENY"] = "7" - CONFIG["build"] = "i386-pc-solaris2.8" - CONFIG["build_cpu"] = "i386" - CONFIG["build_vendor"] = "pc" - CONFIG["build_os"] = "solaris2.8" - CONFIG["host"] = "i386-pc-solaris2.8" - CONFIG["host_cpu"] = "i386" - CONFIG["host_vendor"] = "pc" - CONFIG["host_os"] = "solaris2.8" - CONFIG["target"] = "i386-pc-solaris2.8" - CONFIG["target_cpu"] = "i386" - CONFIG["target_vendor"] = "pc" - CONFIG["target_os"] = "solaris2.8" - CONFIG["CC"] = "/opt/csw/gcc4/bin/gcc" - CONFIG["CFLAGS"] = "-mtune=i686 -O2 -pipe -m32 -march=i386 -I/opt/csw/include -fPIC $(cflags)" - CONFIG["LDFLAGS"] = "-L. -L/opt/csw/gcc4/lib/. -m32 -march=i386 -R /opt/csw/gcc4/lib -L/opt/csw/lib" - CONFIG["CPPFLAGS"] = "-I/opt/csw/include $(DEFS) $(cppflags)" - CONFIG["OBJEXT"] = "o" - CONFIG["CPP"] = "/opt/csw/gcc4/bin/gcc -E" - CONFIG["GREP"] = "/opt/csw/bin/ggrep" - CONFIG["EGREP"] = "/opt/csw/bin/ggrep -E" - CONFIG["GNU_LD"] = "no" - CONFIG["CPPOUTFILE"] = "-o conftest.i" - CONFIG["OUTFLAG"] = "-o " - CONFIG["YACC"] = "bison -y" - CONFIG["YFLAGS"] = "" - CONFIG["RANLIB"] = "ranlib" - CONFIG["AR"] = "ar" - CONFIG["AS"] = "as" - CONFIG["ASFLAGS"] = "" - CONFIG["NM"] = "" - CONFIG["WINDRES"] = "" - CONFIG["DLLWRAP"] = "" - CONFIG["OBJDUMP"] = "" - CONFIG["LN_S"] = "ln -s" - CONFIG["SET_MAKE"] = "" - CONFIG["INSTALL_PROGRAM"] = "$(INSTALL)" - CONFIG["INSTALL_SCRIPT"] = "$(INSTALL)" - CONFIG["INSTALL_DATA"] = "$(INSTALL) -m 644" - CONFIG["RM"] = "rm -f" - CONFIG["CP"] = "cp" - CONFIG["MAKEDIRS"] = "mkdir -p" - CONFIG["ALLOCA"] = "" - CONFIG["DLDFLAGS"] = "" - CONFIG["ARCH_FLAG"] = "" - CONFIG["STATIC"] = "" - CONFIG["CCDLFLAGS"] = " -fPIC" - CONFIG["LDSHARED"] = "$(CC) -shared" - CONFIG["DLEXT"] = "so" - CONFIG["DLEXT2"] = "" - CONFIG["LIBEXT"] = "a" - CONFIG["LINK_SO"] = "" - CONFIG["LIBPATHFLAG"] = " -L%1$-s" - CONFIG["RPATHFLAG"] = " -Wl,-R%1$-s" - CONFIG["LIBPATHENV"] = "LD_LIBRARY_PATH" - CONFIG["TRY_LINK"] = "" - CONFIG["STRIP"] = "strip" - CONFIG["EXTSTATIC"] = "" - CONFIG["setup"] = "Setup" - CONFIG["PREP"] = "miniruby$(EXEEXT)" - CONFIG["EXTOUT"] = ".ext" - CONFIG["ARCHFILE"] = "" - CONFIG["RDOCTARGET"] = "install-doc" - CONFIG["cppflags"] = "-I/opt/csw/include" - CONFIG["cflags"] = "$(optflags) $(debugflags)" - CONFIG["optflags"] = "" - CONFIG["debugflags"] = "" - CONFIG["LIBRUBY_LDSHARED"] = "$(CC) -shared" - CONFIG["LIBRUBY_DLDFLAGS"] = " -Wl,-h,$(@|#_!!_#|F)" - CONFIG["rubyw_install_name"] = "" - CONFIG["RUBYW_INSTALL_NAME"] = "" - CONFIG["LIBRUBY_A"] = "lib$(RUBY_SO_NAME)-static.a" - CONFIG["LIBRUBY_SO"] = "lib$(RUBY_SO_NAME).so.$(MAJOR)" - CONFIG["LIBRUBY_ALIASES"] = "lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY) lib$(RUBY_SO_NAME).so" - CONFIG["LIBRUBY"] = "$(LIBRUBY_SO)" - CONFIG["LIBRUBYARG"] = "$(LIBRUBYARG_SHARED)" - CONFIG["LIBRUBYARG_STATIC"] = "-l$(RUBY_SO_NAME)-static" - CONFIG["LIBRUBYARG_SHARED"] = "-Wl,-R -Wl,$(libdir) -L$(libdir) -l$(RUBY_SO_NAME)" - CONFIG["SOLIBS"] = "$(LIBS)" - CONFIG["DLDLIBS"] = " -lc" - CONFIG["ENABLE_SHARED"] = "yes" - CONFIG["MAINLIBS"] = "" - CONFIG["COMMON_LIBS"] = "" - CONFIG["COMMON_MACROS"] = "" - CONFIG["COMMON_HEADERS"] = "" - CONFIG["EXPORT_PREFIX"] = "" - CONFIG["MAKEFILES"] = "Makefile" - CONFIG["arch"] = "i386-solaris2.8" - CONFIG["sitearch"] = "i386-solaris2.8" - CONFIG["sitedir"] = "$(libdir)/ruby/site_ruby" - CONFIG["vendordir"] = "$(libdir)/ruby/vendor_ruby" - CONFIG["configure_args"] = " '--prefix=/opt/csw' '--exec_prefix=/opt/csw' '--bindir=/opt/csw/bin' '--sbindir=/opt/csw/sbin' '--libexecdir=/opt/csw/libexec' '--datadir=/opt/csw/share' '--sysconfdir=/opt/csw/etc' '--sharedstatedir=/opt/csw/share' '--localstatedir=/opt/csw/var' '--libdir=/opt/csw/lib' '--infodir=/opt/csw/share/info' '--includedir=/opt/csw/include' '--mandir=/opt/csw/share/man' '--enable-pthread' '--enable-shared' '--with-tcl-dir=/opt/csw' '--with-tk-dir=/opt/csw' '--with-dbm-dir=/opt/csw' '--with-gdbm-dir=/opt/csw' '--with-iconv-dir=/opt/csw' '--with-openssl-dir=/opt/csw' '--with-readline-dir=/opt/csw' '--with-zlib-dir=/opt/csw' '--enable-install-doc' 'CC=/opt/csw/gcc4/bin/gcc' 'CFLAGS=-mtune=i686 -O2 -pipe -m32 -march=i386 -I/opt/csw/include' 'LDFLAGS=-L/opt/csw/gcc4/lib/. -m32 -march=i386 -R /opt/csw/gcc4/lib -L/opt/csw/lib' 'CPPFLAGS=-I/opt/csw/include'" - CONFIG["NROFF"] = "/usr/bin/nroff" - CONFIG["MANTYPE"] = "man" - CONFIG["ruby_version"] = "$(MAJOR).$(MINOR)" - CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)" - CONFIG["archdir"] = "$(rubylibdir)/$(arch)" - CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)" - CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)" - CONFIG["vendorlibdir"] = "$(vendordir)/$(ruby_version)" - CONFIG["vendorarchdir"] = "$(vendorlibdir)/$(sitearch)" - CONFIG["topdir"] = File.dirname(__FILE__) - MAKEFILE_CONFIG = {} - CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup} - def Config::expand(val, config = CONFIG) - val.gsub!(/\$\$|\$\(([^()]+)\)|\$\{([^{}]+)\}/) do |var| - if !(v = $1 || $2) - '$' - elsif key = config[v = v[/\A[^:]+(?=(?::(.*?)=(.*))?\z)/]] - pat, sub = $1, $2 - config[v] = false - Config::expand(key, config) - config[v] = key - key = key.gsub(/#{Regexp.quote(pat)}(?=\s|\z)/n) {sub} if pat - key - else - var - end - end - val - end - CONFIG.each_value do |val| - Config::expand(val) - end -end -RbConfig = Config # compatibility for ruby-1.9 -CROSS_COMPILING = nil unless defined? CROSS_COMPILING Copied: csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.i386 (from rev 6972, csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4) =================================================================== --- csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.i386 (rev 0) +++ csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.i386 2009-11-14 01:12:46 UTC (rev 7280) @@ -0,0 +1,182 @@ + +# This file was created by mkconfig.rb when ruby was built. Any +# changes made to this file will be lost the next time ruby is built. + +module Config + RUBY_VERSION == "1.8.7" or + raise "ruby lib version (1.8.7) doesn't match executable version (#{RUBY_VERSION})" + + TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/1.8/i386-solaris2.8") + DESTDIR = '' unless defined? DESTDIR + CONFIG = {} + CONFIG["DESTDIR"] = DESTDIR + CONFIG["INSTALL"] = '/opt/csw/bin/ginstall -c' + CONFIG["prefix"] = (TOPDIR || DESTDIR + "/opt/csw") + CONFIG["EXEEXT"] = "" + CONFIG["ruby_install_name"] = "ruby" + CONFIG["RUBY_INSTALL_NAME"] = "ruby" + CONFIG["RUBY_SO_NAME"] = "ruby" + CONFIG["SHELL"] = "/bin/bash" + CONFIG["PATH_SEPARATOR"] = ":" + CONFIG["PACKAGE_NAME"] = "" + CONFIG["PACKAGE_TARNAME"] = "" + CONFIG["PACKAGE_VERSION"] = "" + CONFIG["PACKAGE_STRING"] = "" + CONFIG["PACKAGE_BUGREPORT"] = "" + CONFIG["exec_prefix"] = "$(DESTDIR)/opt/csw" + CONFIG["bindir"] = "$(DESTDIR)/opt/csw/bin" + CONFIG["sbindir"] = "$(DESTDIR)/opt/csw/sbin" + CONFIG["libexecdir"] = "$(DESTDIR)/opt/csw/libexec" + CONFIG["datarootdir"] = "$(prefix)/share" + CONFIG["datadir"] = "$(DESTDIR)/opt/csw/share" + CONFIG["sysconfdir"] = "$(DESTDIR)/opt/csw/etc" + CONFIG["sharedstatedir"] = "$(DESTDIR)/opt/csw/share" + CONFIG["localstatedir"] = "$(DESTDIR)/opt/csw/var" + CONFIG["includedir"] = "$(DESTDIR)/opt/csw/include" + CONFIG["oldincludedir"] = "/usr/include" + CONFIG["docdir"] = "$(datarootdir)/doc/$(PACKAGE)" + CONFIG["infodir"] = "$(DESTDIR)/opt/csw/share/info" + CONFIG["htmldir"] = "$(docdir)" + CONFIG["dvidir"] = "$(docdir)" + CONFIG["pdfdir"] = "$(docdir)" + CONFIG["psdir"] = "$(docdir)" + CONFIG["libdir"] = "$(DESTDIR)/opt/csw/lib" + CONFIG["localedir"] = "$(datarootdir)/locale" + CONFIG["mandir"] = "$(DESTDIR)/opt/csw/share/man" + CONFIG["DEFS"] = "-D_FILE_OFFSET_BITS=64" + CONFIG["ECHO_C"] = "" + CONFIG["ECHO_N"] = "-n" + CONFIG["ECHO_T"] = "" + CONFIG["LIBS"] = "-lpthread -lrt -ldl -lcrypt -lm " + CONFIG["build_alias"] = "" + CONFIG["host_alias"] = "" + CONFIG["target_alias"] = "" + CONFIG["MAJOR"] = "1" + CONFIG["MINOR"] = "8" + CONFIG["TEENY"] = "7" + CONFIG["build"] = "i386-pc-solaris2.8" + CONFIG["build_cpu"] = "i386" + CONFIG["build_vendor"] = "pc" + CONFIG["build_os"] = "solaris2.8" + CONFIG["host"] = "i386-pc-solaris2.8" + CONFIG["host_cpu"] = "i386" + CONFIG["host_vendor"] = "pc" + CONFIG["host_os"] = "solaris2.8" + CONFIG["target"] = "i386-pc-solaris2.8" + CONFIG["target_cpu"] = "i386" + CONFIG["target_vendor"] = "pc" + CONFIG["target_os"] = "solaris2.8" + CONFIG["CC"] = "/opt/csw/gcc4/bin/gcc" + CONFIG["CFLAGS"] = "-mtune=i686 -O2 -pipe -m32 -march=i386 -I/opt/csw/include -fPIC $(cflags)" + CONFIG["LDFLAGS"] = "-L. -L/opt/csw/gcc4/lib/. -m32 -march=i386 -R /opt/csw/gcc4/lib -L/opt/csw/lib" + CONFIG["CPPFLAGS"] = "-I/opt/csw/include $(DEFS) $(cppflags)" + CONFIG["OBJEXT"] = "o" + CONFIG["CPP"] = "/opt/csw/gcc4/bin/gcc -E" + CONFIG["GREP"] = "/opt/csw/bin/ggrep" + CONFIG["EGREP"] = "/opt/csw/bin/ggrep -E" + CONFIG["GNU_LD"] = "no" + CONFIG["CPPOUTFILE"] = "-o conftest.i" + CONFIG["OUTFLAG"] = "-o " + CONFIG["YACC"] = "bison -y" + CONFIG["YFLAGS"] = "" + CONFIG["RANLIB"] = "ranlib" + CONFIG["AR"] = "ar" + CONFIG["AS"] = "as" + CONFIG["ASFLAGS"] = "" + CONFIG["NM"] = "" + CONFIG["WINDRES"] = "" + CONFIG["DLLWRAP"] = "" + CONFIG["OBJDUMP"] = "" + CONFIG["LN_S"] = "ln -s" + CONFIG["SET_MAKE"] = "" + CONFIG["INSTALL_PROGRAM"] = "$(INSTALL)" + CONFIG["INSTALL_SCRIPT"] = "$(INSTALL)" + CONFIG["INSTALL_DATA"] = "$(INSTALL) -m 644" + CONFIG["RM"] = "rm -f" + CONFIG["CP"] = "cp" + CONFIG["MAKEDIRS"] = "mkdir -p" + CONFIG["ALLOCA"] = "" + CONFIG["DLDFLAGS"] = "" + CONFIG["ARCH_FLAG"] = "" + CONFIG["STATIC"] = "" + CONFIG["CCDLFLAGS"] = " -fPIC" + CONFIG["LDSHARED"] = "$(CC) -shared" + CONFIG["DLEXT"] = "so" + CONFIG["DLEXT2"] = "" + CONFIG["LIBEXT"] = "a" + CONFIG["LINK_SO"] = "" + CONFIG["LIBPATHFLAG"] = " -L%1$-s" + CONFIG["RPATHFLAG"] = " -Wl,-R%1$-s" + CONFIG["LIBPATHENV"] = "LD_LIBRARY_PATH" + CONFIG["TRY_LINK"] = "" + CONFIG["STRIP"] = "strip" + CONFIG["EXTSTATIC"] = "" + CONFIG["setup"] = "Setup" + CONFIG["PREP"] = "miniruby$(EXEEXT)" + CONFIG["EXTOUT"] = ".ext" + CONFIG["ARCHFILE"] = "" + CONFIG["RDOCTARGET"] = "install-doc" + CONFIG["cppflags"] = "-I/opt/csw/include" + CONFIG["cflags"] = "$(optflags) $(debugflags)" + CONFIG["optflags"] = "" + CONFIG["debugflags"] = "" + CONFIG["LIBRUBY_LDSHARED"] = "$(CC) -shared" + CONFIG["LIBRUBY_DLDFLAGS"] = " -Wl,-h,$(@|#_!!_#|F)" + CONFIG["rubyw_install_name"] = "" + CONFIG["RUBYW_INSTALL_NAME"] = "" + CONFIG["LIBRUBY_A"] = "lib$(RUBY_SO_NAME)-static.a" + CONFIG["LIBRUBY_SO"] = "lib$(RUBY_SO_NAME).so.$(MAJOR)" + CONFIG["LIBRUBY_ALIASES"] = "lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY) lib$(RUBY_SO_NAME).so" + CONFIG["LIBRUBY"] = "$(LIBRUBY_SO)" + CONFIG["LIBRUBYARG"] = "$(LIBRUBYARG_SHARED)" + CONFIG["LIBRUBYARG_STATIC"] = "-l$(RUBY_SO_NAME)-static" + CONFIG["LIBRUBYARG_SHARED"] = "-Wl,-R -Wl,$(libdir) -L$(libdir) -l$(RUBY_SO_NAME)" + CONFIG["SOLIBS"] = "$(LIBS)" + CONFIG["DLDLIBS"] = " -lc" + CONFIG["ENABLE_SHARED"] = "yes" + CONFIG["MAINLIBS"] = "" + CONFIG["COMMON_LIBS"] = "" + CONFIG["COMMON_MACROS"] = "" + CONFIG["COMMON_HEADERS"] = "" + CONFIG["EXPORT_PREFIX"] = "" + CONFIG["MAKEFILES"] = "Makefile" + CONFIG["arch"] = "i386-solaris2.8" + CONFIG["sitearch"] = "i386-solaris2.8" + CONFIG["sitedir"] = "$(libdir)/ruby/site_ruby" + CONFIG["vendordir"] = "$(libdir)/ruby/vendor_ruby" + CONFIG["configure_args"] = " '--prefix=/opt/csw' '--exec_prefix=/opt/csw' '--bindir=/opt/csw/bin' '--sbindir=/opt/csw/sbin' '--libexecdir=/opt/csw/libexec' '--datadir=/opt/csw/share' '--sysconfdir=/opt/csw/etc' '--sharedstatedir=/opt/csw/share' '--localstatedir=/opt/csw/var' '--libdir=/opt/csw/lib' '--infodir=/opt/csw/share/info' '--includedir=/opt/csw/include' '--mandir=/opt/csw/share/man' '--enable-pthread' '--enable-shared' '--with-tcl-dir=/opt/csw' '--with-tk-dir=/opt/csw' '--with-dbm-dir=/opt/csw' '--with-gdbm-dir=/opt/csw' '--with-iconv-dir=/opt/csw' '--with-openssl-dir=/opt/csw' '--with-readline-dir=/opt/csw' '--with-zlib-dir=/opt/csw' '--enable-install-doc' 'CC=/opt/csw/gcc4/bin/gcc' 'CFLAGS=-mtune=i686 -O2 -pipe -m32 -march=i386 -I/opt/csw/include' 'LDFLAGS=-L/opt/csw/gcc4/lib/. -m32 -march=i386 -R /opt/csw/gcc4/lib -L/opt/csw/lib' 'CPPFLAGS=-I/opt/csw/include'" + CONFIG["NROFF"] = "/usr/bin/nroff" + CONFIG["MANTYPE"] = "man" + CONFIG["ruby_version"] = "$(MAJOR).$(MINOR)" + CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)" + CONFIG["archdir"] = "$(rubylibdir)/$(arch)" + CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)" + CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)" + CONFIG["vendorlibdir"] = "$(vendordir)/$(ruby_version)" + CONFIG["vendorarchdir"] = "$(vendorlibdir)/$(sitearch)" + CONFIG["topdir"] = File.dirname(__FILE__) + MAKEFILE_CONFIG = {} + CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup} + def Config::expand(val, config = CONFIG) + val.gsub!(/\$\$|\$\(([^()]+)\)|\$\{([^{}]+)\}/) do |var| + if !(v = $1 || $2) + '$' + elsif key = config[v = v[/\A[^:]+(?=(?::(.*?)=(.*))?\z)/]] + pat, sub = $1, $2 + config[v] = false + Config::expand(key, config) + config[v] = key + key = key.gsub(/#{Regexp.quote(pat)}(?=\s|\z)/n) {sub} if pat + key + else + var + end + end + val + end + CONFIG.each_value do |val| + Config::expand(val) + end +end +RbConfig = Config # compatibility for ruby-1.9 +CROSS_COMPILING = nil unless defined? CROSS_COMPILING Added: csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.sparc =================================================================== --- csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.sparc (rev 0) +++ csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.sparc 2009-11-14 01:12:46 UTC (rev 7280) @@ -0,0 +1,182 @@ + +# This file was created by mkconfig.rb when ruby was built. Any +# changes made to this file will be lost the next time ruby is built. + +module Config + RUBY_VERSION == "1.8.7" or + raise "ruby lib version (1.8.7) doesn't match executable version (#{RUBY_VERSION})" + + TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/1.8/sparc-solaris2.8") + DESTDIR = '' unless defined? DESTDIR + CONFIG = {} + CONFIG["DESTDIR"] = DESTDIR + CONFIG["INSTALL"] = '/opt/csw/bin/ginstall -c' + CONFIG["prefix"] = (TOPDIR || DESTDIR + "/opt/csw") + CONFIG["EXEEXT"] = "" + CONFIG["ruby_install_name"] = "ruby" + CONFIG["RUBY_INSTALL_NAME"] = "ruby" + CONFIG["RUBY_SO_NAME"] = "ruby" + CONFIG["SHELL"] = "/bin/bash" + CONFIG["PATH_SEPARATOR"] = ":" + CONFIG["PACKAGE_NAME"] = "" + CONFIG["PACKAGE_TARNAME"] = "" + CONFIG["PACKAGE_VERSION"] = "" + CONFIG["PACKAGE_STRING"] = "" + CONFIG["PACKAGE_BUGREPORT"] = "" + CONFIG["exec_prefix"] = "$(DESTDIR)/opt/csw" + CONFIG["bindir"] = "$(DESTDIR)/opt/csw/bin" + CONFIG["sbindir"] = "$(DESTDIR)/opt/csw/sbin" + CONFIG["libexecdir"] = "$(DESTDIR)/opt/csw/libexec" + CONFIG["datarootdir"] = "$(prefix)/share" + CONFIG["datadir"] = "$(DESTDIR)/opt/csw/share" + CONFIG["sysconfdir"] = "$(DESTDIR)/opt/csw/etc" + CONFIG["sharedstatedir"] = "$(DESTDIR)/opt/csw/share" + CONFIG["localstatedir"] = "$(DESTDIR)/opt/csw/var" + CONFIG["includedir"] = "$(DESTDIR)/opt/csw/include" + CONFIG["oldincludedir"] = "/usr/include" + CONFIG["docdir"] = "$(datarootdir)/doc/$(PACKAGE)" + CONFIG["infodir"] = "$(DESTDIR)/opt/csw/share/info" + CONFIG["htmldir"] = "$(docdir)" + CONFIG["dvidir"] = "$(docdir)" + CONFIG["pdfdir"] = "$(docdir)" + CONFIG["psdir"] = "$(docdir)" + CONFIG["libdir"] = "$(DESTDIR)/opt/csw/lib" + CONFIG["localedir"] = "$(datarootdir)/locale" + CONFIG["mandir"] = "$(DESTDIR)/opt/csw/share/man" + CONFIG["DEFS"] = "-D_FILE_OFFSET_BITS=64" + CONFIG["ECHO_C"] = "" + CONFIG["ECHO_N"] = "-n" + CONFIG["ECHO_T"] = "" + CONFIG["LIBS"] = "-lpthread -lrt -ldl -lcrypt -lm " + CONFIG["build_alias"] = "" + CONFIG["host_alias"] = "" + CONFIG["target_alias"] = "" + CONFIG["MAJOR"] = "1" + CONFIG["MINOR"] = "8" + CONFIG["TEENY"] = "7" + CONFIG["build"] = "sparc-sun-solaris2.8" + CONFIG["build_cpu"] = "sparc" + CONFIG["build_vendor"] = "sun" + CONFIG["build_os"] = "solaris2.8" + CONFIG["host"] = "sparc-sun-solaris2.8" + CONFIG["host_cpu"] = "sparc" + CONFIG["host_vendor"] = "sun" + CONFIG["host_os"] = "solaris2.8" + CONFIG["target"] = "sparc-sun-solaris2.8" + CONFIG["target_cpu"] = "sparc" + CONFIG["target_vendor"] = "sun" + CONFIG["target_os"] = "solaris2.8" + CONFIG["CC"] = "/opt/csw/gcc4/bin/gcc" + CONFIG["CFLAGS"] = "-O2 -pipe -mcpu=v8 -I/opt/csw/include -fPIC $(cflags)" + CONFIG["LDFLAGS"] = "-L. -L/opt/csw/gcc4/lib/. -mcpu=v8 -R /opt/csw/gcc4/lib -L/opt/csw/lib" + CONFIG["CPPFLAGS"] = "-I/opt/csw/include $(DEFS) $(cppflags)" + CONFIG["OBJEXT"] = "o" + CONFIG["CPP"] = "/opt/csw/gcc4/bin/gcc -E" + CONFIG["GREP"] = "/opt/csw/bin/ggrep" + CONFIG["EGREP"] = "/opt/csw/bin/ggrep -E" + CONFIG["GNU_LD"] = "no" + CONFIG["CPPOUTFILE"] = "-o conftest.i" + CONFIG["OUTFLAG"] = "-o " + CONFIG["YACC"] = "bison -y" + CONFIG["YFLAGS"] = "" + CONFIG["RANLIB"] = "ranlib" + CONFIG["AR"] = "ar" + CONFIG["AS"] = "as" + CONFIG["ASFLAGS"] = "" + CONFIG["NM"] = "" + CONFIG["WINDRES"] = "" + CONFIG["DLLWRAP"] = "" + CONFIG["OBJDUMP"] = "" + CONFIG["LN_S"] = "ln -s" + CONFIG["SET_MAKE"] = "" + CONFIG["INSTALL_PROGRAM"] = "$(INSTALL)" + CONFIG["INSTALL_SCRIPT"] = "$(INSTALL)" + CONFIG["INSTALL_DATA"] = "$(INSTALL) -m 644" + CONFIG["RM"] = "rm -f" + CONFIG["CP"] = "cp" + CONFIG["MAKEDIRS"] = "mkdir -p" + CONFIG["ALLOCA"] = "" + CONFIG["DLDFLAGS"] = "" + CONFIG["ARCH_FLAG"] = "" + CONFIG["STATIC"] = "" + CONFIG["CCDLFLAGS"] = " -fPIC" + CONFIG["LDSHARED"] = "$(CC) -shared" + CONFIG["DLEXT"] = "so" + CONFIG["DLEXT2"] = "" + CONFIG["LIBEXT"] = "a" + CONFIG["LINK_SO"] = "" + CONFIG["LIBPATHFLAG"] = " -L%1$-s" + CONFIG["RPATHFLAG"] = " -Wl,-R%1$-s" + CONFIG["LIBPATHENV"] = "LD_LIBRARY_PATH" + CONFIG["TRY_LINK"] = "" + CONFIG["STRIP"] = "strip" + CONFIG["EXTSTATIC"] = "" + CONFIG["setup"] = "Setup" + CONFIG["PREP"] = "miniruby$(EXEEXT)" + CONFIG["EXTOUT"] = ".ext" + CONFIG["ARCHFILE"] = "" + CONFIG["RDOCTARGET"] = "install-doc" + CONFIG["cppflags"] = "-I/opt/csw/include" + CONFIG["cflags"] = "$(optflags) $(debugflags)" + CONFIG["optflags"] = "" + CONFIG["debugflags"] = "" + CONFIG["LIBRUBY_LDSHARED"] = "$(CC) -shared" + CONFIG["LIBRUBY_DLDFLAGS"] = " -Wl,-h,$(@|#_!!_#|F)" + CONFIG["rubyw_install_name"] = "" + CONFIG["RUBYW_INSTALL_NAME"] = "" + CONFIG["LIBRUBY_A"] = "lib$(RUBY_SO_NAME)-static.a" + CONFIG["LIBRUBY_SO"] = "lib$(RUBY_SO_NAME).so.$(MAJOR)" + CONFIG["LIBRUBY_ALIASES"] = "lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY) lib$(RUBY_SO_NAME).so" + CONFIG["LIBRUBY"] = "$(LIBRUBY_SO)" + CONFIG["LIBRUBYARG"] = "$(LIBRUBYARG_SHARED)" + CONFIG["LIBRUBYARG_STATIC"] = "-l$(RUBY_SO_NAME)-static" + CONFIG["LIBRUBYARG_SHARED"] = "-Wl,-R -Wl,$(libdir) -L$(libdir) -l$(RUBY_SO_NAME)" + CONFIG["SOLIBS"] = "$(LIBS)" + CONFIG["DLDLIBS"] = " -lc" + CONFIG["ENABLE_SHARED"] = "yes" + CONFIG["MAINLIBS"] = "" + CONFIG["COMMON_LIBS"] = "" + CONFIG["COMMON_MACROS"] = "" + CONFIG["COMMON_HEADERS"] = "" + CONFIG["EXPORT_PREFIX"] = "" + CONFIG["MAKEFILES"] = "Makefile" + CONFIG["arch"] = "sparc-solaris2.8" + CONFIG["sitearch"] = "sparc-solaris2.8" + CONFIG["sitedir"] = "$(libdir)/ruby/site_ruby" + CONFIG["vendordir"] = "$(libdir)/ruby/vendor_ruby" + CONFIG["configure_args"] = " '--prefix=/opt/csw' '--exec_prefix=/opt/csw' '--bindir=/opt/csw/bin' '--sbindir=/opt/csw/sbin' '--libexecdir=/opt/csw/libexec' '--datadir=/opt/csw/share' '--sysconfdir=/opt/csw/etc' '--sharedstatedir=/opt/csw/share' '--localstatedir=/opt/csw/var' '--libdir=/opt/csw/lib' '--infodir=/opt/csw/share/info' '--includedir=/opt/csw/include' '--mandir=/opt/csw/share/man' '--enable-pthread' '--enable-shared' '--with-tcl-dir=/opt/csw' '--with-tk-dir=/opt/csw' '--with-dbm-dir=/opt/csw' '--with-gdbm-dir=/opt/csw' '--with-iconv-dir=/opt/csw' '--with-openssl-dir=/opt/csw' '--with-readline-dir=/opt/csw' '--with-zlib-dir=/opt/csw' '--enable-install-doc' 'CC=/opt/csw/gcc4/bin/gcc' 'CFLAGS=-O2 -pipe -mcpu=v8 -I/opt/csw/include' 'LDFLAGS=-L/opt/csw/gcc4/lib/. -mcpu=v8 -R /opt/csw/gcc4/lib -L/opt/csw/lib' 'CPPFLAGS=-I/opt/csw/include'" + CONFIG["NROFF"] = "/usr/bin/nroff" + CONFIG["MANTYPE"] = "man" + CONFIG["ruby_version"] = "$(MAJOR).$(MINOR)" + CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)" + CONFIG["archdir"] = "$(rubylibdir)/$(arch)" + CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)" + CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)" + CONFIG["vendorlibdir"] = "$(vendordir)/$(ruby_version)" + CONFIG["vendorarchdir"] = "$(vendorlibdir)/$(sitearch)" + CONFIG["topdir"] = File.dirname(__FILE__) + MAKEFILE_CONFIG = {} + CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup} + def Config::expand(val, config = CONFIG) + val.gsub!(/\$\$|\$\(([^()]+)\)|\$\{([^{}]+)\}/) do |var| + if !(v = $1 || $2) + '$' + elsif key = config[v = v[/\A[^:]+(?=(?::(.*?)=(.*))?\z)/]] + pat, sub = $1, $2 + config[v] = false + Config::expand(key, config) + config[v] = key + key = key.gsub(/#{Regexp.quote(pat)}(?=\s|\z)/n) {sub} if pat + key + else + var + end + end + val + end + CONFIG.each_value do |val| + Config::expand(val) + end +end +RbConfig = Config # compatibility for ruby-1.9 +CROSS_COMPILING = nil unless defined? CROSS_COMPILING 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 Nov 14 04:14:31 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 14 Nov 2009 03:14:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7281] csw/mgar/pkg/ruby/trunk/Makefile Message-ID: Revision: 7281 http://gar.svn.sourceforge.net/gar/?rev=7281&view=rev Author: bdwalton Date: 2009-11-14 03:14:31 +0000 (Sat, 14 Nov 2009) Log Message: ----------- ruby: correct package versioning now that pkg-get does REV= Modified Paths: -------------- csw/mgar/pkg/ruby/trunk/Makefile Modified: csw/mgar/pkg/ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby/trunk/Makefile 2009-11-14 01:12:46 UTC (rev 7280) +++ csw/mgar/pkg/ruby/trunk/Makefile 2009-11-14 03:14:31 UTC (rev 7281) @@ -112,7 +112,7 @@ include gar/category.mk -SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(PATCHLEVEL) +SPKG_VERSION := $(SPKG_VERSION)$(PATCHLEVEL) RBCONFIG = /opt/csw/lib/ruby/1.8/$(GARCH)-solaris2.8/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 Sat Nov 14 15:28:56 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 14 Nov 2009 14:28:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[7282] csw/mgar/pkg Message-ID: Revision: 7282 http://gar.svn.sourceforge.net/gar/?rev=7282&view=rev Author: bdwalton Date: 2009-11-14 14:28:55 +0000 (Sat, 14 Nov 2009) Log Message: ----------- git-subtree: initial commit Added Paths: ----------- csw/mgar/pkg/git-subtree/ csw/mgar/pkg/git-subtree/branches/ csw/mgar/pkg/git-subtree/tags/ csw/mgar/pkg/git-subtree/trunk/ csw/mgar/pkg/git-subtree/trunk/Makefile csw/mgar/pkg/git-subtree/trunk/checksums csw/mgar/pkg/git-subtree/trunk/files/ csw/mgar/pkg/git-subtree/trunk/files/0001-add-installation-support-to-Makefile.patch csw/mgar/pkg/git-subtree/trunk/files/0002-make-git-version-dynamic-when-building-documentation.patch Property changes on: csw/mgar/pkg/git-subtree/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/git-subtree/trunk/Makefile =================================================================== --- csw/mgar/pkg/git-subtree/trunk/Makefile (rev 0) +++ csw/mgar/pkg/git-subtree/trunk/Makefile 2009-11-14 14:28:55 UTC (rev 7282) @@ -0,0 +1,39 @@ +GARNAME = git-subtree +GARVERSION = 0.2 +PATCHLEVEL = c567d9 +CATEGORIES = devel + +DESCRIPTION = Subtree support for git +define BLURB +An experimental alternative to the git-submodule command. +endef + +PACKAGES = CSWgitsubtree +CATALOGNAME_CSWgitsubtree = git_subtree + +ARCHALL_CSWgitsubtree = 1 + +PREREQUISITE_PKGS = CSWasciidoc CSWxmlto + +REQUIRED_PKGS_CSWgitsubtree = CSWbash CSWgit + +GIT_REPOS = git://github.com/apenwarr/git-subtree.git +GIT_TREEISH_git-subtree.git = $(PATCHLEVEL) + +PATCHFILES = 0001-add-installation-support-to-Makefile.patch +PATCHFILES += 0002-make-git-version-dynamic-when-building-documentation.patch + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = custom +TEST_SCRIPTS = + +SPKG_VERSION = $(GARVERSION)_$(PATCHLEVEL) + +include gar/category.mk + +install-custom: + @(cd $(WORKSRC); \ + gsed 's#/bin/bash#/opt/csw/bin/bash#' git-subtree.sh > git-subtree.sh.new; \ + mv git-subtree.sh.new git-subtree.sh; \ + gmake DESTDIR=$(DESTDIR) INSTALL=/opt/csw/bin/ginstall prefix=/opt/csw install ) Added: csw/mgar/pkg/git-subtree/trunk/checksums =================================================================== --- csw/mgar/pkg/git-subtree/trunk/checksums (rev 0) +++ csw/mgar/pkg/git-subtree/trunk/checksums 2009-11-14 14:28:55 UTC (rev 7282) @@ -0,0 +1,2 @@ +40a8c3282a2f4bd4e5fbaebf2bba9359 0001-add-installation-support-to-Makefile.patch +7587367599ef47e0a3e81c96996f855b 0002-make-git-version-dynamic-when-building-documentation.patch Added: csw/mgar/pkg/git-subtree/trunk/files/0001-add-installation-support-to-Makefile.patch =================================================================== --- csw/mgar/pkg/git-subtree/trunk/files/0001-add-installation-support-to-Makefile.patch (rev 0) +++ csw/mgar/pkg/git-subtree/trunk/files/0001-add-installation-support-to-Makefile.patch 2009-11-14 14:28:55 UTC (rev 7282) @@ -0,0 +1,48 @@ +From 9c69a401f3d2fb44b0a09702aff99c9e28b627c4 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Fri, 13 Nov 2009 12:01:31 -0500 +Subject: [PATCH 1/2] add installation support to Makefile + +Signed-off-by: Ben Walton +--- + Makefile | 20 ++++++++++++++++++++ + 1 files changed, 20 insertions(+), 0 deletions(-) + +diff --git a/Makefile b/Makefile +index 3e97c62..faefffd 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,3 +1,13 @@ ++prefix ?= /usr/local ++mandir ?= $(prefix)/share/man ++gitdir ?= $(shell git --exec-path) ++ ++# this should be set to a 'standard' bsd-type install program ++INSTALL ?= install ++INSTALL_DATA = $(INSTALL) -c -m 0644 ++INSTALL_EXE = $(INSTALL) -c -m 0755 ++INSTALL_DIR = $(INSTALL) -c -d -m 0755 ++ + default: + @echo "git-subtree doesn't need to be built." + @echo "Just copy it somewhere on your PATH, like /usr/local/bin." +@@ -5,6 +15,16 @@ default: + @echo "Try: make doc" + @false + ++install: install-exe install-doc ++ ++install-exe: git-subtree.sh ++ $(INSTALL_DIR) $(DESTDIR)/$(gitdir) ++ $(INSTALL_EXE) $< $(DESTDIR)/$(gitdir)/git-subtree ++ ++install-doc: git-subtree.1 ++ $(INSTALL_DIR) $(DESTDIR)/$(mandir)/man1/ ++ $(INSTALL_DATA) $< $(DESTDIR)/$(mandir)/man1/ ++ + doc: git-subtree.1 + + %.1: %.xml +-- +1.6.5 + Added: csw/mgar/pkg/git-subtree/trunk/files/0002-make-git-version-dynamic-when-building-documentation.patch =================================================================== --- csw/mgar/pkg/git-subtree/trunk/files/0002-make-git-version-dynamic-when-building-documentation.patch (rev 0) +++ csw/mgar/pkg/git-subtree/trunk/files/0002-make-git-version-dynamic-when-building-documentation.patch 2009-11-14 14:28:55 UTC (rev 7282) @@ -0,0 +1,35 @@ +From e17159437af26336537a46cf64825c9130e91267 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Fri, 13 Nov 2009 12:08:02 -0500 +Subject: [PATCH 2/2] make git version dynamic when building documentation + +Signed-off-by: Ben Walton +--- + Makefile | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/Makefile b/Makefile +index faefffd..9b204bd 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,6 +2,8 @@ prefix ?= /usr/local + mandir ?= $(prefix)/share/man + gitdir ?= $(shell git --exec-path) + ++gitver ?= $(word 3,$(shell git --version)) ++ + # this should be set to a 'standard' bsd-type install program + INSTALL ?= install + INSTALL_DATA = $(INSTALL) -c -m 0644 +@@ -32,7 +34,7 @@ doc: git-subtree.1 + + %.xml: %.txt + asciidoc -b docbook -d manpage -f asciidoc.conf \ +- -agit_version=1.6.3 $^ ++ -agit_version=$(gitver) $^ + + clean: + rm -f *~ *.xml *.html *.1 +-- +1.6.5 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Nov 14 18:36:54 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 14 Nov 2009 17:36:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[7283] csw/mgar/pkg Message-ID: Revision: 7283 http://gar.svn.sourceforge.net/gar/?rev=7283&view=rev Author: dmichelsen Date: 2009-11-14 17:36:54 +0000 (Sat, 14 Nov 2009) Log Message: ----------- xboard: Initial commit Added Paths: ----------- csw/mgar/pkg/xboard/ csw/mgar/pkg/xboard/branches/ csw/mgar/pkg/xboard/tags/ csw/mgar/pkg/xboard/trunk/ csw/mgar/pkg/xboard/trunk/Makefile csw/mgar/pkg/xboard/trunk/checksums csw/mgar/pkg/xboard/trunk/files/ Property changes on: csw/mgar/pkg/xboard/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/xboard/trunk/Makefile =================================================================== --- csw/mgar/pkg/xboard/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xboard/trunk/Makefile 2009-11-14 17:36:54 UTC (rev 7283) @@ -0,0 +1,28 @@ +GARNAME = xboard +GARVERSION = 4.4.1 +CATEGORIES = apps + +DESCRIPTION = X graphical chessboard +define BLURB + XBoard is a graphical user interface for chess in all its major forms, + including international chess, xiangqi (Chinese chess) and shogi (Japanese chess), + in addition to many minor variants such as Losers Chess, Crazyhouse, Chess960 and + Capabanca Chess. It displays a chessboard on the screen, accepts moves made with + the mouse, and loads and saves games in Portable Game Notation (PGN). +endef + +MASTER_SITES = $(GNU_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +EXTRA_LDFLAGS = -lm /usr/openwin/lib/libXext.so + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/xboard/trunk/checksums =================================================================== --- csw/mgar/pkg/xboard/trunk/checksums (rev 0) +++ csw/mgar/pkg/xboard/trunk/checksums 2009-11-14 17:36:54 UTC (rev 7283) @@ -0,0 +1 @@ +4623a83fdd43f410bfcc8a20e2eb1474 xboard-4.4.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Nov 14 18:44:14 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 14 Nov 2009 17:44:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[7284] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 7284 http://gar.svn.sourceforge.net/gar/?rev=7284&view=rev Author: rthurner Date: 2009-11-14 17:44:13 +0000 (Sat, 14 Nov 2009) Log Message: ----------- upgrade to svn-1.6.6 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 2009-11-14 17:36:54 UTC (rev 7283) +++ csw/mgar/pkg/subversion/trunk/Makefile 2009-11-14 17:44:13 UTC (rev 7284) @@ -1,5 +1,5 @@ GARNAME = subversion -DISTVERSION = 1.6.5 +DISTVERSION = 1.6.6 GARVERSION = $(subst -,,$(DISTVERSION)) CATEGORIES = utils Modified: csw/mgar/pkg/subversion/trunk/checksums =================================================================== --- csw/mgar/pkg/subversion/trunk/checksums 2009-11-14 17:36:54 UTC (rev 7283) +++ csw/mgar/pkg/subversion/trunk/checksums 2009-11-14 17:44:13 UTC (rev 7284) @@ -1,9 +1,9 @@ -32b2cc8a237404d160a5617ea2da53d8 download/CSWap2svn.postinstall -586b9c9924c1547d44451a84d2aca702 download/CSWap2svn.preremove -395ec6d1bfe07efadc1c0aa8816673fa download/CSWsvn.checkinstall -41ec540885de7c34625768aa1fb9682b download/fixme.sh -f107831ad0c702ff32e51df6a207237b download/httpd-svn.conf.CSW -f0aa58c145ae99f8e4d72499ab826169 download/javahl_headers_for_nested_classes.diff -1a53a0e72bee0bf814f4da83a9b6a636 download/subversion-1.6.5.tar.bz2 -f7d05c59656dcf01fb844295c9912f78 download/subversion161.diff -1b532d3055708a97771f5cd959983628 download/svn_access.conf.CSW +32b2cc8a237404d160a5617ea2da53d8 CSWap2svn.postinstall +586b9c9924c1547d44451a84d2aca702 CSWap2svn.preremove +395ec6d1bfe07efadc1c0aa8816673fa CSWsvn.checkinstall +41ec540885de7c34625768aa1fb9682b fixme.sh +f107831ad0c702ff32e51df6a207237b httpd-svn.conf.CSW +f0aa58c145ae99f8e4d72499ab826169 javahl_headers_for_nested_classes.diff +e5109da756d74c7d98f683f004a539af subversion-1.6.6.tar.bz2 +f7d05c59656dcf01fb844295c9912f78 subversion161.diff +1b532d3055708a97771f5cd959983628 svn_access.conf.CSW 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 Sat Nov 14 19:49:22 2009 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Sat, 14 Nov 2009 18:49:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[7285] csw/mgar/pkg/sdlimage/trunk/Makefile Message-ID: Revision: 7285 http://gar.svn.sourceforge.net/gar/?rev=7285&view=rev Author: jake_goerzen Date: 2009-11-14 18:49:21 +0000 (Sat, 14 Nov 2009) Log Message: ----------- restoring GARNAME DISFILES; using PACKAGES instead Modified Paths: -------------- csw/mgar/pkg/sdlimage/trunk/Makefile Modified: csw/mgar/pkg/sdlimage/trunk/Makefile =================================================================== --- csw/mgar/pkg/sdlimage/trunk/Makefile 2009-11-14 17:44:13 UTC (rev 7284) +++ csw/mgar/pkg/sdlimage/trunk/Makefile 2009-11-14 18:49:21 UTC (rev 7285) @@ -1,4 +1,4 @@ -GARNAME = sdlimage +GARNAME = SDL_image GARVERSION = 1.2.8 CATEGORIES = lib @@ -7,11 +7,10 @@ SDL image library loads images as SDL surfaces, and supports the following formats: BMP, PNM, XPM, LBM, PCX, GIF, JPEG, PNG, TGA. endef -DISTNAME = SDL_image-$(GARVERSION) - MASTER_SITES = http://www.libsdl.org/projects/SDL_image/release/ -DISTFILES = SDL_image-$(GARVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PACKAGES = CSWsdlimage REQUIRED_PKGS = CSWlibsdl UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Sat Nov 14 20:11:12 2009 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Sat, 14 Nov 2009 19:11:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7286] csw/mgar/pkg/sdlmixer/trunk Message-ID: Revision: 7286 http://gar.svn.sourceforge.net/gar/?rev=7286&view=rev Author: jake_goerzen Date: 2009-11-14 19:11:12 +0000 (Sat, 14 Nov 2009) Log Message: ----------- Changed to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/sdlmixer/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/sdlmixer/trunk/files/CSWsdlmixer.depend csw/mgar/pkg/sdlmixer/trunk/files/CSWsdlmixer.gspec csw/mgar/pkg/sdlmixer/trunk/files/CSWsdlmixer.prototype Property Changed: ---------------- csw/mgar/pkg/sdlmixer/trunk/ Property changes on: csw/mgar/pkg/sdlmixer/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/sdlmixer/trunk/Makefile =================================================================== --- csw/mgar/pkg/sdlmixer/trunk/Makefile 2009-11-14 18:49:21 UTC (rev 7285) +++ csw/mgar/pkg/sdlmixer/trunk/Makefile 2009-11-14 19:11:12 UTC (rev 7286) @@ -1,5 +1,5 @@ GARNAME = SDL_mixer -GARVERSION = 1.2.8 +GARVERSION = 1.2.10 CATEGORIES = lib DESCRIPTION = multi-channel audio mixer library @@ -9,8 +9,10 @@ MASTER_SITES = http://www.libsdl.org/projects/SDL_mixer/release/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWsdlmixer, depend prototype) +PACKAGES = CSWsdlmixer +REQUIRED_PKGS = CSWlibsdl + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Deleted: csw/mgar/pkg/sdlmixer/trunk/files/CSWsdlmixer.depend =================================================================== --- csw/mgar/pkg/sdlmixer/trunk/files/CSWsdlmixer.depend 2009-11-14 18:49:21 UTC (rev 7285) +++ csw/mgar/pkg/sdlmixer/trunk/files/CSWsdlmixer.depend 2009-11-14 19:11:12 UTC (rev 7286) @@ -1,4 +0,0 @@ -P CSWlibsdl -P CSWlibogg -P CSWvorbis -P CSWsunmath Deleted: csw/mgar/pkg/sdlmixer/trunk/files/CSWsdlmixer.gspec =================================================================== --- csw/mgar/pkg/sdlmixer/trunk/files/CSWsdlmixer.gspec 2009-11-14 18:49:21 UTC (rev 7285) +++ csw/mgar/pkg/sdlmixer/trunk/files/CSWsdlmixer.gspec 2009-11-14 19:11:12 UTC (rev 7286) @@ -1,4 +0,0 @@ -%var bitname sdlmixer -%var pkgname CSWsdlmixer -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/sdlmixer/trunk/files/CSWsdlmixer.prototype =================================================================== --- csw/mgar/pkg/sdlmixer/trunk/files/CSWsdlmixer.prototype 2009-11-14 18:49:21 UTC (rev 7285) +++ csw/mgar/pkg/sdlmixer/trunk/files/CSWsdlmixer.prototype 2009-11-14 19:11:12 UTC (rev 7286) @@ -1,9 +0,0 @@ -d none /opt/csw/include/SDL 0755 root bin -f none /opt/csw/include/SDL/SDL_mixer.h 0644 root bin -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libSDL_mixer-1.2.so.0.2.6 0755 root bin -s none /opt/csw/lib/libSDL_mixer-1.2.so.0=libSDL_mixer-1.2.so.0.2.6 -s none /opt/csw/lib/libSDL_mixer.so=libSDL_mixer-1.2.so.0.2.6 -i copyright=CSWsdlmixer.copyright -i depend=CSWsdlmixer.depend -i pkginfo=CSWsdlmixer.pkginfo 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 Sat Nov 14 20:23:50 2009 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Sat, 14 Nov 2009 19:23:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[7287] csw/mgar/pkg/sdlmixer/trunk Message-ID: Revision: 7287 http://gar.svn.sourceforge.net/gar/?rev=7287&view=rev Author: jake_goerzen Date: 2009-11-14 19:23:50 +0000 (Sat, 14 Nov 2009) Log Message: ----------- add EXTRA_LDFLAGS = -lm Modified Paths: -------------- csw/mgar/pkg/sdlmixer/trunk/Makefile csw/mgar/pkg/sdlmixer/trunk/checksums Modified: csw/mgar/pkg/sdlmixer/trunk/Makefile =================================================================== --- csw/mgar/pkg/sdlmixer/trunk/Makefile 2009-11-14 19:11:12 UTC (rev 7286) +++ csw/mgar/pkg/sdlmixer/trunk/Makefile 2009-11-14 19:23:50 UTC (rev 7287) @@ -12,6 +12,7 @@ PACKAGES = CSWsdlmixer REQUIRED_PKGS = CSWlibsdl +EXTRA_LDFLAGS = -lm # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/sdlmixer/trunk/checksums =================================================================== --- csw/mgar/pkg/sdlmixer/trunk/checksums 2009-11-14 19:11:12 UTC (rev 7286) +++ csw/mgar/pkg/sdlmixer/trunk/checksums 2009-11-14 19:23:50 UTC (rev 7287) @@ -1,4 +1 @@ -0b5b91015d0f3bd9597e094ba67c4d65 download/SDL_mixer-1.2.8.tar.gz -c1158a1551d60aa1f6dab9896df82545 download/CSWsdlmixer.gspec -6fd7872952bbae2565e57654dc0f9965 download/CSWsdlmixer.depend -62269238c73ae43b22fd98ecb9533ffc download/CSWsdlmixer.prototype +a357558552436b0b5ea0333b3e2327df SDL_mixer-1.2.10.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Nov 14 23:20:33 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 14 Nov 2009 22:20:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[7288] csw/mgar/pkg Message-ID: Revision: 7288 http://gar.svn.sourceforge.net/gar/?rev=7288&view=rev Author: dmichelsen Date: 2009-11-14 22:20:33 +0000 (Sat, 14 Nov 2009) Log Message: ----------- libast: Initial commit Added Paths: ----------- csw/mgar/pkg/libast/ csw/mgar/pkg/libast/branches/ csw/mgar/pkg/libast/tags/ csw/mgar/pkg/libast/trunk/ csw/mgar/pkg/libast/trunk/Makefile csw/mgar/pkg/libast/trunk/checksums csw/mgar/pkg/libast/trunk/files/ csw/mgar/pkg/libast/trunk/files/0001-Fix-unknown-Sun-Studio-directive.patch Property changes on: csw/mgar/pkg/libast/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/libast/trunk/Makefile =================================================================== --- csw/mgar/pkg/libast/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libast/trunk/Makefile 2009-11-14 22:20:33 UTC (rev 7288) @@ -0,0 +1,24 @@ +GARNAME = libast +GARVERSION = 0.7 +CATEGORIES = lib + +DESCRIPTION = The Library of Assorted Spiffy Things (LibAST - formerly libmej) +define BLURB +endef + +MASTER_SITES = http://www.eterm.org/download/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Fix-unknown-Sun-Studio-directive.patch + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +STRIP_LIBTOOL = 1 + +BUILD64 = 1 +NO_ISAEXEC = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +MERGE_DIRS_isa-extra = $(libdir) + +include gar/category.mk Added: csw/mgar/pkg/libast/trunk/checksums =================================================================== --- csw/mgar/pkg/libast/trunk/checksums (rev 0) +++ csw/mgar/pkg/libast/trunk/checksums 2009-11-14 22:20:33 UTC (rev 7288) @@ -0,0 +1,2 @@ +2460a809fdffec738719fa1d59b63705 0001-Fix-unknown-Sun-Studio-directive.patch +a9ec3b2da317f35869316e6d9571d296 libast-0.7.tar.gz Added: csw/mgar/pkg/libast/trunk/files/0001-Fix-unknown-Sun-Studio-directive.patch =================================================================== --- csw/mgar/pkg/libast/trunk/files/0001-Fix-unknown-Sun-Studio-directive.patch (rev 0) +++ csw/mgar/pkg/libast/trunk/files/0001-Fix-unknown-Sun-Studio-directive.patch 2009-11-14 22:20:33 UTC (rev 7288) @@ -0,0 +1,451 @@ +From 530336bdbb1de36263137a2fc73fe6d75e06816e Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sat, 14 Nov 2009 23:06:39 +0100 +Subject: [PATCH] Fix unknown Sun Studio directive + +--- + src/array.c | 3 ++- + src/builtin_hashes.c | 4 ++-- + src/conf.c | 4 ++-- + src/debug.c | 4 ++-- + src/dlinked_list.c | 4 ++-- + src/file.c | 4 ++-- + src/linked_list.c | 4 ++-- + src/mbuff.c | 4 ++-- + src/mem.c | 4 ++-- + src/msgs.c | 4 ++-- + src/obj.c | 4 ++-- + src/objpair.c | 4 ++-- + src/options.c | 4 ++-- + src/regexp.c | 4 ++-- + src/snprintf.c | 2 ++ + src/socket.c | 4 ++-- + src/str.c | 4 ++-- + src/strings.c | 6 +++--- + src/tok.c | 4 ++-- + src/url.c | 4 ++-- + 20 files changed, 41 insertions(+), 38 deletions(-) + +diff --git a/src/array.c b/src/array.c +index 8dde32d..e00d809 100644 +--- a/src/array.c ++++ b/src/array.c +@@ -21,13 +21,14 @@ + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + ++#include ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: array.c,v 1.18 2004/07/16 23:22:18 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include + + /* *INDENT-OFF* */ + SPIF_DECL_OBJ(array_iterator) { +diff --git a/src/builtin_hashes.c b/src/builtin_hashes.c +index 7de999a..48b3c2d 100644 +--- a/src/builtin_hashes.c ++++ b/src/builtin_hashes.c +@@ -21,14 +21,14 @@ + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + ++#include ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: builtin_hashes.c,v 1.3 2004/07/23 21:38:39 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include +- + #define BUILTIN_RANDOM_SEED (SPIF_CAST(uint32) 0xf721b64d) + + /* +diff --git a/src/conf.c b/src/conf.c +index 3df8280..2c98677 100644 +--- a/src/conf.c ++++ b/src/conf.c +@@ -31,14 +31,14 @@ + * @author Michael Jennings + */ + ++#include ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: conf.c,v 1.26 2005/03/07 22:29:07 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include +- + static spifconf_var_t *spifconf_new_var(void); + static void spifconf_free_var(spifconf_var_t *); + static spif_charptr_t spifconf_get_var(const spif_charptr_t); +diff --git a/src/debug.c b/src/debug.c +index f0da466..abbb1e5 100644 +--- a/src/debug.c ++++ b/src/debug.c +@@ -32,14 +32,14 @@ + * $Date: 2004/12/15 00:00:22 $ + */ + ++#include "libast_internal.h" ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: debug.c,v 1.14 2004/12/15 00:00:22 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include "libast_internal.h" +- + /** + * Debug level. + * +diff --git a/src/dlinked_list.c b/src/dlinked_list.c +index a220f6e..87990ec 100644 +--- a/src/dlinked_list.c ++++ b/src/dlinked_list.c +@@ -21,14 +21,14 @@ + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + ++#include ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: dlinked_list.c,v 1.21 2004/07/20 22:32:08 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include +- + /* *INDENT-OFF* */ + SPIF_DECL_OBJ(dlinked_list_iterator) { + SPIF_DECL_PARENT_TYPE(obj); +diff --git a/src/file.c b/src/file.c +index f77981c..8ac9945 100644 +--- a/src/file.c ++++ b/src/file.c +@@ -32,14 +32,14 @@ + * $Date: 2004/07/23 21:38:39 $ + */ + ++#include ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: file.c,v 1.11 2004/07/23 21:38:39 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include +- + /** + * Create and open a temporary file. + * +diff --git a/src/linked_list.c b/src/linked_list.c +index 53a3425..11b8cfc 100644 +--- a/src/linked_list.c ++++ b/src/linked_list.c +@@ -21,14 +21,14 @@ + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + ++#include ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: linked_list.c,v 1.26 2004/07/23 21:38:39 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include +- + /* *INDENT-OFF* */ + SPIF_DECL_OBJ(linked_list_iterator) { + SPIF_DECL_PARENT_TYPE(obj); +diff --git a/src/mbuff.c b/src/mbuff.c +index 30ffd0d..bb87101 100644 +--- a/src/mbuff.c ++++ b/src/mbuff.c +@@ -21,14 +21,14 @@ + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + ++#include ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: mbuff.c,v 1.1 2004/12/15 00:00:22 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include +- + /* *INDENT-OFF* */ + static SPIF_CONST_TYPE(mbuffclass) mb_class = { + { +diff --git a/src/mem.c b/src/mem.c +index bb564ac..a4f5d6c 100644 +--- a/src/mem.c ++++ b/src/mem.c +@@ -32,14 +32,14 @@ + * $Date: 2005/12/22 23:28:55 $ + */ + ++#include "libast_internal.h" ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: mem.c,v 1.25 2005/12/22 23:28:55 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include "libast_internal.h" +- + static void memrec_add_var(memrec_t *, const spif_charptr_t, unsigned long, void *, size_t); + static ptr_t *memrec_find_var(memrec_t *, const void *); + static void memrec_rem_var(memrec_t *, const spif_charptr_t, const spif_charptr_t, unsigned long, const void *); +diff --git a/src/msgs.c b/src/msgs.c +index d68b659..ea32ac5 100644 +--- a/src/msgs.c ++++ b/src/msgs.c +@@ -33,14 +33,14 @@ + * $Date: 2004/07/23 21:38:39 $ + */ + ++#include "libast_internal.h" ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: msgs.c,v 1.11 2004/07/23 21:38:39 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include "libast_internal.h" +- + /** + * Program name. + * +diff --git a/src/obj.c b/src/obj.c +index fa89837..1954187 100644 +--- a/src/obj.c ++++ b/src/obj.c +@@ -32,14 +32,14 @@ + * $Date: 2004/07/23 21:38:39 $ + */ + ++#include ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: obj.c,v 1.27 2004/07/23 21:38:39 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include +- + /* *INDENT-OFF* */ + /** + * The actual class structure for the @c obj type. +diff --git a/src/objpair.c b/src/objpair.c +index dc999dd..0efc707 100644 +--- a/src/objpair.c ++++ b/src/objpair.c +@@ -32,14 +32,14 @@ + * $Date: 2004/07/23 21:38:39 $ + */ + ++#include ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: objpair.c,v 1.10 2004/07/23 21:38:39 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include +- + /* *INDENT-OFF* */ + /** + * The actual class structure for the @c objpair type. +diff --git a/src/options.c b/src/options.c +index a34bca6..cf2ddaf 100644 +--- a/src/options.c ++++ b/src/options.c +@@ -33,14 +33,14 @@ + * $Date: 2004/10/26 18:01:53 $ + */ + ++#include ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: options.c,v 1.18 2004/10/26 18:01:53 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include +- + /*@{*/ + /** + * @name Internal Parser Macros +diff --git a/src/regexp.c b/src/regexp.c +index 9e975d3..e5a162e 100644 +--- a/src/regexp.c ++++ b/src/regexp.c +@@ -21,14 +21,14 @@ + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + ++#include ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: regexp.c,v 1.15 2004/07/23 21:38:39 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include +- + /* *INDENT-OFF* */ + static SPIF_CONST_TYPE(class) r_class = { + SPIF_DECL_CLASSNAME(regexp), +diff --git a/src/snprintf.c b/src/snprintf.c +index 4e79f92..8087f5f 100644 +--- a/src/snprintf.c ++++ b/src/snprintf.c +@@ -9,6 +9,8 @@ + # undef HAVE_STDARG_H + #endif + ++#include ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: snprintf.c,v 1.6 2004/07/23 21:38:39 mej Exp $"; + + /* +diff --git a/src/socket.c b/src/socket.c +index da601b4..b040cde 100644 +--- a/src/socket.c ++++ b/src/socket.c +@@ -21,14 +21,14 @@ + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + ++#include ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: socket.c,v 1.23 2004/07/23 21:38:39 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include +- + static spif_url_t spif_url_new_from_ipaddr(spif_ipsockaddr_t); + static spif_bool_t spif_url_init_from_ipaddr(spif_url_t, spif_ipsockaddr_t); + static spif_url_t spif_url_new_from_unixaddr(spif_unixsockaddr_t); +diff --git a/src/str.c b/src/str.c +index 62d41b4..aa7a943 100644 +--- a/src/str.c ++++ b/src/str.c +@@ -21,14 +21,14 @@ + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + ++#include ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: str.c,v 1.32 2004/12/15 00:00:22 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include +- + /* *INDENT-OFF* */ + static SPIF_CONST_TYPE(strclass) s_class = { + { +diff --git a/src/strings.c b/src/strings.c +index 080f5ee..5b4b700 100644 +--- a/src/strings.c ++++ b/src/strings.c +@@ -30,14 +30,14 @@ + * @author Michael Jennings + */ + ++#include ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: strings.c,v 1.25 2005/03/07 22:29:07 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include +- + #if !(HAVE_MEMMEM) + /* Find first occurance of bytestring needle of size needlelen in memory region + haystack of size haystacklen */ +@@ -159,7 +159,7 @@ strrev(register char *str) + REQUIRE_RVAL(str != SPIF_NULL_TYPE(ptr), SPIF_NULL_TYPE(ptr)); + i = strlen(str); + for (j = 0, i--; i > j; i--, j++) { +- (void) SWAP(str[j], str[i]); ++ SWAP(str[j], str[i]); + } + return (str); + +diff --git a/src/tok.c b/src/tok.c +index e0f99b3..8952efc 100644 +--- a/src/tok.c ++++ b/src/tok.c +@@ -21,14 +21,14 @@ + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + ++#include ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: tok.c,v 1.22 2004/07/23 21:38:39 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include +- + /* *INDENT-OFF* */ + static SPIF_CONST_TYPE(class) t_class = { + SPIF_DECL_CLASSNAME(tok), +diff --git a/src/url.c b/src/url.c +index f78766f..c699a5f 100644 +--- a/src/url.c ++++ b/src/url.c +@@ -21,14 +21,14 @@ + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + ++#include ++ + static const char __attribute__((unused)) cvs_ident[] = "$Id: url.c,v 1.20 2004/07/23 21:38:39 mej Exp $"; + + #ifdef HAVE_CONFIG_H + # include + #endif + +-#include +- + /* *INDENT-OFF* */ + static SPIF_CONST_TYPE(class) u_class = { + SPIF_DECL_CLASSNAME(url), +-- +1.6.5.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 Sat Nov 14 23:53:30 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 14 Nov 2009 22:53:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[7289] csw/mgar/pkg/wxwidgets/trunk Message-ID: Revision: 7289 http://gar.svn.sourceforge.net/gar/?rev=7289&view=rev Author: wahwah Date: 2009-11-14 22:53:30 +0000 (Sat, 14 Nov 2009) Log Message: ----------- wxwidgets: providing vsscanf via ncursesw Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/wxwidgets/trunk/files/0003-vsscanf-support-via-ncursesw.patch Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-14 22:20:33 UTC (rev 7288) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-14 22:53:30 UTC (rev 7289) @@ -97,23 +97,18 @@ CATALOGNAME_CSWwxwidgetsgtk2 = wxwidgets_gtk2 TEST_SCRIPTS = -EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so +# To fix a problem with unresolved symbols +EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so +# For vsscanf support +EXTRA_LINKER_FLAGS += /opt/csw/lib/libncursesw.so CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-gtk=2 CONFIGURE_ARGS += --with-gtk-prefix=/opt/csw CONFIGURE_ARGS += --with-regex CONFIGURE_ARGS += --with-opengl -# Unicode-enabled build on Solaris 8 fails with: -# "./src/common/wxchar.cpp", line 1693: Error: The function "vswscanf" must have -# a prototype. -# Building Unicode support for Solaris 9 and 10 only. -CONFIGURE_ARGS_5.8 = --disable-unicode -CONFIGURE_ARGS_5.9 = --enable-unicode -CONFIGURE_ARGS_5.10 = --enable-unicode -CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GAROSREL)) -EXTRA_CFLAGS = -fast -xstrconst -xnolibmopt -EXTRA_CXXFLAGS = -fast -xstrconst -xnolibmopt +EXTRA_CFLAGS = -fast -xstrconst -xnolibmopt -D__EXTENSIONS__ +EXTRA_CXXFLAGS = -fast -xstrconst -xnolibmopt -D__EXTENSIONS__ EXTRA_INC = /opt/csw/X11/include /usr/X11/include /usr/openwin/share/include EXTRA_LIB = /opt/csw/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib Added: csw/mgar/pkg/wxwidgets/trunk/files/0003-vsscanf-support-via-ncursesw.patch =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/files/0003-vsscanf-support-via-ncursesw.patch (rev 0) +++ csw/mgar/pkg/wxwidgets/trunk/files/0003-vsscanf-support-via-ncursesw.patch 2009-11-14 22:53:30 UTC (rev 7289) @@ -0,0 +1,24 @@ +From 402daca1490a5ba6b0742011d72372680d261cc3 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sat, 14 Nov 2009 22:47:42 +0100 +Subject: [PATCH] vsscanf support via ncursesw + +--- + src/common/wxchar.cpp | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp +index f594796..1550acc 100644 +--- a/src/common/wxchar.cpp ++++ b/src/common/wxchar.cpp +@@ -15,6 +15,7 @@ + + // For compilers that support precompilation, includes "wx.h". + #include "wx/wxprec.h" ++#include "ncursesw/ncurses.h" + + #ifdef __BORLANDC__ + #pragma hdrstop +-- +1.6.5.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 Nov 15 02:46:27 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 15 Nov 2009 01:46:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7290] csw/mgar/pkg/wxwidgets/trunk/Makefile Message-ID: Revision: 7290 http://gar.svn.sourceforge.net/gar/?rev=7290&view=rev Author: wahwah Date: 2009-11-15 01:46:27 +0000 (Sun, 15 Nov 2009) Log Message: ----------- wxwidgets: Adding the --enable-unicode flag Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-14 22:53:30 UTC (rev 7289) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-15 01:46:27 UTC (rev 7290) @@ -107,6 +107,7 @@ CONFIGURE_ARGS += --with-gtk-prefix=/opt/csw CONFIGURE_ARGS += --with-regex CONFIGURE_ARGS += --with-opengl +CONFIGURE_ARGS += --enable-unicode EXTRA_CFLAGS = -fast -xstrconst -xnolibmopt -D__EXTENSIONS__ EXTRA_CXXFLAGS = -fast -xstrconst -xnolibmopt -D__EXTENSIONS__ EXTRA_INC = /opt/csw/X11/include /usr/X11/include /usr/openwin/share/include This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Nov 15 02:58:23 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 15 Nov 2009 01:58:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7291] csw/mgar/pkg/wxwidgets/trunk Message-ID: Revision: 7291 http://gar.svn.sourceforge.net/gar/?rev=7291&view=rev Author: wahwah Date: 2009-11-15 01:58:23 +0000 (Sun, 15 Nov 2009) Log Message: ----------- wxwidgets: Enabling 0003-vsscanf-support-via-ncursesw.patch Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile csw/mgar/pkg/wxwidgets/trunk/checksums Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-15 01:46:27 UTC (rev 7290) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-15 01:58:23 UTC (rev 7291) @@ -36,13 +36,17 @@ PATCHFILES_isa-i386-garversion-2.8.5 = 0500-wxT-macro-first-iteration.patch PATCHFILES_isa-i386-garversion-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch PATCHFILES_isa-i386-garversion-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch +PATCHFILES_isa-i386-garversion-2.8.5 += 0003-vsscanf-support-via-ncursesw.patch PATCHFILES_isa-sparcv8-garversion-2.8.5 = 0500-wxT-macro-first-iteration.patch PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch +PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0003-vsscanf-support-via-ncursesw.patch PATCHFILES_isa-i386-garversion-2.8.10 = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch PATCHFILES_isa-i386-garversion-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch +PATCHFILES_isa-i386-garversion-2.8.10 += 0003-vsscanf-support-via-ncursesw.patch PATCHFILES_isa-sparcv8-garversion-2.8.10 = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch PATCHFILES_isa-sparcv8-garversion-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch +PATCHFILES_isa-sparcv8-garversion-2.8.10 += 0003-vsscanf-support-via-ncursesw.patch DISTFILES = $(SOURCEFILES) UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz PACKAGES = CSWwxwidgetscommon Modified: csw/mgar/pkg/wxwidgets/trunk/checksums =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/checksums 2009-11-15 01:46:27 UTC (rev 7290) +++ csw/mgar/pkg/wxwidgets/trunk/checksums 2009-11-15 01:58:23 UTC (rev 7291) @@ -1,6 +1,7 @@ -7830ab8006ade9b14567341b5481eadd download/0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch -45df2933ed2fa53f229feda01467db81 download/0002-Fixing-retarded-checks-for-libGL.patch -75ecdc04af4392f918ff6856a3ba6605 download/0500-wxT-macro-first-iteration.patch -17d8d019fd2e4137b4cd44816b14e282 download/0501-a-possible-fix-to-wxchar.h.patch -05b32ca051651f4b1885a90f62969faf download/wxWidgets-2.8.10.tar.gz -43274231ee50eb1f35e04e693ebab902 download/wxWidgets-2.8.5.tar.gz +7830ab8006ade9b14567341b5481eadd 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch +45df2933ed2fa53f229feda01467db81 0002-Fixing-retarded-checks-for-libGL.patch +225f6163a1c31d1f96a3b0548b338105 0003-vsscanf-support-via-ncursesw.patch +75ecdc04af4392f918ff6856a3ba6605 0500-wxT-macro-first-iteration.patch +17d8d019fd2e4137b4cd44816b14e282 0501-a-possible-fix-to-wxchar.h.patch +05b32ca051651f4b1885a90f62969faf wxWidgets-2.8.10.tar.gz +43274231ee50eb1f35e04e693ebab902 wxWidgets-2.8.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 Sun Nov 15 05:04:22 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 15 Nov 2009 04:04:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[7292] csw/mgar/pkg/ruby/trunk/Makefile Message-ID: Revision: 7292 http://gar.svn.sourceforge.net/gar/?rev=7292&view=rev Author: bdwalton Date: 2009-11-15 04:04:21 +0000 (Sun, 15 Nov 2009) Log Message: ----------- ruby: tweak the way rbconfig.rb.SOS11 is symlinked initially Modified Paths: -------------- csw/mgar/pkg/ruby/trunk/Makefile Modified: csw/mgar/pkg/ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby/trunk/Makefile 2009-11-15 01:58:23 UTC (rev 7291) +++ csw/mgar/pkg/ruby/trunk/Makefile 2009-11-15 04:04:21 UTC (rev 7292) @@ -125,7 +125,7 @@ @echo "Setting up the CSW rbconfig stuff so we can switch between compilers" @mv $(DESTDIR)$(RBCONFIG) $(DESTDIR)$(RBCONFIG).SOS11 @gcp $(FILEDIR)/rbconfig.rb.GCC4.$(GARCH) $(DESTDIR)/$(RBCONFIG).GCC4 - @gln -s $(RBCONFIG).SOS11 $(DESTDIR)$(RBCONFIG) + @gln -n -s $(RBCONFIG).SOS11 $(DESTDIR)$(RBCONFIG) @gcp $(FILEDIR)/cswrbconfig $(DESTDIR)/opt/csw/bin/ @chmod 755 $(DESTDIR)/opt/csw/bin/cswrbconfig @ginstall -c -d -m 0755 $(DESTDIR)$(docdir)/ruby/ 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 Nov 15 10:42:24 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 15 Nov 2009 09:42:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7293] csw/mgar/pkg/wxwidgets/trunk Message-ID: Revision: 7293 http://gar.svn.sourceforge.net/gar/?rev=7293&view=rev Author: wahwah Date: 2009-11-15 09:42:24 +0000 (Sun, 15 Nov 2009) Log Message: ----------- wxwidgets: adding 0004-add-monodll_appbase.so-to-wxrc.patch Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile csw/mgar/pkg/wxwidgets/trunk/checksums Added Paths: ----------- csw/mgar/pkg/wxwidgets/trunk/files/0004-add-monodll_appbase.so-to-wxrc.patch Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-15 04:04:21 UTC (rev 7292) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-15 09:42:24 UTC (rev 7293) @@ -37,10 +37,12 @@ PATCHFILES_isa-i386-garversion-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch PATCHFILES_isa-i386-garversion-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch PATCHFILES_isa-i386-garversion-2.8.5 += 0003-vsscanf-support-via-ncursesw.patch +PATCHFILES_isa-i386-garversion-2.8.5 += 0004-add-monodll_appbase.so-to-wxrc.patch PATCHFILES_isa-sparcv8-garversion-2.8.5 = 0500-wxT-macro-first-iteration.patch PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0003-vsscanf-support-via-ncursesw.patch +PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0004-add-monodll_appbase.so-to-wxrc.patch PATCHFILES_isa-i386-garversion-2.8.10 = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch PATCHFILES_isa-i386-garversion-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch PATCHFILES_isa-i386-garversion-2.8.10 += 0003-vsscanf-support-via-ncursesw.patch Modified: csw/mgar/pkg/wxwidgets/trunk/checksums =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/checksums 2009-11-15 04:04:21 UTC (rev 7292) +++ csw/mgar/pkg/wxwidgets/trunk/checksums 2009-11-15 09:42:24 UTC (rev 7293) @@ -1,6 +1,7 @@ 7830ab8006ade9b14567341b5481eadd 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch 45df2933ed2fa53f229feda01467db81 0002-Fixing-retarded-checks-for-libGL.patch 225f6163a1c31d1f96a3b0548b338105 0003-vsscanf-support-via-ncursesw.patch +d3ee8b20cf9b3dad989f7f0d3363406c 0004-add-monodll_appbase.so-to-wxrc.patch 75ecdc04af4392f918ff6856a3ba6605 0500-wxT-macro-first-iteration.patch 17d8d019fd2e4137b4cd44816b14e282 0501-a-possible-fix-to-wxchar.h.patch 05b32ca051651f4b1885a90f62969faf wxWidgets-2.8.10.tar.gz Added: csw/mgar/pkg/wxwidgets/trunk/files/0004-add-monodll_appbase.so-to-wxrc.patch =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/files/0004-add-monodll_appbase.so-to-wxrc.patch (rev 0) +++ csw/mgar/pkg/wxwidgets/trunk/files/0004-add-monodll_appbase.so-to-wxrc.patch 2009-11-15 09:42:24 UTC (rev 7293) @@ -0,0 +1,39 @@ +From 97b45391f2f97c5455d600051445dd9852a5c58b Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 15 Nov 2009 10:25:28 +0100 +Subject: [PATCH] add monodll_appbase.so to wxrc + +--- + src/common/wxchar.cpp | 1 - + utils/wxrc/Makefile.in | 3 ++- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp +index 1550acc..f594796 100644 +--- a/src/common/wxchar.cpp ++++ b/src/common/wxchar.cpp +@@ -15,7 +15,6 @@ + + // For compilers that support precompilation, includes "wx.h". + #include "wx/wxprec.h" +-#include "ncursesw/ncurses.h" + + #ifdef __BORLANDC__ + #pragma hdrstop +diff --git a/utils/wxrc/Makefile.in b/utils/wxrc/Makefile.in +index 086ba6f..9f1f171 100644 +--- a/utils/wxrc/Makefile.in ++++ b/utils/wxrc/Makefile.in +@@ -44,7 +44,8 @@ WXRC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS) + WXRC_OBJECTS = \ +- wxrc_wxrc.o ++ wxrc_wxrc.o \ ++ ../../monodll_appbase.o + + ### Conditionally set variables: ### + +-- +1.6.2.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 Nov 15 12:15:49 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 15 Nov 2009 11:15:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[7294] csw/mgar/pkg/wxwidgets/trunk Message-ID: Revision: 7294 http://gar.svn.sourceforge.net/gar/?rev=7294&view=rev Author: wahwah Date: 2009-11-15 11:15:49 +0000 (Sun, 15 Nov 2009) Log Message: ----------- Fixing 0004-add-monodll_appbase.so-to-wxrc.patch not to revert 0003 Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/checksums csw/mgar/pkg/wxwidgets/trunk/files/0004-add-monodll_appbase.so-to-wxrc.patch Modified: csw/mgar/pkg/wxwidgets/trunk/checksums =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/checksums 2009-11-15 09:42:24 UTC (rev 7293) +++ csw/mgar/pkg/wxwidgets/trunk/checksums 2009-11-15 11:15:49 UTC (rev 7294) @@ -1,7 +1,7 @@ 7830ab8006ade9b14567341b5481eadd 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch 45df2933ed2fa53f229feda01467db81 0002-Fixing-retarded-checks-for-libGL.patch 225f6163a1c31d1f96a3b0548b338105 0003-vsscanf-support-via-ncursesw.patch -d3ee8b20cf9b3dad989f7f0d3363406c 0004-add-monodll_appbase.so-to-wxrc.patch +f073300d39ce7c88db1033bbce64cdca 0004-add-monodll_appbase.so-to-wxrc.patch 75ecdc04af4392f918ff6856a3ba6605 0500-wxT-macro-first-iteration.patch 17d8d019fd2e4137b4cd44816b14e282 0501-a-possible-fix-to-wxchar.h.patch 05b32ca051651f4b1885a90f62969faf wxWidgets-2.8.10.tar.gz Modified: csw/mgar/pkg/wxwidgets/trunk/files/0004-add-monodll_appbase.so-to-wxrc.patch =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/files/0004-add-monodll_appbase.so-to-wxrc.patch 2009-11-15 09:42:24 UTC (rev 7293) +++ csw/mgar/pkg/wxwidgets/trunk/files/0004-add-monodll_appbase.so-to-wxrc.patch 2009-11-15 11:15:49 UTC (rev 7294) @@ -8,18 +8,6 @@ utils/wxrc/Makefile.in | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp -index 1550acc..f594796 100644 ---- a/src/common/wxchar.cpp -+++ b/src/common/wxchar.cpp -@@ -15,7 +15,6 @@ - - // For compilers that support precompilation, includes "wx.h". - #include "wx/wxprec.h" --#include "ncursesw/ncurses.h" - - #ifdef __BORLANDC__ - #pragma hdrstop diff --git a/utils/wxrc/Makefile.in b/utils/wxrc/Makefile.in index 086ba6f..9f1f171 100644 --- a/utils/wxrc/Makefile.in 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 Nov 15 14:51:22 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 15 Nov 2009 13:51:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[7295] csw/mgar/pkg Message-ID: Revision: 7295 http://gar.svn.sourceforge.net/gar/?rev=7295&view=rev Author: wahwah Date: 2009-11-15 13:51:19 +0000 (Sun, 15 Nov 2009) Log Message: ----------- multiple packages: adding package-level Makefiles Added Paths: ----------- csw/mgar/pkg/GeoIP/Makefile csw/mgar/pkg/S10gnome/Makefile csw/mgar/pkg/Vispan/Makefile csw/mgar/pkg/anjuta/Makefile csw/mgar/pkg/atspi/Makefile csw/mgar/pkg/autossh/Makefile csw/mgar/pkg/awstats/Makefile csw/mgar/pkg/axel/Makefile csw/mgar/pkg/bass/Makefile csw/mgar/pkg/bind2nsd/Makefile csw/mgar/pkg/binutils/Makefile csw/mgar/pkg/bluefish/Makefile csw/mgar/pkg/botnet/Makefile csw/mgar/pkg/boxbackup/Makefile csw/mgar/pkg/bvi/Makefile csw/mgar/pkg/ca_certificates/Makefile csw/mgar/pkg/cacti/Makefile csw/mgar/pkg/control-center/Makefile csw/mgar/pkg/convmv/Makefile csw/mgar/pkg/csup/Makefile csw/mgar/pkg/cvsps/Makefile csw/mgar/pkg/dante/Makefile csw/mgar/pkg/dcc/Makefile csw/mgar/pkg/desktop-file-utils/Makefile csw/mgar/pkg/dhcp/Makefile csw/mgar/pkg/dhcping/Makefile csw/mgar/pkg/diffstat/Makefile csw/mgar/pkg/dnswalk/Makefile csw/mgar/pkg/docbook-dtds/Makefile csw/mgar/pkg/docbook-style-dsssl/Makefile csw/mgar/pkg/docbook-style-xsl/Makefile csw/mgar/pkg/dovecot/Makefile csw/mgar/pkg/drill/Makefile csw/mgar/pkg/enigma/Makefile csw/mgar/pkg/eog/Makefile csw/mgar/pkg/epiphany/Makefile csw/mgar/pkg/esound/Makefile csw/mgar/pkg/etckeeper/Makefile csw/mgar/pkg/evolution/Makefile csw/mgar/pkg/evolution-ds/Makefile csw/mgar/pkg/fedora-ds/Makefile csw/mgar/pkg/ficy/Makefile csw/mgar/pkg/fortune/Makefile csw/mgar/pkg/fotaq/Makefile csw/mgar/pkg/fprobe/Makefile csw/mgar/pkg/gail/Makefile csw/mgar/pkg/gal/Makefile csw/mgar/pkg/gal2/Makefile csw/mgar/pkg/gconf2/Makefile csw/mgar/pkg/gdb/Makefile csw/mgar/pkg/gnome/Makefile csw/mgar/pkg/gnome-applets/Makefile csw/mgar/pkg/gnome-games/Makefile csw/mgar/pkg/gnome-icon-theme/Makefile csw/mgar/pkg/gnome-keyring/Makefile csw/mgar/pkg/gnome-panel/Makefile csw/mgar/pkg/gnome-pilot/Makefile csw/mgar/pkg/gnome-session/Makefile csw/mgar/pkg/gnome-skeleton/Makefile csw/mgar/pkg/gnome-spell/Makefile csw/mgar/pkg/gnome-terminal/Makefile csw/mgar/pkg/gnome-themes/Makefile csw/mgar/pkg/gnome-utils/Makefile csw/mgar/pkg/gnomedesktop/Makefile csw/mgar/pkg/gnomevfs2/Makefile csw/mgar/pkg/gnupg2/Makefile csw/mgar/pkg/gpgme/Makefile csw/mgar/pkg/gstreamer/Makefile csw/mgar/pkg/gtk-engines/Makefile csw/mgar/pkg/gtkhtml/Makefile csw/mgar/pkg/gtkhtml31/Makefile csw/mgar/pkg/gts/Makefile csw/mgar/pkg/hatari/Makefile csw/mgar/pkg/hdf5/Makefile csw/mgar/pkg/hexdump/Makefile csw/mgar/pkg/httping/Makefile csw/mgar/pkg/icinga/Makefile csw/mgar/pkg/iftop/Makefile csw/mgar/pkg/imapsync/Makefile csw/mgar/pkg/indent/Makefile csw/mgar/pkg/intltool/Makefile csw/mgar/pkg/iperf/Makefile csw/mgar/pkg/kshdbx/Makefile csw/mgar/pkg/lame/Makefile csw/mgar/pkg/ldns/Makefile csw/mgar/pkg/leafnode/Makefile csw/mgar/pkg/libassuan/Makefile csw/mgar/pkg/libbonobo2/Makefile csw/mgar/pkg/libbonoboui/Makefile csw/mgar/pkg/libcroco/Makefile csw/mgar/pkg/libfaac/Makefile csw/mgar/pkg/libgadu/Makefile csw/mgar/pkg/libgcrypt/Makefile csw/mgar/pkg/libgnome/Makefile csw/mgar/pkg/libgnomecanvas/Makefile csw/mgar/pkg/libgnomecups/Makefile csw/mgar/pkg/libgnomeprint/Makefile csw/mgar/pkg/libgnomeprintui/Makefile csw/mgar/pkg/libgnomeui/Makefile csw/mgar/pkg/libgpg_error/Makefile csw/mgar/pkg/libgss/Makefile csw/mgar/pkg/libgtop/Makefile csw/mgar/pkg/libidn/Makefile csw/mgar/pkg/libksba/Makefile csw/mgar/pkg/liblasi/Makefile csw/mgar/pkg/libmhash/Makefile csw/mgar/pkg/libserf/Makefile csw/mgar/pkg/libsoup/Makefile csw/mgar/pkg/libsoup2/Makefile csw/mgar/pkg/libspectre/Makefile csw/mgar/pkg/libtasn1/Makefile csw/mgar/pkg/libthai/Makefile csw/mgar/pkg/libtheora/Makefile csw/mgar/pkg/libwnck/Makefile csw/mgar/pkg/libxklavier/Makefile csw/mgar/pkg/libxml2/Makefile csw/mgar/pkg/libxslt/Makefile csw/mgar/pkg/libytnef/Makefile csw/mgar/pkg/loudmouth/Makefile csw/mgar/pkg/lzop/Makefile csw/mgar/pkg/mailx/Makefile csw/mgar/pkg/mairix/Makefile csw/mgar/pkg/mbuffer/Makefile csw/mgar/pkg/mcabber/Makefile csw/mgar/pkg/meanwhile/Makefile csw/mgar/pkg/metacity/Makefile csw/mgar/pkg/mgetty/Makefile csw/mgar/pkg/miltergreylist/Makefile csw/mgar/pkg/mod_macro/Makefile csw/mgar/pkg/mod_wsgi/Makefile csw/mgar/pkg/mtr/Makefile csw/mgar/pkg/multisync/Makefile csw/mgar/pkg/multitail/Makefile csw/mgar/pkg/mysql5/Makefile csw/mgar/pkg/nagios/Makefile csw/mgar/pkg/nagios_plugins/Makefile csw/mgar/pkg/nagvis/Makefile csw/mgar/pkg/nano/Makefile csw/mgar/pkg/nautilus/Makefile csw/mgar/pkg/ncal/Makefile csw/mgar/pkg/ncdu/Makefile csw/mgar/pkg/ndoutils/Makefile csw/mgar/pkg/nethack/Makefile csw/mgar/pkg/nginx/Makefile csw/mgar/pkg/npadmin/Makefile csw/mgar/pkg/nrpe/Makefile csw/mgar/pkg/nsca/Makefile csw/mgar/pkg/nsd/Makefile csw/mgar/pkg/octave/Makefile csw/mgar/pkg/openjade/Makefile csw/mgar/pkg/openjpeg/Makefile csw/mgar/pkg/openobex/Makefile csw/mgar/pkg/openssl1/Makefile csw/mgar/pkg/otr/Makefile csw/mgar/pkg/p7zip/Makefile csw/mgar/pkg/pango-libthai/Makefile csw/mgar/pkg/par/Makefile csw/mgar/pkg/pbzip2/Makefile csw/mgar/pkg/pcb/Makefile csw/mgar/pkg/pen/Makefile csw/mgar/pkg/php5_apc/Makefile csw/mgar/pkg/php5_xdebug/Makefile csw/mgar/pkg/phpMyAdmin/Makefile csw/mgar/pkg/phpmode/Makefile csw/mgar/pkg/phpsysinfo/Makefile csw/mgar/pkg/pidgin/Makefile csw/mgar/pkg/pidginotr/Makefile csw/mgar/pkg/pil/Makefile csw/mgar/pkg/pnp/Makefile csw/mgar/pkg/poppler/Makefile csw/mgar/pkg/postgresql/Makefile csw/mgar/pkg/pound2/Makefile csw/mgar/pkg/privoxy/Makefile csw/mgar/pkg/proxytunnel/Makefile csw/mgar/pkg/pureftpd/Makefile csw/mgar/pkg/pydes/Makefile csw/mgar/pkg/pyorbit/Makefile csw/mgar/pkg/pyzor/Makefile csw/mgar/pkg/qpopper/Makefile csw/mgar/pkg/rcs/Makefile csw/mgar/pkg/rdesktop/Makefile csw/mgar/pkg/reportlab/Makefile csw/mgar/pkg/samba/Makefile csw/mgar/pkg/scala/Makefile csw/mgar/pkg/scponly/Makefile csw/mgar/pkg/scummvm/Makefile csw/mgar/pkg/shmux/Makefile csw/mgar/pkg/siege/Makefile csw/mgar/pkg/silctoolkit/Makefile csw/mgar/pkg/skeleton/Makefile csw/mgar/pkg/slocate/Makefile csw/mgar/pkg/smartmontools/Makefile csw/mgar/pkg/sox/Makefile csw/mgar/pkg/speex/Makefile csw/mgar/pkg/spider/Makefile csw/mgar/pkg/sqlite/Makefile csw/mgar/pkg/startup-notification/Makefile csw/mgar/pkg/stunnel/Makefile csw/mgar/pkg/swftools/Makefile csw/mgar/pkg/synce/Makefile csw/mgar/pkg/synce_multisync/Makefile csw/mgar/pkg/tcl/Makefile csw/mgar/pkg/tcl85/Makefile csw/mgar/pkg/tcpdrop/Makefile csw/mgar/pkg/tcpflow/Makefile csw/mgar/pkg/timidity/Makefile csw/mgar/pkg/tk/Makefile csw/mgar/pkg/tla/Makefile csw/mgar/pkg/tla-tools/Makefile csw/mgar/pkg/top/Makefile csw/mgar/pkg/trafshow/Makefile csw/mgar/pkg/transmission/Makefile csw/mgar/pkg/tuntap/Makefile csw/mgar/pkg/unbound/Makefile csw/mgar/pkg/unclutter/Makefile csw/mgar/pkg/vixiecron/Makefile csw/mgar/pkg/vttest/Makefile csw/mgar/pkg/watch/Makefile csw/mgar/pkg/wbxml2/Makefile csw/mgar/pkg/which/Makefile csw/mgar/pkg/wmcliphist/Makefile csw/mgar/pkg/wmclock/Makefile csw/mgar/pkg/wmmail/Makefile csw/mgar/pkg/wput/Makefile csw/mgar/pkg/wv2/Makefile csw/mgar/pkg/x11-ssh-askpass/Makefile csw/mgar/pkg/x2x/Makefile csw/mgar/pkg/xbill/Makefile csw/mgar/pkg/ximian_connector/Makefile csw/mgar/pkg/xmahjongg/Makefile csw/mgar/pkg/xmlparser/Makefile csw/mgar/pkg/xpdf/Makefile csw/mgar/pkg/xsel/Makefile csw/mgar/pkg/xterm/Makefile csw/mgar/pkg/xtide/Makefile csw/mgar/pkg/zlib/Makefile Copied: csw/mgar/pkg/GeoIP/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/GeoIP/Makefile (rev 0) +++ csw/mgar/pkg/GeoIP/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/S10gnome/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/S10gnome/Makefile (rev 0) +++ csw/mgar/pkg/S10gnome/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/Vispan/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/Vispan/Makefile (rev 0) +++ csw/mgar/pkg/Vispan/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/anjuta/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/anjuta/Makefile (rev 0) +++ csw/mgar/pkg/anjuta/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/atspi/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/atspi/Makefile (rev 0) +++ csw/mgar/pkg/atspi/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/autossh/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/autossh/Makefile (rev 0) +++ csw/mgar/pkg/autossh/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/awstats/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/awstats/Makefile (rev 0) +++ csw/mgar/pkg/awstats/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/axel/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/axel/Makefile (rev 0) +++ csw/mgar/pkg/axel/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/bass/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/bass/Makefile (rev 0) +++ csw/mgar/pkg/bass/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/bind2nsd/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/bind2nsd/Makefile (rev 0) +++ csw/mgar/pkg/bind2nsd/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/binutils/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/binutils/Makefile (rev 0) +++ csw/mgar/pkg/binutils/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/bluefish/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/bluefish/Makefile (rev 0) +++ csw/mgar/pkg/bluefish/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/botnet/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/botnet/Makefile (rev 0) +++ csw/mgar/pkg/botnet/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/boxbackup/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/boxbackup/Makefile (rev 0) +++ csw/mgar/pkg/boxbackup/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/bvi/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/bvi/Makefile (rev 0) +++ csw/mgar/pkg/bvi/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/ca_certificates/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/ca_certificates/Makefile (rev 0) +++ csw/mgar/pkg/ca_certificates/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/cacti/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/cacti/Makefile (rev 0) +++ csw/mgar/pkg/cacti/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/control-center/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/control-center/Makefile (rev 0) +++ csw/mgar/pkg/control-center/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/convmv/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/convmv/Makefile (rev 0) +++ csw/mgar/pkg/convmv/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/csup/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/csup/Makefile (rev 0) +++ csw/mgar/pkg/csup/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/cvsps/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/cvsps/Makefile (rev 0) +++ csw/mgar/pkg/cvsps/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/dante/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/dante/Makefile (rev 0) +++ csw/mgar/pkg/dante/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/dcc/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/dcc/Makefile (rev 0) +++ csw/mgar/pkg/dcc/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/desktop-file-utils/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/desktop-file-utils/Makefile (rev 0) +++ csw/mgar/pkg/desktop-file-utils/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/dhcp/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/dhcp/Makefile (rev 0) +++ csw/mgar/pkg/dhcp/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/dhcping/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/dhcping/Makefile (rev 0) +++ csw/mgar/pkg/dhcping/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/diffstat/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/diffstat/Makefile (rev 0) +++ csw/mgar/pkg/diffstat/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/dnswalk/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/dnswalk/Makefile (rev 0) +++ csw/mgar/pkg/dnswalk/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/docbook-dtds/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/docbook-dtds/Makefile (rev 0) +++ csw/mgar/pkg/docbook-dtds/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/docbook-style-dsssl/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/docbook-style-dsssl/Makefile (rev 0) +++ csw/mgar/pkg/docbook-style-dsssl/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/docbook-style-xsl/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/docbook-style-xsl/Makefile (rev 0) +++ csw/mgar/pkg/docbook-style-xsl/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/dovecot/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/dovecot/Makefile (rev 0) +++ csw/mgar/pkg/dovecot/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/drill/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/drill/Makefile (rev 0) +++ csw/mgar/pkg/drill/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/enigma/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/enigma/Makefile (rev 0) +++ csw/mgar/pkg/enigma/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/eog/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/eog/Makefile (rev 0) +++ csw/mgar/pkg/eog/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/epiphany/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/epiphany/Makefile (rev 0) +++ csw/mgar/pkg/epiphany/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/esound/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/esound/Makefile (rev 0) +++ csw/mgar/pkg/esound/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/etckeeper/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/etckeeper/Makefile (rev 0) +++ csw/mgar/pkg/etckeeper/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/evolution/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/evolution/Makefile (rev 0) +++ csw/mgar/pkg/evolution/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/evolution-ds/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/evolution-ds/Makefile (rev 0) +++ csw/mgar/pkg/evolution-ds/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/fedora-ds/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/fedora-ds/Makefile (rev 0) +++ csw/mgar/pkg/fedora-ds/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/ficy/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/ficy/Makefile (rev 0) +++ csw/mgar/pkg/ficy/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/fortune/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/fortune/Makefile (rev 0) +++ csw/mgar/pkg/fortune/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/fotaq/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/fotaq/Makefile (rev 0) +++ csw/mgar/pkg/fotaq/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/fprobe/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/fprobe/Makefile (rev 0) +++ csw/mgar/pkg/fprobe/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gail/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gail/Makefile (rev 0) +++ csw/mgar/pkg/gail/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gal/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gal/Makefile (rev 0) +++ csw/mgar/pkg/gal/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gal2/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gal2/Makefile (rev 0) +++ csw/mgar/pkg/gal2/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gconf2/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gconf2/Makefile (rev 0) +++ csw/mgar/pkg/gconf2/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gdb/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gdb/Makefile (rev 0) +++ csw/mgar/pkg/gdb/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gnome/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gnome/Makefile (rev 0) +++ csw/mgar/pkg/gnome/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gnome-applets/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gnome-applets/Makefile (rev 0) +++ csw/mgar/pkg/gnome-applets/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gnome-games/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gnome-games/Makefile (rev 0) +++ csw/mgar/pkg/gnome-games/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gnome-icon-theme/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gnome-icon-theme/Makefile (rev 0) +++ csw/mgar/pkg/gnome-icon-theme/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gnome-keyring/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gnome-keyring/Makefile (rev 0) +++ csw/mgar/pkg/gnome-keyring/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gnome-panel/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gnome-panel/Makefile (rev 0) +++ csw/mgar/pkg/gnome-panel/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gnome-pilot/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gnome-pilot/Makefile (rev 0) +++ csw/mgar/pkg/gnome-pilot/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gnome-session/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gnome-session/Makefile (rev 0) +++ csw/mgar/pkg/gnome-session/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gnome-skeleton/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gnome-skeleton/Makefile (rev 0) +++ csw/mgar/pkg/gnome-skeleton/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gnome-spell/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gnome-spell/Makefile (rev 0) +++ csw/mgar/pkg/gnome-spell/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gnome-terminal/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gnome-terminal/Makefile (rev 0) +++ csw/mgar/pkg/gnome-terminal/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gnome-themes/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gnome-themes/Makefile (rev 0) +++ csw/mgar/pkg/gnome-themes/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gnome-utils/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gnome-utils/Makefile (rev 0) +++ csw/mgar/pkg/gnome-utils/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gnomedesktop/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gnomedesktop/Makefile (rev 0) +++ csw/mgar/pkg/gnomedesktop/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gnomevfs2/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gnomevfs2/Makefile (rev 0) +++ csw/mgar/pkg/gnomevfs2/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gnupg2/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gnupg2/Makefile (rev 0) +++ csw/mgar/pkg/gnupg2/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gpgme/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gpgme/Makefile (rev 0) +++ csw/mgar/pkg/gpgme/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gstreamer/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gstreamer/Makefile (rev 0) +++ csw/mgar/pkg/gstreamer/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gtk-engines/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gtk-engines/Makefile (rev 0) +++ csw/mgar/pkg/gtk-engines/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gtkhtml/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gtkhtml/Makefile (rev 0) +++ csw/mgar/pkg/gtkhtml/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gtkhtml31/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gtkhtml31/Makefile (rev 0) +++ csw/mgar/pkg/gtkhtml31/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/gts/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gts/Makefile (rev 0) +++ csw/mgar/pkg/gts/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/hatari/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/hatari/Makefile (rev 0) +++ csw/mgar/pkg/hatari/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/hdf5/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/hdf5/Makefile (rev 0) +++ csw/mgar/pkg/hdf5/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/hexdump/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/hexdump/Makefile (rev 0) +++ csw/mgar/pkg/hexdump/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/httping/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/httping/Makefile (rev 0) +++ csw/mgar/pkg/httping/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/icinga/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/icinga/Makefile (rev 0) +++ csw/mgar/pkg/icinga/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/iftop/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/iftop/Makefile (rev 0) +++ csw/mgar/pkg/iftop/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/imapsync/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/imapsync/Makefile (rev 0) +++ csw/mgar/pkg/imapsync/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/indent/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/indent/Makefile (rev 0) +++ csw/mgar/pkg/indent/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/intltool/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/intltool/Makefile (rev 0) +++ csw/mgar/pkg/intltool/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/iperf/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/iperf/Makefile (rev 0) +++ csw/mgar/pkg/iperf/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/kshdbx/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/kshdbx/Makefile (rev 0) +++ csw/mgar/pkg/kshdbx/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/lame/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/lame/Makefile (rev 0) +++ csw/mgar/pkg/lame/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/ldns/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/ldns/Makefile (rev 0) +++ csw/mgar/pkg/ldns/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/leafnode/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/leafnode/Makefile (rev 0) +++ csw/mgar/pkg/leafnode/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libassuan/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libassuan/Makefile (rev 0) +++ csw/mgar/pkg/libassuan/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libbonobo2/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libbonobo2/Makefile (rev 0) +++ csw/mgar/pkg/libbonobo2/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libbonoboui/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libbonoboui/Makefile (rev 0) +++ csw/mgar/pkg/libbonoboui/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libcroco/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libcroco/Makefile (rev 0) +++ csw/mgar/pkg/libcroco/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libfaac/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libfaac/Makefile (rev 0) +++ csw/mgar/pkg/libfaac/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libgadu/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libgadu/Makefile (rev 0) +++ csw/mgar/pkg/libgadu/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libgcrypt/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libgcrypt/Makefile (rev 0) +++ csw/mgar/pkg/libgcrypt/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libgnome/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libgnome/Makefile (rev 0) +++ csw/mgar/pkg/libgnome/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libgnomecanvas/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libgnomecanvas/Makefile (rev 0) +++ csw/mgar/pkg/libgnomecanvas/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libgnomecups/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libgnomecups/Makefile (rev 0) +++ csw/mgar/pkg/libgnomecups/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libgnomeprint/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libgnomeprint/Makefile (rev 0) +++ csw/mgar/pkg/libgnomeprint/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libgnomeprintui/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libgnomeprintui/Makefile (rev 0) +++ csw/mgar/pkg/libgnomeprintui/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libgnomeui/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libgnomeui/Makefile (rev 0) +++ csw/mgar/pkg/libgnomeui/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libgpg_error/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libgpg_error/Makefile (rev 0) +++ csw/mgar/pkg/libgpg_error/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libgss/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libgss/Makefile (rev 0) +++ csw/mgar/pkg/libgss/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libgtop/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libgtop/Makefile (rev 0) +++ csw/mgar/pkg/libgtop/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libidn/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libidn/Makefile (rev 0) +++ csw/mgar/pkg/libidn/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libksba/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libksba/Makefile (rev 0) +++ csw/mgar/pkg/libksba/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/liblasi/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/liblasi/Makefile (rev 0) +++ csw/mgar/pkg/liblasi/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libmhash/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libmhash/Makefile (rev 0) +++ csw/mgar/pkg/libmhash/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libserf/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libserf/Makefile (rev 0) +++ csw/mgar/pkg/libserf/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libsoup/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libsoup/Makefile (rev 0) +++ csw/mgar/pkg/libsoup/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libsoup2/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libsoup2/Makefile (rev 0) +++ csw/mgar/pkg/libsoup2/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libspectre/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libspectre/Makefile (rev 0) +++ csw/mgar/pkg/libspectre/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libtasn1/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libtasn1/Makefile (rev 0) +++ csw/mgar/pkg/libtasn1/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libthai/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libthai/Makefile (rev 0) +++ csw/mgar/pkg/libthai/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libtheora/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libtheora/Makefile (rev 0) +++ csw/mgar/pkg/libtheora/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libwnck/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libwnck/Makefile (rev 0) +++ csw/mgar/pkg/libwnck/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libxklavier/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libxklavier/Makefile (rev 0) +++ csw/mgar/pkg/libxklavier/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libxml2/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libxml2/Makefile (rev 0) +++ csw/mgar/pkg/libxml2/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libxslt/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libxslt/Makefile (rev 0) +++ csw/mgar/pkg/libxslt/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/libytnef/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libytnef/Makefile (rev 0) +++ csw/mgar/pkg/libytnef/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/loudmouth/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/loudmouth/Makefile (rev 0) +++ csw/mgar/pkg/loudmouth/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/lzop/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/lzop/Makefile (rev 0) +++ csw/mgar/pkg/lzop/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/mailx/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/mailx/Makefile (rev 0) +++ csw/mgar/pkg/mailx/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/mairix/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/mairix/Makefile (rev 0) +++ csw/mgar/pkg/mairix/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/mbuffer/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/mbuffer/Makefile (rev 0) +++ csw/mgar/pkg/mbuffer/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/mcabber/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/mcabber/Makefile (rev 0) +++ csw/mgar/pkg/mcabber/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/meanwhile/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/meanwhile/Makefile (rev 0) +++ csw/mgar/pkg/meanwhile/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/metacity/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/metacity/Makefile (rev 0) +++ csw/mgar/pkg/metacity/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/mgetty/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/mgetty/Makefile (rev 0) +++ csw/mgar/pkg/mgetty/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/miltergreylist/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/miltergreylist/Makefile (rev 0) +++ csw/mgar/pkg/miltergreylist/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/mod_macro/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/mod_macro/Makefile (rev 0) +++ csw/mgar/pkg/mod_macro/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/mod_wsgi/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/mod_wsgi/Makefile (rev 0) +++ csw/mgar/pkg/mod_wsgi/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/mtr/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/mtr/Makefile (rev 0) +++ csw/mgar/pkg/mtr/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/multisync/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/multisync/Makefile (rev 0) +++ csw/mgar/pkg/multisync/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/multitail/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/multitail/Makefile (rev 0) +++ csw/mgar/pkg/multitail/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/mysql5/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/mysql5/Makefile (rev 0) +++ csw/mgar/pkg/mysql5/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/nagios/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/nagios/Makefile (rev 0) +++ csw/mgar/pkg/nagios/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/nagios_plugins/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/nagios_plugins/Makefile (rev 0) +++ csw/mgar/pkg/nagios_plugins/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/nagvis/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/nagvis/Makefile (rev 0) +++ csw/mgar/pkg/nagvis/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/nano/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/nano/Makefile (rev 0) +++ csw/mgar/pkg/nano/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/nautilus/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/nautilus/Makefile (rev 0) +++ csw/mgar/pkg/nautilus/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/ncal/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/ncal/Makefile (rev 0) +++ csw/mgar/pkg/ncal/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/ncdu/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/ncdu/Makefile (rev 0) +++ csw/mgar/pkg/ncdu/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/ndoutils/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/ndoutils/Makefile (rev 0) +++ csw/mgar/pkg/ndoutils/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/nethack/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/nethack/Makefile (rev 0) +++ csw/mgar/pkg/nethack/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/nginx/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/nginx/Makefile (rev 0) +++ csw/mgar/pkg/nginx/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/npadmin/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/npadmin/Makefile (rev 0) +++ csw/mgar/pkg/npadmin/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/nrpe/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/nrpe/Makefile (rev 0) +++ csw/mgar/pkg/nrpe/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/nsca/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/nsca/Makefile (rev 0) +++ csw/mgar/pkg/nsca/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/nsd/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/nsd/Makefile (rev 0) +++ csw/mgar/pkg/nsd/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/octave/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/octave/Makefile (rev 0) +++ csw/mgar/pkg/octave/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/openjade/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/openjade/Makefile (rev 0) +++ csw/mgar/pkg/openjade/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/openjpeg/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/openjpeg/Makefile (rev 0) +++ csw/mgar/pkg/openjpeg/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/openobex/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/openobex/Makefile (rev 0) +++ csw/mgar/pkg/openobex/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/openssl1/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/openssl1/Makefile (rev 0) +++ csw/mgar/pkg/openssl1/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/otr/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/otr/Makefile (rev 0) +++ csw/mgar/pkg/otr/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/p7zip/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/p7zip/Makefile (rev 0) +++ csw/mgar/pkg/p7zip/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/pango-libthai/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/pango-libthai/Makefile (rev 0) +++ csw/mgar/pkg/pango-libthai/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/par/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/par/Makefile (rev 0) +++ csw/mgar/pkg/par/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/pbzip2/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/pbzip2/Makefile (rev 0) +++ csw/mgar/pkg/pbzip2/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/pcb/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/pcb/Makefile (rev 0) +++ csw/mgar/pkg/pcb/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/pen/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/pen/Makefile (rev 0) +++ csw/mgar/pkg/pen/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/php5_apc/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/php5_apc/Makefile (rev 0) +++ csw/mgar/pkg/php5_apc/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/php5_xdebug/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/php5_xdebug/Makefile (rev 0) +++ csw/mgar/pkg/php5_xdebug/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/phpMyAdmin/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/phpMyAdmin/Makefile (rev 0) +++ csw/mgar/pkg/phpMyAdmin/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/phpmode/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/phpmode/Makefile (rev 0) +++ csw/mgar/pkg/phpmode/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/phpsysinfo/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/phpsysinfo/Makefile (rev 0) +++ csw/mgar/pkg/phpsysinfo/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/pidgin/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/pidgin/Makefile (rev 0) +++ csw/mgar/pkg/pidgin/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/pidginotr/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/pidginotr/Makefile (rev 0) +++ csw/mgar/pkg/pidginotr/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/pil/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/pil/Makefile (rev 0) +++ csw/mgar/pkg/pil/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/pnp/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/pnp/Makefile (rev 0) +++ csw/mgar/pkg/pnp/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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) Copied: csw/mgar/pkg/poppler/Makefile (from rev 5828, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/poppler/Makefile (rev 0) +++ csw/mgar/pkg/poppler/Makefile 2009-11-15 13:51:19 UTC (rev 7295) @@ -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 + @@ 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 wahwah at users.sourceforge.net Sun Nov 15 16:20:40 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 15 Nov 2009 15:20:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[7296] csw/mgar/pkg/wxwidgets/trunk Message-ID: Revision: 7296 http://gar.svn.sourceforge.net/gar/?rev=7296&view=rev Author: wahwah Date: 2009-11-15 15:20:40 +0000 (Sun, 15 Nov 2009) Log Message: ----------- wxwidgets: adding 0005-stupid-vwscanf-workaround.patch Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile csw/mgar/pkg/wxwidgets/trunk/checksums Added Paths: ----------- csw/mgar/pkg/wxwidgets/trunk/files/0005-stupid-vwscanf-workaround.patch Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-15 13:51:19 UTC (rev 7295) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-15 15:20:40 UTC (rev 7296) @@ -16,7 +16,7 @@ # The unicode version can't be currently built on Solaris 8. Doing separate # builds on Solaris 8 and Solaris 9. Unicode support will start in Solaris 9. # More details below, look for 'unicode'. -PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 solaris9-sparc solaris9-i386 +PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 EXTRA_MODULATORS = GARVERSION MODULATIONS_GARVERSION = 2.8.5 2.8.10 @@ -29,27 +29,32 @@ SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(GARNAME)-$(VERSION).tar.gz) NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz,$(SOURCEFILES)) +DISTFILES = $(SOURCEFILES) SPKG_SOURCEURL = http://www.wxwidgets.org/ MASTER_SITES = $(SF_MIRRORS) SF_PROJ = wxwindows + PATCHFILES_isa-i386-garversion-2.8.5 = 0500-wxT-macro-first-iteration.patch PATCHFILES_isa-i386-garversion-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch PATCHFILES_isa-i386-garversion-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch PATCHFILES_isa-i386-garversion-2.8.5 += 0003-vsscanf-support-via-ncursesw.patch PATCHFILES_isa-i386-garversion-2.8.5 += 0004-add-monodll_appbase.so-to-wxrc.patch +PATCHFILES_isa-i386-garversion-2.8.5 += 0005-stupid-vwscanf-workaround.patch PATCHFILES_isa-sparcv8-garversion-2.8.5 = 0500-wxT-macro-first-iteration.patch PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0003-vsscanf-support-via-ncursesw.patch PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0004-add-monodll_appbase.so-to-wxrc.patch +PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0005-stupid-vwscanf-workaround.patch PATCHFILES_isa-i386-garversion-2.8.10 = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch PATCHFILES_isa-i386-garversion-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch PATCHFILES_isa-i386-garversion-2.8.10 += 0003-vsscanf-support-via-ncursesw.patch +PATCHFILES_isa-i386-garversion-2.8.10 += 0005-stupid-vwscanf-workaround.patch PATCHFILES_isa-sparcv8-garversion-2.8.10 = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch PATCHFILES_isa-sparcv8-garversion-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch PATCHFILES_isa-sparcv8-garversion-2.8.10 += 0003-vsscanf-support-via-ncursesw.patch -DISTFILES = $(SOURCEFILES) +PATCHFILES_isa-sparcv8-garversion-2.8.10 += 0005-stupid-vwscanf-workaround.patch UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz PACKAGES = CSWwxwidgetscommon PACKAGES += CSWwxwidgetsdevel @@ -106,7 +111,8 @@ # To fix a problem with unresolved symbols EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so # For vsscanf support -EXTRA_LINKER_FLAGS += /opt/csw/lib/libncursesw.so +# EXTRA_LINKER_FLAGS += /opt/csw/lib/libncursesw.so +EXTRA_LINKER_FLAGS += -lncursesw CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-gtk=2 Modified: csw/mgar/pkg/wxwidgets/trunk/checksums =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/checksums 2009-11-15 13:51:19 UTC (rev 7295) +++ csw/mgar/pkg/wxwidgets/trunk/checksums 2009-11-15 15:20:40 UTC (rev 7296) @@ -2,6 +2,7 @@ 45df2933ed2fa53f229feda01467db81 0002-Fixing-retarded-checks-for-libGL.patch 225f6163a1c31d1f96a3b0548b338105 0003-vsscanf-support-via-ncursesw.patch f073300d39ce7c88db1033bbce64cdca 0004-add-monodll_appbase.so-to-wxrc.patch +969c363847e675dc4d3ad6b8871b96db 0005-stupid-vwscanf-workaround.patch 75ecdc04af4392f918ff6856a3ba6605 0500-wxT-macro-first-iteration.patch 17d8d019fd2e4137b4cd44816b14e282 0501-a-possible-fix-to-wxchar.h.patch 05b32ca051651f4b1885a90f62969faf wxWidgets-2.8.10.tar.gz Added: csw/mgar/pkg/wxwidgets/trunk/files/0005-stupid-vwscanf-workaround.patch =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/files/0005-stupid-vwscanf-workaround.patch (rev 0) +++ csw/mgar/pkg/wxwidgets/trunk/files/0005-stupid-vwscanf-workaround.patch 2009-11-15 15:20:40 UTC (rev 7296) @@ -0,0 +1,28 @@ +From 739b2e9cbecf828c1f74f0e349a6ad8b3a2a0060 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 15 Nov 2009 16:07:25 +0100 +Subject: [PATCH] stupid vwscanf workaround + +--- + include/wx/wxchar.h | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h +index 04fbd8d..e88484a 100644 +--- a/include/wx/wxchar.h ++++ b/include/wx/wxchar.h +@@ -1011,9 +1011,9 @@ WXDLLIMPEXP_BASE bool wxOKlibc(); /* for internal use */ + so on but not all systems have them so use our own implementations in this + case. + */ +-#if wxUSE_UNICODE && !defined(wxHAVE_TCHAR_SUPPORT) && !defined(HAVE_WPRINTF) ++/* #if wxUSE_UNICODE && !defined(wxHAVE_TCHAR_SUPPORT) && !defined(HAVE_WPRINTF) */ + #define wxNEED_WPRINTF +-#endif ++/* #endif */ + + /* + More Unicode complications: although both ANSI C and C++ define a number of +-- +1.6.2.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Nov 15 16:49:08 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 15 Nov 2009 15:49:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[7297] csw/mgar/pkg/pcb/trunk/Makefile Message-ID: Revision: 7297 http://gar.svn.sourceforge.net/gar/?rev=7297&view=rev Author: trygvis Date: 2009-11-15 15:49:07 +0000 (Sun, 15 Nov 2009) Log Message: ----------- pcb: Adding PREREQUISITE_PKGS. Modified Paths: -------------- csw/mgar/pkg/pcb/trunk/Makefile Modified: csw/mgar/pkg/pcb/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcb/trunk/Makefile 2009-11-15 15:20:40 UTC (rev 7296) +++ csw/mgar/pkg/pcb/trunk/Makefile 2009-11-15 15:49:07 UTC (rev 7297) @@ -12,6 +12,7 @@ reduce layout time. endef +SF_PROJ = $(GARNAME) MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz @@ -20,6 +21,14 @@ LICENSE = COPYING #REQUIRED_PKGS = CSWggettextrt CSWiconv +PREREQUISITE_PKGS = CSWglib2devel +PREREQUISITE_PKGS += CSWgtk2devel +PREREQUISITE_PKGS += CSWlibxcbdevel +PREREQUISITE_PKGS += CSWlibpthreadstubs +PREREQUISITE_PKGS += CSWlibxaudevel +PREREQUISITE_PKGS += CSWrenderproto +PREREQUISITE_PKGS += CSWxproto +PREREQUISITE_PKGS += CSWkbproto # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=73743 @@ -33,6 +42,7 @@ # Patch submitted to upstream, pending new release #PATCHFILES = iptc-dataset.patch +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-update-desktop-database CONFIGURE_ARGS += --disable-update-mime-database This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Nov 15 17:05:55 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 15 Nov 2009 16:05:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[7298] csw/mgar/pkg/supybot/trunk/Makefile Message-ID: Revision: 7298 http://gar.svn.sourceforge.net/gar/?rev=7298&view=rev Author: skayser Date: 2009-11-15 16:05:55 +0000 (Sun, 15 Nov 2009) Log Message: ----------- supybot: add docs/ and man pages Modified Paths: -------------- csw/mgar/pkg/supybot/trunk/Makefile Modified: csw/mgar/pkg/supybot/trunk/Makefile =================================================================== --- csw/mgar/pkg/supybot/trunk/Makefile 2009-11-15 15:49:07 UTC (rev 7297) +++ csw/mgar/pkg/supybot/trunk/Makefile 2009-11-15 16:05:55 UTC (rev 7298) @@ -12,7 +12,7 @@ plugins providing around 400 actual commands. endef -SPKG_SOURCEURL = http://sourceforge.net/projects/supybot/ +SPKG_SOURCEURL = http://supybot.com/ MASTER_SITES = $(SF_MIRRORS) DISTNAME = Supybot-$(GARVERSION) DISTFILES = $(DISTNAME).tar.gz @@ -25,10 +25,12 @@ include gar/category.mk -post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(CATALOGNAME) -post-install-modulated: DOCS=ChangeLog ACKS +post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) +post-install-modulated: DOCS=ChangeLog ACKS docs/* +post-install-modulated: MANDEST=$(DESTDIR)$(mandir)/man1 post-install-modulated: ginstall -d $(DOCDEST) cp $(FILEDIR)/changelog.CSW $(DOCDEST) - cp $(addprefix $(WORKSRC)/, $(DOCS)) $(DOCDEST) + -cp $(addprefix $(WORKSRC)/, $(DOCS)) $(DOCDEST) + ginstall -d $(MANDEST) && cp $(WORKSRC)/docs/man/* $(MANDEST) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Nov 15 18:14:05 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 15 Nov 2009 17:14:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[7299] csw/mgar/pkg/pcb/trunk/Makefile Message-ID: Revision: 7299 http://gar.svn.sourceforge.net/gar/?rev=7299&view=rev Author: trygvis Date: 2009-11-15 17:14:05 +0000 (Sun, 15 Nov 2009) Log Message: ----------- pcb: Excluding files that make pkgmk core dump(!). Modified Paths: -------------- csw/mgar/pkg/pcb/trunk/Makefile Modified: csw/mgar/pkg/pcb/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcb/trunk/Makefile 2009-11-15 16:05:55 UTC (rev 7298) +++ csw/mgar/pkg/pcb/trunk/Makefile 2009-11-15 17:14:05 UTC (rev 7299) @@ -49,4 +49,6 @@ TEST_SCRIPTS = +EXTRA_MERGE_EXCLUDE_FILES = .*/single-ended\ .* + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Nov 15 19:07:22 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 15 Nov 2009 18:07:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[7300] csw/mgar/pkg/pcb/trunk/Makefile Message-ID: Revision: 7300 http://gar.svn.sourceforge.net/gar/?rev=7300&view=rev Author: trygvis Date: 2009-11-15 18:07:22 +0000 (Sun, 15 Nov 2009) Log Message: ----------- pcb: Updating REQUIRED_PKGS. Excluding a bunch of packages that kills the build. Modified Paths: -------------- csw/mgar/pkg/pcb/trunk/Makefile Modified: csw/mgar/pkg/pcb/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcb/trunk/Makefile 2009-11-15 17:14:05 UTC (rev 7299) +++ csw/mgar/pkg/pcb/trunk/Makefile 2009-11-15 18:07:22 UTC (rev 7300) @@ -20,7 +20,23 @@ LICENSE = COPYING -#REQUIRED_PKGS = CSWggettextrt CSWiconv +REQUIRED_PKGS = CSWfconfig +REQUIRED_PKGS += CSWftype2 +REQUIRED_PKGS += CSWgd +REQUIRED_PKGS += CSWggettextrt +REQUIRED_PKGS += CSWglib2 +REQUIRED_PKGS += CSWgtk2 +REQUIRED_PKGS += CSWiconv +REQUIRED_PKGS += CSWjpeg +REQUIRED_PKGS += CSWlibatk +REQUIRED_PKGS += CSWlibcairo +REQUIRED_PKGS += CSWlibxpm +REQUIRED_PKGS += CSWlibxrender +REQUIRED_PKGS += CSWpango +REQUIRED_PKGS += CSWpng +REQUIRED_PKGS += CSWxpm +REQUIRED_PKGS += CSWzlib + PREREQUISITE_PKGS = CSWglib2devel PREREQUISITE_PKGS += CSWgtk2devel PREREQUISITE_PKGS += CSWlibxcbdevel @@ -49,6 +65,28 @@ TEST_SCRIPTS = -EXTRA_MERGE_EXCLUDE_FILES = .*/single-ended\ .* +# 2009-11-15:If these are not excluded pkgmk core dumps or just fails. - trygvis +EXTRA_MERGE_EXCLUDE_FILES = .*/connector/single-ended.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/1.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/10.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/12.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/16.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/2.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/20.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/24.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/32.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/4.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/5.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/8.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/DIL.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/EIA.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/PLCC.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/QFP.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/SMD.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/SMD-W.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/W-DIL.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/ZIF.* +EXTRA_MERGE_EXCLUDE_FILES += .*/generic/ZIP.* + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Nov 15 20:10:43 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 15 Nov 2009 19:10:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[7301] csw/mgar/pkg/guile/trunk Message-ID: Revision: 7301 http://gar.svn.sourceforge.net/gar/?rev=7301&view=rev Author: trygvis Date: 2009-11-15 19:10:43 +0000 (Sun, 15 Nov 2009) Log Message: ----------- guile: Work in progress to get guile 1.8.7 to work. Package builds, not entirely sure if the content is correct. Modified Paths: -------------- csw/mgar/pkg/guile/trunk/Makefile csw/mgar/pkg/guile/trunk/checksums Modified: csw/mgar/pkg/guile/trunk/Makefile =================================================================== --- csw/mgar/pkg/guile/trunk/Makefile 2009-11-15 18:07:22 UTC (rev 7300) +++ csw/mgar/pkg/guile/trunk/Makefile 2009-11-15 19:10:43 UTC (rev 7301) @@ -1,5 +1,12 @@ +# 2009-11-15: The package builds successfully with GCC (not with sun cc). +# The version in the catalog (1.6.7,REV=2005.07.03) includes the .a +# and .la files only, this package include the .so files only. I'm +# not quite sure what's the correct approach here. +# The existing Makefile included the libraries under files/ +# - Trygve + GARNAME = guile -GARVERSION = 1.6.8 +GARVERSION = 1.8.7 CATEGORIES = lib DESCRIPTION = GNU extensibility library @@ -7,69 +14,30 @@ Guile is a library designed to help programmers create flexible applications. Using Guile in an application allows programmers to write plug-ins, or modules (there are many names, but the concept is essentially the same) and users to use them to have an application fit their needs. endef +SPKG_DESC_CSWguilelib12 = GNU extensibility library (shared libraries) + +# There has to be something wrong when a package depends on *both* gcc3 and gcc4 - trygve +REQUIRED_PKGS = CSWgcc3core +REQUIRED_PKGS += CSWgcc3corert +REQUIRED_PKGS += CSWgcc4corert +REQUIRED_PKGS += CSWggettextrt +REQUIRED_PKGS += CSWlibgmp +REQUIRED_PKGS += CSWlibtoolrt +REQUIRED_PKGS += CSWncurses +REQUIRED_PKGS += CSWreadline + MASTER_SITES = ftp://ftp.gnu.org/pub/gnu/guile/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWguile,$(ADMSTANDARD)) -DISTFILES += $(call admfiles,CSWguilelib12,$(ADMSTANDARD)) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -CONFIGURE_ARGS = $(DIRPATHS) +GARCOMPILER = GNU +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-error-on-warning=no + TEST_SCRIPTS = BUILD_64BIT = yes include gar/category.mk - -post-extract: - @( cd $(WORKDIR) ; gzcat ../../$(FILEDIR)/$(GARNAME)lib12-$(GARCH)-libs-1.6.7.tar.gz | tar xf - ) - -pre-install: - @if test ! -d $(DESTDIR)/opt/csw/share ; then \ - mkdir -p $(DESTDIR)/opt/csw/share ; \ - fi - @if test ! -d $(DESTDIR)/opt/csw/lib ; then \ - mkdir $(DESTDIR)/opt/csw/lib ; \ - fi - @if test ! -d $(DESTDIR)/opt/csw/bin ; then \ - mkdir $(DESTDIR)/opt/csw/bin ; \ - fi - @if test ! -d $(DESTDIR)/opt/csw/sbin ; then \ - mkdir $(DESTDIR)/opt/csw/sbin ; \ - fi - @if test ! -d $(DESTDIR)/opt/csw/share/doc ; then \ - mkdir $(DESTDIR)/opt/csw/share/doc ; \ - fi - @if test ! -d $(DESTDIR)/opt/csw/share/info ; then \ - mkdir $(DESTDIR)/opt/csw/share/info ; \ - fi - @if test ! -d $(DESTDIR)/opt/csw/share/locale ; then \ - mkdir $(DESTDIR)/opt/csw/share/locale ; \ - fi - @if test ! -d $(DESTDIR)/opt/csw/share/man ; then \ - mkdir $(DESTDIR)/opt/csw/share/man ; \ - fi - @if test ! -h $(DESTDIR)/opt/csw/man ; then \ - ln -s $(DESTDIR)/opt/csw/share/man $(DESTDIR)/opt/csw/man ; \ - fi - @if test ! -h $(DESTDIR)/opt/csw/doc ; then \ - ln -s $(DESTDIR)/opt/csw/share/doc $(DESTDIR)/opt/csw/doc ; \ - fi - @if test ! -h $(DESTDIR)/opt/csw/info ; then \ - ln -s $(DESTDIR)/opt/csw/share/info $(DESTDIR)/opt/csw/info ; \ - fi - @if test ! -h $(DESTDIR)/opt/csw/lib/locale ; then \ - ln -s $(DESTDIR)/opt/csw/share/locale $(DESTDIR)/opt/csw/lib/locale ; \ - fi - - -post-install: - @for curlib in libguile-ltdl.so.1.0.0 libguile-srfi-srfi-13-14-v-1.so.1.0.0 libguile-srfi-srfi-4-v-1.so.1.0.0 libguile.so.12.3.0 libguilereadline-v-12.so.12.3.0; do \ - if test -f $(WORKDIR)/$$curlib ; then \ - ginstall -m0755 \ - $(WORKDIR)/$$curlib \ - $(DESTDIR)$(libdir)/$$curlib ; \ - fi ; \ - done - @$(MAKECOOKIE) Modified: csw/mgar/pkg/guile/trunk/checksums =================================================================== --- csw/mgar/pkg/guile/trunk/checksums 2009-11-15 18:07:22 UTC (rev 7300) +++ csw/mgar/pkg/guile/trunk/checksums 2009-11-15 19:10:43 UTC (rev 7301) @@ -1,7 +1 @@ -2756b01f428b910d33267aeaa0e2d59a download/guile-1.6.8.tar.gz -4dfbfa0a9c83ce718bc9e84f912a1463 download/CSWguile.gspec -55b9e3cd0e4bb084a23aa431375ca2ec download/CSWguile.prototype -3360bc130644f066d92ee36acb4d12dd download/CSWguile.depend -3e6e797ea03ebaa3e1e8e19886beb563 download/CSWguilelib12.gspec -677ed30ce2900e4013b262a93ec42753 download/CSWguilelib12.prototype -620a1fb38f3a59a12f40a0d1b01d0f77 download/CSWguilelib12.depend +991b5b3efcbbc3f7507d05bc42f80a5e guile-1.8.7.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Nov 15 20:36:00 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 15 Nov 2009 19:36:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7302] csw/mgar/pkg Message-ID: Revision: 7302 http://gar.svn.sourceforge.net/gar/?rev=7302&view=rev Author: trygvis Date: 2009-11-15 19:36:00 +0000 (Sun, 15 Nov 2009) Log Message: ----------- geda: Initial commit of gEDA. Added Paths: ----------- csw/mgar/pkg/geda/ csw/mgar/pkg/geda/branches/ csw/mgar/pkg/geda/tags/ csw/mgar/pkg/geda/trunk/ csw/mgar/pkg/geda/trunk/Makefile csw/mgar/pkg/geda/trunk/checksums Property changes on: csw/mgar/pkg/geda/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/geda/trunk/Makefile =================================================================== --- csw/mgar/pkg/geda/trunk/Makefile (rev 0) +++ csw/mgar/pkg/geda/trunk/Makefile 2009-11-15 19:36:00 UTC (rev 7302) @@ -0,0 +1,25 @@ +GARNAME = geda +GARVERSION = 1.6.0 +CATEGORIES = devel + +DESCRIPTION = The gEDA suite with gschem, gattrib, gnetlist, gsch2pcb, gsymcheck and libgeda +define BLURB +endef + +MASTER_SITES = http://geda.seul.org/release/v1.6/1.6.0/ +DISTFILES = geda-gaf-$(GARVERSION).tar.gz + +WORKSRC = $(WORKDIR)/geda-gaf-$(GARVERSION) + +# We define upstream file regex so we can be notifed of new upstream software release +# UFILES_REGEX = geda-gaf-(\d+(?:\.\d+)*).tar.gz +# That pattern won't work, geda has a funny major.minor/major.minor.micro +# layout, see MASTER_SITES - trygve + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/geda/trunk/checksums =================================================================== --- csw/mgar/pkg/geda/trunk/checksums (rev 0) +++ csw/mgar/pkg/geda/trunk/checksums 2009-11-15 19:36:00 UTC (rev 7302) @@ -0,0 +1 @@ +1dacc71407e69d77eaf4c1115f5bcd56 geda-gaf-1.6.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Nov 15 22:04:05 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 15 Nov 2009 21:04:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[7303] csw/mgar/pkg/guile/trunk/ Message-ID: Revision: 7303 http://gar.svn.sourceforge.net/gar/?rev=7303&view=rev Author: trygvis Date: 2009-11-15 21:04:05 +0000 (Sun, 15 Nov 2009) Log Message: ----------- guile: Switching the external to GAR v2 after the Makefile was upgraded. Property Changed: ---------------- csw/mgar/pkg/guile/trunk/ Property changes on: csw/mgar/pkg/guile/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 Nov 15 22:20:06 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 15 Nov 2009 21:20:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7304] csw/mgar/pkg/git-subtree/trunk/Makefile Message-ID: Revision: 7304 http://gar.svn.sourceforge.net/gar/?rev=7304&view=rev Author: bdwalton Date: 2009-11-15 21:20:05 +0000 (Sun, 15 Nov 2009) Log Message: ----------- git-subtree: update to newer commit to avoid patching in GPL file Modified Paths: -------------- csw/mgar/pkg/git-subtree/trunk/Makefile Modified: csw/mgar/pkg/git-subtree/trunk/Makefile =================================================================== --- csw/mgar/pkg/git-subtree/trunk/Makefile 2009-11-15 21:04:05 UTC (rev 7303) +++ csw/mgar/pkg/git-subtree/trunk/Makefile 2009-11-15 21:20:05 UTC (rev 7304) @@ -1,6 +1,6 @@ GARNAME = git-subtree GARVERSION = 0.2 -PATCHLEVEL = c567d9 +PATCHLEVEL = d8b2c CATEGORIES = devel DESCRIPTION = Subtree support for git This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Nov 15 22:46:19 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 15 Nov 2009 21:46:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[7305] csw/mgar/pkg/pcb/trunk/Makefile Message-ID: Revision: 7305 http://gar.svn.sourceforge.net/gar/?rev=7305&view=rev Author: trygvis Date: 2009-11-15 21:46:19 +0000 (Sun, 15 Nov 2009) Log Message: ----------- pcb: Renaming files with space in them, pcb still handles it ok. Modified Paths: -------------- csw/mgar/pkg/pcb/trunk/Makefile Modified: csw/mgar/pkg/pcb/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcb/trunk/Makefile 2009-11-15 21:20:05 UTC (rev 7304) +++ csw/mgar/pkg/pcb/trunk/Makefile 2009-11-15 21:46:19 UTC (rev 7305) @@ -65,28 +65,12 @@ TEST_SCRIPTS = -# 2009-11-15:If these are not excluded pkgmk core dumps or just fails. - trygvis -EXTRA_MERGE_EXCLUDE_FILES = .*/connector/single-ended.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/1.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/10.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/12.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/16.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/2.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/20.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/24.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/32.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/4.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/5.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/8.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/DIL.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/EIA.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/PLCC.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/QFP.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/SMD.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/SMD-W.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/W-DIL.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/ZIF.* -EXTRA_MERGE_EXCLUDE_FILES += .*/generic/ZIP.* - - include gar/category.mk + +post-extract-modulated: + @echo " ==> Renaming files (' ' => '_')" + @find $(WORKSRC)/lib/pcblib-newlib -name \*\ \* | \ + while read f; \ + do \ + mv "$$f" `echo $$f | tr " " _`; \ + done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Nov 15 23:15:08 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 15 Nov 2009 22:15:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[7306] csw/mgar/pkg/geda/trunk/Makefile Message-ID: Revision: 7306 http://gar.svn.sourceforge.net/gar/?rev=7306&view=rev Author: trygvis Date: 2009-11-15 22:15:08 +0000 (Sun, 15 Nov 2009) Log Message: ----------- geda: Working package as long as it's built against latest guile. Modified Paths: -------------- csw/mgar/pkg/geda/trunk/Makefile Modified: csw/mgar/pkg/geda/trunk/Makefile =================================================================== --- csw/mgar/pkg/geda/trunk/Makefile 2009-11-15 21:46:19 UTC (rev 7305) +++ csw/mgar/pkg/geda/trunk/Makefile 2009-11-15 22:15:08 UTC (rev 7306) @@ -1,3 +1,13 @@ +# 2009-11-15: Building successfully against svn version of guile, the +# current version in GAR is too old. Getting messages like these when +# starting: +# Read system config file [/opt/csw/share/gEDA/system-gafrc] +# Read system config file [/opt/csw/share/gEDA/system-gschemrc] +# Read init scm file [/opt/csw/share/gEDA/scheme/gschem.scm] +# Should probably find a way to move the configuration files under +# /etc/opt/csw. +# - Trygve + GARNAME = geda GARVERSION = 1.6.0 CATEGORIES = devel @@ -20,6 +30,10 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +GARCOMPILER = GCC4 CONFIGURE_ARGS = $(DIRPATHS) +TEST_SCRIPTS = + 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 Nov 16 02:30:19 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 16 Nov 2009 01:30:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[7307] csw/mgar/pkg/wxwidgets/trunk/Makefile Message-ID: Revision: 7307 http://gar.svn.sourceforge.net/gar/?rev=7307&view=rev Author: wahwah Date: 2009-11-16 01:30:19 +0000 (Mon, 16 Nov 2009) Log Message: ----------- wxwidgets: Adding dependency on CSWncurses and CSWsunmath (fixes the __sincos symbol problem on x86) Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-15 22:15:08 UTC (rev 7306) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-16 01:30:19 UTC (rev 7307) @@ -76,8 +76,10 @@ REQUIRED_PKGS += CSWlibsm REQUIRED_PKGS += CSWlibxext REQUIRED_PKGS += CSWmesa +REQUIRED_PKGS += CSWncurses REQUIRED_PKGS += CSWpango REQUIRED_PKGS += CSWpng +REQUIRED_PKGS += CSWsunmath REQUIRED_PKGS += CSWtiff REQUIRED_PKGS += CSWzlib @@ -113,6 +115,8 @@ # For vsscanf support # EXTRA_LINKER_FLAGS += /opt/csw/lib/libncursesw.so EXTRA_LINKER_FLAGS += -lncursesw +# To fix the __sincos problem on x86 +EXTRA_LINKER_FLAGS += -lsunmath CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-gtk=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 Mon Nov 16 09:03:14 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 16 Nov 2009 08:03:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[7308] csw/mgar/pkg/libtasn1/trunk Message-ID: Revision: 7308 http://gar.svn.sourceforge.net/gar/?rev=7308&view=rev Author: dmichelsen Date: 2009-11-16 08:03:14 +0000 (Mon, 16 Nov 2009) Log Message: ----------- libtasn1: Update to 2.3 Modified Paths: -------------- csw/mgar/pkg/libtasn1/trunk/Makefile csw/mgar/pkg/libtasn1/trunk/checksums Modified: csw/mgar/pkg/libtasn1/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtasn1/trunk/Makefile 2009-11-16 01:30:19 UTC (rev 7307) +++ csw/mgar/pkg/libtasn1/trunk/Makefile 2009-11-16 08:03:14 UTC (rev 7308) @@ -1,5 +1,5 @@ GARNAME = libtasn1 -GARVERSION = 2.2 +GARVERSION = 2.3 CATEGORIES = lib DESCRIPTION = GNU ASN1 library Modified: csw/mgar/pkg/libtasn1/trunk/checksums =================================================================== --- csw/mgar/pkg/libtasn1/trunk/checksums 2009-11-16 01:30:19 UTC (rev 7307) +++ csw/mgar/pkg/libtasn1/trunk/checksums 2009-11-16 08:03:14 UTC (rev 7308) @@ -1 +1 @@ -14cc361500d2e768a8a6ec538ce3fecb libtasn1-2.2.tar.gz +4f0918cf8fe8b2b4ba189938772d1dd2 libtasn1-2.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 Mon Nov 16 13:08:57 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 16 Nov 2009 12:08:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[7309] csw/mgar/pkg/rapidsvn/trunk/Makefile Message-ID: Revision: 7309 http://gar.svn.sourceforge.net/gar/?rev=7309&view=rev Author: wahwah Date: 2009-11-16 12:08:57 +0000 (Mon, 16 Nov 2009) Log Message: ----------- rapidsvn: Added two build dependencies Modified Paths: -------------- csw/mgar/pkg/rapidsvn/trunk/Makefile Modified: csw/mgar/pkg/rapidsvn/trunk/Makefile =================================================================== --- csw/mgar/pkg/rapidsvn/trunk/Makefile 2009-11-16 08:03:14 UTC (rev 7308) +++ csw/mgar/pkg/rapidsvn/trunk/Makefile 2009-11-16 12:08:57 UTC (rev 7309) @@ -19,6 +19,7 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz SPKG_SOURCEURL = http://rapidsvn.tigris.org/ +PREREQUISITE_PKGS = CSWsvn-devel CSWapache2-devel # RapidSVN 0.9.1 omits the manpage from the dist archive # DISTFILES += rapidsvn.xml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Nov 16 16:15:04 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 16 Nov 2009 15:15:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[7310] csw/mgar/pkg/patch/trunk Message-ID: Revision: 7310 http://gar.svn.sourceforge.net/gar/?rev=7310&view=rev Author: dmichelsen Date: 2009-11-16 15:15:04 +0000 (Mon, 16 Nov 2009) Log Message: ----------- patch: Update to 2.6 Modified Paths: -------------- csw/mgar/pkg/patch/trunk/Makefile csw/mgar/pkg/patch/trunk/checksums Modified: csw/mgar/pkg/patch/trunk/Makefile =================================================================== --- csw/mgar/pkg/patch/trunk/Makefile 2009-11-16 12:08:57 UTC (rev 7309) +++ csw/mgar/pkg/patch/trunk/Makefile 2009-11-16 15:15:04 UTC (rev 7310) @@ -1,5 +1,5 @@ GARNAME = patch -GARVERSION = 2.5.9 +GARVERSION = 2.6 CATEGORIES = utils DESCRIPTION = GNU patch utility Modified: csw/mgar/pkg/patch/trunk/checksums =================================================================== --- csw/mgar/pkg/patch/trunk/checksums 2009-11-16 12:08:57 UTC (rev 7309) +++ csw/mgar/pkg/patch/trunk/checksums 2009-11-16 15:15:04 UTC (rev 7310) @@ -1 +1 @@ -dacfb618082f8d3a2194601193cf8716 download/patch-2.5.9.tar.gz +bc71d33c35004db3768465bcaf9ed23c patch-2.6.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 Nov 16 16:45:50 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 16 Nov 2009 15:45:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[7311] csw/mgar/pkg/pcre/trunk Message-ID: Revision: 7311 http://gar.svn.sourceforge.net/gar/?rev=7311&view=rev Author: dmichelsen Date: 2009-11-16 15:45:49 +0000 (Mon, 16 Nov 2009) Log Message: ----------- pcre: Update to 8.00 Modified Paths: -------------- csw/mgar/pkg/pcre/trunk/Makefile csw/mgar/pkg/pcre/trunk/checksums Modified: csw/mgar/pkg/pcre/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcre/trunk/Makefile 2009-11-16 15:15:04 UTC (rev 7310) +++ csw/mgar/pkg/pcre/trunk/Makefile 2009-11-16 15:45:49 UTC (rev 7311) @@ -1,5 +1,5 @@ GARNAME = pcre -GARVERSION = 7.9 +GARVERSION = 8.00 CATEGORIES = lib DESCRIPTION = Perl-compatible regular expression tools Modified: csw/mgar/pkg/pcre/trunk/checksums =================================================================== --- csw/mgar/pkg/pcre/trunk/checksums 2009-11-16 15:15:04 UTC (rev 7310) +++ csw/mgar/pkg/pcre/trunk/checksums 2009-11-16 15:45:49 UTC (rev 7311) @@ -1 +1 @@ -2256d0a1d0a358265165ca70e7cfc47a download/pcre-7.9.tar.gz +c95500eeda12c8c7edc6b0926d60952c pcre-8.00.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 Nov 16 16:46:30 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 16 Nov 2009 15:46:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[7312] csw/mgar/pkg/tightvnc/trunk Message-ID: Revision: 7312 http://gar.svn.sourceforge.net/gar/?rev=7312&view=rev Author: wahwah Date: 2009-11-16 15:46:30 +0000 (Mon, 16 Nov 2009) Log Message: ----------- vncserver: Injecting into EXTRA_DEFINES to achieve compilation for the right architecture (and avoid V8+) Modified Paths: -------------- csw/mgar/pkg/tightvnc/trunk/Makefile csw/mgar/pkg/tightvnc/trunk/checksums Added Paths: ----------- csw/mgar/pkg/tightvnc/trunk/files/0002-GNU-make-by-default.patch Removed Paths: ------------- csw/mgar/pkg/tightvnc/trunk/files/0003-GNU-make-by-default.patch Modified: csw/mgar/pkg/tightvnc/trunk/Makefile =================================================================== --- csw/mgar/pkg/tightvnc/trunk/Makefile 2009-11-16 15:45:49 UTC (rev 7311) +++ csw/mgar/pkg/tightvnc/trunk/Makefile 2009-11-16 15:46:30 UTC (rev 7312) @@ -56,7 +56,7 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = vnc PATCHFILES = 0001-Sun-compiler-in-sun.cf.patch -PATCHFILES += 0003-GNU-make-by-default.patch +PATCHFILES += 0002-GNU-make-by-default.patch PATCHFILES += 0003-libdix.a-after-libos.a.patch PATCHFILES += 0001-Force-the-use-of-libwrap.patch @@ -73,17 +73,18 @@ build-vnc: (cd $(WORKSRC) && $(BUILD_ENV) \ EXTRA_INCLUDES="-I/opt/csw/include" \ + EXTRA_DEFINES="$(CFLAGS)" \ LOCAL_LDFLAGS="-L/opt/csw/lib" \ gmake World) (cd $(WORKSRC)/Xvnc && $(CONFIGURE_ENV) \ EXTRA_LIBRARIES="-lwrap -lsocket" \ - EXTRA_DEFINES="-DUSE_LIBWRAP=1" \ + EXTRA_DEFINES="-DUSE_LIBWRAP=1 $(CFLAGS)" \ EXTRA_INCLUDES="-I/opt/csw/include" \ LOCAL_LDFLAGS="-L/opt/csw/lib" \ ./configure) (cd $(WORKSRC)/Xvnc && $(BUILD_ENV) \ EXTRA_LIBRARIES="-lwrap -lsocket" \ - EXTRA_DEFINES="-DUSE_LIBWRAP=1" \ + EXTRA_DEFINES="-DUSE_LIBWRAP=1 $(CFLAGS)" \ LOCAL_LDFLAGS="-L/opt/csw/lib" \ EXTRA_INCLUDES="-I/opt/csw/include" \ $(MAKE)) Modified: csw/mgar/pkg/tightvnc/trunk/checksums =================================================================== --- csw/mgar/pkg/tightvnc/trunk/checksums 2009-11-16 15:45:49 UTC (rev 7311) +++ csw/mgar/pkg/tightvnc/trunk/checksums 2009-11-16 15:46:30 UTC (rev 7312) @@ -1,7 +1,7 @@ 38a4eaded4a6418f5547fa57cefb97f9 0001-Force-the-use-of-libwrap.patch 76166d097bf2e70627cb6c87d312bca5 0001-Sun-compiler-in-sun.cf.patch -1264014c1ce47a119a724f17a6e0a768 0003-GNU-make-by-default.patch +1264014c1ce47a119a724f17a6e0a768 0002-GNU-make-by-default.patch c5e9c3e4017caa65d14a0b98858043b9 0003-libdix.a-after-libos.a.patch -20c9ead98ffb7b739fdb63429c3bac85 cswvncserver +691ddda52a4bcbc14ee1c19f77e465a1 cswvncserver 397b35faad32d5246b6d44b142f8304f tightvnc-1.3.10_unixsrc.tar.bz2 56c09be17c17184e96193c13246fd649 vncservers Copied: csw/mgar/pkg/tightvnc/trunk/files/0002-GNU-make-by-default.patch (from rev 7270, csw/mgar/pkg/tightvnc/trunk/files/0003-GNU-make-by-default.patch) =================================================================== --- csw/mgar/pkg/tightvnc/trunk/files/0002-GNU-make-by-default.patch (rev 0) +++ csw/mgar/pkg/tightvnc/trunk/files/0002-GNU-make-by-default.patch 2009-11-16 15:46:30 UTC (rev 7312) @@ -0,0 +1,25 @@ +From 3e9ba23cbf15392e04b1d06e57575027a88a16c3 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Mon, 7 Sep 2009 10:09:47 +0200 +Subject: [PATCH 3/3] GNU make by default + +--- + Xvnc/config/cf/svr4.cf | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Xvnc/config/cf/svr4.cf b/Xvnc/config/cf/svr4.cf +index b9fbcfc..2d7d3ab 100644 +--- a/Xvnc/config/cf/svr4.cf ++++ b/Xvnc/config/cf/svr4.cf +@@ -74,7 +74,7 @@ XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.25.2.2 1997/07/05 15:55:30 dawes Exp $ + #define LexCmd /usr/ccs/bin/lex + #endif + #ifndef MakeCmd +-#define MakeCmd /usr/ccs/bin/make ++#define MakeCmd /opt/csw/bin/gmake + #endif + #ifndef YaccCmd + #define YaccCmd /usr/ccs/bin/yacc +-- +1.6.3.2 + Deleted: csw/mgar/pkg/tightvnc/trunk/files/0003-GNU-make-by-default.patch =================================================================== --- csw/mgar/pkg/tightvnc/trunk/files/0003-GNU-make-by-default.patch 2009-11-16 15:45:49 UTC (rev 7311) +++ csw/mgar/pkg/tightvnc/trunk/files/0003-GNU-make-by-default.patch 2009-11-16 15:46:30 UTC (rev 7312) @@ -1,25 +0,0 @@ -From 3e9ba23cbf15392e04b1d06e57575027a88a16c3 Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Mon, 7 Sep 2009 10:09:47 +0200 -Subject: [PATCH 3/3] GNU make by default - ---- - Xvnc/config/cf/svr4.cf | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/Xvnc/config/cf/svr4.cf b/Xvnc/config/cf/svr4.cf -index b9fbcfc..2d7d3ab 100644 ---- a/Xvnc/config/cf/svr4.cf -+++ b/Xvnc/config/cf/svr4.cf -@@ -74,7 +74,7 @@ XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.25.2.2 1997/07/05 15:55:30 dawes Exp $ - #define LexCmd /usr/ccs/bin/lex - #endif - #ifndef MakeCmd --#define MakeCmd /usr/ccs/bin/make -+#define MakeCmd /opt/csw/bin/gmake - #endif - #ifndef YaccCmd - #define YaccCmd /usr/ccs/bin/yacc --- -1.6.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 Mon Nov 16 17:29:27 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 16 Nov 2009 16:29:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7313] csw/mgar/pkg/libtool/tags/libtool-2.2.6, REV=2009.09. 04_rev=a/ Message-ID: Revision: 7313 http://gar.svn.sourceforge.net/gar/?rev=7313&view=rev Author: dmichelsen Date: 2009-11-16 16:29:26 +0000 (Mon, 16 Nov 2009) Log Message: ----------- Put away 2.2.6 release package Added Paths: ----------- csw/mgar/pkg/libtool/tags/libtool-2.2.6,REV=2009.09.04_rev=a/ 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 Nov 16 17:39:25 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 16 Nov 2009 16:39:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7314] csw/mgar/pkg/libtool/trunk Message-ID: Revision: 7314 http://gar.svn.sourceforge.net/gar/?rev=7314&view=rev Author: dmichelsen Date: 2009-11-16 16:39:11 +0000 (Mon, 16 Nov 2009) Log Message: ----------- libtool: Update to 2.2.6b Modified Paths: -------------- csw/mgar/pkg/libtool/trunk/Makefile csw/mgar/pkg/libtool/trunk/checksums Modified: csw/mgar/pkg/libtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtool/trunk/Makefile 2009-11-16 16:29:26 UTC (rev 7313) +++ csw/mgar/pkg/libtool/trunk/Makefile 2009-11-16 16:39:11 UTC (rev 7314) @@ -1,10 +1,9 @@ GARNAME = libtool -RELEASE = a -GARVERSION = 2.2.6 +GARVERSION = 2.2.6b CATEGORIES = devel EXTRA_MODULATORS = GARVERSION GARCOMPILER -MODULATIONS_GARVERSION = 1.5.26 2.2.6 +MODULATIONS_GARVERSION = 1.5.26 2.2.6b MODULATIONS_GARCOMPILER = GCC3 GCC4 SOS11 # Modulate over compiler only for 2.2.6 @@ -12,9 +11,6 @@ # Compile 64 bit libraries only with SOS11 SKIP_MODULATIONS += $(foreach I,sparcv9 amd64,$(foreach C,GCC3 GCC4,isa-$I-garversion-2.2.6-garcompiler-$C)) -FILEVERSION_1.5.26 = 1.5.26 -FILEVERSION_2.2.6 = 2.2.6$(RELEASE) - DESCRIPTION = A generic library support tool define BLURB GNU libtool is a generic library support script. Libtool hides the complexity @@ -23,7 +19,7 @@ endef MASTER_SITES = $(GNU_MIRROR) -SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(GARNAME)-$(FILEVERSION_$(VERSION)).tar.gz) +SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(GARNAME)-$(VERSION).tar.gz) DISTFILES = $(SOURCEFILES) PATCH_LIBTOOL = patch-libtool.diff @@ -31,7 +27,7 @@ PATCHFILES_POSTINSTALL_isa-sparcv8-garversion-2.2.6-garcompiler-SOS11 = $(PATCH_LIBTOOL) DISTFILES += $(PATCH_LIBTOOL) -NOEXTRACT = $(filter-out $(GARNAME)-$(FILEVERSION_$(GARVERSION)).tar.gz,$(SOURCEFILES)) +NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz,$(SOURCEFILES)) EXTRA_TAGS = gcc3 gcc4 COMPILER_TAGNAME_GCC3 = gcc3 @@ -58,36 +54,22 @@ SKIPTEST = 1 TEST_TARGET = check - MERGE_SCRIPTS_isa-i386-garversion-1.5.26-garcompiler-SOS11 = copy-only - MERGE_DIRS_isa-i386-garversion-1.5.26-garcompiler-SOS11 = $(libdir) - MERGE_SCRIPTS_isa-amd64-garversion-1.5.26-garcompiler-SOS11 = copy-relocated-only - MERGE_DIRS_isa-amd64-garversion-1.5.26-garcompiler-SOS11 = $(libdir) + MERGE_SCRIPTS_isa-default-garversion-1.5.26-garcompiler-SOS11 = copy-only + MERGE_DIRS_isa-default-garversion-1.5.26-garcompiler-SOS11 = $(libdir) + MERGE_SCRIPTS_isa-default64-garversion-1.5.26-garcompiler-SOS11 = copy-relocated-only + MERGE_DIRS_isa-default64-garversion-1.5.26-garcompiler-SOS11 = $(libdir) - MERGE_SCRIPTS_isa-i386-garversion-2.2.6-garcompiler-SOS11 = copy-all - MERGE_SCRIPTS_isa-amd64-garversion-2.2.6-garcompiler-SOS11 = copy-relocated-only - MERGE_DIRS_isa-amd64-garversion-2.2.6-garcompiler-SOS11 = $(libdir) + MERGE_SCRIPTS_isa-default-garversion-2.2.6b-garcompiler-SOS11 = copy-all + MERGE_SCRIPTS_isa-default64-garversion-2.2.6b-garcompiler-SOS11 = copy-relocated-only + MERGE_DIRS_isa-default64-garversion-2.2.6b-garcompiler-SOS11 = $(libdir) - MERGE_SCRIPTS_isa-i386-garversion-2.2.6-garcompiler-GCC3 = copy-tags - MERGE_SCRIPTS_isa-i386-garversion-2.2.6-garcompiler-GCC4 = copy-tags + MERGE_SCRIPTS_isa-default-garversion-2.2.6b-garcompiler-GCC3 = copy-tags + MERGE_SCRIPTS_isa-default-garversion-2.2.6b-garcompiler-GCC4 = copy-tags -MERGE_SCRIPTS_isa-sparcv8-garversion-1.5.26-garcompiler-SOS11 = copy-only - MERGE_DIRS_isa-sparcv8-garversion-1.5.26-garcompiler-SOS11 = $(libdir) -MERGE_SCRIPTS_isa-sparcv9-garversion-1.5.26-garcompiler-SOS11 = copy-relocated-only - MERGE_DIRS_isa-sparcv9-garversion-1.5.26-garcompiler-SOS11 = $(libdir) - - MERGE_SCRIPTS_isa-sparcv8-garversion-2.2.6-garcompiler-SOS11 = copy-all - MERGE_SCRIPTS_isa-sparcv9-garversion-2.2.6-garcompiler-SOS11 = copy-relocated-only - MERGE_DIRS_isa-sparcv9-garversion-2.2.6-garcompiler-SOS11 = $(libdir) - - MERGE_SCRIPTS_isa-sparcv8-garversion-2.2.6-garcompiler-GCC3 = copy-tags - MERGE_SCRIPTS_isa-sparcv8-garversion-2.2.6-garcompiler-GCC4 = copy-tags - PKGFILES_CSWlibtoolrt = $(PKGFILES_RT) include gar/category.mk -SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) - post-install-modulated: $(if $(PATCHFILES_POSTINSTALL_$(MODULATION)),patch-libtool) post-install-modulated: $(if $(COMPILER_TAGNAME_$(GARCOMPILER)),install-libtool-$(COMPILER_TAGNAME_$(GARCOMPILER))) Modified: csw/mgar/pkg/libtool/trunk/checksums =================================================================== --- csw/mgar/pkg/libtool/trunk/checksums 2009-11-16 16:29:26 UTC (rev 7313) +++ csw/mgar/pkg/libtool/trunk/checksums 2009-11-16 16:39:11 UTC (rev 7314) @@ -1,3 +1,3 @@ -aa9c5107f3ec9ef4200eb6556f3b3c29 download/libtool-1.5.26.tar.gz -8ca1ea241cd27ff9832e045fe9afe4fd download/libtool-2.2.6a.tar.gz -92bb3c7712498b6a5993ab5d5fc8f077 download/patch-libtool.diff +aa9c5107f3ec9ef4200eb6556f3b3c29 libtool-1.5.26.tar.gz +07da460450490148c6d2df0f21481a25 libtool-2.2.6b.tar.gz +92bb3c7712498b6a5993ab5d5fc8f077 patch-libtool.diff 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 Nov 16 18:01:56 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 16 Nov 2009 17:01:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[7315] csw/mgar/pkg/libtool/trunk/Makefile Message-ID: Revision: 7315 http://gar.svn.sourceforge.net/gar/?rev=7315&view=rev Author: dmichelsen Date: 2009-11-16 17:01:56 +0000 (Mon, 16 Nov 2009) Log Message: ----------- libtool: Fix skipped modulations Modified Paths: -------------- csw/mgar/pkg/libtool/trunk/Makefile Modified: csw/mgar/pkg/libtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtool/trunk/Makefile 2009-11-16 16:39:11 UTC (rev 7314) +++ csw/mgar/pkg/libtool/trunk/Makefile 2009-11-16 17:01:56 UTC (rev 7315) @@ -9,7 +9,7 @@ # Modulate over compiler only for 2.2.6 SKIP_MODULATIONS = $(foreach I,sparcv8 sparcv9 i386 amd64,$(foreach C,GCC3 GCC4,isa-$I-garversion-1.5.26-garcompiler-$C)) # Compile 64 bit libraries only with SOS11 -SKIP_MODULATIONS += $(foreach I,sparcv9 amd64,$(foreach C,GCC3 GCC4,isa-$I-garversion-2.2.6-garcompiler-$C)) +SKIP_MODULATIONS += $(foreach I,sparcv9 amd64,$(foreach C,GCC3 GCC4,isa-$I-garversion-2.2.6b-garcompiler-$C)) DESCRIPTION = A generic library support tool define BLURB 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 Nov 17 02:25:49 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 17 Nov 2009 01:25:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[7316] csw/mgar/pkg/git-subtree/trunk Message-ID: Revision: 7316 http://gar.svn.sourceforge.net/gar/?rev=7316&view=rev Author: bdwalton Date: 2009-11-17 01:25:48 +0000 (Tue, 17 Nov 2009) Log Message: ----------- git-subtree: drop patches that were accepted upstream Modified Paths: -------------- csw/mgar/pkg/git-subtree/trunk/Makefile csw/mgar/pkg/git-subtree/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/git-subtree/trunk/files/0001-add-installation-support-to-Makefile.patch csw/mgar/pkg/git-subtree/trunk/files/0002-make-git-version-dynamic-when-building-documentation.patch Modified: csw/mgar/pkg/git-subtree/trunk/Makefile =================================================================== --- csw/mgar/pkg/git-subtree/trunk/Makefile 2009-11-16 17:01:56 UTC (rev 7315) +++ csw/mgar/pkg/git-subtree/trunk/Makefile 2009-11-17 01:25:48 UTC (rev 7316) @@ -1,6 +1,6 @@ GARNAME = git-subtree GARVERSION = 0.2 -PATCHLEVEL = d8b2c +PATCHLEVEL = d20ac CATEGORIES = devel DESCRIPTION = Subtree support for git @@ -20,9 +20,6 @@ GIT_REPOS = git://github.com/apenwarr/git-subtree.git GIT_TREEISH_git-subtree.git = $(PATCHLEVEL) -PATCHFILES = 0001-add-installation-support-to-Makefile.patch -PATCHFILES += 0002-make-git-version-dynamic-when-building-documentation.patch - CONFIGURE_SCRIPTS = BUILD_SCRIPTS = INSTALL_SCRIPTS = custom Modified: csw/mgar/pkg/git-subtree/trunk/checksums =================================================================== --- csw/mgar/pkg/git-subtree/trunk/checksums 2009-11-16 17:01:56 UTC (rev 7315) +++ csw/mgar/pkg/git-subtree/trunk/checksums 2009-11-17 01:25:48 UTC (rev 7316) @@ -1,2 +0,0 @@ -40a8c3282a2f4bd4e5fbaebf2bba9359 0001-add-installation-support-to-Makefile.patch -7587367599ef47e0a3e81c96996f855b 0002-make-git-version-dynamic-when-building-documentation.patch Deleted: csw/mgar/pkg/git-subtree/trunk/files/0001-add-installation-support-to-Makefile.patch =================================================================== --- csw/mgar/pkg/git-subtree/trunk/files/0001-add-installation-support-to-Makefile.patch 2009-11-16 17:01:56 UTC (rev 7315) +++ csw/mgar/pkg/git-subtree/trunk/files/0001-add-installation-support-to-Makefile.patch 2009-11-17 01:25:48 UTC (rev 7316) @@ -1,48 +0,0 @@ -From 9c69a401f3d2fb44b0a09702aff99c9e28b627c4 Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Fri, 13 Nov 2009 12:01:31 -0500 -Subject: [PATCH 1/2] add installation support to Makefile - -Signed-off-by: Ben Walton ---- - Makefile | 20 ++++++++++++++++++++ - 1 files changed, 20 insertions(+), 0 deletions(-) - -diff --git a/Makefile b/Makefile -index 3e97c62..faefffd 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,3 +1,13 @@ -+prefix ?= /usr/local -+mandir ?= $(prefix)/share/man -+gitdir ?= $(shell git --exec-path) -+ -+# this should be set to a 'standard' bsd-type install program -+INSTALL ?= install -+INSTALL_DATA = $(INSTALL) -c -m 0644 -+INSTALL_EXE = $(INSTALL) -c -m 0755 -+INSTALL_DIR = $(INSTALL) -c -d -m 0755 -+ - default: - @echo "git-subtree doesn't need to be built." - @echo "Just copy it somewhere on your PATH, like /usr/local/bin." -@@ -5,6 +15,16 @@ default: - @echo "Try: make doc" - @false - -+install: install-exe install-doc -+ -+install-exe: git-subtree.sh -+ $(INSTALL_DIR) $(DESTDIR)/$(gitdir) -+ $(INSTALL_EXE) $< $(DESTDIR)/$(gitdir)/git-subtree -+ -+install-doc: git-subtree.1 -+ $(INSTALL_DIR) $(DESTDIR)/$(mandir)/man1/ -+ $(INSTALL_DATA) $< $(DESTDIR)/$(mandir)/man1/ -+ - doc: git-subtree.1 - - %.1: %.xml --- -1.6.5 - Deleted: csw/mgar/pkg/git-subtree/trunk/files/0002-make-git-version-dynamic-when-building-documentation.patch =================================================================== --- csw/mgar/pkg/git-subtree/trunk/files/0002-make-git-version-dynamic-when-building-documentation.patch 2009-11-16 17:01:56 UTC (rev 7315) +++ csw/mgar/pkg/git-subtree/trunk/files/0002-make-git-version-dynamic-when-building-documentation.patch 2009-11-17 01:25:48 UTC (rev 7316) @@ -1,35 +0,0 @@ -From e17159437af26336537a46cf64825c9130e91267 Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Fri, 13 Nov 2009 12:08:02 -0500 -Subject: [PATCH 2/2] make git version dynamic when building documentation - -Signed-off-by: Ben Walton ---- - Makefile | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/Makefile b/Makefile -index faefffd..9b204bd 100644 ---- a/Makefile -+++ b/Makefile -@@ -2,6 +2,8 @@ prefix ?= /usr/local - mandir ?= $(prefix)/share/man - gitdir ?= $(shell git --exec-path) - -+gitver ?= $(word 3,$(shell git --version)) -+ - # this should be set to a 'standard' bsd-type install program - INSTALL ?= install - INSTALL_DATA = $(INSTALL) -c -m 0644 -@@ -32,7 +34,7 @@ doc: git-subtree.1 - - %.xml: %.txt - asciidoc -b docbook -d manpage -f asciidoc.conf \ -- -agit_version=1.6.3 $^ -+ -agit_version=$(gitver) $^ - - clean: - rm -f *~ *.xml *.html *.1 --- -1.6.5 - 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 Nov 17 11:37:08 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 17 Nov 2009 10:37:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[7317] csw/mgar/pkg/pygobject/trunk Message-ID: Revision: 7317 http://gar.svn.sourceforge.net/gar/?rev=7317&view=rev Author: wahwah Date: 2009-11-17 10:37:07 +0000 (Tue, 17 Nov 2009) Log Message: ----------- pygobject: Upgrade to 0.20.0 Modified Paths: -------------- csw/mgar/pkg/pygobject/trunk/Makefile csw/mgar/pkg/pygobject/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pygobject/trunk/files/0001-forcing-lglib-2.0.patch Modified: csw/mgar/pkg/pygobject/trunk/Makefile =================================================================== --- csw/mgar/pkg/pygobject/trunk/Makefile 2009-11-17 01:25:48 UTC (rev 7316) +++ csw/mgar/pkg/pygobject/trunk/Makefile 2009-11-17 10:37:07 UTC (rev 7317) @@ -1,13 +1,14 @@ GARNAME = pygobject -GARVERSION = 2.18.0 +GARVERSION = 2.20.0 CATEGORIES = lang +RELVER = $(shell echo $(GARVERSION) | gsed -e 's/\.[0-9]\+$$//') DESCRIPTION = pygobject support for Python define BLURB This is a Python language binding for gobject. endef -MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.18/ +MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/$(GARNAME)/$(RELVER)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 STRIP_LIBTOOL = 1 @@ -17,25 +18,18 @@ CATALOGNAME_CSWpygobject = pygobject SPKG_DESC_CSWpygobject = pygobject support for Python +PYCOMPILE = 1 -## patch to change zero sized struct to zero-sized sub-object -#PATCHFILES = pygobject.diff +PATCHFILES = 0001-forcing-lglib-2.0.patch -# We define upstream file regex so we can be notifed of -# new upstream software release -UFILES_REGEX = (\d+(?:\.\d+)*) +EXTRA_MERGE_EXCLUDE_FILES += .*\.egg-info.* .*\.pyo .*\.pyc -EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc -PROTOTYPE_FILTER = awk '$$$$3 ~ /.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' -SPKG_CLASSES = none cswpycompile -REQUIRED_PKGS += CSWcswclassutils - +UFILES_REGEX = (\d+(?:\.\d+)*).tar.bz2 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --without-ffi ## Tests require gtk, but gtk requries gobject TEST_TARGET = check -TEST_SCRIPTS = +TEST_SCRIPTS = include gar/category.mk - Modified: csw/mgar/pkg/pygobject/trunk/checksums =================================================================== --- csw/mgar/pkg/pygobject/trunk/checksums 2009-11-17 01:25:48 UTC (rev 7316) +++ csw/mgar/pkg/pygobject/trunk/checksums 2009-11-17 10:37:07 UTC (rev 7317) @@ -1,2 +1,2 @@ -522b813219a6ad14b85b25d953b08727 download/pygobject-2.18.0.tar.bz2 -58a4ba1e53516251eb4c69fae6372208 download/pygobject.diff +bc2cdac34e1084f4d72eb2bf762e700c 0001-forcing-lglib-2.0.patch +10e1fb79be3d698476a28b1e1b0c5640 pygobject-2.20.0.tar.bz2 Added: csw/mgar/pkg/pygobject/trunk/files/0001-forcing-lglib-2.0.patch =================================================================== --- csw/mgar/pkg/pygobject/trunk/files/0001-forcing-lglib-2.0.patch (rev 0) +++ csw/mgar/pkg/pygobject/trunk/files/0001-forcing-lglib-2.0.patch 2009-11-17 10:37:07 UTC (rev 7317) @@ -0,0 +1,25 @@ +From bdf70ab64e91f0c1ad058447ff843de9be055662 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Sun, 18 Oct 2009 13:16:29 +0100 +Subject: [PATCH] forcing -lglib-2.0 + +--- + gobject/Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/gobject/Makefile.am b/gobject/Makefile.am +index fa0ea20..112e750 100644 +--- a/gobject/Makefile.am ++++ b/gobject/Makefile.am +@@ -26,7 +26,7 @@ constants.py: generate-constants$(EXEEXT) constants.py.in + $(top_builddir)/gobject/generate-constants$(EXEEXT) >> constants.py + chmod 444 constants.py + +-generate_constants_CFLAGS = $(GLIB_CFLAGS) $(PYTHON_INCLUDES) ++generate_constants_CFLAGS = $(GLIB_CFLAGS) $(PYTHON_INCLUDES) -lglib-2.0 + + noinst_PROGRAMS = generate-constants + CLEANFILES = constants.py +-- +1.6.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Nov 17 14:05:16 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 Nov 2009 13:05:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7318] csw/mgar/pkg Message-ID: Revision: 7318 http://gar.svn.sourceforge.net/gar/?rev=7318&view=rev Author: dmichelsen Date: 2009-11-17 13:05:15 +0000 (Tue, 17 Nov 2009) Log Message: ----------- libshout: Initial commit Added Paths: ----------- csw/mgar/pkg/libshout/ csw/mgar/pkg/libshout/branches/ csw/mgar/pkg/libshout/tags/ csw/mgar/pkg/libshout/trunk/ csw/mgar/pkg/libshout/trunk/Makefile csw/mgar/pkg/libshout/trunk/checksums csw/mgar/pkg/libshout/trunk/files/ Property changes on: csw/mgar/pkg/libshout/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/libshout/trunk/Makefile =================================================================== --- csw/mgar/pkg/libshout/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libshout/trunk/Makefile 2009-11-17 13:05:15 UTC (rev 7318) @@ -0,0 +1,28 @@ +GARNAME = libshout +GARVERSION = 2.2.2 +CATEGORIES = lib + +DESCRIPTION = Icecast library +define BLURB +endef + +MASTER_SITES = http://downloads.us.xiph.org/releases/libshout/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +REQUIRED_PKGS = CSWlibogg CSWtheora CSWvorbis +PRERQUISITE_PKGS = $(REQUIRED_PKGS) + +# GAR default: -xO3 -xarch=v8 -I/opt/csw/include +# Configure hardwired: -xO4 -fast -w -fsimple -native -xcg92 + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +BUILD_ARGS = CFLAGS="-xO4 -fast -w -fsimple -native -xcg92 $(filter -xarch=% -I%,$(CFLAGS))" + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/libshout/trunk/checksums =================================================================== --- csw/mgar/pkg/libshout/trunk/checksums (rev 0) +++ csw/mgar/pkg/libshout/trunk/checksums 2009-11-17 13:05:15 UTC (rev 7318) @@ -0,0 +1 @@ +4f75fc9901c724b712c371c9a1e782d3 libshout-2.2.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 Tue Nov 17 14:26:55 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 Nov 2009 13:26:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[7320] csw/mgar/pkg/cpan/Shout/trunk/Makefile Message-ID: Revision: 7320 http://gar.svn.sourceforge.net/gar/?rev=7320&view=rev Author: dmichelsen Date: 2009-11-17 13:26:55 +0000 (Tue, 17 Nov 2009) Log Message: ----------- cpan/Shout: Remove examples from distribution Modified Paths: -------------- csw/mgar/pkg/cpan/Shout/trunk/Makefile Modified: csw/mgar/pkg/cpan/Shout/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Shout/trunk/Makefile 2009-11-17 13:24:10 UTC (rev 7319) +++ csw/mgar/pkg/cpan/Shout/trunk/Makefile 2009-11-17 13:26:55 UTC (rev 7320) @@ -16,4 +16,6 @@ PACKAGES = CSWpmshout CATALOGNAME = pm_shout +EXTRA_MERGE_EXCLUDE_FILES = .*/example\.pl .*/example2\.pl + 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 Tue Nov 17 14:24:13 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 Nov 2009 13:24:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[7319] csw/mgar/pkg/cpan Message-ID: Revision: 7319 http://gar.svn.sourceforge.net/gar/?rev=7319&view=rev Author: dmichelsen Date: 2009-11-17 13:24:10 +0000 (Tue, 17 Nov 2009) Log Message: ----------- cpan/Shout: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Shout/ csw/mgar/pkg/cpan/Shout/branches/ csw/mgar/pkg/cpan/Shout/tags/ csw/mgar/pkg/cpan/Shout/trunk/ csw/mgar/pkg/cpan/Shout/trunk/Makefile csw/mgar/pkg/cpan/Shout/trunk/checksums csw/mgar/pkg/cpan/Shout/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Shout/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/Shout/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Shout/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Shout/trunk/Makefile 2009-11-17 13:24:10 UTC (rev 7319) @@ -0,0 +1,19 @@ +GARNAME = Shout +GARVERSION = 2.1 +CATEGORIES = cpan +AUTHOR = MYSELF + +DESCRIPTION = Perl bindings for libshout 2 +define BLURB +endef + +MASTER_SITES = http://downloads.us.xiph.org/releases/libshout/ +DISTFILES = $(DISTNAME).tar.gz + +REQUIRED_PKGS = CSWlibogg CSWlibshout CSWspeex CSWtheora CSWvorbis +PREREQUISITE_PKGS = $(REQUIRED_PKGS) + +PACKAGES = CSWpmshout +CATALOGNAME = pm_shout + +include gar/category.mk Added: csw/mgar/pkg/cpan/Shout/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Shout/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Shout/trunk/checksums 2009-11-17 13:24:10 UTC (rev 7319) @@ -0,0 +1 @@ +7171eb8f9e60d6c5cc6c469ba0f32dc9 Shout-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 Tue Nov 17 14:51:40 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 17 Nov 2009 13:51:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[7321] csw/mgar/pkg/cups/trunk Message-ID: Revision: 7321 http://gar.svn.sourceforge.net/gar/?rev=7321&view=rev Author: wahwah Date: 2009-11-17 13:51:39 +0000 (Tue, 17 Nov 2009) Log Message: ----------- cups: Adding an example client.conf file, and /etc/opt/csw/cups to CSWcupsclient Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile csw/mgar/pkg/cups/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cups/trunk/files/client.conf.CSW Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2009-11-17 13:26:55 UTC (rev 7320) +++ csw/mgar/pkg/cups/trunk/Makefile 2009-11-17 13:51:39 UTC (rev 7321) @@ -47,6 +47,7 @@ DISTFILES += CSWcupsclient.preinstall DISTFILES += CSWcupsd.preinstall DISTFILES += CSWcupsd.postremove +DISTFILES += client.conf.CSW PATCHFILES = 0001-cswcups-for-service-name.patch PATCHFILES += 0002-Adding-the-refcount-member-to-mime_type_t.patch @@ -100,7 +101,13 @@ PKGFILES_CSWcupsdev += $(datadir)/cups/ppdc.* PKGFILES_CSWcupsdev += $(datadir)/cups/drv.* -PKGFILES_CSWcupsd = $(sysconfdir)/.* +PKGFILES_CSWcupsd = $(sysconfdir)/init\.d/.* +PKGFILES_CSWcupsd += $(sysconfdir)/rc.* +PKGFILES_CSWcupsd += $(sysconfdir)/cups/cupsd.* +PKGFILES_CSWcupsd += $(sysconfdir)/cups/interfaces.* +PKGFILES_CSWcupsd += $(sysconfdir)/cups/ppd.* +PKGFILES_CSWcupsd += $(sysconfdir)/cups/snmp.* +PKGFILES_CSWcupsd += $(sysconfdir)/cups/ssl.* PKGFILES_CSWcupsd += $(mandir)/man1m PKGFILES_CSWcupsd += $(mandir)/man1m/cups(filter|d|-polld|-deviced|-driverd|-lpd).* PKGFILES_CSWcupsd += $(mandir)/man7/(backend|filter).7 @@ -136,6 +143,7 @@ PKGFILES_CSWcupsclient += $(mandir)/man5/client.conf.5 PKGFILES_CSWcupsclient += $(mandir)/man5/ppdcfile\.5 PKGFILES_CSWcupsclient += $(mandir)/man7/(drv|notifier)\.7 +PKGFILES_CSWcupsclient += $(sysconfdir)/cups/client\.conf\.CSW SPKG_DESC_CSWcups = Common Unix Printing System SPKG_DESC_CSWlibcups = CUPS libraries @@ -145,7 +153,8 @@ SPKG_DESC_CSWcupsdev = CUPS header files # http://lists.opencsw.org/pipermail/maintainers/2009-September/004249.html -SAMPLECONF = $(sysconfdir)/cups/cupsd\.conf\.CSW +SAMPLECONF = $(sysconfdir)/cups/cupsd\.conf\.CSW +SAMPLECONF += $(sysconfdir)/cups/client\.conf\.CSW INITSMF = $(sysconfdir)/init\.d/cswcups LD_OPTIONS = -R/opt/csw/lib/\$$ISALIST -R/opt/csw/lib @@ -200,4 +209,7 @@ chmod 0644 "$$i.CSW"; \ fi \ done) + ginstall -m 644 \ + $(FILEDIR)/client.conf.CSW \ + $(DESTDIR)$(sysconfdir)/cups/client.conf.CSW @$(MAKECOOKIE) Modified: csw/mgar/pkg/cups/trunk/checksums =================================================================== --- csw/mgar/pkg/cups/trunk/checksums 2009-11-17 13:26:55 UTC (rev 7320) +++ csw/mgar/pkg/cups/trunk/checksums 2009-11-17 13:51:39 UTC (rev 7321) @@ -1,11 +1,11 @@ 1e5e54a2b503cfdeeda1b683bcccab83 0001-cswcups-for-service-name.patch 0da4ea6bf72d61adfc4316a738b90ab5 0002-Adding-the-refcount-member-to-mime_type_t.patch a80b8543633e2f9b3b1e531ac2289306 0003-Reference-counting-for-printers-only.patch -193912518565c7052724420e7899930b 0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch bbf0295c76cd06b5311ac3a3467fd431 0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch 0dd35cc0938696577104852781ec1df6 0006-Fail-compilation-if-no-SSL-impl-chosen.patch 44ff410e237d6f4f9f0fe650ba2c7fa0 0007-Solaris-zone-support-in-init-script.patch cf6a3fe902545aac1ab2303e41c08a3e CSWcupsclient.preinstall ca7718998e56c320c08a77cfefe046f6 CSWcupsd.postremove cf6a3fe902545aac1ab2303e41c08a3e CSWcupsd.preinstall +b69e58be75aab71165f77e9c1ec49ea3 client.conf.CSW d95e2d588e3d36e563027a963b117b1b cups-1.4.2-source.tar.bz2 Added: csw/mgar/pkg/cups/trunk/files/client.conf.CSW =================================================================== --- csw/mgar/pkg/cups/trunk/files/client.conf.CSW (rev 0) +++ csw/mgar/pkg/cups/trunk/files/client.conf.CSW 2009-11-17 13:51:39 UTC (rev 7321) @@ -0,0 +1,6 @@ +# $Id$ +# +# CUPS client configuration file. +# +# Type 'man client.conf' to see instructions. + Property changes on: csw/mgar/pkg/cups/trunk/files/client.conf.CSW ___________________________________________________________________ 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 Tue Nov 17 14:53:25 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 17 Nov 2009 13:53:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7322] csw/mgar/pkg/cups/trunk/checksums Message-ID: Revision: 7322 http://gar.svn.sourceforge.net/gar/?rev=7322&view=rev Author: wahwah Date: 2009-11-17 13:53:25 +0000 (Tue, 17 Nov 2009) Log Message: ----------- cups: Submitting the checksum for a file with the Id tag Modified Paths: -------------- csw/mgar/pkg/cups/trunk/checksums Modified: csw/mgar/pkg/cups/trunk/checksums =================================================================== --- csw/mgar/pkg/cups/trunk/checksums 2009-11-17 13:51:39 UTC (rev 7321) +++ csw/mgar/pkg/cups/trunk/checksums 2009-11-17 13:53:25 UTC (rev 7322) @@ -7,5 +7,5 @@ cf6a3fe902545aac1ab2303e41c08a3e CSWcupsclient.preinstall ca7718998e56c320c08a77cfefe046f6 CSWcupsd.postremove cf6a3fe902545aac1ab2303e41c08a3e CSWcupsd.preinstall -b69e58be75aab71165f77e9c1ec49ea3 client.conf.CSW +4e6b68d829be4e88afd27ac4897957f4 client.conf.CSW d95e2d588e3d36e563027a963b117b1b cups-1.4.2-source.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 Tue Nov 17 14:59:07 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 Nov 2009 13:59:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7323] csw/mgar/pkg Message-ID: Revision: 7323 http://gar.svn.sourceforge.net/gar/?rev=7323&view=rev Author: dmichelsen Date: 2009-11-17 13:59:07 +0000 (Tue, 17 Nov 2009) Log Message: ----------- shout-python: Initial commit Modified Paths: -------------- csw/mgar/pkg/shout-python/trunk/Makefile csw/mgar/pkg/shout-python/trunk/checksums Added Paths: ----------- csw/mgar/pkg/shout-python/ Modified: csw/mgar/pkg/shout-python/trunk/Makefile =================================================================== --- csw/mgar/pkg/pyyaml/trunk/Makefile 2009-11-15 19:36:00 UTC (rev 7302) +++ csw/mgar/pkg/shout-python/trunk/Makefile 2009-11-17 13:59:07 UTC (rev 7323) @@ -2,57 +2,34 @@ # Distributed under the terms of the GNU General Public License v2 # $Header$ -GARNAME = pyyaml -GARVERSION = 3.09 +GARNAME = shout-python +GARVERSION = 0.2.1 CATEGORIES = python -PROJ_NAME = PyYAML +DESCRIPTION = Python bindings for libshout 2 define BLURB - PyYAML is a YAML parser and emitter for the Python programming language. - - PyYAML features: - - * a complete YAML 1.1 parser. In particular, PyYAML can parse all examples - from the specification. The parsing algorithm is simple enough to be a - reference for YAML parser implementors. - * Unicode support including UTF-8/UTF-16 input/output and \u escape - sequences. - * low-level event-based parser and emitter API (like SAX). - * high-level API for serializing and deserializing native Python - objects (like DOM or pickle). - * support for all types from the YAML types repository. A - simple extension API is provided. - * both pure-Python and fast LibYAML-based parsers and - emitters. - * relatively sensible error messages. endef -MASTER_SITES = http://pyyaml.org/download/pyyaml/ -DISTFILES = $(PROJ_NAME)-$(GARVERSION).tar.gz -WORKSRC = $(WORKDIR)/$(PROJ_NAME)-$(GARVERSION) -SPKG_SOURCEURL = http://pyyaml.org/wiki/PyYAML +MASTER_SITES = http://downloads.us.xiph.org/releases/libshout/ +DISTFILES = $(DISTNAME).tar.gz -PACKAGES = CSWpy-yaml CSWpy-yaml-rt -CATALOGNAME_CSWpy-yaml = py_yaml -CATALOGNAME_CSWpy-yaml-rt = py_yaml_rt +SPKG_SOURCEURL = http://www.icecast.org/ -REQUIRED_PKGS_CSWpy-yaml = -REQUIRED_PKGS_CSWpy-yaml-rt = CSWpython-rt CSWlibyaml -PREREQUISITE_PKGS = $(REQUIRED_PKGS_CSWpy-yaml) $(REQUIRED_PKGS_CSWpy-yaml-rt) +REQUIRED_PKGS = CSWlibogg CSWlibshout CSWspeex CSWtheora CSWvorbis -SPKG_DESC_CSWpy-yaml = YAML parser and emitter for Python -SPKG_DESC_CSWpy-yaml-rt = Runtime libraries for YAML parser and emitter +PACKAGES = CSWpyshout +CATALOGNAME_CSWpyshout = py_shout -ARCHALL_CSWpy-yaml = 1 -PKGFILES_CSWpy-yaml-rt = /opt/csw/lib/python/site-packages/.*\.so +REQUIRED_PKGS_CSWpyshout = -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +BUILD_SCRIPTS = custom -BUILD_SCRIPTS = py-yaml +TEST_SCRIPTS = -build-py-yaml: - (cd $(WORKSRC); $(BUILD_ENV) python setup.py --with-libyaml build) +include gar/category.mk + +build-custom: + (cd $(WORKSRC); $(BUILD_ENV) python setup.py build) @$(MAKECOOKIE) -include gar/category.mk Modified: csw/mgar/pkg/shout-python/trunk/checksums =================================================================== --- csw/mgar/pkg/pyyaml/trunk/checksums 2009-11-15 19:36:00 UTC (rev 7302) +++ csw/mgar/pkg/shout-python/trunk/checksums 2009-11-17 13:59:07 UTC (rev 7323) @@ -1 +1 @@ -f219af2361e87fdc5e85e95b84c11d87 download/PyYAML-3.09.tar.gz +864cfecc2474590470fcce750416b7d3 shout-python-0.2.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 Nov 17 16:01:51 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 Nov 2009 15:01:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[7324] csw/mgar/pkg Message-ID: Revision: 7324 http://gar.svn.sourceforge.net/gar/?rev=7324&view=rev Author: dmichelsen Date: 2009-11-17 15:01:51 +0000 (Tue, 17 Nov 2009) Log Message: ----------- libschroedinger: Initial commit Added Paths: ----------- csw/mgar/pkg/libschroedinger/ csw/mgar/pkg/libschroedinger/branches/ csw/mgar/pkg/libschroedinger/tags/ csw/mgar/pkg/libschroedinger/trunk/ csw/mgar/pkg/libschroedinger/trunk/Makefile csw/mgar/pkg/libschroedinger/trunk/checksums csw/mgar/pkg/libschroedinger/trunk/files/ Property changes on: csw/mgar/pkg/libschroedinger/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/libschroedinger/trunk/Makefile =================================================================== --- csw/mgar/pkg/libschroedinger/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libschroedinger/trunk/Makefile 2009-11-17 15:01:51 UTC (rev 7324) @@ -0,0 +1,25 @@ +GARNAME = libschroedinger +GARVERSION = 1.0.7 +CATEGORIES = lib + +DESCRIPTION = A cross-platform implementation of the Dirac video compression specification +define BLURB + A new release of Schr?dinger is available. Schr?dinger (o"schro" + for short) is a cross-platform implementation of the Dirac video + compression specification as a C library. Many media frameworks + such as GStreamer and ffmpeg use schro to encode and decode Dirac + video. +endef + +MASTER_SITES = http://diracvideo.org/download/schroedinger/ +DISTNAME = schroedinger-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +BUILD64 = 1 +NO_ISAEXEC = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +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 Tue Nov 17 16:24:08 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 Nov 2009 15:24:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[7325] csw/mgar/pkg/postgresql/trunk Message-ID: Revision: 7325 http://gar.svn.sourceforge.net/gar/?rev=7325&view=rev Author: dmichelsen Date: 2009-11-17 15:24:08 +0000 (Tue, 17 Nov 2009) Log Message: ----------- postgresql: Remove includes from CFLAGS, they should be only in CPPFLAGS anyway. TBD: Review as general update in GAR Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile csw/mgar/pkg/postgresql/trunk/checksums Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2009-11-17 15:01:51 UTC (rev 7324) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2009-11-17 15:24:08 UTC (rev 7325) @@ -60,6 +60,8 @@ include gar/category.mk +CFLAGS := $(filter-out -I%,$(CFLAGS)) + post-merge: ginstall -d $(PKGROOT)/etc/init.d && ginstall $(WORKDIR)/cswpostgres $(PKGROOT)/etc/init.d/ ginstall -d $(PKGROOT)/opt/csw/etc/pkg/postgresql && ginstall $(WORKDIR)/cswusergroup $(PKGROOT)/opt/csw/etc/pkg/postgresql/ Modified: csw/mgar/pkg/postgresql/trunk/checksums =================================================================== --- csw/mgar/pkg/postgresql/trunk/checksums 2009-11-17 15:01:51 UTC (rev 7324) +++ csw/mgar/pkg/postgresql/trunk/checksums 2009-11-17 15:24:08 UTC (rev 7325) @@ -1,5 +1,5 @@ -45613fd5367cd230505ad68feb9ad634 README-CSW.txt -6916c5b1a6e1285c6a564abf4b659697 cswpostgres +6e4e2a7755acf94bc83200a308e21ef3 README-CSW.txt +73f96aa85c8f99caf4d708c874e23dab cswpostgres 443171cc5303a8ea0f0a13cbb5e32189 cswusergroup f2015af17bacbbfe140daf0d1067f9c9 postgresql-8.4.1.tar.bz2 -121c45f17350191ca5676453c25716da postgresql.conf +20c32ebdca7d585728b6078798fa1f50 postgresql.conf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Tue Nov 17 18:05:43 2009 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Tue, 17 Nov 2009 17:05:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[7326] csw/mgar/pkg/denyhosts/trunk/Makefile Message-ID: Revision: 7326 http://gar.svn.sourceforge.net/gar/?rev=7326&view=rev Author: bensons Date: 2009-11-17 17:05:43 +0000 (Tue, 17 Nov 2009) Log Message: ----------- denyhosts: remove implicit dependency Modified Paths: -------------- csw/mgar/pkg/denyhosts/trunk/Makefile Modified: csw/mgar/pkg/denyhosts/trunk/Makefile =================================================================== --- csw/mgar/pkg/denyhosts/trunk/Makefile 2009-11-17 15:24:08 UTC (rev 7325) +++ csw/mgar/pkg/denyhosts/trunk/Makefile 2009-11-17 17:05:43 UTC (rev 7326) @@ -24,7 +24,6 @@ LICENSE = LICENSE.txt ARCHALL = 1 INITSMF = /etc/opt/csw/init.d/cswdenyhosts -REQUIRED_PKGS = CSWpython # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).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 Nov 17 20:08:35 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 Nov 2009 19:08:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[7327] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7327 http://gar.svn.sourceforge.net/gar/?rev=7327&view=rev Author: dmichelsen Date: 2009-11-17 19:08:35 +0000 (Tue, 17 Nov 2009) Log Message: ----------- mGAR v2: Fix automatic setting of texinfo class Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-11-17 17:05:43 UTC (rev 7326) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-11-17 19:08:35 UTC (rev 7327) @@ -192,8 +192,10 @@ # This is the default path for texinfo pages to be picked up. Extend or replace as necessary. TEXINFO ?= $(infodir)/.*\.info(?:-\d+)? $(EXTRA_TEXINFO) +$(warning TEXINFO: $(TEXINFO) ) + # - set class for all config files -ifneq ($(SAMPLECONF)$(PRESERVECONF)$(MIGRATECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),) +ifneq ($(SAMPLECONF)$(PRESERVECONF)$(MIGRATECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE)$(TEXINFO),) _CSWCLASS_FILTER = | perl -ane '\ $(foreach FILE,$(MIGRATECONF),$$F[1] = "cswmigrateconf" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(SAMPLECONF:%\.CSW=%),$$F[1] = "cswcpsampleconf" if ( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ 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 Nov 17 20:09:27 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 Nov 2009 19:09:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7328] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7328 http://gar.svn.sourceforge.net/gar/?rev=7328&view=rev Author: dmichelsen Date: 2009-11-17 19:09:27 +0000 (Tue, 17 Nov 2009) Log Message: ----------- mGAR v2: Take out erranous warning Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-11-17 19:08:35 UTC (rev 7327) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-11-17 19:09:27 UTC (rev 7328) @@ -192,8 +192,6 @@ # This is the default path for texinfo pages to be picked up. Extend or replace as necessary. TEXINFO ?= $(infodir)/.*\.info(?:-\d+)? $(EXTRA_TEXINFO) -$(warning TEXINFO: $(TEXINFO) ) - # - set class for all config files ifneq ($(SAMPLECONF)$(PRESERVECONF)$(MIGRATECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE)$(TEXINFO),) _CSWCLASS_FILTER = | perl -ane '\ 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 Nov 17 20:19:31 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 Nov 2009 19:19:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7329] csw/mgar/pkg/pcre/trunk/Makefile Message-ID: Revision: 7329 http://gar.svn.sourceforge.net/gar/?rev=7329&view=rev Author: dmichelsen Date: 2009-11-17 19:19:31 +0000 (Tue, 17 Nov 2009) Log Message: ----------- pcre: Remove isaexec Modified Paths: -------------- csw/mgar/pkg/pcre/trunk/Makefile Modified: csw/mgar/pkg/pcre/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcre/trunk/Makefile 2009-11-17 19:09:27 UTC (rev 7328) +++ csw/mgar/pkg/pcre/trunk/Makefile 2009-11-17 19:19:31 UTC (rev 7329) @@ -30,6 +30,7 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz BUILD64 = 1 +NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-unicode-properties @@ -41,6 +42,8 @@ TEST_TARGET = check +MERGE_DIRS_isa-extra = $(libdir) + PKGFILES_CSWpcrert = $(PKGFILES_RT) 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 Tue Nov 17 20:48:51 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 17 Nov 2009 19:48:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[7330] csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/ Message-ID: Revision: 7330 http://gar.svn.sourceforge.net/gar/?rev=7330&view=rev Author: wahwah Date: 2009-11-17 19:48:50 +0000 (Tue, 17 Nov 2009) Log Message: ----------- Making a branch to try out another way of laying out the files. Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/ 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 Nov 17 21:29:17 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 17 Nov 2009 20:29:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[7331] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 7331 http://gar.svn.sourceforge.net/gar/?rev=7331&view=rev Author: skayser Date: 2009-11-17 20:29:17 +0000 (Tue, 17 Nov 2009) Log Message: ----------- gar/v2: multitail tweak, not yet sure why -j is needed, reduce window height to 1 meanwhile Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-11-17 19:48:50 UTC (rev 7330) +++ csw/mgar/gar/v2/gar.mk 2009-11-17 20:29:17 UTC (rev 7331) @@ -734,7 +734,7 @@ merge-watch: _USEMULTITAIL=$(shell test -x $(MULTITAIL) && test -x $(TTY) && $(TTY) >/dev/null 2>&1; if [ $$? -eq 0 ]; then echo yes; fi) merge-watch: $(addprefix $(WORKROOTDIR)/build-,global $(MODULATIONS)) $(_DBG_MERGE)$(if $(_USEMULTITAIL),\ - $(MULTITAIL) --retry-all $(foreach M,$(MODULATIONS),$(WORKROOTDIR)/build-$M/build.log) -j & echo $$! > $(WORKROOTDIR)/build-global/multitail.pid,\ + $(MULTITAIL) --retry-all $(foreach M,$(MODULATIONS),$(WORKROOTDIR)/build-$M/build.log) -t "multi-platform-build in progress" -wh 1 -j & echo $$! > $(WORKROOTDIR)/build-global/multitail.pid,\ echo "Building all ISAs in parallel. Please see the individual logfiles for details:";$(foreach M,$(MODULATIONS),echo "- $(WORKROOTDIR)/build-$M/build.log";)\ ) 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 Nov 17 22:56:43 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 Nov 2009 21:56:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[7332] csw/mgar/gar/v2 Message-ID: Revision: 7332 http://gar.svn.sourceforge.net/gar/?rev=7332&view=rev Author: dmichelsen Date: 2009-11-17 21:56:31 +0000 (Tue, 17 Nov 2009) Log Message: ----------- mGAR v2: Fix cpan category for automatic CSWcommon dependency inside GAR Modified Paths: -------------- csw/mgar/gar/v2/categories/cpan/category.mk csw/mgar/gar/v2/pkglib/csw/depend.perl csw/mgar/gar/v2/pkglib/csw_cpan.gspec Added Paths: ----------- csw/mgar/gar/v2/pkglib/csw_cpan_dyngspec.gspec Modified: csw/mgar/gar/v2/categories/cpan/category.mk =================================================================== --- csw/mgar/gar/v2/categories/cpan/category.mk 2009-11-17 20:29:17 UTC (rev 7331) +++ csw/mgar/gar/v2/categories/cpan/category.mk 2009-11-17 21:56:31 UTC (rev 7332) @@ -34,7 +34,7 @@ SPKG_SOURCEURL := $(SPKG_SOURCEURL)/$(GARNAME) _MERGE_EXCLUDE_CATEGORY = .*/perllocal\.pod .*/\.packlist -_CATEGORY_GSPEC_INCLUDE ?= csw_cpan.gspec +_CATEGORY_GSPEC_INCLUDE ?= csw_cpan_dyngspec.gspec include gar/gar.mk Modified: csw/mgar/gar/v2/pkglib/csw/depend.perl =================================================================== --- csw/mgar/gar/v2/pkglib/csw/depend.perl 2009-11-17 20:29:17 UTC (rev 7331) +++ csw/mgar/gar/v2/pkglib/csw/depend.perl 2009-11-17 21:56:31 UTC (rev 7332) @@ -1,2 +1 @@ -P CSWcommon common - common files and dirs for CSW packages P CSWperl perl - A high-level, general-purpose programming language Modified: csw/mgar/gar/v2/pkglib/csw_cpan.gspec =================================================================== --- csw/mgar/gar/v2/pkglib/csw_cpan.gspec 2009-11-17 20:29:17 UTC (rev 7331) +++ csw/mgar/gar/v2/pkglib/csw_cpan.gspec 2009-11-17 21:56:31 UTC (rev 7332) @@ -1,5 +1,6 @@ %include url file://%{PKGLIB}/csw_vars.gspec %pkginfo url file://%{PKGLIB}/csw/pkginfo %prototype exec cswproto -s %{TIMESTAMP} -r %{DESTDIR} %{DESTDIR} +%depend:merge url file://%{PKGLIB}/csw/depend %depend:merge url file://%{PKGLIB}/csw/depend.perl %depend exec gawk '$1 ~ /f/{print $3}' %{prototype} | depmaker --root %{DESTDIR} --nodep %{pkgname} %{DEPMAKER_EXTRA_ARGS} Copied: csw/mgar/gar/v2/pkglib/csw_cpan_dyngspec.gspec (from rev 7323, csw/mgar/gar/v2/pkglib/csw_cpan.gspec) =================================================================== --- csw/mgar/gar/v2/pkglib/csw_cpan_dyngspec.gspec (rev 0) +++ csw/mgar/gar/v2/pkglib/csw_cpan_dyngspec.gspec 2009-11-17 21:56:31 UTC (rev 7332) @@ -0,0 +1,5 @@ +%include url file://%{PKGLIB}/csw_vars.gspec +%pkginfo url file://%{PKGLIB}/csw/pkginfo +%prototype exec cswproto -s %{TIMESTAMP} -r %{DESTDIR} %{DESTDIR} +%depend:merge url file://%{PKGLIB}/csw/depend.perl +%depend exec gawk '$1 ~ /f/{print $3}' %{prototype} | depmaker --root %{DESTDIR} --nodep %{pkgname} %{DEPMAKER_EXTRA_ARGS} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Nov 17 23:11:36 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 Nov 2009 22:11:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[7333] csw/mgar/pkg Message-ID: Revision: 7333 http://gar.svn.sourceforge.net/gar/?rev=7333&view=rev Author: dmichelsen Date: 2009-11-17 22:11:32 +0000 (Tue, 17 Nov 2009) Log Message: ----------- di: Initial commit Added Paths: ----------- csw/mgar/pkg/di/ csw/mgar/pkg/di/branches/ csw/mgar/pkg/di/tags/ csw/mgar/pkg/di/trunk/ csw/mgar/pkg/di/trunk/Makefile csw/mgar/pkg/di/trunk/checksums csw/mgar/pkg/di/trunk/files/ Property changes on: csw/mgar/pkg/di/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/di/trunk/Makefile =================================================================== --- csw/mgar/pkg/di/trunk/Makefile (rev 0) +++ csw/mgar/pkg/di/trunk/Makefile 2009-11-17 22:11:32 UTC (rev 7333) @@ -0,0 +1,22 @@ +GARNAME = di +GARVERSION = 4.16 +CATEGORIES = utils + +DESCRIPTION = Disk information utility +define BLURB + 'di' is a disk information utility, displaying everything (and more) + that your 'df' command does. It features the ability to display your + disk usage in whatever format you desire/prefer/are used to. It is + designed to be portable across many platforms. +endef + +MASTER_SITES = http://www.gentoo.com/di/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_SCRIPTS = + +include gar/category.mk + Added: csw/mgar/pkg/di/trunk/checksums =================================================================== --- csw/mgar/pkg/di/trunk/checksums (rev 0) +++ csw/mgar/pkg/di/trunk/checksums 2009-11-17 22:11:32 UTC (rev 7333) @@ -0,0 +1 @@ +a035972d3f90bc8390b19461156ee4ea di-4.16.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 Tue Nov 17 23:16:08 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 17 Nov 2009 22:16:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[7334] csw/mgar/pkg/postgresql/trunk/Makefile Message-ID: Revision: 7334 http://gar.svn.sourceforge.net/gar/?rev=7334&view=rev Author: wahwah Date: 2009-11-17 22:16:07 +0000 (Tue, 17 Nov 2009) Log Message: ----------- postgresql: First sketch of the Debian-inspired directory layout. Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2009-11-17 22:11:32 UTC (rev 7333) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2009-11-17 22:16:07 UTC (rev 7334) @@ -1,11 +1,28 @@ GARNAME = postgresql -GARVERSION = 8.4.1 +BASE_VERSION = 8.4 +PATCHLEVEL = 1 +GARVERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = apps DESCRIPTION = An advanced open source database define BLURB endef +bindir = $(prefix)/bin/$(GARNAME)/$(BASE_VERSION) +datadir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION) +docdir=$(prefix)/share/doc/$(GARNAME)/$(BASE_VERSION) +includedir=$(prefix)/include/$(GARNAME)/$(BASE_VERSION) +infodir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION)/info +libdir=$(prefix)/lib/$(GARNAME)/$(BASE_VERSION) +libexecdir=$(prefix)/libexec/$(GARNAME)/$(BASE_VERSION) +lispdir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION)/emacs/site-lisp +localstatedir = /var/opt/csw/$(GARNAME)/$(BASE_VERSION) +mandir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION)/man +sbindir = $(prefix)/sbin/$(GARNAME)/$(BASE_VERSION) +sharedstatedir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION) +sourcedir=$(prefix)/src/$(GARNAME)/$(BASE_VERSION) +sysconfdir = /etc/opt/csw/$(GARNAME)/$(BASE_VERSION) + MASTER_SITES = http://wwwmaster.postgresql.org/redir/53/h/source/v$(GARVERSION)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += cswpostgres @@ -32,8 +49,8 @@ LICENSE = COPYRIGHT -prefix = $(BUILD_PREFIX)/postgresql -docdir = $(BUILD_PREFIX)/share/doc +# prefix = $(BUILD_PREFIX)/postgresql +# docdir = $(BUILD_PREFIX)/share/doc EXTRA_INC = $(BUILD_PREFIX)/include EXTRA_LIB = $(BUILD_PREFIX)/lib @@ -50,21 +67,29 @@ PKGFILES_CSWlibpq = $(PKGFILES_RT) # -> TODO: start in rc3.d S10, Stop everywhere else in K90 -INITSMF = /etc/init.d/cswpostgres +INITSMF = /etc/opt/csw/init\.d/cswpostgres-$(BASE_VERSION) # -> TODO: Migrate /opt/csw/var/pgdata to /var/opt/csw/postgresql/pgdata -USERGROUP = /opt/csw/etc/pkg/postgresql +USERGROUP = /etc/opt/csw/pkg/postgresql-$(BASE_VERSION) # -> TODO: Migrate /opt/csw/etc/postgresql.conf to /etc/opt/csw/postgresql.conf -PRESERVECONF = /opt/csw/etc/postgresql.conf +PRESERVECONF = /opt/csw/etc/postgresql\.conf include gar/category.mk CFLAGS := $(filter-out -I%,$(CFLAGS)) post-merge: - ginstall -d $(PKGROOT)/etc/init.d && ginstall $(WORKDIR)/cswpostgres $(PKGROOT)/etc/init.d/ - ginstall -d $(PKGROOT)/opt/csw/etc/pkg/postgresql && ginstall $(WORKDIR)/cswusergroup $(PKGROOT)/opt/csw/etc/pkg/postgresql/ - ginstall -d $(PKGROOT)/opt/csw/etc && ginstall $(WORKDIR)/postgresql.conf $(PKGROOT)/opt/csw/etc/ - ginstall -d $(PKGROOT)$(docdir)/postgresql/ && ginstall $(WORKDIR)/README-CSW.txt $(PKGROOT)$(docdir)/postgresql/ + ginstall -d $(PKGROOT)/etc/opt/csw/init.d + ginstall \ + $(WORKDIR)/cswpostgres \ + $(PKGROOT)/etc/opt/csw/init.d/cswpostgres-$(BASE_VERSION) + ginstall -d $(PKGROOT)/opt/csw/etc/pkg/$(GARNAME) + ginstall $(WORKDIR)/cswusergroup \ + $(PKGROOT)/etc/opt/csw/pkg/postgresql/$(GARNAME)-$(BASE_VERSION) + ginstall -d $(PKGROOT)/etc/opt/csw/$(GARNAME)-$(BASE_VERSION) + ginstall $(WORKDIR)/postgresql.conf \ + $(PKGROOT)/etc/opt/csw/$(GARNAME)-$(BASE_VERSION) + ginstall -d $(PKGROOT)$(docdir)/$(GARNAME) + ginstall $(WORKDIR)/README-CSW.txt $(PKGROOT)$(docdir)/$(GARNAME)/ @$(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 Nov 18 03:51:57 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 18 Nov 2009 02:51:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[7335] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 7335 http://gar.svn.sourceforge.net/gar/?rev=7335&view=rev Author: skayser Date: 2009-11-18 02:51:57 +0000 (Wed, 18 Nov 2009) Log Message: ----------- gar/v2: adjusted multitail status bar message Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-11-17 22:16:07 UTC (rev 7334) +++ csw/mgar/gar/v2/gar.mk 2009-11-18 02:51:57 UTC (rev 7335) @@ -734,7 +734,7 @@ merge-watch: _USEMULTITAIL=$(shell test -x $(MULTITAIL) && test -x $(TTY) && $(TTY) >/dev/null 2>&1; if [ $$? -eq 0 ]; then echo yes; fi) merge-watch: $(addprefix $(WORKROOTDIR)/build-,global $(MODULATIONS)) $(_DBG_MERGE)$(if $(_USEMULTITAIL),\ - $(MULTITAIL) --retry-all $(foreach M,$(MODULATIONS),$(WORKROOTDIR)/build-$M/build.log) -t "multi-platform-build in progress" -wh 1 -j & echo $$! > $(WORKROOTDIR)/build-global/multitail.pid,\ + $(MULTITAIL) --retry-all $(foreach M,$(MODULATIONS),$(WORKROOTDIR)/build-$M/build.log) -t "build(s) in progress" -wh 1 -j & echo $$! > $(WORKROOTDIR)/build-global/multitail.pid,\ echo "Building all ISAs in parallel. Please see the individual logfiles for details:";$(foreach M,$(MODULATIONS),echo "- $(WORKROOTDIR)/build-$M/build.log";)\ ) 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 Nov 18 04:12:37 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 18 Nov 2009 03:12:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[7336] csw/mgar/pkg/xterm/trunk Message-ID: Revision: 7336 http://gar.svn.sourceforge.net/gar/?rev=7336&view=rev Author: skayser Date: 2009-11-18 03:12:37 +0000 (Wed, 18 Nov 2009) Log Message: ----------- xterm: version bump to 251, documented CSW X11 related build changes since 243 Modified Paths: -------------- csw/mgar/pkg/xterm/trunk/Makefile csw/mgar/pkg/xterm/trunk/checksums csw/mgar/pkg/xterm/trunk/files/changelog.CSW Modified: csw/mgar/pkg/xterm/trunk/Makefile =================================================================== --- csw/mgar/pkg/xterm/trunk/Makefile 2009-11-18 02:51:57 UTC (rev 7335) +++ csw/mgar/pkg/xterm/trunk/Makefile 2009-11-18 03:12:37 UTC (rev 7336) @@ -1,5 +1,8 @@ +# TODO +# - Now that we mostly have our own CSW X11 libs, can we place the app-default +# files in a location where they are actually read by default? GARNAME = xterm -GARVERSION = 250 +GARVERSION = 251 CATEGORIES = apps DESCRIPTION = Terminal emulator for the X Window System @@ -11,26 +14,16 @@ the control sequences for VT220. endef -MASTER_SITES = ftp://invisible-island.net/xterm/ -DISTFILES = $(GARNAME)-$(GARVERSION).tgz +SPKG_SOURCEURL = http://invisible-island.net/xterm/ +MASTER_SITES = ftp://invisible-island.net/xterm/ +DISTFILES = $(GARNAME)-$(GARVERSION).tgz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz REQUIRED_PKGS = CSWfconfig CSWlibxft2 -# We needed to switch to CSW-built X11 (build against Solaris X11 was broken -# on the build boxes, ) and these came along as dependencies. -REQUIRED_PKGS += CSWlibice CSWlibx11 CSWlibxaw CSWlibxmu CSWlibxt -# enable -mk_width per default to address unicode form character width woes, -# can be taken out once upstream enhances wcwidth() sanity checking -# http://article.gmane.org/gmane.comp.lib.ncurses.bugs/3795 -# -# fixed in #244, let's see whether it works -#PATCHFILES = patch-mkwidth.diff +# xterm Makefile doesn't have a test target +TEST_TARGET = -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz - -TEST_SCRIPTS = - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-setuid CONFIGURE_ARGS += --disable-setgid @@ -46,26 +39,46 @@ CONFIGURE_ARGS += --enable-wide-chars CONFIGURE_ARGS += --program-suffix=86 --with-xterm-symlink CONFIGURE_ARGS += --with-freetype-cflags="-I$(includedir)/freetype2" + +#GARFLAVOR = DBG +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) +CONFIGURE_ARGS_DBG = --enable-trace --enable-warnings + +# Notes on CSW X11 libs: +# xterm depends on Xrender and Xft for freetype font support. Starting with +# +# libxrender-0.9.4,REV=2009.06.11 +# libxft2-2.1.13,REV=2009.06.15 +# +# these libs moved to the CSW X11 libs prefix (/opt/csw/X11). Accordingly, +# we need to build against these X11 libs, otherwise ./configure bails out +# when verifying the linkage to freetype. This unfortunatel drags a pile +# of other CSW X11 libs with it ... o_O ... Any caveats? libX11 for +# instance will be run-time linked twice (see ldd output on xterm). +# One from Solaris, another one from us. Time will show how this works out. CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include CONFIGURE_ARGS += --x-libraries=$(prefix)/X11/lib +REQUIRED_PKGS += CSWlibice CSWlibx11 CSWlibxaw CSWlibxmu CSWlibxt + +# The need for the explicit -lfontconfig linkage also came along when +# we upgraded from xterm-243 (CSW X11 libs had been introduced in the +# meantime, related? pkgconfig woes?). Without the explicit linkage +# there are implicit symbol dependencies on the final xterm linking run. +EXTRA_LDFLAGS = -L$(libdir) -lfontconfig + # luit comes with snv_85 # http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6662431 #CONFIGURE_ARGS += --enable-luit -#GARFLAVOR = DBG -CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) -CONFIGURE_ARGS_DBG = --enable-trace --enable-warnings -# The need for the following extra flags also came along with the switch -# to CSW X11, didn't yet investigate what exactly broke ./configure -EXTRA_LDFLAGS = -L$(libdir) -lfontconfig - include gar/category.mk -post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(CATALOGNAME) +post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) +post-install-modulated: CSWDOCS=README.CSW changelog.CSW +post-install-modulated: DOCS=xterm.log.html ctlseqs.txt post-install-modulated: ginstall -d $(DOCDEST) - cp $(FILEDIR)/README.CSW $(DOCDEST) - cp $(FILEDIR)/changelog.CSW $(DOCDEST) + cp $(addprefix $(FILEDIR)/,$(CSWDOCS)) $(DOCDEST) + cp $(addprefix $(WORKSRC)/,$(DOCS)) $(DOCDEST) @$(MAKECOOKIE) Modified: csw/mgar/pkg/xterm/trunk/checksums =================================================================== --- csw/mgar/pkg/xterm/trunk/checksums 2009-11-18 02:51:57 UTC (rev 7335) +++ csw/mgar/pkg/xterm/trunk/checksums 2009-11-18 03:12:37 UTC (rev 7336) @@ -1 +1 @@ -962ce117f65daf6bf376b6697b2cd02d download/xterm-250.tgz +343a4ce213f70c53cf65979f163bebc3 xterm-251.tgz Modified: csw/mgar/pkg/xterm/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/xterm/trunk/files/changelog.CSW 2009-11-18 02:51:57 UTC (rev 7335) +++ csw/mgar/pkg/xterm/trunk/files/changelog.CSW 2009-11-18 03:12:37 UTC (rev 7336) @@ -1,5 +1,5 @@ -xterm (250,REV=2009.11.02) +xterm (251,REV=2009.11.18) * Updated to 250. (Fixes #3937, #3856) - -- Sebastian Kayser Mon, 2 Nov 2009 16:11:49 +0100 + -- Sebastian Kayser Wed, 18 Nov 2009 03:23:47 +0100 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 Nov 18 09:57:58 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 18 Nov 2009 08:57:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7337] csw/mgar/gar/v2-git Message-ID: Revision: 7337 http://gar.svn.sourceforge.net/gar/?rev=7337&view=rev Author: wahwah Date: 2009-11-18 08:57:57 +0000 (Wed, 18 Nov 2009) Log Message: ----------- gar-v2-git: merging changes from v2 Modified Paths: -------------- csw/mgar/gar/v2-git/bin/checkpkg csw/mgar/gar/v2-git/bin/gitproxy csw/mgar/gar/v2-git/bin/update-commondirs csw/mgar/gar/v2-git/categories/cpan/category.mk csw/mgar/gar/v2-git/categories/x11/category.mk csw/mgar/gar/v2-git/category.mk csw/mgar/gar/v2-git/etc/commondirs-i386 csw/mgar/gar/v2-git/etc/commondirs-sparc csw/mgar/gar/v2-git/gar.conf.mk csw/mgar/gar/v2-git/gar.lib.mk csw/mgar/gar/v2-git/gar.mk csw/mgar/gar/v2-git/gar.pkg.mk csw/mgar/gar/v2-git/pkglib/csw/depend.perl csw/mgar/gar/v2-git/pkglib/csw_cpan.gspec csw/mgar/gar/v2-git/pkglib/csw_dyngspec.gspec Added Paths: ----------- csw/mgar/gar/v2-git/categories/loose/ csw/mgar/gar/v2-git/categories/loose/category.mk csw/mgar/gar/v2-git/pkglib/csw_cpan_dyngspec.gspec Removed Paths: ------------- csw/mgar/gar/v2-git/categories/loose/category.mk Property Changed: ---------------- csw/mgar/gar/v2-git/ Property changes on: csw/mgar/gar/v2-git ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-skayser:6087-6132 + /csw/mgar/gar/v2:4936-6678,6916-7336 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-skayser:6087-6132 Modified: csw/mgar/gar/v2-git/bin/checkpkg =================================================================== --- csw/mgar/gar/v2-git/bin/checkpkg 2009-11-18 03:12:37 UTC (rev 7336) +++ csw/mgar/gar/v2-git/bin/checkpkg 2009-11-18 08:57:57 UTC (rev 7337) @@ -97,7 +97,10 @@ # Need to rewrite this whole thing to also # check for badly set RUNPATHs. sigh. # - for badpath in /export/medusa /opt/build ; do + # Using rot13 so that checkpkg can check itself without reporting + # an error. + badpaths="$(echo /rkcbeg/zrqhfn /bcg/ohvyq | gtr a-mn-z n-za-m)" + for badpath in $badpaths ; do GREP=/bin/grep gzgrep "$badpath" $f if [[ $? -eq 0 ]] ; then print "" @@ -440,6 +443,15 @@ exit 1 fi +# Verify that there are no double depends +repeated_depends="$(awk '{print $2}' $EXTRACTDIR/$pkgname/install/depend \ + | sort | uniq -c | awk '{print $1}' | sort | uniq | wc -l)" +if [[ "$repeated_depends" -gt 1 ]]; then + cat $EXTRACTDIR/$pkgname/install/depend + print ERROR: $pkgname has double depends + exit 1 +fi + #to retain a record of all packages currently being examined from $@ echo $pkgname >> $SETDEPS @@ -451,7 +463,7 @@ if [[ $? -ne 0 ]]; then #if we've already looked at the package named $dep, #it'll be in the file. - awk "\$1 == \"$dep\" {print}" $SETDEPS | /usr/xpg4/bin/grep -q $dep + awk "\$1 == \"$dep\" {print}" $SETDEPS | /usr/bin/grep $dep >/dev/null if [[ $? -ne 0 ]]; then #we haven't yet seen this package in our set echo "Can't validate dependence on $dep. Storing for delayed validation." #store for validation at the end. @@ -530,7 +542,7 @@ while read mdep; do dep=`echo $mdep | nawk '{print $1}'` pkg=`echo $mdep | nawk '{print $2}'` - /usr/xpg4/bin/grep -q $dep $SETDEPS + /usr/bin/grep $dep $SETDEPS >/dev/null if [ $? -ne 0 ]; then errmsg "Couldn't validate $dep as a dependency in package $pkg" else @@ -545,7 +557,7 @@ lib=`echo $ldep | nawk '{print $1}'` [ "$lib" = "libm.so.2" ] && continue pkg=`echo $ldep | nawk '{print $2}'` - /usr/xpg4/bin/grep -q "[/=]$lib[ =]" $SETLIBS + /usr/bin/grep "[/=]$lib[ =]" $SETLIBS >/dev/null if [ $? -ne 0 ]; then errmsg "Couldn't find a package providing $lib" else Modified: csw/mgar/gar/v2-git/bin/gitproxy =================================================================== --- csw/mgar/gar/v2-git/bin/gitproxy 2009-11-18 03:12:37 UTC (rev 7336) +++ csw/mgar/gar/v2-git/bin/gitproxy 2009-11-18 08:57:57 UTC (rev 7337) @@ -15,6 +15,6 @@ nc ${PROXYHOST} ${PROXYPORT} | (read a; read a; cat ) else - echo Please set http_proxy in your environment. + echo Please set http_proxy in your environment. >&2 exit 1 fi Modified: csw/mgar/gar/v2-git/bin/update-commondirs =================================================================== --- csw/mgar/gar/v2-git/bin/update-commondirs 2009-11-18 03:12:37 UTC (rev 7336) +++ csw/mgar/gar/v2-git/bin/update-commondirs 2009-11-18 08:57:57 UTC (rev 7337) @@ -19,17 +19,17 @@ mkdir $TMPDIR ( cd $TMPDIR - wget http://mirror.opencsw.org/opencsw/current/$1/5.8/common-1.4.6,REV=2008.04.28-SunOS5.8-$1-CSW.pkg.gz - gzip -c -d common-* | pkgtrans /dev/fd/0 $TMPDIR all + wget http://mirror.opencsw.org/opencsw/current/$1/5.8/common-1.4.7,REV=2009.09.20-SunOS5.8-$1-CSW.pkg + cat common-* | pkgtrans /dev/fd/0 $TMPDIR all ) - perl -ne ' + ( perl -ne ' my @l = split; if( $l[1] =~ /^[ds]$/ ) { print ($l[3] =~ /([^=]*)/); print "\n"; } - ' $TMPDIR/CSWcommon/pkgmap > ../etc/commondirs-$1 + ' $TMPDIR/CSWcommon/pkgmap; echo "/var"; echo "/var/run") > ../etc/commondirs-$1 rm -rf $TMPDIR } Modified: csw/mgar/gar/v2-git/categories/cpan/category.mk =================================================================== --- csw/mgar/gar/v2-git/categories/cpan/category.mk 2009-11-18 03:12:37 UTC (rev 7336) +++ csw/mgar/gar/v2-git/categories/cpan/category.mk 2009-11-18 08:57:57 UTC (rev 7337) @@ -34,7 +34,7 @@ SPKG_SOURCEURL := $(SPKG_SOURCEURL)/$(GARNAME) _MERGE_EXCLUDE_CATEGORY = .*/perllocal\.pod .*/\.packlist -_CATEGORY_GSPEC_INCLUDE ?= csw_cpan.gspec +_CATEGORY_GSPEC_INCLUDE ?= csw_cpan_dyngspec.gspec include gar/gar.mk Deleted: csw/mgar/gar/v2-git/categories/loose/category.mk =================================================================== --- csw/mgar/gar/v2/categories/loose/category.mk 2009-11-18 03:12:37 UTC (rev 7336) +++ csw/mgar/gar/v2-git/categories/loose/category.mk 2009-11-18 08:57:57 UTC (rev 7337) @@ -1,28 +0,0 @@ -# $Id$ -# -# Building packages from loose files, laid out in a directory. - -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = -INSTALL_SCRIPTS = loose -TEST_SCRIPTS = - -MASTER_SITES += $(sort $(addprefix file://$(LOCAL_SRC)/,$(dir $(FILES)))) -DISTFILES += $(notdir $(FILES)) - -include gar/gar.mk - -ifndef LOCAL_SRC -$(error "Please set the LOCAL_SRC variable to the root of your source code tree") -endif - -ifndef FILES -$(error "Please set the FILES variable to the list of files to include") -endif - -install-loose: - $(foreach F,$(FILES),ginstall \ - -d $(DESTDIR)$(prefix)/$(dir $F) \ - && ginstall $(WORKDIR)/$(notdir $F) \ - $(DESTDIR)$(prefix)/$(dir $F);) - @$(MAKECOOKIE) Copied: csw/mgar/gar/v2-git/categories/loose/category.mk (from rev 7336, csw/mgar/gar/v2/categories/loose/category.mk) =================================================================== --- csw/mgar/gar/v2-git/categories/loose/category.mk (rev 0) +++ csw/mgar/gar/v2-git/categories/loose/category.mk 2009-11-18 08:57:57 UTC (rev 7337) @@ -0,0 +1,28 @@ +# $Id$ +# +# Building packages from loose files, laid out in a directory. + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = loose +TEST_SCRIPTS = + +MASTER_SITES += $(sort $(addprefix file://$(LOCAL_SRC)/,$(dir $(FILES)))) +DISTFILES += $(notdir $(FILES)) + +include gar/gar.mk + +ifndef LOCAL_SRC +$(error "Please set the LOCAL_SRC variable to the root of your source code tree") +endif + +ifndef FILES +$(error "Please set the FILES variable to the list of files to include") +endif + +install-loose: + $(foreach F,$(FILES),ginstall \ + -d $(DESTDIR)$(prefix)/$(dir $F) \ + && ginstall $(WORKDIR)/$(notdir $F) \ + $(DESTDIR)$(prefix)/$(dir $F);) + @$(MAKECOOKIE) Modified: csw/mgar/gar/v2-git/categories/x11/category.mk =================================================================== --- csw/mgar/gar/v2-git/categories/x11/category.mk 2009-11-18 03:12:37 UTC (rev 7336) +++ csw/mgar/gar/v2-git/categories/x11/category.mk 2009-11-18 08:57:57 UTC (rev 7337) @@ -1,6 +1,11 @@ # X11 -X11_PROTO_MASTER_SITE = http://xorg.freedesktop.org/releases/individual/proto/ -X11_LIB_MASTER_SITE = http://xorg.freedesktop.org/releases/individual/lib/ + +# Version of X11 +X11_RELEASE_VERSION = X11R7.4 + +# Definition of the URL to access sources +X11_PROTO_MASTER_SITE = http://xorg.freedesktop.org/releases/$(X11_RELEASE_VERSION)/src/proto/ +X11_LIB_MASTER_SITE = http://xorg.freedesktop.org/releases/$(X11_RELEASE_VERSION)/src/lib/ XCB_MASTER_SITES = http://xcb.freedesktop.org/dist/ # C and C++ compiler flags Modified: csw/mgar/gar/v2-git/category.mk =================================================================== --- csw/mgar/gar/v2-git/category.mk 2009-11-18 03:12:37 UTC (rev 7336) +++ csw/mgar/gar/v2-git/category.mk 2009-11-18 08:57:57 UTC (rev 7337) @@ -2,8 +2,8 @@ # This makefile is to be included from Makefiles in each category # directory. -ifeq (,$(CATEGORIES)) - $(error Please set CATEGORIES to one of $(wildcard categories/*)) +ifeq (,$(wildcard gar/categories/$(CATEGORIES)/category.mk)) + $(error The category '$(CATEGORIES)' is invalid. Valid categories are $(patsubst gar/categories/%,%,$(wildcard gar/categories/*))) endif include gar/categories/$(CATEGORIES)/category.mk Modified: csw/mgar/gar/v2-git/etc/commondirs-i386 =================================================================== --- csw/mgar/gar/v2-git/etc/commondirs-i386 2009-11-18 03:12:37 UTC (rev 7336) +++ csw/mgar/gar/v2-git/etc/commondirs-i386 2009-11-18 08:57:57 UTC (rev 7337) @@ -1,4 +1,17 @@ /etc/opt/csw +/etc/opt/csw/pkg-hooks +/etc/opt/csw/pkg-hooks/postbatchinstall.d +/etc/opt/csw/pkg-hooks/postbatchremove.d +/etc/opt/csw/pkg-hooks/postbatchupgrade.d +/etc/opt/csw/pkg-hooks/postinstall.d +/etc/opt/csw/pkg-hooks/postremove.d +/etc/opt/csw/pkg-hooks/postupgrade.d +/etc/opt/csw/pkg-hooks/prebatchinstall.d +/etc/opt/csw/pkg-hooks/prebatchremove.d +/etc/opt/csw/pkg-hooks/prebatchupgrade.d +/etc/opt/csw/pkg-hooks/preinstall.d +/etc/opt/csw/pkg-hooks/preremove.d +/etc/opt/csw/pkg-hooks/preupgrade.d /opt/csw /opt/csw/bin /opt/csw/bin/amd64 @@ -140,3 +153,6 @@ /opt/csw/share/man /opt/csw/var /var/opt/csw +/var/opt/csw/pkg-hooks +/var +/var/run Modified: csw/mgar/gar/v2-git/etc/commondirs-sparc =================================================================== --- csw/mgar/gar/v2-git/etc/commondirs-sparc 2009-11-18 03:12:37 UTC (rev 7336) +++ csw/mgar/gar/v2-git/etc/commondirs-sparc 2009-11-18 08:57:57 UTC (rev 7337) @@ -1,4 +1,17 @@ /etc/opt/csw +/etc/opt/csw/pkg-hooks +/etc/opt/csw/pkg-hooks/postbatchinstall.d +/etc/opt/csw/pkg-hooks/postbatchremove.d +/etc/opt/csw/pkg-hooks/postbatchupgrade.d +/etc/opt/csw/pkg-hooks/postinstall.d +/etc/opt/csw/pkg-hooks/postremove.d +/etc/opt/csw/pkg-hooks/postupgrade.d +/etc/opt/csw/pkg-hooks/prebatchinstall.d +/etc/opt/csw/pkg-hooks/prebatchremove.d +/etc/opt/csw/pkg-hooks/prebatchupgrade.d +/etc/opt/csw/pkg-hooks/preinstall.d +/etc/opt/csw/pkg-hooks/preremove.d +/etc/opt/csw/pkg-hooks/preupgrade.d /opt/csw /opt/csw/bin /opt/csw/bin/sparc @@ -144,3 +157,6 @@ /opt/csw/share/man /opt/csw/var /var/opt/csw +/var/opt/csw/pkg-hooks +/var +/var/run Modified: csw/mgar/gar/v2-git/gar.conf.mk =================================================================== --- csw/mgar/gar/v2-git/gar.conf.mk 2009-11-18 03:12:37 UTC (rev 7336) +++ csw/mgar/gar/v2-git/gar.conf.mk 2009-11-18 08:57:57 UTC (rev 7337) @@ -164,6 +164,8 @@ DESTIMG ?= $(LOGNAME)-$(shell hostname) +# A default list of packages that everyone will depend on +COMMON_PKG_DEPENDS ?= CSWcommon # These are the core packages which must be installed for GAR to function correctly DEF_BASE_PKGS = CSWgmake CSWgtar CSWggrep CSWdiffutils CSWgfile CSWtextutils CSWwget CSWfindutils CSWgsed CSWgawk CSWbzip2 @@ -203,8 +205,8 @@ ARCHFLAGS_SOS11_sparcv9+vis = -xarch=v9a ARCHFLAGS_SOS12_sparcv9+vis = -m64 -xarch=sparcvis - ARCHFLAGS_GCC3_sparcv9+vis = -m64 -mcpu=v9 -mvis - ARCHFLAGS_GCC4_sparcv9+vis = -m64 -mcpu=v9 -mvis + ARCHFLAGS_GCC3_sparcv9+vis = -m64 -mcpu=ultrasparc -mvis + ARCHFLAGS_GCC4_sparcv9+vis = -m64 -mcpu=ultrasparc -mvis MEMORYMODEL_sparcv9+vis = 64 ARCHFLAGS_SOS11_sparcv9 = -xarch=v9 @@ -492,7 +494,7 @@ RUNPATH_LINKER_FLAGS ?= $(foreach D,$(RUNPATH_DIRS),$(addprefix -R,$(addsuffix /\$$ISALIST,$(filter $D,$(RUNPATH_ISALIST))) $(abspath $D/$(MM_LIBDIR)))) $(addprefix -R,$(filter-out $(RUNPATH_DIRS),$(RUNPATH_ISALIST))) $(EXTRA_RUNPATH_LINKER_FLAGS) endif -LINKER_FLAGS ?= $(foreach ELIB,$(libdir_install) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR))) $(EXTRA_LINKER_FLAGS) +LINKER_FLAGS ?= $(foreach ELIB,$(libpath_install) $(filter-out $(libpath_install),$(libdir_install)) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR))) $(EXTRA_LINKER_FLAGS) CC_HOME = $($(GARCOMPILER)_CC_HOME) CC = $($(GARCOMPILER)_CC) Modified: csw/mgar/gar/v2-git/gar.lib.mk =================================================================== --- csw/mgar/gar/v2-git/gar.lib.mk 2009-11-18 03:12:37 UTC (rev 7336) +++ csw/mgar/gar/v2-git/gar.lib.mk 2009-11-18 08:57:57 UTC (rev 7337) @@ -498,6 +498,12 @@ @( cd $* ; $(CONFIGURE_ENV) ruby ./setup.rb config $(CONFIGURE_ARGS) ) @$(MAKECOOKIE) +# WAF build, for details see http://code.google.com/p/waf/ +configure-%/waf: + @echo " ==> Running waf configure in $*" + cd $* && $(CONFIGURE_ENV) ./waf configure $(CONFIGURE_ARGS) + @$(MAKECOOKIE) + #################### BUILD RULES #################### # build from a standard gnu-style makefile's default rule. @@ -537,6 +543,12 @@ @( cd $* ; $(BUILD_ENV) ruby ./setup.rb setup $(BUILD_ARGS) ) @$(MAKECOOKIE) +# WAF build, for details see http://code.google.com/p/waf/ +build-%/waf: + @echo " ==> Running waf build in $*" + @$(cd $* ; (BUILD_ENV) ./waf build $(BUILD_ARGS) ) + @$(MAKECOOKIE) + # This can be: build, build_py, build_ext, build_clib, build_scripts # See setup.py --help-commands for details PYBUILD_CMD ?= build @@ -615,6 +627,12 @@ @( cd $* ; $(INSTALL_ENV) ruby ./setup.rb install --prefix=$(DESTDIR) ) @$(MAKECOOKIE) +# WAF build, for details see http://code.google.com/p/waf/ +install-%/waf: + @echo " ==> Running waf install in $*" + @$(cd $* ; (INSTALL_ENV) ./waf install $(INSTALL_ARGS) ) + @$(MAKECOOKIE) + # This can be: install, install_lib, install_headers, install_scripts, # or install_data. See setup.py --help-commands for details. PYINSTALL_CMD ?= install Modified: csw/mgar/gar/v2-git/gar.mk =================================================================== --- csw/mgar/gar/v2-git/gar.mk 2009-11-18 03:12:37 UTC (rev 7336) +++ csw/mgar/gar/v2-git/gar.mk 2009-11-18 08:57:57 UTC (rev 7337) @@ -46,14 +46,16 @@ DISTNAME ?= $(GARNAME)-$(GARVERSION) DYNSCRIPTS = $(foreach PKG,$(SPKG_SPECS),$(foreach SCR,$(ADMSCRIPTS),$(if $(value $(PKG)_$(SCR)), $(PKG).$(SCR)))) -_NOCHECKSUM += $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))) +_NOCHECKSUM += $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))) $(_EXTRA_GAR_NOCHECKSUM) +DISTFILES += $(_EXTRA_GAR_DISTFILES) + # Allow overriding of only specific components of ALLFILES by clearing e. g. 'ALLFILES_DYNSCRIPTS = ' ALLFILES_DISTFILES ?= $(DISTFILES) ALLFILES_PATCHFILES ?= $(PATCHFILES) $(foreach M,$(MODULATIONS),$(PATCHFILES_$M)) ALLFILES_DYNSCRIPTS ?= $(DYNSCRIPTS) ALLFILES_GIT_REPOS ?= $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))) -ALLFILES ?= $(sort $(ALLFILES_DISTFILES) $(ALLFILES_PATCHFILES) $(ALLFILES_DYNSCRIPTS) $(ALLFILES_GIT_REPOS) $(EXTRA_ALLFILES)) +ALLFILES ?= $(sort $(ALLFILES_DISTFILES) $(ALLFILES_PATCHFILES) $(ALLFILES_DYNSCRIPTS) $(ALLFILES_GIT_REPOS) $(EXTRA_ALLFILES) $(_EXTRA_GAR_ALLFILES)) ifeq ($(MAKE_INSTALL_DIRS),1) INSTALL_DIRS = $(addprefix $(DESTDIR),$(prefix) $(exec_prefix) $(bindir) $(sbindir) $(libexecdir) $(datadir) $(sysconfdir) $(sharedstatedir) $(localstatedir) $(libdir) $(infodir) $(lispdir) $(includedir) $(mandir) $(foreach NUM,1 2 3 4 5 6 7 8, $(mandir)/man$(NUM)) $(sourcedir)) @@ -191,6 +193,48 @@ $(eval $(call _modulate,$(MODULATORS))) +# --- This next block allows you to use collapsed ISAs in modulations +# isa-default-... instead of isa-sparcv8-... and isa-i386-... +# isa-default64-... instead of isa-sparcv9-... and isa-amd64-... +# isa-extra-... instead of any other ISA (if default64 is undefined it falls back to 'extra') + +__collapsedisa = $(strip $(or $(and $(filter $(ISA_DEFAULT_sparc) $(ISA_DEFAULT_i386),$(1)),default),\ + $(and $(filter $(ISA_DEFAULT64_sparc) $(ISA_DEFAULT64_i386),$(1)),default64),\ + extra)) + +__collapsedisa64 = default64 +__collapsedisaextra = extra + +__isacollapsedmodulation_1 = $(call tolower,$(1))-$(if $(filter ISA,$(1)),$(call $(2),$(ISA)),$($(1))) +__isacollapsedmodulation = $(if $(word 2,$(1)),\ + $(foreach P,$(call __isacollapsedmodulation_1,$(firstword $(1)),$(2)),\ + $(addprefix $(P)-,$(call __isacollapsedmodulation,$(wordlist 2,$(words $(1)),$(1))))\ + ),\ + $(call __isacollapsedmodulation_1,$(1),$(2))) + +# This is the name of the current modulation but with the ISA i386, sparcv8 and amd64, sparcv9 replaced +# with the collapsed name 'default', 'default64' and everything else as 'extra'. +MODULATION_ISACOLLAPSED = $(strip $(call __isacollapsedmodulation,$(strip $(MODULATORS)),__collapsedisa)) + +# This is the name of the current modulation but with the ISA replaced with 'default64' +MODULATION_ISACOLLAPSED64 = $(strip $(call __isacollapsedmodulation,$(strip $(MODULATORS)),__collapsedisa64)) + +# This is the name of the current modulation but with the ISA replaced with 'extra' +MODULATION_ISACOLLAPSEDEXTRA = $(strip $(call __isacollapsedmodulation,$(strip $(MODULATORS)),__collapsedisaextra)) + +# $(warning Mod: $(MODULATION) ISA: $(ISA) coll: $(MODULATION_ISACOLLAPSED) 64: $(MODULATION_ISACOLLAPSED64) extra: $(MODULATION_ISACOLLAPSEDEXTRA)) + +# Call this function to get either the modulation-specific value or the default. +# Instead of $(myvar_$(MODULATION)) $(call modulationvalue,myvar) +define modulationvalue +$(strip $(or $($(1)_$(MODULATION)),\ + $($(1)_$(call __isacollapsedmodulation,$(strip $(MODULATORS)),__collapsedisa)),\ + $($(1)_$(call __isacollapsedmodulation,$(strip $(MODULATORS)),__collapsedisaextra))\ +)) +endef + +# --- end of collapsed ISA modulations + #################### DIRECTORY MAKERS #################### # This is to make dirs as needed by the base rules @@ -590,10 +634,15 @@ MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-all $(EXTRA_MERGE_SCRIPTS_$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) else ISAEXEC_DIRS ?= $(if $(NO_ISAEXEC),,$(bindir) $(sbindir) $(libexecdir)) -MERGE_DIRS_isa-$(ISA_DEFAULT) ?= $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA_DEFAULT)) -MERGE_DIRS_isa-$(ISA) ?= $(bindir) $(sbindir) $(libexecdir) $(libdir) $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA)) -MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-relocate $(EXTRA_MERGE_SCRIPTS_isa-$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) -MERGE_SCRIPTS_isa-$(ISA) ?= copy-relocated-only $(EXTRA_MERGE_SCRIPTS_isa-$(ISA)) $(EXTRA_MERGE_SCRIPTS) +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_$(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_$(MODULATION_ISACOLLAPSED64) ?= $(MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSEDEXTRA)) +MERGE_SCRIPTS_$(MODULATION) ?= $(MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSED)) endif # These directories get relocated into their ISA subdirectories @@ -609,6 +658,10 @@ if test -f "$$F" -a \! -h "$$F"; then echo $$F; fi; \ done)),) +ifneq ($(COMMON_PKG_DEPENDS),) +_EXTRA_GAR_PKGS += $(COMMON_PKG_DEPENDS) +endif + ifneq ($(ISAEXEC_FILES),) _EXTRA_GAR_PKGS += CSWisaexec endif @@ -694,7 +747,7 @@ # The basic merge merges the compiles for all ISAs on the current architecture -merge: checksum pre-merge merge-do merge-license $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) post-merge +merge: checksum pre-merge merge-do merge-license merge-classutils $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) post-merge @$(DONADA) merge-do: $(if $(PARALLELMODULATIONS),merge-parallel,merge-sequential) @@ -718,7 +771,7 @@ merge-watch: _USEMULTITAIL=$(shell test -x $(MULTITAIL) && test -x $(TTY) && $(TTY) >/dev/null 2>&1; if [ $$? -eq 0 ]; then echo yes; fi) merge-watch: $(addprefix $(WORKROOTDIR)/build-,global $(MODULATIONS)) $(_DBG_MERGE)$(if $(_USEMULTITAIL),\ - $(MULTITAIL) --retry-all $(foreach M,$(MODULATIONS),$(WORKROOTDIR)/build-$M/build.log) -j & echo $$! > $(WORKROOTDIR)/build-global/multitail.pid,\ + $(MULTITAIL) --retry-all $(foreach M,$(MODULATIONS),$(WORKROOTDIR)/build-$M/build.log) -t "build(s) in progress" -wh 1 -j & echo $$! > $(WORKROOTDIR)/build-global/multitail.pid,\ echo "Building all ISAs in parallel. Please see the individual logfiles for details:";$(foreach M,$(MODULATIONS),echo "- $(WORKROOTDIR)/build-$M/build.log";)\ ) @@ -729,14 +782,14 @@ # Copy the whole tree verbatim merge-copy-all: $(PKGROOT) $(INSTALLISADIR) - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -p e -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 && pax -r -w -v $(_PAX_ARGS) \ $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/,p") \ . $(PKGROOT)) @$(MAKECOOKIE) # Copy only the merge directories merge-copy-only: $(PKGROOT) - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -p e -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 && pax -r -w -v $(_PAX_ARGS) \ $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/,p") -s ",.*,," \ . $(PKGROOT) \ ) @@ -744,7 +797,7 @@ # Copy the whole tree and relocate the directories in $(MERGE_DIRS) merge-copy-relocate: $(PKGROOT) $(INSTALLISADIR) - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -p e -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 && pax -r -w -v $(_PAX_ARGS) \ $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/$(ISA)/,p") \ . $(PKGROOT) \ ) @@ -752,7 +805,7 @@ # Copy only the relocated directories merge-copy-relocated-only: $(PKGROOT) $(INSTALLISADIR) - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -p e -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 && pax -r -w -v $(_PAX_ARGS) \ $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/$(ISA)/,p") -s ",.*,," \ . $(PKGROOT) \ ) @@ -760,7 +813,7 @@ # Copy merge-copy-config-only: - $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -p e -v $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 && pax -r -w -v $(_PAX_ARGS) \ -s ",^\(\.$(bindir)/.*-config\)\$$,\1,p" \ -s ",.*,," \ . $(PKGROOT) \ @@ -770,7 +823,7 @@ .PHONY: remerge reset-merge reset-merge-modulated remerge: reset-merge merge -reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-src +reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-classutils reset-merge-src @rm -f $(COOKIEDIR)/pre-merge $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge $(COOKIEDIR)/post-merge @rm -rf $(PKGROOT) @$(DONADA) Modified: csw/mgar/gar/v2-git/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-git/gar.pkg.mk 2009-11-18 03:12:37 UTC (rev 7336) +++ csw/mgar/gar/v2-git/gar.pkg.mk 2009-11-18 08:57:57 UTC (rev 7337) @@ -165,10 +165,22 @@ $(SPKG_CLASSES) $(if $($(1)),$(if $(filter $(2),$(SPKG_CLASSES)),,$(2))) endef +MIGRATECONF ?= $(strip $(foreach S,$(SPKG_SPECS),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),/etc/opt/csw/pkg/$S/cswmigrateconf))) + +# It is NOT sufficient to change the pathes here, they must be adjusted in merge-* also +_USERGROUP_FILES ?= $(strip $(foreach S,$(SPKG_SPECS),$(if $(value $(S)_usergroup),/etc/opt/csw/pkg/$S/cswusergroup))) +_INETDCONF_FILES ?= $(strip $(foreach S,$(SPKG_SPECS),$(if $(value $(S)_inetdconf),/etc/opt/csw/pkg/$S/inetd.conf))) +_ETCSERVICES_FILES ?= $(strip $(foreach S,$(SPKG_SPECS),$(if $(value $(S)_etcservices),/etc/opt/csw/pkg/$S/services))) + +USERGROUP += $(_USERGROUP_FILES) +INETDCONF += $(_INETDCONF_FILES) +ETCSERVICES += $(_ETCSERVICES_FILES) + # NOTE: Order _can_ be important here. cswinitsmf and cswinetd should # always be the last two added. The reason for this is that # you need to ensure any binaries and config files are already on disk # and able to be consumed by a service that might be started. +SPKG_CLASSES := $(call _spkg_cond_add,MIGRATECONF,cswmigrateconf) SPKG_CLASSES := $(call _spkg_cond_add,SAMPLECONF,cswcpsampleconf) SPKG_CLASSES := $(call _spkg_cond_add,PRESERVECONF,cswpreserveconf) SPKG_CLASSES := $(call _spkg_cond_add,ETCSERVICES,cswetcservices) @@ -177,9 +189,13 @@ SPKG_CLASSES := $(call _spkg_cond_add,INETDCONF,cswinetd) SPKG_CLASSES := $(call _spkg_cond_add,INITSMF,cswinitsmf) +# This is the default path for texinfo pages to be picked up. Extend or replace as necessary. +TEXINFO ?= $(infodir)/.*\.info(?:-\d+)? $(EXTRA_TEXINFO) + # - set class for all config files -ifneq ($(SAMPLECONF)$(PRESERVECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),) +ifneq ($(SAMPLECONF)$(PRESERVECONF)$(MIGRATECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE)$(TEXINFO),) _CSWCLASS_FILTER = | perl -ane '\ + $(foreach FILE,$(MIGRATECONF),$$F[1] = "cswmigrateconf" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(SAMPLECONF:%\.CSW=%),$$F[1] = "cswcpsampleconf" if ( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ $(foreach FILE,$(PRESERVECONF:%\.CSW=%),$$F[1] = "cswpreserveconf" if( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ $(foreach FILE,$(ETCSERVICES),$$F[1] = "cswetcservices" if( $$F[2] =~ m(^$(FILE)$$) );)\ @@ -187,7 +203,9 @@ $(foreach FILE,$(INITSMF),$$F[1] = "cswinitsmf" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(USERGROUP),$$F[1] = "cswusergroup" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(if $(PYCOMPILE),$(foreach FILE,$(_PYCOMPILE_FILES),$$F[1] = "cswpycompile" if( $$F[2] =~ m(^$(FILE)$$) );))\ + $(foreach FILE,$(TEXINFO),$$F[1] = "cswtexinfo" if( $$F[2] =~ m(^$(FILE)$$) );)\ print join(" ", at F),"\n";' + _EXTRA_GAR_PKGS += CSWcswclassutils # Make sure the configuration files always have a .CSW suffix and rename the # configuration files to this if necessary during merge. @@ -274,9 +292,6 @@ $(strip $(foreach S,$(filter-out $(1),$(_PKG_SPECS)), $(PKGFILES_$(S)) - $(EXTRA_PKGFILES_EXCLUDED) - $(EXTRA_PKGFILES_EXCLUDED_$(1)) - $(_EXTRA_PKGFILES_EXCLUDED) ) ) endef @@ -368,8 +383,10 @@ -n "$(_PKGFILES_EXCLUDE)" -o \ -n "$(ISAEXEC_FILES_$*)" -o \ -n "$(ISAEXEC_FILES)" ]; then \ - (pathfilter $(if $(or $(_PKGFILES_EXCLUDE),$(_PKGFILES_INCLUDE)),-I $(call licensedir,$*)/license) \ - $(foreach S,$(filter-out $*,$(SPKG_SPECS)),-X $(call licensedir,$S)/license) \ + (pathfilter $(if $(or $(_PKGFILES_EXCLUDE),$(_PKGFILES_INCLUDE)),-I $(call licensedir,$*)/license -I /etc/opt/csw/pkg/$*/cswmigrateconf) \ + $(foreach S,$(filter-out $*,$(SPKG_SPECS)),-X $(call licensedir,$S)/license -X /etc/opt/csw/pkg/$S/cswmigrateconf) \ + $(foreach I,$(EXTRA_PKGFILES_INCLUDED) $(EXTRA_PKGFILES_INCLUDED_$*),-i '$I') \ + $(foreach X,$(EXTRA_PKGFILES_EXCLUDED) $(EXTRA_PKGFILES_EXCLUDED_$*),-x '$X') \ $(foreach FILE,$(_PKGFILES_INCLUDE),-i '$(FILE)') \ $(if $(_PKGFILES_INCLUDE),-x '.*',$(foreach FILE,$(_PKGFILES_EXCLUDE),-x '$(FILE)')) \ $(foreach IE,$(abspath $(ISAEXEC_FILES_$*) $(ISAEXEC_FILES)), \ @@ -401,6 +418,13 @@ # $_EXTRA_GAR_PKGS is for dynamic dependencies added by GAR itself (like CSWisaexec or CSWcswclassutils) .PRECIOUS: $(WORKDIR)/%.depend + +# The texinfo filter has been taken out of the normal filters as TEXINFO has a default. +# The dependencies to CSWcswclassutils and CSWtexinfo are only added if there are files +# actually matching the _TEXINFO_FILTER. This is done at the prototype-level. +$(WORKDIR)/%.depend: $(WORKDIR)/$*.prototype +$(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach FILE,$(TEXINFO),print "$$F[2]\n" if( $$F[2] =~ m(^$(FILE)$$) );)'),CSWcswclassutils) + $(WORKDIR)/%.depend: $(WORKDIR) $(_DBG)$(if $(_EXTRA_GAR_PKGS)$(REQUIRED_PKGS_$*)$(REQUIRED_PKGS)$(INCOMPATIBLE_PKGS)$(INCOMPATIBLE_PKGS_$*), \ ($(foreach PKG,$(INCOMPATIBLE_PKGS_$*) $(INCOMPATIBLE_PKGS),\ @@ -489,7 +513,7 @@ endef define pkgvar -$(if $($(1)_$(2)),$($(1)_$(2)),$($(1))) +$(strip $(if $($(1)_$(2)),$($(1)_$(2)),$($(1)))) endef # Make sure every producable package contains specific descriptions. @@ -501,6 +525,11 @@ ))) .PRECIOUS: $(WORKDIR)/%.pkginfo + +# The texinfo filter has been taken out of the normal filters as TEXINFO has a default. +$(WORKDIR)/%.pkginfo: $(WORKDIR)/%.prototype +$(WORKDIR)/%.pkginfo: SPKG_CLASSES += $(if $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach FILE,$(TEXINFO),print "$$F[2]\n" if( $$F[2] =~ m(^$(FILE)$$) );)'),cswtexinfo) + $(WORKDIR)/%.pkginfo: $(WORKDIR) $(_DBG)(echo "PKG=$*"; \ echo "NAME=$(call catalogname,$*) - $(call pkgvar,SPKG_DESC,$*)"; \ @@ -547,7 +576,7 @@ if [ -f "$$LICENSEFILE" ]; then cp $$LICENSEFILE $(WORKDIR)/$*.copyright; fi;, \ echo "Please see $$LICENSEDIR/license for license information." > $(WORKDIR)/$*.copyright; \ ) \ - mkdir -p $(PKGROOT)$$LICENSEDIR && \ + umask 022 && mkdir -p $(PKGROOT)$$LICENSEDIR && \ rm -f $(PKGROOT)$$LICENSEDIR/license && \ cp $$LICENSEFILE $(PKGROOT)$$LICENSEDIR/license; \ fi \ @@ -559,9 +588,70 @@ reset-merge-license: @rm -f $(COOKIEDIR)/merge-license $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-license-$(SPEC)) - @$(DONADA) +merge-classutils: merge-migrateconf merge-usergroup merge-inetdconf merge-etcservices +reset-merge-classutils: reset-merge-migrateconf reset-merge-usergroup reset-merge-inetdconf reset-merge-etcservices + +merge-migrateconf: $(foreach S,$(SPKG_SPECS),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),merge-migrateconf-$S)) + @$(MAKECOOKIE) + +merge-migrateconf-%: MIGRATE_FILES_$* ?= $(MIGRATE_FILES) +merge-migrateconf-%: MIGRATE_SOURCE_DIR_$* ?= $(MIGRATE_SOURCE_DIR) +merge-migrateconf-%: MIGRATE_DEST_DIR_$* ?= $(MIGRATE_DEST_DIR) +merge-migrateconf-%: + @echo "[ Generating cswmigrateconf for package $* ]" + $(_DBG)ginstall -d $(PKGROOT)/etc/opt/csw/pkg/$* + $(_DBG)(echo "MIGRATE_FILES=\"$(MIGRATE_FILES_$*)\"";\ + $(if $(MIGRATE_SOURCE_DIR_$*),echo "SOURCE_DIR___default__=\"$(MIGRATE_SOURCE_DIR_$*)\"";)\ + $(if $(MIGRATE_DEST_DIR_$*),echo "DEST_DIR___default__=\"$(MIGRATE_DEST_DIR_$*)\"";)\ + $(foreach F,$(MIGRATE_FILES_$*),\ + $(if $(MIGRATE_SOURCE_DIR_$F),echo "SOURCE_DIR_$(subst .,_,$F)=\"$(MIGRATE_SOURCE_DIR_$F)\"";)\ + $(if $(MIGRATE_DEST_DIR_$F),echo "DEST_DIR_$(subst .,_,$F)=\"$(MIGRATE_DEST_DIR_$F)\"";)\ + )\ + ) >$(PKGROOT)/etc/opt/csw/pkg/$*/cswmigrateconf + @$(MAKECOOKIE) + +reset-merge-migrateconf: + @rm -f $(COOKIEDIR)/merge-migrateconf $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-migrateconf-$(SPEC)) + +_show_classutilvar//%: + $($*) + +merge-usergroup: $(foreach S,$(SPKG_SPECS),$(if $(value $(S)_usergroup),merge-usergroup-$S)) + @$(MAKECOOKIE) + +merge-usergroup-%: + @echo "[ Generating cswusergroup for package $* ]" + $(_DBG)ginstall -d $(PKGROOT)/etc/opt/csw/pkg/$* + $(_DBG)$(MAKE) --no-print-directory -n _show_classutilvar//$*_usergroup >$(PKGROOT)/etc/opt/csw/pkg/$*/cswusergroup + @$(MAKECOOKIE) + +reset-merge-usergroup: + @rm -f $(COOKIEDIR)/merge-usergroup $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-usergroup-$(SPEC)) + +merge-inetdconf: $(foreach S,$(SPKG_SPECS),$(if $(value $(S)_inetdconf),merge-inetdconf-$S)) + +merge-inetdconf-%: + @echo "[ Generating inetd.conf for package $* ]" + $(_DBG)ginstall -d $(PKGROOT)/etc/opt/csw/pkg/$* + $(_DBG)$(MAKE) --no-print-directory -n _show_classutilvar//$*_inetdconf >$(PKGROOT)/etc/opt/csw/pkg/$*/inetd.conf + @$(MAKECOOKIE) + +reset-merge-inetdconf: + @rm -f $(COOKIEDIR)/merge-inetdconf $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-inetdconf-$(SPEC)) + +merge-etcservices: $(foreach S,$(SPKG_SPECS),$(if $(value $(S)_etcservices),merge-etcservices-$S)) + +merge-etcservices-%: + @echo "[ Generating services for package $* ]" + $(_DBG)ginstall -d $(PKGROOT)/etc/opt/csw/pkg/$* + $(_DBG)$(MAKE) --no-print-directory -n _show_classutilvar//$*_etcservices >$(PKGROOT)/etc/opt/csw/pkg/$*/services + @$(MAKECOOKIE) + +reset-merge-etcservices: + @rm -f $(COOKIEDIR)/merge-etcservices $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-etcservices-$(SPEC)) + merge-src: _SRCDIR=$(PKGROOT)$(sourcedir)/$(call catalogname,$(SRCPACKAGE_BASE)) merge-src: fetch $(_DBG)mkdir -p $(_SRCDIR)/files @@ -579,11 +669,7 @@ # package - Use the mkpackage utility to create Solaris packages # -ifneq ($(ENABLE_CHECK),0) -PACKAGE_TARGETS = $(foreach SPEC,$(_PKG_SPECS), package-$(SPEC) pkgcheck-$(SPEC)) -else PACKAGE_TARGETS = $(foreach SPEC,$(_PKG_SPECS), package-$(SPEC)) -endif SPKG_DESTDIRS = $(SPKG_SPOOLDIR) $(SPKG_EXPORT) @@ -610,7 +696,9 @@ # We depend on extract as the additional package files (like .gspec) must be # unpacked to global/ for packaging. E. g. 'merge' depends only on the specific # modulations and does not fill global/. -_package: validateplatform extract-global merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package +ENABLE_CHECK ?= 1 +_package: validateplatform extract-global merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package $(if $(ENABLE_CHECK),pkgcheck) + @$(MAKECOOKIE) package: _package @echo @@ -624,7 +712,7 @@ @$(foreach SPEC,$(_PKG_SPECS),printf " %-20s %s\n" $(SPEC) $(SPKG_EXPORT)/$(shell $(call _PKG_ENV,$(SPEC)) $(GARBIN)/mkpackage -qs $(WORKDIR)/$(SPEC).gspec -D pkgfile).gz;) # The dynamic pkginfo is only generated for dynamic gspec-files -package-%: $(WORKDIR)/%.gspec $(if $(findstring %.gspec,$(DISTFILES)),,$(WORKDIR)/%.pkginfo) $(WORKDIR)/%.prototype-$(GARCH) $(WORKDIR)/%.depend +package-%: $(WORKDIR)/%.gspec $(WORKDIR)/%.prototype-$(GARCH) $(WORKDIR)/%.depend $(if $(findstring %.gspec,$(DISTFILES)),,$(WORKDIR)/%.pkginfo) @echo " ==> Processing $*.gspec" $(_DBG)( $(call _PKG_ENV,$*) mkpackage --spec $(WORKDIR)/$*.gspec \ --spooldir $(SPKG_SPOOLDIR) \ @@ -642,13 +730,10 @@ # pkgcheck - check if the package is compliant # -pkgcheck: $(addprefix pkgcheck-,$(_PKG_SPECS)) - @$(DONADA) +pkgcheck: $(foreach SPEC,$(_PKG_SPECS),package-$(SPEC)) + $(_DBG)( LC_ALL=C $(GARBIN)/checkpkg $(foreach SPEC,$(_PKG_SPECS),$(SPKG_EXPORT)/`$(call _PKG_ENV,$(SPEC)) mkpackage -qs $(WORKDIR)/$(SPEC).gspec -D pkgfile`.gz ) || exit 2;) + @$(MAKECOOKIE) -pkgcheck-%: - @echo " ==> Checking compliance: $*" - @( LC_ALL=C $(GARBIN)/checkpkg $(SPKG_EXPORT)/`$(call _PKG_ENV,$1) mkpackage -qs $(WORKDIR)/$*.gspec -D pkgfile`.gz ) || exit 2 - pkgcheck-p: @$(foreach COOKIEFILE,$(PKGCHECK_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) @@ -660,12 +745,13 @@ reset-package: pkgreset +# Make sure we don't delete files we deliberately added with DISTFILES. They +# will not be copied to WORKDIR again. pkgreset-%: @echo " ==> Reset packaging state for $* ($(DESTIMG))" - @rm -rf $(foreach T,extract checksum package pkgcheck,$(COOKIEDIR)/*$(T)-$**) - @rm -rf $(COOKIEDIR)/pre-package $(COOKIEDIR)/post-package - @rm -rf $(WORKDIR)/$*.* $(WORKDIR)/prototype - @rm -f $(WORKDIR)/copyright $(WORKDIR)/*.copyright + $(_DBG)rm -rf $(foreach T,extract checksum package pkgcheck,$(COOKIEDIR)/*$(T)-$**) + $(_DBG)rm -rf $(COOKIEDIR)/pre-package $(COOKIEDIR)/post-package + $(_DBG)rm -rf $(addprefix $(WORKDIR)/,$(filter-out $(DISTFILES),$(patsubst $(WORKDIR)/%,%,$(wildcard $(WORKDIR)/$*.*)) prototype copyright $*.copyright)) repackage: pkgreset package @@ -676,7 +762,7 @@ $(if $(PACKAGING_HOST_$P),\ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ $(MAKE) PLATFORM=$P _package && ,\ - $(SSH) -t $(PACKAGING_HOST_$P) "$(MAKE) -C $(CURDIR) PLATFORM=$P _package" && \ + $(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) PLATFORM=$P _package" && \ ),\ $(error *** No host has been defined for platform $P)\ )\ @@ -690,7 +776,7 @@ echo " (built on this host)";\ $(MAKE) -s PLATFORM=$P _pkgshow;echo;,\ echo " (built on host '$(PACKAGING_HOST_$P)')";\ - $(SSH) $(PACKAGING_HOST_$P) "$(MAKE) -C $(CURDIR) -s PLATFORM=$P _pkgshow";echo;\ + $(SSH) $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) -s PLATFORM=$P _pkgshow";echo;\ )\ ) @$(MAKECOOKIE) Modified: csw/mgar/gar/v2-git/pkglib/csw/depend.perl =================================================================== --- csw/mgar/gar/v2-git/pkglib/csw/depend.perl 2009-11-18 03:12:37 UTC (rev 7336) +++ csw/mgar/gar/v2-git/pkglib/csw/depend.perl 2009-11-18 08:57:57 UTC (rev 7337) @@ -1,2 +1 @@ -P CSWcommon common - common files and dirs for CSW packages P CSWperl perl - A high-level, general-purpose programming language Modified: csw/mgar/gar/v2-git/pkglib/csw_cpan.gspec =================================================================== --- csw/mgar/gar/v2-git/pkglib/csw_cpan.gspec 2009-11-18 03:12:37 UTC (rev 7336) +++ csw/mgar/gar/v2-git/pkglib/csw_cpan.gspec 2009-11-18 08:57:57 UTC (rev 7337) @@ -1,5 +1,6 @@ %include url file://%{PKGLIB}/csw_vars.gspec %pkginfo url file://%{PKGLIB}/csw/pkginfo %prototype exec cswproto -s %{TIMESTAMP} -r %{DESTDIR} %{DESTDIR} +%depend:merge url file://%{PKGLIB}/csw/depend %depend:merge url file://%{PKGLIB}/csw/depend.perl %depend exec gawk '$1 ~ /f/{print $3}' %{prototype} | depmaker --root %{DESTDIR} --nodep %{pkgname} %{DEPMAKER_EXTRA_ARGS} Copied: csw/mgar/gar/v2-git/pkglib/csw_cpan_dyngspec.gspec (from rev 7336, csw/mgar/gar/v2/pkglib/csw_cpan_dyngspec.gspec) =================================================================== --- csw/mgar/gar/v2-git/pkglib/csw_cpan_dyngspec.gspec (rev 0) +++ csw/mgar/gar/v2-git/pkglib/csw_cpan_dyngspec.gspec 2009-11-18 08:57:57 UTC (rev 7337) @@ -0,0 +1,5 @@ +%include url file://%{PKGLIB}/csw_vars.gspec +%pkginfo url file://%{PKGLIB}/csw/pkginfo +%prototype exec cswproto -s %{TIMESTAMP} -r %{DESTDIR} %{DESTDIR} +%depend:merge url file://%{PKGLIB}/csw/depend.perl +%depend exec gawk '$1 ~ /f/{print $3}' %{prototype} | depmaker --root %{DESTDIR} --nodep %{pkgname} %{DEPMAKER_EXTRA_ARGS} Modified: csw/mgar/gar/v2-git/pkglib/csw_dyngspec.gspec =================================================================== --- csw/mgar/gar/v2-git/pkglib/csw_dyngspec.gspec 2009-11-18 03:12:37 UTC (rev 7336) +++ csw/mgar/gar/v2-git/pkglib/csw_dyngspec.gspec 2009-11-18 08:57:57 UTC (rev 7337) @@ -1,5 +1,4 @@ %include url file://%{PKGLIB}/csw_vars.gspec %include url file://%{PKGLIB}/csw_prototype.gspec %pkginfo url file://%{WORKSRC}/csw/pkginfo -%depend:merge url file://%{PKGLIB}/csw/depend %include url file://%{PKGLIB}/std_depend.gspec 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 Nov 18 11:52:23 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 18 Nov 2009 10:52:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7338] csw/mgar/pkg/cups/trunk/Makefile Message-ID: Revision: 7338 http://gar.svn.sourceforge.net/gar/?rev=7338&view=rev Author: wahwah Date: 2009-11-18 10:52:23 +0000 (Wed, 18 Nov 2009) Log Message: ----------- cups: Adding CSWcupsclient-ln Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2009-11-18 08:57:57 UTC (rev 7337) +++ csw/mgar/pkg/cups/trunk/Makefile 2009-11-18 10:52:23 UTC (rev 7338) @@ -71,8 +71,13 @@ SPKG_CLASSES = none cswcpsampleconf cswinitsmf -PACKAGES = CSWlibcups CSWcupsd CSWcupsclient CSWcupsdoc CSWcupsdev CSWcups +PACKAGES = CSWlibcups CSWcupsd CSWcupsclient CSWcupsdoc CSWcupsdev CSWcups +PACKAGES += CSWcupsclient-ln +INCOMPATIBLE_PKGS_CSWcupsclient-ln = SUNWpcr SUNWpcu +CATALOGNAME_CSWcupsclient-ln = cupsclient_ln +ARCHALL_CSWcupsclient-ln = 1 + ARCHALL_CSWcupsdoc = 1 ARCHALL_CSWcupsdev = 1 @@ -88,6 +93,7 @@ REQUIRED_PKGS_CSWcupsdev = REQUIRED_PKGS_CSWlibcups = CSWjpeg CSWpng CSWtiff CSWzlib REQUIRED_PKGS_CSWlibcups += CSWgcrypt CSWgnutls CSWgpgerr CSWlibtasn1 CSWosslrt +REQUIRED_PKGS_CSWcupsclient-ln = CSWcupsclient PKGFILES_CSWlibcups = $(libdir)/libcups.* @@ -144,6 +150,8 @@ PKGFILES_CSWcupsclient += $(mandir)/man5/ppdcfile\.5 PKGFILES_CSWcupsclient += $(mandir)/man7/(drv|notifier)\.7 PKGFILES_CSWcupsclient += $(sysconfdir)/cups/client\.conf\.CSW +PKGFILES_CSWcupsclient-ln = /usr/sbin/.* +PKGFILES_CSWcupsclient-ln += /usr/bin/.* SPKG_DESC_CSWcups = Common Unix Printing System SPKG_DESC_CSWlibcups = CUPS libraries @@ -151,6 +159,7 @@ SPKG_DESC_CSWcupsclient = CUPS client binaries SPKG_DESC_CSWcupsdoc = CUPS documentation SPKG_DESC_CSWcupsdev = CUPS header files +SPKG_DESC_CSWcupsclient-ln = Drop-in replacement for SUNWpcu and SUNWpcr # http://lists.opencsw.org/pipermail/maintainers/2009-September/004249.html SAMPLECONF = $(sysconfdir)/cups/cupsd\.conf\.CSW @@ -199,7 +208,7 @@ include gar/category.mk -post-install-modulated: +post-install: (cd $(DESTDIR)$(sysconfdir)/cups; \ echo "Making .CSW configs in $(DESTDIR)$(sysconfdir)/cups"; \ for i in cupsd.conf; do \ @@ -212,4 +221,12 @@ ginstall -m 644 \ $(FILEDIR)/client.conf.CSW \ $(DESTDIR)$(sysconfdir)/cups/client.conf.CSW + ginstall -d -m 755 $(DESTDIR)/usr/bin + for f in cancel lp lpoptions lppassd lpq lpr lprm lpstat; do \ + ln -s ../../opt/csw/bin/$$f $(DESTDIR)/usr/bin/$$f; \ + done + ginstall -d -m 755 $(DESTDIR)/usr/sbin + for f in accept lpadmin lpc lpinfo lpmove reject; do \ + ln -s ../../opt/csw/sbin/$$f $(DESTDIR)/usr/sbin/$$f; \ + done @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Nov 18 12:24:59 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 18 Nov 2009 11:24:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[7339] csw/mgar/pkg/postgresql/trunk/Makefile Message-ID: Revision: 7339 http://gar.svn.sourceforge.net/gar/?rev=7339&view=rev Author: wahwah Date: 2009-11-18 11:24:58 +0000 (Wed, 18 Nov 2009) Log Message: ----------- postgresql: Fix for the /etc/opt/csw/pkg/$(GARNAME) directory Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2009-11-18 10:52:23 UTC (rev 7338) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2009-11-18 11:24:58 UTC (rev 7339) @@ -84,7 +84,7 @@ ginstall \ $(WORKDIR)/cswpostgres \ $(PKGROOT)/etc/opt/csw/init.d/cswpostgres-$(BASE_VERSION) - ginstall -d $(PKGROOT)/opt/csw/etc/pkg/$(GARNAME) + ginstall -d $(PKGROOT)/etc/opt/csw/pkg/$(GARNAME) ginstall $(WORKDIR)/cswusergroup \ $(PKGROOT)/etc/opt/csw/pkg/postgresql/$(GARNAME)-$(BASE_VERSION) ginstall -d $(PKGROOT)/etc/opt/csw/$(GARNAME)-$(BASE_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 Wed Nov 18 15:45:35 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Nov 2009 14:45:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[7340] csw/mgar/pkg Message-ID: Revision: 7340 http://gar.svn.sourceforge.net/gar/?rev=7340&view=rev Author: dmichelsen Date: 2009-11-18 14:45:18 +0000 (Wed, 18 Nov 2009) Log Message: ----------- icecast: Initial commit Added Paths: ----------- csw/mgar/pkg/icecast/ csw/mgar/pkg/icecast/branches/ csw/mgar/pkg/icecast/tags/ csw/mgar/pkg/icecast/trunk/ csw/mgar/pkg/icecast/trunk/Makefile csw/mgar/pkg/icecast/trunk/checksums csw/mgar/pkg/icecast/trunk/files/ Property changes on: csw/mgar/pkg/icecast/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/icecast/trunk/Makefile =================================================================== --- csw/mgar/pkg/icecast/trunk/Makefile (rev 0) +++ csw/mgar/pkg/icecast/trunk/Makefile 2009-11-18 14:45:18 UTC (rev 7340) @@ -0,0 +1,27 @@ +GARNAME = icecast +GARVERSION = 2.3.2 +CATEGORIES = apps + +DESCRIPTION = A free server software for streaming multimedia +define BLURB +endef + +MASTER_SITES = http://downloads.xiph.org/releases/icecast/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.icecast.org/ + +REQUIRED_PKGS = CSWlibogg CSWosslrt CSWtheora CSWvorbis CSWzlib +REQUIRED_PKGS += CSWcurlrt CSWlibidn CSWoldaprt CSWspeex + +PREREQUISITE_PKGS = $(REQUIRED_PKGS) + +sysconfdir = /etc/opt/csw +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/icecast/trunk/checksums =================================================================== --- csw/mgar/pkg/icecast/trunk/checksums (rev 0) +++ csw/mgar/pkg/icecast/trunk/checksums 2009-11-18 14:45:18 UTC (rev 7340) @@ -0,0 +1 @@ +ff516b3ccd2bcc31e68f460cd316093f icecast-2.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 Nov 18 16:00:25 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Nov 2009 15:00:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7341] csw/mgar/pkg/icecast/trunk/Makefile Message-ID: Revision: 7341 http://gar.svn.sourceforge.net/gar/?rev=7341&view=rev Author: dmichelsen Date: 2009-11-18 15:00:23 +0000 (Wed, 18 Nov 2009) Log Message: ----------- icecast: Add more requirements Modified Paths: -------------- csw/mgar/pkg/icecast/trunk/Makefile Modified: csw/mgar/pkg/icecast/trunk/Makefile =================================================================== --- csw/mgar/pkg/icecast/trunk/Makefile 2009-11-18 14:45:18 UTC (rev 7340) +++ csw/mgar/pkg/icecast/trunk/Makefile 2009-11-18 15:00:23 UTC (rev 7341) @@ -16,6 +16,7 @@ REQUIRED_PKGS = CSWlibogg CSWosslrt CSWtheora CSWvorbis CSWzlib REQUIRED_PKGS += CSWcurlrt CSWlibidn CSWoldaprt CSWspeex +REQUIRED_PKGS += CSWiconv CSWlibnet CSWlibxml2 CSWlibxslt CSWsasl PREREQUISITE_PKGS = $(REQUIRED_PKGS) 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 Nov 18 17:57:47 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 18 Nov 2009 16:57:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[7342] csw/mgar/pkg Message-ID: Revision: 7342 http://gar.svn.sourceforge.net/gar/?rev=7342&view=rev Author: dmichelsen Date: 2009-11-18 16:57:47 +0000 (Wed, 18 Nov 2009) Log Message: ----------- liboggz: Initial commit Added Paths: ----------- csw/mgar/pkg/liboggz/ csw/mgar/pkg/liboggz/branches/ csw/mgar/pkg/liboggz/tags/ csw/mgar/pkg/liboggz/trunk/ csw/mgar/pkg/liboggz/trunk/Makefile csw/mgar/pkg/liboggz/trunk/checksums csw/mgar/pkg/liboggz/trunk/files/ csw/mgar/pkg/liboggz/trunk/files/0001-Remove-linker-version.patch Property changes on: csw/mgar/pkg/liboggz/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/liboggz/trunk/Makefile =================================================================== --- csw/mgar/pkg/liboggz/trunk/Makefile (rev 0) +++ csw/mgar/pkg/liboggz/trunk/Makefile 2009-11-18 16:57:47 UTC (rev 7342) @@ -0,0 +1,34 @@ +GARNAME = liboggz +GARVERSION = 1.1.0 +CATEGORIES = lib + +DESCRIPTION = A commandline tool for manipulating Ogg files +define BLURB + Oggz comprises liboggz and the tool oggz, which provides commands to inspect, edit + and validate Ogg files. The oggz-chop tool can also be used to serve time ranges of + Ogg media over HTTP by any web server that supports CGI. + + liboggz is a C library for reading and writing Ogg files and streams. It offers various + improvements over the reference libogg, including support for seeking, validation and + timestamp interpretation. +endef + +MASTER_SITES = http://downloads.xiph.org/releases/liboggz/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Remove-linker-version.patch + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +PREREQUISITE_PKGS = CSWdoxygen +REQUIRED_PKGS = CSWlibogg + +BUILD64 = 1 +NO_ISAEXEC = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +MERGE_DIRS_isa-extra = $(libdir) + +include gar/category.mk Added: csw/mgar/pkg/liboggz/trunk/checksums =================================================================== --- csw/mgar/pkg/liboggz/trunk/checksums (rev 0) +++ csw/mgar/pkg/liboggz/trunk/checksums 2009-11-18 16:57:47 UTC (rev 7342) @@ -0,0 +1,2 @@ +f4ec200018ed77f1cb44fee2c4687d49 0001-Remove-linker-version.patch +f97f1d57820a9fc1d080409cf203b38a liboggz-1.1.0.tar.gz Added: csw/mgar/pkg/liboggz/trunk/files/0001-Remove-linker-version.patch =================================================================== --- csw/mgar/pkg/liboggz/trunk/files/0001-Remove-linker-version.patch (rev 0) +++ csw/mgar/pkg/liboggz/trunk/files/0001-Remove-linker-version.patch 2009-11-18 16:57:47 UTC (rev 7342) @@ -0,0 +1,55 @@ +From 98520890bdf48d718490927f04197c48a1958647 Mon Sep 17 00:00:00 2001 +From: dam +Date: Mon, 9 Nov 2009 03:55:19 +0100 +Subject: [PATCH] Remove linker version + +--- + configure | 8 -------- + configure.ac | 12 ------------ + 2 files changed, 0 insertions(+), 20 deletions(-) + +diff --git a/configure b/configure +index 9342074..cafccae 100755 +--- a/configure ++++ b/configure +@@ -15629,14 +15629,6 @@ if test "x${ac_enable_gcc_werror}" = xyes ; then + fi + + +-case "$target_os" in +- linux* | solaris*|k*bsd*-gnu*|gnu-*) +- SHLIB_VERSION_ARG="-Wl,--version-script=Version_script" +- ;; +- *) +- ;; +-esac +- + # Checks for library functions. + + +diff --git a/configure.ac b/configure.ac +index bc9acb8..1098ca1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -396,18 +396,6 @@ if test "x${ac_enable_gcc_werror}" = xyes ; then + CFLAGS="-Werror $CFLAGS" + fi + +-dnl +-dnl Shared library symbol versioning and hiding +-dnl +- +-case "$target_os" in +- linux* | solaris*|k*bsd*-gnu*|gnu-*) +- SHLIB_VERSION_ARG="-Wl,--version-script=Version_script" +- ;; +- *) +- ;; +-esac +- + # Checks for library functions. + + dnl +-- +1.6.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Wed Nov 18 18:12:31 2009 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Wed, 18 Nov 2009 17:12:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7343] csw/mgar/pkg Message-ID: Revision: 7343 http://gar.svn.sourceforge.net/gar/?rev=7343&view=rev Author: bensons Date: 2009-11-18 17:12:31 +0000 (Wed, 18 Nov 2009) Log Message: ----------- tunctl: initial GAR commit Added Paths: ----------- csw/mgar/pkg/tunctl/ csw/mgar/pkg/tunctl/branches/ csw/mgar/pkg/tunctl/tags/ csw/mgar/pkg/tunctl/trunk/ csw/mgar/pkg/tunctl/trunk/Makefile csw/mgar/pkg/tunctl/trunk/checksums Property changes on: csw/mgar/pkg/tunctl/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/tunctl/trunk/Makefile =================================================================== --- csw/mgar/pkg/tunctl/trunk/Makefile (rev 0) +++ csw/mgar/pkg/tunctl/trunk/Makefile 2009-11-18 17:12:31 UTC (rev 7343) @@ -0,0 +1,29 @@ +GARNAME = tunctl +GARVERSION = 1.5 +CATEGORIES = net + +DESCRIPTION = Used to set up and maintain persistent TUN/TAP network interface +define BLURB + tunctl is used to set up and maintain persistent TUN/TAP network interfaces, + enabling user applications to simulate network traffic. Such interfaces + is useful for VPN software, virtualization, emulation, simulation, and a + number of other applications. +endef + +MASTER_SITES = http://garr.dl.sourceforge.net/sourceforge/tunctl/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# since there is no configure script, this is intentionally left empty +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_SCRIPTS = + +# no tests +TEST_SCRIPTS = custom + +include gar/category.mk + +test-custom: + @true + +pre-build-modulated: + @perl -pi -e 's#^CFLAGS.*#$(CFLAGS)#' $(WORKSRC)/Makefile Added: csw/mgar/pkg/tunctl/trunk/checksums =================================================================== --- csw/mgar/pkg/tunctl/trunk/checksums (rev 0) +++ csw/mgar/pkg/tunctl/trunk/checksums 2009-11-18 17:12:31 UTC (rev 7343) @@ -0,0 +1 @@ +fdbedc263b3e85bb0e087cd567414607 tunctl-1.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Nov 18 19:38:18 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 18 Nov 2009 18:38:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7344] csw/mgar/pkg/axel/trunk Message-ID: Revision: 7344 http://gar.svn.sourceforge.net/gar/?rev=7344&view=rev Author: skayser Date: 2009-11-18 18:38:18 +0000 (Wed, 18 Nov 2009) Log Message: ----------- axel: version bump to 2.4 Modified Paths: -------------- csw/mgar/pkg/axel/trunk/Makefile csw/mgar/pkg/axel/trunk/checksums Added Paths: ----------- csw/mgar/pkg/axel/trunk/files/0001-configure-use-backticks-and-honor-prefix-for-gettext.patch csw/mgar/pkg/axel/trunk/files/changelog.CSW Modified: csw/mgar/pkg/axel/trunk/Makefile =================================================================== --- csw/mgar/pkg/axel/trunk/Makefile 2009-11-18 17:12:31 UTC (rev 7343) +++ csw/mgar/pkg/axel/trunk/Makefile 2009-11-18 18:38:18 UTC (rev 7344) @@ -1,5 +1,7 @@ +# TODO +# - Migrate configuration from /opt to /etc GARNAME = axel -GARVERSION = 2.3 +GARVERSION = 2.4 CATEGORIES = utils DESCRIPTION = Lightweight command-line download accelerator @@ -9,42 +11,44 @@ very useful on bootdisks or other small systems as a wget replacement endef -MASTER_SITES = http://alioth.debian.org/frs/download.php/2717/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz - +# Beware: When bumping the version, you also need to visit the download page +# and get the correct DOWNLOAD_ID for the new version. If you don't change it, +# you will get the tarball with the corrent name, but with the old content. SPKG_SOURCEURL = http://axel.alioth.debian.org/ -SPKG_CLASSES = none cswcpsampleconf +MASTER_SITES = http://alioth.debian.org/frs/download.php/$(DOWNLOAD_ID)/ +DOWNLOAD_ID = 3015 +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS = CSWcswclassutils +# upstream_watch currently uses lftp and lftp only lists files when +# they are offered via the SAME scheme as the requested page. The +# axel download page can be accessed via http:// and https:// but +# the files themselves are only offered via https://, thus https://. +UPSTREAM_MASTER_SITES = https://alioth.debian.org/frs/?group_id=100070 -# Doesn't work yet, upstream watch needs to be improved first -#UPSTREAM_MASTER_SITES = http://alioth.debian.org/frs/?group_id=100070 -#UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +# Make ./configure play nicely with /bin/sh and /opt/csw prefix +PATCHFILES = 0001-configure-use-backticks-and-honor-prefix-for-gettext.patch -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --i18n=0 +# axel doesn't come with a test suite TEST_SCRIPTS = -PROTOTYPE_FILTER = awk '\ - $$$$3 ~ /axelrc.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ - { print }' +SAMPLECONF = $(sysconfdir)/axelrc include gar/category.mk -# ./configure is not your usual kind of configure ... -post-configure-modulated: - @perl -pi -e 's|-g -Os||' $(WORKSRC)/Makefile.settings - @echo CFLAGS+=$(CFLAGS) >> $(WORKSRC)/Makefile.settings - @$(MAKECOOKIE) - +# Get rid of hard-coded -Wall gcc'ism pre-build-modulated: - @perl -pi -e 's/-Wall//g' $(WORKSRC)/Makefile + perl -pi -e 's/-Wall//g' $(WORKSRC)/Makefile @$(MAKECOOKIE) +post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) post-install-modulated: - @perl -pi -e "s#/etc/axelrc#$(sysconfdir)/axelrc#" \ + ginstall -d $(DOCDEST) + cp $(FILEDIR)/changelog.CSW $(DOCDEST) + perl -pi -e "s#/etc/axelrc#$(sysconfdir)/axelrc#" \ $(DESTDIR)$(mandir)/man1/axel.1 \ $(DESTDIR)$(mandir)/zh_CN/man1/axel.1 - @mv $(DESTDIR)$(sysconfdir)/axelrc \ - $(DESTDIR)$(sysconfdir)/axelrc.CSW @$(MAKECOOKIE) Modified: csw/mgar/pkg/axel/trunk/checksums =================================================================== --- csw/mgar/pkg/axel/trunk/checksums 2009-11-18 17:12:31 UTC (rev 7343) +++ csw/mgar/pkg/axel/trunk/checksums 2009-11-18 18:38:18 UTC (rev 7344) @@ -1 +1,2 @@ -6f49813ffc1dd10829d74b73712cb5ed download/axel-2.3.tar.gz +717e172161023dd7ad5ca4bdd3cd2678 0001-configure-use-backticks-and-honor-prefix-for-gettext.patch +a2a762fce0c96781965c8f9786a3d09d axel-2.4.tar.gz Added: csw/mgar/pkg/axel/trunk/files/0001-configure-use-backticks-and-honor-prefix-for-gettext.patch =================================================================== --- csw/mgar/pkg/axel/trunk/files/0001-configure-use-backticks-and-honor-prefix-for-gettext.patch (rev 0) +++ csw/mgar/pkg/axel/trunk/files/0001-configure-use-backticks-and-honor-prefix-for-gettext.patch 2009-11-18 18:38:18 UTC (rev 7344) @@ -0,0 +1,40 @@ +From 7de9123636a2d04d6d8bdeec4a8de367c666d031 Mon Sep 17 00:00:00 2001 +From: Sebastian Kayser +Date: Wed, 18 Nov 2009 18:33:30 +0100 +Subject: [PATCH] configure: use backticks and honor prefix for gettext + +--- + configure | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/configure b/configure +index 81ecb99..535a0af 100755 +--- a/configure ++++ b/configure +@@ -42,8 +42,8 @@ EOF + exit; + fi + +- keyname=$(expr "$e" : '\(.*\)=.*' | sed 's/[^a-z0-9_]/_/g') +- value=$(expr "$e" : '.*=\(.*\)' | sed "s/'/_/g") ++ keyname=`expr "$e" : '\(.*\)=.*' | sed 's/[^a-z0-9_]/_/g'` ++ value=`expr "$e" : '.*=\(.*\)' | sed "s/'/_/g"` + + eval "$keyname='$value'" + shift; +@@ -106,9 +106,9 @@ fi + if [ "$i18n" = "1" ]; then + echo 'I18N=1' >> Makefile.settings + echo '#define I18N' >> config.h +- if cat /usr/local/include/libintl.h > /dev/null 2> /dev/null; then +- echo 'CFLAGS+=-I/usr/local/include' >> Makefile.settings +- echo 'LFLAGS+=-L/usr/local/lib' >> Makefile.settings; ++ if [ -f "${prefix}/include/libintl.h" ]; then ++ echo "CFLAGS+=-I${prefix}/include" >> Makefile.settings ++ echo "LFLAGS+=-L${prefix}/lib" >> Makefile.settings; + fi; + fi + +-- +1.6.5.1 + Added: csw/mgar/pkg/axel/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/axel/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/axel/trunk/files/changelog.CSW 2009-11-18 18:38:18 UTC (rev 7344) @@ -0,0 +1,5 @@ +axel (2.4,REV=2009.11.18) + + * Updated to 2.4. (Fixes #4032) + + -- Sebastian Kayser Wed, 18 Nov 2009 16:13:33 +0100 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 Nov 18 22:47:29 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 18 Nov 2009 21:47:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[7345] csw/mgar/pkg/axel/trunk/Makefile Message-ID: Revision: 7345 http://gar.svn.sourceforge.net/gar/?rev=7345&view=rev Author: skayser Date: 2009-11-18 21:47:29 +0000 (Wed, 18 Nov 2009) Log Message: ----------- axel: changed sysconfdir and integrated MIGRATE_FILES Modified Paths: -------------- csw/mgar/pkg/axel/trunk/Makefile Modified: csw/mgar/pkg/axel/trunk/Makefile =================================================================== --- csw/mgar/pkg/axel/trunk/Makefile 2009-11-18 18:38:18 UTC (rev 7344) +++ csw/mgar/pkg/axel/trunk/Makefile 2009-11-18 21:47:29 UTC (rev 7345) @@ -1,5 +1,3 @@ -# TODO -# - Migrate configuration from /opt to /etc GARNAME = axel GARVERSION = 2.4 CATEGORIES = utils @@ -29,13 +27,16 @@ # Make ./configure play nicely with /bin/sh and /opt/csw prefix PATCHFILES = 0001-configure-use-backticks-and-honor-prefix-for-gettext.patch +sysconfdir = /etc/opt/csw CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --etcdir=$(sysconfdir) CONFIGURE_ARGS += --i18n=0 # axel doesn't come with a test suite TEST_SCRIPTS = SAMPLECONF = $(sysconfdir)/axelrc +MIGRATE_FILES = axelrc 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 Nov 18 23:03:37 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 18 Nov 2009 22:03:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[7346] csw/mgar/pkg/tightvnc/trunk Message-ID: Revision: 7346 http://gar.svn.sourceforge.net/gar/?rev=7346&view=rev Author: wahwah Date: 2009-11-18 22:03:37 +0000 (Wed, 18 Nov 2009) Log Message: ----------- tightvnc: wrapping the vncserver script to provide a useful error message http://www.opencsw.org/mantis/view.php?id=942 Modified Paths: -------------- csw/mgar/pkg/tightvnc/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/tightvnc/trunk/files/vncserver-wrapper.sh Modified: csw/mgar/pkg/tightvnc/trunk/Makefile =================================================================== --- csw/mgar/pkg/tightvnc/trunk/Makefile 2009-11-18 21:47:29 UTC (rev 7345) +++ csw/mgar/pkg/tightvnc/trunk/Makefile 2009-11-18 22:03:37 UTC (rev 7346) @@ -102,4 +102,9 @@ ginstall -m 644 $(WORKDIR)/vncservers $(DESTDIR)$(sysconfdir)/vncservers ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d ginstall -m 644 $(FILEDIR)/cswvncserver $(DESTDIR)/etc/opt/csw/init.d + ginstall -d -m 755 $(DESTDIR)$(libexecdir) + mv $(DESTDIR)$(bindir)/vncserver $(DESTDIR)$(libexecdir) + ginstall -m 755 \ + $(FILEDIR)/vncserver-wrapper.sh \ + $(DESTDIR)$(bindir)/vncserver @$(MAKECOOKIE) Added: csw/mgar/pkg/tightvnc/trunk/files/vncserver-wrapper.sh =================================================================== --- csw/mgar/pkg/tightvnc/trunk/files/vncserver-wrapper.sh (rev 0) +++ csw/mgar/pkg/tightvnc/trunk/files/vncserver-wrapper.sh 2009-11-18 22:03:37 UTC (rev 7346) @@ -0,0 +1,50 @@ +#!/opt/csw/bin/bash +# vim:set sw=2 ts=2 sts=2 expandtab: +# +# $Id$ +# +# This file is a workaround for the bug number 942[1]. +# +# The /tmp/.X11-unix directory has following permissions: +# +# maciej at build8st [build8st]:~ > ls -ld /tmp/.X11-unix +# drwxrwxr-x 2 root root 176 Jul 13 23:31 /tmp/.X11-unix +# +# As a result, non-root users cannot run vnc servers. The purpose of +# this file is to provide a useful error message to the user when +# appropriate. +# +# [1] http://www.opencsw.org/mantis/view.php?id=942 + +test_dir="/tmp/.X11-unix" + +# Test whether the directory in question is world writable, or writable by the +# current user. +writable() { + find "$1" -prune -type d \ + -a \ + \( \ + -perm -o+w \ + -o \ + \( \ + -user "${UID}" \ + -a \ + -perm -u+w \ + \) \ + \) | grep "$1" +} + +if writable "${test_dir}"; then + exec /opt/csw/libexec/vncserver "$@" +else + cat < Revision: 7347 http://gar.svn.sourceforge.net/gar/?rev=7347&view=rev Author: skayser Date: 2009-11-18 23:04:18 +0000 (Wed, 18 Nov 2009) Log Message: ----------- ncdu: version bump to 1.6 Modified Paths: -------------- csw/mgar/pkg/ncdu/trunk/Makefile csw/mgar/pkg/ncdu/trunk/checksums csw/mgar/pkg/ncdu/trunk/files/changelog.CSW Removed Paths: ------------- csw/mgar/pkg/ncdu/trunk/files/gar-base.diff Modified: csw/mgar/pkg/ncdu/trunk/Makefile =================================================================== --- csw/mgar/pkg/ncdu/trunk/Makefile 2009-11-18 22:03:37 UTC (rev 7346) +++ csw/mgar/pkg/ncdu/trunk/Makefile 2009-11-18 23:04:18 UTC (rev 7347) @@ -1,42 +1,34 @@ GARNAME = ncdu -GARVERSION = 1.5 +GARVERSION = 1.6 CATEGORIES = utils DESCRIPTION = Ncurses version of the famous old 'du' unix define BLURB -As the name already suggests, ncdu is an ncurses version of the famous old 'du' -unix command. It provides a fast and easy interface to your harddrive. Where is -your disk space going? Why is your home directory that large? ncdu can answer -those questions for you in just a matter of seconds! + As the name already suggests, ncdu is an ncurses version of the famous + old 'du' unix command. It provides a fast and easy interface to your + harddrive. Where is your disk space going? Why is your home directory + that large? ncdu can answer those questions for you in just a matter of + seconds! endef SPKG_SOURCEURL = http://dev.yorhel.nl/ncdu/ -MASTER_SITES = http://dev.yorhel.nl/download/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +MASTER_SITES = http://dev.yorhel.nl/download/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz REQUIRED_PKGS = CSWncurses +# ncdu doesn't come with a test suite TEST_SCRIPTS = EXTRA_INC = /opt/csw/include/ncursesw CONFIGURE_ARGS = $(DIRPATHS) -# - Autoconf check and replacement for non-POSIX dirfd() -# See http://sf.net/tracker/?func=detail&aid=2789779&group_id=200175&atid=972449 -# - Fix for non-void return in src/delete.c:void delete_process() -# See http://sf.net/tracker/?func=detail&aid=2789781&group_id=200175&atid=972449 -PATCHFILES=gar-base.diff - include gar/category.mk -pre-configure-modulated: - @cd $(WORKSRC) && autoconf - @$(MAKECOOKIE) - post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) post-install-modulated: - @ginstall -d $(DOCDEST) - @cp $(FILEDIR)/changelog.CSW $(DOCDEST) + ginstall -d $(DOCDEST) + cp $(FILEDIR)/changelog.CSW $(DOCDEST) @$(MAKECOOKIE) Modified: csw/mgar/pkg/ncdu/trunk/checksums =================================================================== --- csw/mgar/pkg/ncdu/trunk/checksums 2009-11-18 22:03:37 UTC (rev 7346) +++ csw/mgar/pkg/ncdu/trunk/checksums 2009-11-18 23:04:18 UTC (rev 7347) @@ -1,2 +1 @@ -6596993c949abab8e579c401dbe50089 download/gar-base.diff -90a69cc3b2e9f0324eb14e6ce1df0f22 download/ncdu-1.5.tar.gz +95d29cf64af2d8cf4b5005e6e3d60384 ncdu-1.6.tar.gz Modified: csw/mgar/pkg/ncdu/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/ncdu/trunk/files/changelog.CSW 2009-11-18 22:03:37 UTC (rev 7346) +++ csw/mgar/pkg/ncdu/trunk/files/changelog.CSW 2009-11-18 23:04:18 UTC (rev 7347) @@ -1,3 +1,9 @@ +ncdu (1.6,REV=2009.11.19) + + * Updated to 1.6. + + -- Sebastian Kayser Thu, 19 Nov 2009 00:02:30 +0100 + ncdu (1.5,REV=2009.05.10) * Updated to 1.5 (Closes: #3565). Deleted: csw/mgar/pkg/ncdu/trunk/files/gar-base.diff =================================================================== --- csw/mgar/pkg/ncdu/trunk/files/gar-base.diff 2009-11-18 22:03:37 UTC (rev 7346) +++ csw/mgar/pkg/ncdu/trunk/files/gar-base.diff 2009-11-18 23:04:18 UTC (rev 7347) @@ -1,43 +0,0 @@ -diff --speed-large-files --minimal -Nru ncdu-1.5.orig/src/delete.c ncdu-1.5/src/delete.c ---- ncdu-1.5.orig/src/delete.c 2009-05-02 10:42:17.000000000 +0200 -+++ ncdu-1.5/src/delete.c 2009-05-10 18:57:49.873038400 +0200 -@@ -213,8 +213,10 @@ - /* confirm */ - seloption = 1; - while(state == DS_CONFIRM && !noconfirm) -- if(input_handle(0)) -- return browse_init(root); -+ if(input_handle(0)) { -+ browse_init(root); -+ return; -+ } - - /* chdir */ - if(path_chdir(getpath(root->parent)) < 0) { -diff -ur ncdu-1.5.orig/configure.in ncdu-1.5/configure.in ---- ncdu-1.5.orig/configure.in 2009-05-10 19:38:59.182413272 +0200 -+++ ncdu-1.5/configure.in 2009-05-02 13:09:18.000000000 +0200 -@@ -27,6 +27,9 @@ - [getcwd gettimeofday memset fnmatch chdir rmdir unlink lstat getcwd],[], - AC_MSG_ERROR([required function missing])) - -+# dirfd is a glibc extension and available on Solaris -+AC_CHECK_FUNCS([dirfd]) -+ - AC_OUTPUT([Makefile src/Makefile doc/Makefile]) - - echo "" -diff -ur ncdu-1.5.orig/src/path.h ncdu-1.5/src/path.h ---- ncdu-1.5.orig/src/path.h 2009-05-10 19:38:59.209594590 +0200 -+++ ncdu-1.5/src/path.h 2009-05-02 10:42:17.000000000 +0200 -@@ -44,4 +44,10 @@ - /* works exactly the same as chdir() */ - extern int path_chdir(const char *); - -+#ifndef HAVE_DIRFD -+#if defined(__sun__) || defined(__sun) -+#define dirfd(a) ((a)->dd_fd) -+#endif -+#endif -+ - #endif 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 Nov 19 00:51:48 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 18 Nov 2009 23:51:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[7348] csw/mgar/pkg/tightvnc/trunk/files/vncserver-wrapper. sh Message-ID: Revision: 7348 http://gar.svn.sourceforge.net/gar/?rev=7348&view=rev Author: wahwah Date: 2009-11-18 23:51:48 +0000 (Wed, 18 Nov 2009) Log Message: ----------- tightvnc: suppressing grep's output Modified Paths: -------------- csw/mgar/pkg/tightvnc/trunk/files/vncserver-wrapper.sh Modified: csw/mgar/pkg/tightvnc/trunk/files/vncserver-wrapper.sh =================================================================== --- csw/mgar/pkg/tightvnc/trunk/files/vncserver-wrapper.sh 2009-11-18 23:04:18 UTC (rev 7347) +++ csw/mgar/pkg/tightvnc/trunk/files/vncserver-wrapper.sh 2009-11-18 23:51:48 UTC (rev 7348) @@ -31,7 +31,7 @@ -a \ -perm -u+w \ \) \ - \) | grep "$1" + \) | grep "$1" > /dev/null } if writable "${test_dir}"; then 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 Nov 19 00:52:45 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 18 Nov 2009 23:52:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[7349] csw/mgar/pkg/tightvnc/trunk Message-ID: Revision: 7349 http://gar.svn.sourceforge.net/gar/?rev=7349&view=rev Author: wahwah Date: 2009-11-18 23:52:45 +0000 (Wed, 18 Nov 2009) Log Message: ----------- tightvnc: checksums of files with the Id tag Modified Paths: -------------- csw/mgar/pkg/tightvnc/trunk/Makefile csw/mgar/pkg/tightvnc/trunk/checksums Modified: csw/mgar/pkg/tightvnc/trunk/Makefile =================================================================== --- csw/mgar/pkg/tightvnc/trunk/Makefile 2009-11-18 23:51:48 UTC (rev 7348) +++ csw/mgar/pkg/tightvnc/trunk/Makefile 2009-11-18 23:52:45 UTC (rev 7349) @@ -15,6 +15,7 @@ DISTFILES = $(GARNAME)-$(GARVERSION)_unixsrc.tar.bz2 DISTFILES += vncservers DISTFILES += cswvncserver +DISTFILES += vncserver-wrapper.sh PACKAGES = CSWvncs CSWvncv CATALOGNAME_CSWvncs = vncserver CATALOGNAME_CSWvncv = vncviewer Modified: csw/mgar/pkg/tightvnc/trunk/checksums =================================================================== --- csw/mgar/pkg/tightvnc/trunk/checksums 2009-11-18 23:51:48 UTC (rev 7348) +++ csw/mgar/pkg/tightvnc/trunk/checksums 2009-11-18 23:52:45 UTC (rev 7349) @@ -4,4 +4,5 @@ c5e9c3e4017caa65d14a0b98858043b9 0003-libdix.a-after-libos.a.patch 691ddda52a4bcbc14ee1c19f77e465a1 cswvncserver 397b35faad32d5246b6d44b142f8304f tightvnc-1.3.10_unixsrc.tar.bz2 +46d0bcb1569025d9a559bab091aa79fa vncserver-wrapper.sh 56c09be17c17184e96193c13246fd649 vncservers 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 Nov 19 09:03:27 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 19 Nov 2009 08:03:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7350] csw/mgar/pkg/nspr/trunk Message-ID: Revision: 7350 http://gar.svn.sourceforge.net/gar/?rev=7350&view=rev Author: wahwah Date: 2009-11-19 08:03:27 +0000 (Thu, 19 Nov 2009) Log Message: ----------- nspr: update to 4.8, plus some extra work Modified Paths: -------------- csw/mgar/pkg/nspr/trunk/Makefile csw/mgar/pkg/nspr/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/nspr/trunk/files/CSWnspr.depend csw/mgar/pkg/nspr/trunk/files/CSWnspr.gspec Property Changed: ---------------- csw/mgar/pkg/nspr/trunk/ Property changes on: csw/mgar/pkg/nspr/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/nspr/trunk/Makefile =================================================================== --- csw/mgar/pkg/nspr/trunk/Makefile 2009-11-18 23:52:45 UTC (rev 7349) +++ csw/mgar/pkg/nspr/trunk/Makefile 2009-11-19 08:03:27 UTC (rev 7350) @@ -1,38 +1,84 @@ GARNAME = nspr -GARVERSION = 4.6.6 +MIN_VERSION = 8 +GARVERSION = 4.$(MIN_VERSION) CATEGORIES = lib -DISTNAME = $(GARNAME) +# DISTNAME = $(GARNAME) DESCRIPTION = NSPR Netscape Portable Runtime define BLURB -NSPR Netscape Portable Runtime + NSPR Netscape Portable Runtime endef MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(GARVERSION)/src/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWnspr, depend ) -# DISTFILES += CSWnspr.depend CSWnspr.gspec CSWnspr.prototype +PATCHFILES = nspr-4.6.1-config.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PERL="/opt/csw/bin/perl" -CFLAGS=-xlibmil -CXXFLAGS="-xlibmil -xlibmopt -features=tmplife -norunpath" -LDFLAGS="-R'\$\$ORIGIN:\$\$ORIGIN/..' -L/opt/csw/lib -R/opt/csw/lib" +PERL = /opt/csw/bin/perl +EXTRA_CFLAGS = -xlibmil +EXTRA_CXXFLAGS = -xlibmil -xlibmopt -features=tmplife -norunpath +EXTRA_LDFLAGS = -R'\$\$ORIGIN:\$\$ORIGIN/..' -L/opt/csw/lib -R/opt/csw/lib +CONFIGURE_SCRIPTS = nspr +BUILD_SCRIPTS = nspr +TEST_SCRIPTS = +INSTALL_SCRIPTS = nspr -export PERL CFLAGS CXXFLAGS LDFLAGS +# export PERL CFLAGS CXXFLAGS LDFLAGS +export PERL -CONFIGURE_ARGS = --prefix=/opt/csw/mozilla/nspr --mandir=/opt/csw/share/man --with-mozilla --disable-debug --enable-strip --with-native-threads --enable-ipv6 --with-dist-prefix=$(DESTDIR)/opt/csw/mozilla/nspr --enable-optimize="-xO3" --disable-tests --with-dist-bindir=$(DESTDIR)/opt/csw/mozilla/nspr/lib +# prefix = /opt/csw/mozilla/nspr +libdir = $(prefix)/lib/nspr +localstatedir = /var/opt/csw +sysconfdir = /etc/opt/csw +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-mozilla +CONFIGURE_ARGS += --disable-debug +CONFIGURE_ARGS += --enable-strip +CONFIGURE_ARGS += --with-native-threads +CONFIGURE_ARGS += --enable-ipv6 +# CONFIGURE_ARGS += --enable-64bit +# CONFIGURE_ARGS += --with-dist-prefix=$(DESTDIR)/opt/csw/mozilla/nspr +# CONFIGURE_ARGS += --enable-optimize="-xO3" +CONFIGURE_ARGS += --disable-tests +CONFIGURE_ARGS += --enable-system-sqlite +# CONFIGURE_ARGS += --with-dist-bindir=$(DESTDIR)/opt/csw/mozilla/nspr/lib + # PATCHFILES = autoconf.mk.in.diff include gar/category.mk -post-extract: - ( mv $(WORKDIR)/$(DISTNAME)-$(GARVERSION)/mozilla/nsprpub $(WORKDIR)/$(DISTNAME) ) - ( cp $(FILEDIR)/LICENSE $(WORKDIR)/$(DISTNAME) ) +configure-nspr: + (cp $(FILEDIR)/LICENSE $(WORKSRC)) + (cd $(WORKSRC) && mkdir build inst) + gsed -i -e 's/$$(mkshlib) $$(OBJS)/$$(MKSHLIB) $$(LDFLAGS) $$(OBJS)/g' \ + $(WORKSRC)/mozilla/nsprpub/config/rules.mk + cd $(WORKSRC)/build && ../mozilla/nsprpub/configure $(CONFIGURE_ARGS) @$(MAKECOOKIE) +build-nspr: + cd $(WORKSRC)/build && $(BUILD_ENV) gmake + @$(MAKECOOKIE) + +install-nspr: + (cd $(WORKSRC)/build && $(INSTALL_ENV) gmake install DESTDIR=$(DESTDIR)) + (cd $(DESTDIR)/opt/csw/lib/nspr \ + && for file in *.so; do \ + mv $${file} $${file}.$(MIN_VERSION); \ + ln -s $${file}.$(MIN_VERSION) $${file}; \ + done) + ginstall -m 755 -d $(DESTDIR)$(bindir) + ginstall -m 755 $(WORKSRC)/build/config/nspr-config \ + $(DESTDIR)$(bindir) + ginstall -m 755 -d $(DESTDIR)$(prefix)/pkgconfig + ginstall -m 644 $(WORKSRC)/build/config/nspr.pc \ + $(DESTDIR)$(prefix)/pkgconfig + rm $(DESTDIR)$(bindir)/prerr.properties + rm $(DESTDIR)$(bindir)/nspr.pc + @$(MAKECOOKIE) + post-install: - ( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | grep ELF | grep -e 'executable' -e 'dynamic lib' | grep 'not stripped' && strip {}" \; ) + # ( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | grep ELF | grep -e 'executable' -e 'dynamic lib' | grep 'not stripped' && strip {}" \; ) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/nspr/trunk/checksums =================================================================== --- csw/mgar/pkg/nspr/trunk/checksums 2009-11-18 23:52:45 UTC (rev 7349) +++ csw/mgar/pkg/nspr/trunk/checksums 2009-11-19 08:03:27 UTC (rev 7350) @@ -1,3 +1,2 @@ -ba49bc35e2068f54893d3ea7031ad59c download/nspr-4.6.6.tar.gz -8c1d57aae51158397ae963ecac053a4d download/CSWnspr.gspec -a5616e691e9a4fed991893ee673b1a88 download/CSWnspr.depend +4720bb68a64bfa9188ac6318458b47d2 nspr-4.6.1-config.patch +e0916a72bcc6c427551ea262183fdb26 nspr-4.8.tar.gz Deleted: csw/mgar/pkg/nspr/trunk/files/CSWnspr.gspec =================================================================== --- csw/mgar/pkg/nspr/trunk/files/CSWnspr.gspec 2009-11-18 23:52:45 UTC (rev 7349) +++ csw/mgar/pkg/nspr/trunk/files/CSWnspr.gspec 2009-11-19 08:03:27 UTC (rev 7350) @@ -1,4 +0,0 @@ -%var bitname nspr -%var pkgname CSWnspr -%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 wahwah at users.sourceforge.net Thu Nov 19 09:07:35 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 19 Nov 2009 08:07:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[7351] csw/mgar/pkg/nspr/trunk/files/nspr-4.6.1-config. patch Message-ID: Revision: 7351 http://gar.svn.sourceforge.net/gar/?rev=7351&view=rev Author: wahwah Date: 2009-11-19 08:07:34 +0000 (Thu, 19 Nov 2009) Log Message: ----------- nspr: Adding a patch copied from Gentoo, adds nspr.pc Added Paths: ----------- csw/mgar/pkg/nspr/trunk/files/nspr-4.6.1-config.patch Added: csw/mgar/pkg/nspr/trunk/files/nspr-4.6.1-config.patch =================================================================== --- csw/mgar/pkg/nspr/trunk/files/nspr-4.6.1-config.patch (rev 0) +++ csw/mgar/pkg/nspr/trunk/files/nspr-4.6.1-config.patch 2009-11-19 08:07:34 UTC (rev 7351) @@ -0,0 +1,89 @@ +--- a/mozilla/nsprpub/lib/libc/src/Makefile.in.orig 2005-06-01 14:28:26.000000000 +0000 ++++ b/mozilla/nsprpub/lib/libc/src/Makefile.in 2006-01-15 02:50:39.000000000 +0000 +@@ -112,6 +112,10 @@ + MKSHLIB += -R '$$ORIGIN' + endif + ++ifeq ($(OS_ARCH), Linux) ++DSO_LDOPTS +=-Wl,-R,'$$ORIGIN' ++endif ++ + ifeq ($(OS_ARCH),OS2) + MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def + GARBAGE += $(MAPFILE) +--- a/mozilla/nsprpub/lib/ds/Makefile.in.orig 2005-06-01 14:28:25.000000000 +0000 ++++ b/mozilla/nsprpub/lib/ds/Makefile.in 2006-01-15 02:52:30.000000000 +0000 +@@ -102,6 +102,10 @@ + MKSHLIB += -R '$$ORIGIN' + endif + ++ifeq ($(OS_ARCH), Linux) ++DSO_LDOPTS += -Wl,-R,'$$ORIGIN' ++endif ++ + ifeq ($(OS_ARCH),OS2) + MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def + GARBAGE += $(MAPFILE) +--- a/mozilla/nsprpub/pr/src/Makefile.in.orig 2005-06-01 14:28:27.000000000 +0000 ++++ b/mozilla/nsprpub/pr/src/Makefile.in 2006-01-15 03:29:36.000000000 +0000 +@@ -168,6 +168,7 @@ + else + OS_LIBS = -ldl + endif ++DSO_LDOPTS +=-Wl,-R,'$$ORIGIN' + endif + + ifeq ($(OS_ARCH),HP-UX) +--- a/mozilla/nsprpub/config/Makefile.in.orig 2005-06-01 14:28:23.000000000 +0000 ++++ b/mozilla/nsprpub/config/Makefile.in 2006-01-15 04:13:42.000000000 +0000 +@@ -54,7 +54,7 @@ + # because it is included by every makefile. + DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config + +-RELEASE_BINS = nspr-config ++RELEASE_BINS = nspr-config nspr.pc + + include $(topsrcdir)/config/config.mk + +@@ -139,6 +139,7 @@ + + export:: $(TARGETS) + rm -f $(dist_bindir)/nspr-config ++ rm -f $(dist_bindir)/nspr.pc + + ifdef WRAP_SYSTEM_INCLUDES + export:: +--- a/mozilla/nsprpub/config/nspr.pc.in.orig 1970-01-01 00:00:00.000000000 +0000 ++++ b/mozilla/nsprpub/config/nspr.pc.in 2006-01-15 04:12:23.000000000 +0000 +@@ -0,0 +1,10 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: NSPR ++Description: The Netscape Portable Runtime ++Version: @MOD_MAJOR_VERSION at .@MOD_MINOR_VERSION at .@MOD_PATCH_VERSION@ ++Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 @OS_LIBS@ -Wl,-R${libdir} ++Cflags: -I${includedir} +--- a/mozilla/nsprpub/configure.orig 2006-01-15 04:17:59.000000000 +0000 ++++ b/mozilla/nsprpub/configure 2006-01-15 04:21:35.000000000 +0000 +@@ -5899,6 +5899,7 @@ + config/nsprincl.mk + config/nsprincl.sh + config/nspr-config ++config/nspr.pc + lib/Makefile + lib/ds/Makefile + lib/libc/Makefile +--- a/mozilla/nsprpub/config/nspr-config.in.orig 2005-05-11 00:53:41.000000000 +0000 ++++ b/mozilla/nsprpub/config/nspr-config.in 2006-01-15 06:37:58.000000000 +0000 +@@ -122,7 +122,7 @@ + fi + + if test "$echo_libs" = "yes"; then +- libdirs=-L$libdir ++ libdirs="-Wl,-R$libdir -L$libdir" + if test -n "$lib_plds"; then + libdirs="$libdirs -lplds${major_version}" + fi 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 Nov 19 09:51:01 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 19 Nov 2009 08:51:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[7352] csw/mgar/pkg/nspr/trunk/Makefile Message-ID: Revision: 7352 http://gar.svn.sourceforge.net/gar/?rev=7352&view=rev Author: wahwah Date: 2009-11-19 08:51:00 +0000 (Thu, 19 Nov 2009) Log Message: ----------- nspr: enable 64-bit compilation Modified Paths: -------------- csw/mgar/pkg/nspr/trunk/Makefile Modified: csw/mgar/pkg/nspr/trunk/Makefile =================================================================== --- csw/mgar/pkg/nspr/trunk/Makefile 2009-11-19 08:07:34 UTC (rev 7351) +++ csw/mgar/pkg/nspr/trunk/Makefile 2009-11-19 08:51:00 UTC (rev 7352) @@ -2,33 +2,38 @@ MIN_VERSION = 8 GARVERSION = 4.$(MIN_VERSION) CATEGORIES = lib -# DISTNAME = $(GARNAME) -DESCRIPTION = NSPR Netscape Portable Runtime define BLURB - NSPR Netscape Portable Runtime + Netscape Portable Runtime (NSPR) provides a platform-neutral API for system + level and libc like functions. The API is used in the Mozilla clients and + many of Red Hat's, Sun's, and other software offerings. endef MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(GARVERSION)/src/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = nspr-4.6.1-config.patch -# We define upstream file regex so we can be notifed of new upstream software release +PACKAGES = CSWnspr CSWnspr-devel +PKGFILES_CSWnspr-devel = $(PKGFILES_DEVEL) +PKGFILES_CSWnspr-devel += $(bindir).*nspr-config +PKGFILES_CSWnspr-devel += $(prefix)/pkgconfig/nspr\.pc + +SPKG_DESC_CSWnspr = Netscape Portable Runtime +SPKG_DESC_CSWnspr-devel = Netscape Portable Runtime development files +CATALOGNAME_CSWnspr-devel = nspr_devel + UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz PERL = /opt/csw/bin/perl EXTRA_CFLAGS = -xlibmil EXTRA_CXXFLAGS = -xlibmil -xlibmopt -features=tmplife -norunpath -EXTRA_LDFLAGS = -R'\$\$ORIGIN:\$\$ORIGIN/..' -L/opt/csw/lib -R/opt/csw/lib CONFIGURE_SCRIPTS = nspr BUILD_SCRIPTS = nspr TEST_SCRIPTS = INSTALL_SCRIPTS = nspr -# export PERL CFLAGS CXXFLAGS LDFLAGS export PERL -# prefix = /opt/csw/mozilla/nspr libdir = $(prefix)/lib/nspr localstatedir = /var/opt/csw sysconfdir = /etc/opt/csw @@ -39,27 +44,33 @@ CONFIGURE_ARGS += --enable-strip CONFIGURE_ARGS += --with-native-threads CONFIGURE_ARGS += --enable-ipv6 -# CONFIGURE_ARGS += --enable-64bit -# CONFIGURE_ARGS += --with-dist-prefix=$(DESTDIR)/opt/csw/mozilla/nspr -# CONFIGURE_ARGS += --enable-optimize="-xO3" +CONFIGURE_ARGS += --enable-optimize="-xO3" CONFIGURE_ARGS += --disable-tests CONFIGURE_ARGS += --enable-system-sqlite +CONFIGURE_ARGS_isa-sparcv9 = --enable-64bit +CONFIGURE_ARGS_isa-amd64 = --enable-64bit +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION)) + +# These options I'm unsure about, are they really needed? +# EXTRA_LDFLAGS = -R'\$\$ORIGIN:\$\$ORIGIN/..' -R/opt/csw/lib +# prefix = /opt/csw/mozilla/nspr +# CONFIGURE_ARGS += --with-dist-prefix=$(DESTDIR)/opt/csw/mozilla/nspr # CONFIGURE_ARGS += --with-dist-bindir=$(DESTDIR)/opt/csw/mozilla/nspr/lib -# PATCHFILES = autoconf.mk.in.diff +BUILD64 = 1 include gar/category.mk configure-nspr: (cp $(FILEDIR)/LICENSE $(WORKSRC)) - (cd $(WORKSRC) && mkdir build inst) + (cd $(WORKSRC) && mkdir -p build inst) gsed -i -e 's/$$(mkshlib) $$(OBJS)/$$(MKSHLIB) $$(LDFLAGS) $$(OBJS)/g' \ $(WORKSRC)/mozilla/nsprpub/config/rules.mk - cd $(WORKSRC)/build && ../mozilla/nsprpub/configure $(CONFIGURE_ARGS) + cd $(WORKSRC)/build && $(CONFIGURE_ENV) ../mozilla/nsprpub/configure $(CONFIGURE_ARGS) @$(MAKECOOKIE) build-nspr: - cd $(WORKSRC)/build && $(BUILD_ENV) gmake + (cd $(WORKSRC)/build && $(BUILD_ENV) gmake CC=$(CC) CXX=$(CXX)) @$(MAKECOOKIE) install-nspr: @@ -77,8 +88,5 @@ $(DESTDIR)$(prefix)/pkgconfig rm $(DESTDIR)$(bindir)/prerr.properties rm $(DESTDIR)$(bindir)/nspr.pc + rm $(DESTDIR)$(bindir)/compile-et.pl @$(MAKECOOKIE) - -post-install: - # ( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | grep ELF | grep -e 'executable' -e 'dynamic lib' | grep 'not stripped' && strip {}" \; ) - @$(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 Thu Nov 19 10:12:29 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 19 Nov 2009 09:12:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[7353] csw/mgar/pkg/nspr/trunk/Makefile Message-ID: Revision: 7353 http://gar.svn.sourceforge.net/gar/?rev=7353&view=rev Author: wahwah Date: 2009-11-19 09:12:28 +0000 (Thu, 19 Nov 2009) Log Message: ----------- nspr: Adding CSWnspr as a dependency for CSWnspr-devel Modified Paths: -------------- csw/mgar/pkg/nspr/trunk/Makefile Modified: csw/mgar/pkg/nspr/trunk/Makefile =================================================================== --- csw/mgar/pkg/nspr/trunk/Makefile 2009-11-19 08:51:00 UTC (rev 7352) +++ csw/mgar/pkg/nspr/trunk/Makefile 2009-11-19 09:12:28 UTC (rev 7353) @@ -21,6 +21,7 @@ SPKG_DESC_CSWnspr = Netscape Portable Runtime SPKG_DESC_CSWnspr-devel = Netscape Portable Runtime development files CATALOGNAME_CSWnspr-devel = nspr_devel +REQUIRED_PKGS_CSWnspr-devel = CSWnspr UFILES_REGEX = $(GARNAME)-(\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 Thu Nov 19 10:29:42 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 19 Nov 2009 09:29:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[7354] csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/ Makefile Message-ID: Revision: 7354 http://gar.svn.sourceforge.net/gar/?rev=7354&view=rev Author: wahwah Date: 2009-11-19 09:29:42 +0000 (Thu, 19 Nov 2009) Log Message: ----------- mysql-5.1.x-optcsw: First sketch of an /opt/csw version of MySQL build Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2009-11-19 09:12:28 UTC (rev 7353) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2009-11-19 09:29:42 UTC (rev 7354) @@ -3,7 +3,9 @@ # $Id$ GARNAME = mysql5 -GARVERSION = 5.1.40 +BASE_VERSION = 5.1 +PATCHLEVEL = 40 +GARVERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = server DISTNAME = mysql-$(GARVERSION) @@ -16,14 +18,27 @@ GARFLAVOR = DBG -# Change prefix to /opt/csw/mysql5 -prefix = /opt/csw/mysql5 -sysconfdir = /etc/opt/csw/mysql5 -localstatedir = /var/opt/csw/mysql5 +bindir = $(prefix)/bin/mysql/$(BASE_VERSION) +datadir=$(prefix)/share/mysql/$(BASE_VERSION) +docdir=$(prefix)/share/doc/mysql/$(BASE_VERSION) +includedir=$(prefix)/include/mysql/$(BASE_VERSION) +infodir=$(prefix)/share/mysql/$(BASE_VERSION)/info +libdir=$(prefix)/lib/mysql/$(BASE_VERSION) +libexecdir=$(prefix)/libexec/mysql/$(BASE_VERSION) +lispdir=$(prefix)/share/mysql/$(BASE_VERSION)/emacs/site-lisp +localstatedir = /var/opt/csw/mysql/$(BASE_VERSION) +mandir=$(prefix)/share/mysql/$(BASE_VERSION)/man +sbindir = $(prefix)/sbin/mysql/$(BASE_VERSION) +sharedstatedir=$(prefix)/share/mysql/$(BASE_VERSION) +sourcedir=$(prefix)/src/mysql/$(BASE_VERSION) +sysconfdir = /etc/opt/csw/mysql/$(BASE_VERSION) + +# Where to put the init script global_sysconfdir = /etc/opt/csw +# Where to link the binaries global_bindir = /opt/csw/bin -INITSMF = $(global_sysconfdir)/init\.d/cswmysql5 +INITSMF = $(global_sysconfdir)/init\.d/cswmysql-$(BASE_VERSION) PATCHFILES = 0001-Use-libc-not-libcrypt.patch PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch @@ -97,7 +112,7 @@ REQUIRED_PKGS_CSWmysql5devel = CSWmysql5 REQUIRED_PKGS_CSWmysql5test = CSWmysql5 CSWperl -MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.1/ +MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-$(BASE_VERSION)/ DISTFILES = mysql-$(GARVERSION).tar.gz DISTFILES += cswmysql5 quick_start-csw README.CSW ChangeLog DISTFILES += CSWmysql5.preinstall @@ -142,7 +157,7 @@ CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) # TODO: Make the tests pass. They don't at the moment. -# TEST_SCRIPTS = +TEST_SCRIPTS = TEST_TARGETS = check # Enable 64 bits build @@ -181,6 +196,6 @@ # Create symlinks to binaries ginstall -m 755 -d $(DESTDIR)$(global_bindir) for f in $(DESTDIR)$(bindir)/*; do \ - ln -s ../mysql5/bin/`basename $$f` $(DESTDIR)$(global_bindir)/`basename $$f`; \ + ln -s mysql/$(BASE_VERSION)/`basename $$f` $(DESTDIR)$(global_bindir)/`basename $$f`; \ done @$(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 Thu Nov 19 10:37:43 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 19 Nov 2009 09:37:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[7355] csw/mgar/pkg/dovecot/trunk Message-ID: Revision: 7355 http://gar.svn.sourceforge.net/gar/?rev=7355&view=rev Author: skayser Date: 2009-11-19 09:37:43 +0000 (Thu, 19 Nov 2009) Log Message: ----------- dovecot: working copy towards 1.1.20 Modified Paths: -------------- csw/mgar/pkg/dovecot/trunk/Makefile csw/mgar/pkg/dovecot/trunk/checksums Added Paths: ----------- csw/mgar/pkg/dovecot/trunk/files/README.CSW csw/mgar/pkg/dovecot/trunk/files/changelog.CSW csw/mgar/pkg/dovecot/trunk/files/cswdovecot Removed Paths: ------------- csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.README.CSW csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.changelog.CSW csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswdovecot csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswusergroup Modified: csw/mgar/pkg/dovecot/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot/trunk/Makefile 2009-11-19 09:29:42 UTC (rev 7354) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2009-11-19 09:37:43 UTC (rev 7355) @@ -1,8 +1,11 @@ -# TODO: -# * Bump to 1.1.13, http://hg.dovecot.org/dovecot-1.1/rev/a2013dedbad0 - +# TODO +# - Migrate config from /opt/csw/etc/dovecot to /etc +# - example.conf patch needs tweaking (rejected) +# - SSL certs to /etc/opt/csw/ssl? +# - USERGROUP doesn't work yet, wrong usage? +# - /var/run/dovecot instead of /var/opt/csw/run? GARNAME = dovecot -GARVERSION = 1.1.11 +GARVERSION = 1.1.20 CATEGORIES = server DESCRIPTION = Secure IMAP server @@ -13,32 +16,28 @@ special administration and it uses very little memory. endef -MASTER_SITES = http://dovecot.org/releases/1.1/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +SPKG_SOURCEURL = http://dovecot.org/ +MASTER_SITES = http://dovecot.org/releases/1.1/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWdovecot CSWdovecot-devel CSWdovecot-sieve +# Sieve plugin is packaged via a post-package hook (see package-sieveplugin:) +PACKAGES = CSWdovecot CSWdovecot-devel CSWdovecot-sieve +NOPACKAGE = CSWdovecot-sieve + CATALOGNAME_CSWdovecot = dovecot CATALOGNAME_CSWdovecot-devel = dovecot_devel CATALOGNAME_CSWdovecot-sieve = dovecot_sieve -# Sieve plugin is packaged individually (see package-sieveplugin:) -NOPACKAGE = CSWdovecot-sieve - -# CSWdovecot is not installed on the build farm and as such its dependent -# packages throw errors when fed to checkpkg -ENABLE_CHECK=0 - -SPKG_SOURCEURL = http://dovecot.org/ SPKG_DESC_CSWdovecot = Secure IMAP server SPKG_DESC_CSWdovecot-devel = Dovecot secure IMAP server header files SPKG_DESC_CSWdovecot-sieve = Dovecot secure IMAP server sieve plugin -SPKG_CLASSES_CSWdovecot = none cswusergroup cswcpsampleconf cswinitsmf REQUIRED_PKGS_CSWdovecot = CSWosslrt CSWmysql5rt CSWoldaprt CSWlibpq REQUIRED_PKGS_CSWdovecot += CSWsasl CSWsqlite3 CSWzlib CSWlibnet REQUIRED_PKGS_CSWdovecot += CSWbzip2 CSWiconv CSWcswclassutils REQUIRED_PKGS_CSWdovecot += CSWkrb5lib -REQUIRED_PKGS_CSWdovecot-devel = CSWdovecot +REQUIRED_PKGS_CSWdovecot-devel = CSWdovecot REQUIRED_PKGS_CSWdovecot-sieve = CSWdovecot PREREQUISITE_PKGS = CSWossldevel CSWosslrt @@ -52,20 +51,20 @@ PKGFILES_CSWdovecot-devel = $(PKGFILES_DEVEL) PKGFILES_CSWdovecot-sieve = .*sieve.* -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +# These directories belong to CSWosslrt +PROTOTYPE_FILTER = awk '\ + $$$$3 == "/opt/csw/ssl/certs" { next } \ + $$$$3 == "/opt/csw/ssl/private" { next } \ + { print }' # No test suite for Dovecot available TEST_SCRIPTS = -# See http://dovecot.org/list/dovecot/2009-February/037273.html -PATCHFILES = patch-authcrash.diff -# See http://dovecot.org/list/dovecot/2009-March/038201.html -PATCHFILES += patch-enosys.diff # Adjust the comment about file paths in the example conf header PATCHFILES += patch-exampleconf.diff # Override some paths for configure +sysconfdir=/etc/opt/csw localstatedir=/var/opt/csw CONFIGURE_ARGS = $(DIRPATHS) @@ -87,14 +86,10 @@ STRIP_DIRS = $(DESTDIR)$(libexecdir)/dovecot -PROTOTYPE_FILTER = awk '\ - $$$$3 ~ /\/init.d\/cswdovecot$$$$/ { $$$$2 = "cswinitsmf" } \ - $$$$3 ~ /cswusergroup$$$$/ { $$$$2 = "cswusergroup" } \ - $$$$3 ~ /dovecot.pem.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ - $$$$3 ~ /dovecot.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ - $$$$3 == "/opt/csw/ssl/certs" { next } \ - $$$$3 == "/opt/csw/ssl/private" { next } \ - { print }' +# cswclassutils integration +INITSMF = $(sysconfdir)/init.d/cswdovecot +USERGROUP = dovecot:dovecot:Dovecot IMAP Server:/var/opt/csw/run/dovecot/login:/bin/false +SAMPLECONF = .*/dovecot.pem $(sysconfdir)/dovecot.conf include gar/category.mk @@ -102,8 +97,8 @@ # build process, but i found it easiest to put it here and not clutter # post-install even more pre-install-modulated: - @perl -pi -e 's|/etc/ssl|/opt/csw/ssl|' $(WORKSRC)/doc/mkcert.sh - @perl -pi -e '\ + perl -pi -e 's|/etc/ssl|/opt/csw/ssl|' $(WORKSRC)/doc/mkcert.sh + perl -pi -e '\ s| /var/run| /var/opt/csw/run|; \ s| /etc/ssl| /opt/csw/ssl|; \ s| /usr/libexec| /opt/csw/libexec|; \ @@ -111,65 +106,65 @@ $(WORKSRC)/dovecot-example.conf @$(MAKECOOKIE) -# Maybe there is a nicer way to build this via modulations ... -build-and-install-sieveplugin: CONFIGURE_ARGS = $(DIRPATHS) -build-and-install-sieveplugin: CONFIGURE_ARGS += --with-dovecot=../$(WORKSRC) -build-and-install-sieveplugin: - @echo - @echo [===== NOW BUILDING extra cmusieve plugin =====] - @echo - @wget -nc http://www.dovecot.org/releases/sieve/dovecot-sieve-1.1.6.tar.gz - @gtar xzf dovecot-sieve-1.1.6.tar.gz - @(cd dovecot-sieve-1.1.6; \ - $(CONFIGURE_ENV) ./configure $(CONFIGURE_ARGS); \ - $(BUILD_ENV) gmake $(BUILD_ARGS); \ - $(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) $(INSTALL_ARGS) install; ) - @rm -rf dovecot-sieve-1.1.6* - @$(MAKECOOKIE) - -# Sieve plugin needs to be packaged with version != $(GARVERSION) -package-sieveplugin: - @gmake -o post-package \ - NOPACKAGE="CSWdovecot CSWdovecot-devel" SPKG_VERSION=1.1.6 \ - repackage - - -post-install-modulated: DOCS = NEWS AUTHORS COPYING.LGPL COPYING.MIT post-install-modulated: DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME) +post-install-modulated: DOCS = NEWS AUTHORS COPYING.LGPL COPYING.MIT +post-install-modulated: CSWDOCS=README.CSW changelog.CSW post-install-modulated: SSLDIR = $(DESTDIR)/opt/csw/ssl post-install-modulated: build-and-install-sieveplugin - @ginstall -d $(DOCDEST) - @ginstall -d $(DESTDIR)/etc/opt/csw/init.d - @ginstall -d $(DESTDIR)$(sysconfdir)/pkg/CSWdovecot - @ginstall -d $(SSLDIR)/certs - @ginstall -d $(SSLDIR)/private # Include these in the pkg. dovecot will create them otherwise # with root:root ownership, which conflicts with other pkg's - @ginstall -d $(localstatedir)/run $(localstatedir)/lib + ginstall -d $(DESTDIR)$(localstatedir)/run + ginstall -d $(DESTDIR)$(localstatedir)/lib - @cp $(DESTDIR)$(sysconfdir)/dovecot-example.conf \ - $(DESTDIR)$(sysconfdir)/dovecot.conf.CSW + cp $(DESTDIR)$(sysconfdir)/dovecot-example.conf \ + $(DESTDIR)$(sysconfdir)/dovecot.conf # Create self-signed sample cert - @( cd $(WORKSRC)/doc; SSLDIR=$(SSLDIR) /bin/sh ./mkcert.sh ) - @mv $(SSLDIR)/certs/dovecot.pem $(SSLDIR)/certs/dovecot.pem.CSW - @mv $(SSLDIR)/private/dovecot.pem $(SSLDIR)/private/dovecot.pem.CSW - @chmod 400 $(SSLDIR)/private/dovecot.pem.CSW + ginstall -d $(SSLDIR)/certs + ginstall -d $(SSLDIR)/private + ( cd $(WORKSRC)/doc; SSLDIR=$(SSLDIR) /bin/sh ./mkcert.sh ) + chmod 400 $(SSLDIR)/private/dovecot.pem # Copy documentation (upstream + CSW) and mkcert.sh - @$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);) - @cp $(FILEDIR)/CSWdovecot.changelog.CSW $(DOCDEST)/changelog.CSW - @cp $(FILEDIR)/CSWdovecot.README.CSW $(DOCDEST)/README.CSW - @ginstall -m 755 $(WORKSRC)/doc/mkcert.sh $(DOCDEST) - @cp $(WORKSRC)/doc/dovecot-openssl.cnf $(DOCDEST) + ginstall -d $(DOCDEST) + cp $(addprefix $(FILEDIR)/,$(CSWDOCS)) $(DOCDEST) + cp $(addprefix $(WORKSRC)/,$(DOCS)) $(DOCDEST) + ginstall -m 755 $(WORKSRC)/doc/mkcert.sh $(DOCDEST) + cp $(WORKSRC)/doc/dovecot-openssl.cnf $(DOCDEST) - # Files for cswinitsmf and cswusergroup - @ginstall -m 755 $(FILEDIR)/CSWdovecot.cswdovecot \ + # Copy init script + ginstall -Dm 755 $(FILEDIR)/cswdovecot \ $(DESTDIR)/etc/opt/csw/init.d/cswdovecot - @ginstall -m 644 $(FILEDIR)/CSWdovecot.cswusergroup \ - $(DESTDIR)$(sysconfdir)/pkg/CSWdovecot/cswusergroup @$(MAKECOOKIE) post-package: package-sieveplugin @$(MAKECOOKIE) + +# Extra targets for the Sieve plugin build and packaging process, invoked +# via post-install-modulated and post-package. + +SIEVEVERSION = 1.1.8 +SIEVEDIST = dovecot-sieve-$(SIEVEVERSION) +SIEVEURL = http://www.dovecot.org/releases/sieve/$(SIEVEDIST).tar.gz + +build-and-install-sieveplugin: CONFIGURE_ARGS = $(DIRPATHS) +build-and-install-sieveplugin: CONFIGURE_ARGS += --with-dovecot=../$(WORKSRC) +build-and-install-sieveplugin: + @echo + @echo [===== NOW BUILDING extra cmusieve plugin =====] + @echo + wget -nc $(SIEVEURL) + gtar xzf $(SIEVEDIST).tar.gz + (cd $(SIEVEDIST); \ + $(CONFIGURE_ENV) ./configure $(CONFIGURE_ARGS); \ + $(BUILD_ENV) gmake $(BUILD_ARGS); \ + $(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) $(INSTALL_ARGS) install; ) + rm -rf $(SIEVEDIST)* + @$(MAKECOOKIE) + +# Sieve plugin needs to be packaged with version != $(GARVERSION) +package-sieveplugin: + gmake -o post-package \ + NOPACKAGE="CSWdovecot CSWdovecot-devel" SPKG_VERSION=$(SIEVEVERSION) \ + repackage Modified: csw/mgar/pkg/dovecot/trunk/checksums =================================================================== --- csw/mgar/pkg/dovecot/trunk/checksums 2009-11-19 09:29:42 UTC (rev 7354) +++ csw/mgar/pkg/dovecot/trunk/checksums 2009-11-19 09:37:43 UTC (rev 7355) @@ -1,4 +1,2 @@ -c973eb41aca79fb16630a16f0d84f765 download/dovecot-1.1.11.tar.gz -1f39cae3a38d10169fe31f246095b67f download/patch-authcrash.diff -b6bdbd7b8e6f513a8f19dbc0a7507aa6 download/patch-enosys.diff -765a31bece26ed3cebee784dc4aa8216 download/patch-exampleconf.diff +1b0ccfac7765d25f0d106489321a0764 dovecot-1.1.20.tar.gz +765a31bece26ed3cebee784dc4aa8216 patch-exampleconf.diff Deleted: csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.README.CSW =================================================================== --- csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.README.CSW 2009-11-19 09:29:42 UTC (rev 7354) +++ csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.README.CSW 2009-11-19 09:37:43 UTC (rev 7355) @@ -1,56 +0,0 @@ -Configuration file ------------------- - -The default configuration path is /opt/csw/etc/dovecot.conf. CSWdovecot -brings with it a sample configuration (suffixed with .CSW) that will be -installed when dovecot.conf doesn't exist yet. This sample configuration -provides IMAP/POP3 and IMAPS/POP3S services to system users and uses a -self-signed certificate that comes with the package. - -When you adjust dovecot.conf, package upgrades will preserve your -configuration and just install the sample configuration as dovecot.conf.CSW. - - -Machine-local configuration in shared /opt setups -------------------------------------------------- - -If you share /opt among several machines (via NFS for example) you can use -/etc/opt/csw/dovecot.conf as machine-local configuration. The dovecot -startup script will then use it instead of the default configuration. - - -User accounts -------------- - -On installation CSWdovecot will create a user named dovecot in case no user -account by this name exists. This user account is required for the Dovecot -login service (and nothing else). - -If you want to use Dovecot for virtual users, you need to create another -user account (!= dovecot). For background information, see - - http://wiki.dovecot.org/UserIds - - -Upgrading ---------- - -For upgrading information from other IMAP servers or previous Dovecot -versions, see - - http://wiki.dovecot.org/UpgradingDovecot - - -Sieve plugin ------------- - -Sieve support (via the cmusieve plugin) is contained in the CSWdovecot_sieve -package. If required install this package and add - - mail_plugins = cmusieve - -to the "protocol lda" section in dovecot.conf. This requires that you use -Dovecot's deliver as LDA of course. See the following URLs for details - - http://wiki.dovecot.org/LDA - http://wiki.dovecot.org/LDA/Sieve#CMUSieve_Plugin Deleted: csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.changelog.CSW =================================================================== --- csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.changelog.CSW 2009-11-19 09:29:42 UTC (rev 7354) +++ csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.changelog.CSW 2009-11-19 09:37:43 UTC (rev 7355) @@ -1,9 +0,0 @@ -dovecot (1.1.11,REV=2009.03.28) - - * Package adopted and updated to 1.1.11. - * Tested and validated LDAP interopability with PAM. (Closes: #2760) - * Adjusted SSLDIR in mkcert.sh. (Closes: #3027) - * Compiled with --localstatedir=/var/opt/csw. Changes base_dir from - /opt/csw/var/run/dovecot to /var/opt/csw/run/dovecot. - - -- Sebastian Kayser Sat, 28 Mar 2009 18:18:35 +0100 Deleted: csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswdovecot =================================================================== --- csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswdovecot 2009-11-19 09:29:42 UTC (rev 7354) +++ csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswdovecot 2009-11-19 09:37:43 UTC (rev 7355) @@ -1,64 +0,0 @@ -#!/bin/sh -# License is public domain. -# -# Taken from http://wiki.dovecot.org/DovecotInit -# Modified for CSW by Sebastian Kayser -# -#FMRI network - -DAEMON=/opt/csw/sbin/dovecot - -test -x $DAEMON || exit 1 -set -e - -CONF=/opt/csw/etc/dovecot.conf -CONF_LOCAL=/etc/opt/csw/dovecot.conf -[ -r $CONF_LOCAL ] && CONF=$CONF_LOCAL - -[ "`ulimit -n`" -lt 1024 ] && ulimit -n 1024 - -base_dir=`$DAEMON -a|grep '^base_dir: '|sed 's/^base_dir: //'` -pidfile=$base_dir/master.pid - -if test -f $pidfile; then - running=yes -else - running=no -fi - -case "$1" in - start) - echo "Starting Dovecot" - $DAEMON -c $CONF - ;; - stop) - if test $running = yes; then - echo "Stopping Dovecot" - kill `cat $pidfile` - else - echo "Dovecot is already stopped." - fi - ;; - reload) - if test $running = yes; then - echo "Reloading Dovecot configuration" - kill -HUP `cat $pidfile` - else - echo "Dovecot isn't running." - fi - ;; - restart|force-reload) - echo "Restarting Dovecot" - if test $running = yes; then - kill `cat $pidfile` - sleep 1 - fi - $DAEMON -c $CONF - ;; - *) - echo "Usage: /etc/init.d/cswdovecot {start|stop|reload|restart|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0 Deleted: csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswusergroup =================================================================== --- csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswusergroup 2009-11-19 09:29:42 UTC (rev 7354) +++ csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswusergroup 2009-11-19 09:37:43 UTC (rev 7355) @@ -1 +0,0 @@ -dovecot:dovecot:Dovecot IMAP Server:/var/opt/csw/run/dovecot/login:/bin/false Copied: csw/mgar/pkg/dovecot/trunk/files/README.CSW (from rev 6137, csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.README.CSW) =================================================================== --- csw/mgar/pkg/dovecot/trunk/files/README.CSW (rev 0) +++ csw/mgar/pkg/dovecot/trunk/files/README.CSW 2009-11-19 09:37:43 UTC (rev 7355) @@ -0,0 +1,56 @@ +Configuration file +------------------ + +The default configuration path is /opt/csw/etc/dovecot.conf. CSWdovecot +brings with it a sample configuration (suffixed with .CSW) that will be +installed when dovecot.conf doesn't exist yet. This sample configuration +provides IMAP/POP3 and IMAPS/POP3S services to system users and uses a +self-signed certificate that comes with the package. + +When you adjust dovecot.conf, package upgrades will preserve your +configuration and just install the sample configuration as dovecot.conf.CSW. + + +Machine-local configuration in shared /opt setups +------------------------------------------------- + +If you share /opt among several machines (via NFS for example) you can use +/etc/opt/csw/dovecot.conf as machine-local configuration. The dovecot +startup script will then use it instead of the default configuration. + + +User accounts +------------- + +On installation CSWdovecot will create a user named dovecot in case no user +account by this name exists. This user account is required for the Dovecot +login service (and nothing else). + +If you want to use Dovecot for virtual users, you need to create another +user account (!= dovecot). For background information, see + + http://wiki.dovecot.org/UserIds + + +Upgrading +--------- + +For upgrading information from other IMAP servers or previous Dovecot +versions, see + + http://wiki.dovecot.org/UpgradingDovecot + + +Sieve plugin +------------ + +Sieve support (via the cmusieve plugin) is contained in the CSWdovecot_sieve +package. If required install this package and add + + mail_plugins = cmusieve + +to the "protocol lda" section in dovecot.conf. This requires that you use +Dovecot's deliver as LDA of course. See the following URLs for details + + http://wiki.dovecot.org/LDA + http://wiki.dovecot.org/LDA/Sieve#CMUSieve_Plugin Copied: csw/mgar/pkg/dovecot/trunk/files/changelog.CSW (from rev 6137, csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.changelog.CSW) =================================================================== --- csw/mgar/pkg/dovecot/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/dovecot/trunk/files/changelog.CSW 2009-11-19 09:37:43 UTC (rev 7355) @@ -0,0 +1,9 @@ +dovecot (1.1.11,REV=2009.03.28) + + * Package adopted and updated to 1.1.11. + * Tested and validated LDAP interopability with PAM. (Closes: #2760) + * Adjusted SSLDIR in mkcert.sh. (Closes: #3027) + * Compiled with --localstatedir=/var/opt/csw. Changes base_dir from + /opt/csw/var/run/dovecot to /var/opt/csw/run/dovecot. + + -- Sebastian Kayser Sat, 28 Mar 2009 18:18:35 +0100 Copied: csw/mgar/pkg/dovecot/trunk/files/cswdovecot (from rev 6137, csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswdovecot) =================================================================== --- csw/mgar/pkg/dovecot/trunk/files/cswdovecot (rev 0) +++ csw/mgar/pkg/dovecot/trunk/files/cswdovecot 2009-11-19 09:37:43 UTC (rev 7355) @@ -0,0 +1,64 @@ +#!/bin/sh +# License is public domain. +# +# Taken from http://wiki.dovecot.org/DovecotInit +# Modified for CSW by Sebastian Kayser +# +#FMRI network + +DAEMON=/opt/csw/sbin/dovecot + +test -x $DAEMON || exit 1 +set -e + +CONF=/opt/csw/etc/dovecot.conf +CONF_LOCAL=/etc/opt/csw/dovecot.conf +[ -r $CONF_LOCAL ] && CONF=$CONF_LOCAL + +[ "`ulimit -n`" -lt 1024 ] && ulimit -n 1024 + +base_dir=`$DAEMON -a|grep '^base_dir: '|sed 's/^base_dir: //'` +pidfile=$base_dir/master.pid + +if test -f $pidfile; then + running=yes +else + running=no +fi + +case "$1" in + start) + echo "Starting Dovecot" + $DAEMON -c $CONF + ;; + stop) + if test $running = yes; then + echo "Stopping Dovecot" + kill `cat $pidfile` + else + echo "Dovecot is already stopped." + fi + ;; + reload) + if test $running = yes; then + echo "Reloading Dovecot configuration" + kill -HUP `cat $pidfile` + else + echo "Dovecot isn't running." + fi + ;; + restart|force-reload) + echo "Restarting Dovecot" + if test $running = yes; then + kill `cat $pidfile` + sleep 1 + fi + $DAEMON -c $CONF + ;; + *) + echo "Usage: /etc/init.d/cswdovecot {start|stop|reload|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Nov 19 10:58:10 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 19 Nov 2009 09:58:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7356] csw/mgar/pkg/nspr/trunk/Makefile Message-ID: Revision: 7356 http://gar.svn.sourceforge.net/gar/?rev=7356&view=rev Author: wahwah Date: 2009-11-19 09:58:10 +0000 (Thu, 19 Nov 2009) Log Message: ----------- nspr: adjusting the nspr.pc file location Modified Paths: -------------- csw/mgar/pkg/nspr/trunk/Makefile Modified: csw/mgar/pkg/nspr/trunk/Makefile =================================================================== --- csw/mgar/pkg/nspr/trunk/Makefile 2009-11-19 09:37:43 UTC (rev 7355) +++ csw/mgar/pkg/nspr/trunk/Makefile 2009-11-19 09:58:10 UTC (rev 7356) @@ -84,9 +84,9 @@ ginstall -m 755 -d $(DESTDIR)$(bindir) ginstall -m 755 $(WORKSRC)/build/config/nspr-config \ $(DESTDIR)$(bindir) - ginstall -m 755 -d $(DESTDIR)$(prefix)/pkgconfig + ginstall -m 755 -d $(DESTDIR)$(libdir)/pkgconfig ginstall -m 644 $(WORKSRC)/build/config/nspr.pc \ - $(DESTDIR)$(prefix)/pkgconfig + $(DESTDIR)$(libdir)/pkgconfig rm $(DESTDIR)$(bindir)/prerr.properties rm $(DESTDIR)$(bindir)/nspr.pc rm $(DESTDIR)$(bindir)/compile-et.pl This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Thu Nov 19 16:37:24 2009 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Thu, 19 Nov 2009 15:37:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7357] csw/mgar/pkg/tuntap/trunk/Makefile Message-ID: Revision: 7357 http://gar.svn.sourceforge.net/gar/?rev=7357&view=rev Author: bensons Date: 2009-11-19 15:37:24 +0000 (Thu, 19 Nov 2009) Log Message: ----------- tuntap: adjusted Makefile in respect to SPKG_DESC_ Modified Paths: -------------- csw/mgar/pkg/tuntap/trunk/Makefile Modified: csw/mgar/pkg/tuntap/trunk/Makefile =================================================================== --- csw/mgar/pkg/tuntap/trunk/Makefile 2009-11-19 09:58:10 UTC (rev 7356) +++ csw/mgar/pkg/tuntap/trunk/Makefile 2009-11-19 15:37:24 UTC (rev 7357) @@ -11,6 +11,7 @@ to create a network bridge, while TUN is used with routing. endef +SPKG_SOURCEURL = http://www.whiteboard.ne.jp/~admin2/tuntap/ MASTER_SITES = http://www.whiteboard.ne.jp/~admin2/tuntap/source/tuntap/ # fix Dist DISTNAME = tuntap @@ -24,7 +25,9 @@ # one Makefile for both packages PACKAGES = CSWtun CSWtap CATALOGNAME_CSWtun = tun +SPKG_DESC_CSWtun = tun CATALOGNAME_CSWtap = tap +SPKG_DESC_CSWtap = tap # define packagefiles PKGFILES_CSWtun = /usr/kernel/drv/tun PKGFILES_CSWtun += /usr/kernel/drv/tun.conf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Nov 20 09:47:13 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 20 Nov 2009 08:47:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[7358] csw/mgar/pkg/libmcrypt/trunk Message-ID: Revision: 7358 http://gar.svn.sourceforge.net/gar/?rev=7358&view=rev Author: wahwah Date: 2009-11-20 08:47:13 +0000 (Fri, 20 Nov 2009) Log Message: ----------- mcrypt: Bumped version to 2.6.8, but it needs newer mhash Modified Paths: -------------- csw/mgar/pkg/libmcrypt/trunk/Makefile csw/mgar/pkg/libmcrypt/trunk/checksums Modified: csw/mgar/pkg/libmcrypt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmcrypt/trunk/Makefile 2009-11-19 15:37:24 UTC (rev 7357) +++ csw/mgar/pkg/libmcrypt/trunk/Makefile 2009-11-20 08:47:13 UTC (rev 7358) @@ -1,5 +1,5 @@ GARNAME = libmcrypt -GARVERSION = 2.5.8 +GARVERSION = 2.6.8 CATEGORIES = lib DESCRIPTION = GPL replacement for Unix crypt that supports a wide range of algorithms and modes @@ -10,11 +10,11 @@ endef SF_PROJ = mcrypt -MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(SF_PROJ)-$(GARVERSION).tar.gz +DISTNAME = $(SF_PROJ)-$(GARVERSION) -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz BUILD64 = 1 NOISALIST = 1 Modified: csw/mgar/pkg/libmcrypt/trunk/checksums =================================================================== --- csw/mgar/pkg/libmcrypt/trunk/checksums 2009-11-19 15:37:24 UTC (rev 7357) +++ csw/mgar/pkg/libmcrypt/trunk/checksums 2009-11-20 08:47:13 UTC (rev 7358) @@ -1 +1 @@ -c4f491dd411a09e9de3b8702ea6f73eb libmcrypt-2.5.8.tar.bz2 +97639f8821b10f80943fa17da302607e mcrypt-2.6.8.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 Nov 20 10:09:26 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 20 Nov 2009 09:09:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[7359] csw/mgar/pkg/libmcrypt/trunk Message-ID: Revision: 7359 http://gar.svn.sourceforge.net/gar/?rev=7359&view=rev Author: wahwah Date: 2009-11-20 09:09:26 +0000 (Fri, 20 Nov 2009) Log Message: ----------- libmcrypt: Fixed a problem with arbitrary -Wall, not it misses /opt/csw/lib/libltdl.la Modified Paths: -------------- csw/mgar/pkg/libmcrypt/trunk/Makefile csw/mgar/pkg/libmcrypt/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libmcrypt/trunk/files/no-wall.patch Modified: csw/mgar/pkg/libmcrypt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmcrypt/trunk/Makefile 2009-11-20 08:47:13 UTC (rev 7358) +++ csw/mgar/pkg/libmcrypt/trunk/Makefile 2009-11-20 09:09:26 UTC (rev 7359) @@ -15,6 +15,7 @@ DISTNAME = $(SF_PROJ)-$(GARVERSION) UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +PATCHFILES = no-wall.patch BUILD64 = 1 NOISALIST = 1 @@ -23,6 +24,8 @@ CONFIGURE_ARGS += --enable-dynamic-loading CONFIGURE_ARGS += --with-included-algos=cast-128,gost,rijndael-128,twofish,arcfour,cast-256,loki97,rijndael-192,saferplus,wake,blowfish-compat,des,rijndael-256,serpent,xtea,blowfish,enigma,rc2,tripledes +EXTRA_CFLAGS = -D__const=const + TEST_TARGET = check include gar/category.mk Modified: csw/mgar/pkg/libmcrypt/trunk/checksums =================================================================== --- csw/mgar/pkg/libmcrypt/trunk/checksums 2009-11-20 08:47:13 UTC (rev 7358) +++ csw/mgar/pkg/libmcrypt/trunk/checksums 2009-11-20 09:09:26 UTC (rev 7359) @@ -1 +1,2 @@ 97639f8821b10f80943fa17da302607e mcrypt-2.6.8.tar.gz +7047afdeed0db312f9e0a120ad3ec419 no-wall.patch Added: csw/mgar/pkg/libmcrypt/trunk/files/no-wall.patch =================================================================== --- csw/mgar/pkg/libmcrypt/trunk/files/no-wall.patch (rev 0) +++ csw/mgar/pkg/libmcrypt/trunk/files/no-wall.patch 2009-11-20 09:09:26 UTC (rev 7359) @@ -0,0 +1,11 @@ +--- mcrypt-2.6.8/configure.in.orig 2009-11-20 10:01:43.576935508 +0100 ++++ mcrypt-2.6.8/configure.in 2009-11-20 10:01:51.038566121 +0100 +@@ -57,7 +57,7 @@ + *** in OpenPGP packets.)) + + LIBS="${LIBS} ${LIBMCRYPT_LIBS}" +-CFLAGS="${CFLAGS} ${LIBMCRYPT_CFLAGS} -Wall" ++CFLAGS="${CFLAGS} ${LIBMCRYPT_CFLAGS}" + + + AC_C_CONST 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 Nov 20 10:34:23 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 20 Nov 2009 09:34:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7360] csw/mgar/pkg/libmcrypt/trunk Message-ID: Revision: 7360 http://gar.svn.sourceforge.net/gar/?rev=7360&view=rev Author: wahwah Date: 2009-11-20 09:34:23 +0000 (Fri, 20 Nov 2009) Log Message: ----------- libmcrypt: There's a difference between libmcrypt and mcrypt. Modified Paths: -------------- csw/mgar/pkg/libmcrypt/trunk/Makefile csw/mgar/pkg/libmcrypt/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/libmcrypt/trunk/files/no-wall.patch Modified: csw/mgar/pkg/libmcrypt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmcrypt/trunk/Makefile 2009-11-20 09:09:26 UTC (rev 7359) +++ csw/mgar/pkg/libmcrypt/trunk/Makefile 2009-11-20 09:34:23 UTC (rev 7360) @@ -1,5 +1,5 @@ GARNAME = libmcrypt -GARVERSION = 2.6.8 +GARVERSION = 2.5.8 CATEGORIES = lib DESCRIPTION = GPL replacement for Unix crypt that supports a wide range of algorithms and modes @@ -10,12 +10,11 @@ endef SF_PROJ = mcrypt -MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(SF_PROJ)-$(GARVERSION).tar.gz -DISTNAME = $(SF_PROJ)-$(GARVERSION) +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PATCHFILES = no-wall.patch +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 BUILD64 = 1 NOISALIST = 1 @@ -24,8 +23,6 @@ CONFIGURE_ARGS += --enable-dynamic-loading CONFIGURE_ARGS += --with-included-algos=cast-128,gost,rijndael-128,twofish,arcfour,cast-256,loki97,rijndael-192,saferplus,wake,blowfish-compat,des,rijndael-256,serpent,xtea,blowfish,enigma,rc2,tripledes -EXTRA_CFLAGS = -D__const=const - TEST_TARGET = check include gar/category.mk Modified: csw/mgar/pkg/libmcrypt/trunk/checksums =================================================================== --- csw/mgar/pkg/libmcrypt/trunk/checksums 2009-11-20 09:09:26 UTC (rev 7359) +++ csw/mgar/pkg/libmcrypt/trunk/checksums 2009-11-20 09:34:23 UTC (rev 7360) @@ -1,2 +1 @@ -97639f8821b10f80943fa17da302607e mcrypt-2.6.8.tar.gz -7047afdeed0db312f9e0a120ad3ec419 no-wall.patch +c4f491dd411a09e9de3b8702ea6f73eb libmcrypt-2.5.8.tar.bz2 Deleted: csw/mgar/pkg/libmcrypt/trunk/files/no-wall.patch =================================================================== --- csw/mgar/pkg/libmcrypt/trunk/files/no-wall.patch 2009-11-20 09:09:26 UTC (rev 7359) +++ csw/mgar/pkg/libmcrypt/trunk/files/no-wall.patch 2009-11-20 09:34:23 UTC (rev 7360) @@ -1,11 +0,0 @@ ---- mcrypt-2.6.8/configure.in.orig 2009-11-20 10:01:43.576935508 +0100 -+++ mcrypt-2.6.8/configure.in 2009-11-20 10:01:51.038566121 +0100 -@@ -57,7 +57,7 @@ - *** in OpenPGP packets.)) - - LIBS="${LIBS} ${LIBMCRYPT_LIBS}" --CFLAGS="${CFLAGS} ${LIBMCRYPT_CFLAGS} -Wall" -+CFLAGS="${CFLAGS} ${LIBMCRYPT_CFLAGS}" - - - AC_C_CONST 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 Nov 20 16:15:11 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 20 Nov 2009 15:15:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[7361] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7361 http://gar.svn.sourceforge.net/gar/?rev=7361&view=rev Author: dmichelsen Date: 2009-11-20 15:15:11 +0000 (Fri, 20 Nov 2009) Log Message: ----------- mGAR v2: Clarify variable assignment in MIGRATE_FILES Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-11-20 09:34:23 UTC (rev 7360) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-11-20 15:15:11 UTC (rev 7361) @@ -596,16 +596,14 @@ merge-migrateconf: $(foreach S,$(SPKG_SPECS),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),merge-migrateconf-$S)) @$(MAKECOOKIE) -merge-migrateconf-%: MIGRATE_FILES_$* ?= $(MIGRATE_FILES) -merge-migrateconf-%: MIGRATE_SOURCE_DIR_$* ?= $(MIGRATE_SOURCE_DIR) -merge-migrateconf-%: MIGRATE_DEST_DIR_$* ?= $(MIGRATE_DEST_DIR) merge-migrateconf-%: @echo "[ Generating cswmigrateconf for package $* ]" + @echo "X: $(MIGRATE_FILES_$*) Y: $(MIGRATE_FILES)" $(_DBG)ginstall -d $(PKGROOT)/etc/opt/csw/pkg/$* - $(_DBG)(echo "MIGRATE_FILES=\"$(MIGRATE_FILES_$*)\"";\ + $(_DBG)(echo "MIGRATE_FILES=\"$(or $(MIGRATE_FILES_$*),$(MIGRATE_FILES))\"";\ $(if $(MIGRATE_SOURCE_DIR_$*),echo "SOURCE_DIR___default__=\"$(MIGRATE_SOURCE_DIR_$*)\"";)\ $(if $(MIGRATE_DEST_DIR_$*),echo "DEST_DIR___default__=\"$(MIGRATE_DEST_DIR_$*)\"";)\ - $(foreach F,$(MIGRATE_FILES_$*),\ + $(foreach F,$(or $(MIGRATE_FILES_$*),$(MIGRATE_FILES)),\ $(if $(MIGRATE_SOURCE_DIR_$F),echo "SOURCE_DIR_$(subst .,_,$F)=\"$(MIGRATE_SOURCE_DIR_$F)\"";)\ $(if $(MIGRATE_DEST_DIR_$F),echo "DEST_DIR_$(subst .,_,$F)=\"$(MIGRATE_DEST_DIR_$F)\"";)\ )\ 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 Nov 20 16:29:51 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 20 Nov 2009 15:29:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[7362] csw/mgar/pkg/postgresql/trunk/Makefile Message-ID: Revision: 7362 http://gar.svn.sourceforge.net/gar/?rev=7362&view=rev Author: dmichelsen Date: 2009-11-20 15:29:51 +0000 (Fri, 20 Nov 2009) Log Message: ----------- postgresql: Reset directories to let GAR extend the path Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2009-11-20 15:15:11 UTC (rev 7361) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2009-11-20 15:29:51 UTC (rev 7362) @@ -8,17 +8,17 @@ define BLURB endef -bindir = $(prefix)/bin/$(GARNAME)/$(BASE_VERSION) +bindir_install = $(prefix)/bin/$(GARNAME)/$(BASE_VERSION) datadir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION) docdir=$(prefix)/share/doc/$(GARNAME)/$(BASE_VERSION) includedir=$(prefix)/include/$(GARNAME)/$(BASE_VERSION) infodir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION)/info -libdir=$(prefix)/lib/$(GARNAME)/$(BASE_VERSION) -libexecdir=$(prefix)/libexec/$(GARNAME)/$(BASE_VERSION) +libdir_install =$(prefix)/lib/$(GARNAME)/$(BASE_VERSION) +libexecdir_install =$(prefix)/libexec/$(GARNAME)/$(BASE_VERSION) lispdir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION)/emacs/site-lisp localstatedir = /var/opt/csw/$(GARNAME)/$(BASE_VERSION) mandir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION)/man -sbindir = $(prefix)/sbin/$(GARNAME)/$(BASE_VERSION) +sbindir_install = $(prefix)/sbin/$(GARNAME)/$(BASE_VERSION) sharedstatedir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION) sourcedir=$(prefix)/src/$(GARNAME)/$(BASE_VERSION) sysconfdir = /etc/opt/csw/$(GARNAME)/$(BASE_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 Fri Nov 20 17:05:43 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 20 Nov 2009 16:05:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[7363] csw/mgar/pkg/icecast/trunk/Makefile Message-ID: Revision: 7363 http://gar.svn.sourceforge.net/gar/?rev=7363&view=rev Author: dmichelsen Date: 2009-11-20 16:05:42 +0000 (Fri, 20 Nov 2009) Log Message: ----------- icecast: Relocate directories to new locations Modified Paths: -------------- csw/mgar/pkg/icecast/trunk/Makefile Modified: csw/mgar/pkg/icecast/trunk/Makefile =================================================================== --- csw/mgar/pkg/icecast/trunk/Makefile 2009-11-20 15:29:51 UTC (rev 7362) +++ csw/mgar/pkg/icecast/trunk/Makefile 2009-11-20 16:05:42 UTC (rev 7363) @@ -21,8 +21,14 @@ PREREQUISITE_PKGS = $(REQUIRED_PKGS) sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw +PRESERVECONF = $(sysconfdir)/icecast.xml + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check include gar/category.mk + +post-install-modulated: + @ginstall -d $(DESTDIR)$(localstatedir)/log/icecast 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 Nov 20 22:27:08 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 20 Nov 2009 21:27:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[7364] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 7364 http://gar.svn.sourceforge.net/gar/?rev=7364&view=rev Author: bdwalton Date: 2009-11-20 21:27:07 +0000 (Fri, 20 Nov 2009) Log Message: ----------- cswclassutils: cswinetd: create manifest directory when required Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/checksums csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2009-11-20 16:05:42 UTC (rev 7363) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2009-11-20 21:27:07 UTC (rev 7364) @@ -2,7 +2,7 @@ fe030911decab669145b3017ed4fdf10 CSWcswclassutils.i.cswcpsampleconf 9a6f5ad4919b78e4083491edcd86db0c CSWcswclassutils.i.cswcrontab 56900bb1fc9f40f7c227877eca32b1f8 CSWcswclassutils.i.cswetcservices -b363134a7c70a342195badc942a23b9d CSWcswclassutils.i.cswinetd +4f2e9de463cb4b17ba6e1b3dfdf18913 CSWcswclassutils.i.cswinetd fa318ca696e80a9a9f2efbf35cb69080 CSWcswclassutils.i.cswinitsmf 42668b41c7c886091a8ca44992b90806 CSWcswclassutils.i.cswmigrateconf c875d62c8ddaad0de2e18fff7946e1e8 CSWcswclassutils.i.cswpreserveconf Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd 2009-11-20 16:05:42 UTC (rev 7363) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd 2009-11-20 21:27:07 UTC (rev 7364) @@ -72,6 +72,8 @@ if [ "$isrpc" = "yes" ]; then outdir=$outdir/rpc fi + [ -d $outdir ] || mkdir -p $outdir + manifest=$outdir/$svcname-$proto.xml TMPOUT=/var/opt/csw/cswclassutils/$svcname.$$ 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 Nov 20 22:36:22 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 20 Nov 2009 21:36:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[7365] csw/mgar/pkg/cswclassutils/trunk/Makefile Message-ID: Revision: 7365 http://gar.svn.sourceforge.net/gar/?rev=7365&view=rev Author: bonivart Date: 2009-11-20 21:36:21 +0000 (Fri, 20 Nov 2009) Log Message: ----------- cswclassutils: update to 1.30 with inetd fix Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-11-20 21:27:07 UTC (rev 7364) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2009-11-20 21:36:21 UTC (rev 7365) @@ -1,7 +1,7 @@ # $Id$ GARNAME = cswclassutils -GARVERSION = 1.29 +GARVERSION = 1.30 CATEGORIES = utils DESCRIPTION = CSW class action utilities This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Nov 21 09:48:44 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 21 Nov 2009 08:48:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7366] csw/mgar/pkg/nspr/trunk/Makefile Message-ID: Revision: 7366 http://gar.svn.sourceforge.net/gar/?rev=7366&view=rev Author: wahwah Date: 2009-11-21 08:48:44 +0000 (Sat, 21 Nov 2009) Log Message: ----------- nspr: headers in include/nspr, better CSWnspr-devel package. Modified Paths: -------------- csw/mgar/pkg/nspr/trunk/Makefile Modified: csw/mgar/pkg/nspr/trunk/Makefile =================================================================== --- csw/mgar/pkg/nspr/trunk/Makefile 2009-11-20 21:36:21 UTC (rev 7365) +++ csw/mgar/pkg/nspr/trunk/Makefile 2009-11-21 08:48:44 UTC (rev 7366) @@ -14,9 +14,10 @@ PATCHFILES = nspr-4.6.1-config.patch PACKAGES = CSWnspr CSWnspr-devel -PKGFILES_CSWnspr-devel = $(PKGFILES_DEVEL) +PKGFILES_CSWnspr-devel = $(PKGFILES_DEVEL) PKGFILES_CSWnspr-devel += $(bindir).*nspr-config -PKGFILES_CSWnspr-devel += $(prefix)/pkgconfig/nspr\.pc +PKGFILES_CSWnspr-devel += .*/nspr\.pc +PKGFILES_CSWnspr-devel += .*compile-et\.pl SPKG_DESC_CSWnspr = Netscape Portable Runtime SPKG_DESC_CSWnspr-devel = Netscape Portable Runtime development files @@ -38,19 +39,26 @@ libdir = $(prefix)/lib/nspr localstatedir = /var/opt/csw sysconfdir = /etc/opt/csw +# Move the include files to include/nspr to prevent polluting the main +# header file namespace. +includedir = $(prefix)/include/nspr CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-mozilla -CONFIGURE_ARGS += --disable-debug -CONFIGURE_ARGS += --enable-strip CONFIGURE_ARGS += --with-native-threads CONFIGURE_ARGS += --enable-ipv6 -CONFIGURE_ARGS += --enable-optimize="-xO3" -CONFIGURE_ARGS += --disable-tests CONFIGURE_ARGS += --enable-system-sqlite CONFIGURE_ARGS_isa-sparcv9 = --enable-64bit CONFIGURE_ARGS_isa-amd64 = --enable-64bit CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION)) +CONFIGURE_ARGS_OPT = --enable-optimize="-xO3" +CONFIGURE_ARGS_OPT += --disable-debug +CONFIGURE_ARGS_OPT += --enable-strip +CONFIGURE_ARGS_OPT += --disable-tests +CONFIGURE_ARGS_DBG = --enable-debug +CONFIGURE_ARGS_DBG += --disable-strip +CONFIGURE_ARGS_DBG += --enable-tests +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) # These options I'm unsure about, are they really needed? # EXTRA_LDFLAGS = -R'\$\$ORIGIN:\$\$ORIGIN/..' -R/opt/csw/lib @@ -89,5 +97,4 @@ $(DESTDIR)$(libdir)/pkgconfig rm $(DESTDIR)$(bindir)/prerr.properties rm $(DESTDIR)$(bindir)/nspr.pc - rm $(DESTDIR)$(bindir)/compile-et.pl @$(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 Sat Nov 21 11:04:07 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 21 Nov 2009 10:04:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7367] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7367 http://gar.svn.sourceforge.net/gar/?rev=7367&view=rev Author: dmichelsen Date: 2009-11-21 10:04:07 +0000 (Sat, 21 Nov 2009) Log Message: ----------- mGAR v2: Fix depend on cswclassutils which broke on introduction of TEXINFO Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-11-21 08:48:44 UTC (rev 7366) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-11-21 10:04:07 UTC (rev 7367) @@ -193,7 +193,6 @@ TEXINFO ?= $(infodir)/.*\.info(?:-\d+)? $(EXTRA_TEXINFO) # - set class for all config files -ifneq ($(SAMPLECONF)$(PRESERVECONF)$(MIGRATECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE)$(TEXINFO),) _CSWCLASS_FILTER = | perl -ane '\ $(foreach FILE,$(MIGRATECONF),$$F[1] = "cswmigrateconf" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(SAMPLECONF:%\.CSW=%),$$F[1] = "cswcpsampleconf" if ( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ @@ -206,6 +205,8 @@ $(foreach FILE,$(TEXINFO),$$F[1] = "cswtexinfo" if( $$F[2] =~ m(^$(FILE)$$) );)\ print join(" ", at F),"\n";' +# The TEXINFO dependency is handled dynamically by looking at the prototype for matching files +ifneq ($(MIGRATECONF)$(SAMPLECONF)$(PRESERVECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),) _EXTRA_GAR_PKGS += CSWcswclassutils # Make sure the configuration files always have a .CSW suffix and rename the # configuration files to this if necessary during merge. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Nov 21 11:25:41 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 21 Nov 2009 10:25:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[7368] csw/mgar/pkg/libssh2/trunk Message-ID: Revision: 7368 http://gar.svn.sourceforge.net/gar/?rev=7368&view=rev Author: dmichelsen Date: 2009-11-21 10:25:39 +0000 (Sat, 21 Nov 2009) Log Message: ----------- libssh2: Update to 1.2.2, test was commented out and is still failing Modified Paths: -------------- csw/mgar/pkg/libssh2/trunk/Makefile csw/mgar/pkg/libssh2/trunk/checksums Modified: csw/mgar/pkg/libssh2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libssh2/trunk/Makefile 2009-11-21 10:04:07 UTC (rev 7367) +++ csw/mgar/pkg/libssh2/trunk/Makefile 2009-11-21 10:25:39 UTC (rev 7368) @@ -1,8 +1,8 @@ GARNAME = libssh2 -GARVERSION = 1.2.1 +GARVERSION = 1.2.2 CATEGORIES = lib -DESCRIPTION = A Library Implementing the SSH2 Protocol. +DESCRIPTION = A Library Implementing the SSH2 Protocol define BLURB libssh2 is a library implementing the SSH2 protocol as defined by Internet Drafts: SECSH-TRANS, SECSH-USERAUTH, SECSH-CONNECTION, @@ -14,24 +14,21 @@ SPKG_SOURCEURL = http://www.libssh2.org DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PACKAGES = CSWlibssh2 -CATALOGNAME_CSWlibssh2 = libssh2 -SPKG_DESC_CSWlibssh2 = $(DESCRIPTION) - -REQUIRED_PKGS_CSWlibssh2 = CSWosslrt CSWzlib - - # We define upstream file regex so we can be notifed of # new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +REQUIRED_PKGS = CSWosslrt CSWzlib +PREREQUISITE_PKGS = CSWossldevel CSWzlib + BUILD64 = 1 NO_ISAEXEC = 1 -TEST_SCRIPTS = -TEST_TARGET = check CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libz CONFIGURE_ARGS += --with-openssl=/opt/csw +# TEST_SCRIPTS = +TEST_TARGET = check + include gar/category.mk Modified: csw/mgar/pkg/libssh2/trunk/checksums =================================================================== --- csw/mgar/pkg/libssh2/trunk/checksums 2009-11-21 10:04:07 UTC (rev 7367) +++ csw/mgar/pkg/libssh2/trunk/checksums 2009-11-21 10:25:39 UTC (rev 7368) @@ -1 +1 @@ -4ee0197947a3b8a4472328c346e1a0e4 download/libssh2-1.2.1.tar.gz +fa8d9cd425bdd62f57244fc61fb54da7 libssh2-1.2.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 Sat Nov 21 11:29:12 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 21 Nov 2009 10:29:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7369] csw/mgar/pkg/squid/tags/squid-2.7, REV=2009.06. 18_STABLE6/ Message-ID: Revision: 7369 http://gar.svn.sourceforge.net/gar/?rev=7369&view=rev Author: dmichelsen Date: 2009-11-21 10:29:11 +0000 (Sat, 21 Nov 2009) Log Message: ----------- squid: Tag existing release Added Paths: ----------- csw/mgar/pkg/squid/tags/squid-2.7,REV=2009.06.18_STABLE6/ 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 Nov 21 12:11:03 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 21 Nov 2009 11:11:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[7370] csw/mgar/pkg/nspr/trunk/Makefile Message-ID: Revision: 7370 http://gar.svn.sourceforge.net/gar/?rev=7370&view=rev Author: wahwah Date: 2009-11-21 11:11:02 +0000 (Sat, 21 Nov 2009) Log Message: ----------- nspr: nspr.pc in /opt/csw/lib/pkgconfig. Modified Paths: -------------- csw/mgar/pkg/nspr/trunk/Makefile Modified: csw/mgar/pkg/nspr/trunk/Makefile =================================================================== --- csw/mgar/pkg/nspr/trunk/Makefile 2009-11-21 10:29:11 UTC (rev 7369) +++ csw/mgar/pkg/nspr/trunk/Makefile 2009-11-21 11:11:02 UTC (rev 7370) @@ -36,7 +36,7 @@ export PERL -libdir = $(prefix)/lib/nspr +libdir_install = $(prefix)/lib/nspr localstatedir = /var/opt/csw sysconfdir = /etc/opt/csw # Move the include files to include/nspr to prevent polluting the main @@ -92,9 +92,9 @@ ginstall -m 755 -d $(DESTDIR)$(bindir) ginstall -m 755 $(WORKSRC)/build/config/nspr-config \ $(DESTDIR)$(bindir) - ginstall -m 755 -d $(DESTDIR)$(libdir)/pkgconfig + ginstall -m 755 -d $(DESTDIR)$(prefix)/lib/pkgconfig ginstall -m 644 $(WORKSRC)/build/config/nspr.pc \ - $(DESTDIR)$(libdir)/pkgconfig + $(DESTDIR)$(prefix)/lib/pkgconfig rm $(DESTDIR)$(bindir)/prerr.properties rm $(DESTDIR)$(bindir)/nspr.pc @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Nov 21 15:11:18 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 21 Nov 2009 14:11:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7371] csw/mgar/pkg Message-ID: Revision: 7371 http://gar.svn.sourceforge.net/gar/?rev=7371&view=rev Author: wbonnet Date: 2009-11-21 14:11:16 +0000 (Sat, 21 Nov 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/image-editor/ csw/mgar/pkg/image-editor/branches/ csw/mgar/pkg/image-editor/tags/ csw/mgar/pkg/image-editor/trunk/ csw/mgar/pkg/image-editor/trunk/Makefile csw/mgar/pkg/image-editor/trunk/checksums csw/mgar/pkg/image-editor/trunk/files/ csw/mgar/pkg/image-editor/trunk/files/ImageEditor csw/mgar/pkg/image-editor/trunk/files/License.txt Property changes on: csw/mgar/pkg/image-editor/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/image-editor/trunk/Makefile =================================================================== --- csw/mgar/pkg/image-editor/trunk/Makefile (rev 0) +++ csw/mgar/pkg/image-editor/trunk/Makefile 2009-11-21 14:11:16 UTC (rev 7371) @@ -0,0 +1,39 @@ +GARNAME = image-editor +GARVERSION = 2.1.355 +CATEGORIES = java + +DESCRIPTION = Java Image Editor +define BLURB + A fully-featured image editor written in Java using the image filters. Suitable for editing icons or Web images. Features include: Multiple layers, blending modes, image effects, image warping. +endef + +MASTER_SITES = http://www.jhlabs.com/ie/ +DISTFILES = ImageEditor.jar +DISTFILES += ImageEditor +DISTFILES += License.txt + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +PACKAGES = CSWimageeditor +CATALOGNAME_CSWimageeditor = imageeditor + +ARCHALL = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom +LICENSE = License.txt + +include gar/category.mk + +install-custom: + @ginstall -d $(DESTDIR)$(bindir) + @ginstall -d $(DESTDIR)$(datadir)/java + @ginstall $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/ImageEditor $(DESTDIR)$(bindir) + @ginstall $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/ImageEditor.jar $(DESTDIR)$(datadir)/java + + @$(MAKECOOKIE) Added: csw/mgar/pkg/image-editor/trunk/checksums =================================================================== --- csw/mgar/pkg/image-editor/trunk/checksums (rev 0) +++ csw/mgar/pkg/image-editor/trunk/checksums 2009-11-21 14:11:16 UTC (rev 7371) @@ -0,0 +1,3 @@ +aae1797a343749f06d8de254f34d7def ImageEditor +ab316d6430e8fa589ed7a638a24cf8e8 ImageEditor.jar +c308b6deb32b66acd054415c3f60851e License.txt Added: csw/mgar/pkg/image-editor/trunk/files/ImageEditor =================================================================== --- csw/mgar/pkg/image-editor/trunk/files/ImageEditor (rev 0) +++ csw/mgar/pkg/image-editor/trunk/files/ImageEditor 2009-11-21 14:11:16 UTC (rev 7371) @@ -0,0 +1,2 @@ +#!/bin/sh +java -jar /opt/csw/share/java/ImageEditor.jar Property changes on: csw/mgar/pkg/image-editor/trunk/files/ImageEditor ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/image-editor/trunk/files/License.txt =================================================================== --- csw/mgar/pkg/image-editor/trunk/files/License.txt (rev 0) +++ csw/mgar/pkg/image-editor/trunk/files/License.txt 2009-11-21 14:11:16 UTC (rev 7371) @@ -0,0 +1 @@ +To be defined, seems to be apache 2.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 Nov 21 16:16:44 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 21 Nov 2009 15:16:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7372] csw/mgar/pkg Message-ID: Revision: 7372 http://gar.svn.sourceforge.net/gar/?rev=7372&view=rev Author: wahwah Date: 2009-11-21 15:16:44 +0000 (Sat, 21 Nov 2009) Log Message: ----------- nss: Initial commit, work in progress, installer segfaults. Modified Paths: -------------- csw/mgar/pkg/nss/trunk/Makefile csw/mgar/pkg/nss/trunk/checksums Added Paths: ----------- csw/mgar/pkg/nss/ csw/mgar/pkg/nss/trunk/files/nss-3.12.4.patch csw/mgar/pkg/nss/trunk/files/shared-libs.patch Modified: csw/mgar/pkg/nss/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-11-12 20:57:45 UTC (rev 7254) +++ csw/mgar/pkg/nss/trunk/Makefile 2009-11-21 15:16:44 UTC (rev 7372) @@ -11,8 +11,11 @@ ## For more information about GAR variables, please see: ## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference ## -GARNAME = mypkg -GARVERSION = 1.0 +# Based on: +# http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/nss-3.12.4-r1.ebuild?view=markup +GARNAME = nss +GARVERSION = 3.12.4 +# http://www.gentoo-portage.com/AJAX/Ebuild/96014 ## ## The category that your software fits in. This is not a descriptive field, but ## influences the build process. Depending on the CATEGORIES setting, different @@ -25,21 +28,22 @@ CATEGORIES = lib ## ## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = +DESCRIPTION = Network Security Services library, implements PKI support ## ## 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 = +SPKG_SOURCEURL = http://www.mozilla.org/projects/security/pki/nss/ ## ## Whitespace-separated list of URLs to download the source package from. ## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = +# TODO: Generate RTM_NAME from GARVERSION +RTM_NAME = NSS_3_12_4_RTM +MASTER_SITES = ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/ ## ## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the ## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge @@ -49,14 +53,18 @@ ## 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 = +# http://bugs.gentoo.org/show_bug.cgi?id=256102 +PATCHFILES = nss-3.12.4.patch +PATCHFILES += shared-libs.patch +## PATCHFILES = freebl.patch ## ## Whitespace-separated list of files which comprise this build. mGAR will look ## for the files in the $(FILEDIR) (trunk/files) directory and on the ## $(MASTER_SITES). DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz ## -## We define upstream file regex so we can be notifed of new upstream software release +## We define upstream file regex so we can be notifed of new upstream software +## release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz ## ## Catalog name is the name to be used with pkg{-get,util} -i . @@ -123,10 +131,10 @@ ## ETCSERVICES = ## INETDCONF = ## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = +REQUIRED_PKGS = CSWnspr CSWsqlite3 ## ## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWsqlite3devel ## ## When using non-empty $(PACKAGES): ## REQUIRED_PKGS_CSWpkgname = @@ -145,10 +153,10 @@ ## 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 = +CONFIGURE_SCRIPTS = nss +BUILD_SCRIPTS = nss +INSTALL_SCRIPTS = nss +TEST_SCRIPTS = ## ## Compilation settings ## @@ -162,7 +170,7 @@ ## Arguments passed to the ./configure script. CONFIGURE_ARGS = $(DIRPATHS) ## -## BUILD64 = +BUILD64 = 1 ## CONFIGURE_ENV = ## EXTRA_CFLAGS = ## EXTRA_LDFLAGS = @@ -176,10 +184,66 @@ ## 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 +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +## # To fix PR_STATIC_ASSERT(sizeof(size_t) > 4); in drbg.c, line 510 +## EXTRA_CFLAGS = -DNS_PTR_GT_32=1 +## EXTRA_CXXFLAGS = -DNS_PTR_GT_32=1 +BUILD_OPT = 1 +NSS_USE_SYSTEM_SQLITE = 1 +NSPR_INCLUDE_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --cflags-only-I nspr | gsed 's/-I//') +NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//') +USE_SYSTEM_ZLIB = 1 +ZLIB_LIBS = -lz +NSDISTMODE = copy +NSS_ENABLE_ECC = 1 +XCFLAGS=$(CFLAGS) +FREEBL_NO_DEPEND = 1 +# DSO_LDOPTS = -R/opt/csw/lib/$$$$ISALIST -L/opt/csw/lib +# export DSO_LDOPTS +ifeq ($(MODULATION),isa-sparcv9) + USE_64 = 1 +endif +ifeq ($(MODULATION),isa-amd64) + USE_64 = 1 +endif +export BUILD_OPT NSS_USE_SYSTEM_SQLITE NSPR_INCLUDE_DIR NSPR_LIB_DIR USE_64 +export USE_SYSTEM_ZLIB ZLIB_LIBS NSDISTMODE NSS_ENABLE_ECC XCFLAGS FREEBL_NO_DEPEND + +include gar/category.mk + +configure-nss: + (cd $(WORKSRC)/mozilla/security/coreconf \ + && \ + gsed -e 's:SOURCE_PREFIX = $$(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $$(CORE_DEPTH)/dist:' \ + -i source.mk \ + && \ + gsed -i -e 's/\$$(MKSHLIB) -o/\$$(MKSHLIB) \$$(LDFLAGS) -o/g' rules.mk \ + ) + @$(MAKECOOKIE) + +build-nss: build-coreconf build-dbm build-nss-compile + +build-coreconf: + (cd $(WORKSRC)/mozilla/security/coreconf \ + && \ + $(BUILD_ENV) \ + && \ + gmake -j1 CC="$(CC)") + @$(MAKECOOKIE) + +build-dbm: + (cd $(WORKSRC)/mozilla/security/dbm \ + && \ + $(BUILD_ENV) \ + && \ + gmake -j1 CC="$(CC)") + @$(MAKECOOKIE) + +build-nss-compile: + (cd $(WORKSRC)/mozilla/security/nss \ + && \ + $(BUILD_ENV) \ + && \ + gmake -j1 CC="$(CC)") + @$(MAKECOOKIE) Modified: csw/mgar/pkg/nss/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-11-12 20:57:45 UTC (rev 7254) +++ csw/mgar/pkg/nss/trunk/checksums 2009-11-21 15:16:44 UTC (rev 7372) @@ -0,0 +1,3 @@ +39b9d2431d4ff717d103b742fcaefb81 nss-3.12.4.patch +1ee3ed9c1900079319bd1de51388d856 nss-3.12.4.tar.gz +0b7f69f1fdd6fbeddd9c216f59ecabc6 shared-libs.patch Added: csw/mgar/pkg/nss/trunk/files/nss-3.12.4.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/nss-3.12.4.patch (rev 0) +++ csw/mgar/pkg/nss/trunk/files/nss-3.12.4.patch 2009-11-21 15:16:44 UTC (rev 7372) @@ -0,0 +1,141 @@ +--- mozilla/security/nss/lib/freebl/stubs.c.dist 2009-09-16 17:46:24.600678560 +0100 ++++ b/mozilla/security/nss/lib/freebl/stubs.c 2009-09-16 18:09:59.275307160 +0100 +@@ -70,9 +70,32 @@ + #include + #include + +-#define FREEBL_NO_WEAK 1 ++#ifdef __sgi ++# include ++# ifndef _RLD_INTERFACE_DLFCN_H_DLADDR ++# define _RLD_INTERFACE_DLFCN_H_DLADDR ++ typedef struct Dl_info { ++ const char * dli_fname; ++ void * dli_fbase; ++ const char * dli_sname; ++ void * dli_saddr; ++ int dli_version; ++ int dli_reserved1; ++ long dli_reserved[4]; ++ } Dl_info; ++# endif ++# define _RLD_DLADDR 14 ++int dladdr(void *address, Dl_info *dl); ++ ++int dladdr(void *address, Dl_info *dl) ++{ ++ void *v; ++ v = _rld_new_interface(_RLD_DLADDR,address,dl); ++ return (int)v; ++} ++#endif + +-#define WEAK __attribute__((weak)) ++#define FREEBL_NO_WEAK 1 + + #ifdef FREEBL_NO_WEAK + +@@ -93,17 +116,17 @@ + static type_##fn ptr_##fn = NULL + + #define STUB_SAFE_CALL0(fn) \ +- if (ptr_##fn) { return ptr_##fn(); } ++ if (ptr_##fn) { ptr_##fn(); } + #define STUB_SAFE_CALL1(fn,a1) \ +- if (ptr_##fn) { return ptr_##fn(a1); } ++ if (ptr_##fn) { ptr_##fn(a1); } + #define STUB_SAFE_CALL2(fn,a1,a2) \ +- if (ptr_##fn) { return ptr_##fn(a1,a2); } ++ if (ptr_##fn) { ptr_##fn(a1,a2); } + #define STUB_SAFE_CALL3(fn,a1,a2,a3) \ +- if (ptr_##fn) { return ptr_##fn(a1,a2,a3); } ++ if (ptr_##fn) { ptr_##fn(a1,a2,a3); } + #define STUB_SAFE_CALL4(fn,a1,a2,a3,a4) \ +- if (ptr_##fn) { return ptr_##fn(a1,a2,a3,a4); } ++ if (ptr_##fn) { ptr_##fn(a1,a2,a3,a4); } + #define STUB_SAFE_CALL6(fn,a1,a2,a3,a4,a5,a6) \ +- if (ptr_##fn) { return ptr_##fn(a1,a2,a3,a4,a5,a6); } ++ if (ptr_##fn) { ptr_##fn(a1,a2,a3,a4,a5,a6); } + + #define STUB_FETCH_FUNCTION(fn) \ + ptr_##fn = (type_##fn) dlsym(lib,#fn); \ +@@ -118,6 +141,8 @@ + * libutil will not resolve these symbols. + */ + ++#define WEAK __attribute__((weak)) ++ + #define STUB_DECLARE(ret, fn, args) \ + WEAK extern ret fn args + +@@ -200,7 +225,7 @@ extern void + PORT_Free_stub(void *ptr) + { + STUB_SAFE_CALL1(PORT_Free_Util, ptr); +- return free(ptr); ++ free(ptr); + } + + extern void * +@@ -220,14 +245,14 @@ PORT_ZFree_stub(void *ptr, size_t len) + { + STUB_SAFE_CALL2(PORT_ZFree_Util, ptr, len); + memset(ptr, 0, len); +- return free(ptr); ++ free(ptr); + } + + extern void + PR_Free_stub(void *ptr) + { + STUB_SAFE_CALL1(PR_Free, ptr); +- return free(ptr); ++ free(ptr); + } + + /* +@@ -530,7 +555,7 @@ freebl_InitNSSUtil(void *lib) + * fetch the library if it's loaded. For NSS it should already be loaded + */ + #define freebl_getLibrary(libName) \ +- dlopen (libName, RTLD_LAZY|RTLD_NOLOAD) ++ dlopen (libName, RTLD_LAZY) + + #define freebl_releaseLibrary(lib) \ + if (lib) dlclose(lib) +@@ -538,7 +563,7 @@ freebl_InitNSSUtil(void *lib) + static void * FREEBLnsprGlobalLib = NULL; + static void * FREEBLnssutilGlobalLib = NULL; + +-void __attribute ((destructor)) FREEBL_unload() ++void FREEBL_unload() + { + freebl_releaseLibrary(FREEBLnsprGlobalLib); + freebl_releaseLibrary(FREEBLnssutilGlobalLib); +--- mozilla/security/nss/lib/freebl/nsslowhash.c.dist 2009-09-16 18:16:17.529500640 +0100 ++++ b/mozilla/security/nss/lib/freebl/nsslowhash.c 2009-09-16 18:16:37.634080480 +0100 +@@ -375,21 +375,21 @@ NSSLOWHASH_NewContext(NSSLOWInitContext + void + NSSLOWHASH_Begin(NSSLOWHASHContext *context) + { +- return context->hashObj->begin(context->hashCtxt); ++ context->hashObj->begin(context->hashCtxt); + } + + void + NSSLOWHASH_Update(NSSLOWHASHContext *context, const unsigned char *buf, + unsigned int len) + { +- return context->hashObj->update(context->hashCtxt, buf, len); ++ context->hashObj->update(context->hashCtxt, buf, len); + } + + void + NSSLOWHASH_End(NSSLOWHASHContext *context, unsigned char *buf, + unsigned int *ret, unsigned int len) + { +- return context->hashObj->end(context->hashCtxt, buf, ret, len); ++ context->hashObj->end(context->hashCtxt, buf, ret, len); + } + + void Added: csw/mgar/pkg/nss/trunk/files/shared-libs.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/shared-libs.patch (rev 0) +++ csw/mgar/pkg/nss/trunk/files/shared-libs.patch 2009-11-21 15:16:44 UTC (rev 7372) @@ -0,0 +1,18 @@ +--- nss-3.12.4/mozilla/security/nss/lib/softoken/config.mk 2009-11-21 15:53:39.167529521 +0100 ++++ nss-3.12.4/mozilla/security/nss/lib/softoken/config.mk.orig 2009-11-21 15:52:38.972288644 +0100 +@@ -54,7 +54,6 @@ + + ifdef NS_USE_GCC + EXTRA_SHARED_LIBS += \ +- -L/opt/csw/lib \ + -L$(DIST)/lib \ + -L$(NSSUTIL_LIB_DIR) \ + -lnssutil3 \ +@@ -81,7 +80,6 @@ + # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS) + # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX. + EXTRA_SHARED_LIBS += \ +- -L/opt/csw/lib \ + -L$(DIST)/lib \ + -L$(NSSUTIL_LIB_DIR) \ + -lnssutil3 \ 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 Nov 21 17:40:28 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 21 Nov 2009 16:40:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[7373] csw/mgar/pkg/nss/trunk Message-ID: Revision: 7373 http://gar.svn.sourceforge.net/gar/?rev=7373&view=rev Author: wahwah Date: 2009-11-21 16:40:28 +0000 (Sat, 21 Nov 2009) Log Message: ----------- nss: adding a patch to find the sqlite3 library, using with-nspr-4.8 version of NSS Modified Paths: -------------- csw/mgar/pkg/nss/trunk/Makefile csw/mgar/pkg/nss/trunk/checksums csw/mgar/pkg/nss/trunk/files/shared-libs.patch Added Paths: ----------- csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3.patch Modified: csw/mgar/pkg/nss/trunk/Makefile =================================================================== --- csw/mgar/pkg/nss/trunk/Makefile 2009-11-21 15:16:44 UTC (rev 7372) +++ csw/mgar/pkg/nss/trunk/Makefile 2009-11-21 16:40:28 UTC (rev 7373) @@ -43,7 +43,8 @@ ## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). # TODO: Generate RTM_NAME from GARVERSION RTM_NAME = NSS_3_12_4_RTM -MASTER_SITES = ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/ +# MASTER_SITES = ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/ +MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_4_RTM/src/ ## ## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the ## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge @@ -56,12 +57,15 @@ # http://bugs.gentoo.org/show_bug.cgi?id=256102 PATCHFILES = nss-3.12.4.patch PATCHFILES += shared-libs.patch +PATCHFILES += platlibs-sqlite3.patch ## PATCHFILES = freebl.patch ## ## Whitespace-separated list of files which comprise this build. mGAR will look ## for the files in the $(FILEDIR) (trunk/files) directory and on the ## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION)-with-nspr-4.8.tar.gz +DISTNAME = $(GARNAME)-$(GARVERSION)-with-nspr-4.8 ## ## We define upstream file regex so we can be notifed of new upstream software ## release Modified: csw/mgar/pkg/nss/trunk/checksums =================================================================== --- csw/mgar/pkg/nss/trunk/checksums 2009-11-21 15:16:44 UTC (rev 7372) +++ csw/mgar/pkg/nss/trunk/checksums 2009-11-21 16:40:28 UTC (rev 7373) @@ -1,3 +1,4 @@ +8f76e381bf2339d731bfd5b8116c25a4 nss-3.12.4-with-nspr-4.8.tar.gz 39b9d2431d4ff717d103b742fcaefb81 nss-3.12.4.patch -1ee3ed9c1900079319bd1de51388d856 nss-3.12.4.tar.gz -0b7f69f1fdd6fbeddd9c216f59ecabc6 shared-libs.patch +f0f40bd021423ab1680b4d87cd19c1db platlibs-sqlite3.patch +971cfae38e3070d64dccb0960e5deae0 shared-libs.patch Added: csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3.patch (rev 0) +++ csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3.patch 2009-11-21 16:40:28 UTC (rev 7373) @@ -0,0 +1,11 @@ +--- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk.orig 2009-11-21 17:28:09.997982796 +0100 ++++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk 2009-11-21 17:28:32.107632453 +0100 +@@ -80,7 +80,7 @@ + endif + endif + +-SQLITE=-lsqlite3 ++SQLITE=-R/opt/csw/lib/$$ISALIST -L/opt/csw/lib -lsqlite3 + + ifdef NSS_DISABLE_DBM + DBMLIB = $(NULL) Modified: csw/mgar/pkg/nss/trunk/files/shared-libs.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/shared-libs.patch 2009-11-21 15:16:44 UTC (rev 7372) +++ csw/mgar/pkg/nss/trunk/files/shared-libs.patch 2009-11-21 16:40:28 UTC (rev 7373) @@ -1,18 +1,18 @@ ---- nss-3.12.4/mozilla/security/nss/lib/softoken/config.mk 2009-11-21 15:53:39.167529521 +0100 -+++ nss-3.12.4/mozilla/security/nss/lib/softoken/config.mk.orig 2009-11-21 15:52:38.972288644 +0100 -@@ -54,7 +54,6 @@ +--- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/lib/softoken/config.mk.orig 2009-11-21 16:42:33.499624641 +0100 ++++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/lib/softoken/config.mk 2009-11-21 16:43:06.838729533 +0100 +@@ -54,6 +54,7 @@ ifdef NS_USE_GCC EXTRA_SHARED_LIBS += \ -- -L/opt/csw/lib \ ++ -L/opt/csw/lib \ -L$(DIST)/lib \ -L$(NSSUTIL_LIB_DIR) \ -lnssutil3 \ -@@ -81,7 +80,6 @@ +@@ -80,6 +81,7 @@ # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS) # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX. EXTRA_SHARED_LIBS += \ -- -L/opt/csw/lib \ ++ -L/opt/csw/lib \ -L$(DIST)/lib \ -L$(NSSUTIL_LIB_DIR) \ -lnssutil3 \ 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 Nov 21 20:46:36 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 21 Nov 2009 19:46:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[7374] csw/mgar/pkg/rox-filer/trunk/Makefile Message-ID: Revision: 7374 http://gar.svn.sourceforge.net/gar/?rev=7374&view=rev Author: wahwah Date: 2009-11-21 19:46:36 +0000 (Sat, 21 Nov 2009) Log Message: ----------- rox-filer: Adding more files from the $(WORKSRC), should now include help and Options.xml Modified Paths: -------------- csw/mgar/pkg/rox-filer/trunk/Makefile Modified: csw/mgar/pkg/rox-filer/trunk/Makefile =================================================================== --- csw/mgar/pkg/rox-filer/trunk/Makefile 2009-11-21 16:40:28 UTC (rev 7373) +++ csw/mgar/pkg/rox-filer/trunk/Makefile 2009-11-21 19:46:36 UTC (rev 7374) @@ -18,8 +18,9 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 REQUIRED_PKGS = CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWgtk2 REQUIRED_PKGS += CSWlibatk CSWlibcairo CSWlibglade2 CSWlibxml2 CSWpango -REQUIRED_PKGS += CSWbash +REQUIRED_PKGS += CSWbash CSWlibice CSWlibsm + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = rox INSTALL_SCRIPTS = rox @@ -41,6 +42,12 @@ ginstall -d $(DESTDIR)$(datadir)/ROX gcp -av $(WORKSRC)/ROX-Filer/ROX $(DESTDIR)$(datadir) gcp -av $(WORKSRC)/ROX-Filer/images $(DESTDIR)$(datadir)/ROX + gcp -av $(WORKSRC)/ROX-Filer/Help $(DESTDIR)$(datadir)/ROX + gcp -av $(WORKSRC)/ROX-Filer/Options.xml $(DESTDIR)$(datadir)/ROX + gcp -av $(WORKSRC)/ROX-Filer/Messages $(DESTDIR)$(datadir)/ROX + gcp -av $(WORKSRC)/ROX-Filer/AppInfo.xml $(DESTDIR)$(datadir)/ROX + ginstall -d -m 755 $(DESTDIR)$(mandir)/man1 + ginstall -m 644 $(WORKSRC)/rox.1 $(DESTDIR)$(mandir)/man1 gfind $(DESTDIR)$(datadir) -type d -exec chmod 0755 {} \; gfind $(DESTDIR)$(datadir) -type f -exec chmod 0644 {} \; @$(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 Sat Nov 21 20:51:01 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 21 Nov 2009 19:51:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[7375] csw/mgar/pkg/tightvnc/trunk Message-ID: Revision: 7375 http://gar.svn.sourceforge.net/gar/?rev=7375&view=rev Author: wahwah Date: 2009-11-21 19:51:01 +0000 (Sat, 21 Nov 2009) Log Message: ----------- tightvnc: updated the wrapper script to cope with missing /tmp/.X11-unix Modified Paths: -------------- csw/mgar/pkg/tightvnc/trunk/checksums csw/mgar/pkg/tightvnc/trunk/files/vncserver-wrapper.sh Modified: csw/mgar/pkg/tightvnc/trunk/checksums =================================================================== --- csw/mgar/pkg/tightvnc/trunk/checksums 2009-11-21 19:46:36 UTC (rev 7374) +++ csw/mgar/pkg/tightvnc/trunk/checksums 2009-11-21 19:51:01 UTC (rev 7375) @@ -4,5 +4,5 @@ c5e9c3e4017caa65d14a0b98858043b9 0003-libdix.a-after-libos.a.patch 691ddda52a4bcbc14ee1c19f77e465a1 cswvncserver 397b35faad32d5246b6d44b142f8304f tightvnc-1.3.10_unixsrc.tar.bz2 -46d0bcb1569025d9a559bab091aa79fa vncserver-wrapper.sh +e5deb36e898ac88a64dfb960976d251c vncserver-wrapper.sh 56c09be17c17184e96193c13246fd649 vncservers Modified: csw/mgar/pkg/tightvnc/trunk/files/vncserver-wrapper.sh =================================================================== --- csw/mgar/pkg/tightvnc/trunk/files/vncserver-wrapper.sh 2009-11-21 19:46:36 UTC (rev 7374) +++ csw/mgar/pkg/tightvnc/trunk/files/vncserver-wrapper.sh 2009-11-21 19:51:01 UTC (rev 7375) @@ -36,6 +36,8 @@ if writable "${test_dir}"; then exec /opt/csw/libexec/vncserver "$@" +elif [ ! -d "${test_dir}" ]; then + exec /opt/csw/libexec/vncserver "$@" else cat < Revision: 7376 http://gar.svn.sourceforge.net/gar/?rev=7376&view=rev Author: wahwah Date: 2009-11-21 19:57:53 +0000 (Sat, 21 Nov 2009) Log Message: ----------- tightvnc: Updating a checksum for a file with the Id tag Modified Paths: -------------- csw/mgar/pkg/tightvnc/trunk/checksums Modified: csw/mgar/pkg/tightvnc/trunk/checksums =================================================================== --- csw/mgar/pkg/tightvnc/trunk/checksums 2009-11-21 19:51:01 UTC (rev 7375) +++ csw/mgar/pkg/tightvnc/trunk/checksums 2009-11-21 19:57:53 UTC (rev 7376) @@ -4,5 +4,5 @@ c5e9c3e4017caa65d14a0b98858043b9 0003-libdix.a-after-libos.a.patch 691ddda52a4bcbc14ee1c19f77e465a1 cswvncserver 397b35faad32d5246b6d44b142f8304f tightvnc-1.3.10_unixsrc.tar.bz2 -e5deb36e898ac88a64dfb960976d251c vncserver-wrapper.sh +e51b38ef54aa082ed9c277e87b1399de vncserver-wrapper.sh 56c09be17c17184e96193c13246fd649 vncservers 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 Nov 21 21:22:58 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 21 Nov 2009 20:22:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7377] csw/mgar/pkg/nss/trunk Message-ID: Revision: 7377 http://gar.svn.sourceforge.net/gar/?rev=7377&view=rev Author: wahwah Date: 2009-11-21 20:22:58 +0000 (Sat, 21 Nov 2009) Log Message: ----------- nss: Added the runtime search path option to the shared libs patch. Now, instead of segfaulting, it aborts. Modified Paths: -------------- csw/mgar/pkg/nss/trunk/Makefile csw/mgar/pkg/nss/trunk/checksums csw/mgar/pkg/nss/trunk/files/shared-libs.patch Modified: csw/mgar/pkg/nss/trunk/Makefile =================================================================== --- csw/mgar/pkg/nss/trunk/Makefile 2009-11-21 19:57:53 UTC (rev 7376) +++ csw/mgar/pkg/nss/trunk/Makefile 2009-11-21 20:22:58 UTC (rev 7377) @@ -190,9 +190,6 @@ ## EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -## # To fix PR_STATIC_ASSERT(sizeof(size_t) > 4); in drbg.c, line 510 -## EXTRA_CFLAGS = -DNS_PTR_GT_32=1 -## EXTRA_CXXFLAGS = -DNS_PTR_GT_32=1 BUILD_OPT = 1 NSS_USE_SYSTEM_SQLITE = 1 NSPR_INCLUDE_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --cflags-only-I nspr | gsed 's/-I//') @@ -207,11 +204,13 @@ # export DSO_LDOPTS ifeq ($(MODULATION),isa-sparcv9) USE_64 = 1 + export USE_64 endif ifeq ($(MODULATION),isa-amd64) USE_64 = 1 + export USE_64 endif -export BUILD_OPT NSS_USE_SYSTEM_SQLITE NSPR_INCLUDE_DIR NSPR_LIB_DIR USE_64 +export BUILD_OPT NSS_USE_SYSTEM_SQLITE NSPR_INCLUDE_DIR NSPR_LIB_DIR export USE_SYSTEM_ZLIB ZLIB_LIBS NSDISTMODE NSS_ENABLE_ECC XCFLAGS FREEBL_NO_DEPEND include gar/category.mk Modified: csw/mgar/pkg/nss/trunk/checksums =================================================================== --- csw/mgar/pkg/nss/trunk/checksums 2009-11-21 19:57:53 UTC (rev 7376) +++ csw/mgar/pkg/nss/trunk/checksums 2009-11-21 20:22:58 UTC (rev 7377) @@ -1,4 +1,4 @@ 8f76e381bf2339d731bfd5b8116c25a4 nss-3.12.4-with-nspr-4.8.tar.gz 39b9d2431d4ff717d103b742fcaefb81 nss-3.12.4.patch f0f40bd021423ab1680b4d87cd19c1db platlibs-sqlite3.patch -971cfae38e3070d64dccb0960e5deae0 shared-libs.patch +31aeaf6718c269812c445fb3e86f6ac6 shared-libs.patch Modified: csw/mgar/pkg/nss/trunk/files/shared-libs.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/shared-libs.patch 2009-11-21 19:57:53 UTC (rev 7376) +++ csw/mgar/pkg/nss/trunk/files/shared-libs.patch 2009-11-21 20:22:58 UTC (rev 7377) @@ -1,17 +1,19 @@ ---- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/lib/softoken/config.mk.orig 2009-11-21 16:42:33.499624641 +0100 -+++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/lib/softoken/config.mk 2009-11-21 16:43:06.838729533 +0100 -@@ -54,6 +54,7 @@ +--- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/lib/softoken/config.mk.orig 2009-11-21 21:00:43.881431583 +0100 ++++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/lib/softoken/config.mk 2009-11-21 21:01:18.985608134 +0100 +@@ -54,6 +54,8 @@ ifdef NS_USE_GCC EXTRA_SHARED_LIBS += \ ++ -R/opt/csw/lib/$$ISALIST \ + -L/opt/csw/lib \ -L$(DIST)/lib \ -L$(NSSUTIL_LIB_DIR) \ -lnssutil3 \ -@@ -80,6 +81,7 @@ +@@ -80,6 +82,8 @@ # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS) # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX. EXTRA_SHARED_LIBS += \ ++ -R/opt/csw/lib/$$ISALIST \ + -L/opt/csw/lib \ -L$(DIST)/lib \ -L$(NSSUTIL_LIB_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 Sun Nov 22 03:04:18 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 22 Nov 2009 02:04:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7378] csw/mgar/pkg/coreutils/trunk Message-ID: Revision: 7378 http://gar.svn.sourceforge.net/gar/?rev=7378&view=rev Author: bdwalton Date: 2009-11-22 02:04:18 +0000 (Sun, 22 Nov 2009) Log Message: ----------- coreutils: bump to 8.1; disable acl support; add program prefix Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile csw/mgar/pkg/coreutils/trunk/checksums Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-21 20:22:58 UTC (rev 7377) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-22 02:04:18 UTC (rev 7378) @@ -1,5 +1,5 @@ GARNAME = coreutils -GARVERSION = 7.6 +GARVERSION = 8.1 CATEGORIES = utils DESCRIPTION = GNU core utilities @@ -22,6 +22,7 @@ sysconfdir = /etc/opt/csw localstatedir = /var/opt/csw CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --disable-acl --program-prefix=g TEST_ARGS = check Modified: csw/mgar/pkg/coreutils/trunk/checksums =================================================================== --- csw/mgar/pkg/coreutils/trunk/checksums 2009-11-21 20:22:58 UTC (rev 7377) +++ csw/mgar/pkg/coreutils/trunk/checksums 2009-11-22 02:04:18 UTC (rev 7378) @@ -1 +1 @@ -3d82f979229365f880da750642e67cf3 coreutils-7.6.tar.gz +4cde9f31604f4da188ed302ca55545ea coreutils-8.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 Nov 22 13:04:52 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 22 Nov 2009 12:04:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[7379] csw/mgar/pkg/nss/trunk Message-ID: Revision: 7379 http://gar.svn.sourceforge.net/gar/?rev=7379&view=rev Author: wahwah Date: 2009-11-22 12:04:52 +0000 (Sun, 22 Nov 2009) Log Message: ----------- nss: Adding runtime search paths via gsed. It still aborts. Help\! Modified Paths: -------------- csw/mgar/pkg/nss/trunk/Makefile csw/mgar/pkg/nss/trunk/checksums csw/mgar/pkg/nss/trunk/files/shared-libs.patch Added Paths: ----------- csw/mgar/pkg/nss/trunk/files/runtime-search-path.patch csw/mgar/pkg/nss/trunk/files/whoami.patch Modified: csw/mgar/pkg/nss/trunk/Makefile =================================================================== --- csw/mgar/pkg/nss/trunk/Makefile 2009-11-22 02:04:18 UTC (rev 7378) +++ csw/mgar/pkg/nss/trunk/Makefile 2009-11-22 12:04:52 UTC (rev 7379) @@ -2,6 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +GARFLAVOR = DBG + ## 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. @@ -13,6 +15,12 @@ ## # Based on: # http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/nss-3.12.4-r1.ebuild?view=markup +# and +# https://developer.mozilla.org/en/NSS_reference/Building_and_installing_NSS/Build_instructions +# and +# https://developer.mozilla.org/en/NSS_reference/NSS_environment_variables +# and +# https://developer.mozilla.org/en/NSS_reference/Building_and_installing_NSS/Installation_guide GARNAME = nss GARVERSION = 3.12.4 # http://www.gentoo-portage.com/AJAX/Ebuild/96014 @@ -58,6 +66,8 @@ PATCHFILES = nss-3.12.4.patch PATCHFILES += shared-libs.patch PATCHFILES += platlibs-sqlite3.patch +PATCHFILES += whoami.patch +PATCHFILES += runtime-search-path.patch ## PATCHFILES = freebl.patch ## ## Whitespace-separated list of files which comprise this build. mGAR will look @@ -190,10 +200,12 @@ ## EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -BUILD_OPT = 1 +ifeq (OPT,$(GARFLAVOR)) + BUILD_OPT = 1 +endif NSS_USE_SYSTEM_SQLITE = 1 NSPR_INCLUDE_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --cflags-only-I nspr | gsed 's/-I//') -NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//') +NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ') USE_SYSTEM_ZLIB = 1 ZLIB_LIBS = -lz NSDISTMODE = copy @@ -202,6 +214,7 @@ FREEBL_NO_DEPEND = 1 # DSO_LDOPTS = -R/opt/csw/lib/$$$$ISALIST -L/opt/csw/lib # export DSO_LDOPTS +LDOPTS = $(LD_OPTIONS) ifeq ($(MODULATION),isa-sparcv9) USE_64 = 1 export USE_64 @@ -215,16 +228,40 @@ include gar/category.mk -configure-nss: +configure-nss: respect-ldflags add-runtime-search-path + @$(MAKECOOKIE) + +respect-ldflags: (cd $(WORKSRC)/mozilla/security/coreconf \ && \ gsed -e 's:SOURCE_PREFIX = $$(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $$(CORE_DEPTH)/dist:' \ -i source.mk \ && \ - gsed -i -e 's/\$$(MKSHLIB) -o/\$$(MKSHLIB) \$$(LDFLAGS) -o/g' rules.mk \ - ) + gsed -i -e 's/\$$(MKSHLIB) -o/\$$(MKSHLIB) \$$(LDFLAGS) -o/g' rules.mk) @$(MAKECOOKIE) +add-runtime-search-path: + for f in \ + mozilla/security/nss/cmd/pk11mode/Makefile \ + mozilla/security/nss/cmd/platlibs.mk \ + mozilla/security/nss/cmd/shlibsign/Makefile \ + mozilla/security/nss/cmd/shlibsign/mangle/Makefile \ + mozilla/security/nss/lib/ckfw/builtins/Makefile \ + mozilla/security/nss/lib/ckfw/capi/Makefile \ + mozilla/security/nss/lib/ckfw/nssmkey/Makefile \ + mozilla/security/nss/lib/freebl/config.mk \ + mozilla/security/nss/lib/nss/config.mk \ + mozilla/security/nss/lib/smime/config.mk \ + mozilla/security/nss/lib/softoken/config.mk \ + mozilla/security/nss/lib/softoken/legacydb/config.mk \ + mozilla/security/nss/lib/ssl/config.mk \ + mozilla/security/nss/lib/util/config.mk; do \ + gsed -i -e 's|-L\$$(NSPR_LIB_DIR)|-L$$(NSPR_LIB_DIR) -R$$(NSPR_LIB_DIR)/$$$$ISALIST|' $(WORKSRC)/$$f; \ + done; + # A form of assert + ggrep -- -R $(WORKSRC)/mozilla/security/nss/lib/freebl/config.mk + @$(MAKECOOKIE) + build-nss: build-coreconf build-dbm build-nss-compile build-coreconf: @@ -250,3 +287,4 @@ && \ gmake -j1 CC="$(CC)") @$(MAKECOOKIE) + Modified: csw/mgar/pkg/nss/trunk/checksums =================================================================== --- csw/mgar/pkg/nss/trunk/checksums 2009-11-22 02:04:18 UTC (rev 7378) +++ csw/mgar/pkg/nss/trunk/checksums 2009-11-22 12:04:52 UTC (rev 7379) @@ -1,4 +1,6 @@ 8f76e381bf2339d731bfd5b8116c25a4 nss-3.12.4-with-nspr-4.8.tar.gz 39b9d2431d4ff717d103b742fcaefb81 nss-3.12.4.patch f0f40bd021423ab1680b4d87cd19c1db platlibs-sqlite3.patch -31aeaf6718c269812c445fb3e86f6ac6 shared-libs.patch +d41d8cd98f00b204e9800998ecf8427e runtime-search-path.patch +90b4d32437b3e3fdadcf4f16339aa2ed shared-libs.patch +221646aa1954b4a255ac03e7d8b0225d whoami.patch Modified: csw/mgar/pkg/nss/trunk/files/shared-libs.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/shared-libs.patch 2009-11-22 02:04:18 UTC (rev 7378) +++ csw/mgar/pkg/nss/trunk/files/shared-libs.patch 2009-11-22 12:04:52 UTC (rev 7379) @@ -1,20 +1,32 @@ ---- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/lib/softoken/config.mk.orig 2009-11-21 21:00:43.881431583 +0100 -+++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/lib/softoken/config.mk 2009-11-21 21:01:18.985608134 +0100 -@@ -54,6 +54,8 @@ +--- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/lib/softoken/config.mk.orig 2009-11-22 11:39:49.492474635 +0100 ++++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/lib/softoken/config.mk 2009-11-22 11:40:51.857227138 +0100 +@@ -54,10 +54,14 @@ ifdef NS_USE_GCC EXTRA_SHARED_LIBS += \ + -R/opt/csw/lib/$$ISALIST \ + -L/opt/csw/lib \ -L$(DIST)/lib \ ++ -R$(NSSUTIL_LIB_DIR)/$$ISALIST \ -L$(NSSUTIL_LIB_DIR) \ -lnssutil3 \ -@@ -80,6 +82,8 @@ + -lsqlite3 \ ++ -R$(NSPR_LIB_DIR)/$$ISALIST \ + -L$(NSPR_LIB_DIR) \ + -lplc4 \ + -lplds4 \ +@@ -80,10 +84,14 @@ # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS) # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX. EXTRA_SHARED_LIBS += \ + -R/opt/csw/lib/$$ISALIST \ + -L/opt/csw/lib \ -L$(DIST)/lib \ ++ -R$(NSSUTIL_LIB_DIR)/$$ISALIST \ -L$(NSSUTIL_LIB_DIR) \ -lnssutil3 \ + -lsqlite3 \ ++ -R$(NSPR_LIB_DIR)/$$ISALIST \ + -L$(NSPR_LIB_DIR) \ + -lplc4 \ + -lplds4 \ Added: csw/mgar/pkg/nss/trunk/files/whoami.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/whoami.patch (rev 0) +++ csw/mgar/pkg/nss/trunk/files/whoami.patch 2009-11-22 12:04:52 UTC (rev 7379) @@ -0,0 +1,11 @@ +--- nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/UNIX.mk.orig 2009-11-22 02:25:17.411354784 +0100 ++++ nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/UNIX.mk 2009-11-22 02:25:24.833876220 +0100 +@@ -46,7 +46,7 @@ + DEFINES += -UDEBUG -DNDEBUG + else + OPTIMIZER += -g +- USERNAME := $(shell whoami) ++ USERNAME := $(shell gwhoami) + USERNAME := $(subst -,_,$(USERNAME)) + DEFINES += -DDEBUG -UNDEBUG -DDEBUG_$(USERNAME) + endif 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 Nov 22 13:46:36 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 22 Nov 2009 12:46:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[7380] csw/mgar/pkg/nss/trunk/Makefile Message-ID: Revision: 7380 http://gar.svn.sourceforge.net/gar/?rev=7380&view=rev Author: wahwah Date: 2009-11-22 12:46:36 +0000 (Sun, 22 Nov 2009) Log Message: ----------- nss: Removing template comments from the Makefile Modified Paths: -------------- csw/mgar/pkg/nss/trunk/Makefile Modified: csw/mgar/pkg/nss/trunk/Makefile =================================================================== --- csw/mgar/pkg/nss/trunk/Makefile 2009-11-22 12:04:52 UTC (rev 7379) +++ csw/mgar/pkg/nss/trunk/Makefile 2009-11-22 12:46:36 UTC (rev 7380) @@ -4,15 +4,6 @@ GARFLAVOR = DBG -## 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 -## # Based on: # http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/nss-3.12.4-r1.ebuild?view=markup # and @@ -24,180 +15,33 @@ GARNAME = nss GARVERSION = 3.12.4 # http://www.gentoo-portage.com/AJAX/Ebuild/96014 -## -## 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 = Network Security Services library, implements PKI support -## -## 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 = http://www.mozilla.org/projects/security/pki/nss/ -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). # TODO: Generate RTM_NAME from GARVERSION RTM_NAME = NSS_3_12_4_RTM # MASTER_SITES = ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/ MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_4_RTM/src/ -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. # http://bugs.gentoo.org/show_bug.cgi?id=256102 PATCHFILES = nss-3.12.4.patch PATCHFILES += shared-libs.patch PATCHFILES += platlibs-sqlite3.patch PATCHFILES += whoami.patch PATCHFILES += runtime-search-path.patch -## PATCHFILES = freebl.patch -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). # DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES = $(GARNAME)-$(GARVERSION)-with-nspr-4.8.tar.gz DISTNAME = $(GARNAME)-$(GARVERSION)-with-nspr-4.8 -## -## We define upstream file regex so we can be notifed of new upstream software -## release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_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. REQUIRED_PKGS = CSWnspr CSWsqlite3 -## -## A list of packages necessary to build this package PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWsqlite3devel -## -## When using non-empty $(PACKAGES): -## REQUIRED_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 = nss BUILD_SCRIPTS = nss INSTALL_SCRIPTS = nss TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. CONFIGURE_ARGS = $(DIRPATHS) -## BUILD64 = 1 -## 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 -## EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib ifeq (OPT,$(GARFLAVOR)) @@ -212,8 +56,6 @@ NSS_ENABLE_ECC = 1 XCFLAGS=$(CFLAGS) FREEBL_NO_DEPEND = 1 -# DSO_LDOPTS = -R/opt/csw/lib/$$$$ISALIST -L/opt/csw/lib -# export DSO_LDOPTS LDOPTS = $(LD_OPTIONS) ifeq ($(MODULATION),isa-sparcv9) USE_64 = 1 @@ -241,6 +83,7 @@ @$(MAKECOOKIE) add-runtime-search-path: + # Make sure that the runtime search path is added for NSPR libraries. for f in \ mozilla/security/nss/cmd/pk11mode/Makefile \ mozilla/security/nss/cmd/platlibs.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 Sun Nov 22 15:50:31 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 22 Nov 2009 14:50:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7381] csw/mgar/pkg/nss/trunk Message-ID: Revision: 7381 http://gar.svn.sourceforge.net/gar/?rev=7381&view=rev Author: wahwah Date: 2009-11-22 14:50:31 +0000 (Sun, 22 Nov 2009) Log Message: ----------- nss: Tyding up the Makefile, added a patch showing how to debug shlibsign Modified Paths: -------------- csw/mgar/pkg/nss/trunk/Makefile csw/mgar/pkg/nss/trunk/checksums Added Paths: ----------- csw/mgar/pkg/nss/trunk/files/sign-under-dbx.patch Modified: csw/mgar/pkg/nss/trunk/Makefile =================================================================== --- csw/mgar/pkg/nss/trunk/Makefile 2009-11-22 12:46:36 UTC (rev 7380) +++ csw/mgar/pkg/nss/trunk/Makefile 2009-11-22 14:50:31 UTC (rev 7381) @@ -2,19 +2,18 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ + +# Based on the following resources: +# - http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/nss-3.12.4-r1.ebuild?view=markup +# - https://developer.mozilla.org/en/NSS_reference/Building_and_installing_NSS/Build_instructions +# - https://developer.mozilla.org/en/NSS_reference/NSS_environment_variables +# - https://developer.mozilla.org/en/NSS_reference/Building_and_installing_NSS/Installation_guide + +# Debugging mode, this is work in progress. GARFLAVOR = DBG -# Based on: -# http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/nss-3.12.4-r1.ebuild?view=markup -# and -# https://developer.mozilla.org/en/NSS_reference/Building_and_installing_NSS/Build_instructions -# and -# https://developer.mozilla.org/en/NSS_reference/NSS_environment_variables -# and -# https://developer.mozilla.org/en/NSS_reference/Building_and_installing_NSS/Installation_guide GARNAME = nss GARVERSION = 3.12.4 -# http://www.gentoo-portage.com/AJAX/Ebuild/96014 CATEGORIES = lib DESCRIPTION = Network Security Services library, implements PKI support define BLURB @@ -22,25 +21,24 @@ SPKG_SOURCEURL = http://www.mozilla.org/projects/security/pki/nss/ # TODO: Generate RTM_NAME from GARVERSION RTM_NAME = NSS_3_12_4_RTM -# MASTER_SITES = ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/ -MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_4_RTM/src/ -# http://bugs.gentoo.org/show_bug.cgi?id=256102 +MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/ +# This patch taken from http://bugs.gentoo.org/show_bug.cgi?id=256102 PATCHFILES = nss-3.12.4.patch PATCHFILES += shared-libs.patch PATCHFILES += platlibs-sqlite3.patch +PATCHFILES += platlibs-sunos.patch PATCHFILES += whoami.patch PATCHFILES += runtime-search-path.patch -# DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES = $(GARNAME)-$(GARVERSION)-with-nspr-4.8.tar.gz -DISTNAME = $(GARNAME)-$(GARVERSION)-with-nspr-4.8 -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +DIST_SUFFIX = -with-nspr-4.8 +DISTFILES = $(GARNAME)-$(GARVERSION)$(DIST_SUFFIX).tar.gz +DISTNAME = $(GARNAME)-$(GARVERSION)$(DIST_SUFFIX) +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)$(DIST_SUFFIX).tar.gz REQUIRED_PKGS = CSWnspr CSWsqlite3 PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWsqlite3devel CONFIGURE_SCRIPTS = nss BUILD_SCRIPTS = nss INSTALL_SCRIPTS = nss TEST_SCRIPTS = -CONFIGURE_ARGS = $(DIRPATHS) BUILD64 = 1 EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib @@ -54,7 +52,7 @@ ZLIB_LIBS = -lz NSDISTMODE = copy NSS_ENABLE_ECC = 1 -XCFLAGS=$(CFLAGS) +XCFLAGS = $(CFLAGS) FREEBL_NO_DEPEND = 1 LDOPTS = $(LD_OPTIONS) ifeq ($(MODULATION),isa-sparcv9) @@ -76,33 +74,19 @@ respect-ldflags: (cd $(WORKSRC)/mozilla/security/coreconf \ && \ - gsed -e 's:SOURCE_PREFIX = $$(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $$(CORE_DEPTH)/dist:' \ - -i source.mk \ + gsed -i -e 's:SOURCE_PREFIX = $$(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $$(CORE_DEPTH)/dist:' \ + source.mk \ && \ gsed -i -e 's/\$$(MKSHLIB) -o/\$$(MKSHLIB) \$$(LDFLAGS) -o/g' rules.mk) @$(MAKECOOKIE) add-runtime-search-path: - # Make sure that the runtime search path is added for NSPR libraries. - for f in \ - mozilla/security/nss/cmd/pk11mode/Makefile \ - mozilla/security/nss/cmd/platlibs.mk \ - mozilla/security/nss/cmd/shlibsign/Makefile \ - mozilla/security/nss/cmd/shlibsign/mangle/Makefile \ - mozilla/security/nss/lib/ckfw/builtins/Makefile \ - mozilla/security/nss/lib/ckfw/capi/Makefile \ - mozilla/security/nss/lib/ckfw/nssmkey/Makefile \ - mozilla/security/nss/lib/freebl/config.mk \ - mozilla/security/nss/lib/nss/config.mk \ - mozilla/security/nss/lib/smime/config.mk \ - mozilla/security/nss/lib/softoken/config.mk \ - mozilla/security/nss/lib/softoken/legacydb/config.mk \ - mozilla/security/nss/lib/ssl/config.mk \ - mozilla/security/nss/lib/util/config.mk; do \ - gsed -i -e 's|-L\$$(NSPR_LIB_DIR)|-L$$(NSPR_LIB_DIR) -R$$(NSPR_LIB_DIR)/$$$$ISALIST|' $(WORKSRC)/$$f; \ - done; + # Make sure that the runtime search path is added in all Makefiles. + gfind $(WORKSRC) \( -name Makefile -o -name '*.mk' \) \ + -exec gsed -i -e 's|-L\$$(NSPR_LIB_DIR)|-L$$(NSPR_LIB_DIR) -R$$(NSPR_LIB_DIR)/$$$$ISALIST|' \ + {} \; # A form of assert - ggrep -- -R $(WORKSRC)/mozilla/security/nss/lib/freebl/config.mk + gegrep -- '-R.*ISALIST' $(WORKSRC)/mozilla/security/nss/lib/freebl/config.mk @$(MAKECOOKIE) build-nss: build-coreconf build-dbm build-nss-compile Modified: csw/mgar/pkg/nss/trunk/checksums =================================================================== --- csw/mgar/pkg/nss/trunk/checksums 2009-11-22 12:46:36 UTC (rev 7380) +++ csw/mgar/pkg/nss/trunk/checksums 2009-11-22 14:50:31 UTC (rev 7381) @@ -1,6 +1,7 @@ 8f76e381bf2339d731bfd5b8116c25a4 nss-3.12.4-with-nspr-4.8.tar.gz 39b9d2431d4ff717d103b742fcaefb81 nss-3.12.4.patch f0f40bd021423ab1680b4d87cd19c1db platlibs-sqlite3.patch +441f12a9396a89841d384d8c89a052ff platlibs-sunos.patch d41d8cd98f00b204e9800998ecf8427e runtime-search-path.patch 90b4d32437b3e3fdadcf4f16339aa2ed shared-libs.patch 221646aa1954b4a255ac03e7d8b0225d whoami.patch Added: csw/mgar/pkg/nss/trunk/files/sign-under-dbx.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/sign-under-dbx.patch (rev 0) +++ csw/mgar/pkg/nss/trunk/files/sign-under-dbx.patch 2009-11-22 14:50:31 UTC (rev 7381) @@ -0,0 +1,15 @@ +This file shows how to run shlibsign under dbx, the Sun Studio debugger, to see +where it's aborting. + +--- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/shlibsign/./sign.sh.orig 2009-11-22 15:17:12.069116849 +0100 ++++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/shlibsign/./sign.sh 2009-11-22 15:17:54.559576926 +0100 +@@ -34,7 +34,7 @@ + export LIBRARY_PATH + ADDON_PATH=${1}/lib:${4}:$ADDON_PATH + export ADDON_PATH +- echo ${2}/shlibsign -v -i ${5} +- ${2}/shlibsign -v -i ${5} ++ echo /opt/studio/SOS11/SUNWspro/bin/dbx ${2}/shlibsign -v -i ${5} ++ /opt/studio/SOS11/SUNWspro/bin/dbx ${2}/shlibsign -v -i ${5} + ;; + esac This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Nov 22 16:58:46 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 22 Nov 2009 15:58:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7382] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 7382 http://gar.svn.sourceforge.net/gar/?rev=7382&view=rev Author: rthurner Date: 2009-11-22 15:58:46 +0000 (Sun, 22 Nov 2009) Log Message: ----------- update to hg-1.4 version checksums 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 2009-11-22 14:50:31 UTC (rev 7381) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2009-11-22 15:58:46 UTC (rev 7382) @@ -1,5 +1,5 @@ GARNAME = mercurial -GARVERSION = 1.3.1 +GARVERSION = 1.4 CATEGORIES = devel DESCRIPTION = Fast, lightweight Source Control Management system Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2009-11-22 14:50:31 UTC (rev 7381) +++ csw/mgar/pkg/mercurial/trunk/checksums 2009-11-22 15:58:46 UTC (rev 7382) @@ -1,3 +1,3 @@ -db884ecb306bcbf49b671f880d29c431 download/CSWmercurial.changelog.CSW -d280026d7687f061371e87ff306c97c2 download/CSWmercurial.gspec -6504f0dc32bd7ecf59a9f7f719432e76 download/mercurial-1.3.1.tar.gz +db884ecb306bcbf49b671f880d29c431 CSWmercurial.changelog.CSW +d280026d7687f061371e87ff306c97c2 CSWmercurial.gspec +951ebd4a8153eaa3c56fc0ce2575ab70 mercurial-1.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From glawsf at users.sourceforge.net Sun Nov 22 21:42:55 2009 From: glawsf at users.sourceforge.net (glawsf at users.sourceforge.net) Date: Sun, 22 Nov 2009 20:42:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[7383] csw/mgar/pkg/facter/trunk Message-ID: Revision: 7383 http://gar.svn.sourceforge.net/gar/?rev=7383&view=rev Author: glawsf Date: 2009-11-22 20:42:55 +0000 (Sun, 22 Nov 2009) Log Message: ----------- revved version 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 2009-11-22 15:58:46 UTC (rev 7382) +++ csw/mgar/pkg/facter/trunk/Makefile 2009-11-22 20:42:55 UTC (rev 7383) @@ -3,7 +3,7 @@ # $Id$ GARNAME = facter -GARVERSION = 1.5.6 +GARVERSION = 1.5.7 CATEGORIES = apps DESCRIPTION = a system fact gatherer Modified: csw/mgar/pkg/facter/trunk/checksums =================================================================== --- csw/mgar/pkg/facter/trunk/checksums 2009-11-22 15:58:46 UTC (rev 7382) +++ csw/mgar/pkg/facter/trunk/checksums 2009-11-22 20:42:55 UTC (rev 7383) @@ -1 +1 @@ -f2eda650cadfdaf549fab1a436c0db4d download/facter-1.5.6.tar.gz +21db7b613fe14a54e72ef062f3d5e190 facter-1.5.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 Nov 22 22:34:36 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 22 Nov 2009 21:34:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[7384] csw/mgar/pkg/autoconf/tags/autoconf-2.64, REV=2009.07 .29/ Message-ID: Revision: 7384 http://gar.svn.sourceforge.net/gar/?rev=7384&view=rev Author: dmichelsen Date: 2009-11-22 21:34:36 +0000 (Sun, 22 Nov 2009) Log Message: ----------- autoconf: Tag released version Added Paths: ----------- csw/mgar/pkg/autoconf/tags/autoconf-2.64,REV=2009.07.29/ 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 Nov 22 22:35:18 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 22 Nov 2009 21:35:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7385] csw/mgar/pkg/autoconf/trunk Message-ID: Revision: 7385 http://gar.svn.sourceforge.net/gar/?rev=7385&view=rev Author: dmichelsen Date: 2009-11-22 21:35:18 +0000 (Sun, 22 Nov 2009) Log Message: ----------- autoconf: Update to 2.65 Modified Paths: -------------- csw/mgar/pkg/autoconf/trunk/Makefile csw/mgar/pkg/autoconf/trunk/checksums Added Paths: ----------- csw/mgar/pkg/autoconf/trunk/files/0001-Prefer-CSW-tools.patch Removed Paths: ------------- csw/mgar/pkg/autoconf/trunk/files/CSWautoconf.depend csw/mgar/pkg/autoconf/trunk/files/use-csw-tools.patch Modified: csw/mgar/pkg/autoconf/trunk/Makefile =================================================================== --- csw/mgar/pkg/autoconf/trunk/Makefile 2009-11-22 21:34:36 UTC (rev 7384) +++ csw/mgar/pkg/autoconf/trunk/Makefile 2009-11-22 21:35:18 UTC (rev 7385) @@ -1,5 +1,5 @@ GARNAME = autoconf -GARVERSION = 2.64 +GARVERSION = 2.65 CATEGORIES = devel DESCRIPTION = GNU auto-configuration tool @@ -15,7 +15,7 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PATCHFILES = use-csw-tools.patch +PATCHFILES = 0001-Prefer-CSW-tools.patch PREREQUISITE_PKGS = CSWhelp2man REQUIRED_PKGS = CSWgawk CSWgm4 CSWperl @@ -38,6 +38,4 @@ post-install: @echo " ==> Fixing install anomalies" - - @rm -f $(DESTDIR)$(prefix)/share/info/dir @rm -f $(DESTDIR)$(prefix)/share/info/standards.info Modified: csw/mgar/pkg/autoconf/trunk/checksums =================================================================== --- csw/mgar/pkg/autoconf/trunk/checksums 2009-11-22 21:34:36 UTC (rev 7384) +++ csw/mgar/pkg/autoconf/trunk/checksums 2009-11-22 21:35:18 UTC (rev 7385) @@ -1,2 +1,2 @@ -30a198cef839471dd4926e92ab485361 download/autoconf-2.64.tar.gz -56db22eb8fa63698b15f6e2eeadb3caa download/use-csw-tools.patch +ac233d38923d5bebe91a64d68983c3c0 0001-Prefer-CSW-tools.patch +46cfb40e0babf4c64f8325f03da81c9b autoconf-2.65.tar.gz Copied: csw/mgar/pkg/autoconf/trunk/files/0001-Prefer-CSW-tools.patch (from rev 7360, csw/mgar/pkg/autoconf/trunk/files/use-csw-tools.patch) =================================================================== --- csw/mgar/pkg/autoconf/trunk/files/0001-Prefer-CSW-tools.patch (rev 0) +++ csw/mgar/pkg/autoconf/trunk/files/0001-Prefer-CSW-tools.patch 2009-11-22 21:35:18 UTC (rev 7385) @@ -0,0 +1,33 @@ +From bcf37e64f81ff412b506a4d1c0d52f1a7fc8a615 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sun, 22 Nov 2009 22:30:05 +0100 +Subject: [PATCH] Prefer CSW tools + +--- + bin/autoreconf.in | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/bin/autoreconf.in b/bin/autoreconf.in +index 9f82071..139bf34 100644 +--- a/bin/autoreconf.in ++++ b/bin/autoreconf.in +@@ -110,11 +110,11 @@ Written by David J. MacKenzie and Akim Demaille. + my $autoconf = $ENV{'AUTOCONF'} || '@bindir@/@autoconf-name@'; + my $autoheader = $ENV{'AUTOHEADER'} || '@bindir@/@autoheader-name@'; + my $autom4te = $ENV{'AUTOM4TE'} || '@bindir@/@autom4te-name@'; +-my $automake = $ENV{'AUTOMAKE'} || 'automake'; +-my $aclocal = $ENV{'ACLOCAL'} || 'aclocal'; +-my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize'; +-my $autopoint = $ENV{'AUTOPOINT'} || 'autopoint'; +-my $make = $ENV{'MAKE'} || 'make'; ++my $automake = $ENV{'AUTOMAKE'} || '@bindir@/automake'; ++my $aclocal = $ENV{'ACLOCAL'} || '@bindir@/aclocal'; ++my $libtoolize = $ENV{'LIBTOOLIZE'} || '@bindir@/libtoolize'; ++my $autopoint = $ENV{'AUTOPOINT'} || '@bindir@/gautopoint'; ++my $make = $ENV{'MAKE'} || '@bindir@/gmake'; + + # --install -- as --add-missing in other tools. + my $install = 0; +-- +1.6.5.1 + Deleted: csw/mgar/pkg/autoconf/trunk/files/CSWautoconf.depend =================================================================== --- csw/mgar/pkg/autoconf/trunk/files/CSWautoconf.depend 2009-11-22 21:34:36 UTC (rev 7384) +++ csw/mgar/pkg/autoconf/trunk/files/CSWautoconf.depend 2009-11-22 21:35:18 UTC (rev 7385) @@ -1,3 +0,0 @@ -P CSWgawk gawk - GNU AWK -P CSWgm4 gm4 - GNU m4 Unix macro processor -P CSWperl perl - A high-level, general-purpose programming language. Deleted: csw/mgar/pkg/autoconf/trunk/files/use-csw-tools.patch =================================================================== --- csw/mgar/pkg/autoconf/trunk/files/use-csw-tools.patch 2009-11-22 21:34:36 UTC (rev 7384) +++ csw/mgar/pkg/autoconf/trunk/files/use-csw-tools.patch 2009-11-22 21:35:18 UTC (rev 7385) @@ -1,20 +0,0 @@ -diff -Naur autoconf-2.63.orig/bin/autoreconf.in autoconf-2.63/bin/autoreconf.in ---- autoconf-2.63.orig/bin/autoreconf.in 2008-08-28 04:08:10.000000000 +0200 -+++ autoconf-2.63/bin/autoreconf.in 2008-09-18 18:22:49.127382000 +0200 -@@ -109,11 +109,11 @@ - # Lib files. - my $autoconf = $ENV{'AUTOCONF'} || '@bindir@/@autoconf-name@'; - my $autoheader = $ENV{'AUTOHEADER'} || '@bindir@/@autoheader-name@'; --my $automake = $ENV{'AUTOMAKE'} || 'automake'; --my $aclocal = $ENV{'ACLOCAL'} || 'aclocal'; --my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize'; --my $autopoint = $ENV{'AUTOPOINT'} || 'autopoint'; --my $make = $ENV{'MAKE'} || 'make'; -+my $automake = $ENV{'AUTOMAKE'} || '@bindir@/automake'; -+my $aclocal = $ENV{'ACLOCAL'} || '@bindir@/aclocal'; -+my $libtoolize = $ENV{'LIBTOOLIZE'} || '@bindir@/libtoolize'; -+my $autopoint = $ENV{'AUTOPOINT'} || '@bindir@/gautopoint'; -+my $make = $ENV{'MAKE'} || '@bindir@/gmake'; - - # --install -- as --add-missing in other tools. - my $install = 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 Sun Nov 22 23:02:52 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 22 Nov 2009 22:02:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[7386] csw/mgar/pkg/coreutils/trunk Message-ID: Revision: 7386 http://gar.svn.sourceforge.net/gar/?rev=7386&view=rev Author: bdwalton Date: 2009-11-22 22:02:52 +0000 (Sun, 22 Nov 2009) Log Message: ----------- coreutils: add patch to fix test breakages; add more configure options Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile csw/mgar/pkg/coreutils/trunk/checksums Added Paths: ----------- csw/mgar/pkg/coreutils/trunk/files/0001-Fix-solaris-acl-support-breakage.patch Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-22 21:35:18 UTC (rev 7385) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-22 22:02:52 UTC (rev 7386) @@ -9,9 +9,9 @@ Previously these utilities were offered as three individual sets of GNU utilities, Fileutils, Shellutils, and Textutils. Those three have been combined into a single set of utilities called Coreutils. endef - MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Fix-solaris-acl-support-breakage.patch PREREQUISITE_PKGS = CSWautomake CSWautoconf CSWbison CSWggettext CSWgit PREREQUISITE_PKGS += CSWgperf CSWgzip CSWperl CSWrsync CSWgtar CSWbash @@ -22,7 +22,9 @@ sysconfdir = /etc/opt/csw localstatedir = /var/opt/csw CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --disable-acl --program-prefix=g +CONFIGURE_ARGS += --program-prefix=g +CONFIGURE_ARGS += --with-libintl-prefix=/opt/csw/ +CONFIGURE_ARGS += --with-iconv-prefix=/opt/csw/ TEST_ARGS = check Modified: csw/mgar/pkg/coreutils/trunk/checksums =================================================================== --- csw/mgar/pkg/coreutils/trunk/checksums 2009-11-22 21:35:18 UTC (rev 7385) +++ csw/mgar/pkg/coreutils/trunk/checksums 2009-11-22 22:02:52 UTC (rev 7386) @@ -1 +1,2 @@ +ed529e3abbc0fb76d2e13f5202f59932 0001-Fix-solaris-acl-support-breakage.patch 4cde9f31604f4da188ed302ca55545ea coreutils-8.1.tar.gz Added: csw/mgar/pkg/coreutils/trunk/files/0001-Fix-solaris-acl-support-breakage.patch =================================================================== --- csw/mgar/pkg/coreutils/trunk/files/0001-Fix-solaris-acl-support-breakage.patch (rev 0) +++ csw/mgar/pkg/coreutils/trunk/files/0001-Fix-solaris-acl-support-breakage.patch 2009-11-22 22:02:52 UTC (rev 7386) @@ -0,0 +1,54 @@ +From 2f1eeb8502a426f38189d24760d52760448cd2ae Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sun, 22 Nov 2009 18:29:07 +0100 +Subject: [PATCH] Fix solaris acl support breakage + +In the standard solaris acl support, ENOSYS was handled cleanly. This +patch makes the code path handle EOPNOTSUPP identically to ENOSYS, +preventing errors when attempting to a pply acl's on filesystems that +don't implement the acl api (NFS). + +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..346dd5c 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 == EOPNOTSUPP || errno == EINVAL) + { + 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 ddac4df..fdc74f2 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.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From glawsf at users.sourceforge.net Mon Nov 23 00:49:37 2009 From: glawsf at users.sourceforge.net (glawsf at users.sourceforge.net) Date: Sun, 22 Nov 2009 23:49:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[7387] csw/mgar/pkg/puppet/trunk Message-ID: Revision: 7387 http://gar.svn.sourceforge.net/gar/?rev=7387&view=rev Author: glawsf Date: 2009-11-22 23:49:36 +0000 (Sun, 22 Nov 2009) Log Message: ----------- version bump Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/Makefile csw/mgar/pkg/puppet/trunk/checksums csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postremove Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2009-11-22 22:02:52 UTC (rev 7386) +++ csw/mgar/pkg/puppet/trunk/Makefile 2009-11-22 23:49:36 UTC (rev 7387) @@ -7,7 +7,7 @@ # [1] http://garylaw.net/packages/puppet-build.sh GARNAME = puppet -GARVERSION = 0.24.8 +GARVERSION = 0.25.1 CATEGORIES = apps define BLURB @@ -21,9 +21,9 @@ endef MASTER_SITES = http://reductivelabs.com/downloads/puppet/ -DISTFILES = $(GARNAME)-$(GARVERSION).tgz +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += cswpuppetd cswpuppetmasterd cswusergroup -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz SPKG_SOURCEURL = http://reductivelabs.com/products/puppet/ INITSMF = $(sysconfdir)/init\.d/cswpuppetd @@ -35,7 +35,7 @@ PACKAGES = CSWpuppet CSWpuppetmaster REQUIRED_PKGS = CSWfacter -PREREQUISITE_PKGS = $(REQUIRED_PKGS) +#PREREQUISITE_PKGS = $(REQUIRED_PKGS) REQUIRED_PKGS_CSWpuppetmaster = CSWpuppet PKGFILES_CSWpuppetmaster = $(sysconfdir)/init\.d/cswpuppetmasterd Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2009-11-22 22:02:52 UTC (rev 7386) +++ csw/mgar/pkg/puppet/trunk/checksums 2009-11-22 23:49:36 UTC (rev 7387) @@ -3,4 +3,4 @@ db0230ad9c2a8622c7f7e73c10f61dbc cswpuppetd fd5e49b7d2b7d288d5beb224d0cfa855 cswpuppetmasterd 3ab0d4f9801075bc78b68b766b496fc7 cswusergroup -288d46dee00acad64d0f3ecc6d8ba6fa puppet-0.24.8.tgz +55ced6102fe6ad8b2ecb2b1384008167 puppet-0.25.1.tar.gz Modified: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postremove =================================================================== --- csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postremove 2009-11-22 22:02:52 UTC (rev 7386) +++ csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postremove 2009-11-22 23:49:36 UTC (rev 7387) @@ -6,7 +6,6 @@ # Not sure if this cleanup is the right thing to do. TODO(maciej): review rm /etc/puppet || /bin/true -rm /opt/csw/etc/puppet || /bin/true +rmdir /opt/csw/etc/puppet || /bin/true rm /var/puppet || /bin/true -rm /opt/csw/var/puppet || /bin/true -rm -rf /opt/csw/lib/ruby/site_ruby/1.8/puppet +rmdir /opt/csw/var/puppet || /bin/true 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 Nov 23 01:35:23 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 23 Nov 2009 00:35:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7388] csw/mgar/pkg/nss/branches/upstream-work/ Message-ID: Revision: 7388 http://gar.svn.sourceforge.net/gar/?rev=7388&view=rev Author: wahwah Date: 2009-11-23 00:35:23 +0000 (Mon, 23 Nov 2009) Log Message: ----------- Branching off to work with the upstream guys. http://groups.google.com/group/mozilla.dev.tech.crypto/msg/14bff0519a1031c5 Added Paths: ----------- csw/mgar/pkg/nss/branches/upstream-work/ 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 Nov 23 01:59:26 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 23 Nov 2009 00:59:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[7389] csw/mgar/pkg/nss/branches/upstream-work Message-ID: Revision: 7389 http://gar.svn.sourceforge.net/gar/?rev=7389&view=rev Author: wahwah Date: 2009-11-23 00:59:26 +0000 (Mon, 23 Nov 2009) Log Message: ----------- nss/branches/upstream-work: The simplest version of the build, to work with the upstream developers. Modified Paths: -------------- csw/mgar/pkg/nss/branches/upstream-work/Makefile Removed Paths: ------------- csw/mgar/pkg/nss/branches/upstream-work/files/nss-3.12.4.patch csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3.patch csw/mgar/pkg/nss/branches/upstream-work/files/runtime-search-path.patch csw/mgar/pkg/nss/branches/upstream-work/files/shared-libs.patch csw/mgar/pkg/nss/branches/upstream-work/files/sign-under-dbx.patch csw/mgar/pkg/nss/branches/upstream-work/files/whoami.patch Modified: csw/mgar/pkg/nss/branches/upstream-work/Makefile =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/Makefile 2009-11-23 00:35:23 UTC (rev 7388) +++ csw/mgar/pkg/nss/branches/upstream-work/Makefile 2009-11-23 00:59:26 UTC (rev 7389) @@ -22,39 +22,29 @@ # TODO: Generate RTM_NAME from GARVERSION RTM_NAME = NSS_3_12_4_RTM MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/ -# This patch taken from http://bugs.gentoo.org/show_bug.cgi?id=256102 -PATCHFILES = nss-3.12.4.patch -PATCHFILES += shared-libs.patch -PATCHFILES += platlibs-sqlite3.patch -PATCHFILES += platlibs-sunos.patch -PATCHFILES += whoami.patch -PATCHFILES += runtime-search-path.patch DIST_SUFFIX = -with-nspr-4.8 DISTFILES = $(GARNAME)-$(GARVERSION)$(DIST_SUFFIX).tar.gz DISTNAME = $(GARNAME)-$(GARVERSION)$(DIST_SUFFIX) UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)$(DIST_SUFFIX).tar.gz REQUIRED_PKGS = CSWnspr CSWsqlite3 PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWsqlite3devel -CONFIGURE_SCRIPTS = nss +CONFIGURE_SCRIPTS = BUILD_SCRIPTS = nss INSTALL_SCRIPTS = nss TEST_SCRIPTS = BUILD64 = 1 -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib ifeq (OPT,$(GARFLAVOR)) BUILD_OPT = 1 endif -NSS_USE_SYSTEM_SQLITE = 1 + +# NSPR is installed in /opt/csw/lib/nspr, nspr.pc is in /opt/csw/lib/pkgconfig NSPR_INCLUDE_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --cflags-only-I nspr | gsed 's/-I//') +export NSPR_INCLUDE_DIR NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ') -USE_SYSTEM_ZLIB = 1 -ZLIB_LIBS = -lz -NSDISTMODE = copy -NSS_ENABLE_ECC = 1 -XCFLAGS = $(CFLAGS) -FREEBL_NO_DEPEND = 1 -LDOPTS = $(LD_OPTIONS) +export NSPR_LIB_DIR + +# 64-bit suppport ifeq ($(MODULATION),isa-sparcv9) USE_64 = 1 export USE_64 @@ -63,32 +53,9 @@ USE_64 = 1 export USE_64 endif -export BUILD_OPT NSS_USE_SYSTEM_SQLITE NSPR_INCLUDE_DIR NSPR_LIB_DIR -export USE_SYSTEM_ZLIB ZLIB_LIBS NSDISTMODE NSS_ENABLE_ECC XCFLAGS FREEBL_NO_DEPEND include gar/category.mk -configure-nss: respect-ldflags add-runtime-search-path - @$(MAKECOOKIE) - -respect-ldflags: - (cd $(WORKSRC)/mozilla/security/coreconf \ - && \ - gsed -i -e 's:SOURCE_PREFIX = $$(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $$(CORE_DEPTH)/dist:' \ - source.mk \ - && \ - gsed -i -e 's/\$$(MKSHLIB) -o/\$$(MKSHLIB) \$$(LDFLAGS) -o/g' rules.mk) - @$(MAKECOOKIE) - -add-runtime-search-path: - # Make sure that the runtime search path is added in all Makefiles. - gfind $(WORKSRC) \( -name Makefile -o -name '*.mk' \) \ - -exec gsed -i -e 's|-L\$$(NSPR_LIB_DIR)|-L$$(NSPR_LIB_DIR) -R$$(NSPR_LIB_DIR)/$$$$ISALIST|' \ - {} \; - # A form of assert - gegrep -- '-R.*ISALIST' $(WORKSRC)/mozilla/security/nss/lib/freebl/config.mk - @$(MAKECOOKIE) - build-nss: build-coreconf build-dbm build-nss-compile build-coreconf: @@ -114,4 +81,3 @@ && \ gmake -j1 CC="$(CC)") @$(MAKECOOKIE) - Deleted: csw/mgar/pkg/nss/branches/upstream-work/files/nss-3.12.4.patch =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/files/nss-3.12.4.patch 2009-11-23 00:35:23 UTC (rev 7388) +++ csw/mgar/pkg/nss/branches/upstream-work/files/nss-3.12.4.patch 2009-11-23 00:59:26 UTC (rev 7389) @@ -1,141 +0,0 @@ ---- mozilla/security/nss/lib/freebl/stubs.c.dist 2009-09-16 17:46:24.600678560 +0100 -+++ b/mozilla/security/nss/lib/freebl/stubs.c 2009-09-16 18:09:59.275307160 +0100 -@@ -70,9 +70,32 @@ - #include - #include - --#define FREEBL_NO_WEAK 1 -+#ifdef __sgi -+# include -+# ifndef _RLD_INTERFACE_DLFCN_H_DLADDR -+# define _RLD_INTERFACE_DLFCN_H_DLADDR -+ typedef struct Dl_info { -+ const char * dli_fname; -+ void * dli_fbase; -+ const char * dli_sname; -+ void * dli_saddr; -+ int dli_version; -+ int dli_reserved1; -+ long dli_reserved[4]; -+ } Dl_info; -+# endif -+# define _RLD_DLADDR 14 -+int dladdr(void *address, Dl_info *dl); -+ -+int dladdr(void *address, Dl_info *dl) -+{ -+ void *v; -+ v = _rld_new_interface(_RLD_DLADDR,address,dl); -+ return (int)v; -+} -+#endif - --#define WEAK __attribute__((weak)) -+#define FREEBL_NO_WEAK 1 - - #ifdef FREEBL_NO_WEAK - -@@ -93,17 +116,17 @@ - static type_##fn ptr_##fn = NULL - - #define STUB_SAFE_CALL0(fn) \ -- if (ptr_##fn) { return ptr_##fn(); } -+ if (ptr_##fn) { ptr_##fn(); } - #define STUB_SAFE_CALL1(fn,a1) \ -- if (ptr_##fn) { return ptr_##fn(a1); } -+ if (ptr_##fn) { ptr_##fn(a1); } - #define STUB_SAFE_CALL2(fn,a1,a2) \ -- if (ptr_##fn) { return ptr_##fn(a1,a2); } -+ if (ptr_##fn) { ptr_##fn(a1,a2); } - #define STUB_SAFE_CALL3(fn,a1,a2,a3) \ -- if (ptr_##fn) { return ptr_##fn(a1,a2,a3); } -+ if (ptr_##fn) { ptr_##fn(a1,a2,a3); } - #define STUB_SAFE_CALL4(fn,a1,a2,a3,a4) \ -- if (ptr_##fn) { return ptr_##fn(a1,a2,a3,a4); } -+ if (ptr_##fn) { ptr_##fn(a1,a2,a3,a4); } - #define STUB_SAFE_CALL6(fn,a1,a2,a3,a4,a5,a6) \ -- if (ptr_##fn) { return ptr_##fn(a1,a2,a3,a4,a5,a6); } -+ if (ptr_##fn) { ptr_##fn(a1,a2,a3,a4,a5,a6); } - - #define STUB_FETCH_FUNCTION(fn) \ - ptr_##fn = (type_##fn) dlsym(lib,#fn); \ -@@ -118,6 +141,8 @@ - * libutil will not resolve these symbols. - */ - -+#define WEAK __attribute__((weak)) -+ - #define STUB_DECLARE(ret, fn, args) \ - WEAK extern ret fn args - -@@ -200,7 +225,7 @@ extern void - PORT_Free_stub(void *ptr) - { - STUB_SAFE_CALL1(PORT_Free_Util, ptr); -- return free(ptr); -+ free(ptr); - } - - extern void * -@@ -220,14 +245,14 @@ PORT_ZFree_stub(void *ptr, size_t len) - { - STUB_SAFE_CALL2(PORT_ZFree_Util, ptr, len); - memset(ptr, 0, len); -- return free(ptr); -+ free(ptr); - } - - extern void - PR_Free_stub(void *ptr) - { - STUB_SAFE_CALL1(PR_Free, ptr); -- return free(ptr); -+ free(ptr); - } - - /* -@@ -530,7 +555,7 @@ freebl_InitNSSUtil(void *lib) - * fetch the library if it's loaded. For NSS it should already be loaded - */ - #define freebl_getLibrary(libName) \ -- dlopen (libName, RTLD_LAZY|RTLD_NOLOAD) -+ dlopen (libName, RTLD_LAZY) - - #define freebl_releaseLibrary(lib) \ - if (lib) dlclose(lib) -@@ -538,7 +563,7 @@ freebl_InitNSSUtil(void *lib) - static void * FREEBLnsprGlobalLib = NULL; - static void * FREEBLnssutilGlobalLib = NULL; - --void __attribute ((destructor)) FREEBL_unload() -+void FREEBL_unload() - { - freebl_releaseLibrary(FREEBLnsprGlobalLib); - freebl_releaseLibrary(FREEBLnssutilGlobalLib); ---- mozilla/security/nss/lib/freebl/nsslowhash.c.dist 2009-09-16 18:16:17.529500640 +0100 -+++ b/mozilla/security/nss/lib/freebl/nsslowhash.c 2009-09-16 18:16:37.634080480 +0100 -@@ -375,21 +375,21 @@ NSSLOWHASH_NewContext(NSSLOWInitContext - void - NSSLOWHASH_Begin(NSSLOWHASHContext *context) - { -- return context->hashObj->begin(context->hashCtxt); -+ context->hashObj->begin(context->hashCtxt); - } - - void - NSSLOWHASH_Update(NSSLOWHASHContext *context, const unsigned char *buf, - unsigned int len) - { -- return context->hashObj->update(context->hashCtxt, buf, len); -+ context->hashObj->update(context->hashCtxt, buf, len); - } - - void - NSSLOWHASH_End(NSSLOWHASHContext *context, unsigned char *buf, - unsigned int *ret, unsigned int len) - { -- return context->hashObj->end(context->hashCtxt, buf, ret, len); -+ context->hashObj->end(context->hashCtxt, buf, ret, len); - } - - void Deleted: csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3.patch =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3.patch 2009-11-23 00:35:23 UTC (rev 7388) +++ csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3.patch 2009-11-23 00:59:26 UTC (rev 7389) @@ -1,11 +0,0 @@ ---- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk.orig 2009-11-21 17:28:09.997982796 +0100 -+++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk 2009-11-21 17:28:32.107632453 +0100 -@@ -80,7 +80,7 @@ - endif - endif - --SQLITE=-lsqlite3 -+SQLITE=-R/opt/csw/lib/$$ISALIST -L/opt/csw/lib -lsqlite3 - - ifdef NSS_DISABLE_DBM - DBMLIB = $(NULL) Deleted: csw/mgar/pkg/nss/branches/upstream-work/files/shared-libs.patch =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/files/shared-libs.patch 2009-11-23 00:35:23 UTC (rev 7388) +++ csw/mgar/pkg/nss/branches/upstream-work/files/shared-libs.patch 2009-11-23 00:59:26 UTC (rev 7389) @@ -1,32 +0,0 @@ ---- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/lib/softoken/config.mk.orig 2009-11-22 11:39:49.492474635 +0100 -+++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/lib/softoken/config.mk 2009-11-22 11:40:51.857227138 +0100 -@@ -54,10 +54,14 @@ - - ifdef NS_USE_GCC - EXTRA_SHARED_LIBS += \ -+ -R/opt/csw/lib/$$ISALIST \ -+ -L/opt/csw/lib \ - -L$(DIST)/lib \ -+ -R$(NSSUTIL_LIB_DIR)/$$ISALIST \ - -L$(NSSUTIL_LIB_DIR) \ - -lnssutil3 \ - -lsqlite3 \ -+ -R$(NSPR_LIB_DIR)/$$ISALIST \ - -L$(NSPR_LIB_DIR) \ - -lplc4 \ - -lplds4 \ -@@ -80,10 +84,14 @@ - # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS) - # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX. - EXTRA_SHARED_LIBS += \ -+ -R/opt/csw/lib/$$ISALIST \ -+ -L/opt/csw/lib \ - -L$(DIST)/lib \ -+ -R$(NSSUTIL_LIB_DIR)/$$ISALIST \ - -L$(NSSUTIL_LIB_DIR) \ - -lnssutil3 \ - -lsqlite3 \ -+ -R$(NSPR_LIB_DIR)/$$ISALIST \ - -L$(NSPR_LIB_DIR) \ - -lplc4 \ - -lplds4 \ Deleted: csw/mgar/pkg/nss/branches/upstream-work/files/sign-under-dbx.patch =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/files/sign-under-dbx.patch 2009-11-23 00:35:23 UTC (rev 7388) +++ csw/mgar/pkg/nss/branches/upstream-work/files/sign-under-dbx.patch 2009-11-23 00:59:26 UTC (rev 7389) @@ -1,15 +0,0 @@ -This file shows how to run shlibsign under dbx, the Sun Studio debugger, to see -where it's aborting. - ---- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/shlibsign/./sign.sh.orig 2009-11-22 15:17:12.069116849 +0100 -+++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/shlibsign/./sign.sh 2009-11-22 15:17:54.559576926 +0100 -@@ -34,7 +34,7 @@ - export LIBRARY_PATH - ADDON_PATH=${1}/lib:${4}:$ADDON_PATH - export ADDON_PATH -- echo ${2}/shlibsign -v -i ${5} -- ${2}/shlibsign -v -i ${5} -+ echo /opt/studio/SOS11/SUNWspro/bin/dbx ${2}/shlibsign -v -i ${5} -+ /opt/studio/SOS11/SUNWspro/bin/dbx ${2}/shlibsign -v -i ${5} - ;; - esac Deleted: csw/mgar/pkg/nss/branches/upstream-work/files/whoami.patch =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/files/whoami.patch 2009-11-23 00:35:23 UTC (rev 7388) +++ csw/mgar/pkg/nss/branches/upstream-work/files/whoami.patch 2009-11-23 00:59:26 UTC (rev 7389) @@ -1,11 +0,0 @@ ---- nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/UNIX.mk.orig 2009-11-22 02:25:17.411354784 +0100 -+++ nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/UNIX.mk 2009-11-22 02:25:24.833876220 +0100 -@@ -46,7 +46,7 @@ - DEFINES += -UDEBUG -DNDEBUG - else - OPTIMIZER += -g -- USERNAME := $(shell whoami) -+ USERNAME := $(shell gwhoami) - USERNAME := $(subst -,_,$(USERNAME)) - DEFINES += -DDEBUG -UNDEBUG -DDEBUG_$(USERNAME) - endif 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 Nov 23 02:51:47 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 23 Nov 2009 01:51:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[7390] csw/mgar/pkg/coreutils/trunk/Makefile Message-ID: Revision: 7390 http://gar.svn.sourceforge.net/gar/?rev=7390&view=rev Author: bdwalton Date: 2009-11-23 01:51:46 +0000 (Mon, 23 Nov 2009) Log Message: ----------- coreutils: correct iconv configure argument Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-23 00:59:26 UTC (rev 7389) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-23 01:51:46 UTC (rev 7390) @@ -24,7 +24,7 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --program-prefix=g CONFIGURE_ARGS += --with-libintl-prefix=/opt/csw/ -CONFIGURE_ARGS += --with-iconv-prefix=/opt/csw/ +CONFIGURE_ARGS += --with-libiconv-prefix=/opt/csw/ TEST_ARGS = check 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 Nov 23 02:54:03 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 23 Nov 2009 01:54:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[7391] csw/mgar/pkg/nss/trunk Message-ID: Revision: 7391 http://gar.svn.sourceforge.net/gar/?rev=7391&view=rev Author: wahwah Date: 2009-11-23 01:54:03 +0000 (Mon, 23 Nov 2009) Log Message: ----------- nss: using the Gentoo patch to create nss-config and nss.pc Modified Paths: -------------- csw/mgar/pkg/nss/trunk/Makefile csw/mgar/pkg/nss/trunk/checksums Added Paths: ----------- csw/mgar/pkg/nss/trunk/files/csw-include.patch csw/mgar/pkg/nss/trunk/files/gln.patch csw/mgar/pkg/nss/trunk/files/nss-3.12.4-gentoo-fixups-1.diff csw/mgar/pkg/nss/trunk/files/platlibs-sunos.patch Modified: csw/mgar/pkg/nss/trunk/Makefile =================================================================== --- csw/mgar/pkg/nss/trunk/Makefile 2009-11-23 01:51:46 UTC (rev 7390) +++ csw/mgar/pkg/nss/trunk/Makefile 2009-11-23 01:54:03 UTC (rev 7391) @@ -13,7 +13,10 @@ GARFLAVOR = DBG GARNAME = nss -GARVERSION = 3.12.4 +MAJOR_VERSION = 3 +MINOR_VERSION = 12 +PATCHLEVEL = 4 +GARVERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(PATCHLEVEL) CATEGORIES = lib DESCRIPTION = Network Security Services library, implements PKI support define BLURB @@ -29,6 +32,9 @@ PATCHFILES += platlibs-sunos.patch PATCHFILES += whoami.patch PATCHFILES += runtime-search-path.patch +PATCHFILES += nss-3.12.4-gentoo-fixups-1.diff +PATCHFILES += csw-include.patch +PATCHFILES += gln.patch DIST_SUFFIX = -with-nspr-4.8 DISTFILES = $(GARNAME)-$(GARVERSION)$(DIST_SUFFIX).tar.gz DISTNAME = $(GARNAME)-$(GARVERSION)$(DIST_SUFFIX) @@ -41,6 +47,9 @@ TEST_SCRIPTS = BUILD64 = 1 +install_libdir = $(prefix)/lib/nss +includedir = $(prefix)/include/nss + EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib ifeq (OPT,$(GARFLAVOR)) BUILD_OPT = 1 @@ -53,7 +62,6 @@ NSDISTMODE = copy NSS_ENABLE_ECC = 1 XCFLAGS = $(CFLAGS) -FREEBL_NO_DEPEND = 1 LDOPTS = $(LD_OPTIONS) ifeq ($(MODULATION),isa-sparcv9) USE_64 = 1 @@ -64,7 +72,7 @@ export USE_64 endif export BUILD_OPT NSS_USE_SYSTEM_SQLITE NSPR_INCLUDE_DIR NSPR_LIB_DIR -export USE_SYSTEM_ZLIB ZLIB_LIBS NSDISTMODE NSS_ENABLE_ECC XCFLAGS FREEBL_NO_DEPEND +export USE_SYSTEM_ZLIB ZLIB_LIBS NSDISTMODE NSS_ENABLE_ECC XCFLAGS include gar/category.mk @@ -115,3 +123,23 @@ gmake -j1 CC="$(CC)") @$(MAKECOOKIE) +install-nss: + ginstall -d -m 755 $(DESTDIR)$(libdir) + gcp -a $(WORKSRC)/mozilla/security/dist/*/lib/*.so $(DESTDIR)$(libdir) + ginstall -d -m 755 $(DESTDIR)$(bindir) + gcp -a $(WORKSRC)/mozilla/security/dist/*/bin/nss-config $(DESTDIR)$(bindir) + ginstall -d -m 755 $(DESTDIR)/lib/pkgconfig + ginstall -m 644 \ + $(WORKSRC)/mozilla/security/dist/*/lib/pkgconfig/nss.pc \ + $(DESTDIR)/lib/pkgconfig + ginstall -d -m 755 $(DESTDIR)$(includedir) + gcp -a $(WORKSRC)/mozilla/security/dist/private/nss/*.h $(DESTDIR)$(includedir) + gcp -a $(WORKSRC)/mozilla/security/dist/public/nss/*.h $(DESTDIR)$(includedir) + (cd $(DESTDIR)$(libdir); for file in *.so; do \ + mv $${file} $$(file).$(MINOR_VERSION); \ + ln -s $${file}.$(MINOR_VERSION) $${file}; \ + done) + (for file in $(WORKSRC)/mozilla/security/dist/*/bin/*; do \ + ginstall -m 755 $${file} $(DESTDIR)$(bindir)/nss$$(basename $${file}); \ + done) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/nss/trunk/checksums =================================================================== --- csw/mgar/pkg/nss/trunk/checksums 2009-11-23 01:51:46 UTC (rev 7390) +++ csw/mgar/pkg/nss/trunk/checksums 2009-11-23 01:54:03 UTC (rev 7391) @@ -1,3 +1,6 @@ +a1ce38c03b142eb2bd54f1f111661e30 csw-include.patch +7116f8de3ac8b35104365c1b3fc6aea4 gln.patch +63476fb10c2d14f7e0585fe327ae9341 nss-3.12.4-gentoo-fixups-1.diff 8f76e381bf2339d731bfd5b8116c25a4 nss-3.12.4-with-nspr-4.8.tar.gz 39b9d2431d4ff717d103b742fcaefb81 nss-3.12.4.patch f0f40bd021423ab1680b4d87cd19c1db platlibs-sqlite3.patch Added: csw/mgar/pkg/nss/trunk/files/csw-include.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/csw-include.patch (rev 0) +++ csw/mgar/pkg/nss/trunk/files/csw-include.patch 2009-11-23 01:54:03 UTC (rev 7391) @@ -0,0 +1,11 @@ +--- nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/SunOS5.mk.orig 2009-11-23 02:33:18.896095984 +0100 ++++ nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/SunOS5.mk 2009-11-23 02:33:40.956347570 +0100 +@@ -104,7 +104,7 @@ + endif + endif + +-INCLUDES += -I/usr/dt/include -I/usr/openwin/include ++INCLUDES += -I/usr/dt/include -I/usr/openwin/include -I/opt/csw/include + + RANLIB = echo + CPU_ARCH = sparc Added: csw/mgar/pkg/nss/trunk/files/gln.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/gln.patch (rev 0) +++ csw/mgar/pkg/nss/trunk/files/gln.patch 2009-11-23 01:54:03 UTC (rev 7391) @@ -0,0 +1,35 @@ +--- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/config/Makefile.orig 2009-11-23 02:38:13.942222659 +0100 ++++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/config/Makefile 2009-11-23 02:38:42.759423711 +0100 +@@ -13,7 +13,7 @@ + export: + # Create the nss.pc file + mkdir -p $(DIST)/lib/pkgconfig +- sed -e "s, at prefix@,$(PREFIX)," \ ++ gsed -e "s, at prefix@,$(PREFIX)," \ + -e "s, at exec_prefix@,\$${prefix}," \ + -e "s, at libdir@,\$${prefix}/gentoo/nss," \ + -e "s, at includedir@,\$${prefix}/include/nss," \ +@@ -21,18 +21,18 @@ + -e "s, at NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ + -e "s, at NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ + nss.pc.in > nss.pc +- chmod 0644 nss.pc +- ln -sf ../../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig ++ gchmod 0644 nss.pc ++ gln -sf ../../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig + + # Create the nss-config script + mkdir -p $(DIST)/bin +- sed -e "s, at prefix@,$(PREFIX)," \ ++ gsed -e "s, at prefix@,$(PREFIX)," \ + -e "s, at NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \ + -e "s, at NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ + -e "s, at NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ + nss-config.in > nss-config +- chmod 0755 nss-config +- ln -sf ../../../../security/nss/config/nss-config $(DIST)/bin ++ gchmod 0755 nss-config ++ gln -sf ../../../../security/nss/config/nss-config $(DIST)/bin + + libs: + Added: csw/mgar/pkg/nss/trunk/files/nss-3.12.4-gentoo-fixups-1.diff =================================================================== --- csw/mgar/pkg/nss/trunk/files/nss-3.12.4-gentoo-fixups-1.diff (rev 0) +++ csw/mgar/pkg/nss/trunk/files/nss-3.12.4-gentoo-fixups-1.diff 2009-11-23 01:54:03 UTC (rev 7391) @@ -0,0 +1,245 @@ +diff -urN nss-3.12.4-orig/mozilla/security/nss/config/Makefile nss-3.12.4/mozilla/security/nss/config/Makefile +--- nss-3.12.4-orig/mozilla/security/nss/config/Makefile 1969-12-31 18:00:00.000000000 -0600 ++++ nss-3.12.4/mozilla/security/nss/config/Makefile 2009-09-14 21:45:45.619639265 -0500 +@@ -0,0 +1,40 @@ ++CORE_DEPTH = ../.. ++DEPTH = ../.. ++ ++include $(CORE_DEPTH)/coreconf/config.mk ++ ++NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'` ++NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'` ++NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'` ++PREFIX = /usr ++ ++all: export libs ++ ++export: ++ # Create the nss.pc file ++ mkdir -p $(DIST)/lib/pkgconfig ++ sed -e "s, at prefix@,$(PREFIX)," \ ++ -e "s, at exec_prefix@,\$${prefix}," \ ++ -e "s, at libdir@,\$${prefix}/gentoo/nss," \ ++ -e "s, at includedir@,\$${prefix}/include/nss," \ ++ -e "s, at NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \ ++ -e "s, at NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ ++ -e "s, at NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ ++ nss.pc.in > nss.pc ++ chmod 0644 nss.pc ++ ln -sf ../../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig ++ ++ # Create the nss-config script ++ mkdir -p $(DIST)/bin ++ sed -e "s, at prefix@,$(PREFIX)," \ ++ -e "s, at NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \ ++ -e "s, at NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ ++ -e "s, at NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ ++ nss-config.in > nss-config ++ chmod 0755 nss-config ++ ln -sf ../../../../security/nss/config/nss-config $(DIST)/bin ++ ++libs: ++ ++dummy: all export libs ++ +diff -urN nss-3.12.4-orig/mozilla/security/nss/config/nss-config.in nss-3.12.4/mozilla/security/nss/config/nss-config.in +--- nss-3.12.4-orig/mozilla/security/nss/config/nss-config.in 1969-12-31 18:00:00.000000000 -0600 ++++ nss-3.12.4/mozilla/security/nss/config/nss-config.in 2009-09-14 21:47:45.190638078 -0500 +@@ -0,0 +1,145 @@ ++#!/bin/sh ++ ++prefix=@prefix@ ++ ++major_version=@NSS_MAJOR_VERSION@ ++minor_version=@NSS_MINOR_VERSION@ ++patch_version=@NSS_PATCH_VERSION@ ++ ++usage() ++{ ++ cat <&2 ++fi ++ ++lib_ssl=yes ++lib_smime=yes ++lib_nss=yes ++lib_nssutil=yes ++ ++while test $# -gt 0; do ++ case "$1" in ++ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; ++ *) optarg= ;; ++ esac ++ ++ case $1 in ++ --prefix=*) ++ prefix=$optarg ++ ;; ++ --prefix) ++ echo_prefix=yes ++ ;; ++ --exec-prefix=*) ++ exec_prefix=$optarg ++ ;; ++ --exec-prefix) ++ echo_exec_prefix=yes ++ ;; ++ --includedir=*) ++ includedir=$optarg ++ ;; ++ --includedir) ++ echo_includedir=yes ++ ;; ++ --libdir=*) ++ libdir=$optarg ++ ;; ++ --libdir) ++ echo_libdir=yes ++ ;; ++ --version) ++ echo ${major_version}.${minor_version}.${patch_version} ++ ;; ++ --cflags) ++ echo_cflags=yes ++ ;; ++ --libs) ++ echo_libs=yes ++ ;; ++ ssl) ++ lib_ssl=yes ++ ;; ++ smime) ++ lib_smime=yes ++ ;; ++ nss) ++ lib_nss=yes ++ ;; ++ nssutil) ++ lib_nssutil=yes ++ ;; ++ *) ++ usage 1 1>&2 ++ ;; ++ esac ++ shift ++done ++ ++# Set variables that may be dependent upon other variables ++if test -z "$exec_prefix"; then ++ exec_prefix=`pkg-config --variable=exec_prefix nss` ++fi ++if test -z "$includedir"; then ++ includedir=`pkg-config --variable=includedir nss` ++fi ++if test -z "$libdir"; then ++ libdir=`pkg-config --variable=libdir nss` ++fi ++ ++if test "$echo_prefix" = "yes"; then ++ echo $prefix ++fi ++ ++if test "$echo_exec_prefix" = "yes"; then ++ echo $exec_prefix ++fi ++ ++if test "$echo_includedir" = "yes"; then ++ echo $includedir ++fi ++ ++if test "$echo_libdir" = "yes"; then ++ echo $libdir ++fi ++ ++if test "$echo_cflags" = "yes"; then ++ echo -I$includedir ++fi ++ ++if test "$echo_libs" = "yes"; then ++ libdirs="-Wl,-R$libdir -L$libdir" ++ if test -n "$lib_ssl"; then ++ libdirs="$libdirs -lssl${major_version}" ++ fi ++ if test -n "$lib_smime"; then ++ libdirs="$libdirs -lsmime${major_version}" ++ fi ++ if test -n "$lib_nss"; then ++ libdirs="$libdirs -lnss${major_version}" ++ fi ++ if test -n "$lib_nssutil"; then ++ libdirs="$libdirs -lnssutil${major_version}" ++ fi ++ echo $libdirs ++fi ++ +diff -urN nss-3.12.4-orig/mozilla/security/nss/config/nss.pc.in nss-3.12.4/mozilla/security/nss/config/nss.pc.in +--- nss-3.12.4-orig/mozilla/security/nss/config/nss.pc.in 1969-12-31 18:00:00.000000000 -0600 ++++ nss-3.12.4/mozilla/security/nss/config/nss.pc.in 2009-09-14 21:45:45.653637310 -0500 +@@ -0,0 +1,12 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: NSS ++Description: Network Security Services ++Version: @NSS_MAJOR_VERSION at .@NSS_MINOR_VERSION at .@NSS_PATCH_VERSION@ ++Requires: nspr >= 4.8 ++Libs: -L${libdir} -lssl3 -lsmime3 -lnssutil3 -lnss3 -Wl,-R${libdir} ++Cflags: -I${includedir} ++ +diff -urN nss-3.12.4-orig/mozilla/security/nss/Makefile nss-3.12.4/mozilla/security/nss/Makefile +--- nss-3.12.4-orig/mozilla/security/nss/Makefile 2008-12-02 17:24:39.000000000 -0600 ++++ nss-3.12.4/mozilla/security/nss/Makefile 2009-09-14 21:45:45.678657145 -0500 +@@ -78,7 +78,7 @@ + # (7) Execute "local" rules. (OPTIONAL). # + ####################################################################### + +-nss_build_all: build_coreconf build_nspr build_dbm all ++nss_build_all: build_coreconf build_dbm all + + nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber + +@@ -140,12 +140,6 @@ + --with-dist-prefix='$(NSPR_PREFIX)' \ + --with-dist-includedir='$(NSPR_PREFIX)/include' + +-build_nspr: $(NSPR_CONFIG_STATUS) +- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE) +- +-clobber_nspr: $(NSPR_CONFIG_STATUS) +- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE) clobber +- + build_dbm: + ifndef NSS_DISABLE_DBM + cd $(CORE_DEPTH)/dbm ; $(MAKE) export libs +diff -urN nss-3.12.4-orig/mozilla/security/nss/manifest.mn nss-3.12.4/mozilla/security/nss/manifest.mn +--- nss-3.12.4-orig/mozilla/security/nss/manifest.mn 2008-04-04 15:36:59.000000000 -0500 ++++ nss-3.12.4/mozilla/security/nss/manifest.mn 2009-09-14 21:45:45.703656167 -0500 +@@ -42,6 +42,6 @@ + + RELEASE = nss + +-DIRS = lib cmd ++DIRS = lib cmd config + + Added: csw/mgar/pkg/nss/trunk/files/platlibs-sunos.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/platlibs-sunos.patch (rev 0) +++ csw/mgar/pkg/nss/trunk/files/platlibs-sunos.patch 2009-11-23 01:54:03 UTC (rev 7391) @@ -0,0 +1,11 @@ +--- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk.orig 2009-11-22 14:31:53.252227901 +0100 ++++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk 2009-11-22 14:32:46.536330277 +0100 +@@ -48,6 +48,8 @@ + else + EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib' + endif ++EXTRA_SHARED_LIBS += -R/opt/csw/lib/$$ISALIST ++EXTRA_SHARED_LIBS += -R/opt/csw/lib/nspr/$$ISALIST + endif + + ifeq ($(OS_ARCH), Linux) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Mon Nov 23 11:52:47 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 23 Nov 2009 10:52:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[7392] csw/mgar/pkg/xterm/trunk/files/changelog.CSW Message-ID: Revision: 7392 http://gar.svn.sourceforge.net/gar/?rev=7392&view=rev Author: skayser Date: 2009-11-23 10:52:46 +0000 (Mon, 23 Nov 2009) Log Message: ----------- xterm: adjusted changelog.CSW Modified Paths: -------------- csw/mgar/pkg/xterm/trunk/files/changelog.CSW Modified: csw/mgar/pkg/xterm/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/xterm/trunk/files/changelog.CSW 2009-11-23 01:54:03 UTC (rev 7391) +++ csw/mgar/pkg/xterm/trunk/files/changelog.CSW 2009-11-23 10:52:46 UTC (rev 7392) @@ -1,5 +1,13 @@ -xterm (251,REV=2009.11.18) +xterm (251,REV=2009.11.23) - * Updated to 250. (Fixes #3937, #3856) + * Updated to 251. (Fixes #3937, #3856) + * Built with CSW X11 from /opt/csw/X11 (previously X11 from /usr/X11) + as both, libXft and libXrender, are now built against CSW X11. - -- Sebastian Kayser Wed, 18 Nov 2009 03:23:47 +0100 + -- Sebastian Kayser Mon, 23 Nov 2009 11:51:17 +0100 + +xterm (243,REV=2009.04.09) + + * Adopted and updated to 243. + + -- Sebastian Kayser Thu, 09 Apr 2009 12:03:42 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Mon Nov 23 13:23:24 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 23 Nov 2009 12:23:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7393] csw/mgar/pkg/axel/trunk/files/changelog.CSW Message-ID: Revision: 7393 http://gar.svn.sourceforge.net/gar/?rev=7393&view=rev Author: skayser Date: 2009-11-23 12:23:24 +0000 (Mon, 23 Nov 2009) Log Message: ----------- axel: updated changelog.CSW Modified Paths: -------------- csw/mgar/pkg/axel/trunk/files/changelog.CSW Modified: csw/mgar/pkg/axel/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/axel/trunk/files/changelog.CSW 2009-11-23 10:52:46 UTC (rev 7392) +++ csw/mgar/pkg/axel/trunk/files/changelog.CSW 2009-11-23 12:23:24 UTC (rev 7393) @@ -1,5 +1,5 @@ -axel (2.4,REV=2009.11.18) +axel (2.4,REV=2009.11.23) * Updated to 2.4. (Fixes #4032) - -- Sebastian Kayser Wed, 18 Nov 2009 16:13:33 +0100 + -- Sebastian Kayser Mon, 23 Nov 2009 12:39:17 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Mon Nov 23 13:27:12 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 23 Nov 2009 12:27:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7394] csw/mgar/pkg/axel/trunk/files/changelog.CSW Message-ID: Revision: 7394 http://gar.svn.sourceforge.net/gar/?rev=7394&view=rev Author: skayser Date: 2009-11-23 12:27:11 +0000 (Mon, 23 Nov 2009) Log Message: ----------- axel: updated changelog.CSW Modified Paths: -------------- csw/mgar/pkg/axel/trunk/files/changelog.CSW Modified: csw/mgar/pkg/axel/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/axel/trunk/files/changelog.CSW 2009-11-23 12:23:24 UTC (rev 7393) +++ csw/mgar/pkg/axel/trunk/files/changelog.CSW 2009-11-23 12:27:11 UTC (rev 7394) @@ -1,5 +1,6 @@ axel (2.4,REV=2009.11.23) * Updated to 2.4. (Fixes #4032) + * Migrated axelrc from /opt/csw/etc to /etc/opt/csw. -- Sebastian Kayser Mon, 23 Nov 2009 12:39:17 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Mon Nov 23 19:38:49 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 23 Nov 2009 18:38:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[7395] csw/mgar/pkg/mbuffer/trunk Message-ID: Revision: 7395 http://gar.svn.sourceforge.net/gar/?rev=7395&view=rev Author: skayser Date: 2009-11-23 18:38:49 +0000 (Mon, 23 Nov 2009) Log Message: ----------- mbuffer: version bump to 20091122, added TMPDIR cleanup on test failures Modified Paths: -------------- csw/mgar/pkg/mbuffer/trunk/Makefile csw/mgar/pkg/mbuffer/trunk/checksums Modified: csw/mgar/pkg/mbuffer/trunk/Makefile =================================================================== --- csw/mgar/pkg/mbuffer/trunk/Makefile 2009-11-23 12:27:11 UTC (rev 7394) +++ csw/mgar/pkg/mbuffer/trunk/Makefile 2009-11-23 18:38:49 UTC (rev 7395) @@ -1,12 +1,8 @@ # STATUS/TODO -# - 20090628 contained assertion failures in 64-bit code which have been fixed -# with 20091012, 20091012 introduced hickups with non-IPv6 systems when using -# -I / -O (and not explicitly specifying -4) -# - 20091110 does not work on Solaris 8 / 9 any more .. upstream informed -# - 20091110 dumps core on connection refused .. upstream informed - +# - provide feedback about -xarch=generic64 to upstream +# - verify that tests pass GARNAME = mbuffer -GARVERSION = 20091110 +GARVERSION = 20091122 CATEGORIES = utils DESCRIPTION = A tool for buffering data streams @@ -69,10 +65,17 @@ # Target test3 is skipped because it contains IPV6 tests which # are not supported by the build farm boxes (yet). - $(MAKE) -C $(TMPDIR) -o test3 check - rm -rf $(TMPDIR) + $(MAKE) -C $(TMPDIR) -o test3 check || rm -rf $(TMPDIR) && exit 1 + test -d $(TMPDIR) && rm -rf $(TMPDIR) @$(MAKECOOKIE) +# mbuffer-20091122 always tries to use -xarch=generic64, +# even for non-64bit builds +post-configure-modulated: + [ "$(GARCH)" -eq "i386" -o "$(GARCH)" -eq "sparcv8" ] && \ + gsed -ie 's/-xarch=generic64//' $(WORKSRC)/Makefile + @$(MAKECOOKIE) + post-install-modulated: DOCS = ChangeLog README AUTHORS post-install-modulated: DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME) post-install-modulated: Modified: csw/mgar/pkg/mbuffer/trunk/checksums =================================================================== --- csw/mgar/pkg/mbuffer/trunk/checksums 2009-11-23 12:27:11 UTC (rev 7394) +++ csw/mgar/pkg/mbuffer/trunk/checksums 2009-11-23 18:38:49 UTC (rev 7395) @@ -1 +1 @@ -1c2ba8b865c3a26c503bb680810142be mbuffer-20091110.tgz +3f05bd393ac749ed820636e5aaed7848 mbuffer-20091122.tgz 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 Nov 23 23:01:34 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 23 Nov 2009 22:01:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[7396] csw/mgar/pkg/nspr/trunk/Makefile Message-ID: Revision: 7396 http://gar.svn.sourceforge.net/gar/?rev=7396&view=rev Author: wahwah Date: 2009-11-23 22:01:34 +0000 (Mon, 23 Nov 2009) Log Message: ----------- nspr: Adding /opt/csw/lib/nspr/64 --> {amd64,sparcv9} symlinks Modified Paths: -------------- csw/mgar/pkg/nspr/trunk/Makefile Modified: csw/mgar/pkg/nspr/trunk/Makefile =================================================================== --- csw/mgar/pkg/nspr/trunk/Makefile 2009-11-23 18:38:49 UTC (rev 7395) +++ csw/mgar/pkg/nspr/trunk/Makefile 2009-11-23 22:01:34 UTC (rev 7396) @@ -60,12 +60,6 @@ CONFIGURE_ARGS_DBG += --enable-tests CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) -# These options I'm unsure about, are they really needed? -# EXTRA_LDFLAGS = -R'\$\$ORIGIN:\$\$ORIGIN/..' -R/opt/csw/lib -# prefix = /opt/csw/mozilla/nspr -# CONFIGURE_ARGS += --with-dist-prefix=$(DESTDIR)/opt/csw/mozilla/nspr -# CONFIGURE_ARGS += --with-dist-bindir=$(DESTDIR)/opt/csw/mozilla/nspr/lib - BUILD64 = 1 include gar/category.mk @@ -84,7 +78,7 @@ install-nspr: (cd $(WORKSRC)/build && $(INSTALL_ENV) gmake install DESTDIR=$(DESTDIR)) - (cd $(DESTDIR)/opt/csw/lib/nspr \ + (cd $(DESTDIR)$(libdir) \ && for file in *.so; do \ mv $${file} $${file}.$(MIN_VERSION); \ ln -s $${file}.$(MIN_VERSION) $${file}; \ @@ -95,6 +89,16 @@ ginstall -m 755 -d $(DESTDIR)$(prefix)/lib/pkgconfig ginstall -m 644 $(WORKSRC)/build/config/nspr.pc \ $(DESTDIR)$(prefix)/lib/pkgconfig - rm $(DESTDIR)$(bindir)/prerr.properties - rm $(DESTDIR)$(bindir)/nspr.pc + rm -f $(DESTDIR)$(bindir)/prerr.properties + rm -f $(DESTDIR)$(bindir)/nspr.pc @$(MAKECOOKIE) + +# Create symlinks allowing to use -L/opt/csw/lib/nspr/64 for 64-bit +# architectures. +post-merge: + if [ "$(GARCH)" = sparc ]; then \ + gln -sf sparcv9 $(PKGROOT)$(libdir)/64; \ + elif [ "$(GARCH)" = i386 ]; then \ + gln -sf amd64 $(PKGROOT)$(libdir)/64; \ + fi + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From glawsf at users.sourceforge.net Mon Nov 23 23:29:49 2009 From: glawsf at users.sourceforge.net (glawsf at users.sourceforge.net) Date: Mon, 23 Nov 2009 22:29:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[7397] csw/mgar/pkg/puppet/trunk Message-ID: Revision: 7397 http://gar.svn.sourceforge.net/gar/?rev=7397&view=rev Author: glawsf Date: 2009-11-23 22:29:49 +0000 (Mon, 23 Nov 2009) Log Message: ----------- changed binary locations; updated checksums Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/checksums csw/mgar/pkg/puppet/trunk/files/cswpuppetd csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2009-11-23 22:01:34 UTC (rev 7396) +++ csw/mgar/pkg/puppet/trunk/checksums 2009-11-23 22:29:49 UTC (rev 7397) @@ -1,6 +1,6 @@ abaa404420106f9f28e9e1218b4e365b 0001-pkgutil-support.patch 9c27c0cdca051eae986b56b91ef889ca 0002-Using-the-single-option-of-pkgutil.patch -db0230ad9c2a8622c7f7e73c10f61dbc cswpuppetd -fd5e49b7d2b7d288d5beb224d0cfa855 cswpuppetmasterd +6135a983b7f020bea07178801f261693 cswpuppetd +51156a9016cbc41c92e3bbd3ee1bdbb6 cswpuppetmasterd 3ab0d4f9801075bc78b68b766b496fc7 cswusergroup 55ced6102fe6ad8b2ecb2b1384008167 puppet-0.25.1.tar.gz Modified: csw/mgar/pkg/puppet/trunk/files/cswpuppetd =================================================================== --- csw/mgar/pkg/puppet/trunk/files/cswpuppetd 2009-11-23 22:01:34 UTC (rev 7396) +++ csw/mgar/pkg/puppet/trunk/files/cswpuppetd 2009-11-23 22:29:49 UTC (rev 7397) @@ -16,7 +16,7 @@ prefix="/opt/csw" exec_prefix="/opt/csw" sysconfdir="/etc/csw/opt" -sbindir="/opt/csw/bin" +sbindir="/opt/csw/sbin" localstatedir="/var/opt/csw" Modified: csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd =================================================================== --- csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd 2009-11-23 22:01:34 UTC (rev 7396) +++ csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd 2009-11-23 22:29:49 UTC (rev 7397) @@ -17,7 +17,7 @@ printf "Starting Puppet server services:" - /opt/csw/bin/puppetmasterd + /opt/csw/sbin/puppetmasterd printf " puppetmaster" echo "" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From glawsf at users.sourceforge.net Mon Nov 23 23:31:19 2009 From: glawsf at users.sourceforge.net (glawsf at users.sourceforge.net) Date: Mon, 23 Nov 2009 22:31:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[7398] csw/mgar/pkg/puppet/trunk/checksums Message-ID: Revision: 7398 http://gar.svn.sourceforge.net/gar/?rev=7398&view=rev Author: glawsf Date: 2009-11-23 22:31:19 +0000 (Mon, 23 Nov 2009) Log Message: ----------- changed binary locations; updated checksums Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/checksums Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2009-11-23 22:29:49 UTC (rev 7397) +++ csw/mgar/pkg/puppet/trunk/checksums 2009-11-23 22:31:19 UTC (rev 7398) @@ -1,6 +1,6 @@ abaa404420106f9f28e9e1218b4e365b 0001-pkgutil-support.patch 9c27c0cdca051eae986b56b91ef889ca 0002-Using-the-single-option-of-pkgutil.patch -6135a983b7f020bea07178801f261693 cswpuppetd -51156a9016cbc41c92e3bbd3ee1bdbb6 cswpuppetmasterd +0ccf353707349bdc9c04297a8bef1f3d cswpuppetd +aba2c79e589b9bd1c881a22aa663a213 cswpuppetmasterd 3ab0d4f9801075bc78b68b766b496fc7 cswusergroup 55ced6102fe6ad8b2ecb2b1384008167 puppet-0.25.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Nov 23 23:54:13 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 23 Nov 2009 22:54:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[7399] csw/mgar/pkg/firefox/trunk Message-ID: Revision: 7399 http://gar.svn.sourceforge.net/gar/?rev=7399&view=rev Author: wbonnet Date: 2009-11-23 22:54:13 +0000 (Mon, 23 Nov 2009) Log Message: ----------- Upgrade to 3.0.15 Modified Paths: -------------- csw/mgar/pkg/firefox/trunk/Makefile csw/mgar/pkg/firefox/trunk/checksums csw/mgar/pkg/firefox/trunk/files/nsWildCard.cpp.diff Modified: csw/mgar/pkg/firefox/trunk/Makefile =================================================================== --- csw/mgar/pkg/firefox/trunk/Makefile 2009-11-23 22:31:19 UTC (rev 7398) +++ csw/mgar/pkg/firefox/trunk/Makefile 2009-11-23 22:54:13 UTC (rev 7399) @@ -1,5 +1,5 @@ GARNAME = firefox -GARVERSION = 3.0.14 +GARVERSION = 3.0.15 CATEGORIES = x11 DISTNAME = $(GARNAME) @@ -20,6 +20,8 @@ CATALOGNAME_CSWfirefox = $(GARNAME) SPKG_DESC_CSWfirefox = $(DESCRIPTION) +PREREQUISITE_PKGS = CSWgtk2devel CSWlibdbusdev CSWdbusglibdev CSWsqlite3devel CSWkbproto CSWrenderproto + REQUIRED_PKGS_CSWfirefox = CSWdbusglib REQUIRED_PKGS_CSWfirefox += CSWfconfig REQUIRED_PKGS_CSWfirefox += CSWftype2 @@ -84,9 +86,9 @@ WORK_INSTALL = $(WORKROOTDIR)/install-$(firstword $(MODULATIONS)) post-extract: - @mv $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/mozilla $(WORK_BUILD) - @cp $(FILEDIR)/stdbool.h $(WORK_BUILD)/memory/jemalloc - @$(MAKECOOKIE) + mv $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/mozilla $(WORK_BUILD) + cp $(FILEDIR)/stdbool.h $(WORK_BUILD)/memory/jemalloc + $(MAKECOOKIE) pre-configure-modulated: @cp $(FILEDIR)/.mozconfig $(WORK_BUILD)/.mozconfig @@ -95,8 +97,8 @@ @grep openwin $(WORKSRC)/config/autoconf.mk && gpatch -d$(WORKSRC) --forward -p1 -F2 < download/autoconf.mk.diff || true pre-install-modulated: - @grep "LD_LIBRARY_PATH=.LD_LIBRARY_PATH:/usr/lib/lwp" $(WORKSRC)/browser/app/firefox || gpatch -d$(WORKSRC) --forward -p1 -F2 < download/firefox.diff - @grep "LD_LIBRARY_PATH=.LD_LIBRARY_PATH:/usr/lib/lwp" $(WORKSRC)/dist/bin/firefox || gpatch -d$(WORKSRC) --forward -p1 -F2 < download/firefox.dist.bin.diff + @grep "LD_LIBRARY_PATH=.LD_LIBRARY_PATH:/usr/lib/lwp" $(WORKSRC)/browser/app/firefox || gpatch -d$(WORKSRC) --forward -p1 -F2 < $(FILEDIR)/firefox.diff + @grep "LD_LIBRARY_PATH=.LD_LIBRARY_PATH:/usr/lib/lwp" $(WORKSRC)/dist/bin/firefox || gpatch -d$(WORKSRC) --forward -p1 -F2 < $(FILEDIR)/firefox.dist.bin.diff ( if [ ! -d $(WORK_INSTALL)/opt/csw/bin ] ; then mkdir -p $(WORK_INSTALL)/opt/csw/bin ; fi ) ( cd $(WORK_INSTALL)/opt/csw/bin ; rm -f firefox ; ln -sf ../mozilla/firefox/bin/firefox . ) ( mkdir -p $(WORK_INSTALL)/opt/csw/share/pixmaps ) Modified: csw/mgar/pkg/firefox/trunk/checksums =================================================================== --- csw/mgar/pkg/firefox/trunk/checksums 2009-11-23 22:31:19 UTC (rev 7398) +++ csw/mgar/pkg/firefox/trunk/checksums 2009-11-23 22:54:13 UTC (rev 7399) @@ -1,23 +1,23 @@ -f9c7fb69080051172bd7357370731ba3 download/CSWfirefox.postinstall -6ede39c29b3672fb1fc1d8fe397a7863 download/CSWfirefox.postremove -9eaa0433fd8d1d7a3b39442b4b4c3e14 download/SunOS5.mk.diff -03e4d0e627dd508ea895c99c5e7ed184 download/autoconf.mk.diff -45bba282258a321e5e4f73a742bcc31b download/autoconf.mk.in.diff -c869762735a41bb30f417e510ccb7f31 download/configure.diff -a71a4afaabc4d067f30d8fb184fea520 download/file_id.cc.diff -5a075644b1f8d5dbb23525803b6c81dd download/firefox-3.0.14-source.tar.bz2 -125a5da522c7b0cc834ba6d97694d162 download/firefox.diff -162d4cf2d198196e94f6878d60dc7a26 download/firefox.dist.bin.diff -a19792f0b67f28c9227d19d069369369 download/jemalloc.c.diff -b2f4390ca62446743829cf7e23fcbc6c download/legacydb.config.mk.diff -8b401ae856d5be4b9761444b66acdcd8 download/legacydb.manifest.mm.diff -18b0cdc902caa4172b7f2d473239c9a9 download/md5.h.diff -1a3d61e09378d28d9bc9f3df45a224bc download/nsExceptionHandler.cpp.diff -ca4162516d8c09deaa9f0b6f3b3ecffb download/nsMathUtils.h.diff -d8f7ec0df9f63317ff2d8578d9dbe3ff download/nsNativeApSuportUnix.cpp.diff -f562a935a0fb2c5ad38f95af114d0a49 download/nsPluginsDirUnix.cpp.diff -28b8272f0d0f49cf650c5acb212c3d4b download/nsWildCard.cpp.diff -d0d942fa0c012abcb2a45b1d0fc99051 download/packager.mk.diff -25efd55ebf8715e66a28f2b07b25f38a download/softoken.config.mk.diff -187c192196a8c721ac7ae93466614c95 download/softoken.manifest.mm.diff -29e0ca858fe3aef24d5be1300dc39735 download/solaris_lwp.h.diff +18e15c50f07ee3252a5ecec68026bfa9 CSWfirefox.postinstall +e458069bc47dfab03251da4042e99614 CSWfirefox.postremove +9eaa0433fd8d1d7a3b39442b4b4c3e14 SunOS5.mk.diff +03e4d0e627dd508ea895c99c5e7ed184 autoconf.mk.diff +45bba282258a321e5e4f73a742bcc31b autoconf.mk.in.diff +c869762735a41bb30f417e510ccb7f31 configure.diff +a71a4afaabc4d067f30d8fb184fea520 file_id.cc.diff +e28e30d74c1488c8a8e2ff8cd2c37439 firefox-3.0.15-source.tar.bz2 +125a5da522c7b0cc834ba6d97694d162 firefox.diff +162d4cf2d198196e94f6878d60dc7a26 firefox.dist.bin.diff +a19792f0b67f28c9227d19d069369369 jemalloc.c.diff +b2f4390ca62446743829cf7e23fcbc6c legacydb.config.mk.diff +8b401ae856d5be4b9761444b66acdcd8 legacydb.manifest.mm.diff +18b0cdc902caa4172b7f2d473239c9a9 md5.h.diff +1a3d61e09378d28d9bc9f3df45a224bc nsExceptionHandler.cpp.diff +ca4162516d8c09deaa9f0b6f3b3ecffb nsMathUtils.h.diff +d8f7ec0df9f63317ff2d8578d9dbe3ff nsNativeApSuportUnix.cpp.diff +f562a935a0fb2c5ad38f95af114d0a49 nsPluginsDirUnix.cpp.diff +32a26e077d300d4f3ae135a778e43525 nsWildCard.cpp.diff +d0d942fa0c012abcb2a45b1d0fc99051 packager.mk.diff +25efd55ebf8715e66a28f2b07b25f38a softoken.config.mk.diff +187c192196a8c721ac7ae93466614c95 softoken.manifest.mm.diff +29e0ca858fe3aef24d5be1300dc39735 solaris_lwp.h.diff Modified: csw/mgar/pkg/firefox/trunk/files/nsWildCard.cpp.diff =================================================================== --- csw/mgar/pkg/firefox/trunk/files/nsWildCard.cpp.diff 2009-11-23 22:31:19 UTC (rev 7398) +++ csw/mgar/pkg/firefox/trunk/files/nsWildCard.cpp.diff 2009-11-23 22:54:13 UTC (rev 7399) @@ -1,6 +1,6 @@ --- firefox.orig/xpfe/components/filepicker/src/nsWildCard.cpp 2009-09-12 11:39:56.098357687 +0200 -+++ firefox/xpfe/components/filepicker/src]nsWildCard.cpp 2009-09-12 16:06:48.580505412 +0200 -@@ -57,38 +57,34 @@ ++++ firefox/xpfe/components/filepicker/src/nsWildCard.cpp 2009-09-12 16:06:48.580505412 +0200 +@@ -57,40 +57,35 @@ typedef int static_assert_character_code_arrangement['a' > 'A' ? 1 : -1]; @@ -40,20 +40,36 @@ /* ----------------------------- _valid_subexp ---------------------------- */ -template -+template static int - _valid_subexp(const T *expr, T stop1, T stop2) +-_valid_subexp(const T *expr, T stop1, T stop2) ++_valid_subexp(const PRUnichar *expr, PRUnichar stop1, PRUnichar stop2) { -@@ -162,7 +158,7 @@ + register int x; + int nsc = 0; /* Number of special characters */ +@@ -132,7 +127,7 @@ + return INVALID_SXP; + np = -1; + do { +- int t = ::_valid_subexp(&expr[++x], T(')'), T('|')); ++ int t = ::_valid_subexp(&expr[++x], PRUnichar(')'), PRUnichar('|')); + if(t == 0 || t == INVALID_SXP) + return INVALID_SXP; + x+=t; +@@ -162,11 +157,10 @@ } -template -+template int - NS_WildCardValid_(const T *expr) +-NS_WildCardValid_(const T *expr) ++NS_WildCardValid_(const PRUnichar *expr) { -@@ -183,9 +179,8 @@ +- int x = ::_valid_subexp(expr, T('\0'), T('\0')); ++ int x = ::_valid_subexp(expr, PRUnichar('\0'), PRUnichar('\0')); + return (x < 0 ? x : VALID_SXP); + } + +@@ -183,9 +177,8 @@ #define NOMATCH 1 #define ABORTED -1 @@ -64,7 +80,7 @@ /** * Count characters until we reach a NUL character or either of the -@@ -196,9 +191,8 @@ +@@ -196,9 +189,8 @@ * Return index in input string of first stop found, or ABORTED if not found. * If "dest" is non-NULL, copy counted characters to it and NUL terminate. */ @@ -75,7 +91,7 @@ { register int sx; /* source index */ register char cc; -@@ -219,7 +213,7 @@ +@@ -219,7 +211,7 @@ } if (dest && sx) { /* Copy all but the closing delimiter. */ @@ -84,7 +100,7 @@ dest[sx] = 0; } return cc ? sx : ABORTED; /* index of closing delimiter */ -@@ -233,36 +227,35 @@ +@@ -233,36 +225,35 @@ * matches the input string. Repeat this until some alternative matches, * or we have an abort. */ @@ -127,7 +143,7 @@ ret = ::_shexp_match(str, e2, case_insensitive, level + 1); if (ret != NOMATCH || !expr[sx] || expr[sx] == ')') break; -@@ -284,9 +277,8 @@ +@@ -284,9 +275,8 @@ return map[lower(val)]; } @@ -138,7 +154,7 @@ unsigned int level) { register int x; /* input string index */ -@@ -326,7 +318,7 @@ +@@ -326,7 +316,7 @@ else return NOMATCH; case '[': { @@ -147,7 +163,7 @@ int i; neg = ((expr[++y] == '^') && (expr[y+1] != ']')); if (neg) -@@ -342,9 +334,9 @@ +@@ -342,9 +332,9 @@ } if (alphanumeric(end) && expr[i] == ']') { /* This is a range form: a-b */ @@ -159,7 +175,7 @@ end = start; start = tmp; } -@@ -405,21 +397,20 @@ +@@ -405,22 +395,21 @@ } @@ -177,7 +193,9 @@ return _shexp_match(str, xp, case_insensitive, 0); - expr = (T *) NS_Alloc((nsCharTraits::length(xp) + 1) * sizeof(T)); +- memcpy(expr, xp, (nsCharTraits::length(xp) + 1) * sizeof(T)); + expr = (PRUnichar *) NS_Alloc((nsCharTraits::length(xp) + 1) * sizeof(PRUnichar)); ++ memcpy(expr, xp, (nsCharTraits::length(xp) + 1) * sizeof(PRUnichar)); if(!expr) return NOMATCH; @@ -186,7 +204,7 @@ if (x != ABORTED && expr[x] == '~') { expr[x++] = '\0'; ret = ::_shexp_match(str, &expr[x], case_insensitive, 0); -@@ -436,9 +427,8 @@ +@@ -437,9 +426,8 @@ return ret; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From glawsf at users.sourceforge.net Mon Nov 23 23:56:10 2009 From: glawsf at users.sourceforge.net (glawsf at users.sourceforge.net) Date: Mon, 23 Nov 2009 22:56:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7400] csw/mgar/pkg/puppet/trunk Message-ID: Revision: 7400 http://gar.svn.sourceforge.net/gar/?rev=7400&view=rev Author: glawsf Date: 2009-11-23 22:56:10 +0000 (Mon, 23 Nov 2009) Log Message: ----------- path fixes Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/checksums csw/mgar/pkg/puppet/trunk/files/cswpuppetd Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2009-11-23 22:54:13 UTC (rev 7399) +++ csw/mgar/pkg/puppet/trunk/checksums 2009-11-23 22:56:10 UTC (rev 7400) @@ -1,6 +1,6 @@ abaa404420106f9f28e9e1218b4e365b 0001-pkgutil-support.patch 9c27c0cdca051eae986b56b91ef889ca 0002-Using-the-single-option-of-pkgutil.patch -0ccf353707349bdc9c04297a8bef1f3d cswpuppetd +36f8b54ed17847de7cdea6c5992ec0c5 cswpuppetd aba2c79e589b9bd1c881a22aa663a213 cswpuppetmasterd 3ab0d4f9801075bc78b68b766b496fc7 cswusergroup 55ced6102fe6ad8b2ecb2b1384008167 puppet-0.25.1.tar.gz Modified: csw/mgar/pkg/puppet/trunk/files/cswpuppetd =================================================================== --- csw/mgar/pkg/puppet/trunk/files/cswpuppetd 2009-11-23 22:54:13 UTC (rev 7399) +++ csw/mgar/pkg/puppet/trunk/files/cswpuppetd 2009-11-23 22:56:10 UTC (rev 7400) @@ -10,6 +10,9 @@ # * Distinguishing between reload and restart # * Made the script zone-friendly # * Supported custom pid file locations. +# +# 2009-11-23 Gary Law +# * changed sbindir . /lib/svc/share/smf_include.sh This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From glawsf at users.sourceforge.net Tue Nov 24 00:01:32 2009 From: glawsf at users.sourceforge.net (glawsf at users.sourceforge.net) Date: Mon, 23 Nov 2009 23:01:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7401] csw/mgar/pkg/puppet/trunk/checksums Message-ID: Revision: 7401 http://gar.svn.sourceforge.net/gar/?rev=7401&view=rev Author: glawsf Date: 2009-11-23 23:01:32 +0000 (Mon, 23 Nov 2009) Log Message: ----------- path fixes Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/checksums Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2009-11-23 22:56:10 UTC (rev 7400) +++ csw/mgar/pkg/puppet/trunk/checksums 2009-11-23 23:01:32 UTC (rev 7401) @@ -1,6 +1,6 @@ abaa404420106f9f28e9e1218b4e365b 0001-pkgutil-support.patch 9c27c0cdca051eae986b56b91ef889ca 0002-Using-the-single-option-of-pkgutil.patch -36f8b54ed17847de7cdea6c5992ec0c5 cswpuppetd +f4a95dece2231805abf4754d72471de4 cswpuppetd aba2c79e589b9bd1c881a22aa663a213 cswpuppetmasterd 3ab0d4f9801075bc78b68b766b496fc7 cswusergroup 55ced6102fe6ad8b2ecb2b1384008167 puppet-0.25.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 Tue Nov 24 09:54:15 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 24 Nov 2009 08:54:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[7402] csw/mgar/pkg/nss/branches/upstream-work Message-ID: Revision: 7402 http://gar.svn.sourceforge.net/gar/?rev=7402&view=rev Author: wahwah Date: 2009-11-24 08:54:15 +0000 (Tue, 24 Nov 2009) Log Message: ----------- nss: Switched to OPT build, added nss.pc Modified Paths: -------------- csw/mgar/pkg/nss/branches/upstream-work/Makefile csw/mgar/pkg/nss/branches/upstream-work/checksums Added Paths: ----------- csw/mgar/pkg/nss/branches/upstream-work/files/nss.pc Modified: csw/mgar/pkg/nss/branches/upstream-work/Makefile =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/Makefile 2009-11-23 23:01:32 UTC (rev 7401) +++ csw/mgar/pkg/nss/branches/upstream-work/Makefile 2009-11-24 08:54:15 UTC (rev 7402) @@ -1,19 +1,24 @@ # Copyright 2009 OpenCSW # Distributed under the terms of the GNU General Public License v2 # $Id$ - - +# # Based on the following resources: # - http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/nss-3.12.4-r1.ebuild?view=markup # - https://developer.mozilla.org/en/NSS_reference/Building_and_installing_NSS/Build_instructions # - https://developer.mozilla.org/en/NSS_reference/NSS_environment_variables # - https://developer.mozilla.org/en/NSS_reference/Building_and_installing_NSS/Installation_guide +# +# A discussion: +# - https://groups.google.com/group/mozilla.dev.tech.crypto/browse_thread/thread/709646e32fc4fad0# +# +# TODO: nss-config +# TODO: a better nss.pc -# Debugging mode, this is work in progress. -GARFLAVOR = DBG - GARNAME = nss -GARVERSION = 3.12.4 +MAJOR_VERSION = 3 +MINOR_VERSION = 12 +PATCHLEVEL = 4 +GARVERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(PATCHLEVEL) CATEGORIES = lib DESCRIPTION = Network Security Services library, implements PKI support define BLURB @@ -23,8 +28,8 @@ RTM_NAME = NSS_3_12_4_RTM MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/ DIST_SUFFIX = -with-nspr-4.8 -DISTFILES = $(GARNAME)-$(GARVERSION)$(DIST_SUFFIX).tar.gz -DISTNAME = $(GARNAME)-$(GARVERSION)$(DIST_SUFFIX) +DISTFILES = $(GARNAME)-$(GARVERSION)$(DIST_SUFFIX).tar.gz +DISTNAME = $(GARNAME)-$(GARVERSION)$(DIST_SUFFIX) UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)$(DIST_SUFFIX).tar.gz REQUIRED_PKGS = CSWnspr CSWsqlite3 PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWsqlite3devel @@ -34,29 +39,46 @@ TEST_SCRIPTS = BUILD64 = 1 +libdir_install = $(prefix)/lib/nss +# libdir = $(prefix)/lib/nss +includedir = $(prefix)/include/nss + ifeq (OPT,$(GARFLAVOR)) BUILD_OPT = 1 + export BUILD_OPT endif # NSPR is installed in /opt/csw/lib/nspr, nspr.pc is in /opt/csw/lib/pkgconfig NSPR_INCLUDE_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --cflags-only-I nspr | gsed 's/-I//') export NSPR_INCLUDE_DIR -NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ') -export NSPR_LIB_DIR +# To consider in the future. +# NSS_ENABLE_ECC = 1 +# export NSS_ENABLE_ECC + # 64-bit suppport ifeq ($(MODULATION),isa-sparcv9) USE_64 = 1 + NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ')/64 export USE_64 -endif +else ifeq ($(MODULATION),isa-amd64) USE_64 = 1 + NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ')/64 export USE_64 +else + NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ') endif +endif +export NSPR_LIB_DIR +# For DBG builds +PATCHFILES = whoami.patch + include gar/category.mk build-nss: build-coreconf build-dbm build-nss-compile + @$(MAKECOOKIE) build-coreconf: (cd $(WORKSRC)/mozilla/security/coreconf \ @@ -81,3 +103,50 @@ && \ gmake -j1 CC="$(CC)") @$(MAKECOOKIE) + +install-nss: + ginstall -d -m 755 $(DESTDIR)$(libdir) + for f in $(WORKSRC)/mozilla/dist/SunOS5*/lib/*.so; do \ + ginstall -m 755 $${f} $(DESTDIR)$(libdir); \ + done + ginstall -d -m 755 $(DESTDIR)$(bindir) + # TODO: nss-config + # gcp -a $(WORKSRC)/mozilla/dist/*/bin/nss-config $(DESTDIR)$(bindir) + ginstall -d -m 755 $(DESTDIR)$(includedir) + for f in \ + $(WORKSRC)/mozilla/dist/private/nss/*.h \ + $(WORKSRC)/mozilla/dist/public/nss/*.h; \ + do \ + ginstall -m 644 $${f} $(DESTDIR)$(includedir); \ + done + cd $(DESTDIR)$(libdir) && for file in *.so; do \ + if [ ! -h $${file} ]; then \ + gmv -v $${file} $${file}.$(MINOR_VERSION); \ + gln -s $${file}.$(MINOR_VERSION) $${file}; \ + fi; \ + done + for file in $(WORKSRC)/mozilla/dist/*/bin/* ; do \ + ginstall -m 755 $${file} $(DESTDIR)$(bindir)/nss`basename $${file}`; \ + done + # Asserting that we have the right version in the .pc file + ggrep "Version: $(GARVERSION)" $(FILEDIR)/nss.pc \ + || ( \ + echo "Please adjust nss version in $(FILEDIR)/nss.pc" \ + && \ + false \ + ) + ginstall -d -m 755 $(DESTDIR)$(prefix)/lib/pkgconfig + ginstall -m 644 \ + $(FILEDIR)/nss.pc \ + $(DESTDIR)$(prefix)/lib/pkgconfig + @$(MAKECOOKIE) + +# Create symlinks allowing to use -L/opt/csw/lib/nss/64 for 64-bit +# architectures. +post-merge: + if [ "$(GARCH)" = sparc ]; then \ + gln -sf sparcv9 $(PKGROOT)$(libdir)/64; \ + elif [ "$(GARCH)" = i386 ]; then \ + gln -sf amd64 $(PKGROOT)$(libdir)/64; \ + fi + @$(MAKECOOKIE) Modified: csw/mgar/pkg/nss/branches/upstream-work/checksums =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/checksums 2009-11-23 23:01:32 UTC (rev 7401) +++ csw/mgar/pkg/nss/branches/upstream-work/checksums 2009-11-24 08:54:15 UTC (rev 7402) @@ -1,7 +1,2 @@ 8f76e381bf2339d731bfd5b8116c25a4 nss-3.12.4-with-nspr-4.8.tar.gz -39b9d2431d4ff717d103b742fcaefb81 nss-3.12.4.patch -f0f40bd021423ab1680b4d87cd19c1db platlibs-sqlite3.patch -441f12a9396a89841d384d8c89a052ff platlibs-sunos.patch -d41d8cd98f00b204e9800998ecf8427e runtime-search-path.patch -90b4d32437b3e3fdadcf4f16339aa2ed shared-libs.patch 221646aa1954b4a255ac03e7d8b0225d whoami.patch Added: csw/mgar/pkg/nss/branches/upstream-work/files/nss.pc =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/files/nss.pc (rev 0) +++ csw/mgar/pkg/nss/branches/upstream-work/files/nss.pc 2009-11-24 08:54:15 UTC (rev 7402) @@ -0,0 +1,11 @@ +prefix=/opt/csw +exec_prefix=${prefix} +libdir=${prefix}/lib/nss +includedir=${prefix}/include/nss + +Name: NSS +Description: Network Security Services +Version: 3.12.4 +Requires: nspr >= 4.8.0 +Libs: -L${libdir} -lssl3 -lsmime3 -lnssutil3 -lnss3 -R${libdir} +Cflags: -I${includedir} 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 Nov 24 10:18:36 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 24 Nov 2009 09:18:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[7403] csw/mgar/pkg/nss/branches/upstream-work/files/whoami .patch Message-ID: Revision: 7403 http://gar.svn.sourceforge.net/gar/?rev=7403&view=rev Author: wahwah Date: 2009-11-24 09:18:35 +0000 (Tue, 24 Nov 2009) Log Message: ----------- nss: Adding back the whoami patch Added Paths: ----------- csw/mgar/pkg/nss/branches/upstream-work/files/whoami.patch Added: csw/mgar/pkg/nss/branches/upstream-work/files/whoami.patch =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/files/whoami.patch (rev 0) +++ csw/mgar/pkg/nss/branches/upstream-work/files/whoami.patch 2009-11-24 09:18:35 UTC (rev 7403) @@ -0,0 +1,11 @@ +--- nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/UNIX.mk.orig 2009-11-22 02:25:17.411354784 +0100 ++++ nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/UNIX.mk 2009-11-22 02:25:24.833876220 +0100 +@@ -46,7 +46,7 @@ + DEFINES += -UDEBUG -DNDEBUG + else + OPTIMIZER += -g +- USERNAME := $(shell whoami) ++ USERNAME := $(shell gwhoami) + USERNAME := $(subst -,_,$(USERNAME)) + DEFINES += -DDEBUG -UNDEBUG -DDEBUG_$(USERNAME) + endif 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 Nov 24 13:32:56 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 24 Nov 2009 12:32:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[7404] csw/mgar/pkg Message-ID: Revision: 7404 http://gar.svn.sourceforge.net/gar/?rev=7404&view=rev Author: wahwah Date: 2009-11-24 12:32:55 +0000 (Tue, 24 Nov 2009) Log Message: ----------- chromium: template copied Modified Paths: -------------- csw/mgar/pkg/chromium/trunk/Makefile csw/mgar/pkg/chromium/trunk/checksums Added Paths: ----------- csw/mgar/pkg/chromium/ Modified: csw/mgar/pkg/chromium/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-11-18 23:52:45 UTC (rev 7349) +++ csw/mgar/pkg/chromium/trunk/Makefile 2009-11-24 12:32:55 UTC (rev 7404) @@ -11,8 +11,9 @@ ## For more information about GAR variables, please see: ## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference ## -GARNAME = mypkg -GARVERSION = 1.0 +GARNAME = chromium +CHROMIUM_REVISION = 32797 +GARVERSION = 0.$(CHROMIUM_REVISION) ## ## The category that your software fits in. This is not a descriptive field, but ## influences the build process. Depending on the CATEGORIES setting, different @@ -25,12 +26,11 @@ CATEGORIES = lib ## ## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = +DESCRIPTION = An open-source web browser ## ## 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 @@ -39,7 +39,7 @@ ## ## Whitespace-separated list of URLs to download the source package from. ## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = +MASTER_SITES = http://build.chromium.org/buildbot/archives/ ## ## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the ## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge @@ -54,7 +54,7 @@ ## Whitespace-separated list of files which comprise this build. mGAR will look ## for the files in the $(FILEDIR) (trunk/files) directory and on the ## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = chromium.r$(CHROMIUM_REVISION).tgz ## ## We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -123,10 +123,10 @@ ## ETCSERVICES = ## INETDCONF = ## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = +REQUIRED_PKGS = CSWnspr CSWnss ## ## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWlibxcbdevel ## ## When using non-empty $(PACKAGES): ## REQUIRED_PKGS_CSWpkgname = @@ -145,10 +145,10 @@ ## 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 = +CONFIGURE_SCRIPTS = chromium +BUILD_SCRIPTS = chromium +INSTALL_SCRIPTS = chromium +TEST_SCRIPTS = chromium ## ## Compilation settings ## @@ -160,7 +160,7 @@ ## BUILD_ARGS = ## ## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) +## CONFIGURE_ARGS = $(DIRPATHS) ## ## BUILD64 = ## CONFIGURE_ENV = @@ -176,10 +176,19 @@ ## 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 -#include gar/category.mk +configure-chromium: depot-tools + false + @$(MAKECOOKIE) + +depot-tools: + (cd $(WORKDIR) \ + && \ + if [ -d depot_tools ]; then \ + (cd depot_tools; svn up); \ + else \ + svn co http://src.chromium.org/svn/trunk/tools/depot_tools; \ + fi \ + ) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/chromium/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-11-18 23:52:45 UTC (rev 7349) +++ csw/mgar/pkg/chromium/trunk/checksums 2009-11-24 12:32:55 UTC (rev 7404) @@ -0,0 +1 @@ +7c09ec3c1f8bc15184b6e9ee83e26925 chromium.r32797.tgz 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 Nov 24 16:27:07 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 24 Nov 2009 15:27:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7405] csw/mgar/pkg/chromium/trunk/Makefile Message-ID: Revision: 7405 http://gar.svn.sourceforge.net/gar/?rev=7405&view=rev Author: wahwah Date: 2009-11-24 15:27:07 +0000 (Tue, 24 Nov 2009) Log Message: ----------- chromium: got past the gclient runhooks stage. Stuck at ffmpeg. Modified Paths: -------------- csw/mgar/pkg/chromium/trunk/Makefile Modified: csw/mgar/pkg/chromium/trunk/Makefile =================================================================== --- csw/mgar/pkg/chromium/trunk/Makefile 2009-11-24 12:32:55 UTC (rev 7404) +++ csw/mgar/pkg/chromium/trunk/Makefile 2009-11-24 15:27:07 UTC (rev 7405) @@ -176,12 +176,49 @@ ## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. ## GARCOMPILER = SOS11 ## + +GYP_GENERATORS = make +export GYP_GENERATORS + +WORKSRC = $(WORKDIR)/home/chrome-svn/tarball/chromium +CHROMIUM_ROOT = $(WORKSRC) + +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +GARCOMPILER = GNU + include gar/category.mk -configure-chromium: depot-tools - false +$(WORKSRC)/.gclient: + (cd $(WORKSRC) && \ + PATH=$$PATH:$(abspath $(WORKDIR)/depot_tools) \ + GYP_GENERATORS=make \ + gclient config http://src.chromium.org/svn/trunk/src) + +# Skipping gclient sync for now; running only gclient runhooks. The build +# instructions say that we'll miss on some platform-specific depends, but +# I don't think there's anything platform-specific for Solaris in the source +# code repository. + +configure-chromium: depot-tools gclient-runhooks @$(MAKECOOKIE) +gclient-sync: $(WORKSRC)/.gclient + (cd $(WORKSRC) \ + && \ + PATH=$$PATH:$(abspath $(WORKDIR)/depot_tools):/opt/csw/gcc4/bin \ + GYP_GENERATORS=make \ + gclient sync) + @$(MAKECOOKIE) + +gclient-runhooks: $(WORKSRC)/.gclient + (cd $(WORKSRC) \ + && \ + PATH=$$PATH:$(abspath $(WORKDIR)/depot_tools):/opt/csw/gcc4/bin \ + GYP_GENERATORS=make \ + gclient runhooks --force) + @$(MAKECOOKIE) + depot-tools: (cd $(WORKDIR) \ && \ @@ -192,3 +229,9 @@ fi \ ) @$(MAKECOOKIE) + +build-chromium: + (cd $(CHROMIUM_ROOT)/src \ + && \ + PATH=$$PATH:$(abspath $(WORKDIR)/depot_tools):/opt/csw/gcc4/bin \ + gmake chrome) 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 Nov 24 17:17:03 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 24 Nov 2009 16:17:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[7406] csw/mgar/pkg/nspr/trunk/Makefile Message-ID: Revision: 7406 http://gar.svn.sourceforge.net/gar/?rev=7406&view=rev Author: wahwah Date: 2009-11-24 16:17:03 +0000 (Tue, 24 Nov 2009) Log Message: ----------- nspr: -devel package ARCHALL = 1, better 64 --> sparcv9 linking Modified Paths: -------------- csw/mgar/pkg/nspr/trunk/Makefile Modified: csw/mgar/pkg/nspr/trunk/Makefile =================================================================== --- csw/mgar/pkg/nspr/trunk/Makefile 2009-11-24 15:27:07 UTC (rev 7405) +++ csw/mgar/pkg/nspr/trunk/Makefile 2009-11-24 16:17:03 UTC (rev 7406) @@ -19,6 +19,8 @@ PKGFILES_CSWnspr-devel += .*/nspr\.pc PKGFILES_CSWnspr-devel += .*compile-et\.pl +ARCHALL_CSWnspr-devel = 1 + SPKG_DESC_CSWnspr = Netscape Portable Runtime SPKG_DESC_CSWnspr-devel = Netscape Portable Runtime development files CATALOGNAME_CSWnspr-devel = nspr_devel @@ -95,10 +97,6 @@ # Create symlinks allowing to use -L/opt/csw/lib/nspr/64 for 64-bit # architectures. -post-merge: - if [ "$(GARCH)" = sparc ]; then \ - gln -sf sparcv9 $(PKGROOT)$(libdir)/64; \ - elif [ "$(GARCH)" = i386 ]; then \ - gln -sf amd64 $(PKGROOT)$(libdir)/64; \ - fi +post-merge-modulated: + gln -s "$(ISA_DEFAULT_64)" "$(PKGROOT)$(libdir)/64" @$(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 Nov 24 17:29:41 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 24 Nov 2009 16:29:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[7407] csw/mgar/pkg/nspr/trunk/Makefile Message-ID: Revision: 7407 http://gar.svn.sourceforge.net/gar/?rev=7407&view=rev Author: wahwah Date: 2009-11-24 16:29:40 +0000 (Tue, 24 Nov 2009) Log Message: ----------- nspr: Revert to the dumb but working way of symlinking 64 --> sparcv9 Modified Paths: -------------- csw/mgar/pkg/nspr/trunk/Makefile Modified: csw/mgar/pkg/nspr/trunk/Makefile =================================================================== --- csw/mgar/pkg/nspr/trunk/Makefile 2009-11-24 16:17:03 UTC (rev 7406) +++ csw/mgar/pkg/nspr/trunk/Makefile 2009-11-24 16:29:40 UTC (rev 7407) @@ -97,6 +97,10 @@ # Create symlinks allowing to use -L/opt/csw/lib/nspr/64 for 64-bit # architectures. -post-merge-modulated: - gln -s "$(ISA_DEFAULT_64)" "$(PKGROOT)$(libdir)/64" +post-merge: + if [ "$(GARCH)" = sparc ]; then \ + gln -sf sparc9 $(PKGROOT)$(libdir)/64; \ + elif [ "$(GARCH)" = i386 ]; then \ + gln -sf amd64 $(PKGROOT)$(libdir)/64; \ + fi @$(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 Nov 24 20:18:52 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 24 Nov 2009 19:18:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[7408] csw/mgar/pkg Message-ID: Revision: 7408 http://gar.svn.sourceforge.net/gar/?rev=7408&view=rev Author: wahwah Date: 2009-11-24 19:18:52 +0000 (Tue, 24 Nov 2009) Log Message: ----------- gccgo: first commit, copying the template and checkout out gccgo svn repository Modified Paths: -------------- csw/mgar/pkg/gccgo/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/gccgo/ Modified: csw/mgar/pkg/gccgo/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-11-24 16:29:40 UTC (rev 7407) +++ csw/mgar/pkg/gccgo/trunk/Makefile 2009-11-24 19:18:52 UTC (rev 7408) @@ -11,8 +11,9 @@ ## For more information about GAR variables, please see: ## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference ## -GARNAME = mypkg -GARVERSION = 1.0 +GARNAME = gccgo +GARVERSION = 0.0.1 +# svn checkout svn://gcc.gnu.org/svn/gcc/branches/gccgo gccgo ## ## The category that your software fits in. This is not a descriptive field, but ## influences the build process. Depending on the CATEGORIES setting, different @@ -25,17 +26,16 @@ CATEGORIES = lib ## ## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = +DESCRIPTION = Go language compiler using gcc backend ## ## 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 = +SPKG_SOURCEURL = http://golang.org/doc/gccgo_install.html ## ## Whitespace-separated list of URLs to download the source package from. ## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). @@ -54,9 +54,8 @@ ## Whitespace-separated list of files which comprise this build. mGAR will look ## for the files in the $(FILEDIR) (trunk/files) directory and on the ## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz ## -## We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz ## ## Catalog name is the name to be used with pkg{-get,util} -i . @@ -145,10 +144,10 @@ ## 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 = +CONFIGURE_SCRIPTS = gccgo +BUILD_SCRIPTS = gccgo +INSTALL_SCRIPTS = gccgo +TEST_SCRIPTS = gccgo ## ## Compilation settings ## @@ -176,10 +175,7 @@ ## 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 -#include gar/category.mk +post-extract-modulated: + (cd $(WORKDIR) && svn checkout svn://gcc.gnu.org/svn/gcc/branches/gccgo gccgo) 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 Nov 24 20:36:10 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 24 Nov 2009 19:36:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7409] csw/mgar/pkg/gccgo/trunk/Makefile Message-ID: Revision: 7409 http://gar.svn.sourceforge.net/gar/?rev=7409&view=rev Author: wahwah Date: 2009-11-24 19:36:10 +0000 (Tue, 24 Nov 2009) Log Message: ----------- gccgo: stubs written, build fails on 'gcc: gengtype-lex.c: No such file or directory' Modified Paths: -------------- csw/mgar/pkg/gccgo/trunk/Makefile Modified: csw/mgar/pkg/gccgo/trunk/Makefile =================================================================== --- csw/mgar/pkg/gccgo/trunk/Makefile 2009-11-24 19:18:52 UTC (rev 7408) +++ csw/mgar/pkg/gccgo/trunk/Makefile 2009-11-24 19:36:10 UTC (rev 7409) @@ -145,8 +145,8 @@ ## this variable an empty value. The procedure works for configure, build, ## install and test steps. CONFIGURE_SCRIPTS = gccgo -BUILD_SCRIPTS = gccgo -INSTALL_SCRIPTS = gccgo +## BUILD_SCRIPTS = gccgo # using the default target +## INSTALL_SCRIPTS = gccgo # using the default target TEST_SCRIPTS = gccgo ## ## Compilation settings @@ -159,7 +159,8 @@ ## BUILD_ARGS = ## ## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-languages=c,c++,go ## ## BUILD64 = ## CONFIGURE_ENV = @@ -173,9 +174,29 @@ ## OPT_FLAGS_GCC = -O2 -pipe ## ## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## + +# Compiling gcc with gcc +GARCOMPILER = GNU + +WORKSRC = $(WORKDIR)/objdir + include gar/category.mk post-extract-modulated: - (cd $(WORKDIR) && svn checkout svn://gcc.gnu.org/svn/gcc/branches/gccgo gccgo) + (cd $(WORKDIR) && \ + if [ -d gccgo ]; then \ + (cd gccgo && svn up); \ + else \ + svn checkout svn://gcc.gnu.org/svn/gcc/branches/gccgo gccgo; \ + fi) + mkdir -p $(WORKSRC) + @$(MAKECOOKIE) + +configure-gccgo: + (cd $(WORKSRC) && $(CONFIGURE_ENV) ../gccgo/configure $(CONFIGURE_ARGS)) + @$(MAKECOOKIE) + +test-gccgo: + echo "Tests?" + false + @$(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 Nov 24 20:46:00 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 24 Nov 2009 19:46:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7410] csw/mgar/pkg/gccgo/trunk/Makefile Message-ID: Revision: 7410 http://gar.svn.sourceforge.net/gar/?rev=7410&view=rev Author: wahwah Date: 2009-11-24 19:46:00 +0000 (Tue, 24 Nov 2009) Log Message: ----------- gccgo: Added flex and bison as build dependencies Modified Paths: -------------- csw/mgar/pkg/gccgo/trunk/Makefile Modified: csw/mgar/pkg/gccgo/trunk/Makefile =================================================================== --- csw/mgar/pkg/gccgo/trunk/Makefile 2009-11-24 19:36:10 UTC (rev 7409) +++ csw/mgar/pkg/gccgo/trunk/Makefile 2009-11-24 19:46:00 UTC (rev 7410) @@ -122,10 +122,10 @@ ## ETCSERVICES = ## INETDCONF = ## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = +REQUIRED_PKGS = ## ## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWgcc CSWbison CSWflex ## ## When using non-empty $(PACKAGES): ## REQUIRED_PKGS_CSWpkgname = 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 Nov 24 21:53:20 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 24 Nov 2009 20:53:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[7411] csw/mgar/pkg/memcached/trunk/Makefile Message-ID: Revision: 7411 http://gar.svn.sourceforge.net/gar/?rev=7411&view=rev Author: dmichelsen Date: 2009-11-24 20:53:20 +0000 (Tue, 24 Nov 2009) Log Message: ----------- memcached: Start packaging on Solaris 9 Modified Paths: -------------- csw/mgar/pkg/memcached/trunk/Makefile Modified: csw/mgar/pkg/memcached/trunk/Makefile =================================================================== --- csw/mgar/pkg/memcached/trunk/Makefile 2009-11-24 19:46:00 UTC (rev 7410) +++ csw/mgar/pkg/memcached/trunk/Makefile 2009-11-24 20:53:20 UTC (rev 7411) @@ -20,10 +20,13 @@ PREREQUISITE_PKGS = CSWlibevent-devel REQUIRED_PKGS = CSWlibevent +# Solaris 8 Sparc does work, but Solaris 8 x86 has many failed tests due to +# errors in Solaris 8 itself. For consistency we build from Solaris 9 on for +# both ISAs. +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 + BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) -SKIPTEST = 1 - 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 Tue Nov 24 22:03:46 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 24 Nov 2009 21:03:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7412] csw/mgar/pkg/libntlm/trunk Message-ID: Revision: 7412 http://gar.svn.sourceforge.net/gar/?rev=7412&view=rev Author: dmichelsen Date: 2009-11-24 21:03:46 +0000 (Tue, 24 Nov 2009) Log Message: ----------- libntlm: Update to 1.2 Modified Paths: -------------- csw/mgar/pkg/libntlm/trunk/Makefile csw/mgar/pkg/libntlm/trunk/checksums Modified: csw/mgar/pkg/libntlm/trunk/Makefile =================================================================== --- csw/mgar/pkg/libntlm/trunk/Makefile 2009-11-24 20:53:20 UTC (rev 7411) +++ csw/mgar/pkg/libntlm/trunk/Makefile 2009-11-24 21:03:46 UTC (rev 7412) @@ -1,5 +1,5 @@ GARNAME = libntlm -GARVERSION = 20090924 +GARVERSION = 1.2 CATEGORIES = lib DESCRIPTION = Microsoft WinNT domain authentication library @@ -12,12 +12,13 @@ endef MASTER_SITES = http://josefsson.org/libntlm/releases/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -WORKSRC = $(WORKDIR)/libntlm-1.2 +DISTFILES = $(DISTNAME).tar.gz # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +SPKG_SOURCEURL = http://josefsson.org/libntlm/ + # We don't need it and if defined the test breaks LD_OPTIONS = @@ -26,6 +27,4 @@ TEST_TARGET = check -SPKG_SOURCEURL = http://josefsson.org/libntlm/ - include gar/category.mk Modified: csw/mgar/pkg/libntlm/trunk/checksums =================================================================== --- csw/mgar/pkg/libntlm/trunk/checksums 2009-11-24 20:53:20 UTC (rev 7411) +++ csw/mgar/pkg/libntlm/trunk/checksums 2009-11-24 21:03:46 UTC (rev 7412) @@ -1 +1 @@ -5fa3bc33be1be487de1b0f23db469d3f download/libntlm-20090924.tar.gz +13b40af721b29005652fb429a3ae9582 libntlm-1.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Nov 24 22:14:52 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 24 Nov 2009 21:14:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[7413] csw/mgar/pkg/memcached/trunk/Makefile Message-ID: Revision: 7413 http://gar.svn.sourceforge.net/gar/?rev=7413&view=rev Author: dmichelsen Date: 2009-11-24 21:14:52 +0000 (Tue, 24 Nov 2009) Log Message: ----------- memcached: Disable tests for now Modified Paths: -------------- csw/mgar/pkg/memcached/trunk/Makefile Modified: csw/mgar/pkg/memcached/trunk/Makefile =================================================================== --- csw/mgar/pkg/memcached/trunk/Makefile 2009-11-24 21:03:46 UTC (rev 7412) +++ csw/mgar/pkg/memcached/trunk/Makefile 2009-11-24 21:14:52 UTC (rev 7413) @@ -28,5 +28,7 @@ BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) +SKIPTEST ?= 1 + 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 Tue Nov 24 22:22:45 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 24 Nov 2009 21:22:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[7414] csw/mgar/pkg/liboggz/trunk Message-ID: Revision: 7414 http://gar.svn.sourceforge.net/gar/?rev=7414&view=rev Author: dmichelsen Date: 2009-11-24 21:22:44 +0000 (Tue, 24 Nov 2009) Log Message: ----------- liboggz: Add getopt.h patch Modified Paths: -------------- csw/mgar/pkg/liboggz/trunk/Makefile csw/mgar/pkg/liboggz/trunk/checksums csw/mgar/pkg/liboggz/trunk/files/0001-Remove-linker-version.patch Added Paths: ----------- csw/mgar/pkg/liboggz/trunk/files/0002-Add-getopt.h.patch Modified: csw/mgar/pkg/liboggz/trunk/Makefile =================================================================== --- csw/mgar/pkg/liboggz/trunk/Makefile 2009-11-24 21:14:52 UTC (rev 7413) +++ csw/mgar/pkg/liboggz/trunk/Makefile 2009-11-24 21:22:44 UTC (rev 7414) @@ -16,6 +16,7 @@ MASTER_SITES = http://downloads.xiph.org/releases/liboggz/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = 0001-Remove-linker-version.patch +PATCHFILES += 0002-Add-getopt.h.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/liboggz/trunk/checksums =================================================================== --- csw/mgar/pkg/liboggz/trunk/checksums 2009-11-24 21:14:52 UTC (rev 7413) +++ csw/mgar/pkg/liboggz/trunk/checksums 2009-11-24 21:22:44 UTC (rev 7414) @@ -1,2 +1,3 @@ -f4ec200018ed77f1cb44fee2c4687d49 0001-Remove-linker-version.patch +2bcd76f053e973f82df1593400ca94fb 0001-Remove-linker-version.patch +008aac5337ca7e23490927baa4a38589 0002-Add-getopt.h.patch f97f1d57820a9fc1d080409cf203b38a liboggz-1.1.0.tar.gz Modified: csw/mgar/pkg/liboggz/trunk/files/0001-Remove-linker-version.patch =================================================================== --- csw/mgar/pkg/liboggz/trunk/files/0001-Remove-linker-version.patch 2009-11-24 21:14:52 UTC (rev 7413) +++ csw/mgar/pkg/liboggz/trunk/files/0001-Remove-linker-version.patch 2009-11-24 21:22:44 UTC (rev 7414) @@ -27,29 +27,6 @@ # Checks for library functions. -diff --git a/configure.ac b/configure.ac -index bc9acb8..1098ca1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -396,18 +396,6 @@ if test "x${ac_enable_gcc_werror}" = xyes ; then - CFLAGS="-Werror $CFLAGS" - fi - --dnl --dnl Shared library symbol versioning and hiding --dnl -- --case "$target_os" in -- linux* | solaris*|k*bsd*-gnu*|gnu-*) -- SHLIB_VERSION_ARG="-Wl,--version-script=Version_script" -- ;; -- *) -- ;; --esac -- - # Checks for library functions. - - dnl -- 1.6.3.2 Added: csw/mgar/pkg/liboggz/trunk/files/0002-Add-getopt.h.patch =================================================================== --- csw/mgar/pkg/liboggz/trunk/files/0002-Add-getopt.h.patch (rev 0) +++ csw/mgar/pkg/liboggz/trunk/files/0002-Add-getopt.h.patch 2009-11-24 21:22:44 UTC (rev 7414) @@ -0,0 +1,38 @@ +From e404bd5d314bbd97a2d4579607679667bc4d099f Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 24 Nov 2009 22:12:30 +0100 +Subject: [PATCH] Add getopt.h + +--- + include/getopt.h | 19 +++++++++++++++++++ + 1 files changed, 19 insertions(+), 0 deletions(-) + create mode 100644 include/getopt.h + +diff --git a/include/getopt.h b/include/getopt.h +new file mode 100644 +index 0000000..0e98fed +--- /dev/null ++++ b/include/getopt.h +@@ -0,0 +1,19 @@ ++/** ++ * @file getopt.h ++ * @ingroup wbxml2xml_tool ++ * @ingroup xml2wbxml_tool ++ * ++ * @author Kannel Team (http://www.kannel.org/) ++ * ++ * @brief getopt() implementation ++ */ ++ ++#ifndef WBXML_GETOPT_H ++#define WBXML_GETOPT_H ++ ++extern int opterr; ++extern int optind; ++extern int optopt; ++extern char *optarg; ++ ++#endif +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Nov 24 22:31:39 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 24 Nov 2009 21:31:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[7415] csw/mgar/pkg/cpan/Archive-Tar/trunk Message-ID: Revision: 7415 http://gar.svn.sourceforge.net/gar/?rev=7415&view=rev Author: dmichelsen Date: 2009-11-24 21:31:38 +0000 (Tue, 24 Nov 2009) Log Message: ----------- cpan/Archive-Tar: Update to 1.54 Modified Paths: -------------- csw/mgar/pkg/cpan/Archive-Tar/trunk/Makefile csw/mgar/pkg/cpan/Archive-Tar/trunk/checksums Modified: csw/mgar/pkg/cpan/Archive-Tar/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Archive-Tar/trunk/Makefile 2009-11-24 21:22:44 UTC (rev 7414) +++ csw/mgar/pkg/cpan/Archive-Tar/trunk/Makefile 2009-11-24 21:31:38 UTC (rev 7415) @@ -1,7 +1,7 @@ GARNAME = Archive-Tar -GARVERSION = 1.52 +GARVERSION = 1.54 CATEGORIES = cpan -AUTHOR = KANE +AUTHOR = BINGOS DESCRIPTION = Module for manipulations of tar archives define BLURB Modified: csw/mgar/pkg/cpan/Archive-Tar/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Archive-Tar/trunk/checksums 2009-11-24 21:22:44 UTC (rev 7414) +++ csw/mgar/pkg/cpan/Archive-Tar/trunk/checksums 2009-11-24 21:31:38 UTC (rev 7415) @@ -1 +1 @@ -a2bcf46c095f6b4ea747fc978a72d0da download/Archive-Tar-1.52.tar.gz +093c6473c315119556919bd85de0bcb7 Archive-Tar-1.54.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 Nov 24 22:47:35 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 24 Nov 2009 21:47:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[7416] csw/mgar/pkg/websvn/trunk/Makefile Message-ID: Revision: 7416 http://gar.svn.sourceforge.net/gar/?rev=7416&view=rev Author: dmichelsen Date: 2009-11-24 21:47:35 +0000 (Tue, 24 Nov 2009) Log Message: ----------- websvn: Cleanup Makefile Modified Paths: -------------- csw/mgar/pkg/websvn/trunk/Makefile Modified: csw/mgar/pkg/websvn/trunk/Makefile =================================================================== --- csw/mgar/pkg/websvn/trunk/Makefile 2009-11-24 21:31:38 UTC (rev 7415) +++ csw/mgar/pkg/websvn/trunk/Makefile 2009-11-24 21:47:35 UTC (rev 7416) @@ -12,21 +12,14 @@ a particular revision. endef -# MASTER_SITES = svn-http://websvn.tigris.org/svn/$(GARNAME)/tags/ -# DISTFILES = $(GARVERSION) -# NOCHECKSUM = $(GARVERSION) -# SVNHTTP_CO_ARGS = --no-auth-cache --username guest --password guest - MASTER_SITES = http://websvn.tigris.org/files/documents/1380/45918/ DISTFILES = $(DISTNAME).tar.gz +PATCHFILES = websvn-csw-config.patch SPKG_SOURCEURL = http://websvn.tigris.org/ LICENSE = license.txt -# DISTFILES += $(call admfiles,CSWwebsvn,depend postinstall preremove) -PATCHFILES = websvn-csw-config.patch - REQUIRED_PKGS = CSWapache2 CSWdiffutils CSWsvn CSWenscript CSWgsed CSWgtar CSWgzip CONFIGURE_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 Nov 24 22:56:44 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 24 Nov 2009 21:56:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7417] csw/mgar/pkg/gccgo/trunk/Makefile Message-ID: Revision: 7417 http://gar.svn.sourceforge.net/gar/?rev=7417&view=rev Author: wahwah Date: 2009-11-24 21:56:44 +0000 (Tue, 24 Nov 2009) Log Message: ----------- gccgo: Removing bogus prerequisite Modified Paths: -------------- csw/mgar/pkg/gccgo/trunk/Makefile Modified: csw/mgar/pkg/gccgo/trunk/Makefile =================================================================== --- csw/mgar/pkg/gccgo/trunk/Makefile 2009-11-24 21:47:35 UTC (rev 7416) +++ csw/mgar/pkg/gccgo/trunk/Makefile 2009-11-24 21:56:44 UTC (rev 7417) @@ -125,7 +125,7 @@ REQUIRED_PKGS = ## ## A list of packages necessary to build this package -PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWgcc CSWbison CSWflex +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWbison CSWflex ## ## When using non-empty $(PACKAGES): ## REQUIRED_PKGS_CSWpkgname = 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 Nov 24 23:04:14 2009 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Tue, 24 Nov 2009 22:04:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[7418] csw/mgar/pkg/sdlimage/trunk Message-ID: Revision: 7418 http://gar.svn.sourceforge.net/gar/?rev=7418&view=rev Author: jake_goerzen Date: 2009-11-24 22:04:14 +0000 (Tue, 24 Nov 2009) Log Message: ----------- update to version 1.2.10 Modified Paths: -------------- csw/mgar/pkg/sdlimage/trunk/Makefile csw/mgar/pkg/sdlimage/trunk/checksums Modified: csw/mgar/pkg/sdlimage/trunk/Makefile =================================================================== --- csw/mgar/pkg/sdlimage/trunk/Makefile 2009-11-24 21:56:44 UTC (rev 7417) +++ csw/mgar/pkg/sdlimage/trunk/Makefile 2009-11-24 22:04:14 UTC (rev 7418) @@ -1,5 +1,5 @@ GARNAME = SDL_image -GARVERSION = 1.2.8 +GARVERSION = 1.2.10 CATEGORIES = lib DESCRIPTION = SDL image file loading library Modified: csw/mgar/pkg/sdlimage/trunk/checksums =================================================================== --- csw/mgar/pkg/sdlimage/trunk/checksums 2009-11-24 21:56:44 UTC (rev 7417) +++ csw/mgar/pkg/sdlimage/trunk/checksums 2009-11-24 22:04:14 UTC (rev 7418) @@ -1 +1 @@ -2e7c3efa0ec2acc039c46960e27c0792 SDL_image-1.2.8.tar.gz +6c06584b31559e2b59f2b982d0d1f628 SDL_image-1.2.10.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Tue Nov 24 23:16:10 2009 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Tue, 24 Nov 2009 22:16:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7419] csw/mgar/pkg/sdlmixer/trunk Message-ID: Revision: 7419 http://gar.svn.sourceforge.net/gar/?rev=7419&view=rev Author: jake_goerzen Date: 2009-11-24 22:16:10 +0000 (Tue, 24 Nov 2009) Log Message: ----------- update to version 1.2.11 Modified Paths: -------------- csw/mgar/pkg/sdlmixer/trunk/Makefile csw/mgar/pkg/sdlmixer/trunk/checksums Modified: csw/mgar/pkg/sdlmixer/trunk/Makefile =================================================================== --- csw/mgar/pkg/sdlmixer/trunk/Makefile 2009-11-24 22:04:14 UTC (rev 7418) +++ csw/mgar/pkg/sdlmixer/trunk/Makefile 2009-11-24 22:16:10 UTC (rev 7419) @@ -1,5 +1,5 @@ GARNAME = SDL_mixer -GARVERSION = 1.2.10 +GARVERSION = 1.2.11 CATEGORIES = lib DESCRIPTION = multi-channel audio mixer library Modified: csw/mgar/pkg/sdlmixer/trunk/checksums =================================================================== --- csw/mgar/pkg/sdlmixer/trunk/checksums 2009-11-24 22:04:14 UTC (rev 7418) +++ csw/mgar/pkg/sdlmixer/trunk/checksums 2009-11-24 22:16:10 UTC (rev 7419) @@ -1 +1 @@ -a357558552436b0b5ea0333b3e2327df SDL_mixer-1.2.10.tar.gz +65ada3d997fe85109191a5fb083f248c SDL_mixer-1.2.11.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 Nov 24 23:19:12 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 24 Nov 2009 22:19:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7420] csw/mgar/pkg Message-ID: Revision: 7420 http://gar.svn.sourceforge.net/gar/?rev=7420&view=rev Author: dmichelsen Date: 2009-11-24 22:19:12 +0000 (Tue, 24 Nov 2009) Log Message: ----------- sar2rrd: Initial commit Added Paths: ----------- csw/mgar/pkg/sar2rrd/ csw/mgar/pkg/sar2rrd/branches/ csw/mgar/pkg/sar2rrd/tags/ csw/mgar/pkg/sar2rrd/trunk/ csw/mgar/pkg/sar2rrd/trunk/Makefile csw/mgar/pkg/sar2rrd/trunk/checksums csw/mgar/pkg/sar2rrd/trunk/files/ Property changes on: csw/mgar/pkg/sar2rrd/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/sar2rrd/trunk/Makefile =================================================================== --- csw/mgar/pkg/sar2rrd/trunk/Makefile (rev 0) +++ csw/mgar/pkg/sar2rrd/trunk/Makefile 2009-11-24 22:19:12 UTC (rev 7420) @@ -0,0 +1,40 @@ +GARNAME = sar2rrd +GARVERSION = 2.4 +CATEGORIES = utils + +DESCRIPTION = Generate RRDTool graphs from sar output +define BLURB + It creates a PNG Graph for each statistics group collected by sar. + Version 2.0 handles both Linux and Solaris sar output. + Each statistics of the group is represented as a single line in the graph. +endef + +MASTER_SITES = http://www.trickytools.com/downloads/ +DISTFILES = $(GARNAME)-$(GARVERSION).pl +DISTFILES += $(GARNAME)-graph-$(GARVERSION).pl + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.trickytools.com/php/sar2rrd.php + +REQUIRED_PKGS = CSWrrd CSWperl CSWpmdatecalc + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +post-extract-modulated: + $(foreach F,$(DISTFILES),perl -pi \ + -e 's,/usr/bin/perl,/opt/csw/bin/perl,; s,/usr/local/rrdtool/bin/rrdtool,/opt/csw/bin/rrdtool,' \ + $(WORKDIR)/$F;) + @$(MAKECOOKIE) + +install-custom: + ginstall -d $(DESTDIR)$(bindir) + ginstall $(WORKDIR)/$(GARNAME)-$(GARVERSION).pl $(DESTDIR)$(bindir)/$(GARNAME) + ginstall $(WORKDIR)/$(GARNAME)-graph-$(GARVERSION).pl $(DESTDIR)$(bindir)/$(GARNAME)-graph + @$(MAKECOOKIE) Added: csw/mgar/pkg/sar2rrd/trunk/checksums =================================================================== --- csw/mgar/pkg/sar2rrd/trunk/checksums (rev 0) +++ csw/mgar/pkg/sar2rrd/trunk/checksums 2009-11-24 22:19:12 UTC (rev 7420) @@ -0,0 +1,2 @@ +d51bd231562376e034db26a471329842 sar2rrd-2.4.pl +c8d282e71afba0ddfd579debf0ef91a9 sar2rrd-graph-2.4.pl This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Nov 24 23:19:43 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 24 Nov 2009 22:19:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[7421] csw/mgar/pkg/sar2rrd/trunk/Makefile Message-ID: Revision: 7421 http://gar.svn.sourceforge.net/gar/?rev=7421&view=rev Author: dmichelsen Date: 2009-11-24 22:19:43 +0000 (Tue, 24 Nov 2009) Log Message: ----------- sar2rrd: Make package archall Modified Paths: -------------- csw/mgar/pkg/sar2rrd/trunk/Makefile Modified: csw/mgar/pkg/sar2rrd/trunk/Makefile =================================================================== --- csw/mgar/pkg/sar2rrd/trunk/Makefile 2009-11-24 22:19:12 UTC (rev 7420) +++ csw/mgar/pkg/sar2rrd/trunk/Makefile 2009-11-24 22:19:43 UTC (rev 7421) @@ -25,6 +25,8 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = custom +ARCHALL = 1 + include gar/category.mk post-extract-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Nov 24 23:27:18 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 24 Nov 2009 22:27:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7422] csw/mgar/pkg Message-ID: Revision: 7422 http://gar.svn.sourceforge.net/gar/?rev=7422&view=rev Author: dmichelsen Date: 2009-11-24 22:27:18 +0000 (Tue, 24 Nov 2009) Log Message: ----------- liboil: Initial commit Modified Paths: -------------- csw/mgar/pkg/liboil/trunk/Makefile csw/mgar/pkg/liboil/trunk/checksums Added Paths: ----------- csw/mgar/pkg/liboil/ Modified: csw/mgar/pkg/liboil/trunk/Makefile =================================================================== --- csw/mgar/pkg/libschroedinger/trunk/Makefile 2009-11-20 09:34:23 UTC (rev 7360) +++ csw/mgar/pkg/liboil/trunk/Makefile 2009-11-24 22:27:18 UTC (rev 7422) @@ -1,18 +1,18 @@ -GARNAME = libschroedinger -GARVERSION = 1.0.7 +GARNAME = liboil +GARVERSION = 0.3.16 CATEGORIES = lib -DESCRIPTION = A cross-platform implementation of the Dirac video compression specification +DESCRIPTION = A library of simple functions that are optimized for various CPUs define BLURB - A new release of Schr?dinger is available. Schr?dinger (o"schro" - for short) is a cross-platform implementation of the Dirac video - compression specification as a C library. Many media frameworks - such as GStreamer and ffmpeg use schro to encode and decode Dirac - video. + Liboil is a library of simple functions that are optimized for various CPUs. + These functions are generally loops implementing simple algorithms, such as + converting an array of N integers to floating-point numbers or multiplying + and summing an array of N numbers. Such functions are candidates for significant + optimization using various techniques, especially by using extended instructions + provided by modern CPUs (Altivec, MMX, SSE, etc.). endef -MASTER_SITES = http://diracvideo.org/download/schroedinger/ -DISTNAME = schroedinger-$(GARVERSION) +MASTER_SITES = http://liboil.freedesktop.org/download/ DISTFILES = $(DISTNAME).tar.gz # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/liboil/trunk/checksums =================================================================== --- csw/mgar/pkg/libschroedinger/trunk/checksums 2009-11-20 09:34:23 UTC (rev 7360) +++ csw/mgar/pkg/liboil/trunk/checksums 2009-11-24 22:27:18 UTC (rev 7422) @@ -0,0 +1 @@ +febb1d9f9bc4c440fcf622dc90f8b6b7 liboil-0.3.16.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Wed Nov 25 02:21:15 2009 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Wed, 25 Nov 2009 01:21:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[7423] csw/mgar/pkg Message-ID: Revision: 7423 http://gar.svn.sourceforge.net/gar/?rev=7423&view=rev Author: jake_goerzen Date: 2009-11-25 01:21:15 +0000 (Wed, 25 Nov 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/libmikmod/ csw/mgar/pkg/libmikmod/branches/ csw/mgar/pkg/libmikmod/tags/ csw/mgar/pkg/libmikmod/trunk/ csw/mgar/pkg/libmikmod/trunk/Makefile csw/mgar/pkg/libmikmod/trunk/checksums csw/mgar/pkg/libmikmod/trunk/files/ Property changes on: csw/mgar/pkg/libmikmod/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libmikmod/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmikmod/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libmikmod/trunk/Makefile 2009-11-25 01:21:15 UTC (rev 7423) @@ -0,0 +1,22 @@ +GARNAME = libmikmod +GARVERSION = 3.1.11 +CATEGORIES = lib + +DESCRIPTION = library for MOD audio files and other types +define BLURB + Long description +endef + +MASTER_SITES = http://mikmod.raphnet.net/files/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/libmikmod/trunk/checksums =================================================================== --- csw/mgar/pkg/libmikmod/trunk/checksums (rev 0) +++ csw/mgar/pkg/libmikmod/trunk/checksums 2009-11-25 01:21:15 UTC (rev 7423) @@ -0,0 +1 @@ +705106da305e8de191549f1e7393185c libmikmod-3.1.11.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 Nov 25 05:12:57 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 25 Nov 2009 04:12:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[7424] csw/mgar/pkg/coreutils/trunk Message-ID: Revision: 7424 http://gar.svn.sourceforge.net/gar/?rev=7424&view=rev Author: bdwalton Date: 2009-11-25 04:12:56 +0000 (Wed, 25 Nov 2009) Log Message: ----------- coreutils: update acl handling patch Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/checksums csw/mgar/pkg/coreutils/trunk/files/0001-Fix-solaris-acl-support-breakage.patch Modified: csw/mgar/pkg/coreutils/trunk/checksums =================================================================== --- csw/mgar/pkg/coreutils/trunk/checksums 2009-11-25 01:21:15 UTC (rev 7423) +++ csw/mgar/pkg/coreutils/trunk/checksums 2009-11-25 04:12:56 UTC (rev 7424) @@ -1,2 +1,2 @@ -ed529e3abbc0fb76d2e13f5202f59932 0001-Fix-solaris-acl-support-breakage.patch +0fde2b11f34c49995765566acf6cd5b4 0001-Fix-solaris-acl-support-breakage.patch 4cde9f31604f4da188ed302ca55545ea coreutils-8.1.tar.gz Modified: csw/mgar/pkg/coreutils/trunk/files/0001-Fix-solaris-acl-support-breakage.patch =================================================================== --- csw/mgar/pkg/coreutils/trunk/files/0001-Fix-solaris-acl-support-breakage.patch 2009-11-25 01:21:15 UTC (rev 7423) +++ csw/mgar/pkg/coreutils/trunk/files/0001-Fix-solaris-acl-support-breakage.patch 2009-11-25 04:12:56 UTC (rev 7424) @@ -1,32 +1,33 @@ -From 2f1eeb8502a426f38189d24760d52760448cd2ae Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Sun, 22 Nov 2009 18:29:07 +0100 -Subject: [PATCH] Fix solaris acl support breakage +From bd8c66a7789d05bee45a162adf3f6f488fde75bf Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Wed, 25 Nov 2009 04:59:51 +0100 +Subject: [PATCH 1/2] Fix solaris acl support breakage -In the standard solaris acl support, ENOSYS was handled cleanly. This -patch makes the code path handle EOPNOTSUPP identically to ENOSYS, -preventing errors when attempting to a pply acl's on filesystems that -don't implement the acl api (NFS). +Solaris has support for ACL's on NFS, but only in certain combinations +of client and server. When ACL operations are attempted in +unsupported situations, EOPNOTSUPP can be returned instead of ENOSYS. +This patch allows utilities that work with ACL's to handle the +difference properly. -Signed-off-by: Ben Walton +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..346dd5c 100644 +index af85a08..bfacf20 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, +@@ -294,7 +294,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name, - if (ace_count < 0) + if (count < 0) { -- if (errno == ENOSYS || errno == EINVAL) -+ if (errno == ENOSYS || errno == EOPNOTSUPP || errno == EINVAL) +- if (errno == ENOSYS || errno == ENOTSUP) ++ if (errno == ENOSYS || errno == EOPNOTSUPP || errno == ENOTSUP) { - ace_count = 0; - ace_entries = NULL; + count = 0; + 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) { 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 Nov 25 05:14:27 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 25 Nov 2009 04:14:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7425] csw/mgar/pkg/coreutils/trunk Message-ID: Revision: 7425 http://gar.svn.sourceforge.net/gar/?rev=7425&view=rev Author: bdwalton Date: 2009-11-25 04:14:27 +0000 (Wed, 25 Nov 2009) Log Message: ----------- coreutils: patch gnulib-tests Makefile to include -lintl where missing Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile csw/mgar/pkg/coreutils/trunk/checksums Added Paths: ----------- csw/mgar/pkg/coreutils/trunk/files/0002-Add-lintl-to-xalloc-die-LDADD-flags.patch Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-25 04:12:56 UTC (rev 7424) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-25 04:14:27 UTC (rev 7425) @@ -12,6 +12,7 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = 0001-Fix-solaris-acl-support-breakage.patch +PATCHFILES += 0002-Add-lintl-to-xalloc-die-LDADD-flags.patch PREREQUISITE_PKGS = CSWautomake CSWautoconf CSWbison CSWggettext CSWgit PREREQUISITE_PKGS += CSWgperf CSWgzip CSWperl CSWrsync CSWgtar CSWbash Modified: csw/mgar/pkg/coreutils/trunk/checksums =================================================================== --- csw/mgar/pkg/coreutils/trunk/checksums 2009-11-25 04:12:56 UTC (rev 7424) +++ csw/mgar/pkg/coreutils/trunk/checksums 2009-11-25 04:14:27 UTC (rev 7425) @@ -1,2 +1,3 @@ 0fde2b11f34c49995765566acf6cd5b4 0001-Fix-solaris-acl-support-breakage.patch +acbd08eef41092a7b348d03206dad625 0002-Add-lintl-to-xalloc-die-LDADD-flags.patch 4cde9f31604f4da188ed302ca55545ea coreutils-8.1.tar.gz Added: csw/mgar/pkg/coreutils/trunk/files/0002-Add-lintl-to-xalloc-die-LDADD-flags.patch =================================================================== --- csw/mgar/pkg/coreutils/trunk/files/0002-Add-lintl-to-xalloc-die-LDADD-flags.patch (rev 0) +++ csw/mgar/pkg/coreutils/trunk/files/0002-Add-lintl-to-xalloc-die-LDADD-flags.patch 2009-11-25 04:14:27 UTC (rev 7425) @@ -0,0 +1,29 @@ +From 686676e0661bab3d768b5b988e277f5907142e62 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Wed, 25 Nov 2009 05:08:58 +0100 +Subject: [PATCH 2/2] Add -lintl to xalloc-die LDADD flags + +This will allow the file to be linked properly during the gnulib-tests +phase. + +Signed-off-by: Ben Walton +--- + gnulib-tests/Makefile.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/gnulib-tests/Makefile.in b/gnulib-tests/Makefile.in +index 427cccd..641201e 100644 +--- a/gnulib-tests/Makefile.in ++++ b/gnulib-tests/Makefile.in +@@ -1185,7 +1185,7 @@ test_wcwidth_DEPENDENCIES = libtests.a ../lib/libcoreutils.a \ + libtests.a $(am__DEPENDENCIES_1) + test_xalloc_die_SOURCES = test-xalloc-die.c + test_xalloc_die_OBJECTS = test-xalloc-die.$(OBJEXT) +-test_xalloc_die_LDADD = $(LDADD) ++test_xalloc_die_LDADD = $(LDADD) $(LIBINTL) + test_xalloc_die_DEPENDENCIES = libtests.a ../lib/libcoreutils.a \ + libtests.a $(am__DEPENDENCIES_1) + test_xfprintf_posix_SOURCES = test-xfprintf-posix.c +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Nov 25 07:50:21 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Nov 2009 06:50:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[7426] csw/mgar/pkg/liboil/trunk Message-ID: Revision: 7426 http://gar.svn.sourceforge.net/gar/?rev=7426&view=rev Author: dmichelsen Date: 2009-11-25 06:50:07 +0000 (Wed, 25 Nov 2009) Log Message: ----------- liboil: Add patch Modified Paths: -------------- csw/mgar/pkg/liboil/trunk/Makefile csw/mgar/pkg/liboil/trunk/checksums Modified: csw/mgar/pkg/liboil/trunk/Makefile =================================================================== --- csw/mgar/pkg/liboil/trunk/Makefile 2009-11-25 04:14:27 UTC (rev 7425) +++ csw/mgar/pkg/liboil/trunk/Makefile 2009-11-25 06:50:07 UTC (rev 7426) @@ -14,12 +14,17 @@ MASTER_SITES = http://liboil.freedesktop.org/download/ DISTFILES = $(DISTNAME).tar.gz +PATCHFILES = 0001-Use-inttypes.h.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +SPKG_SOURCEURL = http://liboil.freedesktop.org/ + BUILD64 = 1 NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) +TEST_TARGET = check + include gar/category.mk Modified: csw/mgar/pkg/liboil/trunk/checksums =================================================================== --- csw/mgar/pkg/liboil/trunk/checksums 2009-11-25 04:14:27 UTC (rev 7425) +++ csw/mgar/pkg/liboil/trunk/checksums 2009-11-25 06:50:07 UTC (rev 7426) @@ -1 +1,2 @@ +4fb5c9be05a769cc606257a723ecf6cd 0001-Use-inttypes.h.patch febb1d9f9bc4c440fcf622dc90f8b6b7 liboil-0.3.16.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 Nov 25 07:52:08 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Nov 2009 06:52:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[7427] csw/mgar/pkg/liboil/trunk/files/0001-Use-inttypes.h. patch Message-ID: Revision: 7427 http://gar.svn.sourceforge.net/gar/?rev=7427&view=rev Author: dmichelsen Date: 2009-11-25 06:52:01 +0000 (Wed, 25 Nov 2009) Log Message: ----------- liboil: Add patch Added Paths: ----------- csw/mgar/pkg/liboil/trunk/files/0001-Use-inttypes.h.patch Added: csw/mgar/pkg/liboil/trunk/files/0001-Use-inttypes.h.patch =================================================================== --- csw/mgar/pkg/liboil/trunk/files/0001-Use-inttypes.h.patch (rev 0) +++ csw/mgar/pkg/liboil/trunk/files/0001-Use-inttypes.h.patch 2009-11-25 06:52:01 UTC (rev 7427) @@ -0,0 +1,25 @@ +From 85ebb1b1bf68211fd4ad8f0156aa146c6ab27ee7 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 24 Nov 2009 23:39:42 +0100 +Subject: [PATCH] Use inttypes.h + +--- + examples/jpeg/jpeg.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/examples/jpeg/jpeg.h b/examples/jpeg/jpeg.h +index 49eaf6a..a03b38c 100644 +--- a/examples/jpeg/jpeg.h ++++ b/examples/jpeg/jpeg.h +@@ -2,7 +2,7 @@ + #ifndef _JPEG_DECODER_H_ + #define _JPEG_DECODER_H_ + +-#include ++#include + + #define JPEG_MARKER_STUFFED 0x00 + #define JPEG_MARKER_TEM 0x01 +-- +1.6.5.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 Nov 25 12:33:04 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 25 Nov 2009 11:33:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[7428] csw/mgar/pkg/nspr/trunk Message-ID: Revision: 7428 http://gar.svn.sourceforge.net/gar/?rev=7428&view=rev Author: wahwah Date: 2009-11-25 11:33:00 +0000 (Wed, 25 Nov 2009) Log Message: ----------- nspr: Updates as per Wan-Teh Chang's review. Modified Paths: -------------- csw/mgar/pkg/nspr/trunk/Makefile csw/mgar/pkg/nspr/trunk/checksums csw/mgar/pkg/nspr/trunk/files/LICENSE Modified: csw/mgar/pkg/nspr/trunk/Makefile =================================================================== --- csw/mgar/pkg/nspr/trunk/Makefile 2009-11-25 06:52:01 UTC (rev 7427) +++ csw/mgar/pkg/nspr/trunk/Makefile 2009-11-25 11:33:00 UTC (rev 7428) @@ -1,6 +1,7 @@ GARNAME = nspr +MAJOR_VERSION = 4 MIN_VERSION = 8 -GARVERSION = 4.$(MIN_VERSION) +GARVERSION = $(MAJOR_VERSION).$(MIN_VERSION) CATEGORIES = lib define BLURB @@ -9,8 +10,9 @@ many of Red Hat's, Sun's, and other software offerings. endef -MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(GARVERSION)/src/ +MASTER_SITES = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(GARVERSION)/src/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += LICENSE PATCHFILES = nspr-4.6.1-config.patch PACKAGES = CSWnspr CSWnspr-devel @@ -22,15 +24,14 @@ ARCHALL_CSWnspr-devel = 1 SPKG_DESC_CSWnspr = Netscape Portable Runtime -SPKG_DESC_CSWnspr-devel = Netscape Portable Runtime development files +SPKG_DESC_CSWnspr-devel = Netscape Portable Runtime header files CATALOGNAME_CSWnspr-devel = nspr_devel REQUIRED_PKGS_CSWnspr-devel = CSWnspr UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz PERL = /opt/csw/bin/perl -EXTRA_CFLAGS = -xlibmil -EXTRA_CXXFLAGS = -xlibmil -xlibmopt -features=tmplife -norunpath + CONFIGURE_SCRIPTS = nspr BUILD_SCRIPTS = nspr TEST_SCRIPTS = @@ -38,7 +39,6 @@ export PERL -libdir_install = $(prefix)/lib/nspr localstatedir = /var/opt/csw sysconfdir = /etc/opt/csw # Move the include files to include/nspr to prevent polluting the main @@ -46,20 +46,16 @@ includedir = $(prefix)/include/nspr CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-mozilla -CONFIGURE_ARGS += --with-native-threads CONFIGURE_ARGS += --enable-ipv6 -CONFIGURE_ARGS += --enable-system-sqlite CONFIGURE_ARGS_isa-sparcv9 = --enable-64bit CONFIGURE_ARGS_isa-amd64 = --enable-64bit CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION)) -CONFIGURE_ARGS_OPT = --enable-optimize="-xO3" +# http://docs.sun.com/app/docs/doc/819-5265/bjaur?a=view +CONFIGURE_ARGS_OPT = --enable-optimize="-xO3 -xlibmil" CONFIGURE_ARGS_OPT += --disable-debug CONFIGURE_ARGS_OPT += --enable-strip -CONFIGURE_ARGS_OPT += --disable-tests CONFIGURE_ARGS_DBG = --enable-debug CONFIGURE_ARGS_DBG += --disable-strip -CONFIGURE_ARGS_DBG += --enable-tests CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) BUILD64 = 1 @@ -75,7 +71,7 @@ @$(MAKECOOKIE) build-nspr: - (cd $(WORKSRC)/build && $(BUILD_ENV) gmake CC=$(CC) CXX=$(CXX)) + (cd $(WORKSRC)/build && $(BUILD_ENV) gmake) @$(MAKECOOKIE) install-nspr: @@ -94,13 +90,3 @@ rm -f $(DESTDIR)$(bindir)/prerr.properties rm -f $(DESTDIR)$(bindir)/nspr.pc @$(MAKECOOKIE) - -# Create symlinks allowing to use -L/opt/csw/lib/nspr/64 for 64-bit -# architectures. -post-merge: - if [ "$(GARCH)" = sparc ]; then \ - gln -sf sparc9 $(PKGROOT)$(libdir)/64; \ - elif [ "$(GARCH)" = i386 ]; then \ - gln -sf amd64 $(PKGROOT)$(libdir)/64; \ - fi - @$(MAKECOOKIE) Modified: csw/mgar/pkg/nspr/trunk/checksums =================================================================== --- csw/mgar/pkg/nspr/trunk/checksums 2009-11-25 06:52:01 UTC (rev 7427) +++ csw/mgar/pkg/nspr/trunk/checksums 2009-11-25 11:33:00 UTC (rev 7428) @@ -1,2 +1,3 @@ +a932cf1d314e57b35153c4f672a95001 LICENSE 4720bb68a64bfa9188ac6318458b47d2 nspr-4.6.1-config.patch e0916a72bcc6c427551ea262183fdb26 nspr-4.8.tar.gz Modified: csw/mgar/pkg/nspr/trunk/files/LICENSE =================================================================== --- csw/mgar/pkg/nspr/trunk/files/LICENSE 2009-11-25 06:52:01 UTC (rev 7427) +++ csw/mgar/pkg/nspr/trunk/files/LICENSE 2009-11-25 11:33:00 UTC (rev 7428) @@ -1,567 +1,38 @@ - MOZILLA PUBLIC LICENSE - Version 1.1 +There is no single license file in the NSPR distribution, but each file +contains the following note: - --------------- - -1. Definitions. - - 1.0.1. "Commercial Use" means distribution or otherwise making the - Covered Code available to a third party. - - 1.1. "Contributor" means each entity that creates or contributes to - the creation of Modifications. - - 1.2. "Contributor Version" means the combination of the Original - Code, prior Modifications used by a Contributor, and the Modifications - made by that particular Contributor. - - 1.3. "Covered Code" means the Original Code or Modifications or the - combination of the Original Code and Modifications, in each case - including portions thereof. - - 1.4. "Electronic Distribution Mechanism" means a mechanism generally - accepted in the software development community for the electronic - transfer of data. - - 1.5. "Executable" means Covered Code in any form other than Source - Code. - - 1.6. "Initial Developer" means the individual or entity identified - as the Initial Developer in the Source Code notice required by Exhibit - A. - - 1.7. "Larger Work" means a work which combines Covered Code or - portions thereof with code not governed by the terms of this License. - - 1.8. "License" means this document. - - 1.8.1. "Licensable" means having the right to grant, to the maximum - extent possible, whether at the time of the initial grant or - subsequently acquired, any and all of the rights conveyed herein. - - 1.9. "Modifications" means any addition to or deletion from the - substance or structure of either the Original Code or any previous - Modifications. When Covered Code is released as a series of files, a - Modification is: - A. Any addition to or deletion from the contents of a file - containing Original Code or previous Modifications. - - B. Any new file that contains any part of the Original Code or - previous Modifications. - - 1.10. "Original Code" means Source Code of computer software code - which is described in the Source Code notice required by Exhibit A as - Original Code, and which, at the time of its release under this - License is not already Covered Code governed by this License. - - 1.10.1. "Patent Claims" means any patent claim(s), now owned or - hereafter acquired, including without limitation, method, process, - and apparatus claims, in any patent Licensable by grantor. - - 1.11. "Source Code" means the preferred form of the Covered Code for - making modifications to it, including all modules it contains, plus - any associated interface definition files, scripts used to control - compilation and installation of an Executable, or source code - differential comparisons against either the Original Code or another - well known, available Covered Code of the Contributor's choice. The - Source Code can be in a compressed or archival form, provided the - appropriate decompression or de-archiving software is widely available - for no charge. - - 1.12. "You" (or "Your") means an individual or a legal entity - exercising rights under, and complying with all of the terms of, this - License or a future version of this License issued under Section 6.1. - For legal entities, "You" includes any entity which controls, is - controlled by, or is under common control with You. For purposes of - this definition, "control" means (a) the power, direct or indirect, - to cause the direction or management of such entity, whether by - contract or otherwise, or (b) ownership of more than fifty percent - (50%) of the outstanding shares or beneficial ownership of such - entity. - -2. Source Code License. - - 2.1. The Initial Developer Grant. - The Initial Developer hereby grants You a world-wide, royalty-free, - non-exclusive license, subject to third party intellectual property - claims: - (a) under intellectual property rights (other than patent or - trademark) Licensable by Initial Developer to use, reproduce, - modify, display, perform, sublicense and distribute the Original - Code (or portions thereof) with or without Modifications, and/or - as part of a Larger Work; and - - (b) under Patents Claims infringed by the making, using or - selling of Original Code, to make, have made, use, practice, - sell, and offer for sale, and/or otherwise dispose of the - Original Code (or portions thereof). - - (c) the licenses granted in this Section 2.1(a) and (b) are - effective on the date Initial Developer first distributes - Original Code under the terms of this License. - - (d) Notwithstanding Section 2.1(b) above, no patent license is - granted: 1) for code that You delete from the Original Code; 2) - separate from the Original Code; or 3) for infringements caused - by: i) the modification of the Original Code or ii) the - combination of the Original Code with other software or devices. - - 2.2. Contributor Grant. - Subject to third party intellectual property claims, each Contributor - hereby grants You a world-wide, royalty-free, non-exclusive license - - (a) under intellectual property rights (other than patent or - trademark) Licensable by Contributor, to use, reproduce, modify, - display, perform, sublicense and distribute the Modifications - created by such Contributor (or portions thereof) either on an - unmodified basis, with other Modifications, as Covered Code - and/or as part of a Larger Work; and - - (b) under Patent Claims infringed by the making, using, or - selling of Modifications made by that Contributor either alone - and/or in combination with its Contributor Version (or portions - of such combination), to make, use, sell, offer for sale, have - made, and/or otherwise dispose of: 1) Modifications made by that - Contributor (or portions thereof); and 2) the combination of - Modifications made by that Contributor with its Contributor - Version (or portions of such combination). - - (c) the licenses granted in Sections 2.2(a) and 2.2(b) are - effective on the date Contributor first makes Commercial Use of - the Covered Code. - - (d) Notwithstanding Section 2.2(b) above, no patent license is - granted: 1) for any code that Contributor has deleted from the - Contributor Version; 2) separate from the Contributor Version; - 3) for infringements caused by: i) third party modifications of - Contributor Version or ii) the combination of Modifications made - by that Contributor with other software (except as part of the - Contributor Version) or other devices; or 4) under Patent Claims - infringed by Covered Code in the absence of Modifications made by - that Contributor. - -3. Distribution Obligations. - - 3.1. Application of License. - The Modifications which You create or to which You contribute are - governed by the terms of this License, including without limitation - Section 2.2. The Source Code version of Covered Code may be - distributed only under the terms of this License or a future version - of this License released under Section 6.1, and You must include a - copy of this License with every copy of the Source Code You - distribute. You may not offer or impose any terms on any Source Code - version that alters or restricts the applicable version of this - License or the recipients' rights hereunder. However, You may include - an additional document offering the additional rights described in - Section 3.5. - - 3.2. Availability of Source Code. - Any Modification which You create or to which You contribute must be - made available in Source Code form under the terms of this License - either on the same media as an Executable version or via an accepted - Electronic Distribution Mechanism to anyone to whom you made an - Executable version available; and if made available via Electronic - Distribution Mechanism, must remain available for at least twelve (12) - months after the date it initially became available, or at least six - (6) months after a subsequent version of that particular Modification - has been made available to such recipients. You are responsible for - ensuring that the Source Code version remains available even if the - Electronic Distribution Mechanism is maintained by a third party. - - 3.3. Description of Modifications. - You must cause all Covered Code to which You contribute to contain a - file documenting the changes You made to create that Covered Code and - the date of any change. You must include a prominent statement that - the Modification is derived, directly or indirectly, from Original - Code provided by the Initial Developer and including the name of the - Initial Developer in (a) the Source Code, and (b) in any notice in an - Executable version or related documentation in which You describe the - origin or ownership of the Covered Code. - - 3.4. Intellectual Property Matters - (a) Third Party Claims. - If Contributor has knowledge that a license under a third party's - intellectual property rights is required to exercise the rights - granted by such Contributor under Sections 2.1 or 2.2, - Contributor must include a text file with the Source Code - distribution titled "LEGAL" which describes the claim and the - party making the claim in sufficient detail that a recipient will - know whom to contact. If Contributor obtains such knowledge after - the Modification is made available as described in Section 3.2, - Contributor shall promptly modify the LEGAL file in all copies - Contributor makes available thereafter and shall take other steps - (such as notifying appropriate mailing lists or newsgroups) - reasonably calculated to inform those who received the Covered - Code that new knowledge has been obtained. - - (b) Contributor APIs. - If Contributor's Modifications include an application programming - interface and Contributor has knowledge of patent licenses which - are reasonably necessary to implement that API, Contributor must - also include this information in the LEGAL file. - - (c) Representations. - Contributor represents that, except as disclosed pursuant to - Section 3.4(a) above, Contributor believes that Contributor's - Modifications are Contributor's original creation(s) and/or - Contributor has sufficient rights to grant the rights conveyed by - this License. - - 3.5. Required Notices. - You must duplicate the notice in Exhibit A in each file of the Source - Code. If it is not possible to put such notice in a particular Source - Code file due to its structure, then You must include such notice in a - location (such as a relevant directory) where a user would be likely - to look for such a notice. If You created one or more Modification(s) - You may add your name as a Contributor to the notice described in - Exhibit A. You must also duplicate this License in any documentation - for the Source Code where You describe recipients' rights or ownership - rights relating to Covered Code. You may choose to offer, and to - charge a fee for, warranty, support, indemnity or liability - obligations to one or more recipients of Covered Code. However, You - may do so only on Your own behalf, and not on behalf of the Initial - Developer or any Contributor. You must make it absolutely clear than - any such warranty, support, indemnity or liability obligation is - offered by You alone, and You hereby agree to indemnify the Initial - Developer and every Contributor for any liability incurred by the - Initial Developer or such Contributor as a result of warranty, - support, indemnity or liability terms You offer. - - 3.6. Distribution of Executable Versions. - You may distribute Covered Code in Executable form only if the - requirements of Section 3.1-3.5 have been met for that Covered Code, - and if You include a notice stating that the Source Code version of - the Covered Code is available under the terms of this License, - including a description of how and where You have fulfilled the - obligations of Section 3.2. The notice must be conspicuously included - in any notice in an Executable version, related documentation or - collateral in which You describe recipients' rights relating to the - Covered Code. You may distribute the Executable version of Covered - Code or ownership rights under a license of Your choice, which may - contain terms different from this License, provided that You are in - compliance with the terms of this License and that the license for the - Executable version does not attempt to limit or alter the recipient's - rights in the Source Code version from the rights set forth in this - License. If You distribute the Executable version under a different - license You must make it absolutely clear that any terms which differ - from this License are offered by You alone, not by the Initial - Developer or any Contributor. You hereby agree to indemnify the - Initial Developer and every Contributor for any liability incurred by - the Initial Developer or such Contributor as a result of any such - terms You offer. - - 3.7. Larger Works. - You may create a Larger Work by combining Covered Code with other code - not governed by the terms of this License and distribute the Larger - Work as a single product. In such a case, You must make sure the - requirements of this License are fulfilled for the Covered Code. - -4. Inability to Comply Due to Statute or Regulation. - - If it is impossible for You to comply with any of the terms of this - License with respect to some or all of the Covered Code due to - statute, judicial order, or regulation then You must: (a) comply with - the terms of this License to the maximum extent possible; and (b) - describe the limitations and the code they affect. Such description - must be included in the LEGAL file described in Section 3.4 and must - be included with all distributions of the Source Code. Except to the - extent prohibited by statute or regulation, such description must be - sufficiently detailed for a recipient of ordinary skill to be able to - understand it. - -5. Application of this License. - - This License applies to code to which the Initial Developer has - attached the notice in Exhibit A and to related Covered Code. - -6. Versions of the License. - - 6.1. New Versions. - Netscape Communications Corporation ("Netscape") may publish revised - and/or new versions of the License from time to time. Each version - will be given a distinguishing version number. - - 6.2. Effect of New Versions. - Once Covered Code has been published under a particular version of the - License, You may always continue to use it under the terms of that - version. You may also choose to use such Covered Code under the terms - of any subsequent version of the License published by Netscape. No one - other than Netscape has the right to modify the terms applicable to - Covered Code created under this License. - - 6.3. Derivative Works. - If You create or use a modified version of this License (which you may - only do in order to apply it to code which is not already Covered Code - governed by this License), You must (a) rename Your license so that - the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", - "MPL", "NPL" or any confusingly similar phrase do not appear in your - license (except to note that your license differs from this License) - and (b) otherwise make it clear that Your version of the license - contains terms which differ from the Mozilla Public License and - Netscape Public License. (Filling in the name of the Initial - Developer, Original Code or Contributor in the notice described in - Exhibit A shall not of themselves be deemed to be modifications of - this License.) - -7. DISCLAIMER OF WARRANTY. - - COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, - WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF - DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. - THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE - IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, - YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE - COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER - OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF - ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. - -8. TERMINATION. - - 8.1. This License and the rights granted hereunder will terminate - automatically if You fail to comply with terms herein and fail to cure - such breach within 30 days of becoming aware of the breach. All - sublicenses to the Covered Code which are properly granted shall - survive any termination of this License. Provisions which, by their - nature, must remain in effect beyond the termination of this License - shall survive. - - 8.2. If You initiate litigation by asserting a patent infringement - claim (excluding declatory judgment actions) against Initial Developer - or a Contributor (the Initial Developer or Contributor against whom - You file such action is referred to as "Participant") alleging that: - - (a) such Participant's Contributor Version directly or indirectly - infringes any patent, then any and all rights granted by such - Participant to You under Sections 2.1 and/or 2.2 of this License - shall, upon 60 days notice from Participant terminate prospectively, - unless if within 60 days after receipt of notice You either: (i) - agree in writing to pay Participant a mutually agreeable reasonable - royalty for Your past and future use of Modifications made by such - Participant, or (ii) withdraw Your litigation claim with respect to - the Contributor Version against such Participant. If within 60 days - of notice, a reasonable royalty and payment arrangement are not - mutually agreed upon in writing by the parties or the litigation claim - is not withdrawn, the rights granted by Participant to You under - Sections 2.1 and/or 2.2 automatically terminate at the expiration of - the 60 day notice period specified above. - - (b) any software, hardware, or device, other than such Participant's - Contributor Version, directly or indirectly infringes any patent, then - any rights granted to You by such Participant under Sections 2.1(b) - and 2.2(b) are revoked effective as of the date You first made, used, - sold, distributed, or had made, Modifications made by that - Participant. - - 8.3. If You assert a patent infringement claim against Participant - alleging that such Participant's Contributor Version directly or - indirectly infringes any patent where such claim is resolved (such as - by license or settlement) prior to the initiation of patent - infringement litigation, then the reasonable value of the licenses - granted by such Participant under Sections 2.1 or 2.2 shall be taken - into account in determining the amount or value of any payment or - license. - - 8.4. In the event of termination under Sections 8.1 or 8.2 above, - all end user license agreements (excluding distributors and resellers) - which have been validly granted by You or any distributor hereunder - prior to termination shall survive termination. - -9. LIMITATION OF LIABILITY. - - UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT - (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL - DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, - OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR - ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY - CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, - WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER - COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN - INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF - LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY - RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW - PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE - EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO - THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. - -10. U.S. GOVERNMENT END USERS. - - The Covered Code is a "commercial item," as that term is defined in - 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer - software" and "commercial computer software documentation," as such - terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 - C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), - all U.S. Government End Users acquire Covered Code with only those - rights set forth herein. - -11. MISCELLANEOUS. - - This License represents the complete agreement concerning subject - matter hereof. If any provision of this License is held to be - unenforceable, such provision shall be reformed only to the extent - necessary to make it enforceable. This License shall be governed by - California law provisions (except to the extent applicable law, if - any, provides otherwise), excluding its conflict-of-law provisions. - With respect to disputes in which at least one party is a citizen of, - or an entity chartered or registered to do business in the United - States of America, any litigation relating to this License shall be - subject to the jurisdiction of the Federal Courts of the Northern - District of California, with venue lying in Santa Clara County, - California, with the losing party responsible for costs, including - without limitation, court costs and reasonable attorneys' fees and - expenses. The application of the United Nations Convention on - Contracts for the International Sale of Goods is expressly excluded. - Any law or regulation which provides that the language of a contract - shall be construed against the drafter shall not apply to this - License. - -12. RESPONSIBILITY FOR CLAIMS. - - As between Initial Developer and the Contributors, each party is - responsible for claims and damages arising, directly or indirectly, - out of its utilization of rights under this License and You agree to - work with Initial Developer and Contributors to distribute such - responsibility on an equitable basis. Nothing herein is intended or - shall be deemed to constitute any admission of liability. - -13. MULTIPLE-LICENSED CODE. - - Initial Developer may designate portions of the Covered Code as - "Multiple-Licensed". "Multiple-Licensed" means that the Initial - Developer permits you to utilize portions of the Covered Code under - Your choice of the NPL or the alternative licenses, if any, specified - by the Initial Developer in the file described in Exhibit A. - -EXHIBIT A -Mozilla Public License. - - ``The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. - - The Original Code is ______________________________________. - - The Initial Developer of the Original Code is ________________________. - Portions created by ______________________ are Copyright (C) ______ - _______________________. All Rights Reserved. - - Contributor(s): ______________________________________. - - Alternatively, the contents of this file may be used under the terms - of the _____ license (the "[___] License"), in which case the - provisions of [______] License are applicable instead of those - above. If you wish to allow use of your version of this file only - under the terms of the [____] License and not to allow others to use - your version of this file under the MPL, indicate your decision by - deleting the provisions above and replace them with the notice and - other provisions required by the [___] License. If you do not delete - the provisions above, a recipient may use your version of this file - under either the MPL or the [___] License." - - [NOTE: The text of this Exhibit A may differ slightly from the text of - the notices in the Source Code files of the Original Code. You should - use the text of this Exhibit A rather than the text found in the - Original Code Source Code for Your Modifications.] - - ---------------------------------------------------------------------- - - AMENDMENTS - - The Netscape Public License Version 1.1 ("NPL") consists of the - Mozilla Public License Version 1.1 with the following Amendments, - including Exhibit A-Netscape Public License. Files identified with - "Exhibit A-Netscape Public License" are governed by the Netscape - Public License Version 1.1. - - Additional Terms applicable to the Netscape Public License. - I. Effect. - These additional terms described in this Netscape Public - License -- Amendments shall apply to the Mozilla Communicator - client code and to all Covered Code under this License. - - II. "Netscape's Branded Code" means Covered Code that Netscape - distributes and/or permits others to distribute under one or more - trademark(s) which are controlled by Netscape but which are not - licensed for use under this License. - - III. Netscape and logo. - This License does not grant any rights to use the trademarks - "Netscape", the "Netscape N and horizon" logo or the "Netscape - lighthouse" logo, "Netcenter", "Gecko", "Java" or "JavaScript", - "Smart Browsing" even if such marks are included in the Original - Code or Modifications. - - IV. Inability to Comply Due to Contractual Obligation. - Prior to licensing the Original Code under this License, Netscape - has licensed third party code for use in Netscape's Branded Code. - To the extent that Netscape is limited contractually from making - such third party code available under this License, Netscape may - choose to reintegrate such code into Covered Code without being - required to distribute such code in Source Code form, even if - such code would otherwise be considered "Modifications" under - this License. - - V. Use of Modifications and Covered Code by Initial Developer. - V.1. In General. - The obligations of Section 3 apply to Netscape, except to - the extent specified in this Amendment, Section V.2 and V.3. - - V.2. Other Products. - Netscape may include Covered Code in products other than the - Netscape's Branded Code which are released by Netscape - during the two (2) years following the release date of the - Original Code, without such additional products becoming - subject to the terms of this License, and may license such - additional products on different terms from those contained - in this License. - - V.3. Alternative Licensing. - Netscape may license the Source Code of Netscape's Branded - Code, including Modifications incorporated therein, without - such Netscape Branded Code becoming subject to the terms of - this License, and may license such Netscape Branded Code on - different terms from those contained in this License. - - VI. Litigation. - Notwithstanding the limitations of Section 11 above, the - provisions regarding litigation in Section 11(a), (b) and (c) of - the License shall apply to all disputes relating to this License. - - EXHIBIT A-Netscape Public License. - - "The contents of this file are subject to the Netscape Public - License Version 1.1 (the "License"); you may not use this file - except in compliance with the License. You may obtain a copy of - the License at http://www.mozilla.org/NPL/ - - Software distributed under the License is distributed on an "AS - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - implied. See the License for the specific language governing - rights and limitations under the License. - - The Original Code is Mozilla Communicator client code, released - March 31, 1998. - - The Initial Developer of the Original Code is Netscape - Communications Corporation. Portions created by Netscape are - Copyright (C) 1998-1999 Netscape Communications Corporation. All - Rights Reserved. - - Contributor(s): ______________________________________. - - Alternatively, the contents of this file may be used under the - terms of the _____ license (the "[___] License"), in which case - the provisions of [______] License are applicable instead of - those above. If you wish to allow use of your version of this - file only under the terms of the [____] License and not to allow - others to use your version of this file under the NPL, indicate - your decision by deleting the provisions above and replace them - with the notice and other provisions required by the [___] - License. If you do not delete the provisions above, a recipient - may use your version of this file under either the NPL or the - [___] License." +# ***** BEGIN LICENSE BLOCK ***** +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Original Code is the Netscape Portable Runtime (NSPR). +# +# The Initial Developer of the Original Code is +# Netscape Communications Corporation. +# Portions created by the Initial Developer are Copyright (C) 1998-2000 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 2 or later (the "GPL"), or +# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +# in which case the provisions of the GPL or the LGPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL or the LGPL, and not to allow others to +# use your version of this file under the terms of the MPL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL or the LGPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the MPL, the GPL or the LGPL. +# +# ***** END LICENSE BLOCK ***** 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 Nov 25 12:58:40 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Nov 2009 11:58:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[7429] csw/mgar/pkg/liboil/trunk Message-ID: Revision: 7429 http://gar.svn.sourceforge.net/gar/?rev=7429&view=rev Author: dmichelsen Date: 2009-11-25 11:58:40 +0000 (Wed, 25 Nov 2009) Log Message: ----------- liboil: Add patch for Solaris 8/9 x86 Modified Paths: -------------- csw/mgar/pkg/liboil/trunk/Makefile csw/mgar/pkg/liboil/trunk/checksums Added Paths: ----------- csw/mgar/pkg/liboil/trunk/files/0002-Enable-getisax-only-for-Solaris-10.patch Modified: csw/mgar/pkg/liboil/trunk/Makefile =================================================================== --- csw/mgar/pkg/liboil/trunk/Makefile 2009-11-25 11:33:00 UTC (rev 7428) +++ csw/mgar/pkg/liboil/trunk/Makefile 2009-11-25 11:58:40 UTC (rev 7429) @@ -15,6 +15,7 @@ MASTER_SITES = http://liboil.freedesktop.org/download/ DISTFILES = $(DISTNAME).tar.gz PATCHFILES = 0001-Use-inttypes.h.patch +PATCHFILES += 0002-Enable-getisax-only-for-Solaris-10.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/liboil/trunk/checksums =================================================================== --- csw/mgar/pkg/liboil/trunk/checksums 2009-11-25 11:33:00 UTC (rev 7428) +++ csw/mgar/pkg/liboil/trunk/checksums 2009-11-25 11:58:40 UTC (rev 7429) @@ -1,2 +1,3 @@ 4fb5c9be05a769cc606257a723ecf6cd 0001-Use-inttypes.h.patch +dd92cada15fe42ef09f2bc6ed9d068db 0002-Enable-getisax-only-for-Solaris-10.patch febb1d9f9bc4c440fcf622dc90f8b6b7 liboil-0.3.16.tar.gz Added: csw/mgar/pkg/liboil/trunk/files/0002-Enable-getisax-only-for-Solaris-10.patch =================================================================== --- csw/mgar/pkg/liboil/trunk/files/0002-Enable-getisax-only-for-Solaris-10.patch (rev 0) +++ csw/mgar/pkg/liboil/trunk/files/0002-Enable-getisax-only-for-Solaris-10.patch 2009-11-25 11:58:40 UTC (rev 7429) @@ -0,0 +1,26 @@ +From 159a22dd99c2d86891fc5c1f76d35fdacec37368 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 25 Nov 2009 12:48:11 +0100 +Subject: [PATCH] Enable getisax only for Solaris 10 + +--- + liboil/liboilcpu-x86.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/liboil/liboilcpu-x86.c b/liboil/liboilcpu-x86.c +index e7a1978..9851209 100644 +--- a/liboil/liboilcpu-x86.c ++++ b/liboil/liboilcpu-x86.c +@@ -60,7 +60,9 @@ + /***** i386, amd64 *****/ + + #if defined(__sun) ++#if defined(_SYS_AUXV_386_H) + #define USE_I386_GETISAX ++#endif + #else + #define USE_I386_CPUID + #endif +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Nov 25 13:03:54 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Nov 2009 12:03:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[7430] csw/mgar/pkg/orca/trunk Message-ID: Revision: 7430 http://gar.svn.sourceforge.net/gar/?rev=7430&view=rev Author: dmichelsen Date: 2009-11-25 12:03:53 +0000 (Wed, 25 Nov 2009) Log Message: ----------- orca: Fix start script and package name Modified Paths: -------------- csw/mgar/pkg/orca/trunk/Makefile csw/mgar/pkg/orca/trunk/checksums Added Paths: ----------- csw/mgar/pkg/orca/trunk/files/csworca csw/mgar/pkg/orca/trunk/files/fix-start-orcallator.patch Modified: csw/mgar/pkg/orca/trunk/Makefile =================================================================== --- csw/mgar/pkg/orca/trunk/Makefile 2009-11-25 11:58:40 UTC (rev 7429) +++ csw/mgar/pkg/orca/trunk/Makefile 2009-11-25 12:03:53 UTC (rev 7430) @@ -30,17 +30,18 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += csworcallator csworcallator.xml svc-csworcallator DISTFILES += csworca_services +DISTFILES += csworca +PATCHFILES = $(GARNAME)-$(GARVERSION)-se-3.5.0.patch +PATCHFILES += fix-start-orcallator.patch -PACKAGES = CSWorca CSWorca-web +PACKAGES = CSWorca CSWorcaweb -CATALOGNAME_CSWorca = orca -CATALOGNAME_CSWorca-web = orca_web +CATALOGNAME_CSWorca = orca +CATALOGNAME_CSWorcaweb = orca_web SPKG_DESC_CSWorca = Performance Data Collector -SPKG_DESC_CSWorcs-web = Performance Data Viewer +SPKG_DESC_CSWorcaweb = Performance Data Viewer -PATCHFILES = $(GARNAME)-$(GARVERSION)-se-3.5.0.patch - SPKG_SOURCEURL = http://www.orcaware.com/orca # We define upstream file regex so we can be notifed of new upstream software release @@ -50,7 +51,7 @@ REQUIRED_PKGS_CSWorca = CSWsetoolkit CSWperl CSWpmtimedate REQUIRED_PKGS_CSWorca += CSWpmmathinterpolate CSWrrd CSWgawk CSWbzip2 -REQUIRED_PKGS_CSWorca-web = CSWperl CSWpmtimedate CSWpmmathinterpolate CSWrrd CSWapache2 +REQUIRED_PKGS_CSWorcaweb = CSWperl CSWpmtimedate CSWpmmathinterpolate CSWrrd CSWapache2 sysconfdir = /etc/opt/csw localstatedir = /var/opt/csw @@ -70,23 +71,26 @@ PRESERVECONF += /etc/opt/csw/procallator.cfg PRESERVECONF += /etc/opt/csw/orca_services.cfg -INITSMF = /etc/opt/csw/init.d/csworcallator +INITSMF = /etc/opt/csw/init.d/csworca +INITSMF += /etc/opt/csw/init.d/csworcallator ARCHALL = 1 -PKGFILES_CSWorca-web = $(prefix)/apache2/.* -PKGFILES_CSWorca-web += $(sharedstatedir)/www/orca/.* -PKGFILES_CSWorca-web += $(bindir)/orca -PKGFILES_CSWorca-web += $(sysconfdir)/.*\.cfg -PKGFILES_CSWorca-web += $(libdir)/perl/.* -PKGFILES_CSWorca-web += $(mandir)/man1/orca\.1 -PKGFILES_CSWorca-web += /var/opt/csw/.* +PKGFILES_CSWorcaweb = $(prefix)/apache2/.* +PKGFILES_CSWorcaweb += $(sharedstatedir)/www/orca/.* +PKGFILES_CSWorcaweb += $(bindir)/orca +PKGFILES_CSWorcaweb += $(sysconfdir)/.*\.cfg +PKGFILES_CSWorcaweb += $(libdir)/perl/.* +PKGFILES_CSWorcaweb += $(mandir)/man1/orca\.1 +PKGFILES_CSWorcaweb += /var/opt/csw/.* +PKGFILES_CSWorcaweb += /etc/opt/csw/init.d/csworca include gar/category.mk post-install-modulated: @ginstall -d $(DESTDIR)$(sysconfdir)/init.d @# TBD: Use custom manifest for Solaris 10 SMF support + @ginstall $(WORKDIR)/csworca $(DESTDIR)$(sysconfdir)/init.d/csworca @ginstall $(WORKDIR)/csworcallator $(DESTDIR)$(sysconfdir)/init.d/csworcallator @ginstall $(WORKDIR)/csworca_services $(DESTDIR)$(sysconfdir)/init.d/csworca_services @$(MAKE_COOKIE) Modified: csw/mgar/pkg/orca/trunk/checksums =================================================================== --- csw/mgar/pkg/orca/trunk/checksums 2009-11-25 11:58:40 UTC (rev 7429) +++ csw/mgar/pkg/orca/trunk/checksums 2009-11-25 12:03:53 UTC (rev 7430) @@ -1,6 +1,8 @@ +dcb171adb47a8a7d8c55ec4b7f9b5218 csworca 4c74f4f1449fabd0838d0cd71678144c csworca_services 72c1eaa8d3f1ab48363e7ed5792e2855 csworcallator a99644ffcc9164d9d0f4df2b44c61917 csworcallator.xml +22e921ee0ebc822479e99041d1045952 fix-start-orcallator.patch ce08f37aa52f7b27bc82cc9c976d56b4 orca-snapshot-r535-se-3.5.0.patch ba8e48e429008f53037e85fef2fcfe36 orca-snapshot-r535.tar.bz2 23a2b76456b96c5fcff4a1d92c02e140 svc-csworcallator Added: csw/mgar/pkg/orca/trunk/files/csworca =================================================================== --- csw/mgar/pkg/orca/trunk/files/csworca (rev 0) +++ csw/mgar/pkg/orca/trunk/files/csworca 2009-11-25 12:03:53 UTC (rev 7430) @@ -0,0 +1,33 @@ +#!/bin/sh + +prefix=/opt/csw +exec_prefix=/opt/csw +bindir=/opt/csw/bin + +orca="$bindir/orca" + +case "$1" in + start) + if test -x $orca; then + umask 022 + $orca -daemon -logfile /var/opt/csw/orca/orca.log /etc/opt/csw/orcallator.cfg & + echo $! >/var/run/orca.pid + else + echo "$0: $start_orcallator does not exist or is not executable." + fi + ;; + + stop) + if test -f /var/run/orca.pid; then + kill `cat /var/run/orca.pid` + rm -f /var/run/orca.pid + fi + ;; + + *) + echo "usage: $0 {start|stop}" + exit 1 + ;; +esac + +exit 0 Property changes on: csw/mgar/pkg/orca/trunk/files/csworca ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/orca/trunk/files/fix-start-orcallator.patch =================================================================== --- csw/mgar/pkg/orca/trunk/files/fix-start-orcallator.patch (rev 0) +++ csw/mgar/pkg/orca/trunk/files/fix-start-orcallator.patch 2009-11-25 12:03:53 UTC (rev 7430) @@ -0,0 +1,28 @@ +--- orca-snapshot-r535/data_gatherers/orcallator/start_orcallator.sh.in 2005-09-09 05:51:41.000000000 +0200 ++++ orca-snapshot-r535/data_gatherers/orcallator/start_orcallator.sh.in.new 2009-11-25 12:19:03.700007723 +0100 +@@ -118,7 +118,7 @@ + exit 1 + fi + +-echo "Writing data into $OUTDIR/" ++# echo "Writing data into $OUTDIR/" + if test "$WEB_LOG"; then + echo "Using www access log file $WEB_LOG" + fi +@@ -138,8 +138,8 @@ + fi + + # Now start the logging. +-echo "Starting logging" +-nohup $SE $SE_PATCHES -DWATCH_OS $WATCH_WEB -I$libdir/SE/$SE_VERSION $libdir/orcallator.se & ++# echo "Starting logging" ++nohup $SE $SE_PATCHES -DWATCH_OS $WATCH_WEB -I$libdir/SE/$SE_VERSION $libdir/orca/orcallator.se >$OUTDIR/orcallator.log 2>&1 & + + # Write the PID of orcallator to a file to make killing easier. + pid=$! +@@ -147,4 +147,4 @@ + + # Sleep for a couple of seconds to allow any orcallator startup + # warnings to appear on the terminal before exiting. +-sleep 5 ++# sleep 5 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 Nov 25 14:19:07 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Nov 2009 13:19:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7431] csw/mgar/pkg/libschroedinger/trunk Message-ID: Revision: 7431 http://gar.svn.sourceforge.net/gar/?rev=7431&view=rev Author: dmichelsen Date: 2009-11-25 13:19:07 +0000 (Wed, 25 Nov 2009) Log Message: ----------- libschroedinger: Add patch Modified Paths: -------------- csw/mgar/pkg/libschroedinger/trunk/Makefile csw/mgar/pkg/libschroedinger/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libschroedinger/trunk/files/0001-Avoid-using-FUNCTION-and-stdint.h.patch Modified: csw/mgar/pkg/libschroedinger/trunk/Makefile =================================================================== --- csw/mgar/pkg/libschroedinger/trunk/Makefile 2009-11-25 12:03:53 UTC (rev 7430) +++ csw/mgar/pkg/libschroedinger/trunk/Makefile 2009-11-25 13:19:07 UTC (rev 7431) @@ -14,12 +14,17 @@ MASTER_SITES = http://diracvideo.org/download/schroedinger/ DISTNAME = schroedinger-$(GARVERSION) DISTFILES = $(DISTNAME).tar.gz +PATCHFILES = 0001-Avoid-using-FUNCTION-and-stdint.h.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +REQUIRED_PKGS = CSWliboil + BUILD64 = 1 NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) +TEST_TARGET = check + include gar/category.mk Modified: csw/mgar/pkg/libschroedinger/trunk/checksums =================================================================== --- csw/mgar/pkg/libschroedinger/trunk/checksums 2009-11-25 12:03:53 UTC (rev 7430) +++ csw/mgar/pkg/libschroedinger/trunk/checksums 2009-11-25 13:19:07 UTC (rev 7431) @@ -0,0 +1,2 @@ +271143050dd2df0b7d6e00e07ddac3fc 0001-Avoid-using-FUNCTION-and-stdint.h.patch +9a1132c54a58a6a040514f754b53ee44 schroedinger-1.0.7.tar.gz Added: csw/mgar/pkg/libschroedinger/trunk/files/0001-Avoid-using-FUNCTION-and-stdint.h.patch =================================================================== --- csw/mgar/pkg/libschroedinger/trunk/files/0001-Avoid-using-FUNCTION-and-stdint.h.patch (rev 0) +++ csw/mgar/pkg/libschroedinger/trunk/files/0001-Avoid-using-FUNCTION-and-stdint.h.patch 2009-11-25 13:19:07 UTC (rev 7431) @@ -0,0 +1,39 @@ +From c9016f3e69fcfc75bb3256654c2128f2c56995ec Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 25 Nov 2009 13:40:09 +0100 +Subject: [PATCH] Avoid using FUNCTION and stdint.h + +--- + schroedinger/schrodebug.h | 2 +- + schroedinger/schroutils.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/schroedinger/schrodebug.h b/schroedinger/schrodebug.h +index 5a7edf0..835246e 100644 +--- a/schroedinger/schrodebug.h ++++ b/schroedinger/schrodebug.h +@@ -50,7 +50,7 @@ typedef void (*SchroDebugLogFunc) (int level, const char *file, + SCHRO_DEBUG_LEVEL(SCHRO_LEVEL_LOG, __VA_ARGS__) + + #define SCHRO_DEBUG_LEVEL(level,...) \ +- schro_debug_log ((level), __FILE__, __FUNCTION__, __LINE__, __VA_ARGS__) ++ schro_debug_log ((level), __FILE__, "", __LINE__, __VA_ARGS__) + + #define SCHRO_ASSERT(test) do { \ + if (!(test)) { \ +diff --git a/schroedinger/schroutils.h b/schroedinger/schroutils.h +index 17eda4b..4199c58 100644 +--- a/schroedinger/schroutils.h ++++ b/schroedinger/schroutils.h +@@ -12,7 +12,7 @@ typedef unsigned __int16 uint16_t; + typedef unsigned __int32 uint32_t; + #endif + #else +-#include ++#include + #endif + + #ifndef TRUE +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Nov 25 14:46:50 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Nov 2009 13:46:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[7433] csw/mgar/pkg Message-ID: Revision: 7433 http://gar.svn.sourceforge.net/gar/?rev=7433&view=rev Author: dmichelsen Date: 2009-11-25 13:46:50 +0000 (Wed, 25 Nov 2009) Log Message: ----------- libstatgrab: Initial commit Added Paths: ----------- csw/mgar/pkg/libstatgrab/ csw/mgar/pkg/libstatgrab/branches/ csw/mgar/pkg/libstatgrab/tags/ csw/mgar/pkg/libstatgrab/trunk/ csw/mgar/pkg/libstatgrab/trunk/Makefile csw/mgar/pkg/libstatgrab/trunk/checksums csw/mgar/pkg/libstatgrab/trunk/files/ Property changes on: csw/mgar/pkg/libstatgrab/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/libstatgrab/trunk/Makefile =================================================================== --- csw/mgar/pkg/libstatgrab/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libstatgrab/trunk/Makefile 2009-11-25 13:46:50 UTC (rev 7433) @@ -0,0 +1,24 @@ +GARNAME = libstatgrab +GARVERSION = 0.16 +CATEGORIES = lib + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = ftp://ftp.uk.i-scream.org/pub/i-scream/libstatsgrab/ +MASTER_SITES += http://dl.ambiweb.de/mirrors/ftp.i-scream.org/libstatgrab/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +REQUIRED_PKGS = CSWncurses + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/libstatgrab/trunk/checksums =================================================================== --- csw/mgar/pkg/libstatgrab/trunk/checksums (rev 0) +++ csw/mgar/pkg/libstatgrab/trunk/checksums 2009-11-25 13:46:50 UTC (rev 7433) @@ -0,0 +1 @@ +77582438274679a9641d043ddcccdd4e libstatgrab-0.16.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 Nov 25 14:45:16 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Nov 2009 13:45:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7432] csw/mgar/pkg/cpan Message-ID: Revision: 7432 http://gar.svn.sourceforge.net/gar/?rev=7432&view=rev Author: dmichelsen Date: 2009-11-25 13:45:16 +0000 (Wed, 25 Nov 2009) Log Message: ----------- cpan/Unix-Statgrab: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Unix-Statgrab/ csw/mgar/pkg/cpan/Unix-Statgrab/branches/ csw/mgar/pkg/cpan/Unix-Statgrab/tags/ csw/mgar/pkg/cpan/Unix-Statgrab/trunk/ csw/mgar/pkg/cpan/Unix-Statgrab/trunk/Makefile csw/mgar/pkg/cpan/Unix-Statgrab/trunk/checksums csw/mgar/pkg/cpan/Unix-Statgrab/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Unix-Statgrab/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/Unix-Statgrab/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Unix-Statgrab/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Unix-Statgrab/trunk/Makefile 2009-11-25 13:45:16 UTC (rev 7432) @@ -0,0 +1,16 @@ +GARNAME = Unix-Statgrab +GARVERSION = 0.04 +CATEGORIES = cpan +AUTHOR = VPARSEVAL + +DESCRIPTION = Perl extension for collecting information about the machine +define BLURB +endef + +PACKAGES = CSWpmunixstatgrab +CATALOGNAME = pm_unixstatgrab + +REQUIRED_PKGS = CSWlibstatgrab +PREREQUISITE_PKGS = $(REQUIRED_PKGS) + +include gar/category.mk Added: csw/mgar/pkg/cpan/Unix-Statgrab/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Unix-Statgrab/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Unix-Statgrab/trunk/checksums 2009-11-25 13:45:16 UTC (rev 7432) @@ -0,0 +1 @@ +94787010e27183ce5cf354c58c465d0d Unix-Statgrab-0.04.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 Nov 25 15:30:52 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Nov 2009 14:30:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[7434] csw/mgar/pkg/libspf2/trunk/Makefile Message-ID: Revision: 7434 http://gar.svn.sourceforge.net/gar/?rev=7434&view=rev Author: dmichelsen Date: 2009-11-25 14:30:51 +0000 (Wed, 25 Nov 2009) Log Message: ----------- libspf2: Add missing libraries Modified Paths: -------------- csw/mgar/pkg/libspf2/trunk/Makefile Modified: csw/mgar/pkg/libspf2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libspf2/trunk/Makefile 2009-11-25 13:46:50 UTC (rev 7433) +++ csw/mgar/pkg/libspf2/trunk/Makefile 2009-11-25 14:30:51 UTC (rev 7434) @@ -19,6 +19,16 @@ SPKG_SOURCEURL = http://www.libspf2.org +REQUIRED_PGKS = CSWggettextrt + +BUILD64 = 1 +NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) +EXTRA_LINKER_FLAGS = -lresolv -lsocket -lnsl + +TEST_TARGET = check + +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 Wed Nov 25 15:32:18 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Nov 2009 14:32:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7435] csw/mgar/pkg/libspf2/trunk/Makefile Message-ID: Revision: 7435 http://gar.svn.sourceforge.net/gar/?rev=7435&view=rev Author: dmichelsen Date: 2009-11-25 14:32:17 +0000 (Wed, 25 Nov 2009) Log Message: ----------- libspf2: Fix typo Modified Paths: -------------- csw/mgar/pkg/libspf2/trunk/Makefile Modified: csw/mgar/pkg/libspf2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libspf2/trunk/Makefile 2009-11-25 14:30:51 UTC (rev 7434) +++ csw/mgar/pkg/libspf2/trunk/Makefile 2009-11-25 14:32:17 UTC (rev 7435) @@ -19,7 +19,7 @@ SPKG_SOURCEURL = http://www.libspf2.org -REQUIRED_PGKS = CSWggettextrt +REQUIRED_PKGS = CSWggettextrt BUILD64 = 1 NO_ISAEXEC = 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 Wed Nov 25 15:42:11 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Nov 2009 14:42:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[7436] csw/mgar/pkg Message-ID: Revision: 7436 http://gar.svn.sourceforge.net/gar/?rev=7436&view=rev Author: dmichelsen Date: 2009-11-25 14:42:10 +0000 (Wed, 25 Nov 2009) Log Message: ----------- libsmi: Initial commit Added Paths: ----------- csw/mgar/pkg/libsmi/ csw/mgar/pkg/libsmi/branches/ csw/mgar/pkg/libsmi/tags/ csw/mgar/pkg/libsmi/trunk/ csw/mgar/pkg/libsmi/trunk/Makefile csw/mgar/pkg/libsmi/trunk/checksums csw/mgar/pkg/libsmi/trunk/files/ Property changes on: csw/mgar/pkg/libsmi/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/libsmi/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsmi/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libsmi/trunk/Makefile 2009-11-25 14:42:10 UTC (rev 7436) @@ -0,0 +1,43 @@ +GARNAME = libsmi +GARVERSION = 0.4.8 +CATEGORIES = lib + +DESCRIPTION = Allows management applications to access SMI MIB module definitions +define BLURB + The core of the libsmi distribution is a library that allows management applications + to access SMI MIB module definitions. On top of this library, there are tools to check, + analyze dump, convert, and compare MIB definitions. Finally, the distribution contains + a steadily maintained and revised archive of all IETF and IANA maintained standard MIB + and PIB modules. +endef + +MASTER_SITES = ftp://ftp.ibr.cs.tu-bs.de/pub/local/libsmi/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +PACKAGES = CSWlibsmi CSWlibsmimibs + +CATALOGNAME_CSWlibsmi = libsmi +CATALOGNAME_CSWlibsmimibs = libsmi_mibs + +SPKG_DESC_CSWlibsmi = Library to access SMI MIB module definitions +SPKG_DESC_CSWlibsmimibs = SMI MIB definitions + +SPKG_SOURCEURL = http://www.ibr.cs.tu-bs.de/projects/libsmi/ + +REQUIRED_PKGS_CSWlibsmi = CSWlibsmimibs + +BUILD64 = 1 +NO_ISAEXEC = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +EXTRA_CPPFLAGS = -Dfabsf=fabs + +MERGE_DIRS_isa-extra = $(libdir) + +PKGFILES_CSWlibsmimibs = $(sharedstatedir)/mibs/.* +PKGFILES_CSWlibsmimibs += $(sharedstatedir)/pibs/.* + +include gar/category.mk Added: csw/mgar/pkg/libsmi/trunk/checksums =================================================================== --- csw/mgar/pkg/libsmi/trunk/checksums (rev 0) +++ csw/mgar/pkg/libsmi/trunk/checksums 2009-11-25 14:42:10 UTC (rev 7436) @@ -0,0 +1 @@ +760b6b1070738158708649ed2c63425e libsmi-0.4.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 Wed Nov 25 15:53:53 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Nov 2009 14:53:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[7437] csw/mgar/pkg/cpan Message-ID: Revision: 7437 http://gar.svn.sourceforge.net/gar/?rev=7437&view=rev Author: dmichelsen Date: 2009-11-25 14:53:52 +0000 (Wed, 25 Nov 2009) Log Message: ----------- cpan/Net-DNS-Resolver-Programmable: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Net-DNS-Resolver-Programmable/ csw/mgar/pkg/cpan/Net-DNS-Resolver-Programmable/branches/ csw/mgar/pkg/cpan/Net-DNS-Resolver-Programmable/tags/ csw/mgar/pkg/cpan/Net-DNS-Resolver-Programmable/trunk/ csw/mgar/pkg/cpan/Net-DNS-Resolver-Programmable/trunk/Makefile csw/mgar/pkg/cpan/Net-DNS-Resolver-Programmable/trunk/checksums csw/mgar/pkg/cpan/Net-DNS-Resolver-Programmable/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Net-DNS-Resolver-Programmable/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/Net-DNS-Resolver-Programmable/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-DNS-Resolver-Programmable/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Net-DNS-Resolver-Programmable/trunk/Makefile 2009-11-25 14:53:52 UTC (rev 7437) @@ -0,0 +1,15 @@ +GARNAME = Net-DNS-Resolver-Programmable +GARVERSION = v0.003 +CATEGORIES = cpan +AUTHOR = JMEHNLE + +DESCRIPTION = Programmable DNS resolver class for offline emulation of DNS +define BLURB +endef + +PACKAGES = CSWpmnetdnsresp +CATALOGNAME = pm_netdnsresp + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Net-DNS-Resolver-Programmable/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-DNS-Resolver-Programmable/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Net-DNS-Resolver-Programmable/trunk/checksums 2009-11-25 14:53:52 UTC (rev 7437) @@ -0,0 +1 @@ +8d44bf331d6115e7fb4ea21f6cf4b96b Net-DNS-Resolver-Programmable-v0.003.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 Nov 25 16:02:15 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Nov 2009 15:02:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[7438] csw/mgar/pkg/libsmi/trunk/Makefile Message-ID: Revision: 7438 http://gar.svn.sourceforge.net/gar/?rev=7438&view=rev Author: dmichelsen Date: 2009-11-25 15:02:01 +0000 (Wed, 25 Nov 2009) Log Message: ----------- libsmi: Make MIBS archall Modified Paths: -------------- csw/mgar/pkg/libsmi/trunk/Makefile Modified: csw/mgar/pkg/libsmi/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsmi/trunk/Makefile 2009-11-25 14:53:52 UTC (rev 7437) +++ csw/mgar/pkg/libsmi/trunk/Makefile 2009-11-25 15:02:01 UTC (rev 7438) @@ -33,10 +33,15 @@ NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) -EXTRA_CPPFLAGS = -Dfabsf=fabs +EXTRA_CPPFLAGS_isa-sparcv8 = -Dfabsf=fabs +EXTRA_CPPFLAGS_isa-sparcv9 = -Dfabsf=fabs +EXTRA_CPPFLAGS_isa-i386 = -Dfabsf=fabs +EXTRA_CPPFLAGS = $(EXTRA_CPPFLAGS_isa-$(ISA)) MERGE_DIRS_isa-extra = $(libdir) +ARCHALL_CSWlibsmimibs = 1 + PKGFILES_CSWlibsmimibs = $(sharedstatedir)/mibs/.* PKGFILES_CSWlibsmimibs += $(sharedstatedir)/pibs/.* 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 Nov 25 16:40:24 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Nov 2009 15:40:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7439] csw/mgar/pkg Message-ID: Revision: 7439 http://gar.svn.sourceforge.net/gar/?rev=7439&view=rev Author: dmichelsen Date: 2009-11-25 15:40:23 +0000 (Wed, 25 Nov 2009) Log Message: ----------- handbrake: Initial commit Added Paths: ----------- csw/mgar/pkg/handbrake/ csw/mgar/pkg/handbrake/branches/ csw/mgar/pkg/handbrake/tags/ csw/mgar/pkg/handbrake/trunk/ csw/mgar/pkg/handbrake/trunk/Makefile csw/mgar/pkg/handbrake/trunk/checksums csw/mgar/pkg/handbrake/trunk/files/ Property changes on: csw/mgar/pkg/handbrake/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/handbrake/trunk/Makefile =================================================================== --- csw/mgar/pkg/handbrake/trunk/Makefile (rev 0) +++ csw/mgar/pkg/handbrake/trunk/Makefile 2009-11-25 15:40:23 UTC (rev 7439) @@ -0,0 +1,25 @@ +GARNAME = HandBrake +GARVERSION = 0.9.4 +CATEGORIES = apps + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = http://download.handbrake.fr/handbrake/releases/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +GARCOMPILER = GNU + +CONFIGURE_ARGS = --prefix=$(prefix) + +BUILD_SCRIPTS = $(WORKSRC)/build/Makefile + +BUILD_ARGS = M4.exe=/opt/csw/bin/gm4 + + +include gar/category.mk Added: csw/mgar/pkg/handbrake/trunk/checksums =================================================================== --- csw/mgar/pkg/handbrake/trunk/checksums (rev 0) +++ csw/mgar/pkg/handbrake/trunk/checksums 2009-11-25 15:40:23 UTC (rev 7439) @@ -0,0 +1 @@ +69f88b2e602550615da75947f914d7e6 HandBrake-0.9.4.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 Nov 25 17:14:19 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Nov 2009 16:14:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[7440] csw/mgar/pkg/a52dec/trunk Message-ID: Revision: 7440 http://gar.svn.sourceforge.net/gar/?rev=7440&view=rev Author: dmichelsen Date: 2009-11-25 16:14:19 +0000 (Wed, 25 Nov 2009) Log Message: ----------- a52dec: Move to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/a52dec/trunk/Makefile csw/mgar/pkg/a52dec/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/a52dec/trunk/files/CSWliba52.depend csw/mgar/pkg/a52dec/trunk/files/CSWliba52.gspec Property Changed: ---------------- csw/mgar/pkg/a52dec/trunk/ Property changes on: csw/mgar/pkg/a52dec/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/a52dec/trunk/Makefile =================================================================== --- csw/mgar/pkg/a52dec/trunk/Makefile 2009-11-25 15:40:23 UTC (rev 7439) +++ csw/mgar/pkg/a52dec/trunk/Makefile 2009-11-25 16:14:19 UTC (rev 7440) @@ -2,20 +2,29 @@ GARVERSION = 0.7.4 CATEGORIES = lib -DESCRIPTION = a free ATSC A/52 stream decoder +DESCRIPTION = A free ATSC A/52 stream decoder define BLURB liba52 is a free library for decoding ATSC A/52 streams. It is released under the terms of the GPL license. The A/52 standard is used in a variety of applications, including digital television and DVD. It is also known as AC-3. endef -UPSTREAM_MASTER_SITES = http://liba52.sourceforge.net/ MASTER_SITES = http://liba52.sourceforge.net/files/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWliba52, depend) # We define upstream file regex so we can be notifed of new upstream software release +UPSTREAM_MASTER_SITES = http://liba52.sourceforge.net/ UFILES_REGEX = (\d+(?:\.\d+)*) -CONFIGURE_ARGS = $(DIRPATHS) --enable-shared --disable-static +PACKAGES = CSWliba52 +CATALOGNAME = a52dec +EXTRA_LINKER_FLAGS = -lsunmath + +BUILD64 = 1 +NO_ISAEXEC = 1 +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-shared --disable-static + +MERGE_DIRS_isa-extra = $(libdir) + include gar/category.mk Modified: csw/mgar/pkg/a52dec/trunk/checksums =================================================================== --- csw/mgar/pkg/a52dec/trunk/checksums 2009-11-25 15:40:23 UTC (rev 7439) +++ csw/mgar/pkg/a52dec/trunk/checksums 2009-11-25 16:14:19 UTC (rev 7440) @@ -1,3 +1 @@ -caa9f5bc44232dc8aeea773fea56be80 download/a52dec-0.7.4.tar.gz -e8c579511a637db82d574dca101eae78 download/CSWliba52.gspec -dbd9108c1c824c0022ec25ec673ba4fa download/CSWliba52.depend +caa9f5bc44232dc8aeea773fea56be80 a52dec-0.7.4.tar.gz Deleted: csw/mgar/pkg/a52dec/trunk/files/CSWliba52.gspec =================================================================== --- csw/mgar/pkg/a52dec/trunk/files/CSWliba52.gspec 2009-11-25 15:40:23 UTC (rev 7439) +++ csw/mgar/pkg/a52dec/trunk/files/CSWliba52.gspec 2009-11-25 16:14:19 UTC (rev 7440) @@ -1,4 +0,0 @@ -%var bitname a52dec -%var pkgname CSWliba52 -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING 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 Nov 25 18:00:57 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Nov 2009 17:00:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[7441] csw/mgar/pkg Message-ID: Revision: 7441 http://gar.svn.sourceforge.net/gar/?rev=7441&view=rev Author: dmichelsen Date: 2009-11-25 17:00:57 +0000 (Wed, 25 Nov 2009) Log Message: ----------- mibdump: Initial commit Modified Paths: -------------- csw/mgar/pkg/mibdump/trunk/Makefile csw/mgar/pkg/mibdump/trunk/checksums Added Paths: ----------- csw/mgar/pkg/mibdump/ csw/mgar/pkg/mibdump/trunk/ Removed Paths: ------------- csw/mgar/pkg/mibdump/trunk/ Modified: csw/mgar/pkg/mibdump/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsmi/trunk/Makefile 2009-11-25 15:02:01 UTC (rev 7438) +++ csw/mgar/pkg/mibdump/trunk/Makefile 2009-11-25 17:00:57 UTC (rev 7441) @@ -1,6 +1,6 @@ -GARNAME = libsmi -GARVERSION = 0.4.8 -CATEGORIES = lib +GARNAME = mibdump +GARVERSION = 0.1.2 +CATEGORIES = utils DESCRIPTION = Allows management applications to access SMI MIB module definitions define BLURB @@ -17,32 +17,14 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWlibsmi CSWlibsmimibs - -CATALOGNAME_CSWlibsmi = libsmi -CATALOGNAME_CSWlibsmimibs = libsmi_mibs - -SPKG_DESC_CSWlibsmi = Library to access SMI MIB module definitions -SPKG_DESC_CSWlibsmimibs = SMI MIB definitions - SPKG_SOURCEURL = http://www.ibr.cs.tu-bs.de/projects/libsmi/ -REQUIRED_PKGS_CSWlibsmi = CSWlibsmimibs +REQUIRED_PKGS = CSWlibsmi BUILD64 = 1 NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) -EXTRA_CPPFLAGS_isa-sparcv8 = -Dfabsf=fabs -EXTRA_CPPFLAGS_isa-sparcv9 = -Dfabsf=fabs -EXTRA_CPPFLAGS_isa-i386 = -Dfabsf=fabs -EXTRA_CPPFLAGS = $(EXTRA_CPPFLAGS_isa-$(ISA)) - MERGE_DIRS_isa-extra = $(libdir) -ARCHALL_CSWlibsmimibs = 1 - -PKGFILES_CSWlibsmimibs = $(sharedstatedir)/mibs/.* -PKGFILES_CSWlibsmimibs += $(sharedstatedir)/pibs/.* - include gar/category.mk Modified: csw/mgar/pkg/mibdump/trunk/checksums =================================================================== --- csw/mgar/pkg/libsmi/trunk/checksums 2009-11-25 15:02:01 UTC (rev 7438) +++ csw/mgar/pkg/mibdump/trunk/checksums 2009-11-25 17:00:57 UTC (rev 7441) @@ -1 +1 @@ -760b6b1070738158708649ed2c63425e libsmi-0.4.8.tar.gz +724bf7632d649087439f5cb0f5b39c19 mibdump-0.1.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Nov 25 19:03:07 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Nov 2009 18:03:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7442] csw/mgar/pkg/orca/trunk/Makefile Message-ID: Revision: 7442 http://gar.svn.sourceforge.net/gar/?rev=7442&view=rev Author: dmichelsen Date: 2009-11-25 18:03:07 +0000 (Wed, 25 Nov 2009) Log Message: ----------- orca: Adjust version string Modified Paths: -------------- csw/mgar/pkg/orca/trunk/Makefile Modified: csw/mgar/pkg/orca/trunk/Makefile =================================================================== --- csw/mgar/pkg/orca/trunk/Makefile 2009-11-25 17:00:57 UTC (rev 7441) +++ csw/mgar/pkg/orca/trunk/Makefile 2009-11-25 18:03:07 UTC (rev 7442) @@ -1,6 +1,6 @@ GARNAME = orca GARVERSION = snapshot-r535 -SPKG_VERSION = r535 +SPKG_VERSION = snapshot_r535 CATEGORIES = utils DESCRIPTION = A system performance monitoring tool 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 Nov 25 21:50:28 2009 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Wed, 25 Nov 2009 20:50:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[7443] csw/mgar/pkg/libmikmod/trunk Message-ID: Revision: 7443 http://gar.svn.sourceforge.net/gar/?rev=7443&view=rev Author: jake_goerzen Date: 2009-11-25 20:50:27 +0000 (Wed, 25 Nov 2009) Log Message: ----------- clean up Makefile; add BUILD64 = 1 Modified Paths: -------------- csw/mgar/pkg/libmikmod/trunk/Makefile csw/mgar/pkg/libmikmod/trunk/checksums Modified: csw/mgar/pkg/libmikmod/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmikmod/trunk/Makefile 2009-11-25 18:03:07 UTC (rev 7442) +++ csw/mgar/pkg/libmikmod/trunk/Makefile 2009-11-25 20:50:27 UTC (rev 7443) @@ -1,22 +1,22 @@ GARNAME = libmikmod -GARVERSION = 3.1.11 +GARVERSION = 3.2.0 +RELEASE = beta2 +DISTVERSION = $(GARVERSION)-$(RELEASE) +DISTNAME = $(GARNAME)-$(DISTVERSION) CATEGORIES = lib - DESCRIPTION = library for MOD audio files and other types define BLURB - Long description + library supporting many formats, including mod, s3m, it, and xm. Originally a player for MS-DOS, endef MASTER_SITES = http://mikmod.raphnet.net/files/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION)-$(RELEASE).tar.gz # 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 = - +BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) +TEST_SCRIPTS = include gar/category.mk Modified: csw/mgar/pkg/libmikmod/trunk/checksums =================================================================== --- csw/mgar/pkg/libmikmod/trunk/checksums 2009-11-25 18:03:07 UTC (rev 7442) +++ csw/mgar/pkg/libmikmod/trunk/checksums 2009-11-25 20:50:27 UTC (rev 7443) @@ -1 +1 @@ -705106da305e8de191549f1e7393185c libmikmod-3.1.11.tar.gz +19fc0879aebd1610813a23bd84726362 libmikmod-3.2.0-beta2.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 Thu Nov 26 00:09:26 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 25 Nov 2009 23:09:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[7444] csw/mgar/pkg/nss/branches/upstream-work Message-ID: Revision: 7444 http://gar.svn.sourceforge.net/gar/?rev=7444&view=rev Author: wahwah Date: 2009-11-25 23:09:26 +0000 (Wed, 25 Nov 2009) Log Message: ----------- nss: Build update based on Wan-Teh Chang's review Modified Paths: -------------- csw/mgar/pkg/nss/branches/upstream-work/Makefile csw/mgar/pkg/nss/branches/upstream-work/files/nss.pc Modified: csw/mgar/pkg/nss/branches/upstream-work/Makefile =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/Makefile 2009-11-25 20:50:27 UTC (rev 7443) +++ csw/mgar/pkg/nss/branches/upstream-work/Makefile 2009-11-25 23:09:26 UTC (rev 7444) @@ -22,15 +22,19 @@ CATEGORIES = lib DESCRIPTION = Network Security Services library, implements PKI support define BLURB + Network Security Services (NSS) is a set of libraries designed to support + cross-platform development of security-enabled client and server + applications. Applications built with NSS can support SSL v2 and v3, TLS, + PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and + other security standards. endef SPKG_SOURCEURL = http://www.mozilla.org/projects/security/pki/nss/ # TODO: Generate RTM_NAME from GARVERSION RTM_NAME = NSS_3_12_4_RTM -MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/ -DIST_SUFFIX = -with-nspr-4.8 -DISTFILES = $(GARNAME)-$(GARVERSION)$(DIST_SUFFIX).tar.gz -DISTNAME = $(GARNAME)-$(GARVERSION)$(DIST_SUFFIX) -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)$(DIST_SUFFIX).tar.gz +MASTER_SITES = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTNAME = $(GARNAME)-$(GARVERSION) +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz REQUIRED_PKGS = CSWnspr CSWsqlite3 PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWsqlite3devel CONFIGURE_SCRIPTS = @@ -39,8 +43,7 @@ TEST_SCRIPTS = BUILD64 = 1 -libdir_install = $(prefix)/lib/nss -# libdir = $(prefix)/lib/nss +libdir_install = $(prefix)/lib includedir = $(prefix)/include/nss ifeq (OPT,$(GARFLAVOR)) @@ -52,20 +55,19 @@ NSPR_INCLUDE_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --cflags-only-I nspr | gsed 's/-I//') export NSPR_INCLUDE_DIR -# To consider in the future. -# NSS_ENABLE_ECC = 1 -# export NSS_ENABLE_ECC +NSS_ENABLE_ECC = 1 +export NSS_ENABLE_ECC # 64-bit suppport ifeq ($(MODULATION),isa-sparcv9) USE_64 = 1 + export USE_64 NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ')/64 - export USE_64 else ifeq ($(MODULATION),isa-amd64) USE_64 = 1 + export USE_64 NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ')/64 - export USE_64 else NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ') endif @@ -75,6 +77,16 @@ # For DBG builds PATCHFILES = whoami.patch +NSS_BINARIES = addbuiltin +NSS_BINARIES += certutil +NSS_BINARIES += cmsutil +NSS_BINARIES += crlutil +NSS_BINARIES += modutil +NSS_BINARIES += pk12util +NSS_BINARIES += signtool +NSS_BINARIES += signver +NSS_BINARIES += ssltap + include gar/category.mk build-nss: build-coreconf build-dbm build-nss-compile @@ -107,25 +119,23 @@ install-nss: ginstall -d -m 755 $(DESTDIR)$(libdir) for f in $(WORKSRC)/mozilla/dist/SunOS5*/lib/*.so; do \ - ginstall -m 755 $${f} $(DESTDIR)$(libdir); \ + ginstall -m 755 $${f} $(DESTDIR)$(libdir); \ + if [ -r $(WORKSRC)/mozilla/dist/SunOS5*/lib/`basename $${f} .so`.chk ]; then \ + ginstall -m 644 \ + $(WORKSRC)/mozilla/dist/SunOS5*/lib/`basename $${f} .so`.chk \ + $(DESTDIR)$(libdir); \ + fi \ done ginstall -d -m 755 $(DESTDIR)$(bindir) # TODO: nss-config # gcp -a $(WORKSRC)/mozilla/dist/*/bin/nss-config $(DESTDIR)$(bindir) ginstall -d -m 755 $(DESTDIR)$(includedir) for f in \ - $(WORKSRC)/mozilla/dist/private/nss/*.h \ $(WORKSRC)/mozilla/dist/public/nss/*.h; \ do \ ginstall -m 644 $${f} $(DESTDIR)$(includedir); \ done - cd $(DESTDIR)$(libdir) && for file in *.so; do \ - if [ ! -h $${file} ]; then \ - gmv -v $${file} $${file}.$(MINOR_VERSION); \ - gln -s $${file}.$(MINOR_VERSION) $${file}; \ - fi; \ - done - for file in $(WORKSRC)/mozilla/dist/*/bin/* ; do \ + for bin in in $(WORKSRC)/mozilla/dist/*/bin/* ; do \ ginstall -m 755 $${file} $(DESTDIR)$(bindir)/nss`basename $${file}`; \ done # Asserting that we have the right version in the .pc file @@ -140,13 +150,3 @@ $(FILEDIR)/nss.pc \ $(DESTDIR)$(prefix)/lib/pkgconfig @$(MAKECOOKIE) - -# Create symlinks allowing to use -L/opt/csw/lib/nss/64 for 64-bit -# architectures. -post-merge: - if [ "$(GARCH)" = sparc ]; then \ - gln -sf sparcv9 $(PKGROOT)$(libdir)/64; \ - elif [ "$(GARCH)" = i386 ]; then \ - gln -sf amd64 $(PKGROOT)$(libdir)/64; \ - fi - @$(MAKECOOKIE) Modified: csw/mgar/pkg/nss/branches/upstream-work/files/nss.pc =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/files/nss.pc 2009-11-25 20:50:27 UTC (rev 7443) +++ csw/mgar/pkg/nss/branches/upstream-work/files/nss.pc 2009-11-25 23:09:26 UTC (rev 7444) @@ -7,5 +7,5 @@ Description: Network Security Services Version: 3.12.4 Requires: nspr >= 4.8.0 -Libs: -L${libdir} -lssl3 -lsmime3 -lnssutil3 -lnss3 -R${libdir} +Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lnssutil3 -R${libdir} Cflags: -I${includedir} 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 Nov 26 01:37:10 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 26 Nov 2009 00:37:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7445] csw/mgar/pkg/nspr/trunk/Makefile Message-ID: Revision: 7445 http://gar.svn.sourceforge.net/gar/?rev=7445&view=rev Author: wahwah Date: 2009-11-26 00:37:10 +0000 (Thu, 26 Nov 2009) Log Message: ----------- nspr: Tried tests, they fail. Modified Paths: -------------- csw/mgar/pkg/nspr/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/nspr/trunk/Makefile Modified: csw/mgar/pkg/nspr/trunk/Makefile =================================================================== --- csw/mgar/pkg/nspr/trunk/Makefile 2009-11-25 23:09:26 UTC (rev 7444) +++ csw/mgar/pkg/nspr/trunk/Makefile 2009-11-26 00:37:10 UTC (rev 7445) @@ -1,3 +1,11 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# Based on the following resources: +# - http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nspr/nspr-4.8.ebuild?view=markup +# - https://developer.mozilla.org/En/NSPR_build_instructions + GARNAME = nspr MAJOR_VERSION = 4 MIN_VERSION = 8 @@ -34,6 +42,8 @@ CONFIGURE_SCRIPTS = nspr BUILD_SCRIPTS = nspr +# TEST_SCRIPTS = nspr +# Some tests are failing TEST_SCRIPTS = INSTALL_SCRIPTS = nspr @@ -46,12 +56,10 @@ includedir = $(prefix)/include/nspr CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --enable-ipv6 CONFIGURE_ARGS_isa-sparcv9 = --enable-64bit CONFIGURE_ARGS_isa-amd64 = --enable-64bit CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION)) -# http://docs.sun.com/app/docs/doc/819-5265/bjaur?a=view -CONFIGURE_ARGS_OPT = --enable-optimize="-xO3 -xlibmil" +CONFIGURE_ARGS_OPT = --enable-optimize="-xO3" CONFIGURE_ARGS_OPT += --disable-debug CONFIGURE_ARGS_OPT += --enable-strip CONFIGURE_ARGS_DBG = --enable-debug @@ -72,15 +80,21 @@ build-nspr: (cd $(WORKSRC)/build && $(BUILD_ENV) gmake) + (cd $(WORKSRC)/build/pr/tests && $(BUILD_ENV) gmake) @$(MAKECOOKIE) +test-nspr: test-accept test-runtests + +test-accept: + (cd $(WORKSRC)/build/pr/tests && DYLD_LIBRARY_PATH=../../dist/lib ./accept) + @$(MAKECOOKIE) + +test-runtests: + (cd $(WORKSRC)/build/pr/tests && DYLD_LIBRARY_PATH=../../dist/lib ../../../mozilla/nsprpub/pr/tests/runtests.sh) + @$(MAKECOOKIE) + install-nspr: (cd $(WORKSRC)/build && $(INSTALL_ENV) gmake install DESTDIR=$(DESTDIR)) - (cd $(DESTDIR)$(libdir) \ - && for file in *.so; do \ - mv $${file} $${file}.$(MIN_VERSION); \ - ln -s $${file}.$(MIN_VERSION) $${file}; \ - done) ginstall -m 755 -d $(DESTDIR)$(bindir) ginstall -m 755 $(WORKSRC)/build/config/nspr-config \ $(DESTDIR)$(bindir) Property changes on: csw/mgar/pkg/nspr/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Nov 26 03:59:28 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 26 Nov 2009 02:59:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[7446] csw/mgar/pkg Message-ID: Revision: 7446 http://gar.svn.sourceforge.net/gar/?rev=7446&view=rev Author: bdwalton Date: 2009-11-26 02:59:25 +0000 (Thu, 26 Nov 2009) Log Message: ----------- logwatch: port to GAR; _huge_ version bump Added Paths: ----------- csw/mgar/pkg/logwatch/ csw/mgar/pkg/logwatch/branches/ csw/mgar/pkg/logwatch/tags/ csw/mgar/pkg/logwatch/trunk/ csw/mgar/pkg/logwatch/trunk/Makefile csw/mgar/pkg/logwatch/trunk/checksums csw/mgar/pkg/logwatch/trunk/files/ csw/mgar/pkg/logwatch/trunk/files/logwatch.wrapper Property changes on: csw/mgar/pkg/logwatch/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/logwatch/trunk/Makefile =================================================================== --- csw/mgar/pkg/logwatch/trunk/Makefile (rev 0) +++ csw/mgar/pkg/logwatch/trunk/Makefile 2009-11-26 02:59:25 UTC (rev 7446) @@ -0,0 +1,103 @@ +GARNAME = logwatch +GARVERSION = 7.3.6 +CATEGORIES = utils + +ARCHALL = 1 +REQUIRED_PKGS = CSWperl CSWgnulinks CSWgfile CSWggrep CSWfortune CSWgawk + +LICENSE = License + +DESCRIPTION = Logwatch is a customizable log analysis system +define BLURB +Logwatch is a customizable log analysis system. Logwatch parses through your system's logs for a given period of time and creates a report analyzing areas that you specify, in as much detail as you require. Logwatch is easy to use and will work right out of the package on most systems. +endef + +MASTER_SITES = ftp://ftp.kaybee.org/pub/linux/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream +# software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# 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_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +INSTALL = /opt/csw/bin/ginstall +INSTALLDIR = $(INSTALL) -m 0755 -d +INSTALLEXE = $(INSTALL) -m 0755 +INSTALLDATA = $(INSTALL) -m 0644 + +BINDIR = $(bindir) +SHAREDIR = $(datadir)/$(GARNAME) +MANDIR = $(datadir)/man +DOCDIR = $(datadir)/doc/$(GARNAME) +CONFDIR = /etc/opt/csw/$(GARNAME) +TMPDIR = /var/opt/csw/$(GARNAME) + +post-extract-modulated: + cp $(FILEDIR)/logwatch.wrapper $(WORKSRC)/ + +install-custom: + (cd $(WORKSRC); \ + $(INSTALLDIR) $(DESTDIR)$(TMPDIR); \ + $(INSTALLDIR) $(DESTDIR)$(BINDIR); \ + $(INSTALLDIR) $(DESTDIR)$(CONFDIR); \ + $(INSTALLDIR) $(DESTDIR)$(CONFDIR)/conf; \ + $(INSTALLDIR) $(DESTDIR)$(CONFDIR)/scripts; \ + $(INSTALLDIR) $(DESTDIR)$(CONFDIR)/scripts/services; \ + $(INSTALLDIR) $(DESTDIR)$(CONFDIR)/scripts/conf; \ + $(INSTALLDIR) $(DESTDIR)$(CONFDIR)/scripts/conf/logfiles; \ + $(INSTALLDIR) $(DESTDIR)$(CONFDIR)/scripts/conf/services; \ + $(INSTALLDIR) $(DESTDIR)$(CONFDIR)/scripts/conf/html; \ + $(INSTALLDIR) $(DESTDIR)$(DOCDIR); \ + $(INSTALLDIR) $(DESTDIR)$(SHAREDIR); \ + $(INSTALLDIR) $(DESTDIR)$(SHAREDIR)/dist.conf; \ + $(INSTALLDIR) $(DESTDIR)$(SHAREDIR)/dist.conf/logfiles; \ + $(INSTALLDIR) $(DESTDIR)$(SHAREDIR)/dist.conf/services; \ + $(INSTALLDIR) $(DESTDIR)$(SHAREDIR)/default.conf; \ + $(INSTALLDIR) $(DESTDIR)$(SHAREDIR)/default.conf/logfiles; \ + $(INSTALLDIR) $(DESTDIR)$(SHAREDIR)/default.conf/services; \ + $(INSTALLDIR) $(DESTDIR)$(SHAREDIR)/default.conf/html; \ + $(INSTALLDIR) $(DESTDIR)$(SHAREDIR)/scripts; \ + $(INSTALLDIR) $(DESTDIR)$(SHAREDIR)/scripts/logfiles; \ + $(INSTALLDIR) $(DESTDIR)$(SHAREDIR)/scripts/services; \ + $(INSTALLDIR) $(DESTDIR)$(SHAREDIR)/scripts/shared; \ + $(INSTALLDIR) $(DESTDIR)$(SHAREDIR)/lib; \ + $(INSTALLDATA) README $(DESTDIR)$(DOCDIR)/README; \ + $(INSTALLDATA) HOWTO-Customize-LogWatch $(DESTDIR)$(DOCDIR)/HOWTO-Customize-LogWatch; \ + $(INSTALLDATA) conf/*.conf $(DESTDIR)$(SHAREDIR)/default.conf; \ + $(INSTALLDATA) conf/logfiles/* $(DESTDIR)$(SHAREDIR)/default.conf/logfiles/; \ + $(INSTALLDATA) conf/services/* $(DESTDIR)$(SHAREDIR)/default.conf/services/; \ + $(INSTALLDATA) conf/html/* $(DESTDIR)$(SHAREDIR)/default.conf/html/; \ + $(INSTALLEXE) scripts/logwatch.pl $(DESTDIR)$(BINDIR); \ + for i in scripts/logfiles/*; do \ + if [ `ls $$i | grep -v CVS | wc -l` -ne 0 ]; then \ + $(INSTALLDIR) $(DESTDIR)$(SHAREDIR)/$$i; \ + $(INSTALLDATA) $$i/* $(DESTDIR)$(SHAREDIR)/$$i; \ + fi; \ + done; \ + $(INSTALLDATA) scripts/shared/* $(DESTDIR)$(SHAREDIR)/scripts/shared; \ + $(INSTALLDATA) scripts/services/* $(DESTDIR)$(SHAREDIR)/scripts/services; \ + $(INSTALLDATA) lib/* $(DESTDIR)$(SHAREDIR)/lib; \ + touch $(DESTDIR)$(CONFDIR)/conf/logwatch.conf; \ + touch $(DESTDIR)$(CONFDIR)/conf/ignore.conf; \ + touch $(DESTDIR)$(CONFDIR)/conf/override.conf; \ + perl -pi -e "s%/usr/share%/opt/csw/share%" $(DESTDIR)$(BINDIR)/logwatch.pl; \ + perl -pi -e "s%/usr/bin/perl%/opt/csw/bin/perl%" $(DESTDIR)$(BINDIR)/logwatch.pl; \ + perl -pi -e "s%/etc/logwatch%/etc/opt/csw/logwatch%" $(DESTDIR)$(BINDIR)/logwatch.pl; \ + $(INSTALLDIR) $(DESTDIR)$(TMPDIR); \ + echo "TmpDir = $(TMPDIR)" >> $(DESTDIR)$(CONFDIR)/conf/logwatch.conf; \ + $(INSTALLDIR) $(DESTDIR)$(MANDIR)/man8; \ + $(INSTALLDATA) logwatch.8 $(DESTDIR)$(MANDIR)/man8; \ + $(INSTALLEXE) logwatch.wrapper $(DESTDIR)$(BINDIR)/logwatch ) + @$(MAKECOOKIE) \ No newline at end of file Added: csw/mgar/pkg/logwatch/trunk/checksums =================================================================== --- csw/mgar/pkg/logwatch/trunk/checksums (rev 0) +++ csw/mgar/pkg/logwatch/trunk/checksums 2009-11-26 02:59:25 UTC (rev 7446) @@ -0,0 +1 @@ +937d982006b2a76a83edfcfd2e5a9d7d logwatch-7.3.6.tar.gz Added: csw/mgar/pkg/logwatch/trunk/files/logwatch.wrapper =================================================================== --- csw/mgar/pkg/logwatch/trunk/files/logwatch.wrapper (rev 0) +++ csw/mgar/pkg/logwatch/trunk/files/logwatch.wrapper 2009-11-26 02:59:25 UTC (rev 7446) @@ -0,0 +1,6 @@ +#!/bin/sh + +PATH=/opt/csw/gnu:/opt/csw/bin:$PATH +export PATH + +exec /opt/csw/bin/logwatch.pl $* 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 Nov 26 04:15:32 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 26 Nov 2009 03:15:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7447] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7447 http://gar.svn.sourceforge.net/gar/?rev=7447&view=rev Author: bdwalton Date: 2009-11-26 03:15:29 +0000 (Thu, 26 Nov 2009) Log Message: ----------- mgar: add support for CRONTABS variable to set cswcrontab in prototype Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-11-26 02:59:25 UTC (rev 7446) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-11-26 03:15:29 UTC (rev 7447) @@ -185,10 +185,12 @@ SPKG_CLASSES := $(call _spkg_cond_add,PRESERVECONF,cswpreserveconf) SPKG_CLASSES := $(call _spkg_cond_add,ETCSERVICES,cswetcservices) SPKG_CLASSES := $(call _spkg_cond_add,USERGROUP,cswusergroup) +SPKG_CLASSES := $(call _spkg_cond_add,CRONTABS,cswcrontab) SPKG_CLASSES := $(call _spkg_cond_add,PYCOMPILE,cswpycompile) SPKG_CLASSES := $(call _spkg_cond_add,INETDCONF,cswinetd) SPKG_CLASSES := $(call _spkg_cond_add,INITSMF,cswinitsmf) + # This is the default path for texinfo pages to be picked up. Extend or replace as necessary. TEXINFO ?= $(infodir)/.*\.info(?:-\d+)? $(EXTRA_TEXINFO) @@ -201,6 +203,7 @@ $(foreach FILE,$(INETDCONF),$$F[1] = "cswinetd" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(INITSMF),$$F[1] = "cswinitsmf" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(USERGROUP),$$F[1] = "cswusergroup" if( $$F[2] =~ m(^$(FILE)$$) );)\ + $(foreach FILE,$(CRONTABS),$$F[1] = "cswcrontab" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(if $(PYCOMPILE),$(foreach FILE,$(_PYCOMPILE_FILES),$$F[1] = "cswpycompile" if( $$F[2] =~ m(^$(FILE)$$) );))\ $(foreach FILE,$(TEXINFO),$$F[1] = "cswtexinfo" if( $$F[2] =~ m(^$(FILE)$$) );)\ print join(" ", at F),"\n";' 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 Nov 26 04:18:44 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 26 Nov 2009 03:18:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7448] csw/mgar/pkg/logwatch/trunk/Makefile Message-ID: Revision: 7448 http://gar.svn.sourceforge.net/gar/?rev=7448&view=rev Author: bdwalton Date: 2009-11-26 03:18:44 +0000 (Thu, 26 Nov 2009) Log Message: ----------- logwatch: add cron support Modified Paths: -------------- csw/mgar/pkg/logwatch/trunk/Makefile Modified: csw/mgar/pkg/logwatch/trunk/Makefile =================================================================== --- csw/mgar/pkg/logwatch/trunk/Makefile 2009-11-26 03:15:29 UTC (rev 7447) +++ csw/mgar/pkg/logwatch/trunk/Makefile 2009-11-26 03:18:44 UTC (rev 7448) @@ -32,6 +32,10 @@ include gar/category.mk +sysconfdir = /etc/opt/csw +CRONDIR = $(sysconfdir)/CSW$(GARNAME)/crontabs +CRONTABS = $(CRONDIR)/root + INSTALL = /opt/csw/bin/ginstall INSTALLDIR = $(INSTALL) -m 0755 -d INSTALLEXE = $(INSTALL) -m 0755 @@ -41,7 +45,7 @@ SHAREDIR = $(datadir)/$(GARNAME) MANDIR = $(datadir)/man DOCDIR = $(datadir)/doc/$(GARNAME) -CONFDIR = /etc/opt/csw/$(GARNAME) +CONFDIR = $(sysconfdir)/$(GARNAME) TMPDIR = /var/opt/csw/$(GARNAME) post-extract-modulated: @@ -99,5 +103,7 @@ echo "TmpDir = $(TMPDIR)" >> $(DESTDIR)$(CONFDIR)/conf/logwatch.conf; \ $(INSTALLDIR) $(DESTDIR)$(MANDIR)/man8; \ $(INSTALLDATA) logwatch.8 $(DESTDIR)$(MANDIR)/man8; \ - $(INSTALLEXE) logwatch.wrapper $(DESTDIR)$(BINDIR)/logwatch ) + $(INSTALLEXE) logwatch.wrapper $(DESTDIR)$(BINDIR)/logwatch; \ + $(INSTALLDIR) $(DESTDIR)$(CRONDIR); \ + echo "02 4 * * * /opt/csw/sbin/logwatch" > $(DESTDIR)$(CRONTABS) ) @$(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 dmichelsen at users.sourceforge.net Thu Nov 26 10:20:21 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 26 Nov 2009 09:20:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[7449] csw/mgar/pkg Message-ID: Revision: 7449 http://gar.svn.sourceforge.net/gar/?rev=7449&view=rev Author: dmichelsen Date: 2009-11-26 09:20:20 +0000 (Thu, 26 Nov 2009) Log Message: ----------- mtools: Initial commit Added Paths: ----------- csw/mgar/pkg/mtools/ csw/mgar/pkg/mtools/branches/ csw/mgar/pkg/mtools/tags/ csw/mgar/pkg/mtools/trunk/ csw/mgar/pkg/mtools/trunk/Makefile csw/mgar/pkg/mtools/trunk/checksums csw/mgar/pkg/mtools/trunk/files/ csw/mgar/pkg/mtools/trunk/files/0001-Removeprototypes-unknown-to-Sun-Studio.patch Property changes on: csw/mgar/pkg/mtools/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/mtools/trunk/Makefile =================================================================== --- csw/mgar/pkg/mtools/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mtools/trunk/Makefile 2009-11-26 09:20:20 UTC (rev 7449) @@ -0,0 +1,29 @@ +GARNAME = mtools +GARVERSION = 4.0.12 +CATEGORIES = utils + +DESCRIPTION = read/write/list/format DOS disks under Unix +define BLURB + Mtools is a collection of utilities to access MS-DOS disks from GNU + and Unix without mounting them. It supports long file names, OS/2 Xdf + disks, ZIP/JAZ disks and 2m disks (store up to 1992k on a high density + 3 1/2 disk). +endef + +MASTER_SITES = http://ftp.gnu.org/gnu/mtools/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +PATCHFILES = 0001-Removeprototypes-unknown-to-Sun-Studio.patch + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +# X11 is also used, but Openwin X11 is sufficient. +REQUIRED_PKGS = CSWiconv + +EXTRA_LINKER_FLAGS = -liconv + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/mtools/trunk/checksums =================================================================== --- csw/mgar/pkg/mtools/trunk/checksums (rev 0) +++ csw/mgar/pkg/mtools/trunk/checksums 2009-11-26 09:20:20 UTC (rev 7449) @@ -0,0 +1,2 @@ +b3625d680ccc02b0a941e98c5bd36118 0001-Removeprototypes-unknown-to-Sun-Studio.patch +0ee77a14e5f113ad8136a867f8ed4c3a mtools-4.0.12.tar.bz2 Added: csw/mgar/pkg/mtools/trunk/files/0001-Removeprototypes-unknown-to-Sun-Studio.patch =================================================================== --- csw/mgar/pkg/mtools/trunk/files/0001-Removeprototypes-unknown-to-Sun-Studio.patch (rev 0) +++ csw/mgar/pkg/mtools/trunk/files/0001-Removeprototypes-unknown-to-Sun-Studio.patch 2009-11-26 09:20:20 UTC (rev 7449) @@ -0,0 +1,25 @@ +From acaf71a39ce5155d336b0fcdfea3a475952bcfdf Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 26 Nov 2009 10:10:13 +0100 +Subject: [PATCH] Removeprototypes unknown to Sun Studio + +--- + mtools.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/mtools.h b/mtools.h +index 0d4fa6f..94ffc63 100644 +--- a/mtools.h ++++ b/mtools.h +@@ -251,7 +251,7 @@ char getDrive(Stream_t *Stream); + + + void printOom(void); +-int ask_confirmation(const char *, ...) __attribute__ ((format (printf, 1, 2))); ++int ask_confirmation(const char *, ...); + + int helpFlag(int, char **); + +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Nov 26 10:42:20 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 26 Nov 2009 09:42:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[7450] csw/mgar/pkg/openldap/trunk Message-ID: Revision: 7450 http://gar.svn.sourceforge.net/gar/?rev=7450&view=rev Author: dmichelsen Date: 2009-11-26 09:42:20 +0000 (Thu, 26 Nov 2009) Log Message: ----------- openldap: Update merging Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/Makefile csw/mgar/pkg/openldap/trunk/checksums Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2009-11-26 09:20:20 UTC (rev 7449) +++ csw/mgar/pkg/openldap/trunk/Makefile 2009-11-26 09:42:20 UTC (rev 7450) @@ -1,8 +1,8 @@ GARNAME = openldap -GARVERSION = 2.4.18 +GARVERSION = 2.4.19 CATEGORIES = server EXTRA_MODULATORS = GARVERSION -MODULATIONS_GARVERSION = 2.3.43 2.4.18 +MODULATIONS_GARVERSION = 2.3.43 2.4.19 DESCRIPTION = Open source implementation of the Lightweight Directory Access Protocol define BLURB @@ -13,8 +13,6 @@ OpenLDAP Suite and its related documentation. endef -# Missing lib: ld.so.1: svn: fatal: libldap-2.3.so.0: open failed: No such file or directory - MASTER_SITES = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(GARNAME)-$(VERSION).tgz) DISTFILES = $(SOURCEFILES) @@ -22,13 +20,13 @@ DISTFILES += README.CSW openldaprc DISTFILES += cswopenldap openldap.xml svc-openldap -PATCHFILES_isa-sparcv8-garversion-2.4.18 = patch-oldap-2.4.16-ntlm.diff -PATCHFILES_isa-sparcv9-garversion-2.4.18 = patch-oldap-2.4.16-ntlm.diff -PATCHFILES_isa-i386-garversion-2.4.18 = patch-oldap-2.4.16-ntlm.diff -PATCHFILES_isa-amd64-garversion-2.4.18 = patch-oldap-2.4.16-ntlm.diff +PATCHFILES_isa-sparcv8-garversion-2.4.19 = patch-oldap-2.4.16-ntlm.diff +PATCHFILES_isa-sparcv9-garversion-2.4.19 = patch-oldap-2.4.16-ntlm.diff +PATCHFILES_isa-i386-garversion-2.4.19 = patch-oldap-2.4.16-ntlm.diff +PATCHFILES_isa-amd64-garversion-2.4.19 = patch-oldap-2.4.16-ntlm.diff +PATCHFILES += patch-libtool-64bit.diff DISTFILES += patch-oldap-2.4.16-ntlm.diff - NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tgz,$(SOURCEFILES)) LICENSE = COPYRIGHT @@ -45,7 +43,7 @@ SPKG_DESC_CSWoldapdevel = OpenLDAP development support SPKG_DESC_CSWoldaprt = OpenLDAP runtime libraries -REQUIRED_PKGS_CSWoldap = CSWbdb CSWiconv CSWlibnet CSWlibtoolrt CSWoldaprt +REQUIRED_PKGS_CSWoldap = CSWbdb47 CSWiconv CSWlibnet CSWlibtoolrt CSWoldaprt REQUIRED_PKGS_CSWoldap += CSWosslrt CSWsasl CSWtcpwrap CSWunixodbc CSWcswclassutils REQUIRED_PKGS_CSWoldap += CSWkrb5lib CSWlibicu CSWperl REQUIRED_PKGS_CSWoldapclient = CSWlibnet CSWoldaprt CSWosslrt CSWsasl CSWkrb5lib @@ -59,11 +57,20 @@ EXTRA_DOCS = README.CSW $(PATCHFILES) -# OpenLDAP 2.3 was bound to bdb44 -#EXTRA_LIB = $(prefix)/bdb44/lib -#EXTRA_INC = $(prefix)/bdb44/include +EXTRA_LIB_garversion-2.3.43 = $(prefix)/bdb44/lib +EXTRA_INC_garversion-2.3.43 = $(prefix)/bdb44/include +EXTRA_LIB_garversion-2.4.19 = $(prefix)/bdb47/lib +EXTRA_INC_garversion-2.4.19 = $(prefix)/bdb47/include +EXTRA_LIB = $(EXTRA_LIB_garversion-$(GARVERSION)) +EXTRA_INC = $(EXTRA_INC_garversion-$(GARVERSION)) +sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw + +MIGRATECONF = openldap + BUILD64 = 1 +NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-crypt CONFIGURE_ARGS += --enable-lmpasswd @@ -85,8 +92,17 @@ # Disable MySQL Cluster CONFIGURE_ARGS += --disable-ndb -TEST_SCRIPTS = +TEST_TARGET = check +MERGE_SCRIPTS_isa-default-garversion-2.3.43 = copy-only +MERGE_DIRS_isa-default-garversion-2.3.43 = $(libdir) +MERGE_SCRIPTS_isa-default64-garversion-2.3.43 = copy-relocated-only +MERGE_DIRS_isa-default64-garversion-2.3.43 = $(libdir) + +MERGE_SCRIPTS_isa-default-garversion-2.4.19 = copy-all +MERGE_SCRIPTS_isa-default64-garversion-2.4.19 = copy-relocated-only +MERGE_DIRS_isa-default64-garversion-2.4.19 = $(bindir) $(sbindir) $(libexecdir) $(libdir) + PKGFILES_CSWoldapclient = $(bindir)/.* PKGFILES_CSWoldapclient += $(mandir)/man1/.* @@ -98,7 +114,6 @@ PKGFILES_CSWoldaprt += $(mandir)/man5/ldap.conf.5 INITSMF = /etc/opt/csw/init.d/cswopenldap -#PROTOTYPE_FILTER = awk '$$$$3 ~/\/init.d\/cswopenldap$$$$/ { $$$$2 = "cswinitsmf" } { print }' include gar/category.mk @@ -109,4 +124,4 @@ ginstall -D $(DOWNLOADDIR)/cswopenldap \ $(PKGROOT)/etc/opt/csw/init.d/cswopenldap $(foreach F,$(EXTRA_DOCS),ginstall -D $(DOWNLOADDIR)/$F $(PKGROOT)$(docdir)/$(GARNAME)/$F;) - #@$(MAKECOOKIE) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/openldap/trunk/checksums =================================================================== --- csw/mgar/pkg/openldap/trunk/checksums 2009-11-26 09:20:20 UTC (rev 7449) +++ csw/mgar/pkg/openldap/trunk/checksums 2009-11-26 09:42:20 UTC (rev 7450) @@ -1,9 +1,10 @@ -2f6e6a8c9c3497f1c0c9d52ea2d1dafa download/CSWoldap.gspec -892dba5f625755be024c30ea0055fd55 download/README.CSW -c50f5c4040139b6cf57fcc08abffbee7 download/cswopenldap -1b25281086eb146b8e11ebd33de086dc download/openldap-2.3.43.tgz -fecd7a64b6d9a0eb79b817d2562956ed download/openldap-2.4.18.tgz -0e57547ad2b5fedca9f0bd4beaddfe39 download/openldap.xml -ab2ac7519b092ce8d16124c5270bfec0 download/openldaprc -d3dee9018137c39f357859b652e3a67c download/patch-oldap-2.4.16-ntlm.diff -e15c2020566e56f02118e75c89111f15 download/svc-openldap +2f6e6a8c9c3497f1c0c9d52ea2d1dafa CSWoldap.gspec +892dba5f625755be024c30ea0055fd55 README.CSW +c50f5c4040139b6cf57fcc08abffbee7 cswopenldap +1b25281086eb146b8e11ebd33de086dc openldap-2.3.43.tgz +4a6dab2711fcf141f19bb680bc335887 openldap-2.4.19.tgz +0e57547ad2b5fedca9f0bd4beaddfe39 openldap.xml +ab2ac7519b092ce8d16124c5270bfec0 openldaprc +93dc2a04fd943c198ad00edd4d88ce65 patch-libtool-64bit.diff +d3dee9018137c39f357859b652e3a67c patch-oldap-2.4.16-ntlm.diff +e15c2020566e56f02118e75c89111f15 svc-openldap 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 Nov 26 11:21:27 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 26 Nov 2009 10:21:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7451] csw/mgar/pkg/libstatgrab/trunk/Makefile Message-ID: Revision: 7451 http://gar.svn.sourceforge.net/gar/?rev=7451&view=rev Author: dmichelsen Date: 2009-11-26 10:21:26 +0000 (Thu, 26 Nov 2009) Log Message: ----------- libstatgrab: Use Solaris curses Modified Paths: -------------- csw/mgar/pkg/libstatgrab/trunk/Makefile Modified: csw/mgar/pkg/libstatgrab/trunk/Makefile =================================================================== --- csw/mgar/pkg/libstatgrab/trunk/Makefile 2009-11-26 09:42:20 UTC (rev 7450) +++ csw/mgar/pkg/libstatgrab/trunk/Makefile 2009-11-26 10:21:26 UTC (rev 7451) @@ -2,9 +2,13 @@ GARVERSION = 0.16 CATEGORIES = lib -DESCRIPTION = Brief description +DESCRIPTION = A library that provides cross platform access to statistics define BLURB - Long description + libstatgrab is a library that provides cross platform access to statistics + about the system on which it's run. It's written in C and presents a selection + of useful interfaces which can be used to access key system statistics. The + current list of statistics includes CPU usage, memory utilisation, disk usage, + process counts, network traffic, disk I/O, and more. endef MASTER_SITES = ftp://ftp.uk.i-scream.org/pub/i-scream/libstatsgrab/ @@ -14,10 +18,12 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS = CSWncurses +# Don't pull in ncurses from CSW +LINKER_FLAGS = BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-curses-prefix=/usr TEST_TARGET = check 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 Nov 26 11:42:26 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 26 Nov 2009 10:42:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[7452] csw/mgar/pkg/ffmpeg/trunk Message-ID: Revision: 7452 http://gar.svn.sourceforge.net/gar/?rev=7452&view=rev Author: wahwah Date: 2009-11-26 10:42:26 +0000 (Thu, 26 Nov 2009) Log Message: ----------- ffmpeg: better CONFIGURE_ARGS Modified Paths: -------------- csw/mgar/pkg/ffmpeg/trunk/Makefile csw/mgar/pkg/ffmpeg/trunk/checksums Added Paths: ----------- csw/mgar/pkg/ffmpeg/trunk/files/gnu-grep.patch Property Changed: ---------------- csw/mgar/pkg/ffmpeg/trunk/Makefile Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile 2009-11-26 10:21:26 UTC (rev 7451) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2009-11-26 10:42:26 UTC (rev 7452) @@ -1,3 +1,7 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + GARNAME = ffmpeg GARVERSION = 0.5 CATEGORIES = lib @@ -11,17 +15,17 @@ MASTER_SITES = http://ffmpeg.org/releases/ DISTFILES = $(DISTNAME).tar.bz2 -# We define upstream file regex so we can be notifed of new upstream software release +PATCHFILES = gnu-grep.patch + UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 BUILD64 = 1 NO_ISAEXEC = 1 -CONFIGURE_ARGS = --prefix=$(prefix) -CONFIGURE_ARGS += --bindir=$(bindir) -CONFIGURE_ARGS += --datadir=$(datadir) -CONFIGURE_ARGS += --libdir=$(libdir) -CONFIGURE_ARGS += --shlibdir=$(libdir) -CONFIGURE_ARGS += --incdir=$(includedir) -CONFIGURE_ARGS += --mandir=$(mandir) +FFMPEG_CONFIGURE_ARGS_1 = $(filter-out --exec_%,$(DIRPATHS)) +FFMPEG_CONFIGURE_ARGS_2 = $(filter-out --sbindir%,$(FFMPEG_CONFIGURE_ARGS_1)) +CONFIGURE_ARGS = $(FFMPEG_CONFIGURE_ARGS) + +GARCOMPILER = GNU + include gar/category.mk Property changes on: csw/mgar/pkg/ffmpeg/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/ffmpeg/trunk/checksums =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/checksums 2009-11-26 10:21:26 UTC (rev 7451) +++ csw/mgar/pkg/ffmpeg/trunk/checksums 2009-11-26 10:42:26 UTC (rev 7452) @@ -1 +1,2 @@ be8503f15c3b81ba00eb8379ca8dcf33 ffmpeg-0.5.tar.bz2 +aa4573b73656b4105abb209eab474680 gnu-grep.patch Added: csw/mgar/pkg/ffmpeg/trunk/files/gnu-grep.patch =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/files/gnu-grep.patch (rev 0) +++ csw/mgar/pkg/ffmpeg/trunk/files/gnu-grep.patch 2009-11-26 10:42:26 UTC (rev 7452) @@ -0,0 +1,74 @@ +--- ffmpeg-0.5/configure.orig 2009-11-25 00:00:57.441086148 +0100 ++++ ffmpeg-0.5/configure 2009-11-25 00:01:18.358790303 +0100 +@@ -1217,7 +1217,7 @@ + disable source_path_used + else + source_path="`cd \"$source_path\"; pwd`" +- echo "$source_path" | grep -q '[[:blank:]]' && ++ echo "$source_path" | ggrep -q '[[:blank:]]' && + die "Out of tree builds are impossible with whitespace in source path." + fi + +@@ -1363,13 +1363,13 @@ + fi + rm $TMPSH + +-if $cc --version 2>/dev/null | grep -qi gcc; then ++if $cc --version 2>/dev/null | ggrep -qi gcc; then + cc_type=gcc +-elif $cc --version 2>/dev/null | grep -q Intel; then ++elif $cc --version 2>/dev/null | ggrep -q Intel; then + cc_type=icc +-elif $cc -v 2>&1 | grep -q xlc; then ++elif $cc -v 2>&1 | ggrep -q xlc; then + cc_type=xlc +-elif $cc -V 2>/dev/null | grep -q Compaq; then ++elif $cc -V 2>/dev/null | ggrep -q Compaq; then + cc_type=ccc + DEPEND_CMD='$(CC) $(CFLAGS) -M $< | sed -e "/^\#.*/d" -e "s,^[[:space:]]*$(*F)\\.o,$(@D)/$(*F).o,"' + add_ldflags -Wl,-z,now # calls to libots crash without this +@@ -1488,7 +1488,7 @@ + # helps building libavcodec + add_cflags -DPIC -fomit-frame-pointer + # 3 gcc releases known for BeOS, each with ugly bugs +- gcc_version="`$cc -v 2>&1 | grep version | cut -d ' ' -f3-`" ++ gcc_version="`$cc -v 2>&1 | ggrep version | cut -d ' ' -f3-`" + case "$gcc_version" in + 2.9-beos-991026*|2.9-beos-000224*) echo "R5/GG gcc" + disable mmx +@@ -1503,7 +1503,7 @@ + # no need for libm, but the inet stuff + # Check for BONE + # XXX: actually should check for NOT net_server +- if echo $BEINCLUDES | grep -q 'headers/be/bone'; then ++ if echo $BEINCLUDES | ggrep -q 'headers/be/bone'; then + network_extralibs="-lbind -lsocket" + else + enable beos_netserver +@@ -1798,7 +1798,7 @@ + check_cc <> config.mak This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Thu Nov 26 13:02:04 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 26 Nov 2009 12:02:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[7453] csw/mgar/pkg/zlib/trunk/Makefile Message-ID: Revision: 7453 http://gar.svn.sourceforge.net/gar/?rev=7453&view=rev Author: hson Date: 2009-11-26 12:02:04 +0000 (Thu, 26 Nov 2009) Log Message: ----------- zlib: Add optmized libraries to packages Modified Paths: -------------- csw/mgar/pkg/zlib/trunk/Makefile Modified: csw/mgar/pkg/zlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/zlib/trunk/Makefile 2009-11-26 10:42:26 UTC (rev 7452) +++ csw/mgar/pkg/zlib/trunk/Makefile 2009-11-26 12:02:04 UTC (rev 7453) @@ -31,6 +31,7 @@ BUILD64 = 1 #NO_ISAEXEC = 1 +EXTRA_BUILD_ISAS = sparcv8plus sparcv8plus+vis pentium_pro+mmx pentium CONFIGURE_ARGS = --prefix=$(prefix) --exec_prefix=$(exec_prefix) CONFIGURE_ARGS += --libdir=$(libdir) --includedir=$(includedir) --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 Thu Nov 26 13:03:55 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 26 Nov 2009 12:03:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[7454] csw/mgar/pkg/fortune Message-ID: Revision: 7454 http://gar.svn.sourceforge.net/gar/?rev=7454&view=rev Author: dmichelsen Date: 2009-11-26 12:03:55 +0000 (Thu, 26 Nov 2009) Log Message: ----------- fortune: Move legacy to tags/ Added Paths: ----------- csw/mgar/pkg/fortune/branches/ csw/mgar/pkg/fortune/tags/ csw/mgar/pkg/fortune/tags/legacy/ Removed Paths: ------------- csw/mgar/pkg/fortune/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 Thu Nov 26 13:26:31 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 26 Nov 2009 12:26:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7455] csw/mgar/pkg Message-ID: Revision: 7455 http://gar.svn.sourceforge.net/gar/?rev=7455&view=rev Author: dmichelsen Date: 2009-11-26 12:26:31 +0000 (Thu, 26 Nov 2009) Log Message: ----------- fortune4all: Commit for now, not good, not finished Added Paths: ----------- csw/mgar/pkg/fortune4all/ csw/mgar/pkg/fortune4all/branches/ csw/mgar/pkg/fortune4all/tags/ csw/mgar/pkg/fortune4all/trunk/ csw/mgar/pkg/fortune4all/trunk/Makefile csw/mgar/pkg/fortune4all/trunk/checksums csw/mgar/pkg/fortune4all/trunk/files/ csw/mgar/pkg/fortune4all/trunk/files/0001-Fix-for-Sun-CC.patch Property changes on: csw/mgar/pkg/fortune4all/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/fortune4all/trunk/Makefile =================================================================== --- csw/mgar/pkg/fortune4all/trunk/Makefile (rev 0) +++ csw/mgar/pkg/fortune4all/trunk/Makefile 2009-11-26 12:26:31 UTC (rev 7455) @@ -0,0 +1,35 @@ +GARNAME = fortune4all +GARVERSION = 1023 +CATEGORIES = utils + +DESCRIPTION = +define BLURB + Long description +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = Fortune4All-src-$(GARVERSION).zip +#DISTFILES += fortune.zip +DISTFILES += fortune_big.zip +#DISTFILES += greek-fortunes.zip + +PATCHFILES = 0001-Fix-for-Sun-CC.patch + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +LICENSE = license + +DISTNAME = Fortune + +CONFIGURE_SCRIPTS = + +BUILD_ARGS = CC="$(CC)" CFLAGS="$(CFLAGS)" + +TEST_SCRIPTS = + +INSTALL_SCRIPTS = custom + +include gar/category.mk + + Added: csw/mgar/pkg/fortune4all/trunk/checksums =================================================================== --- csw/mgar/pkg/fortune4all/trunk/checksums (rev 0) +++ csw/mgar/pkg/fortune4all/trunk/checksums 2009-11-26 12:26:31 UTC (rev 7455) @@ -0,0 +1,3 @@ +c50398d1590b74bc2ab7bf1d966ec9ac 0001-Fix-for-Sun-CC.patch +4dedf3154ed693e0abd35e818ce577e8 Fortune4All-src-1023.zip +a187d3663fc9517e08785dd0f4bd2a0c fortune_big.zip Added: csw/mgar/pkg/fortune4all/trunk/files/0001-Fix-for-Sun-CC.patch =================================================================== --- csw/mgar/pkg/fortune4all/trunk/files/0001-Fix-for-Sun-CC.patch (rev 0) +++ csw/mgar/pkg/fortune4all/trunk/files/0001-Fix-for-Sun-CC.patch 2009-11-26 12:26:31 UTC (rev 7455) @@ -0,0 +1,38 @@ +From c2f3273c69fc4982a2429e03fdb8a952c7a6f166 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 26 Nov 2009 13:19:22 +0100 +Subject: [PATCH] Fix for Sun CC + +--- + Fortune.c | 2 +- + panic.c | 1 + + 2 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/Fortune.c b/Fortune.c +index 20538f5..096aa0d 100644 +--- a/Fortune.c ++++ b/Fortune.c +@@ -78,7 +78,7 @@ int main() + */ + (void)memset(data,'\0',DATA_SZ); + } +-#elif ++#endif + #else + (void)ReadFortune(data, cur_for++); + printf("%s\n\n\n",data); +diff --git a/panic.c b/panic.c +index 094df29..58bbfcf 100644 +--- a/panic.c ++++ b/panic.c +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include + + static char panic_buf[1024]; + /* +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Thu Nov 26 14:00:23 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 26 Nov 2009 13:00:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7456] csw/mgar/pkg/exiftool/trunk/Makefile Message-ID: Revision: 7456 http://gar.svn.sourceforge.net/gar/?rev=7456&view=rev Author: hson Date: 2009-11-26 13:00:20 +0000 (Thu, 26 Nov 2009) Log Message: ----------- exiftool: Update to 8.00 Modified Paths: -------------- csw/mgar/pkg/exiftool/trunk/Makefile Modified: csw/mgar/pkg/exiftool/trunk/Makefile =================================================================== --- csw/mgar/pkg/exiftool/trunk/Makefile 2009-11-26 12:26:31 UTC (rev 7455) +++ csw/mgar/pkg/exiftool/trunk/Makefile 2009-11-26 13:00:20 UTC (rev 7456) @@ -1,5 +1,5 @@ GARNAME = exiftool -GARVERSION = 7.99 +GARVERSION = 8.00 CATEGORIES = cpan DESCRIPTION = Read, Write and Edit Image File Meta Information This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Thu Nov 26 14:43:07 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 26 Nov 2009 13:43:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7457] csw/mgar/pkg/gengetopt/trunk Message-ID: Revision: 7457 http://gar.svn.sourceforge.net/gar/?rev=7457&view=rev Author: hson Date: 2009-11-26 13:43:06 +0000 (Thu, 26 Nov 2009) Log Message: ----------- gengetopt: Update to 2.22.3 Modified Paths: -------------- csw/mgar/pkg/gengetopt/trunk/Makefile csw/mgar/pkg/gengetopt/trunk/checksums Modified: csw/mgar/pkg/gengetopt/trunk/Makefile =================================================================== --- csw/mgar/pkg/gengetopt/trunk/Makefile 2009-11-26 13:00:20 UTC (rev 7456) +++ csw/mgar/pkg/gengetopt/trunk/Makefile 2009-11-26 13:43:06 UTC (rev 7457) @@ -1,5 +1,5 @@ GARNAME = gengetopt -GARVERSION = 2.22.2 +GARVERSION = 2.22.3 CATEGORIES = utils DESCRIPTION = parses the command line options Modified: csw/mgar/pkg/gengetopt/trunk/checksums =================================================================== --- csw/mgar/pkg/gengetopt/trunk/checksums 2009-11-26 13:00:20 UTC (rev 7456) +++ csw/mgar/pkg/gengetopt/trunk/checksums 2009-11-26 13:43:06 UTC (rev 7457) @@ -1 +1 @@ -99e3e7ff827fe8f1719c298b116a044e download/gengetopt-2.22.2.tar.gz +9f42beca6220df43812725c07d1e843c download/gengetopt-2.22.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 Thu Nov 26 15:31:58 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 26 Nov 2009 14:31:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7458] csw/mgar/pkg/liboggz/trunk/Makefile Message-ID: Revision: 7458 http://gar.svn.sourceforge.net/gar/?rev=7458&view=rev Author: dmichelsen Date: 2009-11-26 14:31:58 +0000 (Thu, 26 Nov 2009) Log Message: ----------- liboggz: Fix build on Solaris 10 Modified Paths: -------------- csw/mgar/pkg/liboggz/trunk/Makefile Modified: csw/mgar/pkg/liboggz/trunk/Makefile =================================================================== --- csw/mgar/pkg/liboggz/trunk/Makefile 2009-11-26 13:43:06 UTC (rev 7457) +++ csw/mgar/pkg/liboggz/trunk/Makefile 2009-11-26 14:31:58 UTC (rev 7458) @@ -33,3 +33,8 @@ MERGE_DIRS_isa-extra = $(libdir) include gar/category.mk + +# Solaris 10 does have getopt.h which interferes with the shipped one included first. +post-configure-isa-amd64: + rm -f $(WORKSRC)/include/getopt.h + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Nov 26 15:54:10 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 26 Nov 2009 14:54:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7459] csw/mgar/pkg Message-ID: Revision: 7459 http://gar.svn.sourceforge.net/gar/?rev=7459&view=rev Author: dmichelsen Date: 2009-11-26 14:54:10 +0000 (Thu, 26 Nov 2009) Log Message: ----------- libfishsound: Initial commit Added Paths: ----------- csw/mgar/pkg/libfishsound/ csw/mgar/pkg/libfishsound/branches/ csw/mgar/pkg/libfishsound/tags/ csw/mgar/pkg/libfishsound/trunk/ csw/mgar/pkg/libfishsound/trunk/Makefile csw/mgar/pkg/libfishsound/trunk/checksums csw/mgar/pkg/libfishsound/trunk/files/ Property changes on: csw/mgar/pkg/libfishsound/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/libfishsound/trunk/Makefile =================================================================== --- csw/mgar/pkg/libfishsound/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libfishsound/trunk/Makefile 2009-11-26 14:54:10 UTC (rev 7459) @@ -0,0 +1,35 @@ +GARNAME = libfishsound +GARVERSION = 0.9.2 +CATEGORIES = lib + +DESCRIPTION = Decoding and encoding audio data using the Xiph.org codecs +define BLURB + libfishsound provides a simple programming interface for decoding and encoding + audio data using the Xiph.org codecs (FLAC, Speex and Vorbis). +endef + +MASTER_SITES = http://downloads.xiph.org/releases/libfishsound/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.xiph.org/fishsound/ + +REQUIRED_PKGS = CSWflac CSWlibogg CSWspeex CSWvorbis +PREREQUISITE_PKGS = $(REQUIRED_PKGS) + +BUILD64 = 1 +NO_ISAEXEC = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +BUILD_ARGS = AM_CFLAGS= + +TEST_TARGET = check + +include gar/category.mk + +# UINTPTR_MAX is defined empty in Solaris, which breaks a constraint check +post-configure-modulated: + perl -pi -e 's,(.*HAVE_UINTPTR_T.*),/* \1 */,' $(WORKSRC)/config.h + @$(MAKECOOKIE) Added: csw/mgar/pkg/libfishsound/trunk/checksums =================================================================== --- csw/mgar/pkg/libfishsound/trunk/checksums (rev 0) +++ csw/mgar/pkg/libfishsound/trunk/checksums 2009-11-26 14:54:10 UTC (rev 7459) @@ -0,0 +1 @@ +92f5d4de8ecd9ab3333b77224f8d3efd libfishsound-0.9.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 Nov 26 16:04:55 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 26 Nov 2009 15:04:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[7460] csw/mgar/pkg/netsnmp/trunk Message-ID: Revision: 7460 http://gar.svn.sourceforge.net/gar/?rev=7460&view=rev Author: dmichelsen Date: 2009-11-26 15:04:55 +0000 (Thu, 26 Nov 2009) Log Message: ----------- netsnmp: Update to 5.5 and add 64 bit Modified Paths: -------------- csw/mgar/pkg/netsnmp/trunk/Makefile csw/mgar/pkg/netsnmp/trunk/checksums Modified: csw/mgar/pkg/netsnmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/netsnmp/trunk/Makefile 2009-11-26 14:54:10 UTC (rev 7459) +++ csw/mgar/pkg/netsnmp/trunk/Makefile 2009-11-26 15:04:55 UTC (rev 7460) @@ -1,10 +1,13 @@ GARNAME = netsnmp -GARVERSION = 5.4.2.1 +GARVERSION = 5.5 CATEGORIES = apps -DESCRIPTION = Brief description +DESCRIPTION = A suite of applications used to implement SNMP define BLURB - Long description + Simple Network Management Protocol (SNMP) is a widely used protocol for monitoring + the health and welfare of network equipment (eg. routers), computer equipment and + even devices like UPSs. Net-SNMP is a suite of applications used to implement + SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6. The suite includes: endef SF_PROJ = net-snmp @@ -24,6 +27,9 @@ UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) +BUILD64 = 1 +NO_ISAEXEC = 1 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-default-snmp-version=1 CONFIGURE_ARGS += --with-sys-contact=unknown Modified: csw/mgar/pkg/netsnmp/trunk/checksums =================================================================== --- csw/mgar/pkg/netsnmp/trunk/checksums 2009-11-26 14:54:10 UTC (rev 7459) +++ csw/mgar/pkg/netsnmp/trunk/checksums 2009-11-26 15:04:55 UTC (rev 7460) @@ -1,3 +1,3 @@ -984932520143f0c8bf7b7ce1fc9e1da1 download/net-snmp-5.4.2.1.tar.gz -01897895a960cd9cafbf2457c1aff065 download/perl_makefiles.diff -5e0ec3e4d3dd363437d85eca6b91951a download/Makefile.in.diff +5e0ec3e4d3dd363437d85eca6b91951a Makefile.in.diff +5b2551e7bd024fbbee84dca22a5f13a1 net-snmp-5.5.tar.gz +01897895a960cd9cafbf2457c1aff065 perl_makefiles.diff 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 Nov 26 16:49:32 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 26 Nov 2009 15:49:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7461] csw/mgar/pkg/a52dec/trunk Message-ID: Revision: 7461 http://gar.svn.sourceforge.net/gar/?rev=7461&view=rev Author: dmichelsen Date: 2009-11-26 15:49:22 +0000 (Thu, 26 Nov 2009) Log Message: ----------- liba52: Fix 64 bit Modified Paths: -------------- csw/mgar/pkg/a52dec/trunk/Makefile csw/mgar/pkg/a52dec/trunk/checksums Added Paths: ----------- csw/mgar/pkg/a52dec/trunk/files/0001-Fix-64-bit-libtool.patch csw/mgar/pkg/a52dec/trunk/files/liba52.pc-32 csw/mgar/pkg/a52dec/trunk/files/liba52.pc-64 Modified: csw/mgar/pkg/a52dec/trunk/Makefile =================================================================== --- csw/mgar/pkg/a52dec/trunk/Makefile 2009-11-26 15:04:55 UTC (rev 7460) +++ csw/mgar/pkg/a52dec/trunk/Makefile 2009-11-26 15:49:22 UTC (rev 7461) @@ -4,11 +4,14 @@ DESCRIPTION = A free ATSC A/52 stream decoder define BLURB - liba52 is a free library for decoding ATSC A/52 streams. It is released under the terms of the GPL license. The A/52 standard is used in a variety of applications, including digital television and DVD. It is also known as AC-3. + liba52 is a free library for decoding ATSC A/52 streams. It is released under the terms + of the GPL license. The A/52 standard is used in a variety of applications, including + digital television and DVD. It is also known as AC-3. endef MASTER_SITES = http://liba52.sourceforge.net/files/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += liba52.pc-32 liba52.pc-64 # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = http://liba52.sourceforge.net/ @@ -17,6 +20,7 @@ PACKAGES = CSWliba52 CATALOGNAME = a52dec +REQUIRED_PKGS = CSWsunmath EXTRA_LINKER_FLAGS = -lsunmath BUILD64 = 1 @@ -24,7 +28,15 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared --disable-static +# This stupid configure script adds '-fast' overwriting -xarch and +# especially activating 64 bit. +BUILD_ARGS = CFLAGS="$(CFLAGS)" + MERGE_DIRS_isa-extra = $(libdir) include gar/category.mk +post-install-modulated: + ginstall -d $(DESTDIR)$(libdir)/pkgconfig + ginstall $(WORKDIR)/liba52.pc-$(MEMORYMODEL) $(DESTDIR)$(libdir)/pkgconfig/liba52.pc + @$(MAKECOOKIE) Modified: csw/mgar/pkg/a52dec/trunk/checksums =================================================================== --- csw/mgar/pkg/a52dec/trunk/checksums 2009-11-26 15:04:55 UTC (rev 7460) +++ csw/mgar/pkg/a52dec/trunk/checksums 2009-11-26 15:49:22 UTC (rev 7461) @@ -1 +1,3 @@ caa9f5bc44232dc8aeea773fea56be80 a52dec-0.7.4.tar.gz +4bdd6062a5b602334c797a2e29c47eea liba52.pc-32 +85e441dbe0432db6925e15c60a1627ff liba52.pc-64 Added: csw/mgar/pkg/a52dec/trunk/files/0001-Fix-64-bit-libtool.patch =================================================================== --- csw/mgar/pkg/a52dec/trunk/files/0001-Fix-64-bit-libtool.patch (rev 0) +++ csw/mgar/pkg/a52dec/trunk/files/0001-Fix-64-bit-libtool.patch 2009-11-26 15:49:22 UTC (rev 7461) @@ -0,0 +1,27 @@ +From 16a37676464c7e728d930a8c044a8917c6198aa8 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 26 Nov 2009 16:11:48 +0100 +Subject: [PATCH] Fix 64 bit libtool + +--- + autotools/ltmain.sh | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/autotools/ltmain.sh b/autotools/ltmain.sh +index a926477..5b3be50 100644 +--- a/autotools/ltmain.sh ++++ b/autotools/ltmain.sh +@@ -1191,6 +1191,10 @@ compiler." + continue + ;; + ++ -xarch=*) ++ linker_flags="$linker_flags $flag" ++ # Fall through ++ + # Some other compiler flag. + -* | +*) + # Unknown arguments in both finalize_command and compile_command need +-- +1.6.5.1 + Added: csw/mgar/pkg/a52dec/trunk/files/liba52.pc-32 =================================================================== --- csw/mgar/pkg/a52dec/trunk/files/liba52.pc-32 (rev 0) +++ csw/mgar/pkg/a52dec/trunk/files/liba52.pc-32 2009-11-26 15:49:22 UTC (rev 7461) @@ -0,0 +1,10 @@ +prefix=/opt/csw +exec_prefix=/opt/csw +libdir=/opt/csw/lib +includedir=/opt/csw/include + +Name: liba52 +Description: A decoding library for ATSC A/52 streams. +Version: 0.7.4 +Libs: -L${libdir} -la52 +Cflags: -I${includedir}/a52dec Added: csw/mgar/pkg/a52dec/trunk/files/liba52.pc-64 =================================================================== --- csw/mgar/pkg/a52dec/trunk/files/liba52.pc-64 (rev 0) +++ csw/mgar/pkg/a52dec/trunk/files/liba52.pc-64 2009-11-26 15:49:22 UTC (rev 7461) @@ -0,0 +1,10 @@ +prefix=/opt/csw +exec_prefix=/opt/csw +libdir=/opt/csw/lib/64 +includedir=/opt/csw/include + +Name: liba52 +Description: A decoding library for ATSC A/52 streams. +Version: 0.7.4 +Libs: -L${libdir} -la52 +Cflags: -I${includedir}/a52dec 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 Nov 26 17:19:40 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 26 Nov 2009 16:19:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[7462] csw/mgar/pkg/gconf2 Message-ID: Revision: 7462 http://gar.svn.sourceforge.net/gar/?rev=7462&view=rev Author: dmichelsen Date: 2009-11-26 16:19:40 +0000 (Thu, 26 Nov 2009) Log Message: ----------- gconf2: Update to GAR Added Paths: ----------- csw/mgar/pkg/gconf2/branches/ csw/mgar/pkg/gconf2/tags/ csw/mgar/pkg/gconf2/tags/legacy/ csw/mgar/pkg/gconf2/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/gconf2/trunk/legacy/ Copied: csw/mgar/pkg/gconf2/trunk/Makefile (from rev 7360, csw/mgar/pkg/glib2/trunk/Makefile) =================================================================== --- csw/mgar/pkg/gconf2/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gconf2/trunk/Makefile 2009-11-26 16:19:40 UTC (rev 7462) @@ -0,0 +1,30 @@ +GARNAME = gconf2 +GNOME_PROJ = GConf +GARVERSION = 2.28.0 +CATEGORIES = lib + +DESCRIPTION = GNOME configuration database system +define BLURB + GConf is a system for storing application preferences. It is intended + for user preferences; not configuration of something like Apache, or + arbitrary data storage. +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTNAME = GConf-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.bz2 + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL = http://projects.gnome.org/gconf/ + +CONFIGURE_ARGS = $(DIRPATHS) + +BUILD64 = 1 +NO_ISAEXEC = 1 + +TEST_TARGET = check + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Nov 26 18:24:47 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 26 Nov 2009 17:24:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[7463] csw/mgar/pkg/x11/lib Message-ID: Revision: 7463 http://gar.svn.sourceforge.net/gar/?rev=7463&view=rev Author: wbonnet Date: 2009-11-26 17:24:46 +0000 (Thu, 26 Nov 2009) Log Message: ----------- Update to 7.5RC Modified Paths: -------------- csw/mgar/pkg/x11/lib/libdmx/trunk/Makefile csw/mgar/pkg/x11/lib/libdmx/trunk/checksums csw/mgar/pkg/x11/lib/libfs/trunk/Makefile csw/mgar/pkg/x11/lib/libfs/trunk/checksums csw/mgar/pkg/x11/lib/libice/trunk/Makefile csw/mgar/pkg/x11/lib/libice/trunk/checksums csw/mgar/pkg/x11/lib/libsm/trunk/Makefile csw/mgar/pkg/x11/lib/libsm/trunk/checksums csw/mgar/pkg/x11/lib/libxext/trunk/Makefile csw/mgar/pkg/x11/lib/libxext/trunk/checksums csw/mgar/pkg/x11/lib/libxi/trunk/Makefile csw/mgar/pkg/x11/lib/libxi/trunk/checksums csw/mgar/pkg/x11/lib/libxt/trunk/Makefile csw/mgar/pkg/x11/lib/libxt/trunk/checksums csw/mgar/pkg/x11/lib/xtrans/trunk/Makefile csw/mgar/pkg/x11/lib/xtrans/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/lib/xtrans/trunk/files/Makefile.am.diff csw/mgar/pkg/x11/lib/xtrans/trunk/files/Makefile.in.diff Modified: csw/mgar/pkg/x11/lib/libdmx/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libdmx/trunk/Makefile 2009-11-26 16:19:40 UTC (rev 7462) +++ csw/mgar/pkg/x11/lib/libdmx/trunk/Makefile 2009-11-26 17:24:46 UTC (rev 7463) @@ -1,5 +1,5 @@ GARNAME = libdmx -GARVERSION = 1.0.2 +GARVERSION = 1.1.0 CATEGORIES = x11 DESCRIPTION = X11 Distributed Multihead extension library Modified: csw/mgar/pkg/x11/lib/libdmx/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libdmx/trunk/checksums 2009-11-26 16:19:40 UTC (rev 7462) +++ csw/mgar/pkg/x11/lib/libdmx/trunk/checksums 2009-11-26 17:24:46 UTC (rev 7463) @@ -1 +1 @@ -4d866967210d06098fc9f302ed4c79b1 download/libdmx-1.0.2.tar.bz2 +a2fcf0382837888d3781b714489a8999 libdmx-1.1.0.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libfs/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libfs/trunk/Makefile 2009-11-26 16:19:40 UTC (rev 7462) +++ csw/mgar/pkg/x11/lib/libfs/trunk/Makefile 2009-11-26 17:24:46 UTC (rev 7463) @@ -1,5 +1,5 @@ GARNAME = libFS -GARVERSION = 1.0.1 +GARVERSION = 1.0.2 CATEGORIES = x11 DESCRIPTION = X11 Font Services library Modified: csw/mgar/pkg/x11/lib/libfs/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libfs/trunk/checksums 2009-11-26 16:19:40 UTC (rev 7462) +++ csw/mgar/pkg/x11/lib/libfs/trunk/checksums 2009-11-26 17:24:46 UTC (rev 7463) @@ -1 +1 @@ -81521249353fa33be7a4bb0062c2fbb9 download/libFS-1.0.1.tar.bz2 +ecf2d6a27da053500283e803efa2a808 libFS-1.0.2.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libice/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libice/trunk/Makefile 2009-11-26 16:19:40 UTC (rev 7462) +++ csw/mgar/pkg/x11/lib/libice/trunk/Makefile 2009-11-26 17:24:46 UTC (rev 7463) @@ -1,5 +1,5 @@ GARNAME = libICE -GARVERSION = 1.0.4 +GARVERSION = 1.0.6 CATEGORIES = x11 DESCRIPTION = X11 Inter-Client Exchange Library Modified: csw/mgar/pkg/x11/lib/libice/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libice/trunk/checksums 2009-11-26 16:19:40 UTC (rev 7462) +++ csw/mgar/pkg/x11/lib/libice/trunk/checksums 2009-11-26 17:24:46 UTC (rev 7463) @@ -1 +1 @@ -4ab4e67e0b8845aa201e984153087f4a download/libICE-1.0.4.tar.bz2 +2d39bc924af24325dae589e9a849180c libICE-1.0.6.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libsm/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libsm/trunk/Makefile 2009-11-26 16:19:40 UTC (rev 7462) +++ csw/mgar/pkg/x11/lib/libsm/trunk/Makefile 2009-11-26 17:24:46 UTC (rev 7463) @@ -1,5 +1,5 @@ GARNAME = libsm -GARVERSION = 1.1.0 +GARVERSION = 1.1.1 CATEGORIES = x11 DESCRIPTION = X11 Session Management library Modified: csw/mgar/pkg/x11/lib/libsm/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libsm/trunk/checksums 2009-11-26 16:19:40 UTC (rev 7462) +++ csw/mgar/pkg/x11/lib/libsm/trunk/checksums 2009-11-26 17:24:46 UTC (rev 7463) @@ -1 +1 @@ -05a04c2b6382fb0054f6c70494e22733 download/libSM-1.1.0.tar.bz2 +6889a455496aaaa65b1fa05fc518d179 libSM-1.1.1.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxext/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxext/trunk/Makefile 2009-11-26 16:19:40 UTC (rev 7462) +++ csw/mgar/pkg/x11/lib/libxext/trunk/Makefile 2009-11-26 17:24:46 UTC (rev 7463) @@ -1,5 +1,5 @@ GARNAME = libxext -GARVERSION = 1.0.4 +GARVERSION = 1.1.1 CATEGORIES = x11 DESCRIPTION = X11 miscellaneous extensions library1 Modified: csw/mgar/pkg/x11/lib/libxext/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxext/trunk/checksums 2009-11-26 16:19:40 UTC (rev 7462) +++ csw/mgar/pkg/x11/lib/libxext/trunk/checksums 2009-11-26 17:24:46 UTC (rev 7463) @@ -1 +1 @@ -a91f1f722ac80c597cf0b75dcb8b48c0 download/libXext-1.0.4.tar.bz2 +c417c0e8df39a067f90a2a2e7133637d libXext-1.1.1.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxi/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/Makefile 2009-11-26 16:19:40 UTC (rev 7462) +++ csw/mgar/pkg/x11/lib/libxi/trunk/Makefile 2009-11-26 17:24:46 UTC (rev 7463) @@ -1,5 +1,5 @@ GARNAME = libxi -GARVERSION = 1.1.3 +GARVERSION = 1.3 CATEGORIES = x11 DESCRIPTION = Client library for XInput Modified: csw/mgar/pkg/x11/lib/libxi/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxi/trunk/checksums 2009-11-26 16:19:40 UTC (rev 7462) +++ csw/mgar/pkg/x11/lib/libxi/trunk/checksums 2009-11-26 17:24:46 UTC (rev 7463) @@ -1 +1 @@ -7c510abb0cad8dc20493fb27ff7859d8 download/libXi-1.1.3.tar.bz2 +8df4ece9bd1efb02c28acb2b6f485e09 libXi-1.3.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxt/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxt/trunk/Makefile 2009-11-26 16:19:40 UTC (rev 7462) +++ csw/mgar/pkg/x11/lib/libxt/trunk/Makefile 2009-11-26 17:24:46 UTC (rev 7463) @@ -1,5 +1,5 @@ GARNAME = libxt -GARVERSION = 1.0.5 +GARVERSION = 1.0.7 CATEGORIES = x11 DESCRIPTION = X11 toolkit intrinsics library Modified: csw/mgar/pkg/x11/lib/libxt/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxt/trunk/checksums 2009-11-26 16:19:40 UTC (rev 7462) +++ csw/mgar/pkg/x11/lib/libxt/trunk/checksums 2009-11-26 17:24:46 UTC (rev 7463) @@ -1 +1 @@ -f3bdd67785ace8cd0b23249e9d8c9975 download/libXt-1.0.5.tar.bz2 +96f3c93434a93186d178b60d4a262496 libXt-1.0.7.tar.bz2 Modified: csw/mgar/pkg/x11/lib/xtrans/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/xtrans/trunk/Makefile 2009-11-26 16:19:40 UTC (rev 7462) +++ csw/mgar/pkg/x11/lib/xtrans/trunk/Makefile 2009-11-26 17:24:46 UTC (rev 7463) @@ -1,5 +1,5 @@ GARNAME = xtrans -GARVERSION = 1.2.1 +GARVERSION = 1.2.5 CATEGORIES = x11 DESCRIPTION = X transport library @@ -19,5 +19,8 @@ BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) +PATCHFILES = Makefile.am.diff +PATCHFILES += Makefile.in.diff + include gar/category.mk Modified: csw/mgar/pkg/x11/lib/xtrans/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/xtrans/trunk/checksums 2009-11-26 16:19:40 UTC (rev 7462) +++ csw/mgar/pkg/x11/lib/xtrans/trunk/checksums 2009-11-26 17:24:46 UTC (rev 7463) @@ -1 +1,3 @@ -5b7f447f6fe92cbc4f17441aaee0bf55 download/xtrans-1.2.1.tar.gz +1fbf46b5dc6a352a47c3390395c14bf3 Makefile.am.diff +52ee4a5f36f8c3729864d59a24971140 Makefile.in.diff +b2f47d49faf1f24e8294b624b21b9b93 xtrans-1.2.5.tar.gz Added: csw/mgar/pkg/x11/lib/xtrans/trunk/files/Makefile.am.diff =================================================================== --- csw/mgar/pkg/x11/lib/xtrans/trunk/files/Makefile.am.diff (rev 0) +++ csw/mgar/pkg/x11/lib/xtrans/trunk/files/Makefile.am.diff 2009-11-26 17:24:46 UTC (rev 7463) @@ -0,0 +1,11 @@ +--- xtrans-1.2.5/Makefile.am.orig 2009-11-26 15:05:04.598921126 +0100 ++++ xtrans-1.2.5/Makefile.am 2009-11-26 14:59:40.883565415 +0100 +@@ -12,7 +12,7 @@ + aclocaldir = $(datadir)/aclocal + aclocal_DATA = xtrans.m4 + +-pkgconfigdir = $(datadir)/pkgconfig ++pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = xtrans.pc + + EXTRA_DIST = xtrans.pc.in ${aclocal_DATA} ChangeLog Xtrans.mm Added: csw/mgar/pkg/x11/lib/xtrans/trunk/files/Makefile.in.diff =================================================================== --- csw/mgar/pkg/x11/lib/xtrans/trunk/files/Makefile.in.diff (rev 0) +++ csw/mgar/pkg/x11/lib/xtrans/trunk/files/Makefile.in.diff 2009-11-26 17:24:46 UTC (rev 7463) @@ -0,0 +1,11 @@ +--- xtrans-1.2.5/Makefile.in.orig 2009-11-26 15:01:50.752826994 +0100 ++++ xtrans-1.2.5/Makefile.in 2009-11-26 15:05:44.512854519 +0100 +@@ -222,7 +222,7 @@ + + aclocaldir = $(datadir)/aclocal + aclocal_DATA = xtrans.m4 +-pkgconfigdir = $(datadir)/pkgconfig ++pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = xtrans.pc + EXTRA_DIST = xtrans.pc.in ${aclocal_DATA} ChangeLog Xtrans.mm + MAINTAINERCLEANFILES = ChangeLog 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 Nov 26 19:34:32 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 26 Nov 2009 18:34:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7464] csw/mgar/pkg/bind/trunk Message-ID: Revision: 7464 http://gar.svn.sourceforge.net/gar/?rev=7464&view=rev Author: bonivart Date: 2009-11-26 18:34:30 +0000 (Thu, 26 Nov 2009) Log Message: ----------- bind: update to 9.6.1-P2 Modified Paths: -------------- csw/mgar/pkg/bind/trunk/Makefile csw/mgar/pkg/bind/trunk/checksums csw/mgar/pkg/bind/trunk/files/README.CSW csw/mgar/pkg/bind/trunk/files/cswusergroup Property Changed: ---------------- csw/mgar/pkg/bind/trunk/files/ Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2009-11-26 17:24:46 UTC (rev 7463) +++ csw/mgar/pkg/bind/trunk/Makefile 2009-11-26 18:34:30 UTC (rev 7464) @@ -1,6 +1,6 @@ GARNAME = bind GARVERSION = 9.6.1 -RELEASE = P1 +RELEASE = P2 DISTVERSION = $(GARVERSION)-$(RELEASE) DISTNAME = $(GARNAME)-$(DISTVERSION) WORKSRC = $(WORKDIR)/$(DISTNAME) @@ -20,11 +20,14 @@ #DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PACKAGES = CSWbind CSWbinddevel CSWlibbind CSWbindutils +#PACKAGES = CSWbind CSWbinddevel CSWlibbind CSWbindutils CSWbindchroot CATALOGNAME_CSWbinddevel = bind_devel CATALOGNAME_CSWbindutils = bind_utils +#CATALOGNAME_CSWbindchroot = bind_chroot ARCHALL_CSWbinddevel = 1 +#ARCHALL_CSWbindchroot = 1 LICENSE = COPYRIGHT @@ -32,11 +35,13 @@ SPKG_DESC_CSWbinddevel = ISC BIND DNS development package SPKG_DESC_CSWlibbind = ISC BIND DNS library package SPKG_DESC_CSWbindutils = ISC BIND DNS utilities package +#SPKG_DESC_CSWbindchroot = ISC BIND DNS chroot package -REQUIRED_PKGS_CSWbind = CSWlibbind CSWbindutils CSWcswclassutils CSWiconv CSWlibxml2 CSWosslrt CSWzlib +REQUIRED_PKGS_CSWbind = CSWlibbind CSWbindutils CSWiconv CSWlibxml2 CSWosslrt CSWzlib REQUIRED_PKGS_CSWbinddevel = CSWbind REQUIRED_PKGS_CSWlibbind = CSWiconv CSWlibxml2 CSWosslrt CSWzlib REQUIRED_PKGS_CSWbindutils = CSWlibbind CSWiconv CSWlibxml2 CSWosslrt CSWzlib +#REQUIRED_PKGS_CSWbindchroot = CSWbind # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = http://ftp.isc.org/isc/bind9/ @@ -55,20 +60,21 @@ PKGFILES_CSWbinddevel = $(PKGFILES_DEVEL) PKGFILES_CSWlibbind = $(libdir)/.* PKGFILES_CSWbindutils = $(bindir)/.* +#PKGFILES_CSWbindchroot = .*chroot.* -# checkpkg can't handle split packages -ENABLE_CHECK = 0 - INSTALL_SCRIPTS = custom PROTOTYPE_FILTER = awk ' \ - $$$$3 ~ /\/init.d\/cswnamed$$$$/ { $$$$2 = "cswinitsmf" } \ - $$$$3 ~ /\/named.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ $$$$3 ~ /\/var\/opt\/csw\/named/ { $$$$5 = "named" ; $$$$2 = "ugfiles" } \ - $$$$3 ~ /\/CSWbind\/cswusergroup$$$$/ { $$$$2 = "cswusergroup" } \ { print }' +INITSMF = .*/init.d/cswnamed +SAMPLECONF = .*/named.conf.CSW +USERGROUP = .*/CSWbind/cswusergroup + SPKG_SOURCEURL = http://www.isc.org/software/bind + +# Still needed because of ugfiles SPKG_CLASSES_CSWbind = none cswusergroup ugfiles cswcpsampleconf cswinitsmf include gar/category.mk @@ -79,15 +85,38 @@ install-custom: @echo " ==> Installing $(GARNAME) (custom)" - @ginstall -d $(DESTDIR)/etc/opt/csw/init.d + @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d @cp $(FILEDIR)/CSWbind.cswnamed $(DESTDIR)/etc/opt/csw/init.d/cswnamed @cp $(FILEDIR)/CSWbind.named.conf.CSW $(DESTDIR)/etc/opt/csw/named.conf.CSW - @ginstall -d $(DESTDIR)/opt/csw/etc/CSWbind + @ginstall -m 755 -d $(DESTDIR)/opt/csw/etc/CSWbind @cp $(FILEDIR)/cswusergroup $(DESTDIR)/opt/csw/etc/CSWbind/ - @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME) @$(foreach DOC,$(DOCLIST),cp $(FILEDIR)/$(DOC) $(DESTDIR)$(docdir)/$(GARNAME);) ( cd $(WORKSRC) ; \ gmake DESTDIR=$(DESTDIR) install ) - @ginstall -d $(DESTDIR)/var/opt/csw/named + @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/named @touch $(DESTDIR)/var/opt/csw/named/named.pid + @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/named/chroot/dev + @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/named/chroot/etc + @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/named/chroot/var/named @$(MAKECOOKIE) + +# run bind chroot'ed: +# (from CentOS 5.3) +# /var/named/chroot +# /var/named/chroot/dev +# /var/named/chroot/dev/null +# /var/named/chroot/dev/random +# /var/named/chroot/dev/zero +# /var/named/chroot/etc +# /var/named/chroot/etc/named.caching-nameserver.conf +# /var/named/chroot/etc/named.conf +# /var/named/chroot/etc/rndc.conf +# /var/named/chroot/var +# /var/named/chroot/var/log/named.log +# /var/named/chroot/var/named +# /var/named/chroot/var/named/data +# /var/named/chroot/var/named/slaves +# /var/named/chroot/var/run +# /var/named/chroot/var/run/named +# /var/named/chroot/var/tmp Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2009-11-26 17:24:46 UTC (rev 7463) +++ csw/mgar/pkg/bind/trunk/checksums 2009-11-26 18:34:30 UTC (rev 7464) @@ -1 +1 @@ -e6ce3b355c4e6bf5d66ef100f555da3f download/bind-9.6.1-P1.tar.gz +435bc2e26e470d46ddf2acb24abb6ea6 bind-9.6.1-P2.tar.gz Property changes on: csw/mgar/pkg/bind/trunk/files ___________________________________________________________________ Added: svn:ignore + CSWbindchroot.* Modified: csw/mgar/pkg/bind/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/bind/trunk/files/README.CSW 2009-11-26 17:24:46 UTC (rev 7463) +++ csw/mgar/pkg/bind/trunk/files/README.CSW 2009-11-26 18:34:30 UTC (rev 7464) @@ -10,11 +10,12 @@ ------------ 1. Modify the named.conf file in /etc/opt/csw. 2. Create the zone files you specified in named.conf. -3. Start Bind with "/etc/init.d/cswnamed start". +3. Start Bind with "/etc/init.d/cswnamed start" + or with SMF (Solaris 10+) "svcadm enable cswnamed". There's sample files to look at in this directory. More info here: http://www.isc.org/software/BIND/. -bonivart/081118 +bonivart/091119 Modified: csw/mgar/pkg/bind/trunk/files/cswusergroup =================================================================== --- csw/mgar/pkg/bind/trunk/files/cswusergroup 2009-11-26 17:24:46 UTC (rev 7463) +++ csw/mgar/pkg/bind/trunk/files/cswusergroup 2009-11-26 18:34:30 UTC (rev 7464) @@ -1 +1 @@ -named::CSW BIND DNS:/false:/bin/false:: +named:named:CSW BIND DNS:/false:/bin/false:::NP 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 Nov 26 20:26:06 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 26 Nov 2009 19:26:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7465] csw/mgar/pkg/bind/trunk/Makefile Message-ID: Revision: 7465 http://gar.svn.sourceforge.net/gar/?rev=7465&view=rev Author: bonivart Date: 2009-11-26 19:26:06 +0000 (Thu, 26 Nov 2009) Log Message: ----------- bind: fix version Modified Paths: -------------- csw/mgar/pkg/bind/trunk/Makefile Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2009-11-26 18:34:30 UTC (rev 7464) +++ csw/mgar/pkg/bind/trunk/Makefile 2009-11-26 19:26:06 UTC (rev 7465) @@ -2,7 +2,8 @@ GARVERSION = 9.6.1 RELEASE = P2 DISTVERSION = $(GARVERSION)-$(RELEASE) -DISTNAME = $(GARNAME)-$(DISTVERSION) +SPKG_VERSION = $(GARVERSION)$(RELEASE) +DISTNAME = $(GARNAME)-$(GARVERSION)-$(RELEASE) WORKSRC = $(WORKDIR)/$(DISTNAME) CATEGORIES = net @@ -15,7 +16,7 @@ endef MASTER_SITES = http://ftp.isc.org/isc/bind9/$(GARVERSION)-$(RELEASE)/ -DISTFILES = $(GARNAME)-$(GARVERSION)-$(RELEASE).tar.gz +DISTFILES = $(DISTNAME).tar.gz #MASTER_SITES = http://ftp.isc.org/isc/bind9/$(GARVERSION)/ #DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz @@ -79,8 +80,6 @@ include gar/category.mk -SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) - DOCLIST = README.CSW db.127.0.0 db.localhost named.conf named.root rndc.key install-custom: 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 Nov 27 01:16:15 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 27 Nov 2009 00:16:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[7466] csw/mgar/pkg/coreutils/trunk/Makefile Message-ID: Revision: 7466 http://gar.svn.sourceforge.net/gar/?rev=7466&view=rev Author: bdwalton Date: 2009-11-27 00:16:15 +0000 (Fri, 27 Nov 2009) Log Message: ----------- coreutils: change how tests get run to work around weird recursive make behaviour Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-26 19:26:06 UTC (rev 7465) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-27 00:16:15 UTC (rev 7466) @@ -27,7 +27,7 @@ CONFIGURE_ARGS += --with-libintl-prefix=/opt/csw/ CONFIGURE_ARGS += --with-libiconv-prefix=/opt/csw/ -TEST_ARGS = check +TEST_SCRIPTS = custom include gar/category.mk @@ -36,3 +36,7 @@ # @$(MAKECOOKIE) PATH := /opt/csw/gnu:/opt/csw/bin:$(PATH) + +test-custom: + @(cd $(WORKSRC); gmake check) + @$(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 Nov 27 02:33:04 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 27 Nov 2009 01:33:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[7467] csw/mgar/pkg/coreutils/trunk/Makefile Message-ID: Revision: 7467 http://gar.svn.sourceforge.net/gar/?rev=7467&view=rev Author: bdwalton Date: 2009-11-27 01:33:04 +0000 (Fri, 27 Nov 2009) Log Message: ----------- coreutils: setup gnu links as part of package Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-27 00:16:15 UTC (rev 7466) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-27 01:33:04 UTC (rev 7467) @@ -2,6 +2,10 @@ GARVERSION = 8.1 CATEGORIES = utils +SHELL = /opt/csw/bin/bash + +PREREQUISITE_PKGS = CSWbash + DESCRIPTION = GNU core utilities define BLURB The GNU Core Utilities are the basic file, shell and text manipulation utilities of the GNU operating system. These are the core utilities which are expected to exist on every operating system. @@ -31,12 +35,21 @@ include gar/category.mk -# pre-configure-modulated: -# @(cd $(WORKSRC); /opt/csw/bin/bash ./bootstrap; ) -# @$(MAKECOOKIE) - PATH := /opt/csw/gnu:/opt/csw/bin:$(PATH) test-custom: @(cd $(WORKSRC); gmake check) @$(MAKECOOKIE) + +post-install-modulated: + @echo Cleaning up install directory... + rm -rf $(DESTDIR)/$(libdir) + +post-merge: + @(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 ) \ 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 Fri Nov 27 02:44:49 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 27 Nov 2009 01:44:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[7468] csw/mgar/pkg/coreutils/trunk/Makefile Message-ID: Revision: 7468 http://gar.svn.sourceforge.net/gar/?rev=7468&view=rev Author: bdwalton Date: 2009-11-27 01:44:49 +0000 (Fri, 27 Nov 2009) Log Message: ----------- coreutils: override default util install exclude list Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-27 01:33:04 UTC (rev 7467) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-27 01:44:49 UTC (rev 7468) @@ -30,6 +30,7 @@ CONFIGURE_ARGS += --program-prefix=g CONFIGURE_ARGS += --with-libintl-prefix=/opt/csw/ CONFIGURE_ARGS += --with-libiconv-prefix=/opt/csw/ +CONFIGURE_ARGS += --enable-no-install-program=arch,hostname,su,chcon TEST_SCRIPTS = custom 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 Nov 27 03:18:27 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 27 Nov 2009 02:18:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7469] csw/mgar/pkg/coreutils/trunk/Makefile Message-ID: Revision: 7469 http://gar.svn.sourceforge.net/gar/?rev=7469&view=rev Author: bdwalton Date: 2009-11-27 02:18:27 +0000 (Fri, 27 Nov 2009) Log Message: ----------- coreutils: makecookie after creating gnu links Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-27 01:44:49 UTC (rev 7468) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-27 02:18:27 UTC (rev 7469) @@ -53,4 +53,5 @@ echo Linking $$f; \ base=$$(basename $$f); \ gln -s $$f ./$${base/g/}; \ - done ) \ No newline at end of file + done ) + @$(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 Nov 27 03:36:08 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 27 Nov 2009 02:36:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[7470] csw/mgar/pkg Message-ID: Revision: 7470 http://gar.svn.sourceforge.net/gar/?rev=7470&view=rev Author: bdwalton Date: 2009-11-27 02:36:07 +0000 (Fri, 27 Nov 2009) Log Message: ----------- colormake: port to gar Added Paths: ----------- csw/mgar/pkg/colormake/ csw/mgar/pkg/colormake/branches/ csw/mgar/pkg/colormake/tags/ csw/mgar/pkg/colormake/trunk/ csw/mgar/pkg/colormake/trunk/Makefile csw/mgar/pkg/colormake/trunk/checksums csw/mgar/pkg/colormake/trunk/files/ csw/mgar/pkg/colormake/trunk/files/0001-Update-Paths-and-Binary-Tool-Names-for-CSW.patch Property changes on: csw/mgar/pkg/colormake/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/colormake/trunk/Makefile =================================================================== --- csw/mgar/pkg/colormake/trunk/Makefile (rev 0) +++ csw/mgar/pkg/colormake/trunk/Makefile 2009-11-27 02:36:07 UTC (rev 7470) @@ -0,0 +1,44 @@ +GARNAME = colormake +GARVERSION = 0.2 +CATEGORIES = utils + +DESCRIPTION = A colorizer for make +define BLURB +This is a simple wrapper around "make" to make its output more readable. +endef + +MASTER_SITES = http://bre.klaki.net/programs/$(GARNAME)/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Update-Paths-and-Binary-Tool-Names-for-CSW.patch + +ARCHALL = 1 + +REQUIRED_PKGS = CSWgmake CSWshutils + +# We define upstream file regex so we can be notifed of new upstream +# software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of +# MASTER_SITES, then uncomment the next line. Otherwise it is set by +# default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +post-extract-modulated: + @cd $(WORKDIR_FIRSTMOD); mv $(GARNAME) $(GARNAME)-$(GARVERSION); + @$(MAKECOOKIE) + +install-custom: CMDD=$(docdir)/$(GARNAME) +install-custom: + @(cd $(WORKSRC); \ + ginstall -d -m 0755 $(DESTDIR)$(bindir) $(DESTDIR)$(CMDD); \ + ginstall -m 0755 colormake.pl cmake clmake $(DESTDIR)$(bindir); \ + ginstall -m 0644 AUTHORS README $(DESTDIR)$(CMDD) ) + @$(MAKECOOKIE) Added: csw/mgar/pkg/colormake/trunk/checksums =================================================================== --- csw/mgar/pkg/colormake/trunk/checksums (rev 0) +++ csw/mgar/pkg/colormake/trunk/checksums 2009-11-27 02:36:07 UTC (rev 7470) @@ -0,0 +1,2 @@ +80ba07d18bc3c409a2744e210b8f7ad7 0001-Update-Paths-and-Binary-Tool-Names-for-CSW.patch +1029dae70e7a23cff0f6a11f3ceffbe1 colormake-0.2.tar.gz Added: csw/mgar/pkg/colormake/trunk/files/0001-Update-Paths-and-Binary-Tool-Names-for-CSW.patch =================================================================== --- csw/mgar/pkg/colormake/trunk/files/0001-Update-Paths-and-Binary-Tool-Names-for-CSW.patch (rev 0) +++ csw/mgar/pkg/colormake/trunk/files/0001-Update-Paths-and-Binary-Tool-Names-for-CSW.patch 2009-11-27 02:36:07 UTC (rev 7470) @@ -0,0 +1,54 @@ +From df457b512ae24c966ac200c3910cf86e2599d8d8 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Fri, 27 Nov 2009 03:22:18 +0100 +Subject: [PATCH] Update Paths and Binary Tool Names for CSW + +/usr/bin/perl -> /opt/csw/bin/perl +export PATH=/opt/csw/bin:$PATH +make -> gmake +stty -> gstty + +Signed-off-by: Ben Walton +--- + clmake | 4 +++- + cmake | 4 +++- + colormake.pl | 2 +- + 3 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/clmake b/clmake +index c091e23..de484ea 100755 +--- a/clmake ++++ b/clmake +@@ -4,4 +4,6 @@ + # Jumps to the first gcc error that occurs during the build process. + # + +-make $* 2>&1 | colormake.pl `stty size` | less -r -pError ++export PATH=/opt/csw/bin:$PATH ++ ++gmake $* 2>&1 | colormake.pl `gstty size` | less -r -pError +diff --git a/cmake b/cmake +index 303e91e..4f2eabd 100755 +--- a/cmake ++++ b/cmake +@@ -4,4 +4,6 @@ + # Jumps to the first gcc error that occurs during the build process. + # + +-make $* 2>&1 | colormake.pl `stty size` ++export PATH=/opt/csw/bin:$PATH ++ ++gmake $* 2>&1 | colormake.pl `gstty size` +diff --git a/colormake.pl b/colormake.pl +index 1d9edb2..7d7b7d2 100755 +--- a/colormake.pl ++++ b/colormake.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl ++#!/opt/csw/bin/perl + # + # colormake.pl 0.3 + # +-- +1.6.5.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 Nov 27 03:41:14 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 27 Nov 2009 02:41:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[7471] csw/mgar/pkg/colormake/trunk/Makefile Message-ID: Revision: 7471 http://gar.svn.sourceforge.net/gar/?rev=7471&view=rev Author: bdwalton Date: 2009-11-27 02:41:14 +0000 (Fri, 27 Nov 2009) Log Message: ----------- colormake: use post-extract instead of post-extract-modulated Modified Paths: -------------- csw/mgar/pkg/colormake/trunk/Makefile Modified: csw/mgar/pkg/colormake/trunk/Makefile =================================================================== --- csw/mgar/pkg/colormake/trunk/Makefile 2009-11-27 02:36:07 UTC (rev 7470) +++ csw/mgar/pkg/colormake/trunk/Makefile 2009-11-27 02:41:14 UTC (rev 7471) @@ -31,7 +31,7 @@ include gar/category.mk -post-extract-modulated: +post-extract: @cd $(WORKDIR_FIRSTMOD); mv $(GARNAME) $(GARNAME)-$(GARVERSION); @$(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 Nov 27 04:00:03 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 27 Nov 2009 03:00:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[7472] csw/mgar/pkg/colormake/trunk Message-ID: Revision: 7472 http://gar.svn.sourceforge.net/gar/?rev=7472&view=rev Author: bdwalton Date: 2009-11-27 03:00:03 +0000 (Fri, 27 Nov 2009) Log Message: ----------- colormake: update patch to clean it up (some, still nasty) Modified Paths: -------------- csw/mgar/pkg/colormake/trunk/checksums csw/mgar/pkg/colormake/trunk/files/0001-Update-Paths-and-Binary-Tool-Names-for-CSW.patch Modified: csw/mgar/pkg/colormake/trunk/checksums =================================================================== --- csw/mgar/pkg/colormake/trunk/checksums 2009-11-27 02:41:14 UTC (rev 7471) +++ csw/mgar/pkg/colormake/trunk/checksums 2009-11-27 03:00:03 UTC (rev 7472) @@ -1,2 +1,2 @@ -80ba07d18bc3c409a2744e210b8f7ad7 0001-Update-Paths-and-Binary-Tool-Names-for-CSW.patch +db4549af77dc9f9583a3fd8b5ede602b 0001-Update-Paths-and-Binary-Tool-Names-for-CSW.patch 1029dae70e7a23cff0f6a11f3ceffbe1 colormake-0.2.tar.gz Modified: csw/mgar/pkg/colormake/trunk/files/0001-Update-Paths-and-Binary-Tool-Names-for-CSW.patch =================================================================== --- csw/mgar/pkg/colormake/trunk/files/0001-Update-Paths-and-Binary-Tool-Names-for-CSW.patch 2009-11-27 02:41:14 UTC (rev 7471) +++ csw/mgar/pkg/colormake/trunk/files/0001-Update-Paths-and-Binary-Tool-Names-for-CSW.patch 2009-11-27 03:00:03 UTC (rev 7472) @@ -1,4 +1,4 @@ -From df457b512ae24c966ac200c3910cf86e2599d8d8 Mon Sep 17 00:00:00 2001 +From d228a89afe97da43e3f03cd9c29509497b06336f Mon Sep 17 00:00:00 2001 From: Ben Walton Date: Fri, 27 Nov 2009 03:22:18 +0100 Subject: [PATCH] Update Paths and Binary Tool Names for CSW @@ -8,37 +8,44 @@ make -> gmake stty -> gstty +misc scripting cleanups. + Signed-off-by: Ben Walton --- - clmake | 4 +++- - cmake | 4 +++- + clmake | 6 +++++- + cmake | 7 ++++++- colormake.pl | 2 +- - 3 files changed, 7 insertions(+), 3 deletions(-) + 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/clmake b/clmake -index c091e23..de484ea 100755 +index c091e23..18c8758 100755 --- a/clmake +++ b/clmake -@@ -4,4 +4,6 @@ +@@ -4,4 +4,8 @@ # Jumps to the first gcc error that occurs during the build process. # -make $* 2>&1 | colormake.pl `stty size` | less -r -pError +export PATH=/opt/csw/bin:$PATH + -+gmake $* 2>&1 | colormake.pl `gstty size` | less -r -pError ++size=$(gstty size) ++ ++gmake $* 2>&1 | colormake.pl $size | less -r -pError diff --git a/cmake b/cmake -index 303e91e..4f2eabd 100755 +index 303e91e..6d3a674 100755 --- a/cmake +++ b/cmake -@@ -4,4 +4,6 @@ +@@ -4,4 +4,9 @@ # Jumps to the first gcc error that occurs during the build process. # -make $* 2>&1 | colormake.pl `stty size` +export PATH=/opt/csw/bin:$PATH + -+gmake $* 2>&1 | colormake.pl `gstty size` ++size=$(gstty size) ++ ++gmake $* 2>&1 | colormake.pl $size ++ diff --git a/colormake.pl b/colormake.pl index 1d9edb2..7d7b7d2 100755 --- a/colormake.pl 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 Nov 27 04:10:29 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 27 Nov 2009 03:10:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[7473] csw/mgar/pkg/colormake/trunk/Makefile Message-ID: Revision: 7473 http://gar.svn.sourceforge.net/gar/?rev=7473&view=rev Author: bdwalton Date: 2009-11-27 03:10:29 +0000 (Fri, 27 Nov 2009) Log Message: ----------- colormake: add remaining deps Modified Paths: -------------- csw/mgar/pkg/colormake/trunk/Makefile Modified: csw/mgar/pkg/colormake/trunk/Makefile =================================================================== --- csw/mgar/pkg/colormake/trunk/Makefile 2009-11-27 03:00:03 UTC (rev 7472) +++ csw/mgar/pkg/colormake/trunk/Makefile 2009-11-27 03:10:29 UTC (rev 7473) @@ -13,7 +13,7 @@ ARCHALL = 1 -REQUIRED_PKGS = CSWgmake CSWshutils +REQUIRED_PKGS = CSWgmake CSWshutils CSWperl CSWless # We define upstream file regex so we can be notifed of new upstream # software release This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Nov 27 10:10:10 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 27 Nov 2009 09:10:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7474] csw/mgar/pkg Message-ID: Revision: 7474 http://gar.svn.sourceforge.net/gar/?rev=7474&view=rev Author: dmichelsen Date: 2009-11-27 09:10:09 +0000 (Fri, 27 Nov 2009) Log Message: ----------- zebra: Initial commit Added Paths: ----------- csw/mgar/pkg/zebra/ csw/mgar/pkg/zebra/branches/ csw/mgar/pkg/zebra/tags/ csw/mgar/pkg/zebra/trunk/ csw/mgar/pkg/zebra/trunk/Makefile csw/mgar/pkg/zebra/trunk/checksums csw/mgar/pkg/zebra/trunk/files/ csw/mgar/pkg/zebra/trunk/files/0001-Fix-for-Sun-Studio.patch Property changes on: csw/mgar/pkg/zebra/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/zebra/trunk/Makefile =================================================================== --- csw/mgar/pkg/zebra/trunk/Makefile (rev 0) +++ csw/mgar/pkg/zebra/trunk/Makefile 2009-11-27 09:10:09 UTC (rev 7474) @@ -0,0 +1,38 @@ +GARNAME = zebra +GARVERSION = 0.95a +CATEGORIES = server + +DESCRIPTION = Manages TCP/IP Based Routing Protocols +define BLURB + GNU Zebra is free software that manages TCP/IP based routing protocols. + It is released as part of the GNU Project, and it is distributed under the + GNU General Public License. It supports BGP-4 protocol as described in RFC1771 + (A Border Gateway Protocol 4) as well as RIPv1, RIPv2 and OSPFv2. Unlike traditional, + monolithic architectures and even the so-called "new modular architectures" that + remove the burden of processing routing functions from the cpu and utilize special + ASIC chips instead, Zebra software offers true modularity. +endef + +MASTER_SITES = ftp://ftp.zebra.org/pub/zebra/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Fix-for-Sun-Studio.patch + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +EXTRA_PAX_ARGS = -s ",\.conf.sample\(.*\),.conf\1.CSW,p" + +SAMPLECONF = /etc/opt/csw/bgpd.conf +SAMPLECONF += /etc/opt/csw/bgpd.conf2 +SAMPLECONF += /etc/opt/csw/ospfd.conf +SAMPLECONF += /etc/opt/csw/ripd.conf +SAMPLECONF += /etc/opt/csw/zebra.conf + +include gar/category.mk Added: csw/mgar/pkg/zebra/trunk/checksums =================================================================== --- csw/mgar/pkg/zebra/trunk/checksums (rev 0) +++ csw/mgar/pkg/zebra/trunk/checksums 2009-11-27 09:10:09 UTC (rev 7474) @@ -0,0 +1,2 @@ +48b2c6d28b807b684e1b4cbdff96e0b2 0001-Fix-for-Sun-Studio.patch +9b8fec2d4f910334e50167414fcf193b zebra-0.95a.tar.gz Added: csw/mgar/pkg/zebra/trunk/files/0001-Fix-for-Sun-Studio.patch =================================================================== --- csw/mgar/pkg/zebra/trunk/files/0001-Fix-for-Sun-Studio.patch (rev 0) +++ csw/mgar/pkg/zebra/trunk/files/0001-Fix-for-Sun-Studio.patch 2009-11-27 09:10:09 UTC (rev 7474) @@ -0,0 +1,61 @@ +From 8fbae5034f3fcbb3c197cfa854bc37142e239967 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 27 Nov 2009 09:53:39 +0100 +Subject: [PATCH] Fix for Sun Studio + +--- + lib/prefix.h | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/lib/prefix.h b/lib/prefix.h +index 7d7cde6..60e8439 100644 +--- a/lib/prefix.h ++++ b/lib/prefix.h +@@ -41,7 +41,7 @@ struct prefix + struct in_addr adv_router; + } lp; + u_char val[8]; +- } u __attribute__ ((aligned (8))); ++ } u; + }; + + /* IPv4 prefix structure. */ +@@ -49,7 +49,7 @@ struct prefix_ipv4 + { + u_char family; + u_char prefixlen; +- struct in_addr prefix __attribute__ ((aligned (8))); ++ struct in_addr prefix; + }; + + /* IPv6 prefix structure. */ +@@ -58,7 +58,7 @@ struct prefix_ipv6 + { + u_char family; + u_char prefixlen; +- struct in6_addr prefix __attribute__ ((aligned (8))); ++ struct in6_addr prefix; + }; + #endif /* HAVE_IPV6 */ + +@@ -66,7 +66,7 @@ struct prefix_ls + { + u_char family; + u_char prefixlen; +- struct in_addr id __attribute__ ((aligned (8))); ++ struct in_addr id; + struct in_addr adv_router; + }; + +@@ -75,7 +75,7 @@ struct prefix_rd + { + u_char family; + u_char prefixlen; +- u_char val[8] __attribute__ ((aligned (8))); ++ u_char val[8]; + }; + + #ifndef INET_ADDRSTRLEN +-- +1.6.5.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 Fri Nov 27 10:35:36 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 27 Nov 2009 09:35:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[7475] csw/mgar/pkg/chromium/trunk/Makefile Message-ID: Revision: 7475 http://gar.svn.sourceforge.net/gar/?rev=7475&view=rev Author: wahwah Date: 2009-11-27 09:35:36 +0000 (Fri, 27 Nov 2009) Log Message: ----------- chromium: Using git sources Modified Paths: -------------- csw/mgar/pkg/chromium/trunk/Makefile Modified: csw/mgar/pkg/chromium/trunk/Makefile =================================================================== --- csw/mgar/pkg/chromium/trunk/Makefile 2009-11-27 09:10:09 UTC (rev 7474) +++ csw/mgar/pkg/chromium/trunk/Makefile 2009-11-27 09:35:36 UTC (rev 7475) @@ -54,7 +54,8 @@ ## 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 = chromium.r$(CHROMIUM_REVISION).tgz +# DISTFILES = chromium.r$(CHROMIUM_REVISION).tgz +DISTFILES = ## ## We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -123,10 +124,10 @@ ## ETCSERVICES = ## INETDCONF = ## A list of runtime package dependencies in the form of CSWfoo. -REQUIRED_PKGS = CSWnspr CSWnss +REQUIRED_PKGS = CSWnspr CSWnss CSWffmpeg ## ## A list of packages necessary to build this package -PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWlibxcbdevel +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWlibxcbdevel CSWffmpeg ## ## When using non-empty $(PACKAGES): ## REQUIRED_PKGS_CSWpkgname = @@ -180,13 +181,17 @@ GYP_GENERATORS = make export GYP_GENERATORS -WORKSRC = $(WORKDIR)/home/chrome-svn/tarball/chromium +# WORKSRC = $(WORKDIR)/home/chrome-svn/tarball/chromium +WORKSRC = $(WORKDIR)/chromium CHROMIUM_ROOT = $(WORKSRC) EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib GARCOMPILER = GNU +# Because of bashisms in Makefiles in Chromium +SHELL = /opt/csw/bin/bash + include gar/category.mk $(WORKSRC)/.gclient: @@ -195,20 +200,32 @@ GYP_GENERATORS=make \ gclient config http://src.chromium.org/svn/trunk/src) +post-extract-modulated: + mkdir -p $(WORKSRC) + (cd $(WORKSRC) \ + && \ + if [ -d src ]; then \ + (cd src && git fetch ); \ + else \ + git clone git://git.chromium.org/chromium.git src; \ + fi) + @$(MAKECOOKIE) + # Skipping gclient sync for now; running only gclient runhooks. The build # instructions say that we'll miss on some platform-specific depends, but # I don't think there's anything platform-specific for Solaris in the source # code repository. -configure-chromium: depot-tools gclient-runhooks - @$(MAKECOOKIE) +configure-chromium: depot-tools gclient-sync gclient-sync: $(WORKSRC)/.gclient (cd $(WORKSRC) \ && \ PATH=$$PATH:$(abspath $(WORKDIR)/depot_tools):/opt/csw/gcc4/bin \ + GYP_DEFINES="use_system_ffmpeg=1" \ GYP_GENERATORS=make \ - gclient sync) + gclient sync --revision src@$(CHROMIUM_REVISION)) + # gclient sync) @$(MAKECOOKIE) gclient-runhooks: $(WORKSRC)/.gclient @@ -216,6 +233,7 @@ && \ PATH=$$PATH:$(abspath $(WORKDIR)/depot_tools):/opt/csw/gcc4/bin \ GYP_GENERATORS=make \ + GYP_DEFINES="use_system_ffmpeg=1" \ gclient runhooks --force) @$(MAKECOOKIE) @@ -234,4 +252,4 @@ (cd $(CHROMIUM_ROOT)/src \ && \ PATH=$$PATH:$(abspath $(WORKDIR)/depot_tools):/opt/csw/gcc4/bin \ - gmake chrome) + gmake $(PARALLELMFLAGS) chrome) 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 Nov 27 10:56:37 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 27 Nov 2009 09:56:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[7476] csw/mgar/pkg/zebra/trunk/Makefile Message-ID: Revision: 7476 http://gar.svn.sourceforge.net/gar/?rev=7476&view=rev Author: dmichelsen Date: 2009-11-27 09:56:37 +0000 (Fri, 27 Nov 2009) Log Message: ----------- zebra: Migrate existing config files Modified Paths: -------------- csw/mgar/pkg/zebra/trunk/Makefile Modified: csw/mgar/pkg/zebra/trunk/Makefile =================================================================== --- csw/mgar/pkg/zebra/trunk/Makefile 2009-11-27 09:35:36 UTC (rev 7475) +++ csw/mgar/pkg/zebra/trunk/Makefile 2009-11-27 09:56:37 UTC (rev 7476) @@ -35,4 +35,6 @@ SAMPLECONF += /etc/opt/csw/ripd.conf SAMPLECONF += /etc/opt/csw/zebra.conf +MIGRATE_FILES = bgpd.conf ospfd.conf ripd.conf zebra.conf + 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 Fri Nov 27 11:58:48 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 27 Nov 2009 10:58:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[7477] csw/mgar/pkg/libgnomecanvas Message-ID: Revision: 7477 http://gar.svn.sourceforge.net/gar/?rev=7477&view=rev Author: dmichelsen Date: 2009-11-27 10:58:48 +0000 (Fri, 27 Nov 2009) Log Message: ----------- libgnomecanvas: Move to mGAR v2 Added Paths: ----------- csw/mgar/pkg/libgnomecanvas/branches/ csw/mgar/pkg/libgnomecanvas/tags/ csw/mgar/pkg/libgnomecanvas/tags/legacy/ csw/mgar/pkg/libgnomecanvas/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/libgnomecanvas/trunk/legacy/ Copied: csw/mgar/pkg/libgnomecanvas/trunk/Makefile (from rev 7462, csw/mgar/pkg/gconf2/trunk/Makefile) =================================================================== --- csw/mgar/pkg/libgnomecanvas/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libgnomecanvas/trunk/Makefile 2009-11-27 10:58:48 UTC (rev 7477) @@ -0,0 +1,25 @@ +GARNAME = libgnomecanvas +GARVERSION = 2.26.0 +CATEGORIES = lib + +DESCRIPTION = GNOME Canvas Lib +define BLURB + The libgnomecanvas package contains the GNOME canvas library. It is an engine + for structured graphics and one of the essential GNOME libraries. +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(DISTNAME).tar.bz2 + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +CONFIGURE_ARGS = $(DIRPATHS) + +BUILD64 = 1 +NO_ISAEXEC = 1 + +TEST_TARGET = check + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Nov 27 12:04:06 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 27 Nov 2009 11:04:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7478] csw/mgar/pkg Message-ID: Revision: 7478 http://gar.svn.sourceforge.net/gar/?rev=7478&view=rev Author: dmichelsen Date: 2009-11-27 11:04:06 +0000 (Fri, 27 Nov 2009) Log Message: ----------- xscreensaver: Initial commit Added Paths: ----------- csw/mgar/pkg/xscreensaver/ csw/mgar/pkg/xscreensaver/branches/ csw/mgar/pkg/xscreensaver/tags/ csw/mgar/pkg/xscreensaver/trunk/ csw/mgar/pkg/xscreensaver/trunk/Makefile csw/mgar/pkg/xscreensaver/trunk/checksums csw/mgar/pkg/xscreensaver/trunk/files/ Property changes on: csw/mgar/pkg/xscreensaver/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/xscreensaver/trunk/Makefile =================================================================== --- csw/mgar/pkg/xscreensaver/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xscreensaver/trunk/Makefile 2009-11-27 11:04:06 UTC (rev 7478) @@ -0,0 +1,21 @@ +GARNAME = xscreensaver +GARVERSION = 5.10 +CATEGORIES = utils + +DESCRIPTION = The ultimate screensaver collection +define BLURB + A collection of free screen savers for X11 and MacOS. +endef + +MASTER_SITES = http://www.jwz.org/xscreensaver/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +PACKAGES = CSWxsave +CATALOGNAME = xscreensaver + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/xscreensaver/trunk/checksums =================================================================== --- csw/mgar/pkg/xscreensaver/trunk/checksums (rev 0) +++ csw/mgar/pkg/xscreensaver/trunk/checksums 2009-11-27 11:04:06 UTC (rev 7478) @@ -0,0 +1 @@ +0d7205f9da8e3f1b83bcda549d73a7c4 xscreensaver-5.10.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 Nov 27 14:48:44 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 27 Nov 2009 13:48:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7479] csw/mgar/pkg/scummvm Message-ID: Revision: 7479 http://gar.svn.sourceforge.net/gar/?rev=7479&view=rev Author: dmichelsen Date: 2009-11-27 13:48:44 +0000 (Fri, 27 Nov 2009) Log Message: ----------- scummvm: Move to mGAR v2, wait for dependencies Added Paths: ----------- csw/mgar/pkg/scummvm/branches/ csw/mgar/pkg/scummvm/tags/ csw/mgar/pkg/scummvm/tags/legacy/ csw/mgar/pkg/scummvm/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/scummvm/trunk/legacy/ Copied: csw/mgar/pkg/scummvm/trunk/Makefile (from rev 7478, csw/mgar/pkg/xscreensaver/trunk/Makefile) =================================================================== --- csw/mgar/pkg/scummvm/trunk/Makefile (rev 0) +++ csw/mgar/pkg/scummvm/trunk/Makefile 2009-11-27 13:48:44 UTC (rev 7479) @@ -0,0 +1,26 @@ +GARNAME = scummvm +GARVERSION = 1.0.0 +CATEGORIES = apps + +DESCRIPTION = Virtual machine for several classic graphical point-and-click adventure games +define BLURB +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +GARCOMPILER = GCC4 + +# Custom configure +CONFIGURE_ARGS = --prefix=$(prefix) +CONFIGURE_ARGS += --bindir=$(bindir) +CONFIGURE_ARGS += --mandir=$(mandir) +CONFIGURE_ARGS += --datadir=$(datadir) +CONFIGURE_ARGS += --libdir=$(libdir) +CONFIGURE_ARGS += --enable-all-engines + + +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 Fri Nov 27 15:26:44 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 27 Nov 2009 14:26:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7480] csw/mgar/pkg/nss/branches/upstream-work Message-ID: Revision: 7480 http://gar.svn.sourceforge.net/gar/?rev=7480&view=rev Author: wahwah Date: 2009-11-27 14:26:44 +0000 (Fri, 27 Nov 2009) Log Message: ----------- nss: Added patches to make it use system sqlite3 and compile Modified Paths: -------------- csw/mgar/pkg/nss/branches/upstream-work/Makefile csw/mgar/pkg/nss/branches/upstream-work/checksums Added Paths: ----------- csw/mgar/pkg/nss/branches/upstream-work/files/include.patch csw/mgar/pkg/nss/branches/upstream-work/files/ld-options.patch csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3-64.patch csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3.patch csw/mgar/pkg/nss/branches/upstream-work/files/sqlite3-32.patch csw/mgar/pkg/nss/branches/upstream-work/files/sqlite3-64.patch Modified: csw/mgar/pkg/nss/branches/upstream-work/Makefile =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/Makefile 2009-11-27 13:48:44 UTC (rev 7479) +++ csw/mgar/pkg/nss/branches/upstream-work/Makefile 2009-11-27 14:26:44 UTC (rev 7480) @@ -14,6 +14,21 @@ # TODO: nss-config # TODO: a better nss.pc +# For DBG builds +PATCHFILES = whoami.patch +# I'll let Wan-Teh decide what and where to patch +PATCHFILES += include.patch +PATCHFILES += ld-options.patch +PATCHFILES += platlibs-sqlite3.patch +PATCHFILES_isa-sparcv8 = sqlite3-32.patch +PATCHFILES_isa-i386 = sqlite3-32.patch +PATCHFILES_isa-sparcv9 = sqlite3-64.patch +PATCHFILES_isa-sparcv9 += platlibs-sqlite3-64.patch +PATCHFILES_isa-amd64 = sqlite3-64.patch +PATCHFILES_isa-amd64 += platlibs-sqlite3-64.patch + + + GARNAME = nss MAJOR_VERSION = 3 MINOR_VERSION = 12 @@ -33,7 +48,6 @@ RTM_NAME = NSS_3_12_4_RTM MASTER_SITES = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTNAME = $(GARNAME)-$(GARVERSION) UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz REQUIRED_PKGS = CSWnspr CSWsqlite3 PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWsqlite3devel @@ -42,11 +56,12 @@ INSTALL_SCRIPTS = nss TEST_SCRIPTS = BUILD64 = 1 +EXTRA_INC = $(prefix)/include libdir_install = $(prefix)/lib includedir = $(prefix)/include/nss -ifeq (OPT,$(GARFLAVOR)) +ifneq (DBG,$(GARFLAVOR)) BUILD_OPT = 1 export BUILD_OPT endif @@ -58,6 +73,10 @@ NSS_ENABLE_ECC = 1 export NSS_ENABLE_ECC +# To avoid creating /opt/csw/lib/libsqlite3.so (already exists) +NSS_USE_SYSTEM_SQLITE = 1 +export NSS_USE_SYSTEM_SQLITE + # 64-bit suppport ifeq ($(MODULATION),isa-sparcv9) USE_64 = 1 @@ -74,9 +93,8 @@ endif export NSPR_LIB_DIR -# For DBG builds -PATCHFILES = whoami.patch - +# Based on: +# http://mxr.mozilla.org/security/source/security/nss/pkg/solaris/SUNWtlsu/prototype_com NSS_BINARIES = addbuiltin NSS_BINARIES += certutil NSS_BINARIES += cmsutil @@ -95,25 +113,24 @@ build-coreconf: (cd $(WORKSRC)/mozilla/security/coreconf \ && \ - $(BUILD_ENV) \ - && \ - gmake -j1 CC="$(CC)") + CPPFLAGS='$(CPPFLAGS)' LD_OPTIONS='$(LD_OPTIONS)' \ + gmake -j1) @$(MAKECOOKIE) build-dbm: (cd $(WORKSRC)/mozilla/security/dbm \ && \ - $(BUILD_ENV) \ - && \ - gmake -j1 CC="$(CC)") + CPPFLAGS='$(CPPFLAGS)' LD_OPTIONS='$(LD_OPTIONS)' \ + gmake -j1) @$(MAKECOOKIE) +# There's an extra interpolation somehwere inside nss' build system, so $$$$ +# needs to be used instead of $$. build-nss-compile: (cd $(WORKSRC)/mozilla/security/nss \ && \ - $(BUILD_ENV) \ - && \ - gmake -j1 CC="$(CC)") + CPPFLAGS='$(CPPFLAGS)' LD_OPTIONS='$(LD_OPTIONS) -R/opt/csw/lib/$$$$ISALIST' \ + gmake -j1) @$(MAKECOOKIE) install-nss: @@ -135,8 +152,10 @@ do \ ginstall -m 644 $${f} $(DESTDIR)$(includedir); \ done - for bin in in $(WORKSRC)/mozilla/dist/*/bin/* ; do \ - ginstall -m 755 $${file} $(DESTDIR)$(bindir)/nss`basename $${file}`; \ + for bin in $(NSS_BINARIES); do \ + ginstall -m 755 \ + $(WORKSRC)/mozilla/dist/*/bin/$${bin} \ + $(DESTDIR)$(bindir)/`basename $${file}`; \ done # Asserting that we have the right version in the .pc file ggrep "Version: $(GARVERSION)" $(FILEDIR)/nss.pc \ Modified: csw/mgar/pkg/nss/branches/upstream-work/checksums =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/checksums 2009-11-27 13:48:44 UTC (rev 7479) +++ csw/mgar/pkg/nss/branches/upstream-work/checksums 2009-11-27 14:26:44 UTC (rev 7480) @@ -1,2 +1,8 @@ -8f76e381bf2339d731bfd5b8116c25a4 nss-3.12.4-with-nspr-4.8.tar.gz +4b2246d07092fe8b2f29a1a01e9bc821 include.patch +79083e118f3d885957910fc845844c1c ld-options.patch +1ee3ed9c1900079319bd1de51388d856 nss-3.12.4.tar.gz +bd8d96c42238c7cfd07ec1ba21191066 platlibs-sqlite3-64.patch +f0f40bd021423ab1680b4d87cd19c1db platlibs-sqlite3.patch +cae46161d981e8aea822953b34339e60 sqlite3-32.patch +b07d3de42785866c3c4385846fd8eb52 sqlite3-64.patch 221646aa1954b4a255ac03e7d8b0225d whoami.patch Added: csw/mgar/pkg/nss/branches/upstream-work/files/include.patch =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/files/include.patch (rev 0) +++ csw/mgar/pkg/nss/branches/upstream-work/files/include.patch 2009-11-27 14:26:44 UTC (rev 7480) @@ -0,0 +1,11 @@ +--- a/mozilla/security/coreconf/SunOS5.mk.orig 2009-11-26 09:29:22.101030210 +0100 ++++ b/mozilla/security/coreconf/SunOS5.mk 2009-11-26 09:29:33.419484372 +0100 +@@ -104,7 +104,7 @@ + endif + endif + +-INCLUDES += -I/usr/dt/include -I/usr/openwin/include ++INCLUDES += -I/usr/dt/include -I/usr/openwin/include $(CPPFLAGS) + + RANLIB = echo + CPU_ARCH = sparc Added: csw/mgar/pkg/nss/branches/upstream-work/files/ld-options.patch =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/files/ld-options.patch (rev 0) +++ csw/mgar/pkg/nss/branches/upstream-work/files/ld-options.patch 2009-11-27 14:26:44 UTC (rev 7480) @@ -0,0 +1,10 @@ +--- a/mozilla/security/coreconf/SunOS5.mk.orig 2009-11-26 11:52:54.279684353 +0100 ++++ b/mozilla/security/coreconf/SunOS5.mk 2009-11-26 11:53:05.767884648 +0100 +@@ -175,6 +175,6 @@ + RPATH = -R '$$ORIGIN:/usr/lib/mps/secv1:/usr/lib/mps' + endif + else +-RPATH = -R '$$ORIGIN' ++RPATH = $(LDFLAGS) $(LD_OPTIONS) + endif + Added: csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3-64.patch =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3-64.patch (rev 0) +++ csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3-64.patch 2009-11-27 14:26:44 UTC (rev 7480) @@ -0,0 +1,11 @@ +--- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk.orig 2009-11-23 14:17:29.741267874 +0100 ++++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk 2009-11-23 14:17:41.292422026 +0100 +@@ -82,7 +82,7 @@ + endif + endif + +-SQLITE=-R/opt/csw/lib/$$ISALIST -L/opt/csw/lib -lsqlite3 ++SQLITE=-R/opt/csw/lib/$$ISALIST -L/opt/csw/lib/64 -lsqlite3 + + ifdef NSS_DISABLE_DBM + DBMLIB = $(NULL) Added: csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3.patch =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3.patch (rev 0) +++ csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3.patch 2009-11-27 14:26:44 UTC (rev 7480) @@ -0,0 +1,11 @@ +--- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk.orig 2009-11-21 17:28:09.997982796 +0100 ++++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk 2009-11-21 17:28:32.107632453 +0100 +@@ -80,7 +80,7 @@ + endif + endif + +-SQLITE=-lsqlite3 ++SQLITE=-R/opt/csw/lib/$$ISALIST -L/opt/csw/lib -lsqlite3 + + ifdef NSS_DISABLE_DBM + DBMLIB = $(NULL) Added: csw/mgar/pkg/nss/branches/upstream-work/files/sqlite3-32.patch =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/files/sqlite3-32.patch (rev 0) +++ csw/mgar/pkg/nss/branches/upstream-work/files/sqlite3-32.patch 2009-11-27 14:26:44 UTC (rev 7480) @@ -0,0 +1,18 @@ +--- a/mozilla/security/nss/lib/softoken/config.mk.orig 2009-11-27 00:13:49.173159939 +0100 ++++ b/mozilla/security/nss/lib/softoken/config.mk 2009-11-27 00:15:19.891579729 +0100 +@@ -57,6 +57,7 @@ + -L$(DIST)/lib \ + -L$(NSSUTIL_LIB_DIR) \ + -lnssutil3 \ ++ -L/opt/csw/lib \ + -lsqlite3 \ + -L$(NSPR_LIB_DIR) \ + -lplc4 \ +@@ -83,6 +84,7 @@ + -L$(DIST)/lib \ + -L$(NSSUTIL_LIB_DIR) \ + -lnssutil3 \ ++ -L/opt/csw/lib \ + -lsqlite3 \ + -L$(NSPR_LIB_DIR) \ + -lplc4 \ Added: csw/mgar/pkg/nss/branches/upstream-work/files/sqlite3-64.patch =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/files/sqlite3-64.patch (rev 0) +++ csw/mgar/pkg/nss/branches/upstream-work/files/sqlite3-64.patch 2009-11-27 14:26:44 UTC (rev 7480) @@ -0,0 +1,18 @@ +--- a/mozilla/security/nss/lib/softoken/config.mk.orig 2009-11-27 00:13:49.173159939 +0100 ++++ b/mozilla/security/nss/lib/softoken/config.mk 2009-11-27 00:15:48.846636621 +0100 +@@ -57,6 +57,7 @@ + -L$(DIST)/lib \ + -L$(NSSUTIL_LIB_DIR) \ + -lnssutil3 \ ++ -L/opt/csw/lib/64 \ + -lsqlite3 \ + -L$(NSPR_LIB_DIR) \ + -lplc4 \ +@@ -83,6 +84,7 @@ + -L$(DIST)/lib \ + -L$(NSSUTIL_LIB_DIR) \ + -lnssutil3 \ ++ -L/opt/csw/lib/64 \ + -lsqlite3 \ + -L$(NSPR_LIB_DIR) \ + -lplc4 \ 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 Nov 27 15:28:07 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 27 Nov 2009 14:28:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7481] csw/mgar/pkg/exiftool/trunk Message-ID: Revision: 7481 http://gar.svn.sourceforge.net/gar/?rev=7481&view=rev Author: dmichelsen Date: 2009-11-27 14:28:07 +0000 (Fri, 27 Nov 2009) Log Message: ----------- exiftool: Switch to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/exiftool/trunk/Makefile csw/mgar/pkg/exiftool/trunk/checksums Added Paths: ----------- csw/mgar/pkg/exiftool/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/exiftool/trunk/files/CSWexiftool.gspec Modified: csw/mgar/pkg/exiftool/trunk/Makefile =================================================================== --- csw/mgar/pkg/exiftool/trunk/Makefile 2009-11-27 14:26:44 UTC (rev 7480) +++ csw/mgar/pkg/exiftool/trunk/Makefile 2009-11-27 14:28:07 UTC (rev 7481) @@ -13,9 +13,9 @@ MASTER_SITES = http://owl.phy.queensu.ca/~phil/exiftool/ MODDIST = DISTFILES = $(DISTNAME).tar.gz -DISTFILES += $(call admfiles,CSWexiftool,) +DISTFILES += COPYING -REQUIRED_PKGS += CSWperl CSWpmiocompress +REQUIRED_PKGS = CSWpmiocompress # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = Image-ExifTool-(\d+(?:\.\d+)*).tar.gz @@ -26,4 +26,6 @@ CONFIGURE_ARGS = $(DIRPATHS) +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/exiftool/trunk/checksums =================================================================== --- csw/mgar/pkg/exiftool/trunk/checksums 2009-11-27 14:26:44 UTC (rev 7480) +++ csw/mgar/pkg/exiftool/trunk/checksums 2009-11-27 14:28:07 UTC (rev 7481) @@ -1,2 +1,2 @@ -13f9aae615a5de5e3c145b374950a75c download/CSWexiftool.gspec -f397ee071a01104e6c68da43f3bdd372 download/Image-ExifTool-7.99.tar.gz +13f9aae615a5de5e3c145b374950a75c COPYING +525f52712c2ab21c467ade83ceb567b8 Image-ExifTool-8.00.tar.gz Copied: csw/mgar/pkg/exiftool/trunk/files/COPYING (from rev 7479, csw/mgar/pkg/exiftool/trunk/files/CSWexiftool.gspec) =================================================================== --- csw/mgar/pkg/exiftool/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/exiftool/trunk/files/COPYING 2009-11-27 14:28:07 UTC (rev 7481) @@ -0,0 +1,9 @@ +%var bitname exiftool +%var pkgname CSWexiftool +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright +Copyright 2003-2009, Phil Harvey + +This is free software; you can redistribute it and/or modify it under the +same terms as Perl itself. Deleted: csw/mgar/pkg/exiftool/trunk/files/CSWexiftool.gspec =================================================================== --- csw/mgar/pkg/exiftool/trunk/files/CSWexiftool.gspec 2009-11-27 14:26:44 UTC (rev 7480) +++ csw/mgar/pkg/exiftool/trunk/files/CSWexiftool.gspec 2009-11-27 14:28:07 UTC (rev 7481) @@ -1,9 +0,0 @@ -%var bitname exiftool -%var pkgname CSWexiftool -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright -Copyright 2003-2009, Phil Harvey - -This 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 wahwah at users.sourceforge.net Fri Nov 27 15:45:45 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 27 Nov 2009 14:45:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[7482] csw/mgar/pkg/nss/branches/upstream-work/Makefile Message-ID: Revision: 7482 http://gar.svn.sourceforge.net/gar/?rev=7482&view=rev Author: wahwah Date: 2009-11-27 14:45:45 +0000 (Fri, 27 Nov 2009) Log Message: ----------- nss: Updated to use CSWsqlite3rt Modified Paths: -------------- csw/mgar/pkg/nss/branches/upstream-work/Makefile Modified: csw/mgar/pkg/nss/branches/upstream-work/Makefile =================================================================== --- csw/mgar/pkg/nss/branches/upstream-work/Makefile 2009-11-27 14:28:07 UTC (rev 7481) +++ csw/mgar/pkg/nss/branches/upstream-work/Makefile 2009-11-27 14:45:45 UTC (rev 7482) @@ -49,7 +49,7 @@ MASTER_SITES = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS = CSWnspr CSWsqlite3 +REQUIRED_PKGS = CSWnspr CSWsqlite3rt PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWsqlite3devel CONFIGURE_SCRIPTS = BUILD_SCRIPTS = nss 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 Nov 27 15:54:00 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 27 Nov 2009 14:54:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7483] csw/mgar/pkg/coreutils/trunk/Makefile Message-ID: Revision: 7483 http://gar.svn.sourceforge.net/gar/?rev=7483&view=rev Author: bdwalton Date: 2009-11-27 14:54:00 +0000 (Fri, 27 Nov 2009) Log Message: ----------- coreutils: use TEST_TARGET instead of awkward install-custom (thanks Dago) Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-27 14:45:45 UTC (rev 7482) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-27 14:54:00 UTC (rev 7483) @@ -32,16 +32,12 @@ CONFIGURE_ARGS += --with-libiconv-prefix=/opt/csw/ CONFIGURE_ARGS += --enable-no-install-program=arch,hostname,su,chcon -TEST_SCRIPTS = custom +TEST_TARGET = check include gar/category.mk PATH := /opt/csw/gnu:/opt/csw/bin:$(PATH) -test-custom: - @(cd $(WORKSRC); gmake check) - @$(MAKECOOKIE) - post-install-modulated: @echo Cleaning up install directory... rm -rf $(DESTDIR)/$(libdir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Nov 27 16:42:19 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 27 Nov 2009 15:42:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[7484] csw/mgar/pkg Message-ID: Revision: 7484 http://gar.svn.sourceforge.net/gar/?rev=7484&view=rev Author: dmichelsen Date: 2009-11-27 15:42:19 +0000 (Fri, 27 Nov 2009) Log Message: ----------- libmpeg2: Initial commit Added Paths: ----------- csw/mgar/pkg/libmpeg2/ csw/mgar/pkg/libmpeg2/branches/ csw/mgar/pkg/libmpeg2/tags/ csw/mgar/pkg/libmpeg2/trunk/ csw/mgar/pkg/libmpeg2/trunk/Makefile csw/mgar/pkg/libmpeg2/trunk/checksums csw/mgar/pkg/libmpeg2/trunk/files/ csw/mgar/pkg/libmpeg2/trunk/files/0001-Don-t-use-arm-specific-assembly-on-Sparc.patch Property changes on: csw/mgar/pkg/libmpeg2/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/libmpeg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmpeg2/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libmpeg2/trunk/Makefile 2009-11-27 15:42:19 UTC (rev 7484) @@ -0,0 +1,36 @@ +GARNAME = libmpeg2 +GARVERSION = 0.5.1 +CATEGORIES = lib + +DESCRIPTION = A free MPEG-2 video stream decoder +define BLURB +endef + +MASTER_SITES = http://libmpeg2.sourceforge.net/files/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Don-t-use-arm-specific-assembly-on-Sparc.patch + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +PACKAGES = CSWlibmpeg2 CSWmpeg2dec + +SPKG_DESC_CSWlibmpeg2 = A free MPEG-2 video stream library +SPKG_DESC_CSWmpeg2dec = A free MPEG-2 video stream decoder + +REQUIRED_PKGS_CSWmpeg2dec = CSWlibmpeg2 + +SPKG_SOURCEURL = http://libmpeg2.sourceforge.net + +# This stupid configure script adds '-fast' overwriting -xarch and +# especially activating 64 bit. +BUILD_ARGS = MPEG2DEC_CFLAGS= OPT_CFLAGS= + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) +# Do this only for sparcv8 and i386, otherwise make sure to compile on vis/mmx-enable ISA +CONFIGURE_ARGS += --disable-accel-detect + +PKGFILES_CSWmpeg2dec = $(bindir)/mpeg2dec + +include gar/category.mk Added: csw/mgar/pkg/libmpeg2/trunk/checksums =================================================================== --- csw/mgar/pkg/libmpeg2/trunk/checksums (rev 0) +++ csw/mgar/pkg/libmpeg2/trunk/checksums 2009-11-27 15:42:19 UTC (rev 7484) @@ -0,0 +1,2 @@ +92ebb653c36deb0a93fe597de10a546e 0001-Don-t-use-arm-specific-assembly-on-Sparc.patch +0f92c7454e58379b4a5a378485bbd8ef libmpeg2-0.5.1.tar.gz Added: csw/mgar/pkg/libmpeg2/trunk/files/0001-Don-t-use-arm-specific-assembly-on-Sparc.patch =================================================================== --- csw/mgar/pkg/libmpeg2/trunk/files/0001-Don-t-use-arm-specific-assembly-on-Sparc.patch (rev 0) +++ csw/mgar/pkg/libmpeg2/trunk/files/0001-Don-t-use-arm-specific-assembly-on-Sparc.patch 2009-11-27 15:42:19 UTC (rev 7484) @@ -0,0 +1,44184 @@ +From 38401a415b34a0751d5f7a48f9b35c2b23715f15 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 27 Nov 2009 15:50:03 +0100 +Subject: [PATCH] Don't use arm-specific assembly on Sparc + +--- + Makefile.in | 220 +- + aclocal.m4 | 6985 +----------- + configure |27651 ++++++++++++------------------------------ + configure.ac | 1 + + doc/Makefile.in | 115 +- + include/Makefile.in | 139 +- + include/config.h.in | 24 +- + libmpeg2/Makefile.in | 296 +- + libmpeg2/convert/Makefile.in | 177 +- + libvo/Makefile.in | 103 +- + src/Makefile.in | 266 +- + test/Makefile.in | 124 +- + vc++/Makefile.in | 71 +- + 13 files changed, 8818 insertions(+), 27354 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 2816117..10a972c 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.11 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,8 +16,9 @@ + @SET_MAKE@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ ++pkglibdir = $(libdir)/@PACKAGE@ ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -40,7 +42,10 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/cflags.m4 \ + $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/keywords.m4 \ +- $(top_srcdir)/m4/nonpic.m4 $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ ++ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ ++ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nonpic.m4 \ ++ $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ +@@ -48,6 +53,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/include/config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + SOURCES = + DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ +@@ -59,15 +65,43 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + ps-recursive uninstall-recursive + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ++AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ ++ distdir dist dist-all distcheck + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + distdir = $(PACKAGE)-$(VERSION) + top_distdir = $(distdir) + am__remove_distdir = \ +- { test ! -d $(distdir) \ +- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ +- && rm -fr $(distdir); }; } ++ { test ! -d "$(distdir)" \ ++ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ ++ && rm -fr "$(distdir)"; }; } ++am__relativize = \ ++ dir0=`pwd`; \ ++ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ ++ sed_rest='s,^[^/]*/*,,'; \ ++ sed_last='s,^.*/\([^/]*\)$$,\1,'; \ ++ sed_butlast='s,/*[^/]*$$,,'; \ ++ while test -n "$$dir1"; do \ ++ first=`echo "$$dir1" | sed -e "$$sed_first"`; \ ++ if test "$$first" != "."; then \ ++ if test "$$first" = ".."; then \ ++ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ ++ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ ++ else \ ++ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ ++ if test "$$first2" = "$$first"; then \ ++ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ ++ else \ ++ dir2="../$$dir2"; \ ++ fi; \ ++ dir0="$$dir0"/"$$first"; \ ++ fi; \ ++ fi; \ ++ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ ++ done; \ ++ reldir="$$dir2" + DIST_ARCHIVES = $(distdir).tar.gz + GZIP_ENV = --best + distuninstallcheck_listfiles = find . -type f -print +@@ -90,29 +124,25 @@ CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CXX = @CXX@ +-CXXCPP = @CXXCPP@ +-CXXDEPMODE = @CXXDEPMODE@ +-CXXFLAGS = @CXXFLAGS@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ + GREP = @GREP@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ++LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@ + LIBOBJS = @LIBOBJS@ +@@ -120,21 +150,26 @@ LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBVO_CFLAGS = @LIBVO_CFLAGS@ + LIBVO_LIBS = @LIBVO_LIBS@ ++LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ + MPEG2DEC_CFLAGS = @MPEG2DEC_CFLAGS@ ++NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OPT_CFLAGS = @OPT_CFLAGS@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + RANLIB = @RANLIB@ +@@ -154,8 +189,7 @@ abs_srcdir = @abs_srcdir@ + abs_top_builddir = @abs_top_builddir@ + abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ +-ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -186,6 +220,7 @@ libdir = @libdir@ + libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ +@@ -198,6 +233,7 @@ sharedstatedir = @sharedstatedir@ + srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + SUBDIRS = libmpeg2 include libvo src test vc++ +@@ -215,15 +251,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ +- cd $(srcdir) && $(AUTOMAKE) --foreign \ ++ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \ ++ $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --foreign Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -239,9 +275,10 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENC + $(SHELL) ./config.status --recheck + + $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(srcdir) && $(AUTOCONF) ++ $(am__cd) $(srcdir) && $(AUTOCONF) + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) ++ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) ++$(am__aclocal_m4_deps): + + mostlyclean-libtool: + -rm -f *.lo +@@ -250,7 +287,7 @@ clean-libtool: + -rm -rf .libs _libs + + distclean-libtool: +- -rm -f libtool ++ -rm -f libtool config.lt + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. +@@ -276,7 +313,7 @@ $(RECURSIVE_TARGETS): + else \ + local_target="$$target"; \ + fi; \ +- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ +@@ -310,16 +347,16 @@ $(RECURSIVE_CLEAN_TARGETS): + else \ + local_target="$$target"; \ + fi; \ +- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ ++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +@@ -327,14 +364,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +@@ -346,7 +383,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ +- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ ++ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +@@ -355,36 +392,41 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ + fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) + $(am__remove_distdir) +- test -d $(distdir) || mkdir $(distdir) ++ test -d "$(distdir)" || mkdir "$(distdir)" + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -400,38 +442,54 @@ distdir: $(DISTFILES) + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ +- (cd $$subdir && \ ++ fi; \ ++ done ++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ ++ $(am__relativize); \ ++ new_distdir=$$reldir; \ ++ dir1=$$subdir; dir2="$(top_distdir)"; \ ++ $(am__relativize); \ ++ new_top_distdir=$$reldir; \ ++ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ ++ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ ++ ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ ++ top_distdir="$$new_top_distdir" \ ++ distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ ++ am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done +- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ++ -test -n "$(am__skip_mode_fix)" \ ++ || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ +- || chmod -R a+r $(distdir) ++ || chmod -R a+r "$(distdir)" + dist-gzip: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) +@@ -444,6 +502,10 @@ dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + ++dist-xz: distdir ++ tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz ++ $(am__remove_distdir) ++ + dist-tarZ: distdir + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__remove_distdir) +@@ -472,6 +534,8 @@ distcheck: dist + bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ ++ *.tar.xz*) \ ++ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ +@@ -483,9 +547,11 @@ distcheck: dist + mkdir $(distdir)/_build + mkdir $(distdir)/_inst + chmod a-w $(distdir) ++ test -d $(distdir)/_build || exit 0; \ + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ +- && cd $(distdir)/_build \ ++ && am__cwd=`pwd` \ ++ && $(am__cd) $(distdir)/_build \ + && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(DISTCHECK_CONFIGURE_FLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) \ +@@ -507,13 +573,15 @@ distcheck: dist + && rm -rf "$$dc_destdir" \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && rm -rf $(DIST_ARCHIVES) \ +- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck ++ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ ++ && cd "$$am__cwd" \ ++ || exit 1 + $(am__remove_distdir) + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' + distuninstallcheck: +- @cd $(distuninstallcheck_dir) \ ++ @$(am__cd) '$(distuninstallcheck_dir)' \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ +@@ -555,6 +623,7 @@ clean-generic: + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -575,6 +644,8 @@ dvi-am: + + html: html-recursive + ++html-am: ++ + info: info-recursive + + info-am: +@@ -583,18 +654,28 @@ install-data-am: + + install-dvi: install-dvi-recursive + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-recursive + ++install-html-am: ++ + install-info: install-info-recursive + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-recursive + ++install-pdf-am: ++ + install-ps: install-ps-recursive + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -617,24 +698,25 @@ ps-am: + + uninstall-am: + +-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ +- install-strip ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ ++ install-am install-strip tags-recursive + + .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am am--refresh check check-am clean clean-generic \ + clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ +- dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \ +- distclean distclean-generic distclean-libtool distclean-tags \ +- distcleancheck distdir distuninstallcheck dvi dvi-am html \ +- html-am info info-am install install-am install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs installdirs-am maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ +- uninstall uninstall-am ++ dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ ++ distcheck distclean distclean-generic distclean-libtool \ ++ distclean-tags distcleancheck distdir distuninstallcheck dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs installdirs-am \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am ++ + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +diff --git a/aclocal.m4 b/aclocal.m4 +index f65e285..6aa0de9 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -1,7 +1,7 @@ +-# generated automatically by aclocal 1.10.1 -*- Autoconf -*- ++# generated automatically by aclocal 1.11 -*- Autoconf -*- + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +-# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -13,6665 +13,13 @@ + + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +-m4_if(AC_AUTOCONF_VERSION, [2.61],, +-[m4_warning([this file was generated for autoconf 2.61. ++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, ++[m4_warning([this file was generated for autoconf 2.65. + You have another version of autoconf. It may work, but is not guaranteed to. + If you have problems, you may need to regenerate the build system entirely. + To do so, use the procedure documented by the package, typically `autoreconf'.])]) + +-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- +- +-# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL +- +- +-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +-# ----------------------------------------------------------- +-# If this macro is not defined by Autoconf, define it here. +-m4_ifdef([AC_PROVIDE_IFELSE], +- [], +- [m4_define([AC_PROVIDE_IFELSE], +- [m4_ifdef([AC_PROVIDE_$1], +- [$2], [$3])])]) +- +- +-# AC_PROG_LIBTOOL +-# --------------- +-AC_DEFUN([AC_PROG_LIBTOOL], +-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl +-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX +-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. +- AC_PROVIDE_IFELSE([AC_PROG_CXX], +- [AC_LIBTOOL_CXX], +- [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX +- ])]) +-dnl And a similar setup for Fortran 77 support +- AC_PROVIDE_IFELSE([AC_PROG_F77], +- [AC_LIBTOOL_F77], +- [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 +-])]) +- +-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. +-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run +-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. +- AC_PROVIDE_IFELSE([AC_PROG_GCJ], +- [AC_LIBTOOL_GCJ], +- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], +- [AC_LIBTOOL_GCJ], +- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], +- [AC_LIBTOOL_GCJ], +- [ifdef([AC_PROG_GCJ], +- [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) +- ifdef([A][M_PROG_GCJ], +- [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) +- ifdef([LT_AC_PROG_GCJ], +- [define([LT_AC_PROG_GCJ], +- defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) +-])])# AC_PROG_LIBTOOL +- +- +-# _AC_PROG_LIBTOOL +-# ---------------- +-AC_DEFUN([_AC_PROG_LIBTOOL], +-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl +-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl +-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl +-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl +- +-# This can be used to rebuild libtool when needed +-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" +- +-# Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' +-AC_SUBST(LIBTOOL)dnl +- +-# Prevent multiple expansion +-define([AC_PROG_LIBTOOL], []) +-])# _AC_PROG_LIBTOOL +- +- +-# AC_LIBTOOL_SETUP +-# ---------------- +-AC_DEFUN([AC_LIBTOOL_SETUP], +-[AC_PREREQ(2.50)dnl +-AC_REQUIRE([AC_ENABLE_SHARED])dnl +-AC_REQUIRE([AC_ENABLE_STATIC])dnl +-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl +-AC_REQUIRE([AC_CANONICAL_HOST])dnl +-AC_REQUIRE([AC_CANONICAL_BUILD])dnl +-AC_REQUIRE([AC_PROG_CC])dnl +-AC_REQUIRE([AC_PROG_LD])dnl +-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl +-AC_REQUIRE([AC_PROG_NM])dnl +- +-AC_REQUIRE([AC_PROG_LN_S])dnl +-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl +-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! +-AC_REQUIRE([AC_OBJEXT])dnl +-AC_REQUIRE([AC_EXEEXT])dnl +-dnl +-AC_LIBTOOL_SYS_MAX_CMD_LEN +-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +-AC_LIBTOOL_OBJDIR +- +-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +-_LT_AC_PROG_ECHO_BACKSLASH +- +-case $host_os in +-aix3*) +- # AIX sometimes has problems with the GCC collect2 program. For some +- # reason, if we set the COLLECT_NAMES environment variable, the problems +- # vanish in a puff of smoke. +- if test "X${COLLECT_NAMES+set}" != Xset; then +- COLLECT_NAMES= +- export COLLECT_NAMES +- fi +- ;; +-esac +- +-# Sed substitution that helps us do robust quoting. It backslashifies +-# metacharacters that are still active within double-quoted strings. +-Xsed='sed -e 1s/^X//' +-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] +- +-# Same as above, but do not quote variable references. +-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] +- +-# Sed substitution to delay expansion of an escaped shell variable in a +-# double_quote_subst'ed string. +-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' +- +-# Sed substitution to avoid accidental globbing in evaled expressions +-no_glob_subst='s/\*/\\\*/g' +- +-# Constants: +-rm="rm -f" +- +-# Global variables: +-default_ofile=libtool +-can_build_shared=yes +- +-# All known linkers require a `.a' archive for static linking (except MSVC, +-# which needs '.lib'). +-libext=a +-ltmain="$ac_aux_dir/ltmain.sh" +-ofile="$default_ofile" +-with_gnu_ld="$lt_cv_prog_gnu_ld" +- +-AC_CHECK_TOOL(AR, ar, false) +-AC_CHECK_TOOL(RANLIB, ranlib, :) +-AC_CHECK_TOOL(STRIP, strip, :) +- +-old_CC="$CC" +-old_CFLAGS="$CFLAGS" +- +-# Set sane defaults for various variables +-test -z "$AR" && AR=ar +-test -z "$AR_FLAGS" && AR_FLAGS=cru +-test -z "$AS" && AS=as +-test -z "$CC" && CC=cc +-test -z "$LTCC" && LTCC=$CC +-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +-test -z "$DLLTOOL" && DLLTOOL=dlltool +-test -z "$LD" && LD=ld +-test -z "$LN_S" && LN_S="ln -s" +-test -z "$MAGIC_CMD" && MAGIC_CMD=file +-test -z "$NM" && NM=nm +-test -z "$SED" && SED=sed +-test -z "$OBJDUMP" && OBJDUMP=objdump +-test -z "$RANLIB" && RANLIB=: +-test -z "$STRIP" && STRIP=: +-test -z "$ac_objext" && ac_objext=o +- +-# Determine commands to create old-style static archives. +-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +-old_postinstall_cmds='chmod 644 $oldlib' +-old_postuninstall_cmds= +- +-if test -n "$RANLIB"; then +- case $host_os in +- openbsd*) +- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" +- ;; +- *) +- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" +- ;; +- esac +- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" +-fi +- +-_LT_CC_BASENAME([$compiler]) +- +-# Only perform the check for file, if the check method requires it +-case $deplibs_check_method in +-file_magic*) +- if test "$file_magic_cmd" = '$MAGIC_CMD'; then +- AC_PATH_MAGIC +- fi +- ;; +-esac +- +-_LT_REQUIRED_DARWIN_CHECKS +- +-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) +-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], +-enable_win32_dll=yes, enable_win32_dll=no) +- +-AC_ARG_ENABLE([libtool-lock], +- [AC_HELP_STRING([--disable-libtool-lock], +- [avoid locking (might break parallel builds)])]) +-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +- +-AC_ARG_WITH([pic], +- [AC_HELP_STRING([--with-pic], +- [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], +- [pic_mode="$withval"], +- [pic_mode=default]) +-test -z "$pic_mode" && pic_mode=default +- +-# Use C for the default configuration in the libtool script +-tagname= +-AC_LIBTOOL_LANG_C_CONFIG +-_LT_AC_TAGCONFIG +-])# AC_LIBTOOL_SETUP +- +- +-# _LT_AC_SYS_COMPILER +-# ------------------- +-AC_DEFUN([_LT_AC_SYS_COMPILER], +-[AC_REQUIRE([AC_PROG_CC])dnl +- +-# If no C compiler was specified, use CC. +-LTCC=${LTCC-"$CC"} +- +-# If no C compiler flags were specified, use CFLAGS. +-LTCFLAGS=${LTCFLAGS-"$CFLAGS"} +- +-# Allow CC to be a program name with arguments. +-compiler=$CC +-])# _LT_AC_SYS_COMPILER +- +- +-# _LT_CC_BASENAME(CC) +-# ------------------- +-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +-AC_DEFUN([_LT_CC_BASENAME], +-[for cc_temp in $1""; do +- case $cc_temp in +- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; +- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; +- \-*) ;; +- *) break;; +- esac +-done +-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +-]) +- +- +-# _LT_COMPILER_BOILERPLATE +-# ------------------------ +-# Check for compiler boilerplate output or warnings with +-# the simple compiler test code. +-AC_DEFUN([_LT_COMPILER_BOILERPLATE], +-[AC_REQUIRE([LT_AC_PROG_SED])dnl +-ac_outfile=conftest.$ac_objext +-echo "$lt_simple_compile_test_code" >conftest.$ac_ext +-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +-_lt_compiler_boilerplate=`cat conftest.err` +-$rm conftest* +-])# _LT_COMPILER_BOILERPLATE +- +- +-# _LT_LINKER_BOILERPLATE +-# ---------------------- +-# Check for linker boilerplate output or warnings with +-# the simple link test code. +-AC_DEFUN([_LT_LINKER_BOILERPLATE], +-[AC_REQUIRE([LT_AC_PROG_SED])dnl +-ac_outfile=conftest.$ac_objext +-echo "$lt_simple_link_test_code" >conftest.$ac_ext +-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +-_lt_linker_boilerplate=`cat conftest.err` +-$rm -r conftest* +-])# _LT_LINKER_BOILERPLATE +- +-# _LT_REQUIRED_DARWIN_CHECKS +-# -------------------------- +-# Check for some things on darwin +-AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ +- case $host_os in +- rhapsody* | darwin*) +- AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) +- AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) +- +- AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], +- [lt_cv_apple_cc_single_mod=no +- if test -z "${LT_MULTI_MODULE}"; then +- # By default we will add the -single_module flag. You can override +- # by either setting the environment variable LT_MULTI_MODULE +- # non-empty at configure time, or by adding -multi_module to the +- # link flags. +- echo "int foo(void){return 1;}" > conftest.c +- $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +- -dynamiclib ${wl}-single_module conftest.c +- if test -f libconftest.dylib; then +- lt_cv_apple_cc_single_mod=yes +- rm -rf libconftest.dylib* +- fi +- rm conftest.c +- fi]) +- AC_CACHE_CHECK([for -exported_symbols_list linker flag], +- [lt_cv_ld_exported_symbols_list], +- [lt_cv_ld_exported_symbols_list=no +- save_LDFLAGS=$LDFLAGS +- echo "_main" > conftest.sym +- LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" +- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], +- [lt_cv_ld_exported_symbols_list=yes], +- [lt_cv_ld_exported_symbols_list=no]) +- LDFLAGS="$save_LDFLAGS" +- ]) +- case $host_os in +- rhapsody* | darwin1.[[0123]]) +- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; +- darwin1.*) +- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; +- darwin*) +- # if running on 10.5 or later, the deployment target defaults +- # to the OS version, if on x86, and 10.4, the deployment +- # target defaults to 10.4. Don't you love it? +- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in +- 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) +- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; +- 10.[[012]]*) +- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; +- 10.*) +- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; +- esac +- ;; +- esac +- if test "$lt_cv_apple_cc_single_mod" = "yes"; then +- _lt_dar_single_mod='$single_module' +- fi +- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then +- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' +- else +- _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" +- fi +- if test "$DSYMUTIL" != ":"; then +- _lt_dsymutil="~$DSYMUTIL \$lib || :" +- else +- _lt_dsymutil= +- fi +- ;; +- esac +-]) +- +-# _LT_AC_SYS_LIBPATH_AIX +-# ---------------------- +-# Links a minimal program and checks the executable +-# for the system default hardcoded library path. In most cases, +-# this is /usr/lib:/lib, but when the MPI compilers are used +-# the location of the communication and MPI libs are included too. +-# If we don't find anything, use the default library path according +-# to the aix ld manual. +-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], +-[AC_REQUIRE([LT_AC_PROG_SED])dnl +-AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +-lt_aix_libpath_sed=' +- /Import File Strings/,/^$/ { +- /^0/ { +- s/^0 *\(.*\)$/\1/ +- p +- } +- }' +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then +- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-fi],[]) +-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +-])# _LT_AC_SYS_LIBPATH_AIX +- +- +-# _LT_AC_SHELL_INIT(ARG) +-# ---------------------- +-AC_DEFUN([_LT_AC_SHELL_INIT], +-[ifdef([AC_DIVERSION_NOTICE], +- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], +- [AC_DIVERT_PUSH(NOTICE)]) +-$1 +-AC_DIVERT_POP +-])# _LT_AC_SHELL_INIT +- +- +-# _LT_AC_PROG_ECHO_BACKSLASH +-# -------------------------- +-# Add some code to the start of the generated configure script which +-# will find an echo command which doesn't interpret backslashes. +-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], +-[_LT_AC_SHELL_INIT([ +-# Check that we are running under the correct shell. +-SHELL=${CONFIG_SHELL-/bin/sh} +- +-case X$ECHO in +-X*--fallback-echo) +- # Remove one level of quotation (which was required for Make). +- ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` +- ;; +-esac +- +-echo=${ECHO-echo} +-if test "X[$]1" = X--no-reexec; then +- # Discard the --no-reexec flag, and continue. +- shift +-elif test "X[$]1" = X--fallback-echo; then +- # Avoid inline document here, it may be left over +- : +-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then +- # Yippee, $echo works! +- : +-else +- # Restart under the correct shell. +- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} +-fi +- +-if test "X[$]1" = X--fallback-echo; then +- # used as fallback echo +- shift +- cat </dev/null 2>&1 && unset CDPATH +- +-if test -z "$ECHO"; then +-if test "X${echo_test_string+set}" != Xset; then +-# find a string as large as possible, as long as the shell can cope with it +- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do +- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... +- if (echo_test_string=`eval $cmd`) 2>/dev/null && +- echo_test_string=`eval $cmd` && +- (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null +- then +- break +- fi +- done +-fi +- +-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- : +-else +- # The Solaris, AIX, and Digital Unix default echo programs unquote +- # backslashes. This makes it impossible to quote backslashes using +- # echo "$something" | sed 's/\\/\\\\/g' +- # +- # So, first we look for a working echo in the user's PATH. +- +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for dir in $PATH /usr/ucb; do +- IFS="$lt_save_ifs" +- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && +- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- echo="$dir/echo" +- break +- fi +- done +- IFS="$lt_save_ifs" +- +- if test "X$echo" = Xecho; then +- # We didn't find a better echo, so look for alternatives. +- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- # This shell has a builtin print -r that does the trick. +- echo='print -r' +- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && +- test "X$CONFIG_SHELL" != X/bin/ksh; then +- # If we have ksh, try running configure again with it. +- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +- export ORIGINAL_CONFIG_SHELL +- CONFIG_SHELL=/bin/ksh +- export CONFIG_SHELL +- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} +- else +- # Try using printf. +- echo='printf %s\n' +- if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- # Cool, printf works +- : +- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && +- test "X$echo_testing_string" = 'X\t' && +- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL +- export CONFIG_SHELL +- SHELL="$CONFIG_SHELL" +- export SHELL +- echo="$CONFIG_SHELL [$]0 --fallback-echo" +- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && +- test "X$echo_testing_string" = 'X\t' && +- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- echo="$CONFIG_SHELL [$]0 --fallback-echo" +- else +- # maybe with a smaller string... +- prev=: +- +- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do +- if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null +- then +- break +- fi +- prev="$cmd" +- done +- +- if test "$prev" != 'sed 50q "[$]0"'; then +- echo_test_string=`eval $prev` +- export echo_test_string +- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} +- else +- # Oops. We lost completely, so just stick with echo. +- echo=echo +- fi +- fi +- fi +- fi +-fi +-fi +- +-# Copy echo and quote the copy suitably for passing to libtool from +-# the Makefile, instead of quoting the original, which is used later. +-ECHO=$echo +-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then +- ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" +-fi +- +-AC_SUBST(ECHO) +-])])# _LT_AC_PROG_ECHO_BACKSLASH +- +- +-# _LT_AC_LOCK +-# ----------- +-AC_DEFUN([_LT_AC_LOCK], +-[AC_ARG_ENABLE([libtool-lock], +- [AC_HELP_STRING([--disable-libtool-lock], +- [avoid locking (might break parallel builds)])]) +-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +- +-# Some flags need to be propagated to the compiler or linker for good +-# libtool support. +-case $host in +-ia64-*-hpux*) +- # Find out which ABI we are using. +- echo 'int i;' > conftest.$ac_ext +- if AC_TRY_EVAL(ac_compile); then +- case `/usr/bin/file conftest.$ac_objext` in +- *ELF-32*) +- HPUX_IA64_MODE="32" +- ;; +- *ELF-64*) +- HPUX_IA64_MODE="64" +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +-*-*-irix6*) +- # Find out which ABI we are using. +- echo '[#]line __oline__ "configure"' > conftest.$ac_ext +- if AC_TRY_EVAL(ac_compile); then +- if test "$lt_cv_prog_gnu_ld" = yes; then +- case `/usr/bin/file conftest.$ac_objext` in +- *32-bit*) +- LD="${LD-ld} -melf32bsmip" +- ;; +- *N32*) +- LD="${LD-ld} -melf32bmipn32" +- ;; +- *64-bit*) +- LD="${LD-ld} -melf64bmip" +- ;; +- esac +- else +- case `/usr/bin/file conftest.$ac_objext` in +- *32-bit*) +- LD="${LD-ld} -32" +- ;; +- *N32*) +- LD="${LD-ld} -n32" +- ;; +- *64-bit*) +- LD="${LD-ld} -64" +- ;; +- esac +- fi +- fi +- rm -rf conftest* +- ;; +- +-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +-s390*-*linux*|sparc*-*linux*) +- # Find out which ABI we are using. +- echo 'int i;' > conftest.$ac_ext +- if AC_TRY_EVAL(ac_compile); then +- case `/usr/bin/file conftest.o` in +- *32-bit*) +- case $host in +- x86_64-*kfreebsd*-gnu) +- LD="${LD-ld} -m elf_i386_fbsd" +- ;; +- x86_64-*linux*) +- LD="${LD-ld} -m elf_i386" +- ;; +- ppc64-*linux*|powerpc64-*linux*) +- LD="${LD-ld} -m elf32ppclinux" +- ;; +- s390x-*linux*) +- LD="${LD-ld} -m elf_s390" +- ;; +- sparc64-*linux*) +- LD="${LD-ld} -m elf32_sparc" +- ;; +- esac +- ;; +- *64-bit*) +- case $host in +- x86_64-*kfreebsd*-gnu) +- LD="${LD-ld} -m elf_x86_64_fbsd" +- ;; +- x86_64-*linux*) +- LD="${LD-ld} -m elf_x86_64" +- ;; +- ppc*-*linux*|powerpc*-*linux*) +- LD="${LD-ld} -m elf64ppc" +- ;; +- s390*-*linux*) +- LD="${LD-ld} -m elf64_s390" +- ;; +- sparc*-*linux*) +- LD="${LD-ld} -m elf64_sparc" +- ;; +- esac +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +- +-*-*-sco3.2v5*) +- # On SCO OpenServer 5, we need -belf to get full-featured binaries. +- SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -belf" +- AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, +- [AC_LANG_PUSH(C) +- AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) +- AC_LANG_POP]) +- if test x"$lt_cv_cc_needs_belf" != x"yes"; then +- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf +- CFLAGS="$SAVE_CFLAGS" +- fi +- ;; +-sparc*-*solaris*) +- # Find out which ABI we are using. +- echo 'int i;' > conftest.$ac_ext +- if AC_TRY_EVAL(ac_compile); then +- case `/usr/bin/file conftest.o` in +- *64-bit*) +- case $lt_cv_prog_gnu_ld in +- yes*) LD="${LD-ld} -m elf64_sparc" ;; +- *) +- if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then +- LD="${LD-ld} -64" +- fi +- ;; +- esac +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +- +-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], +-[*-*-cygwin* | *-*-mingw* | *-*-pw32*) +- AC_CHECK_TOOL(DLLTOOL, dlltool, false) +- AC_CHECK_TOOL(AS, as, false) +- AC_CHECK_TOOL(OBJDUMP, objdump, false) +- ;; +- ]) +-esac +- +-need_locks="$enable_libtool_lock" +- +-])# _LT_AC_LOCK +- +- +-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +-# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) +-# ---------------------------------------------------------------- +-# Check whether the given compiler option works +-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], +-[AC_REQUIRE([LT_AC_PROG_SED]) +-AC_CACHE_CHECK([$1], [$2], +- [$2=no +- ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) +- echo "$lt_simple_compile_test_code" > conftest.$ac_ext +- lt_compiler_flag="$3" +- # Insert the option either (1) after the last *FLAGS variable, or +- # (2) before a word containing "conftest.", or (3) at the end. +- # Note that $ac_compile itself does not contain backslashes and begins +- # with a dollar sign (not a hyphen), so the echo should work correctly. +- # The option is referenced via a variable to avoid confusing sed. +- lt_compile=`echo "$ac_compile" | $SED \ +- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ +- -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ +- -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) +- (eval "$lt_compile" 2>conftest.err) +- ac_status=$? +- cat conftest.err >&AS_MESSAGE_LOG_FD +- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD +- if (exit $ac_status) && test -s "$ac_outfile"; then +- # The compiler can only warn and ignore the option if not recognized +- # So say no if there are warnings other than the usual output. +- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp +- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 +- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then +- $2=yes +- fi +- fi +- $rm conftest* +-]) +- +-if test x"[$]$2" = xyes; then +- ifelse([$5], , :, [$5]) +-else +- ifelse([$6], , :, [$6]) +-fi +-])# AC_LIBTOOL_COMPILER_OPTION +- +- +-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +-# [ACTION-SUCCESS], [ACTION-FAILURE]) +-# ------------------------------------------------------------ +-# Check whether the given compiler option works +-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], +-[AC_REQUIRE([LT_AC_PROG_SED])dnl +-AC_CACHE_CHECK([$1], [$2], +- [$2=no +- save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS $3" +- echo "$lt_simple_link_test_code" > conftest.$ac_ext +- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then +- # The linker can only warn and ignore the option if not recognized +- # So say no if there are warnings +- if test -s conftest.err; then +- # Append any errors to the config.log. +- cat conftest.err 1>&AS_MESSAGE_LOG_FD +- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp +- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 +- if diff conftest.exp conftest.er2 >/dev/null; then +- $2=yes +- fi +- else +- $2=yes +- fi +- fi +- $rm -r conftest* +- LDFLAGS="$save_LDFLAGS" +-]) +- +-if test x"[$]$2" = xyes; then +- ifelse([$4], , :, [$4]) +-else +- ifelse([$5], , :, [$5]) +-fi +-])# AC_LIBTOOL_LINKER_OPTION +- +- +-# AC_LIBTOOL_SYS_MAX_CMD_LEN +-# -------------------------- +-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], +-[# find the maximum length of command line arguments +-AC_MSG_CHECKING([the maximum length of command line arguments]) +-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl +- i=0 +- teststring="ABCD" +- +- case $build_os in +- msdosdjgpp*) +- # On DJGPP, this test can blow up pretty badly due to problems in libc +- # (any single argument exceeding 2000 bytes causes a buffer overrun +- # during glob expansion). Even if it were fixed, the result of this +- # check would be larger than it should be. +- lt_cv_sys_max_cmd_len=12288; # 12K is about right +- ;; +- +- gnu*) +- # Under GNU Hurd, this test is not required because there is +- # no limit to the length of command line arguments. +- # Libtool will interpret -1 as no limit whatsoever +- lt_cv_sys_max_cmd_len=-1; +- ;; +- +- cygwin* | mingw*) +- # On Win9x/ME, this test blows up -- it succeeds, but takes +- # about 5 minutes as the teststring grows exponentially. +- # Worse, since 9x/ME are not pre-emptively multitasking, +- # you end up with a "frozen" computer, even though with patience +- # the test eventually succeeds (with a max line length of 256k). +- # Instead, let's just punt: use the minimum linelength reported by +- # all of the supported platforms: 8192 (on NT/2K/XP). +- lt_cv_sys_max_cmd_len=8192; +- ;; +- +- amigaos*) +- # On AmigaOS with pdksh, this test takes hours, literally. +- # So we just punt and use a minimum line length of 8192. +- lt_cv_sys_max_cmd_len=8192; +- ;; +- +- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) +- # This has been around since 386BSD, at least. Likely further. +- if test -x /sbin/sysctl; then +- lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` +- elif test -x /usr/sbin/sysctl; then +- lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` +- else +- lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs +- fi +- # And add a safety zone +- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` +- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` +- ;; +- +- interix*) +- # We know the value 262144 and hardcode it with a safety zone (like BSD) +- lt_cv_sys_max_cmd_len=196608 +- ;; +- +- osf*) +- # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure +- # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not +- # nice to cause kernel panics so lets avoid the loop below. +- # First set a reasonable default. +- lt_cv_sys_max_cmd_len=16384 +- # +- if test -x /sbin/sysconfig; then +- case `/sbin/sysconfig -q proc exec_disable_arg_limit` in +- *1*) lt_cv_sys_max_cmd_len=-1 ;; +- esac +- fi +- ;; +- sco3.2v5*) +- lt_cv_sys_max_cmd_len=102400 +- ;; +- sysv5* | sco5v6* | sysv4.2uw2*) +- kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` +- if test -n "$kargmax"; then +- lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` +- else +- lt_cv_sys_max_cmd_len=32768 +- fi +- ;; +- *) +- lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` +- if test -n "$lt_cv_sys_max_cmd_len"; then +- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` +- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` +- else +- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} +- while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ +- = "XX$teststring") >/dev/null 2>&1 && +- new_result=`expr "X$teststring" : ".*" 2>&1` && +- lt_cv_sys_max_cmd_len=$new_result && +- test $i != 17 # 1/2 MB should be enough +- do +- i=`expr $i + 1` +- teststring=$teststring$teststring +- done +- teststring= +- # Add a significant safety factor because C++ compilers can tack on massive +- # amounts of additional arguments before passing them to the linker. +- # It appears as though 1/2 is a usable value. +- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` +- fi +- ;; +- esac +-]) +-if test -n $lt_cv_sys_max_cmd_len ; then +- AC_MSG_RESULT($lt_cv_sys_max_cmd_len) +-else +- AC_MSG_RESULT(none) +-fi +-])# AC_LIBTOOL_SYS_MAX_CMD_LEN +- +- +-# _LT_AC_CHECK_DLFCN +-# ------------------ +-AC_DEFUN([_LT_AC_CHECK_DLFCN], +-[AC_CHECK_HEADERS(dlfcn.h)dnl +-])# _LT_AC_CHECK_DLFCN +- +- +-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, +-# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) +-# --------------------------------------------------------------------- +-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], +-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl +-if test "$cross_compiling" = yes; then : +- [$4] +-else +- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 +- lt_status=$lt_dlunknown +- cat > conftest.$ac_ext < +-#endif +- +-#include +- +-#ifdef RTLD_GLOBAL +-# define LT_DLGLOBAL RTLD_GLOBAL +-#else +-# ifdef DL_GLOBAL +-# define LT_DLGLOBAL DL_GLOBAL +-# else +-# define LT_DLGLOBAL 0 +-# endif +-#endif +- +-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we +- find out it does not work in some platform. */ +-#ifndef LT_DLLAZY_OR_NOW +-# ifdef RTLD_LAZY +-# define LT_DLLAZY_OR_NOW RTLD_LAZY +-# else +-# ifdef DL_LAZY +-# define LT_DLLAZY_OR_NOW DL_LAZY +-# else +-# ifdef RTLD_NOW +-# define LT_DLLAZY_OR_NOW RTLD_NOW +-# else +-# ifdef DL_NOW +-# define LT_DLLAZY_OR_NOW DL_NOW +-# else +-# define LT_DLLAZY_OR_NOW 0 +-# endif +-# endif +-# endif +-# endif +-#endif +- +-#ifdef __cplusplus +-extern "C" void exit (int); +-#endif +- +-void fnord() { int i=42;} +-int main () +-{ +- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); +- int status = $lt_dlunknown; +- +- if (self) +- { +- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; +- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; +- /* dlclose (self); */ +- } +- else +- puts (dlerror ()); +- +- exit (status); +-}] +-EOF +- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then +- (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null +- lt_status=$? +- case x$lt_status in +- x$lt_dlno_uscore) $1 ;; +- x$lt_dlneed_uscore) $2 ;; +- x$lt_dlunknown|x*) $3 ;; +- esac +- else : +- # compilation failed +- $3 +- fi +-fi +-rm -fr conftest* +-])# _LT_AC_TRY_DLOPEN_SELF +- +- +-# AC_LIBTOOL_DLOPEN_SELF +-# ---------------------- +-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], +-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl +-if test "x$enable_dlopen" != xyes; then +- enable_dlopen=unknown +- enable_dlopen_self=unknown +- enable_dlopen_self_static=unknown +-else +- lt_cv_dlopen=no +- lt_cv_dlopen_libs= +- +- case $host_os in +- beos*) +- lt_cv_dlopen="load_add_on" +- lt_cv_dlopen_libs= +- lt_cv_dlopen_self=yes +- ;; +- +- mingw* | pw32*) +- lt_cv_dlopen="LoadLibrary" +- lt_cv_dlopen_libs= +- ;; +- +- cygwin*) +- lt_cv_dlopen="dlopen" +- lt_cv_dlopen_libs= +- ;; +- +- darwin*) +- # if libdl is installed we need to link against it +- AC_CHECK_LIB([dl], [dlopen], +- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ +- lt_cv_dlopen="dyld" +- lt_cv_dlopen_libs= +- lt_cv_dlopen_self=yes +- ]) +- ;; +- +- *) +- AC_CHECK_FUNC([shl_load], +- [lt_cv_dlopen="shl_load"], +- [AC_CHECK_LIB([dld], [shl_load], +- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], +- [AC_CHECK_FUNC([dlopen], +- [lt_cv_dlopen="dlopen"], +- [AC_CHECK_LIB([dl], [dlopen], +- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], +- [AC_CHECK_LIB([svld], [dlopen], +- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], +- [AC_CHECK_LIB([dld], [dld_link], +- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) +- ]) +- ]) +- ]) +- ]) +- ]) +- ;; +- esac +- +- if test "x$lt_cv_dlopen" != xno; then +- enable_dlopen=yes +- else +- enable_dlopen=no +- fi +- +- case $lt_cv_dlopen in +- dlopen) +- save_CPPFLAGS="$CPPFLAGS" +- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" +- +- save_LDFLAGS="$LDFLAGS" +- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" +- +- save_LIBS="$LIBS" +- LIBS="$lt_cv_dlopen_libs $LIBS" +- +- AC_CACHE_CHECK([whether a program can dlopen itself], +- lt_cv_dlopen_self, [dnl +- _LT_AC_TRY_DLOPEN_SELF( +- lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, +- lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) +- ]) +- +- if test "x$lt_cv_dlopen_self" = xyes; then +- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" +- AC_CACHE_CHECK([whether a statically linked program can dlopen itself], +- lt_cv_dlopen_self_static, [dnl +- _LT_AC_TRY_DLOPEN_SELF( +- lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, +- lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) +- ]) +- fi +- +- CPPFLAGS="$save_CPPFLAGS" +- LDFLAGS="$save_LDFLAGS" +- LIBS="$save_LIBS" +- ;; +- esac +- +- case $lt_cv_dlopen_self in +- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; +- *) enable_dlopen_self=unknown ;; +- esac +- +- case $lt_cv_dlopen_self_static in +- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; +- *) enable_dlopen_self_static=unknown ;; +- esac +-fi +-])# AC_LIBTOOL_DLOPEN_SELF +- +- +-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) +-# --------------------------------- +-# Check to see if options -c and -o are simultaneously supported by compiler +-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], +-[AC_REQUIRE([LT_AC_PROG_SED])dnl +-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], +- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], +- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no +- $rm -r conftest 2>/dev/null +- mkdir conftest +- cd conftest +- mkdir out +- echo "$lt_simple_compile_test_code" > conftest.$ac_ext +- +- lt_compiler_flag="-o out/conftest2.$ac_objext" +- # Insert the option either (1) after the last *FLAGS variable, or +- # (2) before a word containing "conftest.", or (3) at the end. +- # Note that $ac_compile itself does not contain backslashes and begins +- # with a dollar sign (not a hyphen), so the echo should work correctly. +- lt_compile=`echo "$ac_compile" | $SED \ +- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ +- -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ +- -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) +- (eval "$lt_compile" 2>out/conftest.err) +- ac_status=$? +- cat out/conftest.err >&AS_MESSAGE_LOG_FD +- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD +- if (exit $ac_status) && test -s out/conftest2.$ac_objext +- then +- # The compiler can only warn and ignore the option if not recognized +- # So say no if there are warnings +- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp +- $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 +- if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then +- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes +- fi +- fi +- chmod u+w . 2>&AS_MESSAGE_LOG_FD +- $rm conftest* +- # SGI C++ compiler will create directory out/ii_files/ for +- # template instantiation +- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files +- $rm out/* && rmdir out +- cd .. +- rmdir conftest +- $rm conftest* +-]) +-])# AC_LIBTOOL_PROG_CC_C_O +- +- +-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) +-# ----------------------------------------- +-# Check to see if we can do hard links to lock some files if needed +-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], +-[AC_REQUIRE([_LT_AC_LOCK])dnl +- +-hard_links="nottested" +-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then +- # do not overwrite the value of need_locks provided by the user +- AC_MSG_CHECKING([if we can lock with hard links]) +- hard_links=yes +- $rm conftest* +- ln conftest.a conftest.b 2>/dev/null && hard_links=no +- touch conftest.a +- ln conftest.a conftest.b 2>&5 || hard_links=no +- ln conftest.a conftest.b 2>/dev/null && hard_links=no +- AC_MSG_RESULT([$hard_links]) +- if test "$hard_links" = no; then +- AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) +- need_locks=warn +- fi +-else +- need_locks=no +-fi +-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS +- +- +-# AC_LIBTOOL_OBJDIR +-# ----------------- +-AC_DEFUN([AC_LIBTOOL_OBJDIR], +-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], +-[rm -f .libs 2>/dev/null +-mkdir .libs 2>/dev/null +-if test -d .libs; then +- lt_cv_objdir=.libs +-else +- # MS-DOS does not allow filenames that begin with a dot. +- lt_cv_objdir=_libs +-fi +-rmdir .libs 2>/dev/null]) +-objdir=$lt_cv_objdir +-])# AC_LIBTOOL_OBJDIR +- +- +-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) +-# ---------------------------------------------- +-# Check hardcoding attributes. +-AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], +-[AC_MSG_CHECKING([how to hardcode library paths into programs]) +-_LT_AC_TAGVAR(hardcode_action, $1)= +-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ +- test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ +- test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then +- +- # We can hardcode non-existant directories. +- if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && +- # If the only mechanism to avoid hardcoding is shlibpath_var, we +- # have to relink, otherwise we might link with an installed library +- # when we should be linking with a yet-to-be-installed one +- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && +- test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then +- # Linking always hardcodes the temporary library directory. +- _LT_AC_TAGVAR(hardcode_action, $1)=relink +- else +- # We can link without hardcoding, and we can hardcode nonexisting dirs. +- _LT_AC_TAGVAR(hardcode_action, $1)=immediate +- fi +-else +- # We cannot hardcode anything, or else we can only hardcode existing +- # directories. +- _LT_AC_TAGVAR(hardcode_action, $1)=unsupported +-fi +-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) +- +-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then +- # Fast installation is not supported +- enable_fast_install=no +-elif test "$shlibpath_overrides_runpath" = yes || +- test "$enable_shared" = no; then +- # Fast installation is not necessary +- enable_fast_install=needless +-fi +-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH +- +- +-# AC_LIBTOOL_SYS_LIB_STRIP +-# ------------------------ +-AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], +-[striplib= +-old_striplib= +-AC_MSG_CHECKING([whether stripping libraries is possible]) +-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then +- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" +- test -z "$striplib" && striplib="$STRIP --strip-unneeded" +- AC_MSG_RESULT([yes]) +-else +-# FIXME - insert some real tests, host_os isn't really good enough +- case $host_os in +- darwin*) +- if test -n "$STRIP" ; then +- striplib="$STRIP -x" +- old_striplib="$STRIP -S" +- AC_MSG_RESULT([yes]) +- else +- AC_MSG_RESULT([no]) +-fi +- ;; +- *) +- AC_MSG_RESULT([no]) +- ;; +- esac +-fi +-])# AC_LIBTOOL_SYS_LIB_STRIP +- +- +-# AC_LIBTOOL_SYS_DYNAMIC_LINKER +-# ----------------------------- +-# PORTME Fill in your ld.so characteristics +-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], +-[AC_REQUIRE([LT_AC_PROG_SED])dnl +-AC_MSG_CHECKING([dynamic linker characteristics]) +-library_names_spec= +-libname_spec='lib$name' +-soname_spec= +-shrext_cmds=".so" +-postinstall_cmds= +-postuninstall_cmds= +-finish_cmds= +-finish_eval= +-shlibpath_var= +-shlibpath_overrides_runpath=unknown +-version_type=none +-dynamic_linker="$host_os ld.so" +-sys_lib_dlsearch_path_spec="/lib /usr/lib" +-m4_if($1,[],[ +-if test "$GCC" = yes; then +- case $host_os in +- darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; +- *) lt_awk_arg="/^libraries:/" ;; +- esac +- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then +- # if the path contains ";" then we assume it to be the separator +- # otherwise default to the standard path separator (i.e. ":") - it is +- # assumed that no part of a normal pathname contains ";" but that should +- # okay in the real world where ";" in dirpaths is itself problematic. +- lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` +- else +- lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` +- fi +- # Ok, now we have the path, separated by spaces, we can step through it +- # and add multilib dir if necessary. +- lt_tmp_lt_search_path_spec= +- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` +- for lt_sys_path in $lt_search_path_spec; do +- if test -d "$lt_sys_path/$lt_multi_os_dir"; then +- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" +- else +- test -d "$lt_sys_path" && \ +- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" +- fi +- done +- lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' +-BEGIN {RS=" "; FS="/|\n";} { +- lt_foo=""; +- lt_count=0; +- for (lt_i = NF; lt_i > 0; lt_i--) { +- if ($lt_i != "" && $lt_i != ".") { +- if ($lt_i == "..") { +- lt_count++; +- } else { +- if (lt_count == 0) { +- lt_foo="/" $lt_i lt_foo; +- } else { +- lt_count--; +- } +- } +- } +- } +- if (lt_foo != "") { lt_freq[[lt_foo]]++; } +- if (lt_freq[[lt_foo]] == 1) { print lt_foo; } +-}'` +- sys_lib_search_path_spec=`echo $lt_search_path_spec` +-else +- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +-fi]) +-need_lib_prefix=unknown +-hardcode_into_libs=no +- +-# when you set need_version to no, make sure it does not cause -set_version +-# flags to be left without arguments +-need_version=unknown +- +-case $host_os in +-aix3*) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' +- shlibpath_var=LIBPATH +- +- # AIX 3 has no versioning support, so we append a major version to the name. +- soname_spec='${libname}${release}${shared_ext}$major' +- ;; +- +-aix[[4-9]]*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- hardcode_into_libs=yes +- if test "$host_cpu" = ia64; then +- # AIX 5 supports IA64 +- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH +- else +- # With GCC up to 2.95.x, collect2 would create an import file +- # for dependence libraries. The import file would start with +- # the line `#! .'. This would cause the generated library to +- # depend on `.', always an invalid library. This was fixed in +- # development snapshots of GCC prior to 3.0. +- case $host_os in +- aix4 | aix4.[[01]] | aix4.[[01]].*) +- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' +- echo ' yes ' +- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then +- : +- else +- can_build_shared=no +- fi +- ;; +- esac +- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct +- # soname into executable. Probably we can add versioning support to +- # collect2, so additional links can be useful in future. +- if test "$aix_use_runtimelinking" = yes; then +- # If using run time linking (on AIX 4.2 or later) use lib.so +- # instead of lib.a to let people know that these are not +- # typical AIX shared libraries. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- else +- # We preserve .a as extension for shared libraries through AIX4.2 +- # and later when we are not doing run time linking. +- library_names_spec='${libname}${release}.a $libname.a' +- soname_spec='${libname}${release}${shared_ext}$major' +- fi +- shlibpath_var=LIBPATH +- fi +- ;; +- +-amigaos*) +- library_names_spec='$libname.ixlibrary $libname.a' +- # Create ${libname}_ixlibrary.a entries in /sys/libs. +- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' +- ;; +- +-beos*) +- library_names_spec='${libname}${shared_ext}' +- dynamic_linker="$host_os ld.so" +- shlibpath_var=LIBRARY_PATH +- ;; +- +-bsdi[[45]]*) +- version_type=linux +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" +- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" +- # the default ld.so.conf also contains /usr/contrib/lib and +- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow +- # libtool to hard-code these into programs +- ;; +- +-cygwin* | mingw* | pw32*) +- version_type=windows +- shrext_cmds=".dll" +- need_version=no +- need_lib_prefix=no +- +- case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32*) +- library_names_spec='$libname.dll.a' +- # DLL is installed to $(libdir)/../bin by postinstall_cmds +- postinstall_cmds='base_file=`basename \${file}`~ +- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ +- dldir=$destdir/`dirname \$dlpath`~ +- test -d \$dldir || mkdir -p \$dldir~ +- $install_prog $dir/$dlname \$dldir/$dlname~ +- chmod a+x \$dldir/$dlname' +- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ +- dlpath=$dir/\$dldll~ +- $rm \$dlpath' +- shlibpath_overrides_runpath=yes +- +- case $host_os in +- cygwin*) +- # Cygwin DLLs use 'cyg' prefix rather than 'lib' +- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' +- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" +- ;; +- mingw*) +- # MinGW DLLs use traditional 'lib' prefix +- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' +- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then +- # It is most probably a Windows format PATH printed by +- # mingw gcc, but we are running on Cygwin. Gcc prints its search +- # path with ; separators, and with drive letters. We can handle the +- # drive letters (cygwin fileutils understands them), so leave them, +- # especially as we might pass files found there to a mingw objdump, +- # which wouldn't understand a cygwinified path. Ahh. +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` +- else +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` +- fi +- ;; +- pw32*) +- # pw32 DLLs use 'pw' prefix rather than 'lib' +- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' +- ;; +- esac +- ;; +- +- *) +- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' +- ;; +- esac +- dynamic_linker='Win32 ld.exe' +- # FIXME: first we should search . and the directory the executable is in +- shlibpath_var=PATH +- ;; +- +-darwin* | rhapsody*) +- dynamic_linker="$host_os dyld" +- version_type=darwin +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' +- soname_spec='${libname}${release}${major}$shared_ext' +- shlibpath_overrides_runpath=yes +- shlibpath_var=DYLD_LIBRARY_PATH +- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +- m4_if([$1], [],[ +- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) +- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' +- ;; +- +-dgux*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- ;; +- +-freebsd1*) +- dynamic_linker=no +- ;; +- +-freebsd* | dragonfly*) +- # DragonFly does not have aout. When/if they implement a new +- # versioning mechanism, adjust this. +- if test -x /usr/bin/objformat; then +- objformat=`/usr/bin/objformat` +- else +- case $host_os in +- freebsd[[123]]*) objformat=aout ;; +- *) objformat=elf ;; +- esac +- fi +- version_type=freebsd-$objformat +- case $version_type in +- freebsd-elf*) +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' +- need_version=no +- need_lib_prefix=no +- ;; +- freebsd-*) +- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' +- need_version=yes +- ;; +- esac +- shlibpath_var=LD_LIBRARY_PATH +- case $host_os in +- freebsd2*) +- shlibpath_overrides_runpath=yes +- ;; +- freebsd3.[[01]]* | freebsdelf3.[[01]]*) +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- ;; +- freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ +- freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- ;; +- *) # from 4.6 on, and DragonFly +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- ;; +- esac +- ;; +- +-gnu*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- hardcode_into_libs=yes +- ;; +- +-hpux9* | hpux10* | hpux11*) +- # Give a soname corresponding to the major version so that dld.sl refuses to +- # link against other versions. +- version_type=sunos +- need_lib_prefix=no +- need_version=no +- case $host_cpu in +- ia64*) +- shrext_cmds='.so' +- hardcode_into_libs=yes +- dynamic_linker="$host_os dld.so" +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- if test "X$HPUX_IA64_MODE" = X32; then +- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" +- else +- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" +- fi +- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec +- ;; +- hppa*64*) +- shrext_cmds='.sl' +- hardcode_into_libs=yes +- dynamic_linker="$host_os dld.sl" +- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH +- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" +- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec +- ;; +- *) +- shrext_cmds='.sl' +- dynamic_linker="$host_os dld.sl" +- shlibpath_var=SHLIB_PATH +- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- ;; +- esac +- # HP-UX runs *really* slowly unless shared libraries are mode 555. +- postinstall_cmds='chmod 555 $lib' +- ;; +- +-interix[[3-9]]*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- ;; +- +-irix5* | irix6* | nonstopux*) +- case $host_os in +- nonstopux*) version_type=nonstopux ;; +- *) +- if test "$lt_cv_prog_gnu_ld" = yes; then +- version_type=linux +- else +- version_type=irix +- fi ;; +- esac +- need_lib_prefix=no +- need_version=no +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' +- case $host_os in +- irix5* | nonstopux*) +- libsuff= shlibsuff= +- ;; +- *) +- case $LD in # libtool.m4 will add one of these switches to LD +- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") +- libsuff= shlibsuff= libmagic=32-bit;; +- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") +- libsuff=32 shlibsuff=N32 libmagic=N32;; +- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") +- libsuff=64 shlibsuff=64 libmagic=64-bit;; +- *) libsuff= shlibsuff= libmagic=never-match;; +- esac +- ;; +- esac +- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH +- shlibpath_overrides_runpath=no +- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" +- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" +- hardcode_into_libs=yes +- ;; +- +-# No shared lib support for Linux oldld, aout, or coff. +-linux*oldld* | linux*aout* | linux*coff*) +- dynamic_linker=no +- ;; +- +-# This must be Linux ELF. +-linux* | k*bsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- # This implies no fast_install, which is unacceptable. +- # Some rework will be needed to allow for fast_install +- # before this can be enabled. +- hardcode_into_libs=yes +- +- # Append ld.so.conf contents to the search path +- if test -f /etc/ld.so.conf; then +- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" +- fi +- +- # We used to test for /lib/ld.so.1 and disable shared libraries on +- # powerpc, because MkLinux only supported shared libraries with the +- # GNU dynamic linker. Since this was broken with cross compilers, +- # most powerpc-linux boxes support dynamic linking these days and +- # people can always --disable-shared, the test was removed, and we +- # assume the GNU/Linux dynamic linker is in use. +- dynamic_linker='GNU/Linux ld.so' +- ;; +- +-netbsdelf*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='NetBSD ld.elf_so' +- ;; +- +-netbsd*) +- version_type=sunos +- need_lib_prefix=no +- need_version=no +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' +- dynamic_linker='NetBSD (a.out) ld.so' +- else +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- dynamic_linker='NetBSD ld.elf_so' +- fi +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- ;; +- +-newsos6) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- ;; +- +-nto-qnx*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- ;; +- +-openbsd*) +- version_type=sunos +- sys_lib_dlsearch_path_spec="/usr/lib" +- need_lib_prefix=no +- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. +- case $host_os in +- openbsd3.3 | openbsd3.3.*) need_version=yes ;; +- *) need_version=no ;; +- esac +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- case $host_os in +- openbsd2.[[89]] | openbsd2.[[89]].*) +- shlibpath_overrides_runpath=no +- ;; +- *) +- shlibpath_overrides_runpath=yes +- ;; +- esac +- else +- shlibpath_overrides_runpath=yes +- fi +- ;; +- +-os2*) +- libname_spec='$name' +- shrext_cmds=".dll" +- need_lib_prefix=no +- library_names_spec='$libname${shared_ext} $libname.a' +- dynamic_linker='OS/2 ld.exe' +- shlibpath_var=LIBPATH +- ;; +- +-osf3* | osf4* | osf5*) +- version_type=osf +- need_lib_prefix=no +- need_version=no +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH +- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" +- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" +- ;; +- +-rdos*) +- dynamic_linker=no +- ;; +- +-solaris*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- # ldd complains unless libraries are executable +- postinstall_cmds='chmod +x $lib' +- ;; +- +-sunos4*) +- version_type=sunos +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' +- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- if test "$with_gnu_ld" = yes; then +- need_lib_prefix=no +- fi +- need_version=yes +- ;; +- +-sysv4 | sysv4.3*) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- case $host_vendor in +- sni) +- shlibpath_overrides_runpath=no +- need_lib_prefix=no +- export_dynamic_flag_spec='${wl}-Blargedynsym' +- runpath_var=LD_RUN_PATH +- ;; +- siemens) +- need_lib_prefix=no +- ;; +- motorola) +- need_lib_prefix=no +- need_version=no +- shlibpath_overrides_runpath=no +- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' +- ;; +- esac +- ;; +- +-sysv4*MP*) +- if test -d /usr/nec ;then +- version_type=linux +- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' +- soname_spec='$libname${shared_ext}.$major' +- shlibpath_var=LD_LIBRARY_PATH +- fi +- ;; +- +-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) +- version_type=freebsd-elf +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- hardcode_into_libs=yes +- if test "$with_gnu_ld" = yes; then +- sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' +- shlibpath_overrides_runpath=no +- else +- sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' +- shlibpath_overrides_runpath=yes +- case $host_os in +- sco3.2v5*) +- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" +- ;; +- esac +- fi +- sys_lib_dlsearch_path_spec='/usr/lib' +- ;; +- +-uts4*) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- ;; +- +-*) +- dynamic_linker=no +- ;; +-esac +-AC_MSG_RESULT([$dynamic_linker]) +-test "$dynamic_linker" = no && can_build_shared=no +- +-AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], +-[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) +-sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +-AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], +-[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) +-sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" +- +-variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +-if test "$GCC" = yes; then +- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +-fi +-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER +- +- +-# _LT_AC_TAGCONFIG +-# ---------------- +-AC_DEFUN([_LT_AC_TAGCONFIG], +-[AC_REQUIRE([LT_AC_PROG_SED])dnl +-AC_ARG_WITH([tags], +- [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], +- [include additional configurations @<:@automatic@:>@])], +- [tagnames="$withval"]) +- +-if test -f "$ltmain" && test -n "$tagnames"; then +- if test ! -f "${ofile}"; then +- AC_MSG_WARN([output file `$ofile' does not exist]) +- fi +- +- if test -z "$LTCC"; then +- eval "`$SHELL ${ofile} --config | grep '^LTCC='`" +- if test -z "$LTCC"; then +- AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) +- else +- AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) +- fi +- fi +- if test -z "$LTCFLAGS"; then +- eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" +- fi +- +- # Extract list of available tagged configurations in $ofile. +- # Note that this assumes the entire list is on one line. +- available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` +- +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for tagname in $tagnames; do +- IFS="$lt_save_ifs" +- # Check whether tagname contains only valid characters +- case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in +- "") ;; +- *) AC_MSG_ERROR([invalid tag name: $tagname]) +- ;; +- esac +- +- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null +- then +- AC_MSG_ERROR([tag name \"$tagname\" already exists]) +- fi +- +- # Update the list of available tags. +- if test -n "$tagname"; then +- echo appending configuration tag \"$tagname\" to $ofile +- +- case $tagname in +- CXX) +- if test -n "$CXX" && ( test "X$CXX" != "Xno" && +- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || +- (test "X$CXX" != "Xg++"))) ; then +- AC_LIBTOOL_LANG_CXX_CONFIG +- else +- tagname="" +- fi +- ;; +- +- F77) +- if test -n "$F77" && test "X$F77" != "Xno"; then +- AC_LIBTOOL_LANG_F77_CONFIG +- else +- tagname="" +- fi +- ;; +- +- GCJ) +- if test -n "$GCJ" && test "X$GCJ" != "Xno"; then +- AC_LIBTOOL_LANG_GCJ_CONFIG +- else +- tagname="" +- fi +- ;; +- +- RC) +- AC_LIBTOOL_LANG_RC_CONFIG +- ;; +- +- *) +- AC_MSG_ERROR([Unsupported tag name: $tagname]) +- ;; +- esac +- +- # Append the new tag name to the list of available tags. +- if test -n "$tagname" ; then +- available_tags="$available_tags $tagname" +- fi +- fi +- done +- IFS="$lt_save_ifs" +- +- # Now substitute the updated list of available tags. +- if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then +- mv "${ofile}T" "$ofile" +- chmod +x "$ofile" +- else +- rm -f "${ofile}T" +- AC_MSG_ERROR([unable to update list of available tagged configurations.]) +- fi +-fi +-])# _LT_AC_TAGCONFIG +- +- +-# AC_LIBTOOL_DLOPEN +-# ----------------- +-# enable checks for dlopen support +-AC_DEFUN([AC_LIBTOOL_DLOPEN], +- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) +-])# AC_LIBTOOL_DLOPEN +- +- +-# AC_LIBTOOL_WIN32_DLL +-# -------------------- +-# declare package support for building win32 DLLs +-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], +-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) +-])# AC_LIBTOOL_WIN32_DLL +- +- +-# AC_ENABLE_SHARED([DEFAULT]) +-# --------------------------- +-# implement the --enable-shared flag +-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +-AC_DEFUN([AC_ENABLE_SHARED], +-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl +-AC_ARG_ENABLE([shared], +- [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], +- [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])], +- [p=${PACKAGE-default} +- case $enableval in +- yes) enable_shared=yes ;; +- no) enable_shared=no ;; +- *) +- enable_shared=no +- # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for pkg in $enableval; do +- IFS="$lt_save_ifs" +- if test "X$pkg" = "X$p"; then +- enable_shared=yes +- fi +- done +- IFS="$lt_save_ifs" +- ;; +- esac], +- [enable_shared=]AC_ENABLE_SHARED_DEFAULT) +-])# AC_ENABLE_SHARED +- +- +-# AC_DISABLE_SHARED +-# ----------------- +-# set the default shared flag to --disable-shared +-AC_DEFUN([AC_DISABLE_SHARED], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-AC_ENABLE_SHARED(no) +-])# AC_DISABLE_SHARED +- +- +-# AC_ENABLE_STATIC([DEFAULT]) +-# --------------------------- +-# implement the --enable-static flag +-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +-AC_DEFUN([AC_ENABLE_STATIC], +-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl +-AC_ARG_ENABLE([static], +- [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], +- [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])], +- [p=${PACKAGE-default} +- case $enableval in +- yes) enable_static=yes ;; +- no) enable_static=no ;; +- *) +- enable_static=no +- # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for pkg in $enableval; do +- IFS="$lt_save_ifs" +- if test "X$pkg" = "X$p"; then +- enable_static=yes +- fi +- done +- IFS="$lt_save_ifs" +- ;; +- esac], +- [enable_static=]AC_ENABLE_STATIC_DEFAULT) +-])# AC_ENABLE_STATIC +- +- +-# AC_DISABLE_STATIC +-# ----------------- +-# set the default static flag to --disable-static +-AC_DEFUN([AC_DISABLE_STATIC], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-AC_ENABLE_STATIC(no) +-])# AC_DISABLE_STATIC +- +- +-# AC_ENABLE_FAST_INSTALL([DEFAULT]) +-# --------------------------------- +-# implement the --enable-fast-install flag +-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +-AC_DEFUN([AC_ENABLE_FAST_INSTALL], +-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl +-AC_ARG_ENABLE([fast-install], +- [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], +- [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], +- [p=${PACKAGE-default} +- case $enableval in +- yes) enable_fast_install=yes ;; +- no) enable_fast_install=no ;; +- *) +- enable_fast_install=no +- # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for pkg in $enableval; do +- IFS="$lt_save_ifs" +- if test "X$pkg" = "X$p"; then +- enable_fast_install=yes +- fi +- done +- IFS="$lt_save_ifs" +- ;; +- esac], +- [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT) +-])# AC_ENABLE_FAST_INSTALL +- +- +-# AC_DISABLE_FAST_INSTALL +-# ----------------------- +-# set the default to --disable-fast-install +-AC_DEFUN([AC_DISABLE_FAST_INSTALL], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-AC_ENABLE_FAST_INSTALL(no) +-])# AC_DISABLE_FAST_INSTALL +- +- +-# AC_LIBTOOL_PICMODE([MODE]) +-# -------------------------- +-# implement the --with-pic flag +-# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +-AC_DEFUN([AC_LIBTOOL_PICMODE], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-pic_mode=ifelse($#,1,$1,default) +-])# AC_LIBTOOL_PICMODE +- +- +-# AC_PROG_EGREP +-# ------------- +-# This is predefined starting with Autoconf 2.54, so this conditional +-# definition can be removed once we require Autoconf 2.54 or later. +-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], +-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], +- [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 +- then ac_cv_prog_egrep='grep -E' +- else ac_cv_prog_egrep='egrep' +- fi]) +- EGREP=$ac_cv_prog_egrep +- AC_SUBST([EGREP]) +-])]) +- +- +-# AC_PATH_TOOL_PREFIX +-# ------------------- +-# find a file program which can recognize shared library +-AC_DEFUN([AC_PATH_TOOL_PREFIX], +-[AC_REQUIRE([AC_PROG_EGREP])dnl +-AC_MSG_CHECKING([for $1]) +-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, +-[case $MAGIC_CMD in +-[[\\/*] | ?:[\\/]*]) +- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. +- ;; +-*) +- lt_save_MAGIC_CMD="$MAGIC_CMD" +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +-dnl $ac_dummy forces splitting on constant user-supplied paths. +-dnl POSIX.2 word splitting is done only on the output of word expansions, +-dnl not every word. This closes a longstanding sh security hole. +- ac_dummy="ifelse([$2], , $PATH, [$2])" +- for ac_dir in $ac_dummy; do +- IFS="$lt_save_ifs" +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$1; then +- lt_cv_path_MAGIC_CMD="$ac_dir/$1" +- if test -n "$file_magic_test_file"; then +- case $deplibs_check_method in +- "file_magic "*) +- file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` +- MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +- if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | +- $EGREP "$file_magic_regex" > /dev/null; then +- : +- else +- cat <&2 +- +-*** Warning: the command libtool uses to detect shared libraries, +-*** $file_magic_cmd, produces output that libtool cannot recognize. +-*** The result is that libtool may fail to recognize shared libraries +-*** as such. This will affect the creation of libtool libraries that +-*** depend on shared libraries, but programs linked with such libtool +-*** libraries will work regardless of this problem. Nevertheless, you +-*** may want to report the problem to your system manager and/or to +-*** bug-libtool at gnu.org +- +-EOF +- fi ;; +- esac +- fi +- break +- fi +- done +- IFS="$lt_save_ifs" +- MAGIC_CMD="$lt_save_MAGIC_CMD" +- ;; +-esac]) +-MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +-if test -n "$MAGIC_CMD"; then +- AC_MSG_RESULT($MAGIC_CMD) +-else +- AC_MSG_RESULT(no) +-fi +-])# AC_PATH_TOOL_PREFIX +- +- +-# AC_PATH_MAGIC +-# ------------- +-# find a file program which can recognize a shared library +-AC_DEFUN([AC_PATH_MAGIC], +-[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) +-if test -z "$lt_cv_path_MAGIC_CMD"; then +- if test -n "$ac_tool_prefix"; then +- AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) +- else +- MAGIC_CMD=: +- fi +-fi +-])# AC_PATH_MAGIC +- +- +-# AC_PROG_LD +-# ---------- +-# find the pathname to the GNU or non-GNU linker +-AC_DEFUN([AC_PROG_LD], +-[AC_ARG_WITH([gnu-ld], +- [AC_HELP_STRING([--with-gnu-ld], +- [assume the C compiler uses GNU ld @<:@default=no@:>@])], +- [test "$withval" = no || with_gnu_ld=yes], +- [with_gnu_ld=no]) +-AC_REQUIRE([LT_AC_PROG_SED])dnl +-AC_REQUIRE([AC_PROG_CC])dnl +-AC_REQUIRE([AC_CANONICAL_HOST])dnl +-AC_REQUIRE([AC_CANONICAL_BUILD])dnl +-ac_prog=ld +-if test "$GCC" = yes; then +- # Check if gcc -print-prog-name=ld gives a path. +- AC_MSG_CHECKING([for ld used by $CC]) +- case $host in +- *-*-mingw*) +- # gcc leaves a trailing carriage return which upsets mingw +- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; +- *) +- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; +- esac +- case $ac_prog in +- # Accept absolute paths. +- [[\\/]]* | ?:[[\\/]]*) +- re_direlt='/[[^/]][[^/]]*/\.\./' +- # Canonicalize the pathname of ld +- ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` +- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do +- ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` +- done +- test -z "$LD" && LD="$ac_prog" +- ;; +- "") +- # If it fails, then pretend we aren't using GCC. +- ac_prog=ld +- ;; +- *) +- # If it is relative, then search for the first ld in PATH. +- with_gnu_ld=unknown +- ;; +- esac +-elif test "$with_gnu_ld" = yes; then +- AC_MSG_CHECKING([for GNU ld]) +-else +- AC_MSG_CHECKING([for non-GNU ld]) +-fi +-AC_CACHE_VAL(lt_cv_path_LD, +-[if test -z "$LD"; then +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for ac_dir in $PATH; do +- IFS="$lt_save_ifs" +- test -z "$ac_dir" && ac_dir=. +- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then +- lt_cv_path_LD="$ac_dir/$ac_prog" +- # Check to see if the program is GNU ld. I'd rather use --version, +- # but apparently some variants of GNU ld only accept -v. +- # Break only if it was the GNU/non-GNU ld that we prefer. +- case `"$lt_cv_path_LD" -v 2>&1 &1 Revision: 7485 http://gar.svn.sourceforge.net/gar/?rev=7485&view=rev Author: bonivart Date: 2009-11-27 16:21:59 +0000 (Fri, 27 Nov 2009) Log Message: ----------- pkgutil: update to 1.9 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 2009-11-27 15:42:19 UTC (rev 7484) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-11-27 16:21:59 UTC (rev 7485) @@ -1,5 +1,5 @@ GARNAME = pkgutil -GARVERSION = 1.9b2 +GARVERSION = 1.9 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily @@ -63,8 +63,8 @@ @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME) @ginstall $(WORKSRC)/readme $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)/ @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME)plus - @ginstall $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)plus/ - @ginstall $(WORKSRC)/readme.pkgutilplus $(DESTDIR)$(docdir)/$(GARNAME)plus/readme + @ginstall -m 444 $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)plus/ + @ginstall -m 444 $(WORKSRC)/readme.pkgutilplus $(DESTDIR)$(docdir)/$(GARNAME)plus/readme @ginstall -m 755 -d $(DESTDIR)$(mandir)/man1 @pod2man --section=1 $(WORKSRC)/$(GARNAME) > $(DESTDIR)$(mandir)/man1/pkgutil.1 @pod2man --section=1 $(WORKSRC)/bldcat > $(DESTDIR)$(mandir)/man1/bldcat.1 Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-11-27 15:42:19 UTC (rev 7484) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-11-27 16:21:59 UTC (rev 7485) @@ -1,5 +1,5 @@ a16c6f81bc537d6172fd65d8da1aeecc CSWpkgutil.gspec b93ce519cebdc48350eb0e2a22214827 CSWpkgutil.prototype 33f82561e1fcf3aaf22f66bac22afba1 i.cswpkgutil -2d9c8f2e8ed58c015bdcd73862c5d9f4 pkgutil-1.9b2.zip +bdc6afd165a5117c9d0f3a3a54109461 pkgutil-1.9.zip 6d472d94ea850b600fd29aba7a6fc4b3 r.cswpkgutil 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 Nov 27 17:29:07 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 27 Nov 2009 16:29:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7486] csw/mgar/pkg/gnome-terminal Message-ID: Revision: 7486 http://gar.svn.sourceforge.net/gar/?rev=7486&view=rev Author: wahwah Date: 2009-11-27 16:29:07 +0000 (Fri, 27 Nov 2009) Log Message: ----------- gnome-terminal: Moved the legacy dir to branches Added Paths: ----------- csw/mgar/pkg/gnome-terminal/branches/ csw/mgar/pkg/gnome-terminal/branches/legacy/ csw/mgar/pkg/gnome-terminal/tags/ Removed Paths: ------------- csw/mgar/pkg/gnome-terminal/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 Fri Nov 27 17:35:10 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 27 Nov 2009 16:35:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7487] csw/mgar/pkg/gnome-terminal/trunk/ Message-ID: Revision: 7487 http://gar.svn.sourceforge.net/gar/?rev=7487&view=rev Author: wahwah Date: 2009-11-27 16:35:10 +0000 (Fri, 27 Nov 2009) Log Message: ----------- gnome-terminal: removing trunk to replace it with a copy from the template Removed Paths: ------------- csw/mgar/pkg/gnome-terminal/trunk/ 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 Nov 27 17:35:11 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 27 Nov 2009 16:35:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[7488] csw/mgar/pkg/libmpeg2/trunk Message-ID: Revision: 7488 http://gar.svn.sourceforge.net/gar/?rev=7488&view=rev Author: dmichelsen Date: 2009-11-27 16:35:11 +0000 (Fri, 27 Nov 2009) Log Message: ----------- libmpeg2: Add more patches Modified Paths: -------------- csw/mgar/pkg/libmpeg2/trunk/Makefile csw/mgar/pkg/libmpeg2/trunk/checksums csw/mgar/pkg/libmpeg2/trunk/files/0001-Don-t-use-arm-specific-assembly-on-Sparc.patch Added Paths: ----------- csw/mgar/pkg/libmpeg2/trunk/files/0002-Fix-return-type-for-Sun-Studio.patch csw/mgar/pkg/libmpeg2/trunk/files/0003-Add-missing-m4-files.patch csw/mgar/pkg/libmpeg2/trunk/files/0004-Add-missing-libtool.patch csw/mgar/pkg/libmpeg2/trunk/files/0005-Add-missing-autostuff.patch Modified: csw/mgar/pkg/libmpeg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmpeg2/trunk/Makefile 2009-11-27 16:35:10 UTC (rev 7487) +++ csw/mgar/pkg/libmpeg2/trunk/Makefile 2009-11-27 16:35:11 UTC (rev 7488) @@ -8,7 +8,11 @@ MASTER_SITES = http://libmpeg2.sourceforge.net/files/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PATCHFILES = 0001-Don-t-use-arm-specific-assembly-on-Sparc.patch +PATCHFILES = 0001-Don-t-use-arm-specific-assembly-on-Sparc.patch +PATCHFILES += 0002-Fix-return-type-for-Sun-Studio.patch +PATCHFILES += 0003-Add-missing-m4-files.patch +PATCHFILES += 0004-Add-missing-libtool.patch +PATCHFILES += 0005-Add-missing-autostuff.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -27,10 +31,14 @@ BUILD_ARGS = MPEG2DEC_CFLAGS= OPT_CFLAGS= BUILD64 = 1 +NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) # Do this only for sparcv8 and i386, otherwise make sure to compile on vis/mmx-enable ISA CONFIGURE_ARGS += --disable-accel-detect -PKGFILES_CSWmpeg2dec = $(bindir)/mpeg2dec +MERGE_DIRS_isa-extra = $(libdir) +PKGFILES_CSWmpeg2dec = $(bindir)/.* +PKGFILES_CSWmpeg2dec += $(mandir)/man1/.* + include gar/category.mk Modified: csw/mgar/pkg/libmpeg2/trunk/checksums =================================================================== --- csw/mgar/pkg/libmpeg2/trunk/checksums 2009-11-27 16:35:10 UTC (rev 7487) +++ csw/mgar/pkg/libmpeg2/trunk/checksums 2009-11-27 16:35:11 UTC (rev 7488) @@ -1,2 +1,6 @@ -92ebb653c36deb0a93fe597de10a546e 0001-Don-t-use-arm-specific-assembly-on-Sparc.patch +1c38d557879a40e54ba4e80a2f7ebf23 0001-Don-t-use-arm-specific-assembly-on-Sparc.patch +333b714575b3a86d4a45141cef51e5f1 0002-Fix-return-type-for-Sun-Studio.patch +dc6400408df379128e8e46d2e552bad4 0003-Add-missing-m4-files.patch +ec86eac972d1c6e4b92a2e43150c7b85 0004-Add-missing-libtool.patch +1f472c14ffdc946564f4771d2a533896 0005-Add-missing-autostuff.patch 0f92c7454e58379b4a5a378485bbd8ef libmpeg2-0.5.1.tar.gz Modified: csw/mgar/pkg/libmpeg2/trunk/files/0001-Don-t-use-arm-specific-assembly-on-Sparc.patch =================================================================== --- csw/mgar/pkg/libmpeg2/trunk/files/0001-Don-t-use-arm-specific-assembly-on-Sparc.patch 2009-11-27 16:35:10 UTC (rev 7487) +++ csw/mgar/pkg/libmpeg2/trunk/files/0001-Don-t-use-arm-specific-assembly-on-Sparc.patch 2009-11-27 16:35:11 UTC (rev 7488) @@ -1,7 +1,7 @@ From 38401a415b34a0751d5f7a48f9b35c2b23715f15 Mon Sep 17 00:00:00 2001 From: Dagobert Michelsen Date: Fri, 27 Nov 2009 15:50:03 +0100 -Subject: [PATCH] Don't use arm-specific assembly on Sparc +Subject: [PATCH 1/3] Don't use arm-specific assembly on Sparc --- Makefile.in | 220 +- Added: csw/mgar/pkg/libmpeg2/trunk/files/0002-Fix-return-type-for-Sun-Studio.patch =================================================================== --- csw/mgar/pkg/libmpeg2/trunk/files/0002-Fix-return-type-for-Sun-Studio.patch (rev 0) +++ csw/mgar/pkg/libmpeg2/trunk/files/0002-Fix-return-type-for-Sun-Studio.patch 2009-11-27 16:35:11 UTC (rev 7488) @@ -0,0 +1,25 @@ +From 407d9df72c4125ab714052962574ddfb2baec694 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 27 Nov 2009 16:56:23 +0100 +Subject: [PATCH 2/3] Fix return type for Sun Studio + +--- + src/mpeg2dec.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/mpeg2dec.c b/src/mpeg2dec.c +index 59b36d7..e216ba5 100644 +--- a/src/mpeg2dec.c ++++ b/src/mpeg2dec.c +@@ -63,7 +63,7 @@ static RETSIGTYPE signal_handler (int sig) + { + sigint = 1; + signal (sig, SIG_DFL); +- return (RETSIGTYPE)0; ++ return; + } + + static void print_fps (int final) +-- +1.6.5.1 + Added: csw/mgar/pkg/libmpeg2/trunk/files/0003-Add-missing-m4-files.patch =================================================================== --- csw/mgar/pkg/libmpeg2/trunk/files/0003-Add-missing-m4-files.patch (rev 0) +++ csw/mgar/pkg/libmpeg2/trunk/files/0003-Add-missing-m4-files.patch 2009-11-27 16:35:11 UTC (rev 7488) @@ -0,0 +1,8014 @@ +From b84cf025ed00e56e934a22ae3e630e58315c7a5f Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 27 Nov 2009 16:58:21 +0100 +Subject: [PATCH 3/3] Add missing m4 files + +--- + m4/libtool.m4 | 7357 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + m4/ltoptions.m4 | 368 +++ + m4/ltsugar.m4 | 123 + + m4/ltversion.m4 | 23 + + m4/lt~obsolete.m4 | 92 + + 5 files changed, 7963 insertions(+), 0 deletions(-) + create mode 100644 m4/libtool.m4 + create mode 100644 m4/ltoptions.m4 + create mode 100644 m4/ltsugar.m4 + create mode 100644 m4/ltversion.m4 + create mode 100644 m4/lt~obsolete.m4 + +diff --git a/m4/libtool.m4 b/m4/libtool.m4 +new file mode 100644 +index 0000000..39ba996 +--- /dev/null ++++ b/m4/libtool.m4 +@@ -0,0 +1,7357 @@ ++# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- ++# ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, ++# 2006, 2007, 2008 Free Software Foundation, Inc. ++# Written by Gordon Matzigkeit, 1996 ++# ++# This file is free software; the Free Software Foundation gives ++# unlimited permission to copy and/or distribute it, with or without ++# modifications, as long as this notice is preserved. ++ ++m4_define([_LT_COPYING], [dnl ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, ++# 2006, 2007, 2008 Free Software Foundation, Inc. ++# Written by Gordon Matzigkeit, 1996 ++# ++# This file is part of GNU Libtool. ++# ++# GNU Libtool 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. ++# ++# As a special exception to the GNU General Public License, ++# if you distribute this file as part of a program or library that ++# is built using GNU Libtool, you may include this file under the ++# same distribution terms that you use for the rest of that program. ++# ++# GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy ++# can be downloaded from http://www.gnu.org/licenses/gpl.html, or ++# obtained by writing to the Free Software Foundation, Inc., ++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++]) ++ ++# serial 56 LT_INIT ++ ++ ++# LT_PREREQ(VERSION) ++# ------------------ ++# Complain and exit if this libtool version is less that VERSION. ++m4_defun([LT_PREREQ], ++[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, ++ [m4_default([$3], ++ [m4_fatal([Libtool version $1 or higher is required], ++ 63)])], ++ [$2])]) ++ ++ ++# _LT_CHECK_BUILDDIR ++# ------------------ ++# Complain if the absolute build directory name contains unusual characters ++m4_defun([_LT_CHECK_BUILDDIR], ++[case `pwd` in ++ *\ * | *\ *) ++ AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; ++esac ++]) ++ ++ ++# LT_INIT([OPTIONS]) ++# ------------------ ++AC_DEFUN([LT_INIT], ++[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT ++AC_BEFORE([$0], [LT_LANG])dnl ++AC_BEFORE([$0], [LT_OUTPUT])dnl ++AC_BEFORE([$0], [LTDL_INIT])dnl ++m4_require([_LT_CHECK_BUILDDIR])dnl ++ ++dnl Autoconf doesn't catch unexpanded LT_ macros by default: ++m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl ++m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl ++dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 ++dnl unless we require an AC_DEFUNed macro: ++AC_REQUIRE([LTOPTIONS_VERSION])dnl ++AC_REQUIRE([LTSUGAR_VERSION])dnl ++AC_REQUIRE([LTVERSION_VERSION])dnl ++AC_REQUIRE([LTOBSOLETE_VERSION])dnl ++m4_require([_LT_PROG_LTMAIN])dnl ++ ++dnl Parse OPTIONS ++_LT_SET_OPTIONS([$0], [$1]) ++ ++# This can be used to rebuild libtool when needed ++LIBTOOL_DEPS="$ltmain" ++ ++# Always use our own libtool. ++LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++AC_SUBST(LIBTOOL)dnl ++ ++_LT_SETUP ++ ++# Only expand once: ++m4_define([LT_INIT]) ++])# LT_INIT ++ ++# Old names: ++AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) ++AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_PROG_LIBTOOL], []) ++dnl AC_DEFUN([AM_PROG_LIBTOOL], []) ++ ++ ++# _LT_CC_BASENAME(CC) ++# ------------------- ++# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. ++m4_defun([_LT_CC_BASENAME], ++[for cc_temp in $1""; do ++ case $cc_temp in ++ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; ++ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; ++ \-*) ;; ++ *) break;; ++ esac ++done ++cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ++]) ++ ++ ++# _LT_FILEUTILS_DEFAULTS ++# ---------------------- ++# It is okay to use these file commands and assume they have been set ++# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. ++m4_defun([_LT_FILEUTILS_DEFAULTS], ++[: ${CP="cp -f"} ++: ${MV="mv -f"} ++: ${RM="rm -f"} ++])# _LT_FILEUTILS_DEFAULTS ++ ++ ++# _LT_SETUP ++# --------- ++m4_defun([_LT_SETUP], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++_LT_DECL([], [host_alias], [0], [The host system])dnl ++_LT_DECL([], [host], [0])dnl ++_LT_DECL([], [host_os], [0])dnl ++dnl ++_LT_DECL([], [build_alias], [0], [The build system])dnl ++_LT_DECL([], [build], [0])dnl ++_LT_DECL([], [build_os], [0])dnl ++dnl ++AC_REQUIRE([AC_PROG_CC])dnl ++AC_REQUIRE([LT_PATH_LD])dnl ++AC_REQUIRE([LT_PATH_NM])dnl ++dnl ++AC_REQUIRE([AC_PROG_LN_S])dnl ++test -z "$LN_S" && LN_S="ln -s" ++_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl ++dnl ++AC_REQUIRE([LT_CMD_MAX_LEN])dnl ++_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl ++_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl ++dnl ++m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_CHECK_SHELL_FEATURES])dnl ++m4_require([_LT_CMD_RELOAD])dnl ++m4_require([_LT_CHECK_MAGIC_METHOD])dnl ++m4_require([_LT_CMD_OLD_ARCHIVE])dnl ++m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl ++ ++_LT_CONFIG_LIBTOOL_INIT([ ++# See if we are running on zsh, and set the options which allow our ++# commands through without removal of \ escapes INIT. ++if test -n "\${ZSH_VERSION+set}" ; then ++ setopt NO_GLOB_SUBST ++fi ++]) ++if test -n "${ZSH_VERSION+set}" ; then ++ setopt NO_GLOB_SUBST ++fi ++ ++_LT_CHECK_OBJDIR ++ ++m4_require([_LT_TAG_COMPILER])dnl ++_LT_PROG_ECHO_BACKSLASH ++ ++case $host_os in ++aix3*) ++ # AIX sometimes has problems with the GCC collect2 program. For some ++ # reason, if we set the COLLECT_NAMES environment variable, the problems ++ # vanish in a puff of smoke. ++ if test "X${COLLECT_NAMES+set}" != Xset; then ++ COLLECT_NAMES= ++ export COLLECT_NAMES ++ fi ++ ;; ++esac ++ ++# Sed substitution that helps us do robust quoting. It backslashifies ++# metacharacters that are still active within double-quoted strings. ++sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' ++ ++# Same as above, but do not quote variable references. ++double_quote_subst='s/\([["`\\]]\)/\\\1/g' ++ ++# Sed substitution to delay expansion of an escaped shell variable in a ++# double_quote_subst'ed string. ++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' ++ ++# Sed substitution to delay expansion of an escaped single quote. ++delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' ++ ++# Sed substitution to avoid accidental globbing in evaled expressions ++no_glob_subst='s/\*/\\\*/g' ++ ++# Global variables: ++ofile=libtool ++can_build_shared=yes ++ ++# All known linkers require a `.a' archive for static linking (except MSVC, ++# which needs '.lib'). ++libext=a ++ ++with_gnu_ld="$lt_cv_prog_gnu_ld" ++ ++old_CC="$CC" ++old_CFLAGS="$CFLAGS" ++ ++# Set sane defaults for various variables ++test -z "$CC" && CC=cc ++test -z "$LTCC" && LTCC=$CC ++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS ++test -z "$LD" && LD=ld ++test -z "$ac_objext" && ac_objext=o ++ ++_LT_CC_BASENAME([$compiler]) ++ ++# Only perform the check for file, if the check method requires it ++test -z "$MAGIC_CMD" && MAGIC_CMD=file ++case $deplibs_check_method in ++file_magic*) ++ if test "$file_magic_cmd" = '$MAGIC_CMD'; then ++ _LT_PATH_MAGIC ++ fi ++ ;; ++esac ++ ++# Use C for the default configuration in the libtool script ++LT_SUPPORTED_TAG([CC]) ++_LT_LANG_C_CONFIG ++_LT_LANG_DEFAULT_CONFIG ++_LT_CONFIG_COMMANDS ++])# _LT_SETUP ++ ++ ++# _LT_PROG_LTMAIN ++# --------------- ++# Note that this code is called both from `configure', and `config.status' ++# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, ++# `config.status' has no value for ac_aux_dir unless we are using Automake, ++# so we pass a copy along to make sure it has a sensible value anyway. ++m4_defun([_LT_PROG_LTMAIN], ++[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl ++_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) ++ltmain="$ac_aux_dir/ltmain.sh" ++])# _LT_PROG_LTMAIN ++ ++ ++## ------------------------------------- ## ++## Accumulate code for creating libtool. ## ++## ------------------------------------- ## ++ ++# So that we can recreate a full libtool script including additional ++# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS ++# in macros and then make a single call at the end using the `libtool' ++# label. ++ ++ ++# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) ++# ---------------------------------------- ++# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. ++m4_define([_LT_CONFIG_LIBTOOL_INIT], ++[m4_ifval([$1], ++ [m4_append([_LT_OUTPUT_LIBTOOL_INIT], ++ [$1 ++])])]) ++ ++# Initialize. ++m4_define([_LT_OUTPUT_LIBTOOL_INIT]) ++ ++ ++# _LT_CONFIG_LIBTOOL([COMMANDS]) ++# ------------------------------ ++# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. ++m4_define([_LT_CONFIG_LIBTOOL], ++[m4_ifval([$1], ++ [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], ++ [$1 ++])])]) ++ ++# Initialize. ++m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) ++ ++ ++# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) ++# ----------------------------------------------------- ++m4_defun([_LT_CONFIG_SAVE_COMMANDS], ++[_LT_CONFIG_LIBTOOL([$1]) ++_LT_CONFIG_LIBTOOL_INIT([$2]) ++]) ++ ++ ++# _LT_FORMAT_COMMENT([COMMENT]) ++# ----------------------------- ++# Add leading comment marks to the start of each line, and a trailing ++# full-stop to the whole comment if one is not present already. ++m4_define([_LT_FORMAT_COMMENT], ++[m4_ifval([$1], [ ++m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], ++ [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) ++)]) ++ ++ ++ ++## ------------------------ ## ++## FIXME: Eliminate VARNAME ## ++## ------------------------ ## ++ ++ ++# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) ++# ------------------------------------------------------------------- ++# CONFIGNAME is the name given to the value in the libtool script. ++# VARNAME is the (base) name used in the configure script. ++# VALUE may be 0, 1 or 2 for a computed quote escaped value based on ++# VARNAME. Any other value will be used directly. ++m4_define([_LT_DECL], ++[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], ++ [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], ++ [m4_ifval([$1], [$1], [$2])]) ++ lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) ++ m4_ifval([$4], ++ [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) ++ lt_dict_add_subkey([lt_decl_dict], [$2], ++ [tagged?], [m4_ifval([$5], [yes], [no])])]) ++]) ++ ++ ++# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) ++# -------------------------------------------------------- ++m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) ++ ++ ++# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) ++# ------------------------------------------------ ++m4_define([lt_decl_tag_varnames], ++[_lt_decl_filter([tagged?], [yes], $@)]) ++ ++ ++# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) ++# --------------------------------------------------------- ++m4_define([_lt_decl_filter], ++[m4_case([$#], ++ [0], [m4_fatal([$0: too few arguments: $#])], ++ [1], [m4_fatal([$0: too few arguments: $#: $1])], ++ [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], ++ [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], ++ [lt_dict_filter([lt_decl_dict], $@)])[]dnl ++]) ++ ++ ++# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) ++# -------------------------------------------------- ++m4_define([lt_decl_quote_varnames], ++[_lt_decl_filter([value], [1], $@)]) ++ ++ ++# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) ++# --------------------------------------------------- ++m4_define([lt_decl_dquote_varnames], ++[_lt_decl_filter([value], [2], $@)]) ++ ++ ++# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) ++# --------------------------------------------------- ++m4_define([lt_decl_varnames_tagged], ++[m4_assert([$# <= 2])dnl ++_$0(m4_quote(m4_default([$1], [[, ]])), ++ m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), ++ m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) ++m4_define([_lt_decl_varnames_tagged], ++[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) ++ ++ ++# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) ++# ------------------------------------------------ ++m4_define([lt_decl_all_varnames], ++[_$0(m4_quote(m4_default([$1], [[, ]])), ++ m4_if([$2], [], ++ m4_quote(lt_decl_varnames), ++ m4_quote(m4_shift($@))))[]dnl ++]) ++m4_define([_lt_decl_all_varnames], ++[lt_join($@, lt_decl_varnames_tagged([$1], ++ lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl ++]) ++ ++ ++# _LT_CONFIG_STATUS_DECLARE([VARNAME]) ++# ------------------------------------ ++# Quote a variable value, and forward it to `config.status' so that its ++# declaration there will have the same value as in `configure'. VARNAME ++# must have a single quote delimited value for this to work. ++m4_define([_LT_CONFIG_STATUS_DECLARE], ++[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) ++ ++ ++# _LT_CONFIG_STATUS_DECLARATIONS ++# ------------------------------ ++# We delimit libtool config variables with single quotes, so when ++# we write them to config.status, we have to be sure to quote all ++# embedded single quotes properly. In configure, this macro expands ++# each variable declared with _LT_DECL (and _LT_TAGDECL) into: ++# ++# ='`$ECHO "X$" | $Xsed -e "$delay_single_quote_subst"`' ++m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], ++[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), ++ [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) ++ ++ ++# _LT_LIBTOOL_TAGS ++# ---------------- ++# Output comment and list of tags supported by the script ++m4_defun([_LT_LIBTOOL_TAGS], ++[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl ++available_tags="_LT_TAGS"dnl ++]) ++ ++ ++# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) ++# ----------------------------------- ++# Extract the dictionary values for VARNAME (optionally with TAG) and ++# expand to a commented shell variable setting: ++# ++# # Some comment about what VAR is for. ++# visible_name=$lt_internal_name ++m4_define([_LT_LIBTOOL_DECLARE], ++[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], ++ [description])))[]dnl ++m4_pushdef([_libtool_name], ++ m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl ++m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), ++ [0], [_libtool_name=[$]$1], ++ [1], [_libtool_name=$lt_[]$1], ++ [2], [_libtool_name=$lt_[]$1], ++ [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl ++m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl ++]) ++ ++ ++# _LT_LIBTOOL_CONFIG_VARS ++# ----------------------- ++# Produce commented declarations of non-tagged libtool config variables ++# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' ++# script. Tagged libtool config variables (even for the LIBTOOL CONFIG ++# section) are produced by _LT_LIBTOOL_TAG_VARS. ++m4_defun([_LT_LIBTOOL_CONFIG_VARS], ++[m4_foreach([_lt_var], ++ m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), ++ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) ++ ++ ++# _LT_LIBTOOL_TAG_VARS(TAG) ++# ------------------------- ++m4_define([_LT_LIBTOOL_TAG_VARS], ++[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), ++ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) ++ ++ ++# _LT_TAGVAR(VARNAME, [TAGNAME]) ++# ------------------------------ ++m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) ++ ++ ++# _LT_CONFIG_COMMANDS ++# ------------------- ++# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of ++# variables for single and double quote escaping we saved from calls ++# to _LT_DECL, we can put quote escaped variables declarations ++# into `config.status', and then the shell code to quote escape them in ++# for loops in `config.status'. Finally, any additional code accumulated ++# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. ++m4_defun([_LT_CONFIG_COMMANDS], ++[AC_PROVIDE_IFELSE([LT_OUTPUT], ++ dnl If the libtool generation code has been placed in $CONFIG_LT, ++ dnl instead of duplicating it all over again into config.status, ++ dnl then we will have config.status run $CONFIG_LT later, so it ++ dnl needs to know what name is stored there: ++ [AC_CONFIG_COMMANDS([libtool], ++ [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], ++ dnl If the libtool generation code is destined for config.status, ++ dnl expand the accumulated commands and init code now: ++ [AC_CONFIG_COMMANDS([libtool], ++ [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) ++])#_LT_CONFIG_COMMANDS ++ ++ ++# Initialize. ++m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], ++[ ++ ++# The HP-UX ksh and POSIX shell print the target directory to stdout ++# if CDPATH is set. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++sed_quote_subst='$sed_quote_subst' ++double_quote_subst='$double_quote_subst' ++delay_variable_subst='$delay_variable_subst' ++_LT_CONFIG_STATUS_DECLARATIONS ++LTCC='$LTCC' ++LTCFLAGS='$LTCFLAGS' ++compiler='$compiler_DEFAULT' ++ ++# Quote evaled strings. ++for var in lt_decl_all_varnames([[ \ ++]], lt_decl_quote_varnames); do ++ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in ++ *[[\\\\\\\`\\"\\\$]]*) ++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ++ ;; ++ *) ++ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" ++ ;; ++ esac ++done ++ ++# Double-quote double-evaled strings. ++for var in lt_decl_all_varnames([[ \ ++]], lt_decl_dquote_varnames); do ++ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in ++ *[[\\\\\\\`\\"\\\$]]*) ++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ++ ;; ++ *) ++ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" ++ ;; ++ esac ++done ++ ++# Fix-up fallback echo if it was mangled by the above quoting rules. ++case \$lt_ECHO in ++*'\\\[$]0 --fallback-echo"')dnl " ++ lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` ++ ;; ++esac ++ ++_LT_OUTPUT_LIBTOOL_INIT ++]) ++ ++ ++# LT_OUTPUT ++# --------- ++# This macro allows early generation of the libtool script (before ++# AC_OUTPUT is called), incase it is used in configure for compilation ++# tests. ++AC_DEFUN([LT_OUTPUT], ++[: ${CONFIG_LT=./config.lt} ++AC_MSG_NOTICE([creating $CONFIG_LT]) ++cat >"$CONFIG_LT" <<_LTEOF ++#! $SHELL ++# Generated by $as_me. ++# Run this file to recreate a libtool stub with the current configuration. ++ ++lt_cl_silent=false ++SHELL=\${CONFIG_SHELL-$SHELL} ++_LTEOF ++ ++cat >>"$CONFIG_LT" <<\_LTEOF ++AS_SHELL_SANITIZE ++_AS_PREPARE ++ ++exec AS_MESSAGE_FD>&1 ++exec AS_MESSAGE_LOG_FD>>config.log ++{ ++ echo ++ AS_BOX([Running $as_me.]) ++} >&AS_MESSAGE_LOG_FD ++ ++lt_cl_help="\ ++\`$as_me' creates a local libtool stub from the current configuration, ++for use in further configure time tests before the real libtool is ++generated. ++ ++Usage: $[0] [[OPTIONS]] ++ ++ -h, --help print this help, then exit ++ -V, --version print version number, then exit ++ -q, --quiet do not print progress messages ++ -d, --debug don't remove temporary files ++ ++Report bugs to ." ++ ++lt_cl_version="\ ++m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl ++m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) ++configured by $[0], generated by m4_PACKAGE_STRING. ++ ++Copyright (C) 2008 Free Software Foundation, Inc. ++This config.lt script is free software; the Free Software Foundation ++gives unlimited permision to copy, distribute and modify it." ++ ++while test $[#] != 0 ++do ++ case $[1] in ++ --version | --v* | -V ) ++ echo "$lt_cl_version"; exit 0 ;; ++ --help | --h* | -h ) ++ echo "$lt_cl_help"; exit 0 ;; ++ --debug | --d* | -d ) ++ debug=: ;; ++ --quiet | --q* | --silent | --s* | -q ) ++ lt_cl_silent=: ;; ++ ++ -*) AC_MSG_ERROR([unrecognized option: $[1] ++Try \`$[0] --help' for more information.]) ;; ++ ++ *) AC_MSG_ERROR([unrecognized argument: $[1] ++Try \`$[0] --help' for more information.]) ;; ++ esac ++ shift ++done ++ ++if $lt_cl_silent; then ++ exec AS_MESSAGE_FD>/dev/null ++fi ++_LTEOF ++ ++cat >>"$CONFIG_LT" <<_LTEOF ++_LT_OUTPUT_LIBTOOL_COMMANDS_INIT ++_LTEOF ++ ++cat >>"$CONFIG_LT" <<\_LTEOF ++AC_MSG_NOTICE([creating $ofile]) ++_LT_OUTPUT_LIBTOOL_COMMANDS ++AS_EXIT(0) ++_LTEOF ++chmod +x "$CONFIG_LT" ++ ++# configure is writing to config.log, but config.lt does its own redirection, ++# appending to config.log, which fails on DOS, as config.log is still kept ++# open by configure. Here we exec the FD to /dev/null, effectively closing ++# config.log, so it can be properly (re)opened and appended to by config.lt. ++if test "$no_create" != yes; then ++ lt_cl_success=: ++ test "$silent" = yes && ++ lt_config_lt_args="$lt_config_lt_args --quiet" ++ exec AS_MESSAGE_LOG_FD>/dev/null ++ $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false ++ exec AS_MESSAGE_LOG_FD>>config.log ++ $lt_cl_success || AS_EXIT(1) ++fi ++])# LT_OUTPUT ++ ++ ++# _LT_CONFIG(TAG) ++# --------------- ++# If TAG is the built-in tag, create an initial libtool script with a ++# default configuration from the untagged config vars. Otherwise add code ++# to config.status for appending the configuration named by TAG from the ++# matching tagged config vars. ++m4_defun([_LT_CONFIG], ++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++_LT_CONFIG_SAVE_COMMANDS([ ++ m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl ++ m4_if(_LT_TAG, [C], [ ++ # See if we are running on zsh, and set the options which allow our ++ # commands through without removal of \ escapes. ++ if test -n "${ZSH_VERSION+set}" ; then ++ setopt NO_GLOB_SUBST ++ fi ++ ++ cfgfile="${ofile}T" ++ trap "$RM \"$cfgfile\"; exit 1" 1 2 15 ++ $RM "$cfgfile" ++ ++ cat <<_LT_EOF >> "$cfgfile" ++#! $SHELL ++ ++# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. ++# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION ++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: ++# NOTE: Changes made to this file will be lost: look at ltmain.sh. ++# ++_LT_COPYING ++_LT_LIBTOOL_TAGS ++ ++# ### BEGIN LIBTOOL CONFIG ++_LT_LIBTOOL_CONFIG_VARS ++_LT_LIBTOOL_TAG_VARS ++# ### END LIBTOOL CONFIG ++ ++_LT_EOF ++ ++ case $host_os in ++ aix3*) ++ cat <<\_LT_EOF >> "$cfgfile" ++# AIX sometimes has problems with the GCC collect2 program. For some ++# reason, if we set the COLLECT_NAMES environment variable, the problems ++# vanish in a puff of smoke. ++if test "X${COLLECT_NAMES+set}" != Xset; then ++ COLLECT_NAMES= ++ export COLLECT_NAMES ++fi ++_LT_EOF ++ ;; ++ esac ++ ++ _LT_PROG_LTMAIN ++ ++ # We use sed instead of cat because bash on DJGPP gets confused if ++ # if finds mixed CR/LF and LF-only lines. Since sed operates in ++ # text mode, it properly converts lines to CR/LF. This bash problem ++ # is reportedly fixed, but why not run on old versions too? ++ sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) ++ ++ _LT_PROG_XSI_SHELLFNS ++ ++ sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) ++ ++ mv -f "$cfgfile" "$ofile" || ++ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") ++ chmod +x "$ofile" ++], ++[cat <<_LT_EOF >> "$ofile" ++ ++dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded ++dnl in a comment (ie after a #). ++# ### BEGIN LIBTOOL TAG CONFIG: $1 ++_LT_LIBTOOL_TAG_VARS(_LT_TAG) ++# ### END LIBTOOL TAG CONFIG: $1 ++_LT_EOF ++])dnl /m4_if ++], ++[m4_if([$1], [], [ ++ PACKAGE='$PACKAGE' ++ VERSION='$VERSION' ++ TIMESTAMP='$TIMESTAMP' ++ RM='$RM' ++ ofile='$ofile'], []) ++])dnl /_LT_CONFIG_SAVE_COMMANDS ++])# _LT_CONFIG ++ ++ ++# LT_SUPPORTED_TAG(TAG) ++# --------------------- ++# Trace this macro to discover what tags are supported by the libtool ++# --tag option, using: ++# autoconf --trace 'LT_SUPPORTED_TAG:$1' ++AC_DEFUN([LT_SUPPORTED_TAG], []) ++ ++ ++# C support is built-in for now ++m4_define([_LT_LANG_C_enabled], []) ++m4_define([_LT_TAGS], []) ++ ++ ++# LT_LANG(LANG) ++# ------------- ++# Enable libtool support for the given language if not already enabled. ++AC_DEFUN([LT_LANG], ++[AC_BEFORE([$0], [LT_OUTPUT])dnl ++m4_case([$1], ++ [C], [_LT_LANG(C)], ++ [C++], [_LT_LANG(CXX)], ++ [Java], [_LT_LANG(GCJ)], ++ [Fortran 77], [_LT_LANG(F77)], ++ [Fortran], [_LT_LANG(FC)], ++ [Windows Resource], [_LT_LANG(RC)], ++ [m4_ifdef([_LT_LANG_]$1[_CONFIG], ++ [_LT_LANG($1)], ++ [m4_fatal([$0: unsupported language: "$1"])])])dnl ++])# LT_LANG ++ ++ ++# _LT_LANG(LANGNAME) ++# ------------------ ++m4_defun([_LT_LANG], ++[m4_ifdef([_LT_LANG_]$1[_enabled], [], ++ [LT_SUPPORTED_TAG([$1])dnl ++ m4_append([_LT_TAGS], [$1 ])dnl ++ m4_define([_LT_LANG_]$1[_enabled], [])dnl ++ _LT_LANG_$1_CONFIG($1)])dnl ++])# _LT_LANG ++ ++ ++# _LT_LANG_DEFAULT_CONFIG ++# ----------------------- ++m4_defun([_LT_LANG_DEFAULT_CONFIG], ++[AC_PROVIDE_IFELSE([AC_PROG_CXX], ++ [LT_LANG(CXX)], ++ [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) ++ ++AC_PROVIDE_IFELSE([AC_PROG_F77], ++ [LT_LANG(F77)], ++ [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) ++ ++AC_PROVIDE_IFELSE([AC_PROG_FC], ++ [LT_LANG(FC)], ++ [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) ++ ++dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal ++dnl pulling things in needlessly. ++AC_PROVIDE_IFELSE([AC_PROG_GCJ], ++ [LT_LANG(GCJ)], ++ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], ++ [LT_LANG(GCJ)], ++ [AC_PROVIDE_IFELSE([LT_PROG_GCJ], ++ [LT_LANG(GCJ)], ++ [m4_ifdef([AC_PROG_GCJ], ++ [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) ++ m4_ifdef([A][M_PROG_GCJ], ++ [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) ++ m4_ifdef([LT_PROG_GCJ], ++ [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) ++ ++AC_PROVIDE_IFELSE([LT_PROG_RC], ++ [LT_LANG(RC)], ++ [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) ++])# _LT_LANG_DEFAULT_CONFIG ++ ++# Obsolete macros: ++AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) ++AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) ++AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) ++AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_CXX], []) ++dnl AC_DEFUN([AC_LIBTOOL_F77], []) ++dnl AC_DEFUN([AC_LIBTOOL_FC], []) ++dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) ++ ++ ++# _LT_TAG_COMPILER ++# ---------------- ++m4_defun([_LT_TAG_COMPILER], ++[AC_REQUIRE([AC_PROG_CC])dnl ++ ++_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl ++_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl ++_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl ++_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl ++ ++# If no C compiler was specified, use CC. ++LTCC=${LTCC-"$CC"} ++ ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++ ++# Allow CC to be a program name with arguments. ++compiler=$CC ++])# _LT_TAG_COMPILER ++ ++ ++# _LT_COMPILER_BOILERPLATE ++# ------------------------ ++# Check for compiler boilerplate output or warnings with ++# the simple compiler test code. ++m4_defun([_LT_COMPILER_BOILERPLATE], ++[m4_require([_LT_DECL_SED])dnl ++ac_outfile=conftest.$ac_objext ++echo "$lt_simple_compile_test_code" >conftest.$ac_ext ++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++_lt_compiler_boilerplate=`cat conftest.err` ++$RM conftest* ++])# _LT_COMPILER_BOILERPLATE ++ ++ ++# _LT_LINKER_BOILERPLATE ++# ---------------------- ++# Check for linker boilerplate output or warnings with ++# the simple link test code. ++m4_defun([_LT_LINKER_BOILERPLATE], ++[m4_require([_LT_DECL_SED])dnl ++ac_outfile=conftest.$ac_objext ++echo "$lt_simple_link_test_code" >conftest.$ac_ext ++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++_lt_linker_boilerplate=`cat conftest.err` ++$RM -r conftest* ++])# _LT_LINKER_BOILERPLATE ++ ++# _LT_REQUIRED_DARWIN_CHECKS ++# ------------------------- ++m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ ++ case $host_os in ++ rhapsody* | darwin*) ++ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) ++ AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) ++ AC_CHECK_TOOL([LIPO], [lipo], [:]) ++ AC_CHECK_TOOL([OTOOL], [otool], [:]) ++ AC_CHECK_TOOL([OTOOL64], [otool64], [:]) ++ _LT_DECL([], [DSYMUTIL], [1], ++ [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) ++ _LT_DECL([], [NMEDIT], [1], ++ [Tool to change global to local symbols on Mac OS X]) ++ _LT_DECL([], [LIPO], [1], ++ [Tool to manipulate fat objects and archives on Mac OS X]) ++ _LT_DECL([], [OTOOL], [1], ++ [ldd/readelf like tool for Mach-O binaries on Mac OS X]) ++ _LT_DECL([], [OTOOL64], [1], ++ [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) ++ ++ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], ++ [lt_cv_apple_cc_single_mod=no ++ if test -z "${LT_MULTI_MODULE}"; then ++ # By default we will add the -single_module flag. You can override ++ # by either setting the environment variable LT_MULTI_MODULE ++ # non-empty at configure time, or by adding -multi_module to the ++ # link flags. ++ rm -rf libconftest.dylib* ++ echo "int foo(void){return 1;}" > conftest.c ++ echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ++-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD ++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ++ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err ++ _lt_result=$? ++ if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then ++ lt_cv_apple_cc_single_mod=yes ++ else ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ fi ++ rm -rf libconftest.dylib* ++ rm -f conftest.* ++ fi]) ++ AC_CACHE_CHECK([for -exported_symbols_list linker flag], ++ [lt_cv_ld_exported_symbols_list], ++ [lt_cv_ld_exported_symbols_list=no ++ save_LDFLAGS=$LDFLAGS ++ echo "_main" > conftest.sym ++ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], ++ [lt_cv_ld_exported_symbols_list=yes], ++ [lt_cv_ld_exported_symbols_list=no]) ++ LDFLAGS="$save_LDFLAGS" ++ ]) ++ case $host_os in ++ rhapsody* | darwin1.[[012]]) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; ++ darwin1.*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ darwin*) # darwin 5.x on ++ # if running on 10.5 or later, the deployment target defaults ++ # to the OS version, if on x86, and 10.4, the deployment ++ # target defaults to 10.4. Don't you love it? ++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in ++ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ 10.[[012]]*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ 10.*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ esac ++ ;; ++ esac ++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then ++ _lt_dar_single_mod='$single_module' ++ fi ++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then ++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' ++ else ++ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ fi ++ if test "$DSYMUTIL" != ":"; then ++ _lt_dsymutil='~$DSYMUTIL $lib || :' ++ else ++ _lt_dsymutil= ++ fi ++ ;; ++ esac ++]) ++ ++ ++# _LT_DARWIN_LINKER_FEATURES ++# -------------------------- ++# Checks for linker and compiler features on darwin ++m4_defun([_LT_DARWIN_LINKER_FEATURES], ++[ ++ m4_require([_LT_REQUIRED_DARWIN_CHECKS]) ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_TAGVAR(hardcode_direct, $1)=no ++ _LT_TAGVAR(hardcode_automatic, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='' ++ _LT_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" ++ case $cc_basename in ++ ifort*) _lt_dar_can_shared=yes ;; ++ *) _lt_dar_can_shared=$GCC ;; ++ esac ++ if test "$_lt_dar_can_shared" = "yes"; then ++ output_verbose_link_cmd=echo ++ _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ m4_if([$1], [CXX], ++[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then ++ _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" ++ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" ++ fi ++],[]) ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++]) ++ ++# _LT_SYS_MODULE_PATH_AIX ++# ----------------------- ++# Links a minimal program and checks the executable ++# for the system default hardcoded library path. In most cases, ++# this is /usr/lib:/lib, but when the MPI compilers are used ++# the location of the communication and MPI libs are included too. ++# If we don't find anything, use the default library path according ++# to the aix ld manual. ++m4_defun([_LT_SYS_MODULE_PATH_AIX], ++[m4_require([_LT_DECL_SED])dnl ++AC_LINK_IFELSE(AC_LANG_PROGRAM,[ ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++# Check for a 64-bit object if we didn't find anything. ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi],[]) ++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++])# _LT_SYS_MODULE_PATH_AIX ++ ++ ++# _LT_SHELL_INIT(ARG) ++# ------------------- ++m4_define([_LT_SHELL_INIT], ++[ifdef([AC_DIVERSION_NOTICE], ++ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], ++ [AC_DIVERT_PUSH(NOTICE)]) ++$1 ++AC_DIVERT_POP ++])# _LT_SHELL_INIT ++ ++ ++# _LT_PROG_ECHO_BACKSLASH ++# ----------------------- ++# Add some code to the start of the generated configure script which ++# will find an echo command which doesn't interpret backslashes. ++m4_defun([_LT_PROG_ECHO_BACKSLASH], ++[_LT_SHELL_INIT([ ++# Check that we are running under the correct shell. ++SHELL=${CONFIG_SHELL-/bin/sh} ++ ++case X$lt_ECHO in ++X*--fallback-echo) ++ # Remove one level of quotation (which was required for Make). ++ ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` ++ ;; ++esac ++ ++ECHO=${lt_ECHO-echo} ++if test "X[$]1" = X--no-reexec; then ++ # Discard the --no-reexec flag, and continue. ++ shift ++elif test "X[$]1" = X--fallback-echo; then ++ # Avoid inline document here, it may be left over ++ : ++elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then ++ # Yippee, $ECHO works! ++ : ++else ++ # Restart under the correct shell. ++ exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} ++fi ++ ++if test "X[$]1" = X--fallback-echo; then ++ # used as fallback echo ++ shift ++ cat <<_LT_EOF ++[$]* ++_LT_EOF ++ exit 0 ++fi ++ ++# The HP-UX ksh and POSIX shell print the target directory to stdout ++# if CDPATH is set. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++if test -z "$lt_ECHO"; then ++ if test "X${echo_test_string+set}" != Xset; then ++ # find a string as large as possible, as long as the shell can cope with it ++ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do ++ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... ++ if { echo_test_string=`eval $cmd`; } 2>/dev/null && ++ { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null ++ then ++ break ++ fi ++ done ++ fi ++ ++ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ : ++ else ++ # The Solaris, AIX, and Digital Unix default echo programs unquote ++ # backslashes. This makes it impossible to quote backslashes using ++ # echo "$something" | sed 's/\\/\\\\/g' ++ # ++ # So, first we look for a working echo in the user's PATH. ++ ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for dir in $PATH /usr/ucb; do ++ IFS="$lt_save_ifs" ++ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && ++ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ ECHO="$dir/echo" ++ break ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ++ if test "X$ECHO" = Xecho; then ++ # We didn't find a better echo, so look for alternatives. ++ if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ # This shell has a builtin print -r that does the trick. ++ ECHO='print -r' ++ elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && ++ test "X$CONFIG_SHELL" != X/bin/ksh; then ++ # If we have ksh, try running configure again with it. ++ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} ++ export ORIGINAL_CONFIG_SHELL ++ CONFIG_SHELL=/bin/ksh ++ export CONFIG_SHELL ++ exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} ++ else ++ # Try using printf. ++ ECHO='printf %s\n' ++ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ # Cool, printf works ++ : ++ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && ++ test "X$echo_testing_string" = 'X\t' && ++ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL ++ export CONFIG_SHELL ++ SHELL="$CONFIG_SHELL" ++ export SHELL ++ ECHO="$CONFIG_SHELL [$]0 --fallback-echo" ++ elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && ++ test "X$echo_testing_string" = 'X\t' && ++ echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ ECHO="$CONFIG_SHELL [$]0 --fallback-echo" ++ else ++ # maybe with a smaller string... ++ prev=: ++ ++ for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do ++ if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null ++ then ++ break ++ fi ++ prev="$cmd" ++ done ++ ++ if test "$prev" != 'sed 50q "[$]0"'; then ++ echo_test_string=`eval $prev` ++ export echo_test_string ++ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} ++ else ++ # Oops. We lost completely, so just stick with echo. ++ ECHO=echo ++ fi ++ fi ++ fi ++ fi ++ fi ++fi ++ ++# Copy echo and quote the copy suitably for passing to libtool from ++# the Makefile, instead of quoting the original, which is used later. ++lt_ECHO=$ECHO ++if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then ++ lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" ++fi ++ ++AC_SUBST(lt_ECHO) ++]) ++_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) ++_LT_DECL([], [ECHO], [1], ++ [An echo program that does not interpret backslashes]) ++])# _LT_PROG_ECHO_BACKSLASH ++ ++ ++# _LT_ENABLE_LOCK ++# --------------- ++m4_defun([_LT_ENABLE_LOCK], ++[AC_ARG_ENABLE([libtool-lock], ++ [AS_HELP_STRING([--disable-libtool-lock], ++ [avoid locking (might break parallel builds)])]) ++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ++ ++# Some flags need to be propagated to the compiler or linker for good ++# libtool support. ++case $host in ++ia64-*-hpux*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *ELF-32*) ++ HPUX_IA64_MODE="32" ++ ;; ++ *ELF-64*) ++ HPUX_IA64_MODE="64" ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++*-*-irix6*) ++ # Find out which ABI we are using. ++ echo '[#]line __oline__ "configure"' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ if test "$lt_cv_prog_gnu_ld" = yes; then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -melf32bsmip" ++ ;; ++ *N32*) ++ LD="${LD-ld} -melf32bmipn32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -melf64bmip" ++ ;; ++ esac ++ else ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -32" ++ ;; ++ *N32*) ++ LD="${LD-ld} -n32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -64" ++ ;; ++ esac ++ fi ++ fi ++ rm -rf conftest* ++ ;; ++ ++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ ++s390*-*linux*|s390*-*tpf*|sparc*-*linux*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ case `/usr/bin/file conftest.o` in ++ *32-bit*) ++ case $host in ++ x86_64-*kfreebsd*-gnu) ++ LD="${LD-ld} -m elf_i386_fbsd" ++ ;; ++ x86_64-*linux*) ++ LD="${LD-ld} -m elf_i386" ++ ;; ++ ppc64-*linux*|powerpc64-*linux*) ++ LD="${LD-ld} -m elf32ppclinux" ++ ;; ++ s390x-*linux*) ++ LD="${LD-ld} -m elf_s390" ++ ;; ++ sparc64-*linux*) ++ LD="${LD-ld} -m elf32_sparc" ++ ;; ++ esac ++ ;; ++ *64-bit*) ++ case $host in ++ x86_64-*kfreebsd*-gnu) ++ LD="${LD-ld} -m elf_x86_64_fbsd" ++ ;; ++ x86_64-*linux*) ++ LD="${LD-ld} -m elf_x86_64" ++ ;; ++ ppc*-*linux*|powerpc*-*linux*) ++ LD="${LD-ld} -m elf64ppc" ++ ;; ++ s390*-*linux*|s390*-*tpf*) ++ LD="${LD-ld} -m elf64_s390" ++ ;; ++ sparc*-*linux*) ++ LD="${LD-ld} -m elf64_sparc" ++ ;; ++ esac ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++ ++*-*-sco3.2v5*) ++ # On SCO OpenServer 5, we need -belf to get full-featured binaries. ++ SAVE_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -belf" ++ AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, ++ [AC_LANG_PUSH(C) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) ++ AC_LANG_POP]) ++ if test x"$lt_cv_cc_needs_belf" != x"yes"; then ++ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf ++ CFLAGS="$SAVE_CFLAGS" ++ fi ++ ;; ++sparc*-*solaris*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ case `/usr/bin/file conftest.o` in ++ *64-bit*) ++ case $lt_cv_prog_gnu_ld in ++ yes*) LD="${LD-ld} -m elf64_sparc" ;; ++ *) ++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then ++ LD="${LD-ld} -64" ++ fi ++ ;; ++ esac ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++esac ++ ++need_locks="$enable_libtool_lock" ++])# _LT_ENABLE_LOCK ++ ++ ++# _LT_CMD_OLD_ARCHIVE ++# ------------------- ++m4_defun([_LT_CMD_OLD_ARCHIVE], ++[AC_CHECK_TOOL(AR, ar, false) ++test -z "$AR" && AR=ar ++test -z "$AR_FLAGS" && AR_FLAGS=cru ++_LT_DECL([], [AR], [1], [The archiver]) ++_LT_DECL([], [AR_FLAGS], [1]) ++ ++AC_CHECK_TOOL(STRIP, strip, :) ++test -z "$STRIP" && STRIP=: ++_LT_DECL([], [STRIP], [1], [A symbol stripping program]) ++ ++AC_CHECK_TOOL(RANLIB, ranlib, :) ++test -z "$RANLIB" && RANLIB=: ++_LT_DECL([], [RANLIB], [1], ++ [Commands used to install an old-style archive]) ++ ++# Determine commands to create old-style static archives. ++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' ++old_postinstall_cmds='chmod 644 $oldlib' ++old_postuninstall_cmds= ++ ++if test -n "$RANLIB"; then ++ case $host_os in ++ openbsd*) ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ++ ;; ++ *) ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ++ ;; ++ esac ++ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" ++fi ++_LT_DECL([], [old_postinstall_cmds], [2]) ++_LT_DECL([], [old_postuninstall_cmds], [2]) ++_LT_TAGDECL([], [old_archive_cmds], [2], ++ [Commands used to build an old-style archive]) ++])# _LT_CMD_OLD_ARCHIVE ++ ++ ++# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, ++# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) ++# ---------------------------------------------------------------- ++# Check whether the given compiler option works ++AC_DEFUN([_LT_COMPILER_OPTION], ++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_DECL_SED])dnl ++AC_CACHE_CHECK([$1], [$2], ++ [$2=no ++ m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ lt_compiler_flag="$3" ++ # Insert the option either (1) after the last *FLAGS variable, or ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ # The option is referenced via a variable to avoid confusing sed. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ ++ -e 's:$: $lt_compiler_flag:'` ++ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) ++ (eval "$lt_compile" 2>conftest.err) ++ ac_status=$? ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++ if (exit $ac_status) && test -s "$ac_outfile"; then ++ # The compiler can only warn and ignore the option if not recognized ++ # So say no if there are warnings other than the usual output. ++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then ++ $2=yes ++ fi ++ fi ++ $RM conftest* ++]) ++ ++if test x"[$]$2" = xyes; then ++ m4_if([$5], , :, [$5]) ++else ++ m4_if([$6], , :, [$6]) ++fi ++])# _LT_COMPILER_OPTION ++ ++# Old name: ++AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) ++ ++ ++# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, ++# [ACTION-SUCCESS], [ACTION-FAILURE]) ++# ---------------------------------------------------- ++# Check whether the given linker option works ++AC_DEFUN([_LT_LINKER_OPTION], ++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_DECL_SED])dnl ++AC_CACHE_CHECK([$1], [$2], ++ [$2=no ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS $3" ++ echo "$lt_simple_link_test_code" > conftest.$ac_ext ++ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then ++ # The linker can only warn and ignore the option if not recognized ++ # So say no if there are warnings ++ if test -s conftest.err; then ++ # Append any errors to the config.log. ++ cat conftest.err 1>&AS_MESSAGE_LOG_FD ++ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if diff conftest.exp conftest.er2 >/dev/null; then ++ $2=yes ++ fi ++ else ++ $2=yes ++ fi ++ fi ++ $RM -r conftest* ++ LDFLAGS="$save_LDFLAGS" ++]) ++ ++if test x"[$]$2" = xyes; then ++ m4_if([$4], , :, [$4]) ++else ++ m4_if([$5], , :, [$5]) ++fi ++])# _LT_LINKER_OPTION ++ ++# Old name: ++AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) ++ ++ ++# LT_CMD_MAX_LEN ++#--------------- ++AC_DEFUN([LT_CMD_MAX_LEN], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++# find the maximum length of command line arguments ++AC_MSG_CHECKING([the maximum length of command line arguments]) ++AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl ++ i=0 ++ teststring="ABCD" ++ ++ case $build_os in ++ msdosdjgpp*) ++ # On DJGPP, this test can blow up pretty badly due to problems in libc ++ # (any single argument exceeding 2000 bytes causes a buffer overrun ++ # during glob expansion). Even if it were fixed, the result of this ++ # check would be larger than it should be. ++ lt_cv_sys_max_cmd_len=12288; # 12K is about right ++ ;; ++ ++ gnu*) ++ # Under GNU Hurd, this test is not required because there is ++ # no limit to the length of command line arguments. ++ # Libtool will interpret -1 as no limit whatsoever ++ lt_cv_sys_max_cmd_len=-1; ++ ;; ++ ++ cygwin* | mingw* | cegcc*) ++ # On Win9x/ME, this test blows up -- it succeeds, but takes ++ # about 5 minutes as the teststring grows exponentially. ++ # Worse, since 9x/ME are not pre-emptively multitasking, ++ # you end up with a "frozen" computer, even though with patience ++ # the test eventually succeeds (with a max line length of 256k). ++ # Instead, let's just punt: use the minimum linelength reported by ++ # all of the supported platforms: 8192 (on NT/2K/XP). ++ lt_cv_sys_max_cmd_len=8192; ++ ;; ++ ++ amigaos*) ++ # On AmigaOS with pdksh, this test takes hours, literally. ++ # So we just punt and use a minimum line length of 8192. ++ lt_cv_sys_max_cmd_len=8192; ++ ;; ++ ++ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) ++ # This has been around since 386BSD, at least. Likely further. ++ if test -x /sbin/sysctl; then ++ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` ++ elif test -x /usr/sbin/sysctl; then ++ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` ++ else ++ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs ++ fi ++ # And add a safety zone ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ++ ;; ++ ++ interix*) ++ # We know the value 262144 and hardcode it with a safety zone (like BSD) ++ lt_cv_sys_max_cmd_len=196608 ++ ;; ++ ++ osf*) ++ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure ++ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not ++ # nice to cause kernel panics so lets avoid the loop below. ++ # First set a reasonable default. ++ lt_cv_sys_max_cmd_len=16384 ++ # ++ if test -x /sbin/sysconfig; then ++ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in ++ *1*) lt_cv_sys_max_cmd_len=-1 ;; ++ esac ++ fi ++ ;; ++ sco3.2v5*) ++ lt_cv_sys_max_cmd_len=102400 ++ ;; ++ sysv5* | sco5v6* | sysv4.2uw2*) ++ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` ++ if test -n "$kargmax"; then ++ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` ++ else ++ lt_cv_sys_max_cmd_len=32768 ++ fi ++ ;; ++ *) ++ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` ++ if test -n "$lt_cv_sys_max_cmd_len"; then ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ++ else ++ # Make teststring a little bigger before we do anything with it. ++ # a 1K string should be a reasonable start. ++ for i in 1 2 3 4 5 6 7 8 ; do ++ teststring=$teststring$teststring ++ done ++ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} ++ # If test is not a shell built-in, we'll probably end up computing a ++ # maximum length that is only half of the actual maximum length, but ++ # we can't tell. ++ while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ ++ = "XX$teststring$teststring"; } >/dev/null 2>&1 && ++ test $i != 17 # 1/2 MB should be enough ++ do ++ i=`expr $i + 1` ++ teststring=$teststring$teststring ++ done ++ # Only check the string length outside the loop. ++ lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` ++ teststring= ++ # Add a significant safety factor because C++ compilers can tack on ++ # massive amounts of additional arguments before passing them to the ++ # linker. It appears as though 1/2 is a usable value. ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` ++ fi ++ ;; ++ esac ++]) ++if test -n $lt_cv_sys_max_cmd_len ; then ++ AC_MSG_RESULT($lt_cv_sys_max_cmd_len) ++else ++ AC_MSG_RESULT(none) ++fi ++max_cmd_len=$lt_cv_sys_max_cmd_len ++_LT_DECL([], [max_cmd_len], [0], ++ [What is the maximum length of a command?]) ++])# LT_CMD_MAX_LEN ++ ++# Old name: ++AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) ++ ++ ++# _LT_HEADER_DLFCN ++# ---------------- ++m4_defun([_LT_HEADER_DLFCN], ++[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl ++])# _LT_HEADER_DLFCN ++ ++ ++# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, ++# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) ++# ---------------------------------------------------------------- ++m4_defun([_LT_TRY_DLOPEN_SELF], ++[m4_require([_LT_HEADER_DLFCN])dnl ++if test "$cross_compiling" = yes; then : ++ [$4] ++else ++ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 ++ lt_status=$lt_dlunknown ++ cat > conftest.$ac_ext <<_LT_EOF ++[#line __oline__ "configure" ++#include "confdefs.h" ++ ++#if HAVE_DLFCN_H ++#include ++#endif ++ ++#include ++ ++#ifdef RTLD_GLOBAL ++# define LT_DLGLOBAL RTLD_GLOBAL ++#else ++# ifdef DL_GLOBAL ++# define LT_DLGLOBAL DL_GLOBAL ++# else ++# define LT_DLGLOBAL 0 ++# endif ++#endif ++ ++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we ++ find out it does not work in some platform. */ ++#ifndef LT_DLLAZY_OR_NOW ++# ifdef RTLD_LAZY ++# define LT_DLLAZY_OR_NOW RTLD_LAZY ++# else ++# ifdef DL_LAZY ++# define LT_DLLAZY_OR_NOW DL_LAZY ++# else ++# ifdef RTLD_NOW ++# define LT_DLLAZY_OR_NOW RTLD_NOW ++# else ++# ifdef DL_NOW ++# define LT_DLLAZY_OR_NOW DL_NOW ++# else ++# define LT_DLLAZY_OR_NOW 0 ++# endif ++# endif ++# endif ++# endif ++#endif ++ ++void fnord() { int i=42;} ++int main () ++{ ++ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); ++ int status = $lt_dlunknown; ++ ++ if (self) ++ { ++ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; ++ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; ++ /* dlclose (self); */ ++ } ++ else ++ puts (dlerror ()); ++ ++ return status; ++}] ++_LT_EOF ++ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then ++ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null ++ lt_status=$? ++ case x$lt_status in ++ x$lt_dlno_uscore) $1 ;; ++ x$lt_dlneed_uscore) $2 ;; ++ x$lt_dlunknown|x*) $3 ;; ++ esac ++ else : ++ # compilation failed ++ $3 ++ fi ++fi ++rm -fr conftest* ++])# _LT_TRY_DLOPEN_SELF ++ ++ ++# LT_SYS_DLOPEN_SELF ++# ------------------ ++AC_DEFUN([LT_SYS_DLOPEN_SELF], ++[m4_require([_LT_HEADER_DLFCN])dnl ++if test "x$enable_dlopen" != xyes; then ++ enable_dlopen=unknown ++ enable_dlopen_self=unknown ++ enable_dlopen_self_static=unknown ++else ++ lt_cv_dlopen=no ++ lt_cv_dlopen_libs= ++ ++ case $host_os in ++ beos*) ++ lt_cv_dlopen="load_add_on" ++ lt_cv_dlopen_libs= ++ lt_cv_dlopen_self=yes ++ ;; ++ ++ mingw* | pw32* | cegcc*) ++ lt_cv_dlopen="LoadLibrary" ++ lt_cv_dlopen_libs= ++ ;; ++ ++ cygwin*) ++ lt_cv_dlopen="dlopen" ++ lt_cv_dlopen_libs= ++ ;; ++ ++ darwin*) ++ # if libdl is installed we need to link against it ++ AC_CHECK_LIB([dl], [dlopen], ++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ ++ lt_cv_dlopen="dyld" ++ lt_cv_dlopen_libs= ++ lt_cv_dlopen_self=yes ++ ]) ++ ;; ++ ++ *) ++ AC_CHECK_FUNC([shl_load], ++ [lt_cv_dlopen="shl_load"], ++ [AC_CHECK_LIB([dld], [shl_load], ++ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], ++ [AC_CHECK_FUNC([dlopen], ++ [lt_cv_dlopen="dlopen"], ++ [AC_CHECK_LIB([dl], [dlopen], ++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], ++ [AC_CHECK_LIB([svld], [dlopen], ++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], ++ [AC_CHECK_LIB([dld], [dld_link], ++ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) ++ ]) ++ ]) ++ ]) ++ ]) ++ ]) ++ ;; ++ esac ++ ++ if test "x$lt_cv_dlopen" != xno; then ++ enable_dlopen=yes ++ else ++ enable_dlopen=no ++ fi ++ ++ case $lt_cv_dlopen in ++ dlopen) ++ save_CPPFLAGS="$CPPFLAGS" ++ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" ++ ++ save_LDFLAGS="$LDFLAGS" ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" ++ ++ save_LIBS="$LIBS" ++ LIBS="$lt_cv_dlopen_libs $LIBS" ++ ++ AC_CACHE_CHECK([whether a program can dlopen itself], ++ lt_cv_dlopen_self, [dnl ++ _LT_TRY_DLOPEN_SELF( ++ lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, ++ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) ++ ]) ++ ++ if test "x$lt_cv_dlopen_self" = xyes; then ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" ++ AC_CACHE_CHECK([whether a statically linked program can dlopen itself], ++ lt_cv_dlopen_self_static, [dnl ++ _LT_TRY_DLOPEN_SELF( ++ lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, ++ lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) ++ ]) ++ fi ++ ++ CPPFLAGS="$save_CPPFLAGS" ++ LDFLAGS="$save_LDFLAGS" ++ LIBS="$save_LIBS" ++ ;; ++ esac ++ ++ case $lt_cv_dlopen_self in ++ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; ++ *) enable_dlopen_self=unknown ;; ++ esac ++ ++ case $lt_cv_dlopen_self_static in ++ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; ++ *) enable_dlopen_self_static=unknown ;; ++ esac ++fi ++_LT_DECL([dlopen_support], [enable_dlopen], [0], ++ [Whether dlopen is supported]) ++_LT_DECL([dlopen_self], [enable_dlopen_self], [0], ++ [Whether dlopen of programs is supported]) ++_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], ++ [Whether dlopen of statically linked programs is supported]) ++])# LT_SYS_DLOPEN_SELF ++ ++# Old name: ++AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) ++ ++ ++# _LT_COMPILER_C_O([TAGNAME]) ++# --------------------------- ++# Check to see if options -c and -o are simultaneously supported by compiler. ++# This macro does not hard code the compiler like AC_PROG_CC_C_O. ++m4_defun([_LT_COMPILER_C_O], ++[m4_require([_LT_DECL_SED])dnl ++m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_TAG_COMPILER])dnl ++AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], ++ [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], ++ [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no ++ $RM -r conftest 2>/dev/null ++ mkdir conftest ++ cd conftest ++ mkdir out ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ ++ lt_compiler_flag="-o out/conftest2.$ac_objext" ++ # Insert the option either (1) after the last *FLAGS variable, or ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ ++ -e 's:$: $lt_compiler_flag:'` ++ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) ++ (eval "$lt_compile" 2>out/conftest.err) ++ ac_status=$? ++ cat out/conftest.err >&AS_MESSAGE_LOG_FD ++ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++ if (exit $ac_status) && test -s out/conftest2.$ac_objext ++ then ++ # The compiler can only warn and ignore the option if not recognized ++ # So say no if there are warnings ++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp ++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 ++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then ++ _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes ++ fi ++ fi ++ chmod u+w . 2>&AS_MESSAGE_LOG_FD ++ $RM conftest* ++ # SGI C++ compiler will create directory out/ii_files/ for ++ # template instantiation ++ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files ++ $RM out/* && rmdir out ++ cd .. ++ $RM -r conftest ++ $RM conftest* ++]) ++_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], ++ [Does compiler simultaneously support -c and -o options?]) ++])# _LT_COMPILER_C_O ++ ++ ++# _LT_COMPILER_FILE_LOCKS([TAGNAME]) ++# ---------------------------------- ++# Check to see if we can do hard links to lock some files if needed ++m4_defun([_LT_COMPILER_FILE_LOCKS], ++[m4_require([_LT_ENABLE_LOCK])dnl ++m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++_LT_COMPILER_C_O([$1]) ++ ++hard_links="nottested" ++if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then ++ # do not overwrite the value of need_locks provided by the user ++ AC_MSG_CHECKING([if we can lock with hard links]) ++ hard_links=yes ++ $RM conftest* ++ ln conftest.a conftest.b 2>/dev/null && hard_links=no ++ touch conftest.a ++ ln conftest.a conftest.b 2>&5 || hard_links=no ++ ln conftest.a conftest.b 2>/dev/null && hard_links=no ++ AC_MSG_RESULT([$hard_links]) ++ if test "$hard_links" = no; then ++ AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) ++ need_locks=warn ++ fi ++else ++ need_locks=no ++fi ++_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) ++])# _LT_COMPILER_FILE_LOCKS ++ ++ ++# _LT_CHECK_OBJDIR ++# ---------------- ++m4_defun([_LT_CHECK_OBJDIR], ++[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], ++[rm -f .libs 2>/dev/null ++mkdir .libs 2>/dev/null ++if test -d .libs; then ++ lt_cv_objdir=.libs ++else ++ # MS-DOS does not allow filenames that begin with a dot. ++ lt_cv_objdir=_libs ++fi ++rmdir .libs 2>/dev/null]) ++objdir=$lt_cv_objdir ++_LT_DECL([], [objdir], [0], ++ [The name of the directory that contains temporary libtool files])dnl ++m4_pattern_allow([LT_OBJDIR])dnl ++AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", ++ [Define to the sub-directory in which libtool stores uninstalled libraries.]) ++])# _LT_CHECK_OBJDIR ++ ++ ++# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) ++# -------------------------------------- ++# Check hardcoding attributes. ++m4_defun([_LT_LINKER_HARDCODE_LIBPATH], ++[AC_MSG_CHECKING([how to hardcode library paths into programs]) ++_LT_TAGVAR(hardcode_action, $1)= ++if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || ++ test -n "$_LT_TAGVAR(runpath_var, $1)" || ++ test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then ++ ++ # We can hardcode non-existent directories. ++ if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && ++ # If the only mechanism to avoid hardcoding is shlibpath_var, we ++ # have to relink, otherwise we might link with an installed library ++ # when we should be linking with a yet-to-be-installed one ++ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && ++ test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then ++ # Linking always hardcodes the temporary library directory. ++ _LT_TAGVAR(hardcode_action, $1)=relink ++ else ++ # We can link without hardcoding, and we can hardcode nonexisting dirs. ++ _LT_TAGVAR(hardcode_action, $1)=immediate ++ fi ++else ++ # We cannot hardcode anything, or else we can only hardcode existing ++ # directories. ++ _LT_TAGVAR(hardcode_action, $1)=unsupported ++fi ++AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) ++ ++if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || ++ test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then ++ # Fast installation is not supported ++ enable_fast_install=no ++elif test "$shlibpath_overrides_runpath" = yes || ++ test "$enable_shared" = no; then ++ # Fast installation is not necessary ++ enable_fast_install=needless ++fi ++_LT_TAGDECL([], [hardcode_action], [0], ++ [How to hardcode a shared library path into an executable]) ++])# _LT_LINKER_HARDCODE_LIBPATH ++ ++ ++# _LT_CMD_STRIPLIB ++# ---------------- ++m4_defun([_LT_CMD_STRIPLIB], ++[m4_require([_LT_DECL_EGREP]) ++striplib= ++old_striplib= ++AC_MSG_CHECKING([whether stripping libraries is possible]) ++if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then ++ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" ++ test -z "$striplib" && striplib="$STRIP --strip-unneeded" ++ AC_MSG_RESULT([yes]) ++else ++# FIXME - insert some real tests, host_os isn't really good enough ++ case $host_os in ++ darwin*) ++ if test -n "$STRIP" ; then ++ striplib="$STRIP -x" ++ old_striplib="$STRIP -S" ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ fi ++ ;; ++ *) ++ AC_MSG_RESULT([no]) ++ ;; ++ esac ++fi ++_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) ++_LT_DECL([], [striplib], [1]) ++])# _LT_CMD_STRIPLIB ++ ++ ++# _LT_SYS_DYNAMIC_LINKER([TAG]) ++# ----------------------------- ++# PORTME Fill in your ld.so characteristics ++m4_defun([_LT_SYS_DYNAMIC_LINKER], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++m4_require([_LT_DECL_EGREP])dnl ++m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_DECL_OBJDUMP])dnl ++m4_require([_LT_DECL_SED])dnl ++AC_MSG_CHECKING([dynamic linker characteristics]) ++m4_if([$1], ++ [], [ ++if test "$GCC" = yes; then ++ case $host_os in ++ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; ++ *) lt_awk_arg="/^libraries:/" ;; ++ esac ++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++ if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then ++ # if the path contains ";" then we assume it to be the separator ++ # otherwise default to the standard path separator (i.e. ":") - it is ++ # assumed that no part of a normal pathname contains ";" but that should ++ # okay in the real world where ";" in dirpaths is itself problematic. ++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++ # Ok, now we have the path, separated by spaces, we can step through it ++ # and add multilib dir if necessary. ++ lt_tmp_lt_search_path_spec= ++ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` ++ for lt_sys_path in $lt_search_path_spec; do ++ if test -d "$lt_sys_path/$lt_multi_os_dir"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" ++ else ++ test -d "$lt_sys_path" && \ ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" ++ fi ++ done ++ lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' ++BEGIN {RS=" "; FS="/|\n";} { ++ lt_foo=""; ++ lt_count=0; ++ for (lt_i = NF; lt_i > 0; lt_i--) { ++ if ($lt_i != "" && $lt_i != ".") { ++ if ($lt_i == "..") { ++ lt_count++; ++ } else { ++ if (lt_count == 0) { ++ lt_foo="/" $lt_i lt_foo; ++ } else { ++ lt_count--; ++ } ++ } ++ } ++ } ++ if (lt_foo != "") { lt_freq[[lt_foo]]++; } ++ if (lt_freq[[lt_foo]] == 1) { print lt_foo; } ++}'` ++ sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` ++else ++ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" ++fi]) ++library_names_spec= ++libname_spec='lib$name' ++soname_spec= ++shrext_cmds=".so" ++postinstall_cmds= ++postuninstall_cmds= ++finish_cmds= ++finish_eval= ++shlibpath_var= ++shlibpath_overrides_runpath=unknown ++version_type=none ++dynamic_linker="$host_os ld.so" ++sys_lib_dlsearch_path_spec="/lib /usr/lib" ++need_lib_prefix=unknown ++hardcode_into_libs=no ++ ++# when you set need_version to no, make sure it does not cause -set_version ++# flags to be left without arguments ++need_version=unknown ++ ++case $host_os in ++aix3*) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' ++ shlibpath_var=LIBPATH ++ ++ # AIX 3 has no versioning support, so we append a major version to the name. ++ soname_spec='${libname}${release}${shared_ext}$major' ++ ;; ++ ++aix[[4-9]]*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ hardcode_into_libs=yes ++ if test "$host_cpu" = ia64; then ++ # AIX 5 supports IA64 ++ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ else ++ # With GCC up to 2.95.x, collect2 would create an import file ++ # for dependence libraries. The import file would start with ++ # the line `#! .'. This would cause the generated library to ++ # depend on `.', always an invalid library. This was fixed in ++ # development snapshots of GCC prior to 3.0. ++ case $host_os in ++ aix4 | aix4.[[01]] | aix4.[[01]].*) ++ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' ++ echo ' yes ' ++ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then ++ : ++ else ++ can_build_shared=no ++ fi ++ ;; ++ esac ++ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct ++ # soname into executable. Probably we can add versioning support to ++ # collect2, so additional links can be useful in future. ++ if test "$aix_use_runtimelinking" = yes; then ++ # If using run time linking (on AIX 4.2 or later) use lib.so ++ # instead of lib.a to let people know that these are not ++ # typical AIX shared libraries. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ else ++ # We preserve .a as extension for shared libraries through AIX4.2 ++ # and later when we are not doing run time linking. ++ library_names_spec='${libname}${release}.a $libname.a' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ fi ++ shlibpath_var=LIBPATH ++ fi ++ ;; ++ ++amigaos*) ++ case $host_cpu in ++ powerpc) ++ # Since July 2007 AmigaOS4 officially supports .so libraries. ++ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ ;; ++ m68k) ++ library_names_spec='$libname.ixlibrary $libname.a' ++ # Create ${libname}_ixlibrary.a entries in /sys/libs. ++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ++ ;; ++ esac ++ ;; ++ ++beos*) ++ library_names_spec='${libname}${shared_ext}' ++ dynamic_linker="$host_os ld.so" ++ shlibpath_var=LIBRARY_PATH ++ ;; ++ ++bsdi[[45]]*) ++ version_type=linux ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" ++ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" ++ # the default ld.so.conf also contains /usr/contrib/lib and ++ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow ++ # libtool to hard-code these into programs ++ ;; ++ ++cygwin* | mingw* | pw32* | cegcc*) ++ version_type=windows ++ shrext_cmds=".dll" ++ need_version=no ++ need_lib_prefix=no ++ ++ case $GCC,$host_os in ++ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) ++ library_names_spec='$libname.dll.a' ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename \${file}`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ ++ dldir=$destdir/`dirname \$dlpath`~ ++ test -d \$dldir || mkdir -p \$dldir~ ++ $install_prog $dir/$dlname \$dldir/$dlname~ ++ chmod a+x \$dldir/$dlname~ ++ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then ++ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; ++ fi' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ ++ dlpath=$dir/\$dldll~ ++ $RM \$dlpath' ++ shlibpath_overrides_runpath=yes ++ ++ case $host_os in ++ cygwin*) ++ # Cygwin DLLs use 'cyg' prefix rather than 'lib' ++ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ++ ;; ++ mingw* | cegcc*) ++ # MinGW DLLs use traditional 'lib' prefix ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then ++ # It is most probably a Windows format PATH printed by ++ # mingw gcc, but we are running on Cygwin. Gcc prints its search ++ # path with ; separators, and with drive letters. We can handle the ++ # drive letters (cygwin fileutils understands them), so leave them, ++ # especially as we might pass files found there to a mingw objdump, ++ # which wouldn't understand a cygwinified path. Ahh. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++ ;; ++ pw32*) ++ # pw32 DLLs use 'pw' prefix rather than 'lib' ++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++ ;; ++ esac ++ ;; ++ ++ *) ++ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' ++ ;; ++ esac ++ dynamic_linker='Win32 ld.exe' ++ # FIXME: first we should search . and the directory the executable is in ++ shlibpath_var=PATH ++ ;; ++ ++darwin* | rhapsody*) ++ dynamic_linker="$host_os dyld" ++ version_type=darwin ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' ++ soname_spec='${libname}${release}${major}$shared_ext' ++ shlibpath_overrides_runpath=yes ++ shlibpath_var=DYLD_LIBRARY_PATH ++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' ++m4_if([$1], [],[ ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) ++ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ++ ;; ++ ++dgux*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ ;; ++ ++freebsd1*) ++ dynamic_linker=no ++ ;; ++ ++freebsd* | dragonfly*) ++ # DragonFly does not have aout. When/if they implement a new ++ # versioning mechanism, adjust this. ++ if test -x /usr/bin/objformat; then ++ objformat=`/usr/bin/objformat` ++ else ++ case $host_os in ++ freebsd[[123]]*) objformat=aout ;; ++ *) objformat=elf ;; ++ esac ++ fi ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ need_version=no ++ need_lib_prefix=no ++ ;; ++ freebsd-*) ++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' ++ need_version=yes ++ ;; ++ esac ++ shlibpath_var=LD_LIBRARY_PATH ++ case $host_os in ++ freebsd2*) ++ shlibpath_overrides_runpath=yes ++ ;; ++ freebsd3.[[01]]* | freebsdelf3.[[01]]*) ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ ++ freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ *) # from 4.6 on, and DragonFly ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ esac ++ ;; ++ ++gnu*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ hardcode_into_libs=yes ++ ;; ++ ++hpux9* | hpux10* | hpux11*) ++ # Give a soname corresponding to the major version so that dld.sl refuses to ++ # link against other versions. ++ version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ case $host_cpu in ++ ia64*) ++ shrext_cmds='.so' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.so" ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ if test "X$HPUX_IA64_MODE" = X32; then ++ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" ++ else ++ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" ++ fi ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ hppa*64*) ++ shrext_cmds='.sl' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ *) ++ shrext_cmds='.sl' ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=SHLIB_PATH ++ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ ;; ++ esac ++ # HP-UX runs *really* slowly unless shared libraries are mode 555. ++ postinstall_cmds='chmod 555 $lib' ++ ;; ++ ++interix[[3-9]]*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ ++irix5* | irix6* | nonstopux*) ++ case $host_os in ++ nonstopux*) version_type=nonstopux ;; ++ *) ++ if test "$lt_cv_prog_gnu_ld" = yes; then ++ version_type=linux ++ else ++ version_type=irix ++ fi ;; ++ esac ++ need_lib_prefix=no ++ need_version=no ++ soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' ++ case $host_os in ++ irix5* | nonstopux*) ++ libsuff= shlibsuff= ++ ;; ++ *) ++ case $LD in # libtool.m4 will add one of these switches to LD ++ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") ++ libsuff= shlibsuff= libmagic=32-bit;; ++ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") ++ libsuff=32 shlibsuff=N32 libmagic=N32;; ++ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") ++ libsuff=64 shlibsuff=64 libmagic=64-bit;; ++ *) libsuff= shlibsuff= libmagic=never-match;; ++ esac ++ ;; ++ esac ++ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH ++ shlibpath_overrides_runpath=no ++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" ++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" ++ hardcode_into_libs=yes ++ ;; ++ ++# No shared lib support for Linux oldld, aout, or coff. ++linux*oldld* | linux*aout* | linux*coff*) ++ dynamic_linker=no ++ ;; ++ ++# This must be Linux ELF. ++linux* | k*bsd*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ # Some binutils ld are patched to set DT_RUNPATH ++ save_LDFLAGS=$LDFLAGS ++ save_libdir=$libdir ++ eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ ++ LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], ++ [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], ++ [shlibpath_overrides_runpath=yes])]) ++ LDFLAGS=$save_LDFLAGS ++ libdir=$save_libdir ++ ++ # This implies no fast_install, which is unacceptable. ++ # Some rework will be needed to allow for fast_install ++ # before this can be enabled. ++ hardcode_into_libs=yes ++ ++ # Append ld.so.conf contents to the search path ++ if test -f /etc/ld.so.conf; then ++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ fi ++ ++ # We used to test for /lib/ld.so.1 and disable shared libraries on ++ # powerpc, because MkLinux only supported shared libraries with the ++ # GNU dynamic linker. Since this was broken with cross compilers, ++ # most powerpc-linux boxes support dynamic linking these days and ++ # people can always --disable-shared, the test was removed, and we ++ # assume the GNU/Linux dynamic linker is in use. ++ dynamic_linker='GNU/Linux ld.so' ++ ;; ++ ++netbsd*) ++ version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++ dynamic_linker='NetBSD (a.out) ld.so' ++ else ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ dynamic_linker='NetBSD ld.elf_so' ++ fi ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ ++newsos6) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ ;; ++ ++*nto* | *qnx*) ++ version_type=qnx ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='ldqnx.so' ++ ;; ++ ++openbsd*) ++ version_type=sunos ++ sys_lib_dlsearch_path_spec="/usr/lib" ++ need_lib_prefix=no ++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. ++ case $host_os in ++ openbsd3.3 | openbsd3.3.*) need_version=yes ;; ++ *) need_version=no ;; ++ esac ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ case $host_os in ++ openbsd2.[[89]] | openbsd2.[[89]].*) ++ shlibpath_overrides_runpath=no ++ ;; ++ *) ++ shlibpath_overrides_runpath=yes ++ ;; ++ esac ++ else ++ shlibpath_overrides_runpath=yes ++ fi ++ ;; ++ ++os2*) ++ libname_spec='$name' ++ shrext_cmds=".dll" ++ need_lib_prefix=no ++ library_names_spec='$libname${shared_ext} $libname.a' ++ dynamic_linker='OS/2 ld.exe' ++ shlibpath_var=LIBPATH ++ ;; ++ ++osf3* | osf4* | osf5*) ++ version_type=osf ++ need_lib_prefix=no ++ need_version=no ++ soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" ++ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ++ ;; ++ ++rdos*) ++ dynamic_linker=no ++ ;; ++ ++solaris*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ # ldd complains unless libraries are executable ++ postinstall_cmds='chmod +x $lib' ++ ;; ++ ++sunos4*) ++ version_type=sunos ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ if test "$with_gnu_ld" = yes; then ++ need_lib_prefix=no ++ fi ++ need_version=yes ++ ;; ++ ++sysv4 | sysv4.3*) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ case $host_vendor in ++ sni) ++ shlibpath_overrides_runpath=no ++ need_lib_prefix=no ++ runpath_var=LD_RUN_PATH ++ ;; ++ siemens) ++ need_lib_prefix=no ++ ;; ++ motorola) ++ need_lib_prefix=no ++ need_version=no ++ shlibpath_overrides_runpath=no ++ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' ++ ;; ++ esac ++ ;; ++ ++sysv4*MP*) ++ if test -d /usr/nec ;then ++ version_type=linux ++ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' ++ soname_spec='$libname${shared_ext}.$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ fi ++ ;; ++ ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++ version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ if test "$with_gnu_ld" = yes; then ++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' ++ else ++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' ++ case $host_os in ++ sco3.2v5*) ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" ++ ;; ++ esac ++ fi ++ sys_lib_dlsearch_path_spec='/usr/lib' ++ ;; ++ ++tpf*) ++ # TPF is a cross-target only. Preferred cross-host = GNU/Linux. ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ ++uts4*) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ ;; ++ ++*) ++ dynamic_linker=no ++ ;; ++esac ++AC_MSG_RESULT([$dynamic_linker]) ++test "$dynamic_linker" = no && can_build_shared=no ++ ++variables_saved_for_relink="PATH $shlibpath_var $runpath_var" ++if test "$GCC" = yes; then ++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" ++fi ++ ++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then ++ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++fi ++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then ++ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++fi ++ ++_LT_DECL([], [variables_saved_for_relink], [1], ++ [Variables whose values should be saved in libtool wrapper scripts and ++ restored at link time]) ++_LT_DECL([], [need_lib_prefix], [0], ++ [Do we need the "lib" prefix for modules?]) ++_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) ++_LT_DECL([], [version_type], [0], [Library versioning type]) ++_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) ++_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) ++_LT_DECL([], [shlibpath_overrides_runpath], [0], ++ [Is shlibpath searched before the hard-coded library search path?]) ++_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) ++_LT_DECL([], [library_names_spec], [1], ++ [[List of archive names. First name is the real one, the rest are links. ++ The last name is the one that the linker finds with -lNAME]]) ++_LT_DECL([], [soname_spec], [1], ++ [[The coded name of the library, if different from the real name]]) ++_LT_DECL([], [postinstall_cmds], [2], ++ [Command to use after installation of a shared archive]) ++_LT_DECL([], [postuninstall_cmds], [2], ++ [Command to use after uninstallation of a shared archive]) ++_LT_DECL([], [finish_cmds], [2], ++ [Commands used to finish a libtool library installation in a directory]) ++_LT_DECL([], [finish_eval], [1], ++ [[As "finish_cmds", except a single script fragment to be evaled but ++ not shown]]) ++_LT_DECL([], [hardcode_into_libs], [0], ++ [Whether we should hardcode library paths into libraries]) ++_LT_DECL([], [sys_lib_search_path_spec], [2], ++ [Compile-time system search path for libraries]) ++_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], ++ [Run-time system search path for libraries]) ++])# _LT_SYS_DYNAMIC_LINKER ++ ++ ++# _LT_PATH_TOOL_PREFIX(TOOL) ++# -------------------------- ++# find a file program which can recognize shared library ++AC_DEFUN([_LT_PATH_TOOL_PREFIX], ++[m4_require([_LT_DECL_EGREP])dnl ++AC_MSG_CHECKING([for $1]) ++AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, ++[case $MAGIC_CMD in ++[[\\/*] | ?:[\\/]*]) ++ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. ++ ;; ++*) ++ lt_save_MAGIC_CMD="$MAGIC_CMD" ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++dnl $ac_dummy forces splitting on constant user-supplied paths. ++dnl POSIX.2 word splitting is done only on the output of word expansions, ++dnl not every word. This closes a longstanding sh security hole. ++ ac_dummy="m4_if([$2], , $PATH, [$2])" ++ for ac_dir in $ac_dummy; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$1; then ++ lt_cv_path_MAGIC_CMD="$ac_dir/$1" ++ if test -n "$file_magic_test_file"; then ++ case $deplibs_check_method in ++ "file_magic "*) ++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` ++ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | ++ $EGREP "$file_magic_regex" > /dev/null; then ++ : ++ else ++ cat <<_LT_EOF 1>&2 ++ ++*** Warning: the command libtool uses to detect shared libraries, ++*** $file_magic_cmd, produces output that libtool cannot recognize. ++*** The result is that libtool may fail to recognize shared libraries ++*** as such. This will affect the creation of libtool libraries that ++*** depend on shared libraries, but programs linked with such libtool ++*** libraries will work regardless of this problem. Nevertheless, you ++*** may want to report the problem to your system manager and/or to ++*** bug-libtool at gnu.org ++ ++_LT_EOF ++ fi ;; ++ esac ++ fi ++ break ++ fi ++ done ++ IFS="$lt_save_ifs" ++ MAGIC_CMD="$lt_save_MAGIC_CMD" ++ ;; ++esac]) ++MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++if test -n "$MAGIC_CMD"; then ++ AC_MSG_RESULT($MAGIC_CMD) ++else ++ AC_MSG_RESULT(no) ++fi ++_LT_DECL([], [MAGIC_CMD], [0], ++ [Used to examine libraries when file_magic_cmd begins with "file"])dnl ++])# _LT_PATH_TOOL_PREFIX ++ ++# Old name: ++AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) ++ ++ ++# _LT_PATH_MAGIC ++# -------------- ++# find a file program which can recognize a shared library ++m4_defun([_LT_PATH_MAGIC], ++[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) @@ 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 wahwah at users.sourceforge.net Fri Nov 27 21:26:39 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 27 Nov 2009 20:26:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[7489] csw/mgar/pkg/gnome-terminal Message-ID: Revision: 7489 http://gar.svn.sourceforge.net/gar/?rev=7489&view=rev Author: wahwah Date: 2009-11-27 20:26:39 +0000 (Fri, 27 Nov 2009) Log Message: ----------- gnome-terminal: a first sketch of a build file. vte needs upgrading. Modified Paths: -------------- csw/mgar/pkg/gnome-terminal/trunk/Makefile csw/mgar/pkg/gnome-terminal/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gnome-terminal/trunk/ Modified: csw/mgar/pkg/gnome-terminal/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-11-24 16:29:40 UTC (rev 7407) +++ csw/mgar/pkg/gnome-terminal/trunk/Makefile 2009-11-27 20:26:39 UTC (rev 7489) @@ -2,184 +2,33 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = gnome-terminal +GT_MAJOR_VERSION = 2 +GT_MINOR_VERSION = 22 +GT_PATCHLEVEL = 1 +GARVERSION = $(GT_MAJOR_VERSION).$(GT_MINOR_VERSION).$(GT_PATCHLEVEL) +CATEGORIES = gnome +DESCRIPTION = A terminal emulator, part of GNOME 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). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_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. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. +SPKG_SOURCEURL = http://www.gnome.org/ +MASTER_SITES = http://ftp.heanet.ie/pub/ftp.gnome.org/sources/gnome-terminal/$(GT_MAJOR_VERSION).$(GT_MINOR_VERSION)/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWlibxft2devel +TEST_SCRIPTS = 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 +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +MSGFMT= /opt/csw/bin/gmsgfmt +MSGMERGE= /opt/csw/bin/gmsgmerge +XGETTEXT = /opt/csw/bin/gxgettext +GETTEXT = /opt/csw/bin/ggettext +export MSGMERGE +export MSGFMT +export XGETTEXT +export GETTEXT + +include gar/category.mk + +# TODO: Update CSWvte Modified: csw/mgar/pkg/gnome-terminal/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-11-24 16:29:40 UTC (rev 7407) +++ csw/mgar/pkg/gnome-terminal/trunk/checksums 2009-11-27 20:26:39 UTC (rev 7489) @@ -0,0 +1 @@ +0e6c71def04b2a56e8d6725cef7950b4 gnome-terminal-2.22.1.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 Sat Nov 28 01:55:41 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 28 Nov 2009 00:55:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[7490] csw/mgar/pkg/gnulinks/trunk/Makefile Message-ID: Revision: 7490 http://gar.svn.sourceforge.net/gar/?rev=7490&view=rev Author: bdwalton Date: 2009-11-28 00:55:41 +0000 (Sat, 28 Nov 2009) Log Message: ----------- gnulinks: make creating an updated prototype sane; no longer include links from {sh,text,file}utils Modified Paths: -------------- csw/mgar/pkg/gnulinks/trunk/Makefile Modified: csw/mgar/pkg/gnulinks/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnulinks/trunk/Makefile 2009-11-27 20:26:39 UTC (rev 7489) +++ csw/mgar/pkg/gnulinks/trunk/Makefile 2009-11-28 00:55:41 UTC (rev 7490) @@ -2,6 +2,10 @@ GARVERSION = 1.2 CATEGORIES = xtra +GLINKPKGS = CSWdiffutils CSWggettext CSWggettextrt CSWbison CSWbinutils +GLINKPKGS += CSWggrep CSWgawk CSWgsed CSWggetopt CSWfindutils +PREREQUISITE_PKGS = $(GLINKPKGS) CSWpkgutil + SPKG_SOURCEURL = No Source DESCRIPTION = Creates native symlinks for GNU tools in /opt/csw/gnu @@ -20,7 +24,18 @@ include gar/category.mk + + newproto: - @/bin/ls -1 /opt/csw/bin/g* | pkgproto | \ - perl -plne 's,bin/g([\w\d-]+) 0755 root bin,gnu/$$1=../bin/g$$1 ? ? ?,' \ - > $(FILEDIR)/CSWgnulinks.prototype + @echo Generating new prototype... + @( { echo /opt/csw/gnu; \ + for p in $(GLINKPKGS); do \ + pkgutil -L $$p | grep /opt/csw/bin/g; \ + done } | \ + pkgproto | \ + perl -plne 's,f none /opt/csw/bin/g([\w\d-\+\.]+) 0755 root bin,s none /opt/csw/gnu/$$1=../bin/g$$1,' | \ + grep -v "^l " | sort > $(FILEDIR)/CSWgnulinks.prototype.new ) + @echo Installing new prototype. + @mv $(FILEDIR)/CSWgnulinks.prototype.new \ + $(FILEDIR)/CSWgnulinks.prototype + @$(MAKE) makesums 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 Nov 28 01:59:12 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 28 Nov 2009 00:59:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7491] csw/mgar/pkg/gnulinks/trunk/ Message-ID: Revision: 7491 http://gar.svn.sourceforge.net/gar/?rev=7491&view=rev Author: bdwalton Date: 2009-11-28 00:59:12 +0000 (Sat, 28 Nov 2009) Log Message: ----------- gnulinks: update ignore list so files that pkgutil creates are not worried about Property Changed: ---------------- csw/mgar/pkg/gnulinks/trunk/ Property changes on: csw/mgar/pkg/gnulinks/trunk ___________________________________________________________________ Modified: svn:ignore - cookies download work + catalog.* descriptions.* work cookies packages download 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 Nov 28 02:10:38 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 28 Nov 2009 01:10:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[7492] csw/mgar/pkg/gnulinks/trunk/Makefile Message-ID: Revision: 7492 http://gar.svn.sourceforge.net/gar/?rev=7492&view=rev Author: bdwalton Date: 2009-11-28 01:10:38 +0000 (Sat, 28 Nov 2009) Log Message: ----------- gnulinks: add other packages that were linked, readd *util packages for now to achieve historical parity Modified Paths: -------------- csw/mgar/pkg/gnulinks/trunk/Makefile Modified: csw/mgar/pkg/gnulinks/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnulinks/trunk/Makefile 2009-11-28 00:59:12 UTC (rev 7491) +++ csw/mgar/pkg/gnulinks/trunk/Makefile 2009-11-28 01:10:38 UTC (rev 7492) @@ -4,6 +4,8 @@ GLINKPKGS = CSWdiffutils CSWggettext CSWggettextrt CSWbison CSWbinutils GLINKPKGS += CSWggrep CSWgawk CSWgsed CSWggetopt CSWfindutils +GLINKPKGS += CSWgmake CSWgpatch CSWgm4 CSWgwhois CSWgtar +GLINKPKGS += CSWshutils CSWgfile CSWtextutils PREREQUISITE_PKGS = $(GLINKPKGS) CSWpkgutil SPKG_SOURCEURL = No Source 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 Nov 28 02:13:06 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 28 Nov 2009 01:13:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7493] csw/mgar/pkg/gnulinks/trunk/Makefile Message-ID: Revision: 7493 http://gar.svn.sourceforge.net/gar/?rev=7493&view=rev Author: bdwalton Date: 2009-11-28 01:13:06 +0000 (Sat, 28 Nov 2009) Log Message: ----------- gnulinks: tweak prototype generation rule to allow gsu to be captured properly Modified Paths: -------------- csw/mgar/pkg/gnulinks/trunk/Makefile Modified: csw/mgar/pkg/gnulinks/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnulinks/trunk/Makefile 2009-11-28 01:10:38 UTC (rev 7492) +++ csw/mgar/pkg/gnulinks/trunk/Makefile 2009-11-28 01:13:06 UTC (rev 7493) @@ -35,7 +35,7 @@ pkgutil -L $$p | grep /opt/csw/bin/g; \ done } | \ pkgproto | \ - perl -plne 's,f none /opt/csw/bin/g([\w\d-\+\.]+) 0755 root bin,s none /opt/csw/gnu/$$1=../bin/g$$1,' | \ + perl -plne 's,f none /opt/csw/bin/g([\w\d-\+\.]+) (45|07)55 root bin,s none /opt/csw/gnu/$$1=../bin/g$$1,' | \ grep -v "^l " | sort > $(FILEDIR)/CSWgnulinks.prototype.new ) @echo Installing new prototype. @mv $(FILEDIR)/CSWgnulinks.prototype.new \ 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 Nov 28 02:21:23 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 28 Nov 2009 01:21:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7494] csw/mgar/pkg/gnulinks/trunk Message-ID: Revision: 7494 http://gar.svn.sourceforge.net/gar/?rev=7494&view=rev Author: bdwalton Date: 2009-11-28 01:21:23 +0000 (Sat, 28 Nov 2009) Log Message: ----------- gnulinks: updated prototype with new dynamic generation Modified Paths: -------------- csw/mgar/pkg/gnulinks/trunk/checksums csw/mgar/pkg/gnulinks/trunk/files/CSWgnulinks.prototype Modified: csw/mgar/pkg/gnulinks/trunk/checksums =================================================================== --- csw/mgar/pkg/gnulinks/trunk/checksums 2009-11-28 01:13:06 UTC (rev 7493) +++ csw/mgar/pkg/gnulinks/trunk/checksums 2009-11-28 01:21:23 UTC (rev 7494) @@ -1,2 +1,2 @@ -28514c1726839b6e47728d188d2a1edd download/CSWgnulinks.gspec -0f630eb8dae8b4c155c10c95383822f6 download/CSWgnulinks.prototype +28514c1726839b6e47728d188d2a1edd CSWgnulinks.gspec +5d3b905f55423ae4f8b034171238a26a CSWgnulinks.prototype Modified: csw/mgar/pkg/gnulinks/trunk/files/CSWgnulinks.prototype =================================================================== --- csw/mgar/pkg/gnulinks/trunk/files/CSWgnulinks.prototype 2009-11-28 01:13:06 UTC (rev 7493) +++ csw/mgar/pkg/gnulinks/trunk/files/CSWgnulinks.prototype 2009-11-28 01:21:23 UTC (rev 7494) @@ -13,7 +13,6 @@ s none /opt/csw/gnu/chroot=../bin/gchroot s none /opt/csw/gnu/cksum=../bin/gcksum s none /opt/csw/gnu/cmp=../bin/gcmp -s none /opt/csw/gnu/cnmz=../bin/gcnmz s none /opt/csw/gnu/comm=../bin/gcomm s none /opt/csw/gnu/cp=../bin/gcp s none /opt/csw/gnu/csplit=../bin/gcsplit @@ -40,6 +39,7 @@ s none /opt/csw/gnu/fmt=../bin/gfmt s none /opt/csw/gnu/fold=../bin/gfold s none /opt/csw/gnu/getopt=../bin/ggetopt +s none /opt/csw/gnu/gettext.sh=../bin/ggettext.sh s none /opt/csw/gnu/gettext=../bin/ggettext s none /opt/csw/gnu/gettextize=../bin/ggettextize s none /opt/csw/gnu/gprof=../bin/ggprof @@ -97,6 +97,7 @@ s none /opt/csw/gnu/pwd=../bin/gpwd s none /opt/csw/gnu/ranlib=../bin/granlib s none /opt/csw/gnu/readelf=../bin/greadelf +s none /opt/csw/gnu/recode-sr-latin=../bin/grecode-sr-latin s none /opt/csw/gnu/rm=../bin/grm s none /opt/csw/gnu/rmdir=../bin/grmdir s none /opt/csw/gnu/sdiff=../bin/gsdiff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Nov 28 09:15:58 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 28 Nov 2009 08:15:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7495] csw/mgar/pkg/a52dec/trunk/Makefile Message-ID: Revision: 7495 http://gar.svn.sourceforge.net/gar/?rev=7495&view=rev Author: dmichelsen Date: 2009-11-28 08:15:58 +0000 (Sat, 28 Nov 2009) Log Message: ----------- a52dec: Fix catalog name Modified Paths: -------------- csw/mgar/pkg/a52dec/trunk/Makefile Modified: csw/mgar/pkg/a52dec/trunk/Makefile =================================================================== --- csw/mgar/pkg/a52dec/trunk/Makefile 2009-11-28 01:21:23 UTC (rev 7494) +++ csw/mgar/pkg/a52dec/trunk/Makefile 2009-11-28 08:15:58 UTC (rev 7495) @@ -18,7 +18,7 @@ UFILES_REGEX = (\d+(?:\.\d+)*) PACKAGES = CSWliba52 -CATALOGNAME = a52dec +CATALOGNAME = CSWliba52 REQUIRED_PKGS = CSWsunmath EXTRA_LINKER_FLAGS = -lsunmath This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Nov 28 09:18:26 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 28 Nov 2009 08:18:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[7496] csw/mgar/pkg/a52dec/trunk/Makefile Message-ID: Revision: 7496 http://gar.svn.sourceforge.net/gar/?rev=7496&view=rev Author: dmichelsen Date: 2009-11-28 08:18:25 +0000 (Sat, 28 Nov 2009) Log Message: ----------- a52dec: Fix catalog name Modified Paths: -------------- csw/mgar/pkg/a52dec/trunk/Makefile Modified: csw/mgar/pkg/a52dec/trunk/Makefile =================================================================== --- csw/mgar/pkg/a52dec/trunk/Makefile 2009-11-28 08:15:58 UTC (rev 7495) +++ csw/mgar/pkg/a52dec/trunk/Makefile 2009-11-28 08:18:25 UTC (rev 7496) @@ -18,7 +18,7 @@ UFILES_REGEX = (\d+(?:\.\d+)*) PACKAGES = CSWliba52 -CATALOGNAME = CSWliba52 +CATALOGNAME = liba52 REQUIRED_PKGS = CSWsunmath EXTRA_LINKER_FLAGS = -lsunmath 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 Nov 28 10:30:46 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 28 Nov 2009 09:30:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7497] csw/mgar/pkg/chromium/trunk/files/ xml_dom_minidom_test.py Message-ID: Revision: 7497 http://gar.svn.sourceforge.net/gar/?rev=7497&view=rev Author: wahwah Date: 2009-11-28 09:30:46 +0000 (Sat, 28 Nov 2009) Log Message: ----------- chromium: xml_dom_minidom_test.py -- why does it fail? Added Paths: ----------- csw/mgar/pkg/chromium/trunk/files/xml_dom_minidom_test.py Added: csw/mgar/pkg/chromium/trunk/files/xml_dom_minidom_test.py =================================================================== --- csw/mgar/pkg/chromium/trunk/files/xml_dom_minidom_test.py (rev 0) +++ csw/mgar/pkg/chromium/trunk/files/xml_dom_minidom_test.py 2009-11-28 09:30:46 UTC (rev 7497) @@ -0,0 +1,76 @@ +#!/usr/bin/env python +# coding=utf-8 + +"""There was this problem: + + +Traceback (most recent call last): + File "/export/home/blizinski/opencsw/pkg/chromium/trunk/work/build-isa-i386/depot_tools/gclient.py", line 1183, in + result = Main(sys.argv) + File "/export/home/blizinski/opencsw/pkg/chromium/trunk/work/build-isa-i386/depot_tools/gclient.py", line 1178, in Main + return DispatchCommand(command, options, args) + File "/export/home/blizinski/opencsw/pkg/chromium/trunk/work/build-isa-i386/depot_tools/gclient.py", line 1103, in DispatchCommand + return command_map[command](options, args) + File "/export/home/blizinski/opencsw/pkg/chromium/trunk/work/build-isa-i386/depot_tools/gclient.py", line 1020, in DoUpdate + return client.RunOnDeps('update', args) + File "/export/home/blizinski/opencsw/pkg/chromium/trunk/work/build-isa-i386/depot_tools/gclient.py", line 701, in RunOnDeps + scm.RunCommand(command, self._options, args, file_list) + File "/export/home/blizinski/opencsw/pkg/chromium/trunk/work/build-isa-i386/depot_tools/gclient_scm.py", line 79, in RunCommand + return getattr(self, command)(options, args, file_list) + File "/export/home/blizinski/opencsw/pkg/chromium/trunk/work/build-isa-i386/depot_tools/gclient_scm.py", line 275, in update + from_info = self.CaptureInfo(os.path.join(checkout_path, '.'), '.') + File "/export/home/blizinski/opencsw/pkg/chromium/trunk/work/build-isa-i386/depot_tools/scm.py", line 244, in CaptureInfo + dom = gclient_utils.ParseXML(output) + File "/export/home/blizinski/opencsw/pkg/chromium/trunk/work/build-isa-i386/depot_tools/gclient_utils.py", line 43, in ParseXML + return xml.dom.minidom.parseString(output) + File "/opt/csw/lib/python/site-packages/_xmlplus/dom/minidom.py", line 1925, in parseString + return expatbuilder.parseString(string) + File "/opt/csw/lib/python/site-packages/_xmlplus/dom/expatbuilder.py", line 942, in parseString + return builder.parseString(string) + File "/opt/csw/lib/python/site-packages/_xmlplus/dom/expatbuilder.py", line 223, in parseString + parser.Parse(string, True) + File "/opt/csw/lib/python/site-packages/_xmlplus/dom/expatbuilder.py", line 813, in end_element_handler + "element stack messed up - bad nodeName" +AssertionError: element stack messed up - bad nodeName +gmake[1]: *** [gclient-sync] Error 1 +gmake[1]: Leaving directory `/export/home/blizinski/opencsw/pkg/chromium/trunk' +gmake: *** [build-isa-i386] Error 2 +""" + +__author__ = 'Maciej Blizi?ski (blizinski at google.com)' + +import unittest + +XML_1 = """ + + +http://google-breakpad.googlecode.com/svn/trunk/src + +http://google-breakpad.googlecode.com/svn +4c0a9323-5329-0410-9bdc-e9ce6186880e + + +normal +infinity + + +nealsid +2009-11-18T13:59:01.095147Z + + +""" + +import xml.dom.minidom + +class XmlTest(unittest.TestCase): + + def testParseString(self): + result = xml.dom.minidom.parseString(XML_1) + + +if __name__ == '__main__': + unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Nov 28 16:59:39 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 28 Nov 2009 15:59:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[7498] csw/mgar/pkg/nss/trunk Message-ID: Revision: 7498 http://gar.svn.sourceforge.net/gar/?rev=7498&view=rev Author: wahwah Date: 2009-11-28 15:59:39 +0000 (Sat, 28 Nov 2009) Log Message: ----------- nss: Merged changes based on Wan-Teh Chang's comments. Modified Paths: -------------- csw/mgar/pkg/nss/trunk/Makefile csw/mgar/pkg/nss/trunk/checksums Added Paths: ----------- csw/mgar/pkg/nss/trunk/files/include.patch csw/mgar/pkg/nss/trunk/files/ld-options.patch csw/mgar/pkg/nss/trunk/files/nss.pc csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3-64.patch csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3.patch csw/mgar/pkg/nss/trunk/files/sqlite3-32.patch csw/mgar/pkg/nss/trunk/files/sqlite3-64.patch csw/mgar/pkg/nss/trunk/files/whoami.patch Removed Paths: ------------- csw/mgar/pkg/nss/trunk/files/csw-include.patch csw/mgar/pkg/nss/trunk/files/gln.patch csw/mgar/pkg/nss/trunk/files/nss-3.12.4-gentoo-fixups-1.diff csw/mgar/pkg/nss/trunk/files/nss-3.12.4.patch csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3.patch csw/mgar/pkg/nss/trunk/files/platlibs-sunos.patch csw/mgar/pkg/nss/trunk/files/runtime-search-path.patch csw/mgar/pkg/nss/trunk/files/shared-libs.patch csw/mgar/pkg/nss/trunk/files/sign-under-dbx.patch csw/mgar/pkg/nss/trunk/files/whoami.patch Property Changed: ---------------- csw/mgar/pkg/nss/trunk/ Property changes on: csw/mgar/pkg/nss/trunk ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/pkg/nss/branches/upstream-work:7389-7497 Modified: csw/mgar/pkg/nss/trunk/Makefile =================================================================== --- csw/mgar/pkg/nss/trunk/Makefile 2009-11-28 09:30:46 UTC (rev 7497) +++ csw/mgar/pkg/nss/trunk/Makefile 2009-11-28 15:59:39 UTC (rev 7498) @@ -1,145 +1,171 @@ # Copyright 2009 OpenCSW # Distributed under the terms of the GNU General Public License v2 # $Id$ - - +# # Based on the following resources: # - http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/nss-3.12.4-r1.ebuild?view=markup # - https://developer.mozilla.org/en/NSS_reference/Building_and_installing_NSS/Build_instructions # - https://developer.mozilla.org/en/NSS_reference/NSS_environment_variables # - https://developer.mozilla.org/en/NSS_reference/Building_and_installing_NSS/Installation_guide +# +# A discussion: +# - https://groups.google.com/group/mozilla.dev.tech.crypto/browse_thread/thread/709646e32fc4fad0# +# +# TODO: nss-config +# TODO: a better nss.pc -# Debugging mode, this is work in progress. -GARFLAVOR = DBG +# For DBG builds +PATCHFILES = whoami.patch +# I'll let Wan-Teh decide what and where to patch +PATCHFILES += include.patch +PATCHFILES += ld-options.patch +PATCHFILES += platlibs-sqlite3.patch +PATCHFILES_isa-sparcv8 = sqlite3-32.patch +PATCHFILES_isa-i386 = sqlite3-32.patch +PATCHFILES_isa-sparcv9 = sqlite3-64.patch +PATCHFILES_isa-sparcv9 += platlibs-sqlite3-64.patch +PATCHFILES_isa-amd64 = sqlite3-64.patch +PATCHFILES_isa-amd64 += platlibs-sqlite3-64.patch + + GARNAME = nss MAJOR_VERSION = 3 MINOR_VERSION = 12 -PATCHLEVEL = 4 +PATCHLEVEL = 4 GARVERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(PATCHLEVEL) CATEGORIES = lib DESCRIPTION = Network Security Services library, implements PKI support define BLURB + Network Security Services (NSS) is a set of libraries designed to support + cross-platform development of security-enabled client and server + applications. Applications built with NSS can support SSL v2 and v3, TLS, + PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and + other security standards. endef SPKG_SOURCEURL = http://www.mozilla.org/projects/security/pki/nss/ # TODO: Generate RTM_NAME from GARVERSION RTM_NAME = NSS_3_12_4_RTM -MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/ -# This patch taken from http://bugs.gentoo.org/show_bug.cgi?id=256102 -PATCHFILES = nss-3.12.4.patch -PATCHFILES += shared-libs.patch -PATCHFILES += platlibs-sqlite3.patch -PATCHFILES += platlibs-sunos.patch -PATCHFILES += whoami.patch -PATCHFILES += runtime-search-path.patch -PATCHFILES += nss-3.12.4-gentoo-fixups-1.diff -PATCHFILES += csw-include.patch -PATCHFILES += gln.patch -DIST_SUFFIX = -with-nspr-4.8 -DISTFILES = $(GARNAME)-$(GARVERSION)$(DIST_SUFFIX).tar.gz -DISTNAME = $(GARNAME)-$(GARVERSION)$(DIST_SUFFIX) -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)$(DIST_SUFFIX).tar.gz -REQUIRED_PKGS = CSWnspr CSWsqlite3 +MASTER_SITES = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +REQUIRED_PKGS = CSWnspr CSWsqlite3rt PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWsqlite3devel -CONFIGURE_SCRIPTS = nss +CONFIGURE_SCRIPTS = BUILD_SCRIPTS = nss INSTALL_SCRIPTS = nss TEST_SCRIPTS = BUILD64 = 1 +EXTRA_INC = $(prefix)/include -install_libdir = $(prefix)/lib/nss +libdir_install = $(prefix)/lib includedir = $(prefix)/include/nss -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -ifeq (OPT,$(GARFLAVOR)) +ifneq (DBG,$(GARFLAVOR)) BUILD_OPT = 1 + export BUILD_OPT endif -NSS_USE_SYSTEM_SQLITE = 1 + +# NSPR is installed in /opt/csw/lib/nspr, nspr.pc is in /opt/csw/lib/pkgconfig NSPR_INCLUDE_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --cflags-only-I nspr | gsed 's/-I//') -NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ') -USE_SYSTEM_ZLIB = 1 -ZLIB_LIBS = -lz -NSDISTMODE = copy +export NSPR_INCLUDE_DIR + NSS_ENABLE_ECC = 1 -XCFLAGS = $(CFLAGS) -LDOPTS = $(LD_OPTIONS) +export NSS_ENABLE_ECC + +# To avoid creating /opt/csw/lib/libsqlite3.so (already exists) +NSS_USE_SYSTEM_SQLITE = 1 +export NSS_USE_SYSTEM_SQLITE + +# 64-bit suppport ifeq ($(MODULATION),isa-sparcv9) USE_64 = 1 export USE_64 -endif + NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ')/64 +else ifeq ($(MODULATION),isa-amd64) USE_64 = 1 export USE_64 + NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ')/64 +else + NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ') endif -export BUILD_OPT NSS_USE_SYSTEM_SQLITE NSPR_INCLUDE_DIR NSPR_LIB_DIR -export USE_SYSTEM_ZLIB ZLIB_LIBS NSDISTMODE NSS_ENABLE_ECC XCFLAGS +endif +export NSPR_LIB_DIR +# Based on: +# http://mxr.mozilla.org/security/source/security/nss/pkg/solaris/SUNWtlsu/prototype_com +NSS_BINARIES = addbuiltin +NSS_BINARIES += certutil +NSS_BINARIES += cmsutil +NSS_BINARIES += crlutil +NSS_BINARIES += modutil +NSS_BINARIES += pk12util +NSS_BINARIES += signtool +NSS_BINARIES += signver +NSS_BINARIES += ssltap + include gar/category.mk -configure-nss: respect-ldflags add-runtime-search-path +build-nss: build-coreconf build-dbm build-nss-compile @$(MAKECOOKIE) -respect-ldflags: - (cd $(WORKSRC)/mozilla/security/coreconf \ - && \ - gsed -i -e 's:SOURCE_PREFIX = $$(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $$(CORE_DEPTH)/dist:' \ - source.mk \ - && \ - gsed -i -e 's/\$$(MKSHLIB) -o/\$$(MKSHLIB) \$$(LDFLAGS) -o/g' rules.mk) - @$(MAKECOOKIE) - -add-runtime-search-path: - # Make sure that the runtime search path is added in all Makefiles. - gfind $(WORKSRC) \( -name Makefile -o -name '*.mk' \) \ - -exec gsed -i -e 's|-L\$$(NSPR_LIB_DIR)|-L$$(NSPR_LIB_DIR) -R$$(NSPR_LIB_DIR)/$$$$ISALIST|' \ - {} \; - # A form of assert - gegrep -- '-R.*ISALIST' $(WORKSRC)/mozilla/security/nss/lib/freebl/config.mk - @$(MAKECOOKIE) - -build-nss: build-coreconf build-dbm build-nss-compile - build-coreconf: (cd $(WORKSRC)/mozilla/security/coreconf \ && \ - $(BUILD_ENV) \ - && \ - gmake -j1 CC="$(CC)") + CPPFLAGS='$(CPPFLAGS)' LD_OPTIONS='$(LD_OPTIONS)' \ + gmake -j1) @$(MAKECOOKIE) build-dbm: (cd $(WORKSRC)/mozilla/security/dbm \ && \ - $(BUILD_ENV) \ - && \ - gmake -j1 CC="$(CC)") + CPPFLAGS='$(CPPFLAGS)' LD_OPTIONS='$(LD_OPTIONS)' \ + gmake -j1) @$(MAKECOOKIE) +# There's an extra interpolation somehwere inside nss' build system, so $$$$ +# needs to be used instead of $$. build-nss-compile: (cd $(WORKSRC)/mozilla/security/nss \ && \ - $(BUILD_ENV) \ - && \ - gmake -j1 CC="$(CC)") + CPPFLAGS='$(CPPFLAGS)' LD_OPTIONS='$(LD_OPTIONS) -R/opt/csw/lib/$$$$ISALIST' \ + gmake -j1) @$(MAKECOOKIE) install-nss: ginstall -d -m 755 $(DESTDIR)$(libdir) - gcp -a $(WORKSRC)/mozilla/security/dist/*/lib/*.so $(DESTDIR)$(libdir) + for f in $(WORKSRC)/mozilla/dist/SunOS5*/lib/*.so; do \ + ginstall -m 755 $${f} $(DESTDIR)$(libdir); \ + if [ -r $(WORKSRC)/mozilla/dist/SunOS5*/lib/`basename $${f} .so`.chk ]; then \ + ginstall -m 644 \ + $(WORKSRC)/mozilla/dist/SunOS5*/lib/`basename $${f} .so`.chk \ + $(DESTDIR)$(libdir); \ + fi \ + done ginstall -d -m 755 $(DESTDIR)$(bindir) - gcp -a $(WORKSRC)/mozilla/security/dist/*/bin/nss-config $(DESTDIR)$(bindir) - ginstall -d -m 755 $(DESTDIR)/lib/pkgconfig + # TODO: nss-config + # gcp -a $(WORKSRC)/mozilla/dist/*/bin/nss-config $(DESTDIR)$(bindir) + ginstall -d -m 755 $(DESTDIR)$(includedir) + for f in \ + $(WORKSRC)/mozilla/dist/public/nss/*.h; \ + do \ + ginstall -m 644 $${f} $(DESTDIR)$(includedir); \ + done + for bin in $(NSS_BINARIES); do \ + ginstall -m 755 \ + $(WORKSRC)/mozilla/dist/*/bin/$${bin} \ + $(DESTDIR)$(bindir)/`basename $${file}`; \ + done + # Asserting that we have the right version in the .pc file + ggrep "Version: $(GARVERSION)" $(FILEDIR)/nss.pc \ + || ( \ + echo "Please adjust nss version in $(FILEDIR)/nss.pc" \ + && \ + false \ + ) + ginstall -d -m 755 $(DESTDIR)$(prefix)/lib/pkgconfig ginstall -m 644 \ - $(WORKSRC)/mozilla/security/dist/*/lib/pkgconfig/nss.pc \ - $(DESTDIR)/lib/pkgconfig - ginstall -d -m 755 $(DESTDIR)$(includedir) - gcp -a $(WORKSRC)/mozilla/security/dist/private/nss/*.h $(DESTDIR)$(includedir) - gcp -a $(WORKSRC)/mozilla/security/dist/public/nss/*.h $(DESTDIR)$(includedir) - (cd $(DESTDIR)$(libdir); for file in *.so; do \ - mv $${file} $$(file).$(MINOR_VERSION); \ - ln -s $${file}.$(MINOR_VERSION) $${file}; \ - done) - (for file in $(WORKSRC)/mozilla/security/dist/*/bin/*; do \ - ginstall -m 755 $${file} $(DESTDIR)$(bindir)/nss$$(basename $${file}); \ - done) + $(FILEDIR)/nss.pc \ + $(DESTDIR)$(prefix)/lib/pkgconfig @$(MAKECOOKIE) Modified: csw/mgar/pkg/nss/trunk/checksums =================================================================== --- csw/mgar/pkg/nss/trunk/checksums 2009-11-28 09:30:46 UTC (rev 7497) +++ csw/mgar/pkg/nss/trunk/checksums 2009-11-28 15:59:39 UTC (rev 7498) @@ -1,10 +1,8 @@ -a1ce38c03b142eb2bd54f1f111661e30 csw-include.patch -7116f8de3ac8b35104365c1b3fc6aea4 gln.patch -63476fb10c2d14f7e0585fe327ae9341 nss-3.12.4-gentoo-fixups-1.diff -8f76e381bf2339d731bfd5b8116c25a4 nss-3.12.4-with-nspr-4.8.tar.gz -39b9d2431d4ff717d103b742fcaefb81 nss-3.12.4.patch +4b2246d07092fe8b2f29a1a01e9bc821 include.patch +79083e118f3d885957910fc845844c1c ld-options.patch +1ee3ed9c1900079319bd1de51388d856 nss-3.12.4.tar.gz +bd8d96c42238c7cfd07ec1ba21191066 platlibs-sqlite3-64.patch f0f40bd021423ab1680b4d87cd19c1db platlibs-sqlite3.patch -441f12a9396a89841d384d8c89a052ff platlibs-sunos.patch -d41d8cd98f00b204e9800998ecf8427e runtime-search-path.patch -90b4d32437b3e3fdadcf4f16339aa2ed shared-libs.patch +cae46161d981e8aea822953b34339e60 sqlite3-32.patch +b07d3de42785866c3c4385846fd8eb52 sqlite3-64.patch 221646aa1954b4a255ac03e7d8b0225d whoami.patch Deleted: csw/mgar/pkg/nss/trunk/files/csw-include.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/csw-include.patch 2009-11-28 09:30:46 UTC (rev 7497) +++ csw/mgar/pkg/nss/trunk/files/csw-include.patch 2009-11-28 15:59:39 UTC (rev 7498) @@ -1,11 +0,0 @@ ---- nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/SunOS5.mk.orig 2009-11-23 02:33:18.896095984 +0100 -+++ nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/SunOS5.mk 2009-11-23 02:33:40.956347570 +0100 -@@ -104,7 +104,7 @@ - endif - endif - --INCLUDES += -I/usr/dt/include -I/usr/openwin/include -+INCLUDES += -I/usr/dt/include -I/usr/openwin/include -I/opt/csw/include - - RANLIB = echo - CPU_ARCH = sparc Deleted: csw/mgar/pkg/nss/trunk/files/gln.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/gln.patch 2009-11-28 09:30:46 UTC (rev 7497) +++ csw/mgar/pkg/nss/trunk/files/gln.patch 2009-11-28 15:59:39 UTC (rev 7498) @@ -1,35 +0,0 @@ ---- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/config/Makefile.orig 2009-11-23 02:38:13.942222659 +0100 -+++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/config/Makefile 2009-11-23 02:38:42.759423711 +0100 -@@ -13,7 +13,7 @@ - export: - # Create the nss.pc file - mkdir -p $(DIST)/lib/pkgconfig -- sed -e "s, at prefix@,$(PREFIX)," \ -+ gsed -e "s, at prefix@,$(PREFIX)," \ - -e "s, at exec_prefix@,\$${prefix}," \ - -e "s, at libdir@,\$${prefix}/gentoo/nss," \ - -e "s, at includedir@,\$${prefix}/include/nss," \ -@@ -21,18 +21,18 @@ - -e "s, at NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ - -e "s, at NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ - nss.pc.in > nss.pc -- chmod 0644 nss.pc -- ln -sf ../../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig -+ gchmod 0644 nss.pc -+ gln -sf ../../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig - - # Create the nss-config script - mkdir -p $(DIST)/bin -- sed -e "s, at prefix@,$(PREFIX)," \ -+ gsed -e "s, at prefix@,$(PREFIX)," \ - -e "s, at NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \ - -e "s, at NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ - -e "s, at NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ - nss-config.in > nss-config -- chmod 0755 nss-config -- ln -sf ../../../../security/nss/config/nss-config $(DIST)/bin -+ gchmod 0755 nss-config -+ gln -sf ../../../../security/nss/config/nss-config $(DIST)/bin - - libs: - Copied: csw/mgar/pkg/nss/trunk/files/include.patch (from rev 7497, csw/mgar/pkg/nss/branches/upstream-work/files/include.patch) =================================================================== --- csw/mgar/pkg/nss/trunk/files/include.patch (rev 0) +++ csw/mgar/pkg/nss/trunk/files/include.patch 2009-11-28 15:59:39 UTC (rev 7498) @@ -0,0 +1,11 @@ +--- a/mozilla/security/coreconf/SunOS5.mk.orig 2009-11-26 09:29:22.101030210 +0100 ++++ b/mozilla/security/coreconf/SunOS5.mk 2009-11-26 09:29:33.419484372 +0100 +@@ -104,7 +104,7 @@ + endif + endif + +-INCLUDES += -I/usr/dt/include -I/usr/openwin/include ++INCLUDES += -I/usr/dt/include -I/usr/openwin/include $(CPPFLAGS) + + RANLIB = echo + CPU_ARCH = sparc Copied: csw/mgar/pkg/nss/trunk/files/ld-options.patch (from rev 7497, csw/mgar/pkg/nss/branches/upstream-work/files/ld-options.patch) =================================================================== --- csw/mgar/pkg/nss/trunk/files/ld-options.patch (rev 0) +++ csw/mgar/pkg/nss/trunk/files/ld-options.patch 2009-11-28 15:59:39 UTC (rev 7498) @@ -0,0 +1,10 @@ +--- a/mozilla/security/coreconf/SunOS5.mk.orig 2009-11-26 11:52:54.279684353 +0100 ++++ b/mozilla/security/coreconf/SunOS5.mk 2009-11-26 11:53:05.767884648 +0100 +@@ -175,6 +175,6 @@ + RPATH = -R '$$ORIGIN:/usr/lib/mps/secv1:/usr/lib/mps' + endif + else +-RPATH = -R '$$ORIGIN' ++RPATH = $(LDFLAGS) $(LD_OPTIONS) + endif + Deleted: csw/mgar/pkg/nss/trunk/files/nss-3.12.4-gentoo-fixups-1.diff =================================================================== --- csw/mgar/pkg/nss/trunk/files/nss-3.12.4-gentoo-fixups-1.diff 2009-11-28 09:30:46 UTC (rev 7497) +++ csw/mgar/pkg/nss/trunk/files/nss-3.12.4-gentoo-fixups-1.diff 2009-11-28 15:59:39 UTC (rev 7498) @@ -1,245 +0,0 @@ -diff -urN nss-3.12.4-orig/mozilla/security/nss/config/Makefile nss-3.12.4/mozilla/security/nss/config/Makefile ---- nss-3.12.4-orig/mozilla/security/nss/config/Makefile 1969-12-31 18:00:00.000000000 -0600 -+++ nss-3.12.4/mozilla/security/nss/config/Makefile 2009-09-14 21:45:45.619639265 -0500 -@@ -0,0 +1,40 @@ -+CORE_DEPTH = ../.. -+DEPTH = ../.. -+ -+include $(CORE_DEPTH)/coreconf/config.mk -+ -+NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'` -+NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'` -+NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'` -+PREFIX = /usr -+ -+all: export libs -+ -+export: -+ # Create the nss.pc file -+ mkdir -p $(DIST)/lib/pkgconfig -+ sed -e "s, at prefix@,$(PREFIX)," \ -+ -e "s, at exec_prefix@,\$${prefix}," \ -+ -e "s, at libdir@,\$${prefix}/gentoo/nss," \ -+ -e "s, at includedir@,\$${prefix}/include/nss," \ -+ -e "s, at NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \ -+ -e "s, at NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ -+ -e "s, at NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ -+ nss.pc.in > nss.pc -+ chmod 0644 nss.pc -+ ln -sf ../../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig -+ -+ # Create the nss-config script -+ mkdir -p $(DIST)/bin -+ sed -e "s, at prefix@,$(PREFIX)," \ -+ -e "s, at NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \ -+ -e "s, at NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ -+ -e "s, at NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ -+ nss-config.in > nss-config -+ chmod 0755 nss-config -+ ln -sf ../../../../security/nss/config/nss-config $(DIST)/bin -+ -+libs: -+ -+dummy: all export libs -+ -diff -urN nss-3.12.4-orig/mozilla/security/nss/config/nss-config.in nss-3.12.4/mozilla/security/nss/config/nss-config.in ---- nss-3.12.4-orig/mozilla/security/nss/config/nss-config.in 1969-12-31 18:00:00.000000000 -0600 -+++ nss-3.12.4/mozilla/security/nss/config/nss-config.in 2009-09-14 21:47:45.190638078 -0500 -@@ -0,0 +1,145 @@ -+#!/bin/sh -+ -+prefix=@prefix@ -+ -+major_version=@NSS_MAJOR_VERSION@ -+minor_version=@NSS_MINOR_VERSION@ -+patch_version=@NSS_PATCH_VERSION@ -+ -+usage() -+{ -+ cat <&2 -+fi -+ -+lib_ssl=yes -+lib_smime=yes -+lib_nss=yes -+lib_nssutil=yes -+ -+while test $# -gt 0; do -+ case "$1" in -+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; -+ *) optarg= ;; -+ esac -+ -+ case $1 in -+ --prefix=*) -+ prefix=$optarg -+ ;; -+ --prefix) -+ echo_prefix=yes -+ ;; -+ --exec-prefix=*) -+ exec_prefix=$optarg -+ ;; -+ --exec-prefix) -+ echo_exec_prefix=yes -+ ;; -+ --includedir=*) -+ includedir=$optarg -+ ;; -+ --includedir) -+ echo_includedir=yes -+ ;; -+ --libdir=*) -+ libdir=$optarg -+ ;; -+ --libdir) -+ echo_libdir=yes -+ ;; -+ --version) -+ echo ${major_version}.${minor_version}.${patch_version} -+ ;; -+ --cflags) -+ echo_cflags=yes -+ ;; -+ --libs) -+ echo_libs=yes -+ ;; -+ ssl) -+ lib_ssl=yes -+ ;; -+ smime) -+ lib_smime=yes -+ ;; -+ nss) -+ lib_nss=yes -+ ;; -+ nssutil) -+ lib_nssutil=yes -+ ;; -+ *) -+ usage 1 1>&2 -+ ;; -+ esac -+ shift -+done -+ -+# Set variables that may be dependent upon other variables -+if test -z "$exec_prefix"; then -+ exec_prefix=`pkg-config --variable=exec_prefix nss` -+fi -+if test -z "$includedir"; then -+ includedir=`pkg-config --variable=includedir nss` -+fi -+if test -z "$libdir"; then -+ libdir=`pkg-config --variable=libdir nss` -+fi -+ -+if test "$echo_prefix" = "yes"; then -+ echo $prefix -+fi -+ -+if test "$echo_exec_prefix" = "yes"; then -+ echo $exec_prefix -+fi -+ -+if test "$echo_includedir" = "yes"; then -+ echo $includedir -+fi -+ -+if test "$echo_libdir" = "yes"; then -+ echo $libdir -+fi -+ -+if test "$echo_cflags" = "yes"; then -+ echo -I$includedir -+fi -+ -+if test "$echo_libs" = "yes"; then -+ libdirs="-Wl,-R$libdir -L$libdir" -+ if test -n "$lib_ssl"; then -+ libdirs="$libdirs -lssl${major_version}" -+ fi -+ if test -n "$lib_smime"; then -+ libdirs="$libdirs -lsmime${major_version}" -+ fi -+ if test -n "$lib_nss"; then -+ libdirs="$libdirs -lnss${major_version}" -+ fi -+ if test -n "$lib_nssutil"; then -+ libdirs="$libdirs -lnssutil${major_version}" -+ fi -+ echo $libdirs -+fi -+ -diff -urN nss-3.12.4-orig/mozilla/security/nss/config/nss.pc.in nss-3.12.4/mozilla/security/nss/config/nss.pc.in ---- nss-3.12.4-orig/mozilla/security/nss/config/nss.pc.in 1969-12-31 18:00:00.000000000 -0600 -+++ nss-3.12.4/mozilla/security/nss/config/nss.pc.in 2009-09-14 21:45:45.653637310 -0500 -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: NSS -+Description: Network Security Services -+Version: @NSS_MAJOR_VERSION at .@NSS_MINOR_VERSION at .@NSS_PATCH_VERSION@ -+Requires: nspr >= 4.8 -+Libs: -L${libdir} -lssl3 -lsmime3 -lnssutil3 -lnss3 -Wl,-R${libdir} -+Cflags: -I${includedir} -+ -diff -urN nss-3.12.4-orig/mozilla/security/nss/Makefile nss-3.12.4/mozilla/security/nss/Makefile ---- nss-3.12.4-orig/mozilla/security/nss/Makefile 2008-12-02 17:24:39.000000000 -0600 -+++ nss-3.12.4/mozilla/security/nss/Makefile 2009-09-14 21:45:45.678657145 -0500 -@@ -78,7 +78,7 @@ - # (7) Execute "local" rules. (OPTIONAL). # - ####################################################################### - --nss_build_all: build_coreconf build_nspr build_dbm all -+nss_build_all: build_coreconf build_dbm all - - nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber - -@@ -140,12 +140,6 @@ - --with-dist-prefix='$(NSPR_PREFIX)' \ - --with-dist-includedir='$(NSPR_PREFIX)/include' - --build_nspr: $(NSPR_CONFIG_STATUS) -- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE) -- --clobber_nspr: $(NSPR_CONFIG_STATUS) -- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE) clobber -- - build_dbm: - ifndef NSS_DISABLE_DBM - cd $(CORE_DEPTH)/dbm ; $(MAKE) export libs -diff -urN nss-3.12.4-orig/mozilla/security/nss/manifest.mn nss-3.12.4/mozilla/security/nss/manifest.mn ---- nss-3.12.4-orig/mozilla/security/nss/manifest.mn 2008-04-04 15:36:59.000000000 -0500 -+++ nss-3.12.4/mozilla/security/nss/manifest.mn 2009-09-14 21:45:45.703656167 -0500 -@@ -42,6 +42,6 @@ - - RELEASE = nss - --DIRS = lib cmd -+DIRS = lib cmd config - - Deleted: csw/mgar/pkg/nss/trunk/files/nss-3.12.4.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/nss-3.12.4.patch 2009-11-28 09:30:46 UTC (rev 7497) +++ csw/mgar/pkg/nss/trunk/files/nss-3.12.4.patch 2009-11-28 15:59:39 UTC (rev 7498) @@ -1,141 +0,0 @@ ---- mozilla/security/nss/lib/freebl/stubs.c.dist 2009-09-16 17:46:24.600678560 +0100 -+++ b/mozilla/security/nss/lib/freebl/stubs.c 2009-09-16 18:09:59.275307160 +0100 -@@ -70,9 +70,32 @@ - #include - #include - --#define FREEBL_NO_WEAK 1 -+#ifdef __sgi -+# include -+# ifndef _RLD_INTERFACE_DLFCN_H_DLADDR -+# define _RLD_INTERFACE_DLFCN_H_DLADDR -+ typedef struct Dl_info { -+ const char * dli_fname; -+ void * dli_fbase; -+ const char * dli_sname; -+ void * dli_saddr; -+ int dli_version; -+ int dli_reserved1; -+ long dli_reserved[4]; -+ } Dl_info; -+# endif -+# define _RLD_DLADDR 14 -+int dladdr(void *address, Dl_info *dl); -+ -+int dladdr(void *address, Dl_info *dl) -+{ -+ void *v; -+ v = _rld_new_interface(_RLD_DLADDR,address,dl); -+ return (int)v; -+} -+#endif - --#define WEAK __attribute__((weak)) -+#define FREEBL_NO_WEAK 1 - - #ifdef FREEBL_NO_WEAK - -@@ -93,17 +116,17 @@ - static type_##fn ptr_##fn = NULL - - #define STUB_SAFE_CALL0(fn) \ -- if (ptr_##fn) { return ptr_##fn(); } -+ if (ptr_##fn) { ptr_##fn(); } - #define STUB_SAFE_CALL1(fn,a1) \ -- if (ptr_##fn) { return ptr_##fn(a1); } -+ if (ptr_##fn) { ptr_##fn(a1); } - #define STUB_SAFE_CALL2(fn,a1,a2) \ -- if (ptr_##fn) { return ptr_##fn(a1,a2); } -+ if (ptr_##fn) { ptr_##fn(a1,a2); } - #define STUB_SAFE_CALL3(fn,a1,a2,a3) \ -- if (ptr_##fn) { return ptr_##fn(a1,a2,a3); } -+ if (ptr_##fn) { ptr_##fn(a1,a2,a3); } - #define STUB_SAFE_CALL4(fn,a1,a2,a3,a4) \ -- if (ptr_##fn) { return ptr_##fn(a1,a2,a3,a4); } -+ if (ptr_##fn) { ptr_##fn(a1,a2,a3,a4); } - #define STUB_SAFE_CALL6(fn,a1,a2,a3,a4,a5,a6) \ -- if (ptr_##fn) { return ptr_##fn(a1,a2,a3,a4,a5,a6); } -+ if (ptr_##fn) { ptr_##fn(a1,a2,a3,a4,a5,a6); } - - #define STUB_FETCH_FUNCTION(fn) \ - ptr_##fn = (type_##fn) dlsym(lib,#fn); \ -@@ -118,6 +141,8 @@ - * libutil will not resolve these symbols. - */ - -+#define WEAK __attribute__((weak)) -+ - #define STUB_DECLARE(ret, fn, args) \ - WEAK extern ret fn args - -@@ -200,7 +225,7 @@ extern void - PORT_Free_stub(void *ptr) - { - STUB_SAFE_CALL1(PORT_Free_Util, ptr); -- return free(ptr); -+ free(ptr); - } - - extern void * -@@ -220,14 +245,14 @@ PORT_ZFree_stub(void *ptr, size_t len) - { - STUB_SAFE_CALL2(PORT_ZFree_Util, ptr, len); - memset(ptr, 0, len); -- return free(ptr); -+ free(ptr); - } - - extern void - PR_Free_stub(void *ptr) - { - STUB_SAFE_CALL1(PR_Free, ptr); -- return free(ptr); -+ free(ptr); - } - - /* -@@ -530,7 +555,7 @@ freebl_InitNSSUtil(void *lib) - * fetch the library if it's loaded. For NSS it should already be loaded - */ - #define freebl_getLibrary(libName) \ -- dlopen (libName, RTLD_LAZY|RTLD_NOLOAD) -+ dlopen (libName, RTLD_LAZY) - - #define freebl_releaseLibrary(lib) \ - if (lib) dlclose(lib) -@@ -538,7 +563,7 @@ freebl_InitNSSUtil(void *lib) - static void * FREEBLnsprGlobalLib = NULL; - static void * FREEBLnssutilGlobalLib = NULL; - --void __attribute ((destructor)) FREEBL_unload() -+void FREEBL_unload() - { - freebl_releaseLibrary(FREEBLnsprGlobalLib); - freebl_releaseLibrary(FREEBLnssutilGlobalLib); ---- mozilla/security/nss/lib/freebl/nsslowhash.c.dist 2009-09-16 18:16:17.529500640 +0100 -+++ b/mozilla/security/nss/lib/freebl/nsslowhash.c 2009-09-16 18:16:37.634080480 +0100 -@@ -375,21 +375,21 @@ NSSLOWHASH_NewContext(NSSLOWInitContext - void - NSSLOWHASH_Begin(NSSLOWHASHContext *context) - { -- return context->hashObj->begin(context->hashCtxt); -+ context->hashObj->begin(context->hashCtxt); - } - - void - NSSLOWHASH_Update(NSSLOWHASHContext *context, const unsigned char *buf, - unsigned int len) - { -- return context->hashObj->update(context->hashCtxt, buf, len); -+ context->hashObj->update(context->hashCtxt, buf, len); - } - - void - NSSLOWHASH_End(NSSLOWHASHContext *context, unsigned char *buf, - unsigned int *ret, unsigned int len) - { -- return context->hashObj->end(context->hashCtxt, buf, ret, len); -+ context->hashObj->end(context->hashCtxt, buf, ret, len); - } - - void Copied: csw/mgar/pkg/nss/trunk/files/nss.pc (from rev 7497, csw/mgar/pkg/nss/branches/upstream-work/files/nss.pc) =================================================================== --- csw/mgar/pkg/nss/trunk/files/nss.pc (rev 0) +++ csw/mgar/pkg/nss/trunk/files/nss.pc 2009-11-28 15:59:39 UTC (rev 7498) @@ -0,0 +1,11 @@ +prefix=/opt/csw +exec_prefix=${prefix} +libdir=${prefix}/lib/nss +includedir=${prefix}/include/nss + +Name: NSS +Description: Network Security Services +Version: 3.12.4 +Requires: nspr >= 4.8.0 +Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lnssutil3 -R${libdir} +Cflags: -I${includedir} Copied: csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3-64.patch (from rev 7497, csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3-64.patch) =================================================================== --- csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3-64.patch (rev 0) +++ csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3-64.patch 2009-11-28 15:59:39 UTC (rev 7498) @@ -0,0 +1,11 @@ +--- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk.orig 2009-11-23 14:17:29.741267874 +0100 ++++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk 2009-11-23 14:17:41.292422026 +0100 +@@ -82,7 +82,7 @@ + endif + endif + +-SQLITE=-R/opt/csw/lib/$$ISALIST -L/opt/csw/lib -lsqlite3 ++SQLITE=-R/opt/csw/lib/$$ISALIST -L/opt/csw/lib/64 -lsqlite3 + + ifdef NSS_DISABLE_DBM + DBMLIB = $(NULL) Deleted: csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3.patch 2009-11-28 09:30:46 UTC (rev 7497) +++ csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3.patch 2009-11-28 15:59:39 UTC (rev 7498) @@ -1,11 +0,0 @@ ---- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk.orig 2009-11-21 17:28:09.997982796 +0100 -+++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk 2009-11-21 17:28:32.107632453 +0100 -@@ -80,7 +80,7 @@ - endif - endif - --SQLITE=-lsqlite3 -+SQLITE=-R/opt/csw/lib/$$ISALIST -L/opt/csw/lib -lsqlite3 - - ifdef NSS_DISABLE_DBM - DBMLIB = $(NULL) Copied: csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3.patch (from rev 7497, csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3.patch) =================================================================== --- csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3.patch (rev 0) +++ csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3.patch 2009-11-28 15:59:39 UTC (rev 7498) @@ -0,0 +1,11 @@ +--- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk.orig 2009-11-21 17:28:09.997982796 +0100 ++++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk 2009-11-21 17:28:32.107632453 +0100 +@@ -80,7 +80,7 @@ + endif + endif + +-SQLITE=-lsqlite3 ++SQLITE=-R/opt/csw/lib/$$ISALIST -L/opt/csw/lib -lsqlite3 + + ifdef NSS_DISABLE_DBM + DBMLIB = $(NULL) Deleted: csw/mgar/pkg/nss/trunk/files/platlibs-sunos.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/platlibs-sunos.patch 2009-11-28 09:30:46 UTC (rev 7497) +++ csw/mgar/pkg/nss/trunk/files/platlibs-sunos.patch 2009-11-28 15:59:39 UTC (rev 7498) @@ -1,11 +0,0 @@ ---- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk.orig 2009-11-22 14:31:53.252227901 +0100 -+++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk 2009-11-22 14:32:46.536330277 +0100 -@@ -48,6 +48,8 @@ - else - EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib' - endif -+EXTRA_SHARED_LIBS += -R/opt/csw/lib/$$ISALIST -+EXTRA_SHARED_LIBS += -R/opt/csw/lib/nspr/$$ISALIST - endif - - ifeq ($(OS_ARCH), Linux) Deleted: csw/mgar/pkg/nss/trunk/files/shared-libs.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/shared-libs.patch 2009-11-28 09:30:46 UTC (rev 7497) +++ csw/mgar/pkg/nss/trunk/files/shared-libs.patch 2009-11-28 15:59:39 UTC (rev 7498) @@ -1,32 +0,0 @@ ---- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/lib/softoken/config.mk.orig 2009-11-22 11:39:49.492474635 +0100 -+++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/lib/softoken/config.mk 2009-11-22 11:40:51.857227138 +0100 -@@ -54,10 +54,14 @@ - - ifdef NS_USE_GCC - EXTRA_SHARED_LIBS += \ -+ -R/opt/csw/lib/$$ISALIST \ -+ -L/opt/csw/lib \ - -L$(DIST)/lib \ -+ -R$(NSSUTIL_LIB_DIR)/$$ISALIST \ - -L$(NSSUTIL_LIB_DIR) \ - -lnssutil3 \ - -lsqlite3 \ -+ -R$(NSPR_LIB_DIR)/$$ISALIST \ - -L$(NSPR_LIB_DIR) \ - -lplc4 \ - -lplds4 \ -@@ -80,10 +84,14 @@ - # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS) - # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX. - EXTRA_SHARED_LIBS += \ -+ -R/opt/csw/lib/$$ISALIST \ -+ -L/opt/csw/lib \ - -L$(DIST)/lib \ -+ -R$(NSSUTIL_LIB_DIR)/$$ISALIST \ - -L$(NSSUTIL_LIB_DIR) \ - -lnssutil3 \ - -lsqlite3 \ -+ -R$(NSPR_LIB_DIR)/$$ISALIST \ - -L$(NSPR_LIB_DIR) \ - -lplc4 \ - -lplds4 \ Deleted: csw/mgar/pkg/nss/trunk/files/sign-under-dbx.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/sign-under-dbx.patch 2009-11-28 09:30:46 UTC (rev 7497) +++ csw/mgar/pkg/nss/trunk/files/sign-under-dbx.patch 2009-11-28 15:59:39 UTC (rev 7498) @@ -1,15 +0,0 @@ -This file shows how to run shlibsign under dbx, the Sun Studio debugger, to see -where it's aborting. - ---- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/shlibsign/./sign.sh.orig 2009-11-22 15:17:12.069116849 +0100 -+++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/shlibsign/./sign.sh 2009-11-22 15:17:54.559576926 +0100 -@@ -34,7 +34,7 @@ - export LIBRARY_PATH - ADDON_PATH=${1}/lib:${4}:$ADDON_PATH - export ADDON_PATH -- echo ${2}/shlibsign -v -i ${5} -- ${2}/shlibsign -v -i ${5} -+ echo /opt/studio/SOS11/SUNWspro/bin/dbx ${2}/shlibsign -v -i ${5} -+ /opt/studio/SOS11/SUNWspro/bin/dbx ${2}/shlibsign -v -i ${5} - ;; - esac Copied: csw/mgar/pkg/nss/trunk/files/sqlite3-32.patch (from rev 7497, csw/mgar/pkg/nss/branches/upstream-work/files/sqlite3-32.patch) =================================================================== --- csw/mgar/pkg/nss/trunk/files/sqlite3-32.patch (rev 0) +++ csw/mgar/pkg/nss/trunk/files/sqlite3-32.patch 2009-11-28 15:59:39 UTC (rev 7498) @@ -0,0 +1,18 @@ +--- a/mozilla/security/nss/lib/softoken/config.mk.orig 2009-11-27 00:13:49.173159939 +0100 ++++ b/mozilla/security/nss/lib/softoken/config.mk 2009-11-27 00:15:19.891579729 +0100 +@@ -57,6 +57,7 @@ + -L$(DIST)/lib \ + -L$(NSSUTIL_LIB_DIR) \ + -lnssutil3 \ ++ -L/opt/csw/lib \ + -lsqlite3 \ + -L$(NSPR_LIB_DIR) \ + -lplc4 \ +@@ -83,6 +84,7 @@ + -L$(DIST)/lib \ + -L$(NSSUTIL_LIB_DIR) \ + -lnssutil3 \ ++ -L/opt/csw/lib \ + -lsqlite3 \ + -L$(NSPR_LIB_DIR) \ + -lplc4 \ Copied: csw/mgar/pkg/nss/trunk/files/sqlite3-64.patch (from rev 7497, csw/mgar/pkg/nss/branches/upstream-work/files/sqlite3-64.patch) =================================================================== --- csw/mgar/pkg/nss/trunk/files/sqlite3-64.patch (rev 0) +++ csw/mgar/pkg/nss/trunk/files/sqlite3-64.patch 2009-11-28 15:59:39 UTC (rev 7498) @@ -0,0 +1,18 @@ +--- a/mozilla/security/nss/lib/softoken/config.mk.orig 2009-11-27 00:13:49.173159939 +0100 ++++ b/mozilla/security/nss/lib/softoken/config.mk 2009-11-27 00:15:48.846636621 +0100 +@@ -57,6 +57,7 @@ + -L$(DIST)/lib \ + -L$(NSSUTIL_LIB_DIR) \ + -lnssutil3 \ ++ -L/opt/csw/lib/64 \ + -lsqlite3 \ + -L$(NSPR_LIB_DIR) \ + -lplc4 \ +@@ -83,6 +84,7 @@ + -L$(DIST)/lib \ + -L$(NSSUTIL_LIB_DIR) \ + -lnssutil3 \ ++ -L/opt/csw/lib/64 \ + -lsqlite3 \ + -L$(NSPR_LIB_DIR) \ + -lplc4 \ Deleted: csw/mgar/pkg/nss/trunk/files/whoami.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/whoami.patch 2009-11-28 09:30:46 UTC (rev 7497) +++ csw/mgar/pkg/nss/trunk/files/whoami.patch 2009-11-28 15:59:39 UTC (rev 7498) @@ -1,11 +0,0 @@ ---- nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/UNIX.mk.orig 2009-11-22 02:25:17.411354784 +0100 -+++ nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/UNIX.mk 2009-11-22 02:25:24.833876220 +0100 -@@ -46,7 +46,7 @@ - DEFINES += -UDEBUG -DNDEBUG - else - OPTIMIZER += -g -- USERNAME := $(shell whoami) -+ USERNAME := $(shell gwhoami) - USERNAME := $(subst -,_,$(USERNAME)) - DEFINES += -DDEBUG -UNDEBUG -DDEBUG_$(USERNAME) - endif Copied: csw/mgar/pkg/nss/trunk/files/whoami.patch (from rev 7497, csw/mgar/pkg/nss/branches/upstream-work/files/whoami.patch) =================================================================== --- csw/mgar/pkg/nss/trunk/files/whoami.patch (rev 0) +++ csw/mgar/pkg/nss/trunk/files/whoami.patch 2009-11-28 15:59:39 UTC (rev 7498) @@ -0,0 +1,11 @@ +--- nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/UNIX.mk.orig 2009-11-22 02:25:17.411354784 +0100 ++++ nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/UNIX.mk 2009-11-22 02:25:24.833876220 +0100 +@@ -46,7 +46,7 @@ + DEFINES += -UDEBUG -DNDEBUG + else + OPTIMIZER += -g +- USERNAME := $(shell whoami) ++ USERNAME := $(shell gwhoami) + USERNAME := $(subst -,_,$(USERNAME)) + DEFINES += -DDEBUG -UNDEBUG -DDEBUG_$(USERNAME) + endif 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 Nov 29 11:48:26 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 29 Nov 2009 10:48:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[7503] csw/mgar/pkg/pius/trunk/Makefile Message-ID: Revision: 7503 http://gar.svn.sourceforge.net/gar/?rev=7503&view=rev Author: wahwah Date: 2009-11-29 10:48:26 +0000 (Sun, 29 Nov 2009) Log Message: ----------- pius: Added archall and a build dep Python Modified Paths: -------------- csw/mgar/pkg/pius/trunk/Makefile Modified: csw/mgar/pkg/pius/trunk/Makefile =================================================================== --- csw/mgar/pkg/pius/trunk/Makefile 2009-11-29 00:53:45 UTC (rev 7502) +++ csw/mgar/pkg/pius/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) @@ -14,10 +14,13 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 REQUIRED_PKGS = CSWpython +ARCHALL = 1 +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CONFIGURE_SCRIPTS = BUILD_SCRIPTS = INSTALL_SCRIPTS = pius TEST_SCRIPTS = + include gar/category.mk install-pius: 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 Nov 29 01:53:46 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 29 Nov 2009 00:53:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7502] csw/mgar/pkg/coreutils/trunk/Makefile Message-ID: Revision: 7502 http://gar.svn.sourceforge.net/gar/?rev=7502&view=rev Author: bdwalton Date: 2009-11-29 00:53:45 +0000 (Sun, 29 Nov 2009) Log Message: ----------- coreutils: solidfy include/exclude configure opts; setup gsu manual install Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-28 20:17:10 UTC (rev 7501) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2009-11-29 00:53:45 UTC (rev 7502) @@ -30,7 +30,7 @@ CONFIGURE_ARGS += --program-prefix=g CONFIGURE_ARGS += --with-libintl-prefix=/opt/csw/ CONFIGURE_ARGS += --with-libiconv-prefix=/opt/csw/ -CONFIGURE_ARGS += --enable-no-install-program=arch,hostname,su,chcon +CONFIGURE_ARGS += --enable-no-install-program=chcon TEST_TARGET = check @@ -41,6 +41,8 @@ post-install-modulated: @echo Cleaning up install directory... rm -rf $(DESTDIR)/$(libdir) + @echo Manually install gsu (so no root rights required) + cp $(WORKSRC)/src/su $(DESTDIR)$(bindir)/gsu post-merge: @(cd $(PKGROOT)$(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 Sat Nov 28 20:54:44 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 28 Nov 2009 19:54:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7500] csw/mgar/pkg/ruby/trunk/Makefile Message-ID: Revision: 7500 http://gar.svn.sourceforge.net/gar/?rev=7500&view=rev Author: bdwalton Date: 2009-11-28 19:54:43 +0000 (Sat, 28 Nov 2009) Log Message: ----------- ruby: add a few new makecookies Modified Paths: -------------- csw/mgar/pkg/ruby/trunk/Makefile Modified: csw/mgar/pkg/ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby/trunk/Makefile 2009-11-28 16:13:32 UTC (rev 7499) +++ csw/mgar/pkg/ruby/trunk/Makefile 2009-11-28 19:54:43 UTC (rev 7500) @@ -130,12 +130,14 @@ @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/ + @$(MAKECONFIG) rubymode: RMDIR=$(DESTDIR)/$(datadir)/emacs/site-lisp/ruby-mode rubymode: @echo " ===> Installing and Compilingn ruby-mode elisp" @(mkdir -p $(RMDIR); \ cp $(WORKSRC)/misc/*el $(RMDIR)) + @$(MAKECOOKIE) # Fix up rbconfig rbconfig: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Sat Nov 28 21:17:10 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sat, 28 Nov 2009 20:17:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7501] csw/mgar/pkg/munin/trunk Message-ID: Revision: 7501 http://gar.svn.sourceforge.net/gar/?rev=7501&view=rev Author: j_arndt Date: 2009-11-28 20:17:10 +0000 (Sat, 28 Nov 2009) Log Message: ----------- munin: update to new versiion 1.4, added package for common files Modified Paths: -------------- csw/mgar/pkg/munin/trunk/Makefile csw/mgar/pkg/munin/trunk/checksums csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.postinstall csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype csw/mgar/pkg/munin/trunk/files/CSWmuninnode.prototype csw/mgar/pkg/munin/trunk/files/makefile.config.diff csw/mgar/pkg/munin/trunk/files/makefile.diff csw/mgar/pkg/munin/trunk/files/munin-graph.in.diff csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.diff csw/mgar/pkg/munin/trunk/files/munin.conf.in.diff csw/mgar/pkg/munin/trunk/files/sunos_memory.in.diff Added Paths: ----------- csw/mgar/pkg/munin/trunk/files/CSWmunincommon.prototype csw/mgar/pkg/munin/trunk/files/perl.diff Removed Paths: ------------- csw/mgar/pkg/munin/trunk/files/munin-update.in.diff csw/mgar/pkg/munin/trunk/files/munindoc.in.diff csw/mgar/pkg/munin/trunk/files/perlpath.diff Modified: csw/mgar/pkg/munin/trunk/Makefile =================================================================== --- csw/mgar/pkg/munin/trunk/Makefile 2009-11-28 19:54:43 UTC (rev 7500) +++ csw/mgar/pkg/munin/trunk/Makefile 2009-11-28 20:17:10 UTC (rev 7501) @@ -1,9 +1,10 @@ GARNAME = munin -GARVERSION = 1.3.4 +GARVERSION = 1.4.0 CATEGORIES = apps SPKG_DESC_CSWmuninmaster = master component of the graphical network and system monitoring munin SPKG_DESC_CSWmuninnode = node component of the graphical network and system monitoring munin +SPKG_DESC_CSWmunincommin = common files for munin node and master define BLURB Munin the monitoring tool surveys all your computers and remembers what it saw. It presents all the information in graphs through a web interface. @@ -12,8 +13,10 @@ SF_PROJ = munin MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)_$(GARVERSION).tar.gz +DISTFILES += CSWmuninmaster.postinstall DISTFILES += CSWmuninmaster.prototype CSWmuninmaster.postinstall DISTFILES += CSWmuninnode.prototype cswmuninnode +DISTFILES += CSWmunincommon.prototype DISTFILES += cswusergroup DISTFILES += apache-munin.conf.CSW apache-munin-cgi.conf.CSW DISTFILES += README.CSW @@ -23,10 +26,8 @@ PATCHFILES += sunos_memory.in.diff PATCHFILES += munin-node.conf.in.diff PATCHFILES += munin.conf.in.diff -PATCHFILES += munin-graph.in.diff # use monospace instead of VeraMono.ttf -PATCHFILES += munin-update.in.diff # http://munin.projects.linpro.no/ticket/699 -PATCHFILES += munindoc.in.diff # PATH to perl set to /opt/csw/bin/perl -PATCHFILES += perlpath.diff # shebang changed to #!@@PERL@@ -w +PATCHFILES += munin-graph.in.diff # match some paths to /{etc|var}/opt/csw/munin +PATCHFILES += perl.diff # shebang correctly set # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz @@ -35,21 +36,27 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = -PACKAGES = CSWmuninmaster CSWmuninnode +PACKAGES = CSWmuninmaster CSWmuninnode CSWmunincommon CATALOGNAME_CSWmuninmaster = munin_master CATALOGNAME_CSWmuninnode = munin_node +CATALOGNAME_CSWmunincommon = munin_common ARCHALL_CSWmuninmaster = 1 ARCHALL_CSWmuninnode = 1 +ARCHALL_CSWmunincommon = 1 -REQUIRED_PKGS_CSWmuninmaster = CSWpmnetserver CSWperl CSWpython CSWpmparserecdescent -REQUIRED_PKGS_CSWmuninmaster += CSWpmhtmltmpl CSWpmdatemanip CSWpmmd5 CSWrrd CSWapache2 +REQUIRED_PKGS_CSWmuninmaster = CSWperl CSWpmhtmltmpl CSWpmprmsvldt CSWpmlog4perl CSWmunincommon +REQUIRED_PKGS_CSWmuninmaster += CSWrrd CSWapache2 REQUIRED_PKGS_CSWmuninmaster += CSWcswclassutils -REQUIRED_PKGS_CSWmuninnode = CSWpmdbi CSWpmnetsnmp CSWpmnetserver CSWperl CSWtop CSWcswclassutils +REQUIRED_PKGS_CSWmuninnode = CSWperl CSWpmnetsnmp CSWpmnetserver CSWmunincommon +REQUIRED_PKGS_CSWmuninnode += CSWcswclassutils +REQUIRED_PKGS_CSWmuninnode += CSWperl CSWpmnetssleay + SPKG_CLASSES_CSWmuninmaster = none cswusergroup cswpreserveconf ugfiles SPKG_CLASSES_CSWmuninnode = none cswusergroup ugfiles cswpreserveconf cswinitsmf +SPKG_CLASSES_CSWmunincommon = none CONFIGURE_ARGS = $(DIRPATHS) @@ -69,13 +76,13 @@ @$(MAKECOOKIE) install-custom: - cat $(WORKSRC)/Makefile.config | sed -e "s;$$(DESTDIR);$(DESTDIR);g" > $(WORKSRC)/Makefile.config.tmp - mv $(WORKSRC)/Makefile.config.tmp $(WORKSRC)/Makefile.config - ( cd $(WORKSRC); gmake -f Makefile install) + @cat $(WORKSRC)/Makefile.config | sed -e "s;$$(DESTDIR);$(DESTDIR);g" > $(WORKSRC)/Makefile.config.tmp + @mv $(WORKSRC)/Makefile.config.tmp $(WORKSRC)/Makefile.config + @( cd $(WORKSRC); gmake -f Makefile ; gmake -f Makefile install) #mv $(DESTDIR)/opt/csw/lib/plugins $(DESTDIR)/opt/csw/lib/munin_plugins - mv $(DESTDIR)/etc/opt/csw/munin/munin-node.conf $(DESTDIR)/etc/opt/csw/munin/munin-node.conf.CSW - mv $(DESTDIR)/etc/opt/csw/munin/munin.conf $(DESTDIR)/etc/opt/csw/munin/munin.conf.CSW - @ginstall -d $(DESTDIR)/opt/csw/munin + @mv $(DESTDIR)/etc/opt/csw/munin/munin-node.conf $(DESTDIR)/etc/opt/csw/munin/munin-node.conf.CSW + @mv $(DESTDIR)/etc/opt/csw/munin/munin.conf $(DESTDIR)/etc/opt/csw/munin/munin.conf.CSW + #@ginstall -d $(DESTDIR)/opt/csw/munin @ginstall -d $(DESTDIR)/etc/opt/csw/munin/apache @ginstall -m 644 $(FILEDIR)/apache-munin.conf.CSW $(DESTDIR)/etc/opt/csw/munin/apache/apache-munin.conf.CSW @ginstall -m 644 $(FILEDIR)/apache-munin-cgi.conf.CSW $(DESTDIR)/etc/opt/csw/munin/apache/apache-munin-cgi.conf.CSW Modified: csw/mgar/pkg/munin/trunk/checksums =================================================================== --- csw/mgar/pkg/munin/trunk/checksums 2009-11-28 19:54:43 UTC (rev 7500) +++ csw/mgar/pkg/munin/trunk/checksums 2009-11-28 20:17:10 UTC (rev 7501) @@ -1,18 +1,17 @@ -b494ca780b9becd6a8611e255e606dd4 download/CSWmuninmaster.postinstall -29939c1794e6c602d54effac74e5c89d download/CSWmuninmaster.prototype -6cb29ccba599b5ddcea7581197bf986d download/CSWmuninnode.prototype +58ab277c1a958459e5270da07f017fb3 download/CSWmunincommon.prototype +390277cc59e2c37d5b0bd4f2c3441996 download/CSWmuninmaster.postinstall +8bd7bf2d0356a424fe58c7b3058ee3b4 download/CSWmuninmaster.prototype +c4064b92df7835bf37b18e799aa6177e download/CSWmuninnode.prototype e6bafa4aa3cba7fc16e444ad168b4cd1 download/README.CSW 59409f4b412953283c3df4546fd4886c download/apache-munin-cgi.conf.CSW e701d132ba0b6f3dcc90190860f5aa6b download/apache-munin.conf.CSW 31aec7f9a9a452cc6c75c1096c937fdd download/cswmuninnode 50fa4a545f878d79e219891c6ac8d2d2 download/cswusergroup -4eb0923e09f12335da8249ab7923e250 download/makefile.config.diff -3ea1ba00633ac52c3a25306c3c9c52e0 download/makefile.diff -064e12aa12bc7d4cb312b576ae658d1e download/munin-graph.in.diff -ce97aa8e741383039fb365d1a322f3e7 download/munin-node.conf.in.diff -4688659429fbebf8cafcc8eb8a1ee870 download/munin-update.in.diff -737e3e3d2f68015dfb4e857909cde7da download/munin.conf.in.diff -e3a58e582407981d4f5c5aed59cbfc47 download/munin_1.3.4.tar.gz -8e21ff70a126779e33dd6457839184de download/munindoc.in.diff -d1623381c74f05a174aa4704896ef5b6 download/perlpath.diff -43db53191eaae75be35b3548a993c31e download/sunos_memory.in.diff +fd380babe0e8adeb2fdceb2ff38c8e14 download/makefile.config.diff +81ce1cb57e8331fad745635ad9f2debb download/makefile.diff +e5afa54ed754c43b0b53c57ebac31915 download/munin-graph.in.diff +a0754324697266f8ae3530fcbdf885c0 download/munin-node.conf.in.diff +fcecf75276f36a96027976fd7d0dfdf9 download/munin.conf.in.diff +95be0e6eb98c4c7b2a4f2f922b358414 download/munin_1.4.0.tar.gz +9dc05eea4250fc1bc61436493ab9de75 download/perl.diff +7cb3378da78576a51cacd5b753134ccf download/sunos_memory.in.diff Added: csw/mgar/pkg/munin/trunk/files/CSWmunincommon.prototype =================================================================== --- csw/mgar/pkg/munin/trunk/files/CSWmunincommon.prototype (rev 0) +++ csw/mgar/pkg/munin/trunk/files/CSWmunincommon.prototype 2009-11-28 20:17:10 UTC (rev 7501) @@ -0,0 +1,14 @@ +d none /opt/csw/share/man/man3 0755 root bin +f none /opt/csw/share/man/man3/Munin::Common::Config.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Common::Defaults.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Common::TLS.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Common::TLSClient.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Common::TLSServer.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Common::Timeout.3perl 0444 root bin +d none /opt/csw/share/perl/site_perl/Munin/Common 0755 root bin +f none /opt/csw/share/perl/site_perl/Munin/Common/Config.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Common/Defaults.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Common/TLS.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Common/TLSClient.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Common/TLSServer.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Common/Timeout.pm 0444 root bin Modified: csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.postinstall =================================================================== --- csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.postinstall 2009-11-28 19:54:43 UTC (rev 7500) +++ csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.postinstall 2009-11-28 20:17:10 UTC (rev 7501) @@ -3,10 +3,9 @@ passwd -N munin cat << EOF -# -# -# +======================================================================= + To get Munin running, please follow these steps: (1) Append the following line to the crontab of the user 'munin': @@ -31,7 +30,6 @@ svcadm restart cswapache2 -# -# -# +======================================================================= + EOF Modified: csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype =================================================================== --- csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype 2009-11-28 19:54:43 UTC (rev 7500) +++ csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype 2009-11-28 20:17:10 UTC (rev 7501) @@ -1,15 +1,14 @@ d none /etc/opt/csw/munin 0755 root bin d none /etc/opt/csw/munin/apache 0755 root bin +f cswpreserveconf /etc/opt/csw/munin/apache/apache-munin-cgi.conf.CSW 0644 root bin +f cswpreserveconf /etc/opt/csw/munin/apache/apache-munin.conf.CSW 0644 root bin +d none /etc/opt/csw/munin/munin-conf.d 0755 root bin f cswpreserveconf /etc/opt/csw/munin/munin.conf.CSW 0644 root bin -f none /opt/csw/bin/munin-check 0755 root bin -f none /opt/csw/bin/munin-cron 0755 root bin -f none /opt/csw/share/munin/fonts/VeraMono.ttf 0644 root bin -f none /opt/csw/libexec/munin/munin-graph 0755 root bin -f none /opt/csw/libexec/munin/munin-html 0755 root bin -f none /opt/csw/libexec/munin/munin-limits 0755 root bin -f none /opt/csw/libexec/munin/munin-update 0755 root bin +d none /etc/opt/csw/munin/plugin-conf.d 0755 root bin d ugfiles /etc/opt/csw/munin/templates 0755 munin munin f none /etc/opt/csw/munin/templates/definitions.html 0644 root bin +f none /etc/opt/csw/munin/templates/favicon.ico 0644 root bin +f none /etc/opt/csw/munin/templates/logo-h.png 0644 root bin f none /etc/opt/csw/munin/templates/logo.png 0644 root bin f none /etc/opt/csw/munin/templates/munin-comparison-day.tmpl 0644 root bin f none /etc/opt/csw/munin/templates/munin-comparison-month.tmpl 0644 root bin @@ -19,38 +18,82 @@ f none /etc/opt/csw/munin/templates/munin-nodeview.tmpl 0644 root bin f none /etc/opt/csw/munin/templates/munin-overview.tmpl 0644 root bin f none /etc/opt/csw/munin/templates/munin-serviceview.tmpl 0644 root bin +d none /etc/opt/csw/munin/templates/partial 0755 root bin +f none /etc/opt/csw/munin/templates/partial/bottom_navigation.tmpl 0644 root bin +f none /etc/opt/csw/munin/templates/partial/generated_by.tmpl 0644 root bin +f none /etc/opt/csw/munin/templates/partial/head.tmpl 0644 root bin +f none /etc/opt/csw/munin/templates/partial/logo_navigation.tmpl 0644 root bin +f none /etc/opt/csw/munin/templates/partial/logo_navigation_comparison.tmpl 0644 root bin +f none /etc/opt/csw/munin/templates/partial/logo_path.tmpl 0644 root bin +f none /etc/opt/csw/munin/templates/partial/path.tmpl 0644 root bin +f none /etc/opt/csw/munin/templates/style-1.2.css 0644 root bin f none /etc/opt/csw/munin/templates/style.css 0644 root bin +f none /opt/csw/bin/munin-check 0755 root bin +f none /opt/csw/bin/munin-cron 0755 root bin +d none /opt/csw/etc/pkg 0755 root bin +d none /opt/csw/etc/pkg/CSWmuninmaster 0755 root bin +f cswusergroup /opt/csw/etc/pkg/CSWmuninmaster/cswusergroup 0644 root bin +d none /opt/csw/libexec 0755 root bin +d none /opt/csw/libexec/munin 0755 root bin +f none /opt/csw/libexec/munin/munin-graph 0755 root bin +f none /opt/csw/libexec/munin/munin-html 0755 root bin +f none /opt/csw/libexec/munin/munin-limits 0755 root bin +f none /opt/csw/libexec/munin/munin-update 0755 root bin d none /opt/csw/share/doc/munin_master 0755 root bin +f none /opt/csw/share/doc/munin_master/README.CSW 0644 root bin f none /opt/csw/share/doc/munin_master/license 0644 root bin -f cswpreserveconf /etc/opt/csw/munin/apache/apache-munin.conf.CSW 0644 root bin -f cswpreserveconf /etc/opt/csw/munin/apache/apache-munin-cgi.conf.CSW 0644 root bin -f none /opt/csw/share/doc/munin_master/README.CSW 0644 root bin d none /opt/csw/share/man/man1 0755 root bin +d none /opt/csw/share/man/man3 0755 root bin +f none /opt/csw/share/man/man3/Munin::Master::Config.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Master::Group.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Master::GroupRepository.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Master::HTMLOld.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Master::Host.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Master::Logger.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Master::Node.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Master::ProcessManager.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Master::Update.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Master::UpdateWorker.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Master::Utils.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Master::Worker.3perl 0444 root bin d none /opt/csw/share/man/man5 0755 root bin f none /opt/csw/share/man/man5/munin.conf.5 0644 root bin d none /opt/csw/share/man/man8 0755 root bin +f none /opt/csw/share/man/man8/munin-check.8 0644 root bin f none /opt/csw/share/man/man8/munin-cron.8 0644 root bin f none /opt/csw/share/man/man8/munin-graph.8 0644 root bin f none /opt/csw/share/man/man8/munin-html.8 0644 root bin f none /opt/csw/share/man/man8/munin-limits.8 0644 root bin f none /opt/csw/share/man/man8/munin-update.8 0644 root bin +f none /opt/csw/share/man/man8/munin.8 0644 root bin +d none /opt/csw/share/munin 0755 root bin +d none /opt/csw/share/munin/fonts 0755 root bin +f none /opt/csw/share/munin/fonts/VeraMono.ttf 0644 root bin d none /opt/csw/share/perl 0755 root bin d none /opt/csw/share/perl/site_perl 0755 root bin d none /opt/csw/share/perl/site_perl/Munin 0755 root bin -f none /opt/csw/share/perl/site_perl/Munin.pm 0644 root bin -d none /opt/csw/share/perl/site_perl/Munin/Plugin 0755 root bin -d none /var/opt 0755 root sys -d none /var/opt/csw 0755 root bin -d none /var/opt/csw/munin 0755 root bin +d none /opt/csw/share/perl/site_perl/Munin/Master 0755 root bin +f none /opt/csw/share/perl/site_perl/Munin/Master/Config.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Master/GraphOld.pm 0555 root bin +f none /opt/csw/share/perl/site_perl/Munin/Master/Group.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Master/GroupRepository.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Master/HTMLOld.pm 0555 root bin +f none /opt/csw/share/perl/site_perl/Munin/Master/Host.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Master/LimitsOld.pm 0555 root bin +f none /opt/csw/share/perl/site_perl/Munin/Master/Logger.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Master/Node.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Master/ProcessManager.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Master/Update.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Master/UpdateWorker.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Master/Utils.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Master/Worker.pm 0444 root bin d ugfiles /var/opt/csw/munin/www 0755 munin munin -f ugfiles /var/opt/csw/munin/www/.htaccess 0644 munin munin d ugfiles /var/opt/csw/munin/www/cgi 0755 munin munin f ugfiles /var/opt/csw/munin/www/cgi/munin-cgi-graph 0755 munin munin -f ugfiles /var/opt/csw/munin/www/favicon.ico 0644 munin munin +f ugfiles /var/opt/csw/munin/www/cgi/munin-fastcgi-graph 0755 munin munin +d ugfiles /var/opt/csw/munin 0755 munin munin d ugfiles /var/opt/csw/munin/db 0755 munin munin -d ugfiles /var/opt/csw/munin/db/plugin-state 0755 munin munin d ugfiles /var/opt/csw/munin/log 0755 munin munin d ugfiles /var/opt/csw/munin/run 0755 munin munin -d none /opt/csw/etc/pkg 0755 root bin -d none /opt/csw/etc/pkg/CSWmuninmaster 0755 root bin -f cswusergroup /opt/csw/etc/pkg/CSWmuninmaster/cswusergroup 0644 root bin +d ugfiles /var/opt/csw/munin/www 0755 munin munin +f ugfiles /var/opt/csw/munin/www/.htaccess 0644 munin munin Modified: csw/mgar/pkg/munin/trunk/files/CSWmuninnode.prototype =================================================================== --- csw/mgar/pkg/munin/trunk/files/CSWmuninnode.prototype 2009-11-28 19:54:43 UTC (rev 7500) +++ csw/mgar/pkg/munin/trunk/files/CSWmuninnode.prototype 2009-11-28 20:17:10 UTC (rev 7501) @@ -1,3 +1,5 @@ +d none /etc/opt/csw/init.d 0755 root bin +f cswinitsmf /etc/opt/csw/init.d/cswmuninnode 0755 root bin d none /etc/opt/csw/munin 0755 root bin f cswpreserveconf /etc/opt/csw/munin/munin-node.conf.CSW 0644 root bin d none /etc/opt/csw/munin/plugin-conf.d 0755 root bin @@ -2,3 +4,8 @@ d none /etc/opt/csw/munin/plugins 0755 root bin -f none /opt/csw/bin/munindoc 0755 root bin +f none /opt/csw/bin/munindoc 0555 root bin +d none /opt/csw/etc/pkg 0755 root bin +d none /opt/csw/etc/pkg/CSWmuninnode 0755 root bin +f cswusergroup /opt/csw/etc/pkg/CSWmuninnode/cswusergroup 0644 root bin +d none /opt/csw/libexec 0755 root bin +d none /opt/csw/libexec/munin 0755 root bin d none /opt/csw/libexec/munin/plugins 0755 root bin @@ -10,6 +17,14 @@ f none /opt/csw/libexec/munin/plugins/apache_volume 0755 root bin f none /opt/csw/libexec/munin/plugins/apc_envunit_ 0755 root bin f none /opt/csw/libexec/munin/plugins/apc_nis 0755 root bin +f none /opt/csw/libexec/munin/plugins/asterisk_channels 0755 root bin +f none /opt/csw/libexec/munin/plugins/asterisk_channelstypes 0755 root bin +f none /opt/csw/libexec/munin/plugins/asterisk_codecs 0755 root bin +f none /opt/csw/libexec/munin/plugins/asterisk_meetme 0755 root bin +f none /opt/csw/libexec/munin/plugins/asterisk_meetmeusers 0755 root bin +f none /opt/csw/libexec/munin/plugins/asterisk_sipchannels 0755 root bin +f none /opt/csw/libexec/munin/plugins/asterisk_sippeers 0755 root bin +f none /opt/csw/libexec/munin/plugins/asterisk_voicemail 0755 root bin f none /opt/csw/libexec/munin/plugins/bind9 0755 root bin f none /opt/csw/libexec/munin/plugins/bind9_rndc 0755 root bin f none /opt/csw/libexec/munin/plugins/cmc_tc_sensor_ 0755 root bin @@ -24,37 +39,51 @@ f none /opt/csw/libexec/munin/plugins/df_inode 0755 root bin f none /opt/csw/libexec/munin/plugins/dhcpd3 0755 root bin f none /opt/csw/libexec/munin/plugins/digitemp_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/ejabberd_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/env 0755 root bin f none /opt/csw/libexec/munin/plugins/exim_mailqueue 0755 root bin f none /opt/csw/libexec/munin/plugins/exim_mailqueue_alt 0755 root bin f none /opt/csw/libexec/munin/plugins/exim_mailstats 0755 root bin +f none /opt/csw/libexec/munin/plugins/extinfo_tester 0755 root bin +f none /opt/csw/libexec/munin/plugins/fail2ban 0755 root bin f none /opt/csw/libexec/munin/plugins/foldingathome 0755 root bin f none /opt/csw/libexec/munin/plugins/foldingathome_rank 0755 root bin f none /opt/csw/libexec/munin/plugins/foldingathome_wu 0755 root bin +f none /opt/csw/libexec/munin/plugins/haproxy_ 0755 root bin f none /opt/csw/libexec/munin/plugins/hddtemp 0755 root bin f none /opt/csw/libexec/munin/plugins/hddtemp2 0755 root bin f none /opt/csw/libexec/munin/plugins/hddtemp_smartctl 0755 root bin f none /opt/csw/libexec/munin/plugins/hddtempd 0755 root bin f none /opt/csw/libexec/munin/plugins/http_loadtime 0755 root bin +f none /opt/csw/libexec/munin/plugins/id 0755 root bin f none /opt/csw/libexec/munin/plugins/if_ 0755 root bin -f none /opt/csw/libexec/munin/plugins/if_errcoll_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/if_err_ 0755 root bin f none /opt/csw/libexec/munin/plugins/ifx_concurrent_sessions_ 0755 root bin f none /opt/csw/libexec/munin/plugins/io_busy_ 0755 root bin f none /opt/csw/libexec/munin/plugins/io_bytes_ 0755 root bin f none /opt/csw/libexec/munin/plugins/io_ops_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/iostat 0755 root bin f none /opt/csw/libexec/munin/plugins/ipac-ng 0755 root bin +f none /opt/csw/libexec/munin/plugins/ipmi_sensor_ 0755 root bin f none /opt/csw/libexec/munin/plugins/ircu 0755 root bin +f none /opt/csw/libexec/munin/plugins/jmx_ 0755 root bin f none /opt/csw/libexec/munin/plugins/load 0755 root bin f none /opt/csw/libexec/munin/plugins/loggrep 0755 root bin f none /opt/csw/libexec/munin/plugins/lpstat 0755 root bin f none /opt/csw/libexec/munin/plugins/mailman 0755 root bin f none /opt/csw/libexec/munin/plugins/mailscanner 0755 root bin f none /opt/csw/libexec/munin/plugins/mbmon_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/memcached_ 0755 root bin f none /opt/csw/libexec/munin/plugins/memory 0755 root bin f none /opt/csw/libexec/munin/plugins/mhttping 0755 root bin +f none /opt/csw/libexec/munin/plugins/multigraph_tester 0755 root bin f none /opt/csw/libexec/munin/plugins/multiping 0755 root bin f none /opt/csw/libexec/munin/plugins/multips 0755 root bin f none /opt/csw/libexec/munin/plugins/munin_stats 0755 root bin +f none /opt/csw/libexec/munin/plugins/munin_update 0755 root bin +f none /opt/csw/libexec/munin/plugins/mysql_ 0755 root bin f none /opt/csw/libexec/munin/plugins/mysql_bytes 0755 root bin +f none /opt/csw/libexec/munin/plugins/mysql_innodb 0755 root bin f none /opt/csw/libexec/munin/plugins/mysql_isam_space_ 0755 root bin f none /opt/csw/libexec/munin/plugins/mysql_queries 0755 root bin f none /opt/csw/libexec/munin/plugins/mysql_slowqueries 0755 root bin @@ -62,6 +91,9 @@ f none /opt/csw/libexec/munin/plugins/named 0755 root bin f none /opt/csw/libexec/munin/plugins/netopia 0755 root bin f none /opt/csw/libexec/munin/plugins/netstat 0755 root bin +f none /opt/csw/libexec/munin/plugins/nginx_request 0755 root bin +f none /opt/csw/libexec/munin/plugins/nginx_status 0755 root bin +f none /opt/csw/libexec/munin/plugins/nomadix_users_ 0755 root bin f none /opt/csw/libexec/munin/plugins/ntp_ 0755 root bin f none /opt/csw/libexec/munin/plugins/ntp_kernel_err 0755 root bin f none /opt/csw/libexec/munin/plugins/ntp_kernel_pll_freq 0755 root bin @@ -72,6 +104,7 @@ f none /opt/csw/libexec/munin/plugins/nut_volts 0755 root bin f none /opt/csw/libexec/munin/plugins/nutups_ 0755 root bin f none /opt/csw/libexec/munin/plugins/nvidia_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/openvpn 0755 root bin f none /opt/csw/libexec/munin/plugins/paging_in 0755 root bin f none /opt/csw/libexec/munin/plugins/paging_out 0755 root bin f none /opt/csw/libexec/munin/plugins/perdition 0755 root bin @@ -83,23 +116,32 @@ f none /opt/csw/libexec/munin/plugins/postfix_mailqueue 0755 root bin f none /opt/csw/libexec/munin/plugins/postfix_mailstats 0755 root bin f none /opt/csw/libexec/munin/plugins/postfix_mailvolume 0755 root bin -f none /opt/csw/libexec/munin/plugins/postgres_block_read_ 0755 root bin -f none /opt/csw/libexec/munin/plugins/postgres_commits 0755 root bin -f none /opt/csw/libexec/munin/plugins/postgres_commits_ 0755 root bin -f none /opt/csw/libexec/munin/plugins/postgres_connections 0755 root bin -f none /opt/csw/libexec/munin/plugins/postgres_locks 0755 root bin -f none /opt/csw/libexec/munin/plugins/postgres_queries 0755 root bin -f none /opt/csw/libexec/munin/plugins/postgres_queries_ 0755 root bin -f none /opt/csw/libexec/munin/plugins/postgres_space_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/postgres_bgwriter 0755 root bin +f none /opt/csw/libexec/munin/plugins/postgres_cache_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/postgres_checkpoints 0755 root bin +f none /opt/csw/libexec/munin/plugins/postgres_connections_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/postgres_connections_db 0755 root bin +f none /opt/csw/libexec/munin/plugins/postgres_locks_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/postgres_querylength_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/postgres_scans_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/postgres_size_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/postgres_transactions_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/postgres_tuples_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/postgres_users 0755 root bin +f none /opt/csw/libexec/munin/plugins/postgres_xlog 0755 root bin f none /opt/csw/libexec/munin/plugins/processes 0755 root bin f none /opt/csw/libexec/munin/plugins/ps_ 0755 root bin f none /opt/csw/libexec/munin/plugins/psu_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/qmailqstat 0755 root bin f none /opt/csw/libexec/munin/plugins/qmailscan 0755 root bin f none /opt/csw/libexec/munin/plugins/qmailscan-simple 0755 root bin f none /opt/csw/libexec/munin/plugins/samba 0755 root bin f none /opt/csw/libexec/munin/plugins/sendmail_mailqueue 0755 root bin f none /opt/csw/libexec/munin/plugins/sendmail_mailstats 0755 root bin f none /opt/csw/libexec/munin/plugins/sendmail_mailtraffic 0755 root bin +f none /opt/csw/libexec/munin/plugins/slapd_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/slapd_bdb_cache_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/slony_lag_ 0755 root bin f none /opt/csw/libexec/munin/plugins/smart_ 0755 root bin f none /opt/csw/libexec/munin/plugins/snmp__cpuload 0755 root bin f none /opt/csw/libexec/munin/plugins/snmp__df 0755 root bin @@ -107,9 +149,14 @@ f none /opt/csw/libexec/munin/plugins/snmp__fc_if_err_ 0755 root bin f none /opt/csw/libexec/munin/plugins/snmp__if_ 0755 root bin f none /opt/csw/libexec/munin/plugins/snmp__if_err_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/snmp__if_multi 0755 root bin f none /opt/csw/libexec/munin/plugins/snmp__load 0755 root bin f none /opt/csw/libexec/munin/plugins/snmp__memory 0755 root bin +f none /opt/csw/libexec/munin/plugins/snmp__netapp_diskusage_ 0755 root bin +f none /opt/csw/libexec/munin/plugins/snmp__netapp_inodeusage_ 0755 root bin f none /opt/csw/libexec/munin/plugins/snmp__netstat 0755 root bin +f none /opt/csw/libexec/munin/plugins/snmp__print_pages 0755 root bin +f none /opt/csw/libexec/munin/plugins/snmp__print_supplies 0755 root bin f none /opt/csw/libexec/munin/plugins/snmp__processes 0755 root bin f none /opt/csw/libexec/munin/plugins/snmp__rdp_users 0755 root bin f none /opt/csw/libexec/munin/plugins/snmp__sensors_fsc_bx_fan 0755 root bin @@ -124,7 +171,14 @@ f none /opt/csw/libexec/munin/plugins/snmp__users 0755 root bin f none /opt/csw/libexec/munin/plugins/snmp__winload 0755 root bin f none /opt/csw/libexec/munin/plugins/snmp__winmem 0755 root bin +f none /opt/csw/libexec/munin/plugins/snort_alerts 0755 root bin +f none /opt/csw/libexec/munin/plugins/snort_bytes_pkt 0755 root bin +f none /opt/csw/libexec/munin/plugins/snort_drop_rate 0755 root bin +f none /opt/csw/libexec/munin/plugins/snort_pattern_match 0755 root bin +f none /opt/csw/libexec/munin/plugins/snort_pkts 0755 root bin +f none /opt/csw/libexec/munin/plugins/snort_traffic 0755 root bin f none /opt/csw/libexec/munin/plugins/spamstats 0755 root bin +f none /opt/csw/libexec/munin/plugins/squeezebox_ 0755 root bin f none /opt/csw/libexec/munin/plugins/squid_cache 0755 root bin f none /opt/csw/libexec/munin/plugins/squid_icp 0755 root bin f none /opt/csw/libexec/munin/plugins/squid_objectsize 0755 root bin @@ -133,43 +187,76 @@ f none /opt/csw/libexec/munin/plugins/surfboard 0755 root bin f none /opt/csw/libexec/munin/plugins/sybase_space 0755 root bin f none /opt/csw/libexec/munin/plugins/temperature 0755 root bin +f none /opt/csw/libexec/munin/plugins/tomcat_ 0755 root bin f none /opt/csw/libexec/munin/plugins/tomcat_access 0755 root bin f none /opt/csw/libexec/munin/plugins/tomcat_jvm 0755 root bin f none /opt/csw/libexec/munin/plugins/tomcat_threads 0755 root bin f none /opt/csw/libexec/munin/plugins/tomcat_volume 0755 root bin f none /opt/csw/libexec/munin/plugins/uptime 0755 root bin f none /opt/csw/libexec/munin/plugins/users 0755 root bin +f none /opt/csw/libexec/munin/plugins/varnish_ 0755 root bin f none /opt/csw/libexec/munin/plugins/vmstat 0755 root bin -f none /opt/csw/sbin/munin-node 0755 root bin -f none /opt/csw/sbin/munin-node-configure 0755 root bin -f none /opt/csw/sbin/munin-node-configure-snmp 0755 root bin -f none /opt/csw/sbin/munin-run 0755 root bin +f none /opt/csw/libexec/munin/plugins/warning_tester 0755 root bin +f none /opt/csw/libexec/munin/plugins/zimbra_ 0755 root bin +f none /opt/csw/sbin/munin-node 0555 root bin +f none /opt/csw/sbin/munin-node-configure 0555 root bin +f none /opt/csw/sbin/munin-run 0555 root bin d none /opt/csw/share/doc/munin_node 0755 root bin f none /opt/csw/share/doc/munin_node/license 0644 root bin d none /opt/csw/share/man/man1 0755 root bin +f none /opt/csw/share/man/man1/munin-node-configure.1 0444 root bin +f none /opt/csw/share/man/man1/munin-node.1 0444 root bin +f none /opt/csw/share/man/man1/munin-run.1 0444 root bin +f none /opt/csw/share/man/man1/munindoc.1 0444 root bin +d none /opt/csw/share/man/man3 0755 root bin +f none /opt/csw/share/man/man3/Munin::Node::Config.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Node::Configure::Debug.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Node::Configure::History.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Node::Configure::HostEnumeration.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Node::Configure::Plugin.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Node::Configure::PluginList.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Node::Logger.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Node::OS.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Node::SNMPConfig.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Node::Server.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Node::Service.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Node::Session.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Node::Utils.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Plugin.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Plugin::Pgsql.3perl 0444 root bin +f none /opt/csw/share/man/man3/Munin::Plugin::SNMP.3perl 0444 root bin d none /opt/csw/share/man/man5 0755 root bin f none /opt/csw/share/man/man5/munin-node.conf.5 0644 root bin d none /opt/csw/share/man/man8 0755 root bin -f none /opt/csw/share/man/man8/munin-node-configure-snmp.8 0644 root bin -f none /opt/csw/share/man/man8/munin-node-configure.8 0644 root bin -f none /opt/csw/share/man/man8/munin-node.8 0644 root bin -f none /opt/csw/share/man/man8/munin-run.8 0644 root bin +f none /opt/csw/share/man/man8/munin.8 0644 root bin +d none /opt/csw/share/munin 0755 root bin d none /opt/csw/share/perl 0755 root bin d none /opt/csw/share/perl/site_perl 0755 root bin d none /opt/csw/share/perl/site_perl/Munin 0755 root bin +d none /opt/csw/share/perl/site_perl/Munin/Node 0755 root bin +f none /opt/csw/share/perl/site_perl/Munin/Node/Config.pm 0444 root bin +d none /opt/csw/share/perl/site_perl/Munin/Node/Configure 0755 root bin +f none /opt/csw/share/perl/site_perl/Munin/Node/Configure/Debug.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Node/Configure/History.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Node/Configure/HostEnumeration.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Node/Configure/Plugin.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Node/Configure/PluginList.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Node/Logger.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Node/OS.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Node/SNMPConfig.pm 0555 root bin +f none /opt/csw/share/perl/site_perl/Munin/Node/Server.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Node/Service.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Node/Session.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Node/Utils.pm 0444 root bin d none /opt/csw/share/perl/site_perl/Munin/Plugin 0755 root bin -f none /opt/csw/share/perl/site_perl/Munin/Plugin.pm 0644 root bin -d none /var/opt/csw/munin 0755 root bin +f none /opt/csw/share/perl/site_perl/Munin/Plugin.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Plugin/Pgsql.pm 0444 root bin +f none /opt/csw/share/perl/site_perl/Munin/Plugin/SNMP.pm 0444 root bin +d ugfiles /var/opt/csw/munin 0755 munin munin +d ugfiles /var/opt/csw/munin/db 0755 munin munin +d ugfiles /var/opt/csw/munin/log 0755 munin munin +d ugfiles /var/opt/csw/munin/run 0755 munin munin s none /etc/opt/csw/munin/plugins/load=/opt/csw/libexec/munin/plugins/load s none /etc/opt/csw/munin/plugins/uptime=/opt/csw/libexec/munin/plugins/uptime s none /etc/opt/csw/munin/plugins/cpu=/opt/csw/libexec/munin/plugins/cpu s none /etc/opt/csw/munin/plugins/df=/opt/csw/libexec/munin/plugins/df -d ugfiles /var/opt/csw/munin/log 0755 munin munin -d ugfiles /var/opt/csw/munin/run 0755 munin munin -d ugfiles /var/opt/csw/munin/db 0755 munin munin -d ugfiles /var/opt/csw/munin/db/plugin-state 0755 munin munin -d none /opt/csw/etc/pkg 0755 root bin -d none /opt/csw/etc/pkg/CSWmuninnode 0755 root bin -d none /etc/opt/csw/init.d 0755 root bin -f cswinitsmf /etc/opt/csw/init.d/cswmuninnode 0755 root bin -f cswusergroup /opt/csw/etc/pkg/CSWmuninnode/cswusergroup 0644 root bin Modified: csw/mgar/pkg/munin/trunk/files/makefile.config.diff =================================================================== --- csw/mgar/pkg/munin/trunk/files/makefile.config.diff 2009-11-28 19:54:43 UTC (rev 7500) +++ csw/mgar/pkg/munin/trunk/files/makefile.config.diff 2009-11-28 20:17:10 UTC (rev 7501) @@ -1,9 +1,9 @@ -diff --speed-large-files --minimal -Nru munin-1.3.4.orig/Makefile.config munin-1.3.4/Makefile.config ---- munin-1.3.4.orig/Makefile.config 2008-03-08 07:35:13.000000000 +0100 -+++ munin-1.3.4/Makefile.config 2009-07-05 11:01:24.956040045 +0200 -@@ -6,13 +6,15 @@ - # DESTDIR is empty during building, and optionally set to point to - # a shadow tree during make install. +diff --speed-large-files --minimal -Nru munin-1.4.0.orig/Makefile.config munin-1.4.0/Makefile.config +--- munin-1.4.0.orig/Makefile.config 2009-11-27 12:17:18.000000000 +0100 ++++ munin-1.4.0/Makefile.config 2009-11-28 16:51:45.380818848 +0100 +@@ -14,13 +14,15 @@ + # and LOGDIR as subdirectories. Today, DBDIR contains configured + # domains, as well as PLUGSTATE, and we risk collisions. +DESTDIR=$(DESTDIR) + @@ -19,7 +19,7 @@ # Server only - where to put munin-cron BINDIR = $(PREFIX)/bin -@@ -21,37 +23,37 @@ +@@ -29,17 +31,17 @@ SBINDIR = $(PREFIX)/sbin # Where to put text and html documentation @@ -35,10 +35,16 @@ +LIBDIR = $(PREFIX)/libexec/munin # Server only - Output directory --HTMLDIR = $(PREFIX)/var/www +-HTMLDIR = $(PREFIX)/www/docs +-CGIDIR = $(PREFIX)/www/cgi +HTMLDIR = /var/opt/csw/munin/www - CGIDIR = $(HTMLDIR)/cgi ++CGIDIR = /var/opt/csw/munin/www/cgi + # Server only - spool directory for data gathered from nodes by + # munin-gather - experimental. Place on ramdisk to make munin +@@ -52,24 +54,24 @@ + # SSPOOLDIR := /tmp/muninspool + # Client only - Where to put RRD files and other intenal data -DBDIR = $(DESTDIR)/var/opt/munin +DBDIR = /var/opt/csw/munin/db @@ -48,7 +54,7 @@ PLUGSTATE = $(DBDIR)/plugin-state # Where Munin should place its logs. --LOGDIR = $(DESTDIR)/var/log/munin +-LOGDIR = $(PREFIX)/log/munin +LOGDIR = /var/opt/csw/munin/log # Location of PID files and other statefiles. On the server, must be @@ -57,54 +63,54 @@ +STATEDIR = /var/opt/csw/munin/run # The perl interpreter to use --PERL = $(shell which perl) -+PERL = /opt/csw/bin/perl +-PERL := $(shell which perl) ++PERL := /opt/csw/bin/perl # The python interpreter to use (used by some plugins) --PYTHON = /usr/bin/env python -+PYTHON = /opt/csw/bin/python +-PYTHON := /usr/bin/env python ++PYTHON := /opt/csw/bin/python - # A modern (posix) shell. We're not looking for arrays, but $() and - # other modern stuff is expected. On a posix-system the expression -@@ -64,10 +66,10 @@ - GOODSH = $(shell PATH=`getconf PATH` sh -c 'type sh | sed "s/.* //"') + # The ruby interpreter to use (used by some plugins) + RUBY := /usr/bin/env ruby +@@ -95,11 +97,11 @@ + GOODSH := $(shell PATH=`getconf PATH` sh -c 'type sh | sed "s/.* //"') # Path of bash for bash specific plugins --BASH = /bin/bash -+BASH = /usr/bin/bash +-BASH := /bin/bash ++BASH := /usr/bin/bash # Server only - Where to install the perl libraries --PERLLIB = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d"'" -f2) + PERLSITELIB := $(shell $(PERL) -V:sitelib | cut -d"'" -f2) +-PERLLIB = $(DESTDIR)$(PERLSITELIB) +PERLLIB = $(shell $(PERL) -V:sitelib | cut -d"'" -f2) # Client only - Install plugins for this architecture - OSTYPE = $(shell uname | tr '[A-Z]' '[a-z]') -@@ -79,7 +81,7 @@ + OSTYPE := $(shell uname | tr '[A-Z]' '[a-z]') +@@ -111,7 +113,7 @@ # What is the safest way to create a tempfile. # Default is to figure it out by testing various methods. # Replace this with a known platform-specific method --MKTEMP = $(shell ./test-mktemp) -+MKTEMP = $(shell mktemp) +-MKTEMP := $(shell ./test-mktemp) ++MKTEMP := $(shell mktemp) # Munin version number. - VERSION = $(shell cat RELEASE) -@@ -94,9 +96,9 @@ + VERSION := $(shell ./getversion) +@@ -126,9 +128,9 @@ # Which command to use to check if the USER and GROUP to run Munin as, exists. # These will work on most modern OSes: # --GETENT = $(shell which getent || which true 2>/dev/null) --CHECKUSER = $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2")) --CHECKGROUP = $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2")) -+#GETENT = $(shell which getent || which true 2>/dev/null) -+#CHECKUSER = $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2")) -+#CHECKGROUP = $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2")) +-GETENT := $(shell which getent || which true 2>/dev/null) +-CHECKUSER := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) +-CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) ++#GETENT := $(shell which getent || which true 2>/dev/null) ++#CHECKUSER := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) ++#CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) # For OSX, comment out the previous two lines and comment in these # -@@ -117,5 +119,5 @@ - CHGRP = chgrp +@@ -159,4 +161,4 @@ + JCVALID := $(shell $(JC) -version >/dev/null 2>/dev/null && echo "yes") # Check whether setruid functionality can be used --HASSETR = $(shell perl -e 'use Config; my @vars=("d_setruid", "d_setreuid", "d_setresuid"); foreach my $$var (@vars) { if ($$Config{$$var} eq "define") { print "1\n"; exit 0; } } print "0\n"; exit 0;' ) -+HASSETR = $(shell /opt/csw/bin/perl -e 'use Config; my @vars=("d_setruid", "d_setreuid", "d_setresuid"); foreach my $$var (@vars) { if ($$Config{$$var} eq "define") { print "1\n"; exit 0; } } print "0\n"; exit 0;' ) - +-HASSETR := $(shell perl -e 'use Config; my @vars=("d_setruid", "d_setreuid", "d_setresuid"); foreach my $$var (@vars) { if ($$Config{$$var} eq "define") { print "1\n"; exit 0; } } print "0\n"; exit 0;' ) ++HASSETR := $(shell /opt/csw/bin/perl -e 'use Config; my @vars=("d_setruid", "d_setreuid", "d_setresuid"); foreach my $$var (@vars) { if ($$Config{$$var} eq "define") { print "1\n"; exit 0; } } print "0\n"; exit 0;' ) Modified: csw/mgar/pkg/munin/trunk/files/makefile.diff =================================================================== --- csw/mgar/pkg/munin/trunk/files/makefile.diff 2009-11-28 19:54:43 UTC (rev 7500) +++ csw/mgar/pkg/munin/trunk/files/makefile.diff 2009-11-28 20:17:10 UTC (rev 7501) @@ -1,293 +1,167 @@ -diff --speed-large-files --minimal -Nru munin-1.3.4.orig/Makefile munin-1.3.4/Makefile ---- munin-1.3.4.orig/Makefile 2008-03-08 07:50:16.000000000 +0100 -+++ munin-1.3.4/Makefile 2009-07-01 23:52:36.445587463 +0200 -@@ -28,74 +28,71 @@ +diff --speed-large-files --minimal -Nru munin-1.4.0.orig/Makefile munin-1.4.0/Makefile +--- munin-1.4.0.orig/Makefile 2009-11-27 12:17:18.000000000 +0100 ++++ munin-1.4.0/Makefile 2009-11-28 18:13:47.250778081 +0100 +@@ -49,8 +49,8 @@ # This removes the installed config so that the next install-pass installs - # a new config. Target suitable for maintainers + # a new config. Target _only_ suitable for maintainers. unconfig: - rm -f $(HTMLDIR)/.htaccess - rm -f $(CONFDIR)/munin.conf + rm -f $(DESTDIR)$(HTMLDIR)/.htaccess + rm -f $(DESTDIR)$(CONFDIR)/munin.conf - install-main: build -- $(CHECKUSER) + tags: + -rm -f TAGS +@@ -66,50 +66,47 @@ + + install-pre: Makefile Makefile.config + @$(CHECKUSER) +- mkdir -p $(LOGDIR) +- mkdir -p $(STATEDIR) +- mkdir -p $(CONFDIR) +- $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) ++ mkdir -p $(DESTDIR)$(LOGDIR) ++ mkdir -p $(DESTDIR)$(STATEDIR) ++ mkdir -p $(DESTDIR)$(CONFDIR) + + install-master-prime: $(INFILES_MASTER) install-pre install-master - mkdir -p $(CONFDIR)/templates +- mkdir -p $(CONFDIR)/templates/partial +- mkdir -p $(CONFDIR)/munin-conf.d - mkdir -p $(LIBDIR) - mkdir -p $(BINDIR) - mkdir -p $(PERLLIB) -- -- mkdir -p $(LOGDIR) -- mkdir -p $(STATEDIR) +- mkdir -p $(PERLLIB)/Munin/Master - mkdir -p $(HTMLDIR) - mkdir -p $(DBDIR) - mkdir -p $(CGIDIR) +- +- $(CHOWN) $(USER) $(HTMLDIR) $(DBDIR) + mkdir -p $(DESTDIR)$(CONFDIR)/templates ++ mkdir -p $(DESTDIR)$(CONFDIR)/templates/partial ++ mkdir -p $(DESTDIR)$(CONFDIR)/munin-conf.d + mkdir -p $(DESTDIR)$(LIBDIR) + mkdir -p $(DESTDIR)$(BINDIR) + mkdir -p $(DESTDIR)$(PERLLIB) - -- $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(RUNDIR) $(HTMLDIR) $(DBDIR) -+ mkdir -p $(DESTDIR)$(LOGDIR) -+ mkdir -p $(DESTDIR)$(STATEDIR) ++ mkdir -p $(DESTDIR)$(PERLLIB)/Munin/Master + mkdir -p $(DESTDIR)$(HTMLDIR) + mkdir -p $(DESTDIR)$(DBDIR) + mkdir -p $(DESTDIR)$(CGIDIR) - for p in build/server/*.tmpl; do \ + for p in master/www/*.tmpl master/www/*.png master/www/*.css resources/favicon.ico; do \ - $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \ + $(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/ ; \ done -- $(INSTALL) -m 0644 server/logo.png $(CONFDIR)/templates/ -- $(INSTALL) -m 0644 server/style.css $(CONFDIR)/templates/ -- $(INSTALL) -m 0644 server/definitions.html $(CONFDIR)/templates/ -- $(INSTALL) -m 0755 server/VeraMono.ttf $(LIBDIR)/ -- $(INSTALL) -m 0644 resources/favicon.ico $(HTMLDIR)/ -- test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/server/munin-htaccess $(HTMLDIR)/.htaccess -- test -f "$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/server/munin.conf $(CONFDIR)/ -- $(INSTALL) -m 0755 build/server/munin-cron $(BINDIR)/ -- $(INSTALL) -m 0755 build/server/munin-check $(BINDIR)/ -- $(INSTALL) -m 0755 build/server/munin-update $(LIBDIR)/ -- $(INSTALL) -m 0755 build/server/munin-graph $(LIBDIR)/ -- $(INSTALL) -m 0755 build/server/munin-html $(LIBDIR)/ -- $(INSTALL) -m 0755 build/server/munin-limits $(LIBDIR)/ -- $(INSTALL) -m 0755 build/server/munin-cgi-graph $(CGIDIR)/ -- $(INSTALL) -m 0644 build/server/Munin.pm $(PERLLIB)/ -+ $(INSTALL) -m 0644 server/logo.png $(DESTDIR)$(CONFDIR)/templates/ -+ $(INSTALL) -m 0644 server/style.css $(DESTDIR)$(CONFDIR)/templates/ -+ $(INSTALL) -m 0644 server/definitions.html $(DESTDIR)$(CONFDIR)/templates/ -+ $(INSTALL) -m 0755 server/VeraMono.ttf $(DESTDIR)$(LIBDIR)/ -+ $(INSTALL) -m 0644 resources/favicon.ico $(DESTDIR)$(HTMLDIR)/ -+ test -f $(DESTDIR)$(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/server/munin-htaccess $(DESTDIR)$(HTMLDIR)/.htaccess -+ test -f "$(DESTDIR)$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/server/munin.conf $(DESTDIR)$(CONFDIR)/ -+ $(INSTALL) -m 0755 build/server/munin-cron $(DESTDIR)$(BINDIR)/ -+ $(INSTALL) -m 0755 build/server/munin-check $(DESTDIR)$(BINDIR)/ -+ $(INSTALL) -m 0755 build/server/munin-update $(DESTDIR)$(LIBDIR)/ -+ $(INSTALL) -m 0755 build/server/munin-graph $(DESTDIR)$(LIBDIR)/ -+ $(INSTALL) -m 0755 build/server/munin-html $(DESTDIR)$(LIBDIR)/ -+ $(INSTALL) -m 0755 build/server/munin-limits $(DESTDIR)$(LIBDIR)/ -+ $(INSTALL) -m 0755 build/server/munin-cgi-graph $(DESTDIR)$(CGIDIR)/ -+ $(INSTALL) -m 0644 build/server/Munin.pm $(DESTDIR)$(PERLLIB)/ - uninstall-main: build - for p in build/server/*.tmpl; do \ -- rm -f $(CONFDIR)/templates/"$$p" ; \ -+ rm -f $(DESTDIR)$(CONFDIR)/templates/"$$p" ; \ + for p in master/www/partial/*.tmpl; do \ +- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/partial/ ; \ ++ $(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/partial/ ; \ done -- rm -f $(CONFDIR)/templates/logo.png -- rm -f $(CONFDIR)/templates/style.css -- rm -f $(CONFDIR)/templates/definitions.html -- rm -f $(HTMLDIR)/.htaccess -+ rm -f $(DESTDIR)$(CONFDIR)/templates/logo.png -+ rm -f $(DESTDIR)$(CONFDIR)/templates/style.css -+ rm -f $(DESTDIR)$(CONFDIR)/templates/definitions.html -+ rm -f $(DESTDIR)$(HTMLDIR)/.htaccess -- rm -f $(CONFDIR)/munin.conf -+ rm -f $(DESTDIR)$(CONFDIR)/munin.conf +- $(INSTALL) -m 0644 master/www/definitions.html $(CONFDIR)/templates/ +- $(INSTALL) -m 0755 master/VeraMono.ttf $(LIBDIR)/ ++ $(INSTALL) -m 0644 master/www/definitions.html $(DESTDIR)$(CONFDIR)/templates/ ++ $(INSTALL) -m 0755 master/VeraMono.ttf $(DESTDIR)$(LIBDIR)/ -- rm -f $(BINDIR)/munin-cron -- rm -f $(BINDIR)/munin-check -+ rm -f $(DESTDIR)$(BINDIR)/munin-cron -+ rm -f $(DESTDIR)$(BINDIR)/munin-check +- test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess +- test -f "$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/master/munin.conf $(CONFDIR)/ ++ test -f $(DESTDIR)$(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(DESTDIR)$(HTMLDIR)/.htaccess ++ test -f "$(DESTDIR)$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/master/munin.conf $(DESTDIR)$(CONFDIR)/ -- rm -f $(LIBDIR)/munin-update -- rm -f $(LIBDIR)/munin-graph -- rm -f $(LIBDIR)/munin-html -- rm -f $(LIBDIR)/munin-limits -+ rm -f $(DESTDIR)$(LIBDIR)/munin-update -+ rm -f $(DESTDIR)$(LIBDIR)/munin-graph -+ rm -f $(DESTDIR)$(LIBDIR)/munin-html -+ rm -f $(DESTDIR)$(LIBDIR)/munin-limits - rm -f $(CGIDIR)/munin-cgi-graph +- $(INSTALL) -m 0755 build/master/_bin/munin-cron $(BINDIR)/ +- $(INSTALL) -m 0755 build/master/_bin/munin-check $(BINDIR)/ +- $(INSTALL) -m 0755 build/master/_bin/munin-update $(LIBDIR)/ +- $(INSTALL) -m 0755 build/master/_bin/munin-graph $(LIBDIR)/ +- $(INSTALL) -m 0755 build/master/_bin/munin-html $(LIBDIR)/ +- $(INSTALL) -m 0755 build/master/_bin/munin-limits $(LIBDIR)/ +- $(INSTALL) -m 0755 build/master/_bin/munin-cgi-graph $(CGIDIR)/ +- $(INSTALL) -m 0755 build/master/_bin/munin-fastcgi-graph $(CGIDIR)/ ++ $(INSTALL) -m 0755 build/master/_bin/munin-cron $(DESTDIR)$(BINDIR)/ ++ $(INSTALL) -m 0755 build/master/_bin/munin-check $(DESTDIR)$(BINDIR)/ ++ $(INSTALL) -m 0755 build/master/_bin/munin-update $(DESTDIR)$(LIBDIR)/ ++ $(INSTALL) -m 0755 build/master/_bin/munin-graph $(DESTDIR)$(LIBDIR)/ ++ $(INSTALL) -m 0755 build/master/_bin/munin-html $(DESTDIR)$(LIBDIR)/ ++ $(INSTALL) -m 0755 build/master/_bin/munin-limits $(DESTDIR)$(LIBDIR)/ ++ $(INSTALL) -m 0755 build/master/_bin/munin-cgi-graph $(DESTDIR)$(CGIDIR)/ ++ $(INSTALL) -m 0755 build/master/_bin/munin-fastcgi-graph $(DESTDIR)$(CGIDIR)/ -- rm -f $(PERLLIB)/Munin.pm -- -rmdir $(CONFDIR)/templates -- -rmdir $(CONFDIR) -- -rmdir $(LIBDIR) -- -rmdir $(BINDIR) -+ rm -f $(DESTDIR)$(PERLLIB)/Munin.pm -+ -rmdir $(DESTDIR)$(CONFDIR)/templates -+ -rmdir $(DESTDIR)$(CONFDIR) -+ -rmdir $(DESTDIR)$(LIBDIR) -+ -rmdir $(DESTDIR)$(BINDIR) + # Not ready to be installed yet +-# $(INSTALL) -m 0755 build/master/_bin/munin-gather $(LIBDIR)/ ++# $(INSTALL) -m 0755 build/master/_bin/munin-gather $(DESTDIR)$(LIBDIR)/ -- -rmdir $(LOGDIR) -- -rmdir $(STATEDIR) -- -rmdir $(HTMLDIR) -- -rmdir $(DBDIR) -- -rmdir $(CGIDIR) -+ -rmdir $(DESTDIR)$(LOGDIR) -+ -rmdir $(DESTDIR)$(STATEDIR) -+ -rmdir $(DESTDIR)$(HTMLDIR) -+ -rmdir $(DESTDIR)$(DBDIR) -+ -rmdir $(DESTDIR)$(CGIDIR) + # ALWAYS DO THE OS SPECIFIC PLUGINS LAST! THAT WAY THEY OVERWRITE THE + # GENERIC ONES +@@ -120,28 +117,24 @@ + install-plugins-prime: install-plugins build $(PLUGINS) Makefile Makefile.config + @$(CHECKGROUP) - install-node: build install-node-non-snmp install-node-snmp install-munindoc - echo Done. -@@ -104,44 +101,43 @@ - echo Undone. - - install-node-snmp: build -- $(INSTALL) -m 0755 build/node/munin-node-configure-snmp $(SBINDIR)/ -+ $(INSTALL) -m 0755 build/node/munin-node-configure-snmp $(DESTDIR)$(SBINDIR)/ - - install-munindoc: build -- $(INSTALL) -m 0755 build/node/munindoc $(BINDIR)/ -+ $(INSTALL) -m 0755 build/node/munindoc $(DESTDIR)$(BINDIR)/ - - uninstall-node-snmp: build -- rm -f $(SBINDIR)/munin-node-configure-snmp -- -rmdir $(SBINDIR) -+ rm -f $(DESTDIR)$(SBINDIR)/munin-node-configure-snmp -+ -rmdir $(DESTDIR)$(SBINDIR) - - install-node-non-snmp: build - $(CHECKGROUP) - mkdir -p $(CONFDIR)/plugins - mkdir -p $(CONFDIR)/plugin-conf.d - mkdir -p $(LIBDIR)/plugins -- mkdir -p $(SBINDIR) -- mkdir -p $(PERLLIB)/Munin/Plugin + mkdir -p $(DESTDIR)$(CONFDIR)/plugins + mkdir -p $(DESTDIR)$(CONFDIR)/plugin-conf.d + mkdir -p $(DESTDIR)$(LIBDIR)/plugins -+ mkdir -p $(DESTDIR)$(SBINDIR) -+ mkdir -p $(DESTDIR)$(PERLLIB)/Munin/Plugin + mkdir -p $(PLUGSTATE) -- mkdir -p $(LOGDIR) -- mkdir -p $(STATEDIR) -- mkdir -p $(PLUGSTATE) -+ mkdir -p $(DESTDIR)$(LOGDIR) -+ mkdir -p $(DESTDIR)$(STATEDIR) -+ mkdir -p $(DESTDIR)$(PLUGSTATE) - - $(CHOWN) $(PLUGINUSER):$(GROUP) $(PLUGSTATE) - $(CHMOD) 0775 $(PLUGSTATE) - $(CHMOD) 0755 $(CONFDIR)/plugin-conf.d -+ $(CHMOD) 0775 $(DESTDIR)$(PLUGSTATE) -+ $(CHMOD) 0755 $(DESTDIR)$(CONFDIR)/plugin-conf.d - -- $(INSTALL) -m 0755 build/node/munin-node $(SBINDIR)/ -- $(INSTALL) -m 0755 build/node/munin-node-configure $(SBINDIR)/ -- test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/ -- $(INSTALL) -m 0755 build/node/munin-run $(SBINDIR)/ -+ $(INSTALL) -m 0755 build/node/munin-node $(DESTDIR)$(SBINDIR)/ -+ $(INSTALL) -m 0755 build/node/munin-node-configure $(DESTDIR)$(SBINDIR)/ -+ test -f "$(DESTDIR)$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(DESTDIR)$(CONFDIR)/ -+ $(INSTALL) -m 0755 build/node/munin-run $(DESTDIR)$(SBINDIR)/ - - uninstall-node-non-snmp: build -- rm -f $(SBINDIR)/munin-node -- rm -f $(SBINDIR)/munin-node-configure -- rm -f $(CONFDIR)/munin-node.conf -- rm -f $(SBINDIR)/munin-run -- -rmdir $(CONFDIR)/plugin-conf.d -- -rmdir $(CONFDIR) -- -rmdir $(SBINDIR) -+ rm -f $(DESTDIR)$(SBINDIR)/munin-node -+ rm -f $(DESTDIR)$(SBINDIR)/munin-node-configure -+ rm -f $(DESTDIR)$(CONFDIR)/munin-node.conf -+ rm -f $(DESTDIR)$(SBINDIR)/munin-run -+ -rmdir $(DESTDIR)$(CONFDIR)/plugin-conf.d -+ -rmdir $(DESTDIR)$(CONFDIR) -+ -rmdir $(DESTDIR)$(SBINDIR) - - - # ALWAYS DO THE OS SPECIFIC PLUGINS LAST! THAT WAY THEY OVERWRITE THE -@@ -156,67 +152,67 @@ - if echo $(INSTALL_PLUGINS) | \ - grep $$family >/dev/null; then \ - echo Installing $$p; \ -- $(INSTALL) -m 0755 $$p $(LIBDIR)/plugins/; \ -+ $(INSTALL) -m 0755 $$p $(DESTDIR)$(LIBDIR)/plugins/; \ - fi; \ - fi \ +- + for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \ + if test -f "$$p" ; then \ + echo Installing $$p; \ +- $(INSTALL) -m 0755 $$p $(LIBDIR)/plugins/; \ ++ $(INSTALL) -m 0755 $$p $(DESTDIR)$(LIBDIR)/plugins/; \ + fi \ done - -mv $(LIBDIR)/plugins/*.adv $(LIBDIR) -- -mkdir -p $(PLUGSTATE) -- $(CHOWN) $(PLUGINUSER):$(GROUP) $(PLUGSTATE) -- $(CHMOD) 0775 $(PLUGSTATE) -- $(INSTALL) -m 0644 build/node/plugins.history $(LIBDIR)/plugins/ -- $(INSTALL) -m 0644 build/node/plugin.sh $(LIBDIR)/plugins/ -- mkdir -p $(PERLLIB)/Munin -- $(INSTALL) -m 0644 build/node/Plugin.pm $(PERLLIB)/Munin/ -+ #-mv $(DESTDIR)$(LIBDIR)/plugins/*.adv $(LIBDIR) -+ -mkdir -p $(DESTDIR)$(PLUGSTATE) -+ #$(CHOWN) $(PLUGINUSER):$(GROUP) $(DESTDIR)$(PLUGSTATE) -+ $(CHMOD) 0775 $(DESTDIR)$(PLUGSTATE) -+ $(INSTALL) -m 0644 build/node/plugins.history $(DESTDIR)$(LIBDIR)/plugins/ -+ $(INSTALL) -m 0644 build/node/plugin.sh $(DESTDIR)$(LIBDIR)/plugins/ -+ mkdir -p $(DESTDIR)$(PERLLIB)/Munin -+ $(INSTALL) -m 0644 build/node/Plugin.pm $(DESTDIR)$(PERLLIB)/Munin/ +- $(INSTALL) -m 0644 build/plugins/plugins.history $(LIBDIR)/plugins/ +- $(INSTALL) -m 0644 build/plugins/plugin.sh $(LIBDIR)/plugins/ ++ -mv $(DESTDIR)$(LIBDIR)/plugins/*.adv $(DESTDIR)$(LIBDIR) ++ $(INSTALL) -m 0644 build/plugins/plugins.history $(DESTDIR)$(LIBDIR)/plugins/ ++ $(INSTALL) -m 0644 build/plugins/plugin.sh $(DESTDIR)$(LIBDIR)/plugins/ - uninstall-node-plugins: build $(PLUGINS) - for p in build/node/node.d.$(OSTYPE)/* build/node/node.d/*; do \ -- rm -f $(LIBDIR)/plugins/`basename $$p` \ -+ rm -f $(DESTDIR)$(LIBDIR)/plugins/`basename $$p` \ - done -- rm -f $(LIBDIR)/plugins/plugins.history -- rm -f $(LIBDIR)/plugins/plugin.sh -- -rm -f $(LIBDIR)/*.adv -+ rm -f $(DESTDIR)$(LIBDIR)/plugins/plugins.history -+ rm -f $(DESTDIR)$(LIBDIR)/plugins/plugin.sh -+ -rm -f $(DESTDIR)$(LIBDIR)/*.adv + install-plugins-java: build-plugins-java +- mkdir -p $(JAVALIBDIR) +- $(INSTALL) -m 0644 build/plugins/javalib/munin-jmx-plugins.jar $(JAVALIBDIR)/ ++ mkdir -p $(DESTDIR)$(JAVALIBDIR) ++ $(INSTALL) -m 0644 build/plugins/javalib/munin-jmx-plugins.jar $(DESTDIR)$(JAVALIBDIR)/ #TODO: # configure plugins. Or not. Better done under the direction of the installer - # or the packager. +@@ -150,30 +143,30 @@ + install-node-prime: install-node-pre install-node + install-node-pre: build/node/munin-node.conf install-pre +- test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/ ++ test -f "$(DESTDIR)$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(DESTDIR)$(CONFDIR)/ + + + install-common-prime: build-common install-common + + install-man: build-man Makefile Makefile.config - mkdir -p $(MANDIR)/man1 $(MANDIR)/man5 $(MANDIR)/man8 - $(INSTALL) -m 0644 build/doc/munin-node.conf.5 $(MANDIR)/man5/ - $(INSTALL) -m 0644 build/doc/munin.conf.5 $(MANDIR)/man5/ -- $(INSTALL) -m 0644 build/doc/munin-node.8 $(MANDIR)/man8/ -- $(INSTALL) -m 0644 build/doc/munin-node-configure.8 $(MANDIR)/man8/ -- $(INSTALL) -m 0644 build/doc/munin-node-configure-snmp.8 $(MANDIR)/man8/ -- $(INSTALL) -m 0644 build/doc/munin-run.8 $(MANDIR)/man8/ - $(INSTALL) -m 0644 build/doc/munin-graph.8 $(MANDIR)/man8/ - $(INSTALL) -m 0644 build/doc/munin-update.8 $(MANDIR)/man8/ - $(INSTALL) -m 0644 build/doc/munin-limits.8 $(MANDIR)/man8/ - $(INSTALL) -m 0644 build/doc/munin-html.8 $(MANDIR)/man8/ - $(INSTALL) -m 0644 build/doc/munin-cron.8 $(MANDIR)/man8/ +- $(INSTALL) -m 0644 build/doc/munin-check.8 $(MANDIR)/man8/ +- $(INSTALL) -m 0644 build/doc/munin.8 $(MANDIR)/man8/ + mkdir -p $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man8 + $(INSTALL) -m 0644 build/doc/munin-node.conf.5 $(DESTDIR)$(MANDIR)/man5/ + $(INSTALL) -m 0644 build/doc/munin.conf.5 $(DESTDIR)$(MANDIR)/man5/ -+ $(INSTALL) -m 0644 build/doc/munin-node.8 $(DESTDIR)$(MANDIR)/man8/ -+ $(INSTALL) -m 0644 build/doc/munin-node-configure.8 $(DESTDIR)$(MANDIR)/man8/ -+ $(INSTALL) -m 0644 build/doc/munin-node-configure-snmp.8 $(DESTDIR)$(MANDIR)/man8/ -+ $(INSTALL) -m 0644 build/doc/munin-run.8 $(DESTDIR)$(MANDIR)/man8/ + $(INSTALL) -m 0644 build/doc/munin-graph.8 $(DESTDIR)$(MANDIR)/man8/ + $(INSTALL) -m 0644 build/doc/munin-update.8 $(DESTDIR)$(MANDIR)/man8/ + $(INSTALL) -m 0644 build/doc/munin-limits.8 $(DESTDIR)$(MANDIR)/man8/ + $(INSTALL) -m 0644 build/doc/munin-html.8 $(DESTDIR)$(MANDIR)/man8/ + $(INSTALL) -m 0644 build/doc/munin-cron.8 $(DESTDIR)$(MANDIR)/man8/ ++ $(INSTALL) -m 0644 build/doc/munin-check.8 $(DESTDIR)$(MANDIR)/man8/ ++ $(INSTALL) -m 0644 build/doc/munin.8 $(DESTDIR)$(MANDIR)/man8/ - uninstall-man: build-man -- rm -f $(MANDIR)/man5/munin-node.conf.5 -- rm -f $(MANDIR)/man5/munin.conf.5 -- rm -f $(MANDIR)/man8/munin-node.8 -- rm -f $(MANDIR)/man8/munin-node-configure.8 -- rm -f $(MANDIR)/man8/munin-node-configure-snmp.8 -- rm -f $(MANDIR)/man8/munin-run.8 -- rm -f $(MANDIR)/man8/munin-graph.8 -- rm -f $(MANDIR)/man8/munin-update.8 -- rm -f $(MANDIR)/man8/munin-limits.8 -- rm -f $(MANDIR)/man8/munin-html.8 -- rm -f $(MANDIR)/man8/munin-cron.8 -- -rmdir $(MANDIR)/man1 $(MANDIR)/man5 $(MANDIR)/man8 $(MANDIR) -+ rm -f $(DESTDIR)$(MANDIR)/man5/munin-node.conf.5 -+ rm -f $(DESTDIR)$(MANDIR)/man5/munin.conf.5 -+ rm -f $(DESTDIR)$(MANDIR)/man8/munin-node.8 -+ rm -f $(DESTDIR)$(MANDIR)/man8/munin-node-configure.8 -+ rm -f $(DESTDIR)$(MANDIR)/man8/munin-node-configure-snmp.8 -+ rm -f $(DESTDIR)$(MANDIR)/man8/munin-run.8 -+ rm -f $(DESTDIR)$(MANDIR)/man8/munin-graph.8 -+ rm -f $(DESTDIR)$(MANDIR)/man8/munin-update.8 -+ rm -f $(DESTDIR)$(MANDIR)/man8/munin-limits.8 -+ rm -f $(DESTDIR)$(MANDIR)/man8/munin-html.8 -+ rm -f $(DESTDIR)$(MANDIR)/man8/munin-cron.8 -+ -rmdir $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR) install-doc: build-doc - mkdir -p $(DOCDIR)/resources @@ -299,18 +173,14 @@ + $(INSTALL) -m 0644 COPYING $(DESTDIR)$(DOCDIR)/ + $(INSTALL) -m 0644 build/resources/* $(DESTDIR)$(DOCDIR)/resources - uninstall-doc: build-doc -- rm -rf $(DOCDIR) -+ rm -rf $(DESTDIR)$(DOCDIR) + ###################################################################### - build: build-stamp - -@@ -363,20 +359,20 @@ +@@ -370,20 +363,20 @@ $(MAKE) $@ CONFIG=t/Makefile.config else test_plugins = id_default id_root env --test: t/*.t t/install $(addprefix $(CONFDIR)/plugins/,$(test_plugins)) -+test: t/*.t t/install $(addprefix $(DESTDIR)$(CONFDIR)/plugins/,$(test_plugins)) +-old-test: t/*.t t/install $(addprefix $(CONFDIR)/plugins/,$(test_plugins)) ++old-test: t/*.t t/install $(addprefix $(DESTDIR)$(CONFDIR)/plugins/,$(test_plugins)) @for test in t/*.t; do \ echo -n "$$test: "; \ - PERL5LIB=$(PERLLIB) $(PERL) $$test;\ @@ -334,3 +204,22 @@ echo 'Done?' t/install: +@@ -407,12 +400,12 @@ + # can't seem to find a way to persuade it to write otherwhere. + install-%: %/Build + cd $* && $(PERL) Build install \ +- --install_path lib=$(PERLLIB) \ +- --install_path bin=$(BINDIR) \ +- --install_path script=$(BINDIR) \ +- --install_path sbin=$(SBINDIR) \ +- --install_path bindoc=$(MANDIR)/man1 \ +- --install_path libdoc=$(MANDIR)/man3 \ ++ --install_path lib=$(DESTDIR)$(PERLLIB) \ ++ --install_path bin=$(DESTDIR)$(BINDIR) \ ++ --install_path script=$(DESTDIR)$(BINDIR) \ ++ --install_path sbin=$(DESTDIR)$(SBINDIR) \ ++ --install_path bindoc=$(DESTDIR)$(MANDIR)/man1 \ ++ --install_path libdoc=$(DESTDIR)$(MANDIR)/man3 \ + + test-%: %/Build + cd $* && $(PERL) Build test || true Modified: csw/mgar/pkg/munin/trunk/files/munin-graph.in.diff =================================================================== --- csw/mgar/pkg/munin/trunk/files/munin-graph.in.diff 2009-11-28 19:54:43 UTC (rev 7500) +++ csw/mgar/pkg/munin/trunk/files/munin-graph.in.diff 2009-11-28 20:17:10 UTC (rev 7501) @@ -1,16 +1,18 @@ -diff --speed-large-files --minimal -Nru munin-1.3.4.orig/server/munin-graph.in munin-1.3.4/server/munin-graph.in ---- munin-1.3.4.orig/server/munin-graph.in 2008-03-08 02:42:40.000000000 +0100 -+++ munin-1.3.4/server/munin-graph.in 2009-08-13 20:59:35.901535076 +0200 -@@ -827,9 +827,9 @@ - my @complete = (); - if ($RRDkludge) { - push (@complete, -- '--font' ,'LEGEND:7:@@LIBDIR@@/VeraMono.ttf', -- '--font' ,'UNIT:7:@@LIBDIR@@/VeraMono.ttf', -- '--font' ,'AXIS:7:@@LIBDIR@@/VeraMono.ttf'); -+ '--font' ,'LEGEND:7:@@LIBDIR@@/monospace', -+ '--font' ,'UNIT:7:/opt/csw/share/munin/fonts/VeraMono.ttf', -+ '--font' ,'AXIS:7:/opt/csw/share/munin/fonts/VeraMono.ttf'); - } - push(@complete,'-W', $watermark) if $RRDs::VERSION >= 1.2; +diff --speed-large-files --minimal -Nru munin-1.4.0.orig/master/_bin/munin-graph.in munin-1.4.0/master/_bin/munin-graph.in +--- munin-1.4.0.orig/master/_bin/munin-graph.in 2009-11-27 12:17:18.000000000 +0100 ++++ munin-1.4.0/master/_bin/munin-graph.in 2009-11-28 13:41:02.135025435 +0100 +@@ -135,10 +135,10 @@ + =head1 FILES + +- @@CONFDIR@@/munin.conf +- @@DBDIR@@/* +- @@LOGDIR@@/munin-graph +- @@STATEDIR@@/* ++ /etc/opt/csw/munin/munin.conf ++ /var/opt/csw/munin/* ++ /var/opt/csw/munin/munin-graph ++ /var/opt/csw/munin/* + + =head1 AUTHORS + Modified: csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.diff =================================================================== --- csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.diff 2009-11-28 19:54:43 UTC (rev 7500) +++ csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.diff 2009-11-28 20:17:10 UTC (rev 7501) @@ -1,7 +1,7 @@ -diff --speed-large-files --minimal -Nru munin-1.3.4.orig/node/munin-node.conf.in munin-1.3.4/node/munin-node.conf.in ---- munin-1.3.4.orig/node/munin-node.conf.in 2008-03-08 02:42:39.000000000 +0100 -+++ munin-1.3.4/node/munin-node.conf.in 2009-07-05 08:45:56.286530895 +0200 -@@ -25,7 +25,7 @@ +diff --speed-large-files --minimal -Nru munin-1.4.0.orig/node/munin-node.conf.in munin-1.4.0/node/munin-node.conf.in +--- munin-1.4.0.orig/node/munin-node.conf.in 2009-11-27 12:17:13.000000000 +0100 ++++ munin-1.4.0/node/munin-node.conf.in 2009-11-28 11:59:12.681167885 +0100 +@@ -26,7 +26,7 @@ # Set this if the client doesn't report the correct hostname when # telnetting to localhost, port 4949 # @@ -9,4 +9,4 @@ +#host_name yourhostname # A list of addresses that are allowed to connect. This must be a - # regular expression, due to brain damage in Net::Server, which + # regular expression, since Net::Server does not understand CIDR-style Deleted: csw/mgar/pkg/munin/trunk/files/munin-update.in.diff =================================================================== --- csw/mgar/pkg/munin/trunk/files/munin-update.in.diff 2009-11-28 19:54:43 UTC (rev 7500) +++ csw/mgar/pkg/munin/trunk/files/munin-update.in.diff 2009-11-28 20:17:10 UTC (rev 7501) @@ -1,12 +0,0 @@ -diff --speed-large-files --minimal -Nru munin-1.3.4.orig/server/munin-update.in munin-1.3.4/server/munin-update.in ---- munin-1.3.4.orig/server/munin-update.in 2008-03-08 02:42:40.000000000 +0100 -+++ munin-1.3.4/server/munin-update.in 2009-07-07 22:15:31.832187072 +0200 -@@ -931,7 +931,7 @@ - eval { - local $SIG{ALRM} = sub { die "Could not run list on $name ($fetchdomain): $!\n"}; - alarm 5; # Should be enough to check the list -- write_socket_single ($socket, "list $fetchdomain\n"); -+ write_socket_single ($socket, "list $name\n"); - my $list = read_socket_single ($socket); - exit 1 unless defined $list; - chomp $list; Modified: csw/mgar/pkg/munin/trunk/files/munin.conf.in.diff =================================================================== --- csw/mgar/pkg/munin/trunk/files/munin.conf.in.diff 2009-11-28 19:54:43 UTC (rev 7500) +++ csw/mgar/pkg/munin/trunk/files/munin.conf.in.diff 2009-11-28 20:17:10 UTC (rev 7501) @@ -1,12 +1,12 @@ -diff --speed-large-files --minimal -Nru munin-1.3.4.orig/server/munin.conf.in munin-1.3.4/server/munin.conf.in ---- munin-1.3.4.orig/server/munin.conf.in 2008-03-08 02:42:40.000000000 +0100 -+++ munin-1.3.4/server/munin.conf.in 2009-07-06 00:16:45.205126727 +0200 -@@ -31,7 +31,7 @@ +diff --speed-large-files --minimal -Nru munin-1.4.0.orig/master/munin.conf.in munin-1.4.0/master/munin.conf.in +--- munin-1.4.0.orig/master/munin.conf.in 2009-11-27 12:17:18.000000000 +0100 ++++ munin-1.4.0/master/munin.conf.in 2009-11-28 12:03:14.865737210 +0100 +@@ -57,7 +57,7 @@ #contact.nagios.command /usr/bin/send_nsca nagios.host.comm -c /etc/nsca.conf # a simple host tree -[@@HOSTNAME@@] -+[HOSTNAME] ++[yourhostname] address 127.0.0.1 use_node_name yes Deleted: csw/mgar/pkg/munin/trunk/files/munindoc.in.diff =================================================================== --- csw/mgar/pkg/munin/trunk/files/munindoc.in.diff 2009-11-28 19:54:43 UTC (rev 7500) +++ csw/mgar/pkg/munin/trunk/files/munindoc.in.diff 2009-11-28 20:17:10 UTC (rev 7501) @@ -1,9 +0,0 @@ -diff --speed-large-files --minimal -Nru munin-1.3.4.orig/node/munindoc.in munin-1.3.4/node/munindoc.in ---- munin-1.3.4.orig/node/munindoc.in 2008-03-08 02:42:39.000000000 +0100 -+++ munin-1.3.4/node/munindoc.in 2009-08-02 11:31:16.881795848 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -w -+#!@@PERL@@ -w - # -*- perl -*- - # - # This script provides the basis for a plugin documentation system for Added: csw/mgar/pkg/munin/trunk/files/perl.diff =================================================================== --- csw/mgar/pkg/munin/trunk/files/perl.diff (rev 0) +++ csw/mgar/pkg/munin/trunk/files/perl.diff 2009-11-28 20:17:10 UTC (rev 7501) @@ -0,0 +1,45 @@ +diff --speed-large-files --minimal -Nru munin-1.4.0.orig/master/_bin/munin-update.in munin-1.4.0/master/_bin/munin-update.in +--- munin-1.4.0.orig/master/_bin/munin-update.in 2009-11-27 12:17:18.000000000 +0100 ++++ munin-1.4.0/master/_bin/munin-update.in 2009-11-28 19:30:06.713647230 +0100 +@@ -1,4 +1,4 @@ +-#! /usr/bin/perl ++#!@@PERL@@ + + use warnings; + use strict; +diff --speed-large-files --minimal -Nru munin-1.4.0.orig/node/bin/munindoc munin-1.4.0/node/bin/munindoc +--- munin-1.4.0.orig/node/bin/munindoc 2009-11-27 12:17:13.000000000 +0100 ++++ munin-1.4.0/node/bin/munindoc 2009-11-28 19:28:26.453064302 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -w ++#!/opt/csw/bin/perl -w + # -*- perl -*- + # + # This script provides the basis for a plugin documentation system for +diff --speed-large-files --minimal -Nru munin-1.4.0.orig/node/sbin/munin-node munin-1.4.0/node/sbin/munin-node +--- munin-1.4.0.orig/node/sbin/munin-node 2009-11-27 12:17:13.000000000 +0100 ++++ munin-1.4.0/node/sbin/munin-node 2009-11-28 19:28:26.455172374 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -wT ++#!/opt/csw/bin/perl -wT + # -*- cperl -*- + # + # Copyright (C) 2002-2009 Audun Ytterdal, Jimmy Olsen, Tore Anderson, +diff --speed-large-files --minimal -Nru munin-1.4.0.orig/node/sbin/munin-node-configure munin-1.4.0/node/sbin/munin-node-configure +--- munin-1.4.0.orig/node/sbin/munin-node-configure 2009-11-27 12:17:13.000000000 +0100 ++++ munin-1.4.0/node/sbin/munin-node-configure 2009-11-28 19:28:26.457840168 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -w ++#!/opt/csw/bin/perl -w + # -*- cperl -*- + # + # Copyright (C) 2003-2006 Jimmy Olsen, Nicolai Langfeldt. +diff --speed-large-files --minimal -Nru munin-1.4.0.orig/node/sbin/munin-run munin-1.4.0/node/sbin/munin-run +--- munin-1.4.0.orig/node/sbin/munin-run 2009-11-27 12:17:13.000000000 +0100 ++++ munin-1.4.0/node/sbin/munin-run 2009-11-28 19:28:26.459939564 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -wT ++#!/opt/csw/bin/perl -wT + # -*- perl -*- + + # Copyright (C) 2004-2009 Deleted: csw/mgar/pkg/munin/trunk/files/perlpath.diff =================================================================== --- csw/mgar/pkg/munin/trunk/files/perlpath.diff 2009-11-28 19:54:43 UTC (rev 7500) +++ csw/mgar/pkg/munin/trunk/files/perlpath.diff 2009-11-28 20:17:10 UTC (rev 7501) @@ -1,26 +0,0 @@ -diff --speed-large-files --minimal -Nru munin-1.3.4.orig/node/node.d/exim_mailstats.in munin-1.3.4/node/node.d/exim_mailstats.in ---- munin-1.3.4.orig/node/node.d/exim_mailstats.in 2008-03-08 02:42:39.000000000 +0100 -+++ munin-1.3.4/node/node.d/exim_mailstats.in 2009-08-02 11:26:39.040437174 +0200 -@@ -1,4 +1,3 @@ --#!/usr/bin/perl -w - #!@@PERL@@ -w - # -*- perl -*- - -diff --speed-large-files --minimal -Nru munin-1.3.4.orig/node/node.d/lpstat.in munin-1.3.4/node/node.d/lpstat.in ---- munin-1.3.4.orig/node/node.d/lpstat.in 2008-03-08 02:42:39.000000000 +0100 -+++ munin-1.3.4/node/node.d/lpstat.in 2009-08-02 11:26:48.080049173 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -+#!@@PERL@@ -w - ############################################################################# - # # - # This script was initially developed by Anstat Pty Ltd for internal use # -diff --speed-large-files --minimal -Nru munin-1.3.4.orig/node/node.d/snmp__cpuload.in munin-1.3.4/node/node.d/snmp__cpuload.in ---- munin-1.3.4.orig/node/node.d/snmp__cpuload.in 2008-03-08 02:42:39.000000000 +0100 -+++ munin-1.3.4/node/node.d/snmp__cpuload.in 2009-08-02 11:26:57.614639171 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -w -+#!@@PERL@@ -w - # - # Copyright (C) 2006 Lars Strand - # Modified: csw/mgar/pkg/munin/trunk/files/sunos_memory.in.diff =================================================================== --- csw/mgar/pkg/munin/trunk/files/sunos_memory.in.diff 2009-11-28 19:54:43 UTC (rev 7500) +++ csw/mgar/pkg/munin/trunk/files/sunos_memory.in.diff 2009-11-28 20:17:10 UTC (rev 7501) @@ -1,10 +1,19 @@ -diff --speed-large-files --minimal -Nru munin-1.3.4.orig/node/node.d.sunos/memory.in munin-1.3.4/node/node.d.sunos/memory.in ---- munin-1.3.4.orig/node/node.d.sunos/memory.in 2008-03-08 02:42:39.000000000 +0100 -+++ munin-1.3.4/node/node.d.sunos/memory.in 2009-07-03 11:50:10.815859151 +0200 -@@ -11,7 +11,7 @@ - # FIXME1: Reporting size in MB is Wrong. Report bytes and let rrd scale units - # FIXME2: Using kstat would be much better! +diff --speed-large-files --minimal -Nru munin-1.4.0.orig/plugins/node.d.sunos/memory.in munin-1.4.0/plugins/node.d.sunos/memory.in +--- munin-1.4.0.orig/plugins/node.d.sunos/memory.in 2009-11-27 12:17:12.000000000 +0100 ++++ munin-1.4.0/plugins/node.d.sunos/memory.in 2009-11-28 11:53:12.048911726 +0100 +@@ -15,7 +15,7 @@ + =item top + +-The path to "top" (Default: "/usr/local/bin/top") ++The path to "top" (Default: "/opt/csw/bin/top") + + =back + +@@ -50,7 +50,7 @@ + + . $MUNIN_LIBDIR/plugins/plugin.sh + -TOP=${top:-/usr/local/bin/top} +TOP=${top:-/opt/csw/bin/top} 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 Nov 28 17:13:32 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 28 Nov 2009 16:13:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7499] csw/mgar/pkg/nss/branches/upstream-work/ Message-ID: Revision: 7499 http://gar.svn.sourceforge.net/gar/?rev=7499&view=rev Author: wahwah Date: 2009-11-28 16:13:32 +0000 (Sat, 28 Nov 2009) Log Message: ----------- Removing the merged NSS branch. Removed Paths: ------------- csw/mgar/pkg/nss/branches/upstream-work/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Nov 29 18:26:07 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 29 Nov 2009 17:26:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7504] csw/mgar/pkg/x11/lib Message-ID: Revision: 7504 http://gar.svn.sourceforge.net/gar/?rev=7504&view=rev Author: wbonnet Date: 2009-11-29 17:26:05 +0000 (Sun, 29 Nov 2009) Log Message: ----------- Upgrade to 7.5RC Modified Paths: -------------- csw/mgar/pkg/x11/lib/libfontenc/trunk/Makefile csw/mgar/pkg/x11/lib/libfontenc/trunk/checksums csw/mgar/pkg/x11/lib/libx11/trunk/Makefile csw/mgar/pkg/x11/lib/libx11/trunk/checksums csw/mgar/pkg/x11/lib/libxaw/trunk/Makefile csw/mgar/pkg/x11/lib/libxaw/trunk/checksums csw/mgar/pkg/x11/lib/libxcomposite/trunk/Makefile csw/mgar/pkg/x11/lib/libxcomposite/trunk/checksums csw/mgar/pkg/x11/lib/libxcursor/trunk/Makefile csw/mgar/pkg/x11/lib/libxcursor/trunk/checksums csw/mgar/pkg/x11/lib/libxdamage/trunk/Makefile csw/mgar/pkg/x11/lib/libxdamage/trunk/checksums csw/mgar/pkg/x11/lib/libxdmcp/trunk/Makefile csw/mgar/pkg/x11/lib/libxdmcp/trunk/checksums csw/mgar/pkg/x11/lib/libxfixes/trunk/Makefile csw/mgar/pkg/x11/lib/libxfixes/trunk/checksums csw/mgar/pkg/x11/lib/libxfont/trunk/Makefile csw/mgar/pkg/x11/lib/libxfont/trunk/checksums csw/mgar/pkg/x11/lib/libxft/trunk/Makefile csw/mgar/pkg/x11/lib/libxft/trunk/checksums csw/mgar/pkg/x11/lib/libxinerama/trunk/Makefile csw/mgar/pkg/x11/lib/libxinerama/trunk/checksums csw/mgar/pkg/x11/lib/libxkbfile/trunk/Makefile csw/mgar/pkg/x11/lib/libxkbfile/trunk/checksums csw/mgar/pkg/x11/lib/libxmu/trunk/Makefile csw/mgar/pkg/x11/lib/libxmu/trunk/checksums csw/mgar/pkg/x11/lib/libxpm/trunk/Makefile csw/mgar/pkg/x11/lib/libxpm/trunk/checksums csw/mgar/pkg/x11/lib/libxrandr/trunk/Makefile csw/mgar/pkg/x11/lib/libxrandr/trunk/checksums csw/mgar/pkg/x11/lib/libxres/trunk/Makefile csw/mgar/pkg/x11/lib/libxres/trunk/checksums csw/mgar/pkg/x11/lib/libxtst/trunk/Makefile csw/mgar/pkg/x11/lib/libxtst/trunk/checksums csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile csw/mgar/pkg/x11/lib/libxvmc/trunk/checksums csw/mgar/pkg/x11/lib/libxxf86dga/trunk/Makefile csw/mgar/pkg/x11/lib/libxxf86dga/trunk/checksums csw/mgar/pkg/x11/lib/libxxf86vm/trunk/Makefile csw/mgar/pkg/x11/lib/libxxf86vm/trunk/checksums csw/mgar/pkg/x11/lib/xrender/trunk/Makefile csw/mgar/pkg/x11/lib/xrender/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/lib/libxfont/trunk/files/pcfread.c.diff Modified: csw/mgar/pkg/x11/lib/libfontenc/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libfontenc/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libfontenc/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libfontenc -GARVERSION = 1.0.4 +GARVERSION = 1.0.5 CATEGORIES = x11 DESCRIPTION = X11 font encoding library Modified: csw/mgar/pkg/x11/lib/libfontenc/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libfontenc/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libfontenc/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1 @@ -5cd16a2e51ca7b96a3081c7486ff98b9 download/libfontenc-1.0.4.tar.bz2 +4f0d8191819be9f2bdf9dad49a65e43b libfontenc-1.0.5.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libx11/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libx11/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libx11/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libx11 -GARVERSION = 1.1.5 +GARVERSION = 1.3.2 CATEGORIES = x11 DESCRIPTION = X11 client-side library @@ -12,9 +12,9 @@ MASTER_SITES = $(X11_LIB_MASTER_SITE) DISTNAME = libX11-$(GARVERSION) DISTFILES = $(DISTNAME).tar.gz -# PATCHFILES = patch-stdint.diff +PATCHFILES = patch-stdint.diff # Add workaround for http://bugs.sourcemage.org/show_bug.cgi?id=13476 -# PATCHFILES += patch-xlib-sentinel.diff +PATCHFILES += patch-xlib-sentinel.diff # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/x11/lib/libx11/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libx11/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libx11/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1,3 @@ -2feb39a0de6f05b25c308268691d960c libX11-1.1.5.tar.gz +b68aebbfcac1174c4c95d260e9369766 libX11-1.3.2.tar.gz +667f63d38722e29d6fd36b6648bbb757 patch-stdint.diff +4e6f6f42902f849eba8d88ab15fa3697 patch-xlib-sentinel.diff Modified: csw/mgar/pkg/x11/lib/libxaw/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxaw/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxaw/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libxaw -GARVERSION = 1.0.4 +GARVERSION = 1.0.7 CATEGORIES = x11 DESCRIPTION = X Athena Widgets Modified: csw/mgar/pkg/x11/lib/libxaw/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxaw/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxaw/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1 @@ -73671d8f1cf36fdd81395328cc3539c9 download/libXaw-1.0.4.tar.bz2 +815e74de989ccda684e2baf8d12cf519 libXaw-1.0.7.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxcomposite/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxcomposite/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxcomposite/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libXcomposite -GARVERSION = 0.4.0 +GARVERSION = 0.4.1 CATEGORIES = x11 DESCRIPTION = X11 Composite extension library @@ -15,19 +15,19 @@ CONFIGURE_ARGS = $(DIRPATHS) -PACKAGES = CSWlibxcomposite CSWlibxcompositedevel +PACKAGES = CSWlibxcomposite CSWlibxcompositedev CATALOGNAME_CSWlibxcomposite = libxcomposite -CATALOGNAME_CSWlibxcompositedevel = libxcomposite_devel +CATALOGNAME_CSWlibxcompositedev = libxcomposite_devel SPKG_DESC_CSWlibxcomposite = $(DESCRIPTION) -SPKG_DESC_CSWlibxcompositedevel = $(DESCRIPTION) development files +SPKG_DESC_CSWlibxcompositedev = $(DESCRIPTION) development files # PREREQUISITE_PKGS = CSWcompositeproto -REQUIRED_PKGS_CSWlibxcompositedevel = CSWlibxcomposite -REQUIRED_PKGS_CSWlibxcomposite = CSWlibx11 CSWlibxext CSWlibxfixes +REQUIRED_PKGS_CSWlibxcompositedev = CSWlibxcomposite +REQUIRED_PKGS_CSWlibxcomposite = CSWlibx11 CSWlibxext CSWlibxfixes -PKGFILES_CSWlibxcompositedevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibxcompositedev = $(PKGFILES_DEVEL) BUILD64 = 1 NOISALIST = 1 Modified: csw/mgar/pkg/x11/lib/libxcomposite/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxcomposite/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxcomposite/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1 @@ -7e95395dea89be21bae929b9b7f16641 download/libXcomposite-0.4.0.tar.bz2 +0f1367f57fdf5df17a8dd71d0fa68248 libXcomposite-0.4.1.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxcursor/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxcursor/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxcursor/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libXcursor -GARVERSION = 1.1.9 +GARVERSION = 1.1.10 CATEGORIES = x11 DESCRIPTION = X client-side cursor loading library Modified: csw/mgar/pkg/x11/lib/libxcursor/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxcursor/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxcursor/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1 @@ -99b7554037a92b260891091e81815a0a download/libXcursor-1.1.9.tar.bz2 +7dcdad1c10daea872cb3355af414b2ca libXcursor-1.1.10.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxdamage/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxdamage/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxdamage/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libXdamage -GARVERSION = 1.1.1 +GARVERSION = 1.1.2 CATEGORIES = x11 DESCRIPTION = X11 Font Services library @@ -23,6 +23,7 @@ SPKG_DESC_CSWlibxdamage = $(DESCRIPTION) SPKG_DESC_CSWlibxdamagedevel = $(DESCRIPTION) development files +REQUIRED_PKGS_CSWlibxdamage = CSWlibx11 CSWlibxfixes REQUIRED_PKGS_CSWlibxdamagedevel = CSWlibxdamage # PREREQUISITE_PKGS = CSWdamageproto Modified: csw/mgar/pkg/x11/lib/libxdamage/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxdamage/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxdamage/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1 @@ -ac0ce6b0063a9858c8f24ddb4c60487d download/libXdamage-1.1.1.tar.bz2 +b42780bce703ec202a33e5693991c09d libXdamage-1.1.2.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxdmcp/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxdmcp/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxdmcp/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libxdmcp -GARVERSION = 1.0.2 +GARVERSION = 1.0.3 CATEGORIES = x11 DESCRIPTION = X11 display manager control protocol library Modified: csw/mgar/pkg/x11/lib/libxdmcp/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxdmcp/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxdmcp/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1 @@ -10facf2bc7cbd5e5c1a698b8a210a582 download/libXdmcp-1.0.2.tar.bz2 +d60941d471800f41a3f19b24bea855a7 libXdmcp-1.0.3.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxfixes/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxfixes/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxfixes/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libXfixes -GARVERSION = 4.0.3 +GARVERSION = 4.0.4 CATEGORIES = x11 DESCRIPTION = X11 miscellaneous 'fixes' extension library Modified: csw/mgar/pkg/x11/lib/libxfixes/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxfixes/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxfixes/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1 @@ -1990d19725a3c7f32290037f02d3737f download/libXfixes-4.0.3.tar.bz2 +7f2c40852eb337b237ad944ca5c30d49 libXfixes-4.0.4.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxfont/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxfont/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxfont/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libXfont -GARVERSION = 1.3.3 +GARVERSION = 1.4.1 CATEGORIES = x11 DESCRIPTION = X11 font rasterisation library @@ -23,6 +23,9 @@ SPKG_DESC_CSWlibxfont = $(DESCRIPTION) SPKG_DESC_CSWlibxfontdevel = $(DESCRIPTION) development files +PATCHFILES = pcfread.c.diff + +# # PREREQUISITE_PKGS = CSWlibfontencdevel REQUIRED_PKGS_CSWlibxfontdevel = CSWlibxfont REQUIRED_PKGS_CSWlibxfont = CSWftype2 CSWlibfontenc CSWzlib @@ -32,4 +35,6 @@ BUILD64 = 1 NOISALIST = 1 +EXTRA_CFLAGS = -D__solaris__ + include gar/category.mk Modified: csw/mgar/pkg/x11/lib/libxfont/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxfont/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxfont/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1,2 @@ -4f174b9613f87cf00d731da428a1b194 download/libXfont-1.3.3.tar.bz2 +4f2bed2a2be82e90a51a24bb3a22cdf0 libXfont-1.4.1.tar.bz2 +1a3b100fc51c834222de3a127ba89722 pcfread.c.diff Added: csw/mgar/pkg/x11/lib/libxfont/trunk/files/pcfread.c.diff =================================================================== --- csw/mgar/pkg/x11/lib/libxfont/trunk/files/pcfread.c.diff (rev 0) +++ csw/mgar/pkg/x11/lib/libxfont/trunk/files/pcfread.c.diff 2009-11-29 17:26:05 UTC (rev 7504) @@ -0,0 +1,14 @@ +--- libXfont-1.4.1.orig/src/bitmap/pcfread.c 2009-11-28 14:31:05.959205251 +0100 ++++ libXfont-1.4.1/src/bitmap/pcfread.c 2009-11-28 14:36:05.152906100 +0100 +@@ -44,7 +44,11 @@ + #endif + + #include ++#if defined(__solaris__) ++#include ++#else + #include ++#endif + + void + pcfError(const char* message, ...) Modified: csw/mgar/pkg/x11/lib/libxft/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxft/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxft/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libXft -GARVERSION = 2.1.13 +GARVERSION = 2.1.14 CATEGORIES = x11 DESCRIPTION = A client-side font API for X applications @@ -30,6 +30,9 @@ REQUIRED_PKGS_CSWlibxft2 = CSWzlib CSWfconfig CSWftype2 CSWlibx11 CSWlibxrender REQUIRED_PKGS_CSWlibxft2devel = CSWlibxft2 +SPKG_DESC_CSWlibxft2 = $(DESCRIPTION) +SPKG_DESC_CSWlibxft2devel = $(DESCRIPTION) development package + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/x11/lib/libxft/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxft/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxft/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,3 +1,3 @@ -40ebc53da7efd520e528fa7a564863db download/libXft-2.1.13.tar.gz -5e3b0eeedc8e2ed4926cb73de7b2bc06 download/libXft.so.2.1.2-i386 -637e1b24ae97f0070478c8096b81d81a download/libXft.so.2.1.2-sparc +7b6530be19ce88949c4c08405f23b29a libXft-2.1.14.tar.gz +5e3b0eeedc8e2ed4926cb73de7b2bc06 libXft.so.2.1.2-i386 +637e1b24ae97f0070478c8096b81d81a libXft.so.2.1.2-sparc Modified: csw/mgar/pkg/x11/lib/libxinerama/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxinerama/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxinerama/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libXinerama -GARVERSION = 1.0.3 +GARVERSION = 1.1 CATEGORIES = x11 DESCRIPTION = X11 Xinerama extension library @@ -23,7 +23,7 @@ SPKG_DESC_CSWlibxinerama = $(DESCRIPTION) SPKG_DESC_CSWlibxineramadevel = $(DESCRIPTION) development files -PREREQUISITE_PKGS = CSWxineramaproto +PREREQUISITE_PKGS = CSWx11xineramaproto REQUIRED_PKGS_CSWlibxineramadevel = CSWlibxinerama REQUIRED_PKGS_CSWlibxinerama = CSWlibx11 CSWlibxext Modified: csw/mgar/pkg/x11/lib/libxinerama/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxinerama/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxinerama/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1 @@ -cd9f7c46439ac40e0517a302d2434d2c download/libXinerama-1.0.3.tar.bz2 +a2ac01fc0426cdbb713c5d59cf9955ed libXinerama-1.1.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxkbfile/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxkbfile/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxkbfile/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libxkbfile -GARVERSION = 1.0.5 +GARVERSION = 1.0.6 CATEGORIES = x11 DESCRIPTION = X11 keyboard file manipulation library Modified: csw/mgar/pkg/x11/lib/libxkbfile/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxkbfile/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxkbfile/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1 @@ -0726a845fe5a56551de2718c9f6b0e35 download/libxkbfile-1.0.5.tar.bz2 +b01156e263eca8177e6b7f10441951c4 libxkbfile-1.0.6.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxmu/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxmu/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxmu/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libxmu -GARVERSION = 1.0.4 +GARVERSION = 1.0.5 CATEGORIES = x11 DESCRIPTION = A set of miscellaneous utility convenience functions for X libraries to use Modified: csw/mgar/pkg/x11/lib/libxmu/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxmu/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxmu/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1 @@ -48b432e84035c664ece80a33695d5254 download/libXmu-1.0.4.tar.gz +f49e3587cdc299707da0786a681f9c05 libXmu-1.0.5.tar.gz Modified: csw/mgar/pkg/x11/lib/libxpm/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxpm/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxpm/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libxpm -GARVERSION = 3.5.7 +GARVERSION = 3.5.8 CATEGORIES = x11 DESCRIPTION = X11 pixmap library Modified: csw/mgar/pkg/x11/lib/libxpm/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxpm/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxpm/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1 @@ -cd15ee542d9f515538b4462a6f79d977 download/libXpm-3.5.7.tar.bz2 +38e58e72d476a74298a59052fde185a3 libXpm-3.5.8.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxrandr/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxrandr/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxrandr/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libXrandr -GARVERSION = 1.2.3 +GARVERSION = 1.3.0 CATEGORIES = x11 DESCRIPTION = X11 RandR extension library Modified: csw/mgar/pkg/x11/lib/libxrandr/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxrandr/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxrandr/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1 @@ -5cd67cc02a50c9644ba0a1846ea3b08e download/libXrandr-1.2.3.tar.bz2 +68eb59c3b7524db6ffd78746ee893d1d libXrandr-1.3.0.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxres/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxres/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxres/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libXres -GARVERSION = 1.0.3 +GARVERSION = 1.0.4 CATEGORIES = x11 DESCRIPTION = X11 Resource extension library Modified: csw/mgar/pkg/x11/lib/libxres/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxres/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxres/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1 @@ -de66ffb657aba64c9d6dbdeabb757f3e download/libXres-1.0.3.tar.bz2 +4daf91f93d924e693f6f6ed276791be2 libXres-1.0.4.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxtst/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxtst/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxtst/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libxtst -GARVERSION = 1.0.3 +GARVERSION = 1.1.0 CATEGORIES = x11 DESCRIPTION = The Xtst Library Modified: csw/mgar/pkg/x11/lib/libxtst/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxtst/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxtst/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1 @@ -090c1ad04e34982eada5cf3b1a0792fd download/libXtst-1.0.3.tar.bz2 +dd6f3e20b87310187121539f9605d977 libXtst-1.1.0.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxvmc/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libXvMC -GARVERSION = 1.0.4 +GARVERSION = 1.0.5 CATEGORIES = x11 DESCRIPTION = XVideo Motion Compensation Library Modified: csw/mgar/pkg/x11/lib/libxvmc/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxvmc/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxvmc/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1 @@ -b54600573daf9d1a29b952e8d35b389e download/libXvMC-1.0.4.tar.bz2 +16c3a11add14979beb7510e44623cac6 libXvMC-1.0.5.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxxf86dga/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxxf86dga/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxxf86dga/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libXxf86dga -GARVERSION = 1.0.2 +GARVERSION = 1.1.1 CATEGORIES = x11 DESCRIPTION = X11 Direct Graphics Access extension library Modified: csw/mgar/pkg/x11/lib/libxxf86dga/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxxf86dga/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxxf86dga/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1 @@ -6f5f621804ee652b6cc6f2025c517c78 download/libXxf86dga-1.0.2.tar.bz2 +368837d3d7a4d3b4f70be48383e3544e libXxf86dga-1.1.1.tar.bz2 Modified: csw/mgar/pkg/x11/lib/libxxf86vm/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxxf86vm/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxxf86vm/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libXxf86vm -GARVERSION = 1.0.2 +GARVERSION = 1.1.0 CATEGORIES = x11 DESCRIPTION = X11 XFree86 video mode extension library @@ -23,7 +23,7 @@ SPKG_DESC_CSWlibxxf86vm = $(DESCRIPTION) SPKG_DESC_CSWlibxxf86vmdevel = $(DESCRIPTION) development files -PREREQUISITE_PKGS = CSWxf86vidmodeproto +PREREQUISITE_PKGS = CSWx11xf86vidmdproto REQUIRED_PKGS_CSWlibxxf86vm = CSWlibx11 CSWlibxext REQUIRED_PKGS_CSWlibxxf86vmdevel = CSWlibxxf86vm Modified: csw/mgar/pkg/x11/lib/libxxf86vm/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxxf86vm/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/libxxf86vm/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1 +1 @@ -304d37bd0a10d9b58aa9b64469ad73e5 download/libXxf86vm-1.0.2.tar.bz2 +b431ad7084e1055fef99a9115237edd8 libXxf86vm-1.1.0.tar.bz2 Modified: csw/mgar/pkg/x11/lib/xrender/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/xrender/trunk/Makefile 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/xrender/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,5 +1,5 @@ GARNAME = libxrender -GARVERSION = 0.9.4 +GARVERSION = 0.9.5 CATEGORIES = x11 DESCRIPTION = X Render Extension Library @@ -31,7 +31,7 @@ CATALOGNAME_CSWlibxrender = libxrender CATALOGNAME_CSWlibxrenderdevel = libxrender_devel -PREREQUISITE_PKGS = CSWxrenderproto +PREREQUISITE_PKGS = CSWx11renderproto REQUIRED_PKGS_CSWlibxrenderdevel = CSWlibxrender REQUIRED_PKGS_CSWlibxrender = CSWx11common CSWlibx11 Modified: csw/mgar/pkg/x11/lib/xrender/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/xrender/trunk/checksums 2009-11-29 10:48:26 UTC (rev 7503) +++ csw/mgar/pkg/x11/lib/xrender/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) @@ -1,3 +1,3 @@ -1d9cb49e6c9149d5a5eca118c9c2bcf6 download/libXrender-0.9.4.tar.gz -9000fe29fc6339a43ef43478ae763054 download/libXrender.so.1.2.2-i386 -0a3f6793408aca76dbde2e6e3772a029 download/libXrender.so.1.2.2-sparc +1791473c18a83a333a048b72d719fc55 libXrender-0.9.5.tar.gz +9000fe29fc6339a43ef43478ae763054 libXrender.so.1.2.2-i386 +0a3f6793408aca76dbde2e6e3772a029 libXrender.so.1.2.2-sparc 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 Nov 29 19:44:37 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 29 Nov 2009 18:44:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[7505] csw/mgar/pkg/wxwidgets/trunk Message-ID: Revision: 7505 http://gar.svn.sourceforge.net/gar/?rev=7505&view=rev Author: wahwah Date: 2009-11-29 18:44:36 +0000 (Sun, 29 Nov 2009) Log Message: ----------- wxwidgets: Adding the old binaries for backward compatibility. Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile csw/mgar/pkg/wxwidgets/trunk/checksums Added Paths: ----------- csw/mgar/pkg/wxwidgets/trunk/files/libwx_gtk2u-2.8.so.0.2.0-i386 csw/mgar/pkg/wxwidgets/trunk/files/libwx_gtk2u-2.8.so.0.2.0-sparc csw/mgar/pkg/wxwidgets/trunk/files/libwx_gtk2u_gl-2.8.so.0.2.0-i386 csw/mgar/pkg/wxwidgets/trunk/files/libwx_gtk2u_gl-2.8.so.0.2.0-sparc Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-29 17:26:05 UTC (rev 7504) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-11-29 18:44:36 UTC (rev 7505) @@ -19,7 +19,12 @@ PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 EXTRA_MODULATORS = GARVERSION -MODULATIONS_GARVERSION = 2.8.5 2.8.10 + +# Once upon a time, this build also supported the version 2.8.5 for backward +# compatibility. Unfortunately, it was segfaulting. As a workaround, binary +# files copied from the old package have been provided. +MODULATIONS_GARVERSION = 2.8.10 + MERGE_SCRIPTS_isa-i386-garversion-2.8.5 = copy-only MERGE_DIRS_isa-i386-garversion-2.8.5 = $(libdir) MERGE_SCRIPTS_isa-sparcv8-garversion-2.8.5 = copy-only @@ -30,6 +35,10 @@ SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(GARNAME)-$(VERSION).tar.gz) NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz,$(SOURCEFILES)) DISTFILES = $(SOURCEFILES) +DISTFILES += libwx_gtk2u-2.8.so.0.2.0-i386 +DISTFILES += libwx_gtk2u-2.8.so.0.2.0-sparc +DISTFILES += libwx_gtk2u_gl-2.8.so.0.2.0-i386 +DISTFILES += libwx_gtk2u_gl-2.8.so.0.2.0-sparc SPKG_SOURCEURL = http://www.wxwidgets.org/ MASTER_SITES = $(SF_MIRRORS) SF_PROJ = wxwindows @@ -143,3 +152,12 @@ (cd $(WORKSRC); $(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) install) (cd $(WORKSRC)/contrib; $(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) install) @$(MAKECOOKIE) + +post-merge: + ginstall -m 755 \ + $(FILEDIR)/libwx_gtk2u-2.8.so.0.2.0-$(GARCH) \ + $(PKGROOT)$(libdir)/libwx_gtk2u-2.8.so.0.2.0 + ginstall -m 755 \ + $(FILEDIR)/libwx_gtk2u_gl-2.8.so.0.2.0-$(GARCH) \ + $(PKGROOT)$(libdir)/libwx_gtk2u_gl-2.8.so.0.2.0 + @$(MAKECOOKIE) Modified: csw/mgar/pkg/wxwidgets/trunk/checksums =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/checksums 2009-11-29 17:26:05 UTC (rev 7504) +++ csw/mgar/pkg/wxwidgets/trunk/checksums 2009-11-29 18:44:36 UTC (rev 7505) @@ -1,9 +1,9 @@ 7830ab8006ade9b14567341b5481eadd 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch 45df2933ed2fa53f229feda01467db81 0002-Fixing-retarded-checks-for-libGL.patch 225f6163a1c31d1f96a3b0548b338105 0003-vsscanf-support-via-ncursesw.patch -f073300d39ce7c88db1033bbce64cdca 0004-add-monodll_appbase.so-to-wxrc.patch 969c363847e675dc4d3ad6b8871b96db 0005-stupid-vwscanf-workaround.patch -75ecdc04af4392f918ff6856a3ba6605 0500-wxT-macro-first-iteration.patch -17d8d019fd2e4137b4cd44816b14e282 0501-a-possible-fix-to-wxchar.h.patch +d4a33d7a1a30965edf15b54bfb011174 libwx_gtk2u-2.8.so.0.2.0-i386 +6a5857bca9695738ba5e185aac4d26e7 libwx_gtk2u-2.8.so.0.2.0-sparc +9f2495b8a4b9b91998a74164efc9ca3a libwx_gtk2u_gl-2.8.so.0.2.0-i386 +5870955c6c23ec655c17b4da92548207 libwx_gtk2u_gl-2.8.so.0.2.0-sparc 05b32ca051651f4b1885a90f62969faf wxWidgets-2.8.10.tar.gz -43274231ee50eb1f35e04e693ebab902 wxWidgets-2.8.5.tar.gz Added: csw/mgar/pkg/wxwidgets/trunk/files/libwx_gtk2u-2.8.so.0.2.0-i386 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/wxwidgets/trunk/files/libwx_gtk2u-2.8.so.0.2.0-i386 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/wxwidgets/trunk/files/libwx_gtk2u-2.8.so.0.2.0-sparc =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/wxwidgets/trunk/files/libwx_gtk2u-2.8.so.0.2.0-sparc ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/wxwidgets/trunk/files/libwx_gtk2u_gl-2.8.so.0.2.0-i386 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/wxwidgets/trunk/files/libwx_gtk2u_gl-2.8.so.0.2.0-i386 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/wxwidgets/trunk/files/libwx_gtk2u_gl-2.8.so.0.2.0-sparc =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/wxwidgets/trunk/files/libwx_gtk2u_gl-2.8.so.0.2.0-sparc ___________________________________________________________________ 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 wahwah at users.sourceforge.net Mon Nov 30 01:35:28 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 30 Nov 2009 00:35:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[7506] csw/mgar/pkg/postgresql/trunk Message-ID: Revision: 7506 http://gar.svn.sourceforge.net/gar/?rev=7506&view=rev Author: wahwah Date: 2009-11-30 00:35:28 +0000 (Mon, 30 Nov 2009) Log Message: ----------- postgresql: Seems to be working with versioned directories. Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile csw/mgar/pkg/postgresql/trunk/checksums Added Paths: ----------- csw/mgar/pkg/postgresql/trunk/files/cswpostgres.tmpl csw/mgar/pkg/postgresql/trunk/files/cswusergroup.tmpl csw/mgar/pkg/postgresql/trunk/files/postgresql.conf.tmpl Removed Paths: ------------- csw/mgar/pkg/postgresql/trunk/files/cswpostgres csw/mgar/pkg/postgresql/trunk/files/cswusergroup csw/mgar/pkg/postgresql/trunk/files/postgresql.conf Property Changed: ---------------- csw/mgar/pkg/postgresql/trunk/Makefile Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2009-11-29 18:44:36 UTC (rev 7505) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2009-11-30 00:35:28 UTC (rev 7506) @@ -1,3 +1,7 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + GARNAME = postgresql BASE_VERSION = 8.4 PATCHLEVEL = 1 @@ -4,7 +8,12 @@ GARVERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = apps +# Useful when making a series of builds on the same day +GARFLAVOR = DBG + DESCRIPTION = An advanced open source database +SPKG_SOURCEURL = http://www.postgresql.org/ + define BLURB endef @@ -16,18 +25,21 @@ libdir_install =$(prefix)/lib/$(GARNAME)/$(BASE_VERSION) libexecdir_install =$(prefix)/libexec/$(GARNAME)/$(BASE_VERSION) lispdir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION)/emacs/site-lisp -localstatedir = /var/opt/csw/$(GARNAME)/$(BASE_VERSION) +localstatedir = /var$(prefix)/$(GARNAME)/$(BASE_VERSION) mandir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION)/man sbindir_install = $(prefix)/sbin/$(GARNAME)/$(BASE_VERSION) sharedstatedir=$(prefix)/share/$(GARNAME)/$(BASE_VERSION) sourcedir=$(prefix)/src/$(GARNAME)/$(BASE_VERSION) -sysconfdir = /etc/opt/csw/$(GARNAME)/$(BASE_VERSION) +sysconfdir = /etc$(prefix)/$(GARNAME)/$(BASE_VERSION) +MIGRATE_FILES = postgresql.conf +MIGRATE_DEST_DIR = $(sysconfdir) + MASTER_SITES = http://wwwmaster.postgresql.org/redir/53/h/source/v$(GARVERSION)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += cswpostgres -DISTFILES += cswusergroup -DISTFILES += postgresql.conf +DISTFILES += cswpostgres.tmpl +DISTFILES += cswusergroup.tmpl +DISTFILES += postgresql.conf.tmpl DISTFILES += README-CSW.txt PACKAGES = CSWpostgresql CSWpostgresqldoc CSWpostgresqldevel CSWlibpq @@ -42,20 +54,32 @@ SPKG_DESC_CSWpostgresqldevel = PostgreSQL Developer Files SPKG_DESC_CSWlibpq = PostgreSQL Libraries -SPKG_SOURCEURL = http://www.postgresql.org/ - REQUIRED_PKGS_CSWpostgresql = CSWreadline CSWzlib CSWlibpq REQUIRED_PKGS_CSWpostgresqldevel = CSWpostgresql LICENSE = COPYRIGHT -# prefix = $(BUILD_PREFIX)/postgresql -# docdir = $(BUILD_PREFIX)/share/doc - EXTRA_INC = $(BUILD_PREFIX)/include EXTRA_LIB = $(BUILD_PREFIX)/lib +EXTRA_LD_OPTIONS = -R$(prefix)/lib/\$$ISALIST + BUILD64 = 1 + +# There was a discussion about whether to use ISAEXEC by default. The argument +# is that enabling 64-bit by default where possible (using isaexec) is a waste. +# I'm not completely convinced. Leaving this line commented out for future +# consideration. +# +# References: +# - http://lists.opencsw.org/pipermail/maintainers/2009-November/004903.html +# +# I'd like to get some hard data though. What is the difference in the memory +# footprint, and what is the difference in execution speed between 32 and +# 64-bit versions? +# +# NO_ISAEXEC = 1 + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check @@ -63,33 +87,66 @@ EXTRA_PAX_ARGS = -s ",^\./opt/csw/postgresql/share/doc,./opt/csw/share/doc/postgresql,p" PKGFILES_CSWpostgresqldoc = $(PKGFILES_DOC) -PKGFILES_CSWpostgresqldevel = $(PKGFILES_DEVEL) -PKGFILES_CSWlibpq = $(PKGFILES_RT) +PKGFILES_CSWpostgresqldevel = $(PKGFILES_DEVEL) +PKGFILES_CSWpostgresqldevel += $(prefix)/share/doc/postgresql/html.* +PKGFILES_CSWlibpq = $(PKGFILES_RT) +PKGFILES_CSWlibpq += $(libdir)/64 # -> TODO: start in rc3.d S10, Stop everywhere else in K90 -INITSMF = /etc/opt/csw/init\.d/cswpostgres-$(BASE_VERSION) +INITSMF = /etc$(prefix)/init\.d/cswpostgres-$(BASE_VERSION) -# -> TODO: Migrate /opt/csw/var/pgdata to /var/opt/csw/postgresql/pgdata -USERGROUP = /etc/opt/csw/pkg/postgresql-$(BASE_VERSION) +# -> TODO: Migrate $(prefix)/var/pgdata to /var$(prefix)/postgresql/pgdata +USERGROUP = /etc$(prefix)/pkg/postgresql-$(BASE_VERSION) -# -> TODO: Migrate /opt/csw/etc/postgresql.conf to /etc/opt/csw/postgresql.conf -PRESERVECONF = /opt/csw/etc/postgresql\.conf +# -> TODO: Migrate $(prefix)/etc/postgresql.conf to /etc$(prefix)/postgresql.conf +PRESERVECONF = $(sysconfdir)/postgresql\.conf +BIN_NAMES = clusterdb createdb createlang createuser dropdb droplang dropuser +BIN_NAMES += ecpg initdb pg_config pg_controldata pg_ctl pg_dump pg_dumpall +BIN_NAMES += pg_resetxlog pg_restore postgres postmaster psql reindexdb + +PGDATA = $(localstatedir)/pgdata + +PROTOTYPE_MODIFIERS = pgdata +PROTOTYPE_FILES_pgdata = $(PGDATA) +PROTOTYPE_USER_pgdata = postgres +PROTOTYPE_GROUP_pgdata = postgres +PROTOTYPE_PERMS_pgdata = 0700 +PROTOTYPE_CLASS_pgdata = ugfiles + +SPKG_CLASSES = none ugfiles + include gar/category.mk CFLAGS := $(filter-out -I%,$(CFLAGS)) post-merge: - ginstall -d $(PKGROOT)/etc/opt/csw/init.d + ginstall -d $(PKGROOT)/etc$(prefix)/init.d + sed -e 's+ at PGDATA@+$(PGDATA)+' \ + -e 's+ at sysconfdir@+$(sysconfdir)+' \ + -e 's+ at bindir@+$(bindir)+' \ + < $(FILEDIR)/cswpostgres.tmpl \ + > $(WORKDIR)/cswpostgres ginstall \ $(WORKDIR)/cswpostgres \ - $(PKGROOT)/etc/opt/csw/init.d/cswpostgres-$(BASE_VERSION) - ginstall -d $(PKGROOT)/etc/opt/csw/pkg/$(GARNAME) + $(PKGROOT)/etc$(prefix)/init.d/cswpostgres-$(BASE_VERSION) + ginstall -d $(PKGROOT)/etc$(prefix)/pkg/$(GARNAME) + sed -e 's+ at PGDATA@+$(PGDATA)+' \ + < $(FILEDIR)/cswusergroup.tmpl \ + > $(WORKDIR)/cswusergroup ginstall $(WORKDIR)/cswusergroup \ - $(PKGROOT)/etc/opt/csw/pkg/postgresql/$(GARNAME)-$(BASE_VERSION) - ginstall -d $(PKGROOT)/etc/opt/csw/$(GARNAME)-$(BASE_VERSION) + $(PKGROOT)/etc$(prefix)/pkg/$(GARNAME)/cswusergroup-$(BASE_VERSION) + ginstall -d $(PKGROOT)$(sysconfdir) + sed -e 's+ at PGDATA@+$(PGDATA)+' \ + < $(FILEDIR)/postgresql.conf.tmpl \ + > $(WORKDIR)/postgresql.conf ginstall $(WORKDIR)/postgresql.conf \ - $(PKGROOT)/etc/opt/csw/$(GARNAME)-$(BASE_VERSION) - ginstall -d $(PKGROOT)$(docdir)/$(GARNAME) - ginstall $(WORKDIR)/README-CSW.txt $(PKGROOT)$(docdir)/$(GARNAME)/ + $(PKGROOT)$(sysconfdir) + ginstall -d $(PKGROOT)$(docdir) + ginstall $(WORKDIR)/README-CSW.txt $(PKGROOT)$(docdir) + for b in $(BIN_NAMES); do \ + gln -s $(GARNAME)/$(BASE_VERSION)/$${b} $(PKGROOT)$(prefix)/bin/$${b}; \ + done + ginstall -d $(PKGROOT)$(PGDATA) + gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/postgresql/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/postgresql/trunk/checksums =================================================================== --- csw/mgar/pkg/postgresql/trunk/checksums 2009-11-29 18:44:36 UTC (rev 7505) +++ csw/mgar/pkg/postgresql/trunk/checksums 2009-11-30 00:35:28 UTC (rev 7506) @@ -1,5 +1,5 @@ 6e4e2a7755acf94bc83200a308e21ef3 README-CSW.txt -73f96aa85c8f99caf4d708c874e23dab cswpostgres -443171cc5303a8ea0f0a13cbb5e32189 cswusergroup +922febb720931220e272c2872ebf47e4 cswpostgres.tmpl +9e1e49d76fee70cb8e2d49304695ec89 cswusergroup.tmpl f2015af17bacbbfe140daf0d1067f9c9 postgresql-8.4.1.tar.bz2 -20c32ebdca7d585728b6078798fa1f50 postgresql.conf +8237c74666058f607f5418e3b57c74a9 postgresql.conf.tmpl Deleted: csw/mgar/pkg/postgresql/trunk/files/cswpostgres =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/cswpostgres 2009-11-29 18:44:36 UTC (rev 7505) +++ csw/mgar/pkg/postgresql/trunk/files/cswpostgres 2009-11-30 00:35:28 UTC (rev 7506) @@ -1,97 +0,0 @@ -#!/bin/sh -# PostgreSQL startup script - part of the CSWpostgresql package -# mark at blastwave.org - -# Read in the user configuration file -[ -s /opt/csw/etc/postgresql.conf ] && . /opt/csw/etc/postgresql.conf -[ -s /etc/opt/csw/postgresql.conf ] && . /etc/opt/csw/postgresql.conf - -# Defaults -[ -z "$PGDATA" ] && PGDATA=/opt/csw/var/pgdata -[ -z "$PGCTL" ] && PGCTL=/opt/csw/postgresql/bin/sparcv8/pg_ctl -[ -z "$PGINIT" ] && PGINIT=/opt/csw/postgresql/bin/sparcv8/initdb - - -# The following attempts to catch any mistakes in the server -# version - it checks if the 64-bit server was last run. If so, -# it forces the 64-bit server, otherwise it won't start up! -# And vice-versa for the 32-bit server... -if [ -f $PGDATA/postmaster.opts ]; then - grep 'sparcv9' $PGDATA/postmaster.opts > /dev/null - if [ $? -eq 0 ]; then - echo $PGCTL | grep "sparcv8" > /dev/null - if [ $? -eq 0 ]; then - echo "Warning: 32-bit server was specified in /etc/init.d/cswpostgres," - echo " but 64-bit version was last run. Using 64-bit server..." - fi - PGCTL=/opt/csw/postgresql/bin/sparcv9/pg_ctl - PGINIT=/opt/csw/postgresql/bin/sparcv9/initdb - else - # Did not detect 64-bit server last used - echo $PGCTL | grep "sparcv8" > /dev/null - if [ $? -ne 0 ]; then - echo "Warning: 64-bit server was specified in /etc/init.d/cswpostgres," - echo " but 32-bit version was last run. Using 32-bit server..." - fi - PGCTL=/opt/csw/postgresql/bin/sparcv8/pg_ctl - PGINIT=/opt/csw/postgresql/bin/sparcv8/initdb - fi -fi - -# Exit if postgres user hasn't been created. -grep '^postgres:' /etc/passwd >/dev/null -if [ $? -ne 0 ] ; then - getent passwd postgres >/dev/null - if [ $? -ne 0 ] ; then - exit 0 - fi -fi - -# Change to /var/tmp, as pgctl etc. need to be started from -# a directory that they can read -cd /var/tmp - -case "$1" in -start) - if [ -d $PGDATA -a `ls -l $PGDATA 2> /dev/null | wc -l` -gt 1 ]; then - # PostgreSQL data directory exists and is populated - echo "Starting PostgreSQL..." - su postgres -c "$PGCTL -D $PGDATA -l $PGDATA/postgresql.log start $SERVEROPTS" - fi - ;; - -stop) - echo "Stopping PostgreSQL database..." - su postgres -c "$PGCTL -D $PGDATA -l $PGDATA/postgresql.log stop" - ;; - -restart) - echo "Restarting PostgreSQL database..." - su postgres -c "$PGCTL -D $PGDATA -l $PGDATA/postgresql.log restart $SERVEROPTS" - ;; - -reload) - echo "Reloading PostgreSQL database..." - su postgres -c "$PGCTL -D $PGDATA -l $PGDATA/postgresql.log reload $SERVEROPTS" - ;; - -status) - su postgres -c "$PGCTL -D $PGDATA status" - ;; - -init) - # create and initialise data directory - echo "Creating PostgreSQL data directory at $PGDATA..." - # Create it, unless it's already there and empty - [ -d $PGDATA -a `ls -l $PGDATA 2> /dev/null | wc -l` -eq 1 ] || mkdir -p $PGDATA - chown postgres $PGDATA - echo "Initialising PostgreSQL database..." - su postgres -c "$PGINIT -D $PGDATA > /dev/null" - ;; - -*) - echo "Usage: $0 (init|start|stop|restart|reload|status)" - ;; - -esac - Copied: csw/mgar/pkg/postgresql/trunk/files/cswpostgres.tmpl (from rev 7363, csw/mgar/pkg/postgresql/trunk/files/cswpostgres) =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/cswpostgres.tmpl (rev 0) +++ csw/mgar/pkg/postgresql/trunk/files/cswpostgres.tmpl 2009-11-30 00:35:28 UTC (rev 7506) @@ -0,0 +1,113 @@ +#!/bin/sh +# $Id$ +# +# PostgreSQL startup script - part of the CSWpostgresql package +# mark at blastwave.org +# +# 2009-11-29: Parametrized file locations +# Maciej Blizinski (maciej at opencsw.org) +# +# Variables to substitute: +# - PGDATA +# - bindir +# - sysconfdir + + +# Read in the user configuration file +[ -s /opt/csw/etc/postgresql.conf ] && . /opt/csw/etc/postgresql.conf +[ -s @sysconfdir@/postgresql.conf ] && . @sysconfdir@/postgresql.conf + +# Defaults +[ -z "${PGDATA}" ] && PGDATA=@PGDATA@ +[ -z "${PGCTL}" ] && PGCTL=@bindir@/sparcv8/pg_ctl +[ -z "${PGINIT}" ] && PGINIT=@bindir@/sparcv8/initdb + + +# The following attempts to catch any mistakes in the server +# version - it checks if the 64-bit server was last run. If so, +# it forces the 64-bit server, otherwise it won't start up! +# And vice-versa for the 32-bit server... +if [ -f "${PGDATA}/postmaster.opts" ]; then + if grep 'sparcv9' ${PGDATA}/postmaster.opts > /dev/null; then + echo ${PGCTL} | grep "sparcv8" > /dev/null + if [ $? -eq 0 ]; then + echo "Warning: 32-bit server was specified in /etc/init.d/cswpostgres," + echo " but 64-bit version was last run. Using 64-bit server..." + fi + PGCTL=@bindir@/sparcv9/pg_ctl + PGINIT=@bindir@/sparcv9/initdb + elif grep 'sparcv8' ${PGDATA}/postmaster.opts > /dev/null; then + # Detected 32-bit server last used + echo "${PGCTL}" | grep "sparcv8" > /dev/null + if [ $? -ne 0 ]; then + echo "Warning: 64-bit server was specified in /etc/init.d/cswpostgres," + echo " but 32-bit version was last run. Using 32-bit server..." + fi + PGCTL=@bindir@/sparcv8/pg_ctl + PGINIT=@bindir@/sparcv8/initdb + else + echo "Couldn't detect whether the previously run version was 32 or 64-bit." + PGCTL=@bindir@/pg_ctl + PGINIT=@bindir@/initdb + fi +fi + +# Exit if postgres user hasn't been created. +grep '^postgres:' /etc/passwd >/dev/null +if [ $? -ne 0 ] ; then + getent passwd postgres >/dev/null + if [ $? -ne 0 ] ; then + exit 0 + fi +fi + +# Change to /var/tmp, as pgctl etc. need to be started from +# a directory that they can read +cd /var/tmp + +case "${1}" in +start) + if [ -d ${PGDATA} -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -gt 1 ]; then + # PostgreSQL data directory exists and is populated + echo "Starting PostgreSQL..." + su postgres -c "${PGCTL} -D ${PGDATA} -l ${PGDATA}/postgresql.log start ${SERVEROPTS}" + fi + ;; + +stop) + echo "Stopping PostgreSQL database..." + su postgres -c "${PGCTL} -D ${PGDATA} -l ${PGDATA}/postgresql.log stop" + ;; + +restart) + echo "Restarting PostgreSQL database..." + su postgres -c "${PGCTL} -D ${PGDATA} -l ${PGDATA}/postgresql.log restart ${SERVEROPTS}" + ;; + +reload) + echo "Reloading PostgreSQL database..." + su postgres -c "${PGCTL} -D ${PGDATA} -l ${PGDATA}/postgresql.log reload ${SERVEROPTS}" + ;; + +status) + su postgres -c "${PGCTL} -D ${PGDATA} status" + ;; + +init) + # create and initialise data directory + echo "Creating PostgreSQL data directory at ${PGDATA}..." + # Create it, unless it's already there and empty + [ -d ${PGDATA} -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -eq 1 ] || mkdir -p "${PGDATA}" + chown postgres "${PGDATA}" + chmod 0700 "${PGDATA}" + echo "Initialising PostgreSQL database..." + su postgres -c "${PGINIT} -D ${PGDATA} -E utf-8" + ;; + +*) + echo "Usage: ${0} (init|start|stop|restart|reload|status)" + ;; + +esac + +# vim:set sw=2 ts=2 sts=2 expandtab: Deleted: csw/mgar/pkg/postgresql/trunk/files/cswusergroup =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/cswusergroup 2009-11-29 18:44:36 UTC (rev 7505) +++ csw/mgar/pkg/postgresql/trunk/files/cswusergroup 2009-11-30 00:35:28 UTC (rev 7506) @@ -1 +0,0 @@ -postgres::CSW Postgres:/opt/csw/var/pgdata:/bin/sh:: Copied: csw/mgar/pkg/postgresql/trunk/files/cswusergroup.tmpl (from rev 7363, csw/mgar/pkg/postgresql/trunk/files/cswusergroup) =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/cswusergroup.tmpl (rev 0) +++ csw/mgar/pkg/postgresql/trunk/files/cswusergroup.tmpl 2009-11-30 00:35:28 UTC (rev 7506) @@ -0,0 +1 @@ +postgres::CSW Postgres:@PGDATA@:/bin/sh:: Deleted: csw/mgar/pkg/postgresql/trunk/files/postgresql.conf =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/postgresql.conf 2009-11-29 18:44:36 UTC (rev 7505) +++ csw/mgar/pkg/postgresql/trunk/files/postgresql.conf 2009-11-30 00:35:28 UTC (rev 7506) @@ -1,34 +0,0 @@ -# Example PostgreSQL server configuration file. -# Provided by the Blastwave package of PostgreSQL. -# This file is read by the /etc/init.d/cswpostgres startup script, -# and can be used to override the defaults. - -# The location of the data directory. -# Default : /opt/csw/var/pgdata -PGDATA=/opt/csw/var/pgdata - - -# Which binaries to use, 32- or 64-bit. -# Only use the 64-bit server if you're sure you need it. -# Make sure you have read /opt/csw/postgresql/share/doc/README-CSW.txt -# before changing these, as your databases may not work without -# a 'dump and restore' cycle ! - -# 32-bit server - default, and fine for most uses -PGCTL=/opt/csw/postgresql/bin/sparcv8/pg_ctl -PGINIT=/opt/csw/postgresql/bin/sparcv8/initdb - -# 64-bit server - uncomment these lines only if you really need them. -#PGCTL=/opt/csw/postgresql/bin/sparcv9/pg_ctl -#PGINIT=/opt/csw/postgresql/bin/sparcv9/initdb - - -# Additional options to pass to postmaster. -# These options will be passed to the postmaster program. The most common use of -# these is to allow network access to PostgreSQL from other hosts over TCP/IP. -# This is done by using the flags "-o -i", as in the example below. -# Uncomment this line to enable network access to PostgreSQL. -# Note that you will still need to configure authentication in the pg_hba.conf -# in your data directory. -# SERVEROPTS="-o -i" - Copied: csw/mgar/pkg/postgresql/trunk/files/postgresql.conf.tmpl (from rev 7363, csw/mgar/pkg/postgresql/trunk/files/postgresql.conf) =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/postgresql.conf.tmpl (rev 0) +++ csw/mgar/pkg/postgresql/trunk/files/postgresql.conf.tmpl 2009-11-30 00:35:28 UTC (rev 7506) @@ -0,0 +1,37 @@ +# Example PostgreSQL server configuration file. +# +# Provided by the OpenCSW package of PostgreSQL. This file is read by the +# /etc/opt/csw/init.d/cswpostgres startup script, and can be used to override +# the defaults. + +# The location of the data directory. +# Default : /opt/csw/var/pgdata +PGDATA=@PGDATA@ + +# Which binaries to use, 32- or 64-bit. Only use the 64-bit server if you're +# sure you need it. Make sure you have read +# /opt/csw/postgresql/share/doc/README-CSW.txt before changing these, as your +# databases may not work without a 'dump and restore' cycle! + +# 32-bit server - default, and fine for most uses +# +# PGCTL=/opt/csw/postgresql/bin/sparcv8/pg_ctl +# PGINIT=/opt/csw/postgresql/bin/sparcv8/initdb + +# 64-bit server - uncomment these lines only if you really need them. +# +# PGCTL=/opt/csw/postgresql/bin/sparcv9/pg_ctl +# PGINIT=/opt/csw/postgresql/bin/sparcv9/initdb + + +# Additional options to pass to postmaster. +# +# These options will be passed to the postmaster program. The most common use +# of these is to allow network access to PostgreSQL from other hosts over +# TCP/IP. This is done by using the flags "-o -i", as in the example below. +# Uncomment this line to enable network access to PostgreSQL. Note that you +# will still need to configure authentication in the pg_hba.conf in your data +# directory. +# +# SERVEROPTS="-o -i" + 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 Nov 30 01:52:31 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 30 Nov 2009 00:52:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7507] csw/mgar/pkg/postgresql/trunk Message-ID: Revision: 7507 http://gar.svn.sourceforge.net/gar/?rev=7507&view=rev Author: wahwah Date: 2009-11-30 00:52:31 +0000 (Mon, 30 Nov 2009) Log Message: ----------- postgresql: Setting the devel package ARCHALL Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/postgresql/trunk/files/cswusergroup.tmpl csw/mgar/pkg/postgresql/trunk/files/postgresql.conf.tmpl Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2009-11-30 00:35:28 UTC (rev 7506) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2009-11-30 00:52:31 UTC (rev 7507) @@ -57,6 +57,8 @@ REQUIRED_PKGS_CSWpostgresql = CSWreadline CSWzlib CSWlibpq REQUIRED_PKGS_CSWpostgresqldevel = CSWpostgresql +ARCHALL_CSWpostgresqldevel = 1 + LICENSE = COPYRIGHT EXTRA_INC = $(BUILD_PREFIX)/include @@ -92,13 +94,8 @@ PKGFILES_CSWlibpq = $(PKGFILES_RT) PKGFILES_CSWlibpq += $(libdir)/64 -# -> TODO: start in rc3.d S10, Stop everywhere else in K90 INITSMF = /etc$(prefix)/init\.d/cswpostgres-$(BASE_VERSION) - -# -> TODO: Migrate $(prefix)/var/pgdata to /var$(prefix)/postgresql/pgdata USERGROUP = /etc$(prefix)/pkg/postgresql-$(BASE_VERSION) - -# -> TODO: Migrate $(prefix)/etc/postgresql.conf to /etc$(prefix)/postgresql.conf PRESERVECONF = $(sysconfdir)/postgresql\.conf BIN_NAMES = clusterdb createdb createlang createuser dropdb droplang dropuser Property changes on: csw/mgar/pkg/postgresql/trunk/files/cswusergroup.tmpl ___________________________________________________________________ Added: svn:keywords + files/cswpostgres.tmpl Property changes on: csw/mgar/pkg/postgresql/trunk/files/postgresql.conf.tmpl ___________________________________________________________________ Added: svn:keywords + files/cswpostgres.tmpl 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 Nov 30 17:13:47 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 30 Nov 2009 16:13:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[7508] csw/mgar/pkg/bind/trunk Message-ID: Revision: 7508 http://gar.svn.sourceforge.net/gar/?rev=7508&view=rev Author: bonivart Date: 2009-11-30 16:13:46 +0000 (Mon, 30 Nov 2009) Log Message: ----------- bind: fix bug with config files having double extension, added chroot package Modified Paths: -------------- csw/mgar/pkg/bind/trunk/Makefile csw/mgar/pkg/bind/trunk/checksums csw/mgar/pkg/bind/trunk/files/CSWbind.cswnamed Added Paths: ----------- csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall csw/mgar/pkg/bind/trunk/files/bind.CSW Property Changed: ---------------- csw/mgar/pkg/bind/trunk/files/ Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2009-11-30 00:52:31 UTC (rev 7507) +++ csw/mgar/pkg/bind/trunk/Makefile 2009-11-30 16:13:46 UTC (rev 7508) @@ -19,16 +19,16 @@ DISTFILES = $(DISTNAME).tar.gz #MASTER_SITES = http://ftp.isc.org/isc/bind9/$(GARVERSION)/ #DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += CSWbindchroot.postinstall -PACKAGES = CSWbind CSWbinddevel CSWlibbind CSWbindutils -#PACKAGES = CSWbind CSWbinddevel CSWlibbind CSWbindutils CSWbindchroot +PACKAGES = CSWbind CSWbinddevel CSWlibbind CSWbindutils CSWbindchroot CATALOGNAME_CSWbinddevel = bind_devel CATALOGNAME_CSWbindutils = bind_utils -#CATALOGNAME_CSWbindchroot = bind_chroot +CATALOGNAME_CSWbindchroot = bind_chroot ARCHALL_CSWbinddevel = 1 -#ARCHALL_CSWbindchroot = 1 +ARCHALL_CSWbindchroot = 1 LICENSE = COPYRIGHT @@ -36,13 +36,13 @@ SPKG_DESC_CSWbinddevel = ISC BIND DNS development package SPKG_DESC_CSWlibbind = ISC BIND DNS library package SPKG_DESC_CSWbindutils = ISC BIND DNS utilities package -#SPKG_DESC_CSWbindchroot = ISC BIND DNS chroot package +SPKG_DESC_CSWbindchroot = ISC BIND DNS chroot package REQUIRED_PKGS_CSWbind = CSWlibbind CSWbindutils CSWiconv CSWlibxml2 CSWosslrt CSWzlib REQUIRED_PKGS_CSWbinddevel = CSWbind REQUIRED_PKGS_CSWlibbind = CSWiconv CSWlibxml2 CSWosslrt CSWzlib REQUIRED_PKGS_CSWbindutils = CSWlibbind CSWiconv CSWlibxml2 CSWosslrt CSWzlib -#REQUIRED_PKGS_CSWbindchroot = CSWbind +REQUIRED_PKGS_CSWbindchroot = CSWbind # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = http://ftp.isc.org/isc/bind9/ @@ -61,22 +61,23 @@ PKGFILES_CSWbinddevel = $(PKGFILES_DEVEL) PKGFILES_CSWlibbind = $(libdir)/.* PKGFILES_CSWbindutils = $(bindir)/.* -#PKGFILES_CSWbindchroot = .*chroot.* +PKGFILES_CSWbindchroot = .*chroot.* INSTALL_SCRIPTS = custom PROTOTYPE_FILTER = awk ' \ - $$$$3 ~ /\/var\/opt\/csw\/named/ { $$$$5 = "named" ; $$$$2 = "ugfiles" } \ + $$$$3 ~ /\/var\/opt\/csw\/named/ { $$$$2 = "ugfiles" ; $$$$5 = "named" ; $$$$6 = "named" } \ { print }' -INITSMF = .*/init.d/cswnamed -SAMPLECONF = .*/named.conf.CSW -USERGROUP = .*/CSWbind/cswusergroup +INITSMF = /etc/opt/csw/init.d/cswnamed +SAMPLECONF = /etc/opt/csw/named.conf /etc/opt/csw/CSWbind/bind +USERGROUP = /etc/opt/csw/CSWbind/cswusergroup SPKG_SOURCEURL = http://www.isc.org/software/bind # Still needed because of ugfiles SPKG_CLASSES_CSWbind = none cswusergroup ugfiles cswcpsampleconf cswinitsmf +SPKG_CLASSES_CSWbindchroot = none ugfiles include gar/category.mk @@ -85,10 +86,11 @@ install-custom: @echo " ==> Installing $(GARNAME) (custom)" @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d - @cp $(FILEDIR)/CSWbind.cswnamed $(DESTDIR)/etc/opt/csw/init.d/cswnamed - @cp $(FILEDIR)/CSWbind.named.conf.CSW $(DESTDIR)/etc/opt/csw/named.conf.CSW - @ginstall -m 755 -d $(DESTDIR)/opt/csw/etc/CSWbind - @cp $(FILEDIR)/cswusergroup $(DESTDIR)/opt/csw/etc/CSWbind/ + @ginstall -m 755 $(FILEDIR)/CSWbind.cswnamed $(DESTDIR)/etc/opt/csw/init.d/cswnamed + @ginstall -m 644 $(FILEDIR)/CSWbind.named.conf.CSW $(DESTDIR)/etc/opt/csw/named.conf + @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/CSWbind + @ginstall -m 444 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/CSWbind/ + @ginstall -m 644 $(FILEDIR)/bind.CSW $(DESTDIR)/etc/opt/csw/CSWbind/bind @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME) @$(foreach DOC,$(DOCLIST),cp $(FILEDIR)/$(DOC) $(DESTDIR)$(docdir)/$(GARNAME);) ( cd $(WORKSRC) ; \ @@ -96,26 +98,6 @@ @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/named @touch $(DESTDIR)/var/opt/csw/named/named.pid @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/named/chroot/dev - @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/named/chroot/etc + @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/named/chroot/etc/opt/csw @ginstall -m 755 -d $(DESTDIR)/var/opt/csw/named/chroot/var/named @$(MAKECOOKIE) - -# run bind chroot'ed: -# (from CentOS 5.3) -# /var/named/chroot -# /var/named/chroot/dev -# /var/named/chroot/dev/null -# /var/named/chroot/dev/random -# /var/named/chroot/dev/zero -# /var/named/chroot/etc -# /var/named/chroot/etc/named.caching-nameserver.conf -# /var/named/chroot/etc/named.conf -# /var/named/chroot/etc/rndc.conf -# /var/named/chroot/var -# /var/named/chroot/var/log/named.log -# /var/named/chroot/var/named -# /var/named/chroot/var/named/data -# /var/named/chroot/var/named/slaves -# /var/named/chroot/var/run -# /var/named/chroot/var/run/named -# /var/named/chroot/var/tmp Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2009-11-30 00:52:31 UTC (rev 7507) +++ csw/mgar/pkg/bind/trunk/checksums 2009-11-30 16:13:46 UTC (rev 7508) @@ -1 +1,2 @@ +d6d238e2a0f583709f2d1076114cb0c5 CSWbindchroot.postinstall 435bc2e26e470d46ddf2acb24abb6ea6 bind-9.6.1-P2.tar.gz Property changes on: csw/mgar/pkg/bind/trunk/files ___________________________________________________________________ Modified: svn:ignore - CSWbindchroot.* + Modified: csw/mgar/pkg/bind/trunk/files/CSWbind.cswnamed =================================================================== --- csw/mgar/pkg/bind/trunk/files/CSWbind.cswnamed 2009-11-30 00:52:31 UTC (rev 7507) +++ csw/mgar/pkg/bind/trunk/files/CSWbind.cswnamed 2009-11-30 16:13:46 UTC (rev 7508) @@ -4,13 +4,22 @@ #RC_SLEV 2 # rc-script for CSW Bind -# Peter Bonivart, 2009-01-24 +# Peter Bonivart, 2009-11-30 USER=named #OPTIONS="-d 1" # debug mode #OPTIONS="-c /opt/csw/etc/named.conf" # use old location of conf file OPTIONS="-u $USER" +if [ -r /etc/opt/csw/pkg/CSWbind/bind && /bin/egrep -q '^ROOTDIR=' /etc/opt/csw/pkg/CSWbind/bind ]; then + :; +else + echo ROOTDIR="/var/named/chroot" >> /etc/sysconfig/named; +fi + +# Source config file +[ -r /etc/opt/csw/pkg/CSWbind/bind ] && . /etc/opt/csw/pkg/CSWbind/bind + ZONE= # used for initialization, do not change case "$1" in @@ -18,7 +27,7 @@ if [ -f /opt/csw/sbin/named -a -f /etc/opt/csw/named.conf ]; then echo 'Starting bind.' # ulimit -n 1024 - /opt/csw/sbin/named $OPTIONS & + /opt/csw/sbin/named $OPTIONS $ROOTDIR & fi ;; stop) Added: csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall =================================================================== --- csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall (rev 0) +++ csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall 2009-11-30 16:13:46 UTC (rev 7508) @@ -0,0 +1,34 @@ +#!/bin/sh + +ROOTDIR=/var/opt/csw/named/chroot + +# Create devices +DEVICELIST="null poll random zero" + +for i in $DEVICELIST +do + DEV=`ls -l /dev/$i | awk '{print $11}'` + DEVICE=`ls -l /dev/$DEV` + MAJOR=`echo $DEVICE | awk '{print $5}' | awk -F',' '{print $1}'` + MINOR=`echo $DEVICE | awk '{print $6}'` + echo "Creating device $i ($MAJOR,$MINOR)" + mknod $ROOTDIR/dev/$i $MAJOR $MINOR +done + +# Copy config from /etc/opt/csw +cp /etc/opt/csw/named.conf $ROOTDIR/etc/opt/csw + +# Timezone info +cp -p /etc/TIMEZONE $ROOTDIR/etc + +# change owner on all files/dirs under /var/opt/csw/named/chroot +chown -R named:named $ROOTDIR + +# show info about svc +echo +echo "System prepared for chrooted BIND." +echo +echo "Move your zone files into $ROOTDIR/var/named" +echo "and your rndc keys and so on into $ROOTDIR/etc/opt/csw." +echo +echo "The directory option in named.conf must be set to $ROOTDIR/var/named." Added: csw/mgar/pkg/bind/trunk/files/bind.CSW =================================================================== --- csw/mgar/pkg/bind/trunk/files/bind.CSW (rev 0) +++ csw/mgar/pkg/bind/trunk/files/bind.CSW 2009-11-30 16:13:46 UTC (rev 7508) @@ -0,0 +1,8 @@ +# This is where you customize some settings of your BIND installation so +# you don't have to edit the scripts themselves as they will be replaced during +# upgrades. +# +# Peter Bonivart, OpenCSW + +# Chroot directory +#ROOTDIR=/var/opt/csw/named/chroot 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 Nov 30 18:20:38 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 30 Nov 2009 17:20:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[7509] csw/mgar/pkg/bind/trunk Message-ID: Revision: 7509 http://gar.svn.sourceforge.net/gar/?rev=7509&view=rev Author: bonivart Date: 2009-11-30 17:20:19 +0000 (Mon, 30 Nov 2009) Log Message: ----------- bind: fix chroot stuff Modified Paths: -------------- csw/mgar/pkg/bind/trunk/Makefile csw/mgar/pkg/bind/trunk/files/CSWbind.cswnamed csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2009-11-30 16:13:46 UTC (rev 7508) +++ csw/mgar/pkg/bind/trunk/Makefile 2009-11-30 17:20:19 UTC (rev 7509) @@ -70,8 +70,8 @@ { print }' INITSMF = /etc/opt/csw/init.d/cswnamed -SAMPLECONF = /etc/opt/csw/named.conf /etc/opt/csw/CSWbind/bind -USERGROUP = /etc/opt/csw/CSWbind/cswusergroup +SAMPLECONF = /etc/opt/csw/named.conf /etc/opt/csw/pkg/CSWbind/bind +USERGROUP = /etc/opt/csw/pkg/CSWbind/cswusergroup SPKG_SOURCEURL = http://www.isc.org/software/bind @@ -88,9 +88,9 @@ @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d @ginstall -m 755 $(FILEDIR)/CSWbind.cswnamed $(DESTDIR)/etc/opt/csw/init.d/cswnamed @ginstall -m 644 $(FILEDIR)/CSWbind.named.conf.CSW $(DESTDIR)/etc/opt/csw/named.conf - @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/CSWbind - @ginstall -m 444 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/CSWbind/ - @ginstall -m 644 $(FILEDIR)/bind.CSW $(DESTDIR)/etc/opt/csw/CSWbind/bind + @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWbind + @ginstall -m 444 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWbind/ + @ginstall -m 644 $(FILEDIR)/bind.CSW $(DESTDIR)/etc/opt/csw/pkg/CSWbind/bind @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME) @$(foreach DOC,$(DOCLIST),cp $(FILEDIR)/$(DOC) $(DESTDIR)$(docdir)/$(GARNAME);) ( cd $(WORKSRC) ; \ Modified: csw/mgar/pkg/bind/trunk/files/CSWbind.cswnamed =================================================================== --- csw/mgar/pkg/bind/trunk/files/CSWbind.cswnamed 2009-11-30 16:13:46 UTC (rev 7508) +++ csw/mgar/pkg/bind/trunk/files/CSWbind.cswnamed 2009-11-30 17:20:19 UTC (rev 7509) @@ -11,12 +11,6 @@ #OPTIONS="-c /opt/csw/etc/named.conf" # use old location of conf file OPTIONS="-u $USER" -if [ -r /etc/opt/csw/pkg/CSWbind/bind && /bin/egrep -q '^ROOTDIR=' /etc/opt/csw/pkg/CSWbind/bind ]; then - :; -else - echo ROOTDIR="/var/named/chroot" >> /etc/sysconfig/named; -fi - # Source config file [ -r /etc/opt/csw/pkg/CSWbind/bind ] && . /etc/opt/csw/pkg/CSWbind/bind @@ -25,13 +19,17 @@ case "$1" in start) if [ -f /opt/csw/sbin/named -a -f /etc/opt/csw/named.conf ]; then - echo 'Starting bind.' + echo "Starting bind." + if [ -n "$ROOTDIR" ]; then + echo ROOTDIR set to $ROOTDIR + ROOTDIR="-t $ROOTDIR" + fi # ulimit -n 1024 /opt/csw/sbin/named $OPTIONS $ROOTDIR & fi ;; stop) - echo 'Shutting down bind.' + echo "Shutting down bind." if [ -x /usr/bin/zonename ]; then if [ "`/usr/bin/zonename`" = "global" ]; then ZONE="-z global" @@ -40,7 +38,7 @@ pkill $ZONE -x named ;; reload|refresh) - echo 'Reloading bind.' + echo "Reloading bind." if [ -x /usr/bin/zonename ]; then if [ "`/usr/bin/zonename`" = "global" ]; then ZONE="-z global" Modified: csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall =================================================================== --- csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall 2009-11-30 16:13:46 UTC (rev 7508) +++ csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall 2009-11-30 17:20:19 UTC (rev 7509) @@ -12,7 +12,7 @@ MAJOR=`echo $DEVICE | awk '{print $5}' | awk -F',' '{print $1}'` MINOR=`echo $DEVICE | awk '{print $6}'` echo "Creating device $i ($MAJOR,$MINOR)" - mknod $ROOTDIR/dev/$i $MAJOR $MINOR + mknod $ROOTDIR/dev/$i c $MAJOR $MINOR done # Copy config from /etc/opt/csw @@ -24,11 +24,11 @@ # change owner on all files/dirs under /var/opt/csw/named/chroot chown -R named:named $ROOTDIR -# show info about svc +# show info echo echo "System prepared for chrooted BIND." echo echo "Move your zone files into $ROOTDIR/var/named" -echo "and your rndc keys and so on into $ROOTDIR/etc/opt/csw." +echo "and your rndc key into $ROOTDIR/etc/opt/csw." echo -echo "The directory option in named.conf must be set to $ROOTDIR/var/named." +echo "The directory option in named.conf must be set to /var/named." 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 Nov 30 18:28:40 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 30 Nov 2009 17:28:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[7510] csw/mgar/pkg/bind/trunk/checksums Message-ID: Revision: 7510 http://gar.svn.sourceforge.net/gar/?rev=7510&view=rev Author: bonivart Date: 2009-11-30 17:28:39 +0000 (Mon, 30 Nov 2009) Log Message: ----------- bind: update checksums Modified Paths: -------------- csw/mgar/pkg/bind/trunk/checksums Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2009-11-30 17:20:19 UTC (rev 7509) +++ csw/mgar/pkg/bind/trunk/checksums 2009-11-30 17:28:39 UTC (rev 7510) @@ -1,2 +1,2 @@ -d6d238e2a0f583709f2d1076114cb0c5 CSWbindchroot.postinstall +c6ffb73202550e7c87d0561179fddccf CSWbindchroot.postinstall 435bc2e26e470d46ddf2acb24abb6ea6 bind-9.6.1-P2.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 Nov 30 21:05:20 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 30 Nov 2009 20:05:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[7511] csw/mgar/pkg/bind/trunk Message-ID: Revision: 7511 http://gar.svn.sourceforge.net/gar/?rev=7511&view=rev Author: bonivart Date: 2009-11-30 20:05:20 +0000 (Mon, 30 Nov 2009) Log Message: ----------- bind: fix more chroot stuff Modified Paths: -------------- csw/mgar/pkg/bind/trunk/checksums csw/mgar/pkg/bind/trunk/files/CSWbind.cswnamed csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall csw/mgar/pkg/bind/trunk/files/bind.CSW Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2009-11-30 17:28:39 UTC (rev 7510) +++ csw/mgar/pkg/bind/trunk/checksums 2009-11-30 20:05:20 UTC (rev 7511) @@ -1,2 +1,2 @@ -c6ffb73202550e7c87d0561179fddccf CSWbindchroot.postinstall +4e64ed13da0d0e18aa770d6279df834a CSWbindchroot.postinstall 435bc2e26e470d46ddf2acb24abb6ea6 bind-9.6.1-P2.tar.gz Modified: csw/mgar/pkg/bind/trunk/files/CSWbind.cswnamed =================================================================== --- csw/mgar/pkg/bind/trunk/files/CSWbind.cswnamed 2009-11-30 17:28:39 UTC (rev 7510) +++ csw/mgar/pkg/bind/trunk/files/CSWbind.cswnamed 2009-11-30 20:05:20 UTC (rev 7511) @@ -6,11 +6,6 @@ # rc-script for CSW Bind # Peter Bonivart, 2009-11-30 -USER=named -#OPTIONS="-d 1" # debug mode -#OPTIONS="-c /opt/csw/etc/named.conf" # use old location of conf file -OPTIONS="-u $USER" - # Source config file [ -r /etc/opt/csw/pkg/CSWbind/bind ] && . /etc/opt/csw/pkg/CSWbind/bind @@ -25,7 +20,7 @@ ROOTDIR="-t $ROOTDIR" fi # ulimit -n 1024 - /opt/csw/sbin/named $OPTIONS $ROOTDIR & + /opt/csw/sbin/named -u named $OPTIONS $ROOTDIR & fi ;; stop) Modified: csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall =================================================================== --- csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall 2009-11-30 17:28:39 UTC (rev 7510) +++ csw/mgar/pkg/bind/trunk/files/CSWbindchroot.postinstall 2009-11-30 20:05:20 UTC (rev 7511) @@ -32,3 +32,5 @@ echo "and your rndc key into $ROOTDIR/etc/opt/csw." echo echo "The directory option in named.conf must be set to /var/named." +echo +echo "Uncomment the ROOTDIR option in /etc/opt/csw/pkg/CSWbind/bind." Modified: csw/mgar/pkg/bind/trunk/files/bind.CSW =================================================================== --- csw/mgar/pkg/bind/trunk/files/bind.CSW 2009-11-30 17:28:39 UTC (rev 7510) +++ csw/mgar/pkg/bind/trunk/files/bind.CSW 2009-11-30 20:05:20 UTC (rev 7511) @@ -4,5 +4,8 @@ # # Peter Bonivart, OpenCSW +# Options +#OPTIONS="" + # Chroot directory #ROOTDIR=/var/opt/csw/named/chroot This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.