From dmichelsen at users.sourceforge.net Tue Sep 1 11:48:33 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Sep 2009 09:48:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[6151] csw/mgar/pkg/pigz/trunk/Makefile Message-ID: Revision: 6151 http://gar.svn.sourceforge.net/gar/?rev=6151&view=rev Author: dmichelsen Date: 2009-09-01 09:48:33 +0000 (Tue, 01 Sep 2009) Log Message: ----------- pigz: Disable unneeded ISAs, set runpath and add unpigz Modified Paths: -------------- csw/mgar/pkg/pigz/trunk/Makefile Modified: csw/mgar/pkg/pigz/trunk/Makefile =================================================================== --- csw/mgar/pkg/pigz/trunk/Makefile 2009-08-31 15:52:29 UTC (rev 6150) +++ csw/mgar/pkg/pigz/trunk/Makefile 2009-09-01 09:48:33 UTC (rev 6151) @@ -26,7 +26,8 @@ REQUIRED_PKGS = CSWzlib -REQUESTED_ISAS = $(ISALIST_$(GARCOMPILER)) +# Optimization show effects < 5% +#REQUESTED_ISAS = $(ISALIST_$(GARCOMPILER)) CONFIGURE_SCRIPTS = BUILD_SCRIPTS = custom @@ -38,12 +39,13 @@ build-custom: cd $(WORKSRC) && $(CC) $(CFLAGS) -c yarn.c cd $(WORKSRC) && $(CC) $(CFLAGS) -c pigz.c - cd $(WORKSRC) && $(CC) $(LDFLAGS) -o pigz yarn.o pigz.o -lpthread -lz + cd $(WORKSRC) && LD_OPTIONS="$(LD_OPTIONS)" $(CC) $(LDFLAGS) -o pigz yarn.o pigz.o -lpthread -lz @$(MAKECOOKIE) install-custom: ginstall -d $(DESTDIR)$(bindir) ginstall $(WORKSRC)/pigz $(DESTDIR)$(bindir) + cd $(DESTDIR)$(bindir) && gln pigz unpigz ginstall -d $(DESTDIR)$(mandir)/man1 ginstall $(WORKSRC)/pigz.1 $(DESTDIR)$(mandir)/man1 ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Tue Sep 1 18:04:02 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Tue, 01 Sep 2009 16:04:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[6152] csw/mgar/pkg Message-ID: Revision: 6152 http://gar.svn.sourceforge.net/gar/?rev=6152&view=rev Author: idogan23 Date: 2009-09-01 16:04:02 +0000 (Tue, 01 Sep 2009) Log Message: ----------- freeradius: Initial commit Added Paths: ----------- csw/mgar/pkg/freeradius/ csw/mgar/pkg/freeradius/branches/ csw/mgar/pkg/freeradius/tags/ csw/mgar/pkg/freeradius/trunk/ csw/mgar/pkg/freeradius/trunk/Makefile csw/mgar/pkg/freeradius/trunk/checksums csw/mgar/pkg/freeradius/trunk/files/ Property changes on: csw/mgar/pkg/freeradius/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/freeradius/trunk/Makefile =================================================================== --- csw/mgar/pkg/freeradius/trunk/Makefile (rev 0) +++ csw/mgar/pkg/freeradius/trunk/Makefile 2009-09-01 16:04:02 UTC (rev 6152) @@ -0,0 +1,52 @@ +GARNAME = freeradius +GARVERSION = 2.1.6 +CATEGORIES = server + +DESCRIPTION = A free RADIUS server implementation +define BLURB + A free RADIUS server implementation +endef + +MASTER_SITES = http://freeradius.org/ +DISTFILES = $(GARNAME)-server-$(GARVERSION).tar.gz +DISTNAME = $(GARNAME)-server-$(GARVERSION) + +# 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 = GCC3 + +STRIP_LIBTOOL = 1 + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-system-libtool +CONFIGURE_ARGS += --without-rlm_sqlippool +CONFIGURE_ARGS += --without-rlm_sql_mysql +CONFIGURE_ARGS += --without-rlm_sql_postgresql +CONFIGURE_ARGS += --without-rlm_sql_db2 +CONFIGURE_ARGS += --without-rlm_sql_firebird +CONFIGURE_ARGS += --without-rlm_sql_freetds +CONFIGURE_ARGS += --without-rlm_sql_iodbc +CONFIGURE_ARGS += --without-rlm_sql_oracle +CONFIGURE_ARGS += --without-rlm_sql_sybase +CONFIGURE_ARGS += --without-rlm_sql_unixodbc +CONFIGURE_ARGS += --without-rlm-ldap +CONFIGURE_ARGS += --without-rlm_eap_ikev2 +CONFIGURE_ARGS += --without-rlm_eap_sim +CONFIGURE_ARGS += --without-rlm_eap_tls +CONFIGURE_ARGS += --without-rlm_eap_peap +CONFIGURE_ARGS += --without-rlm_eap_ttls +CONFIGURE_ARGS += --without-rlm_eap_tnc +CONFIGURE_ARGS += --without-rlm_krb5 +CONFIGURE_ARGS += --without-rlm_dbm +CONFIGURE_ARGS += --without-rlm_otp +CONFIGURE_ARGS += --without-rlm_pam +CONFIGURE_ARGS += --without-rlm_python +CONFIGURE_ARGS += --without-snmp + +include gar/category.mk +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/freeradius/trunk/checksums =================================================================== --- csw/mgar/pkg/freeradius/trunk/checksums (rev 0) +++ csw/mgar/pkg/freeradius/trunk/checksums 2009-09-01 16:04:02 UTC (rev 6152) @@ -0,0 +1 @@ +078f7d29b4d2d34f7c992abf772c28a0 download/freeradius-server-2.1.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 Tue Sep 1 18:28:18 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Sep 2009 16:28:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[6153] csw/mgar/pkg/libxml2/trunk/Makefile Message-ID: Revision: 6153 http://gar.svn.sourceforge.net/gar/?rev=6153&view=rev Author: dmichelsen Date: 2009-09-01 16:28:18 +0000 (Tue, 01 Sep 2009) Log Message: ----------- libxml2: Adjust catalog name of python module to be prefixed with py_ and set package descriptions Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2009-09-01 16:04:02 UTC (rev 6152) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2009-09-01 16:28:18 UTC (rev 6153) @@ -17,8 +17,12 @@ CATALOGNAME_CSWlibxml2 = libxml2 CATALOGNAME_CSWlibxml2devel = libxml2_devel -CATALOGNAME_CSWpylibxml2 = pylibxml2 +CATALOGNAME_CSWpylibxml2 = py_libxml2 +SPKG_DESC_CSWlibxml2 = XML Parser Library +SPKG_DESC_CSWlibxml2devel = XML Parser Library Developer Files +SPKG_DESC_CSWpylibxml2 = XML Parser Library Python Bindings + REQUIRED_PKGS_CSWlibxml2 = CSWiconv CSWzlib REQUIRED_PKGS_CSWlibxml2devel = CSWlibxml2 REQUIRED_PKGS_CSWpylibxml2 = CSWpython CSWlibxml2 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 Sep 1 20:12:04 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 01 Sep 2009 18:12:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[6154] csw/mgar/pkg/unixodbc/trunk Message-ID: Revision: 6154 http://gar.svn.sourceforge.net/gar/?rev=6154&view=rev Author: wahwah Date: 2009-09-01 18:12:04 +0000 (Tue, 01 Sep 2009) Log Message: ----------- unixodbc: Postinstall script which helps migrate configuration files to /etc/opt/csw. Modified Paths: -------------- csw/mgar/pkg/unixodbc/trunk/Makefile csw/mgar/pkg/unixodbc/trunk/checksums Added Paths: ----------- csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall Modified: csw/mgar/pkg/unixodbc/trunk/Makefile =================================================================== --- csw/mgar/pkg/unixodbc/trunk/Makefile 2009-09-01 16:28:18 UTC (rev 6153) +++ csw/mgar/pkg/unixodbc/trunk/Makefile 2009-09-01 18:12:04 UTC (rev 6154) @@ -10,33 +10,19 @@ define BLURB It does stuff with things endef - DL_NAME = unixODBC - MASTER_SITES = http://www.unixodbc.org/ DISTFILES = $(DL_NAME)-$(GARVERSION).tar.gz +DISTFILES += CSWunixodbc.postinstall WORKSRC = $(WORKDIR)/$(DL_NAME)-$(GARVERSION) - -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz - -SPKG_CLASSES = none cswcpsampleconf - +UFILES_REGEX = $(DL_NAME)-(\d+(?:\.\d+)*).tar.gz REQUIRED_PKGS = CSWiconv REQUIRED_PKGS += CSWreadline -REQUIRED_PKGS += CSWcswclassutils - sysconfdir = /etc/opt/csw localstatedir = /var/opt/csw - -CONFIGURE_ARGS = $(DIRPATHS) --enable-gui=no +CONFIGURE_ARGS = $(DIRPATHS) --enable-gui=no BUILD64 = 1 - -PROTOTYPE_FILTER = awk ' \ - $$$$3 ~ /\/etc\/opt\/csw\/.*\.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ - { print }' - - +SAMPLECONF = /\/etc\/opt\/csw\/.*\.CSW TEST_SCRIPTS = post-install-modulated: @@ -46,5 +32,4 @@ done) @$(MAKECOOKIE) - include gar/category.mk Modified: csw/mgar/pkg/unixodbc/trunk/checksums =================================================================== --- csw/mgar/pkg/unixodbc/trunk/checksums 2009-09-01 16:28:18 UTC (rev 6153) +++ csw/mgar/pkg/unixodbc/trunk/checksums 2009-09-01 18:12:04 UTC (rev 6154) @@ -1 +1,2 @@ +a3e220ed8b903f2bc8d8ac2654071f9a download/CSWunixodbc.postinstall f47c2efb28618ecf5f33319140a7acd0 download/unixODBC-2.2.14.tar.gz Added: csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall =================================================================== --- csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall (rev 0) +++ csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall 2009-09-01 18:12:04 UTC (rev 6154) @@ -0,0 +1,73 @@ +#!/bin/sh +# +# $Id$ +# +# vim:set sw=2 ts=2 sts=2 expandtab: +# +# # If old_path exists: +# # Create a file named {{old_path.THIS_LOCATION_IS_DEPRECATED}} and leave a message inside the file. +# # If new_path and new_path.CSW files are identical: +# # Remove new_path (it's only a copy of the .CSW default file, no data loss) +# # Create a symlink from new_path to old_path +# # Otherwise: +# # Create a file named {{old_path.THIS_FILE_IS_PROBABLY_UNUSED}} +# +# http://wiki.opencsw.org/configuration-directory-migration + +deprecated_info=" +This location (/opt/csw/etc) is deprecated. + +Configuration files are currently being placed in /etc/opt/csw. Please make +sure your new configuration is in /etc/opt/csw and remove the old one from +/opt/csw/etc. +" +deprecated_file_ext="THIS_LOCATION_IS_DEPRECATED" + +filepairs="/opt/csw/etc/odbc.ini:/etc/opt/csw/odbc.ini" +filepairs="${filepairs} /opt/csw/etc/odbcinst.ini:/etc/opt/csw/odbcinst.ini" +dirpairs="/opt/csw/etc/ODBCDataSources:/etc/opt/csw/ODBCDataSources" + +return_code=0 + +# Generated ../../../ when given a path like /etc/opt/csw/odbc.ini +gen_dubdots() { + echo "$1" \ + | sed -e 's+[^/]+.+g' \ + | sed -e 's+\.*$++g' \ + | tr -s . \ + | sed -e 's+\.+..+g' \ + | sed -e 's+^/++' +} + +files_are_identical() { + cmp "$1" "$2" > /dev/null +} + +drop_warning() { + echo "${deprecated_info}" > "$1.${deprecated_file_ext}" +} + +for ff in ${filepairs} ${dirpairs}; do + old_location=`echo ${ff} | awk -F: '{print $1}'` + new_location=`echo ${ff} | awk -F: '{print $2}'` + abs_old_location="${PKG_INSTSALL_ROOT}${old_location}" + abs_new_location="${PKG_INSTSALL_ROOT}${new_location}" + old_location_noslash=`echo "${old_location}" | sed -e 's+^/++'` + dubdots=`gen_dubdots "${new_location}"` + if [ -r "${abs_old_location}" ]; then + drop_warning "${abs_old_location}" + if [ -r "${abs_new_location}" ]; then + if files_are_identical "${abs_new_location}" "${abs_new_location}.CSW"; then + rm "${abs_new_location}" + ln -s "${dubdots}${old_location_noslash}" "${abs_new_location}" + else + touch "${abs_old_location}.THIS_FILE_IS_PROBABLY_UNUSED" + fi + else + # The file doesn't exist. + ln -s "${dubdots}${old_location_noslash}" "${abs_new_location}" + fi + fi +done + +exit "${return_code}" 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 Sep 1 20:22:23 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 01 Sep 2009 18:22:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6155] csw/mgar/pkg/unixodbc/trunk Message-ID: Revision: 6155 http://gar.svn.sourceforge.net/gar/?rev=6155&view=rev Author: wahwah Date: 2009-09-01 18:22:23 +0000 (Tue, 01 Sep 2009) Log Message: ----------- unixodbc: File migration postinstall, handling an already existing symbolic link Modified Paths: -------------- csw/mgar/pkg/unixodbc/trunk/checksums csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall Modified: csw/mgar/pkg/unixodbc/trunk/checksums =================================================================== --- csw/mgar/pkg/unixodbc/trunk/checksums 2009-09-01 18:12:04 UTC (rev 6154) +++ csw/mgar/pkg/unixodbc/trunk/checksums 2009-09-01 18:22:23 UTC (rev 6155) @@ -1,2 +1,2 @@ -a3e220ed8b903f2bc8d8ac2654071f9a download/CSWunixodbc.postinstall +ccfa98210f71e0322cf3cab3b5ddd0d0 download/CSWunixodbc.postinstall f47c2efb28618ecf5f33319140a7acd0 download/unixODBC-2.2.14.tar.gz Modified: csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall =================================================================== --- csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall 2009-09-01 18:12:04 UTC (rev 6154) +++ csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall 2009-09-01 18:22:23 UTC (rev 6155) @@ -56,7 +56,10 @@ dubdots=`gen_dubdots "${new_location}"` if [ -r "${abs_old_location}" ]; then drop_warning "${abs_old_location}" - if [ -r "${abs_new_location}" ]; then + if [ -h "${abs_new_location}" ]; then + # It's a symbolic link already, doing nothing. + true + elif [ -r "${abs_new_location}" ]; then if files_are_identical "${abs_new_location}" "${abs_new_location}.CSW"; then rm "${abs_new_location}" ln -s "${dubdots}${old_location_noslash}" "${abs_new_location}" @@ -64,7 +67,7 @@ touch "${abs_old_location}.THIS_FILE_IS_PROBABLY_UNUSED" fi else - # The file doesn't exist. + # The file or directory doesn't exist. ln -s "${dubdots}${old_location_noslash}" "${abs_new_location}" fi 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 Tue Sep 1 20:30:37 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 01 Sep 2009 18:30:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[6156] csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc. postinstall Message-ID: Revision: 6156 http://gar.svn.sourceforge.net/gar/?rev=6156&view=rev Author: wahwah Date: 2009-09-01 18:30:37 +0000 (Tue, 01 Sep 2009) Log Message: ----------- unixodbc: Setting the Id keyword on the postinstall script Property Changed: ---------------- csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall Property changes on: csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall ___________________________________________________________________ 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 Sep 1 20:38:33 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 01 Sep 2009 18:38:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[6157] csw/mgar/pkg/unixodbc/trunk/checksums Message-ID: Revision: 6157 http://gar.svn.sourceforge.net/gar/?rev=6157&view=rev Author: wahwah Date: 2009-09-01 18:38:33 +0000 (Tue, 01 Sep 2009) Log Message: ----------- unixodbc: Updating the checksums Modified Paths: -------------- csw/mgar/pkg/unixodbc/trunk/checksums Modified: csw/mgar/pkg/unixodbc/trunk/checksums =================================================================== --- csw/mgar/pkg/unixodbc/trunk/checksums 2009-09-01 18:30:37 UTC (rev 6156) +++ csw/mgar/pkg/unixodbc/trunk/checksums 2009-09-01 18:38:33 UTC (rev 6157) @@ -1,2 +1,2 @@ -ccfa98210f71e0322cf3cab3b5ddd0d0 download/CSWunixodbc.postinstall +81eb84115b647ee2e95c69882de7a415 download/CSWunixodbc.postinstall f47c2efb28618ecf5f33319140a7acd0 download/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 wahwah at users.sourceforge.net Wed Sep 2 08:15:21 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 02 Sep 2009 06:15:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[6158] csw/mgar/pkg/wxwidgets/trunk/Makefile Message-ID: Revision: 6158 http://gar.svn.sourceforge.net/gar/?rev=6158&view=rev Author: wahwah Date: 2009-09-02 06:15:21 +0000 (Wed, 02 Sep 2009) Log Message: ----------- wxwidgets: Adding the contrib module Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-09-01 18:38:33 UTC (rev 6157) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-09-02 06:15:21 UTC (rev 6158) @@ -78,4 +78,11 @@ EXTRA_LIB = /opt/csw/X11/lib PKG_CONFIG_PATH = /opt/csw/lib/pkgconfig:/opt/csw/X11/lib/pkgconfig +INSTALL_SCRIPTS = wxwidgets + +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 dmichelsen at users.sourceforge.net Wed Sep 2 10:08:23 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 02 Sep 2009 08:08:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6159] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 6159 http://gar.svn.sourceforge.net/gar/?rev=6159&view=rev Author: dmichelsen Date: 2009-09-02 08:08:23 +0000 (Wed, 02 Sep 2009) Log Message: ----------- mGAR v2: Fix reinstall so that it works for custom targets too Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-09-02 06:15:21 UTC (rev 6158) +++ csw/mgar/gar/v2/gar.mk 2009-09-02 08:08:23 UTC (rev 6159) @@ -493,6 +493,7 @@ @rm -f $(foreach C,pre-install-modulated install-modulated post-install-modulated,$(COOKIEDIR)/$C) @rm -f $(COOKIEDIR)/pre-install-$(MODULATION) $(COOKIEDIR)/post-install-$(MODULATION) @rm -f $(COOKIEDIR)/strip + @rm -f $(foreach S,$(INSTALL_TARGETS),$(COOKIEDIR)/$S) @rm -f $(COOKIEROOTDIR)/global/install-$(MODULATION) # merge in all isas to the package directory after installation 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 Sep 2 10:17:53 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 02 Sep 2009 08:17:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[6160] csw/mgar/pkg/jdk6/trunk Message-ID: Revision: 6160 http://gar.svn.sourceforge.net/gar/?rev=6160&view=rev Author: dmichelsen Date: 2009-09-02 08:17:53 +0000 (Wed, 02 Sep 2009) Log Message: ----------- jdk6: Move to dynamic gspec Modified Paths: -------------- csw/mgar/pkg/jdk6/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.gspec csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec Modified: csw/mgar/pkg/jdk6/trunk/Makefile =================================================================== --- csw/mgar/pkg/jdk6/trunk/Makefile 2009-09-02 08:08:23 UTC (rev 6159) +++ csw/mgar/pkg/jdk6/trunk/Makefile 2009-09-02 08:17:53 UTC (rev 6160) @@ -18,13 +18,21 @@ DISTNAME = jdk$(SPKG_VERSION) DISTFILES = $(foreach S,$(SUFFIXES),jdk-$(GARVERSION)-solaris-$S.sh) NOEXTRACT = $(foreach S,$(filter-out $(SUFFIXES_$(GARCH)),$(SUFFIXES)),jdk-$(GARVERSION)-solaris-$S.sh) -DISTFILES += $(call admfiles,CSWjdk6) -DISTFILES += $(call admfiles,CSWjre6) -DISTFILES += $(call admfiles,CSWjdk) -DISTFILES += $(call admfiles,CSWjre) SPKG_SOURCEURL = http://java.sun.com/javase/downloads/index.jsp +PACKAGES = CSWjdk6 CSWjre6 CSWjdk CSWjre + +CATALOGNAME_CSWjdk6 = jdk6 +CATALOGNAME_CSWjre6 = jre6 +CATALOGNAME_CSWjdk = jdk +CATALOGNAME_CSWjre = jre + +ARCHALL_CSWjdk = 1 +ARCHALL_CSWjre = 1 + +LICENSE = LICENSE + SPKG_DESC_CSWjdk6 = Java Development Kit 6 SPKG_DESC_CSWjre6 = Java Runtime Environment 6 SPKG_DESC_CSWjdk = Java Delopment Kit - Latest Version (now CSWjdk6) Deleted: csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec 2009-09-02 08:08:23 UTC (rev 6159) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec 2009-09-02 08:17:53 UTC (rev 6160) @@ -1,5 +0,0 @@ -%var bitname jdk -%var pkgname CSWjdk -%var arch all -%include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Deleted: csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.gspec =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.gspec 2009-09-02 08:08:23 UTC (rev 6159) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.gspec 2009-09-02 08:17:53 UTC (rev 6160) @@ -1,4 +0,0 @@ -%var bitname jdk6 -%var pkgname CSWjdk6 -%include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Deleted: csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec 2009-09-02 08:08:23 UTC (rev 6159) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec 2009-09-02 08:17:53 UTC (rev 6160) @@ -1,5 +0,0 @@ -%var bitname jre -%var pkgname CSWjre -%var arch all -%include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Deleted: csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec 2009-09-02 08:08:23 UTC (rev 6159) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec 2009-09-02 08:17:53 UTC (rev 6160) @@ -1,4 +0,0 @@ -%var bitname jre6 -%var pkgname CSWjre6 -%include url file://%{PKGLIB}/csw_standard.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 wahwah at users.sourceforge.net Wed Sep 2 10:50:47 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 02 Sep 2009 08:50:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[6161] csw/mgar/pkg/wxwidgets/trunk/Makefile Message-ID: Revision: 6161 http://gar.svn.sourceforge.net/gar/?rev=6161&view=rev Author: wahwah Date: 2009-09-02 08:50:39 +0000 (Wed, 02 Sep 2009) Log Message: ----------- wxwidgets: Added blurb and separate package descriptions Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-09-02 08:17:53 UTC (rev 6160) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-09-02 08:50:39 UTC (rev 6161) @@ -5,8 +5,12 @@ GARNAME = wxWidgets GARVERSION = 2.8.10 CATEGORIES = lib -DESCRIPTION = A portable widget library define BLURB + wxWidgets lets developers create applications for Win32, Mac OS X, GTK+, X11, + Motif, WinCE, and more using one codebase. It can be used from languages such + as C++, Python, Perl, and C#/.NET. Unlike other cross-platform toolkits, + wxWidgets applications look and feel native. This is because wxWidgets uses + the platform's own native controls rather than emulating them. endef SPKG_SOURCEURL = http://www.wxwidgets.org/ MASTER_SITES = $(SF_MIRRORS) @@ -20,6 +24,9 @@ PACKAGES += CSWwxwidgetsdevel PACKAGES += CSWwxwidgetsgtk2 ARCHALL_CSWwxwidgetsdevel = 1 +SPKG_DESC_CSWwxwidgetscommon = A cross-platform toolkit, common files +SPKG_DESC_CSWwxwidgetsdevel = A cross-platform toolkit, header files +SPKG_DESC_CSWwxwidgetsgtk2 = A cross-platform toolkit, gtk2 support REQUIRED_PKGS = CSWexpat REQUIRED_PKGS += CSWfconfig REQUIRED_PKGS += CSWftype2 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 Sep 2 12:01:03 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 02 Sep 2009 10:01:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[6162] csw/mgar/pkg/jdk5/trunk Message-ID: Revision: 6162 http://gar.svn.sourceforge.net/gar/?rev=6162&view=rev Author: dmichelsen Date: 2009-09-02 10:00:58 +0000 (Wed, 02 Sep 2009) Log Message: ----------- jdk5: Update to u19 Modified Paths: -------------- csw/mgar/pkg/jdk5/trunk/Makefile csw/mgar/pkg/jdk5/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/jdk5/trunk/files/CSWjdk5.gspec csw/mgar/pkg/jdk5/trunk/files/CSWjre5.gspec Modified: csw/mgar/pkg/jdk5/trunk/Makefile =================================================================== --- csw/mgar/pkg/jdk5/trunk/Makefile 2009-09-02 08:50:39 UTC (rev 6161) +++ csw/mgar/pkg/jdk5/trunk/Makefile 2009-09-02 10:00:58 UTC (rev 6162) @@ -1,5 +1,5 @@ GARNAME = jdk5 -SPKG_VERSION = 1.5.0_17 +SPKG_VERSION = 1.5.0_19 GARVERSION = $(shell echo $(SPKG_VERSION) | sed -e 's/\./_/g') CATEGORIES = lang @@ -18,9 +18,11 @@ DISTNAME = jdk$(SPKG_VERSION) DISTFILES = $(foreach S,$(SUFFIXES),jdk-$(GARVERSION)-solaris-$S.sh) NOEXTRACT = $(foreach S,$(filter-out $(SUFFIXES_$(GARCH)),$(SUFFIXES)),jdk-$(GARVERSION)-solaris-$S.sh) -DISTFILES += $(call admfiles,CSWjdk5) -DISTFILES += $(call admfiles,CSWjre5) +PACKAGES = CSWjdk5 CSWjre5 + +LICENSE = LICENSE + SPKG_SOURCEURL = http://java.sun.com/javase/downloads/index_jdk5.jsp SPKG_DESC_CSWjdk5 = Java Development Kit 6 @@ -43,6 +45,10 @@ PKGFILES_CSWjre5 += $(prefix)/java/jre/jre$(SPKG_VERSION) PKGFILES_CSWjre5 += $(prefix)/java/jre/jre5 +# The package must not be checked on Solaris 8 as the package contains +# partly material for Solaris 10 +ENABLE_CHECK = 0 + # Tell the user to download the file manually manual//%: @echo Modified: csw/mgar/pkg/jdk5/trunk/checksums =================================================================== --- csw/mgar/pkg/jdk5/trunk/checksums 2009-09-02 08:50:39 UTC (rev 6161) +++ csw/mgar/pkg/jdk5/trunk/checksums 2009-09-02 10:00:58 UTC (rev 6162) @@ -1,6 +1,4 @@ -7d8b35d7eb7664d36ff2387e73baa15b download/jdk-1_5_0_17-solaris-sparc.sh -7e0ccd19d636bc3fdf1781c07a99cb8d download/jdk-1_5_0_17-solaris-sparcv9.sh -f000bd7d44c2964dd811f3f526572106 download/jdk-1_5_0_17-solaris-i586.sh -419310f32f7f2bfff715bc6f1d1258c4 download/jdk-1_5_0_17-solaris-amd64.sh -43194293b08b51d47ebc1c78af346942 download/CSWjdk5.gspec -68ebd77b4f7648109eb11c58f8959b5b download/CSWjre5.gspec +8b8a01786a9dc91a38c3cc2208ec9df5 download/jdk-1_5_0_19-solaris-amd64.sh +28f99e41bec07c9a458c2cc625876ced download/jdk-1_5_0_19-solaris-i586.sh +d7d5385d69629d03393d4ff02e91c406 download/jdk-1_5_0_19-solaris-sparc.sh +8df216d7b51f333efeb9fd9f2407d5c6 download/jdk-1_5_0_19-solaris-sparcv9.sh Deleted: csw/mgar/pkg/jdk5/trunk/files/CSWjdk5.gspec =================================================================== --- csw/mgar/pkg/jdk5/trunk/files/CSWjdk5.gspec 2009-09-02 08:50:39 UTC (rev 6161) +++ csw/mgar/pkg/jdk5/trunk/files/CSWjdk5.gspec 2009-09-02 10:00:58 UTC (rev 6162) @@ -1,4 +0,0 @@ -%var bitname jdk5 -%var pkgname CSWjdk5 -%include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Deleted: csw/mgar/pkg/jdk5/trunk/files/CSWjre5.gspec =================================================================== --- csw/mgar/pkg/jdk5/trunk/files/CSWjre5.gspec 2009-09-02 08:50:39 UTC (rev 6161) +++ csw/mgar/pkg/jdk5/trunk/files/CSWjre5.gspec 2009-09-02 10:00:58 UTC (rev 6162) @@ -1,4 +0,0 @@ -%var bitname jre5 -%var pkgname CSWjre5 -%include url file://%{PKGLIB}/csw_standard.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 wahwah at users.sourceforge.net Wed Sep 2 13:54:40 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 02 Sep 2009 11:54:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[6163] csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc. postinstall Message-ID: Revision: 6163 http://gar.svn.sourceforge.net/gar/?rev=6163&view=rev Author: wahwah Date: 2009-09-02 11:54:40 +0000 (Wed, 02 Sep 2009) Log Message: ----------- unixodbc: Fixing a typo in the postinstall script Modified Paths: -------------- csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall Modified: csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall =================================================================== --- csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall 2009-09-02 10:00:58 UTC (rev 6162) +++ csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall 2009-09-02 11:54:40 UTC (rev 6163) @@ -50,8 +50,8 @@ for ff in ${filepairs} ${dirpairs}; do old_location=`echo ${ff} | awk -F: '{print $1}'` new_location=`echo ${ff} | awk -F: '{print $2}'` - abs_old_location="${PKG_INSTSALL_ROOT}${old_location}" - abs_new_location="${PKG_INSTSALL_ROOT}${new_location}" + abs_old_location="${PKG_INSTALL_ROOT}${old_location}" + abs_new_location="${PKG_INSTALL_ROOT}${new_location}" old_location_noslash=`echo "${old_location}" | sed -e 's+^/++'` dubdots=`gen_dubdots "${new_location}"` if [ -r "${abs_old_location}" ]; 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 Wed Sep 2 23:05:26 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 02 Sep 2009 21:05:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[6164] csw/mgar/pkg/unixodbc/trunk/checksums Message-ID: Revision: 6164 http://gar.svn.sourceforge.net/gar/?rev=6164&view=rev Author: wahwah Date: 2009-09-02 21:05:25 +0000 (Wed, 02 Sep 2009) Log Message: ----------- unixodbc: Updating checksums Modified Paths: -------------- csw/mgar/pkg/unixodbc/trunk/checksums Modified: csw/mgar/pkg/unixodbc/trunk/checksums =================================================================== --- csw/mgar/pkg/unixodbc/trunk/checksums 2009-09-02 11:54:40 UTC (rev 6163) +++ csw/mgar/pkg/unixodbc/trunk/checksums 2009-09-02 21:05:25 UTC (rev 6164) @@ -1,2 +1,2 @@ -81eb84115b647ee2e95c69882de7a415 download/CSWunixodbc.postinstall +cc65f5642a9b5965da7d6978587e8ac4 download/CSWunixodbc.postinstall f47c2efb28618ecf5f33319140a7acd0 download/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 d_pocock at users.sourceforge.net Thu Sep 3 12:31:43 2009 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 03 Sep 2009 10:31:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6165] csw/mgar/pkg/libconfuse/trunk Message-ID: Revision: 6165 http://gar.svn.sourceforge.net/gar/?rev=6165&view=rev Author: d_pocock Date: 2009-09-03 10:31:43 +0000 (Thu, 03 Sep 2009) Log Message: ----------- Add patch from trunk to expose cfg_setopt() function. Adjust code for skipping tests. Modified Paths: -------------- csw/mgar/pkg/libconfuse/trunk/Makefile csw/mgar/pkg/libconfuse/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libconfuse/trunk/files/setopt.diff Modified: csw/mgar/pkg/libconfuse/trunk/Makefile =================================================================== --- csw/mgar/pkg/libconfuse/trunk/Makefile 2009-09-02 21:05:25 UTC (rev 6164) +++ csw/mgar/pkg/libconfuse/trunk/Makefile 2009-09-03 10:31:43 UTC (rev 6165) @@ -8,9 +8,7 @@ # upstream. ifeq ($(GARVERSION),2.6) #TEST_TARGET = check -TEST_SCRIPTS = skip -test-skip: - $(DONADA) +TEST_SCRIPTS = endif DESCRIPTION = a configuration file parser library @@ -25,9 +23,13 @@ endef MASTER_SITES = http://bzero.se/confuse/ +PATCHFILES = setopt.diff DISTFILES = confuse-$(GARVERSION).tar.gz +DISTFILES += $(PATCHFILES) DISTNAME = confuse-$(GARVERSION) +EXTRA_DOCS = $(PATCHFILES) + # 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/libconfuse/trunk/checksums =================================================================== --- csw/mgar/pkg/libconfuse/trunk/checksums 2009-09-02 21:05:25 UTC (rev 6164) +++ csw/mgar/pkg/libconfuse/trunk/checksums 2009-09-03 10:31:43 UTC (rev 6165) @@ -1 +1,2 @@ 0e883d66f0f58fc33585b430c652aa30 download/confuse-2.6.tar.gz +5a7d6c8406a18340e7508b4d9d0da2ca download/setopt.diff Added: csw/mgar/pkg/libconfuse/trunk/files/setopt.diff =================================================================== --- csw/mgar/pkg/libconfuse/trunk/files/setopt.diff (rev 0) +++ csw/mgar/pkg/libconfuse/trunk/files/setopt.diff 2009-09-03 10:31:43 UTC (rev 6165) @@ -0,0 +1,39 @@ +--- confuse-2.6/src/confuse.c (revision x) ++++ confuse-2.6/src/confuse.c (revision y) +@@ -65,7 +65,6 @@ + + static int cfg_parse_internal(cfg_t *cfg, int level, + int force_state, cfg_opt_t *force_opt); +-static cfg_value_t *cfg_setopt(cfg_t *cfg, cfg_opt_t *opt, char *value); + + #define STATE_CONTINUE 0 + #define STATE_EOF -1 +@@ -531,7 +530,7 @@ + } + } + +-static cfg_value_t *cfg_setopt(cfg_t *cfg, cfg_opt_t *opt, char *value) ++DLLIMPORT cfg_value_t *cfg_setopt(cfg_t *cfg, cfg_opt_t *opt, char *value) + { + cfg_value_t *val = 0; + int b; +--- confuse-2.6/src/confuse.h (revision x) ++++ confuse-2.6/src/confuse.h (revision y) +@@ -839,6 +839,16 @@ + */ + DLLIMPORT int __export cfg_parse_boolean(const char *s); + ++/** Set an option (create an instance of an option). ++ * ++ * @param cfg The configuration file context. ++ * @param opt The option definition. ++ * @param value The initial value for the option. ++ * ++ * @return Returns a pointer to the value object. ++ */ ++DLLIMPORT cfg_value_t __export *cfg_setopt(cfg_t *cfg, cfg_opt_t *opt, char *value); ++ + /** Return an option given it's name. + * + * @param cfg The configuration file context. + 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 Sep 3 12:47:39 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 03 Sep 2009 10:47:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[6166] csw/mgar/pkg/template/trunk/Makefile Message-ID: Revision: 6166 http://gar.svn.sourceforge.net/gar/?rev=6166&view=rev Author: wahwah Date: 2009-09-03 10:47:39 +0000 (Thu, 03 Sep 2009) Log Message: ----------- template: added the python category Modified Paths: -------------- csw/mgar/pkg/template/trunk/Makefile Modified: csw/mgar/pkg/template/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-09-03 10:31:43 UTC (rev 6165) +++ csw/mgar/pkg/template/trunk/Makefile 2009-09-03 10:47:39 UTC (rev 6166) @@ -20,15 +20,15 @@ ## adjust the build settings for the respective category. ## ## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, server, utils, x11, -## xfce, xorg, xtra +## 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. +## inside the Makefile and is not used elsewhere. define BLURB endef @@ -39,11 +39,11 @@ ## ## 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 = ## ## 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. +## 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 @@ -68,7 +68,7 @@ ## ## 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 ~. +## 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 @@ -76,19 +76,19 @@ ## 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. +## 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. +## 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. +## 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 @@ -103,7 +103,7 @@ ## 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. +## the file permissions of a file to be set-UID. ## See http://wiki.opencsw.org/cswclassutils-package for common usage information ## PROTOTYPE_FILTER = ## @@ -153,7 +153,7 @@ ## 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. +## for example, if you need to override Makefile variables. ## BUILD_ARGS = ## ## Arguments passed to the ./configure script. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Sep 4 09:30:41 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Sep 2009 07:30:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[6167] csw/mgar/pkg/libtool/tags/libtool-2.2. 6-legacy-gcctags/ Message-ID: Revision: 6167 http://gar.svn.sourceforge.net/gar/?rev=6167&view=rev Author: dmichelsen Date: 2009-09-04 07:30:40 +0000 (Fri, 04 Sep 2009) Log Message: ----------- Put legacy tags and patch aside for further reference Added Paths: ----------- csw/mgar/pkg/libtool/tags/libtool-2.2.6-legacy-gcctags/ 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 Sep 4 09:35:00 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Sep 2009 07:35:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6168] csw/mgar/pkg/libtool/trunk Message-ID: Revision: 6168 http://gar.svn.sourceforge.net/gar/?rev=6168&view=rev Author: dmichelsen Date: 2009-09-04 07:34:59 +0000 (Fri, 04 Sep 2009) Log Message: ----------- libtool: Enable additional tags for gcc3 and gcc4 Modified Paths: -------------- csw/mgar/pkg/libtool/trunk/Makefile csw/mgar/pkg/libtool/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libtool/trunk/files/patch-libtool.diff Removed Paths: ------------- csw/mgar/pkg/libtool/trunk/files/i386-gcc2.conf csw/mgar/pkg/libtool/trunk/files/i386-gcc2.tags csw/mgar/pkg/libtool/trunk/files/i386-gcc3.conf csw/mgar/pkg/libtool/trunk/files/i386-gcc3.tags csw/mgar/pkg/libtool/trunk/files/libtool-gcc-tags.patch csw/mgar/pkg/libtool/trunk/files/sparc-gcc2.conf csw/mgar/pkg/libtool/trunk/files/sparc-gcc2.tags csw/mgar/pkg/libtool/trunk/files/sparc-gcc3.conf csw/mgar/pkg/libtool/trunk/files/sparc-gcc3.tags Modified: csw/mgar/pkg/libtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtool/trunk/Makefile 2009-09-04 07:30:40 UTC (rev 6167) +++ csw/mgar/pkg/libtool/trunk/Makefile 2009-09-04 07:34:59 UTC (rev 6168) @@ -3,9 +3,13 @@ GARVERSION = 2.2.6 CATEGORIES = devel -EXTRA_MODULATORS = GARVERSION +EXTRA_MODULATORS = GARVERSION GARCOMPILER MODULATIONS_GARVERSION = 1.5.26 2.2.6 +MODULATIONS_GARCOMPILER = GCC3 GCC4 SOS11 +# 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)) + FILEVERSION_1.5.26 = 1.5.26 FILEVERSION_2.2.6 = 2.2.6$(RELEASE) @@ -19,8 +23,18 @@ MASTER_SITES = $(GNU_MIRROR) SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(GARNAME)-$(FILEVERSION_$(VERSION)).tar.gz) DISTFILES = $(SOURCEFILES) -DISTFILES += $(foreach ARCH,i386 sparc,$(ARCH)-gcc2.conf $(ARCH)-gcc2.tags $(ARCH)-gcc3.conf $(ARCH)-gcc3.tags) +PATCH_LIBTOOL = patch-libtool.diff +PATCHFILES_POSTINSTALL_isa-i386-garversion-2.2.6-garcompiler-SOS11 = $(PATCH_LIBTOOL) +PATCHFILES_POSTINSTALL_isa-sparcv8-garversion-2.2.6-garcompiler-SOS11 = $(PATCH_LIBTOOL) +DISTFILES += $(PATCH_LIBTOOL) + +NOEXTRACT = $(filter-out $(GARNAME)-$(FILEVERSION_$(GARVERSION)).tar.gz,$(SOURCEFILES)) + +EXTRA_TAGS = gcc3 gcc4 +COMPILER_TAGNAME_GCC3 = gcc3 +COMPILER_TAGNAME_GCC4 = gcc4 + PACKAGES = CSWlibtool CSWlibtoolrt CATALOGNAME_CSWlibtoolrt = libtool_rt @@ -29,7 +43,7 @@ REQUIRED_PKGS_CSWlibtool = CSWlibtoolrt SPKG_DESC_CSWlibtool = A generic library support tool -SPKG_DESC_CSWlibtoolrt = A Generic library support tool runtime libraries +SPKG_DESC_CSWlibtoolrt = A generic library support tool runtime libraries # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -42,35 +56,56 @@ SKIPTEST = 1 TEST_TARGET = check -MERGE_SCRIPTS_isa-i386-garversion-1.5.26 = copy-only -MERGE_DIRS_isa-i386-garversion-1.5.26 = $(libdir) -MERGE_SCRIPTS_isa-amd64-garversion-1.5.26 = copy-relocated-only -MERGE_DIRS_isa-amd64-garversion-1.5.26 = $(libdir) + 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-i386-garversion-2.2.6 = copy-all -MERGE_SCRIPTS_isa-amd64-garversion-2.2.6 = copy-relocated-only -MERGE_DIRS_isa-amd64-garversion-2.2.6 = $(bindir) $(sbindir) $(libexecdir) $(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-sparcv8-garversion-1.5.26 = copy-only -MERGE_DIRS_isa-sparcv8-garversion-1.5.26 = $(libdir) -MERGE_SCRIPTS_isa-sparcv9-garversion-1.5.26 = copy-relocated-only -MERGE_DIRS_isa-sparcv9-garversion-1.5.26 = $(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-sparcv8-garversion-2.2.6 = copy-all -MERGE_SCRIPTS_isa-sparcv9-garversion-2.2.6 = copy-relocated-only -MERGE_DIRS_isa-sparcv9-garversion-2.2.6 = $(bindir) $(sbindir) $(libexecdir) $(libdir) +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: - @echo " ==> Fixing install anomalies" - @rm -f $(DESTDIR)$(infodir)/dir - @(for f in gcc2.conf gcc2.tags gcc3.conf gcc3.tags; do \ - ginstall -D $(WORKDIR)/$(GARCH)-$$f $(DESTDIR)$(datadir)/$(GARNAME)/$$f; \ - done) +post-install-modulated: $(if $(PATCHFILES_POSTINSTALL_$(MODULATION)),patch-libtool) +post-install-modulated: $(if $(COMPILER_TAGNAME_$(GARCOMPILER)),install-libtool-$(COMPILER_TAGNAME_$(GARCOMPILER))) + +patch-libtool: + cat $(WORKDIR)/$(PATCHFILES_POSTINSTALL_$(MODULATION)) | (cd $(DESTDIR)$(bindir) && gpatch -p1) + +install-libtool-%: + perl -ane 'print if( /^available_tags/ ); $$p = 1 if( /^# ### BEGIN LIBTOOL CONFIG/ ); print if( $$p ); $$p = 0 if( /^# ### END LIBTOOL CONFIG/ )' \ + <$(DESTDIR)$(bindir)/libtool >$(DESTDIR)$(datadir)/libtool/$*.conf + perl -ane '$$p = 1 if( /^# ### BEGIN LIBTOOL TAG CONFIG/ ); print if( $$p ); if( /^# ### END LIBTOOL TAG CONFIG/ ) { $$p = 0; print "\n"; }' \ + <$(DESTDIR)$(bindir)/libtool >$(DESTDIR)$(datadir)/libtool/$*.tags @$(MAKECOOKIE) +merge-copy-tags: + $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \ + -s ",^\(\..*\.conf\)\$$,\1,p" \ + -s ",^\(\..*\.tags\)\$$,\1,p" \ + -s ",.*,," \ + . $(PKGROOT) \ + ) + @$(MAKECOOKIE) + + Modified: csw/mgar/pkg/libtool/trunk/checksums =================================================================== --- csw/mgar/pkg/libtool/trunk/checksums 2009-09-04 07:30:40 UTC (rev 6167) +++ csw/mgar/pkg/libtool/trunk/checksums 2009-09-04 07:34:59 UTC (rev 6168) @@ -1,10 +1,3 @@ -9016437c874268bf70e52aba2af93735 download/i386-gcc2.conf -11fbabbb916c4c4e7b6e811980f41e1a download/i386-gcc2.tags -c39493d590239e70d40220ee8effca5d download/i386-gcc3.conf -706757d554bcc0c20f0af0d5de0848e3 download/i386-gcc3.tags aa9c5107f3ec9ef4200eb6556f3b3c29 download/libtool-1.5.26.tar.gz 8ca1ea241cd27ff9832e045fe9afe4fd download/libtool-2.2.6a.tar.gz -29cb518dd29fda50f9a3e727fd204cfe download/sparc-gcc2.conf -cd32539473e785263c56a2e46fa76cbc download/sparc-gcc2.tags -f78119c4f0f5366735285ca2bf17b829 download/sparc-gcc3.conf -b47cbb95750c4edd59d17479867ebf7b download/sparc-gcc3.tags +7fb6410a02f5fd74aa3696a65ba434e2 download/patch-libtool.diff Deleted: csw/mgar/pkg/libtool/trunk/files/i386-gcc2.conf =================================================================== --- csw/mgar/pkg/libtool/trunk/files/i386-gcc2.conf 2009-09-04 07:30:40 UTC (rev 6167) +++ csw/mgar/pkg/libtool/trunk/files/i386-gcc2.conf 2009-09-04 07:34:59 UTC (rev 6168) @@ -1,318 +0,0 @@ -# A sed program that does not truncate output. -SED="/opt/csw/bin/gsed" - -# Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="/opt/csw/bin/gsed -e 1s/^X//" - -# 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 - -# The names of the tagged configurations supported by this script. -available_tags=" CXX" - -# ### BEGIN LIBTOOL CONFIG - -# Libtool was configured on host ra: - -# Shell to use when invoking shell scripts. -SHELL="/bin/bash" - -# Whether or not to build shared libraries. -build_libtool_libs=yes - -# Whether or not to build static libraries. -build_old_libs=yes - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=yes - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=no - -# Whether or not to optimize for fast installation. -fast_install=needless - -# The host system. -host_alias= -host=i386-pc-solaris2.8 -host_os=solaris2.8 - -# The build system. -build_alias= -build=i386-pc-solaris2.8 -build_os=solaris2.8 - -# An echo program that does not interpret backslashes. -echo="echo" - -# The archiver. -AR="ar" -AR_FLAGS="cru" - -# A C compiler. -LTCC="/opt/csw/gcc2/bin/gcc" - -# LTCC compiler flags. -LTCFLAGS="-O2" - -# A language-specific compiler. -CC="/opt/csw/gcc2/bin/gcc" - -# Is the compiler the GNU C compiler? -with_gcc=yes - -# An ERE matcher. -EGREP="/opt/csw/bin/ggrep -E" - -# The linker used to build libraries. -LD="/usr/ccs/bin/ld" - -# Whether we need hard or soft links. -LN_S="ln -s" - -# A BSD-compatible nm program. -NM="/usr/ccs/bin/nm -p" - -# A symbol stripping program -STRIP="strip" - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=file - -# Used on cygwin: DLL creation program. -DLLTOOL="dlltool" - -# Used on cygwin: object dumper. -OBJDUMP="objdump" - -# Used on cygwin: assembler. -AS="as" - -# The name of the directory that contains temporary libtool files. -objdir=.libs - -# How to create reloadable object files. -reload_flag=" -r" -reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs" - -# How to pass a linker flag through the compiler. -wl="-Wl," - -# Object file suffix (normally "o"). -objext="o" - -# Old archive suffix (normally "a"). -libext="a" - -# Shared library suffix (normally ".so"). -shrext_cmds='.so' - -# Executable file suffix (normally ""). -exeext="" - -# Additional compiler flags for building library objects. -pic_flag=" -fPIC -DPIC" -pic_mode=default - -# What is the maximum length of a command? -max_cmd_len=262144 - -# Does compiler simultaneously support -c and -o options? -compiler_c_o="yes" - -# Must we lock files when doing compilation? -need_locks="no" - -# Do we need the lib prefix for modules? -need_lib_prefix=no - -# Do we need a version for libraries? -need_version=no - -# Whether dlopen is supported. -dlopen_support=yes - -# Whether dlopen of programs is supported. -dlopen_self=yes - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=no - -# Compiler flag to prevent dynamic linking. -link_static_flag="-static" - -# Compiler flag to turn off builtin functions. -no_builtin_flag=" -fno-builtin -fno-rtti -fno-exceptions" - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec="" - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec="\${wl}-z \${wl}allextract\`for conv in \$convenience\\\"\\\"; do test -n \\\"\$conv\\\" && new_convenience=\\\"\$new_convenience,\$conv\\\"; done; \$echo \\\"\$new_convenience\\\"\` \${wl}-z \${wl}defaultextract" - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec="" - -# Library versioning type. -version_type=linux - -# Format of library name prefix. -libname_spec="lib\$name" - -# 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. -library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}" - -# The coded name of the library, if different from the real name. -soname_spec="\${libname}\${release}\${shared_ext}\$major" - -# Commands used to build and install an old-style archive. -RANLIB="ranlib" -old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib" -old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib" -old_postuninstall_cmds="" - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds="" - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds="" - -# Commands used to build and install a shared archive. -archive_cmds="\$CC -shared \${wl}-h \${wl}\$soname -o \$lib \$libobjs \$deplibs \$compiler_flags" -archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$lib.exp~cat \$export_symbols | \$SED -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$lib.exp~\$echo \\\"local: *; };\\\" >> \$lib.exp~ - \$CC -shared \${wl}-M \${wl}\$lib.exp \${wl}-h \${wl}\$soname -o \$lib \$libobjs \$deplibs \$compiler_flags~\$rm \$lib.exp" -postinstall_cmds="chmod +x \$lib" -postuninstall_cmds="" - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds="" -module_expsym_cmds="" - -# Commands to strip libraries. -old_striplib="" -striplib="" - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects="" - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects="" - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps="" - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps="" - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path="" - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method="pass_all" - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd="\$MAGIC_CMD" - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag="" - -# Flag that forces no undefined symbols. -no_undefined_flag=" -z text" - -# Commands used to finish a libtool library installation in a directory. -finish_cmds="" - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval="" - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe="sed -n -e 's/^.*[ ]\\([BDRT][BDRT]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'" - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'" - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (lt_ptr) \\&\\2},/p'" - -# This is the shared library runtime path variable. -runpath_var= - -# This is the shared library path variable. -shlibpath_var=LD_LIBRARY_PATH - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=yes - -# How to hardcode a shared library path into an executable. -hardcode_action=immediate - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=yes - -# Flag to hardcode $libdir into a binary during linking. -# This must work even if $libdir does not exist. -hardcode_libdir_flag_spec="-R\$libdir" - -# If ld is used when linking, flag to hardcode $libdir into -# a binary during linking. This must work even if $libdir does -# not exist. -hardcode_libdir_flag_spec_ld="" - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator="" - -# Set to yes if using DIR/libNAME during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=no - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=no - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=no - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=no - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="PATH LD_LIBRARY_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=yes - -# Compile-time system search path for libraries -sys_lib_search_path_spec=" /opt/csw/gcc2/lib/gcc-lib/i386-pc-solaris2.8/2.95.3/ /usr/lib/gcc/i386-pc-solaris2.8/2.95.3/ /opt/csw/gcc2/i386-pc-solaris2.8/lib/i386-pc-solaris2.8/2.95.3/ /opt/csw/gcc2/i386-pc-solaris2.8/lib/ /usr/ccs/bin/i386-pc-solaris2.8/2.95.3/ /usr/ccs/bin/ /usr/ccs/lib/i386-pc-solaris2.8/2.95.3/ /usr/ccs/lib/ /opt/csw/gcc2/lib/i386-pc-solaris2.8/2.95.3/ /opt/csw/gcc2/lib/ /lib/i386-pc-solaris2.8/2.95.3/ /lib/ /usr/lib/i386-pc-solaris2.8/2.95.3/ /usr/lib/" - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec="/lib /usr/lib" - -# Fix the shell variable $srcfile for the compiler. -fix_srcfile_path="" - -# Set to yes if exported symbols are required. -always_export_symbols=no - -# The commands to list exported symbols. -export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols" - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds="" - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms="_GLOBAL_OFFSET_TABLE_" - -# Symbols that must always be exported. -include_expsyms="" - -# ### END LIBTOOL CONFIG Deleted: csw/mgar/pkg/libtool/trunk/files/i386-gcc2.tags =================================================================== --- csw/mgar/pkg/libtool/trunk/files/i386-gcc2.tags 2009-09-04 07:30:40 UTC (rev 6167) +++ csw/mgar/pkg/libtool/trunk/files/i386-gcc2.tags 2009-09-04 07:34:59 UTC (rev 6168) @@ -1,317 +0,0 @@ -# ### BEGIN LIBTOOL TAG CONFIG: disable-shared -disable_libs=shared -# ### END LIBTOOL TAG CONFIG: disable-shared - -# ### BEGIN LIBTOOL TAG CONFIG: disable-static -disable_libs=static -# ### END LIBTOOL TAG CONFIG: disable-static - -# Local Variables: -# mode:shell-script -# sh-indentation:2 -# End: -# ### BEGIN LIBTOOL TAG CONFIG: CXX - -# Libtool was configured on host ra: - -# Shell to use when invoking shell scripts. -SHELL="/bin/bash" - -# Whether or not to build shared libraries. -build_libtool_libs=yes - -# Whether or not to build static libraries. -build_old_libs=yes - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=no - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=no - -# Whether or not to optimize for fast installation. -fast_install=needless - -# The host system. -host_alias= -host=i386-pc-solaris2.8 -host_os=solaris2.8 - -# The build system. -build_alias= -build=i386-pc-solaris2.8 -build_os=solaris2.8 - -# An echo program that does not interpret backslashes. -echo="echo" - -# The archiver. -AR="ar" -AR_FLAGS="cru" - -# A C compiler. -LTCC="/opt/csw/gcc2/bin/gcc" - -# LTCC compiler flags. -LTCFLAGS="-O2" - -# A language-specific compiler. -CC="/opt/csw/gcc2/bin/g++" - -# Is the compiler the GNU C compiler? -with_gcc=yes - -# An ERE matcher. -EGREP="/opt/csw/bin/ggrep -E" - -# The linker used to build libraries. -LD="/usr/ccs/bin/ld" - -# Whether we need hard or soft links. -LN_S="ln -s" - -# A BSD-compatible nm program. -NM="/usr/ccs/bin/nm -p" - -# A symbol stripping program -STRIP="strip" - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=file - -# Used on cygwin: DLL creation program. -DLLTOOL="dlltool" - -# Used on cygwin: object dumper. -OBJDUMP="objdump" - -# Used on cygwin: assembler. -AS="as" - -# The name of the directory that contains temporary libtool files. -objdir=.libs - -# How to create reloadable object files. -reload_flag=" -r" -reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs" - -# How to pass a linker flag through the compiler. -wl="-Wl," - -# Object file suffix (normally "o"). -objext="o" - -# Old archive suffix (normally "a"). -libext="a" - -# Shared library suffix (normally ".so"). -shrext_cmds='.so' - -# Executable file suffix (normally ""). -exeext="" - -# Additional compiler flags for building library objects. -pic_flag=" -fPIC -DPIC" -pic_mode=default - -# What is the maximum length of a command? -max_cmd_len=262144 - -# Does compiler simultaneously support -c and -o options? -compiler_c_o="yes" - -# Must we lock files when doing compilation? -need_locks="no" - -# Do we need the lib prefix for modules? -need_lib_prefix=no - -# Do we need a version for libraries? -need_version=no - -# Whether dlopen is supported. -dlopen_support=yes - -# Whether dlopen of programs is supported. -dlopen_self=yes - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=no - -# Compiler flag to prevent dynamic linking. -link_static_flag="-static" - -# Compiler flag to turn off builtin functions. -no_builtin_flag=" -fno-builtin" - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec="" - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec="" - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec="" - -# Library versioning type. -version_type=linux - -# Format of library name prefix. -libname_spec="lib\$name" - -# 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. -library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}" - -# The coded name of the library, if different from the real name. -soname_spec="\${libname}\${release}\${shared_ext}\$major" - -# Commands used to build and install an old-style archive. -RANLIB="ranlib" -old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib" -old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib" -old_postuninstall_cmds="" - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds="" - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds="" - -# Commands used to build and install a shared archive. -archive_cmds="\$CC -shared -nostdlib \$LDFLAGS \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-h \$wl\$soname -o \$lib" -archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$lib.exp~cat \$export_symbols | \$SED -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$lib.exp~\$echo \\\"local: *; };\\\" >> \$lib.exp~ - \$CC -shared -nostdlib \${wl}-M \$wl\$lib.exp -o \$lib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags~\$rm \$lib.exp" -postinstall_cmds="chmod +x \$lib" -postuninstall_cmds="" - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds="" -module_expsym_cmds="" - -# Commands to strip libraries. -old_striplib="" -striplib="" - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects="/opt/csw/gcc2/lib/gcc-lib/i386-pc-solaris2.8/2.95.3/crti.o /usr/ccs/lib/values-Xa.o /opt/csw/gcc2/lib/gcc-lib/i386-pc-solaris2.8/2.95.3/crtbegin.o" - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects="/opt/csw/gcc2/lib/gcc-lib/i386-pc-solaris2.8/2.95.3/crtend.o /opt/csw/gcc2/lib/gcc-lib/i386-pc-solaris2.8/2.95.3/crtn.o" - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps="" - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps="-lstdc++ -lm -lgcc -lgcc" - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path="-L/opt/csw/gcc2/lib/gcc-lib/i386-pc-solaris2.8/2.95.3 -L/usr/ccs/bin -L/usr/ccs/lib -L/opt/csw/gcc2/lib" - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method="pass_all" - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd="\$MAGIC_CMD" - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag="" - -# Flag that forces no undefined symbols. -no_undefined_flag=" \${wl}-z \${wl}defs" - -# Commands used to finish a libtool library installation in a directory. -finish_cmds="" - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval="" - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe="sed -n -e 's/^.*[ ]\\([BDRT][BDRT]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'" - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'" - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (lt_ptr) \\&\\2},/p'" - -# This is the shared library runtime path variable. -runpath_var= - -# This is the shared library path variable. -shlibpath_var=LD_LIBRARY_PATH - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=yes - -# How to hardcode a shared library path into an executable. -hardcode_action=immediate - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=yes - -# Flag to hardcode $libdir into a binary during linking. -# This must work even if $libdir does not exist. -hardcode_libdir_flag_spec="\${wl}-R \$wl\$libdir" - -# If ld is used when linking, flag to hardcode $libdir into -# a binary during linking. This must work even if $libdir does -# not exist. -hardcode_libdir_flag_spec_ld="" - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator="" - -# Set to yes if using DIR/libNAME during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=no - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=no - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=unsupported - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=no - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="PATH LD_LIBRARY_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=unknown - -# Compile-time system search path for libraries -sys_lib_search_path_spec=" /opt/csw/gcc2/lib/gcc-lib/i386-pc-solaris2.8/2.95.3/ /usr/lib/gcc/i386-pc-solaris2.8/2.95.3/ /opt/csw/gcc2/i386-pc-solaris2.8/lib/i386-pc-solaris2.8/2.95.3/ /opt/csw/gcc2/i386-pc-solaris2.8/lib/ /usr/ccs/bin/i386-pc-solaris2.8/2.95.3/ /usr/ccs/bin/ /usr/ccs/lib/i386-pc-solaris2.8/2.95.3/ /usr/ccs/lib/ /opt/csw/gcc2/lib/i386-pc-solaris2.8/2.95.3/ /opt/csw/gcc2/lib/ /lib/i386-pc-solaris2.8/2.95.3/ /lib/ /usr/lib/i386-pc-solaris2.8/2.95.3/ /usr/lib/" - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec="/lib /usr/lib" - -# Fix the shell variable $srcfile for the compiler. -fix_srcfile_path="" - -# Set to yes if exported symbols are required. -always_export_symbols=no - -# The commands to list exported symbols. -export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols" - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds="" - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms="" - -# Symbols that must always be exported. -include_expsyms="" - -# ### END LIBTOOL TAG CONFIG: CXX Deleted: csw/mgar/pkg/libtool/trunk/files/i386-gcc3.conf =================================================================== --- csw/mgar/pkg/libtool/trunk/files/i386-gcc3.conf 2009-09-04 07:30:40 UTC (rev 6167) +++ csw/mgar/pkg/libtool/trunk/files/i386-gcc3.conf 2009-09-04 07:34:59 UTC (rev 6168) @@ -1,318 +0,0 @@ -# A sed program that does not truncate output. -SED="/opt/csw/bin/gsed" - -# Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="/opt/csw/bin/gsed -e 1s/^X//" - -# 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 - -# The names of the tagged configurations supported by this script. -available_tags=" CXX F77" - -# ### BEGIN LIBTOOL CONFIG - -# Libtool was configured on host ra: - -# Shell to use when invoking shell scripts. -SHELL="/bin/bash" - -# Whether or not to build shared libraries. -build_libtool_libs=yes - -# Whether or not to build static libraries. -build_old_libs=yes - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=yes - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=no - -# Whether or not to optimize for fast installation. -fast_install=needless - -# The host system. -host_alias= -host=i386-pc-solaris2.8 -host_os=solaris2.8 - -# The build system. -build_alias= -build=i386-pc-solaris2.8 -build_os=solaris2.8 - -# An echo program that does not interpret backslashes. -echo="echo" - -# The archiver. -AR="ar" -AR_FLAGS="cru" - -# A C compiler. -LTCC="/opt/csw/gcc3/bin/gcc" - -# LTCC compiler flags. -LTCFLAGS="-O2" - -# A language-specific compiler. -CC="/opt/csw/gcc3/bin/gcc" - -# Is the compiler the GNU C compiler? -with_gcc=yes - -# An ERE matcher. -EGREP="/opt/csw/bin/ggrep -E" - -# The linker used to build libraries. -LD="/usr/ccs/bin/ld" - -# Whether we need hard or soft links. -LN_S="ln -s" - -# A BSD-compatible nm program. -NM="/usr/ccs/bin/nm -p" - -# A symbol stripping program -STRIP="strip" - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=file - -# Used on cygwin: DLL creation program. -DLLTOOL="dlltool" - -# Used on cygwin: object dumper. -OBJDUMP="objdump" - -# Used on cygwin: assembler. -AS="as" - -# The name of the directory that contains temporary libtool files. -objdir=.libs - -# How to create reloadable object files. -reload_flag=" -r" -reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs" - -# How to pass a linker flag through the compiler. -wl="-Wl," - -# Object file suffix (normally "o"). -objext="o" - -# Old archive suffix (normally "a"). -libext="a" - -# Shared library suffix (normally ".so"). -shrext_cmds='.so' - -# Executable file suffix (normally ""). -exeext="" - -# Additional compiler flags for building library objects. -pic_flag=" -fPIC -DPIC" -pic_mode=default - -# What is the maximum length of a command? -max_cmd_len=262144 - -# Does compiler simultaneously support -c and -o options? -compiler_c_o="yes" - -# Must we lock files when doing compilation? -need_locks="no" - -# Do we need the lib prefix for modules? -need_lib_prefix=no - -# Do we need a version for libraries? -need_version=no - -# Whether dlopen is supported. -dlopen_support=yes - -# Whether dlopen of programs is supported. -dlopen_self=yes - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=no - -# Compiler flag to prevent dynamic linking. -link_static_flag="-static" - -# Compiler flag to turn off builtin functions. -no_builtin_flag=" -fno-builtin" - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec="" - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec="\${wl}-z \${wl}allextract\`for conv in \$convenience\\\"\\\"; do test -n \\\"\$conv\\\" && new_convenience=\\\"\$new_convenience,\$conv\\\"; done; \$echo \\\"\$new_convenience\\\"\` \${wl}-z \${wl}defaultextract" - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec="" - -# Library versioning type. -version_type=linux - -# Format of library name prefix. -libname_spec="lib\$name" - -# 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. -library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}" - -# The coded name of the library, if different from the real name. -soname_spec="\${libname}\${release}\${shared_ext}\$major" - -# Commands used to build and install an old-style archive. -RANLIB="ranlib" -old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib" -old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib" -old_postuninstall_cmds="" - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds="" - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds="" - -# Commands used to build and install a shared archive. -archive_cmds="\$CC -shared \${wl}-h \${wl}\$soname -o \$lib \$libobjs \$deplibs \$compiler_flags" -archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$lib.exp~cat \$export_symbols | \$SED -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$lib.exp~\$echo \\\"local: *; };\\\" >> \$lib.exp~ - \$CC -shared \${wl}-M \${wl}\$lib.exp \${wl}-h \${wl}\$soname -o \$lib \$libobjs \$deplibs \$compiler_flags~\$rm \$lib.exp" -postinstall_cmds="chmod +x \$lib" -postuninstall_cmds="" - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds="" -module_expsym_cmds="" - -# Commands to strip libraries. -old_striplib="" -striplib="" - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects="" - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects="" - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps="" - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps="" - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path="" - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method="pass_all" - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd="\$MAGIC_CMD" - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag="" - -# Flag that forces no undefined symbols. -no_undefined_flag=" -z text" - -# Commands used to finish a libtool library installation in a directory. -finish_cmds="" - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval="" - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe="sed -n -e 's/^.*[ ]\\([BDRT][BDRT]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'" - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'" - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (lt_ptr) \\&\\2},/p'" - -# This is the shared library runtime path variable. -runpath_var= - -# This is the shared library path variable. -shlibpath_var=LD_LIBRARY_PATH - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=yes - -# How to hardcode a shared library path into an executable. -hardcode_action=immediate - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=yes - -# Flag to hardcode $libdir into a binary during linking. -# This must work even if $libdir does not exist. -hardcode_libdir_flag_spec="-R\$libdir" - -# If ld is used when linking, flag to hardcode $libdir into -# a binary during linking. This must work even if $libdir does -# not exist. -hardcode_libdir_flag_spec_ld="" - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator="" - -# Set to yes if using DIR/libNAME during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=no - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=no - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=no - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=no - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="PATH LD_LIBRARY_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=yes - -# Compile-time system search path for libraries -sys_lib_search_path_spec=" /opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/ /usr/lib/gcc/i386-pc-solaris2.8/3.4.5/ /opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/../../../../i386-pc-solaris2.8/lib/i386-pc-solaris2.8/3.4.5/ /opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/../../../../i386-pc-solaris2.8/lib/ /usr/ccs/bin/i386-pc-solaris2.8/3.4.5/ /usr/ccs/bin/ /usr/ccs/lib/i386-pc-solaris2.8/3.4.5/ /usr/ccs/lib/ /opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/../../../i386-pc-solaris2.8/3.4.5/ /opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/../../../ /lib/i386-pc-solaris2.8/3.4.5/ /lib/ /usr/lib/i386-pc-solaris2.8/3.4.5/ /usr/lib/" - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec="/lib /usr/lib" - -# Fix the shell variable $srcfile for the compiler. -fix_srcfile_path="" - -# Set to yes if exported symbols are required. -always_export_symbols=no - -# The commands to list exported symbols. -export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols" - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds="" - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms="_GLOBAL_OFFSET_TABLE_" - -# Symbols that must always be exported. -include_expsyms="" - -# ### END LIBTOOL CONFIG Deleted: csw/mgar/pkg/libtool/trunk/files/i386-gcc3.tags =================================================================== --- csw/mgar/pkg/libtool/trunk/files/i386-gcc3.tags 2009-09-04 07:30:40 UTC (rev 6167) +++ csw/mgar/pkg/libtool/trunk/files/i386-gcc3.tags 2009-09-04 07:34:59 UTC (rev 6168) @@ -1,624 +0,0 @@ -# ### BEGIN LIBTOOL TAG CONFIG: disable-shared -disable_libs=shared -# ### END LIBTOOL TAG CONFIG: disable-shared - -# ### BEGIN LIBTOOL TAG CONFIG: disable-static -disable_libs=static -# ### END LIBTOOL TAG CONFIG: disable-static - -# Local Variables: -# mode:shell-script -# sh-indentation:2 -# End: -# ### BEGIN LIBTOOL TAG CONFIG: CXX - -# Libtool was configured on host ra: - -# Shell to use when invoking shell scripts. -SHELL="/bin/bash" - -# Whether or not to build shared libraries. -build_libtool_libs=yes - -# Whether or not to build static libraries. -build_old_libs=yes - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=no - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=no - -# Whether or not to optimize for fast installation. -fast_install=needless - -# The host system. -host_alias= -host=i386-pc-solaris2.8 -host_os=solaris2.8 - -# The build system. -build_alias= -build=i386-pc-solaris2.8 -build_os=solaris2.8 - -# An echo program that does not interpret backslashes. -echo="echo" - -# The archiver. -AR="ar" -AR_FLAGS="cru" - -# A C compiler. -LTCC="/opt/csw/gcc3/bin/gcc" - -# LTCC compiler flags. -LTCFLAGS="-O2" - -# A language-specific compiler. -CC="/opt/csw/gcc3/bin/g++" - -# Is the compiler the GNU C compiler? -with_gcc=yes - -# An ERE matcher. -EGREP="/opt/csw/bin/ggrep -E" - -# The linker used to build libraries. -LD="/usr/ccs/bin/ld" - -# Whether we need hard or soft links. -LN_S="ln -s" - -# A BSD-compatible nm program. -NM="/usr/ccs/bin/nm -p" - -# A symbol stripping program -STRIP="strip" - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=file - -# Used on cygwin: DLL creation program. -DLLTOOL="dlltool" - -# Used on cygwin: object dumper. -OBJDUMP="objdump" - -# Used on cygwin: assembler. -AS="as" - -# The name of the directory that contains temporary libtool files. -objdir=.libs - -# How to create reloadable object files. -reload_flag=" -r" -reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs" - -# How to pass a linker flag through the compiler. -wl="-Wl," - -# Object file suffix (normally "o"). -objext="o" - -# Old archive suffix (normally "a"). -libext="a" - -# Shared library suffix (normally ".so"). -shrext_cmds='.so' - -# Executable file suffix (normally ""). -exeext="" - -# Additional compiler flags for building library objects. -pic_flag=" -fPIC -DPIC" -pic_mode=default - -# What is the maximum length of a command? -max_cmd_len=262144 - -# Does compiler simultaneously support -c and -o options? -compiler_c_o="yes" - -# Must we lock files when doing compilation? -need_locks="no" - -# Do we need the lib prefix for modules? -need_lib_prefix=no - -# Do we need a version for libraries? -need_version=no - -# Whether dlopen is supported. -dlopen_support=yes - -# Whether dlopen of programs is supported. -dlopen_self=yes - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=no - -# Compiler flag to prevent dynamic linking. -link_static_flag="-static" - -# Compiler flag to turn off builtin functions. -no_builtin_flag=" -fno-builtin" - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec="" - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec="" - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec="" - -# Library versioning type. -version_type=linux - -# Format of library name prefix. -libname_spec="lib\$name" - -# 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. -library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}" - -# The coded name of the library, if different from the real name. -soname_spec="\${libname}\${release}\${shared_ext}\$major" - -# Commands used to build and install an old-style archive. -RANLIB="ranlib" -old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib" -old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib" -old_postuninstall_cmds="" - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds="" - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds="" - -# Commands used to build and install a shared archive. -archive_cmds="\$CC -shared -nostdlib \$LDFLAGS \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-h \$wl\$soname -o \$lib" -archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$lib.exp~cat \$export_symbols | \$SED -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$lib.exp~\$echo \\\"local: *; };\\\" >> \$lib.exp~ - \$CC -shared -nostdlib \${wl}-M \$wl\$lib.exp -o \$lib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags~\$rm \$lib.exp" -postinstall_cmds="chmod +x \$lib" -postuninstall_cmds="" - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds="" -module_expsym_cmds="" - -# Commands to strip libraries. -old_striplib="" -striplib="" - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects="/opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/crti.o /usr/ccs/lib/values-Xa.o /opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/crtbegin.o" - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects="/opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/crtend.o /opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/crtn.o" - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps="" - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps="-lstdc++ -lm -lgcc_s -lgcc_s" - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path="-L/opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5 -L/usr/ccs/bin -L/usr/ccs/lib -L/opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/../../.." - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method="pass_all" - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd="\$MAGIC_CMD" - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag="" - -# Flag that forces no undefined symbols. -no_undefined_flag=" \${wl}-z \${wl}defs" - -# Commands used to finish a libtool library installation in a directory. -finish_cmds="" - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval="" - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe="sed -n -e 's/^.*[ ]\\([BDRT][BDRT]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'" - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'" - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (lt_ptr) \\&\\2},/p'" - -# This is the shared library runtime path variable. -runpath_var= - -# This is the shared library path variable. -shlibpath_var=LD_LIBRARY_PATH - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=yes - -# How to hardcode a shared library path into an executable. -hardcode_action=immediate - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=yes - -# Flag to hardcode $libdir into a binary during linking. -# This must work even if $libdir does not exist. -hardcode_libdir_flag_spec="\${wl}-R \$wl\$libdir" - -# If ld is used when linking, flag to hardcode $libdir into -# a binary during linking. This must work even if $libdir does -# not exist. -hardcode_libdir_flag_spec_ld="" - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator="" - -# Set to yes if using DIR/libNAME during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=no - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=no - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=unsupported - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=no - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="PATH LD_LIBRARY_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=unknown - -# Compile-time system search path for libraries -sys_lib_search_path_spec=" /opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/ /usr/lib/gcc/i386-pc-solaris2.8/3.4.5/ /opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/../../../../i386-pc-solaris2.8/lib/i386-pc-solaris2.8/3.4.5/ /opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/../../../../i386-pc-solaris2.8/lib/ /usr/ccs/bin/i386-pc-solaris2.8/3.4.5/ /usr/ccs/bin/ /usr/ccs/lib/i386-pc-solaris2.8/3.4.5/ /usr/ccs/lib/ /opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/../../../i386-pc-solaris2.8/3.4.5/ /opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/../../../ /lib/i386-pc-solaris2.8/3.4.5/ /lib/ /usr/lib/i386-pc-solaris2.8/3.4.5/ /usr/lib/" - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec="/lib /usr/lib" - -# Fix the shell variable $srcfile for the compiler. -fix_srcfile_path="" - -# Set to yes if exported symbols are required. -always_export_symbols=no - -# The commands to list exported symbols. -export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols" - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds="" - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms="" - -# Symbols that must always be exported. -include_expsyms="" - -# ### END LIBTOOL TAG CONFIG: CXX - -# ### BEGIN LIBTOOL TAG CONFIG: F77 - -# Libtool was configured on host ra: - -# Shell to use when invoking shell scripts. -SHELL="/bin/bash" - -# Whether or not to build shared libraries. -build_libtool_libs=yes - -# Whether or not to build static libraries. -build_old_libs=yes - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=no - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=no - -# Whether or not to optimize for fast installation. -fast_install=needless - -# The host system. -host_alias= -host=i386-pc-solaris2.8 -host_os=solaris2.8 - -# The build system. -build_alias= -build=i386-pc-solaris2.8 -build_os=solaris2.8 - -# An echo program that does not interpret backslashes. -echo="echo" - -# The archiver. -AR="ar" -AR_FLAGS="cru" - -# A C compiler. -LTCC="/opt/csw/gcc3/bin/gcc" - -# LTCC compiler flags. -LTCFLAGS="-O2" - -# A language-specific compiler. -CC="/opt/csw/gcc3/bin/g77" - -# Is the compiler the GNU C compiler? -with_gcc=yes - -# An ERE matcher. -EGREP="/opt/csw/bin/ggrep -E" - -# The linker used to build libraries. -LD="/usr/ccs/bin/ld" - -# Whether we need hard or soft links. -LN_S="ln -s" - -# A BSD-compatible nm program. -NM="/usr/ccs/bin/nm -p" - -# A symbol stripping program -STRIP="strip" - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=file - -# Used on cygwin: DLL creation program. -DLLTOOL="dlltool" - -# Used on cygwin: object dumper. -OBJDUMP="objdump" - -# Used on cygwin: assembler. -AS="as" - -# The name of the directory that contains temporary libtool files. -objdir=.libs - -# How to create reloadable object files. -reload_flag=" -r" -reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs" - -# How to pass a linker flag through the compiler. -wl="-Wl," - -# Object file suffix (normally "o"). -objext="o" - -# Old archive suffix (normally "a"). -libext="a" - -# Shared library suffix (normally ".so"). -shrext_cmds='.so' - -# Executable file suffix (normally ""). -exeext="" - -# Additional compiler flags for building library objects. -pic_flag=" -fPIC" -pic_mode=default - -# What is the maximum length of a command? -max_cmd_len=262144 - -# Does compiler simultaneously support -c and -o options? -compiler_c_o="yes" - -# Must we lock files when doing compilation? -need_locks="no" - -# Do we need the lib prefix for modules? -need_lib_prefix=no - -# Do we need a version for libraries? -need_version=no - -# Whether dlopen is supported. -dlopen_support=yes - -# Whether dlopen of programs is supported. -dlopen_self=yes - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=no - -# Compiler flag to prevent dynamic linking. -link_static_flag="-static" - -# Compiler flag to turn off builtin functions. -no_builtin_flag="" - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec="" - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec="\${wl}-z \${wl}allextract\`for conv in \$convenience\\\"\\\"; do test -n \\\"\$conv\\\" && new_convenience=\\\"\$new_convenience,\$conv\\\"; done; \$echo \\\"\$new_convenience\\\"\` \${wl}-z \${wl}defaultextract" - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec="" - -# Library versioning type. -version_type=linux - -# Format of library name prefix. -libname_spec="lib\$name" - -# 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. -library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}" - -# The coded name of the library, if different from the real name. -soname_spec="\${libname}\${release}\${shared_ext}\$major" - -# Commands used to build and install an old-style archive. -RANLIB="ranlib" -old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib" -old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib" -old_postuninstall_cmds="" - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds="" - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds="" - -# Commands used to build and install a shared archive. -archive_cmds="\$CC -shared \${wl}-h \${wl}\$soname -o \$lib \$libobjs \$deplibs \$compiler_flags" -archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$lib.exp~cat \$export_symbols | \$SED -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$lib.exp~\$echo \\\"local: *; };\\\" >> \$lib.exp~ - \$CC -shared \${wl}-M \${wl}\$lib.exp \${wl}-h \${wl}\$soname -o \$lib \$libobjs \$deplibs \$compiler_flags~\$rm \$lib.exp" -postinstall_cmds="chmod +x \$lib" -postuninstall_cmds="" - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds="" -module_expsym_cmds="" - -# Commands to strip libraries. -old_striplib="" -striplib="" - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects="" - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects="" - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps="" - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps="" - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path="" - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method="pass_all" - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd="\$MAGIC_CMD" - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag="" - -# Flag that forces no undefined symbols. -no_undefined_flag=" -z text" - -# Commands used to finish a libtool library installation in a directory. -finish_cmds="" - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval="" - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe="sed -n -e 's/^.*[ ]\\([BDRT][BDRT]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'" - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'" - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (lt_ptr) \\&\\2},/p'" - -# This is the shared library runtime path variable. -runpath_var= - -# This is the shared library path variable. -shlibpath_var=LD_LIBRARY_PATH - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=yes - -# How to hardcode a shared library path into an executable. -hardcode_action=immediate - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=yes - -# Flag to hardcode $libdir into a binary during linking. -# This must work even if $libdir does not exist. -hardcode_libdir_flag_spec="-R\$libdir" - -# If ld is used when linking, flag to hardcode $libdir into -# a binary during linking. This must work even if $libdir does -# not exist. -hardcode_libdir_flag_spec_ld="" - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator="" - -# Set to yes if using DIR/libNAME during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=no - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=no - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=no - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=no - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="PATH LD_LIBRARY_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=yes - -# Compile-time system search path for libraries -sys_lib_search_path_spec=" /opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/ /usr/lib/gcc/i386-pc-solaris2.8/3.4.5/ /opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/../../../../i386-pc-solaris2.8/lib/i386-pc-solaris2.8/3.4.5/ /opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/../../../../i386-pc-solaris2.8/lib/ /usr/ccs/bin/i386-pc-solaris2.8/3.4.5/ /usr/ccs/bin/ /usr/ccs/lib/i386-pc-solaris2.8/3.4.5/ /usr/ccs/lib/ /opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/../../../i386-pc-solaris2.8/3.4.5/ /opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/../../../ /lib/i386-pc-solaris2.8/3.4.5/ /lib/ /usr/lib/i386-pc-solaris2.8/3.4.5/ /usr/lib/" - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec="/lib /usr/lib" - -# Fix the shell variable $srcfile for the compiler. -fix_srcfile_path="" - -# Set to yes if exported symbols are required. -always_export_symbols=no - -# The commands to list exported symbols. -export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols" - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds="" - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms="_GLOBAL_OFFSET_TABLE_" - -# Symbols that must always be exported. -include_expsyms="" - -# ### END LIBTOOL TAG CONFIG: F77 - Deleted: csw/mgar/pkg/libtool/trunk/files/libtool-gcc-tags.patch =================================================================== --- csw/mgar/pkg/libtool/trunk/files/libtool-gcc-tags.patch 2009-09-04 07:30:40 UTC (rev 6167) +++ csw/mgar/pkg/libtool/trunk/files/libtool-gcc-tags.patch 2009-09-04 07:34:59 UTC (rev 6168) @@ -1,128 +0,0 @@ ---- src-tree/libtool-1.5.22/libtool 2006-06-27 09:01:20.017045000 -0400 -+++ libtool/i386/libtool 2006-06-17 23:25:28.793268000 -0400 -@@ -44,7 +44,7 @@ - - # ### BEGIN LIBTOOL CONFIG - --# Libtool was configured on host thor: -+# Libtool was configured on host ra: - - # Shell to use when invoking shell scripts. - SHELL="/bin/bash" -@@ -85,7 +85,7 @@ - LTCC="cc" - - # LTCC compiler flags. --LTCFLAGS="-I/opt/csw/include -fsimple=2 -nofstore -xO5 -xalias_level=basic -xdepend -xarch=386 -xstrconst -xildoff" -+LTCFLAGS="-O" - - # A language-specific compiler. - CC="cc" -@@ -382,6 +382,8 @@ - # positional parameter $0, within a function call, is the name of the - # function. - progpath="$0" -+confpath="$0" -+tagspath="$0" - - # The name of this program: - progname=`echo "$progpath" | $SED $basename` -@@ -594,9 +596,9 @@ - # if we don't check for them as well. - *) - for z in $available_tags; do -- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then -+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$tagspath" > /dev/null; then - # Evaluate the configuration. -- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" -+ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $tagspath`" - CC_quoted= - for arg in $CC; do - # Double-quote args containing other shell metacharacters. -@@ -777,10 +779,10 @@ - # not specially marked. - ;; - *) -- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then -+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$tagspath" > /dev/null; then - taglist="$taglist $tagname" - # Evaluate the configuration. -- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`" -+ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $tagspath`" - else - $echo "$progname: ignoring unknown tag $tagname" 1>&2 - fi -@@ -816,7 +818,7 @@ - ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath - # Now print the configurations for the tags. - for tagname in $taglist; do -- ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath" -+ ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$tagspath" - done - exit $? - ;; -@@ -894,6 +896,17 @@ - exit $EXIT_FAILURE - fi - -+case `which "$nonopt"` in -+/opt/csw/gcc2/bin/*) -+ . /opt/csw/share/libtool/gcc2.conf -+ tagspath=/opt/csw/share/libtool/gcc2.tags -+ ;; -+/opt/csw/gcc3/bin/*) -+ . /opt/csw/share/libtool/gcc3.conf -+ tagspath=/opt/csw/share/libtool/gcc3.tags -+ ;; -+esac -+ - case $disable_libs in - no) - ;; -@@ -7207,13 +7220,9 @@ - disable_libs=static - # ### END LIBTOOL TAG CONFIG: disable-static - --# Local Variables: --# mode:shell-script --# sh-indentation:2 --# End: - # ### BEGIN LIBTOOL TAG CONFIG: CXX - --# Libtool was configured on host thor: -+# Libtool was configured on host ra: - - # Shell to use when invoking shell scripts. - SHELL="/bin/bash" -@@ -7254,7 +7263,7 @@ - LTCC="cc" - - # LTCC compiler flags. --LTCFLAGS="-I/opt/csw/include -fsimple=2 -nofstore -xO5 -xalias_level=basic -xdepend -xarch=386 -xstrconst -xildoff" -+LTCFLAGS="-O" - - # A language-specific compiler. - CC="CC" -@@ -7519,7 +7528,7 @@ - - # ### BEGIN LIBTOOL TAG CONFIG: F77 - --# Libtool was configured on host thor: -+# Libtool was configured on host ra: - - # Shell to use when invoking shell scripts. - SHELL="/bin/bash" -@@ -7560,7 +7569,7 @@ - LTCC="cc" - - # LTCC compiler flags. --LTCFLAGS="-I/opt/csw/include -fsimple=2 -nofstore -xO5 -xalias_level=basic -xdepend -xarch=386 -xstrconst -xildoff" -+LTCFLAGS="-O" - - # A language-specific compiler. - CC="f77" -@@ -7822,4 +7831,3 @@ - include_expsyms="" - - # ### END LIBTOOL TAG CONFIG: F77 -- Added: csw/mgar/pkg/libtool/trunk/files/patch-libtool.diff =================================================================== --- csw/mgar/pkg/libtool/trunk/files/patch-libtool.diff (rev 0) +++ csw/mgar/pkg/libtool/trunk/files/patch-libtool.diff 2009-09-04 07:34:59 UTC (rev 6168) @@ -0,0 +1,87 @@ +diff -Naur lt-orig/libtool lt-patched/libtool +--- lt-orig/libtool 2009-09-03 20:43:39.235079615 +0200 ++++ lt-patched/libtool 2009-09-03 20:56:11.509318512 +0200 +@@ -138,7 +138,7 @@ + LTCC="/opt/studio/SOS11/SUNWspro/bin/cc" + + # LTCC compiler flags. +-LTCFLAGS="-xO3 -xarch=v8 -I/opt/csw/include" ++LTCFLAGS="-O" + + # Take the output of nm and produce a listing of raw symbols and C names. + global_symbol_pipe="sed -n -e 's/^.*[ ]\\([BDRT][BDRT]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'" +@@ -682,6 +682,8 @@ + # positional parameter $0, within a function call, is the name of the + # function. + progpath="$0" ++confpath="$0" ++tagspath="$0" + + # The name of this program: + # In the unlikely event $progname began with a '-', it would play havoc with +@@ -1128,11 +1130,11 @@ + re_endcf='^# ### END LIBTOOL' + + # Default configuration. +- $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath" ++ $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$confpath" + + # Now print the configurations for the tags. + for tagname in $taglist; do +- $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath" ++ $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$tagspath" + done + + exit $? +@@ -1182,14 +1184,14 @@ + case $tagname in + CC) ;; + *) +- if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then ++ if $GREP "$re_begincf" "$tagspath" >/dev/null 2>&1; then + taglist="$taglist $tagname" + + # Evaluate the configuration. Be careful to quote the path + # and the sed script, to avoid splitting on whitespace, but + # also don't use non-portable quotes within backquotes within + # quotes we have to do it in 2 steps: +- extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` ++ extractedcf=`$SED -n -e "$sed_extractcf" < "$tagspath"` + eval "$extractedcf" + else + func_error "ignoring unknown tag $tagname" +@@ -1303,7 +1305,21 @@ + + -*) func_fatal_help "unrecognized option \`$opt'" ;; + +- *) nonopt="$opt" ++ *) case `which "$opt"` in ++ /opt/csw/gcc3/bin/*) ++ . /opt/csw/share/libtool/gcc3.conf ++ tagspath=/opt/csw/share/libtool/gcc3.tags ++ ;; ++ /opt/csw/gcc4/bin/*) ++ . /opt/csw/share/libtool/gcc4.conf ++ tagspath=/opt/csw/share/libtool/gcc4.tags ++ ;; ++ esac ++ ++ ++ ++ ++nonopt="$opt" + break + ;; + esac +@@ -1530,9 +1546,9 @@ + # if we don't check for them as well. + *) + for z in $available_tags; do +- if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then ++ if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$tagspath" > /dev/null; then + # Evaluate the configuration. +- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" ++ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $tagspath`" + CC_quoted= + for arg in $CC; do + # Double-quote args containing other shell metacharacters. Deleted: csw/mgar/pkg/libtool/trunk/files/sparc-gcc2.conf =================================================================== --- csw/mgar/pkg/libtool/trunk/files/sparc-gcc2.conf 2009-09-04 07:30:40 UTC (rev 6167) +++ csw/mgar/pkg/libtool/trunk/files/sparc-gcc2.conf 2009-09-04 07:34:59 UTC (rev 6168) @@ -1,318 +0,0 @@ -# A sed program that does not truncate output. -SED="/opt/csw/bin/gsed" - -# Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="/opt/csw/bin/gsed -e 1s/^X//" - -# 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 - -# The names of the tagged configurations supported by this script. -available_tags=" CXX" - -# ### BEGIN LIBTOOL CONFIG - -# Libtool was configured on host ra: - -# Shell to use when invoking shell scripts. -SHELL="/bin/bash" - -# Whether or not to build shared libraries. -build_libtool_libs=yes - -# Whether or not to build static libraries. -build_old_libs=yes - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=yes - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=no - -# Whether or not to optimize for fast installation. -fast_install=needless - -# The host system. -host_alias= -host=sparc-sun-solaris2.8 -host_os=solaris2.8 - -# The build system. -build_alias= -build=sparc-sun-solaris2.8 -build_os=solaris2.8 - -# An echo program that does not interpret backslashes. -echo="echo" - -# The archiver. -AR="ar" -AR_FLAGS="cru" - -# A C compiler. -LTCC="/opt/csw/gcc2/bin/gcc" - -# LTCC compiler flags. -LTCFLAGS="-O2" - -# A language-specific compiler. -CC="/opt/csw/gcc2/bin/gcc" - -# Is the compiler the GNU C compiler? -with_gcc=yes - -# An ERE matcher. -EGREP="/opt/csw/bin/ggrep -E" - -# The linker used to build libraries. -LD="/usr/ccs/bin/ld" - -# Whether we need hard or soft links. -LN_S="ln -s" - -# A BSD-compatible nm program. -NM="/usr/ccs/bin/nm -p" - -# A symbol stripping program -STRIP="strip" - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=file - -# Used on cygwin: DLL creation program. -DLLTOOL="dlltool" - -# Used on cygwin: object dumper. -OBJDUMP="objdump" - -# Used on cygwin: assembler. -AS="as" - -# The name of the directory that contains temporary libtool files. -objdir=.libs - -# How to create reloadable object files. -reload_flag=" -r" -reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs" - -# How to pass a linker flag through the compiler. -wl="-Wl," - -# Object file suffix (normally "o"). -objext="o" - -# Old archive suffix (normally "a"). -libext="a" - -# Shared library suffix (normally ".so"). -shrext_cmds='.so' - -# Executable file suffix (normally ""). -exeext="" - -# Additional compiler flags for building library objects. -pic_flag=" -fPIC -DPIC" -pic_mode=default - -# What is the maximum length of a command? -max_cmd_len=262144 - -# Does compiler simultaneously support -c and -o options? -compiler_c_o="yes" - -# Must we lock files when doing compilation? -need_locks="no" - -# Do we need the lib prefix for modules? -need_lib_prefix=no - -# Do we need a version for libraries? -need_version=no - -# Whether dlopen is supported. -dlopen_support=yes - -# Whether dlopen of programs is supported. -dlopen_self=yes - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=no - -# Compiler flag to prevent dynamic linking. -link_static_flag="-static" - -# Compiler flag to turn off builtin functions. -no_builtin_flag=" -fno-builtin -fno-rtti -fno-exceptions" - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec="" - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec="\${wl}-z \${wl}allextract\`for conv in \$convenience\\\"\\\"; do test -n \\\"\$conv\\\" && new_convenience=\\\"\$new_convenience,\$conv\\\"; done; \$echo \\\"\$new_convenience\\\"\` \${wl}-z \${wl}defaultextract" - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec="" - -# Library versioning type. -version_type=linux - -# Format of library name prefix. -libname_spec="lib\$name" - -# 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. -library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}" - -# The coded name of the library, if different from the real name. -soname_spec="\${libname}\${release}\${shared_ext}\$major" - -# Commands used to build and install an old-style archive. -RANLIB="ranlib" -old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib" -old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib" -old_postuninstall_cmds="" - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds="" - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds="" - -# Commands used to build and install a shared archive. -archive_cmds="\$CC -shared \${wl}-h \${wl}\$soname -o \$lib \$libobjs \$deplibs \$compiler_flags" -archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$lib.exp~cat \$export_symbols | \$SED -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$lib.exp~\$echo \\\"local: *; };\\\" >> \$lib.exp~ - \$CC -shared \${wl}-M \${wl}\$lib.exp \${wl}-h \${wl}\$soname -o \$lib \$libobjs \$deplibs \$compiler_flags~\$rm \$lib.exp" -postinstall_cmds="chmod +x \$lib" -postuninstall_cmds="" - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds="" -module_expsym_cmds="" - -# Commands to strip libraries. -old_striplib="" -striplib="" - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects="" - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects="" - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps="" - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps="" - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path="" - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method="pass_all" - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd="\$MAGIC_CMD" - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag="" - -# Flag that forces no undefined symbols. -no_undefined_flag=" -z text" - -# Commands used to finish a libtool library installation in a directory. -finish_cmds="" - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval="" - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe="sed -n -e 's/^.*[ ]\\([BDRT][BDRT]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'" - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'" - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (lt_ptr) \\&\\2},/p'" - -# This is the shared library runtime path variable. -runpath_var= - -# This is the shared library path variable. -shlibpath_var=LD_LIBRARY_PATH - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=yes - -# How to hardcode a shared library path into an executable. -hardcode_action=immediate - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=yes - -# Flag to hardcode $libdir into a binary during linking. -# This must work even if $libdir does not exist. -hardcode_libdir_flag_spec="-R\$libdir" - -# If ld is used when linking, flag to hardcode $libdir into -# a binary during linking. This must work even if $libdir does -# not exist. -hardcode_libdir_flag_spec_ld="" - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator="" - -# Set to yes if using DIR/libNAME during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=no - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=no - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=no - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=no - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="PATH LD_LIBRARY_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=yes - -# Compile-time system search path for libraries -sys_lib_search_path_spec=" /opt/csw/gcc2/lib/gcc-lib/sparc-sun-solaris2.8/2.95.3/ /usr/lib/gcc/sparc-sun-solaris2.8/2.95.3/ /opt/csw/gcc2/sparc-sun-solaris2.8/lib/sparc-sun-solaris2.8/2.95.3/ /opt/csw/gcc2/sparc-sun-solaris2.8/lib/ /usr/ccs/bin/sparc-sun-solaris2.8/2.95.3/ /usr/ccs/bin/ /usr/ccs/lib/sparc-sun-solaris2.8/2.95.3/ /usr/ccs/lib/ /opt/csw/gcc2/lib/sparc-sun-solaris2.8/2.95.3/ /opt/csw/gcc2/lib/ /lib/sparc-sun-solaris2.8/2.95.3/ /lib/ /usr/lib/sparc-sun-solaris2.8/2.95.3/ /usr/lib/" - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec="/lib /usr/lib" - -# Fix the shell variable $srcfile for the compiler. -fix_srcfile_path="" - -# Set to yes if exported symbols are required. -always_export_symbols=no - -# The commands to list exported symbols. -export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols" - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds="" - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms="_GLOBAL_OFFSET_TABLE_" - -# Symbols that must always be exported. -include_expsyms="" - -# ### END LIBTOOL CONFIG Deleted: csw/mgar/pkg/libtool/trunk/files/sparc-gcc2.tags =================================================================== --- csw/mgar/pkg/libtool/trunk/files/sparc-gcc2.tags 2009-09-04 07:30:40 UTC (rev 6167) +++ csw/mgar/pkg/libtool/trunk/files/sparc-gcc2.tags 2009-09-04 07:34:59 UTC (rev 6168) @@ -1,317 +0,0 @@ -# ### BEGIN LIBTOOL TAG CONFIG: disable-shared -disable_libs=shared -# ### END LIBTOOL TAG CONFIG: disable-shared - -# ### BEGIN LIBTOOL TAG CONFIG: disable-static -disable_libs=static -# ### END LIBTOOL TAG CONFIG: disable-static - -# Local Variables: -# mode:shell-script -# sh-indentation:2 -# End: -# ### BEGIN LIBTOOL TAG CONFIG: CXX - -# Libtool was configured on host ra: - -# Shell to use when invoking shell scripts. -SHELL="/bin/bash" - -# Whether or not to build shared libraries. -build_libtool_libs=yes - -# Whether or not to build static libraries. -build_old_libs=yes - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=no - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=no - -# Whether or not to optimize for fast installation. -fast_install=needless - -# The host system. -host_alias= -host=sparc-sun-solaris2.8 -host_os=solaris2.8 - -# The build system. -build_alias= -build=sparc-sun-solaris2.8 -build_os=solaris2.8 - -# An echo program that does not interpret backslashes. -echo="echo" - -# The archiver. -AR="ar" -AR_FLAGS="cru" - -# A C compiler. -LTCC="/opt/csw/gcc2/bin/gcc" - -# LTCC compiler flags. -LTCFLAGS="-O2" - -# A language-specific compiler. -CC="/opt/csw/gcc2/bin/g++" - -# Is the compiler the GNU C compiler? -with_gcc=yes - -# An ERE matcher. -EGREP="/opt/csw/bin/ggrep -E" - -# The linker used to build libraries. -LD="/usr/ccs/bin/ld" - -# Whether we need hard or soft links. -LN_S="ln -s" - -# A BSD-compatible nm program. -NM="/usr/ccs/bin/nm -p" - -# A symbol stripping program -STRIP="strip" - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=file - -# Used on cygwin: DLL creation program. -DLLTOOL="dlltool" - -# Used on cygwin: object dumper. -OBJDUMP="objdump" - -# Used on cygwin: assembler. -AS="as" - -# The name of the directory that contains temporary libtool files. -objdir=.libs - -# How to create reloadable object files. -reload_flag=" -r" -reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs" - -# How to pass a linker flag through the compiler. -wl="-Wl," - -# Object file suffix (normally "o"). -objext="o" - -# Old archive suffix (normally "a"). -libext="a" - -# Shared library suffix (normally ".so"). -shrext_cmds='.so' - -# Executable file suffix (normally ""). -exeext="" - -# Additional compiler flags for building library objects. -pic_flag=" -fPIC -DPIC" -pic_mode=default - -# What is the maximum length of a command? -max_cmd_len=262144 - -# Does compiler simultaneously support -c and -o options? -compiler_c_o="yes" - -# Must we lock files when doing compilation? -need_locks="no" - -# Do we need the lib prefix for modules? -need_lib_prefix=no - -# Do we need a version for libraries? -need_version=no - -# Whether dlopen is supported. -dlopen_support=yes - -# Whether dlopen of programs is supported. -dlopen_self=yes - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=no - -# Compiler flag to prevent dynamic linking. -link_static_flag="-static" - -# Compiler flag to turn off builtin functions. -no_builtin_flag=" -fno-builtin" - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec="" - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec="" - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec="" - -# Library versioning type. -version_type=linux - -# Format of library name prefix. -libname_spec="lib\$name" - -# 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. -library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}" - -# The coded name of the library, if different from the real name. -soname_spec="\${libname}\${release}\${shared_ext}\$major" - -# Commands used to build and install an old-style archive. -RANLIB="ranlib" -old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib" -old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib" -old_postuninstall_cmds="" - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds="" - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds="" - -# Commands used to build and install a shared archive. -archive_cmds="\$CC -shared -nostdlib \$LDFLAGS \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-h \$wl\$soname -o \$lib" -archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$lib.exp~cat \$export_symbols | \$SED -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$lib.exp~\$echo \\\"local: *; };\\\" >> \$lib.exp~ - \$CC -shared -nostdlib \${wl}-M \$wl\$lib.exp -o \$lib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags~\$rm \$lib.exp" -postinstall_cmds="chmod +x \$lib" -postuninstall_cmds="" - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds="" -module_expsym_cmds="" - -# Commands to strip libraries. -old_striplib="" -striplib="" - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects="/opt/csw/gcc2/lib/gcc-lib/sparc-sun-solaris2.8/2.95.3/crti.o /usr/ccs/lib/values-Xa.o /opt/csw/gcc2/lib/gcc-lib/sparc-sun-solaris2.8/2.95.3/crtbegin.o" - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects="/opt/csw/gcc2/lib/gcc-lib/sparc-sun-solaris2.8/2.95.3/crtend.o /opt/csw/gcc2/lib/gcc-lib/sparc-sun-solaris2.8/2.95.3/crtn.o" - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps="" - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps="-lstdc++ -lm -lgcc -lgcc" - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path="-L/opt/csw/gcc2/lib/gcc-lib/sparc-sun-solaris2.8/2.95.3 -L/usr/ccs/bin -L/usr/ccs/lib -L/opt/csw/gcc2/lib" - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method="pass_all" - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd="\$MAGIC_CMD" - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag="" - -# Flag that forces no undefined symbols. -no_undefined_flag=" \${wl}-z \${wl}defs" - -# Commands used to finish a libtool library installation in a directory. -finish_cmds="" - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval="" - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe="sed -n -e 's/^.*[ ]\\([BDRT][BDRT]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'" - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'" - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (lt_ptr) \\&\\2},/p'" - -# This is the shared library runtime path variable. -runpath_var= - -# This is the shared library path variable. -shlibpath_var=LD_LIBRARY_PATH - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=yes - -# How to hardcode a shared library path into an executable. -hardcode_action=immediate - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=yes - -# Flag to hardcode $libdir into a binary during linking. -# This must work even if $libdir does not exist. -hardcode_libdir_flag_spec="\${wl}-R \$wl\$libdir" - -# If ld is used when linking, flag to hardcode $libdir into -# a binary during linking. This must work even if $libdir does -# not exist. -hardcode_libdir_flag_spec_ld="" - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator="" - -# Set to yes if using DIR/libNAME during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=no - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=no - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=unsupported - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=no - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="PATH LD_LIBRARY_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=unknown - -# Compile-time system search path for libraries -sys_lib_search_path_spec=" /opt/csw/gcc2/lib/gcc-lib/sparc-sun-solaris2.8/2.95.3/ /usr/lib/gcc/sparc-sun-solaris2.8/2.95.3/ /opt/csw/gcc2/sparc-sun-solaris2.8/lib/sparc-sun-solaris2.8/2.95.3/ /opt/csw/gcc2/sparc-sun-solaris2.8/lib/ /usr/ccs/bin/sparc-sun-solaris2.8/2.95.3/ /usr/ccs/bin/ /usr/ccs/lib/sparc-sun-solaris2.8/2.95.3/ /usr/ccs/lib/ /opt/csw/gcc2/lib/sparc-sun-solaris2.8/2.95.3/ /opt/csw/gcc2/lib/ /lib/sparc-sun-solaris2.8/2.95.3/ /lib/ /usr/lib/sparc-sun-solaris2.8/2.95.3/ /usr/lib/" - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec="/lib /usr/lib" - -# Fix the shell variable $srcfile for the compiler. -fix_srcfile_path="" - -# Set to yes if exported symbols are required. -always_export_symbols=no - -# The commands to list exported symbols. -export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols" - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds="" - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms="" - -# Symbols that must always be exported. -include_expsyms="" - -# ### END LIBTOOL TAG CONFIG: CXX Deleted: csw/mgar/pkg/libtool/trunk/files/sparc-gcc3.conf =================================================================== --- csw/mgar/pkg/libtool/trunk/files/sparc-gcc3.conf 2009-09-04 07:30:40 UTC (rev 6167) +++ csw/mgar/pkg/libtool/trunk/files/sparc-gcc3.conf 2009-09-04 07:34:59 UTC (rev 6168) @@ -1,318 +0,0 @@ -# A sed program that does not truncate output. -SED="/opt/csw/bin/gsed" - -# Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="/opt/csw/bin/gsed -e 1s/^X//" - -# 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 - -# The names of the tagged configurations supported by this script. -available_tags=" CXX F77" - -# ### BEGIN LIBTOOL CONFIG - -# Libtool was configured on host ra: - -# Shell to use when invoking shell scripts. -SHELL="/bin/bash" - -# Whether or not to build shared libraries. -build_libtool_libs=yes - -# Whether or not to build static libraries. -build_old_libs=yes - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=yes - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=no - -# Whether or not to optimize for fast installation. -fast_install=needless - -# The host system. -host_alias= -host=sparc-sun-solaris2.8 -host_os=solaris2.8 - -# The build system. -build_alias= -build=sparc-sun-solaris2.8 -build_os=solaris2.8 - -# An echo program that does not interpret backslashes. -echo="echo" - -# The archiver. -AR="ar" -AR_FLAGS="cru" - -# A C compiler. -LTCC="/opt/csw/gcc3/bin/gcc" - -# LTCC compiler flags. -LTCFLAGS="-O2" - -# A language-specific compiler. -CC="/opt/csw/gcc3/bin/gcc" - -# Is the compiler the GNU C compiler? -with_gcc=yes - -# An ERE matcher. -EGREP="/opt/csw/bin/ggrep -E" - -# The linker used to build libraries. -LD="/usr/ccs/bin/ld" - -# Whether we need hard or soft links. -LN_S="ln -s" - -# A BSD-compatible nm program. -NM="/usr/ccs/bin/nm -p" - -# A symbol stripping program -STRIP="strip" - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=file - -# Used on cygwin: DLL creation program. -DLLTOOL="dlltool" - -# Used on cygwin: object dumper. -OBJDUMP="objdump" - -# Used on cygwin: assembler. -AS="as" - -# The name of the directory that contains temporary libtool files. -objdir=.libs - -# How to create reloadable object files. -reload_flag=" -r" -reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs" - -# How to pass a linker flag through the compiler. -wl="-Wl," - -# Object file suffix (normally "o"). -objext="o" - -# Old archive suffix (normally "a"). -libext="a" - -# Shared library suffix (normally ".so"). -shrext_cmds='.so' - -# Executable file suffix (normally ""). -exeext="" - -# Additional compiler flags for building library objects. -pic_flag=" -fPIC -DPIC" -pic_mode=default - -# What is the maximum length of a command? -max_cmd_len=262144 - -# Does compiler simultaneously support -c and -o options? -compiler_c_o="yes" - -# Must we lock files when doing compilation? -need_locks="no" - -# Do we need the lib prefix for modules? -need_lib_prefix=no - -# Do we need a version for libraries? -need_version=no - -# Whether dlopen is supported. -dlopen_support=yes - -# Whether dlopen of programs is supported. -dlopen_self=yes - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=no - -# Compiler flag to prevent dynamic linking. -link_static_flag="-static" - -# Compiler flag to turn off builtin functions. -no_builtin_flag=" -fno-builtin" - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec="" - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec="\${wl}-z \${wl}allextract\`for conv in \$convenience\\\"\\\"; do test -n \\\"\$conv\\\" && new_convenience=\\\"\$new_convenience,\$conv\\\"; done; \$echo \\\"\$new_convenience\\\"\` \${wl}-z \${wl}defaultextract" - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec="" - -# Library versioning type. -version_type=linux - -# Format of library name prefix. -libname_spec="lib\$name" - -# 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. -library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}" - -# The coded name of the library, if different from the real name. -soname_spec="\${libname}\${release}\${shared_ext}\$major" - -# Commands used to build and install an old-style archive. -RANLIB="ranlib" -old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib" -old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib" -old_postuninstall_cmds="" - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds="" - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds="" - -# Commands used to build and install a shared archive. -archive_cmds="\$CC -shared \${wl}-h \${wl}\$soname -o \$lib \$libobjs \$deplibs \$compiler_flags" -archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$lib.exp~cat \$export_symbols | \$SED -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$lib.exp~\$echo \\\"local: *; };\\\" >> \$lib.exp~ - \$CC -shared \${wl}-M \${wl}\$lib.exp \${wl}-h \${wl}\$soname -o \$lib \$libobjs \$deplibs \$compiler_flags~\$rm \$lib.exp" -postinstall_cmds="chmod +x \$lib" -postuninstall_cmds="" - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds="" -module_expsym_cmds="" - -# Commands to strip libraries. -old_striplib="" -striplib="" - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects="" - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects="" - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps="" - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps="" - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path="" - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method="pass_all" - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd="\$MAGIC_CMD" - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag="" - -# Flag that forces no undefined symbols. -no_undefined_flag=" -z text" - -# Commands used to finish a libtool library installation in a directory. -finish_cmds="" - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval="" - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe="sed -n -e 's/^.*[ ]\\([BDRT][BDRT]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'" - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'" - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (lt_ptr) \\&\\2},/p'" - -# This is the shared library runtime path variable. -runpath_var= - -# This is the shared library path variable. -shlibpath_var=LD_LIBRARY_PATH - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=yes - -# How to hardcode a shared library path into an executable. -hardcode_action=immediate - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=yes - -# Flag to hardcode $libdir into a binary during linking. -# This must work even if $libdir does not exist. -hardcode_libdir_flag_spec="-R\$libdir" - -# If ld is used when linking, flag to hardcode $libdir into -# a binary during linking. This must work even if $libdir does -# not exist. -hardcode_libdir_flag_spec_ld="" - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator="" - -# Set to yes if using DIR/libNAME during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=no - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=no - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=no - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=no - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="PATH LD_LIBRARY_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=yes - -# Compile-time system search path for libraries -sys_lib_search_path_spec=" /opt/csw/gcc3/lib/gcc/sparc-sun-solaris2.8/3.4.5/ /usr/lib/gcc/sparc-sun-solaris2.8/3.4.5/ /opt/csw/gcc3/lib/gcc/sparc-sun-solaris2.8/3.4.5/../../../../sparc-sun-solaris2.8/lib/sparc-sun-solaris2.8/3.4.5/ /opt/csw/gcc3/lib/gcc/sparc-sun-solaris2.8/3.4.5/../../../../sparc-sun-solaris2.8/lib/ /usr/ccs/bin/sparc-sun-solaris2.8/3.4.5/ /usr/ccs/bin/ /usr/ccs/lib/sparc-sun-solaris2.8/3.4.5/ /usr/ccs/lib/ /opt/csw/gcc3/lib/gcc/sparc-sun-solaris2.8/3.4.5/../../../sparc-sun-solaris2.8/3.4.5/ /opt/csw/gcc3/lib/gcc/sparc-sun-solaris2.8/3.4.5/../../../ /lib/sparc-sun-solaris2.8/3.4.5/ /lib/ /usr/lib/sparc-sun-solaris2.8/3.4.5/ /usr/lib/" - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec="/lib /usr/lib" - -# Fix the shell variable $srcfile for the compiler. -fix_srcfile_path="" - -# Set to yes if exported symbols are required. -always_export_symbols=no - -# The commands to list exported symbols. -export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols" - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds="" - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms="_GLOBAL_OFFSET_TABLE_" - -# Symbols that must always be exported. -include_expsyms="" - -# ### END LIBTOOL CONFIG Deleted: csw/mgar/pkg/libtool/trunk/files/sparc-gcc3.tags =================================================================== --- csw/mgar/pkg/libtool/trunk/files/sparc-gcc3.tags 2009-09-04 07:30:40 UTC (rev 6167) +++ csw/mgar/pkg/libtool/trunk/files/sparc-gcc3.tags 2009-09-04 07:34:59 UTC (rev 6168) @@ -1,624 +0,0 @@ -# ### BEGIN LIBTOOL TAG CONFIG: disable-shared -disable_libs=shared -# ### END LIBTOOL TAG CONFIG: disable-shared - -# ### BEGIN LIBTOOL TAG CONFIG: disable-static -disable_libs=static -# ### END LIBTOOL TAG CONFIG: disable-static - -# Local Variables: -# mode:shell-script -# sh-indentation:2 -# End: -# ### BEGIN LIBTOOL TAG CONFIG: CXX - -# Libtool was configured on host ra: - -# Shell to use when invoking shell scripts. -SHELL="/bin/bash" - -# Whether or not to build shared libraries. -build_libtool_libs=yes - -# Whether or not to build static libraries. -build_old_libs=yes - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=no - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=no - -# Whether or not to optimize for fast installation. -fast_install=needless - -# The host system. -host_alias= -host=sparc-sun-solaris2.8 -host_os=solaris2.8 - -# The build system. -build_alias= -build=sparc-sun-solaris2.8 -build_os=solaris2.8 - -# An echo program that does not interpret backslashes. -echo="echo" - -# The archiver. -AR="ar" -AR_FLAGS="cru" - -# A C compiler. -LTCC="/opt/csw/gcc3/bin/gcc" - -# LTCC compiler flags. -LTCFLAGS="-O2" - -# A language-specific compiler. -CC="/opt/csw/gcc3/bin/g++" - -# Is the compiler the GNU C compiler? -with_gcc=yes - -# An ERE matcher. -EGREP="/opt/csw/bin/ggrep -E" - -# The linker used to build libraries. -LD="/usr/ccs/bin/ld" - -# Whether we need hard or soft links. -LN_S="ln -s" - -# A BSD-compatible nm program. -NM="/usr/ccs/bin/nm -p" - -# A symbol stripping program -STRIP="strip" - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=file - -# Used on cygwin: DLL creation program. -DLLTOOL="dlltool" - -# Used on cygwin: object dumper. -OBJDUMP="objdump" - -# Used on cygwin: assembler. -AS="as" - -# The name of the directory that contains temporary libtool files. -objdir=.libs - -# How to create reloadable object files. -reload_flag=" -r" -reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs" - -# How to pass a linker flag through the compiler. -wl="-Wl," - -# Object file suffix (normally "o"). -objext="o" - -# Old archive suffix (normally "a"). -libext="a" - -# Shared library suffix (normally ".so"). -shrext_cmds='.so' - -# Executable file suffix (normally ""). -exeext="" - -# Additional compiler flags for building library objects. -pic_flag=" -fPIC -DPIC" -pic_mode=default - -# What is the maximum length of a command? -max_cmd_len=262144 - -# Does compiler simultaneously support -c and -o options? -compiler_c_o="yes" - -# Must we lock files when doing compilation? -need_locks="no" - -# Do we need the lib prefix for modules? -need_lib_prefix=no - -# Do we need a version for libraries? -need_version=no - -# Whether dlopen is supported. -dlopen_support=yes - -# Whether dlopen of programs is supported. -dlopen_self=yes - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=no - -# Compiler flag to prevent dynamic linking. -link_static_flag="-static" - -# Compiler flag to turn off builtin functions. -no_builtin_flag=" -fno-builtin" - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec="" - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec="" - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec="" - -# Library versioning type. -version_type=linux - -# Format of library name prefix. -libname_spec="lib\$name" - -# 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. -library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}" - -# The coded name of the library, if different from the real name. -soname_spec="\${libname}\${release}\${shared_ext}\$major" - -# Commands used to build and install an old-style archive. -RANLIB="ranlib" -old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib" -old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib" -old_postuninstall_cmds="" - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds="" - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds="" - -# Commands used to build and install a shared archive. -archive_cmds="\$CC -shared -nostdlib \$LDFLAGS \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-h \$wl\$soname -o \$lib" -archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$lib.exp~cat \$export_symbols | \$SED -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$lib.exp~\$echo \\\"local: *; };\\\" >> \$lib.exp~ - \$CC -shared -nostdlib \${wl}-M \$wl\$lib.exp -o \$lib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags~\$rm \$lib.exp" -postinstall_cmds="chmod +x \$lib" -postuninstall_cmds="" - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds="" -module_expsym_cmds="" - -# Commands to strip libraries. -old_striplib="" -striplib="" - @@ 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 Fri Sep 4 09:53:42 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Sep 2009 07:53:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[6169] csw/mgar/pkg/freeradius/trunk/Makefile Message-ID: Revision: 6169 http://gar.svn.sourceforge.net/gar/?rev=6169&view=rev Author: dmichelsen Date: 2009-09-04 07:53:42 +0000 (Fri, 04 Sep 2009) Log Message: ----------- freeradius: Minor fixes Modified Paths: -------------- csw/mgar/pkg/freeradius/trunk/Makefile Modified: csw/mgar/pkg/freeradius/trunk/Makefile =================================================================== --- csw/mgar/pkg/freeradius/trunk/Makefile 2009-09-04 07:34:59 UTC (rev 6168) +++ csw/mgar/pkg/freeradius/trunk/Makefile 2009-09-04 07:53:42 UTC (rev 6169) @@ -7,7 +7,7 @@ A free RADIUS server implementation endef -MASTER_SITES = http://freeradius.org/ +MASTER_SITES = ftp://ftp.freeradius.org:/pub/freeradius/ DISTFILES = $(GARNAME)-server-$(GARVERSION).tar.gz DISTNAME = $(GARNAME)-server-$(GARVERSION) @@ -18,8 +18,10 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = -#GARCOMPILER = GCC3 +SPKG_SOURCEURL = http://freeradius.org/ +GARCOMPILER = GCC3 + STRIP_LIBTOOL = 1 CONFIGURE_ARGS = $(DIRPATHS) @@ -48,5 +50,9 @@ CONFIGURE_ARGS += --without-rlm_python CONFIGURE_ARGS += --without-snmp +# No tests available +TEST_TARGET = + 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 Sep 4 11:48:26 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Sep 2009 09:48:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[6170] csw/mgar/pkg/libtool/trunk Message-ID: Revision: 6170 http://gar.svn.sourceforge.net/gar/?rev=6170&view=rev Author: dmichelsen Date: 2009-09-04 09:48:26 +0000 (Fri, 04 Sep 2009) Log Message: ----------- libtool: Do some patching dynamically due to differences in flags between archs Modified Paths: -------------- csw/mgar/pkg/libtool/trunk/Makefile csw/mgar/pkg/libtool/trunk/checksums csw/mgar/pkg/libtool/trunk/files/patch-libtool.diff Modified: csw/mgar/pkg/libtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtool/trunk/Makefile 2009-09-04 07:53:42 UTC (rev 6169) +++ csw/mgar/pkg/libtool/trunk/Makefile 2009-09-04 09:48:26 UTC (rev 6170) @@ -9,6 +9,8 @@ # 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)) FILEVERSION_1.5.26 = 1.5.26 FILEVERSION_2.2.6 = 2.2.6$(RELEASE) @@ -91,6 +93,8 @@ patch-libtool: cat $(WORKDIR)/$(PATCHFILES_POSTINSTALL_$(MODULATION)) | (cd $(DESTDIR)$(bindir) && gpatch -p1) + # Remove arch-specific flags from the libtool-compilation so they don't spoil the target build + perl -pi -e 's/^LTCFLAGS=.*/LTCFLAGS="-O"/' $(DESTDIR)$(bindir)/libtool install-libtool-%: perl -ane 'print if( /^available_tags/ ); $$p = 1 if( /^# ### BEGIN LIBTOOL CONFIG/ ); print if( $$p ); $$p = 0 if( /^# ### END LIBTOOL CONFIG/ )' \ Modified: csw/mgar/pkg/libtool/trunk/checksums =================================================================== --- csw/mgar/pkg/libtool/trunk/checksums 2009-09-04 07:53:42 UTC (rev 6169) +++ csw/mgar/pkg/libtool/trunk/checksums 2009-09-04 09:48:26 UTC (rev 6170) @@ -1,3 +1,3 @@ aa9c5107f3ec9ef4200eb6556f3b3c29 download/libtool-1.5.26.tar.gz 8ca1ea241cd27ff9832e045fe9afe4fd download/libtool-2.2.6a.tar.gz -7fb6410a02f5fd74aa3696a65ba434e2 download/patch-libtool.diff +92bb3c7712498b6a5993ab5d5fc8f077 download/patch-libtool.diff Modified: csw/mgar/pkg/libtool/trunk/files/patch-libtool.diff =================================================================== --- csw/mgar/pkg/libtool/trunk/files/patch-libtool.diff 2009-09-04 07:53:42 UTC (rev 6169) +++ csw/mgar/pkg/libtool/trunk/files/patch-libtool.diff 2009-09-04 09:48:26 UTC (rev 6170) @@ -1,15 +1,6 @@ diff -Naur lt-orig/libtool lt-patched/libtool --- lt-orig/libtool 2009-09-03 20:43:39.235079615 +0200 +++ lt-patched/libtool 2009-09-03 20:56:11.509318512 +0200 -@@ -138,7 +138,7 @@ - LTCC="/opt/studio/SOS11/SUNWspro/bin/cc" - - # LTCC compiler flags. --LTCFLAGS="-xO3 -xarch=v8 -I/opt/csw/include" -+LTCFLAGS="-O" - - # Take the output of nm and produce a listing of raw symbols and C names. - global_symbol_pipe="sed -n -e 's/^.*[ ]\\([BDRT][BDRT]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'" @@ -682,6 +682,8 @@ # positional parameter $0, within a function call, is the name of the # function. 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 Sep 4 11:56:37 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Sep 2009 09:56:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[6171] csw/mgar/pkg/pango/trunk Message-ID: Revision: 6171 http://gar.svn.sourceforge.net/gar/?rev=6171&view=rev Author: dmichelsen Date: 2009-09-04 09:56:37 +0000 (Fri, 04 Sep 2009) Log Message: ----------- pango: Update to 1.24.5 Modified Paths: -------------- csw/mgar/pkg/pango/trunk/Makefile csw/mgar/pkg/pango/trunk/checksums Modified: csw/mgar/pkg/pango/trunk/Makefile =================================================================== --- csw/mgar/pkg/pango/trunk/Makefile 2009-09-04 09:48:26 UTC (rev 6170) +++ csw/mgar/pkg/pango/trunk/Makefile 2009-09-04 09:56:37 UTC (rev 6171) @@ -1,5 +1,5 @@ GARNAME = libpango -GARVERSION = 1.24.3 +GARVERSION = 1.24.5 CATEGORIES = lib DESCRIPTION = A framework for the layout and rendering of international text @@ -25,6 +25,10 @@ REQUIRED_PKGS_CSWpango += CSWlibcairo CSWlibxft2 CSWlibxrender CSWzlib CSWlibx11 REQUIRED_PKGS_CSWpangodevel = CSWpango +SPKG_DESC_CSWpango = Pango, a framework for the layout and rendering of international text +SPKG_DESC_CSWpangodevel = Pango Developer Files +SPKG_DESC_CSWpangodoc = Pango Documentation + SPKG_SOURCEURL = http://www.pango.org/ # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/pango/trunk/checksums =================================================================== --- csw/mgar/pkg/pango/trunk/checksums 2009-09-04 09:48:26 UTC (rev 6170) +++ csw/mgar/pkg/pango/trunk/checksums 2009-09-04 09:56:37 UTC (rev 6171) @@ -1,2 +1,2 @@ 236547eb782b42500d0d743f25340599 download/CSWpango.postinstall -63979efe16fe5abaa93c8ea48959e8f3 download/pango-1.24.3.tar.bz2 +815416a452e9cccc172fed9862401f37 download/pango-1.24.5.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Sep 4 12:46:07 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Sep 2009 10:46:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[6172] csw/mgar/pkg/curl/trunk/Makefile Message-ID: Revision: 6172 http://gar.svn.sourceforge.net/gar/?rev=6172&view=rev Author: dmichelsen Date: 2009-09-04 10:46:07 +0000 (Fri, 04 Sep 2009) Log Message: ----------- curl: Enable 64 bit builds for i386 Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2009-09-04 09:56:37 UTC (rev 6171) +++ csw/mgar/pkg/curl/trunk/Makefile 2009-09-04 10:46:07 UTC (rev 6172) @@ -26,15 +26,21 @@ CATALOGNAME_CSWcurlrt = curlrt CATALOGNAME_CSWcurldevel = curldevel +SPKG_DESC_CSWcurl = Curl, a command line tool and library for client-side URL transfers +SPKG_DESC_CSWcurlrt = Curl Runtime Libraries +SPKG_DESC_CSWcurldevel = Curl Developer Files + SPKG_SOURCEURL = http://curl.haxx.se UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +EXTRA_CONFIGURE_ARGS_isa-amd64 = --disable-ldap CONFIGURE_ARGS = $(DIRPATHS) --with-ssl +CONFIGURE_ARGS += $(EXTRA_CONFIGURE_ARGS_isa-$(ISA)) -#Can't build amd64 until openldap has an amd64 build (Mantis 3028) -#BUILD64 = 1 -EXTRA_BUILD_ISAS_sparc = sparcv9 +# amd64 is built without openldap because there are no libs available right now (Mantis 3028) +BUILD64 = 1 +#EXTRA_BUILD_ISAS_sparc = sparcv9 REQUIRED_PKGS_CSWcurl = CSWiconv CSWlibidn CSWlibnet CSWoldaprt CSWosslrt REQUIRED_PKGS_CSWcurl += CSWsasl CSWzlib CSWcurlrt 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 Sep 4 14:28:24 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 04 Sep 2009 12:28:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[6173] csw/mgar/pkg Message-ID: Revision: 6173 http://gar.svn.sourceforge.net/gar/?rev=6173&view=rev Author: wahwah Date: 2009-09-04 12:28:24 +0000 (Fri, 04 Sep 2009) Log Message: ----------- tree: Initial commit Modified Paths: -------------- csw/mgar/pkg/tree/trunk/Makefile csw/mgar/pkg/tree/trunk/checksums Added Paths: ----------- csw/mgar/pkg/tree/ csw/mgar/pkg/tree/trunk/files/solaris.patch Modified: csw/mgar/pkg/tree/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-09-04 07:53:42 UTC (rev 6169) +++ csw/mgar/pkg/tree/trunk/Makefile 2009-09-04 12:28:24 UTC (rev 6173) @@ -11,8 +11,8 @@ ## For more information about GAR variables, please see: ## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference ## -GARNAME = mypkg -GARVERSION = 1.0 +GARNAME = tree +GARVERSION = 1.5.2.2 ## ## The category that your software fits in. This is not a descriptive field, but ## influences the build process. Depending on the CATEGORIES setting, different @@ -22,24 +22,27 @@ ## Possible settings are: ## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, ## utils, x11, xfce, xorg, xtra -CATEGORIES = lib +CATEGORIES = utils ## ## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = +DESCRIPTION = A recursive directory listing program ## ## A longer description of the package. This is only for descriptive purposes ## inside the Makefile and is not used elsewhere. define BLURB - + Tree is a recursive directory listing program that produces a depth indented + listing of files, which is colorized ala dircolors if the LS_COLORS + environment variable is set and output is to tty. endef ## ## Upstream URL that should show up in the VENDOR field as well as on ## http://opencsw.org/packages/. -SPKG_SOURCEURL = +SPKG_SOURCEURL = http://mama.indstate.edu/users/ice/tree/ ## ## 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 = ftp://mama.indstate.edu/linux/tree/ +MASTER_SITES += http://www.sfr-fresh.com/linux/misc/ ## ## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the ## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge @@ -49,15 +52,17 @@ ## 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 = +# PATCHFILES = 0001-Solaris-settings.patch +# PATCHFILES += 0002-install-binary-as-a-parameter.patch +# PATCHFILES += 0003-Destdir-support.patch +PATCHFILES = solaris.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).tgz ## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz ## ## 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. @@ -142,10 +147,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 = +CONFIGURE_SCRIPTS = ## BUILD_SCRIPTS = ## INSTALL_SCRIPTS = -## TEST_SCRIPTS = +SKIPTEST = 1 ## ## Compilation settings ## @@ -157,7 +162,7 @@ ## BUILD_ARGS = ## ## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) +## CONFIGURE_ARGS = $(DIRPATHS) ## ## BUILD64 = ## CONFIGURE_ENV = @@ -173,10 +178,4 @@ ## 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 Modified: csw/mgar/pkg/tree/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-09-04 07:53:42 UTC (rev 6169) +++ csw/mgar/pkg/tree/trunk/checksums 2009-09-04 12:28:24 UTC (rev 6173) @@ -0,0 +1,2 @@ +e714975edbf63afd3037b3c75b0c5319 download/solaris.patch +a7731a898e2c0d7e422a57a84ffbb06c download/tree-1.5.2.2.tgz Added: csw/mgar/pkg/tree/trunk/files/solaris.patch =================================================================== --- csw/mgar/pkg/tree/trunk/files/solaris.patch (rev 0) +++ csw/mgar/pkg/tree/trunk/files/solaris.patch 2009-09-04 12:28:24 UTC (rev 6173) @@ -0,0 +1,64 @@ +diff --git a/Makefile b/Makefile +index 54260a7..e622acd 100644 +--- a/Makefile ++++ b/Makefile +@@ -6,9 +6,9 @@ + # warranties, including, without limitation, the implied warranties + # of merchant-ability and fitness for a particular purpose. + +-prefix = /usr ++prefix = /opt/csw + +-CC=gcc ++# CC=gcc + + VERSION=1.5.2.2 + TREE_DEST=tree +@@ -20,8 +20,9 @@ MANDIR=${prefix}/man/man1 + + # Linux defaults: + #CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +-CFLAGS=-O2 -Wall -fomit-frame-pointer -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +-LDFLAGS=-s ++#CFLAGS=-O2 -Wall -fomit-frame-pointer -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 ++#LDFLAGS=-s ++#INSTALL=$(INSTALL) + + # Uncomment for FreeBSD: + #CFLAGS=-O2 -Wall -fomit-frame-pointer +@@ -29,11 +30,12 @@ LDFLAGS=-s + #XOBJS=strverscmp.o + + # Uncomment for Solaris: +-#CC=cc +-#CFLAGS=-xO0 -v +-#LDFLAGS= +-#XOBJS=strverscmp.o +-#MANDIR=${prefix}/share/man/man1 ++CC=cc ++CFLAGS=-xO0 -v ++LDFLAGS= ++XOBJS=strverscmp.o ++MANDIR=${prefix}/share/man/man1 ++INSTALL=ginstall + + # Uncomment for Cygwin: + #CFLAGS=-O2 -Wall -fomit-frame-pointer -DCYGWIN +@@ -83,12 +85,12 @@ clean: + rm -f *~ + + install: tree +- install -d $(BINDIR) +- install -d $(MANDIR) +- if [ -e $(TREE_DEST) ]; then \ +- install -s $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \ ++ $(INSTALL) -d $(DESTDIR)$(BINDIR) ++ $(INSTALL) -d $(DESTDIR)$(MANDIR) ++ if [ -r $(TREE_DEST) ]; then \ ++ $(INSTALL) -s $(TREE_DEST) $(DESTDIR)$(BINDIR)/$(TREE_DEST); \ + fi +- install man/$(MAN) $(MANDIR)/$(MAN) ++ $(INSTALL) man/$(MAN) $(DESTDIR)$(MANDIR)/$(MAN) + + distclean: + if [ -f tree.o ]; then rm *.o; 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 Fri Sep 4 14:47:44 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 04 Sep 2009 12:47:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[6174] csw/mgar/pkg/tree/trunk/Makefile Message-ID: Revision: 6174 http://gar.svn.sourceforge.net/gar/?rev=6174&view=rev Author: wahwah Date: 2009-09-04 12:47:44 +0000 (Fri, 04 Sep 2009) Log Message: ----------- tree: Removed unnecessary comments from the Makefile Modified Paths: -------------- csw/mgar/pkg/tree/trunk/Makefile Modified: csw/mgar/pkg/tree/trunk/Makefile =================================================================== --- csw/mgar/pkg/tree/trunk/Makefile 2009-09-04 12:28:24 UTC (rev 6173) +++ csw/mgar/pkg/tree/trunk/Makefile 2009-09-04 12:47:44 UTC (rev 6174) @@ -2,180 +2,21 @@ # 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 = tree GARVERSION = 1.5.2.2 -## -## 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 = utils -## -## A one-line description of the package, which will appear in the pkginfo. DESCRIPTION = A recursive directory listing program -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. define BLURB Tree is a recursive directory listing program that produces a depth indented listing of files, which is colorized ala dircolors if the LS_COLORS environment variable is set and output is to tty. endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. SPKG_SOURCEURL = http://mama.indstate.edu/users/ice/tree/ -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). MASTER_SITES = ftp://mama.indstate.edu/linux/tree/ MASTER_SITES += http://www.sfr-fresh.com/linux/misc/ -## -## 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 = 0001-Solaris-settings.patch -# PATCHFILES += 0002-install-binary-as-a-parameter.patch -# PATCHFILES += 0003-Destdir-support.patch PATCHFILES = solaris.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).tgz -## UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz -## -## 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 = SKIPTEST = 1 -## -## 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 -## 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 Sep 4 15:35:00 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Sep 2009 13:35:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6175] csw/mgar/pkg/curl/trunk/Makefile Message-ID: Revision: 6175 http://gar.svn.sourceforge.net/gar/?rev=6175&view=rev Author: dmichelsen Date: 2009-09-04 13:34:55 +0000 (Fri, 04 Sep 2009) Log Message: ----------- curl: Don't include 64 bit curl binary as it serves no purpose Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2009-09-04 12:47:44 UTC (rev 6174) +++ csw/mgar/pkg/curl/trunk/Makefile 2009-09-04 13:34:55 UTC (rev 6175) @@ -40,8 +40,10 @@ # amd64 is built without openldap because there are no libs available right now (Mantis 3028) BUILD64 = 1 -#EXTRA_BUILD_ISAS_sparc = sparcv9 +# We are doing 64 bit only for the libs +NO_ISAEXEC = 1 + REQUIRED_PKGS_CSWcurl = CSWiconv CSWlibidn CSWlibnet CSWoldaprt CSWosslrt REQUIRED_PKGS_CSWcurl += CSWsasl CSWzlib CSWcurlrt REQUIRED_PKGS_CSWcurlrt = CSWlibidn CSWlibnet CSWoldaprt CSWosslrt CSWzlib CSWsasl @@ -49,6 +51,10 @@ SKIPTEST = 1 +# The 64 bit binary just takes space +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = $(bindir)/curl +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = $(bindir)/curl + EXTRA_PAX_ARGS_32 = -s ",^\.$(includedir)/curl/curlbuild.h$$,.$(includedir)/curl/curlbuild-32.h,p" EXTRA_PAX_ARGS_64 = -s ",^\.$(includedir)/curl/curlbuild.h$$,.$(includedir)/curl/curlbuild-64.h,p" EXTRA_PAX_ARGS_isa-sparcv8 = $(EXTRA_PAX_ARGS_32) 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 Sep 4 15:52:59 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Sep 2009 13:52:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6176] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 6176 http://gar.svn.sourceforge.net/gar/?rev=6176&view=rev Author: dmichelsen Date: 2009-09-04 13:52:59 +0000 (Fri, 04 Sep 2009) Log Message: ----------- mGAR v2: Don't make symlinks isaexec Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-09-04 13:34:55 UTC (rev 6175) +++ csw/mgar/gar/v2/gar.mk 2009-09-04 13:52:59 UTC (rev 6176) @@ -539,7 +539,7 @@ ) ISAEXEC_FILES ?= $(if $(_ISAEXEC_FILES),$(patsubst $(PKGROOT)%,%, \ $(shell for F in $(_ISAEXEC_FILES); do \ - if test -f "$$F"; then echo $$F; fi; \ + if test -f "$$F" -a \! -h "$$F"; then echo $$F; fi; \ done)),) ifneq ($(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 Fri Sep 4 16:02:42 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Sep 2009 14:02:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[6177] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 6177 http://gar.svn.sourceforge.net/gar/?rev=6177&view=rev Author: dmichelsen Date: 2009-09-04 14:02:38 +0000 (Fri, 04 Sep 2009) Log Message: ----------- mGAR v2: Reordering NEEDED_ISAS from r6148 broke some checks, remove additional spaces to make it work again 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-09-04 13:52:59 UTC (rev 6176) +++ csw/mgar/gar/v2/gar.conf.mk 2009-09-04 14:02:38 UTC (rev 6177) @@ -363,8 +363,8 @@ # It is guaranteed that all BUILD_ISAS come first in NEEDED_ISAS # Set 'BUILD64 = 1' to build 64 bit versions automatically REQUESTED_ISAS ?= $(strip $(foreach A,$(GARCHLIST),$(ISA_DEFAULT_$A) $(if $(BUILD64),$(ISA_DEFAULT64_$A)) $(EXTRA_BUILD_ISAS_$A)) $(EXTRA_BUILD_ISAS)) -NEEDED_ISAS ?= $(filter $(ISALIST_$(KERNELISA)),$(filter $(ISALIST_$(ISA_DEFAULT64_$(GARCH))),$(REQUESTED_ISAS))) \ - $(filter-out $(ISALIST_$(KERNELISA)),$(filter $(ISALIST_$(ISA_DEFAULT64_$(GARCH))),$(REQUESTED_ISAS))) +NEEDED_ISAS ?= $(strip $(filter $(ISALIST_$(KERNELISA)),$(filter $(ISALIST_$(ISA_DEFAULT64_$(GARCH))),$(REQUESTED_ISAS))) \ + $(filter-out $(ISALIST_$(KERNELISA)),$(filter $(ISALIST_$(ISA_DEFAULT64_$(GARCH))),$(REQUESTED_ISAS)))) BUILD_ISAS ?= $(filter $(ISALIST_$(KERNELISA)),$(NEEDED_ISAS)) # Subdirectories for specialized binaries and libraries 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 Sep 4 16:36:09 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Sep 2009 14:36:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[6178] csw/mgar/pkg/pigz/trunk Message-ID: Revision: 6178 http://gar.svn.sourceforge.net/gar/?rev=6178&view=rev Author: dmichelsen Date: 2009-09-04 14:36:09 +0000 (Fri, 04 Sep 2009) Log Message: ----------- pigz: Use wrapper script to force new thread model on Solaris 8 Modified Paths: -------------- csw/mgar/pkg/pigz/trunk/Makefile csw/mgar/pkg/pigz/trunk/checksums Modified: csw/mgar/pkg/pigz/trunk/Makefile =================================================================== --- csw/mgar/pkg/pigz/trunk/Makefile 2009-09-04 14:02:38 UTC (rev 6177) +++ csw/mgar/pkg/pigz/trunk/Makefile 2009-09-04 14:36:09 UTC (rev 6178) @@ -12,6 +12,7 @@ MASTER_SITES = http://www.zlib.net/pigz/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += pigz-wrapper # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -29,6 +30,8 @@ # Optimization show effects < 5% #REQUESTED_ISAS = $(ISALIST_$(GARCOMPILER)) +EXTRA_CFLAGS = -mt + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = custom INSTALL_SCRIPTS = custom @@ -44,8 +47,11 @@ install-custom: ginstall -d $(DESTDIR)$(bindir) - ginstall $(WORKSRC)/pigz $(DESTDIR)$(bindir) + ginstall $(WORKDIR)/pigz-wrapper $(DESTDIR)$(bindir)/pigz cd $(DESTDIR)$(bindir) && gln pigz unpigz + ginstall -d $(DESTDIR)$(libexecdir) + ginstall $(WORKSRC)/pigz $(DESTDIR)$(libexecdir) + cd $(DESTDIR)$(libexecdir) && gln pigz unpigz ginstall -d $(DESTDIR)$(mandir)/man1 ginstall $(WORKSRC)/pigz.1 $(DESTDIR)$(mandir)/man1 ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) Modified: csw/mgar/pkg/pigz/trunk/checksums =================================================================== --- csw/mgar/pkg/pigz/trunk/checksums 2009-09-04 14:02:38 UTC (rev 6177) +++ csw/mgar/pkg/pigz/trunk/checksums 2009-09-04 14:36:09 UTC (rev 6178) @@ -1 +1,2 @@ 580873165ef3a369674f0c0af4c96d67 download/pigz-2.1.5.tar.gz +2c89ba7ba8b26b2b91a7a061f39fd7e8 download/pigz-wrapper 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 Sep 4 16:37:09 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Sep 2009 14:37:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[6179] csw/mgar/pkg/pigz/trunk/files/pigz-wrapper Message-ID: Revision: 6179 http://gar.svn.sourceforge.net/gar/?rev=6179&view=rev Author: dmichelsen Date: 2009-09-04 14:37:09 +0000 (Fri, 04 Sep 2009) Log Message: ----------- pigz: Add missing wrapper script Added Paths: ----------- csw/mgar/pkg/pigz/trunk/files/pigz-wrapper Added: csw/mgar/pkg/pigz/trunk/files/pigz-wrapper =================================================================== --- csw/mgar/pkg/pigz/trunk/files/pigz-wrapper (rev 0) +++ csw/mgar/pkg/pigz/trunk/files/pigz-wrapper 2009-09-04 14:37:09 UTC (rev 6179) @@ -0,0 +1,8 @@ +#!/bin/sh + +# Needed on native Solaris 8 +# See http://www.opencsw.org/bugtrack/view.php?id=3879 +# and http://developers.sun.com/solaris/articles/alt_thread_lib.html +LD_LIBRARY_PATH=/usr/lib/lwp +export LD_LIBRARY_PATH +exec `/usr/bin/dirname $0`/../libexec/`/usr/bin/basename $0` "$@" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Sep 4 19:26:24 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 04 Sep 2009 17:26:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[6180] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 6180 http://gar.svn.sourceforge.net/gar/?rev=6180&view=rev Author: bonivart Date: 2009-09-04 17:26:24 +0000 (Fri, 04 Sep 2009) Log Message: ----------- pkgutil: 1.7 beta 1 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-09-04 14:37:09 UTC (rev 6179) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-09-04 17:26:24 UTC (rev 6180) @@ -1,5 +1,5 @@ GARNAME = pkgutil -GARVERSION = 1.6.1 +GARVERSION = 1.7b1 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-09-04 14:37:09 UTC (rev 6179) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-09-04 17:26:24 UTC (rev 6180) @@ -2,4 +2,4 @@ e1407c24d47306dbc4cea22dcb291f1d download/CSWpkgutil.postinstall 2fb6c94a2d212f08b71d462082a2d31a download/CSWpkgutil.preremove 4ef9d7ba62987112987311d96e249e3e download/CSWpkgutil.prototype -82c500662d2871e70633a1c58d02cacc download/pkgutil-1.6.1.zip +146008e20dacbb7541f6505cd34d2277 download/pkgutil-1.7b1.zip 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 Sep 4 20:30:10 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Fri, 04 Sep 2009 18:30:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[6181] csw/mgar/pkg/thunderbird/trunk/files/.mozconfig Message-ID: Revision: 6181 http://gar.svn.sourceforge.net/gar/?rev=6181&view=rev Author: wbonnet Date: 2009-09-04 18:30:10 +0000 (Fri, 04 Sep 2009) Log Message: ----------- Use system sqlite instead of Mozilla version Modified Paths: -------------- csw/mgar/pkg/thunderbird/trunk/files/.mozconfig Modified: csw/mgar/pkg/thunderbird/trunk/files/.mozconfig =================================================================== --- csw/mgar/pkg/thunderbird/trunk/files/.mozconfig 2009-09-04 17:26:24 UTC (rev 6180) +++ csw/mgar/pkg/thunderbird/trunk/files/.mozconfig 2009-09-04 18:30:10 UTC (rev 6181) @@ -24,6 +24,7 @@ ac_add_options --disable-debug ac_add_options --disable-updater ac_add_options --disable-js-ultrasparc +ac_add_options --enable-system-sqlite ac_add_options --enable-system-cairo 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 Sep 4 20:41:55 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 04 Sep 2009 18:41:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[6182] csw/mgar/pkg/pkgutil/trunk/checksums Message-ID: Revision: 6182 http://gar.svn.sourceforge.net/gar/?rev=6182&view=rev Author: bonivart Date: 2009-09-04 18:41:55 +0000 (Fri, 04 Sep 2009) Log Message: ----------- pkgutil: update checksums Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/checksums Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-09-04 18:30:10 UTC (rev 6181) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-09-04 18:41:55 UTC (rev 6182) @@ -2,4 +2,4 @@ e1407c24d47306dbc4cea22dcb291f1d download/CSWpkgutil.postinstall 2fb6c94a2d212f08b71d462082a2d31a download/CSWpkgutil.preremove 4ef9d7ba62987112987311d96e249e3e download/CSWpkgutil.prototype -146008e20dacbb7541f6505cd34d2277 download/pkgutil-1.7b1.zip +6c95eb1d1de28e74b72ea2bb4ce249af download/pkgutil-1.7b1.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Fri Sep 4 22:33:08 2009 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Fri, 04 Sep 2009 20:33:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[6183] csw/mgar/pkg/ganglia/trunk Message-ID: Revision: 6183 http://gar.svn.sourceforge.net/gar/?rev=6183&view=rev Author: d_pocock Date: 2009-09-04 20:33:08 +0000 (Fri, 04 Sep 2009) Log Message: ----------- ganglia: Add support for gmetad, web, python, devel packages Modified Paths: -------------- csw/mgar/pkg/ganglia/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/ganglia/trunk/files/CSWgangliaweb.postinstall csw/mgar/pkg/ganglia/trunk/files/CSWgangliaweb.preremove csw/mgar/pkg/ganglia/trunk/files/conf.php csw/mgar/pkg/ganglia/trunk/files/gmetad.conf csw/mgar/pkg/ganglia/trunk/files/httpd-ganglia.conf.CSW Modified: csw/mgar/pkg/ganglia/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia/trunk/Makefile 2009-09-04 18:41:55 UTC (rev 6182) +++ csw/mgar/pkg/ganglia/trunk/Makefile 2009-09-04 20:33:08 UTC (rev 6183) @@ -2,6 +2,15 @@ GARVERSION = 3.1.2 CATEGORIES = utils +# How should we set this? +# There is a release number in configure.in, maybe use that? +# RELVER = + +USER_GMOND = nobody +# nobody shouldn't really be allowed to own any files +# maybe we should add a ganglia user to own the RRD files? +USER_GMETAD = nobody + DESCRIPTION = A scalable distributed monitoring system define BLURB Ganglia is a scalable distributed monitoring system for high-performance computing @@ -12,23 +21,39 @@ SF_PROJ = ganglia MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -#DISTFILES += $(call admfiles,CSWpackage,) +DISTFILES += CSWgangliaweb.postinstall CSWgangliaweb.preremove +DISTFILES += httpd-ganglia.conf.CSW -PACKAGES = CSWgangliaagent CSWgangliart +PACKAGES = CSWgangliaagent CSWgangliart CSWgangliadevel CSWgangliagmetad CSWgangliaweb CSWgangliamodpython CATALOGNAME_CSWganglia = ganglia CATALOGNAME_CSWgangliart = ganglia_rt CATALOGNAME_CSWgangliaagent = ganglia_agent +CATALOGNAME_CSWgangliamodpython = ganglia_modpython +CATALOGNAME_CSWgangliadevel = ganglia_devel +CATALOGNAME_CSWgangliagmetad = ganglia_gmetad +CATALOGNAME_CSWgangliaweb = ganglia_web SPKG_DESC_CSWganglia = Dummy package SPKG_DESC_CSWgangliart = Ganglia runtime libraries SPKG_DESC_CSWgangliaagent = Ganglia performance monitoring agent gmond +SPKG_DESC_CSWgangliamodpython = Ganglia agent module for Python metrics +SPKG_DESC_CSWgangliadevel = Ganglia headers for metric module development +SPKG_DESC_CSWgangliagmetad = Ganglia gmetad +SPKG_DESC_CSWgangliaweb = Ganglia web -PREREQUISITE_PKGS = CSWexpat CSWlibconfuse CSWapache2rt +PREREQUISITE_PKGS = CSWexpat CSWlibconfuse CSWapache2rt CSWapache2-devel CSWrrd REQUIRED_PKGS_CSWgangliart = CSWexpat CSWlibconfuse CSWapache2rt REQUIRED_PKGS_CSWgangliaagent = CSWexpat CSWlibconfuse CSWapache2rt REQUIRED_PKGS_CSWgangliaagent += CSWgangliart +REQUIRED_PKGS_CSWgangliamodpython = CSWlibconfuse CSWapache2rt CSWgangliart +REQUIRED_PKGS_CSWgangliamodpython += CSWgangliaagent +REQUIRED_PKGS_CSWgangliadevel = CSWexpat CSWlibconfuse CSWapache2rt +REQUIRED_PKGS_CSWgangliagmetad = CSWexpat CSWlibconfuse CSWapache2rt +REQUIRED_PKGS_CSWgangliagmetad += CSWgangliart CSWgangliaagent CSWrrd +REQUIRED_PKGS_CSWgangliaweb = CSWgangliagmetad +REQUIRED_PKGS_CSWgangliaweb += CSWapache2 CSWphp5 CSWap2modphp5 CSWrrd # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=43021 @@ -42,23 +67,83 @@ CONFIGURE_ARGS = $(DIRPATHS) # Don't build gmetad (not tested yet on Solaris, more deps required to build) -CONFIGURE_ARGS += --without-gmetad +#CONFIGURE_ARGS += --without-gmetad +CONFIGURE_ARGS += --with-gmetad # Reduce dependencies, no gettext: CONFIGURE_ARGS += --disable-nls +# Use apr from CSWapache2rt +CONFIGURE_ARGS += --with-libapr=/opt/csw/apache2/bin/apr-1-config + +# Include the status module +CONFIGURE_ARGS += --with-status + +# When we enable this, modpython will have to go in a separate package, +# otherwise CSWgangliaagent will have lots of dependencies +# TODO: define a CSWgangliamodpython package +# Depends: some issues exist getting the Python support working on Solaris, +# Ganglia's configure.in needs to be further enhanced for this to work +CONFIGURE_ARGS += --without-python +#CONFIGURE_ARGS += --with-python=/opt/csw + # For Ganglia 3.1.2, the test suite doesn't compile cleanly on Solaris, # so we skip it. This should be re-assessed with each new release # from upstream. Proposed fixes for the test suite to be submitted # upstream. ifeq ($(GARVERSION),3.1.2) -#TEST_TARGET = check -TEST_SCRIPTS = skip -test-skip: - $(DONADA) +TEST_SCRIPTS = endif +INSTALL_SCRIPTS = $(WORKSRC)/Makefile custom + +WWWROOT = /opt/csw/share/www +WWWGANGLIA = $(WWWROOT)/ganglia +ETCGANGLIA = /opt/csw/etc/ganglia + PKGFILES_CSWganglia = PKGFILES_CSWgangliart = $(libdir)/libganglia.* +PKGFILES_CSWgangliamodpython = .*python.* +PKGFILES_CSWgangliadevel = .*/include/.*.h .*/bin/ganglia-config +PKGFILES_CSWgangliagmetad = .*/gmetad.* /opt/csw/var/ganglia/rrds +PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.* /opt/csw/apache2/etc/extra/.* +PROTOTYPE_FILTER_CSWgangliagmetad = awk '\ +$$$$3 ~ /\/opt\/csw\/var\/ganglia\/rrds/ { $$$$5 = "nobody"; $$$$6 = "nogroup" } \ +{ print }' + + +#ARCHALL_CSWgangliadevel = 1 +#ARCHALL_CSWgangliaweb = 1 + include gar/category.mk + +install-custom: + @ginstall -d $(DESTDIR)$(WWWGANGLIA) + @cd $(WORKSRC)/web; \ + cp -R * $(DESTDIR)$(WWWGANGLIA) + @ginstall -D $(FILEDIR)/conf.php \ + $(DESTDIR)$(WWWGANGLIA)/conf.php + @rm -rf $(DESTDIR)$(WWWGANGLIA)/*.in + @ginstall -D $(FILEDIR)/httpd-ganglia.conf.CSW \ + $(DESTDIR)/opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW + @ginstall -d $(DESTDIR)$(ETCGANGLIA)/conf.d + @$(WORKSRC)/gmond/gmond -t | grep -v "^include" \ + > $(DESTDIR)$(ETCGANGLIA)/gmond.conf + @echo "include ('/opt/csw/etc/ganglia/conf.d/*.conf')" \ + >> $(DESTDIR)$(ETCGANGLIA)/gmond.conf +# @ginstall -D $(FILEDIR)/gmond.conf \ +# $(DESTDIR)$(ETCGANGLIA)/gmond.conf + @ginstall -D $(FILEDIR)/gmetad.conf \ + $(DESTDIR)$(ETCGANGLIA)/gmetad.conf + @cd $(WORKSRC)/gmond/modules/conf.d; \ + cp -R *.conf $(DESTDIR)$(ETCGANGLIA)/conf.d + @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/example.conf \ + $(DESTDIR)$(ETCGANGLIA)/conf.d/multicpu.conf +ifeq ($(GARVERSION),3.1.2) + @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/modgstatus.conf +endif + @ginstall -d $(DESTDIR)/opt/csw/var/ganglia/rrds + + + Added: csw/mgar/pkg/ganglia/trunk/files/CSWgangliaweb.postinstall =================================================================== --- csw/mgar/pkg/ganglia/trunk/files/CSWgangliaweb.postinstall (rev 0) +++ csw/mgar/pkg/ganglia/trunk/files/CSWgangliaweb.postinstall 2009-09-04 20:33:08 UTC (rev 6183) @@ -0,0 +1,33 @@ +#!/bin/sh + +AP2EXTRADIR=/opt/csw/apache2/etc/extra +AP2CONF=/opt/csw/apache2/etc/httpd.conf + +if [ -f "${AP2EXTRADIR}/httpd-ganglia.conf" ]; +then + echo "Existing config found" +else + cp "${AP2EXTRADIR}/httpd-ganglia.conf.CSW" "${AP2EXTRADIR}/httpd-ganglia.conf" +fi + +if [ -n "`grep 'Include etc/extra/httpd-ganglia.conf' ${AP2CONF}`" ]; then + perl -i -pne 's|#(Include etc/extra/httpd-ganglia.conf)|$1|' ${AP2CONF} +else + cat << END >>${AP2CONF} + +Include etc/extra/httpd-ganglia.conf + +END +fi + +cat << _EOM_ +********************************************************************* +* NOTICE: +* Ganglia has been enabled in ${AP2CONF} +* You will need to restart your web server +* To finish the install. +********************************************************************* + +_EOM_ + +exit 0 Added: csw/mgar/pkg/ganglia/trunk/files/CSWgangliaweb.preremove =================================================================== --- csw/mgar/pkg/ganglia/trunk/files/CSWgangliaweb.preremove (rev 0) +++ csw/mgar/pkg/ganglia/trunk/files/CSWgangliaweb.preremove 2009-09-04 20:33:08 UTC (rev 6183) @@ -0,0 +1,21 @@ +#!/bin/sh + +PATH=/usr/bin:/usr/sbin + +AP2CONF=/opt/csw/apache2/etc/httpd.conf + +perl -i -pne 's|(? "ff634f", + "75-100" =>"ffa15e", + "50-75" => "ffde5e", + "25-50" => "caff98", + "0-25" => "e2ecff", + "down" => "515151" +); + +# +# Load scaling +# +$load_scale = 1.0; + +# +# Default color for single metric graphs +# +$default_metric_color = "555555"; + +# +# Default metric +# +$default_metric = "load_one"; + +# +# remove the domainname from the FQDN hostnames in graphs +# (to help with long hostnames in small charts) +# +$strip_domainname = false; + +# +# Optional summary graphs +# +#$optional_graphs = array('packet'); + +# +# Time ranges +# Each value is the # of seconds in that range. +# +$time_ranges = array( + 'hour'=>3600, + 'day'=>86400, + 'week'=>604800, + 'month'=>2419200, + 'year'=>31449600 +); + +# this key must exist in $time_ranges +$default_time_range = 'hour'; + +# +# Graph sizes +# +$graph_sizes = array( + 'small'=>array( + 'height'=>40, + 'width'=>130, + 'fudge_0'=>0, + 'fudge_1'=>0, + 'fudge_2'=>0 + ), + 'medium'=>array( + 'height'=>75, + 'width'=>300, + 'fudge_0'=>0, + 'fudge_1'=>14, + 'fudge_2'=>28 + ), + 'large'=>array( + 'height'=>600, + 'width'=>800, + 'fudge_0'=>0, + 'fudge_1'=>0, + 'fudge_2'=>0 + ), + # this was the default value when no other size was provided. + 'default'=>array( + 'height'=>100, + 'width'=>400, + 'fudge_0'=>0, + 'fudge_1'=>0, + 'fudge_2'=>0 + ) +); +$default_graph_size = 'default'; +$graph_sizes_keys = array_keys( $graph_sizes ); +?> Added: csw/mgar/pkg/ganglia/trunk/files/gmetad.conf =================================================================== --- csw/mgar/pkg/ganglia/trunk/files/gmetad.conf (rev 0) +++ csw/mgar/pkg/ganglia/trunk/files/gmetad.conf 2009-09-04 20:33:08 UTC (rev 6183) @@ -0,0 +1,116 @@ +# This is an example of a Ganglia Meta Daemon configuration file +# http://ganglia.sourceforge.net/ +# +# $Id: gmetad.conf.in 1639 2008-08-09 23:30:32Z carenas $ +# +#------------------------------------------------------------------------------- +# Setting the debug_level to 1 will keep daemon in the forground and +# show only error messages. Setting this value higher than 1 will make +# gmetad output debugging information and stay in the foreground. +# default: 0 +# debug_level 10 +# +#------------------------------------------------------------------------------- +# What to monitor. The most important section of this file. +# +# The data_source tag specifies either a cluster or a grid to +# monitor. If we detect the source is a cluster, we will maintain a complete +# set of RRD databases for it, which can be used to create historical +# graphs of the metrics. If the source is a grid (it comes from another gmetad), +# we will only maintain summary RRDs for it. +# +# Format: +# data_source "my cluster" [polling interval] address1:port addreses2:port ... +# +# The keyword 'data_source' must immediately be followed by a unique +# string which identifies the source, then an optional polling interval in +# seconds. The source will be polled at this interval on average. +# If the polling interval is omitted, 15sec is asssumed. +# +# A list of machines which service the data source follows, in the +# format ip:port, or name:port. If a port is not specified then 8649 +# (the default gmond port) is assumed. +# default: There is no default value +# +# data_source "my cluster" 10 localhost my.machine.edu:8649 1.2.3.5:8655 +# data_source "my grid" 50 1.3.4.7:8655 grid.org:8651 grid-backup.org:8651 +# data_source "another source" 1.3.4.7:8655 1.3.4.8 + +data_source "my cluster" localhost + +# +# Round-Robin Archives +# You can specify custom Round-Robin archives here (defaults are listed below) +# +# RRAs "RRA:AVERAGE:0.5:1:244" "RRA:AVERAGE:0.5:24:244" "RRA:AVERAGE:0.5:168:244" "RRA:AVERAGE:0.5:672:244" \ +# "RRA:AVERAGE:0.5:5760:374" +# + +# +#------------------------------------------------------------------------------- +# Scalability mode. If on, we summarize over downstream grids, and respect +# authority tags. If off, we take on 2.5.0-era behavior: we do not wrap our output +# in tags, we ignore all tags we see, and always assume +# we are the "authority" on data source feeds. This approach does not scale to +# large groups of clusters, but is provided for backwards compatibility. +# default: on +# scalable off +# +#------------------------------------------------------------------------------- +# The name of this Grid. All the data sources above will be wrapped in a GRID +# tag with this name. +# default: unspecified +# gridname "MyGrid" +# +#------------------------------------------------------------------------------- +# The authority URL for this grid. Used by other gmetads to locate graphs +# for our data sources. Generally points to a ganglia/ +# website on this machine. +# default: "http://hostname/ganglia/", +# where hostname is the name of this machine, as defined by gethostname(). +# authority "http://mycluster.org/newprefix/" +# +#------------------------------------------------------------------------------- +# List of machines this gmetad will share XML with. Localhost +# is always trusted. +# default: There is no default value +# trusted_hosts 127.0.0.1 169.229.50.165 my.gmetad.org +# +#------------------------------------------------------------------------------- +# If you want any host which connects to the gmetad XML to receive +# data, then set this value to "on" +# default: off +# all_trusted on +# +#------------------------------------------------------------------------------- +# If you don't want gmetad to setuid then set this to off +# default: on +# setuid off +# +#------------------------------------------------------------------------------- +# User gmetad will setuid to (defaults to "nobody") +# default: "nobody" +# setuid_username "nobody" +# +#------------------------------------------------------------------------------- +# The port gmetad will answer requests for XML +# default: 8651 +# xml_port 8651 +# +#------------------------------------------------------------------------------- +# The port gmetad will answer queries for XML. This facility allows +# simple subtree and summation views of the XML tree. +# default: 8652 +# interactive_port 8652 +# +#------------------------------------------------------------------------------- +# The number of threads answering XML requests +# default: 4 +# server_threads 10 +# +#------------------------------------------------------------------------------- +# Where gmetad stores its round-robin databases +# default: "/var/lib/ganglia/rrds" +# rrd_rootdir "/some/other/place" +rrd_rootdir "/opt/csw/var/ganglia/rrds" + Added: csw/mgar/pkg/ganglia/trunk/files/httpd-ganglia.conf.CSW =================================================================== --- csw/mgar/pkg/ganglia/trunk/files/httpd-ganglia.conf.CSW (rev 0) +++ csw/mgar/pkg/ganglia/trunk/files/httpd-ganglia.conf.CSW 2009-09-04 20:33:08 UTC (rev 6183) @@ -0,0 +1,13 @@ + +Alias /ganglia "/opt/csw/share/www/ganglia" + + + AllowOverride None + DirectoryIndex index.html index.php + + Order allow,deny + Allow from all + + + + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Sep 4 22:35:47 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Sep 2009 20:35:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[6184] csw/mgar/pkg Message-ID: Revision: 6184 http://gar.svn.sourceforge.net/gar/?rev=6184&view=rev Author: dmichelsen Date: 2009-09-04 20:35:46 +0000 (Fri, 04 Sep 2009) Log Message: ----------- giflib: Initial commit (also builds libungif) Added Paths: ----------- csw/mgar/pkg/giflib/ csw/mgar/pkg/giflib/branches/ csw/mgar/pkg/giflib/tags/ csw/mgar/pkg/giflib/trunk/ csw/mgar/pkg/giflib/trunk/Makefile csw/mgar/pkg/giflib/trunk/checksums csw/mgar/pkg/giflib/trunk/files/ Property changes on: csw/mgar/pkg/giflib/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/giflib/trunk/Makefile =================================================================== --- csw/mgar/pkg/giflib/trunk/Makefile (rev 0) +++ csw/mgar/pkg/giflib/trunk/Makefile 2009-09-04 20:35:46 UTC (rev 6184) @@ -0,0 +1,51 @@ +GARNAME = giflib +GARVERSION = 4.1.6 +CATEGORIES = lib + +DESCRIPTION = A library for reading and writing gif images +define BLURB + giflib is a library for reading and writing gif images. + It is API and ABI compatible with libungif which was in + wide use while the LZW compression algorithm was patented. +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 + +PACKAGES = CSWgiflib CSWlibungif + +SPKG_DESC_CSWgiflib = A library for reading and writing gif images +SPKG_DESC_CSWlibungif = Links to giflib now the patent is dropped + +REQUIRED_PKGS_CSWlibungif = CSWgiflib + +BUILD64 = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +# We don't want 64 bit executables as they gain no speed +NO_ISAEXEC = 1 +MERGE_DIRS_isa-sparcv9 = $(libdir) +MERGE_DIRS_isa-amd64 = $(libdir) + +PKGFILES_CSWlibungif = .*/libungif\..* + +include gar/category.mk + +DOCFILES = AUTHORS BUGS COPYING ChangeLog DEVELOPERS INSTALL NEWS ONEWS README TODO + +post-install-modulated: + @mkdir -p $(DESTDIR)$(docdir)/giflib + cd $(WORKSRC) && cp $(DOCFILES) $(DESTDIR)$(docdir)/giflib + cd $(WORKSRC)/doc && cp *.html *.png *.txt $(DESTDIR)$(docdir)/giflib + @$(MAKECOOKIE) + +post-merge: + gln -s libgif.so.4 $(PKGROOT)$(libdir)/libungif.so.4 + gln -s libgif.so $(PKGROOT)$(libdir)/libungif.so + @$(MAKECOOKIE) Added: csw/mgar/pkg/giflib/trunk/checksums =================================================================== --- csw/mgar/pkg/giflib/trunk/checksums (rev 0) +++ csw/mgar/pkg/giflib/trunk/checksums 2009-09-04 20:35:46 UTC (rev 6184) @@ -0,0 +1 @@ +7125644155ae6ad33dbc9fc15a14735f download/giflib-4.1.6.tar.bz2 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 Sep 4 22:55:55 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 04 Sep 2009 20:55:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[6185] csw/mgar/pkg/elinks/trunk Message-ID: Revision: 6185 http://gar.svn.sourceforge.net/gar/?rev=6185&view=rev Author: chninkel Date: 2009-09-04 20:55:55 +0000 (Fri, 04 Sep 2009) Log Message: ----------- elinks: updated to 0.11.7 Modified Paths: -------------- csw/mgar/pkg/elinks/trunk/Makefile csw/mgar/pkg/elinks/trunk/checksums csw/mgar/pkg/elinks/trunk/files/changelog.CSW Modified: csw/mgar/pkg/elinks/trunk/Makefile =================================================================== --- csw/mgar/pkg/elinks/trunk/Makefile 2009-09-04 20:35:46 UTC (rev 6184) +++ csw/mgar/pkg/elinks/trunk/Makefile 2009-09-04 20:55:55 UTC (rev 6185) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = elinks -GARVERSION = 0.11.6 +GARVERSION = 0.11.7 CATEGORIES = net DESCRIPTION = An advanced text mode web browser Modified: csw/mgar/pkg/elinks/trunk/checksums =================================================================== --- csw/mgar/pkg/elinks/trunk/checksums 2009-09-04 20:35:46 UTC (rev 6184) +++ csw/mgar/pkg/elinks/trunk/checksums 2009-09-04 20:55:55 UTC (rev 6185) @@ -1,4 +1,4 @@ 9998467007acbd4cb8e46db6e5a9b306 download/CSWelinks.prototype -14b871e8361937a10490cf1018d6f218 download/changelog.CSW -463ec007b013822a82d197580117ea16 download/elinks-0.11.6.tar.bz2 +dccc134301c3dfa95ca4748e9ca948a7 download/changelog.CSW +fcd087a6d2415cd4c6fd1db53dceb646 download/elinks-0.11.7.tar.bz2 858331d6cc6c8459b2dba5e24f0c8cc3 download/elinks-417789.diff Modified: csw/mgar/pkg/elinks/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/elinks/trunk/files/changelog.CSW 2009-09-04 20:35:46 UTC (rev 6184) +++ csw/mgar/pkg/elinks/trunk/files/changelog.CSW 2009-09-04 20:55:55 UTC (rev 6185) @@ -1,3 +1,9 @@ +elinks (0.11.7,REV=2009.09.04) unstable + + * New upstream version. + + -- Yann Rouillard Sun, 04 Sep 2009 10:38:39 +0100 + elinks (0.11.6,REV=2009.03.22) unstable * New upstream version. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Fri Sep 4 23:08:11 2009 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Fri, 04 Sep 2009 21:08:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[6186] csw/mgar/pkg/ganglia/trunk Message-ID: Revision: 6186 http://gar.svn.sourceforge.net/gar/?rev=6186&view=rev Author: d_pocock Date: 2009-09-04 21:08:11 +0000 (Fri, 04 Sep 2009) Log Message: ----------- ganglia: Move to /etc/opt/csw/ganglia. Use PRESERVECONF. Modified Paths: -------------- csw/mgar/pkg/ganglia/trunk/Makefile csw/mgar/pkg/ganglia/trunk/files/CSWgangliaweb.postinstall Modified: csw/mgar/pkg/ganglia/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia/trunk/Makefile 2009-09-04 20:55:55 UTC (rev 6185) +++ csw/mgar/pkg/ganglia/trunk/Makefile 2009-09-04 21:08:11 UTC (rev 6186) @@ -99,7 +99,7 @@ WWWROOT = /opt/csw/share/www WWWGANGLIA = $(WWWROOT)/ganglia -ETCGANGLIA = /opt/csw/etc/ganglia +ETCGANGLIA = /etc/opt/csw/ganglia PKGFILES_CSWganglia = PKGFILES_CSWgangliart = $(libdir)/libganglia.* @@ -108,6 +108,8 @@ PKGFILES_CSWgangliagmetad = .*/gmetad.* /opt/csw/var/ganglia/rrds PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.* /opt/csw/apache2/etc/extra/.* +PRESERVECONF = /opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW + PROTOTYPE_FILTER_CSWgangliagmetad = awk '\ $$$$3 ~ /\/opt\/csw\/var\/ganglia\/rrds/ { $$$$5 = "nobody"; $$$$6 = "nogroup" } \ { print }' @@ -130,7 +132,7 @@ @ginstall -d $(DESTDIR)$(ETCGANGLIA)/conf.d @$(WORKSRC)/gmond/gmond -t | grep -v "^include" \ > $(DESTDIR)$(ETCGANGLIA)/gmond.conf - @echo "include ('/opt/csw/etc/ganglia/conf.d/*.conf')" \ + @echo "include ('/etc/opt/csw/ganglia/conf.d/*.conf')" \ >> $(DESTDIR)$(ETCGANGLIA)/gmond.conf # @ginstall -D $(FILEDIR)/gmond.conf \ # $(DESTDIR)$(ETCGANGLIA)/gmond.conf Modified: csw/mgar/pkg/ganglia/trunk/files/CSWgangliaweb.postinstall =================================================================== --- csw/mgar/pkg/ganglia/trunk/files/CSWgangliaweb.postinstall 2009-09-04 20:55:55 UTC (rev 6185) +++ csw/mgar/pkg/ganglia/trunk/files/CSWgangliaweb.postinstall 2009-09-04 21:08:11 UTC (rev 6186) @@ -3,12 +3,13 @@ AP2EXTRADIR=/opt/csw/apache2/etc/extra AP2CONF=/opt/csw/apache2/etc/httpd.conf -if [ -f "${AP2EXTRADIR}/httpd-ganglia.conf" ]; -then - echo "Existing config found" -else - cp "${AP2EXTRADIR}/httpd-ganglia.conf.CSW" "${AP2EXTRADIR}/httpd-ganglia.conf" -fi +# no longer needed thanks to cswpreserveconf +#if [ -f "${AP2EXTRADIR}/httpd-ganglia.conf" ]; +#then +# echo "Existing config found" +#else +# cp "${AP2EXTRADIR}/httpd-ganglia.conf.CSW" "${AP2EXTRADIR}/httpd-ganglia.conf" +#fi if [ -n "`grep 'Include etc/extra/httpd-ganglia.conf' ${AP2CONF}`" ]; then perl -i -pne 's|#(Include etc/extra/httpd-ganglia.conf)|$1|' ${AP2CONF} 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 Sep 4 23:12:57 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Sep 2009 21:12:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[6187] csw/mgar/pkg/giflib/trunk/Makefile Message-ID: Revision: 6187 http://gar.svn.sourceforge.net/gar/?rev=6187&view=rev Author: dmichelsen Date: 2009-09-04 21:12:56 +0000 (Fri, 04 Sep 2009) Log Message: ----------- giflib: Fix legacy package name Modified Paths: -------------- csw/mgar/pkg/giflib/trunk/Makefile Modified: csw/mgar/pkg/giflib/trunk/Makefile =================================================================== --- csw/mgar/pkg/giflib/trunk/Makefile 2009-09-04 21:08:11 UTC (rev 6186) +++ csw/mgar/pkg/giflib/trunk/Makefile 2009-09-04 21:12:56 UTC (rev 6187) @@ -15,12 +15,12 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -PACKAGES = CSWgiflib CSWlibungif +PACKAGES = CSWgiflib CSWungif SPKG_DESC_CSWgiflib = A library for reading and writing gif images -SPKG_DESC_CSWlibungif = Links to giflib now the patent is dropped +SPKG_DESC_CSWungif = Links to giflib now the patent is dropped -REQUIRED_PKGS_CSWlibungif = CSWgiflib +REQUIRED_PKGS_CSWungif = CSWgiflib BUILD64 = 1 @@ -33,7 +33,7 @@ MERGE_DIRS_isa-sparcv9 = $(libdir) MERGE_DIRS_isa-amd64 = $(libdir) -PKGFILES_CSWlibungif = .*/libungif\..* +PKGFILES_CSWungif = .*/libungif\..* 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 Sep 4 23:34:22 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Sep 2009 21:34:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[6188] csw/mgar/pkg/curl/trunk/Makefile Message-ID: Revision: 6188 http://gar.svn.sourceforge.net/gar/?rev=6188&view=rev Author: dmichelsen Date: 2009-09-04 21:34:22 +0000 (Fri, 04 Sep 2009) Log Message: ----------- curl: Enhance package description Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2009-09-04 21:12:56 UTC (rev 6187) +++ csw/mgar/pkg/curl/trunk/Makefile 2009-09-04 21:34:22 UTC (rev 6188) @@ -26,7 +26,7 @@ CATALOGNAME_CSWcurlrt = curlrt CATALOGNAME_CSWcurldevel = curldevel -SPKG_DESC_CSWcurl = Curl, a command line tool and library for client-side URL transfers +SPKG_DESC_CSWcurl = A command line tool and library for client-side URL transfers SPKG_DESC_CSWcurlrt = Curl Runtime Libraries SPKG_DESC_CSWcurldevel = Curl Developer Files This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Sat Sep 5 01:21:50 2009 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Fri, 04 Sep 2009 23:21:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6189] csw/mgar/pkg/ganglia/trunk Message-ID: Revision: 6189 http://gar.svn.sourceforge.net/gar/?rev=6189&view=rev Author: d_pocock Date: 2009-09-04 23:21:50 +0000 (Fri, 04 Sep 2009) Log Message: ----------- ganglia: init.d script and SMF support Modified Paths: -------------- csw/mgar/pkg/ganglia/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/ganglia/trunk/files/cswgmetad csw/mgar/pkg/ganglia/trunk/files/cswgmond Modified: csw/mgar/pkg/ganglia/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia/trunk/Makefile 2009-09-04 21:34:22 UTC (rev 6188) +++ csw/mgar/pkg/ganglia/trunk/Makefile 2009-09-04 23:21:50 UTC (rev 6189) @@ -22,7 +22,7 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += CSWgangliaweb.postinstall CSWgangliaweb.preremove -DISTFILES += httpd-ganglia.conf.CSW +DISTFILES += httpd-ganglia.conf.CSW cswgmond cswgmetad PACKAGES = CSWgangliaagent CSWgangliart CSWgangliadevel CSWgangliagmetad CSWgangliaweb CSWgangliamodpython @@ -105,11 +105,16 @@ PKGFILES_CSWgangliart = $(libdir)/libganglia.* PKGFILES_CSWgangliamodpython = .*python.* PKGFILES_CSWgangliadevel = .*/include/.*.h .*/bin/ganglia-config -PKGFILES_CSWgangliagmetad = .*/gmetad.* /opt/csw/var/ganglia/rrds +PKGFILES_CSWgangliagmetad = .*/gmetad.* /opt/csw/var/ganglia/rrds /etc/opt/csw/init.d/cswgmetad PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.* /opt/csw/apache2/etc/extra/.* PRESERVECONF = /opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW +# For gmond +INITSMF = /etc/opt/csw/init.d/cswgmond +# For gmetad +INITSMF += /etc/opt/csw/init.d/cswgmetad + PROTOTYPE_FILTER_CSWgangliagmetad = awk '\ $$$$3 ~ /\/opt\/csw\/var\/ganglia\/rrds/ { $$$$5 = "nobody"; $$$$6 = "nogroup" } \ { print }' @@ -121,6 +126,10 @@ include gar/category.mk install-custom: + @ginstall -D $(DOWNLOADDIR)/cswgmond \ + $(PKGROOT)/etc/opt/csw/init.d/cswgmond + @ginstall -D $(DOWNLOADDIR)/cswgmetad \ + $(PKGROOT)/etc/opt/csw/init.d/cswgmetad @ginstall -d $(DESTDIR)$(WWWGANGLIA) @cd $(WORKSRC)/web; \ cp -R * $(DESTDIR)$(WWWGANGLIA) Added: csw/mgar/pkg/ganglia/trunk/files/cswgmetad =================================================================== --- csw/mgar/pkg/ganglia/trunk/files/cswgmetad (rev 0) +++ csw/mgar/pkg/ganglia/trunk/files/cswgmetad 2009-09-04 23:21:50 UTC (rev 6189) @@ -0,0 +1,29 @@ +#!/bin/sh + +GANGLIA_BASEDIR=/opt/csw +GMETAD=${GANGLIA_BASEDIR}/sbin/gmetad +GMETAD_CONF=/etc/opt/csw/ganglia/gmetad.conf + +test -f /etc/default/gmetad && . /etc/default/gmetad + +[ ! -d ${GANGLIA_BASEDIR} ] && exit 1 + +case "$1" in + + 'start') + ${GMETAD} -c "${GMETAD_CONF}" + ;; + + 'stop') + /usr/bin/pkill -x gmetad + ;; + + *) + echo "Usage: $0 { start | stop }" + exit 1 + ;; + +esac +exit 0 + + Added: csw/mgar/pkg/ganglia/trunk/files/cswgmond =================================================================== --- csw/mgar/pkg/ganglia/trunk/files/cswgmond (rev 0) +++ csw/mgar/pkg/ganglia/trunk/files/cswgmond 2009-09-04 23:21:50 UTC (rev 6189) @@ -0,0 +1,29 @@ +#!/bin/sh + +GANGLIA_BASEDIR=/opt/csw +GMOND=${GANGLIA_BASEDIR}/sbin/gmond +GMOND_CONF=/etc/opt/csw/ganglia/gmond.conf + +test -f /etc/default/gmond && . /etc/default/gmond + +[ ! -d ${GANGLIA_BASEDIR} ] && exit 1 + +case "$1" in + + 'start') + ${GMOND} -c "${GMOND_CONF}" + ;; + + 'stop') + /usr/bin/pkill -x gmond + ;; + + *) + echo "Usage: $0 { start | stop }" + 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 Sat Sep 5 02:41:38 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 05 Sep 2009 00:41:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6190] csw/mgar/pkg/cups/branches/cups-1.4/ Message-ID: Revision: 6190 http://gar.svn.sourceforge.net/gar/?rev=6190&view=rev Author: wahwah Date: 2009-09-05 00:41:38 +0000 (Sat, 05 Sep 2009) Log Message: ----------- cups: branching out for 1.4 Added Paths: ----------- csw/mgar/pkg/cups/branches/cups-1.4/ 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 Sep 5 10:03:46 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 05 Sep 2009 08:03:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6191] csw/mgar/pkg/cups/branches/cups-1.4 Message-ID: Revision: 6191 http://gar.svn.sourceforge.net/gar/?rev=6191&view=rev Author: wahwah Date: 2009-09-05 08:03:46 +0000 (Sat, 05 Sep 2009) Log Message: ----------- cups: Branch 1.4 first iteration Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4/Makefile csw/mgar/pkg/cups/branches/cups-1.4/checksums Added Paths: ----------- csw/mgar/pkg/cups/branches/cups-1.4/files/0001-Makefile.patch Removed Paths: ------------- csw/mgar/pkg/cups/branches/cups-1.4/files/Makefile-cups-1.3.11.patch Modified: csw/mgar/pkg/cups/branches/cups-1.4/Makefile =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-05 00:41:38 UTC (rev 6190) +++ csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-05 08:03:46 UTC (rev 6191) @@ -1,5 +1,5 @@ GARNAME = cups -GARVERSION = 1.3.11 +GARVERSION = 1.4.0 CATEGORIES = net define BLURB @@ -21,12 +21,13 @@ FULL_MIRRORS = $(foreach S,$(CUPS_MIRRORS),$(S)/$(GARNAME)/$(GARVERSION)/) MASTER_SITES += $(FULL_MIRRORS) -PATCHFILES = Makefile-cups-$(GARVERSION).patch +PATCHFILES = 0001-Makefile.patch DISTFILES = cups-$(GARVERSION)-source.tar.bz2 $(PATCHFILES) DISTFILES += CSWcupsd.postremove PREREQUISITE_PKGS = CSWggettext PREREQUISITE_PKGS += CSWjpeg +PREREQUISITE_PKGS += CSWkrb5libdev PREREQUISITE_PKGS += CSWoldapdevel PREREQUISITE_PKGS += CSWossldevel PREREQUISITE_PKGS += CSWtiff @@ -62,10 +63,13 @@ PKGFILES_CSWcupsdoc = $(datadir)/doc PKGFILES_CSWcupsdoc += $(datadir)/doc/.* +PKGFILES_CSWcupsdoc += $(datadir)/cups/examples.* PKGFILES_CSWcupsdev = $(includedir)/cups/?.* PKGFILES_CSWcupsdev += $(mandir)/man1/cups-config.1 PKGFILES_CSWcupsdev += $(bindir)/cups-config +PKGFILES_CSWcupsdev += $(datadir)/cups/ppdc.* +PKGFILES_CSWcupsdev += $(datadir)/cups/drv.* PKGFILES_CSWcupsd = $(sysconfdir)/.* PKGFILES_CSWcupsd += $(mandir)/man1m @@ -79,22 +83,30 @@ PKGFILES_CSWcupsd += $(datadir)/cups/(banners|data|profiles|charsets).* PKGFILES_CSWcupsd += $(datadir)/locale/.* PKGFILES_CSWcupsd += $(datadir)/applications/.* +PKGFILES_CSWcupsd += $(datadir)/cups/mime.* +PKGFILES_CSWcupsd += $(datadir)/icons.* PKGFILES_CSWcupsd += $(libdir)/cups/.* PKGFILES_CSWcupsd += $(libdir)/svc/.* +PKGFILES_CSWcupsd += $(bindir)/ppd(c|html|i|merge|po) PKGFILES_CSWcupsd += $(sbindir)/(cupsfilter|cupsd) PKGFILES_CSWcupsd += $(localstatedir)/.* PKGFILES_CSWcupsclient = $(sbindir)/(accept|reject|cups(addsmb|ctl|(en|dis)able)) +PKGFILES_CSWcupsclient += $(sbindir)/cups(accept|reject) PKGFILES_CSWcupsclient += $(sbindir)/(lp(admin|p|c|info|move)) PKGFILES_CSWcupsclient += $(bindir)/(cancel|cupstest(dsc|ppd)) PKGFILES_CSWcupsclient += $(bindir)/(lp(|options|passwd|q|r|rm|stat)) PKGFILES_CSWcupsclient += $(mandir)/man1/(cancel|cupstest(dsc|ppd)|lp).1 PKGFILES_CSWcupsclient += $(mandir)/man1/(lpoptions|lppasswd|lpq|lpr|lprm).1 PKGFILES_CSWcupsclient += $(mandir)/man1/lpstat.1 +PKGFILES_CSWcupsclient += $(mandir)/man1/ppd.*\.1 +PKGFILES_CSWcupsclient += $(mandir)/man1m/cups.*\.1m PKGFILES_CSWcupsclient += $(mandir)/man1m/(accept|cupsaddsmb|cupsctl).1m PKGFILES_CSWcupsclient += $(mandir)/man1m/(cups(en|dis)able).1m PKGFILES_CSWcupsclient += $(mandir)/man1m/(lpadmin|lpc|lpinfo|lpmove|reject).1m PKGFILES_CSWcupsclient += $(mandir)/man5/client.conf.5 +PKGFILES_CSWcupsclient += $(mandir)/man5/ppdcfile\.5 +PKGFILES_CSWcupsclient += $(mandir)/man7/(drv|notifier)\.7 Modified: csw/mgar/pkg/cups/branches/cups-1.4/checksums =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-09-05 00:41:38 UTC (rev 6190) +++ csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-09-05 08:03:46 UTC (rev 6191) @@ -1,3 +1,3 @@ ca7718998e56c320c08a77cfefe046f6 download/CSWcupsd.postremove -09203e5a1274f71b0d6730456aa80c99 download/Makefile-cups-1.3.11.patch -17f3e2bcb3cae3dd9dceb65a2bfd295f download/cups-1.3.11-source.tar.bz2 +09203e5a1274f71b0d6730456aa80c99 download/Makefile-cups-1.4.0.patch +bc5e777d4320cecdd1a64de8035171a8 download/cups-1.4.0-source.tar.bz2 Added: csw/mgar/pkg/cups/branches/cups-1.4/files/0001-Makefile.patch =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/0001-Makefile.patch (rev 0) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/0001-Makefile.patch 2009-09-05 08:03:46 UTC (rev 6191) @@ -0,0 +1,72 @@ +From 77ba01db2d7f7b8585bb05bb8652aedf09860bd5 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sat, 5 Sep 2009 03:31:57 +0200 +Subject: [PATCH] Makefile + +--- + Makefile | 12 ++++++------ + locale/Makefile | 3 ++- + 2 files changed, 8 insertions(+), 7 deletions(-) + +diff --git a/Makefile b/Makefile +index 91be6e5..a1ff6f8 100644 +--- a/Makefile ++++ b/Makefile +@@ -178,18 +178,18 @@ install-data: + if test "x$(INITDIR)" != x; then \ + echo Installing init scripts...; \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \ +- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \ ++ $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cswcups; \ + for level in $(RCLEVELS); do \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \ +- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups; \ ++ $(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups; \ + if test `uname` = HP-UX; then \ + level=`expr $$level - 1`; \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \ + fi; \ +- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups; \ ++ $(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups; \ + done; \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \ +- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \ ++ $(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \ + fi + if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \ + $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \ +@@ -227,7 +227,7 @@ install-data: + $(INSTALL_DATA) init/cups-lpd $(BUILDROOT)$(XINETD)/cups-lpd; \ + fi + if test "x$(MENUDIR)" != x; then \ +- echo Installing desktop menu...; \ ++ echo Installing desktop menu into $(BUILDROOT)$(MENUDIR)...; \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(MENUDIR); \ + $(INSTALL_DATA) desktop/cups.desktop $(BUILDROOT)$(MENUDIR); \ + fi +@@ -290,7 +290,7 @@ uninstall: + -$(RMDIR) $(BINDIR) + echo Uninstalling startup script... + if test "x$(INITDIR)" != x; then \ +- $(RM) $(BUILDROOT)$(INITDIR)/init.d/cups; \ ++ $(RM) $(BUILDROOT)$(INITDIR)/init.d/cswcups; \ + $(RMDIR) $(BUILDROOT)$(INITDIR)/init.d; \ + $(RM) $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \ + $(RMDIR) $(BUILDROOT)$(INITDIR)/rc0.d; \ +diff --git a/locale/Makefile b/locale/Makefile +index 6241b66..f76b8bc 100644 +--- a/locale/Makefile ++++ b/locale/Makefile +@@ -75,7 +75,8 @@ install-languages: + for loc in $(LANGUAGES) ; do \ + if test -f cups_$$loc.po; then \ + $(INSTALL_DIR) -m 755 $(LOCALEDIR)/$$loc ; \ +- $(INSTALL_DATA) cups_$$loc.po $(LOCALEDIR)/$$loc/cups_$$loc.po ; \ ++ $(INSTALL_DIR) -m 755 $(LOCALEDIR)/$$loc/LC_MESSAGES ; \ ++ $(INSTALL_DATA) cups_$$loc.po $(LOCALEDIR)/$$loc/LC_MESSAGES/cups_$$loc.po ; \ + fi ; \ + done + +-- +1.6.3.2 + Deleted: csw/mgar/pkg/cups/branches/cups-1.4/files/Makefile-cups-1.3.11.patch =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/Makefile-cups-1.3.11.patch 2009-09-05 00:41:38 UTC (rev 6190) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/Makefile-cups-1.3.11.patch 2009-09-05 08:03:46 UTC (rev 6191) @@ -1,57 +0,0 @@ -diff -ru cups-1.3.11.orig/locale/Makefile cups-1.3.11/locale/Makefile ---- cups-1.3.11.orig/locale/Makefile 2007-09-28 19:30:31.000000000 +0100 -+++ cups-1.3.11/locale/Makefile 2009-07-23 16:35:44.275047072 +0100 -@@ -54,7 +54,8 @@ - for loc in $(LANGUAGES) ; do \ - if test -f cups_$$loc.po; then \ - $(INSTALL_DIR) -m 755 $(LOCALEDIR)/$$loc ; \ -- $(INSTALL_DATA) cups_$$loc.po $(LOCALEDIR)/$$loc/cups_$$loc.po ; \ -+ $(INSTALL_DIR) -m 755 $(LOCALEDIR)/$$loc/LC_MESSAGES ; \ -+ $(INSTALL_DATA) cups_$$loc.po $(LOCALEDIR)/$$loc/LC_MESSAGES/cups_$$loc.po ; \ - fi ; \ - done - -diff -ru cups-1.3.11.orig/Makefile cups-1.3.11/Makefile ---- cups-1.3.11.orig/Makefile 2009-06-05 18:55:57.000000000 +0100 -+++ cups-1.3.11/Makefile 2009-07-24 13:05:36.723168569 +0100 -@@ -118,18 +118,18 @@ - if test "x$(INITDIR)" != x; then \ - echo Installing init scripts...; \ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \ -- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \ -+ $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cswcups; \ - for level in $(RCLEVELS); do \ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \ -- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups; \ -+ $(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups; \ - if test `uname` = HP-UX; then \ - level=`expr $$level - 1`; \ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \ - fi; \ -- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups; \ -+ $(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups; \ - done; \ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \ -- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \ -+ $(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \ - fi - if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \ - $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \ -@@ -168,7 +168,7 @@ - $(INSTALL_DATA) init/cups-lpd $(BUILDROOT)$(XINETD)/cups-lpd; \ - fi - if test "x$(MENUDIR)" != x; then \ -- echo Installing desktop menu...; \ -+ echo Installing desktop menu into $(BUILDROOT)$(MENUDIR)...; \ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(MENUDIR); \ - $(INSTALL_DATA) desktop/cups.desktop $(BUILDROOT)$(MENUDIR); \ - fi -@@ -211,7 +211,7 @@ - -$(RMDIR) $(BINDIR) - echo Uninstalling startup script... - if test "x$(INITDIR)" != x; then \ -- $(RM) $(BUILDROOT)$(INITDIR)/init.d/cups; \ -+ $(RM) $(BUILDROOT)$(INITDIR)/init.d/cswcups; \ - $(RMDIR) $(BUILDROOT)$(INITDIR)/init.d; \ - $(RM) $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \ - $(RMDIR) $(BUILDROOT)$(INITDIR)/rc0.d; \ 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 Sep 5 10:05:30 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 05 Sep 2009 08:05:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[6192] csw/mgar/pkg/cups/branches/cups-1.4/checksums Message-ID: Revision: 6192 http://gar.svn.sourceforge.net/gar/?rev=6192&view=rev Author: wahwah Date: 2009-09-05 08:05:30 +0000 (Sat, 05 Sep 2009) Log Message: ----------- cupsd: branch 1.4 checksums Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4/checksums Modified: csw/mgar/pkg/cups/branches/cups-1.4/checksums =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-09-05 08:03:46 UTC (rev 6191) +++ csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-09-05 08:05:30 UTC (rev 6192) @@ -1,3 +1,3 @@ +682e10ff0ab0e094c3de2061369038bc download/0001-Makefile.patch ca7718998e56c320c08a77cfefe046f6 download/CSWcupsd.postremove -09203e5a1274f71b0d6730456aa80c99 download/Makefile-cups-1.4.0.patch bc5e777d4320cecdd1a64de8035171a8 download/cups-1.4.0-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 Sat Sep 5 13:51:15 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 05 Sep 2009 11:51:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[6193] csw/mgar/pkg/curl/trunk Message-ID: Revision: 6193 http://gar.svn.sourceforge.net/gar/?rev=6193&view=rev Author: dmichelsen Date: 2009-09-05 11:51:15 +0000 (Sat, 05 Sep 2009) Log Message: ----------- curl: Correct detection of 64 bit on x86 Modified Paths: -------------- csw/mgar/pkg/curl/trunk/checksums csw/mgar/pkg/curl/trunk/files/curlbuild.h Modified: csw/mgar/pkg/curl/trunk/checksums =================================================================== --- csw/mgar/pkg/curl/trunk/checksums 2009-09-05 08:05:30 UTC (rev 6192) +++ csw/mgar/pkg/curl/trunk/checksums 2009-09-05 11:51:15 UTC (rev 6193) @@ -1,5 +1,5 @@ 8402c1f654c51ad7287aad57c3aa79be download/curl-7.19.6.tar.bz2 -5aebb27149d80000d1107b58d65b551b download/curlbuild.h +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 Modified: csw/mgar/pkg/curl/trunk/files/curlbuild.h =================================================================== --- csw/mgar/pkg/curl/trunk/files/curlbuild.h 2009-09-05 08:05:30 UTC (rev 6192) +++ csw/mgar/pkg/curl/trunk/files/curlbuild.h 2009-09-05 11:51:15 UTC (rev 6193) @@ -1,5 +1,5 @@ /* Allow 32 and 64 bit headers to coexist */ -#if defined __arch64__ || defined __sparcv9 +#if defined __amd64 || defined __x86_64 || defined __sparcv9 #include "curlbuild-64.h" #else #include "curlbuild-32.h" 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 Sep 5 13:55:41 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 05 Sep 2009 11:55:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[6194] csw/mgar/pkg/flac/trunk/Makefile Message-ID: Revision: 6194 http://gar.svn.sourceforge.net/gar/?rev=6194&view=rev Author: dmichelsen Date: 2009-09-05 11:55:40 +0000 (Sat, 05 Sep 2009) Log Message: ----------- flac: Disable assembler optimizations for now as they don't link properly Modified Paths: -------------- csw/mgar/pkg/flac/trunk/Makefile Modified: csw/mgar/pkg/flac/trunk/Makefile =================================================================== --- csw/mgar/pkg/flac/trunk/Makefile 2009-09-05 11:51:15 UTC (rev 6193) +++ csw/mgar/pkg/flac/trunk/Makefile 2009-09-05 11:55:40 UTC (rev 6194) @@ -27,8 +27,11 @@ SF_PROJ = flac MASTER_SITES = $(SF_MIRRORS) DISTNAME = $(SF_PROJ)-$(GARVERSION) -DISTFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(SF_PROJ)-$(VERSION).tar.gz) +SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(SF_PROJ)-$(VERSION).tar.gz) +DISTFILES = $(SOURCEFILES) +NOEXTRACT = $(filter-out $(SF_PROJ)-$(GARVERSION).tar.gz,$(SOURCEFILES)) + PATCHFILES_isa-sparcv8-garversion-1.1.2 = libtool-64bit.patch PATCHFILES_isa-sparcv9-garversion-1.1.2 = libtool-64bit.patch PATCHFILES_isa-sparcv8-garversion-1.2.1 = libtool-64bit.patch no-stdint.patch @@ -38,7 +41,7 @@ PATCHFILES_isa-i386-garversion-1.1.2 = strip-nasm-1.1.2.patch libtool-64bit.patch PATCHFILES_isa-amd64-garversion-1.1.2 = libtool-64bit.patch PATCHFILES_isa-i386-garversion-1.2.1 = strip-nasm-1.2.1.patch libtool-64bit.patch no-stdint.patch -PATCHFILES_isa-amd64-garversion-1.2.1 = libtool-64bit.patch no-stdint.patch +PATCHFILES_isa-amd64-garversion-1.2.1 = strip-nasm-1.2.1.patch libtool-64bit.patch no-stdint.patch PACKAGES = CSWflac CSWxmmsflac CATALOGNAME_CSWflac = libflac @@ -77,6 +80,9 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += $(EXTRA_CONFIGURE_ARGS_mm-$(MEMORYMODEL)) +# XXX: Assembler optimization just doesn't work. Disable for now. +CONFIGURE_ARGS += --disable-asm-optimizations + TEST_TARGET = check MERGE_SCRIPTS_isa-i386-garversion-1.0.4 = copy-only 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 Sep 5 18:26:51 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 05 Sep 2009 16:26:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[6195] csw/mgar/pkg/vncserver/trunk Message-ID: Revision: 6195 http://gar.svn.sourceforge.net/gar/?rev=6195&view=rev Author: wahwah Date: 2009-09-05 16:26:49 +0000 (Sat, 05 Sep 2009) Log Message: ----------- vncserver: Some more work. Doesn't compile yet, calls 'clean' target on directories with no Makefiles. Modified Paths: -------------- csw/mgar/pkg/vncserver/trunk/Makefile csw/mgar/pkg/vncserver/trunk/checksums Added Paths: ----------- csw/mgar/pkg/vncserver/trunk/files/0001-GNU-make-by-default.patch Modified: csw/mgar/pkg/vncserver/trunk/Makefile =================================================================== --- csw/mgar/pkg/vncserver/trunk/Makefile 2009-09-05 11:55:40 UTC (rev 6194) +++ csw/mgar/pkg/vncserver/trunk/Makefile 2009-09-05 16:26:49 UTC (rev 6195) @@ -18,7 +18,6 @@ REQUIRED_PKGS = CSWjpeg CSWtcpwrap -# We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_USE_SF = 1 UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=14067 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)_unixsrc.tar.bz2 @@ -28,7 +27,8 @@ # Use tightvnc.spec EXTRA_DEFINES = -DUSE_LIBWRAP=1 -EXTRA_INCLUDE = $(CFLAGS) +EXTRA_INC = /usr/openwin/share/include/X11 +EXTRA_LDFLAGS = /opt/csw/lib LOCAL_LDFLAGS = $(LINKER_FLAGS) BUILD_OVERRIDE_DIRS = EXTRA_DEFINES EXTRA_INCLUDE LOCAL_LDFLAGS @@ -38,10 +38,13 @@ BUILD_SCRIPTS = vnc Xvnc # VNC doesn't come with tests -TEST_SCRIPTS = +SKIPTEST = 1 INSTALL_SCRIPTS = vnc +PATCHFILES = 0001-GNU-make-by-default.patch +# PATCHFILES += work-in-progress.patch + include gar/category.mk pre-configure-modulated: @@ -62,7 +65,10 @@ build-Xvnc: configure-Xvnc banner "Build Xvnc" - cd $(WORKSRC)/Xvnc && $(MAKE) EXTRA_LIBRARIES="-lwrap" EXTRA_DEFINES="-DUSE_LIBWRAP=1" + # $(MAKE) -C $(WORKSRC)/Xvnc $(BUILD_ENV) EXTRA_LIBRARIES="-lwrap" EXTRA_DEFINES="-DUSE_LIBWRAP=1" World + $(MAKE) -C $(WORKSRC) $(BUILD_ENV) EXTRA_LIBRARIES="-lwrap" EXTRA_DEFINES="-DUSE_LIBWRAP=1" World + $(MAKE) -C $(WORKSRC)/Xvnc $(BUILD_ENV) EXTRA_LIBRARIES="-lwrap -lsocket" EXTRA_DEFINES="-DUSE_LIBWRAP=1" EXTRA_LDOPTIONS="-L/opt/csw/lib -L/usr/lib" World + @$(MAKECOOKIE) #xmkmf -a #make CDEBUGFLAGS="$RPM_OPT_FLAGS" World @@ -129,4 +135,3 @@ # VNCSERVERS="1:myusername" #EOF #chmod 644 %{buildroot}/etc/sysconfig/vncservers - Modified: csw/mgar/pkg/vncserver/trunk/checksums =================================================================== --- csw/mgar/pkg/vncserver/trunk/checksums 2009-09-05 11:55:40 UTC (rev 6194) +++ csw/mgar/pkg/vncserver/trunk/checksums 2009-09-05 16:26:49 UTC (rev 6195) @@ -1,2 +1,3 @@ +ccaa72230aff091ca3863896b5c36885 download/0001-GNU-make-by-default.patch 397b35faad32d5246b6d44b142f8304f download/tightvnc-1.3.10_unixsrc.tar.bz2 56c09be17c17184e96193c13246fd649 download/vncservers Added: csw/mgar/pkg/vncserver/trunk/files/0001-GNU-make-by-default.patch =================================================================== --- csw/mgar/pkg/vncserver/trunk/files/0001-GNU-make-by-default.patch (rev 0) +++ csw/mgar/pkg/vncserver/trunk/files/0001-GNU-make-by-default.patch 2009-09-05 16:26:49 UTC (rev 6195) @@ -0,0 +1,25 @@ +From 985baba7fd98f7e329fdbe09559f8f98c1bcce82 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Sat, 5 Sep 2009 14:18:18 +0100 +Subject: [PATCH] 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 wahwah at users.sourceforge.net Sat Sep 5 18:42:10 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 05 Sep 2009 16:42:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[6196] csw/mgar/pkg/cups/branches/cups-1.4/Makefile Message-ID: Revision: 6196 http://gar.svn.sourceforge.net/gar/?rev=6196&view=rev Author: wahwah Date: 2009-09-05 16:42:10 +0000 (Sat, 05 Sep 2009) Log Message: ----------- cups: added dependency on CSWosslrt for branch 1.4 Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4/Makefile Modified: csw/mgar/pkg/cups/branches/cups-1.4/Makefile =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-05 16:26:49 UTC (rev 6195) +++ csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-05 16:42:10 UTC (rev 6196) @@ -51,13 +51,13 @@ REQUIRED_PKGS_CSWcupsd = CSWcswclassutils CSWlibcups CSWoldaprt CSWzlib REQUIRED_PKGS_CSWcupsd += CSWjpeg CSWpng CSWtiff CSWlibtasn1 REQUIRED_PKGS_CSWcupsd += CSWgcrypt CSWgnutls CSWgpgerr CSWlibdbus -REQUIRED_PKGS_CSWcupsd += CSWkrb5lib +REQUIRED_PKGS_CSWcupsd += CSWkrb5lib CSWosslrt REQUIRED_PKGS_CSWcupsclient = CSWcswclassutils CSWlibcups CSWoldaprt CSWzlib -REQUIRED_PKGS_CSWcupsclient += CSWgcrypt CSWgnutls CSWgpgerr CSWlibtasn1 +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_CSWlibcups += CSWgcrypt CSWgnutls CSWgpgerr CSWlibtasn1 +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 j_arndt at users.sourceforge.net Sat Sep 5 20:00:09 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sat, 05 Sep 2009 18:00:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[6197] csw/mgar/pkg/munin/trunk Message-ID: Revision: 6197 http://gar.svn.sourceforge.net/gar/?rev=6197&view=rev Author: j_arndt Date: 2009-09-05 18:00:09 +0000 (Sat, 05 Sep 2009) Log Message: ----------- munin: run level links will be created on Sol 8, improved package description Modified Paths: -------------- csw/mgar/pkg/munin/trunk/Makefile csw/mgar/pkg/munin/trunk/checksums csw/mgar/pkg/munin/trunk/files/cswmuninnode Modified: csw/mgar/pkg/munin/trunk/Makefile =================================================================== --- csw/mgar/pkg/munin/trunk/Makefile 2009-09-05 16:42:10 UTC (rev 6196) +++ csw/mgar/pkg/munin/trunk/Makefile 2009-09-05 18:00:09 UTC (rev 6197) @@ -2,19 +2,18 @@ GARVERSION = 1.3.4 CATEGORIES = apps -SPKG_DESC_CSWmuninmaster = munin master -SPKG_DESC_CSWmuninnode = munin node +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 -#DESCRIPTION = graphical network and system monitoring define BLURB - Long description + Munin the monitoring tool surveys all your computers and remembers what it saw. It presents all the information in graphs through a web interface. endef SF_PROJ = munin MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)_$(GARVERSION).tar.gz DISTFILES += CSWmuninmaster.prototype CSWmuninmaster.postinstall -DISTFILES += CSWmuninnode.prototype +DISTFILES += CSWmuninnode.prototype cswmuninnode DISTFILES += cswusergroup DISTFILES += apache-munin.conf.CSW apache-munin-cgi.conf.CSW DISTFILES += README.CSW Modified: csw/mgar/pkg/munin/trunk/checksums =================================================================== --- csw/mgar/pkg/munin/trunk/checksums 2009-09-05 16:42:10 UTC (rev 6196) +++ csw/mgar/pkg/munin/trunk/checksums 2009-09-05 18:00:09 UTC (rev 6197) @@ -4,6 +4,7 @@ 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 Modified: csw/mgar/pkg/munin/trunk/files/cswmuninnode =================================================================== --- csw/mgar/pkg/munin/trunk/files/cswmuninnode 2009-09-05 16:42:10 UTC (rev 6196) +++ csw/mgar/pkg/munin/trunk/files/cswmuninnode 2009-09-05 18:00:09 UTC (rev 6197) @@ -4,9 +4,14 @@ # All rights reserved. # # For OpenCSW by Juergen Arndt 2009-07-03 +# Run levels added - 2009-09-05 #FMRI application # FMRI path for service #AUTOENABLE yes +#RC_KNUM 20 # Number used for kill script symlink, e.g. K20cswfoo +#RC_SNUM 80 # Number used for start script symlink, e.g. S80cswfoo +#RC_KLEV 0,1,2,S # Run levels that should have a kill script symlink +#RC_SLEV 3 # Run levels that should have a start script symlink SMF_EXIT_ERR_CONFIG=1 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 Sep 5 20:53:15 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sat, 05 Sep 2009 18:53:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[6198] csw/mgar/pkg/spine/trunk Message-ID: Revision: 6198 http://gar.svn.sourceforge.net/gar/?rev=6198&view=rev Author: j_arndt Date: 2009-09-05 18:53:15 +0000 (Sat, 05 Sep 2009) Log Message: ----------- spine: tweaked the configure script Modified Paths: -------------- csw/mgar/pkg/spine/trunk/checksums csw/mgar/pkg/spine/trunk/files/configure.diff Modified: csw/mgar/pkg/spine/trunk/checksums =================================================================== --- csw/mgar/pkg/spine/trunk/checksums 2009-09-05 18:00:09 UTC (rev 6197) +++ csw/mgar/pkg/spine/trunk/checksums 2009-09-05 18:53:15 UTC (rev 6198) @@ -1,4 +1,4 @@ 54e3c3f6ca757815ac1cccf78b7a086c download/CSWspine.postinstall 99e5bde07fc31d1ed8aa23c59de00417 download/cacti-spine-0.8.7e.tar.gz -40235c60873e4097a44b07db653211ae download/configure.diff +2fbbedbfc20811cbc81ddf748ebdb58e download/configure.diff b762d50320246dc8ce21c20233479231 download/cswusergroup Modified: csw/mgar/pkg/spine/trunk/files/configure.diff =================================================================== --- csw/mgar/pkg/spine/trunk/files/configure.diff 2009-09-05 18:00:09 UTC (rev 6197) +++ csw/mgar/pkg/spine/trunk/files/configure.diff 2009-09-05 18:53:15 UTC (rev 6198) @@ -18,7 +18,7 @@ fi -LDFLAGS="-L$SNMP_LIBDIR $LDFLAGS" -+LDFLAGS="-L/opt/csw/lib -L/opt/csw/lib/mysql $LDFLAGS" ++LDFLAGS="-L/opt/csw/lib -L/opt/csw/lib/mysql -L/opt/csw/mysql5/lib/mysql $LDFLAGS" CFLAGS="-I$SNMP_INCDIR -I$SNMP_INCDIR/.. $CFLAGS" # Net/UCD-SNMP includes v3 support and insists on crypto unless compiled --without-openssl This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sat Sep 5 22:58:25 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sat, 05 Sep 2009 20:58:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[6199] csw/mgar/pkg/spine/trunk/Makefile Message-ID: Revision: 6199 http://gar.svn.sourceforge.net/gar/?rev=6199&view=rev Author: skayser Date: 2009-09-05 20:58:25 +0000 (Sat, 05 Sep 2009) Log Message: ----------- spine: tweaked configure phase Modified Paths: -------------- csw/mgar/pkg/spine/trunk/Makefile Modified: csw/mgar/pkg/spine/trunk/Makefile =================================================================== --- csw/mgar/pkg/spine/trunk/Makefile 2009-09-05 18:53:15 UTC (rev 6198) +++ csw/mgar/pkg/spine/trunk/Makefile 2009-09-05 20:58:25 UTC (rev 6199) @@ -12,6 +12,7 @@ #DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES = cacti-$(GARNAME)-$(GARVERSION).tar.gz DISTFILES += cswusergroup CSWspine.postinstall +DISTNAME = cacti-$(GARNAME)-$(GARVERSION) PATCHFILES += configure.diff @@ -30,16 +31,10 @@ SPKG_CLASSES = none cswpreserveconf -WORKSRC = $(WORKDIR)/cacti-$(GARNAME)-$(GARVERSION) - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-mysql=/opt/csw/mysql5 CONFIGURE_ARGS += --with-snmp=/opt/csw/include/net-snmp -EXTRA_LIB += $(BUILD_PREFIX)/lib -LD_OPTIONS += -L/opt/csw/lib - -CONFIGURE_SCRIPTS = custom INSTALL_SCRIPTS = custom SKIPTEST = 1 @@ -50,15 +45,14 @@ include gar/category.mk -configure-custom: - @echo " ==> Configuring in $(WORKSRC)" +pre-configure-modulated: + @echo " ==> Pre-configure in $(WORKSRC)" @rm $(WORKSRC)/config/ltmain.sh @rm $(WORKSRC)/config/config.sub @rm $(WORKSRC)/config/config.guess @ln -s /opt/csw/share/libtool/config/ltmain.sh $(WORKSRC)/config/ltmain.sh @ln -s /opt/csw/share/libtool/config/config.sub $(WORKSRC)/config/config.sub @ln -s /opt/csw/share/libtool/config/config.guess $(WORKSRC)/config/config.guess - @( cd $(WORKSRC) ; ./configure $(CONFIGURE_ARGS) ) @$(MAKECOOKIE) install-custom: 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 Sep 5 23:04:51 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 05 Sep 2009 21:04:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[6200] csw/mgar/pkg/thunderbird/trunk Message-ID: Revision: 6200 http://gar.svn.sourceforge.net/gar/?rev=6200&view=rev Author: wbonnet Date: 2009-09-05 21:04:51 +0000 (Sat, 05 Sep 2009) Log Message: ----------- Remove call to sqlite_os_switch Modified Paths: -------------- csw/mgar/pkg/thunderbird/trunk/Makefile csw/mgar/pkg/thunderbird/trunk/checksums Added Paths: ----------- csw/mgar/pkg/thunderbird/trunk/files/mozStorageAsyncIO.cpp.diff Modified: csw/mgar/pkg/thunderbird/trunk/Makefile =================================================================== --- csw/mgar/pkg/thunderbird/trunk/Makefile 2009-09-05 20:58:25 UTC (rev 6199) +++ csw/mgar/pkg/thunderbird/trunk/Makefile 2009-09-05 21:04:51 UTC (rev 6200) @@ -62,6 +62,7 @@ PATCHFILES += lber-int.h.diff PATCHFILES += ldappr-int.h.diff PATCHFILES += ldap-int.h.diff +PATCHFILES += mozStorageAsyncIO.cpp.diff TEST_SCRIPTS = Modified: csw/mgar/pkg/thunderbird/trunk/checksums =================================================================== --- csw/mgar/pkg/thunderbird/trunk/checksums 2009-09-05 20:58:25 UTC (rev 6199) +++ csw/mgar/pkg/thunderbird/trunk/checksums 2009-09-05 21:04:51 UTC (rev 6200) @@ -2,4 +2,5 @@ 46527aded9c373b6095fea546d4d74f0 download/lber-int.h.diff 46ef334e67dab2301b53b661494f9d58 download/ldap-int.h.diff e7054c1d1d6dc708805a6110ccfa7f70 download/ldappr-int.h.diff +14a88ff4a88cd308b5cd7e25cb4b6172 download/mozStorageAsyncIO.cpp.diff 2e118fcf752ee60ce994f1471f9632d1 download/thunderbird-2.0.0.23-source.tar.bz2 Added: csw/mgar/pkg/thunderbird/trunk/files/mozStorageAsyncIO.cpp.diff =================================================================== --- csw/mgar/pkg/thunderbird/trunk/files/mozStorageAsyncIO.cpp.diff (rev 0) +++ csw/mgar/pkg/thunderbird/trunk/files/mozStorageAsyncIO.cpp.diff 2009-09-05 21:04:51 UTC (rev 6200) @@ -0,0 +1,13 @@ +diff --speed-large-files --minimal -Nru thunderbird.orig/storage/src/mozStorageAsyncIO.cpp.orig thunderbird/storage/src/mozStorageAsyncIO.cpp +--- thunderbird.orig/storage/src/mozStorageAsyncIO.cpp 2009-09-05 22:39:51.740805104 +0200 ++++ thunderbird/storage/src/mozStorageAsyncIO.cpp 2009-09-05 22:41:38.590070067 +0200 +@@ -503,7 +503,8 @@ + nsresult + mozStorageService::InitStorageAsyncIO() + { +- sqlite3OsVtbl* vtable = sqlite3_os_switch(); ++ sqlite3OsVtbl* vtable = &sqlite3Os; ++//sqlite3_os_switch(); + + sqliteOrigOpenReadWrite = vtable->xOpenReadWrite; + sqliteOrigOpenReadOnly = vtable->xOpenReadOnly; 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 Sep 6 00:18:05 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 05 Sep 2009 22:18:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6201] csw/mgar/pkg/vncserver/trunk Message-ID: Revision: 6201 http://gar.svn.sourceforge.net/gar/?rev=6201&view=rev Author: wahwah Date: 2009-09-05 22:18:05 +0000 (Sat, 05 Sep 2009) Log Message: ----------- vncserver: Build phase completes now Modified Paths: -------------- csw/mgar/pkg/vncserver/trunk/Makefile csw/mgar/pkg/vncserver/trunk/checksums csw/mgar/pkg/vncserver/trunk/files/0001-GNU-make-by-default.patch Modified: csw/mgar/pkg/vncserver/trunk/Makefile =================================================================== --- csw/mgar/pkg/vncserver/trunk/Makefile 2009-09-05 21:04:51 UTC (rev 6200) +++ csw/mgar/pkg/vncserver/trunk/Makefile 2009-09-05 22:18:05 UTC (rev 6201) @@ -43,7 +43,7 @@ INSTALL_SCRIPTS = vnc PATCHFILES = 0001-GNU-make-by-default.patch -# PATCHFILES += work-in-progress.patch +PATCHFILES += 0002-Test-for-Makefile-presence.patch include gar/category.mk Modified: csw/mgar/pkg/vncserver/trunk/checksums =================================================================== --- csw/mgar/pkg/vncserver/trunk/checksums 2009-09-05 21:04:51 UTC (rev 6200) +++ csw/mgar/pkg/vncserver/trunk/checksums 2009-09-05 22:18:05 UTC (rev 6201) @@ -1,3 +1,4 @@ -ccaa72230aff091ca3863896b5c36885 download/0001-GNU-make-by-default.patch +c041ccc52996cf7e085e8f3a51747aea download/0001-GNU-make-by-default.patch +88d1dfca0c88c191f54f5aa5c6aab460 download/0002-Test-for-Makefile-presence.patch 397b35faad32d5246b6d44b142f8304f download/tightvnc-1.3.10_unixsrc.tar.bz2 56c09be17c17184e96193c13246fd649 download/vncservers Modified: csw/mgar/pkg/vncserver/trunk/files/0001-GNU-make-by-default.patch =================================================================== --- csw/mgar/pkg/vncserver/trunk/files/0001-GNU-make-by-default.patch 2009-09-05 21:04:51 UTC (rev 6200) +++ csw/mgar/pkg/vncserver/trunk/files/0001-GNU-make-by-default.patch 2009-09-05 22:18:05 UTC (rev 6201) @@ -1,7 +1,7 @@ -From 985baba7fd98f7e329fdbe09559f8f98c1bcce82 Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= -Date: Sat, 5 Sep 2009 14:18:18 +0100 -Subject: [PATCH] GNU make by default +From f12b77cb177de6014ac23913c385c7f4ab9717e3 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sat, 5 Sep 2009 22:52:49 +0200 +Subject: [PATCH 1/2] GNU make by default --- Xvnc/config/cf/svr4.cf | 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 Sun Sep 6 00:18:43 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 05 Sep 2009 22:18:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6202] csw/mgar/pkg/vncserver/trunk/files/ 0002-Test-for-Makefile-presence.patch Message-ID: Revision: 6202 http://gar.svn.sourceforge.net/gar/?rev=6202&view=rev Author: wahwah Date: 2009-09-05 22:18:43 +0000 (Sat, 05 Sep 2009) Log Message: ----------- vncserver: Adding a patch: testing for Makefile presence Added Paths: ----------- csw/mgar/pkg/vncserver/trunk/files/0002-Test-for-Makefile-presence.patch Added: csw/mgar/pkg/vncserver/trunk/files/0002-Test-for-Makefile-presence.patch =================================================================== --- csw/mgar/pkg/vncserver/trunk/files/0002-Test-for-Makefile-presence.patch (rev 0) +++ csw/mgar/pkg/vncserver/trunk/files/0002-Test-for-Makefile-presence.patch 2009-09-05 22:18:43 UTC (rev 6202) @@ -0,0 +1,27 @@ +From 1045270d1e76278f5c613eb74e2a8f347632dc73 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 6 Sep 2009 00:16:10 +0200 +Subject: [PATCH 2/2] Test for Makefile presence + +--- + Xvnc/config/cf/Imake.rules | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Xvnc/config/cf/Imake.rules b/Xvnc/config/cf/Imake.rules +index 5ab9a18..6f5f7c4 100644 +--- a/Xvnc/config/cf/Imake.rules ++++ b/Xvnc/config/cf/Imake.rules +@@ -1304,8 +1304,8 @@ InstallNamedTargetNoClobber(install,srcname,$(INSTBINFLAGS),dest,dstname) + */ + #ifndef MakeNamedTargetSubdir + #define MakeNamedTargetSubdir(dir,flags,subname)\ +- (cd dir && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) \ @@\ +- flags subname) ++ (cd dir && [ -r Makefile ] && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) \ @@\ ++ flags subname || true) + #endif + + /* +-- +1.6.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Sep 6 03:04:38 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 06 Sep 2009 01:04:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6203] csw/mgar/gar/v2/bin/checkpkg Message-ID: Revision: 6203 http://gar.svn.sourceforge.net/gar/?rev=6203&view=rev Author: bdwalton Date: 2009-09-06 01:04:38 +0000 (Sun, 06 Sep 2009) Log Message: ----------- GAR: update checkpkg to handle multiple package sets (inter-dependencies) Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2009-09-05 22:18:43 UTC (rev 6202) +++ csw/mgar/gar/v2/bin/checkpkg 2009-09-06 01:04:38 UTC (rev 6203) @@ -1,8 +1,8 @@ #!/bin/ksh -p -# checkpkg 1.46a (diff to 1.46: modified errmsg -> warnmsg on two places) +# checkpkg 1.50 (diff to 1.46a: check multiple package files) # This script examines a package that has been put together -# for submittal to the CSW archive +# for submittal to the CSW archive at opencsw.org # # It examines it for compliance with the packaging standards at # http://www.opencsw.org/standards/ @@ -29,10 +29,15 @@ rm -rf $EXTRACTDIR fi if [[ "$TMPARCHIVE" != "" ]] ; then - rm $TMPARCHIVE + [ -f "$TMPARCHIVE" ] && rm $TMPARCHIVE fi } +cleanupset(){ + if [ "`echo $SETINF*`" != "$SETINF*" ]; then + rm $SETINF* + fi +} warnmsg(){ print WARNING: $* >/dev/fd/2 if [[ "$quit_on_warn" != "" ]] ; then @@ -45,6 +50,7 @@ errmsg(){ print ERROR: $* >/dev/fd/2 cleanup + cleanupset exit 1 } @@ -58,6 +64,12 @@ shift fi +# a unique filename for the list of package deps and libs we see in a 'set' +SETINF=/tmp/checkpkg.$$.`date +%Y%m%d%H%M%S` +SETLIBS=$SETINF.libs +SETDEPS=$SETINF.deps + + for f in "$@" do @@ -123,7 +135,6 @@ TMPFILE=$EXTRACTDIR/pkginfo - dd if=$f skip=1 | (cd $EXTRACTDIR; cpio -ivd $pkgname/pkginfo) if [[ $? -ne 0 ]] ; then print ERROR: could not extract $f @@ -217,6 +228,13 @@ print ERROR: VERSION field not allowed to have '"-"' in it exit 1 ;; + *,REV=20[01][0-9].[0-9][0-9].[0-9][0-9]*) + : + ;; + *) + print ERROR: no REV=YYYY.MM.DD field in VERSION + exit 1 + ;; esac case $pkgarch in @@ -377,17 +395,19 @@ # man ld.so.1 for more info on this hack export LD_NOAUXFLTR=1 - listbinaries $EXTRACTDIR/$pkgname >$EXTRACTDIR/tmplist + listbinaries $EXTRACTDIR/$pkgname >$EXTRACTDIR/elflist # have to do this for ldd to work. arrg. - if [ -s "$EXTRACTDIR/tmplist" ] ; then - chmod 0755 `cat $EXTRACTDIR/tmplist` + if [ -s "$EXTRACTDIR/elflist" ] ; then + chmod 0755 `cat $EXTRACTDIR/elflist` - #cat $EXTRACTDIR/tmplist| xargs ldd 2>/dev/null |fgrep '.so' | + #cat $EXTRACTDIR/elflist| xargs ldd 2>/dev/null |fgrep '.so' | # sed 's:^.*=>[^/]*::' | nawk '{print $1}' |sort -u >$EXTRACTDIR/liblist - cat $EXTRACTDIR/tmplist| xargs dump -Lv |nawk '$2=="NEEDED"{print $3}' | + cat $EXTRACTDIR/elflist| xargs dump -Lv |nawk '$2=="NEEDED"{print $3}' | sort -u | egrep -v $EXTRACTDIR >$EXTRACTDIR/liblist + + print libraries used are: cat $EXTRACTDIR/liblist print "cross-referencing with depend file (May take a while)" @@ -399,6 +419,10 @@ #If these dont exist, it is Bad. touch $EXTRACTDIR/liblist $EXTRACTDIR/libpkgs +# store things that look like shared objects from the package map for +# delayed library validation. +grep "\.so" $EXTRACTDIR/$pkgname/pkgmap >> $SETLIBS + if [[ -f $EXTRACTDIR/$pkgname/install/depend ]] ; then print print "Examining 'depend' file" @@ -416,11 +440,26 @@ exit 1 fi +#to retain a record of all packages currently being examined from $@ +echo $pkgname >> $SETDEPS + nawk '$1=="P" {print $2}' $EXTRACTDIR/$pkgname/install/depend | sort >$EXTRACTDIR/deppkgs for dep in `cat $EXTRACTDIR/deppkgs` do - pkginfo $dep || warnmsg invalid package $dep specified + pkginfo $dep + 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 + 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. + echo "$dep $pkgname" >> $SETDEPS.missing + else + echo "Found $dep as part of the package set being evaluated." + fi + fi done egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' /var/sadm/install/contents | @@ -433,13 +472,20 @@ if [[ $? -eq 0 ]] ; then echo $lib provided by package itself continue + else + grep "[/=]$lib[ =]" $SETLIBS + if [[ $? -eq 0 ]]; then + echo "$lib provided by package set being evaluated." + continue + fi fi libpkg=`grep /$lib $EXTRACTDIR/shortcatalog | sed 's/^.* \([^ ]*\)$/\1/' |sort -u` if [[ -z "$libpkg" ]] ; then - warnmsg cannot find package for $lib + echo "$lib $pkgname" >> $SETLIBS.missing + print Cannot find package providing $lib. Storing for delayed validation. else print $libpkg | fmt -1 >>$EXTRACTDIR/libpkgs fi @@ -458,19 +504,53 @@ if [[ "$basedir" != "" ]] ; then - print - print "Checking relocation ability..." - xargs strings <$EXTRACTDIR/tmplist | grep /opt/csw - if [[ $? -eq 0 ]] ; then - errmsg package build as relocatable, but binaries have hardcoded /opt/csw paths in them + print + if [[ -f $EXTRACTDIR/elflist ]] ; then + print "Checking relocation ability..." + xargs strings < $EXTRACTDIR/elflist| grep /opt/csw + if [[ $? -eq 0 ]] ; then + errmsg package build as relocatable, but binaries have hardcoded /opt/csw paths in them + else + print trivial check passed + fi else - print trivial check passed + echo No relocation check done for non-binary relocatable package. fi fi + cleanup - print "" done + +if [ -s $SETDEPS.missing ]; then + print "Doing late evaluations of package dependencies." + while read mdep; do + dep=`echo $mdep | nawk '{print $1}'` + pkg=`echo $mdep | nawk '{print $2}'` + /usr/xpg4/bin/grep -q $dep $SETDEPS + if [ $? -ne 0 ]; then + errmsg "Couldn't validate $dep as a dependency in package $pkg" + else + print "Validated $dep as a dependency for $pkg." + fi + done < $SETDEPS.missing +fi + +if [ -s $SETLIBS.missing ]; then + print "Doing late evaluations of package library dependencies." + while read ldep; do + lib=`echo $ldep | nawk '{print $1}'` + pkg=`echo $ldep | nawk '{print $2}'` + /usr/xpg4/bin/grep -q "[/=]$lib[ =]" $SETLIBS + if [ $? -ne 0 ]; then + errmsg "Couldn't find a package providing $lib" + else + print "A package in the set being evaluated provides $lib" + fi + done < $SETLIBS.missing +fi + +cleanupset 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 Sep 6 09:41:24 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 06 Sep 2009 07:41:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[6204] csw/mgar/pkg/vncserver/trunk/Makefile Message-ID: Revision: 6204 http://gar.svn.sourceforge.net/gar/?rev=6204&view=rev Author: wahwah Date: 2009-09-06 07:41:24 +0000 (Sun, 06 Sep 2009) Log Message: ----------- vncserver: Compiles correctly now. To be tested. Modified Paths: -------------- csw/mgar/pkg/vncserver/trunk/Makefile Modified: csw/mgar/pkg/vncserver/trunk/Makefile =================================================================== --- csw/mgar/pkg/vncserver/trunk/Makefile 2009-09-06 01:04:38 UTC (rev 6203) +++ csw/mgar/pkg/vncserver/trunk/Makefile 2009-09-06 07:41:24 UTC (rev 6204) @@ -3,65 +3,67 @@ CATEGORIES = utils DESCRIPTION = TightVNC server is a free remote control package derived from the popular VNC software + define BLURB + TightVNC is a free remote control software package. With TightVNC, you can see + the desktop of a remote machine and control it with your local mouse and + keyboard, just like you would do it sitting in the front of that computer. endef SF_PROJ = vnc-tight MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION)_unixsrc.tar.bz2 DISTFILES += vncservers - -PACKAGES = CSWvncs -CATALOGNAME = vncserver - +PACKAGES = CSWvncs CSWvncv +CATALOGNAME_CSWvncs = vncserver +CATALOGNAME_CSWvncv = vncviewer SPKG_SOURCEURL = http://www.tightvnc.org/ - -REQUIRED_PKGS = CSWjpeg CSWtcpwrap - UPSTREAM_USE_SF = 1 UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=14067 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)_unixsrc.tar.bz2 - DISTNAME = vnc_unixsrc +PKGFILES_CSWvncv = $(bindir)/vncviewer +PKGFILES_CSWvncv += $(mandir)/man1/vncviewer\.1 +SPKG_DESC_CSWvncs = TightVNC server +SPKG_DESC_CSWvncv = TightVNC viewer -# Use tightvnc.spec +REQUIRED_PKGS = CSWjpeg CSWtcpwrap CSWzlib +REQUIRED_PKGS += SUNWcslr SUNWlibmsr SUNWxwice SUNWxwplt +sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw + EXTRA_DEFINES = -DUSE_LIBWRAP=1 EXTRA_INC = /usr/openwin/share/include/X11 EXTRA_LDFLAGS = /opt/csw/lib LOCAL_LDFLAGS = $(LINKER_FLAGS) BUILD_OVERRIDE_DIRS = EXTRA_DEFINES EXTRA_INCLUDE LOCAL_LDFLAGS - CONFIGURE_SCRIPTS = $(WORKSRC)/Imakefile Xvnc CONFIGURE_ARGS = -a - BUILD_SCRIPTS = vnc Xvnc - -# VNC doesn't come with tests SKIPTEST = 1 - INSTALL_SCRIPTS = vnc - PATCHFILES = 0001-GNU-make-by-default.patch +# This patch has been sent upstream with a bug report. +# http://sourceforge.net/tracker/?func=detail&aid=2852808&group_id=14067&atid=114067 PATCHFILES += 0002-Test-for-Makefile-presence.patch include gar/category.mk pre-configure-modulated: perl -pi -e "s|/usr/local/vnc/classes|$(datadir)/vnc/classes|" $(WORKSRC)/vncserver - $(MAKECOOKIE) + @$(MAKECOOKIE) configure-Xvnc: banner "Config Xvnc" perl -pi -e "s|^(\s*make)\s*$$|\1 CC=$(CC)|" $(WORKSRC)/Xvnc/configure cd $(WORKSRC)/Xvnc && ./configure - $(MAKECOOKIE) + @$(MAKECOOKIE) build-vnc: banner "Build VNC" - #$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) cd $(WORKSRC) && $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") World - $(MAKECOOKIE) + @$(MAKECOOKIE) build-Xvnc: configure-Xvnc banner "Build Xvnc" @@ -85,53 +87,5 @@ (cd $(WORKSRC); cp -pR classes $(DESTDIR)$(datadir)/vnc) #mkdir -p %{buildroot}/etc/rc.d/init.d #install -m755 vncserver.init %{buildroot}/etc/rc.d/init.d/vncserver + ginstall -d $(DESTDIR)$(sysconfdir)/vncservers ginstall -m 644 $(WORKDIR)/vncservers $(DESTDIR)$(sysconfdir)/vncservers - - - -# Build - -#patch < vnc-xclients.patch - -#xmkmf -a -#make CDEBUGFLAGS="$RPM_OPT_FLAGS" World -#cd Xvnc -#./configure -#make EXTRA_LIBRARIES="-lwrap -lnss_nis" CDEBUGFLAGS="$RPM_OPT_FLAGS" \ -# EXTRA_DEFINES="-DUSE_LIBWRAP=1" - - - - -# Install - -#rm -rf %{buildroot} - -#mkdir -p %{buildroot}%{_bindir} -#mkdir -p %{buildroot}%{_mandir}/man1 -#./vncinstall %{buildroot}%{_bindir} %{buildroot}%{_mandir} - -#mkdir -p %{buildroot}%{_datadir}/vnc -#cp -aR classes %{buildroot}%{_datadir}/vnc - -#strip %{buildroot}%{_bindir}/* || : - -#mkdir -p %{buildroot}/etc/rc.d/init.d -#install -m755 vncserver.init %{buildroot}/etc/rc.d/init.d/vncserver -# -#mkdir -p %{buildroot}/etc/sysconfig -#cat > %{buildroot}/etc/sysconfig/vncservers << EOF -# The VNCSERVERS variable is a list of display:user pairs. -# -# Uncomment the line below to start a VNC server on display :1 -# as my 'myusername' (adjust this to your own). You will also -# need to set a VNC password; run 'man vncpasswd' to see how -# to do that. -# -# DO NOT RUN THIS SERVICE if your local area network is -# untrusted! For a secure way of using VNC, see -# . - -# VNCSERVERS="1:myusername" -#EOF -#chmod 644 %{buildroot}/etc/sysconfig/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 Sun Sep 6 09:42:40 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 06 Sep 2009 07:42:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[6205] csw/mgar/pkg Message-ID: Revision: 6205 http://gar.svn.sourceforge.net/gar/?rev=6205&view=rev Author: wahwah Date: 2009-09-06 07:42:39 +0000 (Sun, 06 Sep 2009) Log Message: ----------- Renaming the 'vncserver' directory to 'tightvnc' (building both server and viewer). Added Paths: ----------- csw/mgar/pkg/tightvnc/ Removed Paths: ------------- csw/mgar/pkg/vncserver/ 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 Sep 6 09:51:47 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 06 Sep 2009 07:51:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[6206] csw/mgar/pkg/tightvnc/trunk/Makefile Message-ID: Revision: 6206 http://gar.svn.sourceforge.net/gar/?rev=6206&view=rev Author: wahwah Date: 2009-09-06 07:51:46 +0000 (Sun, 06 Sep 2009) Log Message: ----------- tightvnc: Removing references to SUNW packages Modified Paths: -------------- csw/mgar/pkg/tightvnc/trunk/Makefile Modified: csw/mgar/pkg/tightvnc/trunk/Makefile =================================================================== --- csw/mgar/pkg/tightvnc/trunk/Makefile 2009-09-06 07:42:39 UTC (rev 6205) +++ csw/mgar/pkg/tightvnc/trunk/Makefile 2009-09-06 07:51:46 UTC (rev 6206) @@ -28,7 +28,7 @@ SPKG_DESC_CSWvncv = TightVNC viewer REQUIRED_PKGS = CSWjpeg CSWtcpwrap CSWzlib -REQUIRED_PKGS += SUNWcslr SUNWlibmsr SUNWxwice SUNWxwplt +PREREQUISITE_PKGS = $(REQUIRED_PKGS) sysconfdir = /etc/opt/csw localstatedir = /var/opt/csw This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Sep 6 14:00:13 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 06 Sep 2009 12:00:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[6207] csw/mgar/pkg/libxslt/trunk Message-ID: Revision: 6207 http://gar.svn.sourceforge.net/gar/?rev=6207&view=rev Author: bdwalton Date: 2009-09-06 12:00:13 +0000 (Sun, 06 Sep 2009) Log Message: ----------- add patch to stop segfault while debugging Modified Paths: -------------- csw/mgar/pkg/libxslt/trunk/Makefile csw/mgar/pkg/libxslt/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libxslt/trunk/files/fix-segfault-in-debug.patch Modified: csw/mgar/pkg/libxslt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxslt/trunk/Makefile 2009-09-06 07:51:46 UTC (rev 6206) +++ csw/mgar/pkg/libxslt/trunk/Makefile 2009-09-06 12:00:13 UTC (rev 6207) @@ -14,6 +14,8 @@ DISTFILES += $(call admfiles,CSWlibxsltdevel,) DISTFILES += $(call admfiles,CSWpylibxslt,) +PATCHFILES = fix-segfault-in-debug.patch + PREREQUISITE_PKGS = CSWlibxml2 CSWlibxml2devel SPKG_DESC_CSWlibxslt = XSLT engine runtime package Modified: csw/mgar/pkg/libxslt/trunk/checksums =================================================================== --- csw/mgar/pkg/libxslt/trunk/checksums 2009-09-06 07:51:46 UTC (rev 6206) +++ csw/mgar/pkg/libxslt/trunk/checksums 2009-09-06 12:00:13 UTC (rev 6207) @@ -1,4 +1,5 @@ 01dba7c998bd516e5c6845d5babe3d21 download/CSWlibxslt.gspec 9d6a28c9ac7dea73ae95423e2f431fcd download/CSWlibxsltdevel.gspec 1fb5e9ee1b80283247e56231713082e0 download/CSWpylibxslt.gspec +967047de707d0f20d7fa3b0d0916fdd9 download/fix-segfault-in-debug.patch e83ec5d27fc4c10c6f612879bea9a153 download/libxslt-1.1.24.tar.gz Added: csw/mgar/pkg/libxslt/trunk/files/fix-segfault-in-debug.patch =================================================================== --- csw/mgar/pkg/libxslt/trunk/files/fix-segfault-in-debug.patch (rev 0) +++ csw/mgar/pkg/libxslt/trunk/files/fix-segfault-in-debug.patch 2009-09-06 12:00:13 UTC (rev 6207) @@ -0,0 +1,28 @@ +diff --speed-large-files --minimal -Nru libxslt-1.1.24.orig/libxslt/extensions.c libxslt-1.1.24/libxslt/extensions.c +--- libxslt-1.1.24.orig/libxslt/extensions.c 2008-05-13 17:36:26.000000000 +0200 ++++ libxslt-1.1.24/libxslt/extensions.c 2009-08-16 05:00:34.108691758 +0200 +@@ -366,16 +366,17 @@ + /* determine module directory */ + ext_directory = (xmlChar *) getenv("LIBXSLT_PLUGINS_PATH"); + ++ if (NULL == ext_directory) { ++ ext_directory = BAD_CAST LIBXSLT_DEFAULT_PLUGINS_PATH(); ++ if (NULL == ext_directory) ++ return (-1); ++ } + #ifdef WITH_XSLT_DEBUG_EXTENSIONS +- xsltGenericDebug(xsltGenericDebugContext, +- "LIBXSLT_PLUGINS_PATH is %s\n", ext_directory); ++ else ++ xsltGenericDebug(xsltGenericDebugContext, ++ "LIBXSLT_PLUGINS_PATH is %s\n", ext_directory); + #endif + +- if (NULL == ext_directory) +- ext_directory = BAD_CAST LIBXSLT_DEFAULT_PLUGINS_PATH(); +- if (NULL == ext_directory) +- return (-1); +- + /* build the module filename, and confirm the module exists */ + xmlStrPrintf((xmlChar *) module_filename, sizeof(module_filename), + BAD_CAST "%s/%s%s", 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 Sep 6 14:00:50 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 06 Sep 2009 12:00:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6208] csw/mgar/pkg/libxslt/trunk/Makefile Message-ID: Revision: 6208 http://gar.svn.sourceforge.net/gar/?rev=6208&view=rev Author: bdwalton Date: 2009-09-06 12:00:50 +0000 (Sun, 06 Sep 2009) Log Message: ----------- libxslt: enable libtool strip Modified Paths: -------------- csw/mgar/pkg/libxslt/trunk/Makefile Modified: csw/mgar/pkg/libxslt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxslt/trunk/Makefile 2009-09-06 12:00:13 UTC (rev 6207) +++ csw/mgar/pkg/libxslt/trunk/Makefile 2009-09-06 12:00:50 UTC (rev 6208) @@ -38,6 +38,7 @@ BUILD64 = 1 NO_ISAEXEC = 1 +STRIP_LIBTOOL = 1 REQUIRED_PKGS_CSWlibxslt = CSWgcrypt CSWgpgerr CSWiconv CSWlibxml2 CSWzlib REQUIRED_PKGS_CSWlibxsltdevel = CSWlibxslt 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 Sun Sep 6 15:39:10 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sun, 06 Sep 2009 13:39:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[6209] csw/mgar/pkg/spine/trunk Message-ID: Revision: 6209 http://gar.svn.sourceforge.net/gar/?rev=6209&view=rev Author: j_arndt Date: 2009-09-06 13:39:10 +0000 (Sun, 06 Sep 2009) Log Message: ----------- spine: added new default config path, patched configuration file Modified Paths: -------------- csw/mgar/pkg/spine/trunk/Makefile csw/mgar/pkg/spine/trunk/checksums csw/mgar/pkg/spine/trunk/files/CSWspine.postinstall csw/mgar/pkg/spine/trunk/files/CSWspine.prototype Added Paths: ----------- csw/mgar/pkg/spine/trunk/files/spine.conf.diff csw/mgar/pkg/spine/trunk/files/spine.h.diff csw/mgar/pkg/spine/trunk/files/util.c.diff Modified: csw/mgar/pkg/spine/trunk/Makefile =================================================================== --- csw/mgar/pkg/spine/trunk/Makefile 2009-09-06 12:00:50 UTC (rev 6208) +++ csw/mgar/pkg/spine/trunk/Makefile 2009-09-06 13:39:10 UTC (rev 6209) @@ -11,10 +11,13 @@ MASTER_SITES = http://www.cacti.net/downloads/spine/ #DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES = cacti-$(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += cswusergroup CSWspine.postinstall +DISTFILES += cswusergroup CSWspine.postinstall CSWspine.prototype DISTNAME = cacti-$(GARNAME)-$(GARVERSION) PATCHFILES += configure.diff +PATCHFILES += spine.h.diff +PATCHFILES += util.c.diff +PATCHFILES += spine.conf.diff NOISALIST = 1 @@ -39,9 +42,11 @@ SKIPTEST = 1 +EXTRA_LIB += /opt/csw/mysql5/lib/mysql + DOCDEST = $(DESTDIR)$(BUILD_PREFIX)/share/doc/spine BINDIR = $(DESTDIR)$(BUILD_PREFIX)/bin -CFGDIR = $(DESTDIR)$(BUILD_PREFIX)/etc +CFGDIR = $(DESTDIR)/etc$(BUILD_PREFIX) include gar/category.mk Modified: csw/mgar/pkg/spine/trunk/checksums =================================================================== --- csw/mgar/pkg/spine/trunk/checksums 2009-09-06 12:00:50 UTC (rev 6208) +++ csw/mgar/pkg/spine/trunk/checksums 2009-09-06 13:39:10 UTC (rev 6209) @@ -1,4 +1,8 @@ -54e3c3f6ca757815ac1cccf78b7a086c download/CSWspine.postinstall +6c312db77872d0ab0fa66b02774ce066 download/CSWspine.postinstall +75d4f19e408bbd07fc3205d76841b5e3 download/CSWspine.prototype 99e5bde07fc31d1ed8aa23c59de00417 download/cacti-spine-0.8.7e.tar.gz 2fbbedbfc20811cbc81ddf748ebdb58e download/configure.diff b762d50320246dc8ce21c20233479231 download/cswusergroup +e38aac4a5f8c7c3145d45c4d0dba141c download/spine.conf.diff +cc35553f4bcd9dc4ab961330484a959b download/spine.h.diff +5e66f551b2d320a3a6b68ce170e9fec7 download/util.c.diff Modified: csw/mgar/pkg/spine/trunk/files/CSWspine.postinstall =================================================================== --- csw/mgar/pkg/spine/trunk/files/CSWspine.postinstall 2009-09-06 12:00:50 UTC (rev 6208) +++ csw/mgar/pkg/spine/trunk/files/CSWspine.postinstall 2009-09-06 13:39:10 UTC (rev 6209) @@ -4,8 +4,12 @@ ======================================================================= -Please check and edit your configuration in /opt/csw/etc/spine.conf ! +To get spine running, follow these steps: +(1) Check and edit the configuration file /etc/opt/csw/spine.conf + +(2) Follow the instructions on http://www.cacti.net/spine_install.php + ======================================================================= EOF Modified: csw/mgar/pkg/spine/trunk/files/CSWspine.prototype =================================================================== --- csw/mgar/pkg/spine/trunk/files/CSWspine.prototype 2009-09-06 12:00:50 UTC (rev 6208) +++ csw/mgar/pkg/spine/trunk/files/CSWspine.prototype 2009-09-06 13:39:10 UTC (rev 6209) @@ -1,5 +1,5 @@ f none /opt/csw/bin/spine 0755 root bin -f cswpreserveconf /opt/csw/etc/spine.conf.CSW 0644 root bin +f cswpreserveconf /etc/opt/csw/spine.conf.CSW 0644 root bin d none /opt/csw/share/doc/spine 0755 root bin f none /opt/csw/share/doc/spine/COPYING 0644 root bin f none /opt/csw/share/doc/spine/ChangeLog 0644 root bin Added: csw/mgar/pkg/spine/trunk/files/spine.conf.diff =================================================================== --- csw/mgar/pkg/spine/trunk/files/spine.conf.diff (rev 0) +++ csw/mgar/pkg/spine/trunk/files/spine.conf.diff 2009-09-06 13:39:10 UTC (rev 6209) @@ -0,0 +1,29 @@ +diff --speed-large-files --minimal -Nru cacti-spine-0.8.7e.orig/spine.conf cacti-spine-0.8.7e/spine.conf +--- cacti-spine-0.8.7e.orig/spine.conf 2009-06-29 04:03:36.000000000 +0200 ++++ cacti-spine-0.8.7e/spine.conf 2009-09-06 15:11:25.880901586 +0200 +@@ -11,7 +11,7 @@ + # | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | + # | GNU General Public License for more details. | + # +-------------------------------------------------------------------------+ +-# | spine: a backend data gatherer for Cacti | ++# | spine: a backend data gatherer for Cacti | + # +-------------------------------------------------------------------------+ + # | This poller would not have been possible without: | + # | - Larry Adams (current development and enhancements) | +@@ -25,11 +25,11 @@ + # | IP Address for Windows | + # | DB_Database Database name, typically 'cacti' | + # | DB_Port The database port to use | +-# | DB_User The user to access the database, typically 'cactiuser' | ++# | DB_User The user to access the database, typically 'cacti' | + # | DB_Pass The password for the Cacti user | + # +-------------------------------------------------------------------------+ + DB_Host localhost + DB_Database cacti +-DB_User cactiuser +-DB_Pass cactiuser +-DB_Port 3306 +\ No newline at end of file ++DB_User cacti ++DB_Pass cacti ++DB_Port 3306 Added: csw/mgar/pkg/spine/trunk/files/spine.h.diff =================================================================== --- csw/mgar/pkg/spine/trunk/files/spine.h.diff (rev 0) +++ csw/mgar/pkg/spine/trunk/files/spine.h.diff 2009-09-06 13:39:10 UTC (rev 6209) @@ -0,0 +1,30 @@ +diff --speed-large-files --minimal -Nru cacti-spine-0.8.7e.orig/spine.h cacti-spine-0.8.7e/spine.h +--- cacti-spine-0.8.7e.orig/spine.h 2009-06-29 04:03:36.000000000 +0200 ++++ cacti-spine-0.8.7e/spine.h 2009-09-06 12:09:46.987245799 +0200 +@@ -135,21 +135,22 @@ + #define SPINE_FORK 0 + + /* locations to search for the config file */ +-#define CONFIG_PATHS 4 ++#define CONFIG_PATHS 5 + #define CONFIG_PATH_1 "" + #define CONFIG_PATH_2 "/etc/" + #define CONFIG_PATH_3 "/etc/cacti/" + #define CONFIG_PATH_4 "../etc/" ++#define CONFIG_PATH_5 "/etc/opt/csw/" + + /* config file defaults */ + #define DEFAULT_CONF_FILE "spine.conf" + #define DEFAULT_THREADS 5 + #define DEFAULT_DB_HOST "localhost" + #define DEFAULT_DB_DB "cacti" +-#define DEFAULT_DB_USER "cactiuser" +-#define DEFAULT_DB_PASS "cactiuser" ++#define DEFAULT_DB_USER "cacti" ++#define DEFAULT_DB_PASS "cacti" + #define DEFAULT_DB_PORT 3306 +-#define DEFAULT_LOGFILE "/var/www/html/cacti/log/cacti.log" ++#define DEFAULT_LOGFILE "/var/opt/csw/cacti/log/cacti.log" + #define DEFAULT_TIMEOUT 294000000 + + /* threads constants */ Added: csw/mgar/pkg/spine/trunk/files/util.c.diff =================================================================== --- csw/mgar/pkg/spine/trunk/files/util.c.diff (rev 0) +++ csw/mgar/pkg/spine/trunk/files/util.c.diff 2009-09-06 13:39:10 UTC (rev 6209) @@ -0,0 +1,11 @@ +diff --speed-large-files --minimal -Nru cacti-spine-0.8.7e.orig/util.c cacti-spine-0.8.7e/util.c +--- cacti-spine-0.8.7e.orig/util.c 2009-06-29 04:03:36.000000000 +0200 ++++ cacti-spine-0.8.7e/util.c 2009-09-06 12:30:28.429083179 +0200 +@@ -503,6 +503,7 @@ + STRNCOPY(config_paths[1], CONFIG_PATH_2); + STRNCOPY(config_paths[2], CONFIG_PATH_3); + STRNCOPY(config_paths[3], CONFIG_PATH_4); ++ STRNCOPY(config_paths[4], CONFIG_PATH_5); + + set.log_destination = LOGDEST_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 Sun Sep 6 20:31:31 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 06 Sep 2009 18:31:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[6210] csw/mgar/pkg/libxslt/trunk Message-ID: Revision: 6210 http://gar.svn.sourceforge.net/gar/?rev=6210&view=rev Author: bdwalton Date: 2009-09-06 18:31:31 +0000 (Sun, 06 Sep 2009) Log Message: ----------- libxslt: remove manual gspec files Modified Paths: -------------- csw/mgar/pkg/libxslt/trunk/Makefile csw/mgar/pkg/libxslt/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/libxslt/trunk/files/CSWlibxslt.gspec csw/mgar/pkg/libxslt/trunk/files/CSWlibxsltdevel.gspec csw/mgar/pkg/libxslt/trunk/files/CSWpylibxslt.gspec Modified: csw/mgar/pkg/libxslt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxslt/trunk/Makefile 2009-09-06 13:39:10 UTC (rev 6209) +++ csw/mgar/pkg/libxslt/trunk/Makefile 2009-09-06 18:31:31 UTC (rev 6210) @@ -10,10 +10,9 @@ MASTER_SITES = ftp://xmlsoft.org/libxslt/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWlibxslt,) -DISTFILES += $(call admfiles,CSWlibxsltdevel,) -DISTFILES += $(call admfiles,CSWpylibxslt,) +PACKAGES = CSWlibxslt CSWlibxsltdevel CSWpylibxslt + PATCHFILES = fix-segfault-in-debug.patch PREREQUISITE_PKGS = CSWlibxml2 CSWlibxml2devel Modified: csw/mgar/pkg/libxslt/trunk/checksums =================================================================== --- csw/mgar/pkg/libxslt/trunk/checksums 2009-09-06 13:39:10 UTC (rev 6209) +++ csw/mgar/pkg/libxslt/trunk/checksums 2009-09-06 18:31:31 UTC (rev 6210) @@ -1,5 +1,2 @@ -01dba7c998bd516e5c6845d5babe3d21 download/CSWlibxslt.gspec -9d6a28c9ac7dea73ae95423e2f431fcd download/CSWlibxsltdevel.gspec -1fb5e9ee1b80283247e56231713082e0 download/CSWpylibxslt.gspec 967047de707d0f20d7fa3b0d0916fdd9 download/fix-segfault-in-debug.patch e83ec5d27fc4c10c6f612879bea9a153 download/libxslt-1.1.24.tar.gz Deleted: csw/mgar/pkg/libxslt/trunk/files/CSWlibxslt.gspec =================================================================== --- csw/mgar/pkg/libxslt/trunk/files/CSWlibxslt.gspec 2009-09-06 13:39:10 UTC (rev 6209) +++ csw/mgar/pkg/libxslt/trunk/files/CSWlibxslt.gspec 2009-09-06 18:31:31 UTC (rev 6210) @@ -1,4 +0,0 @@ -%var bitname libxslt -%var pkgname CSWlibxslt -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Deleted: csw/mgar/pkg/libxslt/trunk/files/CSWlibxsltdevel.gspec =================================================================== --- csw/mgar/pkg/libxslt/trunk/files/CSWlibxsltdevel.gspec 2009-09-06 13:39:10 UTC (rev 6209) +++ csw/mgar/pkg/libxslt/trunk/files/CSWlibxsltdevel.gspec 2009-09-06 18:31:31 UTC (rev 6210) @@ -1,4 +0,0 @@ -%var bitname libxslt_devel -%var pkgname CSWlibxsltdevel -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Deleted: csw/mgar/pkg/libxslt/trunk/files/CSWpylibxslt.gspec =================================================================== --- csw/mgar/pkg/libxslt/trunk/files/CSWpylibxslt.gspec 2009-09-06 13:39:10 UTC (rev 6209) +++ csw/mgar/pkg/libxslt/trunk/files/CSWpylibxslt.gspec 2009-09-06 18:31:31 UTC (rev 6210) @@ -1,4 +0,0 @@ -%var bitname pylibxslt -%var pkgname CSWpylibxslt -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Sep 7 04:01:10 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 07 Sep 2009 02:01:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[6211] csw/mgar/pkg/libxslt/trunk/Makefile Message-ID: Revision: 6211 http://gar.svn.sourceforge.net/gar/?rev=6211&view=rev Author: bdwalton Date: 2009-09-07 02:01:10 +0000 (Mon, 07 Sep 2009) Log Message: ----------- libxslt: set catalog names according to new preferred conventions Modified Paths: -------------- csw/mgar/pkg/libxslt/trunk/Makefile Modified: csw/mgar/pkg/libxslt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxslt/trunk/Makefile 2009-09-06 18:31:31 UTC (rev 6210) +++ csw/mgar/pkg/libxslt/trunk/Makefile 2009-09-07 02:01:10 UTC (rev 6211) @@ -13,6 +13,9 @@ PACKAGES = CSWlibxslt CSWlibxsltdevel CSWpylibxslt +CATALOGNAME_CSWlibxsltdevel = libxslt_devel +CATALOGNAME_CSWpylibxslt = py_libxslt + PATCHFILES = fix-segfault-in-debug.patch PREREQUISITE_PKGS = CSWlibxml2 CSWlibxml2devel This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Sep 7 04:02:27 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 07 Sep 2009 02:02:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[6212] csw/mgar/pkg/libxslt/trunk/Makefile Message-ID: Revision: 6212 http://gar.svn.sourceforge.net/gar/?rev=6212&view=rev Author: bdwalton Date: 2009-09-07 02:02:26 +0000 (Mon, 07 Sep 2009) Log Message: ----------- libxslt: correct typo in memory model configure flags Modified Paths: -------------- csw/mgar/pkg/libxslt/trunk/Makefile Modified: csw/mgar/pkg/libxslt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxslt/trunk/Makefile 2009-09-07 02:01:10 UTC (rev 6211) +++ csw/mgar/pkg/libxslt/trunk/Makefile 2009-09-07 02:02:26 UTC (rev 6212) @@ -34,7 +34,7 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = -CONFIGURE_AGGS_32 = +CONFIGURE_ARGS_32 = CONFIGURE_ARGS_64 = --without-python CONFIGURE_ARGS = $(DIRPATHS) $(CONFIGURE_ARGS_$(MEMORYMODEL)) 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 Sep 7 10:14:03 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 07 Sep 2009 08:14:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[6213] csw/mgar/pkg/tightvnc/trunk Message-ID: Revision: 6213 http://gar.svn.sourceforge.net/gar/?rev=6213&view=rev Author: wahwah Date: 2009-09-07 08:14:03 +0000 (Mon, 07 Sep 2009) Log Message: ----------- tightvnc: Jumped over one more hoop. Modified Paths: -------------- csw/mgar/pkg/tightvnc/trunk/Makefile csw/mgar/pkg/tightvnc/trunk/checksums Added Paths: ----------- csw/mgar/pkg/tightvnc/trunk/files/0001-Sun-compiler-in-sun.cf.patch csw/mgar/pkg/tightvnc/trunk/files/0002-pass-f-xmakefile-flag-when-appropriate.patch 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-09-07 02:02:26 UTC (rev 6212) +++ csw/mgar/pkg/tightvnc/trunk/Makefile 2009-09-07 08:14:03 UTC (rev 6213) @@ -38,15 +38,19 @@ EXTRA_LDFLAGS = /opt/csw/lib LOCAL_LDFLAGS = $(LINKER_FLAGS) BUILD_OVERRIDE_DIRS = EXTRA_DEFINES EXTRA_INCLUDE LOCAL_LDFLAGS -CONFIGURE_SCRIPTS = $(WORKSRC)/Imakefile Xvnc +CONFIGURE_SCRIPTS = $(WORKSRC)/Imakefile +# Xvnc CONFIGURE_ARGS = -a BUILD_SCRIPTS = vnc Xvnc -SKIPTEST = 1 +TEST_SCRIPTS = INSTALL_SCRIPTS = vnc -PATCHFILES = 0001-GNU-make-by-default.patch # This patch has been sent upstream with a bug report. # http://sourceforge.net/tracker/?func=detail&aid=2852808&group_id=14067&atid=114067 -PATCHFILES += 0002-Test-for-Makefile-presence.patch +# PATCHFILES += 0002-Test-for-Makefile-presence.patch +# +PATCHFILES = 0001-Sun-compiler-in-sun.cf.patch +PATCHFILES += 0002-pass-f-xmakefile-flag-when-appropriate.patch +PATCHFILES += 0003-GNU-make-by-default.patch include gar/category.mk @@ -57,28 +61,25 @@ configure-Xvnc: banner "Config Xvnc" perl -pi -e "s|^(\s*make)\s*$$|\1 CC=$(CC)|" $(WORKSRC)/Xvnc/configure - cd $(WORKSRC)/Xvnc && ./configure + (cd $(WORKSRC)/Xvnc && $(BUILD_ENV) ./configure) @$(MAKECOOKIE) build-vnc: banner "Build VNC" cd $(WORKSRC) && $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") World + # $(MAKE) -C $(WORKSRC) $(BUILD_ENV) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") World @$(MAKECOOKIE) build-Xvnc: configure-Xvnc + # $(MAKE) -C $(WORKSRC) $(BUILD_ENV) EXTRA_LIBRARIES="-lwrap" EXTRA_DEFINES="-DUSE_LIBWRAP=1" World + # banner "Config Xvnc" + # (cd $(WORKSRC)/Xvnc && $(BUILD_ENV) ./configure) banner "Build Xvnc" - # $(MAKE) -C $(WORKSRC)/Xvnc $(BUILD_ENV) EXTRA_LIBRARIES="-lwrap" EXTRA_DEFINES="-DUSE_LIBWRAP=1" World - $(MAKE) -C $(WORKSRC) $(BUILD_ENV) EXTRA_LIBRARIES="-lwrap" EXTRA_DEFINES="-DUSE_LIBWRAP=1" World $(MAKE) -C $(WORKSRC)/Xvnc $(BUILD_ENV) EXTRA_LIBRARIES="-lwrap -lsocket" EXTRA_DEFINES="-DUSE_LIBWRAP=1" EXTRA_LDOPTIONS="-L/opt/csw/lib -L/usr/lib" World + # cd $(WORKSRC) && $(MAKE) $(BUILD_ENV) EXTRA_LIBRARIES="-lwrap" EXTRA_DEFINES="-DUSE_LIBWRAP=1" World + # cd $(WORKSRC)/Xvnc && $(MAKE) $(BUILD_ENV) EXTRA_LIBRARIES="-lwrap -lsocket" EXTRA_DEFINES="-DUSE_LIBWRAP=1" EXTRA_LDOPTIONS="-L/opt/csw/lib -L/usr/lib" World @$(MAKECOOKIE) -#xmkmf -a -#make CDEBUGFLAGS="$RPM_OPT_FLAGS" World -#cd Xvnc -#./configure -#make EXTRA_LIBRARIES="-lwrap -lnss_nis" CDEBUGFLAGS="$RPM_OPT_FLAGS" \ -# EXTRA_DEFINES="-DUSE_LIBWRAP=1" - install-vnc: ginstall -d $(DESTDIR)$(bindir) ginstall -d $(DESTDIR)$(mandir)/man1 Modified: csw/mgar/pkg/tightvnc/trunk/checksums =================================================================== --- csw/mgar/pkg/tightvnc/trunk/checksums 2009-09-07 02:02:26 UTC (rev 6212) +++ csw/mgar/pkg/tightvnc/trunk/checksums 2009-09-07 08:14:03 UTC (rev 6213) @@ -1,4 +1,5 @@ -c041ccc52996cf7e085e8f3a51747aea download/0001-GNU-make-by-default.patch -88d1dfca0c88c191f54f5aa5c6aab460 download/0002-Test-for-Makefile-presence.patch +76166d097bf2e70627cb6c87d312bca5 download/0001-Sun-compiler-in-sun.cf.patch +51441e1d47891f910f0929cd65a487a7 download/0002-pass-f-xmakefile-flag-when-appropriate.patch +1264014c1ce47a119a724f17a6e0a768 download/0003-GNU-make-by-default.patch 397b35faad32d5246b6d44b142f8304f download/tightvnc-1.3.10_unixsrc.tar.bz2 56c09be17c17184e96193c13246fd649 download/vncservers Added: csw/mgar/pkg/tightvnc/trunk/files/0001-Sun-compiler-in-sun.cf.patch =================================================================== --- csw/mgar/pkg/tightvnc/trunk/files/0001-Sun-compiler-in-sun.cf.patch (rev 0) +++ csw/mgar/pkg/tightvnc/trunk/files/0001-Sun-compiler-in-sun.cf.patch 2009-09-07 08:14:03 UTC (rev 6213) @@ -0,0 +1,41 @@ +From dce24615e4e31aadf4a50bd07a502b9f9a8104b8 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Mon, 7 Sep 2009 10:08:09 +0200 +Subject: [PATCH 1/3] Sun compiler in sun.cf + +--- + Xvnc/config/cf/sun.cf | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Xvnc/config/cf/sun.cf b/Xvnc/config/cf/sun.cf +index 01d76dc..622c73a 100644 +--- a/Xvnc/config/cf/sun.cf ++++ b/Xvnc/config/cf/sun.cf +@@ -146,19 +146,19 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe + #if OSMajorVersion > 4 + #if HasSunC + /* +- * Assume /opt/SUNWspro/bin/ contains symlinks to the appropriate tools ++ * Assume /opt/studio/SOS11/SUNWspro/bin/ contains symlinks to the appropriate tools + */ + #ifndef CcCmd +-# define CcCmd /opt/SUNWspro/bin/cc ++# define CcCmd /opt/studio/SOS11/SUNWspro/bin/cc + #endif + #ifndef CplusplusCmd +-# define CplusplusCmd /opt/SUNWspro/bin/CC ++# define CplusplusCmd /opt/studio/SOS11/SUNWspro/bin/CC + #endif + #ifndef CplusplusFilt +-# define CplusplusFilt /opt/SUNWspro/bin/c++filt ++# define CplusplusFilt /opt/studio/SOS11/SUNWspro/bin/c++filt + #endif + #ifndef CplusplusDependIncludes +-# define CplusplusDependIncludes -I/opt/SUNWspro/SC3.0/include/CC ++# define CplusplusDependIncludes -I/opt/studio/SOS11/SUNWspro/SC3.0/include/CC + #endif + #endif + +-- +1.6.3.2 + Added: csw/mgar/pkg/tightvnc/trunk/files/0002-pass-f-xmakefile-flag-when-appropriate.patch =================================================================== --- csw/mgar/pkg/tightvnc/trunk/files/0002-pass-f-xmakefile-flag-when-appropriate.patch (rev 0) +++ csw/mgar/pkg/tightvnc/trunk/files/0002-pass-f-xmakefile-flag-when-appropriate.patch 2009-09-07 08:14:03 UTC (rev 6213) @@ -0,0 +1,50 @@ +From 796212b91212ad84a516554ba5bb6250d8fd1c87 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Mon, 7 Sep 2009 10:08:34 +0200 +Subject: [PATCH 2/3] pass -f xmakefile flag when appropriate + +--- + Xvnc/config/cf/Imake.rules | 13 ++++++++++--- + 1 files changed, 10 insertions(+), 3 deletions(-) + +diff --git a/Xvnc/config/cf/Imake.rules b/Xvnc/config/cf/Imake.rules +index 5ab9a18..353dabf 100644 +--- a/Xvnc/config/cf/Imake.rules ++++ b/Xvnc/config/cf/Imake.rules +@@ -2469,7 +2469,7 @@ $(ONESUBDIR)/Makefile: @@\ + fi; @@\ + @@\ + target:: @@\ +- - at MakeFlagsToShellFlags(ik,set +e); \ @@\ ++ MakeFlagsToShellFlags(ik,set +e); \ @@\ + MakeFlagsToShellFlags(n,executeit="no"); \ @@\ + for i in dirs ;\ @@\ + do \ @@\ +@@ -2477,7 +2477,7 @@ target:: @@\ + .) curdir= ;; \ @@\ + *) curdir=$(CURRENT_DIR)/ ;; \ @@\ + esac; \ @@\ +- echo "making Makefiles in $$curdir$$i..."; \ @@\ ++ echo "making Makefiles in '$$curdir'::'$$i'..."; \ @@\ + itmp=`echo $$i | sed -e 's;^\./;;g' -e 's;/\./;/;g'`; \ @@\ + curtmp="$(CURRENT_DIR)" \ @@\ + toptmp=""; \ @@\ +@@ -2514,7 +2514,14 @@ target:: @@\ + $(MV) $$i/Makefile $$i/Makefile.bak; \ @@\ + fi; \ @@\ + fi; \ @@\ +- $(MAKE) $(MFLAGS) $(MAKE_OPTS) ONESUBDIR=$$i ONECURDIR=$$curdir IMAKETOP=$$imaketop IMAKEPREFIX=$$imakeprefix $$i/Makefile; \ @@\ ++ [ -r xmakefile ] && $(MAKE) -f xmakefile $(MFLAGS) \ @@\ ++ $(MAKE_OPTS) ONESUBDIR=$$i ONECURDIR=$$curdir \ @@\ ++ IMAKETOP=$$imaketop IMAKEPREFIX=$$imakeprefix \ @@\ ++ $$i/Makefile || \ @@\ ++ $(MAKE) $(MFLAGS) \ @@\ ++ $(MAKE_OPTS) ONESUBDIR=$$i ONECURDIR=$$curdir \ @@\ ++ IMAKETOP=$$imaketop IMAKEPREFIX=$$imakeprefix \ @@\ ++ $$i/Makefile; \ @@\ + if [ -d $$i ] ; then \ @@\ + cd $$i; \ @@\ + $(MAKE) $(MFLAGS) Makefiles; \ @@\ +-- +1.6.3.2 + Added: csw/mgar/pkg/tightvnc/trunk/files/0003-GNU-make-by-default.patch =================================================================== --- csw/mgar/pkg/tightvnc/trunk/files/0003-GNU-make-by-default.patch (rev 0) +++ csw/mgar/pkg/tightvnc/trunk/files/0003-GNU-make-by-default.patch 2009-09-07 08:14:03 UTC (rev 6213) @@ -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 + 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 Sep 7 10:22:41 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 07 Sep 2009 08:22:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[6214] csw/mgar/pkg/tightvnc/trunk/files Message-ID: Revision: 6214 http://gar.svn.sourceforge.net/gar/?rev=6214&view=rev Author: wahwah Date: 2009-09-07 08:22:41 +0000 (Mon, 07 Sep 2009) Log Message: ----------- tightvnc: Removed old patches Removed Paths: ------------- csw/mgar/pkg/tightvnc/trunk/files/0001-GNU-make-by-default.patch csw/mgar/pkg/tightvnc/trunk/files/0002-Test-for-Makefile-presence.patch Deleted: csw/mgar/pkg/tightvnc/trunk/files/0001-GNU-make-by-default.patch =================================================================== --- csw/mgar/pkg/tightvnc/trunk/files/0001-GNU-make-by-default.patch 2009-09-07 08:14:03 UTC (rev 6213) +++ csw/mgar/pkg/tightvnc/trunk/files/0001-GNU-make-by-default.patch 2009-09-07 08:22:41 UTC (rev 6214) @@ -1,25 +0,0 @@ -From f12b77cb177de6014ac23913c385c7f4ab9717e3 Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Sat, 5 Sep 2009 22:52:49 +0200 -Subject: [PATCH 1/2] 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/0002-Test-for-Makefile-presence.patch =================================================================== --- csw/mgar/pkg/tightvnc/trunk/files/0002-Test-for-Makefile-presence.patch 2009-09-07 08:14:03 UTC (rev 6213) +++ csw/mgar/pkg/tightvnc/trunk/files/0002-Test-for-Makefile-presence.patch 2009-09-07 08:22:41 UTC (rev 6214) @@ -1,27 +0,0 @@ -From 1045270d1e76278f5c613eb74e2a8f347632dc73 Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Sun, 6 Sep 2009 00:16:10 +0200 -Subject: [PATCH 2/2] Test for Makefile presence - ---- - Xvnc/config/cf/Imake.rules | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Xvnc/config/cf/Imake.rules b/Xvnc/config/cf/Imake.rules -index 5ab9a18..6f5f7c4 100644 ---- a/Xvnc/config/cf/Imake.rules -+++ b/Xvnc/config/cf/Imake.rules -@@ -1304,8 +1304,8 @@ InstallNamedTargetNoClobber(install,srcname,$(INSTBINFLAGS),dest,dstname) - */ - #ifndef MakeNamedTargetSubdir - #define MakeNamedTargetSubdir(dir,flags,subname)\ -- (cd dir && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) \ @@\ -- flags subname) -+ (cd dir && [ -r Makefile ] && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) \ @@\ -+ flags subname || true) - #endif - - /* --- -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 Mon Sep 7 11:04:57 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 07 Sep 2009 09:04:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[6215] csw/mgar/pkg/tightvnc/branches/tightvnc-1.5/ Message-ID: Revision: 6215 http://gar.svn.sourceforge.net/gar/?rev=6215&view=rev Author: wahwah Date: 2009-09-07 09:04:57 +0000 (Mon, 07 Sep 2009) Log Message: ----------- Branching out to try version 1.5a0. Added Paths: ----------- csw/mgar/pkg/tightvnc/branches/tightvnc-1.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 Mon Sep 7 13:16:15 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 07 Sep 2009 11:16:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[6216] csw/mgar/pkg/diffstat/trunk Message-ID: Revision: 6216 http://gar.svn.sourceforge.net/gar/?rev=6216&view=rev Author: dmichelsen Date: 2009-09-07 11:16:14 +0000 (Mon, 07 Sep 2009) Log Message: ----------- diffstat: Update to 1.49 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-09-07 09:04:57 UTC (rev 6215) +++ csw/mgar/pkg/diffstat/trunk/Makefile 2009-09-07 11:16:14 UTC (rev 6216) @@ -1,5 +1,5 @@ GARNAME = diffstat -GARVERSION = 1.48 +GARVERSION = 1.49 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-09-07 09:04:57 UTC (rev 6215) +++ csw/mgar/pkg/diffstat/trunk/checksums 2009-09-07 11:16:14 UTC (rev 6216) @@ -1 +1 @@ -8593e79189dd4b9c4ec32862e19d716c download/diffstat.tar.gz +63fa6d90f137f5d839e94aa93882db98 download/diffstat.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 Sep 7 14:13:53 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 07 Sep 2009 12:13:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[6217] csw/mgar/pkg/ctags/trunk Message-ID: Revision: 6217 http://gar.svn.sourceforge.net/gar/?rev=6217&view=rev Author: dmichelsen Date: 2009-09-07 12:13:52 +0000 (Mon, 07 Sep 2009) Log Message: ----------- ctags: Update to 5.8, naming of binaries still unclear Modified Paths: -------------- csw/mgar/pkg/ctags/trunk/Makefile csw/mgar/pkg/ctags/trunk/checksums csw/mgar/pkg/ctags/trunk/files/install.diff Removed Paths: ------------- csw/mgar/pkg/ctags/trunk/files/CSWctags.gspec csw/mgar/pkg/ctags/trunk/files/CSWctags.prototype Property Changed: ---------------- csw/mgar/pkg/ctags/trunk/ Property changes on: csw/mgar/pkg/ctags/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/ctags/trunk/Makefile =================================================================== --- csw/mgar/pkg/ctags/trunk/Makefile 2009-09-07 11:16:14 UTC (rev 6216) +++ csw/mgar/pkg/ctags/trunk/Makefile 2009-09-07 12:13:52 UTC (rev 6217) @@ -1,8 +1,8 @@ GARNAME = ctags -GARVERSION = 5.5.4 +GARVERSION = 5.8 CATEGORIES = utils -DESCRIPTION = Exuberant ctags +DESCRIPTION = Exuberant Ctags: A multilanguage implementation of Ctags define BLURB Ctags generates an index (or tag) file of language objects found in source files that allows these items to be quickly and easily located by a text @@ -11,18 +11,20 @@ object). endef -MASTER_SITES = $(SF_MIRROR)/$(GARNAME)/ +MASTER_SITES = $(SF_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += CSWctags.gspec CSWctags.prototype +# Respect DESTDIR +PATCHFILES = install.diff + +PACKAGES = CSWectags +CATALOGNAME = ectags + # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=6556 UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) -# Respect DESTDIR -PATCHFILES += install.diff - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-custom-config=$(sysconfdir)/ctags.conf Modified: csw/mgar/pkg/ctags/trunk/checksums =================================================================== --- csw/mgar/pkg/ctags/trunk/checksums 2009-09-07 11:16:14 UTC (rev 6216) +++ csw/mgar/pkg/ctags/trunk/checksums 2009-09-07 12:13:52 UTC (rev 6217) @@ -1,4 +1,2 @@ -a84124caadd4103270e0b84596ecfe83 download/ctags-5.5.4.tar.gz -9fdddaa1280d5f51201f392969060db5 download/CSWctags.gspec -0680c5e068a114f9559da00bf167ee51 download/CSWctags.prototype -ffee120c44f24a8b4492d1aa296c0854 download/install.diff +c00f82ecdcc357434731913e5b48630d download/ctags-5.8.tar.gz +31a698b2e9d2379302183fe03be9eadd download/install.diff Deleted: csw/mgar/pkg/ctags/trunk/files/CSWctags.gspec =================================================================== --- csw/mgar/pkg/ctags/trunk/files/CSWctags.gspec 2009-09-07 11:16:14 UTC (rev 6216) +++ csw/mgar/pkg/ctags/trunk/files/CSWctags.gspec 2009-09-07 12:13:52 UTC (rev 6217) @@ -1,4 +0,0 @@ -%var bitname ctags -%var pkgname CSWctags -%include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/ctags/trunk/files/CSWctags.prototype =================================================================== --- csw/mgar/pkg/ctags/trunk/files/CSWctags.prototype 2009-09-07 11:16:14 UTC (rev 6216) +++ csw/mgar/pkg/ctags/trunk/files/CSWctags.prototype 2009-09-07 12:13:52 UTC (rev 6217) @@ -1,8 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/ctags 0755 root bin -s none /opt/csw/bin/etags=ctags -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/ctags.1 0644 root bin -s none /opt/csw/share/man/man1/etags.1=ctags.1 Modified: csw/mgar/pkg/ctags/trunk/files/install.diff =================================================================== --- csw/mgar/pkg/ctags/trunk/files/install.diff 2009-09-07 11:16:14 UTC (rev 6216) +++ csw/mgar/pkg/ctags/trunk/files/install.diff 2009-09-07 12:13:52 UTC (rev 6217) @@ -1,21 +1,22 @@ -diff --speed-large-files --minimal -Nru ctags-5.5.4.orig/Makefile.in ctags-5.5.4/Makefile.in ---- ctags-5.5.4.orig/Makefile.in 2005-01-27 11:22:14.851370000 -0500 -+++ ctags-5.5.4/Makefile.in 2005-01-27 11:19:56.676032000 -0500 -@@ -16,13 +16,13 @@ +diff -Naur ctags-5.8.orig/Makefile.in ctags-5.8.patched/Makefile.in +--- ctags-5.8.orig/Makefile.in 2009-07-04 07:29:28.000000000 +0200 ++++ ctags-5.8.patched/Makefile.in 2009-09-07 14:02:27.768451180 +0200 +@@ -16,14 +16,14 @@ # GNU Autoconf variables. These are set by the "configure" script when it # runs. # -exec_prefix = @exec_prefix@ +-datarootdir = @datarootdir@ -prefix = @prefix@ -bindir = @bindir@ --srcdir = @srcdir@ ++exec_prefix = $(DESTDIR)@exec_prefix@ ++datarootdir = $(DESTDIR)@datarootdir@ ++prefix = $(DESTDIR)@prefix@ ++bindir = $(DESTDIR)@bindir@ + srcdir = @srcdir@ -libdir = @libdir@ -incdir = @includedir@ -mandir = @mandir@ -+exec_prefix = $(DESTDIR)@exec_prefix@ -+prefix = $(DESTDIR)@prefix@ -+bindir = $(DESTDIR)@bindir@ -+srcdir = @srcdir@ +libdir = $(DESTDIR)@libdir@ +incdir = $(DESTDIR)@includedir@ +mandir = $(DESTDIR)@mandir@ 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 Sep 7 14:51:20 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 07 Sep 2009 12:51:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[6218] csw/mgar/pkg/diffstat/trunk Message-ID: Revision: 6218 http://gar.svn.sourceforge.net/gar/?rev=6218&view=rev Author: dmichelsen Date: 2009-09-07 12:51:20 +0000 (Mon, 07 Sep 2009) Log Message: ----------- diffstat: Update to use versioned upstream archives 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-09-07 12:13:52 UTC (rev 6217) +++ csw/mgar/pkg/diffstat/trunk/Makefile 2009-09-07 12:51:20 UTC (rev 6218) @@ -7,10 +7,10 @@ endef MASTER_SITES = ftp://invisible-island.net/diffstat/ -DISTFILES = $(GARNAME).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION).tgz # We define upstream file regex so we can be notifed of new upstream software release -#UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz SPKG_SOURCEURL = http://invisible-island.net/diffstat/ Modified: csw/mgar/pkg/diffstat/trunk/checksums =================================================================== --- csw/mgar/pkg/diffstat/trunk/checksums 2009-09-07 12:13:52 UTC (rev 6217) +++ csw/mgar/pkg/diffstat/trunk/checksums 2009-09-07 12:51:20 UTC (rev 6218) @@ -1 +1 @@ -63fa6d90f137f5d839e94aa93882db98 download/diffstat.tar.gz +63fa6d90f137f5d839e94aa93882db98 download/diffstat-1.49.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 Mon Sep 7 16:14:35 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 07 Sep 2009 14:14:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[6219] csw/mgar/gar/v2/bin/mkpackage Message-ID: Revision: 6219 http://gar.svn.sourceforge.net/gar/?rev=6219&view=rev Author: dmichelsen Date: 2009-09-07 14:14:35 +0000 (Mon, 07 Sep 2009) Log Message: ----------- mGAR v2: Use OpenCSW perl instead of just finding one as the shipped one is too old Modified Paths: -------------- csw/mgar/gar/v2/bin/mkpackage Modified: csw/mgar/gar/v2/bin/mkpackage =================================================================== --- csw/mgar/gar/v2/bin/mkpackage 2009-09-07 12:51:20 UTC (rev 6218) +++ csw/mgar/gar/v2/bin/mkpackage 2009-09-07 14:14:35 UTC (rev 6219) @@ -1,4 +1,4 @@ -#!/bin/env perl -w +#!/opt/csw/bin/perl -w # # $Id$ # 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 Sep 7 16:34:38 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 07 Sep 2009 14:34:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6220] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 6220 http://gar.svn.sourceforge.net/gar/?rev=6220&view=rev Author: dmichelsen Date: 2009-09-07 14:34:37 +0000 (Mon, 07 Sep 2009) Log Message: ----------- mGAR v2: Print names and pathes to built packages. This fixes #7 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-09-07 14:14:35 UTC (rev 6219) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-09-07 14:34:37 UTC (rev 6220) @@ -561,7 +561,12 @@ # unpacked to global/ for packaging. E. g. 'merge' depends only on the specific # modulations and does not fill global/. package: extract merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package - $(DONADA) + @echo + @echo "The following packages have been built:" + @echo + @$(foreach SPEC,$(_PKG_SPECS),echo $(SPEC);echo " $(SPKG_EXPORT)/$(shell $(call _PKG_ENV,$(SPEC)) $(GARBIN)/mkpackage -qs $(WORKDIR)/$(SPEC).gspec -D pkgfile).gz";) + @echo + @$(DONADA) # The dynamic pkginfo is only generated for dynamic gspec-files package-%: $(WORKDIR)/%.gspec $(if $(findstring %.gspec,$(DISTFILES)),,$(WORKDIR)/%.pkginfo) $(WORKDIR)/%.prototype-$(GARCH) $(WORKDIR)/%.depend 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 Sep 8 00:07:18 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 07 Sep 2009 22:07:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[6221] csw/mgar/pkg/cups/branches Message-ID: Revision: 6221 http://gar.svn.sourceforge.net/gar/?rev=6221&view=rev Author: wahwah Date: 2009-09-07 22:07:18 +0000 (Mon, 07 Sep 2009) Log Message: ----------- cups: branch renamed to cups-1.3 Added Paths: ----------- csw/mgar/pkg/cups/branches/cups-1.3/ Removed Paths: ------------- csw/mgar/pkg/cups/branches/cups-with-classutils/ 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 Sep 8 02:15:11 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 08 Sep 2009 00:15:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[6222] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 6222 http://gar.svn.sourceforge.net/gar/?rev=6222&view=rev Author: bdwalton Date: 2009-09-08 00:15:11 +0000 (Tue, 08 Sep 2009) Log Message: ----------- git: version bump to 1.6.4.2 Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-09-07 22:07:18 UTC (rev 6221) +++ csw/mgar/pkg/git/trunk/Makefile 2009-09-08 00:15:11 UTC (rev 6222) @@ -1,5 +1,5 @@ GARNAME = git -GARVERSION = 1.6.4 +GARVERSION = 1.6.4.2 #xPATCHLEVEL = rc3 CATEGORIES = devel 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 Sep 8 08:50:46 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 08 Sep 2009 06:50:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6223] csw/mgar/pkg/ctags/trunk Message-ID: Revision: 6223 http://gar.svn.sourceforge.net/gar/?rev=6223&view=rev Author: dmichelsen Date: 2009-09-08 06:50:46 +0000 (Tue, 08 Sep 2009) Log Message: ----------- ctags: Add rationale and renaming of binary to ectags Modified Paths: -------------- csw/mgar/pkg/ctags/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/ctags/trunk/files/README Modified: csw/mgar/pkg/ctags/trunk/Makefile =================================================================== --- csw/mgar/pkg/ctags/trunk/Makefile 2009-09-08 00:15:11 UTC (rev 6222) +++ csw/mgar/pkg/ctags/trunk/Makefile 2009-09-08 06:50:46 UTC (rev 6223) @@ -31,4 +31,6 @@ # No test suite TEST_SCRIPTS = +EXTRA_PAX_ARGS = -s ",/ctags,/ectags,p" + include gar/category.mk Added: csw/mgar/pkg/ctags/trunk/files/README =================================================================== --- csw/mgar/pkg/ctags/trunk/files/README (rev 0) +++ csw/mgar/pkg/ctags/trunk/files/README 2009-09-08 06:50:46 UTC (rev 6223) @@ -0,0 +1,70 @@ + Von: car at crank.org.uk + Betreff: Re: ctags + Datum: 14. April 2007 22:52:11 MESZ + An: enh at jessies.org + + +On 15/04/2007, at 7:37 AM, Elliott Hughes wrote: +/etc/alternatives, overwriting/uninstalling the system ctags, or arranging for the new "ctags" to be higher on the path seem to be the most common solutions. + +Yeah, unfortunately none of those is open to me. I'm not allowed to remove or declare and incompatibility with the existing package, and I'm not allowed to clash. My two options are to rename my executable or stick it somewhere other than /opt/csw/bin. + +i've seen it called ectags before where it would otherwise be ambiguous, but not xctags. + +That's good enough for me. I can't even call it gtags/gctags because the other one's GNU. Which came first. + +etags is Emacs' crippled ctags variant. + +Exuberant ctags comes with a symbolic link, on request, to cripple it so. I'm not tempted to to prefix that, too, and call the pair ectags and eetags -- I'll have to alter the code, which I don't like doing. + +Yuck, Emacs. + +Evergreen currently relies on it being the first "ctags" on the path. + +Yes. Unfortunately we'll have to rely on the symbolic link trick to achieve that end. + +-- +Chris Reece +http://www.crank.org.uk/ + + + + Von: car at crank.org.uk + Betreff: /newpkgs ectags + Datum: 26. April 2007 00:16:52 MESZ + An: phil at bolthole.com + +Phil, + +I'll get back to you on the matter of autoenabling and bandwidthd, just a +wee bit busy at the moment, I'm sure you're even more so. + +I do have another package, though, in newpkgs: + +/export/medusa/newpkgs/ectags-5.6,REV=2007.04.25-SunOS5.8-i386-CSW.pkg.gz +/export/medusa/newpkgs/ectags-5.6,REV=2007.04.25-SunOS5.8-sparc-CSW.pkg.gz + +Unfortunately, by default it clashes with the GNU Ctags binary "ctags" +(why these people can't find a new name when they fork, I don't know) +which is bundled with CSWemacs. I am assured, however, that this is the +default ctags on many Linuxes, it certainly seems fairly popular, and it +has tag support for a wider range of languages. There's precedent for +renaming it "ectags" or "exuberant-ctags" where it co-exists with GNU +ctags. The former seems most popular, so that's what I've gone with. + +It's compiled to read configuration from /opt/csw/etc/ectags.conf, and I +*would* include a dummy config file listing the sensible defaults except +that there's no way to comment the config file without causing ectags to +spout a warning every time it's executed I'm reliably informed that +no-one uses the configuration file, and it certainly smells of an +abandoned, half implemented feature. So, instead of a config file, a +message at install-time, that seems the best we can do. + +Cheers, + +Chris. + + + + + 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 Sep 8 09:00:36 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 08 Sep 2009 07:00:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[6224] csw/mgar/pkg Message-ID: Revision: 6224 http://gar.svn.sourceforge.net/gar/?rev=6224&view=rev Author: dmichelsen Date: 2009-09-08 07:00:36 +0000 (Tue, 08 Sep 2009) Log Message: ----------- ectags: Rename in GAR from ctags to ectags Added Paths: ----------- csw/mgar/pkg/ectags/ csw/mgar/pkg/ectags/trunk/ csw/mgar/pkg/ectags/trunk/Makefile csw/mgar/pkg/ectags/trunk/files/ csw/mgar/pkg/ectags/trunk/files/README csw/mgar/pkg/ectags/trunk/files/install.diff Removed Paths: ------------- csw/mgar/pkg/ctags/ csw/mgar/pkg/ectags/trunk/ csw/mgar/pkg/ectags/trunk/Makefile csw/mgar/pkg/ectags/trunk/files/ csw/mgar/pkg/ectags/trunk/files/CSWctags.gspec csw/mgar/pkg/ectags/trunk/files/CSWctags.prototype csw/mgar/pkg/ectags/trunk/files/install.diff Deleted: csw/mgar/pkg/ectags/trunk/Makefile =================================================================== --- csw/mgar/pkg/ctags/trunk/Makefile 2009-09-07 12:13:52 UTC (rev 6217) +++ csw/mgar/pkg/ectags/trunk/Makefile 2009-09-08 07:00:36 UTC (rev 6224) @@ -1,34 +0,0 @@ -GARNAME = ctags -GARVERSION = 5.8 -CATEGORIES = utils - -DESCRIPTION = Exuberant Ctags: A multilanguage implementation of Ctags -define BLURB - Ctags generates an index (or tag) file of language objects found in source - files that allows these items to be quickly and easily located by a text - editor or other utility. A tag signifies a language object for which an index - entry is available (or, alternatively, the index entry created for that - object). -endef - -MASTER_SITES = $(SF_MIRROR) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz - -# Respect DESTDIR -PATCHFILES = install.diff - -PACKAGES = CSWectags -CATALOGNAME = ectags - -# We define upstream file regex so we can be notifed of new upstream software release -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=6556 -UPSTREAM_USE_SF = 1 -UFILES_REGEX = (\d+(?:\.\d+)*) - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --enable-custom-config=$(sysconfdir)/ctags.conf - -# No test suite -TEST_SCRIPTS = - -include gar/category.mk Copied: csw/mgar/pkg/ectags/trunk/Makefile (from rev 6223, csw/mgar/pkg/ctags/trunk/Makefile) =================================================================== --- csw/mgar/pkg/ectags/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ectags/trunk/Makefile 2009-09-08 07:00:36 UTC (rev 6224) @@ -0,0 +1,36 @@ +GARNAME = ctags +GARVERSION = 5.8 +CATEGORIES = utils + +DESCRIPTION = Exuberant Ctags: A multilanguage implementation of Ctags +define BLURB + Ctags generates an index (or tag) file of language objects found in source + files that allows these items to be quickly and easily located by a text + editor or other utility. A tag signifies a language object for which an index + entry is available (or, alternatively, the index entry created for that + object). +endef + +MASTER_SITES = $(SF_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# Respect DESTDIR +PATCHFILES = install.diff + +PACKAGES = CSWectags +CATALOGNAME = ectags + +# We define upstream file regex so we can be notifed of new upstream software release +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=6556 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-custom-config=$(sysconfdir)/ctags.conf + +# No test suite +TEST_SCRIPTS = + +EXTRA_PAX_ARGS = -s ",/ctags,/ectags,p" + +include gar/category.mk Deleted: csw/mgar/pkg/ectags/trunk/files/CSWctags.gspec =================================================================== --- csw/mgar/pkg/ctags/trunk/files/CSWctags.gspec 2009-09-01 16:04:02 UTC (rev 6152) +++ csw/mgar/pkg/ectags/trunk/files/CSWctags.gspec 2009-09-08 07:00:36 UTC (rev 6224) @@ -1,4 +0,0 @@ -%var bitname ctags -%var pkgname CSWctags -%include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/ectags/trunk/files/CSWctags.prototype =================================================================== --- csw/mgar/pkg/ctags/trunk/files/CSWctags.prototype 2009-09-01 16:04:02 UTC (rev 6152) +++ csw/mgar/pkg/ectags/trunk/files/CSWctags.prototype 2009-09-08 07:00:36 UTC (rev 6224) @@ -1,8 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/ctags 0755 root bin -s none /opt/csw/bin/etags=ctags -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/ctags.1 0644 root bin -s none /opt/csw/share/man/man1/etags.1=ctags.1 Copied: csw/mgar/pkg/ectags/trunk/files/README (from rev 6223, csw/mgar/pkg/ctags/trunk/files/README) =================================================================== --- csw/mgar/pkg/ectags/trunk/files/README (rev 0) +++ csw/mgar/pkg/ectags/trunk/files/README 2009-09-08 07:00:36 UTC (rev 6224) @@ -0,0 +1,70 @@ + Von: car at crank.org.uk + Betreff: Re: ctags + Datum: 14. April 2007 22:52:11 MESZ + An: enh at jessies.org + + +On 15/04/2007, at 7:37 AM, Elliott Hughes wrote: +/etc/alternatives, overwriting/uninstalling the system ctags, or arranging for the new "ctags" to be higher on the path seem to be the most common solutions. + +Yeah, unfortunately none of those is open to me. I'm not allowed to remove or declare and incompatibility with the existing package, and I'm not allowed to clash. My two options are to rename my executable or stick it somewhere other than /opt/csw/bin. + +i've seen it called ectags before where it would otherwise be ambiguous, but not xctags. + +That's good enough for me. I can't even call it gtags/gctags because the other one's GNU. Which came first. + +etags is Emacs' crippled ctags variant. + +Exuberant ctags comes with a symbolic link, on request, to cripple it so. I'm not tempted to to prefix that, too, and call the pair ectags and eetags -- I'll have to alter the code, which I don't like doing. + +Yuck, Emacs. + +Evergreen currently relies on it being the first "ctags" on the path. + +Yes. Unfortunately we'll have to rely on the symbolic link trick to achieve that end. + +-- +Chris Reece +http://www.crank.org.uk/ + + + + Von: car at crank.org.uk + Betreff: /newpkgs ectags + Datum: 26. April 2007 00:16:52 MESZ + An: phil at bolthole.com + +Phil, + +I'll get back to you on the matter of autoenabling and bandwidthd, just a +wee bit busy at the moment, I'm sure you're even more so. + +I do have another package, though, in newpkgs: + +/export/medusa/newpkgs/ectags-5.6,REV=2007.04.25-SunOS5.8-i386-CSW.pkg.gz +/export/medusa/newpkgs/ectags-5.6,REV=2007.04.25-SunOS5.8-sparc-CSW.pkg.gz + +Unfortunately, by default it clashes with the GNU Ctags binary "ctags" +(why these people can't find a new name when they fork, I don't know) +which is bundled with CSWemacs. I am assured, however, that this is the +default ctags on many Linuxes, it certainly seems fairly popular, and it +has tag support for a wider range of languages. There's precedent for +renaming it "ectags" or "exuberant-ctags" where it co-exists with GNU +ctags. The former seems most popular, so that's what I've gone with. + +It's compiled to read configuration from /opt/csw/etc/ectags.conf, and I +*would* include a dummy config file listing the sensible defaults except +that there's no way to comment the config file without causing ectags to +spout a warning every time it's executed I'm reliably informed that +no-one uses the configuration file, and it certainly smells of an +abandoned, half implemented feature. So, instead of a config file, a +message at install-time, that seems the best we can do. + +Cheers, + +Chris. + + + + + Deleted: csw/mgar/pkg/ectags/trunk/files/install.diff =================================================================== --- csw/mgar/pkg/ctags/trunk/files/install.diff 2009-09-01 16:04:02 UTC (rev 6152) +++ csw/mgar/pkg/ectags/trunk/files/install.diff 2009-09-08 07:00:36 UTC (rev 6224) @@ -1,24 +0,0 @@ -diff --speed-large-files --minimal -Nru ctags-5.5.4.orig/Makefile.in ctags-5.5.4/Makefile.in ---- ctags-5.5.4.orig/Makefile.in 2005-01-27 11:22:14.851370000 -0500 -+++ ctags-5.5.4/Makefile.in 2005-01-27 11:19:56.676032000 -0500 -@@ -16,13 +16,13 @@ - # GNU Autoconf variables. These are set by the "configure" script when it - # runs. - # --exec_prefix = @exec_prefix@ --prefix = @prefix@ --bindir = @bindir@ --srcdir = @srcdir@ --libdir = @libdir@ --incdir = @includedir@ --mandir = @mandir@ -+exec_prefix = $(DESTDIR)@exec_prefix@ -+prefix = $(DESTDIR)@prefix@ -+bindir = $(DESTDIR)@bindir@ -+srcdir = @srcdir@ -+libdir = $(DESTDIR)@libdir@ -+incdir = $(DESTDIR)@includedir@ -+mandir = $(DESTDIR)@mandir@ - SLINK = @LN_S@ - STRIP = @STRIP@ - CC = @CC@ Copied: csw/mgar/pkg/ectags/trunk/files/install.diff (from rev 6217, csw/mgar/pkg/ctags/trunk/files/install.diff) =================================================================== --- csw/mgar/pkg/ectags/trunk/files/install.diff (rev 0) +++ csw/mgar/pkg/ectags/trunk/files/install.diff 2009-09-08 07:00:36 UTC (rev 6224) @@ -0,0 +1,25 @@ +diff -Naur ctags-5.8.orig/Makefile.in ctags-5.8.patched/Makefile.in +--- ctags-5.8.orig/Makefile.in 2009-07-04 07:29:28.000000000 +0200 ++++ ctags-5.8.patched/Makefile.in 2009-09-07 14:02:27.768451180 +0200 +@@ -16,14 +16,14 @@ + # GNU Autoconf variables. These are set by the "configure" script when it + # runs. + # +-exec_prefix = @exec_prefix@ +-datarootdir = @datarootdir@ +-prefix = @prefix@ +-bindir = @bindir@ ++exec_prefix = $(DESTDIR)@exec_prefix@ ++datarootdir = $(DESTDIR)@datarootdir@ ++prefix = $(DESTDIR)@prefix@ ++bindir = $(DESTDIR)@bindir@ + srcdir = @srcdir@ +-libdir = @libdir@ +-incdir = @includedir@ +-mandir = @mandir@ ++libdir = $(DESTDIR)@libdir@ ++incdir = $(DESTDIR)@includedir@ ++mandir = $(DESTDIR)@mandir@ + SLINK = @LN_S@ + STRIP = @STRIP@ + CC = @CC@ 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 Sep 8 13:21:14 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 08 Sep 2009 11:21:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6225] csw/mgar/pkg/cups/branches/cups-1.4 Message-ID: Revision: 6225 http://gar.svn.sourceforge.net/gar/?rev=6225&view=rev Author: wahwah Date: 2009-09-08 11:21:14 +0000 (Tue, 08 Sep 2009) Log Message: ----------- cups: Postinstall scripts which fail when the old configuration is present Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4/Makefile csw/mgar/pkg/cups/branches/cups-1.4/checksums Added Paths: ----------- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.postinstall csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.postinstall Property Changed: ---------------- csw/mgar/pkg/cups/branches/cups-1.4/Makefile Modified: csw/mgar/pkg/cups/branches/cups-1.4/Makefile =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-08 07:00:36 UTC (rev 6224) +++ csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-08 11:21:14 UTC (rev 6225) @@ -1,3 +1,7 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + GARNAME = cups GARVERSION = 1.4.0 CATEGORIES = net @@ -23,6 +27,8 @@ PATCHFILES = 0001-Makefile.patch DISTFILES = cups-$(GARVERSION)-source.tar.bz2 $(PATCHFILES) +DISTFILES += CSWcupsclient.postinstall +DISTFILES += CSWcupsd.postinstall DISTFILES += CSWcupsd.postremove PREREQUISITE_PKGS = CSWggettext @@ -36,7 +42,6 @@ PREREQUISITE_PKGS += SUNWlibm PREREQUISITE_PKGS += SUNWslpu -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = cups-(\d+(?:\.\d+)*)-source.tar.bz2 SPKG_CLASSES = none cswcpsampleconf cswinitsmf @@ -108,8 +113,6 @@ PKGFILES_CSWcupsclient += $(mandir)/man5/ppdcfile\.5 PKGFILES_CSWcupsclient += $(mandir)/man7/(drv|notifier)\.7 - - SPKG_DESC_CSWcups = Common Unix Printing System SPKG_DESC_CSWlibcups = CUPS libraries SPKG_DESC_CSWcupsd = CUPS daemon @@ -122,7 +125,6 @@ $$$$3 ~ /\/cupsd\.conf\.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ { print }' - LD_OPTIONS = -R/opt/csw/lib/\$$ISALIST -R/opt/csw/lib CONFIGURE_ARGS = $(DIRPATHS) --enable-pdftops Property changes on: csw/mgar/pkg/cups/branches/cups-1.4/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/cups/branches/cups-1.4/checksums =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-09-08 07:00:36 UTC (rev 6224) +++ csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-09-08 11:21:14 UTC (rev 6225) @@ -1,3 +1,5 @@ 682e10ff0ab0e094c3de2061369038bc download/0001-Makefile.patch +236c432ef6c8f0e93f634276278f3c4c download/CSWcupsclient.postinstall +236c432ef6c8f0e93f634276278f3c4c download/CSWcupsd.postinstall ca7718998e56c320c08a77cfefe046f6 download/CSWcupsd.postremove bc5e777d4320cecdd1a64de8035171a8 download/cups-1.4.0-source.tar.bz2 Added: csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.postinstall =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.postinstall (rev 0) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.postinstall 2009-09-08 11:21:14 UTC (rev 6225) @@ -0,0 +1,12 @@ +#!/bin/sh +# +# $Id$ +# + +if [ -d "${PKG_INSTALL_ROOT}/opt/csw/etc/cups" ]; then + echo + echo "The old configuration directory /opt/csw/etc/cup exists." + echo "Please move your configuration to /etc/opt/csw/cups." + echo + exit 1 +fi Added: csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.postinstall =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.postinstall (rev 0) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.postinstall 2009-09-08 11:21:14 UTC (rev 6225) @@ -0,0 +1,12 @@ +#!/bin/sh +# +# $Id$ +# + +if [ -d "${PKG_INSTALL_ROOT}/opt/csw/etc/cups" ]; then + echo + echo "The old configuration directory /opt/csw/etc/cup exists." + echo "Please move your configuration to /etc/opt/csw/cups." + echo + exit 1 +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 Tue Sep 8 14:09:22 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 08 Sep 2009 12:09:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[6226] csw/mgar/pkg/cups/branches/cups-1.4 Message-ID: Revision: 6226 http://gar.svn.sourceforge.net/gar/?rev=6226&view=rev Author: wahwah Date: 2009-09-08 12:09:17 +0000 (Tue, 08 Sep 2009) Log Message: ----------- cups: More visible messages from the postinstall files. Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4/checksums csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.postinstall csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.postinstall Modified: csw/mgar/pkg/cups/branches/cups-1.4/checksums =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-09-08 11:21:14 UTC (rev 6225) +++ csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-09-08 12:09:17 UTC (rev 6226) @@ -1,5 +1,5 @@ 682e10ff0ab0e094c3de2061369038bc download/0001-Makefile.patch -236c432ef6c8f0e93f634276278f3c4c download/CSWcupsclient.postinstall -236c432ef6c8f0e93f634276278f3c4c download/CSWcupsd.postinstall +e950ccba9b35ca698de7c52ba1c54688 download/CSWcupsclient.postinstall +e950ccba9b35ca698de7c52ba1c54688 download/CSWcupsd.postinstall ca7718998e56c320c08a77cfefe046f6 download/CSWcupsd.postremove bc5e777d4320cecdd1a64de8035171a8 download/cups-1.4.0-source.tar.bz2 Modified: csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.postinstall =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.postinstall 2009-09-08 11:21:14 UTC (rev 6225) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.postinstall 2009-09-08 12:09:17 UTC (rev 6226) @@ -5,8 +5,10 @@ if [ -d "${PKG_INSTALL_ROOT}/opt/csw/etc/cups" ]; then echo - echo "The old configuration directory /opt/csw/etc/cup exists." - echo "Please move your configuration to /etc/opt/csw/cups." + echo "*************************************************************" + echo "* The old configuration directory /opt/csw/etc/cups exists. *" + echo "* Please move your configuration to /etc/opt/csw/cups. *" + echo "*************************************************************" echo exit 1 fi Modified: csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.postinstall =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.postinstall 2009-09-08 11:21:14 UTC (rev 6225) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.postinstall 2009-09-08 12:09:17 UTC (rev 6226) @@ -5,8 +5,10 @@ if [ -d "${PKG_INSTALL_ROOT}/opt/csw/etc/cups" ]; then echo - echo "The old configuration directory /opt/csw/etc/cup exists." - echo "Please move your configuration to /etc/opt/csw/cups." + echo "*************************************************************" + echo "* The old configuration directory /opt/csw/etc/cups exists. *" + echo "* Please move your configuration to /etc/opt/csw/cups. *" + echo "*************************************************************" echo exit 1 fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Sep 8 14:15:56 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 08 Sep 2009 12:15:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[6227] csw/mgar/pkg Message-ID: Revision: 6227 http://gar.svn.sourceforge.net/gar/?rev=6227&view=rev Author: dmichelsen Date: 2009-09-08 12:15:56 +0000 (Tue, 08 Sep 2009) Log Message: ----------- fping: Initial commit Added Paths: ----------- csw/mgar/pkg/fping/ csw/mgar/pkg/fping/branches/ csw/mgar/pkg/fping/tags/ csw/mgar/pkg/fping/trunk/ csw/mgar/pkg/fping/trunk/Makefile csw/mgar/pkg/fping/trunk/checksums csw/mgar/pkg/fping/trunk/files/ Property changes on: csw/mgar/pkg/fping/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/fping/trunk/Makefile =================================================================== --- csw/mgar/pkg/fping/trunk/Makefile (rev 0) +++ csw/mgar/pkg/fping/trunk/Makefile 2009-09-08 12:15:56 UTC (rev 6227) @@ -0,0 +1,46 @@ +GARNAME = fping +GARVERSION = 2.4 +REV = b2_to +CATEGORIES = utils + +DESCRIPTION = A ping like program accepting any number of hosts +define BLURB + fping is a ping(1) like program which uses the Internet Control + Message Protocol (ICMP) echo request to determine if a host is up. + fping is different from ping in that you can specify any number of + hosts on the command line, or specify a file containing the lists + of hosts to ping. Instead of trying one host until it timeouts or + replies, fping will send out a ping packet and move on to the next + host in a round-robin fashion. If a host replies, it is noted and + removed from the list of hosts to check. If a host does not respond + within a certain time limit and/or retry limit it will be considered + unreachable. +endef + +MASTER_SITES = http://fping.sourceforge.net/download/ +MASTER_SITES += http://oss.oetiker.ch/smokeping/pub/ +DISTFILES = $(GARNAME).tar.gz +PATCHFILES = fping-2.4b2_to-sequence-fix.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 = http://fping.sourceforge.net/ + +SPKG_SOURCEURL = http://fping.sourceforge.net/ + +WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)$(REV) + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + +SPKG_VERSION := $(SPKG_VERSION)_rev=$(REV) + + + + Added: csw/mgar/pkg/fping/trunk/checksums =================================================================== --- csw/mgar/pkg/fping/trunk/checksums (rev 0) +++ csw/mgar/pkg/fping/trunk/checksums 2009-09-08 12:15:56 UTC (rev 6227) @@ -0,0 +1,2 @@ +ee105906fc48b78f72866e121a7c179e download/fping-2.4b2_to-sequence-fix.patch +d5e8be59e307cef76bc479e1684df705 download/fping.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Sep 8 20:12:28 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 08 Sep 2009 18:12:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[6228] csw/mgar/pkg/xterm/trunk Message-ID: Revision: 6228 http://gar.svn.sourceforge.net/gar/?rev=6228&view=rev Author: skayser Date: 2009-09-08 18:12:27 +0000 (Tue, 08 Sep 2009) Log Message: ----------- xterm: bump version to 247 Modified Paths: -------------- csw/mgar/pkg/xterm/trunk/Makefile csw/mgar/pkg/xterm/trunk/checksums Modified: csw/mgar/pkg/xterm/trunk/Makefile =================================================================== --- csw/mgar/pkg/xterm/trunk/Makefile 2009-09-08 12:15:56 UTC (rev 6227) +++ csw/mgar/pkg/xterm/trunk/Makefile 2009-09-08 18:12:27 UTC (rev 6228) @@ -1,5 +1,5 @@ GARNAME = xterm -GARVERSION = 243 +GARVERSION = 247 CATEGORIES = apps DESCRIPTION = Terminal emulator for the X Window System @@ -52,12 +52,6 @@ include gar/category.mk -# Hack for now to address the double /opt/csw/lib in $R*PATH. One comes -# from LD_OPTIONS and this one from pkg-config i suppose. -pre-build-modulated: - @perl -pi -e 's|-R/opt/csw/lib ||' $(WORKSRC)/Makefile - @$(MAKECOOKIE) - post-install-modulated: @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) @cp $(FILEDIR)/README.CSW $(DESTDIR)$(docdir)/$(GARNAME) Modified: csw/mgar/pkg/xterm/trunk/checksums =================================================================== --- csw/mgar/pkg/xterm/trunk/checksums 2009-09-08 12:15:56 UTC (rev 6227) +++ csw/mgar/pkg/xterm/trunk/checksums 2009-09-08 18:12:27 UTC (rev 6228) @@ -1,2 +1,2 @@ -be25d2d3661d0bb77fc66e1bcbb3caba download/xterm-243.tgz 347f24b7ed3e42a3d40b1db1ed0061f0 download/patch-mkwidth.diff +ef73f7f1eb8c863c51f2bfac1f55efd1 download/xterm-247.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 Sep 8 21:07:06 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 08 Sep 2009 19:07:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6229] csw/mgar/pkg Message-ID: Revision: 6229 http://gar.svn.sourceforge.net/gar/?rev=6229&view=rev Author: wahwah Date: 2009-09-08 19:07:06 +0000 (Tue, 08 Sep 2009) Log Message: ----------- pinentry: initial commit Modified Paths: -------------- csw/mgar/pkg/pinentry/trunk/Makefile csw/mgar/pkg/pinentry/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pinentry/ csw/mgar/pkg/pinentry/trunk/files/0001-remove-__extension__-from-util.c.patch csw/mgar/pkg/pinentry/trunk/files/0002-ncurses-include.patch Modified: csw/mgar/pkg/pinentry/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-09-08 12:15:56 UTC (rev 6227) +++ csw/mgar/pkg/pinentry/trunk/Makefile 2009-09-08 19:07:06 UTC (rev 6229) @@ -2,181 +2,22 @@ # 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 = pinentry +GARVERSION = 0.7.6 +CATEGORIES = utils +DESCRIPTION = Allows entering passwords into gpg-agent. 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). +SPKG_SOURCEURL = http://www.gnupg.org/ +PKG_CONFIG_PATH = /opt/csw/lib/pkgconfig +MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/pinentry/ +PATCHFILES = 0001-remove-__extension__-from-util.c.patch +PATCHFILES += 0002-ncurses-include.patch 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. +REQUIRED_PKGS = CSWglib CSWgtk CSWiconv CSWncurses +PREREQUISITE_PKGS = $(REQUIRED_PKGS) +PREREQUISITE_PKGS += CSWgtk2devel +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 +include gar/category.mk Modified: csw/mgar/pkg/pinentry/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-09-08 12:15:56 UTC (rev 6227) +++ csw/mgar/pkg/pinentry/trunk/checksums 2009-09-08 19:07:06 UTC (rev 6229) @@ -0,0 +1,3 @@ +2964e403781bf656b04b46b3846057e4 download/0001-remove-__extension__-from-util.c.patch +1cfd306236b7fb0bc01a2a408f4f5abb download/0002-ncurses-include.patch +5a4f676375fa882009da02013d77210f download/pinentry-0.7.6.tar.gz Added: csw/mgar/pkg/pinentry/trunk/files/0001-remove-__extension__-from-util.c.patch =================================================================== --- csw/mgar/pkg/pinentry/trunk/files/0001-remove-__extension__-from-util.c.patch (rev 0) +++ csw/mgar/pkg/pinentry/trunk/files/0001-remove-__extension__-from-util.c.patch 2009-09-08 19:07:06 UTC (rev 6229) @@ -0,0 +1,25 @@ +From 26f9938de29f65324acaedf376801f2e40f04b27 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Tue, 8 Sep 2009 20:02:35 +0100 +Subject: [PATCH 1/2] remove __extension__ from util.c + +--- + secmem/util.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/secmem/util.c b/secmem/util.c +index 580fd34..c836ad0 100644 +--- a/secmem/util.c ++++ b/secmem/util.c +@@ -34,7 +34,7 @@ + + #ifndef TEMP_FAILURE_RETRY + #define TEMP_FAILURE_RETRY(expression) \ +- (__extension__ \ ++ ( \ + ({ long int __result; \ + do __result = (long int) (expression); \ + while (__result == -1L && errno == EINTR); \ +-- +1.6.3.2 + Added: csw/mgar/pkg/pinentry/trunk/files/0002-ncurses-include.patch =================================================================== --- csw/mgar/pkg/pinentry/trunk/files/0002-ncurses-include.patch (rev 0) +++ csw/mgar/pkg/pinentry/trunk/files/0002-ncurses-include.patch 2009-09-08 19:07:06 UTC (rev 6229) @@ -0,0 +1,25 @@ +From 257626c95990b2f220bccf2fbc08e51d4eb07e76 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Tue, 8 Sep 2009 20:02:57 +0100 +Subject: [PATCH 2/2] ncurses include + +--- + pinentry/pinentry-curses.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/pinentry/pinentry-curses.c b/pinentry/pinentry-curses.c +index b4417fb..60721f1 100644 +--- a/pinentry/pinentry-curses.c ++++ b/pinentry/pinentry-curses.c +@@ -22,7 +22,7 @@ + #include + #endif + #include +-#include ++#include + #include + #include + #include +-- +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 Tue Sep 8 21:11:37 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 08 Sep 2009 19:11:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[6230] csw/mgar/pkg/pinentry/trunk/Makefile Message-ID: Revision: 6230 http://gar.svn.sourceforge.net/gar/?rev=6230&view=rev Author: wahwah Date: 2009-09-08 19:11:35 +0000 (Tue, 08 Sep 2009) Log Message: ----------- pinentry: Adding /opt/csw/X11/lib/pkgconfig to PKG_CONFIG_PATH Modified Paths: -------------- csw/mgar/pkg/pinentry/trunk/Makefile Modified: csw/mgar/pkg/pinentry/trunk/Makefile =================================================================== --- csw/mgar/pkg/pinentry/trunk/Makefile 2009-09-08 19:07:06 UTC (rev 6229) +++ csw/mgar/pkg/pinentry/trunk/Makefile 2009-09-08 19:11:35 UTC (rev 6230) @@ -9,7 +9,7 @@ define BLURB endef SPKG_SOURCEURL = http://www.gnupg.org/ -PKG_CONFIG_PATH = /opt/csw/lib/pkgconfig +PKG_CONFIG_PATH = /opt/csw/lib/pkgconfig:/opt/csw/X11/lib/pkgconfig MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/pinentry/ PATCHFILES = 0001-remove-__extension__-from-util.c.patch PATCHFILES += 0002-ncurses-include.patch 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 Sep 8 21:25:16 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 08 Sep 2009 19:25:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[6231] csw/mgar/pkg/pinentry/trunk/Makefile Message-ID: Revision: 6231 http://gar.svn.sourceforge.net/gar/?rev=6231&view=rev Author: wahwah Date: 2009-09-08 19:25:16 +0000 (Tue, 08 Sep 2009) Log Message: ----------- pinentry: set the compiler to SOS12 Modified Paths: -------------- csw/mgar/pkg/pinentry/trunk/Makefile Modified: csw/mgar/pkg/pinentry/trunk/Makefile =================================================================== --- csw/mgar/pkg/pinentry/trunk/Makefile 2009-09-08 19:11:35 UTC (rev 6230) +++ csw/mgar/pkg/pinentry/trunk/Makefile 2009-09-08 19:25:16 UTC (rev 6231) @@ -20,4 +20,5 @@ PREREQUISITE_PKGS += CSWgtk2devel TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) +GARCOMPILER = SOS12 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Sep 9 02:21:36 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 09 Sep 2009 00:21:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[6232] csw/mgar/pkg/xmlto/trunk Message-ID: Revision: 6232 http://gar.svn.sourceforge.net/gar/?rev=6232&view=rev Author: bdwalton Date: 2009-09-09 00:21:36 +0000 (Wed, 09 Sep 2009) Log Message: ----------- xmlto: bump version 0.0.21 -> 0.0.22 Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile csw/mgar/pkg/xmlto/trunk/checksums Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-08 19:25:16 UTC (rev 6231) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-09 00:21:36 UTC (rev 6232) @@ -1,5 +1,5 @@ GARNAME = xmlto -GARVERSION = 0.0.21 +GARVERSION = 0.0.22 CATEGORIES = utils PREREQUISITE_PKGS += CSWmktemp CSWfindutils CSWdocbookxsl CSWlibxslt @@ -16,7 +16,7 @@ It also performs any necessary post-processing. endef -MASTER_SITES = https://fedorahosted.org/$(GARNAME)/export/1/ +MASTER_SITES = https://fedorahosted.org/releases/x/m/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 TEST_TARGET = check Modified: csw/mgar/pkg/xmlto/trunk/checksums =================================================================== --- csw/mgar/pkg/xmlto/trunk/checksums 2009-09-08 19:25:16 UTC (rev 6231) +++ csw/mgar/pkg/xmlto/trunk/checksums 2009-09-09 00:21:36 UTC (rev 6232) @@ -1,2 +1 @@ -cc2039dedc81f1a56b06e5fdac6f7570 download/xmlto-0.0.21.tar.bz2 -0eddffc425d6a0439d4ba307ec3a668b download/CSWxmlto.gspec +12f297dc7051e4fef08339980f88a1dd download/xmlto-0.0.22.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 Wed Sep 9 02:53:03 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 09 Sep 2009 00:53:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[6233] csw/mgar/pkg/xmlto/trunk Message-ID: Revision: 6233 http://gar.svn.sourceforge.net/gar/?rev=6233&view=rev Author: bdwalton Date: 2009-09-09 00:53:03 +0000 (Wed, 09 Sep 2009) Log Message: ----------- xmlto: add patch to remove hardcoding of bash path in configure Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile csw/mgar/pkg/xmlto/trunk/checksums Added Paths: ----------- csw/mgar/pkg/xmlto/trunk/files/no-hardcode-bash.patch Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-09 00:21:36 UTC (rev 6232) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-09 00:53:03 UTC (rev 6233) @@ -19,6 +19,8 @@ MASTER_SITES = https://fedorahosted.org/releases/x/m/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +PATCHFILES = no-hardcode-bash.patch + TEST_TARGET = check # We define upstream file regex so we can be notifed of new upstream software release @@ -27,8 +29,9 @@ # we don't link to anything besides libc and libm. NORUNPATH = 1 -pre-configure: +pre-configure-modulated: @(cd $(WORKSRC); \ + autoreconf; \ touch doc/xmlto.xml doc/xmlif.xml ) @$(MAKECOOKIE) Modified: csw/mgar/pkg/xmlto/trunk/checksums =================================================================== --- csw/mgar/pkg/xmlto/trunk/checksums 2009-09-09 00:21:36 UTC (rev 6232) +++ csw/mgar/pkg/xmlto/trunk/checksums 2009-09-09 00:53:03 UTC (rev 6233) @@ -1 +1,2 @@ +a39f8b6fdb2219dca513145a4fca63ac download/no-hardcode-bash.patch 12f297dc7051e4fef08339980f88a1dd download/xmlto-0.0.22.tar.bz2 Added: csw/mgar/pkg/xmlto/trunk/files/no-hardcode-bash.patch =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/no-hardcode-bash.patch (rev 0) +++ csw/mgar/pkg/xmlto/trunk/files/no-hardcode-bash.patch 2009-09-09 00:53:03 UTC (rev 6233) @@ -0,0 +1,14 @@ +diff --speed-large-files --minimal -Nru xmlto-0.0.22.orig/configure.in xmlto-0.0.22/configure.in +--- xmlto-0.0.22.orig/configure.in 2009-03-25 14:48:02.000000000 +0100 ++++ xmlto-0.0.22/configure.in 2009-09-09 02:43:47.431319471 +0200 +@@ -18,9 +18,8 @@ + AC_ARG_VAR([FIND], [Name of the GNU `find' program.]) + AC_CHECK_PROG([FIND], [find],, [find] ) + +-BASH=/bin/bash + AC_ARG_VAR([BASH], [Name and path of the GNU `bash' shell.]) +-AC_PATH_PROG([BASH], [bash], [/bin/bash]) ++AC_PATH_PROG([BASH], [bash],, [bash]) + + AC_ARG_VAR([GETOPT], [Name of the `getopt' program (requires longopt support).]) + AC_CHECK_PROG([GETOPT], [getopt],, [getopt]) 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 Sep 9 02:54:53 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 09 Sep 2009 00:54:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[6234] csw/mgar/pkg/xmlto/trunk/Makefile Message-ID: Revision: 6234 http://gar.svn.sourceforge.net/gar/?rev=6234&view=rev Author: bdwalton Date: 2009-09-09 00:54:53 +0000 (Wed, 09 Sep 2009) Log Message: ----------- xmlto: change configure args to new required input format Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-09 00:53:03 UTC (rev 6233) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-09 00:54:53 UTC (rev 6234) @@ -36,10 +36,10 @@ @$(MAKECOOKIE) CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-mktemp=/opt/csw/bin/mktemp -CONFIGURE_ARGS += --with-find=/opt/csw/bin/gfind -CONFIGURE_ARGS += --with-bash=/opt/csw/bin/bash -CONFIGURE_ARGS += --with-getopt=/opt/csw/bin/ggetopt +CONFIGURE_ARGS += GETOPT=/opt/csw/bin/ggetopt +CONFIGURE_ARGS += BASH=/opt/csw/bin/bash +CONFIGURE_ARGS += FIND=/opt/csw/bin/gfind +CONFIGURE_ARGS += MKTEMP=/opt/csw/bin/mktemp include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Sep 9 03:05:49 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 09 Sep 2009 01:05:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[6235] csw/mgar/pkg/sgml-xml-common/trunk/Makefile Message-ID: Revision: 6235 http://gar.svn.sourceforge.net/gar/?rev=6235&view=rev Author: bdwalton Date: 2009-09-09 01:05:49 +0000 (Wed, 09 Sep 2009) Log Message: ----------- sgml-xml-common: update sysconfdir to /etc/opt/csw Modified Paths: -------------- csw/mgar/pkg/sgml-xml-common/trunk/Makefile Modified: csw/mgar/pkg/sgml-xml-common/trunk/Makefile =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/Makefile 2009-09-09 00:54:53 UTC (rev 6234) +++ csw/mgar/pkg/sgml-xml-common/trunk/Makefile 2009-09-09 01:05:49 UTC (rev 6235) @@ -44,10 +44,12 @@ # a destination xml catalog XMLCATALOG=$(DESTDIR)/$(sysconfdir)/xml/catalog +sysconfdir=/etc/opt/csw/ + include gar/category.mk # fix up auto* stuff -pre-configure: +pre-configure-modulated: ( cd $(WORKSRC)/; \ for f in $(RH_AM_LINKS); do \ rm $$f; \ 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 Sep 9 04:06:30 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 09 Sep 2009 02:06:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[6236] csw/mgar/pkg/sgml-xml-common/trunk/ Message-ID: Revision: 6236 http://gar.svn.sourceforge.net/gar/?rev=6236&view=rev Author: bdwalton Date: 2009-09-09 02:06:26 +0000 (Wed, 09 Sep 2009) Log Message: ----------- sgml-xml-common: move to gar v2 Property Changed: ---------------- csw/mgar/pkg/sgml-xml-common/trunk/ Property changes on: csw/mgar/pkg/sgml-xml-common/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 hson at users.sourceforge.net Wed Sep 9 11:47:56 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Wed, 09 Sep 2009 09:47:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[6237] csw/mgar/pkg/exiftool/trunk/Makefile Message-ID: Revision: 6237 http://gar.svn.sourceforge.net/gar/?rev=6237&view=rev Author: hson Date: 2009-09-09 09:47:55 +0000 (Wed, 09 Sep 2009) Log Message: ----------- exiftool: Update to 7.93, changed dependency Modified Paths: -------------- csw/mgar/pkg/exiftool/trunk/Makefile Modified: csw/mgar/pkg/exiftool/trunk/Makefile =================================================================== --- csw/mgar/pkg/exiftool/trunk/Makefile 2009-09-09 02:06:26 UTC (rev 6236) +++ csw/mgar/pkg/exiftool/trunk/Makefile 2009-09-09 09:47:55 UTC (rev 6237) @@ -1,5 +1,5 @@ GARNAME = exiftool -GARVERSION = 7.81 +GARVERSION = 7.93 CATEGORIES = cpan DESCRIPTION = Read, Write and Edit Image File Meta Information @@ -15,7 +15,7 @@ DISTFILES = $(DISTNAME).tar.gz DISTFILES += $(call admfiles,CSWexiftool,) -REQUIRED_PKGS += CSWperl CSWpmcompresszlib +REQUIRED_PKGS += CSWperl CSWpmiocompress # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = Image-ExifTool-(\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 Wed Sep 9 12:32:06 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 09 Sep 2009 10:32:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6238] csw/mgar/pkg/msmtp/trunk Message-ID: Revision: 6238 http://gar.svn.sourceforge.net/gar/?rev=6238&view=rev Author: dmichelsen Date: 2009-09-09 10:32:06 +0000 (Wed, 09 Sep 2009) Log Message: ----------- msmtp: Update to 1.4.18 Modified Paths: -------------- csw/mgar/pkg/msmtp/trunk/Makefile csw/mgar/pkg/msmtp/trunk/checksums Modified: csw/mgar/pkg/msmtp/trunk/Makefile =================================================================== --- csw/mgar/pkg/msmtp/trunk/Makefile 2009-09-09 09:47:55 UTC (rev 6237) +++ csw/mgar/pkg/msmtp/trunk/Makefile 2009-09-09 10:32:06 UTC (rev 6238) @@ -1,5 +1,5 @@ GARNAME = msmtp -GARVERSION = 1.4.17 +GARVERSION = 1.4.18 CATEGORIES = net DESCRIPTION = SMTP client Modified: csw/mgar/pkg/msmtp/trunk/checksums =================================================================== --- csw/mgar/pkg/msmtp/trunk/checksums 2009-09-09 09:47:55 UTC (rev 6237) +++ csw/mgar/pkg/msmtp/trunk/checksums 2009-09-09 10:32:06 UTC (rev 6238) @@ -1,2 +1 @@ -b0b74f1144812b60688f590c62a0d3dd download/msmtp-1.4.17.tar.bz2 -42e9683c63a21aeb281bbb72d9e4b527 download/CSWmsmtp.gspec +74f80b41c058a0ee34819d6bf5ff3b1a download/msmtp-1.4.18.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Wed Sep 9 13:36:59 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Wed, 09 Sep 2009 11:36:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6239] csw/mgar/pkg/exiftool/trunk/checksums Message-ID: Revision: 6239 http://gar.svn.sourceforge.net/gar/?rev=6239&view=rev Author: hson Date: 2009-09-09 11:36:59 +0000 (Wed, 09 Sep 2009) Log Message: ----------- exiftool: checksums file update Modified Paths: -------------- csw/mgar/pkg/exiftool/trunk/checksums Modified: csw/mgar/pkg/exiftool/trunk/checksums =================================================================== --- csw/mgar/pkg/exiftool/trunk/checksums 2009-09-09 10:32:06 UTC (rev 6238) +++ csw/mgar/pkg/exiftool/trunk/checksums 2009-09-09 11:36:59 UTC (rev 6239) @@ -1,2 +1,2 @@ 13f9aae615a5de5e3c145b374950a75c download/CSWexiftool.gspec -5716c0dec3ffa2b167b73ec27b6a235f download/Image-ExifTool-7.81.tar.gz +da1077cc9a8910f38b97cf5475a37360 download/Image-ExifTool-7.93.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 Sep 9 14:40:32 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 09 Sep 2009 12:40:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[6240] csw/mgar/pkg/cups/branches/cups-1.4/Makefile Message-ID: Revision: 6240 http://gar.svn.sourceforge.net/gar/?rev=6240&view=rev Author: wahwah Date: 2009-09-09 12:40:32 +0000 (Wed, 09 Sep 2009) Log Message: ----------- cups: Adding support for debugging builds Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4/Makefile Modified: csw/mgar/pkg/cups/branches/cups-1.4/Makefile =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-09 11:36:59 UTC (rev 6239) +++ csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-09 12:40:32 UTC (rev 6240) @@ -133,6 +133,13 @@ CONFIGURE_ARGS += --with-rcdir=$(sysconfdir) CONFIGURE_ARGS += --with-icondir=$(datadir)/icons +CONFIGURE_ARGS_DBG = --enable-debug +CONFIGURE_ARGS_DBG += --enable-debug-guards +CONFIGURE_ARGS_DBG += --enable-debug-printfs + +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) + + # This is a hack that's needed, because configure (Makedefs) will otherwise # plase -ltiff, etc. first and -L/opt/csw/lib afterwards, thus being unable # to find any of the image libraries. @@ -156,6 +163,11 @@ PRIVATE_CUPS_INC = $(DESTDIR)$(includedir)/cups +# CUPS uses the 'OPTIM' variable to set the optimization flags. +OPTIM_DBG = -g -xO0 +OPTIM = $(OPTIM_$(GARFLAVOR)) +export OPTIM + post-install-modulated: (cd $(DESTDIR)$(sysconfdir)/cups; \ echo "Making .CSW configs in $(DESTDIR)$(sysconfdir)/cups"; \ 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 Sep 9 15:26:42 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 09 Sep 2009 13:26:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[6241] csw/mgar/pkg/ectags/trunk/Makefile Message-ID: Revision: 6241 http://gar.svn.sourceforge.net/gar/?rev=6241&view=rev Author: dmichelsen Date: 2009-09-09 13:26:42 +0000 (Wed, 09 Sep 2009) Log Message: ----------- ectags: Set SOURCEURL Modified Paths: -------------- csw/mgar/pkg/ectags/trunk/Makefile Modified: csw/mgar/pkg/ectags/trunk/Makefile =================================================================== --- csw/mgar/pkg/ectags/trunk/Makefile 2009-09-09 12:40:32 UTC (rev 6240) +++ csw/mgar/pkg/ectags/trunk/Makefile 2009-09-09 13:26:42 UTC (rev 6241) @@ -20,6 +20,8 @@ PACKAGES = CSWectags CATALOGNAME = ectags +SPKG_SOURCEURL = http://ctags.sourceforge.net/ + # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=6556 UPSTREAM_USE_SF = 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 Sep 9 15:32:13 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 09 Sep 2009 13:32:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[6242] csw/mgar/pkg/orbit2/trunk Message-ID: Revision: 6242 http://gar.svn.sourceforge.net/gar/?rev=6242&view=rev Author: dmichelsen Date: 2009-09-09 13:32:12 +0000 (Wed, 09 Sep 2009) Log Message: ----------- orbit2: Add patch and set package name Modified Paths: -------------- csw/mgar/pkg/orbit2/trunk/Makefile csw/mgar/pkg/orbit2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/orbit2/trunk/files/ csw/mgar/pkg/orbit2/trunk/files/patch-test-foo.diff Modified: csw/mgar/pkg/orbit2/trunk/Makefile =================================================================== --- csw/mgar/pkg/orbit2/trunk/Makefile 2009-09-09 13:26:42 UTC (rev 6241) +++ csw/mgar/pkg/orbit2/trunk/Makefile 2009-09-09 13:32:12 UTC (rev 6242) @@ -9,10 +9,21 @@ endef MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +PACKAGES = CSWorbit2 +CATALOGNAME = orbit2 + +REQUIRED_PKGS = CSWggettextrt CSWglib2 CSWlibidl + SPKG_SOURCEURL = http://projects.gnome.org/ORBit2/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +# Patch from +# https://bugzilla.gnome.org/show_bug.cgi?id=563046 +# This also solves +# https://bugzilla.gnome.org/show_bug.cgi?id=558796 +PATCHFILES = patch-test-foo.diff +PATCHDIRLEVEL = 0 CONFIGURE_ARGS = $(DIRPATHS) STRIP_LIBTOOL = 1 Modified: csw/mgar/pkg/orbit2/trunk/checksums =================================================================== --- csw/mgar/pkg/orbit2/trunk/checksums 2009-09-09 13:26:42 UTC (rev 6241) +++ csw/mgar/pkg/orbit2/trunk/checksums 2009-09-09 13:32:12 UTC (rev 6242) @@ -1 +1,2 @@ 10bfb957fa4a8935a0b4afaee7d71df7 download/ORBit2-2.14.17.tar.bz2 +f0854ac5f081775fc2b7c8afbf769843 download/patch-test-foo.diff Added: csw/mgar/pkg/orbit2/trunk/files/patch-test-foo.diff =================================================================== --- csw/mgar/pkg/orbit2/trunk/files/patch-test-foo.diff (rev 0) +++ csw/mgar/pkg/orbit2/trunk/files/patch-test-foo.diff 2009-09-09 13:32:12 UTC (rev 6242) @@ -0,0 +1,46 @@ +$NetBSD: patch-aa,v 1.7 2009/03/06 14:02:32 wiz Exp $ + +--- src/idl-compiler/orbit-idl-c-headers.c.orig 2008-08-31 14:04:43.000000000 +0000 ++++ src/idl-compiler/orbit-idl-c-headers.c +@@ -574,21 +574,29 @@ static void + ch_output_codefrag(IDL_tree tree, OIDL_Run_Info *rinfo, OIDL_C_Info *ci) + { + GSList *list; ++ char *ctmp; + + for(list = IDL_CODEFRAG(tree).lines; list; + list = g_slist_next(list)) { +- if(!strncmp(list->data, +- "#pragma include_defs", +- sizeof("#pragma include_defs")-1)) { +- char *ctmp, *cte; +- ctmp = ((char *)list->data) + sizeof("#pragma include_defs"); +- while(*ctmp && (isspace((int)*ctmp) || *ctmp == '"')) ctmp++; +- cte = ctmp; +- while(*cte && !isspace((int)*cte) && *cte != '"') cte++; +- *cte = '\0'; +- fprintf(ci->fh, "#include <%s>\n", ctmp); +- } else +- fprintf(ci->fh, "%s\n", (char *)list->data); ++ ctmp = list->data; ++ if(!strncmp(ctmp, "#pragma", sizeof("#pragma")-1)) { ++ ctmp += sizeof("#pragma")-1; ++ if (*ctmp && (isspace((int)*ctmp))) { ++ while(*ctmp && (isspace((int)*ctmp))) ctmp++; ++ if(!strncmp(ctmp, "include_defs", sizeof("include_defs")-1)) { ++ char *cte; ++ ++ ctmp += sizeof("include_defs")-1; ++ while(*ctmp && (isspace((int)*ctmp) || *ctmp == '"')) ctmp++; ++ cte = ctmp; ++ while(*cte && !isspace((int)*cte) && *cte != '"') cte++; ++ *cte = '\0'; ++ fprintf(ci->fh, "#include <%s>\n", ctmp); ++ continue; ++ } ++ } ++ } ++ fprintf(ci->fh, "%s\n", (char *)list->data); + } + } + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Sep 9 16:23:22 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 09 Sep 2009 14:23:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[6243] csw/mgar/pkg/pixman/branches Message-ID: Revision: 6243 http://gar.svn.sourceforge.net/gar/?rev=6243&view=rev Author: wbonnet Date: 2009-09-09 14:23:22 +0000 (Wed, 09 Sep 2009) Log Message: ----------- Create the branch used for packaging of the upstream latest version Update testing version to 0.16.0 Modified Paths: -------------- csw/mgar/pkg/pixman/branches/latest-upstream/Makefile csw/mgar/pkg/pixman/branches/latest-upstream/checksums Added Paths: ----------- csw/mgar/pkg/pixman/branches/latest-upstream/ Modified: csw/mgar/pkg/pixman/branches/latest-upstream/Makefile =================================================================== --- csw/mgar/pkg/pixman/trunk/Makefile 2009-09-09 13:32:12 UTC (rev 6242) +++ csw/mgar/pkg/pixman/branches/latest-upstream/Makefile 2009-09-09 14:23:22 UTC (rev 6243) @@ -1,5 +1,5 @@ GARNAME = pixman -GARVERSION = 0.15.14 +GARVERSION = 0.16.0 CATEGORIES = lib DESCRIPTION = The pixel-manipulation library for X and cairo Modified: csw/mgar/pkg/pixman/branches/latest-upstream/checksums =================================================================== --- csw/mgar/pkg/pixman/trunk/checksums 2009-09-09 13:32:12 UTC (rev 6242) +++ csw/mgar/pkg/pixman/branches/latest-upstream/checksums 2009-09-09 14:23:22 UTC (rev 6243) @@ -1,2 +1,2 @@ -bfbb075dd60402e86528add13f8e27ad download/pixman-0.15.14.tar.gz +46147b142ea530847e2228940f1cd535 download/pixman-0.16.0.tar.gz f78d71433a7d574ff66b7d2bf3ea2a49 download/pixman-private.h.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 Wed Sep 9 16:45:01 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 09 Sep 2009 14:45:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[6244] csw/mgar/pkg Message-ID: Revision: 6244 http://gar.svn.sourceforge.net/gar/?rev=6244&view=rev Author: dmichelsen Date: 2009-09-09 14:45:00 +0000 (Wed, 09 Sep 2009) Log Message: ----------- libmm: Initial commit Added Paths: ----------- csw/mgar/pkg/libmm/ csw/mgar/pkg/libmm/branches/ csw/mgar/pkg/libmm/tags/ csw/mgar/pkg/libmm/trunk/ csw/mgar/pkg/libmm/trunk/Makefile csw/mgar/pkg/libmm/trunk/checksums csw/mgar/pkg/libmm/trunk/files/ csw/mgar/pkg/libmm/trunk/files/0001-libtool-cflags.diff Property changes on: csw/mgar/pkg/libmm/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/libmm/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmm/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libmm/trunk/Makefile 2009-09-09 14:45:00 UTC (rev 6244) @@ -0,0 +1,34 @@ +GARNAME = libmm +GARVERSION = 1.4.2 +CATEGORIES = lib + +DESCRIPTION = Shared Memory Allocation abstraction library +define BLURB + OSSP mm is a 2-layer abstraction library which simplifies the usage + of shared memory between forked (and this way strongly related) processes + under Unix platforms. On the first layer it hides all platform dependent + implementation details (allocation and locking) when dealing with shared + memory segments and on the second layer it provides a high-level + malloc(3)-style API for a convenient and well known way to work with data + structures inside those shared memory segments. +endef + +MASTER_SITES = ftp://ftp.ossp.org/pkg/lib/mm/ +DISTFILES = mm-$(GARVERSION).tar.gz +PATCHFILES = 0001-libtool-cflags.diff + +# 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 = + +SPKG_SOURCEURL = http://www.ossp.org/pkg/lib/mm/ + +DISTNAME = mm-$(GARVERSION) + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/libmm/trunk/checksums =================================================================== --- csw/mgar/pkg/libmm/trunk/checksums (rev 0) +++ csw/mgar/pkg/libmm/trunk/checksums 2009-09-09 14:45:00 UTC (rev 6244) @@ -0,0 +1,2 @@ +54493069b25bc79b8f40ed5c5632b2fa download/0001-libtool-cflags.diff +bdb34c6c14071364c8f69062d2e8c82b download/mm-1.4.2.tar.gz Added: csw/mgar/pkg/libmm/trunk/files/0001-libtool-cflags.diff =================================================================== --- csw/mgar/pkg/libmm/trunk/files/0001-libtool-cflags.diff (rev 0) +++ csw/mgar/pkg/libmm/trunk/files/0001-libtool-cflags.diff 2009-09-09 14:45:00 UTC (rev 6244) @@ -0,0 +1,20 @@ +diff -Naur mm-1.4.2.orig/Makefile.in mm-1.4.2.patched/Makefile.in +--- mm-1.4.2.orig/Makefile.in 2006-08-10 21:05:55.000000000 +0200 ++++ mm-1.4.2.patched/Makefile.in 2009-09-09 16:25:45.161331795 +0200 +@@ -75,14 +75,14 @@ + all: $(LIBS) $(MANS) $(TSTS) + + libmm.la: $(OBJS) +- $(LIBTOOL) --quiet --mode=link $(CC) -o $@ $(OBJS) \ ++ $(LIBTOOL) --quiet --mode=link $(CC) $(CFLAGS) -o $@ $(OBJS) \ + -rpath $(libdir) -version-info `$(SHTOOL) version -l c -d libtool mm_vers.c` + + mm_alloc.c mm_core.c mm_global.c: mm.h mm_vers.c + mm.h: config.h + + mm_test: mm_test.lo libmm.la +- $(LIBTOOL) --quiet --mode=link $(CC) -o $@ mm_test.lo libmm.la ++ $(LIBTOOL) --quiet --mode=link $(CC) $(CFLAGS) -o $@ mm_test.lo libmm.la + + mm.3: mm.pod + V1=`$(SHTOOL) version -l c -d short mm_vers.c`; \ 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 Sep 9 17:30:30 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 09 Sep 2009 15:30:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[6245] csw/mgar/pkg/tightvnc/trunk Message-ID: Revision: 6245 http://gar.svn.sourceforge.net/gar/?rev=6245&view=rev Author: wahwah Date: 2009-09-09 15:30:27 +0000 (Wed, 09 Sep 2009) Log Message: ----------- tightvnc: Builds fine on Solaris 10 with SOS12. Doesn't USE_LIBWRAP. Modified Paths: -------------- csw/mgar/pkg/tightvnc/trunk/Makefile csw/mgar/pkg/tightvnc/trunk/checksums Added Paths: ----------- csw/mgar/pkg/tightvnc/trunk/files/0003-libdix.a-after-libos.a.patch Removed Paths: ------------- csw/mgar/pkg/tightvnc/trunk/files/0002-pass-f-xmakefile-flag-when-appropriate.patch Modified: csw/mgar/pkg/tightvnc/trunk/Makefile =================================================================== --- csw/mgar/pkg/tightvnc/trunk/Makefile 2009-09-09 14:45:00 UTC (rev 6244) +++ csw/mgar/pkg/tightvnc/trunk/Makefile 2009-09-09 15:30:27 UTC (rev 6245) @@ -35,22 +35,17 @@ EXTRA_DEFINES = -DUSE_LIBWRAP=1 EXTRA_INC = /usr/openwin/share/include/X11 +EXTRA_INCLUDES = $(EXTRA_INC) EXTRA_LDFLAGS = /opt/csw/lib LOCAL_LDFLAGS = $(LINKER_FLAGS) -BUILD_OVERRIDE_DIRS = EXTRA_DEFINES EXTRA_INCLUDE LOCAL_LDFLAGS -CONFIGURE_SCRIPTS = $(WORKSRC)/Imakefile -# Xvnc -CONFIGURE_ARGS = -a -BUILD_SCRIPTS = vnc Xvnc +BUILD_OVERRIDE_DIRS = EXTRA_DEFINES EXTRA_INCLUDES LOCAL_LDFLAGS +CONFIGURE_SCRIPTS = vnc +BUILD_SCRIPTS = maciej TEST_SCRIPTS = INSTALL_SCRIPTS = vnc -# This patch has been sent upstream with a bug report. -# http://sourceforge.net/tracker/?func=detail&aid=2852808&group_id=14067&atid=114067 -# PATCHFILES += 0002-Test-for-Makefile-presence.patch -# PATCHFILES = 0001-Sun-compiler-in-sun.cf.patch -PATCHFILES += 0002-pass-f-xmakefile-flag-when-appropriate.patch PATCHFILES += 0003-GNU-make-by-default.patch +PATCHFILES += 0003-libdix.a-after-libos.a.patch include gar/category.mk @@ -58,28 +53,34 @@ perl -pi -e "s|/usr/local/vnc/classes|$(datadir)/vnc/classes|" $(WORKSRC)/vncserver @$(MAKECOOKIE) -configure-Xvnc: - banner "Config Xvnc" - perl -pi -e "s|^(\s*make)\s*$$|\1 CC=$(CC)|" $(WORKSRC)/Xvnc/configure - (cd $(WORKSRC)/Xvnc && $(BUILD_ENV) ./configure) +configure-vnc: + (cd $(WORKSRC) && $(CONFIGURE_ENV) xmkmf) @$(MAKECOOKIE) -build-vnc: - banner "Build VNC" - cd $(WORKSRC) && $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") World - # $(MAKE) -C $(WORKSRC) $(BUILD_ENV) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") World - @$(MAKECOOKIE) +build-maciej: + (cd $(WORKSRC) && $(BUILD_ENV) \ + EXTRA_INCLUDES="-I/opt/csw/include" \ + LOCAL_LDFLAGS="-L/opt/csw/lib" \ + gmake World) + (cd $(WORKSRC)/Xvnc && $(CONFIGURE_ENV) \ + EXTRA_LIBRARIES="-lwrap -lsocket" \ + EXTRA_DEFINES="-DUSE_LIBWRAP=1" \ + EXTRA_INCLUDES="-I/opt/csw/include" \ + LOCAL_LDFLAGS="-L/opt/csw/lib" \ + ./configure) + (cd $(WORKSRC)/Xvnc && $(BUILD_ENV) \ + EXTRA_INCLUDES="-I/opt/csw/include" \ + LOCAL_LDFLAGS="-L/opt/csw/lib" \ + gmake) + # This is something that Dago wanted to do, but it causes the build to + # fail. I'm leaving it for future reference. + # (cd $(WORKSRC)/Xvnc && $(BUILD_ENV) \ + # EXTRA_LIBRARIES="-lwrap -lsocket" \ + # EXTRA_DEFINES="-DUSE_LIBWRAP=1" \ + # LOCAL_LDFLAGS="-L/opt/csw/lib" \ + # EXTRA_INCLUDES="-I/opt/csw/include" \ + # $(MAKE)) -build-Xvnc: configure-Xvnc - # $(MAKE) -C $(WORKSRC) $(BUILD_ENV) EXTRA_LIBRARIES="-lwrap" EXTRA_DEFINES="-DUSE_LIBWRAP=1" World - # banner "Config Xvnc" - # (cd $(WORKSRC)/Xvnc && $(BUILD_ENV) ./configure) - banner "Build Xvnc" - $(MAKE) -C $(WORKSRC)/Xvnc $(BUILD_ENV) EXTRA_LIBRARIES="-lwrap -lsocket" EXTRA_DEFINES="-DUSE_LIBWRAP=1" EXTRA_LDOPTIONS="-L/opt/csw/lib -L/usr/lib" World - # cd $(WORKSRC) && $(MAKE) $(BUILD_ENV) EXTRA_LIBRARIES="-lwrap" EXTRA_DEFINES="-DUSE_LIBWRAP=1" World - # cd $(WORKSRC)/Xvnc && $(MAKE) $(BUILD_ENV) EXTRA_LIBRARIES="-lwrap -lsocket" EXTRA_DEFINES="-DUSE_LIBWRAP=1" EXTRA_LDOPTIONS="-L/opt/csw/lib -L/usr/lib" World - @$(MAKECOOKIE) - install-vnc: ginstall -d $(DESTDIR)$(bindir) ginstall -d $(DESTDIR)$(mandir)/man1 Modified: csw/mgar/pkg/tightvnc/trunk/checksums =================================================================== --- csw/mgar/pkg/tightvnc/trunk/checksums 2009-09-09 14:45:00 UTC (rev 6244) +++ csw/mgar/pkg/tightvnc/trunk/checksums 2009-09-09 15:30:27 UTC (rev 6245) @@ -1,5 +1,5 @@ 76166d097bf2e70627cb6c87d312bca5 download/0001-Sun-compiler-in-sun.cf.patch -51441e1d47891f910f0929cd65a487a7 download/0002-pass-f-xmakefile-flag-when-appropriate.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 Deleted: csw/mgar/pkg/tightvnc/trunk/files/0002-pass-f-xmakefile-flag-when-appropriate.patch =================================================================== --- csw/mgar/pkg/tightvnc/trunk/files/0002-pass-f-xmakefile-flag-when-appropriate.patch 2009-09-09 14:45:00 UTC (rev 6244) +++ csw/mgar/pkg/tightvnc/trunk/files/0002-pass-f-xmakefile-flag-when-appropriate.patch 2009-09-09 15:30:27 UTC (rev 6245) @@ -1,50 +0,0 @@ -From 796212b91212ad84a516554ba5bb6250d8fd1c87 Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Mon, 7 Sep 2009 10:08:34 +0200 -Subject: [PATCH 2/3] pass -f xmakefile flag when appropriate - ---- - Xvnc/config/cf/Imake.rules | 13 ++++++++++--- - 1 files changed, 10 insertions(+), 3 deletions(-) - -diff --git a/Xvnc/config/cf/Imake.rules b/Xvnc/config/cf/Imake.rules -index 5ab9a18..353dabf 100644 ---- a/Xvnc/config/cf/Imake.rules -+++ b/Xvnc/config/cf/Imake.rules -@@ -2469,7 +2469,7 @@ $(ONESUBDIR)/Makefile: @@\ - fi; @@\ - @@\ - target:: @@\ -- - at MakeFlagsToShellFlags(ik,set +e); \ @@\ -+ MakeFlagsToShellFlags(ik,set +e); \ @@\ - MakeFlagsToShellFlags(n,executeit="no"); \ @@\ - for i in dirs ;\ @@\ - do \ @@\ -@@ -2477,7 +2477,7 @@ target:: @@\ - .) curdir= ;; \ @@\ - *) curdir=$(CURRENT_DIR)/ ;; \ @@\ - esac; \ @@\ -- echo "making Makefiles in $$curdir$$i..."; \ @@\ -+ echo "making Makefiles in '$$curdir'::'$$i'..."; \ @@\ - itmp=`echo $$i | sed -e 's;^\./;;g' -e 's;/\./;/;g'`; \ @@\ - curtmp="$(CURRENT_DIR)" \ @@\ - toptmp=""; \ @@\ -@@ -2514,7 +2514,14 @@ target:: @@\ - $(MV) $$i/Makefile $$i/Makefile.bak; \ @@\ - fi; \ @@\ - fi; \ @@\ -- $(MAKE) $(MFLAGS) $(MAKE_OPTS) ONESUBDIR=$$i ONECURDIR=$$curdir IMAKETOP=$$imaketop IMAKEPREFIX=$$imakeprefix $$i/Makefile; \ @@\ -+ [ -r xmakefile ] && $(MAKE) -f xmakefile $(MFLAGS) \ @@\ -+ $(MAKE_OPTS) ONESUBDIR=$$i ONECURDIR=$$curdir \ @@\ -+ IMAKETOP=$$imaketop IMAKEPREFIX=$$imakeprefix \ @@\ -+ $$i/Makefile || \ @@\ -+ $(MAKE) $(MFLAGS) \ @@\ -+ $(MAKE_OPTS) ONESUBDIR=$$i ONECURDIR=$$curdir \ @@\ -+ IMAKETOP=$$imaketop IMAKEPREFIX=$$imakeprefix \ @@\ -+ $$i/Makefile; \ @@\ - if [ -d $$i ] ; then \ @@\ - cd $$i; \ @@\ - $(MAKE) $(MFLAGS) Makefiles; \ @@\ --- -1.6.3.2 - Added: csw/mgar/pkg/tightvnc/trunk/files/0003-libdix.a-after-libos.a.patch =================================================================== --- csw/mgar/pkg/tightvnc/trunk/files/0003-libdix.a-after-libos.a.patch (rev 0) +++ csw/mgar/pkg/tightvnc/trunk/files/0003-libdix.a-after-libos.a.patch 2009-09-09 15:30:27 UTC (rev 6245) @@ -0,0 +1,25 @@ +From 490679f2825057f4516557abce0109a324c95a8a Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Wed, 9 Sep 2009 11:36:02 +0200 +Subject: [PATCH 3/3] libdix.a after libos.a + +--- + Xvnc/programs/Xserver/Imakefile | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Xvnc/programs/Xserver/Imakefile b/Xvnc/programs/Xserver/Imakefile +index 4209d1f..89a1a97 100644 +--- a/Xvnc/programs/Xserver/Imakefile ++++ b/Xvnc/programs/Xserver/Imakefile +@@ -11,7 +11,7 @@ XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.85.2.8 1998/02/07 00:44:33 daw + INSTPGMFLAGS = + #endif + +-#define PreFbLibs $(DIX) $(OS) $(FONT) $(XPDDX) ++#define PreFbLibs $(DIX) $(OS) $(DIX) $(FONT) $(XPDDX) + #define BarePostFbLibs $(MFB) $(XPFBLIBS) $(MI) + #define PostFbLibs BarePostFbLibs $(EXTENSIONS) + #define NoMfbBarePostFbLibs $(XPFBLIBS) $(MI) +-- +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 Wed Sep 9 18:51:21 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 09 Sep 2009 16:51:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[6246] csw/mgar/pkg/tightvnc/trunk Message-ID: Revision: 6246 http://gar.svn.sourceforge.net/gar/?rev=6246&view=rev Author: wahwah Date: 2009-09-09 16:51:21 +0000 (Wed, 09 Sep 2009) Log Message: ----------- tightvnc: Enabling libwrap. Modified Paths: -------------- csw/mgar/pkg/tightvnc/trunk/Makefile csw/mgar/pkg/tightvnc/trunk/checksums Added Paths: ----------- csw/mgar/pkg/tightvnc/trunk/files/0001-Force-the-use-of-libwrap.patch Modified: csw/mgar/pkg/tightvnc/trunk/Makefile =================================================================== --- csw/mgar/pkg/tightvnc/trunk/Makefile 2009-09-09 15:30:27 UTC (rev 6245) +++ csw/mgar/pkg/tightvnc/trunk/Makefile 2009-09-09 16:51:21 UTC (rev 6246) @@ -38,14 +38,16 @@ EXTRA_INCLUDES = $(EXTRA_INC) EXTRA_LDFLAGS = /opt/csw/lib LOCAL_LDFLAGS = $(LINKER_FLAGS) -BUILD_OVERRIDE_DIRS = EXTRA_DEFINES EXTRA_INCLUDES LOCAL_LDFLAGS +EXTRA_LIBRARIES = -lwrap -lsocket +BUILD_OVERRIDE_DIRS = EXTRA_DEFINES EXTRA_INCLUDES LOCAL_LDFLAGS EXTRA_LIBRARIES CONFIGURE_SCRIPTS = vnc -BUILD_SCRIPTS = maciej +BUILD_SCRIPTS = vnc TEST_SCRIPTS = INSTALL_SCRIPTS = vnc PATCHFILES = 0001-Sun-compiler-in-sun.cf.patch PATCHFILES += 0003-GNU-make-by-default.patch PATCHFILES += 0003-libdix.a-after-libos.a.patch +PATCHFILES += 0001-Force-the-use-of-libwrap.patch include gar/category.mk @@ -57,7 +59,7 @@ (cd $(WORKSRC) && $(CONFIGURE_ENV) xmkmf) @$(MAKECOOKIE) -build-maciej: +build-vnc: (cd $(WORKSRC) && $(BUILD_ENV) \ EXTRA_INCLUDES="-I/opt/csw/include" \ LOCAL_LDFLAGS="-L/opt/csw/lib" \ @@ -69,17 +71,11 @@ LOCAL_LDFLAGS="-L/opt/csw/lib" \ ./configure) (cd $(WORKSRC)/Xvnc && $(BUILD_ENV) \ - EXTRA_INCLUDES="-I/opt/csw/include" \ + EXTRA_LIBRARIES="-lwrap -lsocket" \ + EXTRA_DEFINES="-DUSE_LIBWRAP=1" \ LOCAL_LDFLAGS="-L/opt/csw/lib" \ - gmake) - # This is something that Dago wanted to do, but it causes the build to - # fail. I'm leaving it for future reference. - # (cd $(WORKSRC)/Xvnc && $(BUILD_ENV) \ - # EXTRA_LIBRARIES="-lwrap -lsocket" \ - # EXTRA_DEFINES="-DUSE_LIBWRAP=1" \ - # LOCAL_LDFLAGS="-L/opt/csw/lib" \ - # EXTRA_INCLUDES="-I/opt/csw/include" \ - # $(MAKE)) + EXTRA_INCLUDES="-I/opt/csw/include" \ + $(MAKE)) install-vnc: ginstall -d $(DESTDIR)$(bindir) Modified: csw/mgar/pkg/tightvnc/trunk/checksums =================================================================== --- csw/mgar/pkg/tightvnc/trunk/checksums 2009-09-09 15:30:27 UTC (rev 6245) +++ csw/mgar/pkg/tightvnc/trunk/checksums 2009-09-09 16:51:21 UTC (rev 6246) @@ -1,3 +1,4 @@ +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 Added: csw/mgar/pkg/tightvnc/trunk/files/0001-Force-the-use-of-libwrap.patch =================================================================== --- csw/mgar/pkg/tightvnc/trunk/files/0001-Force-the-use-of-libwrap.patch (rev 0) +++ csw/mgar/pkg/tightvnc/trunk/files/0001-Force-the-use-of-libwrap.patch 2009-09-09 16:51:21 UTC (rev 6246) @@ -0,0 +1,25 @@ +From dd810a41debde8e4e24241a87b7ba19766407032 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Wed, 9 Sep 2009 18:18:18 +0200 +Subject: [PATCH] Force the use of libwrap + +--- + Xvnc/config/cf/vnclibs.def | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Xvnc/config/cf/vnclibs.def b/Xvnc/config/cf/vnclibs.def +index c033ca7..948fd7a 100644 +--- a/Xvnc/config/cf/vnclibs.def ++++ b/Xvnc/config/cf/vnclibs.def +@@ -11,7 +11,7 @@ VNCLIBS = $(TOP)/../libvncauth/libvncauth.a + /* Avoid linking with different libjpeg in /usr/shlib under Tru64. */ + VNCSYSLIBS = /usr/local/lib/libjpeg.a /usr/local/lib/libz.a -lcrypt + #else +-VNCSYSLIBS = -L/usr/local/lib -ljpeg -lz -lcrypt ++VNCSYSLIBS = -L/usr/local/lib -ljpeg -lz -lcrypt -lwrap + #endif + + VNCCPPFLAGS = -I$(TOP)/../include -I/usr/local/include +-- +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 Wed Sep 9 22:03:32 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 09 Sep 2009 20:03:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[6247] csw/mgar/pkg/myodbc/trunk/Makefile Message-ID: Revision: 6247 http://gar.svn.sourceforge.net/gar/?rev=6247&view=rev Author: wahwah Date: 2009-09-09 20:03:32 +0000 (Wed, 09 Sep 2009) Log Message: ----------- myodbc: Add /opt/csw/mysql5/lib/mysql to the runtime library search path Modified Paths: -------------- csw/mgar/pkg/myodbc/trunk/Makefile Modified: csw/mgar/pkg/myodbc/trunk/Makefile =================================================================== --- csw/mgar/pkg/myodbc/trunk/Makefile 2009-09-09 16:51:21 UTC (rev 6246) +++ csw/mgar/pkg/myodbc/trunk/Makefile 2009-09-09 20:03:32 UTC (rev 6247) @@ -40,6 +40,7 @@ CONFIGURE_ARGS += --with-unixODBC=/opt/csw --with-mysql-path=/opt/csw/mysql5 --enable-gui=no CONFIGURE_ARGS += --with-odbc-ini=/etc/opt/csw EXTRA_INC = $(abspath $(WORKDIR))/mysql-5.0.84/include +EXTRA_LD_OPTIONS = -R/opt/csw/mysql5/lib/mysql include gar/category.mk SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(PATCHLEVEL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Sep 10 02:11:57 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 10 Sep 2009 00:11:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[6248] csw/mgar/pkg/sgml-xml-common/trunk/Makefile Message-ID: Revision: 6248 http://gar.svn.sourceforge.net/gar/?rev=6248&view=rev Author: bdwalton Date: 2009-09-10 00:11:57 +0000 (Thu, 10 Sep 2009) Log Message: ----------- sgml-xml-common: add gar v2 variables Modified Paths: -------------- csw/mgar/pkg/sgml-xml-common/trunk/Makefile Modified: csw/mgar/pkg/sgml-xml-common/trunk/Makefile =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/Makefile 2009-09-09 20:03:32 UTC (rev 6247) +++ csw/mgar/pkg/sgml-xml-common/trunk/Makefile 2009-09-10 00:11:57 UTC (rev 6248) @@ -14,6 +14,22 @@ PREREQUISITE_PKGS = CSWautomake CSWautoconf +PACKAGES = CSWxmlcommon CSWsgmlcommon + +SPKG_DESC_CSWsgmlcommon = A collection of sgml entities and DTDs +SPKG_DESC_CSWxmlcommon = A collection of xml entities and DTDs + +CATALOGNAME_CSWsgmlcommon = sgmlcommon +CATALOGNAME_CSWxmlcommon = xmlcommon + +PKGFILES_CSWsgmlcommon = .*sgmlwhich.* .*install-catalog.* +PKGFILES_CSWsgmlcommon += /opt/csw/share/sgml/.* /etc/opt/csw/sgml/.* +PKGFILES_CSWsgmlcommon += /opt/csw/share/doc/sgml.* + +PKGFILES_CSWxmlcommon = /etc/opt/csw/xml/.* /opt/csw/share/xml.* .*xmlcatalog + +REQUIRED_PKGS_CSWsgmlcommon = CSWbash CSWggrep CSWgsed + EXTRA_FILES = xml.dcl html.dcl xml.soc html.soc MASTER_SITES = ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/ 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 Sep 10 02:14:20 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 10 Sep 2009 00:14:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[6249] csw/mgar/pkg/sgml-xml-common/trunk/files Message-ID: Revision: 6249 http://gar.svn.sourceforge.net/gar/?rev=6249&view=rev Author: bdwalton Date: 2009-09-10 00:14:20 +0000 (Thu, 10 Sep 2009) Log Message: ----------- sgml-xml-common: remove old manual prototypes, etc Removed Paths: ------------- csw/mgar/pkg/sgml-xml-common/trunk/files/CSWsgmlcommon.depend csw/mgar/pkg/sgml-xml-common/trunk/files/CSWsgmlcommon.gspec csw/mgar/pkg/sgml-xml-common/trunk/files/CSWsgmlcommon.prototype csw/mgar/pkg/sgml-xml-common/trunk/files/CSWxmlcommon.gspec csw/mgar/pkg/sgml-xml-common/trunk/files/CSWxmlcommon.prototype Deleted: csw/mgar/pkg/sgml-xml-common/trunk/files/CSWsgmlcommon.depend =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/files/CSWsgmlcommon.depend 2009-09-10 00:11:57 UTC (rev 6248) +++ csw/mgar/pkg/sgml-xml-common/trunk/files/CSWsgmlcommon.depend 2009-09-10 00:14:20 UTC (rev 6249) @@ -1,5 +0,0 @@ -P CSWbash bash - A sh-compatible command language interpreter -P CSWggrep ggrep - GNU grep -P CSWgsed gsed - The GNU non-interactive text Stream-oriented EDitor (sed) - - Deleted: csw/mgar/pkg/sgml-xml-common/trunk/files/CSWsgmlcommon.gspec =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/files/CSWsgmlcommon.gspec 2009-09-10 00:11:57 UTC (rev 6248) +++ csw/mgar/pkg/sgml-xml-common/trunk/files/CSWsgmlcommon.gspec 2009-09-10 00:14:20 UTC (rev 6249) @@ -1,5 +0,0 @@ -%var bitname sgmlcommon -%var pkgname CSWsgmlcommon -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/sgml-xml-common/trunk/files/CSWsgmlcommon.prototype =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/files/CSWsgmlcommon.prototype 2009-09-10 00:11:57 UTC (rev 6248) +++ csw/mgar/pkg/sgml-xml-common/trunk/files/CSWsgmlcommon.prototype 2009-09-10 00:14:20 UTC (rev 6249) @@ -1,46 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/install-catalog 0755 root bin -f none /opt/csw/bin/sgmlwhich 0755 root bin -d none /opt/csw/etc 0755 root bin -d none /opt/csw/etc/sgml 0755 root bin -f none /opt/csw/etc/sgml/sgml.conf 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/doc 0755 root bin -d none /opt/csw/share/doc/sgml-common-0.6.3 0755 root bin -d none /opt/csw/share/doc/sgml-common-0.6.3/html 0755 root bin -f none /opt/csw/share/doc/sgml-common-0.6.3/html/fdl.html 0644 root bin -f none /opt/csw/share/doc/sgml-common-0.6.3/html/index.html 0644 root bin -f none /opt/csw/share/doc/sgml-common-0.6.3/html/install-catalog.html 0644 root bin -f none /opt/csw/share/doc/sgml-common-0.6.3/html/introduction.html 0644 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man8 0755 root bin -f none /opt/csw/share/man/man8/install-catalog.8 0644 root bin -d none /opt/csw/share/sgml 0755 root bin -f none /opt/csw/share/sgml/html.dcl 0644 root bin -f none /opt/csw/share/sgml/html.soc 0644 root bin -d none /opt/csw/share/sgml/sgml-iso-entities-8879.1986 0755 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISOamsa.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISOamsb.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISOamsc.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISOamsn.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISOamso.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISOamsr.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISObox.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISOcyr1.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISOcyr2.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISOdia.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISOgrk1.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISOgrk2.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISOgrk3.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISOgrk4.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISOlat1.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISOlat2.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISOnum.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISOpub.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISOtech.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/catalog 0644 root bin -f none /opt/csw/share/sgml/xml.dcl 0644 root bin -f none /opt/csw/share/sgml/xml.soc 0644 root bin -i copyright=CSWsgmlcommon.copyright -i depend=CSWsgmlcommon.depend -i pkginfo=CSWsgmlcommon.pkginfo Deleted: csw/mgar/pkg/sgml-xml-common/trunk/files/CSWxmlcommon.gspec =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/files/CSWxmlcommon.gspec 2009-09-10 00:11:57 UTC (rev 6248) +++ csw/mgar/pkg/sgml-xml-common/trunk/files/CSWxmlcommon.gspec 2009-09-10 00:14:20 UTC (rev 6249) @@ -1,5 +0,0 @@ -%var bitname xmlcommon -%var pkgname CSWxmlcommon -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/sgml-xml-common/trunk/files/CSWxmlcommon.prototype =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/files/CSWxmlcommon.prototype 2009-09-10 00:11:57 UTC (rev 6248) +++ csw/mgar/pkg/sgml-xml-common/trunk/files/CSWxmlcommon.prototype 2009-09-10 00:14:20 UTC (rev 6249) @@ -1,11 +0,0 @@ -d none /opt/csw/etc 0755 root bin -d none /opt/csw/etc/xml 0755 root bin -f none /opt/csw/etc/xml/catalog 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/sgml 0755 root bin -d none /opt/csw/share/sgml/docbook 0755 root bin -f none /opt/csw/share/sgml/docbook/xmlcatalog 0644 root bin -d none /opt/csw/share/xml 0755 root bin -i copyright=CSWxmlcommon.copyright -i depend=CSWxmlcommon.depend -i pkginfo=CSWxmlcommon.pkginfo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Sep 10 02:15:58 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 10 Sep 2009 00:15:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[6250] csw/mgar/pkg/sgml-xml-common/trunk/files/ sgmlwhich-sanity.patch Message-ID: Revision: 6250 http://gar.svn.sourceforge.net/gar/?rev=6250&view=rev Author: bdwalton Date: 2009-09-10 00:15:58 +0000 (Thu, 10 Sep 2009) Log Message: ----------- sgml-xml-common: update patch (/opt/csw/etc -> /etc/opt/csw) Modified Paths: -------------- csw/mgar/pkg/sgml-xml-common/trunk/files/sgmlwhich-sanity.patch Modified: csw/mgar/pkg/sgml-xml-common/trunk/files/sgmlwhich-sanity.patch =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/files/sgmlwhich-sanity.patch 2009-09-10 00:14:20 UTC (rev 6249) +++ csw/mgar/pkg/sgml-xml-common/trunk/files/sgmlwhich-sanity.patch 2009-09-10 00:15:58 UTC (rev 6250) @@ -6,5 +6,5 @@ -echo "/etc/sgml/sgml.conf" +# modified for CSW (this should be handled with autoconf, but i'm lazy) -+echo "/opt/csw/etc/sgml/sgml.conf" ++echo "/etc/opt/csw/sgml/sgml.conf" # Simple, isn't it? ;-) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Sep 10 02:26:26 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 10 Sep 2009 00:26:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[6251] csw/mgar/pkg/sgml-xml-common/trunk/Makefile Message-ID: Revision: 6251 http://gar.svn.sourceforge.net/gar/?rev=6251&view=rev Author: bdwalton Date: 2009-09-10 00:26:26 +0000 (Thu, 10 Sep 2009) Log Message: ----------- sgml-xml-common: remove distfiles related to gar v1 stuff Modified Paths: -------------- csw/mgar/pkg/sgml-xml-common/trunk/Makefile Modified: csw/mgar/pkg/sgml-xml-common/trunk/Makefile =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/Makefile 2009-09-10 00:15:58 UTC (rev 6250) +++ csw/mgar/pkg/sgml-xml-common/trunk/Makefile 2009-09-10 00:26:26 UTC (rev 6251) @@ -34,8 +34,6 @@ MASTER_SITES = ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/ DISTFILES = $(GARNAME)-$(GARVERSION).tgz -DISTFILES += CSWsgmlcommon.gspec CSWsgmlcommon.prototype CSWsgmlcommon.depend -DISTFILES += CSWxmlcommon.gspec CSWxmlcommon.prototype DISTFILES += $(EXTRA_FILES) # 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 bdwalton at users.sourceforge.net Thu Sep 10 02:27:44 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 10 Sep 2009 00:27:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[6252] csw/mgar/pkg/sgml-xml-common/trunk/checksums Message-ID: Revision: 6252 http://gar.svn.sourceforge.net/gar/?rev=6252&view=rev Author: bdwalton Date: 2009-09-10 00:27:44 +0000 (Thu, 10 Sep 2009) Log Message: ----------- sgml-xml-common: update makesums Modified Paths: -------------- csw/mgar/pkg/sgml-xml-common/trunk/checksums Modified: csw/mgar/pkg/sgml-xml-common/trunk/checksums =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/checksums 2009-09-10 00:26:26 UTC (rev 6251) +++ csw/mgar/pkg/sgml-xml-common/trunk/checksums 2009-09-10 00:27:44 UTC (rev 6252) @@ -1,21 +1,16 @@ -103c9828f24820df86e55e7862e28974 download/sgml-common-0.6.3.tgz -8344f78748603b2870f2d7f401ef49eb download/CSWsgmlcommon.gspec -fc5cd6cb77e22b8a1e21d0d9f662f891 download/CSWsgmlcommon.prototype -48a802f691734579ef4afefaad1a5423 download/CSWsgmlcommon.depend -f68c56d0904b311d4d254130a63eeee6 download/CSWxmlcommon.gspec -cd5928d3ad12438a4725b3469a6b98fd download/CSWxmlcommon.prototype -9ef2e183281920ecced665a3f644bace download/xml.dcl +99ac766ea29643aa33236a39596d943c download/configure-man.patch +458bbce42a19fe1aa8066e1c7175f144 download/configure-sgml-conf.patch e0135e28b7f6c566a3e0ee379528091b download/html.dcl -8f56c7a27cbe7c8251a385ddb90dd641 download/xml.soc cc6d164ed52f3d96f8e520255bf650ff download/html.soc +12b32f2a5ad0ab2edb70bfb83f3aecd6 download/install-catalog-man.patch +78febdc7f5b8535ef5e90e2c94a6e804 download/install-catalog-sanity.patch 7296f5f2cf78a74f94f5e1ceb48e3555 download/sgml-common-0.6.3-docdir.patch +103c9828f24820df86e55e7862e28974 download/sgml-common-0.6.3.tgz dcda4302e1b43256a55a658280651f42 download/sgml-common-automake.patch 24ff49d6310889d0f423b35893623151 download/sgml-common-quotes.patch b51552a733ae70753b6e7ea997a4e482 download/sgml-common-umask.patch d36dcc47efa67f41d7e406386754bb67 download/sgml-common-xmldir.patch -78febdc7f5b8535ef5e90e2c94a6e804 download/install-catalog-sanity.patch -b35d53333ca6dbc6cd96f0135cd4f85d download/sgmlwhich-sanity.patch -99ac766ea29643aa33236a39596d943c download/configure-man.patch -12b32f2a5ad0ab2edb70bfb83f3aecd6 download/install-catalog-man.patch 267d4e173f9a1e4c75fd65733b179449 download/sgml-conf-autoconf.patch -458bbce42a19fe1aa8066e1c7175f144 download/configure-sgml-conf.patch +fa04b53ee341326b32adced251214485 download/sgmlwhich-sanity.patch +9ef2e183281920ecced665a3f644bace download/xml.dcl +8f56c7a27cbe7c8251a385ddb90dd641 download/xml.soc 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 Sep 10 02:47:09 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 10 Sep 2009 00:47:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[6253] csw/mgar/pkg/sgml-xml-common/trunk/Makefile Message-ID: Revision: 6253 http://gar.svn.sourceforge.net/gar/?rev=6253&view=rev Author: bdwalton Date: 2009-09-10 00:47:09 +0000 (Thu, 10 Sep 2009) Log Message: ----------- sgml-xml-common: archall = 1 Modified Paths: -------------- csw/mgar/pkg/sgml-xml-common/trunk/Makefile Modified: csw/mgar/pkg/sgml-xml-common/trunk/Makefile =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/Makefile 2009-09-10 00:27:44 UTC (rev 6252) +++ csw/mgar/pkg/sgml-xml-common/trunk/Makefile 2009-09-10 00:47:09 UTC (rev 6253) @@ -14,6 +14,8 @@ PREREQUISITE_PKGS = CSWautomake CSWautoconf +ARCHALL = 1 + PACKAGES = CSWxmlcommon CSWsgmlcommon SPKG_DESC_CSWsgmlcommon = A collection of sgml entities and DTDs 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 Sep 10 03:00:17 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 10 Sep 2009 01:00:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[6254] csw/mgar/pkg/sgml-xml-common/trunk/Makefile Message-ID: Revision: 6254 http://gar.svn.sourceforge.net/gar/?rev=6254&view=rev Author: bdwalton Date: 2009-09-10 01:00:16 +0000 (Thu, 10 Sep 2009) Log Message: ----------- sgml-xml-common: use post-install-modulated, not post-install Modified Paths: -------------- csw/mgar/pkg/sgml-xml-common/trunk/Makefile Modified: csw/mgar/pkg/sgml-xml-common/trunk/Makefile =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/Makefile 2009-09-10 00:47:09 UTC (rev 6253) +++ csw/mgar/pkg/sgml-xml-common/trunk/Makefile 2009-09-10 01:00:16 UTC (rev 6254) @@ -75,7 +75,7 @@ automake --add-missing --copy ) @$(MAKECOOKIE) -post-install: +post-install-modulated: # this is almost 100% copy from the sgml-common rpm spec from rhel5 mkdir -p $(DESTDIR)/$(sysconfdir)/xml mkdir -p $(DESTDIR)/$(datadir)/sgml/docbook @@ -98,7 +98,6 @@ "http://www.oasis-open.org/docbook/" \ "file://$(datadir)/sgml/docbook/xmlcatalog" $(XMLCATALOG) # Also create the common DocBook catalog - xmlcatalog --noout --create \ $(DESTDIR)/$(datadir)/sgml/docbook/xmlcatalog rm -f $(DESTDIR)/$(datadir)/sgml/xml.dcl 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 Sep 10 09:38:16 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 10 Sep 2009 07:38:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[6255] csw/mgar/pkg/firefox/trunk Message-ID: Revision: 6255 http://gar.svn.sourceforge.net/gar/?rev=6255&view=rev Author: wbonnet Date: 2009-09-10 07:38:16 +0000 (Thu, 10 Sep 2009) Log Message: ----------- Upgrade to 3.0.14 Modified Paths: -------------- csw/mgar/pkg/firefox/trunk/Makefile csw/mgar/pkg/firefox/trunk/files/.mozconfig Modified: csw/mgar/pkg/firefox/trunk/Makefile =================================================================== --- csw/mgar/pkg/firefox/trunk/Makefile 2009-09-10 01:00:16 UTC (rev 6254) +++ csw/mgar/pkg/firefox/trunk/Makefile 2009-09-10 07:38:16 UTC (rev 6255) @@ -1,5 +1,5 @@ GARNAME = firefox -GARVERSION = 3.0.13 +GARVERSION = 3.0.14 CATEGORIES = x11 DISTNAME = $(GARNAME) Modified: csw/mgar/pkg/firefox/trunk/files/.mozconfig =================================================================== --- csw/mgar/pkg/firefox/trunk/files/.mozconfig 2009-09-10 01:00:16 UTC (rev 6254) +++ csw/mgar/pkg/firefox/trunk/files/.mozconfig 2009-09-10 07:38:16 UTC (rev 6255) @@ -20,6 +20,7 @@ ac_add_options --enable-canvas ac_add_options --enable-system-cairo ac_add_options --disable-pthreads +ac_add_options --enable-system-sqlite ac_add_options --enable-official-branding #ac_add_options --enable-xinerama 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 Sep 10 14:17:31 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 10 Sep 2009 12:17:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[6256] csw/mgar/pkg/cups/branches/cups-1.4 Message-ID: Revision: 6256 http://gar.svn.sourceforge.net/gar/?rev=6256&view=rev Author: wahwah Date: 2009-09-10 12:17:30 +0000 (Thu, 10 Sep 2009) Log Message: ----------- cups: Displaying information about /etc/opt/csw in preinstall scripts. Dropping a note if appropriate. Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4/Makefile csw/mgar/pkg/cups/branches/cups-1.4/checksums Added Paths: ----------- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.preinstall csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.preinstall Removed Paths: ------------- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.postinstall csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.postinstall Modified: csw/mgar/pkg/cups/branches/cups-1.4/Makefile =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-10 07:38:16 UTC (rev 6255) +++ csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-10 12:17:30 UTC (rev 6256) @@ -27,8 +27,8 @@ PATCHFILES = 0001-Makefile.patch DISTFILES = cups-$(GARVERSION)-source.tar.bz2 $(PATCHFILES) -DISTFILES += CSWcupsclient.postinstall -DISTFILES += CSWcupsd.postinstall +DISTFILES += CSWcupsclient.preinstall +DISTFILES += CSWcupsd.preinstall DISTFILES += CSWcupsd.postremove PREREQUISITE_PKGS = CSWggettext Modified: csw/mgar/pkg/cups/branches/cups-1.4/checksums =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-09-10 07:38:16 UTC (rev 6255) +++ csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-09-10 12:17:30 UTC (rev 6256) @@ -1,5 +1,5 @@ 682e10ff0ab0e094c3de2061369038bc download/0001-Makefile.patch -e950ccba9b35ca698de7c52ba1c54688 download/CSWcupsclient.postinstall -e950ccba9b35ca698de7c52ba1c54688 download/CSWcupsd.postinstall +8418cf872043eada2d46c8db6e6451c0 download/CSWcupsclient.preinstall ca7718998e56c320c08a77cfefe046f6 download/CSWcupsd.postremove +8418cf872043eada2d46c8db6e6451c0 download/CSWcupsd.preinstall bc5e777d4320cecdd1a64de8035171a8 download/cups-1.4.0-source.tar.bz2 Deleted: csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.postinstall =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.postinstall 2009-09-10 07:38:16 UTC (rev 6255) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.postinstall 2009-09-10 12:17:30 UTC (rev 6256) @@ -1,14 +0,0 @@ -#!/bin/sh -# -# $Id$ -# - -if [ -d "${PKG_INSTALL_ROOT}/opt/csw/etc/cups" ]; then - echo - echo "*************************************************************" - echo "* The old configuration directory /opt/csw/etc/cups exists. *" - echo "* Please move your configuration to /etc/opt/csw/cups. *" - echo "*************************************************************" - echo - exit 1 -fi Copied: csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.preinstall (from rev 6255, csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.postinstall) =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.preinstall (rev 0) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.preinstall 2009-09-10 12:17:30 UTC (rev 6256) @@ -0,0 +1,34 @@ +#!/bin/sh +# vim:set sw=2 ts=2 sts=2 expandtab: +# +# $Id$ +# + +obsolete_dir_information=" +This configuration directory is obsolete. Current CUPS package is using the +/etc/opt/csw/cups directory. Files in this directory are going to be ignored. +Please move your configuration to /etc/opt/csw/cups. + +Feel free to remove this file afterwards. +" +obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE" + +if [ -d "${PKG_INSTALL_ROOT}/opt/csw/etc/cups" ]; then + echo + echo "*******************************************************************" + echo "* The old configuration directory /opt/csw/etc/cups still exists. *" + echo "* Please move your configuration to /etc/opt/csw/cups. *" + echo "* *" + echo "* Installation will continue in 10 seconds. *" + echo "* Press CTRL+C if you want to stop now. *" + echo "*******************************************************************" + echo + sleep 10 + + # Leaving a note for the sysadmin if the they proceed with the installation. + fn="${PKG_INSTALL_ROOT}/opt/csw/etc/cups/${obsolete_dir_file_name}" + if touch "${fn}" 2>/dev/null; then + echo "${obsolete_dir_information}" > "${fn}" + fi + exit 0 +fi Deleted: csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.postinstall =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.postinstall 2009-09-10 07:38:16 UTC (rev 6255) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.postinstall 2009-09-10 12:17:30 UTC (rev 6256) @@ -1,14 +0,0 @@ -#!/bin/sh -# -# $Id$ -# - -if [ -d "${PKG_INSTALL_ROOT}/opt/csw/etc/cups" ]; then - echo - echo "*************************************************************" - echo "* The old configuration directory /opt/csw/etc/cups exists. *" - echo "* Please move your configuration to /etc/opt/csw/cups. *" - echo "*************************************************************" - echo - exit 1 -fi Copied: csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.preinstall (from rev 6255, csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.postinstall) =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.preinstall (rev 0) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.preinstall 2009-09-10 12:17:30 UTC (rev 6256) @@ -0,0 +1,34 @@ +#!/bin/sh +# vim:set sw=2 ts=2 sts=2 expandtab: +# +# $Id$ +# + +obsolete_dir_information=" +This configuration directory is obsolete. Current CUPS package is using the +/etc/opt/csw/cups directory. Files in this directory are going to be ignored. +Please move your configuration to /etc/opt/csw/cups. + +Feel free to remove this file afterwards. +" +obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE" + +if [ -d "${PKG_INSTALL_ROOT}/opt/csw/etc/cups" ]; then + echo + echo "*******************************************************************" + echo "* The old configuration directory /opt/csw/etc/cups still exists. *" + echo "* Please move your configuration to /etc/opt/csw/cups. *" + echo "* *" + echo "* Installation will continue in 10 seconds. *" + echo "* Press CTRL+C if you want to stop now. *" + echo "*******************************************************************" + echo + sleep 10 + + # Leaving a note for the sysadmin if the they proceed with the installation. + fn="${PKG_INSTALL_ROOT}/opt/csw/etc/cups/${obsolete_dir_file_name}" + if touch "${fn}" 2>/dev/null; then + echo "${obsolete_dir_information}" > "${fn}" + fi + exit 0 +fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Sep 10 16:30:51 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 10 Sep 2009 14:30:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[6257] csw/mgar/pkg Message-ID: Revision: 6257 http://gar.svn.sourceforge.net/gar/?rev=6257&view=rev Author: dmichelsen Date: 2009-09-10 14:30:50 +0000 (Thu, 10 Sep 2009) Log Message: ----------- tcsh: Initial commit Added Paths: ----------- csw/mgar/pkg/tcsh/ csw/mgar/pkg/tcsh/branches/ csw/mgar/pkg/tcsh/tags/ csw/mgar/pkg/tcsh/trunk/ csw/mgar/pkg/tcsh/trunk/Makefile csw/mgar/pkg/tcsh/trunk/checksums csw/mgar/pkg/tcsh/trunk/files/ csw/mgar/pkg/tcsh/trunk/files/CSWtcsh.postinstall csw/mgar/pkg/tcsh/trunk/files/CSWtcsh.postremove Property changes on: csw/mgar/pkg/tcsh/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/tcsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcsh/trunk/Makefile (rev 0) +++ csw/mgar/pkg/tcsh/trunk/Makefile 2009-09-10 14:30:50 UTC (rev 6257) @@ -0,0 +1,33 @@ +GARNAME = tcsh +GARVERSION = 6.17.00 +CATEGORIES = apps + +DESCRIPTION = Enhanced version of the Berkeley C shell (csh) +define BLURB + Tcsh is an enhanced, but completely compatible version of the Berkeley UNIX C shell (csh). + It is a command language interpreter usable both as an interactive login shell and a shell + script command processor. It includes a command-line editor, programmable word completion, + spelling correction, a history mechanism, job control and a C-like syntax. +endef + +MASTER_SITES = ftp://ftp.astron.com/pub/tcsh/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += CSWtcsh.postinstall +DISTFILES += CSWtcsh.postremove + +# 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.tcsh.org/ + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +# Skip tests until this one is fixed: +# http://bugs.gw.com/view.php?id=87 +SKIPTEST = 1 + +INSTALL_ARGS = install.man + +include gar/category.mk Added: csw/mgar/pkg/tcsh/trunk/checksums =================================================================== --- csw/mgar/pkg/tcsh/trunk/checksums (rev 0) +++ csw/mgar/pkg/tcsh/trunk/checksums 2009-09-10 14:30:50 UTC (rev 6257) @@ -0,0 +1,3 @@ +241bfedfd51c5a02581dc60caba3386d download/CSWtcsh.postinstall +9400adc4cb0311fd60635399760926bb download/CSWtcsh.postremove +c47de903e3d52f6824c8dd0c91eeb477 download/tcsh-6.17.00.tar.gz Added: csw/mgar/pkg/tcsh/trunk/files/CSWtcsh.postinstall =================================================================== --- csw/mgar/pkg/tcsh/trunk/files/CSWtcsh.postinstall (rev 0) +++ csw/mgar/pkg/tcsh/trunk/files/CSWtcsh.postinstall 2009-09-10 14:30:50 UTC (rev 6257) @@ -0,0 +1,52 @@ +#!/bin/sh +PATH=/usr/bin +export PATH + +SHELLS=/etc/shells +TCSH=/opt/csw/bin/tcsh + +if [ -z "${PKG_INSTALL_ROOT}" -o "${PKG_INSTALL_ROOT}" = "/" ] +then + RSHELLS=${SHELLS} + RTCSH=${TCSH} +else + RSHELLS=${PKG_INSTALL_ROOT}${SHELLS} + RTCSH=${TCSH} +fi + +if [ -f "${RSHELLS}" ]; then + echo "${RSHELLS} already exists." +else + cat > ${RSHELLS} < /dev/null 2>&1; then + echo "${RSHELLS} UNCHANGED because entry ${RTCSH} already exists." +else + echo "${RTCSH} # Added by CSWtcsh" >> ${RSHELLS} + echo "ADDED ${RTCSH} to ${RSHELLS}." +fi Added: csw/mgar/pkg/tcsh/trunk/files/CSWtcsh.postremove =================================================================== --- csw/mgar/pkg/tcsh/trunk/files/CSWtcsh.postremove (rev 0) +++ csw/mgar/pkg/tcsh/trunk/files/CSWtcsh.postremove 2009-09-10 14:30:50 UTC (rev 6257) @@ -0,0 +1,22 @@ +#!/bin/sh +PATH=/usr/bin +export PATH + +SHELLS=/etc/shells +TCSH=/opt/csw/bin/tcsh + +if [ -z "${PKG_INSTALL_ROOT}" -o "${PKG_INSTALL_ROOT}" = "/" ] +then + RSHELLS=${SHELLS} + RTCSH=${TCSH} +else + RSHELLS=${PKG_INSTALL_ROOT}${SHELLS} + RTCSH=${TCSH} +fi + +if /usr/bin/grep "^${RTCSH}" ${RSHELLS} > /dev/null 2>&1; then + /usr/bin/perl -i -pwe '$_ = "" if m%^'${RTCSH}'%' ${RSHELLS} + echo "REMOVED ${RTCSH} from ${RSHELLS}." +else + echo "${RSHELLS} UNCHANGED because it did not contain entry ${RTCSH}." +fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Sep 10 16:36:36 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 10 Sep 2009 14:36:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[6258] csw/mgar/pkg/tcsh/trunk/Makefile Message-ID: Revision: 6258 http://gar.svn.sourceforge.net/gar/?rev=6258&view=rev Author: dmichelsen Date: 2009-09-10 14:36:36 +0000 (Thu, 10 Sep 2009) Log Message: ----------- tcsh: Add missing dependency Modified Paths: -------------- csw/mgar/pkg/tcsh/trunk/Makefile Modified: csw/mgar/pkg/tcsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcsh/trunk/Makefile 2009-09-10 14:30:50 UTC (rev 6257) +++ csw/mgar/pkg/tcsh/trunk/Makefile 2009-09-10 14:36:36 UTC (rev 6258) @@ -18,6 +18,8 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +REQUIRED_PKGS = CSWiconv + SPKG_SOURCEURL = http://www.tcsh.org/ CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Sep 10 16:44:20 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 10 Sep 2009 14:44:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[6259] csw/mgar/pkg Message-ID: Revision: 6259 http://gar.svn.sourceforge.net/gar/?rev=6259&view=rev Author: dmichelsen Date: 2009-09-10 14:44:19 +0000 (Thu, 10 Sep 2009) Log Message: ----------- tcpwrappers: Adjust name and description Modified Paths: -------------- csw/mgar/pkg/tcpwrappers/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/tcpwrappers/ Removed Paths: ------------- csw/mgar/pkg/tcp_wrappers/ Property Changed: ---------------- csw/mgar/pkg/tcpwrappers/trunk/ Property changes on: csw/mgar/pkg/tcpwrappers/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/tcpwrappers/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcp_wrappers/trunk/Makefile 2009-09-08 06:50:46 UTC (rev 6223) +++ csw/mgar/pkg/tcpwrappers/trunk/Makefile 2009-09-10 14:44:19 UTC (rev 6259) @@ -2,7 +2,7 @@ GARVERSION = 7.6 CATEGORIES = lib -DESCRIPTION = Socket Wrappers +DESCRIPTION = Socket wrappers for pre-screening tcp connections (ipv6.4 patched) define BLURB Socket Wrappers is an improved version of tcp_wrappers by Wietse Venema. endef 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 Sep 11 02:04:28 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 11 Sep 2009 00:04:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[6260] csw/mgar/pkg/openjade/trunk Message-ID: Revision: 6260 http://gar.svn.sourceforge.net/gar/?rev=6260&view=rev Author: bdwalton Date: 2009-09-11 00:04:27 +0000 (Fri, 11 Sep 2009) Log Message: ----------- openjade: transition sysconfdir to /etc/opt/csw Modified Paths: -------------- csw/mgar/pkg/openjade/trunk/Makefile csw/mgar/pkg/openjade/trunk/checksums csw/mgar/pkg/openjade/trunk/files/CSWopenjade.postinstall csw/mgar/pkg/openjade/trunk/files/CSWopenjade.preremove Modified: csw/mgar/pkg/openjade/trunk/Makefile =================================================================== --- csw/mgar/pkg/openjade/trunk/Makefile 2009-09-10 14:44:19 UTC (rev 6259) +++ csw/mgar/pkg/openjade/trunk/Makefile 2009-09-11 00:04:27 UTC (rev 6260) @@ -35,13 +35,15 @@ CONFIGURE_ARGS = $(DIRPATHS) --disable-static CONFIGURE_ARGS += --datadir=$(datadir)/sgml/$(GARNAME) CONFIGURE_ARGS += --enable-splibdir=$(libdir) -CONFIGURE_ARGS += --enable-default-catalog=/opt/csw/etc/sgml/catalog +CONFIGURE_ARGS += --enable-default-catalog=$(sysconfdir)/sgml/catalog CONFIGURE_ARGS += --disable-static TEST_SCRIPTS = INSTALL_ARGS = install install-man +sysconfdir = /etc/opt/csw + include gar/category.mk sgmldir = $(DESTDIR)/$(datadir)/sgml/$(GARNAME) Modified: csw/mgar/pkg/openjade/trunk/checksums =================================================================== --- csw/mgar/pkg/openjade/trunk/checksums 2009-09-10 14:44:19 UTC (rev 6259) +++ csw/mgar/pkg/openjade/trunk/checksums 2009-09-11 00:04:27 UTC (rev 6260) @@ -1,4 +1,4 @@ +1539a69dfac961f0e419cf368f7428e1 download/CSWopenjade.postinstall +e229cb1006dca1505d85b43ff0501e2f download/CSWopenjade.preremove +ca3a0ff43d8ed182f432d723927cd2e9 download/openjade-1.3.1-nsl.patch 7df692e3186109cc00db6825b777201e download/openjade-1.3.2.tar.gz -6667b082aba6cb3ca4979da01af4f4e7 download/CSWopenjade.postinstall -6b1a129259142b0a41a39e984e7a4e43 download/CSWopenjade.preremove -ca3a0ff43d8ed182f432d723927cd2e9 download/openjade-1.3.1-nsl.patch Modified: csw/mgar/pkg/openjade/trunk/files/CSWopenjade.postinstall =================================================================== --- csw/mgar/pkg/openjade/trunk/files/CSWopenjade.postinstall 2009-09-10 14:44:19 UTC (rev 6259) +++ csw/mgar/pkg/openjade/trunk/files/CSWopenjade.postinstall 2009-09-11 00:04:27 UTC (rev 6260) @@ -1,6 +1,6 @@ #!/bin/sh -CONFCAT=/opt/csw/etc/sgml/openjade.soc +CONFCAT=/etc/opt/csw/sgml/openjade.soc CATALOG=/opt/csw/share/sgml/openjade/catalog insterror() @@ -8,7 +8,7 @@ cat < Revision: 6261 http://gar.svn.sourceforge.net/gar/?rev=6261&view=rev Author: bdwalton Date: 2009-09-11 00:31:04 +0000 (Fri, 11 Sep 2009) Log Message: ----------- docbook-dtds: update sysconfdir to /etc/opt/csw Modified Paths: -------------- csw/mgar/pkg/docbook-dtds/trunk/checksums csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove Modified: csw/mgar/pkg/docbook-dtds/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/checksums 2009-09-11 00:04:27 UTC (rev 6260) +++ csw/mgar/pkg/docbook-dtds/trunk/checksums 2009-09-11 00:31:04 UTC (rev 6261) @@ -1,5 +1,5 @@ -6be301db3001ff1ff49ce22187502c29 download/CSWdocbookdtds.postinstall -b531bfd5f43d49469f1bfe2daba471cf download/CSWdocbookdtds.preremove +e7ba1cae44ae889b32c326f0a46f2c81 download/CSWdocbookdtds.postinstall +da4b8f64c222276d2c291bf8afb20517 download/CSWdocbookdtds.preremove d22f42e2f4d073461f202a12fabb5b8a download/add_makefile.patch 9a7f5b1b7dd52d0ca4fb080619f0459c download/docbk30.zip 432749c0c806dbae81c8bcb70da3b5d3 download/docbk31.zip @@ -11,7 +11,6 @@ e3beb1b0b2923c24fa55a68e88654b01 download/docbook-4.3.zip f89e1bd0b2c7a361e3f1f739e16b5d0d download/docbook-4.4.zip 07c581f4bbcba6d3aac85360a19f95f7 download/docbook-4.5.zip -2411c19ed4fb141f3fa3d389fae40736 download/docbook-5.0.zip e3067045964536cc7445d5c3f1e99916 download/docbook-dtd30-sgml-1.0.catalog.patch 856d40f5d1e3fc8fd939b88bf5fedc87 download/docbook-dtd31-sgml-1.0.catalog.patch 8167663f53857ded5095768a85eee387 download/docbook-dtd40-sgml-1.0.catalog.patch Modified: csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall 2009-09-11 00:04:27 UTC (rev 6260) +++ csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall 2009-09-11 00:31:04 UTC (rev 6261) @@ -10,7 +10,7 @@ esac XMLCAT=/opt/csw/bin/xmlcatalog -CSWSGMLCNF=/opt/csw/etc/sgml +CSWSGMLCNF=/etc/opt/csw/sgml CSWSGML=/opt/csw/share/sgml ## Modified: csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove 2009-09-11 00:04:27 UTC (rev 6260) +++ csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove 2009-09-11 00:31:04 UTC (rev 6261) @@ -10,7 +10,7 @@ esac XMLCAT=/opt/csw/bin/xmlcatalog -CSWSGMLCNF=/opt/csw/etc/sgml +CSWSGMLCNF=/etc/opt/csw/sgml CSWSGML=/opt/csw/share/sgml ## 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 Sep 11 02:34:56 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 11 Sep 2009 00:34:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[6262] csw/mgar/pkg/docbook-dtds/trunk Message-ID: Revision: 6262 http://gar.svn.sourceforge.net/gar/?rev=6262&view=rev Author: bdwalton Date: 2009-09-11 00:34:56 +0000 (Fri, 11 Sep 2009) Log Message: ----------- docbook-dtds: update patch to new sysconfdir, strip docbook 5 stuff Modified Paths: -------------- csw/mgar/pkg/docbook-dtds/trunk/Makefile csw/mgar/pkg/docbook-dtds/trunk/checksums csw/mgar/pkg/docbook-dtds/trunk/files/add_makefile.patch Modified: csw/mgar/pkg/docbook-dtds/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/Makefile 2009-09-11 00:31:04 UTC (rev 6261) +++ csw/mgar/pkg/docbook-dtds/trunk/Makefile 2009-09-11 00:34:56 UTC (rev 6262) @@ -5,7 +5,7 @@ # version supplied in the package. GARNAME = docbookdtds -GARVERSION = 5.0 +GARVERSION = 4.5 CATEGORIES = xtra @@ -47,13 +47,12 @@ O_SRC += $(OASIS)/xml/4.2/ D_SRC = $(DOCBOOK)/sgml/4.3/ $(DOCBOOK)/xml/4.3/ $(DOCBOOK)/sgml/4.4/ D_SRC += $(DOCBOOK)/xml/4.4/ $(DOCBOOK)/sgml/4.5/ $(DOCBOOK)/xml/4.5/ -D_SRC += $(DOCBOOK)/xml/5.0/ # the various files we'll need to fetch from the various sources DBFILES = docbk30.zip docbk31.zip docbk40.zip docbk41.zip docbkx412.zip DBFILES += docbook-4.2.zip docbook-xml-4.2.zip docbook-4.3.zip DBFILES += docbook-xml-4.3.zip docbook-4.4.zip docbook-xml-4.4.zip -DBFILES += docbook-4.5.zip docbook-xml-4.5.zip docbook-5.0.zip +DBFILES += docbook-4.5.zip docbook-xml-4.5.zip MASTER_SITES = $(O_SRC) $(D_SRC) DISTFILES = $(DBFILES) @@ -146,13 +145,6 @@ unzip $(DOWNLOADDIR)/docbook-xml-4.5.zip -d $(WORKSRC)/4.5-xml @$(MAKECOOKIE) -zip-extract-docbook-5.0.zip: - ginstall -d $(WORKSRC)/5.0-xml - unzip $(DOWNLOADDIR)/docbook-5.0.zip -d $(WORKSRC)/5.0-xml - mv $(WORKSRC)/5.0-xml/docbook-5.0/* $(WORKSRC)/5.0-xml/ - rmdir $(WORKSRC)/5.0-xml/docbook-5.0 - @$(MAKECOOKIE) - post-extract: # Increase NAMELEN (bug #36058, bug #159382). [bug references from # rpm .spec file] Modified: csw/mgar/pkg/docbook-dtds/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/checksums 2009-09-11 00:31:04 UTC (rev 6261) +++ csw/mgar/pkg/docbook-dtds/trunk/checksums 2009-09-11 00:34:56 UTC (rev 6262) @@ -1,6 +1,6 @@ e7ba1cae44ae889b32c326f0a46f2c81 download/CSWdocbookdtds.postinstall da4b8f64c222276d2c291bf8afb20517 download/CSWdocbookdtds.preremove -d22f42e2f4d073461f202a12fabb5b8a download/add_makefile.patch +9b4a512082ff0851ad3d705072dd5523 download/add_makefile.patch 9a7f5b1b7dd52d0ca4fb080619f0459c download/docbk30.zip 432749c0c806dbae81c8bcb70da3b5d3 download/docbk31.zip fabcf7dd1d88b94797b7e5344389eab9 download/docbk40.zip Modified: csw/mgar/pkg/docbook-dtds/trunk/files/add_makefile.patch =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/add_makefile.patch 2009-09-11 00:31:04 UTC (rev 6261) +++ csw/mgar/pkg/docbook-dtds/trunk/files/add_makefile.patch 2009-09-11 00:34:56 UTC (rev 6262) @@ -1,8 +1,8 @@ --- /dev/null 2008-12-15 18:41:04.000000000 +0100 +++ docbookdtds-5.0/Makefile 2008-12-15 18:55:18.651895350 +0100 -@@ -0,0 +1,96 @@ +@@ -0,0 +1,84 @@ +prefix = /opt/csw -+sysconfdir = $(prefix)/etc ++sysconfdir = /etc/opt/csw +datadir = $(prefix)/share + + @@ -53,8 +53,6 @@ + [ -d $$dir ] || $(INSTALL_DIR) $$dir; \ + $(INSTALL_DATA) $$x.1-sgml/ChangeLog $$dir/; \ + done -+ $(INSTALL_DIR) $(DESTDIR)/$(docdir)/5.0 -+ cp -R 5.0-xml/docs/ $(DESTDIR)/$(docdir)/5.0/ + +inst-%-sgml: DD=$(DESTDIR)/$(docbookdir)/sgml-dtd-$* +inst-%-sgml: @@ -82,16 +80,6 @@ + $(INSTALL_DATA) ent/* $(DD)/ent/; \ + fi ) + -+inst-5.0-xml: DD=$(DESTDIR)/$(docbookdir)/xml-schemas-5.0 -+inst-5.0-xml: -+ @echo Installing 5.0-xml -+ @( cd 5.0-xml/; \ -+ gmkdir -p $(DD); \ -+ for d in dtd rng sch xsd; do \ -+ cp -R $$d $(DD); \ -+ done; \ -+ $(INSTALL_DATA) catalog.xml $(DD)/catalog; ) -+ +build: + @echo Nothing to build...dummy statement in action. + 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 Sep 11 02:45:21 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 11 Sep 2009 00:45:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[6263] csw/mgar/pkg/docbook-style-xsl/trunk Message-ID: Revision: 6263 http://gar.svn.sourceforge.net/gar/?rev=6263&view=rev Author: bdwalton Date: 2009-09-11 00:45:21 +0000 (Fri, 11 Sep 2009) Log Message: ----------- docbook-style-xsl: update sysconfdir to /etc/opt/csw Modified Paths: -------------- csw/mgar/pkg/docbook-style-xsl/trunk/checksums csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.preremove Modified: csw/mgar/pkg/docbook-style-xsl/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/checksums 2009-09-11 00:34:56 UTC (rev 6262) +++ csw/mgar/pkg/docbook-style-xsl/trunk/checksums 2009-09-11 00:45:21 UTC (rev 6263) @@ -1,4 +1,4 @@ -1b98827c1a02fcec57ec0f7376bb8815 download/CSWdocbookxsl.preremove +d3ed0cb0129de0b619aba6ab4d556126 download/CSWdocbookxsl.preremove 6c34caa4c60bf8bd16d6059fee60eb85 download/add_makefile.patch c77c0c317040b2f2e366842bd9df2218 download/docbook-xsl-1.74.3.tar.bz2 2a032a95fbf24367d13acc8210f9cd72 download/docbook-xsl-doc-1.74.3.tar.bz2 Modified: csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall 2009-09-11 00:34:56 UTC (rev 6262) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall 2009-09-11 00:45:21 UTC (rev 6263) @@ -12,7 +12,7 @@ DBHOME=/opt/csw/share/sgml/docbook -CATALOG=/opt/csw/etc/xml/catalog +CATALOG=/etc/opt/csw/xml/catalog #we need a version here, since that will be referenced in URLS being redirected VERSION=$(GARVERSION) Modified: csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.preremove =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.preremove 2009-09-11 00:34:56 UTC (rev 6262) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.preremove 2009-09-11 00:45:21 UTC (rev 6263) @@ -7,7 +7,7 @@ PATH=/opt/csw/bin:$PATH -CATALOG=/opt/csw/etc/xml/catalog +CATALOG=/etc/opt/csw/xml/catalog XMLCAT=/opt/csw/bin/xmlcatalog DBHOME=/opt/csw/share/sgml/docbook 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 Sep 11 10:48:23 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Sep 2009 08:48:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6264] csw/mgar/pkg/krb5/trunk Message-ID: Revision: 6264 http://gar.svn.sourceforge.net/gar/?rev=6264&view=rev Author: dmichelsen Date: 2009-09-11 08:48:23 +0000 (Fri, 11 Sep 2009) Log Message: ----------- krb5: Switch to dynamic gspec Modified Paths: -------------- csw/mgar/pkg/krb5/trunk/Makefile csw/mgar/pkg/krb5/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/krb5/trunk/files/CSWkrb5adminserver.depend csw/mgar/pkg/krb5/trunk/files/CSWkrb5adminserver.gspec csw/mgar/pkg/krb5/trunk/files/CSWkrb5doc.gspec csw/mgar/pkg/krb5/trunk/files/CSWkrb5kdc.depend csw/mgar/pkg/krb5/trunk/files/CSWkrb5kdc.gspec csw/mgar/pkg/krb5/trunk/files/CSWkrb5lib.gspec csw/mgar/pkg/krb5/trunk/files/CSWkrb5libdev.depend csw/mgar/pkg/krb5/trunk/files/CSWkrb5libdev.gspec csw/mgar/pkg/krb5/trunk/files/CSWkrb5user.depend csw/mgar/pkg/krb5/trunk/files/CSWkrb5user.gspec Modified: csw/mgar/pkg/krb5/trunk/Makefile =================================================================== --- csw/mgar/pkg/krb5/trunk/Makefile 2009-09-11 00:45:21 UTC (rev 6263) +++ csw/mgar/pkg/krb5/trunk/Makefile 2009-09-11 08:48:23 UTC (rev 6264) @@ -1,5 +1,5 @@ GARNAME = krb5 -GARVERSION = 1.6.3 +GARVERSION = 1.7 CATEGORIES = server DESCRIPTION = MIT Kerberos 5 @@ -11,23 +11,37 @@ Kerberos is available in many commercial products as well. endef -MASTER_SITES = http://web.mit.edu/kerberos/dist/krb5/1.6/ +MASTER_SITES = http://web.mit.edu/kerberos/dist/krb5/1.7/ DISTFILES = $(GARNAME)-$(GARVERSION)-signed.tar -DISTFILES += $(call admfiles,CSWkrb5adminserver,depend) -DISTFILES += $(call admfiles,CSWkrb5doc) -DISTFILES += $(call admfiles,CSWkrb5kdc,depend) -DISTFILES += $(call admfiles,CSWkrb5lib) -DISTFILES += $(call admfiles,CSWkrb5libdev,depend) -DISTFILES += $(call admfiles,CSWkrb5user,depend) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-signed.tar -PATCHFILES = patch-man2html-perl.diff -PATCHFILES += patch-ldap-const.diff +PATCHFILES = patch-man2html-perl.diff PREREQUISITE_PKGS = CSWtcl +PACKAGES = CSWkrb5adminserver CSWkrb5doc CSWkrb5kdc CSWkrb5lib CSWkrb5libdev CSWkrb5user + +CATALOGNAME_CSWkrb5adminserver = krb5_admin_server +CATALOGNAME_CSWkrb5doc = krb5_doc +CATALOGNAME_CSWkrb5kdc = krb5_kdc +CATALOGNAME_CSWkrb5lib = krb5_lib +CATALOGNAME_CSWkrb5libdev = krb5_lib_dev +CATALOGNAME_CSWkrb5user = krb5_user + +SPKG_DESC_CSWkrb5adminserver = MIT Kerberos 5 admin server +SPKG_DESC_CSWkrb5doc = MIT Kerberos 5 documentation +SPKG_DESC_CSWkrb5kdc = MIT Kerberos 5 key distribution center +SPKG_DESC_CSWkrb5lib = MIT Kerberos 5 core libraries +SPKG_DESC_CSWkrb5libdev = MIT Kerberos 5 developer libraries +SPKG_DESC_CSWkrb5user = MIT Kerberos 5 user tools + +REQUIRED_PKGS_CSWkrb5adminserver = CSWkrb5kdc CSWkrb5lib +REQUIRED_PKGS_CSWkrb5kdc = CSWkrb5lib CSWkrb5user +REQUIRED_PKGS_CSWkrb5libdev = CSWkrb5lib +REQUIRED_PKGS_CSWkrb5user = CSWkrb5lib + CONFIGURE_SCRIPTS = $(WORKSRC)/src/configure CONFIGURE_ARGS = $(DIRPATHS) @@ -51,6 +65,8 @@ INSTALL_SCRIPTS = $(WORKSRC)/src/Makefile custom +ARCHALL_CSWkrb5doc = 1 + ADMINSERVER_BINS = kprop|kadmind|kadmin\.local PKGFILES_CSWkrb5adminserver = $(mandir)/man8/($(ADMINSERVER_BINS))\.8 PKGFILES_CSWkrb5adminserver += $(sbindir)/($(ADMINSERVER_BINS)) @@ -78,7 +94,7 @@ #PKGFILES_CSWkrb5user += $(sharedstatedir)/examples/krb5/krb5.conf #PKGFILES_CSWkrb5user += $(bindir)/($(USER_BINS)) -include ../category.mk +include gar/category.mk # The flags must not contain additional spaces or the build freaks out CFLAGS := $(strip $(CFLAGS) -L$(libdir)/$(MM_LIBDIR)) Modified: csw/mgar/pkg/krb5/trunk/checksums =================================================================== --- csw/mgar/pkg/krb5/trunk/checksums 2009-09-11 00:45:21 UTC (rev 6263) +++ csw/mgar/pkg/krb5/trunk/checksums 2009-09-11 08:48:23 UTC (rev 6264) @@ -1,13 +1,2 @@ -2dc1307686eb1c2bf1ab08ea805dad46 download/krb5-1.6.3-signed.tar -4b4d4cdcfc8e1efe5b09afc99ced8b42 download/CSWkrb5adminserver.gspec -49280cd0857ae223a08f79d97f51c758 download/CSWkrb5adminserver.depend -7a114a5ffc41478c1ab44bacf6e58b18 download/CSWkrb5doc.gspec -8b64f180abcb2fc0f52862f1f0bad155 download/CSWkrb5kdc.gspec -968dff3e3871662fd18b87697486ada2 download/CSWkrb5kdc.depend -57fa9780920e48ee33abcde4468fd5aa download/CSWkrb5lib.gspec -83d0d5e0e3a583f87f7863c34ac1fc5e download/CSWkrb5libdev.gspec -c60f034ec718df26523f61b6e5f3f2cb download/CSWkrb5libdev.depend -0f7ea63e215a904821e5ad23ecb3b020 download/CSWkrb5user.gspec -c60f034ec718df26523f61b6e5f3f2cb download/CSWkrb5user.depend +9f7b3402b4731a7fa543db193bf1b564 download/krb5-1.7-signed.tar 6c2c7718f024c85f66fdc26398090c23 download/patch-man2html-perl.diff -1516a86bd7b8d0ccc4462077105723f4 download/patch-ldap-const.diff Deleted: csw/mgar/pkg/krb5/trunk/files/CSWkrb5adminserver.depend =================================================================== --- csw/mgar/pkg/krb5/trunk/files/CSWkrb5adminserver.depend 2009-09-11 00:45:21 UTC (rev 6263) +++ csw/mgar/pkg/krb5/trunk/files/CSWkrb5adminserver.depend 2009-09-11 08:48:23 UTC (rev 6264) @@ -1,2 +0,0 @@ -P CSWkrb5kdc krb5_kdc - MIT Kerberos 5 key distribution center -P CSWkrb5lib krb5_lib - MIT Kerberos 5 core libraries Deleted: csw/mgar/pkg/krb5/trunk/files/CSWkrb5adminserver.gspec =================================================================== --- csw/mgar/pkg/krb5/trunk/files/CSWkrb5adminserver.gspec 2009-09-11 00:45:21 UTC (rev 6263) +++ csw/mgar/pkg/krb5/trunk/files/CSWkrb5adminserver.gspec 2009-09-11 08:48:23 UTC (rev 6264) @@ -1,5 +0,0 @@ -%var bitname krb5_admin_server -%var pkgname CSWkrb5adminserver -%var desc MIT Kerberos 5 admin server -%include url file://%{PKGLIB}/csw_dyndepend.gspec -#%copyright url file://%{WORKSRC}/COPYRIGHT Deleted: csw/mgar/pkg/krb5/trunk/files/CSWkrb5doc.gspec =================================================================== --- csw/mgar/pkg/krb5/trunk/files/CSWkrb5doc.gspec 2009-09-11 00:45:21 UTC (rev 6263) +++ csw/mgar/pkg/krb5/trunk/files/CSWkrb5doc.gspec 2009-09-11 08:48:23 UTC (rev 6264) @@ -1,5 +0,0 @@ -%var bitname krb5_doc -%var pkgname CSWkrb5doc -%var desc MIT Kerberos 5 documentation -%include url file://%{PKGLIB}/csw_dyndepend.gspec -#%copyright url file://%{WORKSRC}/COPYRIGHT Deleted: csw/mgar/pkg/krb5/trunk/files/CSWkrb5kdc.depend =================================================================== --- csw/mgar/pkg/krb5/trunk/files/CSWkrb5kdc.depend 2009-09-11 00:45:21 UTC (rev 6263) +++ csw/mgar/pkg/krb5/trunk/files/CSWkrb5kdc.depend 2009-09-11 08:48:23 UTC (rev 6264) @@ -1,2 +0,0 @@ -P CSWkrb5lib krb5_lib - MIT Kerberos 5 core libraries -P CSWkrb5user krb5_user - MIT Kerberos 5 user tools Deleted: csw/mgar/pkg/krb5/trunk/files/CSWkrb5kdc.gspec =================================================================== --- csw/mgar/pkg/krb5/trunk/files/CSWkrb5kdc.gspec 2009-09-11 00:45:21 UTC (rev 6263) +++ csw/mgar/pkg/krb5/trunk/files/CSWkrb5kdc.gspec 2009-09-11 08:48:23 UTC (rev 6264) @@ -1,5 +0,0 @@ -%var bitname krb5_kdc -%var pkgname CSWkrb5kdc -%var desc MIT Kerberos 5 key distribution center -%include url file://%{PKGLIB}/csw_dyndepend.gspec -#%copyright url file://%{WORKSRC}/COPYRIGHT Deleted: csw/mgar/pkg/krb5/trunk/files/CSWkrb5lib.gspec =================================================================== --- csw/mgar/pkg/krb5/trunk/files/CSWkrb5lib.gspec 2009-09-11 00:45:21 UTC (rev 6263) +++ csw/mgar/pkg/krb5/trunk/files/CSWkrb5lib.gspec 2009-09-11 08:48:23 UTC (rev 6264) @@ -1,5 +0,0 @@ -%var bitname krb5_lib -%var pkgname CSWkrb5lib -%var desc MIT Kerberos 5 core libraries -%include url file://%{PKGLIB}/csw_dyndepend.gspec -#%copyright url file://%{WORKSRC}/COPYRIGHT Deleted: csw/mgar/pkg/krb5/trunk/files/CSWkrb5libdev.depend =================================================================== --- csw/mgar/pkg/krb5/trunk/files/CSWkrb5libdev.depend 2009-09-11 00:45:21 UTC (rev 6263) +++ csw/mgar/pkg/krb5/trunk/files/CSWkrb5libdev.depend 2009-09-11 08:48:23 UTC (rev 6264) @@ -1 +0,0 @@ -P CSWkrb5lib krb5_lib - MIT Kerberos 5 core libraries Deleted: csw/mgar/pkg/krb5/trunk/files/CSWkrb5libdev.gspec =================================================================== --- csw/mgar/pkg/krb5/trunk/files/CSWkrb5libdev.gspec 2009-09-11 00:45:21 UTC (rev 6263) +++ csw/mgar/pkg/krb5/trunk/files/CSWkrb5libdev.gspec 2009-09-11 08:48:23 UTC (rev 6264) @@ -1,5 +0,0 @@ -%var bitname krb5_lib_dev -%var pkgname CSWkrb5libdev -%var desc MIT Kerberos 5 developer libraries -%include url file://%{PKGLIB}/csw_dyndepend.gspec -#%copyright url file://%{WORKSRC}/COPYRIGHT Deleted: csw/mgar/pkg/krb5/trunk/files/CSWkrb5user.depend =================================================================== --- csw/mgar/pkg/krb5/trunk/files/CSWkrb5user.depend 2009-09-11 00:45:21 UTC (rev 6263) +++ csw/mgar/pkg/krb5/trunk/files/CSWkrb5user.depend 2009-09-11 08:48:23 UTC (rev 6264) @@ -1 +0,0 @@ -P CSWkrb5lib krb5_lib - MIT Kerberos 5 core libraries Deleted: csw/mgar/pkg/krb5/trunk/files/CSWkrb5user.gspec =================================================================== --- csw/mgar/pkg/krb5/trunk/files/CSWkrb5user.gspec 2009-09-11 00:45:21 UTC (rev 6263) +++ csw/mgar/pkg/krb5/trunk/files/CSWkrb5user.gspec 2009-09-11 08:48:23 UTC (rev 6264) @@ -1,5 +0,0 @@ -%var bitname krb5_user -%var pkgname CSWkrb5user -%var desc MIT Kerberos 5 user tools -%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 d_pocock at users.sourceforge.net Fri Sep 11 11:22:46 2009 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Fri, 11 Sep 2009 09:22:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6265] csw/mgar/pkg/ganglia/trunk/checksums Message-ID: Revision: 6265 http://gar.svn.sourceforge.net/gar/?rev=6265&view=rev Author: d_pocock Date: 2009-09-11 09:22:45 +0000 (Fri, 11 Sep 2009) Log Message: ----------- Add checksum Added Paths: ----------- csw/mgar/pkg/ganglia/trunk/checksums Added: csw/mgar/pkg/ganglia/trunk/checksums =================================================================== --- csw/mgar/pkg/ganglia/trunk/checksums (rev 0) +++ csw/mgar/pkg/ganglia/trunk/checksums 2009-09-11 09:22:45 UTC (rev 6265) @@ -0,0 +1,6 @@ +f3436682e339279357aa98473a9f2b8a download/CSWgangliaweb.postinstall +c4c333a46db391464e372ad8ede4993c download/CSWgangliaweb.preremove +25d302948e25837bf17757d5e23e4955 download/cswgmetad +c6bb96c949dbb989d06ebb36b6af885d download/cswgmond +aaba09a6fa897ed581789f679f7ca62d download/ganglia-3.1.2.tar.gz +2ff504ecb546aca2cdd6ee09af9a417e download/httpd-ganglia.conf.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 Sep 11 14:37:32 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Sep 2009 12:37:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[6266] csw/mgar/pkg Message-ID: Revision: 6266 http://gar.svn.sourceforge.net/gar/?rev=6266&view=rev Author: dmichelsen Date: 2009-09-11 12:37:31 +0000 (Fri, 11 Sep 2009) Log Message: ----------- gdome2: Initial commit Added Paths: ----------- csw/mgar/pkg/gdome2/ csw/mgar/pkg/gdome2/branches/ csw/mgar/pkg/gdome2/tags/ csw/mgar/pkg/gdome2/trunk/ csw/mgar/pkg/gdome2/trunk/Makefile csw/mgar/pkg/gdome2/trunk/checksums csw/mgar/pkg/gdome2/trunk/files/ csw/mgar/pkg/gdome2/trunk/files/patch-nowall.diff Property changes on: csw/mgar/pkg/gdome2/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/gdome2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdome2/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gdome2/trunk/Makefile 2009-09-11 12:37:31 UTC (rev 6266) @@ -0,0 +1,24 @@ +GARNAME = gdome2 +GARVERSION = 0.8.1 +CATEGORIES = lib + +DESCRIPTION = A DOM Level 2 Implementation +define BLURB + libgdome, the DOM C library developped for the Gnome project +endef + +MASTER_SITES = http://gdome2.cs.unibo.it/tarball/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = patch-nowall.diff + +REQUIRED_PKGS = CSWggettextrt CSWglib2 CSWiconv CSWlibxml2 CSWzlib + +# 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://gdome2.cs.unibo.it/ + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/gdome2/trunk/checksums =================================================================== --- csw/mgar/pkg/gdome2/trunk/checksums (rev 0) +++ csw/mgar/pkg/gdome2/trunk/checksums 2009-09-11 12:37:31 UTC (rev 6266) @@ -0,0 +1,2 @@ +bfc114e59eec50cbda8e4ece751ff022 download/gdome2-0.8.1.tar.gz +735f58dbc4b9524f313088fa02d0434b download/patch-nowall.diff Added: csw/mgar/pkg/gdome2/trunk/files/patch-nowall.diff =================================================================== --- csw/mgar/pkg/gdome2/trunk/files/patch-nowall.diff (rev 0) +++ csw/mgar/pkg/gdome2/trunk/files/patch-nowall.diff 2009-09-11 12:37:31 UTC (rev 6266) @@ -0,0 +1,171 @@ +diff -Naur gdome2-0.8.1.orig/configure gdome2-0.8.1.patched/configure +--- gdome2-0.8.1.orig/configure 2003-10-05 22:52:20.000000000 +0200 ++++ gdome2-0.8.1.patched/configure 2009-09-11 12:00:18.168479806 +0200 +@@ -1507,7 +1507,7 @@ + fi + + if test $ac_cv_header_stdc = yes; then +- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. ++ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using . + if test "$cross_compiling" = yes; then + : + else +diff -Naur gdome2-0.8.1.orig/libgdome/Makefile.am gdome2-0.8.1.patched/libgdome/Makefile.am +--- gdome2-0.8.1.orig/libgdome/Makefile.am 2002-07-16 16:15:56.000000000 +0200 ++++ gdome2-0.8.1.patched/libgdome/Makefile.am 2009-09-11 12:00:17.924132266 +0200 +@@ -12,7 +12,7 @@ + -I$(top_srcdir)/libgdome/events \ + -I$(top_srcdir)/libgdome/xpath \ + $(LIBXML_CFLAGS) $(GLIB_CFLAGS) \ +- -Wall -ansi \ ++ \ + $(NULL) + + lib_LTLIBRARIES = libgdome.la +diff -Naur gdome2-0.8.1.orig/libgdome/Makefile.in gdome2-0.8.1.patched/libgdome/Makefile.in +--- gdome2-0.8.1.orig/libgdome/Makefile.in 2003-10-05 22:52:47.000000000 +0200 ++++ gdome2-0.8.1.patched/libgdome/Makefile.in 2009-09-11 12:00:17.964737249 +0200 +@@ -111,7 +111,7 @@ + -I$(top_srcdir)/libgdome/events \ + -I$(top_srcdir)/libgdome/xpath \ + $(LIBXML_CFLAGS) $(GLIB_CFLAGS) \ +- -Wall -ansi \ ++ \ + $(NULL) + + +diff -Naur gdome2-0.8.1.orig/libgdome/events/Makefile.am gdome2-0.8.1.patched/libgdome/events/Makefile.am +--- gdome2-0.8.1.orig/libgdome/events/Makefile.am 2001-05-19 16:18:35.000000000 +0200 ++++ gdome2-0.8.1.patched/libgdome/events/Makefile.am 2009-09-11 12:00:17.938633857 +0200 +@@ -4,7 +4,7 @@ + -I$(top_srcdir)/libgdome/gdomecore \ + $(LIBXML_CFLAGS) \ + $(GLIB_CFLAGS) \ +- -Wall -ansi \ ++ \ + $(NULL) + + noinst_LTLIBRARIES = libgdomeevents.la +diff -Naur gdome2-0.8.1.orig/libgdome/events/Makefile.in gdome2-0.8.1.patched/libgdome/events/Makefile.in +--- gdome2-0.8.1.orig/libgdome/events/Makefile.in 2003-10-05 22:52:49.000000000 +0200 ++++ gdome2-0.8.1.patched/libgdome/events/Makefile.in 2009-09-11 12:00:17.942890311 +0200 +@@ -102,7 +102,7 @@ + -I$(top_srcdir)/libgdome/gdomecore \ + $(LIBXML_CFLAGS) \ + $(GLIB_CFLAGS) \ +- -Wall -ansi \ ++ \ + $(NULL) + + +diff -Naur gdome2-0.8.1.orig/libgdome/gdomecore/Makefile.am gdome2-0.8.1.patched/libgdome/gdomecore/Makefile.am +--- gdome2-0.8.1.orig/libgdome/gdomecore/Makefile.am 2002-04-03 09:05:00.000000000 +0200 ++++ gdome2-0.8.1.patched/libgdome/gdomecore/Makefile.am 2009-09-11 12:00:18.044626103 +0200 +@@ -6,7 +6,7 @@ + -I$(top_srcdir)/libgdome/xpath \ + $(LIBXML_CFLAGS) \ + $(GLIB_CFLAGS) \ +- -Wall -ansi \ ++ \ + $(NULL) + + noinst_LTLIBRARIES = libgdomecore.la +diff -Naur gdome2-0.8.1.orig/libgdome/gdomecore/Makefile.in gdome2-0.8.1.patched/libgdome/gdomecore/Makefile.in +--- gdome2-0.8.1.orig/libgdome/gdomecore/Makefile.in 2003-10-05 22:52:48.000000000 +0200 ++++ gdome2-0.8.1.patched/libgdome/gdomecore/Makefile.in 2009-09-11 12:00:18.056327975 +0200 +@@ -104,7 +104,7 @@ + -I$(top_srcdir)/libgdome/xpath \ + $(LIBXML_CFLAGS) \ + $(GLIB_CFLAGS) \ +- -Wall -ansi \ ++ \ + $(NULL) + + +diff -Naur gdome2-0.8.1.orig/libgdome/gdomecore/gdome-xml-node.c gdome2-0.8.1.patched/libgdome/gdomecore/gdome-xml-node.c +--- gdome2-0.8.1.orig/libgdome/gdomecore/gdome-xml-node.c 2003-10-03 17:53:33.000000000 +0200 ++++ gdome2-0.8.1.patched/libgdome/gdomecore/gdome-xml-node.c 2009-09-11 13:34:49.857555834 +0200 +@@ -252,9 +252,9 @@ + switch (type) { + case XML_DOCUMENT_TYPE_NODE: + case XML_DTD_NODE: +- return gdome_xml_dt_unref (self, exc); ++ gdome_xml_dt_unref (self, exc); return; + case XML_DOCUMENT_NODE: +- return gdome_xml_doc_unref (self, exc); ++ gdome_xml_doc_unref (self, exc); return; + default: + if (priv->refcnt > 0) + priv->refcnt--; +diff -Naur gdome2-0.8.1.orig/libgdome/xpath/Makefile.am gdome2-0.8.1.patched/libgdome/xpath/Makefile.am +--- gdome2-0.8.1.orig/libgdome/xpath/Makefile.am 2002-03-01 05:00:25.000000000 +0100 ++++ gdome2-0.8.1.patched/libgdome/xpath/Makefile.am 2009-09-11 12:00:17.952259279 +0200 +@@ -4,7 +4,7 @@ + -I$(top_srcdir)/libgdome/gdomecore \ + $(LIBXML_CFLAGS) \ + $(GLIB_CFLAGS) \ +- -Wall -ansi \ ++ \ + $(NULL) + + noinst_LTLIBRARIES = libgdomexpath.la +diff -Naur gdome2-0.8.1.orig/libgdome/xpath/Makefile.in gdome2-0.8.1.patched/libgdome/xpath/Makefile.in +--- gdome2-0.8.1.orig/libgdome/xpath/Makefile.in 2003-10-05 22:52:50.000000000 +0200 ++++ gdome2-0.8.1.patched/libgdome/xpath/Makefile.in 2009-09-11 12:00:17.951202991 +0200 +@@ -102,7 +102,7 @@ + -I$(top_srcdir)/libgdome/gdomecore \ + $(LIBXML_CFLAGS) \ + $(GLIB_CFLAGS) \ +- -Wall -ansi \ ++ \ + $(NULL) + + +diff -Naur gdome2-0.8.1.orig/test/Makefile.am gdome2-0.8.1.patched/test/Makefile.am +--- gdome2-0.8.1.orig/test/Makefile.am 2002-05-29 02:24:49.000000000 +0200 ++++ gdome2-0.8.1.patched/test/Makefile.am 2009-09-11 12:00:17.850381240 +0200 +@@ -10,7 +10,7 @@ + -I$(top_srcdir)/libgdome \ + -I$(top_srcdir)/libgdome/gdomecore \ + $(LIBXML_CFLAGS) $(GLIB_CFLAGS) \ +- -Wall -ansi \ ++ \ + $(NULL) + + noinst_PROGRAMS = \ +diff -Naur gdome2-0.8.1.orig/test/Makefile.in gdome2-0.8.1.patched/test/Makefile.in +--- gdome2-0.8.1.orig/test/Makefile.in 2003-10-05 22:52:51.000000000 +0200 ++++ gdome2-0.8.1.patched/test/Makefile.in 2009-09-11 12:00:17.859781302 +0200 +@@ -109,7 +109,7 @@ + -I$(top_srcdir)/libgdome \ + -I$(top_srcdir)/libgdome/gdomecore \ + $(LIBXML_CFLAGS) $(GLIB_CFLAGS) \ +- -Wall -ansi \ ++ \ + $(NULL) + + +diff -Naur gdome2-0.8.1.orig/test/apigen/Makefile.am gdome2-0.8.1.patched/test/apigen/Makefile.am +--- gdome2-0.8.1.orig/test/apigen/Makefile.am 2002-11-08 17:38:34.000000000 +0100 ++++ gdome2-0.8.1.patched/test/apigen/Makefile.am 2009-09-11 12:00:17.901805128 +0200 +@@ -3,7 +3,7 @@ + INCLUDES = \ + -I$(top_srcdir)/libgdome \ + $(LIBXML_CFLAGS) $(GLIB_CFLAGS) \ +- -Wall -ansi \ ++ \ + $(NULL) + + noinst_PROGRAMS = \ +diff -Naur gdome2-0.8.1.orig/test/apigen/Makefile.in gdome2-0.8.1.patched/test/apigen/Makefile.in +--- gdome2-0.8.1.orig/test/apigen/Makefile.in 2003-10-05 22:52:52.000000000 +0200 ++++ gdome2-0.8.1.patched/test/apigen/Makefile.in 2009-09-11 12:00:17.892676920 +0200 +@@ -101,7 +101,7 @@ + INCLUDES = \ + -I$(top_srcdir)/libgdome \ + $(LIBXML_CFLAGS) $(GLIB_CFLAGS) \ +- -Wall -ansi \ ++ \ + $(NULL) + + 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 Sep 11 14:48:11 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Sep 2009 12:48:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[6267] csw/mgar/pkg/openldap/trunk Message-ID: Revision: 6267 http://gar.svn.sourceforge.net/gar/?rev=6267&view=rev Author: dmichelsen Date: 2009-09-11 12:48:11 +0000 (Fri, 11 Sep 2009) Log Message: ----------- openldap: Fix building 64 bit on sparc Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/Makefile csw/mgar/pkg/openldap/trunk/checksums Added Paths: ----------- csw/mgar/pkg/openldap/trunk/files/patch-libtool-64bit.diff Property Changed: ---------------- csw/mgar/pkg/openldap/trunk/ Property changes on: csw/mgar/pkg/openldap/trunk ___________________________________________________________________ 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 Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2009-09-11 12:37:31 UTC (rev 6266) +++ csw/mgar/pkg/openldap/trunk/Makefile 2009-09-11 12:48:11 UTC (rev 6267) @@ -44,24 +44,26 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz PATCHFILES = patch-oldap-2.4.16-ntlm.diff -DISTFILES += $(PATCHFILES) +PATCHFILES += patch-libtool-64bit.diff +DISTFILES += patch-oldap-2.4.16-ntlm.diff EXTRA_DOCS = README.CSW $(PATCHFILES) #EXTRA_LIB = $(prefix)/bdb44/lib #EXTRA_INC = $(prefix)/bdb44/include -#BUILD64 = 1 +BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-crypt CONFIGURE_ARGS += --enable-lmpasswd -CONFIGURE_ARGS += --enable-spasswd CONFIGURE_ARGS += --enable-modules CONFIGURE_ARGS += --enable-rlookups CONFIGURE_ARGS += --enable-slp # Disable TCPwrappers in 64 bit until the libraries are available # CONFIGURE_ARGS_32 = --enable-wrappers +# spasswd requires Cyrus SASL +CONFIGURE_ARGS_32 += --enable-spasswd # Disable Cyrus SASL in 64 bit until the libraries are available # CONFIGURE_ARGS_64 += --without-cyrus-sasl Modified: csw/mgar/pkg/openldap/trunk/checksums =================================================================== --- csw/mgar/pkg/openldap/trunk/checksums 2009-09-11 12:37:31 UTC (rev 6266) +++ csw/mgar/pkg/openldap/trunk/checksums 2009-09-11 12:48:11 UTC (rev 6267) @@ -4,5 +4,6 @@ 5e82103780f8cfc2b2fbd0f77c47c158 download/openldap-2.4.17.tgz 0e57547ad2b5fedca9f0bd4beaddfe39 download/openldap.xml ab2ac7519b092ce8d16124c5270bfec0 download/openldaprc +93dc2a04fd943c198ad00edd4d88ce65 download/patch-libtool-64bit.diff d3dee9018137c39f357859b652e3a67c download/patch-oldap-2.4.16-ntlm.diff e15c2020566e56f02118e75c89111f15 download/svc-openldap Added: csw/mgar/pkg/openldap/trunk/files/patch-libtool-64bit.diff =================================================================== --- csw/mgar/pkg/openldap/trunk/files/patch-libtool-64bit.diff (rev 0) +++ csw/mgar/pkg/openldap/trunk/files/patch-libtool-64bit.diff 2009-09-11 12:48:11 UTC (rev 6267) @@ -0,0 +1,15 @@ +diff -Naur openldap-2.4.17.orig/build/ltmain.sh openldap-2.4.17.patched/build/ltmain.sh +--- openldap-2.4.17.orig/build/ltmain.sh 2009-01-22 01:00:41.000000000 +0100 ++++ openldap-2.4.17.patched/build/ltmain.sh 2009-09-11 14:26:06.136891084 +0200 +@@ -4745,7 +4745,10 @@ + case "$compile_command " in + *" -static "*) ;; + *) pic_flag_for_symtable=" $pic_flag";; +- esac ++ esac;; ++ *-*-solaris*) ++ LTCFLAGS="$compiler_flags" ++ ;; + esac + + # Now compile the dynamic symbol 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 Fri Sep 11 15:35:15 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Sep 2009 13:35:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[6268] csw/mgar/pkg/gdome2/trunk Message-ID: Revision: 6268 http://gar.svn.sourceforge.net/gar/?rev=6268&view=rev Author: dmichelsen Date: 2009-09-11 13:35:15 +0000 (Fri, 11 Sep 2009) Log Message: ----------- gdome2: Use ginstall and fix DESTDIR Modified Paths: -------------- csw/mgar/pkg/gdome2/trunk/Makefile csw/mgar/pkg/gdome2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gdome2/trunk/files/patch-doc-destdir.diff csw/mgar/pkg/gdome2/trunk/files/patch-use-install.diff Modified: csw/mgar/pkg/gdome2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdome2/trunk/Makefile 2009-09-11 12:48:11 UTC (rev 6267) +++ csw/mgar/pkg/gdome2/trunk/Makefile 2009-09-11 13:35:15 UTC (rev 6268) @@ -10,6 +10,8 @@ MASTER_SITES = http://gdome2.cs.unibo.it/tarball/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = patch-nowall.diff +PATCHFILES += patch-doc-destdir.diff +PATCHFILES += patch-use-install.diff REQUIRED_PKGS = CSWggettextrt CSWglib2 CSWiconv CSWlibxml2 CSWzlib Modified: csw/mgar/pkg/gdome2/trunk/checksums =================================================================== --- csw/mgar/pkg/gdome2/trunk/checksums 2009-09-11 12:48:11 UTC (rev 6267) +++ csw/mgar/pkg/gdome2/trunk/checksums 2009-09-11 13:35:15 UTC (rev 6268) @@ -1,2 +1,4 @@ bfc114e59eec50cbda8e4ece751ff022 download/gdome2-0.8.1.tar.gz +6c8799423b9ef7a21d6b1b7edff27c9d download/patch-doc-destdir.diff 735f58dbc4b9524f313088fa02d0434b download/patch-nowall.diff +c2e11ca7b8a0b05d0db6823ed40e0494 download/patch-use-install.diff Added: csw/mgar/pkg/gdome2/trunk/files/patch-doc-destdir.diff =================================================================== --- csw/mgar/pkg/gdome2/trunk/files/patch-doc-destdir.diff (rev 0) +++ csw/mgar/pkg/gdome2/trunk/files/patch-doc-destdir.diff 2009-09-11 13:35:15 UTC (rev 6268) @@ -0,0 +1,24 @@ +diff -Naur gdome2-0.8.1.orig/gtk-doc/Makefile.am gdome2-0.8.1.patched/gtk-doc/Makefile.am +--- gdome2-0.8.1.orig/gtk-doc/Makefile.am 2002-04-04 08:58:04.000000000 +0200 ++++ gdome2-0.8.1.patched/gtk-doc/Makefile.am 2009-09-11 15:29:22.320277946 +0200 +@@ -9,7 +9,7 @@ + # The directory containing the source code (if it contains documentation). + DOC_SOURCE_DIR=../libgdome + +-HTML_DIR=@HTML_DIR@ ++HTML_DIR=$(DESTDIR)@HTML_DIR@ + + TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) + +diff -Naur gdome2-0.8.1.orig/gtk-doc/Makefile.in gdome2-0.8.1.patched/gtk-doc/Makefile.in +--- gdome2-0.8.1.orig/gtk-doc/Makefile.in 2003-10-05 22:52:52.000000000 +0200 ++++ gdome2-0.8.1.patched/gtk-doc/Makefile.in 2009-09-11 15:29:44.962917775 +0200 +@@ -105,7 +105,7 @@ + # The directory containing the source code (if it contains documentation). + DOC_SOURCE_DIR = ../libgdome + +-HTML_DIR = @HTML_DIR@ ++HTML_DIR = $(DESTDIR)@HTML_DIR@ + + TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) + Added: csw/mgar/pkg/gdome2/trunk/files/patch-use-install.diff =================================================================== --- csw/mgar/pkg/gdome2/trunk/files/patch-use-install.diff (rev 0) +++ csw/mgar/pkg/gdome2/trunk/files/patch-use-install.diff 2009-09-11 13:35:15 UTC (rev 6268) @@ -0,0 +1,32 @@ +diff -Naur gdome2-0.8.1.orig/gtk-doc/Makefile.am gdome2-0.8.1.patched/gtk-doc/Makefile.am +--- gdome2-0.8.1.orig/gtk-doc/Makefile.am 2002-04-04 08:58:04.000000000 +0200 ++++ gdome2-0.8.1.patched/gtk-doc/Makefile.am 2009-09-11 15:10:49.023110574 +0200 +@@ -33,9 +33,9 @@ + rm -rf sgml html gdome2-decl-list.txt gdome2-decl.txt + + install-data-local: +- -install -d -m 0755 $(TARGET_DIR) +- -install -m 0644 $(srcdir)/html/*.html $(TARGET_DIR) +- -install -m 0644 $(srcdir)/html/index.sgml $(TARGET_DIR) ++ -$(INSTALL) -d -m 0755 $(TARGET_DIR) ++ -$(INSTALL) -m 0644 $(srcdir)/html/*.html $(TARGET_DIR) ++ -$(INSTALL) -m 0644 $(srcdir)/html/index.sgml $(TARGET_DIR) + -(cd $(DESTDIR); gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)) + + .PHONY : html sgml templates scan +diff -Naur gdome2-0.8.1.orig/gtk-doc/Makefile.in gdome2-0.8.1.patched/gtk-doc/Makefile.in +--- gdome2-0.8.1.orig/gtk-doc/Makefile.in 2003-10-05 22:52:52.000000000 +0200 ++++ gdome2-0.8.1.patched/gtk-doc/Makefile.in 2009-09-11 15:11:27.730500581 +0200 +@@ -273,9 +273,9 @@ + rm -rf sgml html gdome2-decl-list.txt gdome2-decl.txt + + install-data-local: +- -install -d -m 0755 $(TARGET_DIR) +- -install -m 0644 $(srcdir)/html/*.html $(TARGET_DIR) +- -install -m 0644 $(srcdir)/html/index.sgml $(TARGET_DIR) ++ -$(INSTALL) -d -m 0755 $(TARGET_DIR) ++ -$(INSTALL) -m 0644 $(srcdir)/html/*.html $(TARGET_DIR) ++ -$(INSTALL) -m 0644 $(srcdir)/html/index.sgml $(TARGET_DIR) + -(cd $(DESTDIR); gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)) + + .PHONY : html sgml templates scan 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 Sep 11 15:44:48 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Sep 2009 13:44:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[6269] csw/mgar/pkg/gdome2/trunk Message-ID: Revision: 6269 http://gar.svn.sourceforge.net/gar/?rev=6269&view=rev Author: dmichelsen Date: 2009-09-11 13:44:48 +0000 (Fri, 11 Sep 2009) Log Message: ----------- gdome2: Remove erranous diff from patch Modified Paths: -------------- csw/mgar/pkg/gdome2/trunk/checksums csw/mgar/pkg/gdome2/trunk/files/patch-nowall.diff Modified: csw/mgar/pkg/gdome2/trunk/checksums =================================================================== --- csw/mgar/pkg/gdome2/trunk/checksums 2009-09-11 13:35:15 UTC (rev 6268) +++ csw/mgar/pkg/gdome2/trunk/checksums 2009-09-11 13:44:48 UTC (rev 6269) @@ -1,4 +1,4 @@ bfc114e59eec50cbda8e4ece751ff022 download/gdome2-0.8.1.tar.gz 6c8799423b9ef7a21d6b1b7edff27c9d download/patch-doc-destdir.diff -735f58dbc4b9524f313088fa02d0434b download/patch-nowall.diff +c736a82f4a9f4472c724bdf620575a38 download/patch-nowall.diff c2e11ca7b8a0b05d0db6823ed40e0494 download/patch-use-install.diff Modified: csw/mgar/pkg/gdome2/trunk/files/patch-nowall.diff =================================================================== --- csw/mgar/pkg/gdome2/trunk/files/patch-nowall.diff 2009-09-11 13:35:15 UTC (rev 6268) +++ csw/mgar/pkg/gdome2/trunk/files/patch-nowall.diff 2009-09-11 13:44:48 UTC (rev 6269) @@ -1,15 +1,3 @@ -diff -Naur gdome2-0.8.1.orig/configure gdome2-0.8.1.patched/configure ---- gdome2-0.8.1.orig/configure 2003-10-05 22:52:20.000000000 +0200 -+++ gdome2-0.8.1.patched/configure 2009-09-11 12:00:18.168479806 +0200 -@@ -1507,7 +1507,7 @@ - fi - - if test $ac_cv_header_stdc = yes; then -- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using . - if test "$cross_compiling" = yes; then - : - else diff -Naur gdome2-0.8.1.orig/libgdome/Makefile.am gdome2-0.8.1.patched/libgdome/Makefile.am --- gdome2-0.8.1.orig/libgdome/Makefile.am 2002-07-16 16:15:56.000000000 +0200 +++ gdome2-0.8.1.patched/libgdome/Makefile.am 2009-09-11 12:00:17.924132266 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Sep 11 15:45:38 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Sep 2009 13:45:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6270] csw/mgar/pkg/openldap/trunk Message-ID: Revision: 6270 http://gar.svn.sourceforge.net/gar/?rev=6270&view=rev Author: dmichelsen Date: 2009-09-11 13:45:38 +0000 (Fri, 11 Sep 2009) Log Message: ----------- openldap: Update to 2.4.18 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-09-11 13:44:48 UTC (rev 6269) +++ csw/mgar/pkg/openldap/trunk/Makefile 2009-09-11 13:45:38 UTC (rev 6270) @@ -1,5 +1,5 @@ GARNAME = openldap -GARVERSION = 2.4.17 +GARVERSION = 2.4.18 CATEGORIES = server DESCRIPTION = Open source implementation of the Lightweight Directory Access Protocol Modified: csw/mgar/pkg/openldap/trunk/checksums =================================================================== --- csw/mgar/pkg/openldap/trunk/checksums 2009-09-11 13:44:48 UTC (rev 6269) +++ csw/mgar/pkg/openldap/trunk/checksums 2009-09-11 13:45:38 UTC (rev 6270) @@ -1,7 +1,7 @@ 2f6e6a8c9c3497f1c0c9d52ea2d1dafa download/CSWoldap.gspec 892dba5f625755be024c30ea0055fd55 download/README.CSW c50f5c4040139b6cf57fcc08abffbee7 download/cswopenldap -5e82103780f8cfc2b2fbd0f77c47c158 download/openldap-2.4.17.tgz +fecd7a64b6d9a0eb79b817d2562956ed download/openldap-2.4.18.tgz 0e57547ad2b5fedca9f0bd4beaddfe39 download/openldap.xml ab2ac7519b092ce8d16124c5270bfec0 download/openldaprc 93dc2a04fd943c198ad00edd4d88ce65 download/patch-libtool-64bit.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 Fri Sep 11 16:06:45 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Sep 2009 14:06:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[6271] csw/mgar/pkg/freetype/trunk/Makefile Message-ID: Revision: 6271 http://gar.svn.sourceforge.net/gar/?rev=6271&view=rev Author: dmichelsen Date: 2009-09-11 14:06:44 +0000 (Fri, 11 Sep 2009) Log Message: ----------- freetype2: /bin/sparcv9/freetype-config must not be excluded or autodetection will not work in 64 bit mode Modified Paths: -------------- csw/mgar/pkg/freetype/trunk/Makefile Modified: csw/mgar/pkg/freetype/trunk/Makefile =================================================================== --- csw/mgar/pkg/freetype/trunk/Makefile 2009-09-11 13:45:38 UTC (rev 6270) +++ csw/mgar/pkg/freetype/trunk/Makefile 2009-09-11 14:06:44 UTC (rev 6271) @@ -32,8 +32,6 @@ BUILD64 = 1 NO_ISAEXEC = 1 -MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/.* - REQUIRED_PKGS_CSWftype2 = CSWzlib TEST_TARGET = check 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 Sep 11 16:27:19 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 11 Sep 2009 14:27:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[6272] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 6272 http://gar.svn.sourceforge.net/gar/?rev=6272&view=rev Author: bonivart Date: 2009-09-11 14:27:18 +0000 (Fri, 11 Sep 2009) Log Message: ----------- pkgutil: update to 1.7 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-09-11 14:06:44 UTC (rev 6271) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-09-11 14:27:18 UTC (rev 6272) @@ -1,5 +1,5 @@ GARNAME = pkgutil -GARVERSION = 1.7b1 +GARVERSION = 1.7 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-09-11 14:06:44 UTC (rev 6271) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-09-11 14:27:18 UTC (rev 6272) @@ -2,4 +2,4 @@ e1407c24d47306dbc4cea22dcb291f1d download/CSWpkgutil.postinstall 2fb6c94a2d212f08b71d462082a2d31a download/CSWpkgutil.preremove 4ef9d7ba62987112987311d96e249e3e download/CSWpkgutil.prototype -6c95eb1d1de28e74b72ea2bb4ce249af download/pkgutil-1.7b1.zip +11c02a77d18f1fc11f23679b1b06efa8 download/pkgutil-1.7.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Sep 11 17:46:06 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Sep 2009 15:46:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6273] csw/mgar/pkg/tcpwrappers/tags Message-ID: Revision: 6273 http://gar.svn.sourceforge.net/gar/?rev=6273&view=rev Author: dmichelsen Date: 2009-09-11 15:46:06 +0000 (Fri, 11 Sep 2009) Log Message: ----------- tcpwrappers: Add legacy description Added Paths: ----------- csw/mgar/pkg/tcpwrappers/tags/legacy/ csw/mgar/pkg/tcpwrappers/tags/legacy/BUILD.NOTES csw/mgar/pkg/tcpwrappers/tags/legacy/README.t csw/mgar/pkg/tcpwrappers/tags/legacy/copyright csw/mgar/pkg/tcpwrappers/tags/legacy/makepkg.old csw/mgar/pkg/tcpwrappers/tags/legacy/man.patch csw/mgar/pkg/tcpwrappers/tags/legacy/pkginfo csw/mgar/pkg/tcpwrappers/tags/legacy/prototype csw/mgar/pkg/tcpwrappers/tags/legacy/sharedlib.patch Added: csw/mgar/pkg/tcpwrappers/tags/legacy/BUILD.NOTES =================================================================== --- csw/mgar/pkg/tcpwrappers/tags/legacy/BUILD.NOTES (rev 0) +++ csw/mgar/pkg/tcpwrappers/tags/legacy/BUILD.NOTES 2009-09-11 15:46:06 UTC (rev 6273) @@ -0,0 +1,25 @@ + +# Patch the makefile to allow for compile of a shared lib. +# Plus, define a sneaky ELF .obj that contains "weak" magic symbols + +#Note that the library is compiled to use LOG_LOCAL1 as the +#syslog type, NOT "LOG_MAIL", the default +#ALSO, it uses /opt/csw/etc, NOT /etc/hosts.XXX + +gpatch <~/pkgs/tcpwrap/sharedlib.patch + +#update manpage paths about /opt/csw/etc +gpatch <~/pkgs/tcpwrap/man.patch + + +gmake REAL_DAEMON_DIR=/usr/sbin sunos5-shared +mv libwrap.so.1 libwrap-std.so.1 +gmake clean + +gmake REAL_DAEMON_DIR=/usr/sbin sunos5-sharedext +mv libwrap.so.1 libwrap-ext.so.1 + +cd ~/pkgs/tcpwrap +cp README.t /export/home/phil/build/tcp_wrappers_7.6-ipv6.4 +createpkg -r /export/home/phil/build/tcp_wrappers_7.6-ipv6.4 + Added: csw/mgar/pkg/tcpwrappers/tags/legacy/README.t =================================================================== --- csw/mgar/pkg/tcpwrappers/tags/legacy/README.t (rev 0) +++ csw/mgar/pkg/tcpwrappers/tags/legacy/README.t 2009-09-11 15:46:06 UTC (rev 6273) @@ -0,0 +1,28 @@ +TCP-Wrappers, from http://www.porcupine.org + +Note that the library is compiled to use LOG_LOCAL1 as the +syslog facility, NOT "LOG_MAIL", the default. + +ALSO, it uses /opt/csw/etc/hosts.xxx, NOT /etc/hosts.XXX + +man hosts_access(3), hosts_access(5), hosts_options(5) +for syntax on those. + +The compile has been hacked to provide a shared-library version instead +of libwrap.a +There is an extra hack, in that there are default variable definitions of +deny_severity and allow_severity, set to 0. +This is to allow for ./configure style tests, that break in the transition +from lib.a to lib.so + + +Note also that there are TWO versions of libwrap.so: +libwrap-std.so.1 The "standard" tcp wrapper library +libwrap-ext.so.1 The "extended" tcp wrapper library + +By default, /opt/csw/lib/libwrap.so.1 is linked to the std version. +To use the extended syntax in hosts_options(5), you need to change +the link to point to libwrap-ext.so.1 +Unfortunately, the syntax for the two versions, is slightly incompatible, +which is why there are two versions. + Added: csw/mgar/pkg/tcpwrappers/tags/legacy/copyright =================================================================== --- csw/mgar/pkg/tcpwrappers/tags/legacy/copyright (rev 0) +++ csw/mgar/pkg/tcpwrappers/tags/legacy/copyright 2009-09-11 15:46:06 UTC (rev 6273) @@ -0,0 +1,16 @@ +/************************************************************************ +* Copyright 1995 by Wietse Venema. All rights reserved. Some individual +* files may be covered by other copyrights. +* +* This material was originally written and compiled by Wietse Venema at +* Eindhoven University of Technology, The Netherlands, in 1990, 1991, +* 1992, 1993, 1994 and 1995. +* +* Redistribution and use in source and binary forms are permitted +* provided that this entire copyright notice is duplicated in all such +* copies. +* +* This software is provided "as is" and without any expressed or implied +* warranties, including, without limitation, the implied warranties of +* merchantibility and fitness for any particular purpose. +************************************************************************/ Added: csw/mgar/pkg/tcpwrappers/tags/legacy/makepkg.old =================================================================== --- csw/mgar/pkg/tcpwrappers/tags/legacy/makepkg.old (rev 0) +++ csw/mgar/pkg/tcpwrappers/tags/legacy/makepkg.old 2009-09-11 15:46:06 UTC (rev 6273) @@ -0,0 +1,61 @@ +#!/bin/ksh -p + +## MODIFIED BUILDPKG - this builds directly from source tree!! + +if [ "$1" = "" ] ; then + echo ERROR: need source dir + exit 1 +fi + +if [ ! -f "$1/libwrap.a" ] ; then + echo ERROR: do not detect built libwrap.a + exit 1 +fi + + + +# This script actually builds the package.. once you have already +# put together the pkginfo and prototype file. +# See the makeproto script for a way to make a prototype file. + +ARCH=all + +die() +{ + print ERROR: $* + exit 1 +} + +PROTO=prototype + + +grep 'i copyright' $PROTO || die need copyright in $PROTO +grep 'root other' $PROTO && die fix $PROTO file + +grep 'Replace this file' copyright && die fix copyright file + +mode=relative + + +PKG=`sed -n 's/^PKG=//p' pkginfo` +PKGREV=`sed -n 's/^VERSION=//p' pkginfo` +SOFTNAME=`sed -n 's/^NAME=//p' pkginfo|awk '{print $1}'` +ARCH=`uname -p` + +PKGFILE=$SOFTNAME-$PKGREV-SunOS`uname -r`-$ARCH-CSW.pkg + +if [ "$PKGREV" = "" -o "$SOFTNAME" = "" ] ; then + echo ERROR: need VERSION and NAME defined properly in pkginfo + exit 1 +fi + +pkgmk -b $1 -a $ARCH -f $PROTO + + +if [ $? -ne 0 ] ; then die package creation failed ; fi + + +pkgtrans -s /var/spool/pkg `pwd`/$PKGFILE $PKG +echo gzipping pkgfile +gzip $PKGFILE +rm -r /var/spool/pkg/$PKG Added: csw/mgar/pkg/tcpwrappers/tags/legacy/man.patch =================================================================== --- csw/mgar/pkg/tcpwrappers/tags/legacy/man.patch (rev 0) +++ csw/mgar/pkg/tcpwrappers/tags/legacy/man.patch 2009-09-11 15:46:06 UTC (rev 6273) @@ -0,0 +1,149 @@ +--- hosts_access.3.pre-csw 1996-02-11 11:01:27.000000000 -0500 ++++ hosts_access.3 2006-03-30 17:08:22.857367000 -0500 +@@ -78,7 +78,7 @@ + hosts_access(5), format of the access control tables. + hosts_options(5), optional extensions to the base language. + .SH FILES +-/etc/hosts.allow, /etc/hosts.deny, access control tables. ++/opt/csw/etc/hosts.allow, /opt/csw/etc/hosts.deny, access control tables. + .SH BUGS + hosts_access() uses the strtok() library function. This may interfere + with other code that relies on strtok(). +--- hosts_access.5.pre-csw 1995-01-30 13:51:47.000000000 -0500 ++++ hosts_access.5 2006-03-30 17:08:22.913093000 -0500 +@@ -21,10 +21,10 @@ + at the first match: + .IP \(bu + Access will be granted when a (daemon,client) pair matches an entry in +-the \fI/etc/hosts.allow\fR file. ++the \fI/opt/csw/etc/hosts.allow\fR file. + .IP \(bu + Otherwise, access will be denied when a (daemon,client) pair matches an +-entry in the \fI/etc/hosts.deny\fR file. ++entry in the \fI/opt/csw/etc/hosts.deny\fR file. + .IP \(bu + Otherwise, access will be granted. + .PP +@@ -268,7 +268,7 @@ + file: + .PP + .ne 2 +-/etc/hosts.deny: ++/opt/csw/etc/hosts.deny: + .in +3 + ALL: ALL + .PP +@@ -279,7 +279,7 @@ + For example: + .PP + .ne 2 +-/etc/hosts.allow: ++/opt/csw/etc/hosts.allow: + .in +3 + ALL: LOCAL @some_netgroup + .br +@@ -298,7 +298,7 @@ + that it can be omitted. The explicitly non-authorized hosts are listed + in the deny file. For example: + .PP +-/etc/hosts.deny: ++/opt/csw/etc/hosts.deny: + .in +3 + ALL: some.host.name, .some.domain + .br +@@ -313,13 +313,13 @@ + host. The result is mailed to the superuser. + .PP + .ne 2 +-/etc/hosts.allow: ++/opt/csw/etc/hosts.allow: + .in +3 + .nf + in.tftpd: LOCAL, .my.domain + .PP + .ne 2 +-/etc/hosts.deny: ++/opt/csw/etc/hosts.deny: + .in +3 + .nf + in.tftpd: ALL: (/some/where/safe_finger -l @%h | \\ +@@ -353,8 +353,8 @@ + .SH FILES + .na + .nf +-/etc/hosts.allow, (daemon,client) pairs that are granted access. +-/etc/hosts.deny, (daemon,client) pairs that are denied access. ++/opt/csw/etc/hosts.allow, (daemon,client) pairs that are granted access. ++/opt/csw/etc/hosts.deny, (daemon,client) pairs that are denied access. + .ad + .fi + .SH SEE ALSO +--- tcpd.8.pre-csw 1996-02-21 10:39:16.000000000 -0500 ++++ tcpd.8 2006-03-30 17:08:22.960557000 -0500 +@@ -146,7 +146,7 @@ + only non-trivial service that is affected by this limitation is + \fIrexd\fR, which is used by the \fIon(1)\fR command. This is no great + loss. On most systems, \fIrexd\fR is less secure than a wildcard in +-/etc/hosts.equiv. ++/opt/csw/etc/hosts.equiv. + .PP + RPC broadcast requests (for example: \fIrwall, rup, rusers\fR) always + appear to come from the responding host. What happens is that the +@@ -158,9 +158,9 @@ + .PP + The default locations of the host access control tables are: + .PP +-/etc/hosts.allow ++/opt/csw/etc/hosts.allow + .br +-/etc/hosts.deny ++/opt/csw/etc/hosts.deny + .SH SEE ALSO + .na + .nf +--- tcpdchk.8.pre-csw 1995-01-08 11:00:31.000000000 -0500 ++++ tcpdchk.8 2006-03-30 17:08:23.007553000 -0500 +@@ -8,7 +8,7 @@ + \fItcpdchk\fR examines your tcp wrapper configuration and reports all + potential and real problems it can find. The program examines the + \fItcpd\fR access control files (by default, these are +-\fI/etc/hosts.allow\fR and \fI/etc/hosts.deny\fR), and compares the ++\fI/opt/csw/etc/hosts.allow\fR and \fI/opt/csw/etc/hosts.deny\fR), and compares the + entries in these files against entries in the \fIinetd\fR or \fItlid\fR + network configuration files. + .PP +@@ -44,9 +44,9 @@ + .PP + The default locations of the \fItcpd\fR access control tables are: + .PP +-/etc/hosts.allow ++/opt/csw/etc/hosts.allow + .br +-/etc/hosts.deny ++/opt/csw/etc/hosts.deny + .SH SEE ALSO + .na + .nf +--- tcpdmatch.8.pre-csw 1996-02-11 11:01:36.000000000 -0500 ++++ tcpdmatch.8 2006-03-30 17:08:23.055866000 -0500 +@@ -11,7 +11,7 @@ + request for service. Examples are given below. + .PP + The program examines the \fItcpd\fR access control tables (default +-\fI/etc/hosts.allow\fR and \fI/etc/hosts.deny\fR) and prints its ++\fI/opt/csw/etc/hosts.allow\fR and \fI/opt/csw/etc/hosts.deny\fR) and prints its + conclusion. For maximal accuracy, it extracts additional information + from your \fIinetd\fR or \fItlid\fR network configuration file. + .PP +@@ -76,9 +76,9 @@ + .PP + The default locations of the \fItcpd\fR access control tables are: + .PP +-/etc/hosts.allow ++/opt/csw/etc/hosts.allow + .br +-/etc/hosts.deny ++/opt/csw/etc/hosts.deny + .SH SEE ALSO + .na + .nf Added: csw/mgar/pkg/tcpwrappers/tags/legacy/pkginfo =================================================================== --- csw/mgar/pkg/tcpwrappers/tags/legacy/pkginfo (rev 0) +++ csw/mgar/pkg/tcpwrappers/tags/legacy/pkginfo 2009-09-11 15:46:06 UTC (rev 6273) @@ -0,0 +1,8 @@ +PKG=CSWtcpwrap +NAME=tcpwrappers - (ipv6.4 patched) lib and tools for pre-screening tcp connections +VERSION=7.6,REV=2006.03.30.ipv6.4 +ARCH=i386 +CATEGORY=system +VENDOR=http://ftp.porcupine.org/pub/security/ packaged for CSW by Philip Brown +HOTLINE=http://www.blastwave.com/bugtrack/ +EMAIL=phil at blastwave.org Added: csw/mgar/pkg/tcpwrappers/tags/legacy/prototype =================================================================== --- csw/mgar/pkg/tcpwrappers/tags/legacy/prototype (rev 0) +++ csw/mgar/pkg/tcpwrappers/tags/legacy/prototype 2009-09-11 15:46:06 UTC (rev 6273) @@ -0,0 +1,29 @@ +i pkginfo +i copyright +d none /opt/csw/share/doc 0755 root bin +d none /opt/csw/share/doc/tcpwrappers 0755 root bin +f none /opt/csw/share/doc/tcpwrappers/README=README.t 0644 root bin +d none /opt/csw/lib 0755 root bin +f none /opt/csw/lib/libwrap-std.so.1=libwrap-std.so.1 0755 root bin +f none /opt/csw/lib/libwrap-ext.so.1=libwrap-ext.so.1 0755 root bin +s none /opt/csw/lib/libwrap.so.1=libwrap-std.so.1 +s none /opt/csw/lib/libwrap.so=libwrap.so.1 +d none /opt/csw/libexec 0755 root bin +f none /opt/csw/libexec/tcpd=tcpd 0755 root bin +f none /opt/csw/libexec/tcpdmatch=tcpdmatch 0755 root bin +f none /opt/csw/libexec/try-from=try-from 0755 root bin +f none /opt/csw/libexec/safe_finger=safe_finger 0755 root bin +f none /opt/csw/libexec/tcpdchk=tcpdchk 0755 root bin +d none /opt/csw/include 0755 root bin +f none /opt/csw/include/tcpd.h=tcpd.h 0644 root bin +d none /opt/csw/share 0755 root bin +d none /opt/csw/share/man 0755 root bin +d none /opt/csw/share/man/man3 0755 root bin +d none /opt/csw/share/man/man5 0755 root bin +d none /opt/csw/share/man/man8 0755 root bin +f none /opt/csw/share/man/man3/hosts_access.3=hosts_access.3 0644 root bin +f none /opt/csw/share/man/man5/hosts_access.5=hosts_access.5 0644 root bin +f none /opt/csw/share/man/man5/hosts_options.5=hosts_options.5 0644 root bin +f none /opt/csw/share/man/man8/tcpd.8=tcpd.8 0644 root bin +f none /opt/csw/share/man/man8/tcpdchk.8=tcpdchk.8 0644 root bin +f none /opt/csw/share/man/man8/tcpdmatch.8=tcpdmatch.8 0644 root bin Added: csw/mgar/pkg/tcpwrappers/tags/legacy/sharedlib.patch =================================================================== --- csw/mgar/pkg/tcpwrappers/tags/legacy/sharedlib.patch (rev 0) +++ csw/mgar/pkg/tcpwrappers/tags/legacy/sharedlib.patch 2009-09-11 15:46:06 UTC (rev 6273) @@ -0,0 +1,71 @@ +--- Makefile.pre-csw 2006-03-30 16:47:20.849031000 -0500 ++++ Makefile 2006-03-30 16:49:56.343391000 -0500 +@@ -197,6 +197,24 @@ + BUGS="$(BUGS) -DSOLARIS_24_GETHOSTBYNAME_BUG" IPV6="$(IPV6)" \ + EXTRA_CFLAGS=-DUSE_STRERROR all + ++sunos5-shared: ++ @$(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 ++ ++sunos5-sharedext: ++ @$(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= STYLE=-DPROCESS_OPTIONS \ ++ NETGROUP=-DNETGROUP AUX_OBJ="setenv.o sharedhack.o" TLI=-DTLI \ ++ BUGS="$(BUGS) -DSOLARIS_24_GETHOSTBYNAME_BUG" IPV6="$(IPV6)" \ ++ EXTRA_CFLAGS="-DUSE_STRERROR -Kpic" all ++ + # Generic SYSV40 + esix sysv4: + @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ +@@ -481,7 +499,7 @@ + # If your system has IPv6 and supports getipnode* and inet_pton/inet_ntop + # uncomment the following (Solaris 8) + +-# IPV6 = -DHAVE_IPV6 ++IPV6 = -DHAVE_IPV6 + + # If your system does not have getipnodebyname() but uses the obsolete + # gethostbyname2() instead, use this (AIX) +@@ -527,7 +545,7 @@ + # + # The LOG_XXX names below are taken from the /usr/include/syslog.h file. + +-FACILITY= LOG_MAIL # LOG_MAIL is what most sendmail daemons use ++FACILITY= LOG_LOCAL1 # LOG_MAIL is what most sendmail daemons use + + # The syslog priority at which successful connections are logged. + +@@ -603,7 +621,7 @@ + # look for access control information. Watch out for the quotes and + # backslashes when you make changes. + +-TABLES = -DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\" ++TABLES = -DHOSTS_DENY=\"/opt/csw/etc/hosts.deny\" -DHOSTS_ALLOW=\"/opt/csw/etc/hosts.allow\" + + #################################################### + # Optional: dealing with host name/address conflicts +@@ -725,7 +743,7 @@ + $(CC) $(CFLAGS) -o $@ miscd.o $(LIB) $(LIBS) + + safe_finger: safe_finger.o $(LIB) +- $(CC) $(CFLAGS) -o $@ safe_finger.o $(LIB) $(LIBS) ++ $(CC) $(CFLAGS) -o $@ safe_finger.o $(LIBS) + + TCPDMATCH_OBJ = tcpdmatch.o fakelog.o inetcf.o scaffold.o + +--- /dev/null 2006-03-30 15:03:19.000000000 -0500 ++++ sharedhack.c 2006-03-30 16:50:50.946442000 -0500 +@@ -0,0 +1,5 @@ ++/* This must be compiled with Sun CC for the pragma */ ++#pragma weak deny_severity ++#pragma weak allow_severity ++int deny_severity=0; ++int allow_severity=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 Sep 11 20:28:00 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Sep 2009 18:28:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6274] csw/mgar/pkg/giflib/trunk/Makefile Message-ID: Revision: 6274 http://gar.svn.sourceforge.net/gar/?rev=6274&view=rev Author: dmichelsen Date: 2009-09-11 18:28:00 +0000 (Fri, 11 Sep 2009) Log Message: ----------- giflib: Fix catalogname Modified Paths: -------------- csw/mgar/pkg/giflib/trunk/Makefile Modified: csw/mgar/pkg/giflib/trunk/Makefile =================================================================== --- csw/mgar/pkg/giflib/trunk/Makefile 2009-09-11 15:46:06 UTC (rev 6273) +++ csw/mgar/pkg/giflib/trunk/Makefile 2009-09-11 18:28:00 UTC (rev 6274) @@ -17,6 +17,9 @@ PACKAGES = CSWgiflib CSWungif +CATALOGNAME_CSWgiflib = giflib +CATALOGNAME_CSWungif = libungif + SPKG_DESC_CSWgiflib = A library for reading and writing gif images SPKG_DESC_CSWungif = Links to giflib now the patent is dropped 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 Sep 11 20:33:26 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Sep 2009 18:33:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[6275] csw/mgar/pkg/libtool/tags Message-ID: Revision: 6275 http://gar.svn.sourceforge.net/gar/?rev=6275&view=rev Author: dmichelsen Date: 2009-09-11 18:33:24 +0000 (Fri, 11 Sep 2009) Log Message: ----------- libtool: Add 1.5.2 legacy build descriptions Added Paths: ----------- csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/ csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/BUILD.NOTES csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/copyright csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/depend csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/libtool.ksh csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/pkginfo csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/prototype csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/prototype.old Added: csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/BUILD.NOTES =================================================================== --- csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/BUILD.NOTES (rev 0) +++ csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/BUILD.NOTES 2009-09-11 18:33:24 UTC (rev 6275) @@ -0,0 +1,41 @@ +# sad thing: it takes 3 times as long to configure the thing, +# as it does to "make" it. + + +CFLAGS=-O CC=cc CXX=CC ./configure --prefix=/opt/csw --infodir=/opt/csw/share/info + +gmake +MAKE=gmake stagepkg + +mv cswstage/opt/csw/bin/libtool cswstage/opt/csw/bin/libtool.cc + +gmake clean # distclean does not seem to work?? + +CC=gcc CXX=g++ ./configure --prefix=/opt/csw +gmake +cp libtool cswstage/opt/csw/bin/libtool.gcc + +cp ~/pkgs/libtool/libtool.ksh cswstage/opt/csw/bin/libtool + +# [the rest is from pkg directory ....] + +cd ~/pkgs/libtool +createpkg -r $HOME/build/libtool*/cswstage + + + +############################################################ +Notes on CCvsgcc issues with libtool: +$ diff -r csw-forte cswstage|egrep '^diff|Binary' +diff -r csw-forte/opt/csw/bin/libtool cswstage/opt/csw/bin/libtool +Binary files csw-forte/opt/csw/lib/libltdl.a and cswstage/opt/csw/lib/libltdl.a differ +Binary files csw-forte/opt/csw/lib/libltdl.so and cswstage/opt/csw/lib/libltdl.so differ +Binary files csw-forte/opt/csw/lib/libltdl.so.3 and cswstage/opt/csw/lib/libltdl.so.3 differ +Binary files csw-forte/opt/csw/lib/libltdl.so.3.1.0 and cswstage/opt/csw/lib/libltdl.so.3.1.0 differ + + +According to "nm", there are ACTUAL FUNCTION DIFFERENCES between the two +libltdl.a files. The forte one is bigger, because it has a whole +bunch of things like, ".XAAj6Ia8srTA10P.archive_ext" +But only if you forget to DISABLE THE STUPID INCREMENTAL LINKER. + Added: csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/copyright =================================================================== --- csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/copyright (rev 0) +++ csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/copyright 2009-09-11 18:33:24 UTC (rev 6275) @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 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 Library General +Public License instead of this License. Added: csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/depend =================================================================== --- csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/depend (rev 0) +++ csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/depend 2009-09-11 18:33:24 UTC (rev 6275) @@ -0,0 +1,2 @@ +P CSWcommon +P CSWgsed Added: csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/libtool.ksh =================================================================== --- csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/libtool.ksh (rev 0) +++ csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/libtool.ksh 2009-09-11 18:33:24 UTC (rev 6275) @@ -0,0 +1,47 @@ +#!/bin/ksh + +# Wrapper for libtool, so that it auto-adjusts to whether you +# are using gcc, or Sun CC. +# libtool itself SHOULD do this. except it doesnt :-/ +# +# It tries to base its choice on what environment vars are set to. +# Otherwise, it defaults to Sun CC if installed, or falls back +# to gcc if all else fails. + +case CC in + gcc) + LIBTOOL=libtool.gcc + ;; + cc) + LIBTOOL=libtool.cc + ;; +esac + +case CXX in + g++) + LIBTOOL=libtool.gcc + ;; + CC) + LIBTOOL=libtool.cc + ;; +esac + +if [[ "$LIBTOOL" = "" ]] ; then + case "$*" in + *" "gcc" "*) + LIBTOOL=libtool.gcc + ;; + esac +fi + +# Hmm. No compiler specified. Try to guess which one to use. +# Although this shouldnt really get called +if [[ "$LIBTOOL" = "" ]] ; then + if [[ -x /opt/SUNWspro/bin/cc ]] ; then + LIBTOOL=libtool.cc + else + LIBTOOL=libtool.gcc + fi +fi + +exec /opt/csw/bin/$LIBTOOL "$@" Added: csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/pkginfo =================================================================== --- csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/pkginfo (rev 0) +++ csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/pkginfo 2009-09-11 18:33:24 UTC (rev 6275) @@ -0,0 +1,8 @@ +PKG=CSWlibtool +NAME=libtool - GNU tool for compiling libraries +VERSION=1.5.2 +ARCH=i386 +CATEGORY=system +VENDOR=http://ftp.gnu.org/pub/gnu/libtool packaged for CSW by Philip Brown +HOTLINE=http://www.blastwave.org/bugtrack/ +EMAIL=phil at bolthole.com Added: csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/prototype =================================================================== --- csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/prototype (rev 0) +++ csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/prototype 2009-09-11 18:33:24 UTC (rev 6275) @@ -0,0 +1,43 @@ +i pkginfo +i copyright +i depend +d none /opt/csw/share 0755 root bin +d none /opt/csw/share/info 0755 root bin +f none /opt/csw/share/info/libtool.info 0644 root bin +d none /opt/csw/share/aclocal 0755 root bin +f none /opt/csw/share/aclocal/libtool.m4 0644 root bin +f none /opt/csw/share/aclocal/ltdl.m4 0644 root bin +d none /opt/csw/share/libtool 0755 root bin +f none /opt/csw/share/libtool/ltmain.sh 0644 root bin +f none /opt/csw/share/libtool/config.guess 0755 root bin +f none /opt/csw/share/libtool/config.sub 0755 root bin +d none /opt/csw/share/libtool/libltdl 0755 root bin +f none /opt/csw/share/libtool/libltdl/README 0644 root bin +f none /opt/csw/share/libtool/libltdl/acinclude.m4 0644 root bin +f none /opt/csw/share/libtool/libltdl/configure.ac 0644 root bin +f none /opt/csw/share/libtool/libltdl/aclocal.m4 0644 root bin +f none /opt/csw/share/libtool/libltdl/ltdl.h 0644 root bin +f none /opt/csw/share/libtool/libltdl/Makefile.am 0644 root bin +f none /opt/csw/share/libtool/libltdl/Makefile.in 0644 root bin +f none /opt/csw/share/libtool/libltdl/config-h.in 0644 root bin +f none /opt/csw/share/libtool/libltdl/configure 0755 root bin +f none /opt/csw/share/libtool/libltdl/COPYING.LIB 0644 root bin +f none /opt/csw/share/libtool/libltdl/config.guess 0755 root bin +f none /opt/csw/share/libtool/libltdl/config.sub 0755 root bin +f none /opt/csw/share/libtool/libltdl/install-sh 0755 root bin +f none /opt/csw/share/libtool/libltdl/ltmain.sh 0644 root bin +f none /opt/csw/share/libtool/libltdl/missing 0755 root bin +f none /opt/csw/share/libtool/libltdl/ltdl.c 0644 root bin +d none /opt/csw/lib 0755 root bin +f none /opt/csw/lib/libltdl.so.3.1.0 0755 root bin +s none /opt/csw/lib/libltdl.so.3=libltdl.so.3.1.0 +s none /opt/csw/lib/libltdl.so=libltdl.so.3.1.0 +f none /opt/csw/lib/libltdl.la 0755 root bin +f none /opt/csw/lib/libltdl.a 0644 root bin +d none /opt/csw/bin 0755 root bin +f none /opt/csw/bin/libtool 0755 root bin +f none /opt/csw/bin/libtool.cc 0755 root bin +f none /opt/csw/bin/libtool.gcc 0755 root bin +f none /opt/csw/bin/libtoolize 0755 root bin +d none /opt/csw/include 0755 root bin +f none /opt/csw/include/ltdl.h 0644 root bin Added: csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/prototype.old =================================================================== --- csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/prototype.old (rev 0) +++ csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/prototype.old 2009-09-11 18:33:24 UTC (rev 6275) @@ -0,0 +1,49 @@ +i pkginfo +i copyright +i depend +d none /opt/csw/share 0755 root bin +d none /opt/csw/share/info 0755 root bin +f none /opt/csw/share/info/libtool.info 0644 root bin +f none /opt/csw/share/info/libtool.info-1 0644 root bin +f none /opt/csw/share/info/libtool.info-2 0644 root bin +f none /opt/csw/share/info/libtool.info-3 0644 root bin +f none /opt/csw/share/info/libtool.info-4 0644 root bin +f none /opt/csw/share/info/libtool.info-5 0644 root bin +d none /opt/csw/share/aclocal 0755 root bin +f none /opt/csw/share/aclocal/libtool.m4 0644 root bin +f none /opt/csw/share/aclocal/ltdl.m4 0644 root bin +d none /opt/csw/share/libtool 0755 root bin +f none /opt/csw/share/libtool/ltmain.sh 0644 root bin +f none /opt/csw/share/libtool/config.guess 0755 root bin +f none /opt/csw/share/libtool/config.sub 0755 root bin +d none /opt/csw/share/libtool/libltdl 0755 root bin +f none /opt/csw/share/libtool/libltdl/README 0644 root bin +f none /opt/csw/share/libtool/libltdl/ltdl.h 0644 root bin +f none /opt/csw/share/libtool/libltdl/COPYING.LIB 0644 root bin +f none /opt/csw/share/libtool/libltdl/Makefile.am 0644 root bin +f none /opt/csw/share/libtool/libltdl/Makefile.in 0644 root bin +f none /opt/csw/share/libtool/libltdl/acinclude.m4 0644 root bin +f none /opt/csw/share/libtool/libltdl/aclocal.m4 0644 root bin +f none /opt/csw/share/libtool/libltdl/config-h.in 0644 root bin +f none /opt/csw/share/libtool/libltdl/config.guess 0755 root bin +f none /opt/csw/share/libtool/libltdl/config.sub 0755 root bin +f none /opt/csw/share/libtool/libltdl/configure 0755 root bin +f none /opt/csw/share/libtool/libltdl/configure.ac 0644 root bin +f none /opt/csw/share/libtool/libltdl/install-sh 0755 root bin +f none /opt/csw/share/libtool/libltdl/ltmain.sh 0644 root bin +f none /opt/csw/share/libtool/libltdl/missing 0755 root bin +f none /opt/csw/share/libtool/libltdl/mkinstalldirs 0755 root bin +f none /opt/csw/share/libtool/libltdl/ltdl.c 0644 root bin +d none /opt/csw/lib 0755 root bin +f none /opt/csw/lib/libltdl.so.3.1.0 0755 root bin +s none /opt/csw/lib/libltdl.so.3=libltdl.so.3.1.0 +s none /opt/csw/lib/libltdl.so=libltdl.so.3.1.0 +f none /opt/csw/lib/libltdl.la 0755 root bin +f none /opt/csw/lib/libltdl.a 0644 root bin +d none /opt/csw/bin 0755 root bin +f none /opt/csw/bin/libtool 0755 root bin +f none /opt/csw/bin/libtool.cc 0755 root bin +f none /opt/csw/bin/libtool.gcc 0755 root bin +f none /opt/csw/bin/libtoolize 0755 root bin +d none /opt/csw/include 0755 root bin +f none /opt/csw/include/ltdl.h 0644 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 Fri Sep 11 20:45:14 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Sep 2009 18:45:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6276] csw/mgar/pkg/tcpwrappers/trunk Message-ID: Revision: 6276 http://gar.svn.sourceforge.net/gar/?rev=6276&view=rev Author: dmichelsen Date: 2009-09-11 18:45:14 +0000 (Fri, 11 Sep 2009) Log Message: ----------- tcpwrappers: Initial commit Modified Paths: -------------- csw/mgar/pkg/tcpwrappers/trunk/Makefile csw/mgar/pkg/tcpwrappers/trunk/checksums Added Paths: ----------- csw/mgar/pkg/tcpwrappers/trunk/files/ csw/mgar/pkg/tcpwrappers/trunk/files/COPYING csw/mgar/pkg/tcpwrappers/trunk/files/README csw/mgar/pkg/tcpwrappers/trunk/files/man.patch csw/mgar/pkg/tcpwrappers/trunk/files/patch-cflags.diff csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch Modified: csw/mgar/pkg/tcpwrappers/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcpwrappers/trunk/Makefile 2009-09-11 18:33:24 UTC (rev 6275) +++ csw/mgar/pkg/tcpwrappers/trunk/Makefile 2009-09-11 18:45:14 UTC (rev 6276) @@ -1,5 +1,7 @@ GARNAME = tcp_wrappers -GARVERSION = 7.6 +BASEVERSION = 7.6 +RELEASE = ipv6.4 +GARVERSION = $(BASEVERSION)-$(RELEASE) CATEGORIES = lib DESCRIPTION = Socket wrappers for pre-screening tcp connections (ipv6.4 patched) @@ -10,33 +12,95 @@ MASTER_SITES = http://ftp.porcupine.org/pub/security/ DISTNAME = $(GARNAME)_$(GARVERSION) DISTFILES = $(DISTNAME).tar.gz +DISTFILES += COPYING +DISTFILES += README + +PATCHFILES = patch-cflags.diff +PATCHFILES += man.patch +PATCHFILES += sharedlib.patch + WORKSRC = $(WORKDIR)/$(DISTNAME) +PACKAGES = CSWtcpwrap +CATALOGNAME = tcpwrappers + +SPKG_VERSION = $(BASEVERSION) + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)_(\d+(?:\.\d+)*).tar.gz -#BUILD_ARGS = REAL_DAEMON_DIR=/foo/bar +EXTRA_MODULATORS = EXTENDED +MODULATIONS_EXTENDED = on off + +BUILD_ARGS = REAL_DAEMON_DIR=/usr/sbin BUILD_ARGS += STYLE=-DPROCESS_OPTIONS +BUILD_ARGS += USER_CFLAGS="$(CFLAGS)" +BUILD64 = 1 + CONFIGURE_SCRIPTS = + +BUILD_TARGET_EXTENDED_off = sunos5-shared +BUILD_TARGET_EXTENDED_on = sunos5-sharedext + BUILD_SCRIPTS = custom -INSTALL_SCRIPTS = custom # No test suite TEST_SCRIPTS = +LIBNAME_EXTENDED-off = libwrap-std.so.1 +LIBNAME_EXTENDED-on = libwrap-ext.so.1 + +INSTALL_SCRIPTS = custom + +MERGE_SCRIPTS_isa-sparcv8-extended-off = copy-all + MERGE_SCRIPTS_isa-sparcv8-extended-on = copy-relocated-only + MERGE_DIRS_isa-sparcv8-extended-on = $(libdir) + +MERGE_SCRIPTS_isa-sparcv9-extended-off = copy-relocated-only + MERGE_DIRS_isa-sparcv9-extended-off = $(libdir) + MERGE_SCRIPTS_isa-sparcv9-extended-on = copy-relocated-only + MERGE_DIRS_isa-sparcv9-extended-on = $(libdir) + + MERGE_SCRIPTS_isa-i386-extended-off = copy-all + MERGE_SCRIPTS_isa-i386-extended-on = copy-relocated-only + MERGE_DIRS_isa-i386-extended-on = $(libdir) + + MERGE_SCRIPTS_isa-amd64-extended-off = copy-relocated-only + MERGE_DIRS_isa-amd64-extended-off = $(libdir) + MERGE_SCRIPTS_isa-amd64-extended-on = copy-relocated-only + MERGE_DIRS_isa-amd64-extended-on = $(libdir) + include gar/category.mk build-custom: - @$(MAKE) -C $(WORKSRC) $(BUILD_ARGS) sunos5 + $(MAKE) -C $(WORKSRC) $(BUILD_ARGS) $(BUILD_TARGET_EXTENDED_$(EXTENDED)) + @$(MAKECOOKIE) -BINFILES = $(addprefix $(WORKSRC)/,safe_finger tcpd tcpdchk tcpdmatch try-from) -INCFILES = $(addprefix $(WORKSRC)/,tcpd.h) -LIBFILES = $(addprefix $(WORKSRC)/,libwrap.a) - install-custom: @echo " => Installing $(GARNAME)" - @install -v -m 555 $(BINFILES) $(DESTDIR)$(bindir) - @install -v -m 444 $(INCFILES) $(DESTDIR)$(includedir) - @install -v -m 444 $(LIBFILES) $(DESTDIR)$(libdir) - + ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) + cd $(WORKDIR) && ginstall -v -m 644 README $(DESTDIR)$(docdir)/$(GARNAME) + ginstall -d $(DESTDIR)$(libexecdir) + cd $(WORKSRC) && ginstall -v -m 755 safe_finger tcpd tcpdchk tcpdmatch try-from $(DESTDIR)$(libexecdir) + ginstall -d $(DESTDIR)$(includedir) + cd $(WORKSRC) && ginstall -v -m 644 tcpd.h $(DESTDIR)$(includedir) + ginstall -d $(DESTDIR)$(libdir) + cd $(WORKSRC) && ginstall -v -m 644 libwrap.so.1 $(DESTDIR)$(libdir)/$(LIBNAME_EXTENDED-$(EXTENDED)) + ginstall -d $(DESTDIR)$(mandir)/man3 + cd $(WORKSRC) && ginstall -v -m 644 *.3 $(DESTDIR)$(mandir)/man3 + ginstall -d $(DESTDIR)$(mandir)/man5 + cd $(WORKSRC) && ginstall -v -m 644 *.5 $(DESTDIR)$(mandir)/man5 + ginstall -d $(DESTDIR)$(mandir)/man8 + cd $(WORKSRC) && ginstall -v -m 644 *.8 $(DESTDIR)$(mandir)/man8 + @$(MAKECOOKIE) + +post-merge: + ln -s libwrap-std.so.1 $(PKGROOT)$(libdir)/libwrap.so.1 + ln -s libwrap.so.1 $(PKGROOT)$(libdir)/libwrap.so + ln -s libwrap-std.so.1 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libwrap.so.1 + ln -s libwrap.so.1 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libwrap.so + @$(MAKECOOKIE) + +SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) + Modified: csw/mgar/pkg/tcpwrappers/trunk/checksums =================================================================== --- csw/mgar/pkg/tcpwrappers/trunk/checksums 2009-09-11 18:33:24 UTC (rev 6275) +++ csw/mgar/pkg/tcpwrappers/trunk/checksums 2009-09-11 18:45:14 UTC (rev 6276) @@ -1 +1,6 @@ -e6fa25f71226d090f34de3f6b122fb5a download/tcp_wrappers_7.6.tar.gz +071bd69cb78b18888ea5e3da5c3127fa download/COPYING +b268880c14ab6d31140015275c82d6aa download/README +89e8f9d1ed25d8e809674af9bf3d18e6 download/man.patch +af28873e5c16c4f921237148e2507826 download/patch-cflags.diff +39ff14b0cc741a02a8427c4107c5d7d4 download/sharedlib.patch +ccbc2676977c31bbd43783abfbf2fdcf download/tcp_wrappers_7.6-ipv6.4.tar.gz Copied: csw/mgar/pkg/tcpwrappers/trunk/files/COPYING (from rev 6273, csw/mgar/pkg/tcpwrappers/tags/legacy/copyright) =================================================================== --- csw/mgar/pkg/tcpwrappers/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/tcpwrappers/trunk/files/COPYING 2009-09-11 18:45:14 UTC (rev 6276) @@ -0,0 +1,16 @@ +/************************************************************************ +* Copyright 1995 by Wietse Venema. All rights reserved. Some individual +* files may be covered by other copyrights. +* +* This material was originally written and compiled by Wietse Venema at +* Eindhoven University of Technology, The Netherlands, in 1990, 1991, +* 1992, 1993, 1994 and 1995. +* +* Redistribution and use in source and binary forms are permitted +* provided that this entire copyright notice is duplicated in all such +* copies. +* +* This software is provided "as is" and without any expressed or implied +* warranties, including, without limitation, the implied warranties of +* merchantibility and fitness for any particular purpose. +************************************************************************/ Copied: csw/mgar/pkg/tcpwrappers/trunk/files/README (from rev 6273, csw/mgar/pkg/tcpwrappers/tags/legacy/README.t) =================================================================== --- csw/mgar/pkg/tcpwrappers/trunk/files/README (rev 0) +++ csw/mgar/pkg/tcpwrappers/trunk/files/README 2009-09-11 18:45:14 UTC (rev 6276) @@ -0,0 +1,28 @@ +TCP-Wrappers, from http://www.porcupine.org + +Note that the library is compiled to use LOG_LOCAL1 as the +syslog facility, NOT "LOG_MAIL", the default. + +ALSO, it uses /etc/opt/csw/hosts.xxx, NOT /etc/hosts.XXX + +man hosts_access(3), hosts_access(5), hosts_options(5) +for syntax on those. + +The compile has been hacked to provide a shared-library version instead +of libwrap.a +There is an extra hack, in that there are default variable definitions of +deny_severity and allow_severity, set to 0. +This is to allow for ./configure style tests, that break in the transition +from lib.a to lib.so + + +Note also that there are TWO versions of libwrap.so: +libwrap-std.so.1 The "standard" tcp wrapper library +libwrap-ext.so.1 The "extended" tcp wrapper library + +By default, /opt/csw/lib/libwrap.so.1 is linked to the std version. +To use the extended syntax in hosts_options(5), you need to change +the link to point to libwrap-ext.so.1 +Unfortunately, the syntax for the two versions, is slightly incompatible, +which is why there are two versions. + Copied: csw/mgar/pkg/tcpwrappers/trunk/files/man.patch (from rev 6273, csw/mgar/pkg/tcpwrappers/tags/legacy/man.patch) =================================================================== --- csw/mgar/pkg/tcpwrappers/trunk/files/man.patch (rev 0) +++ csw/mgar/pkg/tcpwrappers/trunk/files/man.patch 2009-09-11 18:45:14 UTC (rev 6276) @@ -0,0 +1,154 @@ +diff -Naur tcp_wrappers_7.6-ipv6.4.orig/hosts_access.3 tcp_wrappers_7.6-ipv6.4.patched/hosts_access.3 +--- tcp_wrappers_7.6-ipv6.4.orig/hosts_access.3 1996-02-11 17:01:27.000000000 +0100 ++++ tcp_wrappers_7.6-ipv6.4.patched/hosts_access.3 2009-09-11 18:54:28.630235290 +0200 +@@ -78,7 +78,7 @@ + hosts_access(5), format of the access control tables. + hosts_options(5), optional extensions to the base language. + .SH FILES +-/etc/hosts.allow, /etc/hosts.deny, access control tables. ++/etc/opt/csw/hosts.allow, /etc//opt/csw/hosts.deny, access control tables. + .SH BUGS + hosts_access() uses the strtok() library function. This may interfere + with other code that relies on strtok(). +diff -Naur tcp_wrappers_7.6-ipv6.4.orig/hosts_access.5 tcp_wrappers_7.6-ipv6.4.patched/hosts_access.5 +--- tcp_wrappers_7.6-ipv6.4.orig/hosts_access.5 1995-01-30 19:51:47.000000000 +0100 ++++ tcp_wrappers_7.6-ipv6.4.patched/hosts_access.5 2009-09-11 18:54:28.633332432 +0200 +@@ -21,10 +21,10 @@ + at the first match: + .IP \(bu + Access will be granted when a (daemon,client) pair matches an entry in +-the \fI/etc/hosts.allow\fR file. ++the \fI/etc/opt/csw/hosts.allow\fR file. + .IP \(bu + Otherwise, access will be denied when a (daemon,client) pair matches an +-entry in the \fI/etc/hosts.deny\fR file. ++entry in the \fI/etc/opt/csw/hosts.deny\fR file. + .IP \(bu + Otherwise, access will be granted. + .PP +@@ -268,7 +268,7 @@ + file: + .PP + .ne 2 +-/etc/hosts.deny: ++/etc/opt/csw/hosts.deny: + .in +3 + ALL: ALL + .PP +@@ -279,7 +279,7 @@ + For example: + .PP + .ne 2 +-/etc/hosts.allow: ++/etc/opt/csw/hosts.allow: + .in +3 + ALL: LOCAL @some_netgroup + .br +@@ -298,7 +298,7 @@ + that it can be omitted. The explicitly non-authorized hosts are listed + in the deny file. For example: + .PP +-/etc/hosts.deny: ++/etc/opt/csw/hosts.deny: + .in +3 + ALL: some.host.name, .some.domain + .br +@@ -313,13 +313,13 @@ + host. The result is mailed to the superuser. + .PP + .ne 2 +-/etc/hosts.allow: ++/etc/opt/csw/hosts.allow: + .in +3 + .nf + in.tftpd: LOCAL, .my.domain + .PP + .ne 2 +-/etc/hosts.deny: ++/etc/opt/csw/hosts.deny: + .in +3 + .nf + in.tftpd: ALL: (/some/where/safe_finger -l @%h | \\ +@@ -353,8 +353,8 @@ + .SH FILES + .na + .nf +-/etc/hosts.allow, (daemon,client) pairs that are granted access. +-/etc/hosts.deny, (daemon,client) pairs that are denied access. ++/etc/opt/csw/hosts.allow, (daemon,client) pairs that are granted access. ++/etc/opt/csw/hosts.deny, (daemon,client) pairs that are denied access. + .ad + .fi + .SH SEE ALSO +diff -Naur tcp_wrappers_7.6-ipv6.4.orig/tcpd.8 tcp_wrappers_7.6-ipv6.4.patched/tcpd.8 +--- tcp_wrappers_7.6-ipv6.4.orig/tcpd.8 1996-02-21 16:39:16.000000000 +0100 ++++ tcp_wrappers_7.6-ipv6.4.patched/tcpd.8 2009-09-11 18:54:28.635231817 +0200 +@@ -146,7 +146,7 @@ + only non-trivial service that is affected by this limitation is + \fIrexd\fR, which is used by the \fIon(1)\fR command. This is no great + loss. On most systems, \fIrexd\fR is less secure than a wildcard in +-/etc/hosts.equiv. ++/etc/opt/csw/hosts.equiv. + .PP + RPC broadcast requests (for example: \fIrwall, rup, rusers\fR) always + appear to come from the responding host. What happens is that the +@@ -158,9 +158,9 @@ + .PP + The default locations of the host access control tables are: + .PP +-/etc/hosts.allow ++/etc/opt/csw/hosts.allow + .br +-/etc/hosts.deny ++/etc/opt/csw/hosts.deny + .SH SEE ALSO + .na + .nf +diff -Naur tcp_wrappers_7.6-ipv6.4.orig/tcpdchk.8 tcp_wrappers_7.6-ipv6.4.patched/tcpdchk.8 +--- tcp_wrappers_7.6-ipv6.4.orig/tcpdchk.8 1995-01-08 17:00:31.000000000 +0100 ++++ tcp_wrappers_7.6-ipv6.4.patched/tcpdchk.8 2009-09-11 18:54:28.636911201 +0200 +@@ -8,7 +8,7 @@ + \fItcpdchk\fR examines your tcp wrapper configuration and reports all + potential and real problems it can find. The program examines the + \fItcpd\fR access control files (by default, these are +-\fI/etc/hosts.allow\fR and \fI/etc/hosts.deny\fR), and compares the ++\fI/etc/opt/csw/hosts.allow\fR and \fI/etc/opt/csw/hosts.deny\fR), and compares the + entries in these files against entries in the \fIinetd\fR or \fItlid\fR + network configuration files. + .PP +@@ -44,9 +44,9 @@ + .PP + The default locations of the \fItcpd\fR access control tables are: + .PP +-/etc/hosts.allow ++/etc/opt/csw/hosts.allow + .br +-/etc/hosts.deny ++/etc/opt/csw/hosts.deny + .SH SEE ALSO + .na + .nf +diff -Naur tcp_wrappers_7.6-ipv6.4.orig/tcpdmatch.8 tcp_wrappers_7.6-ipv6.4.patched/tcpdmatch.8 +--- tcp_wrappers_7.6-ipv6.4.orig/tcpdmatch.8 1996-02-11 17:01:36.000000000 +0100 ++++ tcp_wrappers_7.6-ipv6.4.patched/tcpdmatch.8 2009-09-11 18:54:28.638584325 +0200 +@@ -11,7 +11,7 @@ + request for service. Examples are given below. + .PP + The program examines the \fItcpd\fR access control tables (default +-\fI/etc/hosts.allow\fR and \fI/etc/hosts.deny\fR) and prints its ++\fI/etc/opt/csw/hosts.allow\fR and \fI/etc/opt/csw/hosts.deny\fR) and prints its + conclusion. For maximal accuracy, it extracts additional information + from your \fIinetd\fR or \fItlid\fR network configuration file. + .PP +@@ -76,9 +76,9 @@ + .PP + The default locations of the \fItcpd\fR access control tables are: + .PP +-/etc/hosts.allow ++/etc/opt/csw/hosts.allow + .br +-/etc/hosts.deny ++/etc/opt/csw/hosts.deny + .SH SEE ALSO + .na + .nf Added: csw/mgar/pkg/tcpwrappers/trunk/files/patch-cflags.diff =================================================================== --- csw/mgar/pkg/tcpwrappers/trunk/files/patch-cflags.diff (rev 0) +++ csw/mgar/pkg/tcpwrappers/trunk/files/patch-cflags.diff 2009-09-11 18:45:14 UTC (rev 6276) @@ -0,0 +1,12 @@ +diff -Naur tcp_wrappers_7.6-ipv6.4.orig/Makefile tcp_wrappers_7.6-ipv6.4.patched/Makefile +--- tcp_wrappers_7.6-ipv6.4.orig/Makefile 2003-04-16 16:25:03.000000000 +0200 ++++ tcp_wrappers_7.6-ipv6.4.patched/Makefile 2009-09-11 17:11:48.499403164 +0200 +@@ -677,7 +677,7 @@ + -DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" $(STYLE) $(KILL_OPT) \ + -DSEVERITY=$(SEVERITY) -DRFC931_TIMEOUT=$(RFC931_TIMEOUT) \ + $(UCHAR) $(TABLES) $(STRINGS) $(TLI) $(EXTRA_CFLAGS) $(DOT) \ +- $(VSYSLOG) $(HOSTNAME) $(IPV6) ++ $(VSYSLOG) $(HOSTNAME) $(IPV6) $(USER_CFLAGS) + + LIB_OBJ= hosts_access.o options.o shell_cmd.o rfc931.o eval.o \ + hosts_ctl.o refuse.o percent_x.o clean_exit.o $(AUX_OBJ) \ Copied: csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch (from rev 6273, csw/mgar/pkg/tcpwrappers/tags/legacy/sharedlib.patch) =================================================================== --- csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch (rev 0) +++ csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch 2009-09-11 18:45:14 UTC (rev 6276) @@ -0,0 +1,73 @@ +diff -Naur tcp_wrappers_7.6-ipv6.4.orig/Makefile tcp_wrappers_7.6-ipv6.4.patched/Makefile +--- tcp_wrappers_7.6-ipv6.4.orig/Makefile 2003-04-16 16:25:03.000000000 +0200 ++++ tcp_wrappers_7.6-ipv6.4.patched/Makefile 2009-09-11 18:58:37.916723372 +0200 +@@ -197,6 +197,24 @@ + BUGS="$(BUGS) -DSOLARIS_24_GETHOSTBYNAME_BUG" IPV6="$(IPV6)" \ + EXTRA_CFLAGS=-DUSE_STRERROR all + ++sunos5-shared: ++ @$(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 ++ ++sunos5-sharedext: ++ @$(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= STYLE=-DPROCESS_OPTIONS \ ++ NETGROUP=-DNETGROUP AUX_OBJ="setenv.o sharedhack.o" TLI=-DTLI \ ++ BUGS="$(BUGS) -DSOLARIS_24_GETHOSTBYNAME_BUG" IPV6="$(IPV6)" \ ++ EXTRA_CFLAGS="-DUSE_STRERROR -Kpic" all ++ + # Generic SYSV40 + esix sysv4: + @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ +@@ -481,7 +499,7 @@ + # If your system has IPv6 and supports getipnode* and inet_pton/inet_ntop + # uncomment the following (Solaris 8) + +-# IPV6 = -DHAVE_IPV6 ++IPV6 = -DHAVE_IPV6 + + # If your system does not have getipnodebyname() but uses the obsolete + # gethostbyname2() instead, use this (AIX) +@@ -527,7 +545,7 @@ + # + # The LOG_XXX names below are taken from the /usr/include/syslog.h file. + +-FACILITY= LOG_MAIL # LOG_MAIL is what most sendmail daemons use ++FACILITY= LOG_LOCAL1 # LOG_MAIL is what most sendmail daemons use + + # The syslog priority at which successful connections are logged. + +@@ -603,7 +621,7 @@ + # look for access control information. Watch out for the quotes and + # backslashes when you make changes. + +-TABLES = -DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\" ++TABLES = -DHOSTS_DENY=\"/etc/opt/csw/hosts.deny\" -DHOSTS_ALLOW=\"/etc/opt/csw/hosts.allow\" + + #################################################### + # Optional: dealing with host name/address conflicts +@@ -725,7 +743,7 @@ + $(CC) $(CFLAGS) -o $@ miscd.o $(LIB) $(LIBS) + + safe_finger: safe_finger.o $(LIB) +- $(CC) $(CFLAGS) -o $@ safe_finger.o $(LIB) $(LIBS) ++ $(CC) $(CFLAGS) -o $@ safe_finger.o $(LIBS) + + TCPDMATCH_OBJ = tcpdmatch.o fakelog.o inetcf.o scaffold.o + +diff -Naur tcp_wrappers_7.6-ipv6.4.orig/sharedhack.c tcp_wrappers_7.6-ipv6.4.patched/sharedhack.c +--- tcp_wrappers_7.6-ipv6.4.orig/sharedhack.c 1970-01-01 01:00:00.000000000 +0100 ++++ tcp_wrappers_7.6-ipv6.4.patched/sharedhack.c 2009-09-11 18:58:37.917838872 +0200 +@@ -0,0 +1,5 @@ ++/* This must be compiled with Sun CC for the pragma */ ++#pragma weak deny_severity ++#pragma weak allow_severity ++int deny_severity=0; ++int allow_severity=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 Sep 11 20:52:20 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Sep 2009 18:52:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[6277] csw/mgar/pkg/tcpwrappers/trunk/Makefile Message-ID: Revision: 6277 http://gar.svn.sourceforge.net/gar/?rev=6277&view=rev Author: dmichelsen Date: 2009-09-11 18:52:19 +0000 (Fri, 11 Sep 2009) Log Message: ----------- tcpwrappers: Fix directory of README Modified Paths: -------------- csw/mgar/pkg/tcpwrappers/trunk/Makefile Modified: csw/mgar/pkg/tcpwrappers/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcpwrappers/trunk/Makefile 2009-09-11 18:45:14 UTC (rev 6276) +++ csw/mgar/pkg/tcpwrappers/trunk/Makefile 2009-09-11 18:52:19 UTC (rev 6277) @@ -78,9 +78,9 @@ @$(MAKECOOKIE) install-custom: - @echo " => Installing $(GARNAME)" - ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) - cd $(WORKDIR) && ginstall -v -m 644 README $(DESTDIR)$(docdir)/$(GARNAME) + @echo " => Installing $(CATALOGNAME)" + ginstall -d $(DESTDIR)$(docdir)/$(CATALOGNAME) + cd $(WORKDIR) && ginstall -v -m 644 README $(DESTDIR)$(docdir)/$(CATALOGNAME) ginstall -d $(DESTDIR)$(libexecdir) cd $(WORKSRC) && ginstall -v -m 755 safe_finger tcpd tcpdchk tcpdmatch try-from $(DESTDIR)$(libexecdir) ginstall -d $(DESTDIR)$(includedir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sat Sep 12 00:37:25 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 11 Sep 2009 22:37:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[6278] csw/mgar/pkg Message-ID: Revision: 6278 http://gar.svn.sourceforge.net/gar/?rev=6278&view=rev Author: skayser Date: 2009-09-11 22:37:24 +0000 (Fri, 11 Sep 2009) Log Message: ----------- sudosh2: initial commit Added Paths: ----------- csw/mgar/pkg/sudosh2/ csw/mgar/pkg/sudosh2/branches/ csw/mgar/pkg/sudosh2/tags/ csw/mgar/pkg/sudosh2/trunk/ csw/mgar/pkg/sudosh2/trunk/Makefile csw/mgar/pkg/sudosh2/trunk/checksums csw/mgar/pkg/sudosh2/trunk/files/ csw/mgar/pkg/sudosh2/trunk/files/001-installsudosh.conf-destdir.patch Property changes on: csw/mgar/pkg/sudosh2/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/sudosh2/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudosh2/trunk/Makefile (rev 0) +++ csw/mgar/pkg/sudosh2/trunk/Makefile 2009-09-11 22:37:24 UTC (rev 6278) @@ -0,0 +1,32 @@ +# TODO/Issues +# - Man pages don't display right now +# - Set sudosh.conf ownership to root:root? +# - Compiled in default for logdir /var/adm/..., if not existant sudosh2 +# totally hangs (^C doesn't work). Change default and include the dir in the +# package? +# - Submit DESTDIR patch upstream +GARNAME = sudosh2 +GARVERSION = 1.0.2 +CATEGORIES = apps + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tgz + +CONFIGURE_ARGS = $(DIRPATHS) + +# No tests available +TEST_SCRIPTS = + +# Installation for sudosh.conf doesn't honor DESTDIR +PATCHFILES = 001-installsudosh.conf-destdir.patch + +include gar/category.mk + +pre-configure-modulated: + perl -pi -e 's|-Werror|-errwarn|g' $(WORKSRC)/Makefile.in $(WORKSRC)/src/Makefile.in + @$(MAKECOOKIE) Added: csw/mgar/pkg/sudosh2/trunk/checksums =================================================================== --- csw/mgar/pkg/sudosh2/trunk/checksums (rev 0) +++ csw/mgar/pkg/sudosh2/trunk/checksums 2009-09-11 22:37:24 UTC (rev 6278) @@ -0,0 +1 @@ +4c837f7739d9db780ad324ed8482e8a7 download/sudosh2-1.0.2.tgz Added: csw/mgar/pkg/sudosh2/trunk/files/001-installsudosh.conf-destdir.patch =================================================================== --- csw/mgar/pkg/sudosh2/trunk/files/001-installsudosh.conf-destdir.patch (rev 0) +++ csw/mgar/pkg/sudosh2/trunk/files/001-installsudosh.conf-destdir.patch 2009-09-11 22:37:24 UTC (rev 6278) @@ -0,0 +1,14 @@ +diff --speed-large-files --minimal -Nru sudosh2-1.0.2.orig/src/Makefile.in sudosh2-1.0.2/src/Makefile.in +--- sudosh2-1.0.2.orig/src/Makefile.in 2008-02-22 22:11:01.000000000 +0100 ++++ sudosh2-1.0.2/src/Makefile.in 2009-09-12 00:15:07.491559672 +0200 +@@ -441,8 +441,8 @@ + + + install-sudosh.conf: +- test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)" +- test -f $(sysconfdir)/sudosh.conf || $(INSTALL) -o 0 -g 0 -m 0444 '$(srcdir)/sudosh.conf' '$(sysconfdir)/sudosh.conf' ++ test -z "$(DESTDIR)$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)" ++ test -f "$(DESTDIR)$(sysconfdir)/sudosh.conf" || $(INSTALL) -m 0444 '$(srcdir)/sudosh.conf' '$(DESTDIR)$(sysconfdir)/sudosh.conf' + + install: install-am install-sudosh.conf + # Tell versions [3.59,3.63) of GNU make to not export all variables. 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 Sep 12 02:24:35 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 12 Sep 2009 00:24:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[6279] csw/mgar/pkg/xmlto/trunk/Makefile Message-ID: Revision: 6279 http://gar.svn.sourceforge.net/gar/?rev=6279&view=rev Author: bdwalton Date: 2009-09-12 00:24:35 +0000 (Sat, 12 Sep 2009) Log Message: ----------- xmlto: /opt/csw/etc -> /etc/opt/csw Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-11 22:37:24 UTC (rev 6278) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-12 00:24:35 UTC (rev 6279) @@ -41,6 +41,8 @@ CONFIGURE_ARGS += FIND=/opt/csw/bin/gfind CONFIGURE_ARGS += MKTEMP=/opt/csw/bin/mktemp +sysconfdir = /etc/opt/csw + include gar/category.mk # We need this for 'tail -n' @@ -48,4 +50,4 @@ #reset XML_CATALOG lookup (we rely on having packages that provide stylesheets #etc). Having xsltproc not find them during build makes us blow up!! -XML_CATALOG_FILES = /opt/csw/etc/xml/catalog +XML_CATALOG_FILES = /etc/opt/csw/xml/catalog 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 Sep 12 03:26:57 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 12 Sep 2009 01:26:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[6280] csw/mgar/pkg/asciidoc/trunk Message-ID: Revision: 6280 http://gar.svn.sourceforge.net/gar/?rev=6280&view=rev Author: bdwalton Date: 2009-09-12 01:26:57 +0000 (Sat, 12 Sep 2009) Log Message: ----------- asciidoc: update to 8.4.5; /opt/csw/etc -> /etc/opt/csw Modified Paths: -------------- csw/mgar/pkg/asciidoc/trunk/Makefile csw/mgar/pkg/asciidoc/trunk/checksums Added Paths: ----------- csw/mgar/pkg/asciidoc/trunk/files/handle-csw-etc-paths.patch Removed Paths: ------------- csw/mgar/pkg/asciidoc/trunk/files/fix-Makefile-am.patch csw/mgar/pkg/asciidoc/trunk/files/fix-autoconf-version.patch Modified: csw/mgar/pkg/asciidoc/trunk/Makefile =================================================================== --- csw/mgar/pkg/asciidoc/trunk/Makefile 2009-09-12 00:24:35 UTC (rev 6279) +++ csw/mgar/pkg/asciidoc/trunk/Makefile 2009-09-12 01:26:57 UTC (rev 6280) @@ -1,5 +1,5 @@ GARNAME = asciidoc -GARVERSION = 8.4.2 +GARVERSION = 8.4.5 CATEGORIES = utils DESCRIPTION = An Documentation Generator @@ -24,18 +24,19 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(AUTOFILES) -#it would really seem this author "doesn't get" auto* stuff. -PATCHFILES = fix-autoconf-version.patch fix-Makefile-am.patch +PATCHFILES = handle-csw-etc-paths.patch -PREREQUISITE_PKGS = CSWautoconf - # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=67797 UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) +sysconfdir = /etc/opt/csw + CONFIGURE_ARGS = $(DIRPATHS) +INSTALL_ARGS = vimdir=/opt/csw/etc/vim + include gar/category.mk # until the autoconf stuff is included upstream, we'll maintain and import our Modified: csw/mgar/pkg/asciidoc/trunk/checksums =================================================================== --- csw/mgar/pkg/asciidoc/trunk/checksums 2009-09-12 00:24:35 UTC (rev 6279) +++ csw/mgar/pkg/asciidoc/trunk/checksums 2009-09-12 01:26:57 UTC (rev 6280) @@ -1,5 +1,2 @@ -5f04247c505cc85987c657eb6f6505db download/asciidoc-8.4.2.tar.gz -38527e11ffe879f2cac4a63b6268b4ca download/CSWasciidoc.gspec -204ab2546bda5c6fb0510ba8e366db7d download/CSWasciidoc.depend -46d75ac8ad96048e25ee1a9883e96224 download/fix-autoconf-version.patch -ca66107f476039013fe578e571f92ff5 download/fix-Makefile-am.patch +9f21d6e352b3ab668f9def3eb7497da2 download/asciidoc-8.4.5.tar.gz +ec48eeea1eafdaa7e507bc11327f6eae download/handle-csw-etc-paths.patch Deleted: csw/mgar/pkg/asciidoc/trunk/files/fix-Makefile-am.patch =================================================================== --- csw/mgar/pkg/asciidoc/trunk/files/fix-Makefile-am.patch 2009-09-12 00:24:35 UTC (rev 6279) +++ csw/mgar/pkg/asciidoc/trunk/files/fix-Makefile-am.patch 2009-09-12 01:26:57 UTC (rev 6280) @@ -1,6507 +0,0 @@ -diff --speed-large-files --minimal -Nru asciidoc-8.4.2.orig/Makefile asciidoc-8.4.2/Makefile ---- asciidoc-8.4.2.orig/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ asciidoc-8.4.2/Makefile 2009-03-27 01:07:56.327828594 +0100 -@@ -0,0 +1,162 @@ -+# -+# Make file to install/uninstall AsciiDoc -+# -+ -+.NOTPARALLEL: -+ -+INSTALL = /opt/csw/bin/ginstall -c -+INSTALL_PROG = ${INSTALL} -+INSTALL_DATA = ${INSTALL} -m 644 -+ -+SED = /opt/csw/bin/gsed -+ -+prefix = /opt/csw -+exec_prefix = /opt/csw -+bindir = /opt/csw/bin -+datadir = /opt/csw/share -+sysconfdir = /opt/csw/etc -+datarootdir = ${prefix}/share -+mandir=/opt/csw/share/man -+srcdir = . -+ -+ -+ -+ASCIIDOCCONF = $(sysconfdir)/asciidoc -+ -+prog = asciidoc.py a2x -+progdir = $(bindir) -+ -+vimdir = /opt/csw/etc/vim -+ -+manp = $(wildcard doc/*.1) -+manpdir = $(mandir)/man1 -+ -+conf = $(wildcard *.conf) -+confdir = $(ASCIIDOCCONF) -+ -+filtersdir = $(ASCIIDOCCONF)/filters -+ -+codefilter = filters/code/code-filter.py -+codefilterdir = $(filtersdir)/code -+codefilterconf = filters/code/code-filter.conf -+codefilterconfdir = $(filtersdir)/code -+ -+graphvizfilter = filters/graphviz/graphviz2png.py -+graphvizfilterdir = $(filtersdir)/graphviz -+graphvizfilterconf = filters/graphviz/graphviz-filter.conf -+graphvizfilterconfdir = $(filtersdir)/graphviz -+ -+musicfilter = filters/music/music2png.py -+musicfilterdir = $(filtersdir)/music -+musicfilterconf = filters/music/music-filter.conf -+musicfilterconfdir = $(filtersdir)/music -+ -+sourcefilterconf = filters/source/source-highlight-filter.conf -+sourcefilterconfdir = $(filtersdir)/source -+ -+docbook = $(wildcard docbook-xsl/*.xsl) -+docbookdir = $(ASCIIDOCCONF)/docbook-xsl -+ -+dblatex = $(wildcard dblatex/*.xsl) $(wildcard dblatex/*.sty) -+dblatexdir = $(ASCIIDOCCONF)/dblatex -+ -+css = $(wildcard stylesheets/*.css) -+cssdir = $(ASCIIDOCCONF)/stylesheets -+ -+js = $(wildcard javascripts/*.js) -+jsdir = $(ASCIIDOCCONF)/javascripts -+ -+callouts = $(wildcard images/icons/callouts/*) -+calloutsdir = $(ASCIIDOCCONF)/images/icons/callouts -+ -+icons = $(wildcard images/icons/*.png) images/icons/README -+iconsdir = $(ASCIIDOCCONF)/images/icons -+ -+doc = $(wildcard README*) $(wildcard BUGS*) $(wildcard INSTALL*) $(wildcard CHANGELOG*) -+docdir = $(datadir)/doc/asciidoc -+ -+DATATARGETS = manp conf docbook dblatex css js callouts icons codefilterconf musicfilterconf sourcefilterconf graphvizfilterconf -+PROGTARGETS = prog codefilter musicfilter graphvizfilter -+TARGETS = $(DATATARGETS) $(PROGTARGETS) doc -+ -+INSTDIRS = $(TARGETS:%=%dir) -+ -+.PHONY: $(TARGETS) -+ -+all: build -+ -+# create directories used during the install -+$(INSTDIRS): -+ $(INSTALL) -d $(DESTDIR)/$($@) -+ -+$(PROGTARGETS): % : %dir -+ $(INSTALL_PROG) $($@) $(DESTDIR)/$($<)/ -+ -+$(DATATARGETS): % : %dir -+ $(INSTALL_DATA) $($@) $(DESTDIR)/$($<)/ -+ -+docs: -+ $(INSTALL) -d $(DESTDIR)/$(docdir) -+ $(INSTALL_DATA) $(doc) $(DESTDIR)/$(docdir) -+ $(INSTALL) -d $(DESTDIR)/$(docdir)/docbook-xsl -+ $(INSTALL_DATA) docbook-xsl/asciidoc-docbook-xsl.txt $(DESTDIR)/$(docdir)/docbook-xsl -+ $(INSTALL) -d $(DESTDIR)/$(docdir)/dblatex -+ $(INSTALL_DATA) dblatex/dblatex-readme.txt $(DESTDIR)/$(docdir)/dblatex -+ $(INSTALL) -d $(DESTDIR)/$(docdir)/stylesheets -+ $(INSTALL_DATA) $(css) $(DESTDIR)/$(docdir)/stylesheets -+ $(INSTALL) -d $(DESTDIR)/$(docdir)/javascripts -+ $(INSTALL_DATA) $(js) $(DESTDIR)/$(docdir)/javascripts -+ $(INSTALL) -d $(DESTDIR)/$(docdir)/images -+ ( cd images && \ -+ cp -R * $(DESTDIR)/$(docdir)/images ) -+ $(INSTALL) -d $(DESTDIR)/$(docdir)/doc -+ ( cd doc && \ -+ cp -R * $(DESTDIR)/$(docdir)/doc ) -+ $(INSTALL) -d $(DESTDIR)/$(docdir)/examples/website -+ ( cd examples/website && \ -+ cp -R * $(DESTDIR)/$(docdir)/examples/website ) -+ -+progsymlink: -+ (cd $(DESTDIR)/$(progdir); ln -sf asciidoc.py asciidoc) -+ -+fixconfpath: -+ @for f in $(prog); do \ -+ echo "Fixing CONF_DIR in $$f"; \ -+ $(SED) "s#^CONF_DIR = '.*'#CONF_DIR = '$(ASCIIDOCCONF)'#; s#^CONF_DIR=.*#CONF_DIR=$(ASCIIDOCCONF)#" $$f > $$f.out; \ -+ mv $$f.out $$f; \ -+ done -+ -+install-vim: -+ @for d in $(DESTDIR)/$(vimdir) /etc/vim; do \ -+ if ! test -d $$d; then continue; fi ; \ -+ echo "installing Vim files in $$d" ; \ -+ $(INSTALL) -d $$d/syntax ; \ -+ $(INSTALL_DATA) vim/syntax/asciidoc.vim $$d/syntax ; \ -+ $(INSTALL) -d $$d/ftdetect ; \ -+ $(INSTALL_DATA) vim/ftdetect/asciidoc_filetype.vim $$d/ftdetect ; \ -+ done -+ -+uninstall-vim: -+ @for d in $(DESTDIR)/$(vimdir) /etc/vim; do \ -+ if ! test -d $$d; then continue; fi ; \ -+ echo "uninstalling Vim files in $$d" ; \ -+ rm -f $$d/syntax/asciidoc.vim ; \ -+ rm -f $$d/ftdetect/asciidoc_filetype.vim ; \ -+ done -+ -+ -+build: fixconfpath -+ -+install: $(PROGTARGETS) $(DATATARGETS) progsymlink install-vim -+ -+uninstall: uninstall-vim -+ rm -f $(DESTDIR)/$(progdir)/asciidoc -+ rm -f $(DESTDIR)/$(progdir)/asciidoc.py -+ rm -f $(DESTDIR)/$(progdir)/a2x -+ rm -f $(DESTDIR)/$(mandir)/asciidoc.1 -+ rm -f $(DESTDIR)/$(mandir)/a2x.1 -+ rm -rf $(DESTDIR)/$(confdir) -+ rm -rf $(DESTDIR)/$(docdir) -+ -+test: -+ @echo "Nothing to see here...Move along." -diff --speed-large-files --minimal -Nru asciidoc-8.4.2.orig/Makefile.in asciidoc-8.4.2/Makefile.in ---- asciidoc-8.4.2.orig/Makefile.in 2009-03-09 21:52:50.000000000 +0100 -+++ asciidoc-8.4.2/Makefile.in 2009-03-27 01:12:11.530587241 +0100 -@@ -127,7 +127,7 @@ - done - - install-vim: -- @for d in $(DESTDIR)/$(vimdir) /etc/vim; do \ -+ @for d in $(DESTDIR)/$(vimdir); do \ - if ! test -d $$d; then continue; fi ; \ - echo "installing Vim files in $$d" ; \ - $(INSTALL) -d $$d/syntax ; \ -@@ -137,7 +137,7 @@ - done - - uninstall-vim: -- @for d in $(DESTDIR)/$(vimdir) /etc/vim; do \ -+ @for d in $(DESTDIR)/$(vimdir); do \ - if ! test -d $$d; then continue; fi ; \ - echo "uninstalling Vim files in $$d" ; \ - rm -f $$d/syntax/asciidoc.vim ; \ -diff --speed-large-files --minimal -Nru asciidoc-8.4.2.orig/a2x asciidoc-8.4.2/a2x ---- asciidoc-8.4.2.orig/a2x 2008-12-31 03:46:28.000000000 +0100 -+++ asciidoc-8.4.2/a2x 2009-03-27 01:08:17.794738348 +0100 -@@ -14,7 +14,7 @@ - REALNAME=$(which "$REALNAME") - fi - REALNAME="$(readlink -f "$REALNAME")" --CONF_DIR=/etc/asciidoc -+CONF_DIR=/opt/csw/etc/asciidoc - FOP_COMMAND="fop.sh" # FOP executable. - - #-------------------------------------------------------------------- -diff --speed-large-files --minimal -Nru asciidoc-8.4.2.orig/asciidoc.py asciidoc-8.4.2/asciidoc.py ---- asciidoc-8.4.2.orig/asciidoc.py 2009-03-18 05:22:00.000000000 +0100 -+++ asciidoc-8.4.2/asciidoc.py 2009-03-27 01:08:17.758780186 +0100 -@@ -4749,7 +4749,7 @@ - APP_DIR = None # This file's directory. - USER_DIR = None # ~/.asciidoc - # Global configuration files directory (set by Makefile build target). --CONF_DIR = '/etc/asciidoc' -+CONF_DIR = '/opt/csw/etc/asciidoc' - HELP_FILE = 'help.conf' # Default (English) help file. - - # Globals -diff --speed-large-files --minimal -Nru asciidoc-8.4.2.orig/autom4te.cache/output.0 asciidoc-8.4.2/autom4te.cache/output.0 ---- asciidoc-8.4.2.orig/autom4te.cache/output.0 1970-01-01 01:00:00.000000000 +0100 -+++ asciidoc-8.4.2/autom4te.cache/output.0 2009-03-27 01:07:51.433802066 +0100 -@@ -0,0 +1,3041 @@ -+@%:@! /bin/sh -+@%:@ Guess values for system-dependent variables and create Makefiles. -+@%:@ Generated by GNU Autoconf 2.63 for asciidoc 8.4.2. -+@%:@ -+@%:@ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -+@%:@ 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+@%:@ This configure script is free software; the Free Software Foundation -+@%:@ gives unlimited permission to copy, distribute and modify it. -+## --------------------- ## -+## M4sh Initialization. ## -+## --------------------- ## -+ -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+ emulate sh -+ NULLCMD=: -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '${1+"$@"}'='"$@"' -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ -+fi -+ -+ -+ -+ -+# PATH needs CR -+# Avoid depending upon Character Ranges. -+as_cr_letters='abcdefghijklmnopqrstuvwxyz' -+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -+as_cr_Letters=$as_cr_letters$as_cr_LETTERS -+as_cr_digits='0123456789' -+as_cr_alnum=$as_cr_Letters$as_cr_digits -+ -+as_nl=' -+' -+export as_nl -+# Printing a long string crashes Solaris 7 /usr/bin/printf. -+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='printf %s\n' -+ as_echo_n='printf %s' -+else -+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' -+ as_echo_n='/usr/ucb/echo -n' -+ else -+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' -+ as_echo_n_body='eval -+ arg=$1; -+ case $arg in -+ *"$as_nl"*) -+ expr "X$arg" : "X\\(.*\\)$as_nl"; -+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -+ esac; -+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -+ ' -+ export as_echo_n_body -+ as_echo_n='sh -c $as_echo_n_body as_echo' -+ fi -+ export as_echo_body -+ as_echo='sh -c $as_echo_body as_echo' -+fi -+ -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ PATH_SEPARATOR=: -+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -+ PATH_SEPARATOR=';' -+ } -+fi -+ -+# Support unset when possible. -+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -+ as_unset=unset -+else -+ as_unset=false -+fi -+ -+ -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) -+IFS=" "" $as_nl" -+ -+# Find who we are. Look in the path if we contain no directory separator. -+case $0 in -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+# We did not find ourselves, most probably we were run as `sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then -+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ { (exit 1); exit 1; } -+fi -+ -+# Work around bugs in pre-3.0 UWIN ksh. -+for as_var in ENV MAIL MAILPATH -+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+done -+PS1='$ ' -+PS2='> ' -+PS4='+ ' -+ -+# NLS nuisances. -+LC_ALL=C -+export LC_ALL -+LANGUAGE=C -+export LANGUAGE -+ -+# Required to use basename. -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then -+ as_expr=expr -+else -+ as_expr=false -+fi -+ -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then -+ as_basename=basename -+else -+ as_basename=false -+fi -+ -+ -+# Name of the executable. -+as_me=`$as_basename -- "$0" || -+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ -+ X"$0" : 'X\(//\)$' \| \ -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X/"$0" | -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ -+# CDPATH. -+$as_unset CDPATH -+ -+ -+if test "x$CONFIG_SHELL" = x; then -+ if (eval ":") 2>/dev/null; then -+ as_have_required=yes -+else -+ as_have_required=no -+fi -+ -+ if test $as_have_required = yes && (eval ": -+(as_func_return () { -+ (exit \$1) -+} -+as_func_success () { -+ as_func_return 0 -+} -+as_func_failure () { -+ as_func_return 1 -+} -+as_func_ret_success () { -+ return 0 -+} -+as_func_ret_failure () { -+ return 1 -+} -+ -+exitcode=0 -+if as_func_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_success failed. -+fi -+ -+if as_func_failure; then -+ exitcode=1 -+ echo as_func_failure succeeded. -+fi -+ -+if as_func_ret_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_ret_success failed. -+fi -+ -+if as_func_ret_failure; then -+ exitcode=1 -+ echo as_func_ret_failure succeeded. -+fi -+ -+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then -+ : -+else -+ exitcode=1 -+ echo positional parameters were not saved. -+fi -+ -+test \$exitcode = 0) || { (exit 1); exit 1; } -+ -+( -+ as_lineno_1=\$LINENO -+ as_lineno_2=\$LINENO -+ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && -+ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -+") 2> /dev/null; then -+ : -+else -+ as_candidate_shells= -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ case $as_dir in -+ /*) -+ for as_base in sh bash ksh sh5; do -+ as_candidate_shells="$as_candidate_shells $as_dir/$as_base" -+ done;; -+ esac -+done -+IFS=$as_save_IFS -+ -+ -+ for as_shell in $as_candidate_shells $SHELL; do -+ # Try only shells that exist, to save several forks. -+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && -+ { ("$as_shell") 2> /dev/null <<\_ASEOF -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+ emulate sh -+ NULLCMD=: -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '${1+"$@"}'='"$@"' -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ -+fi -+ -+ -+: -+_ASEOF -+}; then -+ CONFIG_SHELL=$as_shell -+ as_have_required=yes -+ if { "$as_shell" 2> /dev/null <<\_ASEOF -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+ emulate sh -+ NULLCMD=: -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '${1+"$@"}'='"$@"' -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ -+fi -+ -+ -+: -+(as_func_return () { -+ (exit $1) -+} -+as_func_success () { -+ as_func_return 0 -+} -+as_func_failure () { -+ as_func_return 1 -+} -+as_func_ret_success () { -+ return 0 -+} -+as_func_ret_failure () { -+ return 1 -+} -+ -+exitcode=0 -+if as_func_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_success failed. -+fi -+ -+if as_func_failure; then -+ exitcode=1 -+ echo as_func_failure succeeded. -+fi -+ -+if as_func_ret_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_ret_success failed. -+fi -+ -+if as_func_ret_failure; then -+ exitcode=1 -+ echo as_func_ret_failure succeeded. -+fi -+ -+if ( set x; as_func_ret_success y && test x = "$1" ); then -+ : -+else -+ exitcode=1 -+ echo positional parameters were not saved. -+fi -+ -+test $exitcode = 0) || { (exit 1); exit 1; } -+ -+( -+ as_lineno_1=$LINENO -+ as_lineno_2=$LINENO -+ test "x$as_lineno_1" != "x$as_lineno_2" && -+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } -+ -+_ASEOF -+}; then -+ break -+fi -+ -+fi -+ -+ done -+ -+ if test "x$CONFIG_SHELL" != x; then -+ for as_var in BASH_ENV ENV -+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+ done -+ export CONFIG_SHELL -+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -+fi -+ -+ -+ if test $as_have_required = no; then -+ echo This script requires a shell more modern than all the -+ echo shells that I found on your system. Please install a -+ echo modern shell, or manually run the script under such a -+ echo shell if you do have one. -+ { (exit 1); exit 1; } -+fi -+ -+ -+fi -+ -+fi -+ -+ -+ -+(eval "as_func_return () { -+ (exit \$1) -+} -+as_func_success () { -+ as_func_return 0 -+} -+as_func_failure () { -+ as_func_return 1 -+} -+as_func_ret_success () { -+ return 0 -+} -+as_func_ret_failure () { -+ return 1 -+} -+ -+exitcode=0 -+if as_func_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_success failed. -+fi -+ -+if as_func_failure; then -+ exitcode=1 -+ echo as_func_failure succeeded. -+fi -+ -+if as_func_ret_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_ret_success failed. -+fi -+ -+if as_func_ret_failure; then -+ exitcode=1 -+ echo as_func_ret_failure succeeded. -+fi -+ -+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then -+ : -+else -+ exitcode=1 -+ echo positional parameters were not saved. -+fi -+ -+test \$exitcode = 0") || { -+ echo No shell found that supports shell functions. -+ echo Please tell bug-autoconf at gnu.org about your system, -+ echo including any error possibly output before this message. -+ echo This can help us improve future autoconf versions. -+ echo Configuration will now proceed without shell functions. -+} -+ -+ -+ -+ as_lineno_1=$LINENO -+ as_lineno_2=$LINENO -+ test "x$as_lineno_1" != "x$as_lineno_2" && -+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { -+ -+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -+ # uniformly replaced by the line number. The first 'sed' inserts a -+ # line-number line after each line using $LINENO; the second 'sed' -+ # does the real work. The second script uses 'N' to pair each -+ # line-number line with the line containing $LINENO, and appends -+ # trailing '-' during substitution so that $LINENO is not a special -+ # case at line end. -+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -+ # scripts with optimization help from Paolo Bonzini. Blame Lee -+ # E. McMahon (1931-1989) for sed's syntax. :-) -+ sed -n ' -+ p -+ /[$]LINENO/= -+ ' <$as_myself | -+ sed ' -+ s/[$]LINENO.*/&-/ -+ t lineno -+ b -+ :lineno -+ N -+ :loop -+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ -+ t loop -+ s/-\n.*// -+ ' >$as_me.lineno && -+ chmod +x "$as_me.lineno" || -+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -+ { (exit 1); exit 1; }; } -+ -+ # Don't try to exec as it changes $[0], causing all sort of problems -+ # (the dirname of $[0] is not the place where we might find the -+ # original and so on. Autoconf is especially sensitive to this). -+ . "./$as_me.lineno" -+ # Exit status is that of the last command. -+ exit -+} -+ -+ -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi -+ -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in -+-n*) -+ case `echo 'x\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ *) ECHO_C='\c';; -+ esac;; -+*) -+ ECHO_N='-n';; -+esac -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then -+ as_expr=expr -+else -+ as_expr=false -+fi -+ -+rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file -+else -+ rm -f conf$$.dir -+ mkdir conf$$.dir 2>/dev/null -+fi -+if (echo >conf$$.file) 2>/dev/null; then -+ if ln -s conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -p'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -p' -+ elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+ else -+ as_ln_s='cp -p' -+ fi -+else -+ as_ln_s='cp -p' -+fi -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null -+ -+if mkdir -p . 2>/dev/null; then -+ as_mkdir_p=: -+else -+ test -d ./-p && rmdir ./-p -+ as_mkdir_p=false -+fi -+ -+if test -x / >/dev/null 2>&1; then -+ as_test_x='test -x' -+else -+ if ls -dL / >/dev/null 2>&1; then -+ as_ls_L_option=L -+ else -+ as_ls_L_option= -+ fi -+ as_test_x=' -+ eval sh -c '\'' -+ if test -d "$1"; then -+ test -d "$1/."; -+ else -+ case $1 in -+ -*)set "./$1";; -+ esac; -+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in -+ ???[sx]*):;;*)false;;esac;fi -+ '\'' sh -+ ' -+fi -+as_executable_p=$as_test_x -+ -+# Sed expression to map a string onto a valid CPP name. -+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -+ -+# Sed expression to map a string onto a valid variable name. -+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -+ -+ -+ -+exec 7<&0 &1 -+ -+# Name of the host. -+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -+# so uname gets run too. -+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` -+ -+# -+# Initializations. -+# -+ac_default_prefix=/usr/local -+ac_clean_files= -+ac_config_libobj_dir=. -+LIB@&t at OBJS= -+cross_compiling=no -+subdirs= -+MFLAGS= -+MAKEFLAGS= -+SHELL=${CONFIG_SHELL-/bin/sh} -+ -+# Identity of this package. -+PACKAGE_NAME='asciidoc' -+PACKAGE_TARNAME='asciidoc' -+PACKAGE_VERSION='8.4.2' -+PACKAGE_STRING='asciidoc 8.4.2' -+PACKAGE_BUGREPORT='' -+ -+ac_subst_vars='LTLIBOBJS -+LIB@&t at OBJS -+INSTALL_DATA -+INSTALL_SCRIPT -+INSTALL_PROGRAM -+LN_S -+SED -+target_alias -+host_alias -+build_alias -+LIBS -+ECHO_T -+ECHO_N -+ECHO_C -+DEFS -+mandir -+localedir -+libdir -+psdir -+pdfdir -+dvidir -+htmldir -+infodir -+docdir -+oldincludedir -+includedir -+localstatedir -+sharedstatedir -+sysconfdir -+datadir -+datarootdir -+libexecdir -+sbindir -+bindir -+program_transform_name -+prefix -+exec_prefix -+PACKAGE_BUGREPORT -+PACKAGE_STRING -+PACKAGE_VERSION -+PACKAGE_TARNAME -+PACKAGE_NAME -+PATH_SEPARATOR -+SHELL' -+ac_subst_files='' -+ac_user_opts=' -+enable_option_checking -+' -+ ac_precious_vars='build_alias -+host_alias -+target_alias' -+ -+ -+# Initialize some variables set by options. -+ac_init_help= -+ac_init_version=false -+ac_unrecognized_opts= -+ac_unrecognized_sep= -+# The variables have the same names as the options, with -+# dashes changed to underlines. -+cache_file=/dev/null -+exec_prefix=NONE -+no_create= -+no_recursion= -+prefix=NONE -+program_prefix=NONE -+program_suffix=NONE -+program_transform_name=s,x,x, -+silent= -+site= -+srcdir= -+verbose= -+x_includes=NONE -+x_libraries=NONE -+ -+# Installation directory options. -+# These are left unexpanded so users can "make install exec_prefix=/foo" -+# and all the variables that are supposed to be based on exec_prefix -+# by default will actually change. -+# Use braces instead of parens because sh, perl, etc. also accept them. -+# (The list follows the same order as the GNU Coding Standards.) -+bindir='${exec_prefix}/bin' -+sbindir='${exec_prefix}/sbin' -+libexecdir='${exec_prefix}/libexec' -+datarootdir='${prefix}/share' -+datadir='${datarootdir}' -+sysconfdir='${prefix}/etc' -+sharedstatedir='${prefix}/com' -+localstatedir='${prefix}/var' -+includedir='${prefix}/include' -+oldincludedir='/usr/include' -+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -+infodir='${datarootdir}/info' -+htmldir='${docdir}' -+dvidir='${docdir}' -+pdfdir='${docdir}' -+psdir='${docdir}' -+libdir='${exec_prefix}/lib' -+localedir='${datarootdir}/locale' -+mandir='${datarootdir}/man' -+ -+ac_prev= -+ac_dashdash= -+for ac_option -+do -+ # If the previous option needs an argument, assign it. -+ if test -n "$ac_prev"; then -+ eval $ac_prev=\$ac_option -+ ac_prev= -+ continue -+ fi -+ -+ case $ac_option in -+ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; -+ *) ac_optarg=yes ;; -+ esac -+ -+ # Accept the important Cygnus configure options, so we can diagnose typos. -+ -+ case $ac_dashdash$ac_option in -+ --) -+ ac_dashdash=yes ;; -+ -+ -bindir | --bindir | --bindi | --bind | --bin | --bi) -+ ac_prev=bindir ;; -+ -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) -+ bindir=$ac_optarg ;; -+ -+ -build | --build | --buil | --bui | --bu) -+ ac_prev=build_alias ;; -+ -build=* | --build=* | --buil=* | --bui=* | --bu=*) -+ build_alias=$ac_optarg ;; -+ -+ -cache-file | --cache-file | --cache-fil | --cache-fi \ -+ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) -+ ac_prev=cache_file ;; -+ -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ -+ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) -+ cache_file=$ac_optarg ;; -+ -+ --config-cache | -C) -+ cache_file=config.cache ;; -+ -+ -datadir | --datadir | --datadi | --datad) -+ ac_prev=datadir ;; -+ -datadir=* | --datadir=* | --datadi=* | --datad=*) -+ datadir=$ac_optarg ;; -+ -+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ -+ | --dataroo | --dataro | --datar) -+ ac_prev=datarootdir ;; -+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ -+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) -+ datarootdir=$ac_optarg ;; -+ -+ -disable-* | --disable-*) -+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` -+ # Reject names that are not valid shell variable names. -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 -+ { (exit 1); exit 1; }; } -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"enable_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval enable_$ac_useropt=no ;; -+ -+ -docdir | --docdir | --docdi | --doc | --do) -+ ac_prev=docdir ;; -+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) -+ docdir=$ac_optarg ;; -+ -+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) -+ ac_prev=dvidir ;; -+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) -+ dvidir=$ac_optarg ;; -+ -+ -enable-* | --enable-*) -+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` -+ # Reject names that are not valid shell variable names. -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 -+ { (exit 1); exit 1; }; } -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"enable_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval enable_$ac_useropt=\$ac_optarg ;; -+ -+ -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ -+ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -+ | --exec | --exe | --ex) -+ ac_prev=exec_prefix ;; -+ -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ -+ | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ -+ | --exec=* | --exe=* | --ex=*) -+ exec_prefix=$ac_optarg ;; -+ -+ -gas | --gas | --ga | --g) -+ # Obsolete; use --with-gas. -+ with_gas=yes ;; -+ -+ -help | --help | --hel | --he | -h) -+ ac_init_help=long ;; -+ -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) -+ ac_init_help=recursive ;; -+ -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) -+ ac_init_help=short ;; -+ -+ -host | --host | --hos | --ho) -+ ac_prev=host_alias ;; -+ -host=* | --host=* | --hos=* | --ho=*) -+ host_alias=$ac_optarg ;; -+ -+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) -+ ac_prev=htmldir ;; -+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ -+ | --ht=*) -+ htmldir=$ac_optarg ;; -+ -+ -includedir | --includedir | --includedi | --included | --include \ -+ | --includ | --inclu | --incl | --inc) -+ ac_prev=includedir ;; -+ -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ -+ | --includ=* | --inclu=* | --incl=* | --inc=*) -+ includedir=$ac_optarg ;; -+ -+ -infodir | --infodir | --infodi | --infod | --info | --inf) -+ ac_prev=infodir ;; -+ -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) -+ infodir=$ac_optarg ;; -+ -+ -libdir | --libdir | --libdi | --libd) -+ ac_prev=libdir ;; -+ -libdir=* | --libdir=* | --libdi=* | --libd=*) -+ libdir=$ac_optarg ;; -+ -+ -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ -+ | --libexe | --libex | --libe) -+ ac_prev=libexecdir ;; -+ -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ -+ | --libexe=* | --libex=* | --libe=*) -+ libexecdir=$ac_optarg ;; -+ -+ -localedir | --localedir | --localedi | --localed | --locale) -+ ac_prev=localedir ;; -+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) -+ localedir=$ac_optarg ;; -+ -+ -localstatedir | --localstatedir | --localstatedi | --localstated \ -+ | --localstate | --localstat | --localsta | --localst | --locals) -+ ac_prev=localstatedir ;; -+ -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ -+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) -+ localstatedir=$ac_optarg ;; -+ -+ -mandir | --mandir | --mandi | --mand | --man | --ma | --m) -+ ac_prev=mandir ;; -+ -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) -+ mandir=$ac_optarg ;; -+ -+ -nfp | --nfp | --nf) -+ # Obsolete; use --without-fp. -+ with_fp=no ;; -+ -+ -no-create | --no-create | --no-creat | --no-crea | --no-cre \ -+ | --no-cr | --no-c | -n) -+ no_create=yes ;; -+ -+ -no-recursion | --no-recursion | --no-recursio | --no-recursi \ -+ | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) -+ no_recursion=yes ;; -+ -+ -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ -+ | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ -+ | --oldin | --oldi | --old | --ol | --o) -+ ac_prev=oldincludedir ;; -+ -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ -+ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ -+ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) -+ oldincludedir=$ac_optarg ;; -+ -+ -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) -+ ac_prev=prefix ;; -+ -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) -+ prefix=$ac_optarg ;; -+ -+ -program-prefix | --program-prefix | --program-prefi | --program-pref \ -+ | --program-pre | --program-pr | --program-p) -+ ac_prev=program_prefix ;; -+ -program-prefix=* | --program-prefix=* | --program-prefi=* \ -+ | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) -+ program_prefix=$ac_optarg ;; -+ -+ -program-suffix | --program-suffix | --program-suffi | --program-suff \ -+ | --program-suf | --program-su | --program-s) -+ ac_prev=program_suffix ;; -+ -program-suffix=* | --program-suffix=* | --program-suffi=* \ -+ | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) -+ program_suffix=$ac_optarg ;; -+ -+ -program-transform-name | --program-transform-name \ -+ | --program-transform-nam | --program-transform-na \ -+ | --program-transform-n | --program-transform- \ -+ | --program-transform | --program-transfor \ -+ | --program-transfo | --program-transf \ -+ | --program-trans | --program-tran \ -+ | --progr-tra | --program-tr | --program-t) -+ ac_prev=program_transform_name ;; -+ -program-transform-name=* | --program-transform-name=* \ -+ | --program-transform-nam=* | --program-transform-na=* \ -+ | --program-transform-n=* | --program-transform-=* \ -+ | --program-transform=* | --program-transfor=* \ -+ | --program-transfo=* | --program-transf=* \ -+ | --program-trans=* | --program-tran=* \ -+ | --progr-tra=* | --program-tr=* | --program-t=*) -+ program_transform_name=$ac_optarg ;; -+ -+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) -+ ac_prev=pdfdir ;; -+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) -+ pdfdir=$ac_optarg ;; -+ -+ -psdir | --psdir | --psdi | --psd | --ps) -+ ac_prev=psdir ;; -+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) -+ psdir=$ac_optarg ;; -+ -+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -+ | -silent | --silent | --silen | --sile | --sil) -+ silent=yes ;; -+ -+ -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) -+ ac_prev=sbindir ;; -+ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ -+ | --sbi=* | --sb=*) -+ sbindir=$ac_optarg ;; -+ -+ -sharedstatedir | --sharedstatedir | --sharedstatedi \ -+ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ -+ | --sharedst | --shareds | --shared | --share | --shar \ -+ | --sha | --sh) -+ ac_prev=sharedstatedir ;; -+ -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ -+ | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ -+ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ -+ | --sha=* | --sh=*) -+ sharedstatedir=$ac_optarg ;; -+ -+ -site | --site | --sit) -+ ac_prev=site ;; -+ -site=* | --site=* | --sit=*) -+ site=$ac_optarg ;; -+ -+ -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) -+ ac_prev=srcdir ;; -+ -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) -+ srcdir=$ac_optarg ;; -+ -+ -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ -+ | --syscon | --sysco | --sysc | --sys | --sy) -+ ac_prev=sysconfdir ;; -+ -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ -+ | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) -+ sysconfdir=$ac_optarg ;; -+ -+ -target | --target | --targe | --targ | --tar | --ta | --t) -+ ac_prev=target_alias ;; -+ -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) -+ target_alias=$ac_optarg ;; -+ -+ -v | -verbose | --verbose | --verbos | --verbo | --verb) -+ verbose=yes ;; -+ -+ -version | --version | --versio | --versi | --vers | -V) -+ ac_init_version=: ;; -+ -+ -with-* | --with-*) -+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` -+ # Reject names that are not valid shell variable names. -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 -+ { (exit 1); exit 1; }; } -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"with_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval with_$ac_useropt=\$ac_optarg ;; -+ -+ -without-* | --without-*) -+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` -+ # Reject names that are not valid shell variable names. -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 -+ { (exit 1); exit 1; }; } -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"with_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval with_$ac_useropt=no ;; -+ -+ --x) -+ # Obsolete; use --with-x. -+ with_x=yes ;; -+ -+ -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ -+ | --x-incl | --x-inc | --x-in | --x-i) -+ ac_prev=x_includes ;; -+ -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ -+ | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) -+ x_includes=$ac_optarg ;; -+ -+ -x-libraries | --x-libraries | --x-librarie | --x-librari \ -+ | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) -+ ac_prev=x_libraries ;; -+ -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ -+ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) -+ x_libraries=$ac_optarg ;; -+ -+ -*) { $as_echo "$as_me: error: unrecognized option: $ac_option -+Try \`$0 --help' for more information." >&2 -+ { (exit 1); exit 1; }; } -+ ;; -+ -+ *=*) -+ ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` -+ # Reject names that are not valid shell variable names. -+ expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && -+ { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 -+ { (exit 1); exit 1; }; } -+ eval $ac_envvar=\$ac_optarg -+ export $ac_envvar ;; -+ -+ *) -+ # FIXME: should be removed in autoconf 3.0. -+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 -+ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && -+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 -+ : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} -+ ;; -+ -+ esac -+done -+ -+if test -n "$ac_prev"; then -+ ac_option=--`echo $ac_prev | sed 's/_/-/g'` -+ { $as_echo "$as_me: error: missing argument to $ac_option" >&2 -+ { (exit 1); exit 1; }; } -+fi -+ -+if test -n "$ac_unrecognized_opts"; then -+ case $enable_option_checking in -+ no) ;; -+ fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 -+ { (exit 1); exit 1; }; } ;; -+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; -+ esac -+fi -+ -+# Check all directory arguments for consistency. -+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ -+ datadir sysconfdir sharedstatedir localstatedir includedir \ -+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ -+ libdir localedir mandir -+do -+ eval ac_val=\$$ac_var -+ # Remove trailing slashes. -+ case $ac_val in -+ */ ) -+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` -+ eval $ac_var=\$ac_val;; -+ esac -+ # Be sure to have absolute directory names. -+ case $ac_val in -+ [\\/$]* | ?:[\\/]* ) continue;; -+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;; -+ esac -+ { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -+ { (exit 1); exit 1; }; } -+done -+ -+# There might be people who depend on the old broken behavior: `$host' -+# used to hold the argument of --host etc. -+# FIXME: To remove some day. -+build=$build_alias -+host=$host_alias -+target=$target_alias -+ -+# FIXME: To remove some day. -+if test "x$host_alias" != x; then -+ if test "x$build_alias" = x; then -+ cross_compiling=maybe -+ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. -+ If a cross compiler is detected then cross compile mode will be used." >&2 -+ elif test "x$build_alias" != "x$host_alias"; then -+ cross_compiling=yes -+ fi -+fi -+ -+ac_tool_prefix= -+test -n "$host_alias" && ac_tool_prefix=$host_alias- -+ -+test "$silent" = yes && exec 6>/dev/null -+ -+ -+ac_pwd=`pwd` && test -n "$ac_pwd" && -+ac_ls_di=`ls -di .` && -+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || -+ { $as_echo "$as_me: error: working directory cannot be determined" >&2 -+ { (exit 1); exit 1; }; } -+test "X$ac_ls_di" = "X$ac_pwd_ls_di" || -+ { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 -+ { (exit 1); exit 1; }; } -+ -+ -+# Find the source files, if location was not specified. -+if test -z "$srcdir"; then -+ ac_srcdir_defaulted=yes -+ # Try the directory containing this script, then the parent directory. -+ ac_confdir=`$as_dirname -- "$as_myself" || -+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_myself" : 'X\(//\)[^/]' \| \ -+ X"$as_myself" : 'X\(//\)$' \| \ -+ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_myself" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ srcdir=$ac_confdir -+ if test ! -r "$srcdir/$ac_unique_file"; then -+ srcdir=.. -+ fi -+else -+ ac_srcdir_defaulted=no -+fi -+if test ! -r "$srcdir/$ac_unique_file"; then -+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." -+ { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 -+ { (exit 1); exit 1; }; } -+fi -+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -+ac_abs_confdir=`( -+ cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 -+ { (exit 1); exit 1; }; } -+ pwd)` -+# When building in place, set srcdir=. -+if test "$ac_abs_confdir" = "$ac_pwd"; then -+ srcdir=. -+fi -+# Remove unnecessary trailing slashes from srcdir. -+# Double slashes in file names in object file debugging info -+# mess up M-x gdb in Emacs. -+case $srcdir in -+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -+esac -+for ac_var in $ac_precious_vars; do -+ eval ac_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_env_${ac_var}_value=\$${ac_var} -+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_cv_env_${ac_var}_value=\$${ac_var} -+done -+ -+# -+# Report the --help message. -+# -+if test "$ac_init_help" = "long"; then -+ # Omit some internal or obsolete options to make the list less imposing. -+ # This message is too long to be a string in the A/UX 3.1 sh. -+ cat <<_ACEOF -+\`configure' configures asciidoc 8.4.2 to adapt to many kinds of systems. -+ -+Usage: $0 [OPTION]... [VAR=VALUE]... -+ -+To assign environment variables (e.g., CC, CFLAGS...), specify them as -+VAR=VALUE. See below for descriptions of some of the useful variables. -+ -+Defaults for the options are specified in brackets. -+ -+Configuration: -+ -h, --help display this help and exit -+ --help=short display options specific to this package -+ --help=recursive display the short help of all the included packages -+ -V, --version display version information and exit -+ -q, --quiet, --silent do not print \`checking...' messages -+ --cache-file=FILE cache test results in FILE [disabled] -+ -C, --config-cache alias for \`--cache-file=config.cache' -+ -n, --no-create do not create output files -+ --srcdir=DIR find the sources in DIR [configure dir or \`..'] -+ -+Installation directories: -+ --prefix=PREFIX install architecture-independent files in PREFIX -+ [$ac_default_prefix] -+ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX -+ [PREFIX] -+ -+By default, \`make install' will install all the files in -+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -+an installation prefix other than \`$ac_default_prefix' using \`--prefix', -+for instance \`--prefix=\$HOME'. -+ -+For better control, use the options below. -+ -+Fine tuning of the installation directories: -+ --bindir=DIR user executables [EPREFIX/bin] -+ --sbindir=DIR system admin executables [EPREFIX/sbin] -+ --libexecdir=DIR program executables [EPREFIX/libexec] -+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -+ --localstatedir=DIR modifiable single-machine data [PREFIX/var] -+ --libdir=DIR object code libraries [EPREFIX/lib] -+ --includedir=DIR C header files [PREFIX/include] -+ --oldincludedir=DIR C header files for non-gcc [/usr/include] -+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] -+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] -+ --infodir=DIR info documentation [DATAROOTDIR/info] -+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] -+ --mandir=DIR man documentation [DATAROOTDIR/man] -+ --docdir=DIR documentation root @<:@DATAROOTDIR/doc/asciidoc@:>@ -+ --htmldir=DIR html documentation [DOCDIR] -+ --dvidir=DIR dvi documentation [DOCDIR] -+ --pdfdir=DIR pdf documentation [DOCDIR] -+ --psdir=DIR ps documentation [DOCDIR] -+_ACEOF -+ -+ cat <<\_ACEOF -+_ACEOF -+fi -+ -+if test -n "$ac_init_help"; then -+ case $ac_init_help in -+ short | recursive ) echo "Configuration of asciidoc 8.4.2:";; -+ esac -+ cat <<\_ACEOF -+ -+_ACEOF -+ac_status=$? -+fi -+ -+if test "$ac_init_help" = "recursive"; then -+ # If there are subdirs, report their specific --help. -+ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue -+ test -d "$ac_dir" || -+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || -+ continue -+ ac_builddir=. -+ -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) -+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` -+ # A ".." for each directory in $ac_dir_suffix. -+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` -+ case $ac_top_builddir_sub in -+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix -+ -+case $srcdir in -+ .) # We are building in place. -+ ac_srcdir=. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. -+ ac_srcdir=$srcdir$ac_dir_suffix; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -+esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -+ -+ cd "$ac_dir" || { ac_status=$?; continue; } -+ # Check for guested configure. -+ if test -f "$ac_srcdir/configure.gnu"; then -+ echo && -+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive -+ elif test -f "$ac_srcdir/configure"; then -+ echo && -+ $SHELL "$ac_srcdir/configure" --help=recursive -+ else -+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -+ fi || ac_status=$? -+ cd "$ac_pwd" || { ac_status=$?; break; } -+ done -+fi -+ -+test -n "$ac_init_help" && exit $ac_status -+if $ac_init_version; then -+ cat <<\_ACEOF -+asciidoc configure 8.4.2 -+generated by GNU Autoconf 2.63 -+ -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+This configure script is free software; the Free Software Foundation -+gives unlimited permission to copy, distribute and modify it. -+_ACEOF -+ exit -+fi -+cat >config.log <<_ACEOF -+This file contains any messages produced by compilers while -+running configure, to aid debugging if configure makes a mistake. -+ -+It was created by asciidoc $as_me 8.4.2, which was -+generated by GNU Autoconf 2.63. Invocation command line was -+ -+ $ $0 $@ -+ -+_ACEOF -+exec 5>>config.log -+{ -+cat <<_ASUNAME -+@%:@@%:@ --------- @%:@@%:@ -+@%:@@%:@ Platform. @%:@@%:@ -+@%:@@%:@ --------- @%:@@%:@ -+ -+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -+uname -m = `(uname -m) 2>/dev/null || echo unknown` -+uname -r = `(uname -r) 2>/dev/null || echo unknown` -+uname -s = `(uname -s) 2>/dev/null || echo unknown` -+uname -v = `(uname -v) 2>/dev/null || echo unknown` -+ -+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -+/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` -+ -+/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -+/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -+/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -+ -+_ASUNAME -+ -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ $as_echo "PATH: $as_dir" -+done -+IFS=$as_save_IFS -+ -+} >&5 -+ -+cat >&5 <<_ACEOF -+ -+ -+@%:@@%:@ ----------- @%:@@%:@ -+@%:@@%:@ Core tests. @%:@@%:@ -+@%:@@%:@ ----------- @%:@@%:@ -+ -+_ACEOF -+ -+ -+# Keep a trace of the command line. -+# Strip out --no-create and --no-recursion so they do not pile up. -+# Strip out --silent because we don't want to record it for future runs. -+# Also quote any args containing shell meta-characters. -+# Make two passes to allow for proper duplicate-argument suppression. -+ac_configure_args= -+ac_configure_args0= -+ac_configure_args1= -+ac_must_keep_next=false -+for ac_pass in 1 2 -+do -+ for ac_arg -+ do -+ case $ac_arg in -+ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; -+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -+ | -silent | --silent | --silen | --sile | --sil) -+ continue ;; -+ *\'*) -+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ esac -+ case $ac_pass in -+ 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; -+ 2) -+ ac_configure_args1="$ac_configure_args1 '$ac_arg'" -+ if test $ac_must_keep_next = true; then -+ ac_must_keep_next=false # Got value, back to normal. -+ else -+ case $ac_arg in -+ *=* | --config-cache | -C | -disable-* | --disable-* \ -+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ -+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ -+ | -with-* | --with-* | -without-* | --without-* | --x) -+ case "$ac_configure_args0 " in -+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; -+ esac -+ ;; -+ -* ) ac_must_keep_next=true ;; -+ esac -+ fi -+ ac_configure_args="$ac_configure_args '$ac_arg'" -+ ;; -+ esac -+ done -+done -+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } -+ -+# When interrupted or exit'd, cleanup temporary files, and complete -+# config.log. We remove comments because anyway the quotes in there -+# would cause problems or look ugly. -+# WARNING: Use '\'' to represent an apostrophe within the trap. -+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. -+trap 'exit_status=$? -+ # Save into config.log some information that might help in debugging. -+ { -+ echo -+ -+ cat <<\_ASBOX -+@%:@@%:@ ---------------- @%:@@%:@ -+@%:@@%:@ Cache variables. @%:@@%:@ -+@%:@@%:@ ---------------- @%:@@%:@ -+_ASBOX -+ echo -+ # The following way of writing the cache mishandles newlines in values, -+( -+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 -+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -+ *) $as_unset $ac_var ;; -+ esac ;; -+ esac -+ done -+ (set) 2>&1 | -+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) -+ sed -n \ -+ "s/'\''/'\''\\\\'\'''\''/g; -+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" -+ ;; #( -+ *) -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" -+ ;; -+ esac | -+ sort -+) -+ echo -+ -+ cat <<\_ASBOX -+@%:@@%:@ ----------------- @%:@@%:@ -+@%:@@%:@ Output variables. @%:@@%:@ -+@%:@@%:@ ----------------- @%:@@%:@ -+_ASBOX -+ echo -+ for ac_var in $ac_subst_vars -+ do -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ $as_echo "$ac_var='\''$ac_val'\''" -+ done | sort -+ echo -+ -+ if test -n "$ac_subst_files"; then -+ cat <<\_ASBOX -+@%:@@%:@ ------------------- @%:@@%:@ -+@%:@@%:@ File substitutions. @%:@@%:@ -+@%:@@%:@ ------------------- @%:@@%:@ -+_ASBOX -+ echo -+ for ac_var in $ac_subst_files -+ do -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ $as_echo "$ac_var='\''$ac_val'\''" -+ done | sort -+ echo -+ fi -+ -+ if test -s confdefs.h; then -+ cat <<\_ASBOX -+@%:@@%:@ ----------- @%:@@%:@ -+@%:@@%:@ confdefs.h. @%:@@%:@ -+@%:@@%:@ ----------- @%:@@%:@ -+_ASBOX -+ echo -+ cat confdefs.h -+ echo -+ fi -+ test "$ac_signal" != 0 && -+ $as_echo "$as_me: caught signal $ac_signal" -+ $as_echo "$as_me: exit $exit_status" -+ } >&5 -+ rm -f core *.core core.conftest.* && -+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files && -+ exit $exit_status -+' 0 -+for ac_signal in 1 2 13 15; do -+ trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -+done -+ac_signal=0 -+ -+# confdefs.h avoids OS command line length limits that DEFS can exceed. -+rm -f -r conftest* confdefs.h -+ -+# Predefined preprocessor variables. -+ -+cat >>confdefs.h <<_ACEOF -+@%:@define PACKAGE_NAME "$PACKAGE_NAME" -+_ACEOF -+ -+ -+cat >>confdefs.h <<_ACEOF -+@%:@define PACKAGE_TARNAME "$PACKAGE_TARNAME" -+_ACEOF -+ -+ -+cat >>confdefs.h <<_ACEOF -+@%:@define PACKAGE_VERSION "$PACKAGE_VERSION" -+_ACEOF -+ -+ -+cat >>confdefs.h <<_ACEOF -+@%:@define PACKAGE_STRING "$PACKAGE_STRING" -+_ACEOF -+ -+ -+cat >>confdefs.h <<_ACEOF -+@%:@define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -+_ACEOF -+ -+ -+# Let the site file select an alternate cache file if it wants to. -+# Prefer an explicitly selected file to automatically selected ones. -+ac_site_file1=NONE -+ac_site_file2=NONE -+if test -n "$CONFIG_SITE"; then -+ ac_site_file1=$CONFIG_SITE -+elif test "x$prefix" != xNONE; then -+ ac_site_file1=$prefix/share/config.site -+ ac_site_file2=$prefix/etc/config.site -+else -+ ac_site_file1=$ac_default_prefix/share/config.site -+ ac_site_file2=$ac_default_prefix/etc/config.site -+fi -+for ac_site_file in "$ac_site_file1" "$ac_site_file2" -+do -+ test "x$ac_site_file" = xNONE && continue -+ if test -r "$ac_site_file"; then -+ { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -+$as_echo "$as_me: loading site script $ac_site_file" >&6;} -+ sed 's/^/| /' "$ac_site_file" >&5 -+ . "$ac_site_file" -+ fi -+done -+ -+if test -r "$cache_file"; then -+ # Some versions of bash will fail to source /dev/null (special -+ # files actually), so we avoid doing that. -+ if test -f "$cache_file"; then -+ { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 -+$as_echo "$as_me: loading cache $cache_file" >&6;} -+ case $cache_file in -+ [\\/]* | ?:[\\/]* ) . "$cache_file";; -+ *) . "./$cache_file";; -+ esac -+ fi -+else -+ { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 -+$as_echo "$as_me: creating cache $cache_file" >&6;} -+ >$cache_file -+fi -+ -+# Check that the precious variables saved in the cache have kept the same -+# value. -+ac_cache_corrupted=false -+for ac_var in $ac_precious_vars; do -+ eval ac_old_set=\$ac_cv_env_${ac_var}_set -+ eval ac_new_set=\$ac_env_${ac_var}_set -+ eval ac_old_val=\$ac_cv_env_${ac_var}_value -+ eval ac_new_val=\$ac_env_${ac_var}_value -+ case $ac_old_set,$ac_new_set in -+ set,) -+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} -+ ac_cache_corrupted=: ;; -+ ,set) -+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} -+ ac_cache_corrupted=: ;; -+ ,);; -+ *) -+ if test "x$ac_old_val" != "x$ac_new_val"; then -+ # differences in whitespace do not lead to failure. -+ ac_old_val_w=`echo x $ac_old_val` -+ ac_new_val_w=`echo x $ac_new_val` -+ if test "$ac_old_val_w" != "$ac_new_val_w"; then -+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -+ ac_cache_corrupted=: -+ else -+ { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} -+ eval $ac_var=\$ac_old_val -+ fi -+ { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 -+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} -+ { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 -+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} -+ fi;; -+ esac -+ # Pass precious variables to config.status. -+ if test "$ac_new_set" = set; then -+ case $ac_new_val in -+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *) ac_arg=$ac_var=$ac_new_val ;; -+ esac -+ case " $ac_configure_args " in -+ *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. -+ *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; -+ esac -+ fi -+done -+if $ac_cache_corrupted; then -+ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+ { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} -+ { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} -+ { (exit 1); exit 1; }; } -+fi -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ -+ -+ac_config_files="$ac_config_files Makefile" -+ -+ -+{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 -+$as_echo_n "checking for a sed that does not truncate output... " >&6; } -+if test "${ac_cv_path_SED+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ -+ for ac_i in 1 2 3 4 5 6 7; do -+ ac_script="$ac_script$as_nl$ac_script" -+ done -+ echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed -+ $as_unset ac_script || ac_script= -+ if test -z "$SED"; then -+ ac_path_SED_found=false -+ # Loop through the user's path and test for each of PROGNAME-LIST -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in sed gsed; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" -+ { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue -+# Check for GNU ac_path_SED and select it if it is found. -+ # Check for GNU $ac_path_SED -+case `"$ac_path_SED" --version 2>&1` in -+*GNU*) -+ ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; -+*) -+ ac_count=0 -+ $as_echo_n 0123456789 >"conftest.in" -+ while : -+ do -+ cat "conftest.in" "conftest.in" >"conftest.tmp" -+ mv "conftest.tmp" "conftest.in" -+ cp "conftest.in" "conftest.nl" -+ $as_echo '' >> "conftest.nl" -+ "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break -+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -+ ac_count=`expr $ac_count + 1` -+ if test $ac_count -gt ${ac_path_SED_max-0}; then -+ # Best one so far, save it but keep looking for a better one -+ ac_cv_path_SED="$ac_path_SED" -+ ac_path_SED_max=$ac_count -+ fi -+ # 10*(2^10) chars as input seems more than enough -+ test $ac_count -gt 10 && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -+esac -+ -+ $ac_path_SED_found && break 3 -+ done -+ done -+done -+IFS=$as_save_IFS -+ if test -z "$ac_cv_path_SED"; then -+ { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5 -+$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;} -+ { (exit 1); exit 1; }; } -+ fi -+else -+ ac_cv_path_SED=$SED -+fi -+ -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5 -+$as_echo "$ac_cv_path_SED" >&6; } -+ SED="$ac_cv_path_SED" -+ rm -f conftest.sed -+ -+ -+{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 -+$as_echo_n "checking whether ln -s works... " >&6; } -+LN_S=$as_ln_s -+if test "$LN_S" = "ln -s"; then -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -+$as_echo "no, using $LN_S" >&6; } -+fi -+ -+ -+ac_aux_dir= -+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do -+ if test -f "$ac_dir/install-sh"; then -+ ac_aux_dir=$ac_dir -+ ac_install_sh="$ac_aux_dir/install-sh -c" -+ break -+ elif test -f "$ac_dir/install.sh"; then -+ ac_aux_dir=$ac_dir -+ ac_install_sh="$ac_aux_dir/install.sh -c" -+ break -+ elif test -f "$ac_dir/shtool"; then -+ ac_aux_dir=$ac_dir -+ ac_install_sh="$ac_aux_dir/shtool install -c" -+ break -+ fi -+done -+if test -z "$ac_aux_dir"; then -+ { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -+$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} -+ { (exit 1); exit 1; }; } -+fi -+ -+# These three variables are undocumented and unsupported, -+# and are intended to be withdrawn in a future Autoconf release. -+# They can cause serious problems if a builder's source tree is in a directory -+# whose full name contains unusual characters. -+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -+ -+ -+# Find a good install program. We prefer a C program (faster), -+# so one script is as good as another. But avoid the broken or -+# incompatible versions: -+# SysV /etc/install, /usr/sbin/install -+# SunOS /usr/etc/install -+# IRIX /sbin/install -+# AIX /bin/install -+# AmigaOS /C/install, which installs bootblocks on floppy discs -+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -+# AFS /usr/afsws/bin/install, which mishandles nonexistent args -+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -+# OS/2's system install, which has a completely different semantic -+# ./install, which can be erroneously created by make from ./install.sh. -+# Reject install programs that cannot install multiple files. -+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -+$as_echo_n "checking for a BSD-compatible install... " >&6; } -+if test -z "$INSTALL"; then -+if test "${ac_cv_path_install+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ # Account for people who put trailing slashes in PATH elements. -+case $as_dir/ in -+ ./ | .// | /cC/* | \ -+ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ -+ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ -+ /usr/ucb/* ) ;; -+ *) -+ # OSF1 and SCO ODT 3.0 have their own names for install. -+ # Don't use installbsd from OSF since it installs stuff as root -+ # by default. -+ for ac_prog in ginstall scoinst install; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then -+ if test $ac_prog = install && -+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -+ # AIX install. It has an incompatible calling convention. -+ : -+ elif test $ac_prog = install && -+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -+ # program-specific install script used by HP pwplus--don't use. -+ : -+ else -+ rm -rf conftest.one conftest.two conftest.dir -+ echo one > conftest.one -+ echo two > conftest.two -+ mkdir conftest.dir -+ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && -+ test -s conftest.one && test -s conftest.two && -+ test -s conftest.dir/conftest.one && -+ test -s conftest.dir/conftest.two -+ then -+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -+ break 3 -+ fi -+ fi -+ fi -+ done -+ done -+ ;; -+esac -+ -+done -+IFS=$as_save_IFS -+ -+rm -rf conftest.one conftest.two conftest.dir -+ -+fi -+ if test "${ac_cv_path_install+set}" = set; then -+ INSTALL=$ac_cv_path_install -+ else -+ # As a last resort, use the slow shell script. Don't cache a -+ # value for INSTALL within a source directory, because that will -+ # break other packages using the cache if that directory is -+ # removed, or if the value is a relative name. -+ INSTALL=$ac_install_sh -+ fi -+fi -+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 -+$as_echo "$INSTALL" >&6; } -+ -+# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -+# It thinks the first close brace ends the variable substitution. -+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -+ -+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' -+ -+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -+ -+ -+cat >confcache <<\_ACEOF -+# This file is a shell script that caches the results of configure -+# tests run on this system so they can be shared between configure -+# scripts and configure runs, see configure's option --config-cache. -+# It is not useful on other systems. If it contains results you don't -+# want to keep, you may remove or edit it. -+# -+# config.status only pays attention to the cache file if you give it -+# the --recheck option to rerun configure. -+# -+# `ac_cv_env_foo' variables (set or unset) will be overridden when -+# loading this file, other *unset* `ac_cv_foo' will be assigned the -+# following values. -+ -+_ACEOF -+ -+# The following way of writing the cache mishandles newlines in values, -+# but we know of no workaround that is simple, portable, and efficient. -+# So, we kill variables containing newlines. -+# Ultrix sh set writes to stderr and can't be redirected directly, -+# and sets the high bit in the cache file unless we assign to the vars. -+( -+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 -+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -+ *) $as_unset $ac_var ;; -+ esac ;; -+ esac -+ done -+ -+ (set) 2>&1 | -+ case $as_nl`(ac_space=' '; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) -+ # `set' does not quote correctly, so add quotes (double-quote -+ # substitution turns \\\\ into \\, and sed turns \\ into \). -+ sed -n \ -+ "s/'/'\\\\''/g; -+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -+ ;; #( -+ *) -+ # `set' quotes correctly as required by POSIX, so do not add quotes. -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" -+ ;; -+ esac | -+ sort -+) | -+ sed ' -+ /^ac_cv_env_/b end -+ t clear -+ :clear -+ s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ -+ t end -+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ -+ :end' >>confcache -+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else -+ if test -w "$cache_file"; then -+ test "x$cache_file" != "x/dev/null" && -+ { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 -+$as_echo "$as_me: updating cache $cache_file" >&6;} -+ cat confcache >$cache_file -+ else -+ { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} -+ fi -+fi -+rm -f confcache -+ -+test "x$prefix" = xNONE && prefix=$ac_default_prefix -+# Let make expand exec_prefix. -+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -+ -+# Transform confdefs.h into DEFS. -+# Protect against shell expansion while executing Makefile rules. -+# Protect against Makefile macro expansion. -+# -+# If the first sed substitution is executed (which looks for macros that -+# take arguments), then branch to the quote section. Otherwise, -+# look for a macro that doesn't take arguments. -+ac_script=' -+:mline -+/\\$/{ -+ N -+ s,\\\n,, -+ b mline -+} -+t clear -+:clear -+s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g -+t quote -+s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g -+t quote -+b any -+:quote -+s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g -+s/\[/\\&/g -+s/\]/\\&/g -+s/\$/$$/g -+H -+:any -+${ -+ g -+ s/^\n// -+ s/\n/ /g -+ p -+} -+' -+DEFS=`sed -n "$ac_script" confdefs.h` -+ -+ -+ac_libobjs= -+ac_ltlibobjs= -+for ac_i in : $LIB@&t at OBJS; do test "x$ac_i" = x: && continue -+ # 1. Remove the extension, and $U if already installed. -+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' -+ ac_i=`$as_echo "$ac_i" | sed "$ac_script"` -+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR -+ # will be set to the directory where LIBOBJS objects are built. -+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" -+ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' -+done -+LIB@&t at OBJS=$ac_libobjs -+ -+LTLIBOBJS=$ac_ltlibobjs -+ -+ -+ -+: ${CONFIG_STATUS=./config.status} -+ac_write_fail=0 -+ac_clean_files_save=$ac_clean_files -+ac_clean_files="$ac_clean_files $CONFIG_STATUS" -+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+#! $SHELL -+# Generated by $as_me. -+# Run this file to recreate the current configuration. -+# Compiler output produced by configure, useful for debugging -+# configure, is in config.log if it exists. -+ -+debug=false -+ac_cs_recheck=false -+ac_cs_silent=false -+SHELL=\${CONFIG_SHELL-$SHELL} -+_ACEOF -+ -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+## --------------------- ## -+## M4sh Initialization. ## -+## --------------------- ## -+ -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+ emulate sh -+ NULLCMD=: -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '${1+"$@"}'='"$@"' -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ -+fi -+ -+ -+ -+ -+# PATH needs CR -+# Avoid depending upon Character Ranges. -+as_cr_letters='abcdefghijklmnopqrstuvwxyz' -+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -+as_cr_Letters=$as_cr_letters$as_cr_LETTERS -+as_cr_digits='0123456789' -+as_cr_alnum=$as_cr_Letters$as_cr_digits -+ -+as_nl=' -+' -+export as_nl -+# Printing a long string crashes Solaris 7 /usr/bin/printf. -+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='printf %s\n' -+ as_echo_n='printf %s' -+else -+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' -+ as_echo_n='/usr/ucb/echo -n' -+ else -+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' -+ as_echo_n_body='eval -+ arg=$1; -+ case $arg in -+ *"$as_nl"*) -+ expr "X$arg" : "X\\(.*\\)$as_nl"; -+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -+ esac; -+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -+ ' -+ export as_echo_n_body -+ as_echo_n='sh -c $as_echo_n_body as_echo' -+ fi -+ export as_echo_body -+ as_echo='sh -c $as_echo_body as_echo' -+fi -+ -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ PATH_SEPARATOR=: -+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -+ PATH_SEPARATOR=';' -+ } -+fi -+ -+# Support unset when possible. -+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -+ as_unset=unset -+else -+ as_unset=false -+fi -+ -+ -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) -+IFS=" "" $as_nl" -+ -+# Find who we are. Look in the path if we contain no directory separator. -+case $0 in -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+# We did not find ourselves, most probably we were run as `sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then -+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ { (exit 1); exit 1; } -+fi -+ -+# Work around bugs in pre-3.0 UWIN ksh. -+for as_var in ENV MAIL MAILPATH -+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+done -+PS1='$ ' -+PS2='> ' -+PS4='+ ' -+ -+# NLS nuisances. -+LC_ALL=C -+export LC_ALL -+LANGUAGE=C -+export LANGUAGE -+ -+# Required to use basename. -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then -+ as_expr=expr -+else -+ as_expr=false -+fi -+ -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then -+ as_basename=basename -+else -+ as_basename=false -+fi -+ -+ -+# Name of the executable. -+as_me=`$as_basename -- "$0" || -+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ -+ X"$0" : 'X\(//\)$' \| \ -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X/"$0" | -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ -+# CDPATH. -+$as_unset CDPATH -+ -+ -+ -+ as_lineno_1=$LINENO -+ as_lineno_2=$LINENO -+ test "x$as_lineno_1" != "x$as_lineno_2" && -+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { -+ -+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -+ # uniformly replaced by the line number. The first 'sed' inserts a -+ # line-number line after each line using $LINENO; the second 'sed' -+ # does the real work. The second script uses 'N' to pair each -+ # line-number line with the line containing $LINENO, and appends -+ # trailing '-' during substitution so that $LINENO is not a special -+ # case at line end. -+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -+ # scripts with optimization help from Paolo Bonzini. Blame Lee -+ # E. McMahon (1931-1989) for sed's syntax. :-) -+ sed -n ' -+ p -+ /[$]LINENO/= -+ ' <$as_myself | -+ sed ' -+ s/[$]LINENO.*/&-/ -+ t lineno -+ b -+ :lineno -+ N -+ :loop -+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ -+ t loop -+ s/-\n.*// -+ ' >$as_me.lineno && -+ chmod +x "$as_me.lineno" || -+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -+ { (exit 1); exit 1; }; } -+ -+ # Don't try to exec as it changes $[0], causing all sort of problems -+ # (the dirname of $[0] is not the place where we might find the -+ # original and so on. Autoconf is especially sensitive to this). -+ . "./$as_me.lineno" -+ # Exit status is that of the last command. -+ exit -+} -+ -+ -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi -+ -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in -+-n*) -+ case `echo 'x\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ *) ECHO_C='\c';; -+ esac;; -+*) -+ ECHO_N='-n';; -+esac -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then -+ as_expr=expr -+else -+ as_expr=false -+fi -+ -+rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file -+else -+ rm -f conf$$.dir -+ mkdir conf$$.dir 2>/dev/null -+fi -+if (echo >conf$$.file) 2>/dev/null; then -+ if ln -s conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -p'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -p' -+ elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+ else -+ as_ln_s='cp -p' -+ fi -+else -+ as_ln_s='cp -p' -+fi -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null -+ -+if mkdir -p . 2>/dev/null; then -+ as_mkdir_p=: -+else -+ test -d ./-p && rmdir ./-p -+ as_mkdir_p=false -+fi -+ -+if test -x / >/dev/null 2>&1; then -+ as_test_x='test -x' -+else -+ if ls -dL / >/dev/null 2>&1; then -+ as_ls_L_option=L -+ else -+ as_ls_L_option= -+ fi -+ as_test_x=' -+ eval sh -c '\'' -+ if test -d "$1"; then -+ test -d "$1/."; -+ else -+ case $1 in -+ -*)set "./$1";; -+ esac; -+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in -+ ???[sx]*):;;*)false;;esac;fi -+ '\'' sh -+ ' -+fi -+as_executable_p=$as_test_x -+ -+# Sed expression to map a string onto a valid CPP name. -+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -+ -+# Sed expression to map a string onto a valid variable name. -+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -+ -+ -+exec 6>&1 -+ -+# Save the log message, to keep $[0] and so on meaningful, and to -+# report actual input values of CONFIG_FILES etc. instead of their -+# values after options handling. -+ac_log=" -+This file was extended by asciidoc $as_me 8.4.2, which was -+generated by GNU Autoconf 2.63. Invocation command line was -+ -+ CONFIG_FILES = $CONFIG_FILES -+ CONFIG_HEADERS = $CONFIG_HEADERS -+ CONFIG_LINKS = $CONFIG_LINKS -+ CONFIG_COMMANDS = $CONFIG_COMMANDS -+ $ $0 $@ -+ -+on `(hostname || uname -n) 2>/dev/null | sed 1q` -+" -+ -+_ACEOF -+ -+case $ac_config_files in *" -+"*) set x $ac_config_files; shift; ac_config_files=$*;; -+esac -+ -+ -+ -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+# Files that config.status was made for. -+config_files="$ac_config_files" -+ -+_ACEOF -+ -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+ac_cs_usage="\ -+\`$as_me' instantiates files from templates according to the -+current configuration. -+ -+Usage: $0 [OPTION]... [FILE]... -+ -+ -h, --help print this help, then exit -+ -V, --version print version number and configuration settings, then exit -+ -q, --quiet, --silent -+ do not print progress messages -+ -d, --debug don't remove temporary files -+ --recheck update $as_me by reconfiguring in the same conditions -+ --file=FILE[:TEMPLATE] -+ instantiate the configuration file FILE -+ -+Configuration files: -+$config_files -+ -+Report bugs to ." -+ -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ac_cs_version="\\ -+asciidoc config.status 8.4.2 -+configured by $0, generated by GNU Autoconf 2.63, -+ with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -+ -+Copyright (C) 2008 Free Software Foundation, Inc. -+This config.status script is free software; the Free Software Foundation -+gives unlimited permission to copy, distribute and modify it." -+ -+ac_pwd='$ac_pwd' -+srcdir='$srcdir' -+INSTALL='$INSTALL' -+test -n "\$AWK" || AWK=awk -+_ACEOF -+ -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# The default lists apply if the user does not specify any file. -+ac_need_defaults=: -+while test $# != 0 -+do -+ case $1 in -+ --*=*) -+ ac_option=`expr "X$1" : 'X\([^=]*\)='` -+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` -+ ac_shift=: -+ ;; -+ *) -+ ac_option=$1 -+ ac_optarg=$2 -+ ac_shift=shift -+ ;; -+ esac -+ -+ case $ac_option in -+ # Handling of the options. -+ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) -+ ac_cs_recheck=: ;; -+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) -+ $as_echo "$ac_cs_version"; exit ;; -+ --debug | --debu | --deb | --de | --d | -d ) -+ debug=: ;; -+ --file | --fil | --fi | --f ) -+ $ac_shift -+ case $ac_optarg in -+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ esac -+ CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" -+ ac_need_defaults=false;; -+ --he | --h | --help | --hel | -h ) -+ $as_echo "$ac_cs_usage"; exit ;; -+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -+ | -silent | --silent | --silen | --sile | --sil | --si | --s) -+ ac_cs_silent=: ;; -+ -+ # This is an error. -+ -*) { $as_echo "$as_me: error: unrecognized option: $1 -+Try \`$0 --help' for more information." >&2 -+ { (exit 1); exit 1; }; } ;; -+ -+ *) ac_config_targets="$ac_config_targets $1" -+ ac_need_defaults=false ;; -+ -+ esac -+ shift -+done -+ -+ac_configure_extra_args= -+ -+if $ac_cs_silent; then -+ exec 6>/dev/null -+ ac_configure_extra_args="$ac_configure_extra_args --silent" -+fi -+ -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+if \$ac_cs_recheck; then -+ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+ shift -+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 -+ CONFIG_SHELL='$SHELL' -+ export CONFIG_SHELL -+ exec "\$@" -+fi -+ -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+exec 5>>config.log -+{ -+ echo -+ sed 'h;s/./-/g;s/^.../@%:@@%:@ /;s/...$/ @%:@@%:@/;p;x;p;x' <<_ASBOX -+@%:@@%:@ Running $as_me. @%:@@%:@ -+_ASBOX -+ $as_echo "$ac_log" -+} >&5 -+ -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+_ACEOF -+ -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+ -+# Handling of arguments. -+for ac_config_target in $ac_config_targets -+do -+ case $ac_config_target in -+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; -+ -+ *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -+ { (exit 1); exit 1; }; };; -+ esac -+done -+ -+ -+# If the user did not use the arguments to specify the items to instantiate, -+# then the envvar interface is used. Set only those that are not. -+# We use the long form for the default assignment because of an extremely -+# bizarre bug on SunOS 4.1.3. -+if $ac_need_defaults; then -+ test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files -+fi -+ -+# Have a temporary directory for convenience. Make it in the build tree -+# simply because there is no reason against having it here, and in addition, -+# creating and moving files from /tmp can sometimes cause problems. -+# Hook for its removal unless debugging. -+# Note that there is a small window in which the directory will not be cleaned: -+# after its creation but before its name has been assigned to `$tmp'. -+$debug || -+{ -+ tmp= -+ trap 'exit_status=$? -+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status -+' 0 -+ trap '{ (exit 1); exit 1; }' 1 2 13 15 -+} -+# Create a (secure) tmp directory for tmp files. -+ -+{ -+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && -+ test -n "$tmp" && test -d "$tmp" -+} || -+{ -+ tmp=./conf$$-$RANDOM -+ (umask 077 && mkdir "$tmp") -+} || -+{ -+ $as_echo "$as_me: cannot create a temporary directory in ." >&2 -+ { (exit 1); exit 1; } -+} -+ -+# Set up the scripts for CONFIG_FILES section. -+# No need to generate them if there are no CONFIG_FILES. -+# This happens for instance with `./config.status config.h'. -+if test -n "$CONFIG_FILES"; then -+ -+ -+ac_cr=' -' -+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` -+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then -+ ac_cs_awk_cr='\\r' -+else -+ ac_cs_awk_cr=$ac_cr -+fi -+ -+echo 'BEGIN {' >"$tmp/subs1.awk" && -+_ACEOF -+ -+ -+{ -+ echo "cat >conf$$subs.awk <<_ACEOF" && -+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && -+ echo "_ACEOF" -+} >conf$$subs.sh || -+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -+ { (exit 1); exit 1; }; } -+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` -+ac_delim='%!_!# ' -+for ac_last_try in false false false false false :; do -+ . ./conf$$subs.sh || -+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -+ { (exit 1); exit 1; }; } -+ -+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` -+ if test $ac_delim_n = $ac_delim_num; then -+ break -+ elif $ac_last_try; then -+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -+ { (exit 1); exit 1; }; } -+ else -+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " -+ fi -+done -+rm -f conf$$subs.sh -+ -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+cat >>"\$tmp/subs1.awk" <<\\_ACAWK && -+_ACEOF -+sed -n ' -+h -+s/^/S["/; s/!.*/"]=/ -+p -+g -+s/^[^!]*!// -+:repl -+t repl -+s/'"$ac_delim"'$// -+t delim -+:nl -+h -+s/\(.\{148\}\).*/\1/ -+t more1 -+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ -+p -+n -+b repl -+:more1 -+s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -+p -+g -+s/.\{148\}// -+t nl -+:delim -+h -+s/\(.\{148\}\).*/\1/ -+t more2 -+s/["\\]/\\&/g; s/^/"/; s/$/"/ -+p -+b -+:more2 -+s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -+p -+g -+s/.\{148\}// -+t delim -+' >$CONFIG_STATUS || ac_write_fail=1 -+rm -f conf$$subs.awk -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+_ACAWK -+cat >>"\$tmp/subs1.awk" <<_ACAWK && -+ for (key in S) S_is_set[key] = 1 -+ FS = "" -+ -+} -+{ -+ line = $ 0 -+ nfields = split(line, field, "@") -+ substed = 0 -+ len = length(field[1]) -+ for (i = 2; i < nfields; i++) { -+ key = field[i] -+ keylen = length(key) -+ if (S_is_set[key]) { -+ value = S[key] -+ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) -+ len += length(value) + length(field[++i]) -+ substed = 1 -+ } else -+ len += 1 + keylen -+ } -+ -+ print line -+} -+ -+_ACAWK -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then -+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" -+else -+ cat -+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ -+ || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 -+$as_echo "$as_me: error: could not setup config files machinery" >&2;} -+ { (exit 1); exit 1; }; } -+_ACEOF -+ -+# VPATH may cause trouble with some makes, so we remove $(srcdir), -+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -+# trailing colons and then remove the whole line if VPATH becomes empty -+# (actually we leave an empty line to preserve line numbers). -+if test "x$srcdir" = x.; then -+ ac_vpsub='/^[ ]*VPATH[ ]*=/{ -+s/:*\$(srcdir):*/:/ -+s/:*\${srcdir}:*/:/ -+s/:*@srcdir@:*/:/ -+s/^\([^=]*=[ ]*\):*/\1/ -+s/:*$// -+s/^[^=]*=[ ]*$// -+}' -+fi -+ -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+fi # test -n "$CONFIG_FILES" -+ -+ -+eval set X " :F $CONFIG_FILES " -+shift -+for ac_tag -+do -+ case $ac_tag in -+ :[FHLC]) ac_mode=$ac_tag; continue;; -+ esac -+ case $ac_mode$ac_tag in -+ :[FHL]*:*);; -+ :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 -+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} -+ { (exit 1); exit 1; }; };; -+ :[FH]-) ac_tag=-:-;; -+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; -+ esac -+ ac_save_IFS=$IFS -+ IFS=: -+ set x $ac_tag -+ IFS=$ac_save_IFS -+ shift -+ ac_file=$1 -+ shift -+ -+ case $ac_mode in -+ :L) ac_source=$1;; -+ :[FH]) -+ ac_file_inputs= -+ for ac_f -+ do -+ case $ac_f in -+ -) ac_f="$tmp/stdin";; -+ *) # Look for the file first in the build tree, then in the source tree -+ # (if the path is not absolute). The absolute path cannot be DOS-style, -+ # because $ac_f cannot contain `:'. -+ test -f "$ac_f" || -+ case $ac_f in -+ [\\/$]*) false;; -+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; -+ esac || -+ { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} -+ { (exit 1); exit 1; }; };; -+ esac -+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac -+ ac_file_inputs="$ac_file_inputs '$ac_f'" -+ done -+ -+ # Let's still pretend it is `configure' which instantiates (i.e., don't -+ # use $as_me), people would be surprised to read: -+ # /* config.h. Generated by config.status. */ -+ configure_input='Generated from '` -+ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' -+ `' by configure.' -+ if test x"$ac_file" != x-; then -+ configure_input="$ac_file. $configure_input" -+ { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 -+$as_echo "$as_me: creating $ac_file" >&6;} -+ fi -+ # Neutralize special characters interpreted by sed in replacement strings. -+ case $configure_input in #( -+ *\&* | *\|* | *\\* ) -+ ac_sed_conf_input=`$as_echo "$configure_input" | -+ sed 's/[\\\\&|]/\\\\&/g'`;; #( -+ *) ac_sed_conf_input=$configure_input;; -+ esac -+ -+ case $ac_tag in -+ *:-:* | *:-) cat >"$tmp/stdin" \ -+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -+$as_echo "$as_me: error: could not create $ac_file" >&2;} -+ { (exit 1); exit 1; }; } ;; -+ esac -+ ;; -+ esac -+ -+ ac_dir=`$as_dirname -- "$ac_file" || -+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$ac_file" : 'X\(//\)[^/]' \| \ -+ X"$ac_file" : 'X\(//\)$' \| \ -+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$ac_file" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ { as_dir="$ac_dir" -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { -+ as_dirs= -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break -+ done -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} -+ { (exit 1); exit 1; }; }; } -+ ac_builddir=. -+ -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) -+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` -+ # A ".." for each directory in $ac_dir_suffix. -+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` -+ case $ac_top_builddir_sub in -+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix -+ -+case $srcdir in -+ .) # We are building in place. -+ ac_srcdir=. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. -+ ac_srcdir=$srcdir$ac_dir_suffix; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -+esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -+ -+ -+ case $ac_mode in -+ :F) -+ # -+ # CONFIG_FILE -+ # -+ -+ case $INSTALL in -+ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; -+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; -+ esac -+_ACEOF -+ -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# If the template does not know about datarootdir, expand it. -+# FIXME: This hack should be removed a few years after 2.60. -+ac_datarootdir_hack=; ac_datarootdir_seen= -+ -+ac_sed_dataroot=' -+/datarootdir/ { -+ p -+ q -+} -+/@datadir@/p -+/@docdir@/p -+/@infodir@/p -+/@localedir@/p -+/@mandir@/p -+' -+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in -+*datarootdir*) ac_datarootdir_seen=yes;; -+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ ac_datarootdir_hack=' -+ s&@datadir@&$datadir&g -+ s&@docdir@&$docdir&g -+ s&@infodir@&$infodir&g -+ s&@localedir@&$localedir&g -+ s&@mandir@&$mandir&g -+ s&\\\${datarootdir}&$datarootdir&g' ;; -+esac -+_ACEOF -+ -+# Neutralize VPATH when `$srcdir' = `.'. -+# Shell code in configure.ac might set extrasub. -+# FIXME: do we really want to maintain this feature? -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ac_sed_extra="$ac_vpsub -+$extrasub -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+:t -+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -+s|@configure_input@|$ac_sed_conf_input|;t t -+s&@top_builddir@&$ac_top_builddir_sub&;t t -+s&@top_build_prefix@&$ac_top_build_prefix&;t t -+s&@srcdir@&$ac_srcdir&;t t -+s&@abs_srcdir@&$ac_abs_srcdir&;t t -+s&@top_srcdir@&$ac_top_srcdir&;t t -+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -+s&@builddir@&$ac_builddir&;t t -+s&@abs_builddir@&$ac_abs_builddir&;t t -+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -+s&@INSTALL@&$ac_INSTALL&;t t -+$ac_datarootdir_hack -+" -+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ -+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -+$as_echo "$as_me: error: could not create $ac_file" >&2;} -+ { (exit 1); exit 1; }; } -+ -+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && -+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && -+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined." >&5 -+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined." >&2;} -+ -+ rm -f "$tmp/stdin" -+ case $ac_file in -+ -) cat "$tmp/out" && rm -f "$tmp/out";; -+ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; -+ esac \ -+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -+$as_echo "$as_me: error: could not create $ac_file" >&2;} -+ { (exit 1); exit 1; }; } -+ ;; -+ -+ -+ -+ esac -+ -+done # for ac_tag -+ -+ -+{ (exit 0); exit 0; } -+_ACEOF -+chmod +x $CONFIG_STATUS -+ac_clean_files=$ac_clean_files_save -+ -+test $ac_write_fail = 0 || -+ { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 -+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} -+ { (exit 1); exit 1; }; } -+ -+ -+# configure is writing to config.log, and then calls config.status. -+# config.status does its own redirection, appending to config.log. -+# Unfortunately, on DOS this fails, as config.log is still kept open -+# by configure, so config.status won't be able to write to it; its -+# output is simply discarded. So we exec the FD to /dev/null, -+# effectively closing config.log, so it can be properly (re)opened and -+# appended to by config.status. When coming back to configure, we -+# need to make the FD available again. -+if test "$no_create" != yes; then -+ ac_cs_success=: -+ ac_config_status_args= -+ test "$silent" = yes && -+ ac_config_status_args="$ac_config_status_args --quiet" -+ exec 5>/dev/null -+ $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false -+ exec 5>>config.log -+ # Use ||, not &&, to avoid exiting from the if with $? = 1, which -+ # would make configure fail if this is the last instruction. -+ $ac_cs_success || { (exit 1); exit 1; } -+fi -+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then -+ { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} -+fi -+ -diff --speed-large-files --minimal -Nru asciidoc-8.4.2.orig/autom4te.cache/requests asciidoc-8.4.2/autom4te.cache/requests ---- asciidoc-8.4.2.orig/autom4te.cache/requests 1970-01-01 01:00:00.000000000 +0100 -+++ asciidoc-8.4.2/autom4te.cache/requests 2009-03-27 01:07:51.994374586 +0100 -@@ -0,0 +1,66 @@ -+# This file was generated. -+# It contains the lists of macros which have been traced. -+# It can be safely removed. -+ -+ at request = ( -+ bless( [ -+ '0', -+ 1, -+ [ -+ '/opt/csw/share/autoconf' -+ ], -+ [ @@ 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 wbonnet at users.sourceforge.net Sat Sep 12 17:04:59 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 12 Sep 2009 15:04:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6281] csw/mgar/pkg/firefox/trunk Message-ID: Revision: 6281 http://gar.svn.sourceforge.net/gar/?rev=6281&view=rev Author: wbonnet Date: 2009-09-12 15:04:59 +0000 (Sat, 12 Sep 2009) Log Message: ----------- Upgrade to 3.0.14 Modified Paths: -------------- csw/mgar/pkg/firefox/trunk/Makefile csw/mgar/pkg/firefox/trunk/checksums Added Paths: ----------- csw/mgar/pkg/firefox/trunk/files/legacydb.config.mk.diff csw/mgar/pkg/firefox/trunk/files/legacydb.manifest.mm.diff csw/mgar/pkg/firefox/trunk/files/nsWildCard.cpp.diff csw/mgar/pkg/firefox/trunk/files/softoken.config.mk.diff csw/mgar/pkg/firefox/trunk/files/softoken.manifest.mm.diff Modified: csw/mgar/pkg/firefox/trunk/Makefile =================================================================== --- csw/mgar/pkg/firefox/trunk/Makefile 2009-09-12 01:26:57 UTC (rev 6280) +++ csw/mgar/pkg/firefox/trunk/Makefile 2009-09-12 15:04:59 UTC (rev 6281) @@ -34,6 +34,7 @@ REQUIRED_PKGS_CSWfirefox += CSWlibx11 REQUIRED_PKGS_CSWfirefox += CSWlibxrender REQUIRED_PKGS_CSWfirefox += CSWpango +REQUIRED_PKGS_CSWfirefox += CSWzlib REQUIRED_PKGS_CSWfirefox += CSWsqlite3rt # Defines the list of patches to be applied to the sources @@ -49,6 +50,11 @@ PATCHFILES += nsNativeApSuportUnix.cpp.diff PATCHFILES += nsExceptionHandler.cpp.diff PATCHFILES += SunOS5.mk.diff +PATCHFILES += nsWildCard.cpp.diff +PATCHFILES += softoken.manifest.mm.diff +PATCHFILES += softoken.config.mk.diff +PATCHFILES += legacydb.manifest.mm.diff +PATCHFILES += legacydb.config.mk.diff # pkg-config options EXTRA_PKG_CONFIG_PATH += /opt/csw/X11/lib/pkgconfig Modified: csw/mgar/pkg/firefox/trunk/checksums =================================================================== --- csw/mgar/pkg/firefox/trunk/checksums 2009-09-12 01:26:57 UTC (rev 6280) +++ csw/mgar/pkg/firefox/trunk/checksums 2009-09-12 15:04:59 UTC (rev 6281) @@ -5,14 +5,19 @@ 45bba282258a321e5e4f73a742bcc31b download/autoconf.mk.in.diff c869762735a41bb30f417e510ccb7f31 download/configure.diff a71a4afaabc4d067f30d8fb184fea520 download/file_id.cc.diff -040d01a1e22a1ec1b28188479df06007 download/firefox-3.0.13-source.tar.bz2 +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 Added: csw/mgar/pkg/firefox/trunk/files/legacydb.config.mk.diff =================================================================== --- csw/mgar/pkg/firefox/trunk/files/legacydb.config.mk.diff (rev 0) +++ csw/mgar/pkg/firefox/trunk/files/legacydb.config.mk.diff 2009-09-12 15:04:59 UTC (rev 6281) @@ -0,0 +1,13 @@ +--- firefox.orig/security/nss/lib/softoken/legacydb/config.mk 2009-09-12 16:48:35.872144730 +0200 ++++ firefox/security/nss/lib/softoken/legacydb/config.mk 2009-09-12 16:49:37.894263860 +0200 +@@ -83,6 +83,10 @@ + # $(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 \ ++ -R/opt/csw/lib \ ++ -L/opt/csw/X11/lib \ ++ -R/opt/csw/X11/lib \ + -L$(DIST)/lib \ + -lnssutil3 \ + -L$(NSPR_LIB_DIR) \ Added: csw/mgar/pkg/firefox/trunk/files/legacydb.manifest.mm.diff =================================================================== --- csw/mgar/pkg/firefox/trunk/files/legacydb.manifest.mm.diff (rev 0) +++ csw/mgar/pkg/firefox/trunk/files/legacydb.manifest.mm.diff 2009-09-12 15:04:59 UTC (rev 6281) @@ -0,0 +1,10 @@ +--- firefox.orig/security/nss/lib/softoken/legacydb/manifest.mn 2009-09-12 16:48:43.152291326 +0200 ++++ firefox/security/nss/lib/softoken/legacydb/manifest.mn 2009-09-12 16:49:12.293669070 +0200 +@@ -48,6 +48,7 @@ + + ifdef MOZILLA_CLIENT + INCLUDES += -I$(DIST)/include/sqlite3 ++INCLUDES += -I/opt/csw/include + endif + + CSRCS = \ Added: csw/mgar/pkg/firefox/trunk/files/nsWildCard.cpp.diff =================================================================== --- csw/mgar/pkg/firefox/trunk/files/nsWildCard.cpp.diff (rev 0) +++ csw/mgar/pkg/firefox/trunk/files/nsWildCard.cpp.diff 2009-09-12 15:04:59 UTC (rev 6281) @@ -0,0 +1,199 @@ +--- 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 @@ + + typedef int static_assert_character_code_arrangement['a' > 'A' ? 1 : -1]; + +-template + static int +-alpha(T c) ++alpha(PRUnichar c) + { + return ('a' <= c && c <= 'z') || + ('A' <= c && c <= 'Z'); + } + +-template + static int +-alphanumeric(T c) ++alphanumeric(PRUnichar c) + { + return ('0' <= c && c <= '9') || alpha(c); + } + +-template + static int +-lower(T c) ++lower(PRUnichar c) + { + return ('A' <= c && c <= 'Z') ? c + ('a' - 'A') : c; + } + +-template + static int +-upper(T c) ++upper(PRUnichar c) + { + return ('a' <= c && c <= 'z') ? c - ('a' - 'A') : c; + } + + /* ----------------------------- _valid_subexp ---------------------------- */ + +-template ++template + static int + _valid_subexp(const T *expr, T stop1, T stop2) + { +@@ -162,7 +158,7 @@ + } + + +-template ++template + int + NS_WildCardValid_(const T *expr) + { +@@ -183,9 +179,8 @@ + #define NOMATCH 1 + #define ABORTED -1 + +-template + static int +-_shexp_match(const T *str, const T *expr, PRBool case_insensitive, unsigned int level); ++_shexp_match(const PRUnichar *str, const PRUnichar *expr, PRBool case_insensitive, unsigned int level); + + /** + * Count characters until we reach a NUL character or either of the +@@ -196,9 +191,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. + */ +-template + static int +-_scan_and_copy(const T *expr, T stop1, T stop2, T *dest) ++_scan_and_copy(const PRUnichar *expr, PRUnichar stop1, PRUnichar stop2, PRUnichar *dest) + { + register int sx; /* source index */ + register char cc; +@@ -219,7 +213,7 @@ + } + if (dest && sx) { + /* Copy all but the closing delimiter. */ +- memcpy(dest, expr, sx * sizeof(T)); ++ memcpy(dest, expr, sx * sizeof(PRUnichar)); + dest[sx] = 0; + } + return cc ? sx : ABORTED; /* index of closing delimiter */ +@@ -233,36 +227,35 @@ + * matches the input string. Repeat this until some alternative matches, + * or we have an abort. + */ +-template + static int +-_handle_union(const T *str, const T *expr, PRBool case_insensitive, ++_handle_union(const PRUnichar *str, const PRUnichar *expr, PRBool case_insensitive, + unsigned int level) + { + register int sx; /* source index */ + int cp; /* source index of closing parenthesis */ + int count; + int ret = NOMATCH; +- T *e2; ++ PRUnichar *e2; + + /* Find the closing parenthesis that ends this union in the expression */ +- cp = ::_scan_and_copy(expr, T(')'), T('\0'), static_cast(NULL)); ++ cp = ::_scan_and_copy(expr, PRUnichar(')'), PRUnichar('\0'), static_cast(NULL)); + if (cp == ABORTED || cp < 4) /* must be at least "(a|b" before ')' */ + return ABORTED; + ++cp; /* now index of char after closing parenthesis */ +- e2 = (T *) NS_Alloc((1 + nsCharTraits::length(expr)) * sizeof(T)); ++ e2 = (PRUnichar *) NS_Alloc((1 + nsCharTraits::length(expr)) * sizeof(PRUnichar)); + if (!e2) + return ABORTED; + for (sx = 1; ; ++sx) { + /* Here, expr[sx] is one character past the preceeding '(' or '|'. */ + /* Copy everything up to the next delimiter to e2 */ +- count = ::_scan_and_copy(expr + sx, T(')'), T('|'), e2); ++ count = ::_scan_and_copy(expr + sx, PRUnichar(')'), PRUnichar('|'), e2); + if (count == ABORTED || !count) { + ret = ABORTED; + break; + } + sx += count; + /* Append everything after closing parenthesis to e2. This is safe. */ +- nsCharTraits::copy(e2 + count, expr + cp, nsCharTraits::length(expr + cp) + 1); ++ nsCharTraits::copy(e2 + count, expr + cp, nsCharTraits::length(expr + cp) + 1); + ret = ::_shexp_match(str, e2, case_insensitive, level + 1); + if (ret != NOMATCH || !expr[sx] || expr[sx] == ')') + break; +@@ -284,9 +277,8 @@ + return map[lower(val)]; + } + +-template + static int +-_shexp_match(const T *str, const T *expr, PRBool case_insensitive, ++_shexp_match(const PRUnichar *str, const PRUnichar *expr, PRBool case_insensitive, + unsigned int level) + { + register int x; /* input string index */ +@@ -326,7 +318,7 @@ + else + return NOMATCH; + case '[': { +- T start, end = 0; ++ PRUnichar start, end = 0; + int i; + neg = ((expr[++y] == '^') && (expr[y+1] != ']')); + if (neg) +@@ -342,9 +334,9 @@ + } + if (alphanumeric(end) && expr[i] == ']') { + /* This is a range form: a-b */ +- T val = str[x]; ++ PRUnichar val = str[x]; + if (end < start) { /* swap them */ +- T tmp = end; ++ PRUnichar tmp = end; + end = start; + start = tmp; + } +@@ -405,21 +397,20 @@ + } + + +-template + static int +-ns_WildCardMatch(const T *str, const T *xp, PRBool case_insensitive) ++ns_WildCardMatch(const PRUnichar *str, const PRUnichar *xp, PRBool case_insensitive) + { +- T *expr = NULL; ++ PRUnichar *expr = NULL; + int x, ret = MATCH; + +- if (!nsCharTraits::find(xp, nsCharTraits::length(xp), T('~'))) ++ if (!nsCharTraits::find(xp, nsCharTraits::length(xp), PRUnichar('~'))) + return _shexp_match(str, xp, case_insensitive, 0); + +- expr = (T *) NS_Alloc((nsCharTraits::length(xp) + 1) * sizeof(T)); ++ expr = (PRUnichar *) NS_Alloc((nsCharTraits::length(xp) + 1) * sizeof(PRUnichar)); + if(!expr) + return NOMATCH; + +- x = ::_scan_and_copy(expr, T('~'), T('\0'), static_cast(NULL)); ++ x = ::_scan_and_copy(expr, PRUnichar('~'), PRUnichar('\0'), static_cast(NULL)); + if (x != ABORTED && expr[x] == '~') { + expr[x++] = '\0'; + ret = ::_shexp_match(str, &expr[x], case_insensitive, 0); +@@ -436,9 +427,8 @@ + return ret; + } + +-template + NS_COM int +-NS_WildCardMatch_(const T *str, const T *expr, PRBool case_insensitive) ++NS_WildCardMatch_(const PRUnichar *str, const PRUnichar *expr, PRBool case_insensitive) + { + int is_valid = NS_WildCardValid(expr); + switch(is_valid) { Added: csw/mgar/pkg/firefox/trunk/files/softoken.config.mk.diff =================================================================== --- csw/mgar/pkg/firefox/trunk/files/softoken.config.mk.diff (rev 0) +++ csw/mgar/pkg/firefox/trunk/files/softoken.config.mk.diff 2009-09-12 15:04:59 UTC (rev 6281) @@ -0,0 +1,13 @@ +--- firefox.orig/security/nss/lib/softoken/config.mk 2009-09-12 16:29:40.981589923 +0200 ++++ firefox/security/nss/lib/softoken/config.mk 2009-09-12 16:40:15.362584742 +0200 +@@ -84,6 +84,10 @@ + # $(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 \ ++ -R/opt/csw/lib \ ++ -L/opt/csw/X11/lib \ ++ -R/opt/csw/X11/lib \ + -L$(DIST)/lib \ + -lnssutil3 \ + -lsqlite3 \ Added: csw/mgar/pkg/firefox/trunk/files/softoken.manifest.mm.diff =================================================================== --- csw/mgar/pkg/firefox/trunk/files/softoken.manifest.mm.diff (rev 0) +++ csw/mgar/pkg/firefox/trunk/files/softoken.manifest.mm.diff 2009-09-12 15:04:59 UTC (rev 6281) @@ -0,0 +1,10 @@ +--- firefox.orig/security/nss/lib/softoken/manifest.mm 2009-09-12 16:29:35.109858462 +0200 ++++ firefox/security/nss/lib/softoken/manifest.mn 2009-09-12 16:39:33.257884547 +0200 +@@ -49,6 +49,7 @@ + + ifdef MOZILLA_CLIENT + INCLUDES += -I$(DIST)/include/sqlite3 ++INCLUDES += -I/opt/csw/include + endif + + EXPORTS = \ 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 Sep 12 19:57:37 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 12 Sep 2009 17:57:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[6282] csw/mgar/pkg/libxml2/trunk/Makefile Message-ID: Revision: 6282 http://gar.svn.sourceforge.net/gar/?rev=6282&view=rev Author: bdwalton Date: 2009-09-12 17:57:36 +0000 (Sat, 12 Sep 2009) Log Message: ----------- libxml2: update sysconfdir and localstatedir Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2009-09-12 15:04:59 UTC (rev 6281) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2009-09-12 17:57:36 UTC (rev 6282) @@ -56,5 +56,8 @@ PKGFILES_CSWpylibxml2 = $(libdir)/python/.* PKGFILES_CSWpylibxml2 += $(docdir)/pylibxml2/.* +sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Sep 12 20:09:20 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 12 Sep 2009 18:09:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[6283] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 6283 http://gar.svn.sourceforge.net/gar/?rev=6283&view=rev Author: bdwalton Date: 2009-09-12 18:09:20 +0000 (Sat, 12 Sep 2009) Log Message: ----------- git: install bash completion and make it a new package Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-09-12 17:57:36 UTC (rev 6282) +++ csw/mgar/pkg/git/trunk/Makefile 2009-09-12 18:09:20 UTC (rev 6283) @@ -7,6 +7,7 @@ # TEST_SCRIPTS = PACKAGES = CSWgit CSWgitk CSWgitgui CSWgitsvn CSWgitcvs CSWgitemacs CSWgitdoc +PACKAGES += CSWgitcompletion CATALOGNAME_CSWgit = git CATALOGNAME_CSWgitcvs = git_cvs @@ -15,6 +16,7 @@ CATALOGNAME_CSWgitgui = git_gui CATALOGNAME_CSWgitdoc = git_doc CATALOGNAME_CSWgitk = gitk +CATALOGNAME_CSWgitcompletion = git_completion ARCHALL_CSWgitsvn = 1 ARCHALL_CSWgitcvs = 1 @@ -22,6 +24,7 @@ ARCHALL_CSWgitgui = 1 ARCHALL_CSWgitemacs = 1 ARCHALL_CSWgitdoc = 1 +ARCHALL_CSWgitcompletion = 1 PREREQUISITE_PKGS = CSWasciidoc CSWossldevel CSWxmlto CSWbash CSWcurldevel PREREQUISITE_PKGS += CSWgsed CSWgnulinks CSWperl CSWtk CSWexpat @@ -44,6 +47,10 @@ REQUIRED_PKGS_CSWgitdoc = CSWgit +# We include bash here even though git itself depends on it because in theory +# git could use any other POSIX compliant shell and drop the dependency... +REQUIRED_PKGS_CSWgitcompletion = CSWgit CSWbash + LICENSE_CSWgit = COPYING LICENSE_CSWgitk = COPYING LICENSE_CSWgitgui = COPYING @@ -51,6 +58,7 @@ LICENSE_CSWgitcvs = COPYING LICENSE_CSWgitemacs = COPYING LICENSE_CSWgitdoc = COPYING +LICENSE_CSWgitcompletion = COPYING DESCRIPTION = Fast Version Control System define BLURB @@ -66,6 +74,7 @@ SPKG_DESC_CSWgitcvs = Git tools for working with CVS repositories SPKG_DESC_CSWgitdoc = Documentation for Git SPKG_DESC_CSWgitemacs = Git VCS support for Emacs +SPKG_DESC_CSWgitcompletion = Bash completion support for Git #NOTE: If you need to proxy git:// connections, set GIT_USE_PROXY in # your .garrc file. (That leaves this recipe in a more generic form.) @@ -83,6 +92,7 @@ PKGFILES_CSWgitcvs = $(foreach d,$(fdirs),$(d)/.*cvs.*) PKGFILES_CSWgitemacs = .*emacs.* PKGFILES_CSWgitdoc = $(docdir)/.* +PKGFILES_CSWgitcompletion = $(bashconfdir)/bash_completion.d/.* # We define upstream file regex so we can be notifed of new upstream # software release @@ -90,6 +100,8 @@ sysconfdir = /etc/opt/csw localstatedir = /var/opt/csw +#set bashconfdir to sysconfdir when bash changes +bashconfdir = /opt/csw/etc/ CONFIGURE_ARGS = $(DIRPATHS) --with-shell=$(bindir)/bash CONFIGURE_ARGS += --with-perl=$(bindir)/perl @@ -143,4 +155,8 @@ cp -R contrib/hooks README COPYING $(GD)/; \ cp -R Documentation/*.html Documentation/docbook-xsl.css $(GD)/; \ cp -R Documentation/howto Documentation/technical $(GD)/; ) + @echo Installing Bash Completion files + @( cd $(WORKSRC); \ + cp contrib/completion/* \ + $(DESTDIR)/$(bashconfdir)/bash_completion.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 Sat Sep 12 22:47:19 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 12 Sep 2009 20:47:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[6284] csw/mgar/pkg/giflib/trunk/Makefile Message-ID: Revision: 6284 http://gar.svn.sourceforge.net/gar/?rev=6284&view=rev Author: dmichelsen Date: 2009-09-12 20:47:19 +0000 (Sat, 12 Sep 2009) Log Message: ----------- giflib: Split off runtime and doc package Modified Paths: -------------- csw/mgar/pkg/giflib/trunk/Makefile Modified: csw/mgar/pkg/giflib/trunk/Makefile =================================================================== --- csw/mgar/pkg/giflib/trunk/Makefile 2009-09-12 18:09:20 UTC (rev 6283) +++ csw/mgar/pkg/giflib/trunk/Makefile 2009-09-12 20:47:19 UTC (rev 6284) @@ -15,12 +15,14 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -PACKAGES = CSWgiflib CSWungif +PACKAGES = CSWgiflib CSWgiflibrt CSWgiflibdoc CSWungif CATALOGNAME_CSWgiflib = giflib CATALOGNAME_CSWungif = libungif SPKG_DESC_CSWgiflib = A library for reading and writing gif images +SPKG_DESC_CSWgiflibrt = giflib runtime libraries +SPKG_DESC_CSWgiflibdoc = giflib documentation SPKG_DESC_CSWungif = Links to giflib now the patent is dropped REQUIRED_PKGS_CSWungif = CSWgiflib @@ -36,6 +38,8 @@ MERGE_DIRS_isa-sparcv9 = $(libdir) MERGE_DIRS_isa-amd64 = $(libdir) +PKGFILES_CSWgiflibrt = .*/libgif\..* +PKGFILES_CSWgiflibdoc = $(PKGFILES_DOC) PKGFILES_CSWungif = .*/libungif\..* 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 Sat Sep 12 22:55:49 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 12 Sep 2009 20:55:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[6285] csw/mgar/pkg/giflib/trunk/Makefile Message-ID: Revision: 6285 http://gar.svn.sourceforge.net/gar/?rev=6285&view=rev Author: dmichelsen Date: 2009-09-12 20:55:49 +0000 (Sat, 12 Sep 2009) Log Message: ----------- giflib: Add requirements Modified Paths: -------------- csw/mgar/pkg/giflib/trunk/Makefile Modified: csw/mgar/pkg/giflib/trunk/Makefile =================================================================== --- csw/mgar/pkg/giflib/trunk/Makefile 2009-09-12 20:47:19 UTC (rev 6284) +++ csw/mgar/pkg/giflib/trunk/Makefile 2009-09-12 20:55:49 UTC (rev 6285) @@ -25,7 +25,8 @@ SPKG_DESC_CSWgiflibdoc = giflib documentation SPKG_DESC_CSWungif = Links to giflib now the patent is dropped -REQUIRED_PKGS_CSWungif = CSWgiflib +REQUIRED_PKGS_CSWgiflib = CSWgiflibrt +REQUIRED_PKGS_CSWungif = CSWgiflibrt BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Sep 12 23:05:55 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 12 Sep 2009 21:05:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[6286] csw/mgar/pkg/giflib/trunk/Makefile Message-ID: Revision: 6286 http://gar.svn.sourceforge.net/gar/?rev=6286&view=rev Author: dmichelsen Date: 2009-09-12 21:05:55 +0000 (Sat, 12 Sep 2009) Log Message: ----------- giflib: Fix catalogname Modified Paths: -------------- csw/mgar/pkg/giflib/trunk/Makefile Modified: csw/mgar/pkg/giflib/trunk/Makefile =================================================================== --- csw/mgar/pkg/giflib/trunk/Makefile 2009-09-12 20:55:49 UTC (rev 6285) +++ csw/mgar/pkg/giflib/trunk/Makefile 2009-09-12 21:05:55 UTC (rev 6286) @@ -18,6 +18,8 @@ PACKAGES = CSWgiflib CSWgiflibrt CSWgiflibdoc CSWungif CATALOGNAME_CSWgiflib = giflib +CATALOGNAME_CSWgiflibrt = giflib_rt +CATALOGNAME_CSWgiflibdoc = giflib_doc CATALOGNAME_CSWungif = libungif SPKG_DESC_CSWgiflib = A library for reading and writing gif images @@ -26,7 +28,7 @@ SPKG_DESC_CSWungif = Links to giflib now the patent is dropped REQUIRED_PKGS_CSWgiflib = CSWgiflibrt -REQUIRED_PKGS_CSWungif = CSWgiflibrt +REQUIRED_PKGS_CSWungif = CSWgiflib BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Sep 13 01:25:55 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 12 Sep 2009 23:25:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[6287] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 6287 http://gar.svn.sourceforge.net/gar/?rev=6287&view=rev Author: bdwalton Date: 2009-09-12 23:25:55 +0000 (Sat, 12 Sep 2009) Log Message: ----------- git: update bash completion and doc handling Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-09-12 21:05:55 UTC (rev 6286) +++ csw/mgar/pkg/git/trunk/Makefile 2009-09-12 23:25:55 UTC (rev 6287) @@ -115,7 +115,7 @@ BUILD_ARGS = MSGFMT=gmsgfmt SHELL_PATH=/opt/csw/bin/bash \ ETC_GITCONFIG=$(sysconfdir)/gitconfig V=1 \ ASCIIDOC_NO_ROFF=YesPlease \ - all doc + all INSTALL_ARGS = ETC_GITCONFIG=$(sysconfdir)/gitconfig \ INSTALLDIRS=vendor \ @@ -138,6 +138,7 @@ post-build-modulated: @echo Builing Emacs Git extension @( cd $(WORKSRC); $(MAKE) -C contrib/emacs ) + @( cd $(WORKSRC)/Documentation; $(MAKE) ) post-install-modulated: GD=$(DESTDIR)/$(datadir)/doc/$(GARNAME) post-install-modulated: @@ -157,6 +158,7 @@ cp -R Documentation/howto Documentation/technical $(GD)/; ) @echo Installing Bash Completion files @( cd $(WORKSRC); \ + mkdir -p $(DESTDIR)/$(bashconfdir); \ cp contrib/completion/* \ $(DESTDIR)/$(bashconfdir)/bash_completion.d/ ) @$(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 Sun Sep 13 01:33:23 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 12 Sep 2009 23:33:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6288] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 6288 http://gar.svn.sourceforge.net/gar/?rev=6288&view=rev Author: bdwalton Date: 2009-09-12 23:33:23 +0000 (Sat, 12 Sep 2009) Log Message: ----------- git: tweak bash completion installation Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-09-12 23:25:55 UTC (rev 6287) +++ csw/mgar/pkg/git/trunk/Makefile 2009-09-12 23:33:23 UTC (rev 6288) @@ -141,6 +141,7 @@ @( cd $(WORKSRC)/Documentation; $(MAKE) ) post-install-modulated: GD=$(DESTDIR)/$(datadir)/doc/$(GARNAME) +post-install-modulated: BD=$(DESTDIR)/$(bashconfdir)/bash_completion.d post-install-modulated: @echo Cleaning up perl stuff @rm -rf $(DESTDIR)/$(libdir)/perl5/site_perl/5* @@ -158,7 +159,7 @@ cp -R Documentation/howto Documentation/technical $(GD)/; ) @echo Installing Bash Completion files @( cd $(WORKSRC); \ - mkdir -p $(DESTDIR)/$(bashconfdir); \ + ginstall -c -m 0755 -d $(BD); \ cp contrib/completion/* \ - $(DESTDIR)/$(bashconfdir)/bash_completion.d/ ) + $(BD)/ ) @$(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 Sun Sep 13 03:11:00 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 13 Sep 2009 01:11:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6289] csw/mgar/pkg/sgml-xml-common/trunk/Makefile Message-ID: Revision: 6289 http://gar.svn.sourceforge.net/gar/?rev=6289&view=rev Author: bdwalton Date: 2009-09-13 01:10:46 +0000 (Sun, 13 Sep 2009) Log Message: ----------- sgml-xml-common: tweak pkgfiles selection Modified Paths: -------------- csw/mgar/pkg/sgml-xml-common/trunk/Makefile Modified: csw/mgar/pkg/sgml-xml-common/trunk/Makefile =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/Makefile 2009-09-12 23:33:23 UTC (rev 6288) +++ csw/mgar/pkg/sgml-xml-common/trunk/Makefile 2009-09-13 01:10:46 UTC (rev 6289) @@ -25,10 +25,10 @@ CATALOGNAME_CSWxmlcommon = xmlcommon PKGFILES_CSWsgmlcommon = .*sgmlwhich.* .*install-catalog.* -PKGFILES_CSWsgmlcommon += /opt/csw/share/sgml/.* /etc/opt/csw/sgml/.* +PKGFILES_CSWsgmlcommon += /opt/csw/share/sgml/.* /etc/opt/csw/sgml/sgml.conf PKGFILES_CSWsgmlcommon += /opt/csw/share/doc/sgml.* -PKGFILES_CSWxmlcommon = /etc/opt/csw/xml/.* /opt/csw/share/xml.* .*xmlcatalog +PKGFILES_CSWxmlcommon = /etc/opt/csw/xml/.* /opt/csw/share/xml.* /etc/opt/csw/sgml/docbook/xmlcatalog REQUIRED_PKGS_CSWsgmlcommon = CSWbash CSWggrep CSWgsed 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 Sep 13 04:36:30 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 13 Sep 2009 02:36:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[6290] csw/mgar/pkg/sgml-xml-common/trunk/Makefile Message-ID: Revision: 6290 http://gar.svn.sourceforge.net/gar/?rev=6290&view=rev Author: bdwalton Date: 2009-09-13 02:36:30 +0000 (Sun, 13 Sep 2009) Log Message: ----------- sgml-xml-common: more pkgfiles tweaks Modified Paths: -------------- csw/mgar/pkg/sgml-xml-common/trunk/Makefile Modified: csw/mgar/pkg/sgml-xml-common/trunk/Makefile =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/Makefile 2009-09-13 01:10:46 UTC (rev 6289) +++ csw/mgar/pkg/sgml-xml-common/trunk/Makefile 2009-09-13 02:36:30 UTC (rev 6290) @@ -24,11 +24,11 @@ CATALOGNAME_CSWsgmlcommon = sgmlcommon CATALOGNAME_CSWxmlcommon = xmlcommon -PKGFILES_CSWsgmlcommon = .*sgmlwhich.* .*install-catalog.* +PKGFILES_CSWsgmlcommon = /opt/csw/bin/.* /opt/csw/share/doc/sgml/.* PKGFILES_CSWsgmlcommon += /opt/csw/share/sgml/.* /etc/opt/csw/sgml/sgml.conf -PKGFILES_CSWsgmlcommon += /opt/csw/share/doc/sgml.* +PKGFILES_CSWsgmlcommon += /opt/csw/share/man/.* -PKGFILES_CSWxmlcommon = /etc/opt/csw/xml/.* /opt/csw/share/xml.* /etc/opt/csw/sgml/docbook/xmlcatalog +PKGFILES_CSWxmlcommon = /etc/opt/csw/xml/.* /opt/csw/share/xml.* /opt/csw/share/sgml/docbook/xmlcatalog REQUIRED_PKGS_CSWsgmlcommon = CSWbash CSWggrep CSWgsed 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 Sep 13 13:08:13 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 13 Sep 2009 11:08:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[6291] csw/mgar/pkg/seamonkey/trunk Message-ID: Revision: 6291 http://gar.svn.sourceforge.net/gar/?rev=6291&view=rev Author: wbonnet Date: 2009-09-13 11:08:13 +0000 (Sun, 13 Sep 2009) Log Message: ----------- Upgrade to 1.1.18 Modified Paths: -------------- csw/mgar/pkg/seamonkey/trunk/Makefile csw/mgar/pkg/seamonkey/trunk/checksums Added Paths: ----------- csw/mgar/pkg/seamonkey/trunk/files/SunOS5.mk.diff csw/mgar/pkg/seamonkey/trunk/files/autoconfig.mk.in.diff csw/mgar/pkg/seamonkey/trunk/files/legacydb.config.mk.diff csw/mgar/pkg/seamonkey/trunk/files/legacydb.manifest.mm.diff csw/mgar/pkg/seamonkey/trunk/files/packager.mk.diff csw/mgar/pkg/seamonkey/trunk/files/softoken.config.mk.diff csw/mgar/pkg/seamonkey/trunk/files/softoken.manifest.mm.diff Modified: csw/mgar/pkg/seamonkey/trunk/Makefile =================================================================== --- csw/mgar/pkg/seamonkey/trunk/Makefile 2009-09-13 02:36:30 UTC (rev 6290) +++ csw/mgar/pkg/seamonkey/trunk/Makefile 2009-09-13 11:08:13 UTC (rev 6291) @@ -1,5 +1,5 @@ GARNAME = seamonkey -GARVERSION = 1.1.17 +GARVERSION = 1.1.18 CATEGORIES = x11 DISTNAME = $(GARNAME) @@ -16,38 +16,46 @@ MASTER_SITES = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/$(GARVERSION)/ UPSTREAM_MASTER_SITES = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/ -PACKAGES = CSWseamonkey +PACKAGES = CSWseamonkey CATALOGNAME_CSWseamonkey = $(GARNAME) SPKG_DESC_CSWseamonkey = $(DESCRIPTION) -# REQUIRED_PKGS_CSWseamonkey = CSWdbusglib -# REQUIRED_PKGS_CSWseamonkey += CSWfconfig -# REQUIRED_PKGS_CSWseamonkey += CSWftype2 -# REQUIRED_PKGS_CSWseamonkey += CSWgconf2 -# REQUIRED_PKGS_CSWseamonkey += CSWglib2 -# REQUIRED_PKGS_CSWseamonkey += CSWgnomevfs2 -# REQUIRED_PKGS_CSWseamonkey += CSWgtk2 -# REQUIRED_PKGS_CSWseamonkey += CSWlibatk -# REQUIRED_PKGS_CSWseamonkey += CSWlibcairo -# REQUIRED_PKGS_CSWseamonkey += CSWlibdbus -# REQUIRED_PKGS_CSWseamonkey += CSWlibgnome -# REQUIRED_PKGS_CSWseamonkey += CSWlibx11 -# REQUIRED_PKGS_CSWseamonkey += CSWlibxrender -# REQUIRED_PKGS_CSWseamonkey += CSWpango -# REQUIRED_PKGS_CSWseamonkey += CSWsqlite3rt +REQUIRED_PKGS_CSWseamonkey += CSWbonobo2 +REQUIRED_PKGS_CSWseamonkey += CSWfconfig +REQUIRED_PKGS_CSWseamonkey += CSWftype2 +REQUIRED_PKGS_CSWseamonkey += CSWgconf2 +REQUIRED_PKGS_CSWseamonkey += CSWggettextrt +REQUIRED_PKGS_CSWseamonkey += CSWglib2 +REQUIRED_PKGS_CSWseamonkey += CSWgnomekeyring +REQUIRED_PKGS_CSWseamonkey += CSWgnomevfs2 +REQUIRED_PKGS_CSWseamonkey += CSWgtk2 +REQUIRED_PKGS_CSWseamonkey += CSWlibart +REQUIRED_PKGS_CSWseamonkey += CSWlibatk +REQUIRED_PKGS_CSWseamonkey += CSWlibbonoboui +REQUIRED_PKGS_CSWseamonkey += CSWlibcairo +REQUIRED_PKGS_CSWseamonkey += CSWlibgnome +REQUIRED_PKGS_CSWseamonkey += CSWlibgnomecanvas +REQUIRED_PKGS_CSWseamonkey += CSWlibgnomeui +REQUIRED_PKGS_CSWseamonkey += CSWlibidl +REQUIRED_PKGS_CSWseamonkey += CSWlibpopt +REQUIRED_PKGS_CSWseamonkey += CSWlibx11 +REQUIRED_PKGS_CSWseamonkey += CSWlibxft2 +REQUIRED_PKGS_CSWseamonkey += CSWlibxrender +REQUIRED_PKGS_CSWseamonkey += CSWorbit2 +REQUIRED_PKGS_CSWseamonkey += CSWpango +REQUIRED_PKGS_CSWseamonkey += CSWsqlite3rt +REQUIRED_PKGS_CSWseamonkey += CSWzlib # Defines the list of patches to be applied to the sources -# PATCHFILES = autoconf.mk.in.diff +PATCHFILES += autoconf.mk.in.diff +PATCHFILES += SunOS5.mk.diff +PATCHFILES += legacydb.manifest.mm.diff +PATCHFILES += legacydb.config.mk.diff +PATCHFILES += softoken.manifest.mm.diff +PATCHFILES += softoken.config.mk.diff +PATCHFILES += packager.mk.diff + # PATCHFILES += configure.diff -# PATCHFILES += nsPluginsDirUnix.cpp.diff -# PATCHFILES += packager.mk.diff -# PATCHFILES += jemalloc.c.diff -# PATCHFILES += nsMathUtils.h.diff -# PATCHFILES += file_id.cc.diff -# PATCHFILES += md5.h.diff -# PATCHFILES += solaris_lwp.h.diff -# PATCHFILES += nsNativeApSuportUnix.cpp.diff -# PATCHFILES += nsExceptionHandler.cpp.diff # pkg-config options EXTRA_PKG_CONFIG_PATH += /opt/csw/X11/lib/pkgconfig @@ -57,12 +65,12 @@ CFLAGS +=-xlibmil -D__solaris__ CFLAGS += -DG_HAVE_ISO_VARARGS CXXFLAGS += -DG_HAVE_ISO_VARARGS -CPPFLAGS = -I/opt/csw/include -I/opt/csw/X11/include -XCFLAGS = -I/opt/csw/include -I/opt/csw/X11/include +CPPFLAGS = -I/opt/csw/include -I/opt/csw/X11/include -I/opt/csw/include/cairo +XCFLAGS = -I/opt/csw/include -I/opt/csw/X11/include -I/opt/csw/include/cairo EXTRA_CONFIGURE_EXPORTS = XCFLAGS -LDFLAGS+=-L/usr/lib/lwp -L/opt/csw/mozilla/seamonkey/lib -R/opt/csw/mozilla/seamonkey/lib -L/opt/csw/lib -R/opt/csw/lib -lsqlite3 +LDFLAGS+=-L/usr/lib/lwp -L/opt/csw/mozilla/seamonkey/lib -R/opt/csw/mozilla/seamonkey/lib -L/opt/csw/lib -R/opt/csw/lib -L/opt/csw/X11/lib -R/opt/csw/X11/lib -lsqlite3 export PERL CFLAGS CXXFLAGS LDFLAGS @@ -86,13 +94,13 @@ pre-install: ( if [ ! -d $(WORK_INSTALL)/opt/csw/bin ] ; then mkdir -p $(WORK_INSTALL)/opt/csw/bin ; fi ) - ( cd $(WORK_INSTALL)/opt/csw/bin && ln -sf ../mozilla/seamonkey/bin/seamonkey . ) - ( mkdir -p $(WORK_INSTALL)/opt/csw/share/pixmaps ) - ( cp $(WORK_BUILD)/other-licenses/branding/seamonkey/mozicon128.png $(WORK_INSTALL)/opt/csw/share/pixmaps/seamonkey.png ) - ( mkdir -p $(WORK_INSTALL)/opt/csw/share/applications ) - ( cp $(FILEDIR)/seamonkey.desktop $(WORK_INSTALL)/opt/csw/share/applications/seamonkey.desktop ) - ( mkdir -p $(WORK_INSTALL)/opt/csw/share/gnome/mime-info ) - ( cp $(FILEDIR)/seamonkey.keys $(WORK_INSTALL)/opt/csw/share/gnome/mime-info/seamonkey.keys ) + ( cd $(WORK_INSTALL)/opt/csw/bin ; rm -f seamonkey ; ln -sf ../mozilla/seamonkey/bin/seamonkey . ) +# ( mkdir -p $(WORK_INSTALL)/opt/csw/share/pixmaps ) +# ( cp $(WORK_BUILD)/other-licenses/branding/seamonkey/mozicon128.png $(WORK_INSTALL)/opt/csw/share/pixmaps/seamonkey.png ) +# ( mkdir -p $(WORK_INSTALL)/opt/csw/share/applications ) +# ( cp $(FILEDIR)/seamonkey.desktop $(WORK_INSTALL)/opt/csw/share/applications/seamonkey.desktop ) +# ( mkdir -p $(WORK_INSTALL)/opt/csw/share/gnome/mime-info ) +# ( cp $(FILEDIR)/seamonkey.keys $(WORK_INSTALL)/opt/csw/share/gnome/mime-info/seamonkey.keys ) post-install: ( gfind $(WORK_INSTALL)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}" \; ) Modified: csw/mgar/pkg/seamonkey/trunk/checksums =================================================================== --- csw/mgar/pkg/seamonkey/trunk/checksums 2009-09-13 02:36:30 UTC (rev 6290) +++ csw/mgar/pkg/seamonkey/trunk/checksums 2009-09-13 11:08:13 UTC (rev 6291) @@ -1 +1,3 @@ -9eba600ba6ca522b8eada9a0a8e890e2 download/seamonkey-1.1.17.source.tar.bz2 +3b03f00259d6897e017254e9dceed493 download/packager.mk.diff +ef4455becf3a12833dca7dd92854aeaa download/seamonkey-1.1.18.source.tar.bz2 +c815868b27233888ae5623967cc012f5 download/softoken.config.mk.diff Added: csw/mgar/pkg/seamonkey/trunk/files/SunOS5.mk.diff =================================================================== --- csw/mgar/pkg/seamonkey/trunk/files/SunOS5.mk.diff (rev 0) +++ csw/mgar/pkg/seamonkey/trunk/files/SunOS5.mk.diff 2009-09-13 11:08:13 UTC (rev 6291) @@ -0,0 +1,11 @@ +--- seamonkey.orig/security/coreconf/SunOS5.mk 2009-08-29 23:08:08.804586828 +0200 ++++ seamonkey/security/coreconf/SunOS5.mk 2009-08-29 23:08:32.556961245 +0200 +@@ -104,7 +104,7 @@ + endif + endif + +-INCLUDES += -I/usr/dt/include -I/usr/openwin/include ++INCLUDES += -I/usr/dt/include -I/opt/csw/X11/include + + RANLIB = echo + CPU_ARCH = sparc Added: csw/mgar/pkg/seamonkey/trunk/files/autoconfig.mk.in.diff =================================================================== --- csw/mgar/pkg/seamonkey/trunk/files/autoconfig.mk.in.diff (rev 0) +++ csw/mgar/pkg/seamonkey/trunk/files/autoconfig.mk.in.diff 2009-09-13 11:08:13 UTC (rev 6291) @@ -0,0 +1,21 @@ +--- seamonkey.orig/config/autoconf.mk.in 2009-09-13 10:26:24.361534256 +0200 ++++ seamonkey/config/autoconf.mk.in 2009-09-13 10:29:26.969746616 +0200 +@@ -57,14 +57,14 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + bindir = @bindir@ +-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++includedir = @includedir@ + libdir = @libdir@ + datadir = @datadir@ + mandir = @mandir@ +-idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++idldir = @datadir@/idl + +-mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) ++mozappdir = $(libdir) ++mredir = $(libdir)/mre + mrelibdir = $(mredir)/lib + + DIST = $(DEPTH)/dist Added: csw/mgar/pkg/seamonkey/trunk/files/legacydb.config.mk.diff =================================================================== --- csw/mgar/pkg/seamonkey/trunk/files/legacydb.config.mk.diff (rev 0) +++ csw/mgar/pkg/seamonkey/trunk/files/legacydb.config.mk.diff 2009-09-13 11:08:13 UTC (rev 6291) @@ -0,0 +1,13 @@ +--- seamonkey.orig/security/nss/lib/softoken/legacydb/config.mk 2009-09-12 16:48:35.872144730 +0200 ++++ seamonkey/security/nss/lib/softoken/legacydb/config.mk 2009-09-12 16:49:37.894263860 +0200 +@@ -83,6 +83,10 @@ + # $(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 \ ++ -R/opt/csw/lib \ ++ -L/opt/csw/X11/lib \ ++ -R/opt/csw/X11/lib \ + -L$(DIST)/lib \ + -lnssutil3 \ + -L$(NSPR_LIB_DIR) \ Added: csw/mgar/pkg/seamonkey/trunk/files/legacydb.manifest.mm.diff =================================================================== --- csw/mgar/pkg/seamonkey/trunk/files/legacydb.manifest.mm.diff (rev 0) +++ csw/mgar/pkg/seamonkey/trunk/files/legacydb.manifest.mm.diff 2009-09-13 11:08:13 UTC (rev 6291) @@ -0,0 +1,10 @@ +--- seamonkey.orig/security/nss/lib/softoken/legacydb/manifest.mn 2009-09-12 16:48:43.152291326 +0200 ++++ seamonkey/security/nss/lib/softoken/legacydb/manifest.mn 2009-09-12 16:49:12.293669070 +0200 +@@ -48,6 +48,7 @@ + + ifdef MOZILLA_CLIENT + INCLUDES += -I$(DIST)/include/sqlite3 ++INCLUDES += -I/opt/csw/include + endif + + CSRCS = \ Added: csw/mgar/pkg/seamonkey/trunk/files/packager.mk.diff =================================================================== --- csw/mgar/pkg/seamonkey/trunk/files/packager.mk.diff (rev 0) +++ csw/mgar/pkg/seamonkey/trunk/files/packager.mk.diff 2009-09-13 11:08:13 UTC (rev 6291) @@ -0,0 +1,12 @@ +diff --speed-large-files --minimal -Nru seamonkey.orig/toolkit/mozapps/installer/packager.mk seamonkey/toolkit/mozapps/installer/packager.mk +--- seamonkey.orig/toolkit/mozapps/installer/packager.mk 2008-04-28 19:14:12.000000000 +0000 ++++ seamonkey/toolkit/mozapps/installer/packager.mk 2008-11-15 20:28:41.679741300 +0000 +@@ -332,7 +332,7 @@ + endif # MOZ_PKG_MANIFEST + ifndef PKG_SKIP_STRIP + @echo "Stripping package directory..." +- @cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_APPNAME); find . ! -type d \ ++ @cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_APPNAME); gfind . ! -type d \ + ! -name "*.js" \ + ! -name "*.xpt" \ + ! -name "*.gif" \ Added: csw/mgar/pkg/seamonkey/trunk/files/softoken.config.mk.diff =================================================================== --- csw/mgar/pkg/seamonkey/trunk/files/softoken.config.mk.diff (rev 0) +++ csw/mgar/pkg/seamonkey/trunk/files/softoken.config.mk.diff 2009-09-13 11:08:13 UTC (rev 6291) @@ -0,0 +1,13 @@ +--- seamonkey.orig/security/nss/lib/softoken/config.mk 2009-09-12 16:29:40.981589923 +0200 ++++ seamonkey/security/nss/lib/softoken/config.mk 2009-09-12 16:40:15.362584742 +0200 +@@ -84,6 +84,10 @@ + # $(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 \ ++ -R/opt/csw/lib \ ++ -L/opt/csw/X11/lib \ ++ -R/opt/csw/X11/lib \ + -L$(DIST)/lib \ + -lnssutil3 \ + -lsqlite3 \ Added: csw/mgar/pkg/seamonkey/trunk/files/softoken.manifest.mm.diff =================================================================== --- csw/mgar/pkg/seamonkey/trunk/files/softoken.manifest.mm.diff (rev 0) +++ csw/mgar/pkg/seamonkey/trunk/files/softoken.manifest.mm.diff 2009-09-13 11:08:13 UTC (rev 6291) @@ -0,0 +1,10 @@ +--- seamonkey.orig/security/nss/lib/softoken/manifest.mm 2009-09-12 16:29:35.109858462 +0200 ++++ seamonkey/security/nss/lib/softoken/manifest.mn 2009-09-12 16:39:33.257884547 +0200 +@@ -49,6 +49,7 @@ + + ifdef MOZILLA_CLIENT + INCLUDES += -I$(DIST)/include/sqlite3 ++INCLUDES += -I/opt/csw/include + endif + + EXPORTS = \ 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 Sep 13 13:12:37 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 13 Sep 2009 11:12:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[6292] csw/mgar/pkg/seamonkey/trunk/files Message-ID: Revision: 6292 http://gar.svn.sourceforge.net/gar/?rev=6292&view=rev Author: wbonnet Date: 2009-09-13 11:12:37 +0000 (Sun, 13 Sep 2009) Log Message: ----------- Upgrade to 1.1.18 Added Paths: ----------- csw/mgar/pkg/seamonkey/trunk/files/autoconf.mk.in.diff Removed Paths: ------------- csw/mgar/pkg/seamonkey/trunk/files/autoconfig.mk.in.diff Copied: csw/mgar/pkg/seamonkey/trunk/files/autoconf.mk.in.diff (from rev 6291, csw/mgar/pkg/seamonkey/trunk/files/autoconfig.mk.in.diff) =================================================================== --- csw/mgar/pkg/seamonkey/trunk/files/autoconf.mk.in.diff (rev 0) +++ csw/mgar/pkg/seamonkey/trunk/files/autoconf.mk.in.diff 2009-09-13 11:12:37 UTC (rev 6292) @@ -0,0 +1,21 @@ +--- seamonkey.orig/config/autoconf.mk.in 2009-09-13 10:26:24.361534256 +0200 ++++ seamonkey/config/autoconf.mk.in 2009-09-13 10:29:26.969746616 +0200 +@@ -57,14 +57,14 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + bindir = @bindir@ +-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++includedir = @includedir@ + libdir = @libdir@ + datadir = @datadir@ + mandir = @mandir@ +-idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++idldir = @datadir@/idl + +-mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) ++mozappdir = $(libdir) ++mredir = $(libdir)/mre + mrelibdir = $(mredir)/lib + + DIST = $(DEPTH)/dist Deleted: csw/mgar/pkg/seamonkey/trunk/files/autoconfig.mk.in.diff =================================================================== --- csw/mgar/pkg/seamonkey/trunk/files/autoconfig.mk.in.diff 2009-09-13 11:08:13 UTC (rev 6291) +++ csw/mgar/pkg/seamonkey/trunk/files/autoconfig.mk.in.diff 2009-09-13 11:12:37 UTC (rev 6292) @@ -1,21 +0,0 @@ ---- seamonkey.orig/config/autoconf.mk.in 2009-09-13 10:26:24.361534256 +0200 -+++ seamonkey/config/autoconf.mk.in 2009-09-13 10:29:26.969746616 +0200 -@@ -57,14 +57,14 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = @includedir@ - libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ --idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+idldir = @datadir@/idl - --mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) -+mozappdir = $(libdir) -+mredir = $(libdir)/mre - mrelibdir = $(mredir)/lib - - DIST = $(DEPTH)/dist 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 Sep 13 15:03:44 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 13 Sep 2009 13:03:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[6293] csw/mgar/pkg/sgml-xml-common/trunk/Makefile Message-ID: Revision: 6293 http://gar.svn.sourceforge.net/gar/?rev=6293&view=rev Author: bdwalton Date: 2009-09-13 13:03:44 +0000 (Sun, 13 Sep 2009) Log Message: ----------- sgml-xml-common: more pkgfiles fiddling Modified Paths: -------------- csw/mgar/pkg/sgml-xml-common/trunk/Makefile Modified: csw/mgar/pkg/sgml-xml-common/trunk/Makefile =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/Makefile 2009-09-13 11:12:37 UTC (rev 6292) +++ csw/mgar/pkg/sgml-xml-common/trunk/Makefile 2009-09-13 13:03:44 UTC (rev 6293) @@ -24,9 +24,10 @@ CATALOGNAME_CSWsgmlcommon = sgmlcommon CATALOGNAME_CSWxmlcommon = xmlcommon -PKGFILES_CSWsgmlcommon = /opt/csw/bin/.* /opt/csw/share/doc/sgml/.* -PKGFILES_CSWsgmlcommon += /opt/csw/share/sgml/.* /etc/opt/csw/sgml/sgml.conf -PKGFILES_CSWsgmlcommon += /opt/csw/share/man/.* +PKGFILES_CSWsgmlcommon = /opt/csw/bin/.* /opt/csw/share/man/.* +PKGFILES_CSWsgmlcommon += /opt/csw/share/doc/sgml/.* /etc/opt/csw/sgml/.* +PKGFILES_CSWsgmlcommon += /opt/csw/share/sgml/sgml-iso-entities-8879.1986/.* +PKGFILES_CSWsgmlcommon += /opt/csw/share/sgml/.*soc /opt/csw/share/sgml/.*dcl PKGFILES_CSWxmlcommon = /etc/opt/csw/xml/.* /opt/csw/share/xml.* /opt/csw/share/sgml/docbook/xmlcatalog 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 Sep 13 20:16:23 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 13 Sep 2009 18:16:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6294] csw/mgar/pkg/firefox/branches Message-ID: Revision: 6294 http://gar.svn.sourceforge.net/gar/?rev=6294&view=rev Author: wbonnet Date: 2009-09-13 18:16:23 +0000 (Sun, 13 Sep 2009) Log Message: ----------- Cleanup scripts Modified Paths: -------------- csw/mgar/pkg/firefox/branches/firefox2-maintenance/files/CSWfirefox.postinstall csw/mgar/pkg/firefox/branches/firefox2-maintenance/files/CSWfirefox.postremove csw/mgar/pkg/firefox/branches/firefox3-packaging/files/CSWfirefox.postinstall csw/mgar/pkg/firefox/branches/firefox3-packaging/files/CSWfirefox.postremove csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/CSWfirefox.postinstall csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/CSWfirefox.postremove csw/mgar/pkg/firefox/branches/mwatters/files/CSWfirefox.postinstall csw/mgar/pkg/firefox/branches/mwatters/files/CSWfirefox.postremove Modified: csw/mgar/pkg/firefox/branches/firefox2-maintenance/files/CSWfirefox.postinstall =================================================================== --- csw/mgar/pkg/firefox/branches/firefox2-maintenance/files/CSWfirefox.postinstall 2009-09-13 13:03:44 UTC (rev 6293) +++ csw/mgar/pkg/firefox/branches/firefox2-maintenance/files/CSWfirefox.postinstall 2009-09-13 18:16:23 UTC (rev 6294) @@ -1,6 +1,4 @@ #!/bin/sh -# -# Blastwave.org Firefox Community Edition web browser postinstall script UNAME_P=`uname -p` UNAME_R=`uname -r` Modified: csw/mgar/pkg/firefox/branches/firefox2-maintenance/files/CSWfirefox.postremove =================================================================== --- csw/mgar/pkg/firefox/branches/firefox2-maintenance/files/CSWfirefox.postremove 2009-09-13 13:03:44 UTC (rev 6293) +++ csw/mgar/pkg/firefox/branches/firefox2-maintenance/files/CSWfirefox.postremove 2009-09-13 18:16:23 UTC (rev 6294) @@ -1,6 +1,4 @@ #!/bin/sh -# -# Blastwave.org Firefox Community Edition preremove script PLUGIN_FILE=/opt/csw/mozilla/firefox/lib/plugins/libjavaplugin_oji.so Modified: csw/mgar/pkg/firefox/branches/firefox3-packaging/files/CSWfirefox.postinstall =================================================================== --- csw/mgar/pkg/firefox/branches/firefox3-packaging/files/CSWfirefox.postinstall 2009-09-13 13:03:44 UTC (rev 6293) +++ csw/mgar/pkg/firefox/branches/firefox3-packaging/files/CSWfirefox.postinstall 2009-09-13 18:16:23 UTC (rev 6294) @@ -1,6 +1,4 @@ #!/bin/sh -# -# Blastwave.org Firefox Community Edition web browser postinstall script UNAME_P=`uname -p` UNAME_R=`uname -r` Modified: csw/mgar/pkg/firefox/branches/firefox3-packaging/files/CSWfirefox.postremove =================================================================== --- csw/mgar/pkg/firefox/branches/firefox3-packaging/files/CSWfirefox.postremove 2009-09-13 13:03:44 UTC (rev 6293) +++ csw/mgar/pkg/firefox/branches/firefox3-packaging/files/CSWfirefox.postremove 2009-09-13 18:16:23 UTC (rev 6294) @@ -1,6 +1,4 @@ #!/bin/sh -# -# Blastwave.org Firefox Community Edition preremove script PLUGIN_FILE=/opt/csw/mozilla/firefox/lib/plugins/libjavaplugin_oji.so Modified: csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/CSWfirefox.postinstall =================================================================== --- csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/CSWfirefox.postinstall 2009-09-13 13:03:44 UTC (rev 6293) +++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/CSWfirefox.postinstall 2009-09-13 18:16:23 UTC (rev 6294) @@ -1,6 +1,4 @@ #!/bin/sh -# -# Blastwave.org Firefox Community Edition web browser postinstall script UNAME_P=`uname -p` UNAME_R=`uname -r` Modified: csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/CSWfirefox.postremove =================================================================== --- csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/CSWfirefox.postremove 2009-09-13 13:03:44 UTC (rev 6293) +++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/CSWfirefox.postremove 2009-09-13 18:16:23 UTC (rev 6294) @@ -1,6 +1,4 @@ #!/bin/sh -# -# Blastwave.org Firefox Community Edition preremove script PLUGIN_FILE=/opt/csw/mozilla/firefox/lib/plugins/libjavaplugin_oji.so Modified: csw/mgar/pkg/firefox/branches/mwatters/files/CSWfirefox.postinstall =================================================================== --- csw/mgar/pkg/firefox/branches/mwatters/files/CSWfirefox.postinstall 2009-09-13 13:03:44 UTC (rev 6293) +++ csw/mgar/pkg/firefox/branches/mwatters/files/CSWfirefox.postinstall 2009-09-13 18:16:23 UTC (rev 6294) @@ -1,6 +1,4 @@ #!/bin/sh -# -# Blastwave.org Firefox Community Edition web browser postinstall script UNAME_P=`uname -p` UNAME_R=`uname -r` Modified: csw/mgar/pkg/firefox/branches/mwatters/files/CSWfirefox.postremove =================================================================== --- csw/mgar/pkg/firefox/branches/mwatters/files/CSWfirefox.postremove 2009-09-13 13:03:44 UTC (rev 6293) +++ csw/mgar/pkg/firefox/branches/mwatters/files/CSWfirefox.postremove 2009-09-13 18:16:23 UTC (rev 6294) @@ -1,6 +1,4 @@ #!/bin/sh -# -# Blastwave.org Firefox Community Edition preremove script PLUGIN_FILE=/opt/csw/mozilla/firefox/lib/plugins/libjavaplugin_oji.so 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 Sep 13 20:17:13 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 13 Sep 2009 18:17:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[6295] csw/mgar/pkg/firefox/trunk/files Message-ID: Revision: 6295 http://gar.svn.sourceforge.net/gar/?rev=6295&view=rev Author: wbonnet Date: 2009-09-13 18:17:13 +0000 (Sun, 13 Sep 2009) Log Message: ----------- Cleanup scripts Modified Paths: -------------- csw/mgar/pkg/firefox/trunk/files/CSWfirefox.postinstall csw/mgar/pkg/firefox/trunk/files/CSWfirefox.postremove Modified: csw/mgar/pkg/firefox/trunk/files/CSWfirefox.postinstall =================================================================== --- csw/mgar/pkg/firefox/trunk/files/CSWfirefox.postinstall 2009-09-13 18:16:23 UTC (rev 6294) +++ csw/mgar/pkg/firefox/trunk/files/CSWfirefox.postinstall 2009-09-13 18:17:13 UTC (rev 6295) @@ -1,6 +1,4 @@ #!/bin/sh -# -# Blastwave.org Firefox Community Edition web browser postinstall script UNAME_P=`uname -p` UNAME_R=`uname -r` Modified: csw/mgar/pkg/firefox/trunk/files/CSWfirefox.postremove =================================================================== --- csw/mgar/pkg/firefox/trunk/files/CSWfirefox.postremove 2009-09-13 18:16:23 UTC (rev 6294) +++ csw/mgar/pkg/firefox/trunk/files/CSWfirefox.postremove 2009-09-13 18:17:13 UTC (rev 6295) @@ -1,6 +1,4 @@ #!/bin/sh -# -# Blastwave.org Firefox Community Edition preremove script PLUGIN_FILE=/opt/csw/mozilla/firefox/lib/plugins/libjavaplugin_oji.so 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 Sep 13 20:27:21 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 13 Sep 2009 18:27:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[6296] csw/mgar/pkg/seamonkey/trunk Message-ID: Revision: 6296 http://gar.svn.sourceforge.net/gar/?rev=6296&view=rev Author: wbonnet Date: 2009-09-13 18:27:21 +0000 (Sun, 13 Sep 2009) Log Message: ----------- Upgrade to 1.1.18 Modified Paths: -------------- csw/mgar/pkg/seamonkey/trunk/Makefile csw/mgar/pkg/seamonkey/trunk/checksums Added Paths: ----------- csw/mgar/pkg/seamonkey/trunk/files/CSWseamonkey.postinstall csw/mgar/pkg/seamonkey/trunk/files/CSWseamonkey.postremove Modified: csw/mgar/pkg/seamonkey/trunk/Makefile =================================================================== --- csw/mgar/pkg/seamonkey/trunk/Makefile 2009-09-13 18:17:13 UTC (rev 6295) +++ csw/mgar/pkg/seamonkey/trunk/Makefile 2009-09-13 18:27:21 UTC (rev 6296) @@ -9,7 +9,7 @@ endef DISTFILES = $(GARNAME)-$(GARVERSION).source.tar.bz2 -# DISTFILES += CSWseamonkey.postremove CSWseamonkey.postinstall +DISTFILES += CSWseamonkey.postremove CSWseamonkey.postinstall # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = (\d+(?:\.\d+)*) @@ -86,7 +86,6 @@ post-extract: @mv $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/mozilla $(WORK_BUILD) -# @cp $(FILEDIR)/stdbool.h $(WORK_BUILD)/memory/jemalloc @$(MAKECOOKIE) pre-configure: @@ -95,12 +94,6 @@ pre-install: ( if [ ! -d $(WORK_INSTALL)/opt/csw/bin ] ; then mkdir -p $(WORK_INSTALL)/opt/csw/bin ; fi ) ( cd $(WORK_INSTALL)/opt/csw/bin ; rm -f seamonkey ; ln -sf ../mozilla/seamonkey/bin/seamonkey . ) -# ( mkdir -p $(WORK_INSTALL)/opt/csw/share/pixmaps ) -# ( cp $(WORK_BUILD)/other-licenses/branding/seamonkey/mozicon128.png $(WORK_INSTALL)/opt/csw/share/pixmaps/seamonkey.png ) -# ( mkdir -p $(WORK_INSTALL)/opt/csw/share/applications ) -# ( cp $(FILEDIR)/seamonkey.desktop $(WORK_INSTALL)/opt/csw/share/applications/seamonkey.desktop ) -# ( mkdir -p $(WORK_INSTALL)/opt/csw/share/gnome/mime-info ) -# ( cp $(FILEDIR)/seamonkey.keys $(WORK_INSTALL)/opt/csw/share/gnome/mime-info/seamonkey.keys ) post-install: ( gfind $(WORK_INSTALL)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}" \; ) Modified: csw/mgar/pkg/seamonkey/trunk/checksums =================================================================== --- csw/mgar/pkg/seamonkey/trunk/checksums 2009-09-13 18:17:13 UTC (rev 6295) +++ csw/mgar/pkg/seamonkey/trunk/checksums 2009-09-13 18:27:21 UTC (rev 6296) @@ -1,3 +1,10 @@ +058f97fd1a482f544e00706fa4d9b85a download/CSWseamonkey.postinstall +b7484bcb84a902a5a110758cd5ffad99 download/CSWseamonkey.postremove +23b32e46acefebe1eb21566d0336075e download/SunOS5.mk.diff +923bc1a8e0f98039c863a4f01dec9ec4 download/autoconf.mk.in.diff +e06ffefa6534521de5ed91c812a4a9c6 download/legacydb.config.mk.diff +f06035b459f608ed5032252bcaf87fb2 download/legacydb.manifest.mm.diff 3b03f00259d6897e017254e9dceed493 download/packager.mk.diff ef4455becf3a12833dca7dd92854aeaa download/seamonkey-1.1.18.source.tar.bz2 c815868b27233888ae5623967cc012f5 download/softoken.config.mk.diff +1150110fc60db3d7f5475e6906fe80c6 download/softoken.manifest.mm.diff Added: csw/mgar/pkg/seamonkey/trunk/files/CSWseamonkey.postinstall =================================================================== --- csw/mgar/pkg/seamonkey/trunk/files/CSWseamonkey.postinstall (rev 0) +++ csw/mgar/pkg/seamonkey/trunk/files/CSWseamonkey.postinstall 2009-09-13 18:27:21 UTC (rev 6296) @@ -0,0 +1,44 @@ +#!/bin/sh + +UNAME_P=`uname -p` +UNAME_R=`uname -r` + +PLUGIN_PATH=/opt/csw/mozilla/seamonkey/lib/plugins +PLUGIN_BASEFILE=libjavaplugin_oji.so +PLUGIN_DEST=$PLUGIN_PATH/$PLUGIN_BASEFILE +PLUGIN_BASE=/usr/java/jre/plugin + +# There is no need to detect the different java installed version +# This script uses default location for jre : /usr/java/jre +# This directory is linked during java installation + +# Create the link only if it does not already exist +if [ ! -f $PLUGIN_PATH/$PLUGIN_BASEFILE ]; then + # Try to use the most recent plugin version + PLUGIN_FILE="$PLUGIN_BASE/${UNAME_P}/ns7/$PLUGIN_BASEFILE" + if [ ! -f $PLUGIN_FILE ] ; then + PLUGIN_FILE="$PLUGIN_BASE/${UNAME_P}/ns610/$PLUGIN_BASEFILE" + if [ ! -f $PLUGIN_FILE ] ; then + PLUGIN_FILE="$PLUGIN_BASE/${UNAME_P}/ns600/$PLUGIN_BASEFILE" + if [ ! -f $PLUGIN_FILE ] ; then + PLUGIN_FILE="$PLUGIN_BASE/${UNAME_P}/ns4/$PLUGIN_BASEFILE" + if [ ! -f $PLUGIN_FILE ] ; then + echo "No Java plugin found." + exit 0 + fi + fi + fi + fi + + # Still here ? thus at least one of the plugin was found and var is set + echo Solaris $UNAME_R $UNAME_P + echo "Installing Java plugin..." + echo "Java plugin location:" + echo ${PLUGIN_FILE} + cd $PLUGIN_PATH && ln -s ${PLUGIN_FILE} libjavaplugin_oji.so +else + echo "Java plugin $PLUGIN_PATH/$PLUGIN_BASEFILE is already installed" + echo "The existing plugin has not been modified" +fi + +exit 0 Added: csw/mgar/pkg/seamonkey/trunk/files/CSWseamonkey.postremove =================================================================== --- csw/mgar/pkg/seamonkey/trunk/files/CSWseamonkey.postremove (rev 0) +++ csw/mgar/pkg/seamonkey/trunk/files/CSWseamonkey.postremove 2009-09-13 18:27:21 UTC (rev 6296) @@ -0,0 +1,12 @@ +#!/bin/sh + +PLUGIN_FILE=/opt/csw/mozilla/seamonkey/lib/plugins/libjavaplugin_oji.so + +if [ -f $PLUGIN_FILE ]; then + echo + echo "The java plugin has been detected in $PLUGIN_FILE" + echo "It has been installed by this package, but it may have been modified after installation" + echo "Please delete it manually if you need to remove this file definitively" + echo +fi +exit 0 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 Sep 13 21:10:36 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 13 Sep 2009 19:10:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[6297] csw/mgar/pkg/seamonkey/trunk/files/.mozconfig Message-ID: Revision: 6297 http://gar.svn.sourceforge.net/gar/?rev=6297&view=rev Author: wbonnet Date: 2009-09-13 19:10:36 +0000 (Sun, 13 Sep 2009) Log Message: ----------- Upgrade to 1.1.18 Added Paths: ----------- csw/mgar/pkg/seamonkey/trunk/files/.mozconfig Added: csw/mgar/pkg/seamonkey/trunk/files/.mozconfig =================================================================== --- csw/mgar/pkg/seamonkey/trunk/files/.mozconfig (rev 0) +++ csw/mgar/pkg/seamonkey/trunk/files/.mozconfig 2009-09-13 19:10:36 UTC (rev 6297) @@ -0,0 +1,36 @@ +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/seamonkey-opt-static +mk_add_options BUILD_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 +mk_add_options CFLAGS="-xc99=all" + +ac_add_options --enable-application=suite +ac_add_options --disable-debug +ac_add_options --disable-tests +ac_add_options --enable-xft +ac_add_options --enable-default-toolkit=gtk2 +ac_add_options --disable-auto-deps +ac_add_options --enable-optimize="-xO3" +ac_add_options --disable-updater +ac_add_options --disable-js-ultrasparc +ac_add_options --enable-extensions=default +ac_add_options --with-user-appdir=.mozilla +ac_add_options --prefix=/opt/csw/mozilla/seamonkey +ac_add_options --enable-crypto +ac_add_options --enable-canvas +ac_add_options --enable-system-cairo +ac_add_options --disable-pthreads +ac_add_options --enable-system-sqlite + +#ac_add_options --enable-xinerama + + +# ac_add_options --enable-svg +# ac_add_options --enable-svg-renderer=cairo +# ac_add_options --disable-freetype2 +# ac_add_options --enable-shared +# ac_add_options --disable-strip +# ac_add_options --enable-strip +# ac_add_options --disable-strip-libs +# ac_add_options --enable-strip-libs + + 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 Sep 13 22:39:44 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 13 Sep 2009 20:39:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[6298] csw/mgar/gar/v2-pbuild Message-ID: Revision: 6298 http://gar.svn.sourceforge.net/gar/?rev=6298&view=rev Author: dmichelsen Date: 2009-09-13 20:39:44 +0000 (Sun, 13 Sep 2009) Log Message: ----------- mGAR v2-pbuild: Fix merge rule Modified Paths: -------------- csw/mgar/gar/v2-pbuild/gar.mk csw/mgar/gar/v2-pbuild/gar.pkg.mk Modified: csw/mgar/gar/v2-pbuild/gar.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.mk 2009-09-13 19:10:36 UTC (rev 6297) +++ csw/mgar/gar/v2-pbuild/gar.mk 2009-09-13 20:39:44 UTC (rev 6298) @@ -153,22 +153,19 @@ endef define _modulate_merge -merge-$(2): $(3) -merge-$(2): BUILDHOST=$$$$(call modulation2host) +$(foreach ASSIGNMENT,$(3), +merge-$(2): $(ASSIGNMENT) +) +merge-$(2): BUILDHOST=$$(call modulation2host) merge-$(2): echo modulation: $(2) echo vars: $(3) - echo ISA: $(ISA) - echo BUILDHOST=$(BUILDHOST) - echo BUILDHOST=$(call modulation2host) - echo BUILDHOST=$$(call modulation2host) - echo BUILDHOST=$(eval $(call modulation2host)) - echo BUILDHOST=$$(eval $(call modulation2host)) - echo BUILDHOST=$$(eval $$(call modulation2host)) - echo THISHOST=$(THISHOST) - echo "Building modulation on host '$(BUILDHOST)'" - $(if $(and $(BUILDHOST),$(filter-out $(THISHOST),$(BUILDHOST))),\ - ssh $(BUILDHOST) "gmake -C $(CURDIR) MODULATION=$(2) $(3) merge-modulated",\ + echo ISA: $$(ISA) + echo BUILDHOST="$$(BUILDHOST)" + echo THISHOST="$$(THISHOST)" + echo "Building modulation on host '$$(BUILDHOST)'" + $$(if $$(and $$(BUILDHOST),$$(filter-out $$(THISHOST),$$(BUILDHOST))),\ + ssh $$(BUILDHOST) "gmake -C $$(CURDIR) MODULATION=$(2) $(3) merge-modulated",\ gmake MODULATION=$(2) $(3) merge-modulated\ ) @# The next line has intentionally been left blank to explicitly terminate this make rule Modified: csw/mgar/gar/v2-pbuild/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-09-13 19:10:36 UTC (rev 6297) +++ csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-09-13 20:39:44 UTC (rev 6298) @@ -533,6 +533,17 @@ # On a normal packaging workflow this is not used. prototypes: extract merge $(SPKG_DESTDIRS) pre-package $(foreach SPEC,$(_PKG_SPECS),$(WORKDIR)/$(SPEC).prototype-$(GARCH)) +# On these platforms packages are built. +# They will include binaries for all ISAs that are specified for the platform. +PACKAGING_PLATFORMS ?= solaris8-sparc solaris8-i386 + +# Only override for testing purposes +THIS_PLATFORM ?= solaris$(shell uname -r | sed -e 's/5.//')-$(shell uname -p) + +ifeq (,$(filter $(THIS_PLATFORM),$(PACKAGING_PLATFORMS))) + $(warn *** You are building a package on a non-requested platform ($(THIS_PLATFORM)). Requested platforms were $(PACKAGING_PLATFORMS)) +endif + # 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/. 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 Sep 13 23:39:26 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 13 Sep 2009 21:39:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[6299] csw/mgar/gar/v2-pbuild Message-ID: Revision: 6299 http://gar.svn.sourceforge.net/gar/?rev=6299&view=rev Author: dmichelsen Date: 2009-09-13 21:39:26 +0000 (Sun, 13 Sep 2009) Log Message: ----------- mGAR v2-pbuild: Add validatateplatform and platforms targets Modified Paths: -------------- csw/mgar/gar/v2-pbuild/gar.mk csw/mgar/gar/v2-pbuild/gar.pkg.mk Modified: csw/mgar/gar/v2-pbuild/gar.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.mk 2009-09-13 20:39:44 UTC (rev 6298) +++ csw/mgar/gar/v2-pbuild/gar.mk 2009-09-13 21:39:26 UTC (rev 6299) @@ -178,11 +178,9 @@ $(call _modulate_target,configure,$(2),$(4)) $(call _modulate_target_nocookie,reset-configure,$(2),$(4)) $(call _modulate_target,build,$(2),$(4)) -#$(call _modulate_build,,$(2),$(4)) $(call _modulate_target_nocookie,reset-build,$(2),$(4)) $(call _modulate_target,test,$(2),$(4)) $(call _modulate_target,install,$(2),$(4)) -#$(call _modulate_install,,$(2),$(4)) $(call _modulate_target_nocookie,reset-install,$(2),$(4)) #$(call _modulate_target,merge,$(2),$(4)) $(call _modulate_merge,,$(2),$(4)) Modified: csw/mgar/gar/v2-pbuild/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-09-13 20:39:44 UTC (rev 6298) +++ csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-09-13 21:39:26 UTC (rev 6299) @@ -537,17 +537,21 @@ # They will include binaries for all ISAs that are specified for the platform. PACKAGING_PLATFORMS ?= solaris8-sparc solaris8-i386 -# Only override for testing purposes -THIS_PLATFORM ?= solaris$(shell uname -r | sed -e 's/5.//')-$(shell uname -p) +validateplatform: + $(if $(filter $(THISHOST),$(foreach P,$(PACKAGING_PLATFORMS),$(PACKAGING_HOST_$P))),,\ + $(warning ***)\ + $(warning *** You are building this package on a non-requested platform host '$(THISHOST)'. The follow platforms were requested:)\ + $(foreach P,$(PACKAGING_PLATFORMS),\ + $(warning *** - $P $(if $(PACKAGING_HOST_$P),to be build on host '$(PACKAGING_HOST_$P)',with no suitable host available))\ + )\ + $(warning *** You can execute '$(MAKE) platforms' to automatically build on all necessary platforms.)\ + $(warning ***)\ + ) -ifeq (,$(filter $(THIS_PLATFORM),$(PACKAGING_PLATFORMS))) - $(warn *** You are building a package on a non-requested platform ($(THIS_PLATFORM)). Requested platforms were $(PACKAGING_PLATFORMS)) -endif - # 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: extract merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package +package: validateplatform extract merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package $(DONADA) # The dynamic pkginfo is only generated for dynamic gspec-files @@ -596,6 +600,19 @@ repackage: pkgreset package +# This rule automatically logs into every host where a package for this software should +# be built. It is especially suited for automated build bots. +platforms: + $(foreach P,$(PACKAGING_PLATFORMS),\ + $(if $(PACKAGING_HOST_$P),\ + $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ + $(MAKE) package;,\ + ssh $(PACKAGING_HOST_$P) "$(MAKE) -C $(CURDIR) package";\ + ),\ + $(error *** No host has been defined for platform $P)\ + )\ + ) + # dependb - update the dependency database # dependb: 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 Sep 14 03:08:22 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 14 Sep 2009 01:08:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[6300] csw/mgar/pkg/docbook-dtds/trunk Message-ID: Revision: 6300 http://gar.svn.sourceforge.net/gar/?rev=6300&view=rev Author: bdwalton Date: 2009-09-14 01:08:22 +0000 (Mon, 14 Sep 2009) Log Message: ----------- docbook-dtds: correct makefile patch Modified Paths: -------------- csw/mgar/pkg/docbook-dtds/trunk/checksums csw/mgar/pkg/docbook-dtds/trunk/files/add_makefile.patch Modified: csw/mgar/pkg/docbook-dtds/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/checksums 2009-09-13 21:39:26 UTC (rev 6299) +++ csw/mgar/pkg/docbook-dtds/trunk/checksums 2009-09-14 01:08:22 UTC (rev 6300) @@ -1,6 +1,6 @@ -e7ba1cae44ae889b32c326f0a46f2c81 download/CSWdocbookdtds.postinstall +c4074456da444839aa6010c8721a56da download/CSWdocbookdtds.postinstall da4b8f64c222276d2c291bf8afb20517 download/CSWdocbookdtds.preremove -9b4a512082ff0851ad3d705072dd5523 download/add_makefile.patch +39e1c752fddfed4f89c8276c42ec95d4 download/add_makefile.patch 9a7f5b1b7dd52d0ca4fb080619f0459c download/docbk30.zip 432749c0c806dbae81c8bcb70da3b5d3 download/docbk31.zip fabcf7dd1d88b94797b7e5344389eab9 download/docbk40.zip Modified: csw/mgar/pkg/docbook-dtds/trunk/files/add_makefile.patch =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/add_makefile.patch 2009-09-13 21:39:26 UTC (rev 6299) +++ csw/mgar/pkg/docbook-dtds/trunk/files/add_makefile.patch 2009-09-14 01:08:22 UTC (rev 6300) @@ -19,8 +19,8 @@ +SGMLTARG = $(patsubst %,inst-%,$(SGML)) +XMLTARG = $(patsubst %,inst-%,$(XML)) + -+CUR_SGML = $(lastword $(sort $(subst -sgml,,$(SGMLTARG)))) -+CUR_XML = $(lastword $(sort $(subst -xml,,$(XMLTARG)))) ++CUR_SGML = $(lastword $(sort $(subst -sgml,,$(SGML)))) ++CUR_XML = $(lastword $(sort $(subst -xml,,$(XML)))) + +.PHONY: $(SGML) $(XMLT) + 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 Sep 14 03:08:45 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 14 Sep 2009 01:08:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[6301] csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds .postinstall Message-ID: Revision: 6301 http://gar.svn.sourceforge.net/gar/?rev=6301&view=rev Author: bdwalton Date: 2009-09-14 01:08:45 +0000 (Mon, 14 Sep 2009) Log Message: ----------- docbook-dtds: strip out remaining docbook 5 stuff Modified Paths: -------------- csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall Modified: csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall 2009-09-14 01:08:22 UTC (rev 6300) +++ csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall 2009-09-14 01:08:45 UTC (rev 6301) @@ -122,14 +122,6 @@ $CSWSGMLCNF/xml-docbook-4.5.cat \ $CSWSGML/docbook/xml-dtd-4.5/catalog -# DocBook 5.0 -$PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/xml-docbook-5.0.cat \ - $CSWSGML/sgml-iso-entities-8879.1986/catalog -$PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/xml-docbook-5.0.cat \ - $CSWSGML/docbook/xml-schemas-5.0/catalog - # Fix up SGML super catalog so that there isn't an XML DTD before an # SGML one. We need to do this (*sigh*) because xmlcatalog messes up # the order of the lines, and SGML tools don't like to see XML things 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 Sep 14 07:45:50 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 14 Sep 2009 05:45:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6302] csw/mgar/pkg/seamonkey/trunk Message-ID: Revision: 6302 http://gar.svn.sourceforge.net/gar/?rev=6302&view=rev Author: wbonnet Date: 2009-09-14 05:45:50 +0000 (Mon, 14 Sep 2009) Log Message: ----------- Upgrade to 1.1.8 Modified Paths: -------------- csw/mgar/pkg/seamonkey/trunk/Makefile csw/mgar/pkg/seamonkey/trunk/checksums Added Paths: ----------- csw/mgar/pkg/seamonkey/trunk/files/lber-int.h.diff csw/mgar/pkg/seamonkey/trunk/files/ldap-int.h.diff csw/mgar/pkg/seamonkey/trunk/files/ldappr-int.h.diff Modified: csw/mgar/pkg/seamonkey/trunk/Makefile =================================================================== --- csw/mgar/pkg/seamonkey/trunk/Makefile 2009-09-14 01:08:45 UTC (rev 6301) +++ csw/mgar/pkg/seamonkey/trunk/Makefile 2009-09-14 05:45:50 UTC (rev 6302) @@ -54,6 +54,9 @@ PATCHFILES += softoken.manifest.mm.diff PATCHFILES += softoken.config.mk.diff PATCHFILES += packager.mk.diff +PATCHFILES += lber-int.h.diff +PATCHFILES += ldap-int.h.diff +PATCHFILES += ldappr-int.h.diff # PATCHFILES += configure.diff Modified: csw/mgar/pkg/seamonkey/trunk/checksums =================================================================== --- csw/mgar/pkg/seamonkey/trunk/checksums 2009-09-14 01:08:45 UTC (rev 6301) +++ csw/mgar/pkg/seamonkey/trunk/checksums 2009-09-14 05:45:50 UTC (rev 6302) @@ -2,6 +2,9 @@ b7484bcb84a902a5a110758cd5ffad99 download/CSWseamonkey.postremove 23b32e46acefebe1eb21566d0336075e download/SunOS5.mk.diff 923bc1a8e0f98039c863a4f01dec9ec4 download/autoconf.mk.in.diff +46527aded9c373b6095fea546d4d74f0 download/lber-int.h.diff +46ef334e67dab2301b53b661494f9d58 download/ldap-int.h.diff +e7054c1d1d6dc708805a6110ccfa7f70 download/ldappr-int.h.diff e06ffefa6534521de5ed91c812a4a9c6 download/legacydb.config.mk.diff f06035b459f608ed5032252bcaf87fb2 download/legacydb.manifest.mm.diff 3b03f00259d6897e017254e9dceed493 download/packager.mk.diff Added: csw/mgar/pkg/seamonkey/trunk/files/lber-int.h.diff =================================================================== --- csw/mgar/pkg/seamonkey/trunk/files/lber-int.h.diff (rev 0) +++ csw/mgar/pkg/seamonkey/trunk/files/lber-int.h.diff 2009-09-14 05:45:50 UTC (rev 6302) @@ -0,0 +1,12 @@ +diff --speed-large-files --minimal -Nru thunderbird.orig/directory/c-sdk/ldap/libraries/liblber/lber-int.h thunderbird/directory/c-sdk/ldap/libraries/liblber/lber-int.h +--- thunderbird.orig/directory/c-sdk/ldap/libraries/liblber/lber-int.h 2009-05-27 09:58:02.216472168 +0200 ++++ thunderbird/directory/c-sdk/ldap/libraries/liblber/lber-int.h 2009-05-27 09:58:25.484409572 +0200 +@@ -107,7 +107,7 @@ + #define stderr NULL + #endif + +-#include "lber.h" ++#include "../../include/lber.h" + + #ifdef macintosh + #define NSLDAPI_LBER_SOCKET_IS_PTR Added: csw/mgar/pkg/seamonkey/trunk/files/ldap-int.h.diff =================================================================== --- csw/mgar/pkg/seamonkey/trunk/files/ldap-int.h.diff (rev 0) +++ csw/mgar/pkg/seamonkey/trunk/files/ldap-int.h.diff 2009-09-14 05:45:50 UTC (rev 6302) @@ -0,0 +1,18 @@ +diff --speed-large-files --minimal -Nru thunderbird.orig/directory/c-sdk/ldap/libraries/libldap/ldap-int.h thunderbird/directory/c-sdk/ldap/libraries/libldap/ldap-int.h +--- thunderbird.orig/directory/c-sdk/ldap/libraries/libldap/ldap-int.h 2009-05-27 09:59:24.939222864 +0200 ++++ thunderbird/directory/c-sdk/ldap/libraries/libldap/ldap-int.h 2009-05-27 10:00:08.738847653 +0200 +@@ -82,10 +82,10 @@ + #include "../liblber/lber-int.h" + #endif /* macintosh */ + +-#include "ldap.h" +-#include "ldaprot.h" +-#include "ldaplog.h" +-#include "portable.h" ++#include "../../include/ldap.h" ++#include "../../include/ldaprot.h" ++#include "../../include/ldaplog.h" ++#include "../../include/portable.h" + + #ifdef LDAP_ASYNC_IO + #ifdef NEED_FILIO Added: csw/mgar/pkg/seamonkey/trunk/files/ldappr-int.h.diff =================================================================== --- csw/mgar/pkg/seamonkey/trunk/files/ldappr-int.h.diff (rev 0) +++ csw/mgar/pkg/seamonkey/trunk/files/ldappr-int.h.diff 2009-09-14 05:45:50 UTC (rev 6302) @@ -0,0 +1,15 @@ +diff --speed-large-files --minimal -Nru thunderbird.orig/directory/c-sdk/ldap/libraries/libprldap/ldappr-int.h thunderbird/directory/c-sdk/ldap/libraries/libprldap/ldappr-int.h +--- thunderbird.orig/directory/c-sdk/ldap/libraries/libprldap/ldappr-int.h 2009-05-27 10:01:14.924882377 +0200 ++++ thunderbird/directory/c-sdk/ldap/libraries/libprldap/ldappr-int.h 2009-05-27 10:02:26.014267148 +0200 +@@ -41,9 +41,9 @@ + * + */ + +-#include "ldap.h" ++#include "../../include/ldap.h" + #include "nspr.h" +-#include "ldappr.h" ++#include "../../include/ldappr.h" + + #include + #include 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 Sep 14 10:26:35 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 14 Sep 2009 08:26:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[6303] csw/mgar/pkg/neon/trunk Message-ID: Revision: 6303 http://gar.svn.sourceforge.net/gar/?rev=6303&view=rev Author: dmichelsen Date: 2009-09-14 08:26:35 +0000 (Mon, 14 Sep 2009) Log Message: ----------- neon: Update to 0.29.0 and move docs to devel-package Modified Paths: -------------- csw/mgar/pkg/neon/trunk/Makefile csw/mgar/pkg/neon/trunk/checksums Modified: csw/mgar/pkg/neon/trunk/Makefile =================================================================== --- csw/mgar/pkg/neon/trunk/Makefile 2009-09-14 05:45:50 UTC (rev 6302) +++ csw/mgar/pkg/neon/trunk/Makefile 2009-09-14 08:26:35 UTC (rev 6303) @@ -1,9 +1,9 @@ GARNAME = neon -GARVERSION = 0.28.6 +GARVERSION = 0.29.0 CATEGORIES = lib EXTRA_MODULATORS = GARVERSION -MODULATIONS_GARVERSION = 0.26.4 0.28.6 +MODULATIONS_GARVERSION = 0.26.4 0.29.0 DESCRIPTION = Neon HTTP and WebDAV client library define BLURB @@ -51,20 +51,21 @@ MERGE_SCRIPTS_isa-amd64-garversion-0.26.4 = copy-relocated-only MERGE_DIRS_isa-amd64-garversion-0.26.4 = $(libdir) -MERGE_SCRIPTS_isa-i386-garversion-0.28.6 = copy-all -MERGE_SCRIPTS_isa-amd64-garversion-0.28.6 = copy-relocated-only -MERGE_DIRS_isa-amd64-garversion-0.28.6 = $(bindir) $(sbindir) $(libexecdir) $(libdir) +MERGE_SCRIPTS_isa-i386-garversion-0.29.0 = copy-all +MERGE_SCRIPTS_isa-amd64-garversion-0.29.0 = copy-relocated-only +MERGE_DIRS_isa-amd64-garversion-0.29.0 = $(bindir) $(sbindir) $(libexecdir) $(libdir) MERGE_SCRIPTS_isa-sparcv8-garversion-0.26.4 = copy-only MERGE_DIRS_isa-sparcv8-garversion-0.26.4 = $(libdir) MERGE_SCRIPTS_isa-sparcv9-garversion-0.26.4 = copy-relocated-only MERGE_DIRS_isa-sparcv9-garversion-0.26.4 = $(libdir) -MERGE_SCRIPTS_isa-sparcv8-garversion-0.28.6 = copy-all -MERGE_SCRIPTS_isa-sparcv9-garversion-0.28.6 = copy-relocated-only -MERGE_DIRS_isa-sparcv9-garversion-0.28.6 = $(bindir) $(sbindir) $(libexecdir) $(libdir) +MERGE_SCRIPTS_isa-sparcv8-garversion-0.29.0 = copy-all +MERGE_SCRIPTS_isa-sparcv9-garversion-0.29.0 = copy-relocated-only +MERGE_DIRS_isa-sparcv9-garversion-0.29.0 = $(bindir) $(sbindir) $(libexecdir) $(libdir) PKGFILES_CSWneon-devel = $(PKGFILES_DEVEL) +PKGFILES_CSWneon-devel += $(docdir)/.* EXTRA_LINKER_FLAGS = -lintl Modified: csw/mgar/pkg/neon/trunk/checksums =================================================================== --- csw/mgar/pkg/neon/trunk/checksums 2009-09-14 05:45:50 UTC (rev 6302) +++ csw/mgar/pkg/neon/trunk/checksums 2009-09-14 08:26:35 UTC (rev 6303) @@ -1,3 +1,4 @@ 4ef5552e8930ef82b1f56c2712f8ed1e download/COPYING 2d11fff51ffa856fc6b5d4bd801d6cc4 download/neon-0.26.4.tar.gz 252578ed555552b71d15909641484951 download/neon-0.28.6.tar.gz +18a3764b70f9317f8b61509fd90d9e7a download/neon-0.29.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Sep 14 17:32:28 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 14 Sep 2009 15:32:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[6304] csw/mgar/pkg/cups/branches/cups-1.4 Message-ID: Revision: 6304 http://gar.svn.sourceforge.net/gar/?rev=6304&view=rev Author: wahwah Date: 2009-09-14 15:32:28 +0000 (Mon, 14 Sep 2009) Log Message: ----------- cups: Experimental patches with reference counts. Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4/Makefile csw/mgar/pkg/cups/branches/cups-1.4/checksums Added Paths: ----------- csw/mgar/pkg/cups/branches/cups-1.4/files/0001-cswcups-for-service-name.patch csw/mgar/pkg/cups/branches/cups-1.4/files/0002-Adding-the-refcount-member-to-mime_type_t.patch csw/mgar/pkg/cups/branches/cups-1.4/files/0003-Reference-counting-for-printers-only.patch Removed Paths: ------------- csw/mgar/pkg/cups/branches/cups-1.4/files/0001-Makefile.patch Modified: csw/mgar/pkg/cups/branches/cups-1.4/Makefile =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-14 08:26:35 UTC (rev 6303) +++ csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-14 15:32:28 UTC (rev 6304) @@ -25,7 +25,9 @@ FULL_MIRRORS = $(foreach S,$(CUPS_MIRRORS),$(S)/$(GARNAME)/$(GARVERSION)/) MASTER_SITES += $(FULL_MIRRORS) -PATCHFILES = 0001-Makefile.patch +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 DISTFILES = cups-$(GARVERSION)-source.tar.bz2 $(PATCHFILES) DISTFILES += CSWcupsclient.preinstall DISTFILES += CSWcupsd.preinstall Modified: csw/mgar/pkg/cups/branches/cups-1.4/checksums =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-09-14 08:26:35 UTC (rev 6303) +++ csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-09-14 15:32:28 UTC (rev 6304) @@ -1,4 +1,6 @@ -682e10ff0ab0e094c3de2061369038bc download/0001-Makefile.patch +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 8418cf872043eada2d46c8db6e6451c0 download/CSWcupsclient.preinstall ca7718998e56c320c08a77cfefe046f6 download/CSWcupsd.postremove 8418cf872043eada2d46c8db6e6451c0 download/CSWcupsd.preinstall Deleted: csw/mgar/pkg/cups/branches/cups-1.4/files/0001-Makefile.patch =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/0001-Makefile.patch 2009-09-14 08:26:35 UTC (rev 6303) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/0001-Makefile.patch 2009-09-14 15:32:28 UTC (rev 6304) @@ -1,72 +0,0 @@ -From 77ba01db2d7f7b8585bb05bb8652aedf09860bd5 Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Sat, 5 Sep 2009 03:31:57 +0200 -Subject: [PATCH] Makefile - ---- - Makefile | 12 ++++++------ - locale/Makefile | 3 ++- - 2 files changed, 8 insertions(+), 7 deletions(-) - -diff --git a/Makefile b/Makefile -index 91be6e5..a1ff6f8 100644 ---- a/Makefile -+++ b/Makefile -@@ -178,18 +178,18 @@ install-data: - if test "x$(INITDIR)" != x; then \ - echo Installing init scripts...; \ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \ -- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \ -+ $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cswcups; \ - for level in $(RCLEVELS); do \ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \ -- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups; \ -+ $(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups; \ - if test `uname` = HP-UX; then \ - level=`expr $$level - 1`; \ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \ - fi; \ -- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups; \ -+ $(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups; \ - done; \ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \ -- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \ -+ $(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \ - fi - if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \ - $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \ -@@ -227,7 +227,7 @@ install-data: - $(INSTALL_DATA) init/cups-lpd $(BUILDROOT)$(XINETD)/cups-lpd; \ - fi - if test "x$(MENUDIR)" != x; then \ -- echo Installing desktop menu...; \ -+ echo Installing desktop menu into $(BUILDROOT)$(MENUDIR)...; \ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(MENUDIR); \ - $(INSTALL_DATA) desktop/cups.desktop $(BUILDROOT)$(MENUDIR); \ - fi -@@ -290,7 +290,7 @@ uninstall: - -$(RMDIR) $(BINDIR) - echo Uninstalling startup script... - if test "x$(INITDIR)" != x; then \ -- $(RM) $(BUILDROOT)$(INITDIR)/init.d/cups; \ -+ $(RM) $(BUILDROOT)$(INITDIR)/init.d/cswcups; \ - $(RMDIR) $(BUILDROOT)$(INITDIR)/init.d; \ - $(RM) $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \ - $(RMDIR) $(BUILDROOT)$(INITDIR)/rc0.d; \ -diff --git a/locale/Makefile b/locale/Makefile -index 6241b66..f76b8bc 100644 ---- a/locale/Makefile -+++ b/locale/Makefile -@@ -75,7 +75,8 @@ install-languages: - for loc in $(LANGUAGES) ; do \ - if test -f cups_$$loc.po; then \ - $(INSTALL_DIR) -m 755 $(LOCALEDIR)/$$loc ; \ -- $(INSTALL_DATA) cups_$$loc.po $(LOCALEDIR)/$$loc/cups_$$loc.po ; \ -+ $(INSTALL_DIR) -m 755 $(LOCALEDIR)/$$loc/LC_MESSAGES ; \ -+ $(INSTALL_DATA) cups_$$loc.po $(LOCALEDIR)/$$loc/LC_MESSAGES/cups_$$loc.po ; \ - fi ; \ - done - --- -1.6.3.2 - Added: csw/mgar/pkg/cups/branches/cups-1.4/files/0001-cswcups-for-service-name.patch =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/0001-cswcups-for-service-name.patch (rev 0) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/0001-cswcups-for-service-name.patch 2009-09-14 15:32:28 UTC (rev 6304) @@ -0,0 +1,72 @@ +From 7ef5a09e7257782a5f8b4d9bcf681a399ef82996 Mon Sep 17 00:00:00 2001 +From: Super-User +Date: Wed, 9 Sep 2009 16:41:17 +0100 +Subject: [PATCH 1/3] cswcups for service name + +--- + Makefile | 12 ++++++------ + locale/Makefile | 3 ++- + 2 files changed, 8 insertions(+), 7 deletions(-) + +diff --git a/Makefile b/Makefile +index 91be6e5..a1ff6f8 100644 +--- a/Makefile ++++ b/Makefile +@@ -178,18 +178,18 @@ install-data: + if test "x$(INITDIR)" != x; then \ + echo Installing init scripts...; \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \ +- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \ ++ $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cswcups; \ + for level in $(RCLEVELS); do \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \ +- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups; \ ++ $(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups; \ + if test `uname` = HP-UX; then \ + level=`expr $$level - 1`; \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \ + fi; \ +- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups; \ ++ $(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups; \ + done; \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \ +- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \ ++ $(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \ + fi + if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \ + $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \ +@@ -227,7 +227,7 @@ install-data: + $(INSTALL_DATA) init/cups-lpd $(BUILDROOT)$(XINETD)/cups-lpd; \ + fi + if test "x$(MENUDIR)" != x; then \ +- echo Installing desktop menu...; \ ++ echo Installing desktop menu into $(BUILDROOT)$(MENUDIR)...; \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(MENUDIR); \ + $(INSTALL_DATA) desktop/cups.desktop $(BUILDROOT)$(MENUDIR); \ + fi +@@ -290,7 +290,7 @@ uninstall: + -$(RMDIR) $(BINDIR) + echo Uninstalling startup script... + if test "x$(INITDIR)" != x; then \ +- $(RM) $(BUILDROOT)$(INITDIR)/init.d/cups; \ ++ $(RM) $(BUILDROOT)$(INITDIR)/init.d/cswcups; \ + $(RMDIR) $(BUILDROOT)$(INITDIR)/init.d; \ + $(RM) $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \ + $(RMDIR) $(BUILDROOT)$(INITDIR)/rc0.d; \ +diff --git a/locale/Makefile b/locale/Makefile +index 6241b66..f76b8bc 100644 +--- a/locale/Makefile ++++ b/locale/Makefile +@@ -75,7 +75,8 @@ install-languages: + for loc in $(LANGUAGES) ; do \ + if test -f cups_$$loc.po; then \ + $(INSTALL_DIR) -m 755 $(LOCALEDIR)/$$loc ; \ +- $(INSTALL_DATA) cups_$$loc.po $(LOCALEDIR)/$$loc/cups_$$loc.po ; \ ++ $(INSTALL_DIR) -m 755 $(LOCALEDIR)/$$loc/LC_MESSAGES ; \ ++ $(INSTALL_DATA) cups_$$loc.po $(LOCALEDIR)/$$loc/LC_MESSAGES/cups_$$loc.po ; \ + fi ; \ + done + +-- +1.6.3.2 + Added: csw/mgar/pkg/cups/branches/cups-1.4/files/0002-Adding-the-refcount-member-to-mime_type_t.patch =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/0002-Adding-the-refcount-member-to-mime_type_t.patch (rev 0) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/0002-Adding-the-refcount-member-to-mime_type_t.patch 2009-09-14 15:32:28 UTC (rev 6304) @@ -0,0 +1,24 @@ +From ee9340922a5a998e05b2ec123233f2bbf57a84a3 Mon Sep 17 00:00:00 2001 +From: Super-User +Date: Wed, 9 Sep 2009 19:33:00 +0100 +Subject: [PATCH 2/3] Adding the refcount member to mime_type_t + +--- + scheduler/mime.h | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/scheduler/mime.h b/scheduler/mime.h +index 0194964..4bd64c2 100644 +--- a/scheduler/mime.h ++++ b/scheduler/mime.h +@@ -85,6 +85,7 @@ typedef struct _mime_magic_s /**** MIME Magic Data ****/ + + typedef struct _mime_type_s /**** MIME Type Data ****/ + { ++ int refcount; /* To allow sharing of this struct */ + mime_magic_t *rules; /* Rules used to detect this type */ + int priority; /* Priority of this type */ + char super[MIME_MAX_SUPER], /* Super-type name ("image", "application", etc.) */ +-- +1.6.3.2 + Added: csw/mgar/pkg/cups/branches/cups-1.4/files/0003-Reference-counting-for-printers-only.patch =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/0003-Reference-counting-for-printers-only.patch (rev 0) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/0003-Reference-counting-for-printers-only.patch 2009-09-14 15:32:28 UTC (rev 6304) @@ -0,0 +1,56 @@ +From b22d9f6339a2d367dd5493f8fb0e06041b26d80a Mon Sep 17 00:00:00 2001 +From: Super-User +Date: Wed, 9 Sep 2009 19:52:18 +0100 +Subject: [PATCH 3/3] Reference counting for printers only. + +--- + scheduler/mime.c | 7 +++++++ + scheduler/printers.c | 1 + + scheduler/type.c | 1 + + 3 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/scheduler/mime.c b/scheduler/mime.c +index 890f2ea..1cabf64 100644 +--- a/scheduler/mime.c ++++ b/scheduler/mime.c +@@ -156,6 +156,13 @@ mimeDeleteType(mime_t *mime, /* I - MIME database */ + if (!mime || !mt) + return; + ++ mt->refcount--; ++ if (mt->refcount) { ++ /* ++ * Other references to this instance exist, not removing. ++ */ ++ return; ++ } + cupsArrayRemove(mime->types, mt); + + delete_rules(mt->rules); +diff --git a/scheduler/printers.c b/scheduler/printers.c +index 1430946..629b86d 100644 +--- a/scheduler/printers.c ++++ b/scheduler/printers.c +@@ -127,6 +127,7 @@ cupsdAddPrinter(const char *name) /* I - Name of printer */ + p->accepting = 0; + p->shared = DefaultShared; + p->filetype = mimeAddType(MimeDatabase, "printer", name); ++ p->filetype->refcount++; + + cupsdSetString(&p->job_sheets[0], "none"); + cupsdSetString(&p->job_sheets[1], "none"); +diff --git a/scheduler/type.c b/scheduler/type.c +index 6443506..faf4381 100644 +--- a/scheduler/type.c ++++ b/scheduler/type.c +@@ -124,6 +124,7 @@ mimeAddType(mime_t *mime, /* I - MIME database */ + strlen(type) + 1)) == NULL) + return (NULL); + ++ temp->refcount = 0; /* Callers are responsible for incrementing the counter */ + strlcpy(temp->super, super, sizeof(temp->super)); + strcpy(temp->type, type); /* Safe: temp->type is allocated */ + temp->priority = 100; +-- +1.6.3.2 + 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 Sep 14 18:18:37 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 14 Sep 2009 16:18:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[6305] csw/mgar/pkg/seamonkey/Makefile Message-ID: Revision: 6305 http://gar.svn.sourceforge.net/gar/?rev=6305&view=rev Author: wbonnet Date: 2009-09-14 16:18:37 +0000 (Mon, 14 Sep 2009) Log Message: ----------- Add missing Makefile Added Paths: ----------- csw/mgar/pkg/seamonkey/Makefile Added: csw/mgar/pkg/seamonkey/Makefile =================================================================== --- csw/mgar/pkg/seamonkey/Makefile (rev 0) +++ csw/mgar/pkg/seamonkey/Makefile 2009-09-14 16:18:37 UTC (rev 6305) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -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 bdwalton at users.sourceforge.net Mon Sep 14 19:15:48 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 14 Sep 2009 17:15:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[6306] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 6306 http://gar.svn.sourceforge.net/gar/?rev=6306&view=rev Author: bdwalton Date: 2009-09-14 17:15:48 +0000 (Mon, 14 Sep 2009) Log Message: ----------- git: bump to 1.6.4.3 Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-09-14 16:18:37 UTC (rev 6305) +++ csw/mgar/pkg/git/trunk/Makefile 2009-09-14 17:15:48 UTC (rev 6306) @@ -1,5 +1,5 @@ GARNAME = git -GARVERSION = 1.6.4.2 +GARVERSION = 1.6.4.3 #xPATCHLEVEL = rc3 CATEGORIES = devel 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 Sep 14 21:29:36 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 14 Sep 2009 19:29:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[6307] csw/mgar/pkg/cups/branches/cups-1.4/Makefile Message-ID: Revision: 6307 http://gar.svn.sourceforge.net/gar/?rev=6307&view=rev Author: wahwah Date: 2009-09-14 19:29:36 +0000 (Mon, 14 Sep 2009) Log Message: ----------- cups: Rewritten man1m PKGFILES, removed duplicate manpages between cupsd and cupsclient Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4/Makefile Modified: csw/mgar/pkg/cups/branches/cups-1.4/Makefile =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-14 17:15:48 UTC (rev 6306) +++ csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-14 19:29:36 UTC (rev 6307) @@ -107,10 +107,10 @@ PKGFILES_CSWcupsclient += $(mandir)/man1/(lpoptions|lppasswd|lpq|lpr|lprm).1 PKGFILES_CSWcupsclient += $(mandir)/man1/lpstat.1 PKGFILES_CSWcupsclient += $(mandir)/man1/ppd.*\.1 -PKGFILES_CSWcupsclient += $(mandir)/man1m/cups.*\.1m -PKGFILES_CSWcupsclient += $(mandir)/man1m/(accept|cupsaddsmb|cupsctl).1m -PKGFILES_CSWcupsclient += $(mandir)/man1m/(cups(en|dis)able).1m -PKGFILES_CSWcupsclient += $(mandir)/man1m/(lpadmin|lpc|lpinfo|lpmove|reject).1m +PKGFILES_CSWcupsclient += $(mandir)/man1m/(cups|)(accept|reject)\.1m +PKGFILES_CSWcupsclient += $(mandir)/man1m/cups(en|dis)able\.1m +PKGFILES_CSWcupsclient += $(mandir)/man1m/cups(addsmb|ctl)\.1m +PKGFILES_CSWcupsclient += $(mandir)/man1m/lp(admin|c|info|move)\.1m PKGFILES_CSWcupsclient += $(mandir)/man5/client.conf.5 PKGFILES_CSWcupsclient += $(mandir)/man5/ppdcfile\.5 PKGFILES_CSWcupsclient += $(mandir)/man7/(drv|notifier)\.7 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Sep 15 00:14:08 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 14 Sep 2009 22:14:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[6308] csw/mgar/pkg/xfce/xfconf/trunk Message-ID: Revision: 6308 http://gar.svn.sourceforge.net/gar/?rev=6308&view=rev Author: wbonnet Date: 2009-09-14 22:14:08 +0000 (Mon, 14 Sep 2009) Log Message: ----------- Upgrade to 4.6.1 Modified Paths: -------------- csw/mgar/pkg/xfce/xfconf/trunk/checksums csw/mgar/pkg/xfce/xfconf/trunk/files/xfconf-gvaluefuncs.h.diff Modified: csw/mgar/pkg/xfce/xfconf/trunk/checksums =================================================================== --- csw/mgar/pkg/xfce/xfconf/trunk/checksums 2009-09-14 19:29:36 UTC (rev 6307) +++ csw/mgar/pkg/xfce/xfconf/trunk/checksums 2009-09-14 22:14:08 UTC (rev 6308) @@ -1,4 +1,4 @@ 3e43af7de9f725ed3057021862ae9899 download/Makefile.PL.in.diff a711dd1aba91d78b5a5d84e57edaa5df download/xf-conf-locking-utils.h.diff d4d3018767ea9eb4b57cc57d4038023b download/xfconf-4.6.1.tar.bz2 -bc8e1b6b529591ed0b0f0410734cee24 download/xfconf-gvaluefuncs.h.diff +dedc7f77147cc0de1919290c97032e8e download/xfconf-gvaluefuncs.h.diff Modified: csw/mgar/pkg/xfce/xfconf/trunk/files/xfconf-gvaluefuncs.h.diff =================================================================== --- csw/mgar/pkg/xfce/xfconf/trunk/files/xfconf-gvaluefuncs.h.diff 2009-09-14 19:29:36 UTC (rev 6307) +++ csw/mgar/pkg/xfce/xfconf/trunk/files/xfconf-gvaluefuncs.h.diff 2009-09-14 22:14:08 UTC (rev 6308) @@ -13,7 +13,7 @@ -gboolean _xfconf_gvalue_from_string(GValue *value, - const gchar *str) G_GNUC_INTERNAL; +G_GNUC_INTERNAL gboolean _xfconf_gvalue_from_string(GValue *value, -+ const gchar *str); ++ const gchar *str); -gchar *_xfconf_string_from_gvalue(GValue *value) G_GNUC_INTERNAL; +G_GNUC_INTERNAL gchar *_xfconf_string_from_gvalue(GValue *value); @@ -21,7 +21,7 @@ -gboolean _xfconf_gvalue_is_equal(const GValue *value1, - const GValue *value2) G_GNUC_INTERNAL; +G_GNUC_INTERNAL gboolean _xfconf_gvalue_is_equal(const GValue *value1, -+ const GValue *value2); ++ const GValue *value2); -void _xfconf_gvalue_free(GValue *value) G_GNUC_INTERNAL; +G_GNUC_INTERNAL void _xfconf_gvalue_free(GValue *value); 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 Sep 15 12:19:44 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 15 Sep 2009 10:19:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[6309] csw/mgar/pkg/wxwidgets/trunk/Makefile Message-ID: Revision: 6309 http://gar.svn.sourceforge.net/gar/?rev=6309&view=rev Author: wahwah Date: 2009-09-15 10:19:44 +0000 (Tue, 15 Sep 2009) Log Message: ----------- wxwidgets: Enabling built-in regex support, pgadmin3 seems to need it Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-09-14 22:14:08 UTC (rev 6308) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-09-15 10:19:44 UTC (rev 6309) @@ -70,7 +70,7 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-gtk=2 CONFIGURE_ARGS += --with-gtk-prefix=/opt/csw -CONFIGURE_ARGS += --without-regex +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 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 Sep 15 19:59:39 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 15 Sep 2009 17:59:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[6310] csw/mgar/pkg/xmlto/trunk Message-ID: Revision: 6310 http://gar.svn.sourceforge.net/gar/?rev=6310&view=rev Author: bdwalton Date: 2009-09-15 17:59:39 +0000 (Tue, 15 Sep 2009) Log Message: ----------- xmlto: update bash handling patch, autoconf tail and gcp selection Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile csw/mgar/pkg/xmlto/trunk/checksums Added Paths: ----------- csw/mgar/pkg/xmlto/trunk/files/0001-add-support-for-selection-of-posix-tail-binary.patch csw/mgar/pkg/xmlto/trunk/files/0002-add-handling-so-that-gnu-cp-can-be-specified.patch csw/mgar/pkg/xmlto/trunk/files/0003-do-no-hardcode-bin-bash-to-override-env-check.patch Removed Paths: ------------- csw/mgar/pkg/xmlto/trunk/files/no-hardcode-bash.patch Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-15 10:19:44 UTC (rev 6309) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-15 17:59:39 UTC (rev 6310) @@ -3,7 +3,7 @@ CATEGORIES = utils PREREQUISITE_PKGS += CSWmktemp CSWfindutils CSWdocbookxsl CSWlibxslt -PREREQUISITE_PKGS += CSWflex CSWggetopt CSWgnulinks +PREREQUISITE_PKGS += CSWflex CSWggetopt REQUIRED_PKGS = CSWsgmlcommon CSWxmlcommon CSWlibxml2 CSWdocbookdtds REQUIRED_PKGS += CSWdocbookxsl CSWlibxslt CSWflex CSWw3m CSWmktemp @@ -19,7 +19,9 @@ MASTER_SITES = https://fedorahosted.org/releases/x/m/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -PATCHFILES = no-hardcode-bash.patch +PATCHFILES += 0001-add-support-for-selection-of-posix-tail-binary.patch +PATCHFILES += 0002-add-handling-so-that-gnu-cp-can-be-specified.patch +PATCHFILES += 0003-do-no-hardcode-bin-bash-to-override-env-check.patch TEST_TARGET = check @@ -36,18 +38,17 @@ @$(MAKECOOKIE) CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += BASH=/opt/csw/bin/bash CONFIGURE_ARGS += GETOPT=/opt/csw/bin/ggetopt -CONFIGURE_ARGS += BASH=/opt/csw/bin/bash CONFIGURE_ARGS += FIND=/opt/csw/bin/gfind +CONFIGURE_ARGS += TAIL=/usr/xpg4/bin/tail +CONFIGURE_ARGS += GCP=/opt/csw/bin/gcp CONFIGURE_ARGS += MKTEMP=/opt/csw/bin/mktemp sysconfdir = /etc/opt/csw include gar/category.mk -# We need this for 'tail -n' -PATH := /opt/csw/gnu:/usr/xpg4/bin:/opt/csw/bin:$(PATH) - #reset XML_CATALOG lookup (we rely on having packages that provide stylesheets #etc). Having xsltproc not find them during build makes us blow up!! XML_CATALOG_FILES = /etc/opt/csw/xml/catalog Modified: csw/mgar/pkg/xmlto/trunk/checksums =================================================================== --- csw/mgar/pkg/xmlto/trunk/checksums 2009-09-15 10:19:44 UTC (rev 6309) +++ csw/mgar/pkg/xmlto/trunk/checksums 2009-09-15 17:59:39 UTC (rev 6310) @@ -1,2 +1,4 @@ -a39f8b6fdb2219dca513145a4fca63ac download/no-hardcode-bash.patch +037997ead86e0589b4e34538d7d2694a download/0001-add-support-for-selection-of-posix-tail-binary.patch +134ec47ba3f225ebd04bfb629b230e69 download/0002-add-handling-so-that-gnu-cp-can-be-specified.patch +b53522eb1413d28da8e661b76f4ab098 download/0003-do-no-hardcode-bin-bash-to-override-env-check.patch 12f297dc7051e4fef08339980f88a1dd download/xmlto-0.0.22.tar.bz2 Added: csw/mgar/pkg/xmlto/trunk/files/0001-add-support-for-selection-of-posix-tail-binary.patch =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/0001-add-support-for-selection-of-posix-tail-binary.patch (rev 0) +++ csw/mgar/pkg/xmlto/trunk/files/0001-add-support-for-selection-of-posix-tail-binary.patch 2009-09-15 17:59:39 UTC (rev 6310) @@ -0,0 +1,48 @@ +From 788a65e1792057ac1379c459e111eccf06b4a034 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Tue, 15 Sep 2009 19:01:55 +0200 +Subject: [PATCH 1/2] add support for selection of posix tail binary + +--- + configure.in | 3 +++ + xmlto.in | 3 ++- + 2 files changed, 5 insertions(+), 1 deletions(-) + +diff --git a/configure.in b/configure.in +index c41bb72..0fb685e 100644 +--- a/configure.in ++++ b/configure.in +@@ -107,6 +107,9 @@ AC_PATH_PROG([LINKS], [links], [links]) + AC_ARG_VAR([W3M], [Name and path of the `w3m' browser.]) + AC_PATH_PROG([W3M], [w3m], [w3m]) + ++AC_ARG_VAR([TAIL], [Name and path of a tail binary that supports -n.]) ++AC_PATH_PROG([TAIL], [tail], [tail]) ++ + dnl + dnl default webrowser + dnl +diff --git a/xmlto.in b/xmlto.in +index 66423b3..21f9acc 100755 +--- a/xmlto.in ++++ b/xmlto.in +@@ -21,6 +21,7 @@ FIND=@FIND@ # This must be GNU find (need -maxdepth) + MKTEMP=@MKTEMP@ # See http://www.mktemp.org if missing on your system + BASH=@BASH@ # GNU bash, for running the format scripts + GETOPT=@GETOPT@ # a getopt that supports --longoptions ++TAIL=@TAIL@ # a tail that supports -n (posix) + + version () { + echo "@PACKAGE@ version @VERSION@" +@@ -407,7 +408,7 @@ esac + # sed -e 's/^]*?>//g' -e 's/^]*>//g' -e 's/^<\([^ ]*\).*$/\1/') + + # Seems reasonable fix the file command and teach it to identify the DTD/Schema but this is faster to write: +-rootel=$(echo "xpath *" | "$XMLLINT_PATH" --shell "$INPUT_FILE" 2> /dev/null | head -n 3 |tail -n 1 | cut -f 4 -d " " ) ++rootel=$(echo "xpath *" | "$XMLLINT_PATH" --shell "$INPUT_FILE" 2> /dev/null | head -n 3 |$TAIL -n 1 | cut -f 4 -d " " ) + + case $(echo $rootel) in + fo:root) +-- +1.6.3.2 + Added: csw/mgar/pkg/xmlto/trunk/files/0002-add-handling-so-that-gnu-cp-can-be-specified.patch =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/0002-add-handling-so-that-gnu-cp-can-be-specified.patch (rev 0) +++ csw/mgar/pkg/xmlto/trunk/files/0002-add-handling-so-that-gnu-cp-can-be-specified.patch 2009-09-15 17:59:39 UTC (rev 6310) @@ -0,0 +1,191 @@ +From d8102af69b3d635abfb913771d3fe9b1d11ad971 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Tue, 15 Sep 2009 19:39:54 +0200 +Subject: [PATCH 2/2] add handling so that gnu cp can be specified + +--- + configure.in | 3 +++ + format/docbook/fo | 2 +- + format/docbook/html | 2 +- + format/docbook/html-nochunks | 2 +- + format/docbook/htmlhelp | 2 +- + format/docbook/javahelp | 2 +- + format/docbook/man | 2 +- + format/docbook/xhtml | 2 +- + format/docbook/xhtml-nochunks | 2 +- + format/fo/dvi | 2 +- + format/fo/pdf | 2 +- + format/xhtml1/fo | 2 +- + xmlto.in | 2 ++ + 13 files changed, 16 insertions(+), 11 deletions(-) + +diff --git a/configure.in b/configure.in +index 0fb685e..727da83 100644 +--- a/configure.in ++++ b/configure.in +@@ -110,6 +110,9 @@ AC_PATH_PROG([W3M], [w3m], [w3m]) + AC_ARG_VAR([TAIL], [Name and path of a tail binary that supports -n.]) + AC_PATH_PROG([TAIL], [tail], [tail]) + ++AC_ARG_VAR([GCP], [Name and path of a GNU cp binary (need at least -P)]) ++AC_PATH_PROG([GCP], [cp], [cp]) ++ + dnl + dnl default webrowser + dnl +diff --git a/format/docbook/fo b/format/docbook/fo +index 699fe3b..8b4f200 100755 +--- a/format/docbook/fo ++++ b/format/docbook/fo +@@ -7,6 +7,6 @@ stylesheet) + echo "http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl" + ;; + post-process) +- cp -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").fo" ++ ${GCP_PATH:-cp} -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").fo" + ;; + esac +diff --git a/format/docbook/html b/format/docbook/html +index 56bed62..3b2cd71 100755 +--- a/format/docbook/html ++++ b/format/docbook/html +@@ -7,6 +7,6 @@ stylesheet) + echo "http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl" + ;; + post-process) +- cp -R -P -p -- * "$OUTPUT_DIR" ++ ${GCP_PATH:-cp} -R -P -p -- * "$OUTPUT_DIR" + ;; + esac +diff --git a/format/docbook/html-nochunks b/format/docbook/html-nochunks +index 18a0a63..82b635b 100755 +--- a/format/docbook/html-nochunks ++++ b/format/docbook/html-nochunks +@@ -7,6 +7,6 @@ stylesheet) + echo "http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl" + ;; + post-process) +- cp -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").html" ++ ${GCP_PATH:-cp} -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").html" + ;; + esac +diff --git a/format/docbook/htmlhelp b/format/docbook/htmlhelp +index 6ae2750..01553df 100755 +--- a/format/docbook/htmlhelp ++++ b/format/docbook/htmlhelp +@@ -7,6 +7,6 @@ stylesheet) + echo "http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl" + ;; + post-process) +- cp -R -P -p -- * "$OUTPUT_DIR" ++ ${GCP_PATH:-cp} -R -P -p -- * "$OUTPUT_DIR" + ;; + esac +diff --git a/format/docbook/javahelp b/format/docbook/javahelp +index ad50388..57710f0 100755 +--- a/format/docbook/javahelp ++++ b/format/docbook/javahelp +@@ -7,6 +7,6 @@ stylesheet) + echo "http://docbook.sourceforge.net/release/xsl/current/javahelp/javahelp.xsl" + ;; + post-process) +- cp -R -P -p -- *.htm* *.hs *.xml *.jhm "$OUTPUT_DIR" ++ ${GCP_PATH:-cp} -R -P -p -- *.htm* *.hs *.xml *.jhm "$OUTPUT_DIR" + ;; + esac +diff --git a/format/docbook/man b/format/docbook/man +index 1b0d561..525b03b 100755 +--- a/format/docbook/man ++++ b/format/docbook/man +@@ -8,6 +8,6 @@ stylesheet) + ;; + post-process) + [ -e "$XSLT_PROCESSED" ] && rm "$XSLT_PROCESSED" +- cp -R -P -p -- * "$OUTPUT_DIR" 2>/dev/null ++ ${GCP_PATH:-cp} -R -P -p -- * "$OUTPUT_DIR" 2>/dev/null + ;; + esac +diff --git a/format/docbook/xhtml b/format/docbook/xhtml +index 940c250..8204549 100755 +--- a/format/docbook/xhtml ++++ b/format/docbook/xhtml +@@ -7,6 +7,6 @@ stylesheet) + echo "http://docbook.sourceforge.net/release/xsl/current/xhtml/chunk.xsl" + ;; + post-process) +- cp -R -P -p -- *.*htm* "$OUTPUT_DIR" ++ ${GCP_PATH:-cp} -R -P -p -- *.*htm* "$OUTPUT_DIR" + ;; + esac +diff --git a/format/docbook/xhtml-nochunks b/format/docbook/xhtml-nochunks +index 3ae4c81..82b555d 100755 +--- a/format/docbook/xhtml-nochunks ++++ b/format/docbook/xhtml-nochunks +@@ -7,6 +7,6 @@ stylesheet) + echo "http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl" + ;; + post-process) +- cp -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename ${XSLT_PROCESSED%.*}).html" ++ ${GCP_PATH:-cp} -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename ${XSLT_PROCESSED%.*}).html" + ;; + esac +diff --git a/format/fo/dvi b/format/fo/dvi +index 1c797a6..9db53c7 100755 +--- a/format/fo/dvi ++++ b/format/fo/dvi +@@ -34,6 +34,6 @@ post-process) + [ "$VERBOSE" -ge 3 ] && cat $OUT + fi + fi +- cp -R -P -p -- *.dvi "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").dvi" ++ ${GCP_PATH:-cp} -R -P -p -- *.dvi "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").dvi" + ;; + esac +diff --git a/format/fo/pdf b/format/fo/pdf +index c6f55a4..670cd3c 100755 +--- a/format/fo/pdf ++++ b/format/fo/pdf +@@ -37,7 +37,7 @@ DEFAULT|DBLATEX) + [ "$VERBOSE" -ge 3 ] && cat $OUT + fi + fi +- cp -R -P -p -- *.pdf "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").pdf" ++ ${GCP_PATH:-cp} -R -P -p -- *.pdf "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").pdf" + ;; + esac + ;; +diff --git a/format/xhtml1/fo b/format/xhtml1/fo +index 588051e..a445ea0 100755 +--- a/format/xhtml1/fo ++++ b/format/xhtml1/fo +@@ -7,6 +7,6 @@ stylesheet) + echo "http://www.antennahouse.com/XSLsample/sample-xsl-xhtml2fo/xhtml2fo.xsl" + ;; + post-process) +- cp -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").fo" ++ ${GCP_PATH:-cp} -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").fo" + ;; + esac +diff --git a/xmlto.in b/xmlto.in +index 21f9acc..dcab15e 100755 +--- a/xmlto.in ++++ b/xmlto.in +@@ -245,6 +245,7 @@ fi + LINKS_PATH=@LINKS@ + W3M_PATH=@W3M@ + LYNX_PATH=@LYNX@ ++GCP_PATH=@GCP@ + + # Process any options + ARGS=$(${GETOPT} \ +@@ -441,6 +442,7 @@ fi + XSLT_PROCESSOR="$XSLTPROC_PATH" # We only know about xsltproc right now. + export XSLT_PROCESSOR + export W3M_PATH ++export GCP_PATH + export LINKS_PATH + export LYNX_PATH + export FOP_PATH +-- +1.6.3.2 + Added: csw/mgar/pkg/xmlto/trunk/files/0003-do-no-hardcode-bin-bash-to-override-env-check.patch =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/0003-do-no-hardcode-bin-bash-to-override-env-check.patch (rev 0) +++ csw/mgar/pkg/xmlto/trunk/files/0003-do-no-hardcode-bin-bash-to-override-env-check.patch 2009-09-15 17:59:39 UTC (rev 6310) @@ -0,0 +1,24 @@ +From d9ee41aa38e8009bff734ec540c41822a7d3998f Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Tue, 15 Sep 2009 19:45:33 +0200 +Subject: [PATCH 3/3] do no hardcode /bin/bash to override env check + +--- + configure.in | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/configure.in b/configure.in +index 727da83..bf854b7 100644 +--- a/configure.in ++++ b/configure.in +@@ -18,7 +18,6 @@ AC_CHECK_PROG([MKTEMP], [mktemp],, [mktemp]) + AC_ARG_VAR([FIND], [Name of the GNU `find' program.]) + AC_CHECK_PROG([FIND], [find],, [find] ) + +-BASH=/bin/bash + AC_ARG_VAR([BASH], [Name and path of the GNU `bash' shell.]) + AC_PATH_PROG([BASH], [bash], [/bin/bash]) + +-- +1.6.3.2 + Deleted: csw/mgar/pkg/xmlto/trunk/files/no-hardcode-bash.patch =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/no-hardcode-bash.patch 2009-09-15 10:19:44 UTC (rev 6309) +++ csw/mgar/pkg/xmlto/trunk/files/no-hardcode-bash.patch 2009-09-15 17:59:39 UTC (rev 6310) @@ -1,14 +0,0 @@ -diff --speed-large-files --minimal -Nru xmlto-0.0.22.orig/configure.in xmlto-0.0.22/configure.in ---- xmlto-0.0.22.orig/configure.in 2009-03-25 14:48:02.000000000 +0100 -+++ xmlto-0.0.22/configure.in 2009-09-09 02:43:47.431319471 +0200 -@@ -18,9 +18,8 @@ - AC_ARG_VAR([FIND], [Name of the GNU `find' program.]) - AC_CHECK_PROG([FIND], [find],, [find] ) - --BASH=/bin/bash - AC_ARG_VAR([BASH], [Name and path of the GNU `bash' shell.]) --AC_PATH_PROG([BASH], [bash], [/bin/bash]) -+AC_PATH_PROG([BASH], [bash],, [bash]) - - AC_ARG_VAR([GETOPT], [Name of the `getopt' program (requires longopt support).]) - AC_CHECK_PROG([GETOPT], [getopt],, [getopt]) 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 Sep 15 20:02:39 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 15 Sep 2009 18:02:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[6311] csw/mgar/pkg/xmlto/trunk/Makefile Message-ID: Revision: 6311 http://gar.svn.sourceforge.net/gar/?rev=6311&view=rev Author: bdwalton Date: 2009-09-15 18:02:39 +0000 (Tue, 15 Sep 2009) Log Message: ----------- xmlto: depend on CSWgfile Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-15 17:59:39 UTC (rev 6310) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-15 18:02:39 UTC (rev 6311) @@ -7,7 +7,7 @@ REQUIRED_PKGS = CSWsgmlcommon CSWxmlcommon CSWlibxml2 CSWdocbookdtds REQUIRED_PKGS += CSWdocbookxsl CSWlibxslt CSWflex CSWw3m CSWmktemp -REQUIRED_PKGS += CSWggetopt CSWbash +REQUIRED_PKGS += CSWggetopt CSWbash CSWgfile DESCRIPTION = An XSL toolchain front end. define BLURB 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 Sep 16 01:28:28 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 15 Sep 2009 23:28:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[6312] csw/mgar/pkg/sudosh2/trunk Message-ID: Revision: 6312 http://gar.svn.sourceforge.net/gar/?rev=6312&view=rev Author: skayser Date: 2009-09-15 23:28:28 +0000 (Tue, 15 Sep 2009) Log Message: ----------- sudosh2: getting release ready Modified Paths: -------------- csw/mgar/pkg/sudosh2/trunk/Makefile csw/mgar/pkg/sudosh2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/sudosh2/trunk/files/002-strip-man-page-blank.patch csw/mgar/pkg/sudosh2/trunk/files/003-adjust-sudosh-man-binary-name.patch csw/mgar/pkg/sudosh2/trunk/files/changelog.CSW Modified: csw/mgar/pkg/sudosh2/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudosh2/trunk/Makefile 2009-09-15 18:02:39 UTC (rev 6311) +++ csw/mgar/pkg/sudosh2/trunk/Makefile 2009-09-15 23:28:28 UTC (rev 6312) @@ -1,32 +1,59 @@ # TODO/Issues -# - Man pages don't display right now -# - Set sudosh.conf ownership to root:root? -# - Compiled in default for logdir /var/adm/..., if not existant sudosh2 -# totally hangs (^C doesn't work). Change default and include the dir in the -# package? -# - Submit DESTDIR patch upstream +# - Submit 001- (DESTDIR) and 002- (man page) patches upstream +# - What about --logdir perms? Any other special perms required? GARNAME = sudosh2 GARVERSION = 1.0.2 CATEGORIES = apps -DESCRIPTION = Brief description +DESCRIPTION = Extensive auditing of user shell usage define BLURB - Long description + sudosh can be used as a default login shell or a filter that takes + advantage of PTY devices in order to sit between the user's keyboard and + a program, in this case a shell. It was designed specifically to be used + in conjunction with sudo, and allows the execution of a root or + application shell with logging. It is basically a VCR and will record + root shell sessions and also has the ability to play back the sessions + as they were originally recorded. It records all input/output, keyboard + input, and timing information so that the session can be played back in + the original format. + + Sudosh2 is a fork of sudosh (by Douglas Hanks). endef MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tgz CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-logdir=/var/opt/csw/sudosh # No tests available TEST_SCRIPTS = # Installation for sudosh.conf doesn't honor DESTDIR -PATCHFILES = 001-installsudosh.conf-destdir.patch +PATCHFILES = 001-installsudosh.conf-destdir.patch +# Man pages contain an empty line that becomes a full first blank page +PATCHFILES += 002-strip-man-page-blank.patch +# The binary is called sudosh (not sudosh2 - only leave sudosh2 in the title) +PATCHFILES += 003-adjust-sudosh-man-binary-name.patch include gar/category.mk pre-configure-modulated: - perl -pi -e 's|-Werror|-errwarn|g' $(WORKSRC)/Makefile.in $(WORKSRC)/src/Makefile.in + # -errwarn bails out with implicit function declarations + # http://lists.opencsw.org/pipermail/maintainers/2009-September/004159.html + #perl -pi -e 's|-Werror|-errwarn|g' \ + perl -pi -e 's|-Werror||g' \ + $(WORKSRC)/src/Makefile.in \ + $(WORKSRC)/Makefile.in \ + $(WORKSRC)/configure @$(MAKECOOKIE) + +post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) +post-install-modulated: DOCS=AUTHORS NEWS README +post-install-modulated: + ginstall -d $(DESTDIR)/var/opt/csw/sudosh + ginstall -d $(DOCDEST) + cp $(addprefix $(WORKSRC)/,$(DOCS)) $(DOCDEST) + cp $(WORKSRC)/ChangeLog $(DOCDEST)/changelog + cp $(FILEDIR)/changelog.CSW $(DOCDEST) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/sudosh2/trunk/checksums =================================================================== --- csw/mgar/pkg/sudosh2/trunk/checksums 2009-09-15 18:02:39 UTC (rev 6311) +++ csw/mgar/pkg/sudosh2/trunk/checksums 2009-09-15 23:28:28 UTC (rev 6312) @@ -1 +1,4 @@ +652d339ec04952f3d114b9aea838afc5 download/001-installsudosh.conf-destdir.patch +9752d641a2233caf7789711ecbcd890e download/002-strip-man-page-blank.patch +882f7d2ddb59330350dd2d82184aff50 download/003-adjust-sudosh-man-binary-name.patch 4c837f7739d9db780ad324ed8482e8a7 download/sudosh2-1.0.2.tgz Added: csw/mgar/pkg/sudosh2/trunk/files/002-strip-man-page-blank.patch =================================================================== --- csw/mgar/pkg/sudosh2/trunk/files/002-strip-man-page-blank.patch (rev 0) +++ csw/mgar/pkg/sudosh2/trunk/files/002-strip-man-page-blank.patch 2009-09-15 23:28:28 UTC (rev 6312) @@ -0,0 +1,36 @@ +diff --git a/sudosh-replay.8.in b/sudosh-replay.8.in +index e4b93c0..b2159e0 100644 +--- a/sudosh-replay.8.in ++++ b/sudosh-replay.8.in +@@ -1,7 +1,6 @@ + .\" Process this file with + .\" groff -man -Tascii sudosh-replay.1 + .\" +- + .TH SUDOSH-REPLAY 8 "December 20 2007" @VERSION@ "User Manuals" + .SH NAME + sudosh-replay \- view and replay sudosh sessions +diff --git a/sudosh.1.in b/sudosh.1.in +index de95301..cd60622 100644 +--- a/sudosh.1.in ++++ b/sudosh.1.in +@@ -1,7 +1,6 @@ + .\" Process this file with + .\" groff -man -Tascii sudosh.1 + .\" +- + .TH SUDOSH 1 "December 21th 2007" @VERSION@ "User Manuals" + .SH NAME + @PACKAGE_NAME@ \- works like a VCR and records shell sessions. +diff --git a/sudosh.conf.5.in b/sudosh.conf.5.in +index 9a42617..1d115fe 100644 +--- a/sudosh.conf.5.in ++++ b/sudosh.conf.5.in +@@ -1,7 +1,6 @@ + .\" Process this file with + .\" groff -man -Tascii sudosh.1 + .\" +- + .TH SUDOSH.CONF 5 "December 21th 2007" @VERSION@ "User Manuals" + .SH NAME + sudosh.conf \- configuration file for sudosh Added: csw/mgar/pkg/sudosh2/trunk/files/003-adjust-sudosh-man-binary-name.patch =================================================================== --- csw/mgar/pkg/sudosh2/trunk/files/003-adjust-sudosh-man-binary-name.patch (rev 0) +++ csw/mgar/pkg/sudosh2/trunk/files/003-adjust-sudosh-man-binary-name.patch 2009-09-15 23:28:28 UTC (rev 6312) @@ -0,0 +1,16 @@ +diff --git a/sudosh.1.in b/sudosh.1.in +index cd60622..dd46be3 100644 +--- a/sudosh.1.in ++++ b/sudosh.1.in +@@ -5,9 +5,9 @@ + .SH NAME + @PACKAGE_NAME@ \- works like a VCR and records shell sessions. + .SH SYNOPSIS +-.B @PACKAGE_NAME@ [OPTION]... ++.B sudosh [OPTION]... + .SH DESCRIPTION +-.B @PACKAGE_NAME@ ++.B sudosh + can be used as a default login shell or as a filter. sudosh takes advantage of pty devices in order to sit between the user's keyboard and a program, in this case a shell. It was designed specifically to be used in conjunction with + .BR sudo (8) + and allows execution of a shell with logging. It is basically a VCR and will record shell sessions and also has the ability to play back the sessions as they were originally recorded. It records all input/output, keyboard input, and timing information so that the session acn be played back in the original format. Added: csw/mgar/pkg/sudosh2/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/sudosh2/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/sudosh2/trunk/files/changelog.CSW 2009-09-15 23:28:28 UTC (rev 6312) @@ -0,0 +1,5 @@ +sudosh2 (1.0.2,REV=2009.09.16) + + * Initial release. + + -- Sebastian Kayser Wed, 16 Sep 2009 01:11:30 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Sep 16 02:31:47 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 16 Sep 2009 00:31:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[6313] csw/mgar/pkg/xmlto/trunk Message-ID: Revision: 6313 http://gar.svn.sourceforge.net/gar/?rev=6313&view=rev Author: bdwalton Date: 2009-09-16 00:31:46 +0000 (Wed, 16 Sep 2009) Log Message: ----------- xmlto: patch to use type instead of which to detect files Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile csw/mgar/pkg/xmlto/trunk/checksums Added Paths: ----------- csw/mgar/pkg/xmlto/trunk/files/0004-switch-file-detection-from-which-to-type.patch Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-15 23:28:28 UTC (rev 6312) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-16 00:31:46 UTC (rev 6313) @@ -22,6 +22,7 @@ PATCHFILES += 0001-add-support-for-selection-of-posix-tail-binary.patch PATCHFILES += 0002-add-handling-so-that-gnu-cp-can-be-specified.patch PATCHFILES += 0003-do-no-hardcode-bin-bash-to-override-env-check.patch +PATCHFILES += 0004-switch-file-detection-from-which-to-type.patch TEST_TARGET = check Modified: csw/mgar/pkg/xmlto/trunk/checksums =================================================================== --- csw/mgar/pkg/xmlto/trunk/checksums 2009-09-15 23:28:28 UTC (rev 6312) +++ csw/mgar/pkg/xmlto/trunk/checksums 2009-09-16 00:31:46 UTC (rev 6313) @@ -1,4 +1,5 @@ 037997ead86e0589b4e34538d7d2694a download/0001-add-support-for-selection-of-posix-tail-binary.patch 134ec47ba3f225ebd04bfb629b230e69 download/0002-add-handling-so-that-gnu-cp-can-be-specified.patch b53522eb1413d28da8e661b76f4ab098 download/0003-do-no-hardcode-bin-bash-to-override-env-check.patch +aec9edfc4fdc77ee6bc77124bb1235f4 download/0004-switch-file-detection-from-which-to-type.patch 12f297dc7051e4fef08339980f88a1dd download/xmlto-0.0.22.tar.bz2 Added: csw/mgar/pkg/xmlto/trunk/files/0004-switch-file-detection-from-which-to-type.patch =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/0004-switch-file-detection-from-which-to-type.patch (rev 0) +++ csw/mgar/pkg/xmlto/trunk/files/0004-switch-file-detection-from-which-to-type.patch 2009-09-16 00:31:46 UTC (rev 6313) @@ -0,0 +1,170 @@ +From b9b12cdac3163c55bf3af13b1d51dd7c60639d4b Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Wed, 16 Sep 2009 02:30:05 +0200 +Subject: [PATCH 4/4] switch file detection from `which` to `type` + +--- + format/docbook/txt | 6 +++--- + format/fo/dvi | 2 +- + format/fo/pdf | 2 +- + format/xhtml1/txt | 6 +++--- + xmlto.in | 18 +++++++++--------- + 5 files changed, 17 insertions(+), 17 deletions(-) + +diff --git a/format/docbook/txt b/format/docbook/txt +index 390e96a..d72f27f 100755 +--- a/format/docbook/txt ++++ b/format/docbook/txt +@@ -1,14 +1,14 @@ + case "$USE_BACKEND" in + DEFAULT|DBLATEX) +- if [ -n "`which "$W3M_PATH" 2>/dev/null`" ] ++ if [ -n "`type -t $W3M_PATH`" ] + then + CONVERT="$W3M_PATH" + ARGS="-T text/html -dump" +- elif [ -n "`which "$LYNX_PATH" 2>/dev/null`" ] ++ elif [ -n "`type -t $LYNX_PATH`" ] + then + CONVERT="$LYNX_PATH" + ARGS="-force_html -dump -nolist -width=72" +- elif [ -n "`which "$LINKS_PATH" 2>/dev/null`" ] ++ elif [ -n "`type -t $LINKS_PATH`" ] + then + CONVERT="$LINKS_PATH" + ARGS="-dump" +diff --git a/format/fo/dvi b/format/fo/dvi +index 9db53c7..a9af333 100755 +--- a/format/fo/dvi ++++ b/format/fo/dvi +@@ -6,7 +6,7 @@ post-process) + then + echo >&2 "Post-process XSL-FO to DVI" + fi +- if [ -z "`which $XMLTEX_PATH 2>/dev/null`" ] ++ if [ -z "`type -t $XMLTEX_PATH`" ] + then + echo >&2 "Can't process, xmltex tool not found at $XMLTEX_PATH." + exit 3 +diff --git a/format/fo/pdf b/format/fo/pdf +index 670cd3c..aa967aa 100755 +--- a/format/fo/pdf ++++ b/format/fo/pdf +@@ -8,7 +8,7 @@ DEFAULT|DBLATEX) + then + echo >&2 "Post-process XSL-FO to PDF" + fi +- if [ -z "`which $PDFXMLTEX_PATH 2>/dev/null`" ] ++ if [ -z "`type -t $PDFXMLTEX_PATH`" ] + then + echo >&2 "Can't process, pdfxmltex tool not found at $PDFXMLTEX_PATH." + exit 3 +diff --git a/format/xhtml1/txt b/format/xhtml1/txt +index fa34ff7..18c9559 100755 +--- a/format/xhtml1/txt ++++ b/format/xhtml1/txt +@@ -1,14 +1,14 @@ + case "$USE_BACKEND" in + DEFAULT|DBLATEX) +- if [ -n "`which "$W3M_PATH" 2>/dev/null`" ] ++ if [ -n "`type -t $W3M_PATH`" ] + then + CONVERT="$W3M_PATH" + ARGS="-T text/html -dump" +- elif [ -n "`which "$LYNX_PATH" 2>/dev/null`" ] ++ elif [ -n "`type -t $LYNX_PATH`" ] + then + CONVERT="$LYNX_PATH" + ARGS="-force_html -dump -nolist -width=72" +- elif [ -n "`which "$LINKS_PATH" 2>/dev/null`" ] ++ elif [ -n "`type -t $LINKS_PATH`" ] + then + CONVERT="$LINKS_PATH" + ARGS="-dump" +diff --git a/xmlto.in b/xmlto.in +index dcab15e..45221a6 100755 +--- a/xmlto.in ++++ b/xmlto.in +@@ -125,7 +125,7 @@ XMLLINT_PATH=@XMLLINT@ + XSLTPROC_PATH=@XSLTPROC@ + + # Try to setup papersize using libpaper first ... +-if [ -n "`which "$PAPERCONF_PATH" 2>/dev/null`" ] ++if [ -n "`type -t $PAPERCONF_PATH`" ] + then + papername=`"$PAPERCONF_PATH" -n` + paperheight=`"$PAPERCONF_PATH" -mh | sed 's/ //g'` +@@ -156,7 +156,7 @@ EOF + fi + + # ... or use magic paper size, based on LC_PAPER +-elif [ -n "`which "$LOCALE_PATH" 2>/dev/null`" ] ++elif [ -n "`type -t $LOCALE_PATH`" ] + then + # For paper sizes we know about, specify them. + h=$("$LOCALE_PATH" LC_PAPER 2>/dev/null | head -n 1) +@@ -179,7 +179,7 @@ EOF + fi + + # Magic encoding, based on locale +-if [ -n "`which "$LOCALE_PATH" 2>/dev/null`" ] ++if [ -n "`type -t $LOCALE_PATH`" ] + then + charmap=$("$LOCALE_PATH" charmap 2>/dev/null) + +@@ -228,14 +228,14 @@ XMLTEX_PATH=@XMLTEX@ + PDFXMLTEX_PATH=@PDFXMLTEX@ + + #check if we could use fop/dblatex backend as default(if not, use passivetex) +-if [ x"$USE_BACKEND" = xFOP ] && [ -z "`which "$FOP_PATH" 2>/dev/null`" ] ++if [ x"$USE_BACKEND" = xFOP ] && [ -z "`type -t $FOP_PATH`" ] + then + echo >&2 "@PACKAGE@: Warning: fop not found or not executable." + echo >&2 "@PACKAGE@: Using default backend..." + USE_BACKEND=DEFAULT + fi + if [ x"$USE_BACKEND" = xDBLATEX ] && \ +- [ -z "`which "$DBLATEX_PATH" 2>/dev/null`" ] ++ [ -z "`type -t $DBLATEX_PATH`" ] + then + echo >&2 "@PACKAGE@: Warning: dblatex not found or not executable." + echo >&2 "@PACKAGE@: Using default backend..." +@@ -330,7 +330,7 @@ while [ "$#" -gt "0" ]; do + ;; + --with-fop) + ##use fop instead of passivetex where possible +- if [ -z "`which "$FOP_PATH" 2>/dev/null`" ] ++ if [ -z "`type -t $FOP_PATH`" ] + then + echo >&2 Warning: fop not found or not executable. + echo >&2 Using default backend... +@@ -341,7 +341,7 @@ while [ "$#" -gt "0" ]; do + ;; + --with-dblatex) + ##use dblatex instead of passivetex where possible +- if [ -z "`which "$DBLATEX_PATH" 2>/dev/null`" ] ++ if [ -z "`type -t $DBLATEX_PATH`" ] + then + echo >&2 Warning: dblatex not found or not executable. + echo >&2 Using default backend... +@@ -490,7 +490,7 @@ cd "$XSLT_PROCESSED_DIR" + if [ "$SKIP_VALIDATION" -eq 0 ] && [ "$SOURCE_FORMAT" != "fo" ] + then + #do we have xmllint validation tool? +- if [ -z "`which "$XMLLINT_PATH" 2>/dev/null`" ] ++ if [ -z "`type -t $XMLLINT_PATH`" ] + then + echo >&2 "@PACKAGE@: xmllint validation tool not found or not executable." + echo >&2 "@PACKAGE@: Skipping validation... " \ +@@ -522,7 +522,7 @@ then + else + + #do we have xsltproc tool? +- if [ -z "`which "$XSLTPROC_PATH" 2>/dev/null`" ] ++ if [ -z "`type -t $XSLTPROC_PATH`" ] + then + echo >&2 "@PACKAGE@: Can't continue, xsltproc tool not found or not executable." + exit 3 +-- +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 Wed Sep 16 02:58:09 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 16 Sep 2009 00:58:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[6314] csw/mgar/pkg/facter/trunk Message-ID: Revision: 6314 http://gar.svn.sourceforge.net/gar/?rev=6314&view=rev Author: wahwah Date: 2009-09-16 00:58:08 +0000 (Wed, 16 Sep 2009) Log Message: ----------- facter: Version bump to 1.5.6 Modified Paths: -------------- csw/mgar/pkg/facter/trunk/Makefile csw/mgar/pkg/facter/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/facter/trunk/Makefile Modified: csw/mgar/pkg/facter/trunk/Makefile =================================================================== --- csw/mgar/pkg/facter/trunk/Makefile 2009-09-16 00:31:46 UTC (rev 6313) +++ csw/mgar/pkg/facter/trunk/Makefile 2009-09-16 00:58:08 UTC (rev 6314) @@ -1,33 +1,37 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + GARNAME = facter -GARVERSION = 1.5.4 +GARVERSION = 1.5.6 CATEGORIES = apps -DESCRIPTION = a system fact gatherer +DESCRIPTION = a system fact gatherer define BLURB - A cross-platform Ruby library for retrieving facts from operating systems. - Supports multiple resolution mechanisms, any of which can be restricted to - working only on certain operating systems or environments. Facter is - especially useful for retrieving things like operating system names, IP - addresses, MAC addresses, and SSH keys. + A cross-platform Ruby library for retrieving facts from operating systems. + Supports multiple resolution mechanisms, any of which can be restricted to + working only on certain operating systems or environments. Facter is + especially useful for retrieving things like operating system names, IP + addresses, MAC addresses, and SSH keys. - It is easy to extend Facter to include your own custom facts or to include - additional mechanisms for retrieving facts. + It is easy to extend Facter to include your own custom facts or to include + additional mechanisms for retrieving facts. endef MASTER_SITES = http://reductivelabs.com/downloads/facter/ -DISTFILES = $(GARNAME)-$(GARVERSION).tgz +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PREREQUISITE_PKGS += CSWruby REQUIRED_PKGS = CSWruby +PREREQUISITE_PKGS = $(REQUIRED_PKGS) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz ARCHALL=1 -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = -TEST_SCRIPTS = +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = INSTALL_SCRIPTS = facter include gar/category.mk Property changes on: csw/mgar/pkg/facter/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/facter/trunk/checksums =================================================================== --- csw/mgar/pkg/facter/trunk/checksums 2009-09-16 00:31:46 UTC (rev 6313) +++ csw/mgar/pkg/facter/trunk/checksums 2009-09-16 00:58:08 UTC (rev 6314) @@ -1 +1 @@ -0df92b81606f8e23bdd1f2ade597049b download/facter-1.5.4.tgz +f2eda650cadfdaf549fab1a436c0db4d download/facter-1.5.6.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 Sep 16 03:53:44 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 16 Sep 2009 01:53:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[6315] csw/mgar/pkg/mysql5/branches/mysql-5.0.x Message-ID: Revision: 6315 http://gar.svn.sourceforge.net/gar/?rev=6315&view=rev Author: wahwah Date: 2009-09-16 01:53:44 +0000 (Wed, 16 Sep 2009) Log Message: ----------- mysql5: First iteration of slicing it into separate packages. Things left to do: Creating mysql user and group, pre/post install/remove scripts, a check if MySQL database exists Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0001-Use-libc-not-libcrypt.patch csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0002-cast-user_info-pw_gid-to-gid_t.patch csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0003-OpenCSW-perl-for-tests.patch csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0004-basedir-and-datadir-in-the-cnf-files.patch csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW 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-09-16 00:58:08 UTC (rev 6314) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-09-16 01:53:44 UTC (rev 6315) @@ -1,5 +1,5 @@ GARNAME = mysql5 -GARVERSION = 5.1.33 +GARVERSION = 5.0.84 CATEGORIES = server DISTNAME = mysql-$(GARVERSION) @@ -10,30 +10,70 @@ (Structured Query Language) database server. endef +# Change prefix to /opt/csw/mysql5 +prefix = /opt/csw/mysql5 +sysconfdir = /etc/opt/csw/mysql5 +localstatedir = /var/opt/csw/mysql5 + +INITSMF = $(sysconfdir)/init\.d/cswmysql5 + +PATCHFILES = 0001-Use-libc-not-libcrypt.patch +PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch +PATCHFILES += 0003-OpenCSW-perl-for-tests.patch +PATCHFILES += 0004-basedir-and-datadir-in-the-cnf-files.patch + PACKAGES = CSWmysql5 CSWmysql5bench CSWmysql5client CSWmysql5devel PACKAGES += CSWmysql5rt CSWmysql5test -CATALOGNAME_CSWmysql5 = $(GARNAME) -CATALOGNAME_CSWmysql5bench = $(GARNAME)bench -CATALOGNAME_CSWmysql5clien = $(GARNAME)client -CATALOGNAME_CSWmysql5devel = $(GARNAME)devel -CATALOGNAME_CSWmysql5rt = $(GARNAME)rt -CATALOGNAME_CSWmysql5test = $(GARNAME)test +CATALOGNAME_CSWmysql5 = $(GARNAME) +CATALOGNAME_CSWmysql5bench = $(GARNAME)bench +CATALOGNAME_CSWmysql5client = $(GARNAME)client +CATALOGNAME_CSWmysql5devel = $(GARNAME)devel +CATALOGNAME_CSWmysql5rt = $(GARNAME)rt +CATALOGNAME_CSWmysql5test = $(GARNAME)test -MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.1/ +SPKG_DESC_CSWmysql5 = Multithreaded SQL database +SPKG_DESC_CSWmysql5bench = MySQL 5 benchmarking +SPKG_DESC_CSWmysql5client = MySQL 5 client binaries +SPKG_DESC_CSWmysql5devel = MySQL 5 header files +SPKG_DESC_CSWmysql5rt = MySQL 5 runtime files +SPKG_DESC_CSWmysql5test = MySQL 5 testing files + +support64 = (/(amd64|i386))? +PKGFILES_CSWmysql5client = $(bindir) +PKGFILES_CSWmysql5client += $(bindir)$(support64)/myisam(log|pack) +PKGFILES_CSWmysql5client += $(bindir)$(support64)/mysql +PKGFILES_CSWmysql5client += $(bindir)$(support64)/mysql_client_test +PKGFILES_CSWmysql5client += $(bindir)$(support64)/mysql(_zap|access|admin|binlog|check) +PKGFILES_CSWmysql5client += $(bindir)$(support64)/mysql(dump|hotcopy|import|show) +PKGFILES_CSWmysql5client += $(bindir)$(support64)/(perror|replace) +PKGFILES_CSWmysql5client += $(mandir)/man1/mysql(|\_zap|access|admin|dump|show)\.1 +PKGFILES_CSWmysql5client += $(mandir)/man1/(perror|replace)\.1 +PKGFILES_CSWmysql5devel = $(prefix)/include.* +PKGFILES_CSWmysql5devel += $(bindir)$(support64)/mysql_config +PKGFILES_CSWmysql5devel += $(mandir)/man1/mysql_config\.1 +PKGFILES_CSWmysql5rt = $(prefix)/lib/.*\.so.* +PKGFILES_CSWmysql5bench = $(prefix)/sql-bench.* +PKGFILES_CSWmysql5test = $(prefix)/mysql-test.* + +REQUIRED_PKGS_CSWmysql5client = CSWmysql5rt + +MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.0/ DISTFILES = mysql-$(GARVERSION).tar.gz +DISTFILES += cswmysql5 quick_start-csw README.CSW + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# Change prefix to /opt/csw/mysql5 -prefix = /opt/csw/mysql5 +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_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ # Set ./configure options @@ -49,9 +89,21 @@ CONFIGURE_ARGS += --with-ssl=/opt/csw CONFIGURE_ARGS += --with-plugins=max-no-ndb -#TEST_ARGS = test-force +TEST_SCRIPTS = # Enable 64 bits build BUILD64 = 1 include gar/category.mk + +post-install-modulated: + ginstall -m 755 -d $(DESTDIR)$(localstatedir) + ginstall -m 755 -d $(DESTDIR)$(datadir)/mysql5/doc + ginstall -m 644 $(FILEDIR)/README.CSW $(DESTDIR)$(datadir)/mysql5/doc + ginstall -m 755 -d $(DESTDIR)/opt/csw/share/mysql5/doc + ln -s ../../../mysql5/share/mysql5/doc/README.CSW \ + $(DESTDIR)/opt/csw/share/mysql5/doc/README.CSW + ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d + ginstall -m 755 $(FILEDIR)/cswmysql5 $(DESTDIR)/etc/opt/csw/init.d + ginstall -m 755 $(FILEDIR)/quick_start-csw $(DESTDIR)$(datadir)/mysql5 + @$(MAKECOOKIE) Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-09-16 00:58:08 UTC (rev 6314) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-09-16 01:53:44 UTC (rev 6315) @@ -1 +1,8 @@ -9c5711e9bea4514df6f2659f283f0aa0 download/mysql-5.1.33.tar.gz +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 +70d7860bfa776dfc5510fc11d7c14203 download/README.CSW +815a50011c356cd29758ca2195804952 download/cswmysql5 +671348f1a5b078da9ca76f97e1fda325 download/mysql-5.0.84.tar.gz +1d79b3cfc4f91db05952bf71f0181fe7 download/quick_start-csw Added: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0001-Use-libc-not-libcrypt.patch =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0001-Use-libc-not-libcrypt.patch (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0001-Use-libc-not-libcrypt.patch 2009-09-16 01:53:44 UTC (rev 6315) @@ -0,0 +1,28 @@ +From a527f284ef5646dbdd731af007aace3daee3e946 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Wed, 16 Sep 2009 01:27:38 +0100 +Subject: [PATCH 1/4] Use libc, not libcrypt + +--- + configure.in | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +diff --git a/configure.in b/configure.in +index ec432e1..577cfe3 100644 +--- a/configure.in ++++ b/configure.in +@@ -891,7 +891,10 @@ AC_CHECK_FUNC(p2open, , AC_CHECK_LIB(gen, p2open)) + # This may get things to compile even if bind-8 is installed + AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind)) + # Check if crypt() exists in libc or libcrypt, sets LIBS if needed +-AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt])) ++## AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt])) ++# For crypt() on Solaris use libc, not libcrypt ++AC_CHECK_LIB(c, crypt) ++AC_CHECK_FUNC(crypt, AC_DEFINE([HAVE_CRYPT], [1], [crypt])) + # See if we need a library for address lookup. + AC_SEARCH_LIBS(inet_aton, [socket nsl resolv]) + +-- +1.6.3.2 + Added: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0002-cast-user_info-pw_gid-to-gid_t.patch =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0002-cast-user_info-pw_gid-to-gid_t.patch (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0002-cast-user_info-pw_gid-to-gid_t.patch 2009-09-16 01:53:44 UTC (rev 6315) @@ -0,0 +1,27 @@ +From 8536f5925a96634950decd8779b2c6a60d183134 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Wed, 16 Sep 2009 01:29:57 +0100 +Subject: [PATCH 2/4] cast user_info->pw_gid to gid_t + +--- + sql/mysqld.cc | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/sql/mysqld.cc b/sql/mysqld.cc +index 592ae3e..695fbb9 100644 +--- a/sql/mysqld.cc ++++ b/sql/mysqld.cc +@@ -1436,7 +1436,9 @@ static void set_user(const char *user, struct passwd *user_info_arg) + output a specific message to help the user resolve this problem. + */ + calling_initgroups= TRUE; +- initgroups((char*) user, user_info_arg->pw_gid); ++/* Solaris patch */ ++/* initgroups((char*) user, user_info->pw_gid); */ ++ initgroups((char*) user,(gid_t) user_info->pw_gid); + calling_initgroups= FALSE; + #endif + if (setgid(user_info_arg->pw_gid) == -1) +-- +1.6.3.2 + Added: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0003-OpenCSW-perl-for-tests.patch =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0003-OpenCSW-perl-for-tests.patch (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0003-OpenCSW-perl-for-tests.patch 2009-09-16 01:53:44 UTC (rev 6315) @@ -0,0 +1,22 @@ +From bd9a3ff419f5a614d584aa6156a512e69f470e0f Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Wed, 16 Sep 2009 01:36:09 +0100 +Subject: [PATCH 3/4] OpenCSW perl for tests + +--- + mysql-test/mysql-test-run.pl | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl +index f60701b..cd9f843 100755 +--- a/mysql-test/mysql-test-run.pl ++++ b/mysql-test/mysql-test-run.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl ++#!/opt/csw/bin/perl + # -*- cperl -*- + + # +-- +1.6.3.2 + Added: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0004-basedir-and-datadir-in-the-cnf-files.patch =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0004-basedir-and-datadir-in-the-cnf-files.patch (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0004-basedir-and-datadir-in-the-cnf-files.patch 2009-09-16 01:53:44 UTC (rev 6315) @@ -0,0 +1,81 @@ +From 194dbf9ff230f747bb093970831fbdf4cb0f0674 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Wed, 16 Sep 2009 01:38:35 +0100 +Subject: [PATCH 4/4] basedir and datadir in the cnf files + +--- + support-files/my-huge.cnf.sh | 2 ++ + support-files/my-innodb-heavy-4G.cnf.sh | 2 ++ + support-files/my-large.cnf.sh | 2 ++ + support-files/my-medium.cnf.sh | 2 ++ + support-files/my-small.cnf.sh | 2 ++ + 5 files changed, 10 insertions(+), 0 deletions(-) + +diff --git a/support-files/my-huge.cnf.sh b/support-files/my-huge.cnf.sh +index e4747ac..907b41d 100644 +--- a/support-files/my-huge.cnf.sh ++++ b/support-files/my-huge.cnf.sh +@@ -23,6 +23,8 @@ socket = @MYSQL_UNIX_ADDR@ + + # The MySQL server + [mysqld] ++basedir = /opt/csw/mysql5 ++datadir = /var/opt/csw/mysql5 + port = @MYSQL_TCP_PORT@ + socket = @MYSQL_UNIX_ADDR@ + skip-locking +diff --git a/support-files/my-innodb-heavy-4G.cnf.sh b/support-files/my-innodb-heavy-4G.cnf.sh +index cda11d6..a9d5514 100644 +--- a/support-files/my-innodb-heavy-4G.cnf.sh ++++ b/support-files/my-innodb-heavy-4G.cnf.sh +@@ -39,6 +39,8 @@ socket = @MYSQL_UNIX_ADDR@ + # The MySQL server + # + [mysqld] ++basedir = /opt/csw/mysql5 ++datadir = /var/opt/csw/mysql5 + + # generic configuration options + port = @MYSQL_TCP_PORT@ +diff --git a/support-files/my-large.cnf.sh b/support-files/my-large.cnf.sh +index 981b137..8b890fb 100644 +--- a/support-files/my-large.cnf.sh ++++ b/support-files/my-large.cnf.sh +@@ -23,6 +23,8 @@ socket = @MYSQL_UNIX_ADDR@ + + # The MySQL server + [mysqld] ++basedir = /opt/csw/mysql5 ++datadir = /var/opt/csw/mysql5 + port = @MYSQL_TCP_PORT@ + socket = @MYSQL_UNIX_ADDR@ + skip-locking +diff --git a/support-files/my-medium.cnf.sh b/support-files/my-medium.cnf.sh +index c3135ea..ef841db 100644 +--- a/support-files/my-medium.cnf.sh ++++ b/support-files/my-medium.cnf.sh +@@ -24,6 +24,8 @@ socket = @MYSQL_UNIX_ADDR@ + + # The MySQL server + [mysqld] ++basedir = /opt/csw/mysql5 ++datadir = /var/opt/csw/mysql5 + port = @MYSQL_TCP_PORT@ + socket = @MYSQL_UNIX_ADDR@ + skip-locking +diff --git a/support-files/my-small.cnf.sh b/support-files/my-small.cnf.sh +index 24c0840..89299dd 100644 +--- a/support-files/my-small.cnf.sh ++++ b/support-files/my-small.cnf.sh +@@ -24,6 +24,8 @@ socket = @MYSQL_UNIX_ADDR@ + + # The MySQL server + [mysqld] ++basedir = /opt/csw/mysql5 ++datadir = /var/opt/csw/mysql5 + port = @MYSQL_TCP_PORT@ + socket = @MYSQL_UNIX_ADDR@ + skip-locking +-- +1.6.3.2 + Copied: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW (from rev 6058, csw/mgar/pkg/mysql5/branches/legacy/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-09-16 01:53:44 UTC (rev 6315) @@ -0,0 +1,62 @@ +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 Copied: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 (from rev 6058, csw/mgar/pkg/mysql5/branches/legacy/cswmysql5) =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 2009-09-16 01:53:44 UTC (rev 6315) @@ -0,0 +1,180 @@ +#!/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 +# 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 +# for 'Using Option Files'. +# Support for mysql5rc still remains in this startup script. +# + +RETVAL=0 +MYSQLHOME=/opt/csw/mysql5 +MYSQLD_DATADIR=$MYSQLHOME/var +MYSQLD_PID_FILE=$MYSQLHOME/var/mysql.pid +CONFFILE=$MYSQLHOME/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 +# $MYSQLHOME/share/mysql +# For example, +# cp /opt/csw/mysql5/share/mysql/my-medium.cnf /opt/csw/mysql5/var/my.cnf +# +# Or, manually follow the database creation steps below, and have +# mysql just use defaults for everything. + +# 2006-03-11 Changed to only look for the grant tables database +# 2006-04-16 Changed again. Look for either the grant tables database +# or the options file. +# 2006-12-28 Fix problem. Look for either the grant tables database in +# the default location or the default options file. +if [ ! -d "$MYSQLD_DATADIR/mysql" -a ! -f "$CONFFILE" ] ; then + exit 0 +fi + +# If CONFFILE is the server default file, unset CONFFILE +if [ x"$CONFFILE" = x"$MYSQLHOME/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 + MYSQLD_DATADIR= +fi + +# Make sure required vars are set +MYSQLD_PID_FILE=${MYSQLD_PID_FILE:=$MYSQLHOME/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 + fi + + printf "%-60s" "Starting mysqld: " +# 2006-03-11 +# 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 +# fi + +# 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 + RETVAL=$? + if [ $RETVAL = 0 ] ; then + echo "[ OK ]" + else + echo "[FAILED]" + return 1 + fi + return 0 +} + +stop_it() { + + 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=$? + else + RETVAL=1 + fi + if [ $RETVAL = 0 ] ; then + echo "[ OK ]" + else + echo "[FAILED]" + fi + echo "" + return 0 +} + +case $1 in + start) + start_it + ;; + + stop) + stop_it + ;; + + restart) + stop_it + while pgrep mysqld > /dev/null + do + sleep 1 + done + start_it + ;; + + *) + echo "Usage: $0 { start | stop | restart } " + ;; +esac + +exit $RETVAL Copied: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw (from rev 6058, csw/mgar/pkg/mysql5/branches/legacy/quick_start-csw) =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw 2009-09-16 01:53:44 UTC (rev 6315) @@ -0,0 +1,132 @@ +#!/bin/ksh -p +# 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 +DEFAULTS_FILE=$BASEDIR/my.cnf +SAVE_DEFAULTS_FILE=$BASEDIR/my.cnf +MYSQLD_USER=mysql +# +# Provide a default data directory +MYSQLD_DATADIR=/opt/csw/mysql5/var +# +echo +echo "This is the blastwave quick start script to setup a MySQL5 database" +echo " directory." +echo +echo " The base directory is $BASEDIR." +echo " The default database directory is $MYSQLD_DATADIR." +echo +echo " If you have not setup a partition for the database and" +echo " you want one; now is a good time to exit this script and" +echo " create and mount the partition." +echo +echo " If you have not setup a my.cnf file and you do not want" +echo " one of the sample files; now is a good time to exit and" +echo " create the file $DEFAULTS_FILE." +echo +echo "Data directory: The default is $MYSQLD_DATADIR." +unset usrin +usrin=`/usr/bin/ckpath -ay -d [default] \ + -p "Accept the default or enter a directory" + ` || exit $? +if [ ! "$usrin" = "[default]" ]; then + MYSQLD_DATADIR=$usrin +fi +echo +echo "my.cnf pathname: The default is either to use the supplied file in" +echo " the base directory or to create one in the base directory from" +echo " the small memory footprint sample. If your enter a pathname," +echo " it will be used to create the options file in the base directory." +unset usrin +usrin=`/usr/bin/ckpath -f -d [default] \ + -p "Accept the default or enter a pathname" + ` || 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." + else + IN_DEFAULTS_FILE=$DEFAULTS_FILE + echo "Using $DEFAULTS_FILE as the options file." + fi +else + IN_DEFAULTS_FILE=$usrin + echo "Using $IN_DEFAULTS_FILE to create the options file." +fi + +echo "data directory is $MYSQLD_DATADIR" +if [ ! -d "$MYSQLD_DATADIR" ]; then + echo "data directory will be created." +fi + +unset usrin +usrin=`/usr/bin/ckyorn -d y \ + -p "Continue with installation or quit" + ` || exit $? +if [ "$usrin" = "n" ] ; then + echo "Leaving script without doing anything." + exit 0 +fi + +if [ -d "$MYSQLD_DATADIR/mysql" ]; then + echo "mysql database already exists. Leaving script without doing anything." + exit 0 +fi + +echo "Setting up the database" +# Create the database directory and set the permissions if needed +if [ ! -d "$MYSQLD_DATADIR" ] ; then + mkdir -p $MYSQLD_DATADIR + chown -R root:bin $MYSQLD_DATADIR + chmod -R 0755 $MYSQLD_DATADIR + chown mysql:mysql $MYSQLD_DATADIR + chmod 0700 $MYSQLD_DATADIR +fi +# +# copy the configuration file if not exists. +CNFCOPIED=no +if [ ! -f "$DEFAULTS_FILE" ] ; then + cp -p $IN_DEFAULTS_FILE $DEFAULTS_FILE + CNFCOPIED=yes +fi +# +# Run the mysql script to create the database +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 + +# +# Fix permissions on the data directory +chown -R mysql:mysql $MYSQLD_DATADIR + +# +# Update --datadir in the cnf file with the correct value if file was copied +if [ x"$CNFCOPIED" = xyes ]; then + sed -e "s|/opt/csw/mysql5/var|$MYSQLD_DATADIR|g" $DEFAULTS_FILE >$DEFAULTS_FILE.new + mv $DEFAULTS_FILE.new $DEFAULTS_FILE +fi + +# +# Ending message +echo +echo "### The following messages are from quick_start-csw." +echo "See /opt/csw/mysql5/share/mysql/doc/README.CSW for packaging changes." +echo "Please ignore references to starting mysqld_safe in the messages above." +echo " These messages are from mysql_install_db. See the following" +echo " for starting CSWmysql5." +smf=no +if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ] ; then smf=yes ; fi +if [ $smf = yes ] +then + echo "To start mysqld; run \`svcadm enable cswmysql5\` on Solaris 10 or later" +else + echo "To start mysqld; run \`/etc/init.d/cswmysql start\` on Solaris 9 or earlier" +fi + +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 Wed Sep 16 12:56:09 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 16 Sep 2009 10:56:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[6316] csw/mgar/pkg/puppet/trunk Message-ID: Revision: 6316 http://gar.svn.sourceforge.net/gar/?rev=6316&view=rev Author: wahwah Date: 2009-09-16 10:56:09 +0000 (Wed, 16 Sep 2009) Log Message: ----------- puppet: Using cswclassutils, separating CSWpuppetmaster, version bump to 0.25.0. Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/Makefile csw/mgar/pkg/puppet/trunk/checksums csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postremove csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preinstall csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preremove Added Paths: ----------- csw/mgar/pkg/puppet/trunk/files/cswusergroup Removed Paths: ------------- csw/mgar/pkg/puppet/trunk/files/CSWpuppet.gspec csw/mgar/pkg/puppet/trunk/files/cswpuppetd.xml csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd.xml csw/mgar/pkg/puppet/trunk/files/svc-cswpuppetd csw/mgar/pkg/puppet/trunk/files/svc-cswpuppetmasterd Property Changed: ---------------- csw/mgar/pkg/puppet/trunk/Makefile csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postremove csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preinstall csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preremove Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2009-09-16 01:53:44 UTC (rev 6315) +++ csw/mgar/pkg/puppet/trunk/Makefile 2009-09-16 10:56:09 UTC (rev 6316) @@ -1,58 +1,66 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + GARNAME = puppet -GARVERSION = 0.24.7 +GARVERSION = 0.25.0 CATEGORIES = apps -DESCRIPTION = a system configuration tool define BLURB Long description endef MASTER_SITES = http://reductivelabs.com/downloads/puppet/ -DISTFILES = $(GARNAME)-$(GARVERSION).tgz -DISTFILES += $(call admfiles,CSWpuppet,preinstall postinstall preremove postremove) -DISTFILES += cswpuppetd cswpuppetd.xml cswpuppetmasterd cswpuppetmasterd.xml -DISTFILES += svc-cswpuppetd svc-cswpuppetmasterd +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += cswpuppetd cswpuppetmasterd cswusergroup +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +SPKG_SOURCEURL = http://reductivelabs.com/products/puppet/ +INITSMF = $(sysconfdir)/init\.d/cswpuppetd +INITSMF += $(sysconfdir)/init\.d/cswpuppetmasterd +USERGROUP = $(sysconfdir)/pkg/CSWpuppet/cswusergroup + +# Creating a separate package CSWpuppetmaster so that the cswpuppetmaster +# service isn't started upon the installation of CSWpuppet. +PACKAGES = CSWpuppet CSWpuppetmaster + REQUIRED_PKGS = CSWfacter +REQUIRED_PKGS_CSWpuppetmaster = CSWpuppet -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +PKGFILES_CSWpuppetmaster = $(sysconfdir)/init\.d/cswpuppetmasterd +SPKG_DESC_CSWpuppet = System configuration management tool, client daemon +SPKG_DESC_CSWpuppetmaster = System configuration management tool, server ARCHALL=1 -CONFIGURE_SCRIPTS = none -BUILD_SCRIPTS = none -TEST_SCRIPTS = none +sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = INSTALL_SCRIPTS = puppet include gar/category.mk -configure-none: - @$(MAKECOOKIE) - -test-none: - @$(MAKECOOKIE) - -build-none: - @$(MAKECOOKIE) - install-puppet: @ginstall -d $(DESTDIR) - @ginstall -d $(DESTDIR)/etc/opt/csw/puppet - @ginstall -d $(DESTDIR)/var/opt/csw/puppet/run - @ginstall -d $(DESTDIR)/opt/csw/var/svc/manifest - @ginstall -d $(DESTDIR)/opt/csw/lib/svc/method + @ginstall -d $(DESTDIR)$(sysconfdir)/puppet + @ginstall -d $(DESTDIR)$(localstatedir)/puppet/run + ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/init.d + ginstall -m 755 $(FILEDIR)/cswpuppetd $(DESTDIR)$(sysconfdir)/init.d + ginstall -m 755 $(FILEDIR)/cswpuppetmasterd $(DESTDIR)$(sysconfdir)/init.d (cd $(WORKDIR)/$(DISTNAME) ; \ - gsed -e "s|/var/puppet|/var/opt/csw/puppet|g" < ./lib/puppet/defaults.rb > ./lib/puppet/defaults.rb.csw && gmv ./lib/puppet/defaults.rb.csw ./lib/puppet/defaults.rb; \ - gsed -e "s|/etc/puppet|/etc/opt/csw/puppet|g" < ./lib/puppet/defaults.rb > ./lib/puppet/defaults.rb.csw && gmv ./lib/puppet/defaults.rb.csw ./lib/puppet/defaults.rb; \ - DESTDIR=$(DESTDIR) ruby install.rb ; \ - cd $(DESTDIR)$(mandir)/man8 ; \ - gunzip * ) + gsed -e "s|/var/puppet|/var/opt/csw/puppet|g" -i ./lib/puppet/defaults.rb; \ + gsed -e "s|/etc/puppet|/etc/opt/csw/puppet|g" -i ./lib/puppet/defaults.rb; \ + gsed -e "s|/var/run/puppet|/var/opt/csw/puppet/run|g" -i ./lib/puppet/defaults.rb; \ + DESTDIR=$(DESTDIR) ruby install.rb; \ + cd $(DESTDIR)$(mandir)/man8 && gunzip *) (cd $(WORKDIR)/$(DISTNAME)/examples/etc/puppet ; \ for f in *; do \ if [ -f $$f ] ; then \ - cp $$f $(DESTDIR)/etc/opt/csw/puppet/$$f.example; \ - chmod 644 $(DESTDIR)/etc/opt/csw/puppet/$$f.example; \ + cp $$f $(DESTDIR)$(sysconfdir)/puppet/$$f.example; \ + chmod 644 $(DESTDIR)$(sysconfdir)/puppet/$$f.example; \ fi \ - done ) + done) @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/puppet/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2009-09-16 01:53:44 UTC (rev 6315) +++ csw/mgar/pkg/puppet/trunk/checksums 2009-09-16 10:56:09 UTC (rev 6316) @@ -1,12 +1,4 @@ -36f57de5c2e069d04752f0539034227d download/puppet-0.24.7.tgz -a8dc43771843b852f506f1795231d6ee download/CSWpuppet.gspec -11c352613cf14412565f26dde2dc7578 download/CSWpuppet.preinstall -b3a1e3bb293bf607368f3479b288f6eb download/CSWpuppet.postinstall -2465374a83d4fbe6e01b6eac410e62a8 download/CSWpuppet.preremove -2b76d69202476fad006d27d26364e59c download/CSWpuppet.postremove ecf6aae7bb8bd8ad9e064ed40674a7be download/cswpuppetd -dd10b02543d22bbe66994ef89409f7fd download/cswpuppetd.xml 066f9053e1342b19cf83f3f78ce2259c download/cswpuppetmasterd -38e007c1906fca70bc95dc45b5892581 download/cswpuppetmasterd.xml -ecf6aae7bb8bd8ad9e064ed40674a7be download/svc-cswpuppetd -066f9053e1342b19cf83f3f78ce2259c download/svc-cswpuppetmasterd +3ab0d4f9801075bc78b68b766b496fc7 download/cswusergroup +8900ff87260219020949ee0d21a7a1ff download/puppet-0.25.0.tar.gz Deleted: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.gspec =================================================================== --- csw/mgar/pkg/puppet/trunk/files/CSWpuppet.gspec 2009-09-16 01:53:44 UTC (rev 6315) +++ csw/mgar/pkg/puppet/trunk/files/CSWpuppet.gspec 2009-09-16 10:56:09 UTC (rev 6316) @@ -1,5 +0,0 @@ -%var bitname puppet -%var pkgname CSWpuppet -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/LICENCE -%include url file://%{PKGLIB}/smf_enabled.gspec Modified: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall =================================================================== --- csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall 2009-09-16 01:53:44 UTC (rev 6315) +++ csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall 2009-09-16 10:56:09 UTC (rev 6316) @@ -1,12 +1,24 @@ -PKG_INSTALL_ROOT=\${PKG_INSTALL_ROOT:-/} -/usr/bin/test -d \$PKG_INSTALL_ROOT/opt/csw/etc/puppet || /usr/sbin/chroot \$PKG_INSTALL_ROOT /usr/bin/ln -s /etc/opt/csw/puppet /opt/csw/etc/puppet -/usr/bin/test -d \$PKG_INSTALL_ROOT/etc/puppet || /usr/sbin/chroot \$PKG_INSTALL_ROOT /usr/bin/ln -s /opt/csw/etc/puppet /etc/puppet -/usr/bin/test -d \$PKG_INSTALL_ROOT/opt/csw/var/puppet || /usr/sbin/chroot \$PKG_INSTALL_ROOT /usr/bin/ln -s /var/opt/csw/puppet /opt/csw/var/puppet -/usr/bin/test -d \$PKG_INSTALL_ROOT/var/puppet || /usr/sbin/chroot \$PKG_INSTALL_ROOT /usr/bin/ln -s /var/opt/csw/puppet /var/puppet -touch \$PKG_INSTALL_ROOT/etc/opt/csw/puppet/puppet.conf -/usr/bin/test -f \$PKG_INSTALL_ROOT/opt/csw/etc/csw.conf && . \$PKG_INSTALL_ROOT/opt/csw/etc/csw.conf -/usr/bin/test -f \$PKG_INSTALL_ROOT/etc/opt/csw/csw.conf && . \$PKG_INSTALL_ROOT/etc/opt/csw/csw.conf -if [ "\$autoenable_daemons" != "no" ] ; then - /usr/sbin/chroot \$PKG_INSTALL_ROOT /usr/sbin/svccfg import /opt/csw/var/svc/manifest/puppetd.xml || /bin/true - /usr/sbin/chroot \$PKG_INSTALL_ROOT /usr/sbin/svcadm enable svc:network/puppetd || /bin/true +#!/bin/sh +# +# $Id$ +# + +PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-/} + +# Migration of the configuration files? +/usr/bin/test -d $PKG_INSTALL_ROOT/opt/csw/etc/puppet || /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/bin/ln -s /etc/opt/csw/puppet /opt/csw/etc/puppet +/usr/bin/test -d $PKG_INSTALL_ROOT/etc/puppet || /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/bin/ln -s /opt/csw/etc/puppet /etc/puppet +/usr/bin/test -d $PKG_INSTALL_ROOT/opt/csw/var/puppet || /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/bin/ln -s /var/opt/csw/puppet /opt/csw/var/puppet +/usr/bin/test -d $PKG_INSTALL_ROOT/var/puppet || /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/bin/ln -s /var/opt/csw/puppet /var/puppet + +# Replaced with INITSMF + +exit 0 + +touch $PKG_INSTALL_ROOT/etc/opt/csw/puppet/puppet.conf +/usr/bin/test -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf && . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf +/usr/bin/test -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf && . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf +if [ "$autoenable_daemons" != "no" ] ; then + /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/sbin/svccfg import /opt/csw/var/svc/manifest/puppetd.xml || /bin/true + /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/sbin/svcadm enable svc:network/puppetd || /bin/true fi Property changes on: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postremove =================================================================== --- csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postremove 2009-09-16 01:53:44 UTC (rev 6315) +++ csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postremove 2009-09-16 10:56:09 UTC (rev 6316) @@ -1,3 +1,10 @@ +#!/bin/sh +# +# $Id$ +# + +# 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 rm /var/puppet || /bin/true @@ -2 +9,2 @@ rm /opt/csw/var/puppet || /bin/true +rm -rf /opt/csw/lib/ruby/site_ruby/1.8/puppet Property changes on: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postremove ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preinstall =================================================================== --- csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preinstall 2009-09-16 01:53:44 UTC (rev 6315) +++ csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preinstall 2009-09-16 10:56:09 UTC (rev 6316) @@ -1,6 +1,20 @@ -PKG_INSTALL_ROOT=\${PKG_INSTALL_ROOT:-/} -\$PKG_INSTALL_ROOT/usr/sbin/chroot \$PKG_INSTALL_ROOT/ /usr/bin/getent group puppet > /dev/null || /usr/sbin/chroot \$PKG_INSTALL_ROOT /usr/sbin/groupadd puppet -\$PKG_INSTALL_ROOT/usr/sbin/chroot \$PKG_INSTALL_ROOT/ /usr/bin/getent passwd puppet > /dev/null || /usr/sbin/chroot \$PKG_INSTALL_ROOT /usr/sbin/useradd -g puppet -c "Puppet" -d /var/opt/csw/puppet -s "/bin/true" puppet +#!/bin/sh +# +# $Id$ +# -mkdir -p \$PKG_INSTALL_ROOT/etc/opt/csw/puppet -chown root:bin \$PKG_INSTALL_ROOT/etc/opt/csw/puppet +PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-/} + +# Replaced with cswusergroup + +exit 0 + +$PKG_INSTALL_ROOT/usr/sbin/chroot $PKG_INSTALL_ROOT/ /usr/bin/getent group puppet \ + > /dev/null \ + || /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/sbin/groupadd puppet +$PKG_INSTALL_ROOT/usr/sbin/chroot $PKG_INSTALL_ROOT/ /usr/bin/getent passwd puppet \ + > /dev/null \ + || /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/sbin/useradd -g puppet -c "Puppet" -d /var/opt/csw/puppet -s "/bin/true" puppet + +mkdir -p $PKG_INSTALL_ROOT/etc/opt/csw/puppet +chown root:bin $PKG_INSTALL_ROOT/etc/opt/csw/puppet Property changes on: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preinstall ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preremove =================================================================== --- csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preremove 2009-09-16 01:53:44 UTC (rev 6315) +++ csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preremove 2009-09-16 10:56:09 UTC (rev 6316) @@ -1,2 +1,11 @@ +#!/bin/sh +# +# $Id$ +# + +# Replaced with INITSMF + +exit 0 + /usr/sbin/svcadm disable svc:network/puppetd 2>/dev/null || /bin/true /usr/sbin/svccfg delete svc:network/puppetd || /bin/true Property changes on: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preremove ___________________________________________________________________ Added: svn:keywords + Id Deleted: csw/mgar/pkg/puppet/trunk/files/cswpuppetd.xml =================================================================== --- csw/mgar/pkg/puppet/trunk/files/cswpuppetd.xml 2009-09-16 01:53:44 UTC (rev 6315) +++ csw/mgar/pkg/puppet/trunk/files/cswpuppetd.xml 2009-09-16 10:56:09 UTC (rev 6316) @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Deleted: csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd.xml =================================================================== --- csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd.xml 2009-09-16 01:53:44 UTC (rev 6315) +++ csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd.xml 2009-09-16 10:56:09 UTC (rev 6316) @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Added: csw/mgar/pkg/puppet/trunk/files/cswusergroup =================================================================== --- csw/mgar/pkg/puppet/trunk/files/cswusergroup (rev 0) +++ csw/mgar/pkg/puppet/trunk/files/cswusergroup 2009-09-16 10:56:09 UTC (rev 6316) @@ -0,0 +1 @@ +puppet:puppet:Puppet configuration management:/var/opt/csw/puppet:/bin/false:: Deleted: csw/mgar/pkg/puppet/trunk/files/svc-cswpuppetd =================================================================== --- csw/mgar/pkg/puppet/trunk/files/svc-cswpuppetd 2009-09-16 01:53:44 UTC (rev 6315) +++ csw/mgar/pkg/puppet/trunk/files/svc-cswpuppetd 2009-09-16 10:56:09 UTC (rev 6316) @@ -1,66 +0,0 @@ -#!/bin/sh -# This is the /etc/init.d file for puppetd -# Modified for CSW -# -# description: puppetd - Puppet Automation Client -# - -. /lib/svc/share/smf_include.sh - -prefix=/opt/csw -exec_prefix=/opt/csw -sysconfdir=/opt/csw/etc -sbindir=/opt/csw/bin - -pidfile=/var/opt/csw/puppet/run/puppetd.pid - -case "$1" in -start) - cd / - # Start daemons. - - printf "Starting Puppet client services:" - - /opt/csw/bin/puppetd - - printf " puppetd" - echo "" - ;; -stop) - printf "Stopping Puppet client services:" - kill `cat $pidfile` - - printf " puppetd" - echo "" - ;; -restart) - printf "Restarting Puppet client services:" - kill -HUP `cat $pidfile` - - printf " puppetd" - echo "" - ;; -reload) - printf "Reloading Puppet client services:" - - kill -HUP `cat $pidfile` - - printf " puppetd" - echo "" - ;; -status) - if [ -f $pidfile ]; then - pid=`cat $pidfile` - curpid=`pgrep puppetd` - if [ "$pid" -eq "$curpid" ]; then - exit 0 - else - exit 1 - fi - else - exit 1 - fi -esac -exit 0 - -# $Id$ Deleted: csw/mgar/pkg/puppet/trunk/files/svc-cswpuppetmasterd =================================================================== --- csw/mgar/pkg/puppet/trunk/files/svc-cswpuppetmasterd 2009-09-16 01:53:44 UTC (rev 6315) +++ csw/mgar/pkg/puppet/trunk/files/svc-cswpuppetmasterd 2009-09-16 10:56:09 UTC (rev 6316) @@ -1,62 +0,0 @@ -#!/bin/sh -# - -. /lib/svc/share/smf_include.sh - -prefix=/opt/csw -exec_prefix=/opt/csw -sysconfdir=/opt/csw/etc -sbindir=/opt/csw/sbin - -pidfile=/var/opt/csw/puppet/run/puppetmasterd.pid - -case "$1" in -start) - cd / - # Start daemons. - - printf "Starting Puppet server services:" - - /opt/csw/bin/puppetmasterd - - printf " puppetmaster" - echo "" - ;; -stop) - printf "Stopping Puppet server services:" - kill `cat $pidfile` - - printf " puppetmasterd" - echo "" - ;; -restart) - printf "Restarting Puppet server services:" - kill -HUP `cat $pidfile` - - printf " puppetmasterd" - echo "" - ;; -reload) - printf "Reloading Puppet server services:" - - kill -HUP `cat $pidfile` - - printf " puppetmasterd" - echo "" - ;; -status) - if [ -f $pidfile ]; then - pid=`cat $pidfile` - curpid=`pgrep puppetmasterd` - if [ "$pid" -eq "$curpid" ]; then - exit 0 - else - exit 1 - fi - else - exit 1 - fi -esac -exit 0 - -# $Id$ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Wed Sep 16 13:56:03 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Wed, 16 Sep 2009 11:56:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[6317] csw/mgar/pkg/jetty6/trunk Message-ID: Revision: 6317 http://gar.svn.sourceforge.net/gar/?rev=6317&view=rev Author: trygvis Date: 2009-09-16 11:56:03 +0000 (Wed, 16 Sep 2009) Log Message: ----------- o Adding my Jetty6 work, even if it is not done. Modified Paths: -------------- csw/mgar/pkg/jetty6/trunk/Makefile csw/mgar/pkg/jetty6/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/jetty6/trunk/ Property changes on: csw/mgar/pkg/jetty6/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/jetty6/trunk/Makefile =================================================================== --- csw/mgar/pkg/jetty6/trunk/Makefile 2009-09-16 10:56:09 UTC (rev 6316) +++ csw/mgar/pkg/jetty6/trunk/Makefile 2009-09-16 11:56:03 UTC (rev 6317) @@ -1,7 +1,6 @@ GARNAME = jetty6 -GARVERSION = 6.1.7 +GARVERSION = 6.1.14 CATEGORIES = server - GARCH=all DESCRIPTION = Standards-based, full-featured web server and servlet container. @@ -21,20 +20,26 @@ DISTFILES += $(call admfiles,CSW$(GARNAME),prototype csw_usrgrp_config postinstall) DISTFILES += $(call admfiles,CSW$(GARNAME)doc,prototype) +REQUIRED_PKGS = + +SPKG_SOURCEURL = http://jetty.mortbay.org + +SPKG_DESC_CSWjetty6doc=Documentation for Jetty 6 + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = jetty-(\d+(?:\.\d+)*).zip -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = -TEST_SCRIPTS = -INSTALL_SCRIPTS = common +#CONFIGURE_SCRIPTS = +#BUILD_SCRIPTS = +SKIPTEST = 1 +#INSTALL_SCRIPTS = custom include gar/category.mk COPY_FILES=LICENSES README.txt VERSION.txt etc lib resources/log4j.properties start.jar javadoc TO_COPY=$(foreach file,$(COPY_FILES),cp $(WORKDIR)/jetty-$(GARVERSION)/$(COPY_FILES) $(DESTDIR)/opt/csw/share/jetty6/$(COPY_FILES)) -install-common: +install-custom: mkdir -p $(DESTDIR)/opt/csw/share mkdir -p $(DESTDIR)/etc/init.d mkdir -p $(DESTDIR)/etc/default Modified: csw/mgar/pkg/jetty6/trunk/checksums =================================================================== --- csw/mgar/pkg/jetty6/trunk/checksums 2009-09-16 10:56:09 UTC (rev 6316) +++ csw/mgar/pkg/jetty6/trunk/checksums 2009-09-16 11:56:03 UTC (rev 6317) @@ -1,4 +1,4 @@ -22b79a589bce55bc05f14fc974a24adf download/jetty-6.1.7.zip +b09a660b234e6613a866cb471280bf40 download/jetty-6.1.14.zip 240dc05bf7522e73f0fc6729ebecc77c download/default-jetty6 06f0ab966be58c3fa4d76876323db0fd download/etc-README.txt 0f3208426ea992044c35ba10b7f3a8e0 download/share-jetty.xml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Wed Sep 16 14:10:42 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Wed, 16 Sep 2009 12:10:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[6318] csw/mgar/pkg/Makefile Message-ID: Revision: 6318 http://gar.svn.sourceforge.net/gar/?rev=6318&view=rev Author: trygvis Date: 2009-09-16 12:10:42 +0000 (Wed, 16 Sep 2009) Log Message: ----------- o Adding a 'scm-help' target. Modified Paths: -------------- csw/mgar/pkg/Makefile Modified: csw/mgar/pkg/Makefile =================================================================== --- csw/mgar/pkg/Makefile 2009-09-16 11:56:03 UTC (rev 6317) +++ csw/mgar/pkg/Makefile 2009-09-16 12:10:42 UTC (rev 6318) @@ -14,6 +14,13 @@ default: @echo "You are in the pkg/ directory." +scm-update-packages: + @echo "Updating packages..." + @svn up --ignore-externals + +scm-help: + @cat ../gar/v2/scm-help + %: @for i in $(filter-out $(FILTER_DIRS),$(wildcard */)) ; do \ $(MAKE) -C $$i $* ; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Wed Sep 16 14:11:28 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Wed, 16 Sep 2009 12:11:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[6319] csw/mgar/pkg/ghc/trunk Message-ID: Revision: 6319 http://gar.svn.sourceforge.net/gar/?rev=6319&view=rev Author: trygvis Date: 2009-09-16 12:11:27 +0000 (Wed, 16 Sep 2009) Log Message: ----------- o Adding my GHC work, even if it is not done. Modified Paths: -------------- csw/mgar/pkg/ghc/trunk/Makefile csw/mgar/pkg/ghc/trunk/checksums csw/mgar/pkg/ghc/trunk/files/CSWghc-prof.gspec csw/mgar/pkg/ghc/trunk/files/CSWghc.gspec Modified: csw/mgar/pkg/ghc/trunk/Makefile =================================================================== --- csw/mgar/pkg/ghc/trunk/Makefile 2009-09-16 12:10:42 UTC (rev 6318) +++ csw/mgar/pkg/ghc/trunk/Makefile 2009-09-16 12:11:27 UTC (rev 6319) @@ -42,8 +42,15 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARVERSION)/$(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -PKGFILES_CSWghc-prof = $(prefix)/.*\.p_hi +PKGFILES_CSWghc-prof = $(prefix)/.*\.p_hi +PKGFILES_CSWghc-prof += $(prefix)/.*\.so +#PKGFILES_CSWghc = +#PKGFILES_CSWghc = $(prefix)/.* +#PKGFILES_CSWghc += $(prefix)/.*\.a +#PKGFILES_CSWghc += $(PKGFILES_DEVEL) +#PKGFILES_CSWghc += $(PKGFILES_RT) + CONFIGURE_ARGS = $(DIRPATHS) # Disabled for now TEST_SCRIPTS = Modified: csw/mgar/pkg/ghc/trunk/checksums =================================================================== --- csw/mgar/pkg/ghc/trunk/checksums 2009-09-16 12:10:42 UTC (rev 6318) +++ csw/mgar/pkg/ghc/trunk/checksums 2009-09-16 12:11:27 UTC (rev 6319) @@ -1,6 +1,6 @@ dfa31028b4d06d1d226f55fe3a2ab7b3 download/ghc-6.8.3-src.tar.bz2 +c92b368262a194e8b859815415bc10d0 download/testsuite-6.8.3.tar.gz ee43ceea42b9353b6613db6d4058ab0a download/ghc-6.8.3-sparc-sun-solaris2.tar.bz2 907c15e1d7d33dfd5a829936fe18176a download/ghc-6.8.3-i386-unknown-solaris2.tar.bz2 -c92b368262a194e8b859815415bc10d0 download/testsuite-6.8.3.tar.gz -41b4ca8ae020320be23571cd8a71d4dd download/CSWghc.gspec -2c370b5638a7c14488b6844972e74aae download/CSWghc-prof.gspec +8f73e728ba2e6f65f738a302d1cc8ff4 download/CSWghc.gspec +2a3d93a43a4499e0c3366f660ffda4bf download/CSWghc-prof.gspec Modified: csw/mgar/pkg/ghc/trunk/files/CSWghc-prof.gspec =================================================================== --- csw/mgar/pkg/ghc/trunk/files/CSWghc-prof.gspec 2009-09-16 12:10:42 UTC (rev 6318) +++ csw/mgar/pkg/ghc/trunk/files/CSWghc-prof.gspec 2009-09-16 12:11:27 UTC (rev 6319) @@ -1,3 +1,10 @@ +# Copyright 2008 OpenCSW +# +# 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. + %var bitname ghc_prof %var pkgname CSWghc-prof %include url file://%{PKGLIB}/csw_dyndepend.gspec Modified: csw/mgar/pkg/ghc/trunk/files/CSWghc.gspec =================================================================== --- csw/mgar/pkg/ghc/trunk/files/CSWghc.gspec 2009-09-16 12:10:42 UTC (rev 6318) +++ csw/mgar/pkg/ghc/trunk/files/CSWghc.gspec 2009-09-16 12:11:27 UTC (rev 6319) @@ -1,3 +1,10 @@ +# Copyright 2008 OpenCSW +# +# 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. + %var bitname ghc %var pkgname CSWghc %include url file://%{PKGLIB}/csw_dyndepend.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 Wed Sep 16 16:07:48 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 16 Sep 2009 14:07:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[6320] csw/mgar/pkg/docbook-dtds/trunk Message-ID: Revision: 6320 http://gar.svn.sourceforge.net/gar/?rev=6320&view=rev Author: bdwalton Date: 2009-09-16 14:07:48 +0000 (Wed, 16 Sep 2009) Log Message: ----------- docbook-dtds: update entities patch for 4.5 Modified Paths: -------------- csw/mgar/pkg/docbook-dtds/trunk/checksums csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtds-ents.patch Modified: csw/mgar/pkg/docbook-dtds/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/checksums 2009-09-16 12:11:27 UTC (rev 6319) +++ csw/mgar/pkg/docbook-dtds/trunk/checksums 2009-09-16 14:07:48 UTC (rev 6320) @@ -16,7 +16,7 @@ 8167663f53857ded5095768a85eee387 download/docbook-dtd40-sgml-1.0.catalog.patch e976c302070ec2e14316d4a601c224cb download/docbook-dtd41-sgml-1.0.catalog.patch 0ee42c28835cd448b6b47b2345394b28 download/docbook-dtd42-sgml-1.0.catalog.patch -1dae3f33fe7dda3fd68a4d4a3df2c653 download/docbook-dtds-ents.patch +7e4a8a4b7c5d311ab3dcaf81a9dc6a08 download/docbook-dtds-ents.patch 73fe50dfe74ca631c1602f558ed8961f download/docbook-xml-4.2.zip ab200202b9e136a144db1e0864c45074 download/docbook-xml-4.3.zip cbb04e9a700955d88c50962ef22c1634 download/docbook-xml-4.4.zip Modified: csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtds-ents.patch =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtds-ents.patch 2009-09-16 12:11:27 UTC (rev 6319) +++ csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtds-ents.patch 2009-09-16 14:07:48 UTC (rev 6320) @@ -32,3 +32,22 @@ +-- -- End of catalog data for DocBook V4.4 ................................. -- -- ...................................................................... -- +diff -urNp docbook-dtds-1.0-orig/4.5-sgml/docbook.cat docbook-dtds-1.0/4.5-sgml/docbook.cat +--- docbook-dtds-1.0-orig/4.5-sgml/docbook.cat 2009-02-19 13:45:22.000000000 +0100 ++++ docbook-dtds-1.0/4.5-sgml/docbook.cat 2009-02-19 13:47:31.000000000 +0100 +@@ -60,6 +60,7 @@ PUBLIC "-//OASIS//ENTITIES DocBook Chara + + -- ...................................................................... -- + -- ISO entity sets ...................................................... -- ++-- + + PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" + "iso-dia.gml" +@@ -118,5 +119,7 @@ PUBLIC "ISO 8879:1986//ENTITIES Russian + PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" + "iso-cyr2.gml" + ++-- ++ + -- End of catalog data for DocBook V4.5 ................................. -- + -- ...................................................................... -- 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 Sep 16 16:48:52 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 16 Sep 2009 14:48:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[6321] csw/mgar/pkg/docbook-dtds/trunk Message-ID: Revision: 6321 http://gar.svn.sourceforge.net/gar/?rev=6321&view=rev Author: bdwalton Date: 2009-09-16 14:48:51 +0000 (Wed, 16 Sep 2009) Log Message: ----------- docbook-dtds: correct registration of db 4.5 stuff Modified Paths: -------------- csw/mgar/pkg/docbook-dtds/trunk/Makefile csw/mgar/pkg/docbook-dtds/trunk/checksums csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall Added Paths: ----------- csw/mgar/pkg/docbook-dtds/trunk/files/docbook-sgml-systemrewrite.patch Modified: csw/mgar/pkg/docbook-dtds/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/Makefile 2009-09-16 14:07:48 UTC (rev 6320) +++ csw/mgar/pkg/docbook-dtds/trunk/Makefile 2009-09-16 14:48:51 UTC (rev 6321) @@ -64,6 +64,7 @@ PATCHFILES += docbook-dtd41-sgml-1.0.catalog.patch PATCHFILES += docbook-dtd42-sgml-1.0.catalog.patch PATCHFILES += docbook-dtds-ents.patch +PATCHFILES += docbook-sgml-systemrewrite.patch PATCHFILES += add_makefile.patch # we don't need no stinkin' configure! :) Modified: csw/mgar/pkg/docbook-dtds/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/checksums 2009-09-16 14:07:48 UTC (rev 6320) +++ csw/mgar/pkg/docbook-dtds/trunk/checksums 2009-09-16 14:48:51 UTC (rev 6321) @@ -1,4 +1,4 @@ -c4074456da444839aa6010c8721a56da download/CSWdocbookdtds.postinstall +f0d84543fabf17484edd08a39b2c6db0 download/CSWdocbookdtds.postinstall da4b8f64c222276d2c291bf8afb20517 download/CSWdocbookdtds.preremove 39e1c752fddfed4f89c8276c42ec95d4 download/add_makefile.patch 9a7f5b1b7dd52d0ca4fb080619f0459c download/docbk30.zip @@ -17,6 +17,7 @@ e976c302070ec2e14316d4a601c224cb download/docbook-dtd41-sgml-1.0.catalog.patch 0ee42c28835cd448b6b47b2345394b28 download/docbook-dtd42-sgml-1.0.catalog.patch 7e4a8a4b7c5d311ab3dcaf81a9dc6a08 download/docbook-dtds-ents.patch +698cd105d772a263c022a613339bb9b5 download/docbook-sgml-systemrewrite.patch 73fe50dfe74ca631c1602f558ed8961f download/docbook-xml-4.2.zip ab200202b9e136a144db1e0864c45074 download/docbook-xml-4.3.zip cbb04e9a700955d88c50962ef22c1634 download/docbook-xml-4.4.zip Modified: csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall 2009-09-16 14:07:48 UTC (rev 6320) +++ csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall 2009-09-16 14:48:51 UTC (rev 6321) @@ -590,6 +590,12 @@ $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ "xml-dtd-4.5/soextblx.dtd" $CATALOG + $PREFIX $XMLCAT --noout --add "rewriteSystem" \ + "http://www.oasis-open.org/docbook/xml/4.5" \ + "xml-dtd-4.5" $CATALOG + $PREFIX $XMLCAT --noout --add "rewriteURI" \ + "http://www.oasis-open.org/docbook/xml/4.5" \ + "xml-dtd-4.5" $CATALOG fi # Finally, make sure everything in $CSWSGMLCNF is readable! Added: csw/mgar/pkg/docbook-dtds/trunk/files/docbook-sgml-systemrewrite.patch =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/docbook-sgml-systemrewrite.patch (rev 0) +++ csw/mgar/pkg/docbook-dtds/trunk/files/docbook-sgml-systemrewrite.patch 2009-09-16 14:48:51 UTC (rev 6321) @@ -0,0 +1,210 @@ +diff -urNp docbook-dtds-1.0-orig/3.0-sgml/docbook.cat docbook-dtds-1.0/3.0-sgml/docbook.cat +--- docbook-dtds-1.0-orig/3.0-sgml/docbook.cat 2009-02-05 16:44:15.000000000 +0100 ++++ docbook-dtds-1.0/3.0-sgml/docbook.cat 2009-02-05 16:48:58.000000000 +0100 +@@ -30,6 +30,12 @@ + SGMLDECL "docbook.dcl" + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++ ++SYSTEM "http://www.oasis-open.org/docbook/sgml/3.0/docbook.dtd" ++ "docbook.dtd" ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//Davenport//DTD DocBook V3.0//EN" "docbook.dtd" +diff -urNp docbook-dtds-1.0-orig/3.1-sgml/docbook.cat docbook-dtds-1.0/3.1-sgml/docbook.cat +--- docbook-dtds-1.0-orig/3.1-sgml/docbook.cat 2009-02-05 16:44:15.000000000 +0100 ++++ docbook-dtds-1.0/3.1-sgml/docbook.cat 2009-02-05 16:56:51.000000000 +0100 +@@ -22,6 +22,12 @@ + SGMLDECL "docbook.dcl" + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++ ++SYSTEM "http://www.oasis-open.org/docbook/sgml/3.0/docbook.dtd" ++ "docbook.dtd" ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//OASIS//DTD DocBook V3.1//EN" "docbook.dtd" +diff -urNp docbook-dtds-1.0-orig/4.0-sgml/docbook.cat docbook-dtds-1.0/4.0-sgml/docbook.cat +--- docbook-dtds-1.0-orig/4.0-sgml/docbook.cat 2009-02-05 16:44:16.000000000 +0100 ++++ docbook-dtds-1.0/4.0-sgml/docbook.cat 2009-02-05 16:49:06.000000000 +0100 +@@ -22,6 +22,12 @@ + SGMLDECL "docbook.dcl" + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++ ++SYSTEM "http://www.oasis-open.org/docbook/sgml/4.0/docbook.dtd" ++ "docbook.dtd" ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//OASIS//DTD DocBook V4.0//EN" "docbook.dtd" +Bin?rn? soubory docbook-dtds-1.0-orig/4.0-sgml/.docbook.cat.swp a docbook-dtds-1.0/4.0-sgml/.docbook.cat.swp jsou r?zn? +diff -urNp docbook-dtds-1.0-orig/4.1-sgml/docbook.cat docbook-dtds-1.0/4.1-sgml/docbook.cat +--- docbook-dtds-1.0-orig/4.1-sgml/docbook.cat 2009-02-05 16:44:16.000000000 +0100 ++++ docbook-dtds-1.0/4.1-sgml/docbook.cat 2009-02-05 16:49:27.000000000 +0100 +@@ -22,6 +22,12 @@ + SGMLDECL "docbook.dcl" + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++SYSTEM "http://www.oasis-open.org/docbook/sgml/4.1/docbook.dtd" ++ "docbook.dtd" ++ ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//OASIS//DTD DocBook V4.1//EN" "docbook.dtd" +diff -urNp docbook-dtds-1.0-orig/4.1.2-xml/docbook.cat docbook-dtds-1.0/4.1.2-xml/docbook.cat +--- docbook-dtds-1.0-orig/4.1.2-xml/docbook.cat 2000-08-27 17:19:42.000000000 +0200 ++++ docbook-dtds-1.0/4.1.2-xml/docbook.cat 2009-02-05 16:52:16.000000000 +0100 +@@ -17,6 +17,12 @@ + -- + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++ ++SYSTEM "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" ++ "docbookx.dtd" ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "docbookx.dtd" +diff -urNp docbook-dtds-1.0-orig/4.2-sgml/docbook.cat docbook-dtds-1.0/4.2-sgml/docbook.cat +--- docbook-dtds-1.0-orig/4.2-sgml/docbook.cat 2009-02-05 16:44:17.000000000 +0100 ++++ docbook-dtds-1.0/4.2-sgml/docbook.cat 2009-02-05 16:50:10.000000000 +0100 +@@ -17,6 +17,12 @@ + -- + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++ ++SYSTEM "http://www.oasis-open.org/docbook/sgml/4.2/docbook.dtd" ++ "docbook.dtd" ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//OASIS//DTD DocBook V4.2//EN" +diff -urNp docbook-dtds-1.0-orig/4.2-xml/docbook.cat docbook-dtds-1.0/4.2-xml/docbook.cat +--- docbook-dtds-1.0-orig/4.2-xml/docbook.cat 2002-07-17 18:14:41.000000000 +0200 ++++ docbook-dtds-1.0/4.2-xml/docbook.cat 2009-02-05 16:52:53.000000000 +0100 +@@ -17,6 +17,12 @@ + -- + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++ ++SYSTEM "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" ++ "docbookx.dtd" ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" +diff -urNp docbook-dtds-1.0-orig/4.3-sgml/docbook.cat docbook-dtds-1.0/4.3-sgml/docbook.cat +--- docbook-dtds-1.0-orig/4.3-sgml/docbook.cat 2009-02-05 16:44:18.000000000 +0100 ++++ docbook-dtds-1.0/4.3-sgml/docbook.cat 2009-02-05 16:50:37.000000000 +0100 +@@ -17,6 +17,13 @@ + -- + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++ ++SYSTEM "http://www.oasis-open.org/docbook/sgml/4.3/docbook.dtd" ++ "docbook.dtd" ++ ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//OASIS//DTD DocBook V4.3//EN" +diff -urNp docbook-dtds-1.0-orig/4.3-xml/docbook.cat docbook-dtds-1.0/4.3-xml/docbook.cat +--- docbook-dtds-1.0-orig/4.3-xml/docbook.cat 2004-03-31 13:22:18.000000000 +0200 ++++ docbook-dtds-1.0/4.3-xml/docbook.cat 2009-02-05 16:53:12.000000000 +0100 +@@ -17,6 +17,12 @@ + -- + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++ ++SYSTEM "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" ++ "docbookx.dtd" ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" +diff -urNp docbook-dtds-1.0-orig/4.4-sgml/docbook.cat docbook-dtds-1.0/4.4-sgml/docbook.cat +--- docbook-dtds-1.0-orig/4.4-sgml/docbook.cat 2009-02-05 16:44:18.000000000 +0100 ++++ docbook-dtds-1.0/4.4-sgml/docbook.cat 2009-02-05 16:50:57.000000000 +0100 +@@ -17,6 +17,12 @@ + -- + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++ ++SYSTEM "http://www.oasis-open.org/docbook/sgml/4.4/docbook.dtd" ++ "docbook.dtd" ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//OASIS//DTD DocBook V4.4//EN" +diff -urNp docbook-dtds-1.0-orig/4.4-xml/docbook.cat docbook-dtds-1.0/4.4-xml/docbook.cat +--- docbook-dtds-1.0-orig/4.4-xml/docbook.cat 2005-01-27 14:57:19.000000000 +0100 ++++ docbook-dtds-1.0/4.4-xml/docbook.cat 2009-02-05 16:53:30.000000000 +0100 +@@ -17,6 +17,12 @@ + -- + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++ ++SYSTEM "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" ++ "docbookx.dtd" ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" +diff -urNp docbook-dtds-1.0-orig/4.5-sgml/docbook.cat docbook-dtds-1.0/4.5-sgml/docbook.cat +--- docbook-dtds-1.0-orig/4.5-sgml/docbook.cat 2006-10-03 15:27:50.000000000 +0200 ++++ docbook-dtds-1.0/4.5-sgml/docbook.cat 2009-02-05 16:51:22.000000000 +0100 +@@ -17,6 +17,12 @@ + -- + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++ ++SYSTEM "http://www.oasis-open.org/docbook/sgml/4.5/docbook.dtd" ++ "docbook.dtd" ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//OASIS//DTD DocBook V4.5//EN" +diff -urNp docbook-dtds-1.0-orig/4.5-xml/docbook.cat docbook-dtds-1.0/4.5-xml/docbook.cat +--- docbook-dtds-1.0-orig/4.5-xml/docbook.cat 2006-10-03 15:26:00.000000000 +0200 ++++ docbook-dtds-1.0/4.5-xml/docbook.cat 2009-02-05 16:55:45.000000000 +0100 +@@ -17,6 +17,12 @@ + -- + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++ ++SYSTEM "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" ++ "docbookx.dtd" ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" 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 Sep 16 17:29:52 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 16 Sep 2009 15:29:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[6322] csw/mgar/pkg/puppet/trunk Message-ID: Revision: 6322 http://gar.svn.sourceforge.net/gar/?rev=6322&view=rev Author: wahwah Date: 2009-09-16 15:29:51 +0000 (Wed, 16 Sep 2009) Log Message: ----------- puppet: Version downgrade to 0.24.8, small formatting changes. Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/Makefile csw/mgar/pkg/puppet/trunk/checksums csw/mgar/pkg/puppet/trunk/files/cswpuppetd Property Changed: ---------------- csw/mgar/pkg/puppet/trunk/files/cswpuppetd csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd csw/mgar/pkg/puppet/trunk/files/cswusergroup Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2009-09-16 14:48:51 UTC (rev 6321) +++ csw/mgar/pkg/puppet/trunk/Makefile 2009-09-16 15:29:51 UTC (rev 6322) @@ -1,19 +1,29 @@ # Copyright 2009 OpenCSW # Distributed under the terms of the GNU General Public License v2 # $Id$ +# +# Based on a build script[1] written by Gary Law. +# +# [1] http://garylaw.net/packages/puppet-build.sh GARNAME = puppet -GARVERSION = 0.25.0 +GARVERSION = 0.24.8 CATEGORIES = apps define BLURB - Long description + Puppet helps accomplish the goal of a hands-off, automated infrastructure. + The benefits of automated infrastructure go beyond policy-enforced + consistency and auditing. The impact of hardware failure and other disaster + scenarios can be mitigated, as services can be quickly restored by Puppet. In + conjunction with virtualizaton, the ability to reliably create new systems + running consistent services can be leveraged to create autoscaling + applications as well as test systems identical to production environments. endef MASTER_SITES = http://reductivelabs.com/downloads/puppet/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION).tgz DISTFILES += cswpuppetd cswpuppetmasterd cswusergroup -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz SPKG_SOURCEURL = http://reductivelabs.com/products/puppet/ INITSMF = $(sysconfdir)/init\.d/cswpuppetd @@ -25,6 +35,7 @@ PACKAGES = CSWpuppet CSWpuppetmaster REQUIRED_PKGS = CSWfacter +PREREQUISITE_PKGS = $(REQUIRED_PKGS) REQUIRED_PKGS_CSWpuppetmaster = CSWpuppet PKGFILES_CSWpuppetmaster = $(sysconfdir)/init\.d/cswpuppetmasterd @@ -44,23 +55,23 @@ include gar/category.mk install-puppet: - @ginstall -d $(DESTDIR) - @ginstall -d $(DESTDIR)$(sysconfdir)/puppet - @ginstall -d $(DESTDIR)$(localstatedir)/puppet/run + ginstall -d $(DESTDIR) + ginstall -d $(DESTDIR)$(sysconfdir)/puppet + ginstall -d $(DESTDIR)$(localstatedir)/puppet/run ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/init.d ginstall -m 755 $(FILEDIR)/cswpuppetd $(DESTDIR)$(sysconfdir)/init.d ginstall -m 755 $(FILEDIR)/cswpuppetmasterd $(DESTDIR)$(sysconfdir)/init.d - (cd $(WORKDIR)/$(DISTNAME) ; \ + (cd $(WORKSRC) && \ gsed -e "s|/var/puppet|/var/opt/csw/puppet|g" -i ./lib/puppet/defaults.rb; \ gsed -e "s|/etc/puppet|/etc/opt/csw/puppet|g" -i ./lib/puppet/defaults.rb; \ - gsed -e "s|/var/run/puppet|/var/opt/csw/puppet/run|g" -i ./lib/puppet/defaults.rb; \ - DESTDIR=$(DESTDIR) ruby install.rb; \ - cd $(DESTDIR)$(mandir)/man8 && gunzip *) - (cd $(WORKDIR)/$(DISTNAME)/examples/etc/puppet ; \ + gsed -e "s|/var/run/puppet|/var/opt/csw/puppet/run|g" -i ./lib/puppet/defaults.rb) + cd $(WORKSRC) && DESTDIR=$(DESTDIR) ruby install.rb + cd $(DESTDIR)$(mandir)/man8 && gunzip * + (cd $(WORKSRC)/examples/etc/puppet && \ for f in *; do \ - if [ -f $$f ] ; then \ - cp $$f $(DESTDIR)$(sysconfdir)/puppet/$$f.example; \ - chmod 644 $(DESTDIR)$(sysconfdir)/puppet/$$f.example; \ - fi \ + if [ -f $$f ] ; then \ + cp $$f $(DESTDIR)$(sysconfdir)/puppet/$$f.example; \ + chmod 644 $(DESTDIR)$(sysconfdir)/puppet/$$f.example; \ + fi \ done) @$(MAKECOOKIE) Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2009-09-16 14:48:51 UTC (rev 6321) +++ csw/mgar/pkg/puppet/trunk/checksums 2009-09-16 15:29:51 UTC (rev 6322) @@ -1,4 +1,4 @@ -ecf6aae7bb8bd8ad9e064ed40674a7be download/cswpuppetd +7331526709cf8cbce59421157068c184 download/cswpuppetd 066f9053e1342b19cf83f3f78ce2259c download/cswpuppetmasterd 3ab0d4f9801075bc78b68b766b496fc7 download/cswusergroup -8900ff87260219020949ee0d21a7a1ff download/puppet-0.25.0.tar.gz +288d46dee00acad64d0f3ecc6d8ba6fa download/puppet-0.24.8.tgz Modified: csw/mgar/pkg/puppet/trunk/files/cswpuppetd =================================================================== --- csw/mgar/pkg/puppet/trunk/files/cswpuppetd 2009-09-16 14:48:51 UTC (rev 6321) +++ csw/mgar/pkg/puppet/trunk/files/cswpuppetd 2009-09-16 15:29:51 UTC (rev 6322) @@ -1,4 +1,7 @@ #!/bin/sh +# +# $Id$ +# # This is the /etc/init.d file for puppetd # Modified for CSW # @@ -21,7 +24,7 @@ printf "Starting Puppet client services:" - /opt/csw/bin/puppetd + ${sbindir}/puppetd printf " puppetd" echo "" @@ -45,8 +48,8 @@ kill -HUP `cat $pidfile` - printf " puppetd" - echo "" + printf " puppetd" + echo "" ;; status) if [ -f $pidfile ]; then @@ -62,5 +65,3 @@ fi esac exit 0 - -# $Id$ Property changes on: csw/mgar/pkg/puppet/trunk/files/cswpuppetd ___________________________________________________________________ Added: svn:keywords + Id Property changes on: csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd ___________________________________________________________________ Added: svn:keywords + Id Property changes on: csw/mgar/pkg/puppet/trunk/files/cswusergroup ___________________________________________________________________ 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 Sep 17 01:50:55 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 16 Sep 2009 23:50:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[6323] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 6323 http://gar.svn.sourceforge.net/gar/?rev=6323&view=rev Author: bdwalton Date: 2009-09-16 23:50:55 +0000 (Wed, 16 Sep 2009) Log Message: ----------- git: add headers, static libs; carve out a _devel package Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-09-16 15:29:51 UTC (rev 6322) +++ csw/mgar/pkg/git/trunk/Makefile 2009-09-16 23:50:55 UTC (rev 6323) @@ -7,7 +7,7 @@ # TEST_SCRIPTS = PACKAGES = CSWgit CSWgitk CSWgitgui CSWgitsvn CSWgitcvs CSWgitemacs CSWgitdoc -PACKAGES += CSWgitcompletion +PACKAGES += CSWgitcompletion CSWgitdevel CATALOGNAME_CSWgit = git CATALOGNAME_CSWgitcvs = git_cvs @@ -17,6 +17,7 @@ CATALOGNAME_CSWgitdoc = git_doc CATALOGNAME_CSWgitk = gitk CATALOGNAME_CSWgitcompletion = git_completion +CATALOGNAME_CSWgitdevel = git_devel ARCHALL_CSWgitsvn = 1 ARCHALL_CSWgitcvs = 1 @@ -47,6 +48,8 @@ REQUIRED_PKGS_CSWgitdoc = CSWgit +REQUIRED_PKGS_CSWgitdevel = CSWgit + # We include bash here even though git itself depends on it because in theory # git could use any other POSIX compliant shell and drop the dependency... REQUIRED_PKGS_CSWgitcompletion = CSWgit CSWbash @@ -59,6 +62,7 @@ LICENSE_CSWgitemacs = COPYING LICENSE_CSWgitdoc = COPYING LICENSE_CSWgitcompletion = COPYING +LICENSE_CSWgitdevel = COPYING DESCRIPTION = Fast Version Control System define BLURB @@ -75,6 +79,7 @@ SPKG_DESC_CSWgitdoc = Documentation for Git SPKG_DESC_CSWgitemacs = Git VCS support for Emacs SPKG_DESC_CSWgitcompletion = Bash completion support for Git +SPKG_DESC_CSWgitdevel = Headers and static libraries for Git #NOTE: If you need to proxy git:// connections, set GIT_USE_PROXY in # your .garrc file. (That leaves this recipe in a more generic form.) @@ -93,6 +98,7 @@ PKGFILES_CSWgitemacs = .*emacs.* PKGFILES_CSWgitdoc = $(docdir)/.* PKGFILES_CSWgitcompletion = $(bashconfdir)/bash_completion.d/.* +PKGFILES_CSWgitdevel = $(includedir)/.* $(libdir)/.* # We define upstream file regex so we can be notifed of new upstream # software release @@ -121,6 +127,9 @@ INSTALLDIRS=vendor \ install-doc +# We want static libs installed for our devel package +MERGE_EXCLUDE_STATICLIBS = + include gar/category.mk # for tail -n and to override things like, etc with the gnu counterparts @@ -142,6 +151,8 @@ post-install-modulated: GD=$(DESTDIR)/$(datadir)/doc/$(GARNAME) post-install-modulated: BD=$(DESTDIR)/$(bashconfdir)/bash_completion.d +post-install-modulated: ID=$(DESTDIR)/$(includedir)/git +post-install-modulated: LD=$(DESTDIR)/$(libdir_install)/git post-install-modulated: @echo Cleaning up perl stuff @rm -rf $(DESTDIR)/$(libdir)/perl5/site_perl/5* @@ -150,6 +161,16 @@ @echo Installing Emacs Git extension @( cd $(WORKSRC); $(MAKE) -C contrib/emacs install \ emacsdir=$(DESTDIR)/$(datadir)/emacs/site-lisp ) + @echo Installing devel files + @( cd $(WORKSRC); \ + ginstall -c -m 0755 -d $(ID) $(LD); \ + for f in `find . -name "*.h"`; do \ + dn=`dirname $$f`; \ + ginstall -c -m 0755 -d $(ID)/$$dn; \ + ginstall -c -m 0644 $$f $(ID)/$$dn; \ + done; \ + ginstall -c -m 0444 libgit.a $(LD)/; \ + ginstall -c -m 0444 ./xdiff/lib.a $(LD)/libxdiff.a ) @echo Installing Documentation @( cd $(WORKSRC); \ ginstall -c -m 0755 -d $(GD); \ 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 Sep 17 01:51:40 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 16 Sep 2009 23:51:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[6324] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 6324 http://gar.svn.sourceforge.net/gar/?rev=6324&view=rev Author: bdwalton Date: 2009-09-16 23:51:40 +0000 (Wed, 16 Sep 2009) Log Message: ----------- git: bump version to 1.6.4.4 Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-09-16 23:50:55 UTC (rev 6323) +++ csw/mgar/pkg/git/trunk/Makefile 2009-09-16 23:51:40 UTC (rev 6324) @@ -1,5 +1,5 @@ GARNAME = git -GARVERSION = 1.6.4.3 +GARVERSION = 1.6.4.4 #xPATCHLEVEL = rc3 CATEGORIES = devel This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Sep 17 01:58:42 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 16 Sep 2009 23:58:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[6325] csw/mgar/pkg/git/trunk Message-ID: Revision: 6325 http://gar.svn.sourceforge.net/gar/?rev=6325&view=rev Author: bdwalton Date: 2009-09-16 23:58:42 +0000 (Wed, 16 Sep 2009) Log Message: ----------- git: add a postinstall script to migrate config to /etc/opt/csw Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/git/trunk/files/CSWgit.postinstall Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-09-16 23:51:40 UTC (rev 6324) +++ csw/mgar/pkg/git/trunk/Makefile 2009-09-16 23:58:42 UTC (rev 6325) @@ -86,6 +86,8 @@ GIT_REPOS = git://git.kernel.org/pub/scm/git/git.git GIT_TREEISH_git.git = v$(GARVERSION)$(if $(PATCHLEVEL),-$(PATCHLEVEL)) +DISTFILES = CSWgit.postinstall + fdirs = $(bindir_install) $(mandir) $(libexecdir_install) define _git_files $(foreach d,$(fdirs),$(d)/.*$(1).*) $(sharedstatedir)/$(1).* Added: csw/mgar/pkg/git/trunk/files/CSWgit.postinstall =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgit.postinstall (rev 0) +++ csw/mgar/pkg/git/trunk/files/CSWgit.postinstall 2009-09-16 23:58:42 UTC (rev 6325) @@ -0,0 +1,11 @@ +#!/bin/sh + +GC_OLD="$PKG_INSTALL_ROOT/opt/csw/etc/gitconfig" +GC_NEW="$PKG_INSTALL_ROOT/etc/opt/csw/gitconfig" + +# this will hopefully ease the /opt/csw/etc -> /etc/opt/csw +# transition. +if [ -f "$GC_OLD" -a ! -f "$GC_NEW" ]; then + echo "Copying /opt/csw/etc/gitconfig to /etc/opt/csw/gitconfig" + cp -p "$GC_OLD" "$GC_NEW" +fi 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 Sep 17 01:59:51 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 16 Sep 2009 23:59:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[6326] csw/mgar/pkg/git/trunk/checksums Message-ID: Revision: 6326 http://gar.svn.sourceforge.net/gar/?rev=6326&view=rev Author: bdwalton Date: 2009-09-16 23:59:50 +0000 (Wed, 16 Sep 2009) Log Message: ----------- git: update makesums Modified Paths: -------------- csw/mgar/pkg/git/trunk/checksums Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2009-09-16 23:58:42 UTC (rev 6325) +++ csw/mgar/pkg/git/trunk/checksums 2009-09-16 23:59:50 UTC (rev 6326) @@ -1,8 +1 @@ -075441ea2a95cfa5fd7aaebb888a93f3 download/doc-makefile.patch -d88d34fc8e4ce18fe738753a06417eac download/0001-configure-ensure-settings-from-user-are-also-usable.patch -9f1f5c3f7759319d647420d330f87c28 download/0002-configure-reorganize-flow-of-argument-checks.patch -dc54bd8c79b58724eaab77e15f9e2029 download/0003-configure-add-macros-to-stash-FLAG-variables.patch -b1c0911b53bcccb943b1f7bdc6db5237 download/0004-configure-wrap-some-library-tests-with-GIT_STASH_FL.patch -50fa0de30bbc019e6c5e43c20cef423a download/0005-configure-asciidoc-version-test-cleanup.patch -cde5cd3ceebe13864dd8e3718e104387 download/0006-configure-make-iconv-tests-aware-of-user-arguments.patch -89dbcc3180bf4e651e9e64d4de3f6df0 download/0007-configure-rework-pthread-handling-to-allow-for-user.patch +76a83b807edbcc41a01d3792d4a0322d download/CSWgit.postinstall 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 Sep 17 10:02:38 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 17 Sep 2009 08:02:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6327] csw/mgar/pkg/pgadmin3/trunk Message-ID: Revision: 6327 http://gar.svn.sourceforge.net/gar/?rev=6327&view=rev Author: wahwah Date: 2009-09-17 08:02:38 +0000 (Thu, 17 Sep 2009) Log Message: ----------- pgadmin3: Initial commit Modified Paths: -------------- csw/mgar/pkg/pgadmin3/trunk/Makefile csw/mgar/pkg/pgadmin3/trunk/checksums Modified: csw/mgar/pkg/pgadmin3/trunk/Makefile =================================================================== --- csw/mgar/pkg/pgadmin3/trunk/Makefile 2009-09-16 23:59:50 UTC (rev 6326) +++ csw/mgar/pkg/pgadmin3/trunk/Makefile 2009-09-17 08:02:38 UTC (rev 6327) @@ -2,181 +2,26 @@ # 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, 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 = pgadmin3 +GARVERSION = 1.10.0 +CATEGORIES = apps +DESCRIPTION = An administration and development platform for PostgreSQL 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). +SPKG_SOURCEURL = http://www.pgadmin.org/ +MASTER_SITES = http://wwwmaster.postgresql.org/redir/76/h/pgadmin3/release/v$(GARVERSION)/src/ 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. +REQUIRED_PKGS += CSWpostgresql +REQUIRED_PKGS += CSWkrb5lib +REQUIRED_PKGS += CSWlibpq +REQUIRED_PKGS += CSWlibxml2 +REQUIRED_PKGS += CSWlibxslt +REQUIRED_PKGS += CSWosslrt +REQUIRED_PKGS += CSWwxwidgetscommon +REQUIRED_PKGS += CSWwxwidgetsgtk2 +REQUIRED_PKGS += CSWzlib +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWwxwidgetsdevel +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 +include gar/category.mk Modified: csw/mgar/pkg/pgadmin3/trunk/checksums =================================================================== --- csw/mgar/pkg/pgadmin3/trunk/checksums 2009-09-16 23:59:50 UTC (rev 6326) +++ csw/mgar/pkg/pgadmin3/trunk/checksums 2009-09-17 08:02:38 UTC (rev 6327) @@ -0,0 +1 @@ +3f2032c78657e3db4e0719613751060c download/pgadmin3-1.10.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Sep 17 10:55:43 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 17 Sep 2009 08:55:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6328] csw/mgar/pkg/sudosh2/trunk/Makefile Message-ID: Revision: 6328 http://gar.svn.sourceforge.net/gar/?rev=6328&view=rev Author: skayser Date: 2009-09-17 08:55:43 +0000 (Thu, 17 Sep 2009) Log Message: ----------- sudosh2: added SAMPLECONF, moved config to /etc/opt/csw Modified Paths: -------------- csw/mgar/pkg/sudosh2/trunk/Makefile Modified: csw/mgar/pkg/sudosh2/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudosh2/trunk/Makefile 2009-09-17 08:02:38 UTC (rev 6327) +++ csw/mgar/pkg/sudosh2/trunk/Makefile 2009-09-17 08:55:43 UTC (rev 6328) @@ -23,8 +23,13 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tgz +sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw + +SAMPLECONF = $(sysconfdir)/sudosh.conf + CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-logdir=/var/opt/csw/sudosh +CONFIGURE_ARGS += --with-logdir=$(localstatedir)/sudosh # No tests available TEST_SCRIPTS = @@ -51,7 +56,7 @@ post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) post-install-modulated: DOCS=AUTHORS NEWS README post-install-modulated: - ginstall -d $(DESTDIR)/var/opt/csw/sudosh + ginstall -d $(DESTDIR)$(localstatedir)/sudosh ginstall -d $(DOCDEST) cp $(addprefix $(WORKSRC)/,$(DOCS)) $(DOCDEST) cp $(WORKSRC)/ChangeLog $(DOCDEST)/changelog This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Sep 17 12:31:04 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 17 Sep 2009 10:31:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[6329] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 6329 http://gar.svn.sourceforge.net/gar/?rev=6329&view=rev Author: skayser Date: 2009-09-17 10:31:04 +0000 (Thu, 17 Sep 2009) Log Message: ----------- gar/v2: SAMPLECONF needs to result in cswcpsampleconf, not cswsampleconf 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-09-17 08:55:43 UTC (rev 6328) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-09-17 10:31:04 UTC (rev 6329) @@ -161,7 +161,7 @@ # Handle cswclassutils # - prepend cswpreserveconf if it is not already in SPKG_CLASSES -SPKG_CLASSES := $(SPKG_CLASSES) $(if $(SAMPLECONF),$(if $(filter cswsampleconf,$(SPKG_CLASSES)),,cswsampleconf)) +SPKG_CLASSES := $(SPKG_CLASSES) $(if $(SAMPLECONF),$(if $(filter cswcpsampleconf,$(SPKG_CLASSES)),,cswcpsampleconf)) SPKG_CLASSES := $(SPKG_CLASSES) $(if $(PRESERVECONF),$(if $(filter cswpreserveconf,$(SPKG_CLASSES)),,cswpreserveconf)) SPKG_CLASSES := $(SPKG_CLASSES) $(if $(INITSMF),$(if $(filter cswinitsmf,$(SPKG_CLASSES)),,cswinitsmf)) SPKG_CLASSES := $(SPKG_CLASSES) $(if $(USERGROUP),$(if $(filter cswusergroup,$(SPKG_CLASSES)),,cswusergroup)) @@ -169,7 +169,7 @@ # - set class for all config files ifneq ($(SAMPLECONF)$(PRESERVECONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),) _CSWCLASS_FILTER = | perl -ane '\ - $(foreach FILE,$(SAMPLECONF:%.CSW=%),$$F[1] = "cswsampleconf" if ( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ + $(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,$(INITSMF),$$F[1] = "cswinitsmf" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(USERGROUP),$$F[1] = "cswusergroup" if( $$F[2] =~ m(^$(FILE)$$) );)\ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Sep 17 13:39:21 2009 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 17 Sep 2009 11:39:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[6330] csw/mgar/pkg/ganglia/branches Message-ID: Revision: 6330 http://gar.svn.sourceforge.net/gar/?rev=6330&view=rev Author: d_pocock Date: 2009-09-17 11:39:21 +0000 (Thu, 17 Sep 2009) Log Message: ----------- ganglia: testing a release candidate Modified Paths: -------------- csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/Makefile csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/checksums Added Paths: ----------- csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/ Modified: csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/Makefile =================================================================== --- csw/mgar/pkg/ganglia/trunk/Makefile 2009-09-11 09:22:45 UTC (rev 6265) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/Makefile 2009-09-17 11:39:21 UTC (rev 6330) @@ -1,5 +1,5 @@ GARNAME = ganglia -GARVERSION = 3.1.2 +GARVERSION = 3.1.3 CATEGORIES = utils # How should we set this? @@ -24,7 +24,7 @@ DISTFILES += CSWgangliaweb.postinstall CSWgangliaweb.preremove DISTFILES += httpd-ganglia.conf.CSW cswgmond cswgmetad -PACKAGES = CSWgangliaagent CSWgangliart CSWgangliadevel CSWgangliagmetad CSWgangliaweb CSWgangliamodpython +PACKAGES = CSWgangliart CSWgangliaagent CSWgangliadevel CSWgangliagmetad CSWgangliaweb CSWgangliamodpython CATALOGNAME_CSWganglia = ganglia CATALOGNAME_CSWgangliart = ganglia_rt @@ -84,14 +84,14 @@ # TODO: define a CSWgangliamodpython package # Depends: some issues exist getting the Python support working on Solaris, # Ganglia's configure.in needs to be further enhanced for this to work -CONFIGURE_ARGS += --without-python +CONFIGURE_ARGS += --disable-python #CONFIGURE_ARGS += --with-python=/opt/csw # For Ganglia 3.1.2, the test suite doesn't compile cleanly on Solaris, # so we skip it. This should be re-assessed with each new release # from upstream. Proposed fixes for the test suite to be submitted # upstream. -ifeq ($(GARVERSION),3.1.2) +ifeq ($(GARVERSION),3.1.3) TEST_SCRIPTS = endif Modified: csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/checksums =================================================================== --- csw/mgar/pkg/ganglia/trunk/checksums 2009-09-11 09:22:45 UTC (rev 6265) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/checksums 2009-09-17 11:39:21 UTC (rev 6330) @@ -2,5 +2,5 @@ c4c333a46db391464e372ad8ede4993c download/CSWgangliaweb.preremove 25d302948e25837bf17757d5e23e4955 download/cswgmetad c6bb96c949dbb989d06ebb36b6af885d download/cswgmond -aaba09a6fa897ed581789f679f7ca62d download/ganglia-3.1.2.tar.gz +cd502229ea934b433fa2ddc6fd3a2706 download/ganglia-3.1.3.tar.gz 2ff504ecb546aca2cdd6ee09af9a417e download/httpd-ganglia.conf.CSW 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 Sep 17 14:13:00 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 17 Sep 2009 12:13:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6331] csw/mgar/pkg/sudosh2/trunk/Makefile Message-ID: Revision: 6331 http://gar.svn.sourceforge.net/gar/?rev=6331&view=rev Author: skayser Date: 2009-09-17 12:13:00 +0000 (Thu, 17 Sep 2009) Log Message: ----------- sudosh2: secure logdir, adjust sudosh paths in README Modified Paths: -------------- csw/mgar/pkg/sudosh2/trunk/Makefile Modified: csw/mgar/pkg/sudosh2/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudosh2/trunk/Makefile 2009-09-17 11:39:21 UTC (rev 6330) +++ csw/mgar/pkg/sudosh2/trunk/Makefile 2009-09-17 12:13:00 UTC (rev 6331) @@ -27,6 +27,7 @@ localstatedir = /var/opt/csw SAMPLECONF = $(sysconfdir)/sudosh.conf +PROTOTYPE_FILTER = awk '$$$$3 ~/^\/var\/opt\/csw\/sudosh$$$$/ { $$$$4 = 0700 } { print }' CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-logdir=$(localstatedir)/sudosh @@ -61,4 +62,6 @@ cp $(addprefix $(WORKSRC)/,$(DOCS)) $(DOCDEST) cp $(WORKSRC)/ChangeLog $(DOCDEST)/changelog cp $(FILEDIR)/changelog.CSW $(DOCDEST) + + perl -pi -e 's|/usr/local/bin|$(bindir)|g' $(DOCDEST)/README @$(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 Sep 17 15:31:21 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 17 Sep 2009 13:31:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[6332] csw/mgar/pkg Message-ID: Revision: 6332 http://gar.svn.sourceforge.net/gar/?rev=6332&view=rev Author: dmichelsen Date: 2009-09-17 13:31:20 +0000 (Thu, 17 Sep 2009) Log Message: ----------- keepassx: Initial commit, wait for Qt >= 4.3 Added Paths: ----------- csw/mgar/pkg/keepassx/ csw/mgar/pkg/keepassx/branches/ csw/mgar/pkg/keepassx/tags/ csw/mgar/pkg/keepassx/trunk/ csw/mgar/pkg/keepassx/trunk/Makefile csw/mgar/pkg/keepassx/trunk/checksums csw/mgar/pkg/keepassx/trunk/files/ Property changes on: csw/mgar/pkg/keepassx/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/keepassx/trunk/Makefile =================================================================== --- csw/mgar/pkg/keepassx/trunk/Makefile (rev 0) +++ csw/mgar/pkg/keepassx/trunk/Makefile 2009-09-17 13:31:20 UTC (rev 6332) @@ -0,0 +1,20 @@ +GARNAME = keepassx +GARVERSION = 0.4.1 +CATEGORIES = apps + +DESCRIPTION = Cross platform password manager +define BLURB + Long description +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +# This needs qmake from Qt >= 4.3 + +include gar/category.mk Added: csw/mgar/pkg/keepassx/trunk/checksums =================================================================== --- csw/mgar/pkg/keepassx/trunk/checksums (rev 0) +++ csw/mgar/pkg/keepassx/trunk/checksums 2009-09-17 13:31:20 UTC (rev 6332) @@ -0,0 +1 @@ +96efdf5855703e3d2817973d5e2b0fcf download/keepassx-0.4.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 Thu Sep 17 15:39:35 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 17 Sep 2009 13:39:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[6333] csw/mgar Message-ID: Revision: 6333 http://gar.svn.sourceforge.net/gar/?rev=6333&view=rev Author: dmichelsen Date: 2009-09-17 13:39:35 +0000 (Thu, 17 Sep 2009) Log Message: ----------- x11: Add variable for xorg individual libs Modified Paths: -------------- csw/mgar/gar/v2/categories/x11/category.mk csw/mgar/pkg/x11/libX11/trunk/Makefile csw/mgar/pkg/x11/libXau/trunk/Makefile csw/mgar/pkg/x11/libXdmcp/trunk/Makefile csw/mgar/pkg/x11/libxft/trunk/Makefile csw/mgar/pkg/x11/xrender/trunk/Makefile csw/mgar/pkg/x11/xtrans/trunk/Makefile Modified: csw/mgar/gar/v2/categories/x11/category.mk =================================================================== --- csw/mgar/gar/v2/categories/x11/category.mk 2009-09-17 13:31:20 UTC (rev 6332) +++ csw/mgar/gar/v2/categories/x11/category.mk 2009-09-17 13:39:35 UTC (rev 6333) @@ -1,5 +1,6 @@ # X11 X11_PROTO_MASTER_SITE = http://xorg.freedesktop.org/releases/individual/proto/ +X11_LIB_MASTER_SITE = http://xorg.freedesktop.org/releases/individual/lib/ XCB_MASTER_SITES = http://xcb.freedesktop.org/dist/ # C and C++ compiler flags Modified: csw/mgar/pkg/x11/libX11/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libX11/trunk/Makefile 2009-09-17 13:31:20 UTC (rev 6332) +++ csw/mgar/pkg/x11/libX11/trunk/Makefile 2009-09-17 13:39:35 UTC (rev 6333) @@ -9,7 +9,7 @@ functions of the window system. endef -MASTER_SITES =http://xorg.freedesktop.org/releases/individual/lib/ +MASTER_SITES = $(X11_LIB_MASTER_SITE) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = patch-stdint.diff # Add workaround for http://bugs.sourcemage.org/show_bug.cgi?id=13476 Modified: csw/mgar/pkg/x11/libXau/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libXau/trunk/Makefile 2009-09-17 13:31:20 UTC (rev 6332) +++ csw/mgar/pkg/x11/libXau/trunk/Makefile 2009-09-17 13:39:35 UTC (rev 6333) @@ -8,7 +8,7 @@ which controls authorisation for X connections, both client-side and server-side. endef -MASTER_SITES = http://xorg.freedesktop.org/releases/individual/lib/ +MASTER_SITES = $(X11_LIB_MASTER_SITE) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PREREQUISITE_PKGS = CSWinputproto CSWkbproto CSWrenderproto CSWxcbproto Modified: csw/mgar/pkg/x11/libXdmcp/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libXdmcp/trunk/Makefile 2009-09-17 13:31:20 UTC (rev 6332) +++ csw/mgar/pkg/x11/libXdmcp/trunk/Makefile 2009-09-17 13:39:35 UTC (rev 6333) @@ -8,7 +8,7 @@ protocol library, which allows for remote logins to display managers. endef -MASTER_SITES = http://xorg.freedesktop.org/releases/individual/lib/ +MASTER_SITES = $(X11_LIB_MASTER_SITE) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/x11/libxft/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxft/trunk/Makefile 2009-09-17 13:31:20 UTC (rev 6332) +++ csw/mgar/pkg/x11/libxft/trunk/Makefile 2009-09-17 13:39:35 UTC (rev 6333) @@ -10,7 +10,7 @@ extension handles glyph drawing; otherwise, the core X protocol is used. endef -MASTER_SITES = http://xorg.freedesktop.org/releases/individual/lib/ +MASTER_SITES = $(X11_LIB_MASTER_SITE) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz # Legacy libraries Modified: csw/mgar/pkg/x11/xrender/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xrender/trunk/Makefile 2009-09-17 13:31:20 UTC (rev 6332) +++ csw/mgar/pkg/x11/xrender/trunk/Makefile 2009-09-17 13:39:35 UTC (rev 6333) @@ -10,7 +10,7 @@ into either triangles or trapezoids. endef -MASTER_SITES = http://xorg.freedesktop.org/releases/individual/lib/ +MASTER_SITES = $(X11_LIB_MASTER_SITE) DISTNAME = libXrender-$(GARVERSION) DISTFILES = $(DISTNAME).tar.gz Modified: csw/mgar/pkg/x11/xtrans/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xtrans/trunk/Makefile 2009-09-17 13:31:20 UTC (rev 6332) +++ csw/mgar/pkg/x11/xtrans/trunk/Makefile 2009-09-17 13:39:35 UTC (rev 6333) @@ -8,7 +8,7 @@ at time of writing, it includes support for UNIX sockets, IPv4, IPv6, and DECnet. endef -MASTER_SITES = http://xorg.freedesktop.org/releases/individual/lib/ +MASTER_SITES = $(X11_LIB_MASTER_SITE) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz # 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 Thu Sep 17 15:43:54 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 17 Sep 2009 13:43:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[6334] csw/mgar/pkg/x11 Message-ID: Revision: 6334 http://gar.svn.sourceforge.net/gar/?rev=6334&view=rev Author: dmichelsen Date: 2009-09-17 13:43:50 +0000 (Thu, 17 Sep 2009) Log Message: ----------- x11/libxtst: Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxtst/ csw/mgar/pkg/x11/libxtst/branches/ csw/mgar/pkg/x11/libxtst/tags/ csw/mgar/pkg/x11/libxtst/trunk/ csw/mgar/pkg/x11/libxtst/trunk/Makefile csw/mgar/pkg/x11/libxtst/trunk/checksums csw/mgar/pkg/x11/libxtst/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxtst/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/x11/libxtst/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxtst/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxtst/trunk/Makefile 2009-09-17 13:43:50 UTC (rev 6334) @@ -0,0 +1,25 @@ +GARNAME = libxtst +GARVERSION = 1.0.99.2 +CATEGORIES = x11 + +DESCRIPTION = +define BLURB + Long description +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +DISTNAME = libXtst-$(GARVERSION) +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.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 +NOISALIST = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/x11/libxtst/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxtst/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxtst/trunk/checksums 2009-09-17 13:43:50 UTC (rev 6334) @@ -0,0 +1 @@ +b5edc35ca9b9ba4133a3fa34cb1b00f8 download/libXtst-1.0.99.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Sep 17 15:52:11 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 17 Sep 2009 13:52:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[6335] csw/mgar/pkg/x11/xextproto/trunk Message-ID: Revision: 6335 http://gar.svn.sourceforge.net/gar/?rev=6335&view=rev Author: dmichelsen Date: 2009-09-17 13:52:08 +0000 (Thu, 17 Sep 2009) Log Message: ----------- x11/xextproto: Update to 7.1.1 Modified Paths: -------------- csw/mgar/pkg/x11/xextproto/trunk/Makefile csw/mgar/pkg/x11/xextproto/trunk/checksums Modified: csw/mgar/pkg/x11/xextproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xextproto/trunk/Makefile 2009-09-17 13:43:50 UTC (rev 6334) +++ csw/mgar/pkg/x11/xextproto/trunk/Makefile 2009-09-17 13:52:08 UTC (rev 6335) @@ -1,5 +1,5 @@ GARNAME = xextproto -GARVERSION = 7.0.5 +GARVERSION = 7.1.1 CATEGORIES = x11 Modified: csw/mgar/pkg/x11/xextproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xextproto/trunk/checksums 2009-09-17 13:43:50 UTC (rev 6334) +++ csw/mgar/pkg/x11/xextproto/trunk/checksums 2009-09-17 13:52:08 UTC (rev 6335) @@ -1 +1 @@ -f6274c778e571130484fb0650651ac02 download/xextproto-7.0.5.tar.gz +6c55283718dbeb826bcf899b9e89faba download/xextproto-7.1.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Sep 17 16:03:56 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 17 Sep 2009 14:03:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[6336] csw/mgar/pkg/x11 Message-ID: Revision: 6336 http://gar.svn.sourceforge.net/gar/?rev=6336&view=rev Author: dmichelsen Date: 2009-09-17 14:03:55 +0000 (Thu, 17 Sep 2009) Log Message: ----------- libxext: Initial commit Modified Paths: -------------- csw/mgar/pkg/x11/libxext/trunk/Makefile csw/mgar/pkg/x11/libxext/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/libxext/ Modified: csw/mgar/pkg/x11/libxext/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxtst/trunk/Makefile 2009-09-17 13:43:50 UTC (rev 6334) +++ csw/mgar/pkg/x11/libxext/trunk/Makefile 2009-09-17 14:03:55 UTC (rev 6336) @@ -1,22 +1,24 @@ -GARNAME = libxtst -GARVERSION = 1.0.99.2 +GARNAME = libxext +GARVERSION = 1.0.99.4 CATEGORIES = x11 -DESCRIPTION = +DESCRIPTION = X11 miscellaneous extensions library1 define BLURB - Long description + LibXext provides an X Window System client interface to several extensions + to the X protocol, iincluding DOUBLE-BUFFER (DBE), DPMS, Extended-Visual-Information + (EVI), LBX, MIT-SHM, MIT-SUNDRY-NONSTANDARD, Multi-Buffering, SECURITY, SHAPE, + SHAPE, SYNC, TOG-CUP, XC-APPGROUP, XC-MISC, XTEST and possibly others. endef MASTER_SITES = $(X11_LIB_MASTER_SITE) -DISTNAME = libXtst-$(GARVERSION) +DISTNAME = libXext-$(GARVERSION) 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.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_PKGS = CSWxextproto +REQUIRED_PKGS = CSWlibx11 BUILD64 = 1 NOISALIST = 1 Modified: csw/mgar/pkg/x11/libxext/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxtst/trunk/checksums 2009-09-17 13:43:50 UTC (rev 6334) +++ csw/mgar/pkg/x11/libxext/trunk/checksums 2009-09-17 14:03:55 UTC (rev 6336) @@ -1 +1 @@ -b5edc35ca9b9ba4133a3fa34cb1b00f8 download/libXtst-1.0.99.2.tar.bz2 +24da44888b87c66edb326acec35b85aa download/libXext-1.0.99.4.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Sep 17 16:15:10 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 17 Sep 2009 14:15:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[6337] csw/mgar/pkg/pidgin/trunk Message-ID: Revision: 6337 http://gar.svn.sourceforge.net/gar/?rev=6337&view=rev Author: wahwah Date: 2009-09-17 14:15:10 +0000 (Thu, 17 Sep 2009) Log Message: ----------- pidgin: Version bump to 2.6.2. Fixed the REQUIRED_PKGS variable and added PREREQUISITE_PKGS. I'm not intending to take the package over, only building it for my own selfish needs. ;-) Modified Paths: -------------- csw/mgar/pkg/pidgin/trunk/Makefile csw/mgar/pkg/pidgin/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/pidgin/trunk/Makefile Modified: csw/mgar/pkg/pidgin/trunk/Makefile =================================================================== --- csw/mgar/pkg/pidgin/trunk/Makefile 2009-09-17 14:03:55 UTC (rev 6336) +++ csw/mgar/pkg/pidgin/trunk/Makefile 2009-09-17 14:15:10 UTC (rev 6337) @@ -1,5 +1,7 @@ +# $Id$ + GARNAME = pidgin -GARVERSION = 2.5.8 +GARVERSION = 2.6.2 CATEGORIES = apps DESCRIPTION = Multi-protocol IM client @@ -21,6 +23,7 @@ CONFIGURE_ARGS += '--disable-nm' CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include CONFIGURE_ARGS += --x-libraries=$(prefix)/X11/lib +CONFIGURE_ARGS += --disable-vv PATH = $(SOS11_CC_HOME)/bin:$(PATH) @@ -47,12 +50,14 @@ EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod -REQUIRED_PKGS_CSWpidgin = CSWaspell CSWdbusglib CSWgcrypt CSWggettextrt CSWglib2 -REQUIRED_PKGS_CSWpidgin += CSWgnutls CSWgstreamer CSWgtk2 CSWgtkspell CSWlibatk -REQUIRED_PKGS_CSWpidgin += CSWlibcairo CSWlibdbus CSWlibxml2 CSWmeanwhile CSWncurses -REQUIRED_PKGS_CSWpidgin += CSWpango CSWperl CSWpython CSWsilctoolkit CSWstartupnotif -REQUIRED_PKGS_CSWpidgin += CSWtcl CSWtk CSWiconv CSWsunmath CSWzlib CSWdbus -REQUIRED_PKGS_CSWpidgin += CSWfconfig CSWftype2 CSWlibx11 +REQUIRED_PKGS = CSWaspell CSWdbusglib CSWgcrypt CSWggettextrt CSWglib2 +REQUIRED_PKGS += CSWgnutls CSWgstreamer CSWgtk2 CSWgtkspell CSWlibatk +REQUIRED_PKGS += CSWlibcairo CSWlibdbus CSWlibxml2 CSWmeanwhile CSWncurses +REQUIRED_PKGS += CSWpango CSWperl CSWpython CSWsilctoolkit CSWstartupnotif +REQUIRED_PKGS += CSWtcl CSWtk CSWiconv CSWsunmath CSWzlib CSWdbus +REQUIRED_PKGS += CSWfconfig CSWftype2 CSWlibx11 CSWbdb CSWlibidn + +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWlibdbusdev CSWdbusglibdev CSWgnutlsdevel + include gar/category.mk - Property changes on: csw/mgar/pkg/pidgin/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/pidgin/trunk/checksums =================================================================== --- csw/mgar/pkg/pidgin/trunk/checksums 2009-09-17 14:03:55 UTC (rev 6336) +++ csw/mgar/pkg/pidgin/trunk/checksums 2009-09-17 14:15:10 UTC (rev 6337) @@ -1 +1 @@ -bf8215d85a7ab0bc1c99dbd6d83937f6 download/pidgin-2.5.8.tar.gz +2db20c9c44e9a84ae4a9290f9e47ae83 download/pidgin-2.6.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Sep 17 17:52:21 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 17 Sep 2009 15:52:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[6338] csw/mgar/pkg/sudosh2/trunk/Makefile Message-ID: Revision: 6338 http://gar.svn.sourceforge.net/gar/?rev=6338&view=rev Author: skayser Date: 2009-09-17 15:52:21 +0000 (Thu, 17 Sep 2009) Log Message: ----------- sudosh2: adjusted logdir perms to 0733 Modified Paths: -------------- csw/mgar/pkg/sudosh2/trunk/Makefile Modified: csw/mgar/pkg/sudosh2/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudosh2/trunk/Makefile 2009-09-17 14:15:10 UTC (rev 6337) +++ csw/mgar/pkg/sudosh2/trunk/Makefile 2009-09-17 15:52:21 UTC (rev 6338) @@ -1,6 +1,5 @@ # TODO/Issues # - Submit 001- (DESTDIR) and 002- (man page) patches upstream -# - What about --logdir perms? Any other special perms required? GARNAME = sudosh2 GARVERSION = 1.0.2 CATEGORIES = apps @@ -27,8 +26,21 @@ localstatedir = /var/opt/csw SAMPLECONF = $(sysconfdir)/sudosh.conf -PROTOTYPE_FILTER = awk '$$$$3 ~/^\/var\/opt\/csw\/sudosh$$$$/ { $$$$4 = 0700 } { print }' +# logdir is writable by all users (needs to be so that all users can use +# sudosh). This might look horribly wrong at first, but when looking at +# the logfile names one can see that they are created with some entropy. +# +# skayser-root-input-1253202076-FMssssssOOOOOOuu +# skayser-root-script-1253202076-FMssssssOOOOOOuu +# skayser-root-time-1253202076-FMssssssOOOOOOuu +# +# This way, an ordinary user would need to guess such a name to be able to +# access or modify the related session files. Might not be 100% bullet-proof, +# but then again, you probably will use something else than sudosh in an +# environment that calls for 100% bullet-proof. +PROTOTYPE_FILTER = awk '$$$$3 ~/^\/var\/opt\/csw\/sudosh$$$$/ { $$$$4 = 0733 } { print }' + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-logdir=$(localstatedir)/sudosh 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 Sep 17 18:07:46 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 17 Sep 2009 16:07:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6339] csw/mgar/pkg/sudosh2/trunk/files/changelog.CSW Message-ID: Revision: 6339 http://gar.svn.sourceforge.net/gar/?rev=6339&view=rev Author: skayser Date: 2009-09-17 16:07:46 +0000 (Thu, 17 Sep 2009) Log Message: ----------- sudosh2: updated changelog.CSW Modified Paths: -------------- csw/mgar/pkg/sudosh2/trunk/files/changelog.CSW Modified: csw/mgar/pkg/sudosh2/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/sudosh2/trunk/files/changelog.CSW 2009-09-17 15:52:21 UTC (rev 6338) +++ csw/mgar/pkg/sudosh2/trunk/files/changelog.CSW 2009-09-17 16:07:46 UTC (rev 6339) @@ -1,5 +1,5 @@ -sudosh2 (1.0.2,REV=2009.09.16) +sudosh2 (1.0.2,REV=2009.09.17) * Initial release. - -- Sebastian Kayser Wed, 16 Sep 2009 01:11:30 +0200 + -- Sebastian Kayser Thu, 17 Sep 2009 18:07:17 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Sep 17 18:33:32 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 17 Sep 2009 16:33:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[6340] csw/mgar/pkg Message-ID: Revision: 6340 http://gar.svn.sourceforge.net/gar/?rev=6340&view=rev Author: dmichelsen Date: 2009-09-17 16:33:32 +0000 (Thu, 17 Sep 2009) Log Message: ----------- xapian: Initial commit Added Paths: ----------- csw/mgar/pkg/xapian/ csw/mgar/pkg/xapian/branches/ csw/mgar/pkg/xapian/tags/ csw/mgar/pkg/xapian/trunk/ csw/mgar/pkg/xapian/trunk/Makefile csw/mgar/pkg/xapian/trunk/checksums csw/mgar/pkg/xapian/trunk/files/ Property changes on: csw/mgar/pkg/xapian/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/xapian/trunk/Makefile =================================================================== --- csw/mgar/pkg/xapian/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xapian/trunk/Makefile 2009-09-17 16:33:32 UTC (rev 6340) @@ -0,0 +1,30 @@ +GARNAME = xapian-core +GARVERSION = 1.0.11 +CATEGORIES = lib + +DESCRIPTION = An open source search engine library +define BLURB + Xapian is an Open Source Probabilistic Information Retrieval Library. It + offers a highly adaptable toolkit that allows developers to easily add + advanced indexing and search facilities to applications. +endef + +MASTER_SITES = http://oligarchy.co.uk/xapian/$(GARVERSION)/ + +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 = CSWxapiancore +CATALOGNAME_CSWxapiancore = xapian_core + +REQUIRED_PKGS = CSWstlport CSWzlib + +EXTRA_LD_FLAGS = -lm + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/xapian/trunk/checksums =================================================================== --- csw/mgar/pkg/xapian/trunk/checksums (rev 0) +++ csw/mgar/pkg/xapian/trunk/checksums 2009-09-17 16:33:32 UTC (rev 6340) @@ -0,0 +1 @@ +f80a2f51b109e2a065bdcbf1ba03b808 download/xapian-core-1.0.11.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Sep 17 20:23:47 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 17 Sep 2009 18:23:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[6341] csw/mgar/pkg/xterm/trunk Message-ID: Revision: 6341 http://gar.svn.sourceforge.net/gar/?rev=6341&view=rev Author: skayser Date: 2009-09-17 18:23:47 +0000 (Thu, 17 Sep 2009) Log Message: ----------- xterm: bump to 248 Modified Paths: -------------- csw/mgar/pkg/xterm/trunk/Makefile csw/mgar/pkg/xterm/trunk/checksums Modified: csw/mgar/pkg/xterm/trunk/Makefile =================================================================== --- csw/mgar/pkg/xterm/trunk/Makefile 2009-09-17 16:33:32 UTC (rev 6340) +++ csw/mgar/pkg/xterm/trunk/Makefile 2009-09-17 18:23:47 UTC (rev 6341) @@ -1,5 +1,5 @@ GARNAME = xterm -GARVERSION = 247 +GARVERSION = 248 CATEGORIES = apps DESCRIPTION = Terminal emulator for the X Window System @@ -19,7 +19,9 @@ # 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 -PATCHFILES = patch-mkwidth.diff +# +# fixed in #244, let's see whether it works +#PATCHFILES = patch-mkwidth.diff # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz Modified: csw/mgar/pkg/xterm/trunk/checksums =================================================================== --- csw/mgar/pkg/xterm/trunk/checksums 2009-09-17 16:33:32 UTC (rev 6340) +++ csw/mgar/pkg/xterm/trunk/checksums 2009-09-17 18:23:47 UTC (rev 6341) @@ -1,2 +1,2 @@ 347f24b7ed3e42a3d40b1db1ed0061f0 download/patch-mkwidth.diff -ef73f7f1eb8c863c51f2bfac1f55efd1 download/xterm-247.tgz +70771a21fbc54a79f68374cebb49935a download/xterm-248.tgz 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 Sep 17 21:46:16 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 17 Sep 2009 19:46:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[6342] csw/mgar/pkg/xfce/libxfce4util/trunk/checksums Message-ID: Revision: 6342 http://gar.svn.sourceforge.net/gar/?rev=6342&view=rev Author: wbonnet Date: 2009-09-17 19:46:09 +0000 (Thu, 17 Sep 2009) Log Message: ----------- Update checksums for version 4.6.1 Modified Paths: -------------- csw/mgar/pkg/xfce/libxfce4util/trunk/checksums Modified: csw/mgar/pkg/xfce/libxfce4util/trunk/checksums =================================================================== --- csw/mgar/pkg/xfce/libxfce4util/trunk/checksums 2009-09-17 18:23:47 UTC (rev 6341) +++ csw/mgar/pkg/xfce/libxfce4util/trunk/checksums 2009-09-17 19:46:09 UTC (rev 6342) @@ -1,4 +1 @@ -ecee743bfbd594e7c56e69189b72f5b6 download/CSWlibxfce4util.gspec -e6acf26d8418a68961f6e6ebf5168739 download/CSWlibxfce4utildev.gspec -89bbdc03bcb397ceae359246900ef96d download/CSWlibxfce4utildoc.gspec eac51d58179cbcadc3f802450a8ec9cd download/libxfce4util-4.6.1.tar.bz2 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 Sep 17 21:56:35 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 17 Sep 2009 19:56:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[6343] csw/mgar/pkg/xfce/libxfcegui4/trunk/Makefile Message-ID: Revision: 6343 http://gar.svn.sourceforge.net/gar/?rev=6343&view=rev Author: wbonnet Date: 2009-09-17 19:56:22 +0000 (Thu, 17 Sep 2009) Log Message: ----------- Add missing dependencies Modified Paths: -------------- csw/mgar/pkg/xfce/libxfcegui4/trunk/Makefile Modified: csw/mgar/pkg/xfce/libxfcegui4/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/libxfcegui4/trunk/Makefile 2009-09-17 19:46:09 UTC (rev 6342) +++ csw/mgar/pkg/xfce/libxfcegui4/trunk/Makefile 2009-09-17 19:56:22 UTC (rev 6343) @@ -33,7 +33,10 @@ # Defines dependencies REQUIRED_PKGS_CSWlibxfcegui4 = CSWdbusglib CSWggettextrt CSWglib2 CSWgtk2 CSWlibatk CSWlibcairo REQUIRED_PKGS_CSWlibxfcegui4 += CSWlibdbus CSWlibglade2 CSWlibxfce4util CSWlibxml2 CSWpango -REQUIRED_PKGS_CSWlibxfcegui4 += CSWstartupnotif CSWxfconf +REQUIRED_PKGS_CSWlibxfcegui4 += CSWstartupnotif CSWxfconf CSWfconfig +REQUIRED_PKGS_CSWlibxfcegui4 += CSWftype2 +REQUIRED_PKGS_CSWlibxfcegui4 += CSWsunmath + REQUIRED_PKGS_CSWlibxfcegui4devel = REQUIRED_PKGS_CSWlibxfcegui4doc = 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 Sep 18 13:57:00 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Fri, 18 Sep 2009 11:57:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6344] csw/mgar/pkg Message-ID: Revision: 6344 http://gar.svn.sourceforge.net/gar/?rev=6344&view=rev Author: trygvis Date: 2009-09-18 11:56:59 +0000 (Fri, 18 Sep 2009) Log Message: ----------- o Initial add of the 'cgit' package. Added Paths: ----------- csw/mgar/pkg/cgit/ csw/mgar/pkg/cgit/branches/ csw/mgar/pkg/cgit/tags/ csw/mgar/pkg/cgit/trunk/ csw/mgar/pkg/cgit/trunk/Makefile csw/mgar/pkg/cgit/trunk/checksums csw/mgar/pkg/cgit/trunk/files/ csw/mgar/pkg/cgit/trunk/files/0001-cgit.conf csw/mgar/pkg/cgit/trunk/files/apache.conf.CSW csw/mgar/pkg/cgit/trunk/files/cgitrc.CSW Property changes on: csw/mgar/pkg/cgit/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/cgit/trunk/Makefile =================================================================== --- csw/mgar/pkg/cgit/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cgit/trunk/Makefile 2009-09-18 11:56:59 UTC (rev 6344) @@ -0,0 +1,61 @@ +GARNAME = cgit +GARVERSION = 0.8.3-opencsw-1 +CATEGORIES = devel + +DESCRIPTION = Web front-end for Git +define BLURB +cgit is + * a cgi application implemented in C: it's basically (yet) another git command, used to generate html. + * not forking: all git operations are performed by linking with libgit.a. + * using a built-in cache: the generated html is stored on disk for the benefit of later requests. + * fond of virtual urls - using PATH_INFO or modules like mod_rewrite makes cgit generate urls with few or no querystring parameters, e.g. + * http://hjemli.net/git/cgit/log/Makefile vs. + * http://hjemli.net/git?r=cgit&p=log&path=Makefile. + * not too visual, but sometimes a bit of graphics can be justified. + * open source - it is licensed under GPL v2. + * maintained by Lars Hjemli, who is happy to receive patches, suggestions and bug reports. +endef + +REQUIRED_PKGS_CSWcgit = CSWiconv CSWosslrt CSWzlib + +#MASTER_SITES = http://hjemli.net/git/cgit/snapshot/ +#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 + +#GIT_REPOS = git://github.com/trygvis/cgit.git +GIT_REPOS = http://localhost/cgit/cgit +#GIT_TREEISH_cgit = v$(GARVERSION)$(if $(PATCHLEVEL),-$(PATCHLEVEL)) +GIT_TREEISH_cgit = solaris + +DISTFILES = apache.conf.CSW cgitrc.CSW + +# The Makefile use "install" to install files but the Sun one is not really compatible +PATH := /usr/ucb:$(PATH) + +# 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 = + +PATCHFILES = 0001-cgit.conf + +CONFIGURE_SCRIPTS = + +# Disable tests for now, need a round GNU'ism removal there too +TEST_SCRIPTS = + +PRESERVECONF = /etc/opt/csw/cgit/apache.conf.CSW +PRESERVECONF += /etc/opt/csw/cgit/cgitrc.CSW + +# Trick to get the gar+git support to export the source code +pre-extract-modulated: git-extract-cgit + +post-install-modulated: + @mkdir -p $(DESTDIR)/etc/opt/csw/cgit/ + @cp $(FILEDIR)/apache.conf.CSW \ + $(FILEDIR)/cgitrc.CSW \ + $(DESTDIR)/etc/opt/csw/cgit/ +# @$(MAKECOOKIE) + +include gar/category.mk Added: csw/mgar/pkg/cgit/trunk/checksums =================================================================== --- csw/mgar/pkg/cgit/trunk/checksums (rev 0) +++ csw/mgar/pkg/cgit/trunk/checksums 2009-09-18 11:56:59 UTC (rev 6344) @@ -0,0 +1,3 @@ +b013ec63820f1841df1cddaa35d66ed3 download/0001-cgit.conf +27ef98eeb9066a301e60def5b6895a2c download/apache.conf.CSW +03d013bbfdad0143ddcb4c29acf1b637 download/cgitrc.CSW Added: csw/mgar/pkg/cgit/trunk/files/0001-cgit.conf =================================================================== --- csw/mgar/pkg/cgit/trunk/files/0001-cgit.conf (rev 0) +++ csw/mgar/pkg/cgit/trunk/files/0001-cgit.conf 2009-09-18 11:56:59 UTC (rev 6344) @@ -0,0 +1,35 @@ +--- a/dev/null 2009-09-18 13:04:46.000000000 +0200 ++++ b/cgit.conf 2009-09-18 13:08:12.674658346 +0200 +@@ -0,0 +1,32 @@ ++# Sun Studio ++CC=/opt/studio/ss11/SUNWspro/bin/cc ++#CFLAGS += -v ++MMFLAGS = -xM1 ++ ++# GCC ++#CC=/opt/csw/gcc4/bin/gcc ++ ++# Common ++LDFLAGS += -R/opt/csw/lib ++ ++LIBGIT_PATH=/opt/csw/lib/git/libgit.a ++ ++# Common ++CFLAGS += -I/opt/csw/include ++CFLAGS += -I/opt/csw/include/git ++ ++LDFLAGS += -L/opt/csw/lib ++LDFLAGS += -L/opt/csw/lib/git ++ ++# Solaris ++EXTLIBS = -lsocket -lnsl -lgit -lxdiff ++NEEDS_LIBICONV=1 ++NO_STRCASESTR=1 ++ ++# OpenCSW ++CGIT_SCRIPT_PATH = /opt/csw/libexec/cgit ++CGIT_DATA_PATH = /opt/csw/share/cgit/httpd ++CGIT_CONFIG = /etc/opt/csw/cgit/cgitrc ++CACHE_ROOT = /var/opt/csw/cgit/cache ++ ++INSTALL = /usr/ucb/install Added: csw/mgar/pkg/cgit/trunk/files/apache.conf.CSW =================================================================== --- csw/mgar/pkg/cgit/trunk/files/apache.conf.CSW (rev 0) +++ csw/mgar/pkg/cgit/trunk/files/apache.conf.CSW 2009-09-18 11:56:59 UTC (rev 6344) @@ -0,0 +1,12 @@ + + AllowOverride None + Options ExecCGI + Order allow,deny + Allow from all + + + + AllowOverride None + Order allow,deny + Allow from all + Added: csw/mgar/pkg/cgit/trunk/files/cgitrc.CSW =================================================================== --- csw/mgar/pkg/cgit/trunk/files/cgitrc.CSW (rev 0) +++ csw/mgar/pkg/cgit/trunk/files/cgitrc.CSW 2009-09-18 11:56:59 UTC (rev 6344) @@ -0,0 +1,12 @@ +cache-size=1000 + +snapshots=tar.gz tar.bz2 zip + +#scan-path=/var/opt/csw/gitosis/repositories + +repo.url=cgit +repo.path=/home/trygvis/dev/net.hjemli/cgit/.git +repo.desc=the master foo repository +repo.owner=fooman at foobar.com +repo.readme=info/web/about.html + 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 Sep 18 17:12:23 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Fri, 18 Sep 2009 15:12:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6345] csw/mgar/gar/v2/general-help Message-ID: Revision: 6345 http://gar.svn.sourceforge.net/gar/?rev=6345&view=rev Author: trygvis Date: 2009-09-18 15:12:23 +0000 (Fri, 18 Sep 2009) Log Message: ----------- o Adding a generic help message. Added Paths: ----------- csw/mgar/gar/v2/general-help Added: csw/mgar/gar/v2/general-help =================================================================== --- csw/mgar/gar/v2/general-help (rev 0) +++ csw/mgar/gar/v2/general-help 2009-09-18 15:12:23 UTC (rev 6345) @@ -0,0 +1,4 @@ +Please go here for more detailed documentation: + + http://sourceforge.net/apps/trac/gar/wiki/GarRepository + 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 Sep 18 17:26:31 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Fri, 18 Sep 2009 15:26:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[6346] csw/mgar/gar/v2/gar.lib.mk Message-ID: Revision: 6346 http://gar.svn.sourceforge.net/gar/?rev=6346&view=rev Author: trygvis Date: 2009-09-18 15:26:30 +0000 (Fri, 18 Sep 2009) Log Message: ----------- o Fixing a typo in the git support. Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2009-09-18 15:12:23 UTC (rev 6345) +++ csw/mgar/gar/v2/gar.lib.mk 2009-09-18 15:26:30 UTC (rev 6346) @@ -68,7 +68,7 @@ # to update the code. # we possibly proxy the git:// references depending on GIT_USE_PROXY git-http//%: - @$git clone --bare http://$* $(PARTIALDIR)/$(call GITPROJ,$*) + @git clone --bare http://$* $(PARTIALDIR)/$(call GITPROJ,$*) @( cd $(PARTIALDIR)/$(call GITPROJ,$*); \ git remote add origin http://$*; \ git config remote.origin.fetch $(if $(GIT_REFS_$(call GITPROJ,$*)),$(GIT_REFS_$(call GITPROJ,$*)),$(GIT_DEFAULT_TRACK)); ) 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 Sep 18 18:27:11 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 18 Sep 2009 16:27:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[6347] csw/mgar/pkg/cpan Message-ID: Revision: 6347 http://gar.svn.sourceforge.net/gar/?rev=6347&view=rev Author: dmichelsen Date: 2009-09-18 16:27:11 +0000 (Fri, 18 Sep 2009) Log Message: ----------- cpan/Search-Xapian: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Search-Xapian/ csw/mgar/pkg/cpan/Search-Xapian/branches/ csw/mgar/pkg/cpan/Search-Xapian/tags/ csw/mgar/pkg/cpan/Search-Xapian/trunk/ csw/mgar/pkg/cpan/Search-Xapian/trunk/Makefile csw/mgar/pkg/cpan/Search-Xapian/trunk/checksums csw/mgar/pkg/cpan/Search-Xapian/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Search-Xapian/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/Search-Xapian/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Search-Xapian/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Search-Xapian/trunk/Makefile 2009-09-18 16:27:11 UTC (rev 6347) @@ -0,0 +1,16 @@ +GARNAME = Search-Xapian +GARVERSION = 1.0.16.0 +CATEGORIES = cpan +AUTHOR = OLLY + +DESCRIPTION = A Perl XS frontend to the Xapian C++ search library +define BLURB +endef + +PACKAGES = CSWpmsearchxapian +CATALOGNAME = pm_searchxapian + +PREREQUISITE_PKGS = CSWxapiancore +REQUIRED_PKGS = $(PREREQUISITE_PKGS) + +include gar/category.mk Added: csw/mgar/pkg/cpan/Search-Xapian/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Search-Xapian/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Search-Xapian/trunk/checksums 2009-09-18 16:27:11 UTC (rev 6347) @@ -0,0 +1 @@ +732c23816cdb79f66ed83a3c25e8975f download/Search-Xapian-1.0.16.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 Fri Sep 18 18:28:01 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 18 Sep 2009 16:28:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[6348] csw/mgar/pkg Message-ID: Revision: 6348 http://gar.svn.sourceforge.net/gar/?rev=6348&view=rev Author: dmichelsen Date: 2009-09-18 16:28:01 +0000 (Fri, 18 Sep 2009) Log Message: ----------- xapian: Split into core and bindings Modified Paths: -------------- csw/mgar/pkg/xapian-bindings/trunk/Makefile csw/mgar/pkg/xapian-bindings/trunk/checksums csw/mgar/pkg/xapian-core/trunk/Makefile csw/mgar/pkg/xapian-core/trunk/checksums Added Paths: ----------- csw/mgar/pkg/xapian-bindings/ csw/mgar/pkg/xapian-core/ Removed Paths: ------------- csw/mgar/pkg/xapian/ Modified: csw/mgar/pkg/xapian-bindings/trunk/Makefile =================================================================== --- csw/mgar/pkg/xapian/trunk/Makefile 2009-09-17 16:33:32 UTC (rev 6340) +++ csw/mgar/pkg/xapian-bindings/trunk/Makefile 2009-09-18 16:28:01 UTC (rev 6348) @@ -1,8 +1,8 @@ -GARNAME = xapian-core -GARVERSION = 1.0.11 +GARNAME = xapian-bindings +GARVERSION = 1.0.16 CATEGORIES = lib -DESCRIPTION = An open source search engine library +DESCRIPTION = Xapian bindings for SWIG and JNI define BLURB Xapian is an Open Source Probabilistic Information Retrieval Library. It offers a highly adaptable toolkit that allows developers to easily add @@ -16,15 +16,17 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWxapiancore -CATALOGNAME_CSWxapiancore = xapian_core +PACKAGES = CSWxapianbindings +CATALOGNAME_CSWxapianbindings = xapian_bindings -REQUIRED_PKGS = CSWstlport CSWzlib +REQUIRED_PKGS = CSWxapiancore -EXTRA_LD_FLAGS = -lm +#EXTRA_LD_FLAGS = -lm CONFIGURE_ARGS = $(DIRPATHS) +#BUILD_ARGS = AM_CXXFLAGS="-library=stlport4 -features=tmplife" + TEST_TARGET = check include gar/category.mk Modified: csw/mgar/pkg/xapian-bindings/trunk/checksums =================================================================== --- csw/mgar/pkg/xapian/trunk/checksums 2009-09-17 16:33:32 UTC (rev 6340) +++ csw/mgar/pkg/xapian-bindings/trunk/checksums 2009-09-18 16:28:01 UTC (rev 6348) @@ -1 +1 @@ -f80a2f51b109e2a065bdcbf1ba03b808 download/xapian-core-1.0.11.tar.gz +c330b2ccc451c890916c44446e148f07 download/xapian-bindings-1.0.16.tar.gz Modified: csw/mgar/pkg/xapian-core/trunk/Makefile =================================================================== --- csw/mgar/pkg/xapian/trunk/Makefile 2009-09-17 16:33:32 UTC (rev 6340) +++ csw/mgar/pkg/xapian-core/trunk/Makefile 2009-09-18 16:28:01 UTC (rev 6348) @@ -1,5 +1,5 @@ GARNAME = xapian-core -GARVERSION = 1.0.11 +GARVERSION = 1.0.12 CATEGORIES = lib DESCRIPTION = An open source search engine library @@ -25,6 +25,11 @@ CONFIGURE_ARGS = $(DIRPATHS) +BUILD_ARGS = AM_CXXFLAGS="-library=stlport4 -features=tmplife" + TEST_TARGET = check +# We need the .la-file, otherwise xapian-config doesn't work +MERGE_EXCLUDE_LIBTOOL = + include gar/category.mk Modified: csw/mgar/pkg/xapian-core/trunk/checksums =================================================================== --- csw/mgar/pkg/xapian/trunk/checksums 2009-09-17 16:33:32 UTC (rev 6340) +++ csw/mgar/pkg/xapian-core/trunk/checksums 2009-09-18 16:28:01 UTC (rev 6348) @@ -1 +1 @@ -f80a2f51b109e2a065bdcbf1ba03b808 download/xapian-core-1.0.11.tar.gz +060efc364062704528bbfed5328e907b download/xapian-core-1.0.12.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 Sep 18 19:47:25 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 18 Sep 2009 17:47:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[6349] csw/mgar/pkg/gitosis/trunk/files/README.csw Message-ID: Revision: 6349 http://gar.svn.sourceforge.net/gar/?rev=6349&view=rev Author: bdwalton Date: 2009-09-18 17:47:24 +0000 (Fri, 18 Sep 2009) Log Message: ----------- add note about no-login gitosis account Modified Paths: -------------- csw/mgar/pkg/gitosis/trunk/files/README.csw Modified: csw/mgar/pkg/gitosis/trunk/files/README.csw =================================================================== --- csw/mgar/pkg/gitosis/trunk/files/README.csw 2009-09-18 16:28:01 UTC (rev 6348) +++ csw/mgar/pkg/gitosis/trunk/files/README.csw 2009-09-18 17:47:24 UTC (rev 6349) @@ -11,7 +11,7 @@ Perform the following steps on the gitosis server: -1. su - gitosis +1. su - gitosis (as root, since gitosis is a no-login account) 2. gitosis-init < /tmp/id_dsa.pub The server should now be ready to go. Now, in the account holding the 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 Sep 18 19:56:58 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 18 Sep 2009 17:56:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[6350] csw/mgar/pkg/gitosis/trunk/Makefile Message-ID: Revision: 6350 http://gar.svn.sourceforge.net/gar/?rev=6350&view=rev Author: bdwalton Date: 2009-09-18 17:56:57 +0000 (Fri, 18 Sep 2009) Log Message: ----------- gitosis: update recipe to use pycompile and usergroup auto gar stuff Modified Paths: -------------- csw/mgar/pkg/gitosis/trunk/Makefile Modified: csw/mgar/pkg/gitosis/trunk/Makefile =================================================================== --- csw/mgar/pkg/gitosis/trunk/Makefile 2009-09-18 17:47:24 UTC (rev 6349) +++ csw/mgar/pkg/gitosis/trunk/Makefile 2009-09-18 17:56:57 UTC (rev 6350) @@ -3,7 +3,7 @@ # This represents the tip of master as of 20090516. It is ahead of # release/0.2 PATCHLEVEL = 73a03 -CATEGORIES = utils +CATEGORIES = python DESCRIPTION = Software for hosting git repositories define BLURB @@ -24,7 +24,7 @@ PREREQUISITE_PKGS_CSWgitosis = CSWpython CSWpysetuptools -REQUIRED_PKGS_CSWgitosis = CSWgit CSWpython CSWcswclassutils CSWpysetuptools +REQUIRED_PKGS_CSWgitosis = CSWgit CSWpysetuptools GIT_REPOS = git://eagain.net/gitosis.git GIT_USE_PROXY = 1 @@ -52,19 +52,17 @@ CSWUG = gitosis:gitosis:Gitosis Host:$(GITOSISHOME):/bin/bash:: CSWUGD = $(INSTALLISADIR)/opt/csw/etc/pkg/CSW$(GARNAME) -EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc +USERGROUP = /opt/csw/etc/pkg/CSWgitosis/cswusergroup -PROTOTYPE_FILTER = awk '$$$$3 ~ /\/CSWgitosis\/cswusergroup$$$$/ { $$$$2 = "cswusergroup" }; $$$$3 ~ /\/var\/opt\/csw\/gitosis/ { $$$$2 = "ugfiles"; $$$$5 = "gitosis"; $$$$6 = "gitosis" }; $$$$3 ~ /\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' +PROTOTYPE_FILTER = awk '$$$$3 ~ /\/var\/opt\/csw\/gitosis/ { $$$$2 = "ugfiles"; $$$$5 = "gitosis"; $$$$6 = "gitosis" }; { print }' -SPKG_CLASSES = none cswpycompile cswusergroup ugfiles +SPKG_CLASSES = none ugfiles include gar/category.mk -PATH := /opt/csw/gnu:$(PATH) - # Set a slightly altered revstamp to indicate that we're not using a # pressed release. -SPKG_REVSTAMP := $(SPKG_REVSTAMP)_$(PATCHLEVEL) +SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(PATCHLEVEL) post-install-modulated: @( gmkdir -p $(CSWUGD); \ 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 Sep 18 20:16:47 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 18 Sep 2009 18:16:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[6351] csw/mgar/pkg/gitosis/trunk/Makefile Message-ID: Revision: 6351 http://gar.svn.sourceforge.net/gar/?rev=6351&view=rev Author: bdwalton Date: 2009-09-18 18:16:47 +0000 (Fri, 18 Sep 2009) Log Message: ----------- gitosis: add note about where to find first use instructions in postinstall script Modified Paths: -------------- csw/mgar/pkg/gitosis/trunk/Makefile Modified: csw/mgar/pkg/gitosis/trunk/Makefile =================================================================== --- csw/mgar/pkg/gitosis/trunk/Makefile 2009-09-18 17:56:57 UTC (rev 6350) +++ csw/mgar/pkg/gitosis/trunk/Makefile 2009-09-18 18:16:47 UTC (rev 6351) @@ -16,6 +16,8 @@ #!/bin/sh /usr/bin/passwd -N gitosis + +echo See $(docdir)/$(GARNAME)/README.csw for first use instructions. endef PACKAGES = CSWgitosis 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 Sep 18 21:29:07 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 18 Sep 2009 19:29:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[6352] csw/mgar/pkg/xapian-core/trunk Message-ID: Revision: 6352 http://gar.svn.sourceforge.net/gar/?rev=6352&view=rev Author: dmichelsen Date: 2009-09-18 19:29:07 +0000 (Fri, 18 Sep 2009) Log Message: ----------- xapian-core: Downgrade to 1.0.11 after compile problems tracked at http://trac.xapian.org/ticket/403 Modified Paths: -------------- csw/mgar/pkg/xapian-core/trunk/Makefile csw/mgar/pkg/xapian-core/trunk/checksums Modified: csw/mgar/pkg/xapian-core/trunk/Makefile =================================================================== --- csw/mgar/pkg/xapian-core/trunk/Makefile 2009-09-18 18:16:47 UTC (rev 6351) +++ csw/mgar/pkg/xapian-core/trunk/Makefile 2009-09-18 19:29:07 UTC (rev 6352) @@ -1,5 +1,5 @@ GARNAME = xapian-core -GARVERSION = 1.0.12 +GARVERSION = 1.0.11 CATEGORIES = lib DESCRIPTION = An open source search engine library @@ -25,7 +25,7 @@ CONFIGURE_ARGS = $(DIRPATHS) -BUILD_ARGS = AM_CXXFLAGS="-library=stlport4 -features=tmplife" +#BUILD_ARGS = AM_CXXFLAGS="-library=stlport4 -features=tmplife" TEST_TARGET = check Modified: csw/mgar/pkg/xapian-core/trunk/checksums =================================================================== --- csw/mgar/pkg/xapian-core/trunk/checksums 2009-09-18 18:16:47 UTC (rev 6351) +++ csw/mgar/pkg/xapian-core/trunk/checksums 2009-09-18 19:29:07 UTC (rev 6352) @@ -1 +1 @@ -060efc364062704528bbfed5328e907b download/xapian-core-1.0.12.tar.gz +f80a2f51b109e2a065bdcbf1ba03b808 download/xapian-core-1.0.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 Fri Sep 18 21:40:15 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 18 Sep 2009 19:40:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[6353] csw/mgar/pkg/gnulinks/trunk/ Message-ID: Revision: 6353 http://gar.svn.sourceforge.net/gar/?rev=6353&view=rev Author: bdwalton Date: 2009-09-18 19:40:15 +0000 (Fri, 18 Sep 2009) Log Message: ----------- gnulinks: update to gar2 external Property Changed: ---------------- csw/mgar/pkg/gnulinks/trunk/ Property changes on: csw/mgar/pkg/gnulinks/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 dmichelsen at users.sourceforge.net Fri Sep 18 22:18:06 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 18 Sep 2009 20:18:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6354] csw/mgar/pkg/xapian-bindings/trunk Message-ID: Revision: 6354 http://gar.svn.sourceforge.net/gar/?rev=6354&view=rev Author: dmichelsen Date: 2009-09-18 20:18:05 +0000 (Fri, 18 Sep 2009) Log Message: ----------- xapian-bindings: Downreved according to xapian-core Modified Paths: -------------- csw/mgar/pkg/xapian-bindings/trunk/Makefile csw/mgar/pkg/xapian-bindings/trunk/checksums Modified: csw/mgar/pkg/xapian-bindings/trunk/Makefile =================================================================== --- csw/mgar/pkg/xapian-bindings/trunk/Makefile 2009-09-18 19:40:15 UTC (rev 6353) +++ csw/mgar/pkg/xapian-bindings/trunk/Makefile 2009-09-18 20:18:05 UTC (rev 6354) @@ -1,5 +1,5 @@ GARNAME = xapian-bindings -GARVERSION = 1.0.16 +GARVERSION = 1.0.11 CATEGORIES = lib DESCRIPTION = Xapian bindings for SWIG and JNI @@ -19,7 +19,7 @@ PACKAGES = CSWxapianbindings CATALOGNAME_CSWxapianbindings = xapian_bindings -REQUIRED_PKGS = CSWxapiancore +REQUIRED_PKGS = CSWxapiancore CSWstlport #EXTRA_LD_FLAGS = -lm Modified: csw/mgar/pkg/xapian-bindings/trunk/checksums =================================================================== --- csw/mgar/pkg/xapian-bindings/trunk/checksums 2009-09-18 19:40:15 UTC (rev 6353) +++ csw/mgar/pkg/xapian-bindings/trunk/checksums 2009-09-18 20:18:05 UTC (rev 6354) @@ -1 +1 @@ -c330b2ccc451c890916c44446e148f07 download/xapian-bindings-1.0.16.tar.gz +7297a1d09564fe31b768fe58eabd219d download/xapian-bindings-1.0.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 Fri Sep 18 23:15:51 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 18 Sep 2009 21:15:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[6355] csw/mgar/pkg/gnulinks/trunk Message-ID: Revision: 6355 http://gar.svn.sourceforge.net/gar/?rev=6355&view=rev Author: bdwalton Date: 2009-09-18 21:15:51 +0000 (Fri, 18 Sep 2009) Log Message: ----------- gnulinks: update to include ggetopt, gyacc and a few other minor changes Modified Paths: -------------- csw/mgar/pkg/gnulinks/trunk/Makefile csw/mgar/pkg/gnulinks/trunk/checksums csw/mgar/pkg/gnulinks/trunk/files/CSWgnulinks.prototype Modified: csw/mgar/pkg/gnulinks/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnulinks/trunk/Makefile 2009-09-18 20:18:05 UTC (rev 6354) +++ csw/mgar/pkg/gnulinks/trunk/Makefile 2009-09-18 21:15:51 UTC (rev 6355) @@ -1,5 +1,5 @@ GARNAME = gnulinks -GARVERSION = 1.1 +GARVERSION = 1.2 CATEGORIES = xtra SPKG_SOURCEURL = No Source @@ -24,4 +24,3 @@ @/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 - Modified: csw/mgar/pkg/gnulinks/trunk/checksums =================================================================== --- csw/mgar/pkg/gnulinks/trunk/checksums 2009-09-18 20:18:05 UTC (rev 6354) +++ csw/mgar/pkg/gnulinks/trunk/checksums 2009-09-18 21:15:51 UTC (rev 6355) @@ -1,2 +1,2 @@ 28514c1726839b6e47728d188d2a1edd download/CSWgnulinks.gspec -154d1f6d3f4174bee6a930854c0ea931 download/CSWgnulinks.prototype +0f630eb8dae8b4c155c10c95383822f6 download/CSWgnulinks.prototype Modified: csw/mgar/pkg/gnulinks/trunk/files/CSWgnulinks.prototype =================================================================== --- csw/mgar/pkg/gnulinks/trunk/files/CSWgnulinks.prototype 2009-09-18 20:18:05 UTC (rev 6354) +++ csw/mgar/pkg/gnulinks/trunk/files/CSWgnulinks.prototype 2009-09-18 21:15:51 UTC (rev 6355) @@ -28,17 +28,18 @@ s none /opt/csw/gnu/dirname=../bin/gdirname s none /opt/csw/gnu/du=../bin/gdu s none /opt/csw/gnu/echo=../bin/gecho -s none /opt/csw/gnu/egrep=../bin/ggrep +s none /opt/csw/gnu/egrep=../bin/gegrep s none /opt/csw/gnu/env=../bin/genv s none /opt/csw/gnu/envsubst=../bin/genvsubst s none /opt/csw/gnu/expand=../bin/gexpand s none /opt/csw/gnu/expr=../bin/gexpr s none /opt/csw/gnu/factor=../bin/gfactor s none /opt/csw/gnu/false=../bin/gfalse -s none /opt/csw/gnu/fgrep=../bin/ggrep +s none /opt/csw/gnu/fgrep=../bin/gfgrep s none /opt/csw/gnu/find=../bin/gfind 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=../bin/ggettext s none /opt/csw/gnu/gettextize=../bin/ggettextize s none /opt/csw/gnu/gprof=../bin/ggprof @@ -84,8 +85,9 @@ s none /opt/csw/gnu/objcopy=../bin/gobjcopy s none /opt/csw/gnu/objdump=../bin/gobjdump s none /opt/csw/gnu/od=../bin/god +s none /opt/csw/gnu/oldfind=../bin/goldfind s none /opt/csw/gnu/paste=../bin/gpaste -s none /opt/csw/gnu/patch=/usr/bin/gpatch +s none /opt/csw/gnu/patch=../bin/gpatch s none /opt/csw/gnu/pathchk=../bin/gpathchk s none /opt/csw/gnu/pinky=../bin/gpinky s none /opt/csw/gnu/pr=../bin/gpr @@ -132,6 +134,8 @@ s none /opt/csw/gnu/wc=../bin/gwc s none /opt/csw/gnu/who=../bin/gwho s none /opt/csw/gnu/whoami=../bin/gwhoami +s none /opt/csw/gnu/whois=../bin/gwhois s none /opt/csw/gnu/xargs=../bin/gxargs s none /opt/csw/gnu/xgettext=../bin/gxgettext +s none /opt/csw/gnu/yacc=../bin/gyacc s none /opt/csw/gnu/yes=../bin/gyes 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 Sep 18 23:29:25 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 18 Sep 2009 21:29:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[6356] csw/mgar/pkg/asciidoc/trunk Message-ID: Revision: 6356 http://gar.svn.sourceforge.net/gar/?rev=6356&view=rev Author: bdwalton Date: 2009-09-18 21:29:25 +0000 (Fri, 18 Sep 2009) Log Message: ----------- asciidoc: patch a2x so that gnu tools are found via new dep on gnulinks/ggetopt Modified Paths: -------------- csw/mgar/pkg/asciidoc/trunk/Makefile csw/mgar/pkg/asciidoc/trunk/checksums Added Paths: ----------- csw/mgar/pkg/asciidoc/trunk/files/add-csw-gnu-path-to-a2x.patch Modified: csw/mgar/pkg/asciidoc/trunk/Makefile =================================================================== --- csw/mgar/pkg/asciidoc/trunk/Makefile 2009-09-18 21:15:51 UTC (rev 6355) +++ csw/mgar/pkg/asciidoc/trunk/Makefile 2009-09-18 21:29:25 UTC (rev 6356) @@ -18,13 +18,14 @@ ARCHALL_CSWasciidoc = 1 -REQUIRED_PKGS_CSWasciidoc = CSWpython +REQUIRED_PKGS_CSWasciidoc = CSWpython CSWgnulinks CSWggetopt MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(AUTOFILES) PATCHFILES = handle-csw-etc-paths.patch +PATCHFILES += add-csw-gnu-path-to-a2x.patch # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=67797 Modified: csw/mgar/pkg/asciidoc/trunk/checksums =================================================================== --- csw/mgar/pkg/asciidoc/trunk/checksums 2009-09-18 21:15:51 UTC (rev 6355) +++ csw/mgar/pkg/asciidoc/trunk/checksums 2009-09-18 21:29:25 UTC (rev 6356) @@ -1,2 +1,3 @@ +4f81539ae1a7796a55770bfb977e063a download/add-csw-gnu-path-to-a2x.patch 9f21d6e352b3ab668f9def3eb7497da2 download/asciidoc-8.4.5.tar.gz ec48eeea1eafdaa7e507bc11327f6eae download/handle-csw-etc-paths.patch Added: csw/mgar/pkg/asciidoc/trunk/files/add-csw-gnu-path-to-a2x.patch =================================================================== --- csw/mgar/pkg/asciidoc/trunk/files/add-csw-gnu-path-to-a2x.patch (rev 0) +++ csw/mgar/pkg/asciidoc/trunk/files/add-csw-gnu-path-to-a2x.patch 2009-09-18 21:29:25 UTC (rev 6356) @@ -0,0 +1,13 @@ +diff --speed-large-files --minimal -Nru asciidoc-8.4.5.orig/a2x asciidoc-8.4.5/a2x +--- asciidoc-8.4.5.orig/a2x 2009-05-12 00:26:16.000000000 +0200 ++++ asciidoc-8.4.5/a2x 2009-09-18 21:32:44.546730245 +0200 +@@ -7,6 +7,9 @@ + # under the terms of the GNU General Public License (GPL). + # + ++PATH=/opt/csw/gnu:$PATH ++export PATH ++ + VERSION=1.0.0 + BASENAME=$(basename "$0") + REALNAME="$0" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Sep 19 03:36:05 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 19 Sep 2009 01:36:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6357] csw/mgar/pkg/gitosis/trunk/Makefile Message-ID: Revision: 6357 http://gar.svn.sourceforge.net/gar/?rev=6357&view=rev Author: bdwalton Date: 2009-09-19 01:36:05 +0000 (Sat, 19 Sep 2009) Log Message: ----------- gitosis: work around merge exludes that strip required files Modified Paths: -------------- csw/mgar/pkg/gitosis/trunk/Makefile Modified: csw/mgar/pkg/gitosis/trunk/Makefile =================================================================== --- csw/mgar/pkg/gitosis/trunk/Makefile 2009-09-18 21:29:25 UTC (rev 6356) +++ csw/mgar/pkg/gitosis/trunk/Makefile 2009-09-19 01:36:05 UTC (rev 6357) @@ -62,6 +62,9 @@ include gar/category.mk +# override the category exclusion +_MERGE_EXCLUDE_CATEGORY = + # Set a slightly altered revstamp to indicate that we're not using a # pressed release. SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(PATCHLEVEL) 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 Sep 19 13:56:58 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 19 Sep 2009 11:56:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[6358] csw/mgar/pkg/xapian-bindings/trunk/Makefile Message-ID: Revision: 6358 http://gar.svn.sourceforge.net/gar/?rev=6358&view=rev Author: dmichelsen Date: 2009-09-19 11:56:58 +0000 (Sat, 19 Sep 2009) Log Message: ----------- xapian-bindings: Adjust compilation Modified Paths: -------------- csw/mgar/pkg/xapian-bindings/trunk/Makefile Modified: csw/mgar/pkg/xapian-bindings/trunk/Makefile =================================================================== --- csw/mgar/pkg/xapian-bindings/trunk/Makefile 2009-09-19 01:36:05 UTC (rev 6357) +++ csw/mgar/pkg/xapian-bindings/trunk/Makefile 2009-09-19 11:56:58 UTC (rev 6358) @@ -2,6 +2,10 @@ GARVERSION = 1.0.11 CATEGORIES = lib +EXTRA_MODULATORS = BINDING +#MODULATIONS_BINDING = ruby python +MODULATIONS_BINDING = ruby + DESCRIPTION = Xapian bindings for SWIG and JNI define BLURB Xapian is an Open Source Probabilistic Information Retrieval Library. It @@ -16,17 +20,30 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWxapianbindings -CATALOGNAME_CSWxapianbindings = xapian_bindings +PACKAGES = CSWpyxapian CSWrbxapian +CATALOGNAME_CSWpyxapian = py_xapian +CATALOGNAME_CSWrbxapian = rb_xapian -REQUIRED_PKGS = CSWxapiancore CSWstlport +SPKG_DESC_CSWpyxapian = Xapian bindings for Python +SPKG_DESC_CSWrbxapian = Xapian bindings for Ruby -#EXTRA_LD_FLAGS = -lm +PREREQUISITE_PKGS = CSWrubydev +REQUIRED_PKGS_CSWpyxapian = CSWpython CSWxapianrt +REQUIRED_PKGS_CSWrbxapian = CSWruby CSWxapianrt CSWgcc3corert +GARCOMPILER_ruby = GCC3 +GARCOMPILER_python = SOS11 +GARCOMPILER = $(if $(GARCOMPILER_$(BINDING)),$(GARCOMPILER_$(BINDING)),SOS11) + +CONFIGURE_ARGS_ruby = --without-python --without-php --with-ruby --without-tcl --without-csharp --without-java +CONFIGURE_ARGS_python = --with-python --without-php --without-ruby --without-tcl --without-csharp --without-java + CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(BINDING)) -#BUILD_ARGS = AM_CXXFLAGS="-library=stlport4 -features=tmplife" - TEST_TARGET = check +MERGE_SCRIPTS_isa-sparcv8-binding-ruby = copy-all +MERGE_SCRIPTS_isa-sparcv8-binding-python = copy-all + 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 Sat Sep 19 13:59:58 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 19 Sep 2009 11:59:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[6359] csw/mgar/pkg/xapian-bindings/trunk/Makefile Message-ID: Revision: 6359 http://gar.svn.sourceforge.net/gar/?rev=6359&view=rev Author: dmichelsen Date: 2009-09-19 11:59:58 +0000 (Sat, 19 Sep 2009) Log Message: ----------- xapian-bindings: Splitted files Modified Paths: -------------- csw/mgar/pkg/xapian-bindings/trunk/Makefile Modified: csw/mgar/pkg/xapian-bindings/trunk/Makefile =================================================================== --- csw/mgar/pkg/xapian-bindings/trunk/Makefile 2009-09-19 11:56:58 UTC (rev 6358) +++ csw/mgar/pkg/xapian-bindings/trunk/Makefile 2009-09-19 11:59:58 UTC (rev 6359) @@ -46,4 +46,7 @@ MERGE_SCRIPTS_isa-sparcv8-binding-ruby = copy-all MERGE_SCRIPTS_isa-sparcv8-binding-python = copy-all +PKGFILES_CSWrbxapian = $(libdir)/ruby/.* +PKGFILES_CSWrbxapian += $(docdir)/xapian-bindings/ruby/.* + 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 Sat Sep 19 15:07:14 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 19 Sep 2009 13:07:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6360] csw/mgar/pkg/xapian-core/trunk/Makefile Message-ID: Revision: 6360 http://gar.svn.sourceforge.net/gar/?rev=6360&view=rev Author: dmichelsen Date: 2009-09-19 13:07:14 +0000 (Sat, 19 Sep 2009) Log Message: ----------- xapian-core: Split files Modified Paths: -------------- csw/mgar/pkg/xapian-core/trunk/Makefile Modified: csw/mgar/pkg/xapian-core/trunk/Makefile =================================================================== --- csw/mgar/pkg/xapian-core/trunk/Makefile 2009-09-19 11:59:58 UTC (rev 6359) +++ csw/mgar/pkg/xapian-core/trunk/Makefile 2009-09-19 13:07:14 UTC (rev 6360) @@ -16,13 +16,27 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWxapiancore -CATALOGNAME_CSWxapiancore = xapian_core +PACKAGES = CSWxapian CSWxapianrt CSWxapiandevel +CATALOGNAME_CSWxapian = xapian +CATALOGNAME_CSWxapianrt = xapian_rt +CATALOGNAME_CSWxapiandevel = xapian_devel -REQUIRED_PKGS = CSWstlport CSWzlib +SPKG_DESC_CSWxapian = An open source search engine library +SPKG_DESC_CSWxapianrt = Xapian runtime libraries +SPKG_DESC_CSWxapiandevel = Xapian development files +REQUIRED_PKGS_CSWxapianrt = CSWstlport CSWzlib +REQUIRED_PKGS_CSWxapian = CSWxapianrt +REQUIRED_PKGS_CSWxapiandevel = CSWxapian +# If we compile with Sun Studio it is impossible to build the Ruby bindings as +# Ruby is compiled with GCC. +# Compiling with GCC4 yields the error "__sync_fetch_and_add_4 not found". +GARCOMPILER = GCC3 + EXTRA_LD_FLAGS = -lm +# GCC3 can not build amd64 +#BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) #BUILD_ARGS = AM_CXXFLAGS="-library=stlport4 -features=tmplife" @@ -32,4 +46,8 @@ # We need the .la-file, otherwise xapian-config doesn't work MERGE_EXCLUDE_LIBTOOL = +PKGFILES_CSWxapianrt = $(PKGFILES_RT) +PKGFILES_CSWxapiandevel = $(PKGFILES_DEVEL) +PKGFILES_CSWxapiandevel += $(docdir)/xapian-core/apidoc/.* + 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 Sat Sep 19 16:28:57 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 19 Sep 2009 14:28:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[6361] csw/mgar/pkg/xapian-bindings/trunk/Makefile Message-ID: Revision: 6361 http://gar.svn.sourceforge.net/gar/?rev=6361&view=rev Author: dmichelsen Date: 2009-09-19 14:28:57 +0000 (Sat, 19 Sep 2009) Log Message: ----------- xapian-bindings: Add merge scripts for i386 Modified Paths: -------------- csw/mgar/pkg/xapian-bindings/trunk/Makefile Modified: csw/mgar/pkg/xapian-bindings/trunk/Makefile =================================================================== --- csw/mgar/pkg/xapian-bindings/trunk/Makefile 2009-09-19 13:07:14 UTC (rev 6360) +++ csw/mgar/pkg/xapian-bindings/trunk/Makefile 2009-09-19 14:28:57 UTC (rev 6361) @@ -30,6 +30,8 @@ PREREQUISITE_PKGS = CSWrubydev REQUIRED_PKGS_CSWpyxapian = CSWpython CSWxapianrt REQUIRED_PKGS_CSWrbxapian = CSWruby CSWxapianrt CSWgcc3corert +# This should be CSWgcc3g++rt, but the lib is actually in CSWgcc3g++ +REQUIRED_PKGS_CSWrbxapian += CSWgcc3g++ GARCOMPILER_ruby = GCC3 GARCOMPILER_python = SOS11 @@ -46,6 +48,9 @@ MERGE_SCRIPTS_isa-sparcv8-binding-ruby = copy-all MERGE_SCRIPTS_isa-sparcv8-binding-python = copy-all +MERGE_SCRIPTS_isa-i386-binding-ruby = copy-all +MERGE_SCRIPTS_isa-i386-binding-python = copy-all + PKGFILES_CSWrbxapian = $(libdir)/ruby/.* PKGFILES_CSWrbxapian += $(docdir)/xapian-bindings/ruby/.* 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 Sep 19 16:58:03 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 19 Sep 2009 14:58:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[6362] csw/mgar/pkg Message-ID: Revision: 6362 http://gar.svn.sourceforge.net/gar/?rev=6362&view=rev Author: dmichelsen Date: 2009-09-19 14:58:03 +0000 (Sat, 19 Sep 2009) Log Message: ----------- colordiff: Initial commit Added Paths: ----------- csw/mgar/pkg/colordiff/ csw/mgar/pkg/colordiff/branches/ csw/mgar/pkg/colordiff/tags/ csw/mgar/pkg/colordiff/trunk/ csw/mgar/pkg/colordiff/trunk/Makefile csw/mgar/pkg/colordiff/trunk/checksums csw/mgar/pkg/colordiff/trunk/files/ Property changes on: csw/mgar/pkg/colordiff/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/colordiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/colordiff/trunk/Makefile (rev 0) +++ csw/mgar/pkg/colordiff/trunk/Makefile 2009-09-19 14:58:03 UTC (rev 6362) @@ -0,0 +1,36 @@ +GARNAME = colordiff +GARVERSION = 1.0.9 +CATEGORIES = utils + +DESCRIPTION = Wrapper for for the diff command producing colored output +define BLURB +endef + +MASTER_SITES = http://colordiff.sourceforge.net/ +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 = +BUILD_ARGS = doc +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +sysconfdir = /etc/opt/csw +PRESERVECONF = $(sysconfdir)/colordiffrc + +include gar/category.mk + +install-custom: + ginstall -d $(DESTDIR)$(docdir) + (cd $(WORKSRC) && ginstall BUGS CHANGES INSTALL README TODO $(DESTDIR)$(docdir)) + ginstall -d $(DESTDIR)$(mandir)/man1 + (cd $(WORKSRC) && ginstall cdiff.1 colordiff.1 $(DESTDIR)$(mandir)/man1) + ginstall -d $(DESTDIR)$(sysconfdir) + (cd $(WORKSRC) && ginstall colordiffrc colordiffrc-lightbg $(DESTDIR)$(sysconfdir)) + ginstall -d $(DESTDIR)$(bindir) + sed -e "s%/etc%$(sysconfdir)%g" $(WORKSRC)/colordiff.pl >$(DESTDIR)$(bindir)/colordiff + chmod 755 $(DESTDIR)$(bindir)/colordiff + ginstall $(WORKSRC)/cdiff.sh $(DESTDIR)$(bindir)/cdiff + @$(MAKECOOKIE) Added: csw/mgar/pkg/colordiff/trunk/checksums =================================================================== --- csw/mgar/pkg/colordiff/trunk/checksums (rev 0) +++ csw/mgar/pkg/colordiff/trunk/checksums 2009-09-19 14:58:03 UTC (rev 6362) @@ -0,0 +1 @@ +31864847eaa4e900f72bbb6bbc64f1ec download/colordiff-1.0.9.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Sep 21 10:42:27 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Sep 2009 08:42:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[6363] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/ cswmysql5 Message-ID: Revision: 6363 http://gar.svn.sourceforge.net/gar/?rev=6363&view=rev Author: wahwah Date: 2009-09-21 08:42:26 +0000 (Mon, 21 Sep 2009) Log Message: ----------- mysql5: Fixing a syntax error in the startup script .../files/cswmysql5. Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 2009-09-19 14:58:03 UTC (rev 6362) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 2009-09-21 08:42:26 UTC (rev 6363) @@ -99,7 +99,7 @@ `[ -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_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"` \ 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 Sep 21 12:14:21 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 21 Sep 2009 10:14:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[6364] csw/mgar/pkg Message-ID: Revision: 6364 http://gar.svn.sourceforge.net/gar/?rev=6364&view=rev Author: skayser Date: 2009-09-21 10:14:21 +0000 (Mon, 21 Sep 2009) Log Message: ----------- stalonetray: initial commit Added Paths: ----------- csw/mgar/pkg/stalonetray/ csw/mgar/pkg/stalonetray/branches/ csw/mgar/pkg/stalonetray/tags/ csw/mgar/pkg/stalonetray/trunk/ csw/mgar/pkg/stalonetray/trunk/Makefile csw/mgar/pkg/stalonetray/trunk/checksums csw/mgar/pkg/stalonetray/trunk/files/ Property changes on: csw/mgar/pkg/stalonetray/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/stalonetray/trunk/Makefile =================================================================== --- csw/mgar/pkg/stalonetray/trunk/Makefile (rev 0) +++ csw/mgar/pkg/stalonetray/trunk/Makefile 2009-09-21 10:14:21 UTC (rev 6364) @@ -0,0 +1,31 @@ +GARNAME = stalonetray +GARVERSION = 0.7.6 +CATEGORIES = apps + +DESCRIPTION = Stand-alone freedesktop.org and KDE system tray +define BLURB + Stalonetray is a stand-alone freedesktop.org and KDE system tray + (notification area) for X Window System/X11 (e.g. X.Org or XFree 86). + It has full XEMBED support and minimal dependencies: an X11 lib only. + Stalonetray works with virtually any EWMH-compliant window manager. +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# No test target for stalonetray +TEST_SCRIPTS = + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += $(CONFIGURE_ARGS)_$(GARFLAVOR) +CONFIGURE_ARGS_OPT = --disable-debug + +include gar/category.mk + +post-install-modulated: DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME) +post-install-modulated: DOCS = README AUTHORS stalonetrayrc.sample +post-install-modulated: + ginstall -d $(DOCDEST) + cp $(FILEDIR)/changelog.CSW $(DOCDEST) + cp $(addprefix $(WORKSRC)/, $(DOCS)) $(DOCDEST) + @$(MAKECOOKIE) Added: csw/mgar/pkg/stalonetray/trunk/checksums =================================================================== --- csw/mgar/pkg/stalonetray/trunk/checksums (rev 0) +++ csw/mgar/pkg/stalonetray/trunk/checksums 2009-09-21 10:14:21 UTC (rev 6364) @@ -0,0 +1 @@ +0389f28ac8a790fb6f8cf6dc33811d68 download/stalonetray-0.7.6.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 Mon Sep 21 12:31:43 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 21 Sep 2009 10:31:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6365] csw/mgar/pkg/stalonetray/trunk/Makefile Message-ID: Revision: 6365 http://gar.svn.sourceforge.net/gar/?rev=6365&view=rev Author: skayser Date: 2009-09-21 10:31:43 +0000 (Mon, 21 Sep 2009) Log Message: ----------- stalonetray: fix GARFLAVOR-dependent CONFIGURE_ARGS assignment Modified Paths: -------------- csw/mgar/pkg/stalonetray/trunk/Makefile Modified: csw/mgar/pkg/stalonetray/trunk/Makefile =================================================================== --- csw/mgar/pkg/stalonetray/trunk/Makefile 2009-09-21 10:14:21 UTC (rev 6364) +++ csw/mgar/pkg/stalonetray/trunk/Makefile 2009-09-21 10:31:43 UTC (rev 6365) @@ -17,7 +17,7 @@ TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += $(CONFIGURE_ARGS)_$(GARFLAVOR) +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) CONFIGURE_ARGS_OPT = --disable-debug include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Mon Sep 21 12:33:00 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 21 Sep 2009 10:33:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6366] csw/mgar/pkg/stalonetray/trunk/files/changelog.CSW Message-ID: Revision: 6366 http://gar.svn.sourceforge.net/gar/?rev=6366&view=rev Author: skayser Date: 2009-09-21 10:33:00 +0000 (Mon, 21 Sep 2009) Log Message: ----------- stalonetray: add changelog.CSW Added Paths: ----------- csw/mgar/pkg/stalonetray/trunk/files/changelog.CSW Added: csw/mgar/pkg/stalonetray/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/stalonetray/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/stalonetray/trunk/files/changelog.CSW 2009-09-21 10:33:00 UTC (rev 6366) @@ -0,0 +1,5 @@ +stalonetray (0.7.6,REV=2009.09.21) + + * Initial release. + + -- Sebastian Kayser Mon, 21 Sep 2009 12:04:14 +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 Sep 21 18:11:42 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 21 Sep 2009 16:11:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[6367] csw/mgar/pkg/xterm/trunk Message-ID: Revision: 6367 http://gar.svn.sourceforge.net/gar/?rev=6367&view=rev Author: skayser Date: 2009-09-21 16:11:41 +0000 (Mon, 21 Sep 2009) Log Message: ----------- xterm: working towards a build against CSWlibx11 Modified Paths: -------------- csw/mgar/pkg/xterm/trunk/Makefile csw/mgar/pkg/xterm/trunk/checksums Modified: csw/mgar/pkg/xterm/trunk/Makefile =================================================================== --- csw/mgar/pkg/xterm/trunk/Makefile 2009-09-21 10:33:00 UTC (rev 6366) +++ csw/mgar/pkg/xterm/trunk/Makefile 2009-09-21 16:11:41 UTC (rev 6367) @@ -43,6 +43,8 @@ CONFIGURE_ARGS += --enable-wide-chars CONFIGURE_ARGS += --program-suffix=86 --with-xterm-symlink CONFIGURE_ARGS += --with-freetype-cflags="-I$(includedir)/freetype2" +CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(prefix)/X11/lib # luit comes with snv_85 # http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6662431 Modified: csw/mgar/pkg/xterm/trunk/checksums =================================================================== --- csw/mgar/pkg/xterm/trunk/checksums 2009-09-21 10:33:00 UTC (rev 6366) +++ csw/mgar/pkg/xterm/trunk/checksums 2009-09-21 16:11:41 UTC (rev 6367) @@ -1,2 +1 @@ -347f24b7ed3e42a3d40b1db1ed0061f0 download/patch-mkwidth.diff 70771a21fbc54a79f68374cebb49935a download/xterm-248.tgz 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 Sep 21 18:18:43 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 21 Sep 2009 16:18:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6368] csw/mgar/pkg/xmlto/trunk Message-ID: Revision: 6368 http://gar.svn.sourceforge.net/gar/?rev=6368&view=rev Author: bdwalton Date: 2009-09-21 16:18:43 +0000 (Mon, 21 Sep 2009) Log Message: ----------- xmlto: bump to 0.0.23, remove patches that got rolled in upstream Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile csw/mgar/pkg/xmlto/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/xmlto/trunk/files/0001-add-support-for-selection-of-posix-tail-binary.patch csw/mgar/pkg/xmlto/trunk/files/0002-add-handling-so-that-gnu-cp-can-be-specified.patch csw/mgar/pkg/xmlto/trunk/files/0003-do-no-hardcode-bin-bash-to-override-env-check.patch csw/mgar/pkg/xmlto/trunk/files/0004-switch-file-detection-from-which-to-type.patch Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-21 16:11:41 UTC (rev 6367) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-21 16:18:43 UTC (rev 6368) @@ -1,5 +1,5 @@ GARNAME = xmlto -GARVERSION = 0.0.22 +GARVERSION = 0.0.23 CATEGORIES = utils PREREQUISITE_PKGS += CSWmktemp CSWfindutils CSWdocbookxsl CSWlibxslt @@ -19,11 +19,6 @@ MASTER_SITES = https://fedorahosted.org/releases/x/m/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -PATCHFILES += 0001-add-support-for-selection-of-posix-tail-binary.patch -PATCHFILES += 0002-add-handling-so-that-gnu-cp-can-be-specified.patch -PATCHFILES += 0003-do-no-hardcode-bin-bash-to-override-env-check.patch -PATCHFILES += 0004-switch-file-detection-from-which-to-type.patch - TEST_TARGET = check # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/xmlto/trunk/checksums =================================================================== --- csw/mgar/pkg/xmlto/trunk/checksums 2009-09-21 16:11:41 UTC (rev 6367) +++ csw/mgar/pkg/xmlto/trunk/checksums 2009-09-21 16:18:43 UTC (rev 6368) @@ -1,5 +1 @@ -037997ead86e0589b4e34538d7d2694a download/0001-add-support-for-selection-of-posix-tail-binary.patch -134ec47ba3f225ebd04bfb629b230e69 download/0002-add-handling-so-that-gnu-cp-can-be-specified.patch -b53522eb1413d28da8e661b76f4ab098 download/0003-do-no-hardcode-bin-bash-to-override-env-check.patch -aec9edfc4fdc77ee6bc77124bb1235f4 download/0004-switch-file-detection-from-which-to-type.patch -12f297dc7051e4fef08339980f88a1dd download/xmlto-0.0.22.tar.bz2 +3001d6bb2bbc2c8f6c2301f05120f074 download/xmlto-0.0.23.tar.bz2 Deleted: csw/mgar/pkg/xmlto/trunk/files/0001-add-support-for-selection-of-posix-tail-binary.patch =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/0001-add-support-for-selection-of-posix-tail-binary.patch 2009-09-21 16:11:41 UTC (rev 6367) +++ csw/mgar/pkg/xmlto/trunk/files/0001-add-support-for-selection-of-posix-tail-binary.patch 2009-09-21 16:18:43 UTC (rev 6368) @@ -1,48 +0,0 @@ -From 788a65e1792057ac1379c459e111eccf06b4a034 Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Tue, 15 Sep 2009 19:01:55 +0200 -Subject: [PATCH 1/2] add support for selection of posix tail binary - ---- - configure.in | 3 +++ - xmlto.in | 3 ++- - 2 files changed, 5 insertions(+), 1 deletions(-) - -diff --git a/configure.in b/configure.in -index c41bb72..0fb685e 100644 ---- a/configure.in -+++ b/configure.in -@@ -107,6 +107,9 @@ AC_PATH_PROG([LINKS], [links], [links]) - AC_ARG_VAR([W3M], [Name and path of the `w3m' browser.]) - AC_PATH_PROG([W3M], [w3m], [w3m]) - -+AC_ARG_VAR([TAIL], [Name and path of a tail binary that supports -n.]) -+AC_PATH_PROG([TAIL], [tail], [tail]) -+ - dnl - dnl default webrowser - dnl -diff --git a/xmlto.in b/xmlto.in -index 66423b3..21f9acc 100755 ---- a/xmlto.in -+++ b/xmlto.in -@@ -21,6 +21,7 @@ FIND=@FIND@ # This must be GNU find (need -maxdepth) - MKTEMP=@MKTEMP@ # See http://www.mktemp.org if missing on your system - BASH=@BASH@ # GNU bash, for running the format scripts - GETOPT=@GETOPT@ # a getopt that supports --longoptions -+TAIL=@TAIL@ # a tail that supports -n (posix) - - version () { - echo "@PACKAGE@ version @VERSION@" -@@ -407,7 +408,7 @@ esac - # sed -e 's/^]*?>//g' -e 's/^]*>//g' -e 's/^<\([^ ]*\).*$/\1/') - - # Seems reasonable fix the file command and teach it to identify the DTD/Schema but this is faster to write: --rootel=$(echo "xpath *" | "$XMLLINT_PATH" --shell "$INPUT_FILE" 2> /dev/null | head -n 3 |tail -n 1 | cut -f 4 -d " " ) -+rootel=$(echo "xpath *" | "$XMLLINT_PATH" --shell "$INPUT_FILE" 2> /dev/null | head -n 3 |$TAIL -n 1 | cut -f 4 -d " " ) - - case $(echo $rootel) in - fo:root) --- -1.6.3.2 - Deleted: csw/mgar/pkg/xmlto/trunk/files/0002-add-handling-so-that-gnu-cp-can-be-specified.patch =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/0002-add-handling-so-that-gnu-cp-can-be-specified.patch 2009-09-21 16:11:41 UTC (rev 6367) +++ csw/mgar/pkg/xmlto/trunk/files/0002-add-handling-so-that-gnu-cp-can-be-specified.patch 2009-09-21 16:18:43 UTC (rev 6368) @@ -1,191 +0,0 @@ -From d8102af69b3d635abfb913771d3fe9b1d11ad971 Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Tue, 15 Sep 2009 19:39:54 +0200 -Subject: [PATCH 2/2] add handling so that gnu cp can be specified - ---- - configure.in | 3 +++ - format/docbook/fo | 2 +- - format/docbook/html | 2 +- - format/docbook/html-nochunks | 2 +- - format/docbook/htmlhelp | 2 +- - format/docbook/javahelp | 2 +- - format/docbook/man | 2 +- - format/docbook/xhtml | 2 +- - format/docbook/xhtml-nochunks | 2 +- - format/fo/dvi | 2 +- - format/fo/pdf | 2 +- - format/xhtml1/fo | 2 +- - xmlto.in | 2 ++ - 13 files changed, 16 insertions(+), 11 deletions(-) - -diff --git a/configure.in b/configure.in -index 0fb685e..727da83 100644 ---- a/configure.in -+++ b/configure.in -@@ -110,6 +110,9 @@ AC_PATH_PROG([W3M], [w3m], [w3m]) - AC_ARG_VAR([TAIL], [Name and path of a tail binary that supports -n.]) - AC_PATH_PROG([TAIL], [tail], [tail]) - -+AC_ARG_VAR([GCP], [Name and path of a GNU cp binary (need at least -P)]) -+AC_PATH_PROG([GCP], [cp], [cp]) -+ - dnl - dnl default webrowser - dnl -diff --git a/format/docbook/fo b/format/docbook/fo -index 699fe3b..8b4f200 100755 ---- a/format/docbook/fo -+++ b/format/docbook/fo -@@ -7,6 +7,6 @@ stylesheet) - echo "http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl" - ;; - post-process) -- cp -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").fo" -+ ${GCP_PATH:-cp} -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").fo" - ;; - esac -diff --git a/format/docbook/html b/format/docbook/html -index 56bed62..3b2cd71 100755 ---- a/format/docbook/html -+++ b/format/docbook/html -@@ -7,6 +7,6 @@ stylesheet) - echo "http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl" - ;; - post-process) -- cp -R -P -p -- * "$OUTPUT_DIR" -+ ${GCP_PATH:-cp} -R -P -p -- * "$OUTPUT_DIR" - ;; - esac -diff --git a/format/docbook/html-nochunks b/format/docbook/html-nochunks -index 18a0a63..82b635b 100755 ---- a/format/docbook/html-nochunks -+++ b/format/docbook/html-nochunks -@@ -7,6 +7,6 @@ stylesheet) - echo "http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl" - ;; - post-process) -- cp -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").html" -+ ${GCP_PATH:-cp} -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").html" - ;; - esac -diff --git a/format/docbook/htmlhelp b/format/docbook/htmlhelp -index 6ae2750..01553df 100755 ---- a/format/docbook/htmlhelp -+++ b/format/docbook/htmlhelp -@@ -7,6 +7,6 @@ stylesheet) - echo "http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl" - ;; - post-process) -- cp -R -P -p -- * "$OUTPUT_DIR" -+ ${GCP_PATH:-cp} -R -P -p -- * "$OUTPUT_DIR" - ;; - esac -diff --git a/format/docbook/javahelp b/format/docbook/javahelp -index ad50388..57710f0 100755 ---- a/format/docbook/javahelp -+++ b/format/docbook/javahelp -@@ -7,6 +7,6 @@ stylesheet) - echo "http://docbook.sourceforge.net/release/xsl/current/javahelp/javahelp.xsl" - ;; - post-process) -- cp -R -P -p -- *.htm* *.hs *.xml *.jhm "$OUTPUT_DIR" -+ ${GCP_PATH:-cp} -R -P -p -- *.htm* *.hs *.xml *.jhm "$OUTPUT_DIR" - ;; - esac -diff --git a/format/docbook/man b/format/docbook/man -index 1b0d561..525b03b 100755 ---- a/format/docbook/man -+++ b/format/docbook/man -@@ -8,6 +8,6 @@ stylesheet) - ;; - post-process) - [ -e "$XSLT_PROCESSED" ] && rm "$XSLT_PROCESSED" -- cp -R -P -p -- * "$OUTPUT_DIR" 2>/dev/null -+ ${GCP_PATH:-cp} -R -P -p -- * "$OUTPUT_DIR" 2>/dev/null - ;; - esac -diff --git a/format/docbook/xhtml b/format/docbook/xhtml -index 940c250..8204549 100755 ---- a/format/docbook/xhtml -+++ b/format/docbook/xhtml -@@ -7,6 +7,6 @@ stylesheet) - echo "http://docbook.sourceforge.net/release/xsl/current/xhtml/chunk.xsl" - ;; - post-process) -- cp -R -P -p -- *.*htm* "$OUTPUT_DIR" -+ ${GCP_PATH:-cp} -R -P -p -- *.*htm* "$OUTPUT_DIR" - ;; - esac -diff --git a/format/docbook/xhtml-nochunks b/format/docbook/xhtml-nochunks -index 3ae4c81..82b555d 100755 ---- a/format/docbook/xhtml-nochunks -+++ b/format/docbook/xhtml-nochunks -@@ -7,6 +7,6 @@ stylesheet) - echo "http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl" - ;; - post-process) -- cp -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename ${XSLT_PROCESSED%.*}).html" -+ ${GCP_PATH:-cp} -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename ${XSLT_PROCESSED%.*}).html" - ;; - esac -diff --git a/format/fo/dvi b/format/fo/dvi -index 1c797a6..9db53c7 100755 ---- a/format/fo/dvi -+++ b/format/fo/dvi -@@ -34,6 +34,6 @@ post-process) - [ "$VERBOSE" -ge 3 ] && cat $OUT - fi - fi -- cp -R -P -p -- *.dvi "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").dvi" -+ ${GCP_PATH:-cp} -R -P -p -- *.dvi "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").dvi" - ;; - esac -diff --git a/format/fo/pdf b/format/fo/pdf -index c6f55a4..670cd3c 100755 ---- a/format/fo/pdf -+++ b/format/fo/pdf -@@ -37,7 +37,7 @@ DEFAULT|DBLATEX) - [ "$VERBOSE" -ge 3 ] && cat $OUT - fi - fi -- cp -R -P -p -- *.pdf "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").pdf" -+ ${GCP_PATH:-cp} -R -P -p -- *.pdf "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").pdf" - ;; - esac - ;; -diff --git a/format/xhtml1/fo b/format/xhtml1/fo -index 588051e..a445ea0 100755 ---- a/format/xhtml1/fo -+++ b/format/xhtml1/fo -@@ -7,6 +7,6 @@ stylesheet) - echo "http://www.antennahouse.com/XSLsample/sample-xsl-xhtml2fo/xhtml2fo.xsl" - ;; - post-process) -- cp -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").fo" -+ ${GCP_PATH:-cp} -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").fo" - ;; - esac -diff --git a/xmlto.in b/xmlto.in -index 21f9acc..dcab15e 100755 ---- a/xmlto.in -+++ b/xmlto.in -@@ -245,6 +245,7 @@ fi - LINKS_PATH=@LINKS@ - W3M_PATH=@W3M@ - LYNX_PATH=@LYNX@ -+GCP_PATH=@GCP@ - - # Process any options - ARGS=$(${GETOPT} \ -@@ -441,6 +442,7 @@ fi - XSLT_PROCESSOR="$XSLTPROC_PATH" # We only know about xsltproc right now. - export XSLT_PROCESSOR - export W3M_PATH -+export GCP_PATH - export LINKS_PATH - export LYNX_PATH - export FOP_PATH --- -1.6.3.2 - Deleted: csw/mgar/pkg/xmlto/trunk/files/0003-do-no-hardcode-bin-bash-to-override-env-check.patch =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/0003-do-no-hardcode-bin-bash-to-override-env-check.patch 2009-09-21 16:11:41 UTC (rev 6367) +++ csw/mgar/pkg/xmlto/trunk/files/0003-do-no-hardcode-bin-bash-to-override-env-check.patch 2009-09-21 16:18:43 UTC (rev 6368) @@ -1,24 +0,0 @@ -From d9ee41aa38e8009bff734ec540c41822a7d3998f Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Tue, 15 Sep 2009 19:45:33 +0200 -Subject: [PATCH 3/3] do no hardcode /bin/bash to override env check - ---- - configure.in | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/configure.in b/configure.in -index 727da83..bf854b7 100644 ---- a/configure.in -+++ b/configure.in -@@ -18,7 +18,6 @@ AC_CHECK_PROG([MKTEMP], [mktemp],, [mktemp]) - AC_ARG_VAR([FIND], [Name of the GNU `find' program.]) - AC_CHECK_PROG([FIND], [find],, [find] ) - --BASH=/bin/bash - AC_ARG_VAR([BASH], [Name and path of the GNU `bash' shell.]) - AC_PATH_PROG([BASH], [bash], [/bin/bash]) - --- -1.6.3.2 - Deleted: csw/mgar/pkg/xmlto/trunk/files/0004-switch-file-detection-from-which-to-type.patch =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/0004-switch-file-detection-from-which-to-type.patch 2009-09-21 16:11:41 UTC (rev 6367) +++ csw/mgar/pkg/xmlto/trunk/files/0004-switch-file-detection-from-which-to-type.patch 2009-09-21 16:18:43 UTC (rev 6368) @@ -1,170 +0,0 @@ -From b9b12cdac3163c55bf3af13b1d51dd7c60639d4b Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Wed, 16 Sep 2009 02:30:05 +0200 -Subject: [PATCH 4/4] switch file detection from `which` to `type` - ---- - format/docbook/txt | 6 +++--- - format/fo/dvi | 2 +- - format/fo/pdf | 2 +- - format/xhtml1/txt | 6 +++--- - xmlto.in | 18 +++++++++--------- - 5 files changed, 17 insertions(+), 17 deletions(-) - -diff --git a/format/docbook/txt b/format/docbook/txt -index 390e96a..d72f27f 100755 ---- a/format/docbook/txt -+++ b/format/docbook/txt -@@ -1,14 +1,14 @@ - case "$USE_BACKEND" in - DEFAULT|DBLATEX) -- if [ -n "`which "$W3M_PATH" 2>/dev/null`" ] -+ if [ -n "`type -t $W3M_PATH`" ] - then - CONVERT="$W3M_PATH" - ARGS="-T text/html -dump" -- elif [ -n "`which "$LYNX_PATH" 2>/dev/null`" ] -+ elif [ -n "`type -t $LYNX_PATH`" ] - then - CONVERT="$LYNX_PATH" - ARGS="-force_html -dump -nolist -width=72" -- elif [ -n "`which "$LINKS_PATH" 2>/dev/null`" ] -+ elif [ -n "`type -t $LINKS_PATH`" ] - then - CONVERT="$LINKS_PATH" - ARGS="-dump" -diff --git a/format/fo/dvi b/format/fo/dvi -index 9db53c7..a9af333 100755 ---- a/format/fo/dvi -+++ b/format/fo/dvi -@@ -6,7 +6,7 @@ post-process) - then - echo >&2 "Post-process XSL-FO to DVI" - fi -- if [ -z "`which $XMLTEX_PATH 2>/dev/null`" ] -+ if [ -z "`type -t $XMLTEX_PATH`" ] - then - echo >&2 "Can't process, xmltex tool not found at $XMLTEX_PATH." - exit 3 -diff --git a/format/fo/pdf b/format/fo/pdf -index 670cd3c..aa967aa 100755 ---- a/format/fo/pdf -+++ b/format/fo/pdf -@@ -8,7 +8,7 @@ DEFAULT|DBLATEX) - then - echo >&2 "Post-process XSL-FO to PDF" - fi -- if [ -z "`which $PDFXMLTEX_PATH 2>/dev/null`" ] -+ if [ -z "`type -t $PDFXMLTEX_PATH`" ] - then - echo >&2 "Can't process, pdfxmltex tool not found at $PDFXMLTEX_PATH." - exit 3 -diff --git a/format/xhtml1/txt b/format/xhtml1/txt -index fa34ff7..18c9559 100755 ---- a/format/xhtml1/txt -+++ b/format/xhtml1/txt -@@ -1,14 +1,14 @@ - case "$USE_BACKEND" in - DEFAULT|DBLATEX) -- if [ -n "`which "$W3M_PATH" 2>/dev/null`" ] -+ if [ -n "`type -t $W3M_PATH`" ] - then - CONVERT="$W3M_PATH" - ARGS="-T text/html -dump" -- elif [ -n "`which "$LYNX_PATH" 2>/dev/null`" ] -+ elif [ -n "`type -t $LYNX_PATH`" ] - then - CONVERT="$LYNX_PATH" - ARGS="-force_html -dump -nolist -width=72" -- elif [ -n "`which "$LINKS_PATH" 2>/dev/null`" ] -+ elif [ -n "`type -t $LINKS_PATH`" ] - then - CONVERT="$LINKS_PATH" - ARGS="-dump" -diff --git a/xmlto.in b/xmlto.in -index dcab15e..45221a6 100755 ---- a/xmlto.in -+++ b/xmlto.in -@@ -125,7 +125,7 @@ XMLLINT_PATH=@XMLLINT@ - XSLTPROC_PATH=@XSLTPROC@ - - # Try to setup papersize using libpaper first ... --if [ -n "`which "$PAPERCONF_PATH" 2>/dev/null`" ] -+if [ -n "`type -t $PAPERCONF_PATH`" ] - then - papername=`"$PAPERCONF_PATH" -n` - paperheight=`"$PAPERCONF_PATH" -mh | sed 's/ //g'` -@@ -156,7 +156,7 @@ EOF - fi - - # ... or use magic paper size, based on LC_PAPER --elif [ -n "`which "$LOCALE_PATH" 2>/dev/null`" ] -+elif [ -n "`type -t $LOCALE_PATH`" ] - then - # For paper sizes we know about, specify them. - h=$("$LOCALE_PATH" LC_PAPER 2>/dev/null | head -n 1) -@@ -179,7 +179,7 @@ EOF - fi - - # Magic encoding, based on locale --if [ -n "`which "$LOCALE_PATH" 2>/dev/null`" ] -+if [ -n "`type -t $LOCALE_PATH`" ] - then - charmap=$("$LOCALE_PATH" charmap 2>/dev/null) - -@@ -228,14 +228,14 @@ XMLTEX_PATH=@XMLTEX@ - PDFXMLTEX_PATH=@PDFXMLTEX@ - - #check if we could use fop/dblatex backend as default(if not, use passivetex) --if [ x"$USE_BACKEND" = xFOP ] && [ -z "`which "$FOP_PATH" 2>/dev/null`" ] -+if [ x"$USE_BACKEND" = xFOP ] && [ -z "`type -t $FOP_PATH`" ] - then - echo >&2 "@PACKAGE@: Warning: fop not found or not executable." - echo >&2 "@PACKAGE@: Using default backend..." - USE_BACKEND=DEFAULT - fi - if [ x"$USE_BACKEND" = xDBLATEX ] && \ -- [ -z "`which "$DBLATEX_PATH" 2>/dev/null`" ] -+ [ -z "`type -t $DBLATEX_PATH`" ] - then - echo >&2 "@PACKAGE@: Warning: dblatex not found or not executable." - echo >&2 "@PACKAGE@: Using default backend..." -@@ -330,7 +330,7 @@ while [ "$#" -gt "0" ]; do - ;; - --with-fop) - ##use fop instead of passivetex where possible -- if [ -z "`which "$FOP_PATH" 2>/dev/null`" ] -+ if [ -z "`type -t $FOP_PATH`" ] - then - echo >&2 Warning: fop not found or not executable. - echo >&2 Using default backend... -@@ -341,7 +341,7 @@ while [ "$#" -gt "0" ]; do - ;; - --with-dblatex) - ##use dblatex instead of passivetex where possible -- if [ -z "`which "$DBLATEX_PATH" 2>/dev/null`" ] -+ if [ -z "`type -t $DBLATEX_PATH`" ] - then - echo >&2 Warning: dblatex not found or not executable. - echo >&2 Using default backend... -@@ -490,7 +490,7 @@ cd "$XSLT_PROCESSED_DIR" - if [ "$SKIP_VALIDATION" -eq 0 ] && [ "$SOURCE_FORMAT" != "fo" ] - then - #do we have xmllint validation tool? -- if [ -z "`which "$XMLLINT_PATH" 2>/dev/null`" ] -+ if [ -z "`type -t $XMLLINT_PATH`" ] - then - echo >&2 "@PACKAGE@: xmllint validation tool not found or not executable." - echo >&2 "@PACKAGE@: Skipping validation... " \ -@@ -522,7 +522,7 @@ then - else - - #do we have xsltproc tool? -- if [ -z "`which "$XSLTPROC_PATH" 2>/dev/null`" ] -+ if [ -z "`type -t $XSLTPROC_PATH`" ] - then - echo >&2 "@PACKAGE@: Can't continue, xsltproc tool not found or not executable." - exit 3 --- -1.6.3.2 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Mon Sep 21 23:07:44 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 21 Sep 2009 21:07:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[6369] csw/mgar/pkg/x11 Message-ID: Revision: 6369 http://gar.svn.sourceforge.net/gar/?rev=6369&view=rev Author: skayser Date: 2009-09-21 21:07:41 +0000 (Mon, 21 Sep 2009) Log Message: ----------- x11/libICE: initial commit Added Paths: ----------- csw/mgar/pkg/x11/libICE/ csw/mgar/pkg/x11/libICE/branches/ csw/mgar/pkg/x11/libICE/tags/ csw/mgar/pkg/x11/libICE/trunk/ csw/mgar/pkg/x11/libICE/trunk/Makefile csw/mgar/pkg/x11/libICE/trunk/checksums csw/mgar/pkg/x11/libICE/trunk/files/ Property changes on: csw/mgar/pkg/x11/libICE/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/x11/libICE/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libICE/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libICE/trunk/Makefile 2009-09-21 21:07:41 UTC (rev 6369) @@ -0,0 +1,31 @@ +GARNAME = libICE +GARVERSION = 1.0.6 +CATEGORIES = x11 + +DESCRIPTION = X11 Inter-Client Exchange Library +define BLURB + Long description +endef + +MASTER_SITES = http://xorg.freedesktop.org/releases/individual/lib/ +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_ARGS = $(DIRPATHS) + +PACKAGES = CSWlibice CSWlibicedevel + +CATALOGNAME_CSWlibice = libice +CATALOGNAME_CSWlibice = libice_devel + +SPKG_DESC_CSWlibice = X11 Inter-Client Exchange library +SPKG_DESC_CSWlibicedevel = X11 Inter-Client Exchange library development files + +PKGFILES_CSWlibicedevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libICE/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libICE/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libICE/trunk/checksums 2009-09-21 21:07:41 UTC (rev 6369) @@ -0,0 +1 @@ +4a8f09f15fc92196b91d61e2dc9afcea download/libICE-1.0.6.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 Sep 22 00:38:38 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Sep 2009 22:38:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6370] csw/mgar/pkg/mysql5/branches/mysql-5.0.x Message-ID: Revision: 6370 http://gar.svn.sourceforge.net/gar/?rev=6370&view=rev Author: wahwah Date: 2009-09-21 22:38:38 +0000 (Mon, 21 Sep 2009) Log Message: ----------- mysql5: Better prototypes for mysql5 subpackages. Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql.preinstall csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswusergroup Property Changed: ---------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Property changes on: csw/mgar/pkg/mysql5/branches/mysql-5.0.x ___________________________________________________________________ Modified: svn:ignore - cookies download work + cookies download work mysql-5.0.84 old-pkgs CSWmysql5 Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-09-21 21:07:41 UTC (rev 6369) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-09-21 22:38:38 UTC (rev 6370) @@ -1,3 +1,14 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# TODO(maciej): +# - include the right symlinks in the right packages +# - declare mysql4 incompatible +# - reduce the size of the package +# - define file ownerships with cswusergroup +# - verify file permissions + GARNAME = mysql5 GARVERSION = 5.0.84 CATEGORIES = server @@ -4,7 +15,7 @@ DISTNAME = mysql-$(GARVERSION) -DESCRIPTION = Multithreaded SQL database +DESCRIPTION = Multithreaded SQL database server define BLURB MySQL is a very fast, multi-threaded, multi-user and robust SQL (Structured Query Language) database server. @@ -14,8 +25,10 @@ prefix = /opt/csw/mysql5 sysconfdir = /etc/opt/csw/mysql5 localstatedir = /var/opt/csw/mysql5 +global_sysconfdir = /etc/opt/csw +global_bindir = /opt/csw/bin -INITSMF = $(sysconfdir)/init\.d/cswmysql5 +INITSMF = $(global_sysconfdir)/init\.d/cswmysql5 PATCHFILES = 0001-Use-libc-not-libcrypt.patch PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch @@ -32,6 +45,8 @@ CATALOGNAME_CSWmysql5rt = $(GARNAME)rt CATALOGNAME_CSWmysql5test = $(GARNAME)test +INCOMPATIBLE_PKGS_CSWmysql5 = CSWmysql4 + SPKG_DESC_CSWmysql5 = Multithreaded SQL database SPKG_DESC_CSWmysql5bench = MySQL 5 benchmarking SPKG_DESC_CSWmysql5client = MySQL 5 client binaries @@ -40,15 +55,32 @@ 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 +CSWmysql5client_programs += myisampack +CSWmysql5client_programs += mysql +CSWmysql5client_programs += mysql_client_test +CSWmysql5client_programs += mysql_zap +CSWmysql5client_programs += mysqlaccess +CSWmysql5client_programs += mysqladmin +CSWmysql5client_programs += mysqlbin +CSWmysql5client_programs += mysqlbinlog +CSWmysql5client_programs += mysqlcheck +CSWmysql5client_programs += mysqldump +CSWmysql5client_programs += mysqlhotcopy +CSWmysql5client_programs += mysqlimport +CSWmysql5client_programs += mysqlshow +CSWmysql5client_programs += perror +CSWmysql5client_programs += replace + + PKGFILES_CSWmysql5client = $(bindir) -PKGFILES_CSWmysql5client += $(bindir)$(support64)/myisam(log|pack) -PKGFILES_CSWmysql5client += $(bindir)$(support64)/mysql -PKGFILES_CSWmysql5client += $(bindir)$(support64)/mysql_client_test -PKGFILES_CSWmysql5client += $(bindir)$(support64)/mysql(_zap|access|admin|binlog|check) -PKGFILES_CSWmysql5client += $(bindir)$(support64)/mysql(dump|hotcopy|import|show) -PKGFILES_CSWmysql5client += $(bindir)$(support64)/(perror|replace) -PKGFILES_CSWmysql5client += $(mandir)/man1/mysql(|\_zap|access|admin|dump|show)\.1 -PKGFILES_CSWmysql5client += $(mandir)/man1/(perror|replace)\.1 +PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(bindir)$(support64)/$(bin_name)) +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_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(mandir)/man1/$(bin_name)\.1) PKGFILES_CSWmysql5devel = $(prefix)/include.* PKGFILES_CSWmysql5devel += $(bindir)$(support64)/mysql_config PKGFILES_CSWmysql5devel += $(mandir)/man1/mysql_config\.1 @@ -61,9 +93,8 @@ 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 += CSWmysql.preinstall - -# 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 CSWzlib @@ -94,6 +125,14 @@ # Enable 64 bits build BUILD64 = 1 +USERGROUP = /opt/csw/etc/pkg/CSWmysql5/cswusergroup +PROTOTYPE_FILTER = awk ' \ + $$$$3 ~ /\/var\/opt\/csw\/mysql5$$$$/ { $$$$2 = "ugfiles"; \ + $$$$4 = "0700"; \ + $$$$5 = "mysql"; \ + $$$$6 = "mysql" } \ + { print }' + include gar/category.mk post-install-modulated: @@ -101,9 +140,18 @@ ginstall -m 755 -d $(DESTDIR)$(datadir)/mysql5/doc ginstall -m 644 $(FILEDIR)/README.CSW $(DESTDIR)$(datadir)/mysql5/doc ginstall -m 755 -d $(DESTDIR)/opt/csw/share/mysql5/doc - ln -s ../../../mysql5/share/mysql5/doc/README.CSW \ + ln -sf ../../../mysql5/share/mysql5/doc/README.CSW \ $(DESTDIR)/opt/csw/share/mysql5/doc/README.CSW ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d ginstall -m 755 $(FILEDIR)/cswmysql5 $(DESTDIR)/etc/opt/csw/init.d ginstall -m 755 $(FILEDIR)/quick_start-csw $(DESTDIR)$(datadir)/mysql5 + ginstall -m 755 -d $(DESTDIR)$(global_sysconfdir)/pkg/CSWmysql5 + ginstall -m 644 $(FILEDIR)/cswusergroup \ + $(DESTDIR)$(global_sysconfdir)/pkg/CSWmysql5 + + # Create symlinks + ginstall -m 755 -d $(DESTDIR)$(global_bindir) + for f in $(DESTDIR)$(bindir)/*; do \ + ln -s ../mysql5/bin/`basename $$f` $(DESTDIR)$(global_bindir)/`basename $$f`; \ + done @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-09-21 21:07:41 UTC (rev 6369) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-09-21 22:38:38 UTC (rev 6370) @@ -2,7 +2,8 @@ 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 +cc2a219abbe7dc6049775cff070a27a5 download/CSWmysql.preinstall 70d7860bfa776dfc5510fc11d7c14203 download/README.CSW -815a50011c356cd29758ca2195804952 download/cswmysql5 +fa8f33c812604457f2c0792e875f6967 download/cswmysql5 671348f1a5b078da9ca76f97e1fda325 download/mysql-5.0.84.tar.gz 1d79b3cfc4f91db05952bf71f0181fe7 download/quick_start-csw Added: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql.preinstall =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql.preinstall (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql.preinstall 2009-09-21 22:38:38 UTC (rev 6370) @@ -0,0 +1,40 @@ +#!/bin/sh +# vim:set sw=2 ts=2 sts=2 expandtab: +# +# $Id$ +# + +obsolete_directories="/opt/csw/mysql5/var:/var/opt/csw/mysql5" + +obsolete_dir_information=" +This directory is obsolete. Files in this directory are going to be ignored. +Please move your data to the new location. + +Feel free to remove this file afterwards. +" +obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE" + +for dirpair in ${obsolete_directories}; do + obsolete_dir=`echo ${dirpair} | cut -d: -f1` + new_dir=`echo ${dirpair} | cut -d: -f2` + if [ -d "${PKG_INSTALL_ROOT}${obsolete_dir}" ]; then + echo + echo "*******************************************************************" + echo "* The old configuration directory ${obsolete_dir} still exists. " + echo "* Please move your configuration to ${new_dir}. " + echo "* " + echo "* Installation will continue in 10 seconds. " + echo "* Press CTRL+C if you want to stop now. " + echo "*******************************************************************" + echo + sleep 10 + + # Leaving a note for the sysadmin if the they proceed with the installation. + fn="${PKG_INSTALL_ROOT}${obsolete_dir}/${obsolete_dir_file_name}" + if touch "${fn}" 2>/dev/null; then + echo "${obsolete_dir_information}" > "${fn}" + fi + fi +done + +exit 0 Added: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswusergroup =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswusergroup (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswusergroup 2009-09-21 22:38:38 UTC (rev 6370) @@ -0,0 +1 @@ +mysql:mysql:MySQL database user:/opt/csw/mysql:/bin/false:: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Sep 22 03:26:33 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 22 Sep 2009 01:26:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[6371] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 6371 http://gar.svn.sourceforge.net/gar/?rev=6371&view=rev Author: bdwalton Date: 2009-09-22 01:26:33 +0000 (Tue, 22 Sep 2009) Log Message: ----------- git: disable tests until next version bump Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-09-21 22:38:38 UTC (rev 6370) +++ csw/mgar/pkg/git/trunk/Makefile 2009-09-22 01:26:33 UTC (rev 6371) @@ -4,7 +4,7 @@ CATEGORIES = devel # disable tests until next version bump (at the top so it stands out) -# TEST_SCRIPTS = +TEST_SCRIPTS = PACKAGES = CSWgit CSWgitk CSWgitgui CSWgitsvn CSWgitcvs CSWgitemacs CSWgitdoc PACKAGES += CSWgitcompletion CSWgitdevel 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 Sep 22 09:12:16 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 07:12:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[6372] csw/mgar/pkg/x11/libxft/trunk/Makefile Message-ID: Revision: 6372 http://gar.svn.sourceforge.net/gar/?rev=6372&view=rev Author: dmichelsen Date: 2009-09-22 07:12:16 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libxft: Fix description Modified Paths: -------------- csw/mgar/pkg/x11/libxft/trunk/Makefile Modified: csw/mgar/pkg/x11/libxft/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxft/trunk/Makefile 2009-09-22 01:26:33 UTC (rev 6371) +++ csw/mgar/pkg/x11/libxft/trunk/Makefile 2009-09-22 07:12:16 UTC (rev 6372) @@ -2,7 +2,7 @@ GARVERSION = 2.1.13 CATEGORIES = x11 -DESCRIPTION = X11 authorisation library +DESCRIPTION = A client-side font API for X applications define BLURB Xft provides a client-side font API for X applications, making the FreeType font rasterizer available to X clients. Fontconfig is used 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 Sep 22 10:29:08 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 22 Sep 2009 08:29:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[6373] csw/mgar/pkg/mysql5/branches/mysql-5.0.x Message-ID: Revision: 6373 http://gar.svn.sourceforge.net/gar/?rev=6373&view=rev Author: wahwah Date: 2009-09-22 08:29:08 +0000 (Tue, 22 Sep 2009) Log Message: ----------- mysql5: Defined incompatible packages, set runtime dependencies, set the ownership of /var/opt/csw/mysql directory, added a preinstall script with a warning. Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.preinstall Removed Paths: ------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql.preinstall Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-09-22 07:12:16 UTC (rev 6372) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-09-22 08:29:08 UTC (rev 6373) @@ -2,13 +2,6 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -# TODO(maciej): -# - include the right symlinks in the right packages -# - declare mysql4 incompatible -# - reduce the size of the package -# - define file ownerships with cswusergroup -# - verify file permissions - GARNAME = mysql5 GARVERSION = 5.0.84 CATEGORIES = server @@ -45,7 +38,12 @@ CATALOGNAME_CSWmysql5rt = $(GARNAME)rt CATALOGNAME_CSWmysql5test = $(GARNAME)test -INCOMPATIBLE_PKGS_CSWmysql5 = CSWmysql4 +INCOMPATIBLE_PKGS_CSWmysql5bench = CSWmysql4bench +INCOMPATIBLE_PKGS_CSWmysql5client = CSWmysql4client +INCOMPATIBLE_PKGS_CSWmysql5 = CSWmysql4 +INCOMPATIBLE_PKGS_CSWmysql5devel = CSWmysql4devel +INCOMPATIBLE_PKGS_CSWmysql5rt = CSWmysql4rt +INCOMPATIBLE_PKGS_CSWmysql5test = CSWmysql4test SPKG_DESC_CSWmysql5 = Multithreaded SQL database SPKG_DESC_CSWmysql5bench = MySQL 5 benchmarking @@ -61,39 +59,43 @@ CSWmysql5client_programs = myisamlog CSWmysql5client_programs += myisampack CSWmysql5client_programs += mysql -CSWmysql5client_programs += mysql_client_test -CSWmysql5client_programs += mysql_zap CSWmysql5client_programs += mysqlaccess CSWmysql5client_programs += mysqladmin CSWmysql5client_programs += mysqlbin CSWmysql5client_programs += mysqlbinlog CSWmysql5client_programs += mysqlcheck +CSWmysql5client_programs += mysql_client_test CSWmysql5client_programs += mysqldump CSWmysql5client_programs += mysqlhotcopy CSWmysql5client_programs += mysqlimport CSWmysql5client_programs += mysqlshow +CSWmysql5client_programs += mysql_zap CSWmysql5client_programs += perror CSWmysql5client_programs += replace +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),$(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_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(mandir)/man1/$(bin_name)\.1) -PKGFILES_CSWmysql5devel = $(prefix)/include.* PKGFILES_CSWmysql5devel += $(bindir)$(support64)/mysql_config PKGFILES_CSWmysql5devel += $(mandir)/man1/mysql_config\.1 +PKGFILES_CSWmysql5devel = $(prefix)/include.* PKGFILES_CSWmysql5rt = $(prefix)/lib/.*\.so.* -PKGFILES_CSWmysql5bench = $(prefix)/sql-bench.* PKGFILES_CSWmysql5test = $(prefix)/mysql-test.* -REQUIRED_PKGS_CSWmysql5client = CSWmysql5rt +REQUIRED_PKGS_CSWmysql5bench = CSWmysql5 +REQUIRED_PKGS_CSWmysql5client = CSWmysql5rt +REQUIRED_PKGS_CSWmysql5 = CSWmysql5client CSWmysql5rt +REQUIRED_PKGS_CSWmysql5devel = CSWmysql5 +REQUIRED_PKGS_CSWmysql5test = CSWmysql5 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 += CSWmysql.preinstall +DISTFILES += CSWmysql5.preinstall UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -132,6 +134,7 @@ $$$$5 = "mysql"; \ $$$$6 = "mysql" } \ { print }' +SPKG_CLASSES = none ugfiles include gar/category.mk Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-09-22 07:12:16 UTC (rev 6372) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-09-22 08:29:08 UTC (rev 6373) @@ -2,7 +2,7 @@ 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 -cc2a219abbe7dc6049775cff070a27a5 download/CSWmysql.preinstall +cc2a219abbe7dc6049775cff070a27a5 download/CSWmysql5.preinstall 70d7860bfa776dfc5510fc11d7c14203 download/README.CSW fa8f33c812604457f2c0792e875f6967 download/cswmysql5 671348f1a5b078da9ca76f97e1fda325 download/mysql-5.0.84.tar.gz Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql.preinstall =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql.preinstall 2009-09-22 07:12:16 UTC (rev 6372) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql.preinstall 2009-09-22 08:29:08 UTC (rev 6373) @@ -1,40 +0,0 @@ -#!/bin/sh -# vim:set sw=2 ts=2 sts=2 expandtab: -# -# $Id$ -# - -obsolete_directories="/opt/csw/mysql5/var:/var/opt/csw/mysql5" - -obsolete_dir_information=" -This directory is obsolete. Files in this directory are going to be ignored. -Please move your data to the new location. - -Feel free to remove this file afterwards. -" -obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE" - -for dirpair in ${obsolete_directories}; do - obsolete_dir=`echo ${dirpair} | cut -d: -f1` - new_dir=`echo ${dirpair} | cut -d: -f2` - if [ -d "${PKG_INSTALL_ROOT}${obsolete_dir}" ]; then - echo - echo "*******************************************************************" - echo "* The old configuration directory ${obsolete_dir} still exists. " - echo "* Please move your configuration to ${new_dir}. " - echo "* " - echo "* Installation will continue in 10 seconds. " - echo "* Press CTRL+C if you want to stop now. " - echo "*******************************************************************" - echo - sleep 10 - - # Leaving a note for the sysadmin if the they proceed with the installation. - fn="${PKG_INSTALL_ROOT}${obsolete_dir}/${obsolete_dir_file_name}" - if touch "${fn}" 2>/dev/null; then - echo "${obsolete_dir_information}" > "${fn}" - fi - fi -done - -exit 0 Copied: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.preinstall (from rev 6370, csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql.preinstall) =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.preinstall (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.preinstall 2009-09-22 08:29:08 UTC (rev 6373) @@ -0,0 +1,40 @@ +#!/bin/sh +# vim:set sw=2 ts=2 sts=2 expandtab: +# +# $Id$ +# + +obsolete_directories="/opt/csw/mysql5/var:/var/opt/csw/mysql5" + +obsolete_dir_information=" +This directory is obsolete. Files in this directory are going to be ignored. +Please move your data to the new location. + +Feel free to remove this file afterwards. +" +obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE" + +for dirpair in ${obsolete_directories}; do + obsolete_dir=`echo ${dirpair} | cut -d: -f1` + new_dir=`echo ${dirpair} | cut -d: -f2` + if [ -d "${PKG_INSTALL_ROOT}${obsolete_dir}" ]; then + echo + echo "*******************************************************************" + echo "* The old configuration directory ${obsolete_dir} still exists. " + echo "* Please move your configuration to ${new_dir}. " + echo "* " + echo "* Installation will continue in 10 seconds. " + echo "* Press CTRL+C if you want to stop now. " + echo "*******************************************************************" + echo + sleep 10 + + # Leaving a note for the sysadmin if the they proceed with the installation. + fn="${PKG_INSTALL_ROOT}${obsolete_dir}/${obsolete_dir_file_name}" + if touch "${fn}" 2>/dev/null; then + echo "${obsolete_dir_information}" > "${fn}" + fi + fi +done + +exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Sep 22 11:34:54 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 22 Sep 2009 09:34:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[6374] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 6374 http://gar.svn.sourceforge.net/gar/?rev=6374&view=rev Author: skayser Date: 2009-09-22 09:34:54 +0000 (Tue, 22 Sep 2009) Log Message: ----------- gar/v2: fix USERGROUP handling, cswusergroup needs to be prepended 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-09-22 08:29:08 UTC (rev 6373) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-09-22 09:34:54 UTC (rev 6374) @@ -160,11 +160,12 @@ SPKG_PKGFILE ?= %{bitname}-%{SPKG_VERSION}%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-%{arch}-$(or $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),CSW).pkg # Handle cswclassutils -# - prepend cswpreserveconf if it is not already in SPKG_CLASSES +# - append csw* classes if they are used and not already contained in SPKG_CLASSES +# - exception: prepend cswusergroup so that required accounts are setup first SPKG_CLASSES := $(SPKG_CLASSES) $(if $(SAMPLECONF),$(if $(filter cswcpsampleconf,$(SPKG_CLASSES)),,cswcpsampleconf)) SPKG_CLASSES := $(SPKG_CLASSES) $(if $(PRESERVECONF),$(if $(filter cswpreserveconf,$(SPKG_CLASSES)),,cswpreserveconf)) SPKG_CLASSES := $(SPKG_CLASSES) $(if $(INITSMF),$(if $(filter cswinitsmf,$(SPKG_CLASSES)),,cswinitsmf)) -SPKG_CLASSES := $(SPKG_CLASSES) $(if $(USERGROUP),$(if $(filter cswusergroup,$(SPKG_CLASSES)),,cswusergroup)) +SPKG_CLASSES := $(if $(USERGROUP),$(if $(filter cswusergroup,$(SPKG_CLASSES)),,cswusergroup)) $(SPKG_CLASSES) SPKG_CLASSES := $(SPKG_CLASSES) $(if $(PYCOMPILE),$(if $(filter cswpycompile,$(SPKG_CLASSES)),,cswpycompile)) # - set class for all config files ifneq ($(SAMPLECONF)$(PRESERVECONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),) 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 Sep 22 11:35:13 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 09:35:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[6375] csw/mgar/pkg/x11 Message-ID: Revision: 6375 http://gar.svn.sourceforge.net/gar/?rev=6375&view=rev Author: dmichelsen Date: 2009-09-22 09:35:13 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libice: make dirname conform catalog Modified Paths: -------------- csw/mgar/pkg/x11/libice/trunk/Makefile csw/mgar/pkg/x11/libice/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/libice/ Removed Paths: ------------- csw/mgar/pkg/x11/libICE/ Modified: csw/mgar/pkg/x11/libice/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libICE/trunk/Makefile 2009-09-22 01:26:33 UTC (rev 6371) +++ csw/mgar/pkg/x11/libice/trunk/Makefile 2009-09-22 09:35:13 UTC (rev 6375) @@ -4,14 +4,14 @@ DESCRIPTION = X11 Inter-Client Exchange Library define BLURB - Long description + X Inter-Client Exchange (ICE) protocol library endef -MASTER_SITES = http://xorg.freedesktop.org/releases/individual/lib/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/x11/libice/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libICE/trunk/checksums 2009-09-22 01:26:33 UTC (rev 6371) +++ csw/mgar/pkg/x11/libice/trunk/checksums 2009-09-22 09:35:13 UTC (rev 6375) @@ -1 +1 @@ -4a8f09f15fc92196b91d61e2dc9afcea download/libICE-1.0.6.tar.gz +2d39bc924af24325dae589e9a849180c download/libICE-1.0.6.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 Sep 22 11:36:48 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 09:36:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[6376] csw/mgar/pkg/x11/libice/trunk/Makefile Message-ID: Revision: 6376 http://gar.svn.sourceforge.net/gar/?rev=6376&view=rev Author: dmichelsen Date: 2009-09-22 09:36:48 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libice: Add dependency Modified Paths: -------------- csw/mgar/pkg/x11/libice/trunk/Makefile Modified: csw/mgar/pkg/x11/libice/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libice/trunk/Makefile 2009-09-22 09:35:13 UTC (rev 6375) +++ csw/mgar/pkg/x11/libice/trunk/Makefile 2009-09-22 09:36:48 UTC (rev 6376) @@ -23,6 +23,8 @@ SPKG_DESC_CSWlibice = X11 Inter-Client Exchange library SPKG_DESC_CSWlibicedevel = X11 Inter-Client Exchange library development files +REQUIRED_PKGS_CSWlibicedevel = CSWlibice + PKGFILES_CSWlibicedevel = $(PKGFILES_DEVEL) BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Sep 22 11:38:41 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 09:38:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[6377] csw/mgar/pkg/x11/libice/trunk/Makefile Message-ID: Revision: 6377 http://gar.svn.sourceforge.net/gar/?rev=6377&view=rev Author: dmichelsen Date: 2009-09-22 09:38:37 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libice: Fix catalog name Modified Paths: -------------- csw/mgar/pkg/x11/libice/trunk/Makefile Modified: csw/mgar/pkg/x11/libice/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libice/trunk/Makefile 2009-09-22 09:36:48 UTC (rev 6376) +++ csw/mgar/pkg/x11/libice/trunk/Makefile 2009-09-22 09:38:37 UTC (rev 6377) @@ -18,7 +18,7 @@ PACKAGES = CSWlibice CSWlibicedevel CATALOGNAME_CSWlibice = libice -CATALOGNAME_CSWlibice = libice_devel +CATALOGNAME_CSWlibicedevel = libice_devel SPKG_DESC_CSWlibice = X11 Inter-Client Exchange library SPKG_DESC_CSWlibicedevel = X11 Inter-Client Exchange library development files 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 Sep 22 11:41:00 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 22 Sep 2009 09:41:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6378] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 6378 http://gar.svn.sourceforge.net/gar/?rev=6378&view=rev Author: skayser Date: 2009-09-22 09:41:00 +0000 (Tue, 22 Sep 2009) Log Message: ----------- gar/v2: rolled back naive r6374, cswusergroup and ugfiles need to be handled BOTH by GAR 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-09-22 09:38:37 UTC (rev 6377) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-09-22 09:41:00 UTC (rev 6378) @@ -160,12 +160,11 @@ SPKG_PKGFILE ?= %{bitname}-%{SPKG_VERSION}%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-%{arch}-$(or $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),CSW).pkg # Handle cswclassutils -# - append csw* classes if they are used and not already contained in SPKG_CLASSES -# - exception: prepend cswusergroup so that required accounts are setup first +# - prepend cswpreserveconf if it is not already in SPKG_CLASSES SPKG_CLASSES := $(SPKG_CLASSES) $(if $(SAMPLECONF),$(if $(filter cswcpsampleconf,$(SPKG_CLASSES)),,cswcpsampleconf)) SPKG_CLASSES := $(SPKG_CLASSES) $(if $(PRESERVECONF),$(if $(filter cswpreserveconf,$(SPKG_CLASSES)),,cswpreserveconf)) SPKG_CLASSES := $(SPKG_CLASSES) $(if $(INITSMF),$(if $(filter cswinitsmf,$(SPKG_CLASSES)),,cswinitsmf)) -SPKG_CLASSES := $(if $(USERGROUP),$(if $(filter cswusergroup,$(SPKG_CLASSES)),,cswusergroup)) $(SPKG_CLASSES) +SPKG_CLASSES := $(SPKG_CLASSES) $(if $(USERGROUP),$(if $(filter cswusergroup,$(SPKG_CLASSES)),,cswusergroup)) SPKG_CLASSES := $(SPKG_CLASSES) $(if $(PYCOMPILE),$(if $(filter cswpycompile,$(SPKG_CLASSES)),,cswpycompile)) # - set class for all config files ifneq ($(SAMPLECONF)$(PRESERVECONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),) 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 Sep 22 11:46:46 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 22 Sep 2009 09:46:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6379] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 6379 http://gar.svn.sourceforge.net/gar/?rev=6379&view=rev Author: wahwah Date: 2009-09-22 09:46:46 +0000 (Tue, 22 Sep 2009) Log Message: ----------- mysql5: cswusergroup must be listed as well 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-09-22 09:41:00 UTC (rev 6378) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-09-22 09:46:46 UTC (rev 6379) @@ -134,7 +134,7 @@ $$$$5 = "mysql"; \ $$$$6 = "mysql" } \ { print }' -SPKG_CLASSES = none ugfiles +SPKG_CLASSES = none cswusergroup ugfiles 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 Sep 22 11:53:16 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 09:53:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[6380] csw/mgar/pkg/x11 Message-ID: Revision: 6380 http://gar.svn.sourceforge.net/gar/?rev=6380&view=rev Author: dmichelsen Date: 2009-09-22 09:53:16 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libsm: Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libsm/ csw/mgar/pkg/x11/libsm/branches/ csw/mgar/pkg/x11/libsm/tags/ csw/mgar/pkg/x11/libsm/trunk/ csw/mgar/pkg/x11/libsm/trunk/Makefile csw/mgar/pkg/x11/libsm/trunk/checksums csw/mgar/pkg/x11/libsm/trunk/files/ Property changes on: csw/mgar/pkg/x11/libsm/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/x11/libsm/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libsm/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libsm/trunk/Makefile 2009-09-22 09:53:16 UTC (rev 6380) @@ -0,0 +1,37 @@ +GARNAME = libsm +GARVERSION = 1.1.1 +CATEGORIES = x11 + +DESCRIPTION = X11 Session Management library +define BLURB + This package provides the main interface to the X11 Session Management + library, which allows for applications to both manage sessions, and make + use of session managers to save and restore their state for later use. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +DISTNAME = libSM-$(GARVERSION) +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 + +PREREQUISITE_PKGS = CSWlibicedevel +REQUIRED_PKGS = CSWlibice + +PACKAGES = CSWlibsm CSWlibsmdevel + +CATALOGNAME_CSWlibsm = libsm +CATALOGNAME_CSWlibsmdevel = libsm_devel + +SPKG_DESC_CSWlibsm = X11 Session Management library +SPKG_DESC_CSWlibsmdevel = X11 Session Management library development files + +BUILD64 = 1 +NOISALIST = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +PKGFILES_CSWlibsmdevel = $(PKGFILES_DEVEL) + +include gar/category.mk Added: csw/mgar/pkg/x11/libsm/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libsm/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libsm/trunk/checksums 2009-09-22 09:53:16 UTC (rev 6380) @@ -0,0 +1 @@ +6889a455496aaaa65b1fa05fc518d179 download/libSM-1.1.1.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 Sep 22 12:18:07 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 10:18:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[6381] csw/mgar/pkg/x11 Message-ID: Revision: 6381 http://gar.svn.sourceforge.net/gar/?rev=6381&view=rev Author: dmichelsen Date: 2009-09-22 10:18:07 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libxt: Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxt/ csw/mgar/pkg/x11/libxt/branches/ csw/mgar/pkg/x11/libxt/tags/ csw/mgar/pkg/x11/libxt/trunk/ csw/mgar/pkg/x11/libxt/trunk/Makefile csw/mgar/pkg/x11/libxt/trunk/checksums csw/mgar/pkg/x11/libxt/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxt/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/x11/libxt/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxt/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxt/trunk/Makefile 2009-09-22 10:18:07 UTC (rev 6381) @@ -0,0 +1,38 @@ +GARNAME = libxt +GARVERSION = 1.0.6 +CATEGORIES = x11 + +DESCRIPTION = X11 toolkit intrinsics library +define BLURB + LibXt provides the X Toolkit Intrinsics, an abstract widget library + upon which other toolkits are based. Xt is the basis for many toolkits, + including the Athena widgets (Xaw), and LessTif. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +DISTNAME = libXt-$(GARVERSION) +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 + +PREREQUISITE_PKGS = CSWlibsmdevel + +PACKAGES = CSWlibxt CSWlibxtdevel + +CATALOGNAME_CSWlibxt = libxt +CATALOGNAME_CSWlibxtdevel = libxt_devel + +SPKG_DESC_CSWlibxt = X11 toolkit intrinsics library +SPKG_DESC_CSWlibxtdevel = X11 toolkit intrinsics library development files + +REQUIRED_PKGS_CSWlibxtdevel = CSWlibxt + +PKGFILES_CSWlibxtdevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/x11/libxt/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxt/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxt/trunk/checksums 2009-09-22 10:18:07 UTC (rev 6381) @@ -0,0 +1 @@ +953930ddf9fdaa1405732c7f01e9e599 download/libXt-1.0.6.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Sep 22 12:36:07 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 22 Sep 2009 10:36:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[6382] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 6382 http://gar.svn.sourceforge.net/gar/?rev=6382&view=rev Author: wahwah Date: 2009-09-22 10:36:07 +0000 (Tue, 22 Sep 2009) Log Message: ----------- mysql5: Runtime libraries can live together with mysql4. 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-09-22 10:18:07 UTC (rev 6381) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-09-22 10:36:07 UTC (rev 6382) @@ -42,7 +42,6 @@ INCOMPATIBLE_PKGS_CSWmysql5client = CSWmysql4client INCOMPATIBLE_PKGS_CSWmysql5 = CSWmysql4 INCOMPATIBLE_PKGS_CSWmysql5devel = CSWmysql4devel -INCOMPATIBLE_PKGS_CSWmysql5rt = CSWmysql4rt INCOMPATIBLE_PKGS_CSWmysql5test = CSWmysql4test SPKG_DESC_CSWmysql5 = Multithreaded SQL database 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 Sep 22 12:39:38 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 10:39:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6383] csw/mgar/pkg/x11/xextproto/trunk Message-ID: Revision: 6383 http://gar.svn.sourceforge.net/gar/?rev=6383&view=rev Author: dmichelsen Date: 2009-09-22 10:39:38 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/xextproto: Downrev as not all other libs have been updated and problems occur with libxext Modified Paths: -------------- csw/mgar/pkg/x11/xextproto/trunk/Makefile csw/mgar/pkg/x11/xextproto/trunk/checksums Modified: csw/mgar/pkg/x11/xextproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xextproto/trunk/Makefile 2009-09-22 10:36:07 UTC (rev 6382) +++ csw/mgar/pkg/x11/xextproto/trunk/Makefile 2009-09-22 10:39:38 UTC (rev 6383) @@ -1,5 +1,5 @@ GARNAME = xextproto -GARVERSION = 7.1.1 +GARVERSION = 7.0.5 CATEGORIES = x11 Modified: csw/mgar/pkg/x11/xextproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xextproto/trunk/checksums 2009-09-22 10:36:07 UTC (rev 6382) +++ csw/mgar/pkg/x11/xextproto/trunk/checksums 2009-09-22 10:39:38 UTC (rev 6383) @@ -1 +1 @@ -6c55283718dbeb826bcf899b9e89faba download/xextproto-7.1.1.tar.gz +f6274c778e571130484fb0650651ac02 work/download/xextproto-7.0.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 Tue Sep 22 12:42:59 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 10:42:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6384] csw/mgar/pkg/x11/xextproto/trunk Message-ID: Revision: 6384 http://gar.svn.sourceforge.net/gar/?rev=6384&view=rev Author: dmichelsen Date: 2009-09-22 10:42:59 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/xextproto: Switch to bz2 Modified Paths: -------------- csw/mgar/pkg/x11/xextproto/trunk/Makefile csw/mgar/pkg/x11/xextproto/trunk/checksums Modified: csw/mgar/pkg/x11/xextproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xextproto/trunk/Makefile 2009-09-22 10:39:38 UTC (rev 6383) +++ csw/mgar/pkg/x11/xextproto/trunk/Makefile 2009-09-22 10:42:59 UTC (rev 6384) @@ -9,10 +9,10 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +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.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 REQUIRED_PKGS = CSWx11common Modified: csw/mgar/pkg/x11/xextproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xextproto/trunk/checksums 2009-09-22 10:39:38 UTC (rev 6383) +++ csw/mgar/pkg/x11/xextproto/trunk/checksums 2009-09-22 10:42:59 UTC (rev 6384) @@ -1 +1 @@ -f6274c778e571130484fb0650651ac02 work/download/xextproto-7.0.5.tar.gz +e6841018a7c64983b0954aa2c564d115 download/xextproto-7.0.5.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 Sep 22 12:51:09 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 10:51:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[6385] csw/mgar/pkg/x11/libxext/trunk Message-ID: Revision: 6385 http://gar.svn.sourceforge.net/gar/?rev=6385&view=rev Author: dmichelsen Date: 2009-09-22 10:51:09 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libxext: Downgrade to 1.0.5 and split off devel Modified Paths: -------------- csw/mgar/pkg/x11/libxext/trunk/Makefile csw/mgar/pkg/x11/libxext/trunk/checksums Modified: csw/mgar/pkg/x11/libxext/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxext/trunk/Makefile 2009-09-22 10:42:59 UTC (rev 6384) +++ csw/mgar/pkg/x11/libxext/trunk/Makefile 2009-09-22 10:51:09 UTC (rev 6385) @@ -1,5 +1,5 @@ GARNAME = libxext -GARVERSION = 1.0.99.4 +GARVERSION = 1.0.5 CATEGORIES = x11 DESCRIPTION = X11 miscellaneous extensions library1 @@ -20,6 +20,18 @@ PREREQUISITE_PKGS = CSWxextproto REQUIRED_PKGS = CSWlibx11 +PACKAGES = CSWlibxext CSWlibxextdevel + +CATALOGNAME_CSWlibxext = libxext +CATALOGNAME_CSWlibxextdevel = libxext_devel + +SPKG_DESC_CSWlibxext = X11 miscellaneous extensions library +SPKG_DESC_CSWlibxextdevel = X11 miscellaneous extensions library development files + +REQUIRED_PKGS_CSWlibxextdevel = CSWlibxext + +PKGFILES_CSWlibxextdevel = $(PKGFILES_DEVEL) + BUILD64 = 1 NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/x11/libxext/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxext/trunk/checksums 2009-09-22 10:42:59 UTC (rev 6384) +++ csw/mgar/pkg/x11/libxext/trunk/checksums 2009-09-22 10:51:09 UTC (rev 6385) @@ -1 +1 @@ -24da44888b87c66edb326acec35b85aa download/libXext-1.0.99.4.tar.bz2 +aa11d859cc8e9a0bad3bb55e1666547b download/libXext-1.0.5.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 Sep 22 13:03:04 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 11:03:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[6386] csw/mgar/pkg/x11 Message-ID: Revision: 6386 http://gar.svn.sourceforge.net/gar/?rev=6386&view=rev Author: dmichelsen Date: 2009-09-22 11:03:04 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libxmu: Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxmu/ csw/mgar/pkg/x11/libxmu/branches/ csw/mgar/pkg/x11/libxmu/tags/ csw/mgar/pkg/x11/libxmu/trunk/ csw/mgar/pkg/x11/libxmu/trunk/Makefile csw/mgar/pkg/x11/libxmu/trunk/checksums csw/mgar/pkg/x11/libxmu/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxmu/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/x11/libxmu/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxmu/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxmu/trunk/Makefile 2009-09-22 11:03:04 UTC (rev 6386) @@ -0,0 +1,37 @@ +GARNAME = libxmu +GARVERSION = 1.0.4 +CATEGORIES = x11 + +DESCRIPTION = A set of miscellaneous utility convenience functions for X libraries to use +define BLURB + LibXmu provides a set of miscellaneous utility convenience functions for X libraries to use. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +DISTNAME = libXmu-$(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 + +PREREQUISITE_PKGS = CSWlibxtdevel CSWlibxextdevel + +PACKAGES = CSWlibxmu CSWlibxmudevel + +CATALOGNAME_CSWlibxmu = libxmu +CATALOGNAME_CSWlibxmudevel = libxmu_devel + +SPKG_DESC_CSWlibxmu = X11 miscellaneous utility library +SPKG_DESC_CSWlibxmudevel = X11 miscellaneous utility library development files + +REQUIRED_PKGS_CSWlibxmu = CSWlibice CSWlibsm CSWlibx11 CSWlibxext CSWlibxt +REQUIRED_PKGS_CSWlibxmudevel = CSWlibxmu + +PKGFILES_CSWlibxmudevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/x11/libxmu/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxmu/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxmu/trunk/checksums 2009-09-22 11:03:04 UTC (rev 6386) @@ -0,0 +1 @@ +48b432e84035c664ece80a33695d5254 download/libXmu-1.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 Tue Sep 22 14:23:14 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 22 Sep 2009 12:23:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6387] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 6387 http://gar.svn.sourceforge.net/gar/?rev=6387&view=rev Author: wahwah Date: 2009-09-22 12:23:14 +0000 (Tue, 22 Sep 2009) Log Message: ----------- mysql5: Fixing the cswusergroup path (changing to /etc/opt/csw) 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-09-22 11:03:04 UTC (rev 6386) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-09-22 12:23:14 UTC (rev 6387) @@ -126,7 +126,7 @@ # Enable 64 bits build BUILD64 = 1 -USERGROUP = /opt/csw/etc/pkg/CSWmysql5/cswusergroup +USERGROUP = /etc/opt/csw/pkg/CSWmysql5/cswusergroup PROTOTYPE_FILTER = awk ' \ $$$$3 ~ /\/var\/opt\/csw\/mysql5$$$$/ { $$$$2 = "ugfiles"; \ $$$$4 = "0700"; \ 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 Sep 22 15:24:47 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 13:24:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[6388] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 6388 http://gar.svn.sourceforge.net/gar/?rev=6388&view=rev Author: dmichelsen Date: 2009-09-22 13:24:36 +0000 (Tue, 22 Sep 2009) Log Message: ----------- mGAR v2: Exclude pkgconfig .pc-files for ISAs other then the 32- and 64 bit defaults Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-09-22 12:23:14 UTC (rev 6387) +++ csw/mgar/gar/v2/gar.mk 2009-09-22 13:24:36 UTC (rev 6388) @@ -569,7 +569,9 @@ MERGE_EXCLUDE_LIBTOOL ?= $(libdir)/.*\.la MERGE_EXCLUDE_BACKUPFILES ?= .*\~ MERGE_EXCLUDE_STATICLIBS ?= $(libdir)/.*\.a -MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_CATEGORY) $(MERGE_EXCLUDE_INFODIR) $(MERGE_EXCLUDE_LIBTOOL) $(MERGE_EXCLUDE_BACKUPFILES) $(MERGE_EXCLUDE_STATICLIBS) $(MERGE_EXCLUDE_PYCOMPILE) +# Exclude all other .pc-files apart from the default 32- and 64 bit versions +MERGE_EXCLUDE_EXTRA_ISA_PKGCONFIG ?= $(if $(filter-out $(ISA_DEFAULT) $(ISA_DEFAULT64),$(ISA)),$(libdir)/.*\.pc) +MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_CATEGORY) $(MERGE_EXCLUDE_INFODIR) $(MERGE_EXCLUDE_LIBTOOL) $(MERGE_EXCLUDE_BACKUPFILES) $(MERGE_EXCLUDE_STATICLIBS) $(MERGE_EXCLUDE_EXTRA_ISA_PKGCONFIG) $(MERGE_EXCLUDE_PYCOMPILE) # Exclude these files ifeq ($(origin MERGE_EXCLUDE_FILES_$(MODULATION)), undefined) 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 Sep 22 15:26:22 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 13:26:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[6389] csw/mgar/pkg/x11 Message-ID: Revision: 6389 http://gar.svn.sourceforge.net/gar/?rev=6389&view=rev Author: dmichelsen Date: 2009-09-22 13:26:21 +0000 (Tue, 22 Sep 2009) Log Message: ----------- libxaw: Initial commit Modified Paths: -------------- csw/mgar/pkg/x11/libxaw/trunk/Makefile csw/mgar/pkg/x11/libxaw/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/libxaw/ Modified: csw/mgar/pkg/x11/libxaw/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libsm/trunk/Makefile 2009-09-22 09:53:16 UTC (rev 6380) +++ csw/mgar/pkg/x11/libxaw/trunk/Makefile 2009-09-22 13:26:21 UTC (rev 6389) @@ -1,37 +1,36 @@ -GARNAME = libsm -GARVERSION = 1.1.1 +GARNAME = libxaw +GARVERSION = 1.0.6 CATEGORIES = x11 -DESCRIPTION = X11 Session Management library +DESCRIPTION = X Athena Widgets define BLURB - This package provides the main interface to the X11 Session Management - library, which allows for applications to both manage sessions, and make - use of session managers to save and restore their state for later use. + Xaw is a widget set based on the X Toolkit Intrinsics (Xt) Library. endef MASTER_SITES = $(X11_LIB_MASTER_SITE) -DISTNAME = libSM-$(GARVERSION) +DISTNAME = libXaw-$(GARVERSION) 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 -PREREQUISITE_PKGS = CSWlibicedevel -REQUIRED_PKGS = CSWlibice +# xproto x11 xext xextproto xt xmu xpm +#PREREQUISITE_PKGS = CSWlibicedevel +#REQUIRED_PKGS = CSWlibice -PACKAGES = CSWlibsm CSWlibsmdevel +PACKAGES = CSWlibxaw CSWlibxawdevel -CATALOGNAME_CSWlibsm = libsm -CATALOGNAME_CSWlibsmdevel = libsm_devel +CATALOGNAME_CSWlibxaw = libxaw +CATALOGNAME_CSWlibxawdevel = libxaw_devel -SPKG_DESC_CSWlibsm = X11 Session Management library -SPKG_DESC_CSWlibsmdevel = X11 Session Management library development files +SPKG_DESC_CSWlibxaw = X Athena Widgets +SPKG_DESC_CSWlibxawdevel = X Athena Widgets development files BUILD64 = 1 NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) -PKGFILES_CSWlibsmdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibxawdevel = $(PKGFILES_DEVEL) include gar/category.mk Modified: csw/mgar/pkg/x11/libxaw/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libsm/trunk/checksums 2009-09-22 09:53:16 UTC (rev 6380) +++ csw/mgar/pkg/x11/libxaw/trunk/checksums 2009-09-22 13:26:21 UTC (rev 6389) @@ -1 +1 @@ -6889a455496aaaa65b1fa05fc518d179 download/libSM-1.1.1.tar.bz2 +066218dceb82eb8da0e11d259ed3ceda download/libXaw-1.0.6.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 Sep 22 15:26:56 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 13:26:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[6390] csw/mgar/pkg/x11 Message-ID: Revision: 6390 http://gar.svn.sourceforge.net/gar/?rev=6390&view=rev Author: dmichelsen Date: 2009-09-22 13:26:55 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libxi: Initial commit Modified Paths: -------------- csw/mgar/pkg/x11/libxi/trunk/Makefile csw/mgar/pkg/x11/libxi/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/libxi/ Modified: csw/mgar/pkg/x11/libxi/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxtst/trunk/Makefile 2009-09-17 13:43:50 UTC (rev 6334) +++ csw/mgar/pkg/x11/libxi/trunk/Makefile 2009-09-22 13:26:55 UTC (rev 6390) @@ -1,23 +1,18 @@ -GARNAME = libxtst -GARVERSION = 1.0.99.2 +GARNAME = libxi +GARVERSION = 1.2.99.4 CATEGORIES = x11 -DESCRIPTION = +DESCRIPTION = Client library for XInput define BLURB - Long description endef MASTER_SITES = $(X11_LIB_MASTER_SITE) -DISTNAME = libXtst-$(GARVERSION) +DISTNAME = libXi-$(GARVERSION) 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.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 NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/x11/libxi/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxtst/trunk/checksums 2009-09-17 13:43:50 UTC (rev 6334) +++ csw/mgar/pkg/x11/libxi/trunk/checksums 2009-09-22 13:26:55 UTC (rev 6390) @@ -1 +1 @@ -b5edc35ca9b9ba4133a3fa34cb1b00f8 download/libXtst-1.0.99.2.tar.bz2 +0f3e9002b5797b01c84c302cb124dc55 download/libXi-1.2.99.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 Tue Sep 22 15:28:49 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 13:28:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[6391] csw/mgar/pkg/x11 Message-ID: Revision: 6391 http://gar.svn.sourceforge.net/gar/?rev=6391&view=rev Author: dmichelsen Date: 2009-09-22 13:28:49 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libxpm: Initial commit Modified Paths: -------------- csw/mgar/pkg/x11/libxpm/trunk/Makefile csw/mgar/pkg/x11/libxpm/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/libxpm/ Modified: csw/mgar/pkg/x11/libxpm/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxaw/trunk/Makefile 2009-09-22 13:26:21 UTC (rev 6389) +++ csw/mgar/pkg/x11/libxpm/trunk/Makefile 2009-09-22 13:28:49 UTC (rev 6391) @@ -1,36 +1,66 @@ -GARNAME = libxaw -GARVERSION = 1.0.6 +GARNAME = libxpm +GARVERSION = 3.5.7 CATEGORIES = x11 -DESCRIPTION = X Athena Widgets +DESCRIPTION = X11 pixmap library define BLURB - Xaw is a widget set based on the X Toolkit Intrinsics (Xt) Library. + LibXpm provides support and common operation for the XPM pixmap format, + which is commonly used in legacy X applications. XPM is an extension of + the monochrome XBM bitmap. endef MASTER_SITES = $(X11_LIB_MASTER_SITE) -DISTNAME = libXaw-$(GARVERSION) +DISTNAME = libXpm-$(GARVERSION) 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 -# xproto x11 xext xextproto xt xmu xpm -#PREREQUISITE_PKGS = CSWlibicedevel -#REQUIRED_PKGS = CSWlibice +# CSWxpm is the legacy library +PACKAGES = CSWlibxpm CSWlibxpmdevel CSWxpm -PACKAGES = CSWlibxaw CSWlibxawdevel +CATALOGNAME_CSWlibxpm = libxpm +CATALOGNAME_CSWlibxpmdevel = libxpm_devel -CATALOGNAME_CSWlibxaw = libxaw -CATALOGNAME_CSWlibxawdevel = libxaw_devel +SPKG_DESC_CSWlibxpm = X11 pixmap library +SPKG_DESC_CSWlibxpmdevel = X11 pixmap library development files -SPKG_DESC_CSWlibxaw = X Athena Widgets -SPKG_DESC_CSWlibxawdevel = X Athena Widgets development files +REQUIRED_PKGS_CSWlibxpm = CSWlibice CSWlibsm CSWlibx11 CSWlibxext CSWlibxt +REQUIRED_PKGS_CSWlibxpmdevel = CSWlibxpm +REQUIRED_PKGS_CSWxpm = CSWlibxpm +PKGFILES_CSWlibxpmdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWxpm = /opt/csw/bin/.* +PKGFILES_CSWxpm += /opt/csw/lib/.* + BUILD64 = 1 -NOISALIST = 1 - +NO_ISAEXEC = 1 +EXTRA_BUILD_ISAS = sparcv8plus+vis CONFIGURE_ARGS = $(DIRPATHS) -PKGFILES_CSWlibxawdevel = $(PKGFILES_DEVEL) +# We don't want optimized binaries, optimized libs are sufficient + MERGE_DIRS_isa-sparcv9 = $(libdir) +MERGE_DIRS_isa-sparcv8plus+vis = $(libdir) + MERGE_DIRS_isa-amd64 = $(libdir) include gar/category.mk + +post-merge: +ifeq ($(GARCH),sparc) + @ginstall -d $(PKGROOT)/opt/csw/lib/sparcv8plus+vis + ln -s ../../X11/lib/sparcv8plus+vis/libXpm.so.4.11 $(PKGROOT)/opt/csw/lib/sparcv8plus+vis + ln -s ../../X11/lib/sparcv8plus+vis/libXpm.so.4 $(PKGROOT)/opt/csw/lib/sparcv8plus+vis + ln -s ../../X11/lib/sparcv8plus+vis/libXpm.so $(PKGROOT)/opt/csw/lib/sparcv8plus+vis + @ginstall -d $(PKGROOT)/opt/csw/lib/sparcv9 + ln -s ../../X11/lib/sparcv9/libXpm.so.4.11 $(PKGROOT)/opt/csw/lib/sparcv9 + ln -s ../../X11/lib/sparcv9/libXpm.so.4 $(PKGROOT)/opt/csw/lib/sparcv9 + ln -s ../../X11/lib/sparcv9/libXpm.so $(PKGROOT)/opt/csw/lib/sparcv9 +endif + @ginstall -d $(PKGROOT)/opt/csw/lib + ln -s ../X11/lib/libXpm.so.4.11 $(PKGROOT)/opt/csw/lib + ln -s ../X11/lib/libXpm.so.4 $(PKGROOT)/opt/csw/lib + ln -s ../X11/lib/libXpm.so $(PKGROOT)/opt/csw/lib + @ginstall -d $(PKGROOT)/opt/csw/bin + ln -s ../X11/bin/sxpm $(PKGROOT)/opt/csw/bin + ln -s ../X11/bin/cxpm $(PKGROOT)/opt/csw/bin + @$(MAKECOOKIE) Modified: csw/mgar/pkg/x11/libxpm/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxaw/trunk/checksums 2009-09-22 13:26:21 UTC (rev 6389) +++ csw/mgar/pkg/x11/libxpm/trunk/checksums 2009-09-22 13:28:49 UTC (rev 6391) @@ -1 +1 @@ -066218dceb82eb8da0e11d259ed3ceda download/libXaw-1.0.6.tar.bz2 +cd15ee542d9f515538b4462a6f79d977 download/libXpm-3.5.7.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Sep 22 15:47:10 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 22 Sep 2009 13:47:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[6392] csw/mgar/pkg/cups/branches/cups-1.4 Message-ID: Revision: 6392 http://gar.svn.sourceforge.net/gar/?rev=6392&view=rev Author: wahwah Date: 2009-09-22 13:47:10 +0000 (Tue, 22 Sep 2009) Log Message: ----------- cups: A more generic preinstall script Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4/checksums csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.preinstall csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.preinstall Modified: csw/mgar/pkg/cups/branches/cups-1.4/checksums =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-09-22 13:28:49 UTC (rev 6391) +++ csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-09-22 13:47:10 UTC (rev 6392) @@ -1,7 +1,7 @@ 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 -8418cf872043eada2d46c8db6e6451c0 download/CSWcupsclient.preinstall +dec0baa8c3ec0e171183496da8f24323 download/CSWcupsclient.preinstall ca7718998e56c320c08a77cfefe046f6 download/CSWcupsd.postremove -8418cf872043eada2d46c8db6e6451c0 download/CSWcupsd.preinstall +dec0baa8c3ec0e171183496da8f24323 download/CSWcupsd.preinstall bc5e777d4320cecdd1a64de8035171a8 download/cups-1.4.0-source.tar.bz2 Modified: csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.preinstall =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.preinstall 2009-09-22 13:28:49 UTC (rev 6391) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.preinstall 2009-09-22 13:47:10 UTC (rev 6392) @@ -4,31 +4,37 @@ # $Id$ # +obsolete_directories="/opt/csw/etc/cups:/etc/opt/csw/cups" + obsolete_dir_information=" -This configuration directory is obsolete. Current CUPS package is using the -/etc/opt/csw/cups directory. Files in this directory are going to be ignored. -Please move your configuration to /etc/opt/csw/cups. +This directory is obsolete. Files in this directory are going to be ignored. +Please move your data to the new location. Feel free to remove this file afterwards. " obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE" -if [ -d "${PKG_INSTALL_ROOT}/opt/csw/etc/cups" ]; then - echo - echo "*******************************************************************" - echo "* The old configuration directory /opt/csw/etc/cups still exists. *" - echo "* Please move your configuration to /etc/opt/csw/cups. *" - echo "* *" - echo "* Installation will continue in 10 seconds. *" - echo "* Press CTRL+C if you want to stop now. *" - echo "*******************************************************************" - echo - sleep 10 - - # Leaving a note for the sysadmin if the they proceed with the installation. - fn="${PKG_INSTALL_ROOT}/opt/csw/etc/cups/${obsolete_dir_file_name}" - if touch "${fn}" 2>/dev/null; then - echo "${obsolete_dir_information}" > "${fn}" +for dirpair in ${obsolete_directories}; do + obsolete_dir=`echo ${dirpair} | cut -d: -f1` + new_dir=`echo ${dirpair} | cut -d: -f2` + if [ -d "${PKG_INSTALL_ROOT}${obsolete_dir}" ]; then + echo + echo "*******************************************************************" + echo "* The old configuration directory ${obsolete_dir} still exists. " + echo "* Please move your configuration to ${new_dir}. " + echo "* " + echo "* Installation will continue in 10 seconds. " + echo "* Press CTRL+C if you want to stop now. " + echo "*******************************************************************" + echo + sleep 10 + + # Leaving a note for the sysadmin if the they proceed with the installation. + fn="${PKG_INSTALL_ROOT}${obsolete_dir}/${obsolete_dir_file_name}" + if touch "${fn}" 2>/dev/null; then + echo "${obsolete_dir_information}" > "${fn}" + fi fi - exit 0 -fi +done + +exit 0 Modified: csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.preinstall =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.preinstall 2009-09-22 13:28:49 UTC (rev 6391) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.preinstall 2009-09-22 13:47:10 UTC (rev 6392) @@ -4,31 +4,37 @@ # $Id$ # +obsolete_directories="/opt/csw/etc/cups:/etc/opt/csw/cups" + obsolete_dir_information=" -This configuration directory is obsolete. Current CUPS package is using the -/etc/opt/csw/cups directory. Files in this directory are going to be ignored. -Please move your configuration to /etc/opt/csw/cups. +This directory is obsolete. Files in this directory are going to be ignored. +Please move your data to the new location. Feel free to remove this file afterwards. " obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE" -if [ -d "${PKG_INSTALL_ROOT}/opt/csw/etc/cups" ]; then - echo - echo "*******************************************************************" - echo "* The old configuration directory /opt/csw/etc/cups still exists. *" - echo "* Please move your configuration to /etc/opt/csw/cups. *" - echo "* *" - echo "* Installation will continue in 10 seconds. *" - echo "* Press CTRL+C if you want to stop now. *" - echo "*******************************************************************" - echo - sleep 10 - - # Leaving a note for the sysadmin if the they proceed with the installation. - fn="${PKG_INSTALL_ROOT}/opt/csw/etc/cups/${obsolete_dir_file_name}" - if touch "${fn}" 2>/dev/null; then - echo "${obsolete_dir_information}" > "${fn}" +for dirpair in ${obsolete_directories}; do + obsolete_dir=`echo ${dirpair} | cut -d: -f1` + new_dir=`echo ${dirpair} | cut -d: -f2` + if [ -d "${PKG_INSTALL_ROOT}${obsolete_dir}" ]; then + echo + echo "*******************************************************************" + echo "* The old configuration directory ${obsolete_dir} still exists. " + echo "* Please move your configuration to ${new_dir}. " + echo "* " + echo "* Installation will continue in 10 seconds. " + echo "* Press CTRL+C if you want to stop now. " + echo "*******************************************************************" + echo + sleep 10 + + # Leaving a note for the sysadmin if the they proceed with the installation. + fn="${PKG_INSTALL_ROOT}${obsolete_dir}/${obsolete_dir_file_name}" + if touch "${fn}" 2>/dev/null; then + echo "${obsolete_dir_information}" > "${fn}" + fi fi - exit 0 -fi +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 Tue Sep 22 15:55:59 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 13:55:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6393] csw/mgar/pkg/x11/libxaw/trunk/Makefile Message-ID: Revision: 6393 http://gar.svn.sourceforge.net/gar/?rev=6393&view=rev Author: dmichelsen Date: 2009-09-22 13:55:59 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libxaw: Fix requirements Modified Paths: -------------- csw/mgar/pkg/x11/libxaw/trunk/Makefile Modified: csw/mgar/pkg/x11/libxaw/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxaw/trunk/Makefile 2009-09-22 13:47:10 UTC (rev 6392) +++ csw/mgar/pkg/x11/libxaw/trunk/Makefile 2009-09-22 13:55:59 UTC (rev 6393) @@ -15,8 +15,7 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 # xproto x11 xext xextproto xt xmu xpm -#PREREQUISITE_PKGS = CSWlibicedevel -#REQUIRED_PKGS = CSWlibice +PREREQUISITE_PKGS = CSWlibxpmdevel PACKAGES = CSWlibxaw CSWlibxawdevel @@ -26,9 +25,11 @@ SPKG_DESC_CSWlibxaw = X Athena Widgets SPKG_DESC_CSWlibxawdevel = X Athena Widgets development files +REQUIRED_PKGS_CSWlibxaw = CSWlibice CSWlibsm CSWlibx11 CSWlibxext CSWlibxmu CSWlibxt +REQUIRED_PKGS_CSWlibxawdevel = CSWlibxpm + BUILD64 = 1 NOISALIST = 1 - CONFIGURE_ARGS = $(DIRPATHS) PKGFILES_CSWlibxawdevel = $(PKGFILES_DEVEL) 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 Sep 22 16:49:21 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 14:49:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[6394] csw/mgar/pkg/x11/libxi/trunk Message-ID: Revision: 6394 http://gar.svn.sourceforge.net/gar/?rev=6394&view=rev Author: dmichelsen Date: 2009-09-22 14:49:21 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libxi: Split off devel Modified Paths: -------------- csw/mgar/pkg/x11/libxi/trunk/Makefile csw/mgar/pkg/x11/libxi/trunk/checksums Modified: csw/mgar/pkg/x11/libxi/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxi/trunk/Makefile 2009-09-22 13:55:59 UTC (rev 6393) +++ csw/mgar/pkg/x11/libxi/trunk/Makefile 2009-09-22 14:49:21 UTC (rev 6394) @@ -1,5 +1,5 @@ GARNAME = libxi -GARVERSION = 1.2.99.4 +GARVERSION = 1.2.1 CATEGORIES = x11 DESCRIPTION = Client library for XInput @@ -13,8 +13,23 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +#PREREQUISITE_PKGS = CSWlibxpmdevel + +PACKAGES = CSWlibxi CSWlibxidevel + +CATALOGNAME_CSWlibxi = libxii +CATALOGNAME_CSWlibxidevel = libxi_devel + +SPKG_DESC_CSWlibxi = Client library for XInput +SPKG_DESC_CSWlibxi = Client library for XInput development files + +#REQUIRED_PKGS_CSWlibxi = +REQUIRED_PKGS_CSWlibxidevel = CSWlibxi + BUILD64 = 1 NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) +PKGFILES_CSWlibxidevel = $(PKGFILES_DEVEL) + include gar/category.mk Modified: csw/mgar/pkg/x11/libxi/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxi/trunk/checksums 2009-09-22 13:55:59 UTC (rev 6393) +++ csw/mgar/pkg/x11/libxi/trunk/checksums 2009-09-22 14:49:21 UTC (rev 6394) @@ -1 +1 @@ -0f3e9002b5797b01c84c302cb124dc55 download/libXi-1.2.99.4.tar.bz2 +cfb36307e8e7ffafe40848dba24e0b11 download/libXi-1.2.1.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 Sep 22 16:50:46 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 14:50:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6395] csw/mgar/pkg/x11/libxi/trunk/Makefile Message-ID: Revision: 6395 http://gar.svn.sourceforge.net/gar/?rev=6395&view=rev Author: dmichelsen Date: 2009-09-22 14:50:46 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libxi: Fix typo Modified Paths: -------------- csw/mgar/pkg/x11/libxi/trunk/Makefile Modified: csw/mgar/pkg/x11/libxi/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxi/trunk/Makefile 2009-09-22 14:49:21 UTC (rev 6394) +++ csw/mgar/pkg/x11/libxi/trunk/Makefile 2009-09-22 14:50:46 UTC (rev 6395) @@ -17,7 +17,7 @@ PACKAGES = CSWlibxi CSWlibxidevel -CATALOGNAME_CSWlibxi = libxii +CATALOGNAME_CSWlibxi = libxi CATALOGNAME_CSWlibxidevel = libxi_devel SPKG_DESC_CSWlibxi = Client library for XInput 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 Sep 22 16:56:02 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 14:56:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[6396] csw/mgar/pkg/x11 Message-ID: Revision: 6396 http://gar.svn.sourceforge.net/gar/?rev=6396&view=rev Author: dmichelsen Date: 2009-09-22 14:56:02 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/recordproto: Initial commit Modified Paths: -------------- csw/mgar/pkg/x11/recordproto/trunk/Makefile csw/mgar/pkg/x11/recordproto/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/recordproto/ Modified: csw/mgar/pkg/x11/recordproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/renderproto/trunk/Makefile 2009-09-22 13:55:59 UTC (rev 6393) +++ csw/mgar/pkg/x11/recordproto/trunk/Makefile 2009-09-22 14:56:02 UTC (rev 6396) @@ -1,15 +1,14 @@ -GARNAME = renderproto -GARVERSION = 0.9.3 - +GARNAME = recordproto +GARVERSION = 1.13.2 CATEGORIES = x11 -DESCRIPTION = Render extension headers from modular X.org +DESCRIPTION = Record extension headers define BLURB - This provides the Render extension headers from modular X.org X11 project. + Record extension headers endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +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.gz Modified: csw/mgar/pkg/x11/recordproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/renderproto/trunk/checksums 2009-09-22 13:55:59 UTC (rev 6393) +++ csw/mgar/pkg/x11/recordproto/trunk/checksums 2009-09-22 14:56:02 UTC (rev 6396) @@ -1 +1 @@ -ab8f3e356973d9c99810a8f092db3a2e download/renderproto-0.9.3.tar.gz +0ed4706564a34fc2aff724aa16d3ff00 download/recordproto-1.13.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 Tue Sep 22 17:06:19 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 15:06:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[6397] csw/mgar/pkg/x11/libxtst/trunk Message-ID: Revision: 6397 http://gar.svn.sourceforge.net/gar/?rev=6397&view=rev Author: dmichelsen Date: 2009-09-22 15:06:19 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libxtst: Split off devel Modified Paths: -------------- csw/mgar/pkg/x11/libxtst/trunk/Makefile csw/mgar/pkg/x11/libxtst/trunk/checksums Modified: csw/mgar/pkg/x11/libxtst/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxtst/trunk/Makefile 2009-09-22 14:56:02 UTC (rev 6396) +++ csw/mgar/pkg/x11/libxtst/trunk/Makefile 2009-09-22 15:06:19 UTC (rev 6397) @@ -1,10 +1,10 @@ GARNAME = libxtst -GARVERSION = 1.0.99.2 +GARVERSION = 1.0.3 CATEGORIES = x11 -DESCRIPTION = +DESCRIPTION = The Xtst Library define BLURB - Long description + The Xtst Library endef MASTER_SITES = $(X11_LIB_MASTER_SITE) @@ -14,12 +14,20 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = +PACKAGES = CSWlibxtst CSWlibxtstdevel +CATALOGNAME_CSWlibxtst = libxtst +CATALOGNAME_CSWlibxtstdevel = libxtst_devel + +SPKG_DESC_CSWlibxtst = The Xtst Library +SPKG_DESC_CSWlibxtstdevel = The Xtst Library development files + +REQUIRED_PKGS_CSWlibxtstdevel = CSWlibxtst + BUILD64 = 1 NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) +PKGFILES_CSWlibxtstdevel = $(PKGFILES_DEVEL) + include gar/category.mk Modified: csw/mgar/pkg/x11/libxtst/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxtst/trunk/checksums 2009-09-22 14:56:02 UTC (rev 6396) +++ csw/mgar/pkg/x11/libxtst/trunk/checksums 2009-09-22 15:06:19 UTC (rev 6397) @@ -1 +1 @@ -b5edc35ca9b9ba4133a3fa34cb1b00f8 download/libXtst-1.0.99.2.tar.bz2 +090c1ad04e34982eada5cf3b1a0792fd download/libXtst-1.0.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 Tue Sep 22 17:10:30 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 15:10:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[6398] csw/mgar/pkg/x11 Message-ID: Revision: 6398 http://gar.svn.sourceforge.net/gar/?rev=6398&view=rev Author: dmichelsen Date: 2009-09-22 15:10:30 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/videoproto: Initial commit Modified Paths: -------------- csw/mgar/pkg/x11/videoproto/trunk/Makefile csw/mgar/pkg/x11/videoproto/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/videoproto/ Modified: csw/mgar/pkg/x11/videoproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/renderproto/trunk/Makefile 2009-09-22 13:55:59 UTC (rev 6393) +++ csw/mgar/pkg/x11/videoproto/trunk/Makefile 2009-09-22 15:10:30 UTC (rev 6398) @@ -1,11 +1,10 @@ -GARNAME = renderproto -GARVERSION = 0.9.3 - +GARNAME = videoproto +GARVERSION = 2.3.0 CATEGORIES = x11 -DESCRIPTION = Render extension headers from modular X.org +DESCRIPTION = Video extension headers define BLURB - This provides the Render extension headers from modular X.org X11 project. + Video extension headers endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) Modified: csw/mgar/pkg/x11/videoproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/renderproto/trunk/checksums 2009-09-22 13:55:59 UTC (rev 6393) +++ csw/mgar/pkg/x11/videoproto/trunk/checksums 2009-09-22 15:10:30 UTC (rev 6398) @@ -1 +1 @@ -ab8f3e356973d9c99810a8f092db3a2e download/renderproto-0.9.3.tar.gz +888543493cd69c6c78002ac59c3f077f download/videoproto-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 Tue Sep 22 17:17:02 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 15:17:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[6399] csw/mgar/pkg/x11 Message-ID: Revision: 6399 http://gar.svn.sourceforge.net/gar/?rev=6399&view=rev Author: dmichelsen Date: 2009-09-22 15:17:02 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libxv: Initial commit Modified Paths: -------------- csw/mgar/pkg/x11/libxv/trunk/Makefile csw/mgar/pkg/x11/libxv/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/libxv/ Modified: csw/mgar/pkg/x11/libxv/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxt/trunk/Makefile 2009-09-22 13:55:59 UTC (rev 6393) +++ csw/mgar/pkg/x11/libxv/trunk/Makefile 2009-09-22 15:17:02 UTC (rev 6399) @@ -1,34 +1,33 @@ -GARNAME = libxt -GARVERSION = 1.0.6 +GARNAME = libxv +GARVERSION = 1.0.4 CATEGORIES = x11 -DESCRIPTION = X11 toolkit intrinsics library +DESCRIPTION = The Xv Library define BLURB - LibXt provides the X Toolkit Intrinsics, an abstract widget library - upon which other toolkits are based. Xt is the basis for many toolkits, - including the Athena widgets (Xaw), and LessTif. + The Xv Library endef MASTER_SITES = $(X11_LIB_MASTER_SITE) -DISTNAME = libXt-$(GARVERSION) +DISTNAME = libXv-$(GARVERSION) 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 -PREREQUISITE_PKGS = CSWlibsmdevel +PREREQUISITE_PKGS = CSWvideoproto -PACKAGES = CSWlibxt CSWlibxtdevel +PACKAGES = CSWlibxv CSWlibxvdevel -CATALOGNAME_CSWlibxt = libxt -CATALOGNAME_CSWlibxtdevel = libxt_devel +CATALOGNAME_CSWlibxv = libxv +CATALOGNAME_CSWlibxvdevel = libxv_devel -SPKG_DESC_CSWlibxt = X11 toolkit intrinsics library -SPKG_DESC_CSWlibxtdevel = X11 toolkit intrinsics library development files +SPKG_DESC_CSWlibxv = The Xv Library +SPKG_DESC_CSWlibxvdevel = The Xv Library development files -REQUIRED_PKGS_CSWlibxtdevel = CSWlibxt +REQUIRED_PKGS_CSWlibxv = CSWlibx11 CSWlibxext +REQUIRED_PKGS_CSWlibxvdevel = CSWlibxv -PKGFILES_CSWlibxtdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibxvdevel = $(PKGFILES_DEVEL) BUILD64 = 1 NOISALIST = 1 Modified: csw/mgar/pkg/x11/libxv/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxt/trunk/checksums 2009-09-22 13:55:59 UTC (rev 6393) +++ csw/mgar/pkg/x11/libxv/trunk/checksums 2009-09-22 15:17:02 UTC (rev 6399) @@ -1 +1 @@ -953930ddf9fdaa1405732c7f01e9e599 download/libXt-1.0.6.tar.bz2 +723a0275227165383e967a1ca8899b52 download/libXv-1.0.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 Tue Sep 22 17:17:15 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 15:17:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[6400] csw/mgar/pkg/x11 Message-ID: Revision: 6400 http://gar.svn.sourceforge.net/gar/?rev=6400&view=rev Author: dmichelsen Date: 2009-09-22 15:17:15 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/glproto: Initial commit Modified Paths: -------------- csw/mgar/pkg/x11/glproto/trunk/Makefile csw/mgar/pkg/x11/glproto/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/glproto/ Modified: csw/mgar/pkg/x11/glproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/videoproto/trunk/Makefile 2009-09-22 15:10:30 UTC (rev 6398) +++ csw/mgar/pkg/x11/glproto/trunk/Makefile 2009-09-22 15:17:15 UTC (rev 6400) @@ -1,14 +1,14 @@ -GARNAME = videoproto -GARVERSION = 2.3.0 +GARNAME = glproto +GARVERSION = 1.4.10 CATEGORIES = x11 -DESCRIPTION = Video extension headers +DESCRIPTION = GL extension headers define BLURB - Video extension headers + GL extension headers endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +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.gz Modified: csw/mgar/pkg/x11/glproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/videoproto/trunk/checksums 2009-09-22 15:10:30 UTC (rev 6398) +++ csw/mgar/pkg/x11/glproto/trunk/checksums 2009-09-22 15:17:15 UTC (rev 6400) @@ -1 +1 @@ -888543493cd69c6c78002ac59c3f077f download/videoproto-2.3.0.tar.gz +c9f8cebfba72bfab674bc0170551fb8d download/glproto-1.4.10.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Sep 22 17:26:45 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 22 Sep 2009 15:26:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[6401] csw/mgar/pkg/cups/branches/cups-1.4/Makefile Message-ID: Revision: 6401 http://gar.svn.sourceforge.net/gar/?rev=6401&view=rev Author: wahwah Date: 2009-09-22 15:26:45 +0000 (Tue, 22 Sep 2009) Log Message: ----------- cups-1.4: CSWcups doesn't need CSWcupsdev or CSWcupsdoc Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4/Makefile Modified: csw/mgar/pkg/cups/branches/cups-1.4/Makefile =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-22 15:17:15 UTC (rev 6400) +++ csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-22 15:26:45 UTC (rev 6401) @@ -53,8 +53,7 @@ ARCHALL_CSWcupsdoc = 1 ARCHALL_CSWcupsdev = 1 -REQUIRED_PKGS_CSWcups = CSWcswclassutils CSWcupsd CSWcupsclient CSWcupsdoc -REQUIRED_PKGS_CSWcups += CSWcupsdev +REQUIRED_PKGS_CSWcups = CSWcswclassutils CSWcupsd CSWcupsclient REQUIRED_PKGS_CSWcupsd = CSWcswclassutils CSWlibcups CSWoldaprt CSWzlib REQUIRED_PKGS_CSWcupsd += CSWjpeg CSWpng CSWtiff CSWlibtasn1 REQUIRED_PKGS_CSWcupsd += CSWgcrypt CSWgnutls CSWgpgerr CSWlibdbus 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 Sep 22 17:37:22 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 15:37:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[6402] csw/mgar/pkg/x11 Message-ID: Revision: 6402 http://gar.svn.sourceforge.net/gar/?rev=6402&view=rev Author: dmichelsen Date: 2009-09-22 15:37:21 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libxkbfile: Initial commit Modified Paths: -------------- csw/mgar/pkg/x11/libxkbfile/trunk/Makefile csw/mgar/pkg/x11/libxkbfile/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/libxkbfile/ Modified: csw/mgar/pkg/x11/libxkbfile/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxaw/trunk/Makefile 2009-09-22 13:55:59 UTC (rev 6393) +++ csw/mgar/pkg/x11/libxkbfile/trunk/Makefile 2009-09-22 15:37:21 UTC (rev 6402) @@ -1,37 +1,34 @@ -GARNAME = libxaw -GARVERSION = 1.0.6 +GARNAME = libxkbfile +GARVERSION = 1.0.5 CATEGORIES = x11 -DESCRIPTION = X Athena Widgets +DESCRIPTION = X11 keyboard file manipulation library define BLURB - Xaw is a widget set based on the X Toolkit Intrinsics (Xt) Library. + Libxkbfile provides an interface to read and manipulate description + files for XKB, the X11 keyboard configuration extension. endef MASTER_SITES = $(X11_LIB_MASTER_SITE) -DISTNAME = libXaw-$(GARVERSION) 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 -# xproto x11 xext xextproto xt xmu xpm -PREREQUISITE_PKGS = CSWlibxpmdevel +PACKAGES = CSWlibxkbfile CSWlibxkbfiledevel -PACKAGES = CSWlibxaw CSWlibxawdevel +CATALOGNAME_CSWlibxkbfile = libxkfileb +CATALOGNAME_CSWlibxkbfiledevel = libxkbfile_devel -CATALOGNAME_CSWlibxaw = libxaw -CATALOGNAME_CSWlibxawdevel = libxaw_devel +SPKG_DESC_CSWlibxkbfile = X11 keyboard file manipulation library +SPKG_DESC_CSWlibxkbfiledevel = X11 keyboard file manipulation library development files -SPKG_DESC_CSWlibxaw = X Athena Widgets -SPKG_DESC_CSWlibxawdevel = X Athena Widgets development files +REQUIRED_PKGS_CSWlibxkbfile = CSWlibx11 +REQUIRED_PKGS_CSWlibxkbfiledevel = CSWlibxkbfile -REQUIRED_PKGS_CSWlibxaw = CSWlibice CSWlibsm CSWlibx11 CSWlibxext CSWlibxmu CSWlibxt -REQUIRED_PKGS_CSWlibxawdevel = CSWlibxpm - BUILD64 = 1 NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) -PKGFILES_CSWlibxawdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibxkbfiledevel = $(PKGFILES_DEVEL) include gar/category.mk Modified: csw/mgar/pkg/x11/libxkbfile/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxaw/trunk/checksums 2009-09-22 13:55:59 UTC (rev 6393) +++ csw/mgar/pkg/x11/libxkbfile/trunk/checksums 2009-09-22 15:37:21 UTC (rev 6402) @@ -1 +1 @@ -066218dceb82eb8da0e11d259ed3ceda download/libXaw-1.0.6.tar.bz2 +0726a845fe5a56551de2718c9f6b0e35 download/libxkbfile-1.0.5.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 Sep 22 17:38:46 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 15:38:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6403] csw/mgar/pkg/x11 Message-ID: Revision: 6403 http://gar.svn.sourceforge.net/gar/?rev=6403&view=rev Author: dmichelsen Date: 2009-09-22 15:38:46 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libxkbui: Initial commit Modified Paths: -------------- csw/mgar/pkg/x11/libxkbui/trunk/Makefile csw/mgar/pkg/x11/libxkbui/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/libxkbui/ Modified: csw/mgar/pkg/x11/libxkbui/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxkbfile/trunk/Makefile 2009-09-22 15:37:21 UTC (rev 6402) +++ csw/mgar/pkg/x11/libxkbui/trunk/Makefile 2009-09-22 15:38:46 UTC (rev 6403) @@ -1,11 +1,10 @@ -GARNAME = libxkbfile -GARVERSION = 1.0.5 +GARNAME = libxkbui +GARVERSION = 1.0.2 CATEGORIES = x11 -DESCRIPTION = X11 keyboard file manipulation library +DESCRIPTION = X11 keyboard UI presentation library define BLURB - Libxkbfile provides an interface to read and manipulate description - files for XKB, the X11 keyboard configuration extension. + X11 keyboard UI presentation library endef MASTER_SITES = $(X11_LIB_MASTER_SITE) @@ -14,21 +13,22 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -PACKAGES = CSWlibxkbfile CSWlibxkbfiledevel +PREREQUISUITE_PKGS = CSWlibxkbfiledevel -CATALOGNAME_CSWlibxkbfile = libxkfileb -CATALOGNAME_CSWlibxkbfiledevel = libxkbfile_devel +PACKAGES = CSWlibxkbui CSWlibxkbui -SPKG_DESC_CSWlibxkbfile = X11 keyboard file manipulation library -SPKG_DESC_CSWlibxkbfiledevel = X11 keyboard file manipulation library development files +CATALOGNAME_CSWlibxkbui = libxkbui +CATALOGNAME_CSWlibxkbuidevel = libxkbui_devel -REQUIRED_PKGS_CSWlibxkbfile = CSWlibx11 -REQUIRED_PKGS_CSWlibxkbfiledevel = CSWlibxkbfile +SPKG_DESC_CSWlibxkbui = X11 keyboard UI presentation library +SPKG_DESC_CSWlibxkbuidevel = X11 keyboard UI presentation library development files +REQUIRED_PKGS_CSWlibxkbuidevel = CSWlibxkbui + BUILD64 = 1 NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) -PKGFILES_CSWlibxkbfiledevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibxkbuidevel = $(PKGFILES_DEVEL) include gar/category.mk Modified: csw/mgar/pkg/x11/libxkbui/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxkbfile/trunk/checksums 2009-09-22 15:37:21 UTC (rev 6402) +++ csw/mgar/pkg/x11/libxkbui/trunk/checksums 2009-09-22 15:38:46 UTC (rev 6403) @@ -1 +1 @@ -0726a845fe5a56551de2718c9f6b0e35 download/libxkbfile-1.0.5.tar.bz2 +1143e456f7429e18e88f2eadb2f2b6b1 download/libxkbui-1.0.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 Tue Sep 22 17:39:59 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 15:39:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6404] csw/mgar/pkg/x11/libxkbfile/trunk/Makefile Message-ID: Revision: 6404 http://gar.svn.sourceforge.net/gar/?rev=6404&view=rev Author: dmichelsen Date: 2009-09-22 15:39:55 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libxkbfile: Fix typo Modified Paths: -------------- csw/mgar/pkg/x11/libxkbfile/trunk/Makefile Modified: csw/mgar/pkg/x11/libxkbfile/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxkbfile/trunk/Makefile 2009-09-22 15:38:46 UTC (rev 6403) +++ csw/mgar/pkg/x11/libxkbfile/trunk/Makefile 2009-09-22 15:39:55 UTC (rev 6404) @@ -16,7 +16,7 @@ PACKAGES = CSWlibxkbfile CSWlibxkbfiledevel -CATALOGNAME_CSWlibxkbfile = libxkfileb +CATALOGNAME_CSWlibxkbfile = libxkbfile CATALOGNAME_CSWlibxkbfiledevel = libxkbfile_devel SPKG_DESC_CSWlibxkbfile = X11 keyboard file manipulation library 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 Sep 22 17:53:05 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 15:53:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6405] csw/mgar/pkg/x11/libxkbui/trunk/Makefile Message-ID: Revision: 6405 http://gar.svn.sourceforge.net/gar/?rev=6405&view=rev Author: dmichelsen Date: 2009-09-22 15:53:05 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libxkbui: Add required pkgs Modified Paths: -------------- csw/mgar/pkg/x11/libxkbui/trunk/Makefile Modified: csw/mgar/pkg/x11/libxkbui/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxkbui/trunk/Makefile 2009-09-22 15:39:55 UTC (rev 6404) +++ csw/mgar/pkg/x11/libxkbui/trunk/Makefile 2009-09-22 15:53:05 UTC (rev 6405) @@ -23,6 +23,7 @@ SPKG_DESC_CSWlibxkbui = X11 keyboard UI presentation library SPKG_DESC_CSWlibxkbuidevel = X11 keyboard UI presentation library development files +REQUIRED_PKGS_CSWlibxkbui = CSWlibice CSWlibsm CSWlibx11 CSWlibxkbfile CSWlibxt REQUIRED_PKGS_CSWlibxkbuidevel = CSWlibxkbui BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Sep 22 22:17:45 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 22 Sep 2009 20:17:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[6406] csw/mgar/pkg/mysql5/branches/mysql-5.0.x Message-ID: Revision: 6406 http://gar.svn.sourceforge.net/gar/?rev=6406&view=rev Author: wahwah Date: 2009-09-22 20:17:45 +0000 (Tue, 22 Sep 2009) Log Message: ----------- mysql-5.0.x: Fixed runtime library paths, fixed the quickstart file, added a postinstall file. 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/cswusergroup 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/CSWmysql5.postinstall Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-09-22 15:53:05 UTC (rev 6405) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-09-22 20:17:45 UTC (rev 6406) @@ -95,6 +95,8 @@ DISTFILES = mysql-$(GARVERSION).tar.gz DISTFILES += cswmysql5 quick_start-csw README.CSW DISTFILES += CSWmysql5.preinstall +DISTFILES += CSWmysql5.postinstall +DISTFILES += cswusergroup UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -107,6 +109,7 @@ 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) @@ -139,14 +142,14 @@ post-install-modulated: ginstall -m 755 -d $(DESTDIR)$(localstatedir) - ginstall -m 755 -d $(DESTDIR)$(datadir)/mysql5/doc - ginstall -m 644 $(FILEDIR)/README.CSW $(DESTDIR)$(datadir)/mysql5/doc - ginstall -m 755 -d $(DESTDIR)/opt/csw/share/mysql5/doc - ln -sf ../../../mysql5/share/mysql5/doc/README.CSW \ - $(DESTDIR)/opt/csw/share/mysql5/doc/README.CSW + ginstall -m 755 -d $(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 \ + $(DESTDIR)/opt/csw/share/mysql/doc/README.CSW ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d ginstall -m 755 $(FILEDIR)/cswmysql5 $(DESTDIR)/etc/opt/csw/init.d - ginstall -m 755 $(FILEDIR)/quick_start-csw $(DESTDIR)$(datadir)/mysql5 + ginstall -m 755 $(FILEDIR)/quick_start-csw $(DESTDIR)$(datadir)/mysql ginstall -m 755 -d $(DESTDIR)$(global_sysconfdir)/pkg/CSWmysql5 ginstall -m 644 $(FILEDIR)/cswusergroup \ $(DESTDIR)$(global_sysconfdir)/pkg/CSWmysql5 Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-09-22 15:53:05 UTC (rev 6405) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-09-22 20:17:45 UTC (rev 6406) @@ -2,8 +2,10 @@ 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 fa8f33c812604457f2c0792e875f6967 download/cswmysql5 +67228e1f096fe08a94f4267439a4ec36 download/cswusergroup 671348f1a5b078da9ca76f97e1fda325 download/mysql-5.0.84.tar.gz -1d79b3cfc4f91db05952bf71f0181fe7 download/quick_start-csw +a6560d8d679f3eb3fca2dbace29baa65 download/quick_start-csw Added: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall 2009-09-22 20:17:45 UTC (rev 6406) @@ -0,0 +1,14 @@ +#!/bin/sh +# +# $Id$ +# + +MYSQLDATADIR=/var/opt/csw/mysql5 +if [ ! -d "${MYSQLDATADIR}/mysql" ] ; then + echo "No database directory found in the default location." + 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," + echo " please start mysql manually." + exit 0 +fi Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswusergroup =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswusergroup 2009-09-22 15:53:05 UTC (rev 6405) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswusergroup 2009-09-22 20:17:45 UTC (rev 6406) @@ -1 +1 @@ -mysql:mysql:MySQL database user:/opt/csw/mysql:/bin/false:: +mysql:mysql:MySQL database user:/var/opt/csw/mysql5:/bin/false:: 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-09-22 15:53:05 UTC (rev 6405) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw 2009-09-22 20:17:45 UTC (rev 6406) @@ -12,7 +12,7 @@ MYSQLD_USER=mysql # # Provide a default data directory -MYSQLD_DATADIR=/opt/csw/mysql5/var +MYSQLD_DATADIR=/var/opt/csw/mysql5 # echo echo "This is the blastwave quick start script to setup a MySQL5 database" @@ -108,7 +108,7 @@ # # Update --datadir in the cnf file with the correct value if file was copied if [ x"$CNFCOPIED" = xyes ]; then - sed -e "s|/opt/csw/mysql5/var|$MYSQLD_DATADIR|g" $DEFAULTS_FILE >$DEFAULTS_FILE.new + sed -e "s|/var/opt/csw/mysql5|$MYSQLD_DATADIR|g" $DEFAULTS_FILE >$DEFAULTS_FILE.new mv $DEFAULTS_FILE.new $DEFAULTS_FILE fi @@ -126,7 +126,7 @@ then echo "To start mysqld; run \`svcadm enable cswmysql5\` on Solaris 10 or later" else - echo "To start mysqld; run \`/etc/init.d/cswmysql start\` on Solaris 9 or earlier" + echo "To start mysqld; run \`/etc/opt/csw/init.d/cswmysql start\` on Solaris 9 or earlier" fi 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 Tue Sep 22 22:20:16 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 22 Sep 2009 20:20:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[6407] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums Message-ID: Revision: 6407 http://gar.svn.sourceforge.net/gar/?rev=6407&view=rev Author: wahwah Date: 2009-09-22 20:20:16 +0000 (Tue, 22 Sep 2009) Log Message: ----------- mysql-5.0.x: Updating checksums 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-09-22 20:17:45 UTC (rev 6406) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-09-22 20:20:16 UTC (rev 6407) @@ -8,4 +8,4 @@ fa8f33c812604457f2c0792e875f6967 download/cswmysql5 67228e1f096fe08a94f4267439a4ec36 download/cswusergroup 671348f1a5b078da9ca76f97e1fda325 download/mysql-5.0.84.tar.gz -a6560d8d679f3eb3fca2dbace29baa65 download/quick_start-csw +52ad413f019717b89bd5aa33babdedc3 download/quick_start-csw This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Sep 22 22:26:19 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 22 Sep 2009 20:26:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[6408] csw/mgar/pkg/x11 Message-ID: Revision: 6408 http://gar.svn.sourceforge.net/gar/?rev=6408&view=rev Author: wbonnet Date: 2009-09-22 20:26:18 +0000 (Tue, 22 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/fontsproto/ csw/mgar/pkg/x11/fontsproto/branches/ csw/mgar/pkg/x11/fontsproto/tags/ csw/mgar/pkg/x11/fontsproto/trunk/ csw/mgar/pkg/x11/fontsproto/trunk/Makefile csw/mgar/pkg/x11/fontsproto/trunk/checksums csw/mgar/pkg/x11/fontsproto/trunk/files/ Property changes on: csw/mgar/pkg/x11/fontsproto/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/x11/fontsproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/fontsproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/fontsproto/trunk/Makefile 2009-09-22 20:26:18 UTC (rev 6408) @@ -0,0 +1,22 @@ +GARNAME = fontsproto +GARVERSION = 2.1.0 +CATEGORIES = x11 + +DESCRIPTION = Fonts extension headers +define BLURB + Font-related prototype header files for X11 +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/fontsproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/fontsproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/fontsproto/trunk/checksums 2009-09-22 20:26:18 UTC (rev 6408) @@ -0,0 +1 @@ +6819fc82585daac68cec17938b659bf0 download/fontsproto-2.1.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Sep 22 22:45:01 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 20:45:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[6409] csw/mgar/pkg/x11/libxext/trunk/Makefile Message-ID: Revision: 6409 http://gar.svn.sourceforge.net/gar/?rev=6409&view=rev Author: dmichelsen Date: 2009-09-22 20:45:01 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libxext: Update requirements Modified Paths: -------------- csw/mgar/pkg/x11/libxext/trunk/Makefile Modified: csw/mgar/pkg/x11/libxext/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxext/trunk/Makefile 2009-09-22 20:26:18 UTC (rev 6408) +++ csw/mgar/pkg/x11/libxext/trunk/Makefile 2009-09-22 20:45:01 UTC (rev 6409) @@ -17,8 +17,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PREREQUISITE_PKGS = CSWxextproto -REQUIRED_PKGS = CSWlibx11 +PREREQUISITE_PKGS = CSWxextproto CSWlibx11devel CSWlibxaudevel PACKAGES = CSWlibxext CSWlibxextdevel @@ -28,6 +27,7 @@ SPKG_DESC_CSWlibxext = X11 miscellaneous extensions library SPKG_DESC_CSWlibxextdevel = X11 miscellaneous extensions library development files +REQUIRED_PKGS_CSWlibxext = CSWlibx11 CSWlibxau REQUIRED_PKGS_CSWlibxextdevel = CSWlibxext PKGFILES_CSWlibxextdevel = $(PKGFILES_DEVEL) 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 Sep 22 22:46:01 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 22 Sep 2009 20:46:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[6410] csw/mgar/pkg/mysql5/branches/mysql-5.0.x Message-ID: Revision: 6410 http://gar.svn.sourceforge.net/gar/?rev=6410&view=rev Author: wahwah Date: 2009-09-22 20:46:01 +0000 (Tue, 22 Sep 2009) Log Message: ----------- mysqld-5.0.x: updating the startup script to use MYSQLD_DATADIR=/var/opt/csw/mysql5 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-09-22 20:45:01 UTC (rev 6409) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-09-22 20:46:01 UTC (rev 6410) @@ -5,7 +5,7 @@ 9b5511de728fec4394eca7dd0097fb43 download/CSWmysql5.postinstall cc2a219abbe7dc6049775cff070a27a5 download/CSWmysql5.preinstall 70d7860bfa776dfc5510fc11d7c14203 download/README.CSW -fa8f33c812604457f2c0792e875f6967 download/cswmysql5 +9e86a7c581edf83eac11ceb827c318a2 download/cswmysql5 67228e1f096fe08a94f4267439a4ec36 download/cswusergroup 671348f1a5b078da9ca76f97e1fda325 download/mysql-5.0.84.tar.gz 52ad413f019717b89bd5aa33babdedc3 download/quick_start-csw Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 2009-09-22 20:45:01 UTC (rev 6409) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 2009-09-22 20:46:01 UTC (rev 6410) @@ -15,7 +15,7 @@ RETVAL=0 MYSQLHOME=/opt/csw/mysql5 -MYSQLD_DATADIR=$MYSQLHOME/var +MYSQLD_DATADIR=/var/opt/csw/mysql5 MYSQLD_PID_FILE=$MYSQLHOME/var/mysql.pid CONFFILE=$MYSQLHOME/my.cnf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Sep 22 22:49:25 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 22 Sep 2009 20:49:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[6411] csw/mgar/pkg/x11/inputproto/trunk/Makefile Message-ID: Revision: 6411 http://gar.svn.sourceforge.net/gar/?rev=6411&view=rev Author: wbonnet Date: 2009-09-22 20:49:25 +0000 (Tue, 22 Sep 2009) Log Message: ----------- Upgrade to 1.5.1 Modified Paths: -------------- csw/mgar/pkg/x11/inputproto/trunk/Makefile Modified: csw/mgar/pkg/x11/inputproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/inputproto/trunk/Makefile 2009-09-22 20:46:01 UTC (rev 6410) +++ csw/mgar/pkg/x11/inputproto/trunk/Makefile 2009-09-22 20:49:25 UTC (rev 6411) @@ -1,5 +1,5 @@ GARNAME = inputproto -GARVERSION = 1.5.0 +GARVERSION = 1.5.1 CATEGORIES = x11 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Sep 22 22:51:36 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 22 Sep 2009 20:51:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[6412] csw/mgar/pkg/x11/renderproto/trunk/Makefile Message-ID: Revision: 6412 http://gar.svn.sourceforge.net/gar/?rev=6412&view=rev Author: wbonnet Date: 2009-09-22 20:51:31 +0000 (Tue, 22 Sep 2009) Log Message: ----------- Upgrade to 0.11 Modified Paths: -------------- csw/mgar/pkg/x11/renderproto/trunk/Makefile Modified: csw/mgar/pkg/x11/renderproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/renderproto/trunk/Makefile 2009-09-22 20:49:25 UTC (rev 6411) +++ csw/mgar/pkg/x11/renderproto/trunk/Makefile 2009-09-22 20:51:31 UTC (rev 6412) @@ -1,5 +1,5 @@ GARNAME = renderproto -GARVERSION = 0.9.3 +GARVERSION = 0.11 CATEGORIES = x11 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 Sep 22 22:54:40 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 20:54:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[6413] csw/mgar/pkg/x11 Message-ID: Revision: 6413 http://gar.svn.sourceforge.net/gar/?rev=6413&view=rev Author: dmichelsen Date: 2009-09-22 20:54:39 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libx11: Adjust directory name to match catalog name Modified Paths: -------------- csw/mgar/pkg/x11/libx11/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/libx11/ Removed Paths: ------------- csw/mgar/pkg/x11/libX11/ Modified: csw/mgar/pkg/x11/libx11/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libX11/trunk/Makefile 2009-09-22 13:55:59 UTC (rev 6393) +++ csw/mgar/pkg/x11/libx11/trunk/Makefile 2009-09-22 20:54:39 UTC (rev 6413) @@ -1,4 +1,4 @@ -GARNAME = libX11 +GARNAME = libx11 GARVERSION = 1.2.2 CATEGORIES = x11 @@ -10,7 +10,8 @@ endef MASTER_SITES = $(X11_LIB_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTNAME = libX11-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz PATCHFILES = patch-stdint.diff # Add workaround for http://bugs.sourcemage.org/show_bug.cgi?id=13476 PATCHFILES += patch-xlib-sentinel.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 Tue Sep 22 22:56:47 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 20:56:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[6414] csw/mgar/pkg/x11 Message-ID: Revision: 6414 http://gar.svn.sourceforge.net/gar/?rev=6414&view=rev Author: dmichelsen Date: 2009-09-22 20:56:47 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libxau: Adjust directory name to match catalog name, switch to bz2 Modified Paths: -------------- csw/mgar/pkg/x11/libxau/trunk/Makefile csw/mgar/pkg/x11/libxau/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/libxau/ Removed Paths: ------------- csw/mgar/pkg/x11/libXau/ Modified: csw/mgar/pkg/x11/libxau/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libXau/trunk/Makefile 2009-09-22 13:55:59 UTC (rev 6393) +++ csw/mgar/pkg/x11/libxau/trunk/Makefile 2009-09-22 20:56:47 UTC (rev 6414) @@ -1,4 +1,4 @@ -GARNAME = libXau +GARNAME = libxau GARVERSION = 1.0.4 CATEGORIES = x11 @@ -9,7 +9,8 @@ endef MASTER_SITES = $(X11_LIB_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTNAME = libXau-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.bz2 PREREQUISITE_PKGS = CSWinputproto CSWkbproto CSWrenderproto CSWxcbproto PREREQUISITE_PKGS += CSWxextproto CSWxproto CSWxtrans CSWlibpthreadstubs Modified: csw/mgar/pkg/x11/libxau/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libXau/trunk/checksums 2009-09-22 13:55:59 UTC (rev 6393) +++ csw/mgar/pkg/x11/libxau/trunk/checksums 2009-09-22 20:56:47 UTC (rev 6414) @@ -1 +1 @@ -77c3de874155456c857b331063ad2fd9 download/libXau-1.0.4.tar.gz +0f2b88d857e0a3f5898e4759c541af46 download/libXau-1.0.4.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Sep 22 22:57:32 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 22 Sep 2009 20:57:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[6415] csw/mgar/pkg/x11/inputproto/trunk/checksums Message-ID: Revision: 6415 http://gar.svn.sourceforge.net/gar/?rev=6415&view=rev Author: wbonnet Date: 2009-09-22 20:57:32 +0000 (Tue, 22 Sep 2009) Log Message: ----------- Update checksums Modified Paths: -------------- csw/mgar/pkg/x11/inputproto/trunk/checksums Modified: csw/mgar/pkg/x11/inputproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/inputproto/trunk/checksums 2009-09-22 20:56:47 UTC (rev 6414) +++ csw/mgar/pkg/x11/inputproto/trunk/checksums 2009-09-22 20:57:32 UTC (rev 6415) @@ -1,2 +1 @@ -edab35e039779f7f967e4f29878c5421 download/inputproto-1.5.0.tar.gz -18c9a938f54119eca02836cf21b3f6bb download/CSWinputproto.gspec +2311483e8c175af3b4b5111413018dd1 download/inputproto-1.5.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 Sep 22 23:00:38 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 21:00:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6416] csw/mgar/pkg/x11 Message-ID: Revision: 6416 http://gar.svn.sourceforge.net/gar/?rev=6416&view=rev Author: dmichelsen Date: 2009-09-22 21:00:38 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libxdmcp: Several enhancements towards x11 standard Makefile Modified Paths: -------------- csw/mgar/pkg/x11/libxdmcp/trunk/Makefile csw/mgar/pkg/x11/libxdmcp/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/libxdmcp/ Removed Paths: ------------- csw/mgar/pkg/x11/libXdmcp/ Modified: csw/mgar/pkg/x11/libxdmcp/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libXdmcp/trunk/Makefile 2009-09-22 13:55:59 UTC (rev 6393) +++ csw/mgar/pkg/x11/libxdmcp/trunk/Makefile 2009-09-22 21:00:38 UTC (rev 6416) @@ -1,4 +1,4 @@ -GARNAME = libXdmcp +GARNAME = libxdmcp GARVERSION = 1.0.2 CATEGORIES = x11 @@ -9,7 +9,8 @@ endef MASTER_SITES = $(X11_LIB_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTNAME = libXdmcp-$(GARVERSION) +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.gz @@ -18,24 +19,15 @@ CATALOGNAME_CSWlibxdmcp = libxdmcp CATALOGNAME_CSWlibxdmcpdevel = libxdmcp_devel -REQUIRED_PKGS_CSWlibxdmcpdevel = CSWlibxdmcp - SPKG_DESC_CSWlibxdmcp = X11 display manager control protocol library SPKG_DESC_CSWlibxdmcpdevel = X11 display manager control protocol library development package -PKGFILES_CSWlibxdmcpdevel = $(PKGFILES_DEVEL) -PKGFILES_CSWlibxdmcpdevel += $(prefix)/X11/include/.* -PKGFILES_CSWlibxdmcpdevel += $(prefix)/X11/lib/.*\.a -PKGFILES_CSWlibxdmcpdevel += $(prefix)/X11/lib/pkgconfig/.* +REQUIRED_PKGS_CSWlibxdmcpdevel = CSWlibxdmcp BUILD64 = 1 NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) -include gar/category.mk +PKGFILES_CSWlibxdmcpdevel = $(PKGFILES_DEVEL) -post-merge: - gln -s . $(PKGROOT)$(libdir)/32 - gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 - @$(MAKECOOKIE) - +include gar/category.mk Modified: csw/mgar/pkg/x11/libxdmcp/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libXdmcp/trunk/checksums 2009-09-22 13:55:59 UTC (rev 6393) +++ csw/mgar/pkg/x11/libxdmcp/trunk/checksums 2009-09-22 21:00:38 UTC (rev 6416) @@ -1 +1 @@ -a7e23f356a2b4fe8668f9ff4a2b0413a download/libXdmcp-1.0.2.tar.gz +10facf2bc7cbd5e5c1a698b8a210a582 download/libXdmcp-1.0.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Sep 22 23:07:07 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 22 Sep 2009 21:07:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[6417] csw/mgar/pkg/x11/xextproto/trunk/Makefile Message-ID: Revision: 6417 http://gar.svn.sourceforge.net/gar/?rev=6417&view=rev Author: wbonnet Date: 2009-09-22 21:07:06 +0000 (Tue, 22 Sep 2009) Log Message: ----------- Upgrade to 7.1.1 Modified Paths: -------------- csw/mgar/pkg/x11/xextproto/trunk/Makefile Modified: csw/mgar/pkg/x11/xextproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xextproto/trunk/Makefile 2009-09-22 21:00:38 UTC (rev 6416) +++ csw/mgar/pkg/x11/xextproto/trunk/Makefile 2009-09-22 21:07:06 UTC (rev 6417) @@ -1,5 +1,5 @@ GARNAME = xextproto -GARVERSION = 7.0.5 +GARVERSION = 7.1.1 CATEGORIES = x11 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Sep 22 23:08:17 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 22 Sep 2009 21:08:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[6418] csw/mgar/pkg/x11/xextproto/trunk/checksums Message-ID: Revision: 6418 http://gar.svn.sourceforge.net/gar/?rev=6418&view=rev Author: wbonnet Date: 2009-09-22 21:08:17 +0000 (Tue, 22 Sep 2009) Log Message: ----------- Upgrade to 7.1.1 Modified Paths: -------------- csw/mgar/pkg/x11/xextproto/trunk/checksums Modified: csw/mgar/pkg/x11/xextproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xextproto/trunk/checksums 2009-09-22 21:07:06 UTC (rev 6417) +++ csw/mgar/pkg/x11/xextproto/trunk/checksums 2009-09-22 21:08:17 UTC (rev 6418) @@ -1 +1 @@ -e6841018a7c64983b0954aa2c564d115 download/xextproto-7.0.5.tar.bz2 +fb6ccaae76db7a35e49b12aea60ca6ff download/xextproto-7.1.1.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Sep 22 23:27:51 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 22 Sep 2009 21:27:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[6419] csw/mgar/pkg/x11 Message-ID: Revision: 6419 http://gar.svn.sourceforge.net/gar/?rev=6419&view=rev Author: wbonnet Date: 2009-09-22 21:27:49 +0000 (Tue, 22 Sep 2009) Log Message: ----------- Update some path in the default message Modified Paths: -------------- csw/mgar/pkg/x11/glproto/Makefile csw/mgar/pkg/x11/inputproto/Makefile csw/mgar/pkg/x11/kbproto/Makefile csw/mgar/pkg/x11/recordproto/Makefile csw/mgar/pkg/x11/renderproto/Makefile csw/mgar/pkg/x11/videoproto/Makefile csw/mgar/pkg/x11/xcb-proto/Makefile csw/mgar/pkg/x11/xextproto/Makefile csw/mgar/pkg/x11/xproto/Makefile Modified: csw/mgar/pkg/x11/glproto/Makefile =================================================================== --- csw/mgar/pkg/x11/glproto/Makefile 2009-09-22 21:08:17 UTC (rev 6418) +++ csw/mgar/pkg/x11/glproto/Makefile 2009-09-22 21:27:49 UTC (rev 6419) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/ directory." + @echo "You are in the pkg/x11/glproto directory." %: $(MAKE) -C trunk $* Modified: csw/mgar/pkg/x11/inputproto/Makefile =================================================================== --- csw/mgar/pkg/x11/inputproto/Makefile 2009-09-22 21:08:17 UTC (rev 6418) +++ csw/mgar/pkg/x11/inputproto/Makefile 2009-09-22 21:27:49 UTC (rev 6419) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/ directory." + @echo "You are in the pkg/x11/inputproto directory." %: $(MAKE) -C trunk $* Modified: csw/mgar/pkg/x11/kbproto/Makefile =================================================================== --- csw/mgar/pkg/x11/kbproto/Makefile 2009-09-22 21:08:17 UTC (rev 6418) +++ csw/mgar/pkg/x11/kbproto/Makefile 2009-09-22 21:27:49 UTC (rev 6419) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/ directory." + @echo "You are in the pkg/x11/kbproto directory." %: $(MAKE) -C trunk $* Modified: csw/mgar/pkg/x11/recordproto/Makefile =================================================================== --- csw/mgar/pkg/x11/recordproto/Makefile 2009-09-22 21:08:17 UTC (rev 6418) +++ csw/mgar/pkg/x11/recordproto/Makefile 2009-09-22 21:27:49 UTC (rev 6419) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/ directory." + @echo "You are in the pkg/x11/recordproto directory." %: $(MAKE) -C trunk $* Modified: csw/mgar/pkg/x11/renderproto/Makefile =================================================================== --- csw/mgar/pkg/x11/renderproto/Makefile 2009-09-22 21:08:17 UTC (rev 6418) +++ csw/mgar/pkg/x11/renderproto/Makefile 2009-09-22 21:27:49 UTC (rev 6419) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/ directory." + @echo "You are in the pkg/x11/renderproto directory." %: $(MAKE) -C trunk $* Modified: csw/mgar/pkg/x11/videoproto/Makefile =================================================================== --- csw/mgar/pkg/x11/videoproto/Makefile 2009-09-22 21:08:17 UTC (rev 6418) +++ csw/mgar/pkg/x11/videoproto/Makefile 2009-09-22 21:27:49 UTC (rev 6419) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/ directory." + @echo "You are in the pkg/x11/videoproto directory." %: $(MAKE) -C trunk $* Modified: csw/mgar/pkg/x11/xcb-proto/Makefile =================================================================== --- csw/mgar/pkg/x11/xcb-proto/Makefile 2009-09-22 21:08:17 UTC (rev 6418) +++ csw/mgar/pkg/x11/xcb-proto/Makefile 2009-09-22 21:27:49 UTC (rev 6419) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/ directory." + @echo "You are in the pkg/x11/xcb-proto directory." %: $(MAKE) -C trunk $* Modified: csw/mgar/pkg/x11/xextproto/Makefile =================================================================== --- csw/mgar/pkg/x11/xextproto/Makefile 2009-09-22 21:08:17 UTC (rev 6418) +++ csw/mgar/pkg/x11/xextproto/Makefile 2009-09-22 21:27:49 UTC (rev 6419) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/ directory." + @echo "You are in the pkg/x11/xextproto directory." %: $(MAKE) -C trunk $* Modified: csw/mgar/pkg/x11/xproto/Makefile =================================================================== --- csw/mgar/pkg/x11/xproto/Makefile 2009-09-22 21:08:17 UTC (rev 6418) +++ csw/mgar/pkg/x11/xproto/Makefile 2009-09-22 21:27:49 UTC (rev 6419) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/ directory." + @echo "You are in the pkg/x11/xproto directory." %: $(MAKE) -C trunk $* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Sep 22 23:40:27 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 22 Sep 2009 21:40:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[6420] csw/mgar/pkg/x11 Message-ID: Revision: 6420 http://gar.svn.sourceforge.net/gar/?rev=6420&view=rev Author: wbonnet Date: 2009-09-22 21:40:25 +0000 (Tue, 22 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/resourceproto/ csw/mgar/pkg/x11/resourceproto/branches/ csw/mgar/pkg/x11/resourceproto/tags/ csw/mgar/pkg/x11/resourceproto/trunk/ csw/mgar/pkg/x11/resourceproto/trunk/Makefile csw/mgar/pkg/x11/resourceproto/trunk/checksums csw/mgar/pkg/x11/resourceproto/trunk/files/ Property changes on: csw/mgar/pkg/x11/resourceproto/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/x11/resourceproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/resourceproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/resourceproto/trunk/Makefile 2009-09-22 21:40:25 UTC (rev 6420) @@ -0,0 +1,22 @@ +GARNAME = resourceproto +GARVERSION = 1.1.0 +CATEGORIES = x11 + +DESCRIPTION = X.Org Resource protocol headers +define BLURB + Prototype header files for the Resource extension to X11 +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/resourceproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/resourceproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/resourceproto/trunk/checksums 2009-09-22 21:40:25 UTC (rev 6420) @@ -0,0 +1 @@ +587333b4995a3e11ebe4c8ba2742efaf download/resourceproto-1.1.0.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 Tue Sep 22 23:59:43 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 22 Sep 2009 21:59:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6421] csw/mgar/pkg/x11 Message-ID: Revision: 6421 http://gar.svn.sourceforge.net/gar/?rev=6421&view=rev Author: wbonnet Date: 2009-09-22 21:59:43 +0000 (Tue, 22 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/printproto/ csw/mgar/pkg/x11/printproto/branches/ csw/mgar/pkg/x11/printproto/tags/ csw/mgar/pkg/x11/printproto/trunk/ csw/mgar/pkg/x11/printproto/trunk/Makefile csw/mgar/pkg/x11/printproto/trunk/checksums csw/mgar/pkg/x11/printproto/trunk/files/ Property changes on: csw/mgar/pkg/x11/printproto/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/x11/printproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/printproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/printproto/trunk/Makefile 2009-09-22 21:59:43 UTC (rev 6421) @@ -0,0 +1,22 @@ +GARNAME = printproto +GARVERSION = 1.0.4 +CATEGORIES = x11 + +DESCRIPTION = X.Org Print extension headers +define BLURB + X11 print extension wire protocol Headers +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/printproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/printproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/printproto/trunk/checksums 2009-09-22 21:59:43 UTC (rev 6421) @@ -0,0 +1 @@ +9726f053b3d4cbd245766de70408c30b download/printproto-1.0.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Sep 23 10:32:51 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 23 Sep 2009 08:32:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[6422] csw/mgar/pkg/phpldapadmin/trunk Message-ID: Revision: 6422 http://gar.svn.sourceforge.net/gar/?rev=6422&view=rev Author: dmichelsen Date: 2009-09-23 08:32:50 +0000 (Wed, 23 Sep 2009) Log Message: ----------- phpldapadmin: Update to 1.2.0.4 Modified Paths: -------------- csw/mgar/pkg/phpldapadmin/trunk/Makefile csw/mgar/pkg/phpldapadmin/trunk/checksums Modified: csw/mgar/pkg/phpldapadmin/trunk/Makefile =================================================================== --- csw/mgar/pkg/phpldapadmin/trunk/Makefile 2009-09-22 21:59:43 UTC (rev 6421) +++ csw/mgar/pkg/phpldapadmin/trunk/Makefile 2009-09-23 08:32:50 UTC (rev 6422) @@ -1,5 +1,5 @@ GARNAME = phpldapadmin -GARVERSION = 1.2.0 +GARVERSION = 1.2.0.4 CATEGORIES = apps DESCRIPTION = Web-based LDAP browser to manage your LDAP server @@ -14,13 +14,15 @@ endef MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(GARNAME)-$(GARVERSION).zip +DISTFILES = $(GARNAME)-$(GARVERSION).tgz DISTFILES += CSWphpldapadmin.preinstall # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = https://sourceforge.net/projects/phpldapadmin/files/ -UFILES_REGEX = (\d+(?:\.\d+)*) +UFILES_REGEX = (\d+(?:\.\d+)*).tgz +SPKG_SOURCEURL = http://phpldapadmin.sourceforge.net/ + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = Modified: csw/mgar/pkg/phpldapadmin/trunk/checksums =================================================================== --- csw/mgar/pkg/phpldapadmin/trunk/checksums 2009-09-22 21:59:43 UTC (rev 6421) +++ csw/mgar/pkg/phpldapadmin/trunk/checksums 2009-09-23 08:32:50 UTC (rev 6422) @@ -1,2 +1,2 @@ 87983d70476a8a80332f0c3c188d9c2d download/CSWphpldapadmin.preinstall -16ce69b3cc2b4d2d67619059fc25254d download/phpldapadmin-1.2.0.zip +a2d914e22c1b114738eca91c80c0d09c download/phpldapadmin-1.2.0.4.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 Wed Sep 23 10:43:30 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 23 Sep 2009 08:43:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[6423] csw/mgar/pkg/cups/branches/cups-1.4/Makefile Message-ID: Revision: 6423 http://gar.svn.sourceforge.net/gar/?rev=6423&view=rev Author: wahwah Date: 2009-09-23 08:43:30 +0000 (Wed, 23 Sep 2009) Log Message: ----------- cups-1.4: Setting GARFLAVOR to DBG, simplifying the prototype processing, added references to CUPS bug tracking system. Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4/Makefile Modified: csw/mgar/pkg/cups/branches/cups-1.4/Makefile =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-23 08:32:50 UTC (rev 6422) +++ csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-23 08:43:30 UTC (rev 6423) @@ -11,8 +11,25 @@ systems. It is developed and maintained by Easy Software Products to promote a standard printing solution and is the standard printing system in MacOS(R) X and most Linux(R) distributions. + + http://www.cups.org/str.php?L3324 endef +sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw + +# There's a problem with cups-polld going into a busy-wait loop when polling +# print servers. +# +# http://www.cups.org/str.php?L3257 +# +# The problem with cups-polld seems to be going away when CUPS is compiled with +# debugging symbols. The debugging options is turned on for this package, in +# order to be able to debug the binary if it ever shows the problem. +# +# TODO: Check whether the issue is gone or not. +GARFLAVOR = DBG + # These are the source mirrors published on the CUPS home-page. CUPS_MIRRORS = http://ftp.easysw.com/pub CUPS_MIRRORS += ftp://ftp2.easysw.com/pub @@ -57,7 +74,8 @@ REQUIRED_PKGS_CSWcupsd = CSWcswclassutils CSWlibcups CSWoldaprt CSWzlib REQUIRED_PKGS_CSWcupsd += CSWjpeg CSWpng CSWtiff CSWlibtasn1 REQUIRED_PKGS_CSWcupsd += CSWgcrypt CSWgnutls CSWgpgerr CSWlibdbus -REQUIRED_PKGS_CSWcupsd += CSWkrb5lib CSWosslrt +REQUIRED_PKGS_CSWcupsd += CSWkrb5lib CSWosslrt CSWcupsdoc +REQUIRED_PKGS_CSWcupsd += CSWdbusglib CSWggettextrt CSWglib2 REQUIRED_PKGS_CSWcupsclient = CSWcswclassutils CSWlibcups CSWoldaprt CSWzlib REQUIRED_PKGS_CSWcupsclient += CSWgcrypt CSWgnutls CSWgpgerr CSWlibtasn1 CSWosslrt REQUIRED_PKGS_CSWcupsdoc = CSWcswclassutils @@ -121,10 +139,9 @@ SPKG_DESC_CSWcupsdoc = CUPS documentation SPKG_DESC_CSWcupsdev = CUPS header files -PROTOTYPE_FILTER = awk ' \ - $$$$3 ~ /\/init.d\/cswcups$$$$/ { $$$$2 = "cswinitsmf" } \ - $$$$3 ~ /\/cupsd\.conf\.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ - { print }' +# http://lists.opencsw.org/pipermail/maintainers/2009-September/004249.html +SAMPLECONF = $(sysconfdir)/cups/cupsd.conf.CSW +INITSMF = $(sysconfdir)/init\.d/cswcups LD_OPTIONS = -R/opt/csw/lib/\$$ISALIST -R/opt/csw/lib @@ -154,9 +171,6 @@ DSTROOT = $(DESTDIR) export DSTROOT -sysconfdir = /etc/opt/csw -localstatedir = /var/opt/csw - # Don't run tests (at least for now); there are some LD_LIBRARY_PATH issues TEST_TARGET = @@ -176,6 +190,7 @@ if [ -r "$$i" ]; then \ echo "$$i -> $$i.CSW"; \ mv "$$i" "$$i.CSW"; \ + chmod 0644 "$$i.CSW"; \ fi \ done) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Wed Sep 23 12:24:08 2009 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Wed, 23 Sep 2009 10:24:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[6424] csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/ checksums Message-ID: Revision: 6424 http://gar.svn.sourceforge.net/gar/?rev=6424&view=rev Author: d_pocock Date: 2009-09-23 10:24:07 +0000 (Wed, 23 Sep 2009) Log Message: ----------- Update checksum to use beta ganglia-3.1.3.tar.gz Modified Paths: -------------- csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/checksums Modified: csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/checksums =================================================================== --- csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/checksums 2009-09-23 08:43:30 UTC (rev 6423) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/checksums 2009-09-23 10:24:07 UTC (rev 6424) @@ -2,5 +2,5 @@ c4c333a46db391464e372ad8ede4993c download/CSWgangliaweb.preremove 25d302948e25837bf17757d5e23e4955 download/cswgmetad c6bb96c949dbb989d06ebb36b6af885d download/cswgmond -cd502229ea934b433fa2ddc6fd3a2706 download/ganglia-3.1.3.tar.gz +d71166060fc8dd998861837f560a0a3e download/ganglia-3.1.3.tar.gz 2ff504ecb546aca2cdd6ee09af9a417e download/httpd-ganglia.conf.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 Sep 23 12:24:13 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 23 Sep 2009 10:24:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[6425] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 6425 http://gar.svn.sourceforge.net/gar/?rev=6425&view=rev Author: dmichelsen Date: 2009-09-23 10:24:13 +0000 (Wed, 23 Sep 2009) Log Message: ----------- mGAR v2: Fix auto-replacement of .CSW in cswclassutils 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-09-23 10:24:07 UTC (rev 6424) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-09-23 10:24:13 UTC (rev 6425) @@ -169,8 +169,8 @@ # - set class for all config files ifneq ($(SAMPLECONF)$(PRESERVECONF)$(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,$(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,$(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)$$) );))\ @@ -178,7 +178,7 @@ _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. -_EXTRA_PAX_ARGS += $(foreach FILE,$(SAMPLECONF:%.CSW=%) $(PRESERVECONF:%.CSW=%),-s ",^\.\($(FILE)\)$$,.\1.CSW,p") +_EXTRA_PAX_ARGS += $(foreach FILE,$(SAMPLECONF:%\.CSW=%) $(PRESERVECONF:%\.CSW=%),-s ",^\.\($(FILE)\)$$,.\1\.CSW,p") endif PKGGET_DESTDIR ?= 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 Sep 23 12:32:49 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 23 Sep 2009 10:32:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[6426] csw/mgar/pkg/x11 Message-ID: Revision: 6426 http://gar.svn.sourceforge.net/gar/?rev=6426&view=rev Author: dmichelsen Date: 2009-09-23 10:32:49 +0000 (Wed, 23 Sep 2009) Log Message: ----------- x11/videoproto: Adjust package name with x-prefix Modified Paths: -------------- csw/mgar/pkg/x11/libxv/trunk/Makefile csw/mgar/pkg/x11/videoproto/trunk/Makefile Modified: csw/mgar/pkg/x11/libxv/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxv/trunk/Makefile 2009-09-23 10:24:13 UTC (rev 6425) +++ csw/mgar/pkg/x11/libxv/trunk/Makefile 2009-09-23 10:32:49 UTC (rev 6426) @@ -14,7 +14,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -PREREQUISITE_PKGS = CSWvideoproto +PREREQUISITE_PKGS = CSWxvideoproto PACKAGES = CSWlibxv CSWlibxvdevel Modified: csw/mgar/pkg/x11/videoproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/videoproto/trunk/Makefile 2009-09-23 10:24:13 UTC (rev 6425) +++ csw/mgar/pkg/x11/videoproto/trunk/Makefile 2009-09-23 10:32:49 UTC (rev 6426) @@ -7,6 +7,8 @@ Video extension headers endef +PACKAGES = CSWxvideoproto + MASTER_SITES = $(X11_PROTO_MASTER_SITE) DISTFILES = $(GARNAME)-$(GARVERSION).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 Sep 23 12:37:41 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 23 Sep 2009 10:37:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[6427] csw/mgar/pkg/x11 Message-ID: Revision: 6427 http://gar.svn.sourceforge.net/gar/?rev=6427&view=rev Author: dmichelsen Date: 2009-09-23 10:37:41 +0000 (Wed, 23 Sep 2009) Log Message: ----------- x11/kbproto: Adjust package name with x-prefix Modified Paths: -------------- csw/mgar/pkg/x11/kbproto/trunk/Makefile csw/mgar/pkg/x11/libx11/trunk/Makefile csw/mgar/pkg/x11/libxau/trunk/Makefile Modified: csw/mgar/pkg/x11/kbproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/kbproto/trunk/Makefile 2009-09-23 10:32:49 UTC (rev 6426) +++ csw/mgar/pkg/x11/kbproto/trunk/Makefile 2009-09-23 10:37:41 UTC (rev 6427) @@ -14,6 +14,8 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWxkbproto + REQUIRED_PKGS = CSWx11common BUILD64 = 1 Modified: csw/mgar/pkg/x11/libx11/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libx11/trunk/Makefile 2009-09-23 10:32:49 UTC (rev 6426) +++ csw/mgar/pkg/x11/libx11/trunk/Makefile 2009-09-23 10:37:41 UTC (rev 6427) @@ -19,7 +19,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PREREQUISITE_PKGS = CSWxcbproto CSWxextproto CSWxtrans CSWkbproto CSWinputproto CSWlibpthreadstubs CSWlibxcbdevel +PREREQUISITE_PKGS = CSWxcbproto CSWxextproto CSWxtrans CSWxkbproto CSWinputproto CSWlibpthreadstubs CSWlibxcbdevel PACKAGES = CSWlibx11 CSWlibx11devel Modified: csw/mgar/pkg/x11/libxau/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxau/trunk/Makefile 2009-09-23 10:32:49 UTC (rev 6426) +++ csw/mgar/pkg/x11/libxau/trunk/Makefile 2009-09-23 10:37:41 UTC (rev 6427) @@ -12,7 +12,7 @@ DISTNAME = libXau-$(GARVERSION) DISTFILES = $(DISTNAME).tar.bz2 -PREREQUISITE_PKGS = CSWinputproto CSWkbproto CSWrenderproto CSWxcbproto +PREREQUISITE_PKGS = CSWinputproto CSWxkbproto CSWrenderproto CSWxcbproto PREREQUISITE_PKGS += CSWxextproto CSWxproto CSWxtrans CSWlibpthreadstubs PACKAGES = CSWlibxau CSWlibxaudevel 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 Sep 23 12:44:16 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 23 Sep 2009 10:44:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[6428] csw/mgar/pkg/x11/glproto/trunk/Makefile Message-ID: Revision: 6428 http://gar.svn.sourceforge.net/gar/?rev=6428&view=rev Author: dmichelsen Date: 2009-09-23 10:44:15 +0000 (Wed, 23 Sep 2009) Log Message: ----------- x11/glproto: Adjust package name with x-prefix Modified Paths: -------------- csw/mgar/pkg/x11/glproto/trunk/Makefile Modified: csw/mgar/pkg/x11/glproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/glproto/trunk/Makefile 2009-09-23 10:37:41 UTC (rev 6427) +++ csw/mgar/pkg/x11/glproto/trunk/Makefile 2009-09-23 10:44:15 UTC (rev 6428) @@ -13,6 +13,8 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWxglproto + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Sep 23 12:45:14 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 23 Sep 2009 10:45:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6429] csw/mgar/pkg/x11/glproto/trunk/Makefile Message-ID: Revision: 6429 http://gar.svn.sourceforge.net/gar/?rev=6429&view=rev Author: dmichelsen Date: 2009-09-23 10:45:13 +0000 (Wed, 23 Sep 2009) Log Message: ----------- x11/glproto: Fix upstream regex Modified Paths: -------------- csw/mgar/pkg/x11/glproto/trunk/Makefile Modified: csw/mgar/pkg/x11/glproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/glproto/trunk/Makefile 2009-09-23 10:44:15 UTC (rev 6428) +++ csw/mgar/pkg/x11/glproto/trunk/Makefile 2009-09-23 10:45:13 UTC (rev 6429) @@ -11,7 +11,7 @@ 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.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 PACKAGES = CSWxglproto 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 Sep 23 12:52:25 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 23 Sep 2009 10:52:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[6430] csw/mgar/pkg/x11 Message-ID: Revision: 6430 http://gar.svn.sourceforge.net/gar/?rev=6430&view=rev Author: dmichelsen Date: 2009-09-23 10:52:21 +0000 (Wed, 23 Sep 2009) Log Message: ----------- x11/renderproto: Adjust x-prefix to packagename Modified Paths: -------------- csw/mgar/pkg/x11/libxau/trunk/Makefile csw/mgar/pkg/x11/renderproto/trunk/Makefile csw/mgar/pkg/x11/xrender/trunk/Makefile Modified: csw/mgar/pkg/x11/libxau/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxau/trunk/Makefile 2009-09-23 10:45:13 UTC (rev 6429) +++ csw/mgar/pkg/x11/libxau/trunk/Makefile 2009-09-23 10:52:21 UTC (rev 6430) @@ -12,7 +12,7 @@ DISTNAME = libXau-$(GARVERSION) DISTFILES = $(DISTNAME).tar.bz2 -PREREQUISITE_PKGS = CSWinputproto CSWxkbproto CSWrenderproto CSWxcbproto +PREREQUISITE_PKGS = CSWinputproto CSWxkbproto CSWxrenderproto CSWxcbproto PREREQUISITE_PKGS += CSWxextproto CSWxproto CSWxtrans CSWlibpthreadstubs PACKAGES = CSWlibxau CSWlibxaudevel Modified: csw/mgar/pkg/x11/renderproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/renderproto/trunk/Makefile 2009-09-23 10:45:13 UTC (rev 6429) +++ csw/mgar/pkg/x11/renderproto/trunk/Makefile 2009-09-23 10:52:21 UTC (rev 6430) @@ -14,6 +14,8 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWxrenderproto + REQUIRED_PKGS = CSWx11common BUILD64 = 1 Modified: csw/mgar/pkg/x11/xrender/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xrender/trunk/Makefile 2009-09-23 10:45:13 UTC (rev 6429) +++ csw/mgar/pkg/x11/xrender/trunk/Makefile 2009-09-23 10:52:21 UTC (rev 6430) @@ -31,7 +31,7 @@ CATALOGNAME_CSWlibxrender = libxrender CATALOGNAME_CSWlibxrenderdevel = libxrender_devel -PREREQUISITE_PKGS = CSWrenderproto +PREREQUISITE_PKGS = CSWxrenderproto REQUIRED_PKGS_CSWlibxrenderdevel = CSWlibxrender REQUIRED_PKGS_CSWlibxrender = CSWx11common CSWlibx11 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 Sep 23 12:54:09 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 23 Sep 2009 10:54:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[6431] csw/mgar/pkg/x11/renderproto/trunk/checksums Message-ID: Revision: 6431 http://gar.svn.sourceforge.net/gar/?rev=6431&view=rev Author: dmichelsen Date: 2009-09-23 10:54:09 +0000 (Wed, 23 Sep 2009) Log Message: ----------- x11/renderproto: Update checksum Modified Paths: -------------- csw/mgar/pkg/x11/renderproto/trunk/checksums Modified: csw/mgar/pkg/x11/renderproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/renderproto/trunk/checksums 2009-09-23 10:52:21 UTC (rev 6430) +++ csw/mgar/pkg/x11/renderproto/trunk/checksums 2009-09-23 10:54:09 UTC (rev 6431) @@ -1 +1 @@ -ab8f3e356973d9c99810a8f092db3a2e download/renderproto-0.9.3.tar.gz +57216f25b9a5edc561b83a7484cb17e8 download/renderproto-0.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 Wed Sep 23 13:01:21 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 23 Sep 2009 11:01:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[6432] csw/mgar/pkg/x11/recordproto/trunk/Makefile Message-ID: Revision: 6432 http://gar.svn.sourceforge.net/gar/?rev=6432&view=rev Author: dmichelsen Date: 2009-09-23 11:01:21 +0000 (Wed, 23 Sep 2009) Log Message: ----------- x11/recordproto: Adjust x-prefix to packagename Modified Paths: -------------- csw/mgar/pkg/x11/recordproto/trunk/Makefile Modified: csw/mgar/pkg/x11/recordproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/recordproto/trunk/Makefile 2009-09-23 10:54:09 UTC (rev 6431) +++ csw/mgar/pkg/x11/recordproto/trunk/Makefile 2009-09-23 11:01:21 UTC (rev 6432) @@ -13,6 +13,8 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWxrecordproto + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Sep 23 13:58:43 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 23 Sep 2009 11:58:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6433] csw/mgar/pkg Message-ID: Revision: 6433 http://gar.svn.sourceforge.net/gar/?rev=6433&view=rev Author: wahwah Date: 2009-09-23 11:58:43 +0000 (Wed, 23 Sep 2009) Log Message: ----------- rox-filer: initial commit Modified Paths: -------------- csw/mgar/pkg/rox-filer/trunk/Makefile csw/mgar/pkg/rox-filer/trunk/checksums Added Paths: ----------- csw/mgar/pkg/rox-filer/ Modified: csw/mgar/pkg/rox-filer/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-09-15 10:19:44 UTC (rev 6309) +++ csw/mgar/pkg/rox-filer/trunk/Makefile 2009-09-23 11:58:43 UTC (rev 6433) @@ -2,181 +2,44 @@ # 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. +# This software uses custom ways of executing. Gentoo portage uses wrappers to +# set icon directories. + +GARNAME = rox-filer +GARVERSION = 2.9 +CATEGORIES = apps +DESCRIPTION = A lightweight X file manager 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 -## 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://roscidus.com/desktop/ROX-Filer +MASTER_SITES = $(SF_MIRRORS) +SF_PROJ = rox +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +REQUIRED_PKGS = CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWgtk2 +REQUIRED_PKGS += CSWlibatk CSWlibcairo CSWlibglade2 CSWlibxml2 CSWpango -#include gar/category.mk +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = rox +INSTALL_SCRIPTS = rox +TEST_SCRIPTS = +PACKAGES = CSWroxfiler +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +X_EXTRA_LIBS = -lm +export X_EXTRA_LIBS + +build-rox: + (cd $(WORKSRC); $(BUILD_ENV) ./ROX-Filer/AppRun --compile) + @$(MAKECOOKIE) + +install-rox: + # $(INSTALL_ENV) gmake -C $(WORKSRC)/ROX-Filer/build install + ginstall -d $(DESTDIR)$(bindir) + ginstall $(WORKSRC)/ROX-Filer/ROX-Filer $(DESTDIR)$(bindir) + ginstall -d $(DESTDIR)$(libdir) + gcp -av $(WORKSRC)/ROX-Filer/ROX $(DESTDIR)$(libdir) + gfind $(DESTDIR)$(libdir) -type d -exec chmod 0755 {} \; + gfind $(DESTDIR)$(libdir) -type f -exec chmod 0644 {} \; + @$(MAKECOOKIE) + +include gar/category.mk Modified: csw/mgar/pkg/rox-filer/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-09-15 10:19:44 UTC (rev 6309) +++ csw/mgar/pkg/rox-filer/trunk/checksums 2009-09-23 11:58:43 UTC (rev 6433) @@ -0,0 +1 @@ +d514b409e074ad77488aa7b44372aad1 download/rox-filer-2.9.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Sep 23 21:52:46 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 23 Sep 2009 19:52:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6434] csw/mgar/pkg/x11 Message-ID: Revision: 6434 http://gar.svn.sourceforge.net/gar/?rev=6434&view=rev Author: wbonnet Date: 2009-09-23 19:52:46 +0000 (Wed, 23 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libfs/ csw/mgar/pkg/x11/libfs/branches/ csw/mgar/pkg/x11/libfs/tags/ csw/mgar/pkg/x11/libfs/trunk/ csw/mgar/pkg/x11/libfs/trunk/Makefile csw/mgar/pkg/x11/libfs/trunk/checksums csw/mgar/pkg/x11/libfs/trunk/files/ Property changes on: csw/mgar/pkg/x11/libfs/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/x11/libfs/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libfs/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libfs/trunk/Makefile 2009-09-23 19:52:46 UTC (rev 6434) @@ -0,0 +1,33 @@ +GARNAME = libFS +GARVERSION = 1.0.2 +CATEGORIES = x11 + +DESCRIPTION = X11 Font Services library +define BLURB + libFS, the Font Services library, provides various functions useful to X11 font servers, and clients connecting to font servers. It is not used outside of these implementations. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibfs CSWlibfsdevel + +CATALOGNAME_CSWlibfs = libfs +CATALOGNAME_CSWlibfsdevel = libfs_devel + +SPKG_DESC_CSWlibfs = X11 Inter-Client Exchange library +SPKG_DESC_CSWlibfsdevel = X11 Inter-Client Exchange library development files + +REQUIRED_PKGS_CSWlibfsdevel = CSWlibfs + +PKGFILES_CSWlibfsdevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libfs/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libfs/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libfs/trunk/checksums 2009-09-23 19:52:46 UTC (rev 6434) @@ -0,0 +1 @@ +ecf2d6a27da053500283e803efa2a808 download/libFS-1.0.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Wed Sep 23 23:24:02 2009 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Wed, 23 Sep 2009 21:24:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[6435] csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/ Makefile Message-ID: Revision: 6435 http://gar.svn.sourceforge.net/gar/?rev=6435&view=rev Author: d_pocock Date: 2009-09-23 21:24:01 +0000 (Wed, 23 Sep 2009) Log Message: ----------- ganglia: explicitly set sysconfdir to /etc/opt/csw/ganglia Modified Paths: -------------- csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/Makefile Modified: csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/Makefile =================================================================== --- csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/Makefile 2009-09-23 19:52:46 UTC (rev 6434) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/Makefile 2009-09-23 21:24:01 UTC (rev 6435) @@ -99,7 +99,8 @@ WWWROOT = /opt/csw/share/www WWWGANGLIA = $(WWWROOT)/ganglia -ETCGANGLIA = /etc/opt/csw/ganglia +sysconfdir = /etc/opt/csw/ganglia +ETCGANGLIA = $(sysconfdir) PKGFILES_CSWganglia = PKGFILES_CSWgangliart = $(libdir)/libganglia.* 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 Sep 24 01:12:36 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 23 Sep 2009 23:12:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[6436] csw/mgar/pkg Message-ID: Revision: 6436 http://gar.svn.sourceforge.net/gar/?rev=6436&view=rev Author: skayser Date: 2009-09-23 23:12:36 +0000 (Wed, 23 Sep 2009) Log Message: ----------- pyfpconst: initial commit Added Paths: ----------- csw/mgar/pkg/pyfpconst/ csw/mgar/pkg/pyfpconst/branches/ csw/mgar/pkg/pyfpconst/tags/ csw/mgar/pkg/pyfpconst/trunk/ csw/mgar/pkg/pyfpconst/trunk/Makefile csw/mgar/pkg/pyfpconst/trunk/checksums csw/mgar/pkg/pyfpconst/trunk/files/ Property changes on: csw/mgar/pkg/pyfpconst/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/pyfpconst/trunk/Makefile =================================================================== --- csw/mgar/pkg/pyfpconst/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pyfpconst/trunk/Makefile 2009-09-23 23:12:36 UTC (rev 6436) @@ -0,0 +1,23 @@ +GARNAME = pyfpconst +GARVERSION = 0.7.2 +CATEGORIES = python + +DESCRIPTION = Utilities for handling IEEE 754 floating point special values +define BLURB + This python module implements constants and functions for working with + IEEE754 double-precision special values. It provides constants for + Not-a-Number (NaN), Positive Infinity (PosInf), and Negative Infinity + (NegInf), as well as functions to test for these values. +endef + +MASTER_SITES = http://pypi.python.org/packages/source/f/fpconst/ +DISTNAME = fpconst-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz + +PACKAGES = CSWpyfpconst +CATALOGNAME = py_fpconst +ARCHALL = 1 + +TEST_SCRIPTS = + +include gar/category.mk Added: csw/mgar/pkg/pyfpconst/trunk/checksums =================================================================== --- csw/mgar/pkg/pyfpconst/trunk/checksums (rev 0) +++ csw/mgar/pkg/pyfpconst/trunk/checksums 2009-09-23 23:12:36 UTC (rev 6436) @@ -0,0 +1 @@ +10ba9e04129af23108d24c22c3a698b1 download/fpconst-0.7.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Sep 24 01:17:03 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 23 Sep 2009 23:17:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[6437] csw/mgar/pkg/pyfpconst/trunk Message-ID: Revision: 6437 http://gar.svn.sourceforge.net/gar/?rev=6437&view=rev Author: skayser Date: 2009-09-23 23:17:03 +0000 (Wed, 23 Sep 2009) Log Message: ----------- pyfpconst: add changelog, add SPKG_SOURCEURL Modified Paths: -------------- csw/mgar/pkg/pyfpconst/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/pyfpconst/trunk/files/changelog.CSW Modified: csw/mgar/pkg/pyfpconst/trunk/Makefile =================================================================== --- csw/mgar/pkg/pyfpconst/trunk/Makefile 2009-09-23 23:12:36 UTC (rev 6436) +++ csw/mgar/pkg/pyfpconst/trunk/Makefile 2009-09-23 23:17:03 UTC (rev 6437) @@ -13,6 +13,7 @@ MASTER_SITES = http://pypi.python.org/packages/source/f/fpconst/ DISTNAME = fpconst-$(GARVERSION) DISTFILES = $(DISTNAME).tar.gz +SPKG_SOURCEURL = http://pypi.python.org/pypi/fpconst/ PACKAGES = CSWpyfpconst CATALOGNAME = py_fpconst @@ -21,3 +22,9 @@ TEST_SCRIPTS = include gar/category.mk + +post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(CATALOGNAME) +post-install-modulated: + @ginstall -d $(DOCDEST) + @cp $(FILEDIR)/changelog.CSW $(DOCDEST) + @$(MAKECOOKIE) Added: csw/mgar/pkg/pyfpconst/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/pyfpconst/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/pyfpconst/trunk/files/changelog.CSW 2009-09-23 23:17:03 UTC (rev 6437) @@ -0,0 +1,5 @@ +py_fpconst (0.7.2,REV=2009.09.24) + + * Initial release. + + -- Sebastian Kayser Thu, 24 Sep 2009 01:14:30 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Sep 24 03:42:43 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 24 Sep 2009 01:42:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6438] csw/mgar/pkg Message-ID: Revision: 6438 http://gar.svn.sourceforge.net/gar/?rev=6438&view=rev Author: bdwalton Date: 2009-09-24 01:42:43 +0000 (Thu, 24 Sep 2009) Log Message: ----------- gardev: initial commit Added Paths: ----------- csw/mgar/pkg/gardev/ csw/mgar/pkg/gardev/branches/ csw/mgar/pkg/gardev/tags/ csw/mgar/pkg/gardev/trunk/ csw/mgar/pkg/gardev/trunk/Makefile csw/mgar/pkg/gardev/trunk/checksums csw/mgar/pkg/gardev/trunk/files/ csw/mgar/pkg/gardev/trunk/files/README.csw Property changes on: csw/mgar/pkg/gardev/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/gardev/trunk/Makefile =================================================================== --- csw/mgar/pkg/gardev/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gardev/trunk/Makefile 2009-09-24 01:42:43 UTC (rev 6438) @@ -0,0 +1,35 @@ +GARNAME = gar_devel +GARVERSION = 1.0 +CATEGORIES = devel + +DESCRIPTION = Ease setting up a GAR development environment +define BLURB +Pull in all packages required to get started developing OpenCSW packages +with GAR. +endef + +ARCHALL = 1 +PACKAGES = CSWgardevel +CATALOGNAME_CSWgardevel = gar_devel + +# git and netcat are required if a GAR repo is tracking a git repo instead +# of upstream tarballs. svn is required for commiting gar recipes +REQUIRED_PKGS_CSWgardevel = CSWgmake CSWgtar CSWggrep CSWdiffutils CSWgfile +REQUIRED_PKGS_CSWgardevel += CSWtextutils CSWwget CSWfindutils CSWgsed +REQUIRED_PKGS_CSWgardevel += CSWgawk CSWbzip2 CSWlftp CSWgit CSWnetcat +REQUIRED_PKGS_CSWgardevel += CSWsvn + +MASTER_SITES = + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: DOCDIR=$(DESTDIR)/$(docdir)/$(GARNAME) +install-custom: $(WORKSRC) + @(gmkdir -p $(DOCDIR); \ + cp $(FILEDIR)/README.csw $(DOCDIR) ) + @$(MAKECOOKIE) Added: csw/mgar/pkg/gardev/trunk/files/README.csw =================================================================== --- csw/mgar/pkg/gardev/trunk/files/README.csw (rev 0) +++ csw/mgar/pkg/gardev/trunk/files/README.csw 2009-09-24 01:42:43 UTC (rev 6438) @@ -0,0 +1,3 @@ +This is just a dummy package that depends on all CSW packages that are +required to create packages with GAR. Feel free to remove it after +you've used it to install the current requirements. 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 Sep 24 04:21:11 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 24 Sep 2009 02:21:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[6439] csw/mgar/pkg/git/trunk Message-ID: Revision: 6439 http://gar.svn.sourceforge.net/gar/?rev=6439&view=rev Author: bdwalton Date: 2009-09-24 02:21:11 +0000 (Thu, 24 Sep 2009) Log Message: ----------- git: postinstallation register of git-daemon service in /etc/services Modified Paths: -------------- csw/mgar/pkg/git/trunk/checksums csw/mgar/pkg/git/trunk/files/CSWgit.postinstall Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2009-09-24 01:42:43 UTC (rev 6438) +++ csw/mgar/pkg/git/trunk/checksums 2009-09-24 02:21:11 UTC (rev 6439) @@ -1 +1 @@ -76a83b807edbcc41a01d3792d4a0322d download/CSWgit.postinstall +6c2d8cf8dcdfc844ea32bc381f6a3bfd download/CSWgit.postinstall Modified: csw/mgar/pkg/git/trunk/files/CSWgit.postinstall =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgit.postinstall 2009-09-24 01:42:43 UTC (rev 6438) +++ csw/mgar/pkg/git/trunk/files/CSWgit.postinstall 2009-09-24 02:21:11 UTC (rev 6439) @@ -3,9 +3,16 @@ GC_OLD="$PKG_INSTALL_ROOT/opt/csw/etc/gitconfig" GC_NEW="$PKG_INSTALL_ROOT/etc/opt/csw/gitconfig" -# this will hopefully ease the /opt/csw/etc -> /etc/opt/csw -# transition. +# ease the /opt/csw/etc -> /etc/opt/csw transition. if [ -f "$GC_OLD" -a ! -f "$GC_NEW" ]; then echo "Copying /opt/csw/etc/gitconfig to /etc/opt/csw/gitconfig" cp -p "$GC_OLD" "$GC_NEW" fi + +/usr/xpg4/bin/grep -q CSWgit /etc/services +if [ $? -ne 0 ]; then + echo <>/etc/services +git 9418/tcp # CSWgit: git transfer service +git 9418/udp # CSWgit: git transfer service +EOF +fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Sep 24 11:43:50 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 24 Sep 2009 09:43:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6440] csw/mgar/pkg/libntlm/trunk Message-ID: Revision: 6440 http://gar.svn.sourceforge.net/gar/?rev=6440&view=rev Author: dmichelsen Date: 2009-09-24 09:43:50 +0000 (Thu, 24 Sep 2009) Log Message: ----------- libntlm: Interim commit before 1.2, 1.1 is broken and 1.2 not released yet. Just bump version on release 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-09-24 02:21:11 UTC (rev 6439) +++ csw/mgar/pkg/libntlm/trunk/Makefile 2009-09-24 09:43:50 UTC (rev 6440) @@ -1,5 +1,5 @@ GARNAME = libntlm -GARVERSION = 1.1 +GARVERSION = 20090924 CATEGORIES = lib DESCRIPTION = Microsoft WinNT domain authentication library @@ -13,12 +13,15 @@ MASTER_SITES = http://josefsson.org/libntlm/releases/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +WORKSRC = $(WORKDIR)/libntlm-1.2 # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +# We don't need it and if defined the test breaks +LD_OPTIONS = + BUILD64 = 1 - CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/libntlm/trunk/checksums =================================================================== --- csw/mgar/pkg/libntlm/trunk/checksums 2009-09-24 02:21:11 UTC (rev 6439) +++ csw/mgar/pkg/libntlm/trunk/checksums 2009-09-24 09:43:50 UTC (rev 6440) @@ -1 +1 @@ -9ae0b6fa77c3f789e68db1fd708159e1 download/libntlm-1.1.tar.gz +5fa3bc33be1be487de1b0f23db469d3f download/libntlm-20090924.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 Sep 24 13:18:28 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 24 Sep 2009 11:18:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[6441] csw/mgar/pkg/openldap/trunk Message-ID: Revision: 6441 http://gar.svn.sourceforge.net/gar/?rev=6441&view=rev Author: dmichelsen Date: 2009-09-24 11:18:28 +0000 (Thu, 24 Sep 2009) Log Message: ----------- openldap: Added version modulation for 2.3.x to support 2.3.so legacy lib. Release pending BDB cleanup 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-09-24 09:43:50 UTC (rev 6440) +++ csw/mgar/pkg/openldap/trunk/Makefile 2009-09-24 11:18:28 UTC (rev 6441) @@ -1,6 +1,8 @@ GARNAME = openldap GARVERSION = 2.4.18 CATEGORIES = server +EXTRA_MODULATORS = GARVERSION +MODULATIONS_GARVERSION = 2.3.43 2.4.18 DESCRIPTION = Open source implementation of the Lightweight Directory Access Protocol define BLURB @@ -11,12 +13,24 @@ 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/ -DISTFILES = $(GARNAME)-$(GARVERSION).tgz +SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(GARNAME)-$(VERSION).tgz) +DISTFILES = $(SOURCEFILES) DISTFILES += $(call admfiles,CSWoldap) 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 +DISTFILES += patch-oldap-2.4.16-ntlm.diff + + +NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tgz,$(SOURCEFILES)) + LICENSE = COPYRIGHT PACKAGES = CSWoldap CSWoldapclient CSWoldapdevel CSWoldaprt @@ -43,12 +57,9 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PATCHFILES = patch-oldap-2.4.16-ntlm.diff -PATCHFILES += patch-libtool-64bit.diff -DISTFILES += patch-oldap-2.4.16-ntlm.diff - EXTRA_DOCS = README.CSW $(PATCHFILES) +# OpenLDAP 2.3 was bound to bdb44 #EXTRA_LIB = $(prefix)/bdb44/lib #EXTRA_INC = $(prefix)/bdb44/include Modified: csw/mgar/pkg/openldap/trunk/checksums =================================================================== --- csw/mgar/pkg/openldap/trunk/checksums 2009-09-24 09:43:50 UTC (rev 6440) +++ csw/mgar/pkg/openldap/trunk/checksums 2009-09-24 11:18:28 UTC (rev 6441) @@ -1,9 +1,9 @@ 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 -93dc2a04fd943c198ad00edd4d88ce65 download/patch-libtool-64bit.diff d3dee9018137c39f357859b652e3a67c download/patch-oldap-2.4.16-ntlm.diff e15c2020566e56f02118e75c89111f15 download/svc-openldap 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 Sep 24 19:01:13 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 24 Sep 2009 17:01:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[6442] csw/mgar/pkg Message-ID: Revision: 6442 http://gar.svn.sourceforge.net/gar/?rev=6442&view=rev Author: wahwah Date: 2009-09-24 17:01:12 +0000 (Thu, 24 Sep 2009) Log Message: ----------- modulatedpkg: An example of simple modulated package Modified Paths: -------------- csw/mgar/pkg/examples/modulations/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/examples/ csw/mgar/pkg/examples/modulations/ Modified: csw/mgar/pkg/examples/modulations/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-09-24 11:18:28 UTC (rev 6441) +++ csw/mgar/pkg/examples/modulations/trunk/Makefile 2009-09-24 17:01:12 UTC (rev 6442) @@ -2,181 +2,36 @@ # 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. +# The resulting prototype should look like this: +# +# f none /opt/csw/share/example-1.0.txt 0644 root bin +# f none /opt/csw/share/example-1.1.txt 0644 root bin +# f none /opt/csw/share/example-2.0.txt 0644 root bin +# i depend=CSWmodulatedpkg.depend +# i pkginfo=CSWmodulatedpkg.pkginfo + +GARNAME = modulatedpkg +GARVERSION = 2.0 +CATEGORIES = utils +DESCRIPTION = An example of a modulated package 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 -## 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 +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = example +TEST_SCRIPTS = -#include gar/category.mk +EXTRA_MODULATORS = GARVERSION +MODULATIONS_GARVERSION = 1.0 1.1 2.0 +MERGE_SCRIPTS_isa-sparcv8-garversion-1.0 = copy-all +MERGE_SCRIPTS_isa-sparcv8-garversion-1.1 = copy-all +MERGE_SCRIPTS_isa-sparcv8-garversion-2.0 = copy-all + +# A really simple installator, creating different files for each GARVERSION. +install-example: + ginstall -d -m 755 $(DESTDIR)$(datadir) + echo "This file belongs to the $(GARNAME)-$(GARVERSION)." \ + > $(DESTDIR)$(datadir)/example-$(GARVERSION).txt + @$(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 Sep 24 19:03:41 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 24 Sep 2009 17:03:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[6443] csw/mgar/pkg Message-ID: Revision: 6443 http://gar.svn.sourceforge.net/gar/?rev=6443&view=rev Author: wahwah Date: 2009-09-24 17:03:41 +0000 (Thu, 24 Sep 2009) Log Message: ----------- minimalsmf: Moving into the examples directory Added Paths: ----------- csw/mgar/pkg/examples/minimalsmf/ Removed Paths: ------------- csw/mgar/pkg/minimalsmf/ 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 Sep 24 21:50:50 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 24 Sep 2009 19:50:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6444] csw/mgar/pkg Message-ID: Revision: 6444 http://gar.svn.sourceforge.net/gar/?rev=6444&view=rev Author: skayser Date: 2009-09-24 19:50:50 +0000 (Thu, 24 Sep 2009) Log Message: ----------- supybot: initial commit, work in progress Added Paths: ----------- csw/mgar/pkg/supybot/ csw/mgar/pkg/supybot/branches/ csw/mgar/pkg/supybot/tags/ csw/mgar/pkg/supybot/trunk/ csw/mgar/pkg/supybot/trunk/Makefile csw/mgar/pkg/supybot/trunk/checksums csw/mgar/pkg/supybot/trunk/files/ csw/mgar/pkg/supybot/trunk/files/changelog.CSW Property changes on: csw/mgar/pkg/supybot/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/supybot/trunk/Makefile =================================================================== --- csw/mgar/pkg/supybot/trunk/Makefile (rev 0) +++ csw/mgar/pkg/supybot/trunk/Makefile 2009-09-24 19:50:50 UTC (rev 6444) @@ -0,0 +1,26 @@ +# TODO +# - Check whether additional dependencies are needed +GARNAME = supybot +GARVERSION = 0.83.4.1 +CATEGORIES = python + +DESCRIPTION = Robust, user-friendly, and extensible IRC bot +define BLURB +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTNAME = Supybot-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz + +EXTRA_PAX_ARGS = '-s,ChangeLog$$,changelog,p' +TEST_SCRIPTS = + +include gar/category.mk + +post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(CATALOGNAME) +post-install-modulated: DOCS=ChangeLog ACKS +post-install-modulated: + ginstall -d $(DOCDEST) + cp $(FILEDIR)/changelog.CSW $(DOCDEST) + cp $(addprefix $(WORKSRC)/, $(DOCS)) $(DOCDEST) + @$(MAKECOOKIE) Added: csw/mgar/pkg/supybot/trunk/checksums =================================================================== --- csw/mgar/pkg/supybot/trunk/checksums (rev 0) +++ csw/mgar/pkg/supybot/trunk/checksums 2009-09-24 19:50:50 UTC (rev 6444) @@ -0,0 +1 @@ +3efd15ea1516101cbf22b68c26452889 download/Supybot-0.83.4.1.tar.gz Added: csw/mgar/pkg/supybot/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/supybot/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/supybot/trunk/files/changelog.CSW 2009-09-24 19:50:50 UTC (rev 6444) @@ -0,0 +1,5 @@ +supybot (0.83.4.1,REV=2009.09.24) + + * Initial release. + + -- Sebastian Kayser Thu, 24 Sep 2009 21:24:03 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Sep 24 22:23:37 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 24 Sep 2009 20:23:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[6445] csw/mgar/pkg/gitosis/trunk/Makefile Message-ID: Revision: 6445 http://gar.svn.sourceforge.net/gar/?rev=6445&view=rev Author: bdwalton Date: 2009-09-24 20:23:37 +0000 (Thu, 24 Sep 2009) Log Message: ----------- gitosis: make dep on bash explicit instead of via git Modified Paths: -------------- csw/mgar/pkg/gitosis/trunk/Makefile Modified: csw/mgar/pkg/gitosis/trunk/Makefile =================================================================== --- csw/mgar/pkg/gitosis/trunk/Makefile 2009-09-24 19:50:50 UTC (rev 6444) +++ csw/mgar/pkg/gitosis/trunk/Makefile 2009-09-24 20:23:37 UTC (rev 6445) @@ -26,7 +26,7 @@ PREREQUISITE_PKGS_CSWgitosis = CSWpython CSWpysetuptools -REQUIRED_PKGS_CSWgitosis = CSWgit CSWpysetuptools +REQUIRED_PKGS_CSWgitosis = CSWgit CSWpysetuptools CSWbash GIT_REPOS = git://eagain.net/gitosis.git GIT_USE_PROXY = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Sep 24 22:26:34 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 24 Sep 2009 20:26:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[6446] csw/mgar/pkg/examples/modulations/branches/ minimal-version-modulation/ Message-ID: Revision: 6446 http://gar.svn.sourceforge.net/gar/?rev=6446&view=rev Author: wahwah Date: 2009-09-24 20:26:34 +0000 (Thu, 24 Sep 2009) Log Message: ----------- examples/modulations: Storing the simplest example of version modulation. Added Paths: ----------- csw/mgar/pkg/examples/modulations/branches/minimal-version-modulation/ 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 Sep 24 23:03:54 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 24 Sep 2009 21:03:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[6447] csw/mgar/pkg/x11 Message-ID: Revision: 6447 http://gar.svn.sourceforge.net/gar/?rev=6447&view=rev Author: wbonnet Date: 2009-09-24 21:03:54 +0000 (Thu, 24 Sep 2009) Log Message: ----------- initial commit Added Paths: ----------- csw/mgar/pkg/x11/xineramaproto/ csw/mgar/pkg/x11/xineramaproto/branches/ csw/mgar/pkg/x11/xineramaproto/tags/ csw/mgar/pkg/x11/xineramaproto/trunk/ csw/mgar/pkg/x11/xineramaproto/trunk/Makefile csw/mgar/pkg/x11/xineramaproto/trunk/checksums csw/mgar/pkg/x11/xineramaproto/trunk/files/ Property changes on: csw/mgar/pkg/x11/xineramaproto/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/x11/xineramaproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xineramaproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/xineramaproto/trunk/Makefile 2009-09-24 21:03:54 UTC (rev 6447) @@ -0,0 +1,22 @@ +GARNAME = xineramaproto +GARVERSION = 1.1.2 +CATEGORIES = x11 + +DESCRIPTION = X.Org Xinerama protocol headers +define BLURB + Prototype headers for Xinerama extension to X11 +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/xineramaproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xineramaproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/xineramaproto/trunk/checksums 2009-09-24 21:03:54 UTC (rev 6447) @@ -0,0 +1 @@ +1ad90ffc98d49c0dc5abb11e78b8d1aa download/xineramaproto-1.1.2.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 Thu Sep 24 23:06:19 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 24 Sep 2009 21:06:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[6448] csw/mgar/pkg/x11/xineramaproto/Makefile Message-ID: Revision: 6448 http://gar.svn.sourceforge.net/gar/?rev=6448&view=rev Author: wbonnet Date: 2009-09-24 21:06:18 +0000 (Thu, 24 Sep 2009) Log Message: ----------- Added Paths: ----------- csw/mgar/pkg/x11/xineramaproto/Makefile Added: csw/mgar/pkg/x11/xineramaproto/Makefile =================================================================== --- csw/mgar/pkg/x11/xineramaproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/xineramaproto/Makefile 2009-09-24 21:06:18 UTC (rev 6448) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/x11/xproto directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Thu Sep 24 23:23:07 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 24 Sep 2009 21:23:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[6449] csw/mgar/pkg/x11 Message-ID: Revision: 6449 http://gar.svn.sourceforge.net/gar/?rev=6449&view=rev Author: wbonnet Date: 2009-09-24 21:23:06 +0000 (Thu, 24 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/compositeproto/ csw/mgar/pkg/x11/compositeproto/Makefile csw/mgar/pkg/x11/compositeproto/branches/ csw/mgar/pkg/x11/compositeproto/tags/ csw/mgar/pkg/x11/compositeproto/trunk/ csw/mgar/pkg/x11/compositeproto/trunk/Makefile csw/mgar/pkg/x11/compositeproto/trunk/checksums csw/mgar/pkg/x11/compositeproto/trunk/files/ Added: csw/mgar/pkg/x11/compositeproto/Makefile =================================================================== --- csw/mgar/pkg/x11/compositeproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/compositeproto/Makefile 2009-09-24 21:23:06 UTC (rev 6449) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/x11/xproto directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/x11/compositeproto/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/x11/compositeproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/compositeproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/compositeproto/trunk/Makefile 2009-09-24 21:23:06 UTC (rev 6449) @@ -0,0 +1,22 @@ +GARNAME = compositeproto +GARVERSION = 0.4 +CATEGORIES = x11 + +DESCRIPTION = X.Org Composite protocol headers +define BLURB + Composite protocol headers from modular X.org X11 +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/compositeproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/compositeproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/compositeproto/trunk/checksums 2009-09-24 21:23:06 UTC (rev 6449) @@ -0,0 +1 @@ +33a79f6ba950bc5b41e077c951871bd5 download/compositeproto-0.4.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 Thu Sep 24 23:32:35 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 24 Sep 2009 21:32:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[6450] csw/mgar/pkg/x11 Message-ID: Revision: 6450 http://gar.svn.sourceforge.net/gar/?rev=6450&view=rev Author: wbonnet Date: 2009-09-24 21:32:35 +0000 (Thu, 24 Sep 2009) Log Message: ----------- initial commit Added Paths: ----------- csw/mgar/pkg/x11/damageproto/ csw/mgar/pkg/x11/damageproto/Makefile csw/mgar/pkg/x11/damageproto/branches/ csw/mgar/pkg/x11/damageproto/tags/ csw/mgar/pkg/x11/damageproto/trunk/ csw/mgar/pkg/x11/damageproto/trunk/Makefile csw/mgar/pkg/x11/damageproto/trunk/checksums csw/mgar/pkg/x11/damageproto/trunk/files/ Added: csw/mgar/pkg/x11/damageproto/Makefile =================================================================== --- csw/mgar/pkg/x11/damageproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/damageproto/Makefile 2009-09-24 21:32:35 UTC (rev 6450) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/x11/xproto directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/x11/damageproto/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/x11/damageproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/damageproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/damageproto/trunk/Makefile 2009-09-24 21:32:35 UTC (rev 6450) @@ -0,0 +1,22 @@ +GARNAME = damageproto +GARVERSION = 1.2.0 +CATEGORIES = x11 + +DESCRIPTION = X.Org Damage protocol headers +define BLURB + X.Org Damage protocol headers from modular X.org X11 +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/damageproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/damageproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/damageproto/trunk/checksums 2009-09-24 21:32:35 UTC (rev 6450) @@ -0,0 +1 @@ +423516fd64e43e8671120056b0d9f597 download/damageproto-1.2.0.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 Thu Sep 24 23:56:30 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 24 Sep 2009 21:56:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[6451] csw/mgar/pkg/x11 Message-ID: Revision: 6451 http://gar.svn.sourceforge.net/gar/?rev=6451&view=rev Author: wbonnet Date: 2009-09-24 21:56:30 +0000 (Thu, 24 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/applewmproto/ csw/mgar/pkg/x11/applewmproto/Makefile csw/mgar/pkg/x11/applewmproto/branches/ csw/mgar/pkg/x11/applewmproto/tags/ csw/mgar/pkg/x11/applewmproto/trunk/ csw/mgar/pkg/x11/applewmproto/trunk/Makefile csw/mgar/pkg/x11/applewmproto/trunk/checksums csw/mgar/pkg/x11/applewmproto/trunk/files/ Added: csw/mgar/pkg/x11/applewmproto/Makefile =================================================================== --- csw/mgar/pkg/x11/applewmproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/applewmproto/Makefile 2009-09-24 21:56:30 UTC (rev 6451) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/x11/xproto directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/x11/applewmproto/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/x11/applewmproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/applewmproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/applewmproto/trunk/Makefile 2009-09-24 21:56:30 UTC (rev 6451) @@ -0,0 +1,22 @@ +GARNAME = applewmproto +GARVERSION = 1.4.1 +CATEGORIES = x11 + +DESCRIPTION = AppleWM extension headers from X.org +define BLURB + AppleWM extension headers from modular X.org X11 project +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/applewmproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/applewmproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/applewmproto/trunk/checksums 2009-09-24 21:56:30 UTC (rev 6451) @@ -0,0 +1 @@ +822151ea24caf7c23ced6da7a14dfb4d download/applewmproto-1.4.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 Thu Sep 24 23:59:14 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 24 Sep 2009 21:59:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6452] csw/mgar/pkg/x11 Message-ID: Revision: 6452 http://gar.svn.sourceforge.net/gar/?rev=6452&view=rev Author: wbonnet Date: 2009-09-24 21:59:14 +0000 (Thu, 24 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/bigreqsproto/ csw/mgar/pkg/x11/bigreqsproto/Makefile csw/mgar/pkg/x11/bigreqsproto/branches/ csw/mgar/pkg/x11/bigreqsproto/tags/ csw/mgar/pkg/x11/bigreqsproto/trunk/ csw/mgar/pkg/x11/bigreqsproto/trunk/Makefile csw/mgar/pkg/x11/bigreqsproto/trunk/checksums csw/mgar/pkg/x11/bigreqsproto/trunk/files/ Added: csw/mgar/pkg/x11/bigreqsproto/Makefile =================================================================== --- csw/mgar/pkg/x11/bigreqsproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/bigreqsproto/Makefile 2009-09-24 21:59:14 UTC (rev 6452) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/x11/xproto directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/x11/bigreqsproto/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/x11/bigreqsproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/bigreqsproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/bigreqsproto/trunk/Makefile 2009-09-24 21:59:14 UTC (rev 6452) @@ -0,0 +1,22 @@ +GARNAME = bigreqsproto +GARVERSION = 1.1.0 +CATEGORIES = x11 + +DESCRIPTION = Prototype headers for BigReqs extension to X11 +define BLURB + Prototype headers for BigReqs extension to X11 for modular X.org project +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/bigreqsproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/bigreqsproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/bigreqsproto/trunk/checksums 2009-09-24 21:59:14 UTC (rev 6452) @@ -0,0 +1 @@ +882d49cc3bb591dbdccdf9e680bd2e4b download/bigreqsproto-1.1.0.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 Sep 25 00:10:46 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 24 Sep 2009 22:10:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6453] csw/mgar/pkg/x11 Message-ID: Revision: 6453 http://gar.svn.sourceforge.net/gar/?rev=6453&view=rev Author: wbonnet Date: 2009-09-24 22:10:46 +0000 (Thu, 24 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/dmxproto/ csw/mgar/pkg/x11/dmxproto/Makefile csw/mgar/pkg/x11/dmxproto/branches/ csw/mgar/pkg/x11/dmxproto/tags/ csw/mgar/pkg/x11/dmxproto/trunk/ csw/mgar/pkg/x11/dmxproto/trunk/Makefile csw/mgar/pkg/x11/dmxproto/trunk/checksums csw/mgar/pkg/x11/dmxproto/trunk/files/ Added: csw/mgar/pkg/x11/dmxproto/Makefile =================================================================== --- csw/mgar/pkg/x11/dmxproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/dmxproto/Makefile 2009-09-24 22:10:46 UTC (rev 6453) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/x11/xproto directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/x11/dmxproto/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/x11/dmxproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/dmxproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/dmxproto/trunk/Makefile 2009-09-24 22:10:46 UTC (rev 6453) @@ -0,0 +1,22 @@ +GARNAME = dmxproto +GARVERSION = 2.2.2 +CATEGORIES = x11 + +DESCRIPTION = Distributed Multi-headed X protocol headers for X11 +define BLURB + Distributed Multi-headed X protocol headers from modular X.org : "your networked Xinerama". +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/dmxproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/dmxproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/dmxproto/trunk/checksums 2009-09-24 22:10:46 UTC (rev 6453) @@ -0,0 +1 @@ +c76b374240fdb37af3ff62cbd484ec72 download/dmxproto-2.2.2.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 Sep 25 00:11:47 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 24 Sep 2009 22:11:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[6454] csw/mgar/pkg/x11 Message-ID: Revision: 6454 http://gar.svn.sourceforge.net/gar/?rev=6454&view=rev Author: wbonnet Date: 2009-09-24 22:11:47 +0000 (Thu, 24 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/dri2proto/ csw/mgar/pkg/x11/dri2proto/Makefile csw/mgar/pkg/x11/dri2proto/branches/ csw/mgar/pkg/x11/dri2proto/tags/ csw/mgar/pkg/x11/dri2proto/trunk/ csw/mgar/pkg/x11/dri2proto/trunk/Makefile csw/mgar/pkg/x11/dri2proto/trunk/checksums csw/mgar/pkg/x11/dri2proto/trunk/files/ Added: csw/mgar/pkg/x11/dri2proto/Makefile =================================================================== --- csw/mgar/pkg/x11/dri2proto/Makefile (rev 0) +++ csw/mgar/pkg/x11/dri2proto/Makefile 2009-09-24 22:11:47 UTC (rev 6454) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/x11/xproto directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/x11/dri2proto/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/x11/dri2proto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/dri2proto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/dri2proto/trunk/Makefile 2009-09-24 22:11:47 UTC (rev 6454) @@ -0,0 +1,22 @@ +GARNAME = dri2proto +GARVERSION = 2.1 +CATEGORIES = x11 + +DESCRIPTION = X.Org DRI2 prototype headers +define BLURB + DRI2 prototype headers from modular X.org +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/dri2proto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/dri2proto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/dri2proto/trunk/checksums 2009-09-24 22:11:47 UTC (rev 6454) @@ -0,0 +1 @@ +4815a9ac0682528aba50759b6f611acb download/dri2proto-2.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 Sep 25 00:12:43 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 24 Sep 2009 22:12:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6455] csw/mgar/pkg/x11 Message-ID: Revision: 6455 http://gar.svn.sourceforge.net/gar/?rev=6455&view=rev Author: wbonnet Date: 2009-09-24 22:12:43 +0000 (Thu, 24 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/evieextproto/ csw/mgar/pkg/x11/evieextproto/Makefile csw/mgar/pkg/x11/evieextproto/branches/ csw/mgar/pkg/x11/evieextproto/tags/ csw/mgar/pkg/x11/evieextproto/trunk/ csw/mgar/pkg/x11/evieextproto/trunk/Makefile csw/mgar/pkg/x11/evieextproto/trunk/checksums csw/mgar/pkg/x11/evieextproto/trunk/files/ Added: csw/mgar/pkg/x11/evieextproto/Makefile =================================================================== --- csw/mgar/pkg/x11/evieextproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/evieextproto/Makefile 2009-09-24 22:12:43 UTC (rev 6455) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/x11/xproto directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/x11/evieextproto/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/x11/evieextproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/evieextproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/evieextproto/trunk/Makefile 2009-09-24 22:12:43 UTC (rev 6455) @@ -0,0 +1,22 @@ +GARNAME = evieext +GARVERSION = 1.1.0 +CATEGORIES = x11 + +DESCRIPTION = X.Org EvIE protocol headers +define BLURB + EvIE protocol headers from modular X.org X11 +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/evieextproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/evieextproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/evieextproto/trunk/checksums 2009-09-24 22:12:43 UTC (rev 6455) @@ -0,0 +1 @@ +68e61ce53caa495a3ad4085f66010eb8 download/evieext-1.1.0.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 Sep 25 00:26:14 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 24 Sep 2009 22:26:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6456] csw/mgar/pkg/x11 Message-ID: Revision: 6456 http://gar.svn.sourceforge.net/gar/?rev=6456&view=rev Author: wbonnet Date: 2009-09-24 22:26:14 +0000 (Thu, 24 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/fixesproto/ csw/mgar/pkg/x11/fixesproto/Makefile csw/mgar/pkg/x11/fixesproto/branches/ csw/mgar/pkg/x11/fixesproto/tags/ csw/mgar/pkg/x11/fixesproto/trunk/ csw/mgar/pkg/x11/fixesproto/trunk/Makefile csw/mgar/pkg/x11/fixesproto/trunk/checksums csw/mgar/pkg/x11/fixesproto/trunk/files/ Added: csw/mgar/pkg/x11/fixesproto/Makefile =================================================================== --- csw/mgar/pkg/x11/fixesproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/fixesproto/Makefile 2009-09-24 22:26:14 UTC (rev 6456) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/x11/xproto directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/x11/fixesproto/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/x11/fixesproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/fixesproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/fixesproto/trunk/Makefile 2009-09-24 22:26:14 UTC (rev 6456) @@ -0,0 +1,22 @@ +GARNAME = fixesproto +GARVERSION = 4.1 +CATEGORIES = x11 + +DESCRIPTION = X11 Fixes extension protocol specification +define BLURB + Fixes extension protocol specification modular X.org +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/fixesproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/fixesproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/fixesproto/trunk/checksums 2009-09-24 22:26:14 UTC (rev 6456) @@ -0,0 +1 @@ +c8dc868f8f23bb4b545e6b98aed375b4 download/fixesproto-4.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 Sep 25 00:27:18 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 24 Sep 2009 22:27:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[6457] csw/mgar/pkg/x11 Message-ID: Revision: 6457 http://gar.svn.sourceforge.net/gar/?rev=6457&view=rev Author: wbonnet Date: 2009-09-24 22:27:17 +0000 (Thu, 24 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/fontcacheproto/ csw/mgar/pkg/x11/fontcacheproto/Makefile csw/mgar/pkg/x11/fontcacheproto/branches/ csw/mgar/pkg/x11/fontcacheproto/tags/ csw/mgar/pkg/x11/fontcacheproto/trunk/ csw/mgar/pkg/x11/fontcacheproto/trunk/Makefile csw/mgar/pkg/x11/fontcacheproto/trunk/checksums csw/mgar/pkg/x11/fontcacheproto/trunk/files/ Added: csw/mgar/pkg/x11/fontcacheproto/Makefile =================================================================== --- csw/mgar/pkg/x11/fontcacheproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/fontcacheproto/Makefile 2009-09-24 22:27:17 UTC (rev 6457) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/x11/xproto directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/x11/fontcacheproto/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/x11/fontcacheproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/fontcacheproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/fontcacheproto/trunk/Makefile 2009-09-24 22:27:17 UTC (rev 6457) @@ -0,0 +1,22 @@ +GARNAME = fontcacheproto +GARVERSION = 0.1.2 +CATEGORIES = x11 + +DESCRIPTION = X11 Prototype headers for the Fontcache library +define BLURB + Prototype headers for the Fontcache library from modular X.org +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/fontcacheproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/fontcacheproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/fontcacheproto/trunk/checksums 2009-09-24 22:27:17 UTC (rev 6457) @@ -0,0 +1 @@ +dc8c34a8c3559bf3b008bcdf7ba5a743 download/fontcacheproto-0.1.2.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 Sep 25 00:28:34 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 24 Sep 2009 22:28:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[6458] csw/mgar/pkg/x11 Message-ID: Revision: 6458 http://gar.svn.sourceforge.net/gar/?rev=6458&view=rev Author: wbonnet Date: 2009-09-24 22:28:34 +0000 (Thu, 24 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/randrproto/ csw/mgar/pkg/x11/randrproto/Makefile csw/mgar/pkg/x11/randrproto/branches/ csw/mgar/pkg/x11/randrproto/tags/ csw/mgar/pkg/x11/randrproto/trunk/ csw/mgar/pkg/x11/randrproto/trunk/Makefile csw/mgar/pkg/x11/randrproto/trunk/checksums csw/mgar/pkg/x11/randrproto/trunk/files/ Added: csw/mgar/pkg/x11/randrproto/Makefile =================================================================== --- csw/mgar/pkg/x11/randrproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/randrproto/Makefile 2009-09-24 22:28:34 UTC (rev 6458) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/x11/xproto directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/x11/randrproto/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/x11/randrproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/randrproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/randrproto/trunk/Makefile 2009-09-24 22:28:34 UTC (rev 6458) @@ -0,0 +1,22 @@ +GARNAME = randrproto +GARVERSION = 1.3.0 +CATEGORIES = x11 + +DESCRIPTION = X.Org Randr protocol headers +define BLURB + Randr protocol headers from modular X.org +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/randrproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/randrproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/randrproto/trunk/checksums 2009-09-24 22:28:34 UTC (rev 6458) @@ -0,0 +1 @@ +5804ffeea0e40982258cc4618b8c6f07 download/randrproto-1.3.0.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 Sep 25 00:32:59 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 24 Sep 2009 22:32:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6459] csw/mgar/pkg/x11 Message-ID: Revision: 6459 http://gar.svn.sourceforge.net/gar/?rev=6459&view=rev Author: wbonnet Date: 2009-09-24 22:32:59 +0000 (Thu, 24 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/scrnsaverproto/ csw/mgar/pkg/x11/scrnsaverproto/Makefile csw/mgar/pkg/x11/scrnsaverproto/branches/ csw/mgar/pkg/x11/scrnsaverproto/tags/ csw/mgar/pkg/x11/scrnsaverproto/trunk/ csw/mgar/pkg/x11/scrnsaverproto/trunk/Makefile csw/mgar/pkg/x11/scrnsaverproto/trunk/checksums csw/mgar/pkg/x11/scrnsaverproto/trunk/files/ Added: csw/mgar/pkg/x11/scrnsaverproto/Makefile =================================================================== --- csw/mgar/pkg/x11/scrnsaverproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/scrnsaverproto/Makefile 2009-09-24 22:32:59 UTC (rev 6459) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/x11/xproto directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/x11/scrnsaverproto/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/x11/scrnsaverproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/scrnsaverproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/scrnsaverproto/trunk/Makefile 2009-09-24 22:32:59 UTC (rev 6459) @@ -0,0 +1,22 @@ +GARNAME = scrnsaverproto +GARVERSION = 1.2.0 +CATEGORIES = x11 + +DESCRIPTION = X.Org ScrnSaver protocol headers +define BLURB + ScrnSaver protocol headers from modular X.org +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/scrnsaverproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/scrnsaverproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/scrnsaverproto/trunk/checksums 2009-09-24 22:32:59 UTC (rev 6459) @@ -0,0 +1 @@ +0ed88bdd6945ba207c4f734af48e7e25 download/scrnsaverproto-1.2.0.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 Sep 25 00:33:52 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 24 Sep 2009 22:33:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[6460] csw/mgar/pkg/x11 Message-ID: Revision: 6460 http://gar.svn.sourceforge.net/gar/?rev=6460&view=rev Author: wbonnet Date: 2009-09-24 22:33:52 +0000 (Thu, 24 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/trapproto/ csw/mgar/pkg/x11/trapproto/Makefile csw/mgar/pkg/x11/trapproto/branches/ csw/mgar/pkg/x11/trapproto/tags/ csw/mgar/pkg/x11/trapproto/trunk/ csw/mgar/pkg/x11/trapproto/trunk/Makefile csw/mgar/pkg/x11/trapproto/trunk/checksums csw/mgar/pkg/x11/trapproto/trunk/files/ Added: csw/mgar/pkg/x11/trapproto/Makefile =================================================================== --- csw/mgar/pkg/x11/trapproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/trapproto/Makefile 2009-09-24 22:33:52 UTC (rev 6460) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/x11/xproto directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/x11/trapproto/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/x11/trapproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/trapproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/trapproto/trunk/Makefile 2009-09-24 22:33:52 UTC (rev 6460) @@ -0,0 +1,22 @@ +GARNAME = trapproto +GARVERSION = 3.4.3 +CATEGORIES = x11 + +DESCRIPTION = X.Org Trap protocol headers +define BLURB + Trap protocol headers from modular X.org +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/trapproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/trapproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/trapproto/trunk/checksums 2009-09-24 22:33:52 UTC (rev 6460) @@ -0,0 +1 @@ +1344759ae8d7d923e64f5eec078a679b download/trapproto-3.4.3.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 Sep 25 00:36:13 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 24 Sep 2009 22:36:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[6461] csw/mgar/pkg/x11 Message-ID: Revision: 6461 http://gar.svn.sourceforge.net/gar/?rev=6461&view=rev Author: wbonnet Date: 2009-09-24 22:36:13 +0000 (Thu, 24 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/windowswmproto/ csw/mgar/pkg/x11/windowswmproto/Makefile csw/mgar/pkg/x11/windowswmproto/branches/ csw/mgar/pkg/x11/windowswmproto/tags/ csw/mgar/pkg/x11/windowswmproto/trunk/ csw/mgar/pkg/x11/windowswmproto/trunk/Makefile csw/mgar/pkg/x11/windowswmproto/trunk/checksums csw/mgar/pkg/x11/windowswmproto/trunk/files/ Added: csw/mgar/pkg/x11/windowswmproto/Makefile =================================================================== --- csw/mgar/pkg/x11/windowswmproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/windowswmproto/Makefile 2009-09-24 22:36:13 UTC (rev 6461) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/x11/xproto directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/x11/windowswmproto/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/x11/windowswmproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/windowswmproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/windowswmproto/trunk/Makefile 2009-09-24 22:36:13 UTC (rev 6461) @@ -0,0 +1,22 @@ +GARNAME = windowswmproto +GARVERSION = 1.0.3 +CATEGORIES = x11 + +DESCRIPTION = Windowswmproto headers for X.org +define BLURB + Windowswmproto headers from modular X.org +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/windowswmproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/windowswmproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/windowswmproto/trunk/checksums 2009-09-24 22:36:13 UTC (rev 6461) @@ -0,0 +1 @@ +a306fcd4afa9c5f981b8c1b45c725dec download/windowswmproto-1.0.3.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 Sep 25 00:37:16 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 24 Sep 2009 22:37:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[6462] csw/mgar/pkg/x11 Message-ID: Revision: 6462 http://gar.svn.sourceforge.net/gar/?rev=6462&view=rev Author: wbonnet Date: 2009-09-24 22:37:16 +0000 (Thu, 24 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/xcmiscproto/ csw/mgar/pkg/x11/xcmiscproto/Makefile csw/mgar/pkg/x11/xcmiscproto/branches/ csw/mgar/pkg/x11/xcmiscproto/tags/ csw/mgar/pkg/x11/xcmiscproto/trunk/ csw/mgar/pkg/x11/xcmiscproto/trunk/Makefile csw/mgar/pkg/x11/xcmiscproto/trunk/checksums csw/mgar/pkg/x11/xcmiscproto/trunk/files/ Added: csw/mgar/pkg/x11/xcmiscproto/Makefile =================================================================== --- csw/mgar/pkg/x11/xcmiscproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/xcmiscproto/Makefile 2009-09-24 22:37:16 UTC (rev 6462) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/x11/xproto directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/x11/xcmiscproto/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/x11/xcmiscproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xcmiscproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/xcmiscproto/trunk/Makefile 2009-09-24 22:37:16 UTC (rev 6462) @@ -0,0 +1,22 @@ +GARNAME = xcmiscproto +GARVERSION = 1.2.0 +CATEGORIES = x11 + +DESCRIPTION = X.Org XCMisc extension headers +define BLURB + XCMisc extension headers from modular X.org +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/xcmiscproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xcmiscproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/xcmiscproto/trunk/checksums 2009-09-24 22:37:16 UTC (rev 6462) @@ -0,0 +1 @@ +bacfb0f3cb4d6e1a71770307bfdba129 download/xcmiscproto-1.2.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Sep 25 01:40:39 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 24 Sep 2009 23:40:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[6463] csw/mgar/pkg/gitosis/trunk/Makefile Message-ID: Revision: 6463 http://gar.svn.sourceforge.net/gar/?rev=6463&view=rev Author: bdwalton Date: 2009-09-24 23:40:39 +0000 (Thu, 24 Sep 2009) Log Message: ----------- gitosis: remove CSWbash dep; I used /bin/bash for gitosis users... Modified Paths: -------------- csw/mgar/pkg/gitosis/trunk/Makefile Modified: csw/mgar/pkg/gitosis/trunk/Makefile =================================================================== --- csw/mgar/pkg/gitosis/trunk/Makefile 2009-09-24 22:37:16 UTC (rev 6462) +++ csw/mgar/pkg/gitosis/trunk/Makefile 2009-09-24 23:40:39 UTC (rev 6463) @@ -26,7 +26,7 @@ PREREQUISITE_PKGS_CSWgitosis = CSWpython CSWpysetuptools -REQUIRED_PKGS_CSWgitosis = CSWgit CSWpysetuptools CSWbash +REQUIRED_PKGS_CSWgitosis = CSWgit CSWpysetuptools GIT_REPOS = git://eagain.net/gitosis.git GIT_USE_PROXY = 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 Sep 25 02:16:38 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 25 Sep 2009 00:16:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6464] csw/mgar/pkg/gitosis/trunk/Makefile Message-ID: Revision: 6464 http://gar.svn.sourceforge.net/gar/?rev=6464&view=rev Author: bdwalton Date: 2009-09-25 00:16:38 +0000 (Fri, 25 Sep 2009) Log Message: ----------- gitosis: set csw bash as shell for gitosis user; depend on csw bash again; rework spkg_classes handling so that ugfiles triggers _after_ cswusergroup (bug after moving to USERGROUP var) Modified Paths: -------------- csw/mgar/pkg/gitosis/trunk/Makefile Modified: csw/mgar/pkg/gitosis/trunk/Makefile =================================================================== --- csw/mgar/pkg/gitosis/trunk/Makefile 2009-09-24 23:40:39 UTC (rev 6463) +++ csw/mgar/pkg/gitosis/trunk/Makefile 2009-09-25 00:16:38 UTC (rev 6464) @@ -26,7 +26,7 @@ PREREQUISITE_PKGS_CSWgitosis = CSWpython CSWpysetuptools -REQUIRED_PKGS_CSWgitosis = CSWgit CSWpysetuptools +REQUIRED_PKGS_CSWgitosis = CSWgit CSWpysetuptools CSWbash GIT_REPOS = git://eagain.net/gitosis.git GIT_USE_PROXY = 1 @@ -51,17 +51,18 @@ INSTALL_ARGS = --root $(DESTDIR) --single-version-externally-managed GITOSISHOME = /var/opt/csw/gitosis -CSWUG = gitosis:gitosis:Gitosis Host:$(GITOSISHOME):/bin/bash:: +CSWUG = gitosis:gitosis:Gitosis Host:$(GITOSISHOME):/opt/csw/bin/bash:: CSWUGD = $(INSTALLISADIR)/opt/csw/etc/pkg/CSW$(GARNAME) USERGROUP = /opt/csw/etc/pkg/CSWgitosis/cswusergroup PROTOTYPE_FILTER = awk '$$$$3 ~ /\/var\/opt\/csw\/gitosis/ { $$$$2 = "ugfiles"; $$$$5 = "gitosis"; $$$$6 = "gitosis" }; { print }' -SPKG_CLASSES = none ugfiles - include gar/category.mk +# this has to be after cswusergroup is added automatically... +SPKG_CLASSES += ugfiles + # override the category exclusion _MERGE_EXCLUDE_CATEGORY = 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 Sep 25 02:50:13 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 25 Sep 2009 00:50:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[6465] csw/mgar/pkg/gitosis/trunk/Makefile Message-ID: Revision: 6465 http://gar.svn.sourceforge.net/gar/?rev=6465&view=rev Author: bdwalton Date: 2009-09-25 00:50:13 +0000 (Fri, 25 Sep 2009) Log Message: ----------- gitosis: add postinstall code to migrate shell to csw bash if required Modified Paths: -------------- csw/mgar/pkg/gitosis/trunk/Makefile Modified: csw/mgar/pkg/gitosis/trunk/Makefile =================================================================== --- csw/mgar/pkg/gitosis/trunk/Makefile 2009-09-25 00:16:38 UTC (rev 6464) +++ csw/mgar/pkg/gitosis/trunk/Makefile 2009-09-25 00:50:13 UTC (rev 6465) @@ -17,6 +17,13 @@ /usr/bin/passwd -N gitosis +# in case the gitosis package was still using /bin/bash. +/usr/bin/getent passwd gitosis | /usr/xpg4/bin/grep -q ':/bin/bash' +if [ $$? -eq 0 ]; then + echo Updating shell for gitosis account to /opt/csw/bin/bash. + /usr/sbin/usermod -s /opt/csw/bin/bash gitosis +fi + echo See $(docdir)/$(GARNAME)/README.csw for first use instructions. endef 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 Sep 25 09:06:16 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 25 Sep 2009 07:06:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[6466] csw/mgar/pkg/x11/libxt/trunk/Makefile Message-ID: Revision: 6466 http://gar.svn.sourceforge.net/gar/?rev=6466&view=rev Author: dmichelsen Date: 2009-09-25 07:06:16 +0000 (Fri, 25 Sep 2009) Log Message: ----------- libxt: Put makestrs in devel package Modified Paths: -------------- csw/mgar/pkg/x11/libxt/trunk/Makefile Modified: csw/mgar/pkg/x11/libxt/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxt/trunk/Makefile 2009-09-25 00:50:13 UTC (rev 6465) +++ csw/mgar/pkg/x11/libxt/trunk/Makefile 2009-09-25 07:06:16 UTC (rev 6466) @@ -29,10 +29,15 @@ REQUIRED_PKGS_CSWlibxtdevel = CSWlibxt PKGFILES_CSWlibxtdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibxtdevel += .*/makestrs.* BUILD64 = 1 NOISALIST = 1 - +NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) +# No need for 64 bit makestrs +MERGE_DIRS_isa-sparcv9 = $(libdir) +MERGE_DIRS_isa-amd64 = $(libdir) + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri Sep 25 09:07:03 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 25 Sep 2009 07:07:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[6467] csw/mgar/pkg/mbuffer/trunk Message-ID: Revision: 6467 http://gar.svn.sourceforge.net/gar/?rev=6467&view=rev Author: skayser Date: 2009-09-25 07:07:00 +0000 (Fri, 25 Sep 2009) Log Message: ----------- mbuffer: version bump, skip new ipv6 test 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-09-25 07:06:16 UTC (rev 6466) +++ csw/mgar/pkg/mbuffer/trunk/Makefile 2009-09-25 07:07:00 UTC (rev 6467) @@ -1,5 +1,20 @@ +# 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 +# + GARNAME = mbuffer -GARVERSION = 20090215 +GARVERSION = 20090628 CATEGORIES = utils DESCRIPTION = A tool for buffering data streams @@ -16,7 +31,7 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tgz LICENSE = LICENSE -# Required for the test target +# Required during packaging (for the "test" target) PREREQUISITE_PKGS = CSWmktemp CSWgcc4core REQUIRED_PKGS = CSWosslrt @@ -26,7 +41,7 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz # To build the mixed package for x86 you have to do the following -# 1) build8x: gmake build-isa-i386 +# 1) build8x: gmake merge # 2) build10x: gmake merge # 3) build8x: gmake package BUILD64 = 1 @@ -53,9 +68,12 @@ test-custom: TMPDIR := $(shell mktemp -d -p /tmp) test-custom: echo "Running target test-custom, TMPDIR = $(TMPDIR)" - @cp $(WORKSRC)/mbuffer $(WORKSRC)/Makefile $(TMPDIR)/ - @$(MAKE) -C $(TMPDIR) check - @rm -rf $(TMPDIR) + cp $(WORKSRC)/mbuffer $(WORKSRC)/Makefile $(TMPDIR)/ + + # 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) @$(MAKECOOKIE) # Solaris 10 on build10x has libm.so which points to libm.so.2. libm.so.2 Modified: csw/mgar/pkg/mbuffer/trunk/checksums =================================================================== --- csw/mgar/pkg/mbuffer/trunk/checksums 2009-09-25 07:06:16 UTC (rev 6466) +++ csw/mgar/pkg/mbuffer/trunk/checksums 2009-09-25 07:07:00 UTC (rev 6467) @@ -1 +1 @@ -0bfc7e7da04f5226e3139af6ee9d590f download/mbuffer-20090215.tgz +66a39f6e3289f2e181b4861e6a301b01 download/mbuffer-20090628.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 Fri Sep 25 09:14:18 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 25 Sep 2009 07:14:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[6468] csw/mgar/pkg/bdb44 Message-ID: Revision: 6468 http://gar.svn.sourceforge.net/gar/?rev=6468&view=rev Author: dmichelsen Date: 2009-09-25 07:14:18 +0000 (Fri, 25 Sep 2009) Log Message: ----------- bdb44: Reinstatiate full bdb44 manifest Added Paths: ----------- csw/mgar/pkg/bdb44/tags/bdb-consolidation-4.4.20,REV=2009.07.28/ csw/mgar/pkg/bdb44/trunk/Makefile csw/mgar/pkg/bdb44/trunk/checksums csw/mgar/pkg/bdb44/trunk/files/ Removed Paths: ------------- csw/mgar/pkg/bdb44/trunk/Makefile csw/mgar/pkg/bdb44/trunk/legacy/ Deleted: csw/mgar/pkg/bdb44/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb44/trunk/Makefile 2009-09-25 07:07:00 UTC (rev 6467) +++ csw/mgar/pkg/bdb44/trunk/Makefile 2009-09-25 07:14:18 UTC (rev 6468) @@ -1,91 +0,0 @@ -GARNAME = db -GARVERSION = 4.4.20 -CATEGORIES = lib - -DESCRIPTION = embedded database libraries and utilities -define BLURB - Berkeley DB (libdb) is a programmatic toolkit that provides embedded database - support for both traditional and client/server applications. It includes - b+tree, queue, extended linear hashing, fixed, and variable-length record - access methods, transactions, locking, logging, shared memory caching and - database recovery. DB supports C, C++, Java, and Perl APIs. It is available - for a wide variety of UNIX platforms as well as Windows NT and Windows 95 - (MSVC 4, 5 and 6). -endef - -MASTER_SITES = http://download.oracle.com/berkeley-db/ -SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html - -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = -INSTALL_SCRIPTS = custom-$(GARCH) custom-all -TEST_SCRIPTS = - -ENABLE_CHECK = 0 -PACKAGES = CSWbdb44 -SPKG_DESC = BerkeleyDB 4.4 embedded database libraries and utilities -CATALOGNAME = berkeleydb44 -REQUIRED_PKGS = CSWbdb - -include gar/category.mk - -install-custom-i386: - ginstall -d $(DESTDIR)$(prefix)/bdb44/lib - cd $(DESTDIR)$(prefix)/bdb44/lib && gln -s . i386 - -install-custom-sparc: - ginstall -d $(DESTDIR)$(prefix)/bdb44/lib/sparcv9 - ginstall -d $(DESTDIR)$(prefix)/bdb44/bin/sparcv9 - cd $(DESTDIR)$(prefix)/bdb44/lib && gln -s . sparcv8 - cd $(DESTDIR)$(prefix)/bdb44/lib && gln -s sparcv9 64 - cd $(DESTDIR)$(prefix)/bdb44/lib/sparcv9 && gln -s $(libdir)/sparcv9/db.jar db.jar - cd $(DESTDIR)$(prefix)/bdb44/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb-4.so libdb-4.4.so - cd $(DESTDIR)$(prefix)/bdb44/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb-4.so libdb-4.so - cd $(DESTDIR)$(prefix)/bdb44/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb.so libdb.so - cd $(DESTDIR)$(prefix)/bdb44/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb_cxx-4.so libdb_cxx-4.4.so - cd $(DESTDIR)$(prefix)/bdb44/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb_cxx-4.so libdb_cxx-4.so - cd $(DESTDIR)$(prefix)/bdb44/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb_cxx.so libdb_cxx.so - cd $(DESTDIR)$(prefix)/bdb44/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb_java-4.so libdb_java-4.4.so - cd $(DESTDIR)$(prefix)/bdb44/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb_java-4.so libdb_java-4.4_g.so - cd $(DESTDIR)$(prefix)/bdb44/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb_java-4.so libdb_java-4.so - cd $(DESTDIR)$(prefix)/bdb44/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb_java.so libdb_java.so - cd $(DESTDIR)$(prefix)/bdb44/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_archive db_archive - cd $(DESTDIR)$(prefix)/bdb44/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_checkpoint db_checkpoint - cd $(DESTDIR)$(prefix)/bdb44/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_deadlock db_deadlock - cd $(DESTDIR)$(prefix)/bdb44/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_dump db_dump - cd $(DESTDIR)$(prefix)/bdb44/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_load db_load - cd $(DESTDIR)$(prefix)/bdb44/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_printlog db_printlog - cd $(DESTDIR)$(prefix)/bdb44/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_recover db_recover - cd $(DESTDIR)$(prefix)/bdb44/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_stat db_stat - cd $(DESTDIR)$(prefix)/bdb44/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_upgrade db_upgrade - cd $(DESTDIR)$(prefix)/bdb44/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_verify db_verify - cd $(DESTDIR)$(prefix)/bdb44/bin/sparcv9 && gln -s $(bindir)/sparcv9/berkeley_db_svc berkeley_db_svc - cd $(DESTDIR)$(prefix)/bdb44/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_hotbackup db_hotbackup - -install-custom-all: - ginstall -d $(DESTDIR)$(prefix)/bdb44/lib - ginstall -d $(DESTDIR)$(prefix)/bdb44/bin - cd $(DESTDIR)$(prefix)/bdb44/lib && gln -s . 32 - cd $(DESTDIR)$(prefix)/bdb44/lib && gln -s $(libdir)/db.jar db.jar - cd $(DESTDIR)$(prefix)/bdb44/lib && gln -s $(libdir)/libdb-4.so libdb-4.4.so - cd $(DESTDIR)$(prefix)/bdb44/lib && gln -s $(libdir)/libdb-4.so libdb-4.so - cd $(DESTDIR)$(prefix)/bdb44/lib && gln -s $(libdir)/libdb.so libdb.so - cd $(DESTDIR)$(prefix)/bdb44/lib && gln -s $(libdir)/libdb_cxx-4.so libdb_cxx-4.4.so - cd $(DESTDIR)$(prefix)/bdb44/lib && gln -s $(libdir)/libdb_cxx-4.so libdb_cxx-4.so - cd $(DESTDIR)$(prefix)/bdb44/lib && gln -s $(libdir)/libdb_cxx.so libdb_cxx.so - cd $(DESTDIR)$(prefix)/bdb44/lib && gln -s $(libdir)/libdb_java-4.so libdb_java-4.4.so - cd $(DESTDIR)$(prefix)/bdb44/lib && gln -s $(libdir)/libdb_java-4.so libdb_java-4.4_g.so - cd $(DESTDIR)$(prefix)/bdb44/lib && gln -s $(libdir)/libdb_java-4.so libdb_java-4.so - cd $(DESTDIR)$(prefix)/bdb44/lib && gln -s $(libdir)/libdb_java.so libdb_java.so - cd $(DESTDIR)$(prefix)/bdb44/bin && gln -s $(bindir)/db_archive db_archive - cd $(DESTDIR)$(prefix)/bdb44/bin && gln -s $(bindir)/db_checkpoint db_checkpoint - cd $(DESTDIR)$(prefix)/bdb44/bin && gln -s $(bindir)/db_deadlock db_deadlock - cd $(DESTDIR)$(prefix)/bdb44/bin && gln -s $(bindir)/db_dump db_dump - cd $(DESTDIR)$(prefix)/bdb44/bin && gln -s $(bindir)/db_load db_load - cd $(DESTDIR)$(prefix)/bdb44/bin && gln -s $(bindir)/db_printlog db_printlog - cd $(DESTDIR)$(prefix)/bdb44/bin && gln -s $(bindir)/db_recover db_recover - cd $(DESTDIR)$(prefix)/bdb44/bin && gln -s $(bindir)/db_stat db_stat - cd $(DESTDIR)$(prefix)/bdb44/bin && gln -s $(bindir)/db_upgrade db_upgrade - cd $(DESTDIR)$(prefix)/bdb44/bin && gln -s $(bindir)/db_verify db_verify - cd $(DESTDIR)$(prefix)/bdb44/bin && gln -s $(bindir)/berkeley_db_svc berkeley_db_svc - cd $(DESTDIR)$(prefix)/bdb44/bin && gln -s $(bindir)/db_hotbackup db_hotbackup Copied: csw/mgar/pkg/bdb44/trunk/Makefile (from rev 6465, csw/mgar/pkg/bdb44/trunk/legacy/Makefile) =================================================================== --- csw/mgar/pkg/bdb44/trunk/Makefile (rev 0) +++ csw/mgar/pkg/bdb44/trunk/Makefile 2009-09-25 07:14:18 UTC (rev 6468) @@ -0,0 +1,101 @@ +GARNAME = db +GARVERSION = 4.4.20 +CATEGORIES = lib + +DESCRIPTION = embedded database libraries and utilities +define BLURB + Berkeley DB (libdb) is a programmatic toolkit that provides embedded database + support for both traditional and client/server applications. It includes + b+tree, queue, extended linear hashing, fixed, and variable-length record + access methods, transactions, locking, logging, shared memory caching and + database recovery. DB supports C, C++, Java, and Perl APIs. It is available + for a wide variety of UNIX platforms as well as Windows NT and Windows 95 + (MSVC 4, 5 and 6). +endef + +MASTER_SITES = http://download.oracle.com/berkeley-db/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +PACKAGES = CSWbdb44 CSWbdb44-devel CSWbdb44-doc + +# 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.oracle.com/technology/software/products/berkeley-db/db/index.html + +WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix + +PATCHDIR = $(WORKSRC)/.. +PATCHDIRLEVEL = 0 +PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*.diff)) + +BUILD64 = 1 + +CONFIGURE_SCRIPTS = dist + +prefix = $(BUILD_PREFIX)/bdb44 +docdir = $(BUILD_PREFIX)/share/doc + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --disable-cryptography +CONFIGURE_ARGS += --enable-compat185 +CONFIGURE_ARGS += --enable-o_direct +CONFIGURE_ARGS += --enable-rpc +CONFIGURE_ARGS += --enable-cxx +CONFIGURE_ARGS += --enable-java + +# Exclude TCL support for 64 bit until we have a 64 bit TCL +ifeq ($(MEMORYMODEL),32) +CONFIGURE_ARGS += --enable-tcl +CONFIGURE_ARGS += --with-tcl=$(libdir) +endif + +FIXCONFIG_DIRS = $(DESTDIR)$(prefix)/bdb44/lib + +# bdb tests are *very* time consuming +TEST_SCRIPTS = + +NO_ISAEXEC = 1 + +PACKAGES = CSWbdb44 CSWbdb44-devel CSWbdb44-doc + +CATALOGNAME_CSWbdb44 = berkeleydb44 +CATALOGNAME_CSWbdb44-devel = berkeleydb44_devel +CATALOGNAME_CSWbdb44-doc = berkeleydb44_doc + +ARCHALL_CSWbdb44-doc = 1 + +SPKG_DESC_CSWbdb44 = BerkeleyDB 4.4 embedded database libraries and utilities +SPKG_DESC_CSWbdb44-devel = BerkeleyDB 4.4 development support +SPKG_DESC_CSWbdb44-doc = BerkeleyDB 4.4 documentation + +REQUIRED_PKGS_CSWbdb44-devel = CSWbdb44 +INCOMPATIBLE_PKGS_CSWbdb44-doc = CSWbdb44doc + +LICENSE = LICENSE + +# Leave the docs where they are for now +#EXTRA_PAX_ARGS_isa-sparcv8 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb44/,p" +#EXTRA_PAX_ARGS_isa-i386 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb44/,p" + +#PKGFILES_CSWbdb44-doc = $(PKGFILES_DOC) +PKGFILES_CSWbdb44-doc = $(prefix)/docs/.* + +PKGFILES_CSWbdb44-devel = $(PKGFILES_DEVEL) + +include gar/category.mk + +LIBS += -lnsl +export LIBS + +PATH := /usr/j2se/bin:$(PATH) +export PATH + +configure-dist: + ( cd $(WORKSRC) ; $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS) ) + @$(MAKECOOKIE) + +post-merge: + gln -s . $(PKGROOT)$(libdir)/32 + gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 + @$(MAKECOOKIE) Copied: csw/mgar/pkg/bdb44/trunk/checksums (from rev 6465, csw/mgar/pkg/bdb44/trunk/legacy/checksums) =================================================================== --- csw/mgar/pkg/bdb44/trunk/checksums (rev 0) +++ csw/mgar/pkg/bdb44/trunk/checksums 2009-09-25 07:14:18 UTC (rev 6468) @@ -0,0 +1,6 @@ +d84dff288a19186b136b0daf7067ade3 download/db-4.4.20.tar.gz +66584d621355df055b6e05b4a02e9c3e download/patch.4.4.20.1.diff +85df93a0867f6cace3501671cdeb6ed1 download/patch.4.4.20.2.diff +88ee91889ebf5498b22b2e7bed945d41 download/patch.4.4.20.3.diff +c2ef7b3e59460c35950fab5f2faa3fc0 download/patch.4.4.20.4.diff +099621e0dad419188acd42c588242131 download/patch.4.4.20.5.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 Fri Sep 25 09:26:44 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 25 Sep 2009 07:26:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[6469] csw/mgar/pkg/bdb43 Message-ID: Revision: 6469 http://gar.svn.sourceforge.net/gar/?rev=6469&view=rev Author: dmichelsen Date: 2009-09-25 07:26:44 +0000 (Fri, 25 Sep 2009) Log Message: ----------- bdb43: Reinstatiate full bdb43 manifest Added Paths: ----------- csw/mgar/pkg/bdb43/tags/bdb-consolidation-4.3.29,REV=2009.06.26/ csw/mgar/pkg/bdb43/trunk/Makefile csw/mgar/pkg/bdb43/trunk/checksums csw/mgar/pkg/bdb43/trunk/files/ Removed Paths: ------------- csw/mgar/pkg/bdb43/trunk/Makefile Deleted: csw/mgar/pkg/bdb43/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb43/trunk/Makefile 2009-09-25 07:14:18 UTC (rev 6468) +++ csw/mgar/pkg/bdb43/trunk/Makefile 2009-09-25 07:26:44 UTC (rev 6469) @@ -1,56 +0,0 @@ -GARNAME = db -GARVERSION = 4.3.29 -CATEGORIES = lib - -DESCRIPTION = BerkeleyDB 4.3 libraries and utilities -define BLURB - Berkeley DB (libdb) is a programmatic toolkit that provides embedded database - support for both traditional and client/server applications. It includes - b+tree, queue, extended linear hashing, fixed, and variable-length record - access methods, transactions, locking, logging, shared memory caching and - database recovery. DB supports C, C++, Java, and Perl APIs. It is available - for a wide variety of UNIX platforms as well as Windows NT and Windows 95 - (MSVC 4, 5 and 6). -endef - -MASTER_SITES = http://downloads.sleepycat.com/ - -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = -INSTALL_SCRIPTS = custom -TEST_SCRIPTS = - -ENABLE_CHECK = 0 -ARCHALL = 1 -PACKAGES = CSWbdb43 -SPKG_DESC = BerkeleyDB 4.3 libraries and utilities -CATALOGNAME = berkeleydb43 -REQUIRED_PKGS = CSWbdb - -include gar/category.mk -install-custom: - ginstall -d $(DESTDIR)$(prefix)/bdb43/lib - ginstall -d $(DESTDIR)$(prefix)/bdb43/bin - cd $(DESTDIR)$(prefix)/bdb43/lib && gln -s $(libdir)/db.jar db.jar - cd $(DESTDIR)$(prefix)/bdb43/lib && gln -s $(libdir)/libdb-4.so libdb-4.3.so - cd $(DESTDIR)$(prefix)/bdb43/lib && gln -s $(libdir)/libdb-4.so libdb-4.so - cd $(DESTDIR)$(prefix)/bdb43/lib && gln -s $(libdir)/libdb.so libdb.so - cd $(DESTDIR)$(prefix)/bdb43/lib && gln -s $(libdir)/libdb_cxx-4.so libdb_cxx-4.3.so - cd $(DESTDIR)$(prefix)/bdb43/lib && gln -s $(libdir)/libdb_cxx-4.so libdb_cxx-4.so - cd $(DESTDIR)$(prefix)/bdb43/lib && gln -s $(libdir)/libdb_cxx.so libdb_cxx.so - cd $(DESTDIR)$(prefix)/bdb43/lib && gln -s $(libdir)/libdb_java-4.so libdb_java-4.3.so - cd $(DESTDIR)$(prefix)/bdb43/lib && gln -s $(libdir)/libdb_java-4.so libdb_java-4.3_g.so - cd $(DESTDIR)$(prefix)/bdb43/lib && gln -s $(libdir)/libdb_java-4.so libdb_java-4.so - cd $(DESTDIR)$(prefix)/bdb43/lib && gln -s $(libdir)/libdb_java.so libdb_java.so - cd $(DESTDIR)$(prefix)/bdb43/bin && gln -s $(bindir)/db_archive db_archive - cd $(DESTDIR)$(prefix)/bdb43/bin && gln -s $(bindir)/db_checkpoint db_checkpoint - cd $(DESTDIR)$(prefix)/bdb43/bin && gln -s $(bindir)/db_deadlock db_deadlock - cd $(DESTDIR)$(prefix)/bdb43/bin && gln -s $(bindir)/db_dump db_dump - cd $(DESTDIR)$(prefix)/bdb43/bin && gln -s $(bindir)/db_load db_load - cd $(DESTDIR)$(prefix)/bdb43/bin && gln -s $(bindir)/db_printlog db_printlog - cd $(DESTDIR)$(prefix)/bdb43/bin && gln -s $(bindir)/db_recover db_recover - cd $(DESTDIR)$(prefix)/bdb43/bin && gln -s $(bindir)/db_stat db_stat - cd $(DESTDIR)$(prefix)/bdb43/bin && gln -s $(bindir)/db_upgrade db_upgrade - cd $(DESTDIR)$(prefix)/bdb43/bin && gln -s $(bindir)/db_verify db_verify - cd $(DESTDIR)$(prefix)/bdb43/bin && gln -s $(bindir)/berkeley_db_svc berkeley_db_svc - Copied: csw/mgar/pkg/bdb43/trunk/Makefile (from rev 6465, csw/mgar/pkg/bdb43/trunk/legacy/Makefile) =================================================================== --- csw/mgar/pkg/bdb43/trunk/Makefile (rev 0) +++ csw/mgar/pkg/bdb43/trunk/Makefile 2009-09-25 07:26:44 UTC (rev 6469) @@ -0,0 +1,56 @@ +GARNAME = db +GARVERSION = 4.3.29 +CATEGORIES = lib + +DESCRIPTION = BerkeleyDB 4.3 libraries and utilities +define BLURB + Berkeley DB (libdb) is a programmatic toolkit that provides embedded database + support for both traditional and client/server applications. It includes + b+tree, queue, extended linear hashing, fixed, and variable-length record + access methods, transactions, locking, logging, shared memory caching and + database recovery. DB supports C, C++, Java, and Perl APIs. It is available + for a wide variety of UNIX platforms as well as Windows NT and Windows 95 + (MSVC 4, 5 and 6). +endef + +MASTER_SITES = http://downloads.sleepycat.com/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWbdb43,depend prototype) +DISTFILES += $(call admfiles,CSWbdb43-devel,depend prototype) +DISTFILES += $(call admfiles,CSWbdb43-doc,depend prototype) + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix + +CONFIGURE_SCRIPTS = dist + +CONFIGURE_ARGS = --prefix $(prefix)/bdb43 +CONFIGURE_ARGS += --disable-cryptography +CONFIGURE_ARGS += --enable-compat185 +CONFIGURE_ARGS += --enable-rpc +CONFIGURE_ARGS += --enable-cxx +CONFIGURE_ARGS += --enable-java +CONFIGURE_ARGS += --enable-tcl +CONFIGURE_ARGS += --with-tcl=$(libdir) +CONFIGURE_ARGS += --enable-o_direct + +LIBTOOL_LADIR = $(DESTDIR)$(prefix)/bdb43/lib +STRIP_DIRS += $(DESTDIR)$(prefix)/bdb43/bin + +# bdb tests are time consuming +TEST_SCRIPTS = + +include gar/category.mk + +LIBS += -lnsl +export LIBS + +PATH := /usr/j2se/bin:$(PATH) +export PATH + +configure-dist: + @( cd $(WORKSRC) ; $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS) ) + @$(MAKECOOKIE) + Copied: csw/mgar/pkg/bdb43/trunk/checksums (from rev 6465, csw/mgar/pkg/bdb43/trunk/legacy/checksums) =================================================================== --- csw/mgar/pkg/bdb43/trunk/checksums (rev 0) +++ csw/mgar/pkg/bdb43/trunk/checksums 2009-09-25 07:26:44 UTC (rev 6469) @@ -0,0 +1,10 @@ +13585a20ce32f113b8e8cdb57f52e3bb download/db-4.3.29.tar.gz +a780ed74216a67b45d5bab030d29d1a8 download/CSWbdb43.gspec +8093298b67861e241b0d2499c9f2ff89 download/CSWbdb43.depend +001de61b8e01758ba15ee19184b36bcf download/CSWbdb43.prototype +d3e8da06077e095478cb493e3928eaaf download/CSWbdb43-devel.gspec +f905a2c20a7c2265a2ed126027a49b85 download/CSWbdb43-devel.depend +102c5de41ee6b1039f92836fc309eb80 download/CSWbdb43-devel.prototype +0539eef14dfa8dc02a162d946ad164b1 download/CSWbdb43-doc.gspec +8c10985a125690e3d6bc877be173e20d download/CSWbdb43-doc.depend +b7e86382632f53bae97051502bb37295 download/CSWbdb43-doc.prototype This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Sep 25 18:39:29 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 25 Sep 2009 16:39:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[6470] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 6470 http://gar.svn.sourceforge.net/gar/?rev=6470&view=rev Author: rthurner Date: 2009-09-25 16:39:29 +0000 (Fri, 25 Sep 2009) Log Message: ----------- upgrade to svn-1.6.5 Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2009-09-25 07:26:44 UTC (rev 6469) +++ csw/mgar/pkg/subversion/trunk/Makefile 2009-09-25 16:39:29 UTC (rev 6470) @@ -1,5 +1,5 @@ GARNAME = subversion -DISTVERSION = 1.6.4 +DISTVERSION = 1.6.5 GARVERSION = $(subst -,,$(DISTVERSION)) CATEGORIES = utils This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Sep 25 18:41:46 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 25 Sep 2009 16:41:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6471] csw/mgar/pkg/subversion/trunk/checksums Message-ID: Revision: 6471 http://gar.svn.sourceforge.net/gar/?rev=6471&view=rev Author: rthurner Date: 2009-09-25 16:41:43 +0000 (Fri, 25 Sep 2009) Log Message: ----------- upgrade to svn-1.6.5, checksums as well Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/checksums Modified: csw/mgar/pkg/subversion/trunk/checksums =================================================================== --- csw/mgar/pkg/subversion/trunk/checksums 2009-09-25 16:39:29 UTC (rev 6470) +++ csw/mgar/pkg/subversion/trunk/checksums 2009-09-25 16:41:43 UTC (rev 6471) @@ -4,6 +4,6 @@ 41ec540885de7c34625768aa1fb9682b download/fixme.sh f107831ad0c702ff32e51df6a207237b download/httpd-svn.conf.CSW f0aa58c145ae99f8e4d72499ab826169 download/javahl_headers_for_nested_classes.diff -11e3fa838c9a558cadc378f2807572e2 download/subversion-1.6.4.tar.bz2 +1a53a0e72bee0bf814f4da83a9b6a636 download/subversion-1.6.5.tar.bz2 f7d05c59656dcf01fb844295c9912f78 download/subversion161.diff 1b532d3055708a97771f5cd959983628 download/svn_access.conf.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Sep 25 18:54:47 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 25 Sep 2009 16:54:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[6472] csw/mgar/pkg/rox-filer/trunk Message-ID: Revision: 6472 http://gar.svn.sourceforge.net/gar/?rev=6472&view=rev Author: wahwah Date: 2009-09-25 16:54:35 +0000 (Fri, 25 Sep 2009) Log Message: ----------- rox-filer: Added a wrapper, which fixed the icons Modified Paths: -------------- csw/mgar/pkg/rox-filer/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/rox-filer/trunk/files/rox-filer Modified: csw/mgar/pkg/rox-filer/trunk/Makefile =================================================================== --- csw/mgar/pkg/rox-filer/trunk/Makefile 2009-09-25 16:41:43 UTC (rev 6471) +++ csw/mgar/pkg/rox-filer/trunk/Makefile 2009-09-25 16:54:35 UTC (rev 6472) @@ -18,6 +18,7 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 REQUIRED_PKGS = CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWgtk2 REQUIRED_PKGS += CSWlibatk CSWlibcairo CSWlibglade2 CSWlibxml2 CSWpango +REQUIRED_PKGS += CSWbash CONFIGURE_SCRIPTS = BUILD_SCRIPTS = rox @@ -33,13 +34,15 @@ @$(MAKECOOKIE) install-rox: - # $(INSTALL_ENV) gmake -C $(WORKSRC)/ROX-Filer/build install ginstall -d $(DESTDIR)$(bindir) - ginstall $(WORKSRC)/ROX-Filer/ROX-Filer $(DESTDIR)$(bindir) - ginstall -d $(DESTDIR)$(libdir) - gcp -av $(WORKSRC)/ROX-Filer/ROX $(DESTDIR)$(libdir) - gfind $(DESTDIR)$(libdir) -type d -exec chmod 0755 {} \; - gfind $(DESTDIR)$(libdir) -type f -exec chmod 0644 {} \; + ginstall -m 755 $(FILEDIR)/rox-filer $(DESTDIR)$(bindir) + ginstall -d $(DESTDIR)$(libexecdir) + ginstall $(WORKSRC)/ROX-Filer/ROX-Filer $(DESTDIR)$(libexecdir) + ginstall -d $(DESTDIR)$(datadir)/ROX + gcp -av $(WORKSRC)/ROX-Filer/ROX $(DESTDIR)$(datadir) + gcp -av $(WORKSRC)/ROX-Filer/images $(DESTDIR)$(datadir)/ROX + gfind $(DESTDIR)$(datadir) -type d -exec chmod 0755 {} \; + gfind $(DESTDIR)$(datadir) -type f -exec chmod 0644 {} \; @$(MAKECOOKIE) include gar/category.mk Added: csw/mgar/pkg/rox-filer/trunk/files/rox-filer =================================================================== --- csw/mgar/pkg/rox-filer/trunk/files/rox-filer (rev 0) +++ csw/mgar/pkg/rox-filer/trunk/files/rox-filer 2009-09-25 16:54:35 UTC (rev 6472) @@ -0,0 +1,4 @@ +#!/opt/csw/bin/bash + +export APP_DIR="/opt/csw/share/ROX" +exec /opt/csw/libexec/ROX-Filer Property changes on: csw/mgar/pkg/rox-filer/trunk/files/rox-filer ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Sep 25 19:24:38 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 25 Sep 2009 17:24:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6473] csw/mgar/pkg/x11/libxt/trunk/Makefile Message-ID: Revision: 6473 http://gar.svn.sourceforge.net/gar/?rev=6473&view=rev Author: dmichelsen Date: 2009-09-25 17:24:38 +0000 (Fri, 25 Sep 2009) Log Message: ----------- x11/libxt: Add dependency to CSWlibx11 Modified Paths: -------------- csw/mgar/pkg/x11/libxt/trunk/Makefile Modified: csw/mgar/pkg/x11/libxt/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxt/trunk/Makefile 2009-09-25 16:54:35 UTC (rev 6472) +++ csw/mgar/pkg/x11/libxt/trunk/Makefile 2009-09-25 17:24:38 UTC (rev 6473) @@ -26,6 +26,7 @@ SPKG_DESC_CSWlibxt = X11 toolkit intrinsics library SPKG_DESC_CSWlibxtdevel = X11 toolkit intrinsics library development files +REQUIRED_PKGS_CSWlibxt = CSWlibx11 REQUIRED_PKGS_CSWlibxtdevel = CSWlibxt PKGFILES_CSWlibxtdevel = $(PKGFILES_DEVEL) 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 Sep 25 19:25:48 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 25 Sep 2009 17:25:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[6474] csw/mgar/pkg/x11/libxt/trunk/Makefile Message-ID: Revision: 6474 http://gar.svn.sourceforge.net/gar/?rev=6474&view=rev Author: dmichelsen Date: 2009-09-25 17:25:45 +0000 (Fri, 25 Sep 2009) Log Message: ----------- x11/libxt: Add dependency to CSWlibx11 Modified Paths: -------------- csw/mgar/pkg/x11/libxt/trunk/Makefile Modified: csw/mgar/pkg/x11/libxt/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxt/trunk/Makefile 2009-09-25 17:24:38 UTC (rev 6473) +++ csw/mgar/pkg/x11/libxt/trunk/Makefile 2009-09-25 17:25:45 UTC (rev 6474) @@ -26,7 +26,7 @@ SPKG_DESC_CSWlibxt = X11 toolkit intrinsics library SPKG_DESC_CSWlibxtdevel = X11 toolkit intrinsics library development files -REQUIRED_PKGS_CSWlibxt = CSWlibx11 +REQUIRED_PKGS_CSWlibxt = CSWlibx11 CSWlibice REQUIRED_PKGS_CSWlibxtdevel = CSWlibxt PKGFILES_CSWlibxtdevel = $(PKGFILES_DEVEL) 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 Sep 26 14:09:16 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 26 Sep 2009 12:09:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[6475] csw/mgar/pkg Message-ID: Revision: 6475 http://gar.svn.sourceforge.net/gar/?rev=6475&view=rev Author: wahwah Date: 2009-09-26 12:09:16 +0000 (Sat, 26 Sep 2009) Log Message: ----------- libxdg-basedir: Initial commit Modified Paths: -------------- csw/mgar/pkg/libxdg-basedir/trunk/Makefile csw/mgar/pkg/libxdg-basedir/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libxdg-basedir/ Modified: csw/mgar/pkg/libxdg-basedir/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-09-25 17:25:45 UTC (rev 6474) +++ csw/mgar/pkg/libxdg-basedir/trunk/Makefile 2009-09-26 12:09:16 UTC (rev 6475) @@ -2,181 +2,26 @@ # 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 +GARNAME = libxdg-basedir +GARVERSION = 1.0.2 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. +DESCRIPTION = implements functions according to the XDG Base Directory Specification define BLURB - + + The XDG Base Directory Specification defines where should user files be + looked for by defining one or more base directories relative in with + they should be located. + + This library implements functions to list the directories according to + the specification and provides a few higher-level functions. + 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). +SPKG_SOURCEURL = http://n.ethz.ch/student/nevillm/download/libxdg-basedir +MASTER_SITES = http://n.ethz.ch/~nevillm/download/libxdg-basedir/ 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. +PACKAGES = CSWlibxdgbasedir +CATALOGNAME = libxdg_basedir +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 +include gar/category.mk Modified: csw/mgar/pkg/libxdg-basedir/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-09-25 17:25:45 UTC (rev 6474) +++ csw/mgar/pkg/libxdg-basedir/trunk/checksums 2009-09-26 12:09:16 UTC (rev 6475) @@ -0,0 +1 @@ +944202425e5359666f268d18671303d4 download/libxdg-basedir-1.0.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Sep 26 15:08:20 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 26 Sep 2009 13:08:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[6476] csw/mgar/pkg/coreutils/trunk Message-ID: Revision: 6476 http://gar.svn.sourceforge.net/gar/?rev=6476&view=rev Author: bdwalton Date: 2009-09-26 13:08:19 +0000 (Sat, 26 Sep 2009) Log Message: ----------- coreutils: gar2; version bump to 7.6; no static; 6 tests fail Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile csw/mgar/pkg/coreutils/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/coreutils/trunk/ Property changes on: csw/mgar/pkg/coreutils/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/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2009-09-26 12:09:16 UTC (rev 6475) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2009-09-26 13:08:19 UTC (rev 6476) @@ -1,35 +1,33 @@ GARNAME = coreutils -GARVERSION = 5.94 +GARVERSION = 7.6 CATEGORIES = utils DESCRIPTION = Basic file, shell and text manipulation 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 the coreutils. endef MASTER_SITES = $(GNU_MIRROR) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +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.bz2 -# Prevent autoconf from running --recheck -PATCHFILES += autoconf.diff - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --program-prefix=g -CONFIGURE_ARGS += --program-suffix=-static +CONFIGURE_ARGS += --enable-silent-rules +CONFIGURE_ARGS += --disable-libcap +CONFIGURE_ARGS += --with-packager="$(SPKG_PACKAGER) <$(SPKG_EMAIL)>" +TEST_ARGS = check + GARCOMPILER = GNU include gar/category.mk - -LDFLAGS := -static $(CFLAGS) -export LDFLAGS - Modified: csw/mgar/pkg/coreutils/trunk/checksums =================================================================== --- csw/mgar/pkg/coreutils/trunk/checksums 2009-09-26 12:09:16 UTC (rev 6475) +++ csw/mgar/pkg/coreutils/trunk/checksums 2009-09-26 13:08:19 UTC (rev 6476) @@ -1,2 +1 @@ -11985c8345371546da8ff13f7efae359 download/coreutils-5.94.tar.bz2 -7fc1c7c3372e2708bdab539431f8a879 download/autoconf.diff +3d82f979229365f880da750642e67cf3 download/coreutils-7.6.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 Sat Sep 26 16:56:05 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 26 Sep 2009 14:56:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6477] csw/mgar/pkg/x11 Message-ID: Revision: 6477 http://gar.svn.sourceforge.net/gar/?rev=6477&view=rev Author: wbonnet Date: 2009-09-26 14:56:05 +0000 (Sat, 26 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/xf86bigfontproto/ csw/mgar/pkg/x11/xf86bigfontproto/branches/ csw/mgar/pkg/x11/xf86bigfontproto/tags/ csw/mgar/pkg/x11/xf86bigfontproto/trunk/ csw/mgar/pkg/x11/xf86bigfontproto/trunk/Makefile csw/mgar/pkg/x11/xf86bigfontproto/trunk/checksums csw/mgar/pkg/x11/xf86bigfontproto/trunk/files/ csw/mgar/pkg/x11/xf86dgaproto/ csw/mgar/pkg/x11/xf86dgaproto/branches/ csw/mgar/pkg/x11/xf86dgaproto/tags/ csw/mgar/pkg/x11/xf86dgaproto/trunk/ csw/mgar/pkg/x11/xf86dgaproto/trunk/Makefile csw/mgar/pkg/x11/xf86dgaproto/trunk/checksums csw/mgar/pkg/x11/xf86dgaproto/trunk/files/ csw/mgar/pkg/x11/xf86driproto/ csw/mgar/pkg/x11/xf86driproto/branches/ csw/mgar/pkg/x11/xf86driproto/tags/ csw/mgar/pkg/x11/xf86driproto/trunk/ csw/mgar/pkg/x11/xf86driproto/trunk/Makefile csw/mgar/pkg/x11/xf86driproto/trunk/checksums csw/mgar/pkg/x11/xf86driproto/trunk/files/ csw/mgar/pkg/x11/xf86miscproto/ csw/mgar/pkg/x11/xf86miscproto/branches/ csw/mgar/pkg/x11/xf86miscproto/tags/ csw/mgar/pkg/x11/xf86miscproto/trunk/ csw/mgar/pkg/x11/xf86miscproto/trunk/Makefile csw/mgar/pkg/x11/xf86miscproto/trunk/checksums csw/mgar/pkg/x11/xf86miscproto/trunk/files/ csw/mgar/pkg/x11/xf86rushproto/ csw/mgar/pkg/x11/xf86rushproto/branches/ csw/mgar/pkg/x11/xf86rushproto/tags/ csw/mgar/pkg/x11/xf86rushproto/trunk/ csw/mgar/pkg/x11/xf86rushproto/trunk/Makefile csw/mgar/pkg/x11/xf86rushproto/trunk/checksums csw/mgar/pkg/x11/xf86rushproto/trunk/files/ csw/mgar/pkg/x11/xf86vidmodeproto/ csw/mgar/pkg/x11/xf86vidmodeproto/branches/ csw/mgar/pkg/x11/xf86vidmodeproto/tags/ csw/mgar/pkg/x11/xf86vidmodeproto/trunk/ csw/mgar/pkg/x11/xf86vidmodeproto/trunk/Makefile csw/mgar/pkg/x11/xf86vidmodeproto/trunk/checksums csw/mgar/pkg/x11/xf86vidmodeproto/trunk/files/ Property changes on: csw/mgar/pkg/x11/xf86bigfontproto/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/x11/xf86bigfontproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xf86bigfontproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/xf86bigfontproto/trunk/Makefile 2009-09-26 14:56:05 UTC (rev 6477) @@ -0,0 +1,22 @@ +GARNAME = xf86bigfontproto +GARVERSION = 1.2.0 +CATEGORIES = x11 + +DESCRIPTION = X.Org XF86BigFont protocol headers +define BLURB + XF86BigFont protocol headersX protocol and ancillary headers from modular X.org +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/xf86bigfontproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xf86bigfontproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/xf86bigfontproto/trunk/checksums 2009-09-26 14:56:05 UTC (rev 6477) @@ -0,0 +1 @@ +91b0733ff4cbe55808d96073258aa3d1 download/xf86bigfontproto-1.2.0.tar.gz Property changes on: csw/mgar/pkg/x11/xf86dgaproto/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/x11/xf86dgaproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xf86dgaproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/xf86dgaproto/trunk/Makefile 2009-09-26 14:56:05 UTC (rev 6477) @@ -0,0 +1,22 @@ +GARNAME = xf86dgaproto +GARVERSION = 2.0.3 +CATEGORIES = x11 + +DESCRIPTION = X.Org XF86DGA protocol headers +define BLURB + XF86DGA protocol headers from modular X.org +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/xf86dgaproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xf86dgaproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/xf86dgaproto/trunk/checksums 2009-09-26 14:56:05 UTC (rev 6477) @@ -0,0 +1 @@ +f73c1d99b557249662bc75b9b872b61b download/xf86dgaproto-2.0.3.tar.gz Property changes on: csw/mgar/pkg/x11/xf86driproto/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/x11/xf86driproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xf86driproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/xf86driproto/trunk/Makefile 2009-09-26 14:56:05 UTC (rev 6477) @@ -0,0 +1,22 @@ +GARNAME = xf86driproto +GARVERSION = 2.1.0 +CATEGORIES = x11 + +DESCRIPTION = X.Org XF86DRI protocol headers +define BLURB + X.Org XF86DRI protocol headers from modular X.org +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/xf86driproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xf86driproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/xf86driproto/trunk/checksums 2009-09-26 14:56:05 UTC (rev 6477) @@ -0,0 +1 @@ +da848afcd5c41ac05e3aa994bdacdf1c download/xf86driproto-2.1.0.tar.gz Property changes on: csw/mgar/pkg/x11/xf86miscproto/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/x11/xf86miscproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xf86miscproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/xf86miscproto/trunk/Makefile 2009-09-26 14:56:05 UTC (rev 6477) @@ -0,0 +1,22 @@ +GARNAME = xf86miscproto +GARVERSION = 0.9.2 +CATEGORIES = x11 + +DESCRIPTION = X.Org XF86Misc protocol headers +define BLURB + X.Org XF86Misc protocol headers from modular X.org +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/xf86miscproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xf86miscproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/xf86miscproto/trunk/checksums 2009-09-26 14:56:05 UTC (rev 6477) @@ -0,0 +1 @@ +c4f03f37e2afd9c7f1b1f33db1e9c75a download/xf86miscproto-0.9.2.tar.gz Property changes on: csw/mgar/pkg/x11/xf86rushproto/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/x11/xf86rushproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xf86rushproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/xf86rushproto/trunk/Makefile 2009-09-26 14:56:05 UTC (rev 6477) @@ -0,0 +1,22 @@ +GARNAME = xf86rushproto +GARVERSION = 1.1.2 +CATEGORIES = x11 + +DESCRIPTION = X.Org XF86Rush protocol headers +define BLURB + X.Org XF86Rush protocol headers from modular X.org +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/xf86rushproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xf86rushproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/xf86rushproto/trunk/checksums 2009-09-26 14:56:05 UTC (rev 6477) @@ -0,0 +1 @@ +6a6389473332ace01146cccfef228576 download/xf86rushproto-1.1.2.tar.gz Property changes on: csw/mgar/pkg/x11/xf86vidmodeproto/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/x11/xf86vidmodeproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xf86vidmodeproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/xf86vidmodeproto/trunk/Makefile 2009-09-26 14:56:05 UTC (rev 6477) @@ -0,0 +1,22 @@ +GARNAME = xf86vidmodeproto +GARVERSION = 2.2.2 +CATEGORIES = x11 + +DESCRIPTION = X.Org XF86VidMode protocol headers +define BLURB + X.Org XF86VidMode protocol headers from modular X.org +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/xf86vidmodeproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xf86vidmodeproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/xf86vidmodeproto/trunk/checksums 2009-09-26 14:56:05 UTC (rev 6477) @@ -0,0 +1 @@ +67c93ee2c2c4941e866d96d63329a471 download/xf86vidmodeproto-2.2.2.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 Sat Sep 26 19:31:43 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 26 Sep 2009 17:31:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6478] csw/mgar/pkg/x11 Message-ID: Revision: 6478 http://gar.svn.sourceforge.net/gar/?rev=6478&view=rev Author: wbonnet Date: 2009-09-26 17:31:43 +0000 (Sat, 26 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxfixes/ csw/mgar/pkg/x11/libxfixes/branches/ csw/mgar/pkg/x11/libxfixes/tags/ csw/mgar/pkg/x11/libxfixes/trunk/ csw/mgar/pkg/x11/libxfixes/trunk/Makefile csw/mgar/pkg/x11/libxfixes/trunk/checksums csw/mgar/pkg/x11/libxfixes/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxfixes/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/x11/libxfixes/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxfixes/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxfixes/trunk/Makefile 2009-09-26 17:31:43 UTC (rev 6478) @@ -0,0 +1,35 @@ +GARNAME = libXfixes +GARVERSION = 4.0.3 +CATEGORIES = x11 + +DESCRIPTION = X11 miscellaneous 'fixes' extension library +define BLURB + libXfixes provides an X Window System client interface to the 'XFIXES' extension to the X protocol. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibxfixes CSWlibxfixesdevel + +CATALOGNAME_CSWlibxfixes = libxfixes +CATALOGNAME_CSWlibxfixesdevel = libxfixes_devel + +SPKG_DESC_CSWlibxfixes = $(DESCRIPTION) +SPKG_DESC_CSWlibxfixesdevel = $(DESCRIPTION) development files + +PREREQUISITE_PKGS = CSWfixesproto + +REQUIRED_PKGS_CSWlibxfixesdevel = CSWlibxfixes + +PKGFILES_CSWlibxfixesdevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libxfixes/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxfixes/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxfixes/trunk/checksums 2009-09-26 17:31:43 UTC (rev 6478) @@ -0,0 +1 @@ +1990d19725a3c7f32290037f02d3737f download/libXfixes-4.0.3.tar.bz2 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 Sep 26 19:34:50 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 26 Sep 2009 17:34:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6479] csw/mgar/pkg/x11 Message-ID: Revision: 6479 http://gar.svn.sourceforge.net/gar/?rev=6479&view=rev Author: wbonnet Date: 2009-09-26 17:34:49 +0000 (Sat, 26 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxcursor/ csw/mgar/pkg/x11/libxcursor/branches/ csw/mgar/pkg/x11/libxcursor/tags/ csw/mgar/pkg/x11/libxcursor/trunk/ csw/mgar/pkg/x11/libxcursor/trunk/Makefile csw/mgar/pkg/x11/libxcursor/trunk/checksums csw/mgar/pkg/x11/libxcursor/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxcursor/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/x11/libxcursor/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxcursor/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxcursor/trunk/Makefile 2009-09-26 17:34:49 UTC (rev 6479) @@ -0,0 +1,33 @@ +GARNAME = libXcursor +GARVERSION = 1.1.10 +CATEGORIES = x11 + +DESCRIPTION = X client-side cursor loading library +define BLURB + Xcursor is a simple library designed to help locate and load cursors for the X Window System. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibfs CSWlibfsdevel + +CATALOGNAME_CSWlibfs = libfs +CATALOGNAME_CSWlibfsdevel = libfs_devel + +SPKG_DESC_CSWlibfs = X11 Inter-Client Exchange library +SPKG_DESC_CSWlibfsdevel = X11 Inter-Client Exchange library development files + +REQUIRED_PKGS_CSWlibfsdevel = CSWlibfs + +PKGFILES_CSWlibfsdevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libxcursor/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxcursor/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxcursor/trunk/checksums 2009-09-26 17:34:49 UTC (rev 6479) @@ -0,0 +1 @@ +7dcdad1c10daea872cb3355af414b2ca download/libXcursor-1.1.10.tar.bz2 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 Sep 26 19:53:57 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 26 Sep 2009 17:53:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[6480] csw/mgar/pkg/x11/libxcursor/trunk/Makefile Message-ID: Revision: 6480 http://gar.svn.sourceforge.net/gar/?rev=6480&view=rev Author: wbonnet Date: 2009-09-26 17:53:56 +0000 (Sat, 26 Sep 2009) Log Message: ----------- Initial commit Modified Paths: -------------- csw/mgar/pkg/x11/libxcursor/trunk/Makefile Modified: csw/mgar/pkg/x11/libxcursor/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxcursor/trunk/Makefile 2009-09-26 17:34:49 UTC (rev 6479) +++ csw/mgar/pkg/x11/libxcursor/trunk/Makefile 2009-09-26 17:53:56 UTC (rev 6480) @@ -15,17 +15,18 @@ CONFIGURE_ARGS = $(DIRPATHS) -PACKAGES = CSWlibfs CSWlibfsdevel +PACKAGES = CSWlibxcursor CSWlibxcursordevel -CATALOGNAME_CSWlibfs = libfs -CATALOGNAME_CSWlibfsdevel = libfs_devel +CATALOGNAME_CSWlibxcursor = libxcursor +CATALOGNAME_CSWlibxcursordevel = libxcursor_devel -SPKG_DESC_CSWlibfs = X11 Inter-Client Exchange library -SPKG_DESC_CSWlibfsdevel = X11 Inter-Client Exchange library development files +SPKG_DESC_CSWlibxcursor = $(DESCRIPTION) +SPKG_DESC_CSWlibxcursordevel = $(DESCRIPTION) development files -REQUIRED_PKGS_CSWlibfsdevel = CSWlibfs +REQUIRED_PKGS_CSWlibxcursordevel = CSWlibxcursor +REQUIRED_PKGS_CSWlibxcursor = CSWlibx11 CSWlibxcomposite CSWlibxfixes CSWlibxrender -PKGFILES_CSWlibfsdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibxcursordevel = $(PKGFILES_DEVEL) BUILD64 = 1 NOISALIST = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Sep 26 20:01:09 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 26 Sep 2009 18:01:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[6481] csw/mgar/pkg/x11 Message-ID: Revision: 6481 http://gar.svn.sourceforge.net/gar/?rev=6481&view=rev Author: wbonnet Date: 2009-09-26 18:01:09 +0000 (Sat, 26 Sep 2009) Log Message: ----------- Update depends Modified Paths: -------------- csw/mgar/pkg/x11/libfs/trunk/Makefile csw/mgar/pkg/x11/libxfixes/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/libfs/Makefile Added: csw/mgar/pkg/x11/libfs/Makefile =================================================================== --- csw/mgar/pkg/x11/libfs/Makefile (rev 0) +++ csw/mgar/pkg/x11/libfs/Makefile 2009-09-26 18:01:09 UTC (rev 6481) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/x11/libFS directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Modified: csw/mgar/pkg/x11/libfs/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libfs/trunk/Makefile 2009-09-26 17:53:56 UTC (rev 6480) +++ csw/mgar/pkg/x11/libfs/trunk/Makefile 2009-09-26 18:01:09 UTC (rev 6481) @@ -20,8 +20,8 @@ CATALOGNAME_CSWlibfs = libfs CATALOGNAME_CSWlibfsdevel = libfs_devel -SPKG_DESC_CSWlibfs = X11 Inter-Client Exchange library -SPKG_DESC_CSWlibfsdevel = X11 Inter-Client Exchange library development files +SPKG_DESC_CSWlibfs = $(DESCRIPTION) +SPKG_DESC_CSWlibfsdevel = $(DESCRIPTION) development files REQUIRED_PKGS_CSWlibfsdevel = CSWlibfs Modified: csw/mgar/pkg/x11/libxfixes/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxfixes/trunk/Makefile 2009-09-26 17:53:56 UTC (rev 6480) +++ csw/mgar/pkg/x11/libxfixes/trunk/Makefile 2009-09-26 18:01:09 UTC (rev 6481) @@ -25,6 +25,7 @@ PREREQUISITE_PKGS = CSWfixesproto +REQUIRED_PKGS_CSWlibxfixes = CSWlibx11 REQUIRED_PKGS_CSWlibxfixesdevel = CSWlibxfixes PKGFILES_CSWlibxfixesdevel = $(PKGFILES_DEVEL) 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 Sep 26 21:28:38 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 26 Sep 2009 19:28:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6482] csw/mgar/pkg/x11 Message-ID: Revision: 6482 http://gar.svn.sourceforge.net/gar/?rev=6482&view=rev Author: wbonnet Date: 2009-09-26 19:28:36 +0000 (Sat, 26 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxdamage/ csw/mgar/pkg/x11/libxdamage/branches/ csw/mgar/pkg/x11/libxdamage/tags/ csw/mgar/pkg/x11/libxdamage/trunk/ csw/mgar/pkg/x11/libxdamage/trunk/Makefile csw/mgar/pkg/x11/libxdamage/trunk/checksums csw/mgar/pkg/x11/libxdamage/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxdamage/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/x11/libxdamage/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxdamage/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxdamage/trunk/Makefile 2009-09-26 19:28:36 UTC (rev 6482) @@ -0,0 +1,35 @@ +GARNAME = libXdamage +GARVERSION = 1.1.1 +CATEGORIES = x11 + +DESCRIPTION = X11 Font Services library +define BLURB + libxdamage, the Font Services library, provides various functions useful to X11 font servers, and clients connecting to font servers. It is not used outside of these implementations. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibxdamage CSWlibxdamagedevel + +CATALOGNAME_CSWlibxdamage = libxdamage +CATALOGNAME_CSWlibxdamagedevel = libxdamage_devel + +SPKG_DESC_CSWlibxdamage = $(DESCRIPTION) +SPKG_DESC_CSWlibxdamagedevel = $(DESCRIPTION) development files + +REQUIRED_PKGS_CSWlibxdamagedevel = CSWlibxdamage + +PREREQUISITE_PKGS = CSWdamageproto + +PKGFILES_CSWlibxdamagedevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libxdamage/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxdamage/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxdamage/trunk/checksums 2009-09-26 19:28:36 UTC (rev 6482) @@ -0,0 +1 @@ +ac0ce6b0063a9858c8f24ddb4c60487d download/libXdamage-1.1.1.tar.bz2 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 Sep 26 22:13:45 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 26 Sep 2009 20:13:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[6483] csw/mgar/pkg/x11 Message-ID: Revision: 6483 http://gar.svn.sourceforge.net/gar/?rev=6483&view=rev Author: wbonnet Date: 2009-09-26 20:13:45 +0000 (Sat, 26 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxrandr/ csw/mgar/pkg/x11/libxrandr/branches/ csw/mgar/pkg/x11/libxrandr/tags/ csw/mgar/pkg/x11/libxrandr/trunk/ csw/mgar/pkg/x11/libxrandr/trunk/Makefile csw/mgar/pkg/x11/libxrandr/trunk/checksums csw/mgar/pkg/x11/libxrandr/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxrandr/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/x11/libxrandr/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxrandr/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxrandr/trunk/Makefile 2009-09-26 20:13:45 UTC (rev 6483) @@ -0,0 +1,36 @@ +GARNAME = libXrandr +GARVERSION = 1.3.0 +CATEGORIES = x11 + +DESCRIPTION = X11 RandR extension library +define BLURB + libXrandr provides an X Window System client interface to the RandR extension to the X protocol. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibxrandr CSWlibxrandrdevel + +CATALOGNAME_CSWlibxrandr = libxrandr +CATALOGNAME_CSWlibxrandrdevel = libxrandr_devel + +SPKG_DESC_CSWlibxrandr = $(DESCRIPTION) +SPKG_DESC_CSWlibxrandrdevel = $(DESCRIPTION) development files + +REQUIRED_PKGS_CSWlibxrandrdevel = CSWlibxrandr + +PREREQUISITE_PKGS = CSWrandrproto CSWlibxextdevel + +PKGFILES_CSWlibxrandrdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibxrandr = CSWlibx11 CSWlibxext CSWlibxrender + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libxrandr/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxrandr/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxrandr/trunk/checksums 2009-09-26 20:13:45 UTC (rev 6483) @@ -0,0 +1 @@ +68eb59c3b7524db6ffd78746ee893d1d download/libXrandr-1.3.0.tar.bz2 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 Sep 26 22:25:38 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 26 Sep 2009 20:25:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6484] csw/mgar/pkg/x11 Message-ID: Revision: 6484 http://gar.svn.sourceforge.net/gar/?rev=6484&view=rev Author: wbonnet Date: 2009-09-26 20:25:38 +0000 (Sat, 26 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxinerama/ csw/mgar/pkg/x11/libxinerama/branches/ csw/mgar/pkg/x11/libxinerama/tags/ csw/mgar/pkg/x11/libxinerama/trunk/ csw/mgar/pkg/x11/libxinerama/trunk/Makefile csw/mgar/pkg/x11/libxinerama/trunk/checksums csw/mgar/pkg/x11/libxinerama/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxinerama/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/x11/libxinerama/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxinerama/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxinerama/trunk/Makefile 2009-09-26 20:25:38 UTC (rev 6484) @@ -0,0 +1,36 @@ +GARNAME = libXinerama +GARVERSION = 1.0.3 +CATEGORIES = x11 + +DESCRIPTION = X11 Xinerama extension library +define BLURB + libXinerama provides an X Window System client interface to the XINERAMA extension to the X protocol. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibxinerama CSWlibxineramadevel + +CATALOGNAME_CSWlibxinerama = libxinerama +CATALOGNAME_CSWlibxineramadevel = libxinerama_devel + +SPKG_DESC_CSWlibxinerama = $(DESCRIPTION) +SPKG_DESC_CSWlibxineramadevel = $(DESCRIPTION) development files + +PREREQUISITE_PKGS = CSWxineramaproto + +REQUIRED_PKGS_CSWlibxineramadevel = CSWlibxinerama +REQUIRED_PKGS_CSWlibxinerama = CSWlibx11 CSWlibxext + +PKGFILES_CSWlibxineramadevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libxinerama/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxinerama/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxinerama/trunk/checksums 2009-09-26 20:25:38 UTC (rev 6484) @@ -0,0 +1 @@ +cd9f7c46439ac40e0517a302d2434d2c download/libXinerama-1.0.3.tar.bz2 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 Sep 26 22:40:40 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 26 Sep 2009 20:40:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[6485] csw/mgar/pkg/x11 Message-ID: Revision: 6485 http://gar.svn.sourceforge.net/gar/?rev=6485&view=rev Author: wbonnet Date: 2009-09-26 20:40:40 +0000 (Sat, 26 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxevie/ csw/mgar/pkg/x11/libxevie/branches/ csw/mgar/pkg/x11/libxevie/tags/ csw/mgar/pkg/x11/libxevie/trunk/ csw/mgar/pkg/x11/libxevie/trunk/Makefile csw/mgar/pkg/x11/libxevie/trunk/checksums csw/mgar/pkg/x11/libxevie/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxevie/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/x11/libxevie/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxevie/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxevie/trunk/Makefile 2009-09-26 20:40:40 UTC (rev 6485) @@ -0,0 +1,36 @@ +GARNAME = libXevie +GARVERSION = 1.0.2 +CATEGORIES = x11 + +DESCRIPTION = X11 EvIE extension library +define BLURB + libXevie provides an X Window System client interface to the EvIE extension to the X protocol. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibxevie CSWlibxeviedevel + +CATALOGNAME_CSWlibxevie = libxevie +CATALOGNAME_CSWlibxeviedevel = libxevie_devel + +SPKG_DESC_CSWlibxevie = $(DESCRIPTION) +SPKG_DESC_CSWlibxeviedevel = $(DESCRIPTION) development files + +PREREQUISITE_PKGS = CSWevieext + +REQUIRED_PKGS_CSWlibxeviedevel = CSWlibxevie +REQUIRED_PKGS_CSWlibxevie = CSWlibx11 CSWlibxext + +PKGFILES_CSWlibxeviedevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libxevie/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxevie/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxevie/trunk/checksums 2009-09-26 20:40:40 UTC (rev 6485) @@ -0,0 +1 @@ +88e9bf535364e7c821ef4014fb1ca2dd download/libXevie-1.0.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Sep 27 03:39:57 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 27 Sep 2009 01:39:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[6486] csw/mgar/pkg/xmlto/trunk Message-ID: Revision: 6486 http://gar.svn.sourceforge.net/gar/?rev=6486&view=rev Author: bdwalton Date: 2009-09-27 01:39:57 +0000 (Sun, 27 Sep 2009) Log Message: ----------- xmlto: add patch to use long args for gcp Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile csw/mgar/pkg/xmlto/trunk/checksums Added Paths: ----------- csw/mgar/pkg/xmlto/trunk/files/gcp-explicit-args.patch Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-26 20:40:40 UTC (rev 6485) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-27 01:39:57 UTC (rev 6486) @@ -19,6 +19,11 @@ MASTER_SITES = https://fedorahosted.org/releases/x/m/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +# Out gcp (from the very old fileutils) spits out warnings about -P changing +# meanings. xmlto is depending on the new meaning. We'll explicitly use +# the long forms of -P (--no-dereference) and -p (--presever). +PATCHFILES = gcp-explicit-args.patch + TEST_TARGET = check # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/xmlto/trunk/checksums =================================================================== --- csw/mgar/pkg/xmlto/trunk/checksums 2009-09-26 20:40:40 UTC (rev 6485) +++ csw/mgar/pkg/xmlto/trunk/checksums 2009-09-27 01:39:57 UTC (rev 6486) @@ -1 +1,2 @@ +52189e7619044dfb7d15773cd4256353 download/gcp-explicit-args.patch 3001d6bb2bbc2c8f6c2301f05120f074 download/xmlto-0.0.23.tar.bz2 Added: csw/mgar/pkg/xmlto/trunk/files/gcp-explicit-args.patch =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/gcp-explicit-args.patch (rev 0) +++ csw/mgar/pkg/xmlto/trunk/files/gcp-explicit-args.patch 2009-09-27 01:39:57 UTC (rev 6486) @@ -0,0 +1,122 @@ +diff --speed-large-files --minimal -Nru xmlto-0.0.23.orig/format/docbook/fo xmlto-0.0.23/format/docbook/fo +--- xmlto-0.0.23.orig/format/docbook/fo 2009-09-18 12:02:48.000000000 +0200 ++++ xmlto-0.0.23/format/docbook/fo 2009-09-27 03:29:35.202032412 +0200 +@@ -7,6 +7,6 @@ + echo "http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl" + ;; + post-process) +- ${GCP_PATH:-cp} -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").fo" ++ ${GCP_PATH:-cp} -R --no-dereference --preserve -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").fo" + ;; + esac +diff --speed-large-files --minimal -Nru xmlto-0.0.23.orig/format/docbook/html xmlto-0.0.23/format/docbook/html +--- xmlto-0.0.23.orig/format/docbook/html 2009-09-18 12:02:48.000000000 +0200 ++++ xmlto-0.0.23/format/docbook/html 2009-09-27 03:29:11.664862459 +0200 +@@ -7,6 +7,6 @@ + echo "http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl" + ;; + post-process) +- ${GCP_PATH:-cp} -R -P -p -- * "$OUTPUT_DIR" ++ ${GCP_PATH:-cp} -R --no-dereference --preserve -- * "$OUTPUT_DIR" + ;; + esac +diff --speed-large-files --minimal -Nru xmlto-0.0.23.orig/format/docbook/html-nochunks xmlto-0.0.23/format/docbook/html-nochunks +--- xmlto-0.0.23.orig/format/docbook/html-nochunks 2009-09-18 12:02:48.000000000 +0200 ++++ xmlto-0.0.23/format/docbook/html-nochunks 2009-09-27 03:29:01.147776511 +0200 +@@ -7,6 +7,6 @@ + echo "http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl" + ;; + post-process) +- ${GCP_PATH:-cp} -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").html" ++ ${GCP_PATH:-cp} -R --no-dereference --preserve -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").html" + ;; + esac +diff --speed-large-files --minimal -Nru xmlto-0.0.23.orig/format/docbook/htmlhelp xmlto-0.0.23/format/docbook/htmlhelp +--- xmlto-0.0.23.orig/format/docbook/htmlhelp 2009-09-18 12:02:48.000000000 +0200 ++++ xmlto-0.0.23/format/docbook/htmlhelp 2009-09-27 03:28:44.785383980 +0200 +@@ -7,6 +7,6 @@ + echo "http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl" + ;; + post-process) +- ${GCP_PATH:-cp} -R -P -p -- * "$OUTPUT_DIR" ++ ${GCP_PATH:-cp} -R --no-dereference --preserve -- * "$OUTPUT_DIR" + ;; + esac +diff --speed-large-files --minimal -Nru xmlto-0.0.23.orig/format/docbook/javahelp xmlto-0.0.23/format/docbook/javahelp +--- xmlto-0.0.23.orig/format/docbook/javahelp 2009-09-18 12:02:48.000000000 +0200 ++++ xmlto-0.0.23/format/docbook/javahelp 2009-09-27 03:28:30.573820522 +0200 +@@ -7,6 +7,6 @@ + echo "http://docbook.sourceforge.net/release/xsl/current/javahelp/javahelp.xsl" + ;; + post-process) +- ${GCP_PATH:-cp} -R -P -p -- *.htm* *.hs *.xml *.jhm "$OUTPUT_DIR" ++ ${GCP_PATH:-cp} -R --no-dereference --preserve -- *.htm* *.hs *.xml *.jhm "$OUTPUT_DIR" + ;; + esac +diff --speed-large-files --minimal -Nru xmlto-0.0.23.orig/format/docbook/man xmlto-0.0.23/format/docbook/man +--- xmlto-0.0.23.orig/format/docbook/man 2009-09-18 12:02:48.000000000 +0200 ++++ xmlto-0.0.23/format/docbook/man 2009-09-27 03:32:18.415718330 +0200 +@@ -8,6 +8,6 @@ + ;; + post-process) + [ -e "$XSLT_PROCESSED" ] && rm "$XSLT_PROCESSED" +- ${GCP_PATH:-cp} -R -P -p -- * "$OUTPUT_DIR" 2>/dev/null ++ ${GCP_PATH:-cp} -R --no-dereference --preserve -- * "$OUTPUT_DIR" 2>/dev/null + ;; + esac +diff --speed-large-files --minimal -Nru xmlto-0.0.23.orig/format/docbook/xhtml xmlto-0.0.23/format/docbook/xhtml +--- xmlto-0.0.23.orig/format/docbook/xhtml 2009-09-18 12:02:48.000000000 +0200 ++++ xmlto-0.0.23/format/docbook/xhtml 2009-09-27 03:27:05.450989625 +0200 +@@ -7,6 +7,6 @@ + echo "http://docbook.sourceforge.net/release/xsl/current/xhtml/chunk.xsl" + ;; + post-process) +- ${GCP_PATH:-cp} -R -P -p -- *.*htm* "$OUTPUT_DIR" ++ ${GCP_PATH:-cp} -R --no-dereference --preserve -- *.*htm* "$OUTPUT_DIR" + ;; + esac +diff --speed-large-files --minimal -Nru xmlto-0.0.23.orig/format/docbook/xhtml-nochunks xmlto-0.0.23/format/docbook/xhtml-nochunks +--- xmlto-0.0.23.orig/format/docbook/xhtml-nochunks 2009-09-18 12:02:48.000000000 +0200 ++++ xmlto-0.0.23/format/docbook/xhtml-nochunks 2009-09-27 03:30:29.045829717 +0200 +@@ -7,6 +7,6 @@ + echo "http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl" + ;; + post-process) +- ${GCP_PATH:-cp} -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename ${XSLT_PROCESSED%.*}).html" ++ ${GCP_PATH:-cp} -R --no-dereference --preserve -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename ${XSLT_PROCESSED%.*}).html" + ;; + esac +diff --speed-large-files --minimal -Nru xmlto-0.0.23.orig/format/fo/dvi xmlto-0.0.23/format/fo/dvi +--- xmlto-0.0.23.orig/format/fo/dvi 2009-09-18 12:06:23.000000000 +0200 ++++ xmlto-0.0.23/format/fo/dvi 2009-09-27 03:31:55.252241931 +0200 +@@ -34,6 +34,6 @@ + [ "$VERBOSE" -ge 3 ] && cat $OUT + fi + fi +- ${GCP_PATH:-cp} -R -P -p -- *.dvi "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").dvi" ++ ${GCP_PATH:-cp} -R --no-dereference --preserve -- *.dvi "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").dvi" + ;; + esac +diff --speed-large-files --minimal -Nru xmlto-0.0.23.orig/format/fo/pdf xmlto-0.0.23/format/fo/pdf +--- xmlto-0.0.23.orig/format/fo/pdf 2009-09-18 12:06:23.000000000 +0200 ++++ xmlto-0.0.23/format/fo/pdf 2009-09-27 03:32:06.485584110 +0200 +@@ -37,7 +37,7 @@ + [ "$VERBOSE" -ge 3 ] && cat $OUT + fi + fi +- ${GCP_PATH:-cp} -R -P -p -- *.pdf "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").pdf" ++ ${GCP_PATH:-cp} -R --no-dereference --preserve -- *.pdf "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").pdf" + ;; + esac + ;; +diff --speed-large-files --minimal -Nru xmlto-0.0.23.orig/format/xhtml1/fo xmlto-0.0.23/format/xhtml1/fo +--- xmlto-0.0.23.orig/format/xhtml1/fo 2009-09-18 12:02:48.000000000 +0200 ++++ xmlto-0.0.23/format/xhtml1/fo 2009-09-27 03:31:43.246030247 +0200 +@@ -7,6 +7,6 @@ + echo "http://www.antennahouse.com/XSLsample/sample-xsl-xhtml2fo/xhtml2fo.xsl" + ;; + post-process) +- ${GCP_PATH:-cp} -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").fo" ++ ${GCP_PATH:-cp} -R --no-dereference --preserve -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").fo" + ;; + esac 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 Sep 27 03:54:13 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 27 Sep 2009 01:54:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[6487] csw/mgar/pkg/colordiff/trunk Message-ID: Revision: 6487 http://gar.svn.sourceforge.net/gar/?rev=6487&view=rev Author: bdwalton Date: 2009-09-27 01:54:12 +0000 (Sun, 27 Sep 2009) Log Message: ----------- colordiff: patch xml to be docbook 4.1.2 conformant Modified Paths: -------------- csw/mgar/pkg/colordiff/trunk/Makefile csw/mgar/pkg/colordiff/trunk/checksums Added Paths: ----------- csw/mgar/pkg/colordiff/trunk/files/fix-entity-nesting.patch Modified: csw/mgar/pkg/colordiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/colordiff/trunk/Makefile 2009-09-27 01:39:57 UTC (rev 6486) +++ csw/mgar/pkg/colordiff/trunk/Makefile 2009-09-27 01:54:12 UTC (rev 6487) @@ -8,6 +8,7 @@ MASTER_SITES = http://colordiff.sourceforge.net/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = fix-entity-nesting.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/colordiff/trunk/checksums =================================================================== --- csw/mgar/pkg/colordiff/trunk/checksums 2009-09-27 01:39:57 UTC (rev 6486) +++ csw/mgar/pkg/colordiff/trunk/checksums 2009-09-27 01:54:12 UTC (rev 6487) @@ -1 +1,2 @@ 31864847eaa4e900f72bbb6bbc64f1ec download/colordiff-1.0.9.tar.gz +d202632e9ec507e53445232a930c9c6f download/fix-entity-nesting.patch Added: csw/mgar/pkg/colordiff/trunk/files/fix-entity-nesting.patch =================================================================== --- csw/mgar/pkg/colordiff/trunk/files/fix-entity-nesting.patch (rev 0) +++ csw/mgar/pkg/colordiff/trunk/files/fix-entity-nesting.patch 2009-09-27 01:54:12 UTC (rev 6487) @@ -0,0 +1,14 @@ +diff --speed-large-files --minimal -Nru colordiff-1.0.9.orig/colordiff.xml colordiff-1.0.9/colordiff.xml +--- colordiff-1.0.9.orig/colordiff.xml 2009-01-25 05:59:25.000000000 -0500 ++++ colordiff-1.0.9/colordiff.xml 2009-09-25 20:07:56.801979000 -0400 +@@ -22,8 +22,8 @@ + + + colordiff +- &diff; options +- &colordiff; options ++ diff options ++ colordiff options + file1 + file2 + 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 Sep 27 12:13:43 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 10:13:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6488] csw/mgar/pkg/x11 Message-ID: Revision: 6488 http://gar.svn.sourceforge.net/gar/?rev=6488&view=rev Author: wbonnet Date: 2009-09-27 10:13:43 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxp/ csw/mgar/pkg/x11/libxp/branches/ csw/mgar/pkg/x11/libxp/tags/ csw/mgar/pkg/x11/libxp/trunk/ csw/mgar/pkg/x11/libxp/trunk/Makefile csw/mgar/pkg/x11/libxp/trunk/checksums csw/mgar/pkg/x11/libxp/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxp/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/x11/libxp/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxp/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxp/trunk/Makefile 2009-09-27 10:13:43 UTC (rev 6488) @@ -0,0 +1,36 @@ +GARNAME = libXp +GARVERSION = 1.0.0 +CATEGORIES = x11 + +DESCRIPTION = X Print Library +define BLURB + libXp provides public APIs to allow client applications to render to non-display devices. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibxp CSWlibxpdevel + +CATALOGNAME_CSWlibxp = libxp +CATALOGNAME_CSWlibxpdevel = libxp_devel + +SPKG_DESC_CSWlibxp = $(DESCRIPTION) +SPKG_DESC_CSWlibxpdevel = $(DESCRIPTION) development files + +PREREQUISITE_PKGS = CSWdamageproto + +REQUIRED_PKGS_CSWlibxp = CSWlibx11 CSWlibxau CSWlibxext +REQUIRED_PKGS_CSWlibxpdevel = CSWlibxp + +PKGFILES_CSWlibxpdevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libxp/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxp/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxp/trunk/checksums 2009-09-27 10:13:43 UTC (rev 6488) @@ -0,0 +1 @@ +0f4ac39108c1ae8c443cdfac259b58fa download/libXp-1.0.0.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 Sun Sep 27 12:15:46 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 27 Sep 2009 10:15:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6489] csw/mgar/pkg/freetype/trunk/Makefile Message-ID: Revision: 6489 http://gar.svn.sourceforge.net/gar/?rev=6489&view=rev Author: dmichelsen Date: 2009-09-27 10:15:45 +0000 (Sun, 27 Sep 2009) Log Message: ----------- freetype: Reorder rules and fix SOURCEURL Modified Paths: -------------- csw/mgar/pkg/freetype/trunk/Makefile Modified: csw/mgar/pkg/freetype/trunk/Makefile =================================================================== --- csw/mgar/pkg/freetype/trunk/Makefile 2009-09-27 10:13:43 UTC (rev 6488) +++ csw/mgar/pkg/freetype/trunk/Makefile 2009-09-27 10:15:45 UTC (rev 6489) @@ -14,9 +14,6 @@ Windows FNT/FON. endef -PACKAGES = CSWftype2 -CATALOGNAME_CSWftype2 = freetype2 - MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += COPYING @@ -25,6 +22,12 @@ UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) +PACKAGES = CSWftype2 +CATALOGNAME_CSWftype2 = freetype2 +SPKG_SOURCEURL = http://www.freetype.org/ + +REQUIRED_PKGS_CSWftype2 = CSWzlib + CONFIGURE_ARGS = $(DIRPATHS) GNUMAKE = gmake EXTRA_CONFIGURE_EXPORTS = GNUMAKE @@ -32,8 +35,6 @@ BUILD64 = 1 NO_ISAEXEC = 1 -REQUIRED_PKGS_CSWftype2 = CSWzlib - 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 dmichelsen at users.sourceforge.net Sun Sep 27 12:19:00 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 27 Sep 2009 10:19:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6490] csw/mgar/pkg/giflib/trunk/Makefile Message-ID: Revision: 6490 http://gar.svn.sourceforge.net/gar/?rev=6490&view=rev Author: dmichelsen Date: 2009-09-27 10:19:00 +0000 (Sun, 27 Sep 2009) Log Message: ----------- giflib: Adjust SOURCEURL Modified Paths: -------------- csw/mgar/pkg/giflib/trunk/Makefile Modified: csw/mgar/pkg/giflib/trunk/Makefile =================================================================== --- csw/mgar/pkg/giflib/trunk/Makefile 2009-09-27 10:15:45 UTC (rev 6489) +++ csw/mgar/pkg/giflib/trunk/Makefile 2009-09-27 10:19:00 UTC (rev 6490) @@ -27,6 +27,8 @@ SPKG_DESC_CSWgiflibdoc = giflib documentation SPKG_DESC_CSWungif = Links to giflib now the patent is dropped +SPKG_SOURCEURL = http://giflib.sourceforge.net/ + REQUIRED_PKGS_CSWgiflib = CSWgiflibrt REQUIRED_PKGS_CSWungif = CSWgiflib 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 Sep 27 12:22:15 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 10:22:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[6491] csw/mgar/pkg/x11 Message-ID: Revision: 6491 http://gar.svn.sourceforge.net/gar/?rev=6491&view=rev Author: wbonnet Date: 2009-09-27 10:22:15 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxres/ csw/mgar/pkg/x11/libxres/branches/ csw/mgar/pkg/x11/libxres/tags/ csw/mgar/pkg/x11/libxres/trunk/ csw/mgar/pkg/x11/libxres/trunk/Makefile csw/mgar/pkg/x11/libxres/trunk/checksums csw/mgar/pkg/x11/libxres/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxres/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/x11/libxres/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxres/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxres/trunk/Makefile 2009-09-27 10:22:15 UTC (rev 6491) @@ -0,0 +1,34 @@ +GARNAME = libXres +GARVERSION = 1.0.3 +CATEGORIES = x11 + +DESCRIPTION = X11 Resource extension library +define BLURB + libXRes provides an X Window System client interface to the Resource extension to the X protocol. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibxres CSWlibxresdevel + +CATALOGNAME_CSWlibxres = libxres +CATALOGNAME_CSWlibxresdevel = libxres_devel + +SPKG_DESC_CSWlibxres = $(DESCRIPTION) +SPKG_DESC_CSWlibxresdevel = $(DESCRIPTION) development files + +REQUIRED_PKGS_CSWlibxres = CSWlibx11 CSWlibxext +REQUIRED_PKGS_CSWlibxresdevel = CSWlibxres + +PKGFILES_CSWlibxresdevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libxres/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxres/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxres/trunk/checksums 2009-09-27 10:22:15 UTC (rev 6491) @@ -0,0 +1 @@ +de66ffb657aba64c9d6dbdeabb757f3e download/libXres-1.0.3.tar.bz2 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 Sep 27 12:42:25 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 10:42:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[6492] csw/mgar/pkg/x11 Message-ID: Revision: 6492 http://gar.svn.sourceforge.net/gar/?rev=6492&view=rev Author: wbonnet Date: 2009-09-27 10:42:25 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxfontcache/ csw/mgar/pkg/x11/libxfontcache/branches/ csw/mgar/pkg/x11/libxfontcache/tags/ csw/mgar/pkg/x11/libxfontcache/trunk/ csw/mgar/pkg/x11/libxfontcache/trunk/Makefile csw/mgar/pkg/x11/libxfontcache/trunk/checksums csw/mgar/pkg/x11/libxfontcache/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxfontcache/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/x11/libxfontcache/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxfontcache/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxfontcache/trunk/Makefile 2009-09-27 10:42:25 UTC (rev 6492) @@ -0,0 +1,35 @@ +GARNAME = libXfontcache +GARVERSION = 1.0.4 +CATEGORIES = x11 + +DESCRIPTION = X-TrueType font cache extension client library +define BLURB + FontCache is an extension that is used by X-TrueType to cache information about fonts. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibxfontcache CSWlibxfontcachedevel + +CATALOGNAME_CSWlibxfontcache = libxfontcache +CATALOGNAME_CSWlibxfontcachedevel = libxfontcache_devel + +SPKG_DESC_CSWlibxfontcache = $(DESCRIPTION) +SPKG_DESC_CSWlibxfontcachedevel = $(DESCRIPTION) development files + +PREREQUISITE_PKGS = CSWfontcacheproto +REQUIRED_PKGS_CSWlibxfontcachedevel = CSWlibxfontcache +REQUIRED_PKGS_CSWlibxfontcache = CSWlibx11 CSWlibxext + +PKGFILES_CSWlibxfontcachedevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libxfontcache/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxfontcache/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxfontcache/trunk/checksums 2009-09-27 10:42:25 UTC (rev 6492) @@ -0,0 +1 @@ +1adca018aa7bf2d215f20a69c10828ad download/libXfontcache-1.0.4.tar.bz2 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 Sep 27 12:55:45 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 10:55:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[6493] csw/mgar/pkg/x11 Message-ID: Revision: 6493 http://gar.svn.sourceforge.net/gar/?rev=6493&view=rev Author: wbonnet Date: 2009-09-27 10:55:45 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxscrnsaver/ csw/mgar/pkg/x11/libxscrnsaver/branches/ csw/mgar/pkg/x11/libxscrnsaver/tags/ csw/mgar/pkg/x11/libxscrnsaver/trunk/ csw/mgar/pkg/x11/libxscrnsaver/trunk/Makefile csw/mgar/pkg/x11/libxscrnsaver/trunk/checksums csw/mgar/pkg/x11/libxscrnsaver/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxscrnsaver/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/x11/libxscrnsaver/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxscrnsaver/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxscrnsaver/trunk/Makefile 2009-09-27 10:55:45 UTC (rev 6493) @@ -0,0 +1,35 @@ +GARNAME = libXScrnSaver +GARVERSION = 1.2.0 +CATEGORIES = x11 + +DESCRIPTION = The XScrnSaver Library +define BLURB + libXScrnSaver provides an X Window System client interface to the MIT-SCREEN-SAVER extension to the X protocol. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibxscrnsaver CSWlibxscrnsaverdevel + +CATALOGNAME_CSWlibxscrnsaver = libxscrnsaver +CATALOGNAME_CSWlibxscrnsaverdevel = libxscrnsaver_devel + +SPKG_DESC_CSWlibxscrnsaver = $(DESCRIPTION) +SPKG_DESC_CSWlibxscrnsaverdevel = $(DESCRIPTION) development files + +PREREQUISITE_PKGS = CSWscrnsaverproto +REQUIRED_PKGS_CSWlibxscrnsaver = CSWlibx11 CSWlibxext +REQUIRED_PKGS_CSWlibxscrnsaverdevel = CSWlibxscrnsaver + +PKGFILES_CSWlibxscrnsaverdevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libxscrnsaver/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxscrnsaver/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxscrnsaver/trunk/checksums 2009-09-27 10:55:45 UTC (rev 6493) @@ -0,0 +1 @@ +33e54f64b55f22d8bbe822a5b62568cb download/libXScrnSaver-1.2.0.tar.bz2 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 Sep 27 18:07:50 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 16:07:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6494] csw/mgar/pkg/x11 Message-ID: Revision: 6494 http://gar.svn.sourceforge.net/gar/?rev=6494&view=rev Author: wbonnet Date: 2009-09-27 16:07:50 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libfontenc/ csw/mgar/pkg/x11/libfontenc/branches/ csw/mgar/pkg/x11/libfontenc/tags/ csw/mgar/pkg/x11/libfontenc/trunk/ csw/mgar/pkg/x11/libfontenc/trunk/Makefile csw/mgar/pkg/x11/libfontenc/trunk/checksums csw/mgar/pkg/x11/libfontenc/trunk/files/ Property changes on: csw/mgar/pkg/x11/libfontenc/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/x11/libfontenc/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libfontenc/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libfontenc/trunk/Makefile 2009-09-27 16:07:50 UTC (rev 6494) @@ -0,0 +1,34 @@ +GARNAME = libfontenc +GARVERSION = 1.0.5 +CATEGORIES = x11 + +DESCRIPTION = X11 font encoding library +define BLURB + libfontenc is a library which helps font libraries portably determine and deal with different encodings of fonts. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibfontenc CSWlibfontencdevel + +CATALOGNAME_CSWlibfontenc = libfontenc +CATALOGNAME_CSWlibfontencdevel = libfontenc_devel + +SPKG_DESC_CSWlibfontenc = $(DESCRIPTION) +SPKG_DESC_CSWlibfontencdevel = $(DESCRIPTION) development files + +REQUIRED_PKGS_CSWlibfontencdevel = CSWlibfontenc +REQUIRED_PKGS_CSWlibfontenc = CSWzlib + +PKGFILES_CSWlibfontencdevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libfontenc/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libfontenc/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libfontenc/trunk/checksums 2009-09-27 16:07:50 UTC (rev 6494) @@ -0,0 +1 @@ +4f0d8191819be9f2bdf9dad49a65e43b download/libfontenc-1.0.5.tar.bz2 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 Sep 27 18:18:57 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 16:18:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[6495] csw/mgar/pkg/x11 Message-ID: Revision: 6495 http://gar.svn.sourceforge.net/gar/?rev=6495&view=rev Author: wbonnet Date: 2009-09-27 16:18:57 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libdmx/ csw/mgar/pkg/x11/libdmx/branches/ csw/mgar/pkg/x11/libdmx/tags/ csw/mgar/pkg/x11/libdmx/trunk/ csw/mgar/pkg/x11/libdmx/trunk/Makefile csw/mgar/pkg/x11/libdmx/trunk/checksums csw/mgar/pkg/x11/libdmx/trunk/files/ Property changes on: csw/mgar/pkg/x11/libdmx/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/x11/libdmx/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libdmx/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libdmx/trunk/Makefile 2009-09-27 16:18:57 UTC (rev 6495) @@ -0,0 +1,36 @@ +GARNAME = libdmx +GARVERSION = 1.0.2 +CATEGORIES = x11 + +DESCRIPTION = X11 Distributed Multihead extension library +define BLURB + libdmx is an interface to the DMX extension for X, which allows a single server to be set up as a proxy spanning multiple servers -- not unlike Xinerama across discrete physical machines. It can be reconfigured on the fly to change the layout, and it is presented as a single logical display to clients. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibdmx CSWlibdmxdevel + +CATALOGNAME_CSWlibdmx = libdmx +CATALOGNAME_CSWlibdmxdevel = libdmx_devel + +SPKG_DESC_CSWlibdmx = $(DESCRIPTION) +SPKG_DESC_CSWlibdmxdevel = $(DESCRIPTION) development files + +PREREQUISITE_PKGS = CSWdmxproto + +REQUIRED_PKGS_CSWlibdmx = CSWlibx11 CSWlibxext +REQUIRED_PKGS_CSWlibdmxdevel = CSWlibdmx + +PKGFILES_CSWlibdmxdevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libdmx/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libdmx/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libdmx/trunk/checksums 2009-09-27 16:18:57 UTC (rev 6495) @@ -0,0 +1 @@ +4d866967210d06098fc9f302ed4c79b1 download/libdmx-1.0.2.tar.bz2 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 Sep 27 18:44:37 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 16:44:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[6496] csw/mgar/pkg/x11 Message-ID: Revision: 6496 http://gar.svn.sourceforge.net/gar/?rev=6496&view=rev Author: wbonnet Date: 2009-09-27 16:44:37 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/liblbxutil/ csw/mgar/pkg/x11/liblbxutil/branches/ csw/mgar/pkg/x11/liblbxutil/tags/ csw/mgar/pkg/x11/liblbxutil/trunk/ csw/mgar/pkg/x11/liblbxutil/trunk/Makefile csw/mgar/pkg/x11/liblbxutil/trunk/checksums csw/mgar/pkg/x11/liblbxutil/trunk/files/ Property changes on: csw/mgar/pkg/x11/liblbxutil/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/x11/liblbxutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/liblbxutil/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/liblbxutil/trunk/Makefile 2009-09-27 16:44:37 UTC (rev 6496) @@ -0,0 +1,34 @@ +GARNAME = liblbxutil +GARVERSION = 1.0.1 +CATEGORIES = x11 + +DESCRIPTION = LBX utilities library from modular X.org. +define BLURB + LBX (Low Bandwidth X) is an X server extension which performs compression and caching on the X protocol to improve the performance of X over low-bandwidth, high-latency links. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWliblbxutil CSWliblbxutildevel + +CATALOGNAME_CSWliblbxutil = liblbxutil +CATALOGNAME_CSWliblbxutildevel = liblbxutil_devel + +SPKG_DESC_CSWliblbxutil = $(DESCRIPTION) +SPKG_DESC_CSWliblbxutildevel = $(DESCRIPTION) development files + +REQUIRED_PKGS_CSWliblbxutil = CSWzlib +REQUIRED_PKGS_CSWliblbxutildevel = CSWliblbxutil + +PKGFILES_CSWliblbxutildevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/liblbxutil/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/liblbxutil/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/liblbxutil/trunk/checksums 2009-09-27 16:44:37 UTC (rev 6496) @@ -0,0 +1 @@ +b73cbd5bc3cd268722a624a5f1318fde download/liblbxutil-1.0.1.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 Sun Sep 27 19:12:00 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 27 Sep 2009 17:12:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6497] csw/mgar/pkg/unixodbc/trunk Message-ID: Revision: 6497 http://gar.svn.sourceforge.net/gar/?rev=6497&view=rev Author: wahwah Date: 2009-09-27 17:12:00 +0000 (Sun, 27 Sep 2009) Log Message: ----------- unixodbc: An example implementation of configuration migration using an archive directory. Modified Paths: -------------- csw/mgar/pkg/unixodbc/trunk/Makefile csw/mgar/pkg/unixodbc/trunk/checksums Added Paths: ----------- csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall-linking csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall-moving Removed Paths: ------------- csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall Modified: csw/mgar/pkg/unixodbc/trunk/Makefile =================================================================== --- csw/mgar/pkg/unixodbc/trunk/Makefile 2009-09-27 16:44:37 UTC (rev 6496) +++ csw/mgar/pkg/unixodbc/trunk/Makefile 2009-09-27 17:12:00 UTC (rev 6497) @@ -13,7 +13,8 @@ DL_NAME = unixODBC MASTER_SITES = http://www.unixodbc.org/ DISTFILES = $(DL_NAME)-$(GARVERSION).tar.gz -DISTFILES += CSWunixodbc.postinstall +# The configuration migratin is pending decision. +# DISTFILES += CSWunixodbc.postinstall WORKSRC = $(WORKDIR)/$(DL_NAME)-$(GARVERSION) UFILES_REGEX = $(DL_NAME)-(\d+(?:\.\d+)*).tar.gz REQUIRED_PKGS = CSWiconv Modified: csw/mgar/pkg/unixodbc/trunk/checksums =================================================================== --- csw/mgar/pkg/unixodbc/trunk/checksums 2009-09-27 16:44:37 UTC (rev 6496) +++ csw/mgar/pkg/unixodbc/trunk/checksums 2009-09-27 17:12:00 UTC (rev 6497) @@ -1,2 +1 @@ -cc65f5642a9b5965da7d6978587e8ac4 download/CSWunixodbc.postinstall f47c2efb28618ecf5f33319140a7acd0 download/unixODBC-2.2.14.tar.gz Deleted: csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall =================================================================== --- csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall 2009-09-27 16:44:37 UTC (rev 6496) +++ csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall 2009-09-27 17:12:00 UTC (rev 6497) @@ -1,76 +0,0 @@ -#!/bin/sh -# -# $Id$ -# -# vim:set sw=2 ts=2 sts=2 expandtab: -# -# # If old_path exists: -# # Create a file named {{old_path.THIS_LOCATION_IS_DEPRECATED}} and leave a message inside the file. -# # If new_path and new_path.CSW files are identical: -# # Remove new_path (it's only a copy of the .CSW default file, no data loss) -# # Create a symlink from new_path to old_path -# # Otherwise: -# # Create a file named {{old_path.THIS_FILE_IS_PROBABLY_UNUSED}} -# -# http://wiki.opencsw.org/configuration-directory-migration - -deprecated_info=" -This location (/opt/csw/etc) is deprecated. - -Configuration files are currently being placed in /etc/opt/csw. Please make -sure your new configuration is in /etc/opt/csw and remove the old one from -/opt/csw/etc. -" -deprecated_file_ext="THIS_LOCATION_IS_DEPRECATED" - -filepairs="/opt/csw/etc/odbc.ini:/etc/opt/csw/odbc.ini" -filepairs="${filepairs} /opt/csw/etc/odbcinst.ini:/etc/opt/csw/odbcinst.ini" -dirpairs="/opt/csw/etc/ODBCDataSources:/etc/opt/csw/ODBCDataSources" - -return_code=0 - -# Generated ../../../ when given a path like /etc/opt/csw/odbc.ini -gen_dubdots() { - echo "$1" \ - | sed -e 's+[^/]+.+g' \ - | sed -e 's+\.*$++g' \ - | tr -s . \ - | sed -e 's+\.+..+g' \ - | sed -e 's+^/++' -} - -files_are_identical() { - cmp "$1" "$2" > /dev/null -} - -drop_warning() { - echo "${deprecated_info}" > "$1.${deprecated_file_ext}" -} - -for ff in ${filepairs} ${dirpairs}; do - old_location=`echo ${ff} | awk -F: '{print $1}'` - new_location=`echo ${ff} | awk -F: '{print $2}'` - abs_old_location="${PKG_INSTALL_ROOT}${old_location}" - abs_new_location="${PKG_INSTALL_ROOT}${new_location}" - old_location_noslash=`echo "${old_location}" | sed -e 's+^/++'` - dubdots=`gen_dubdots "${new_location}"` - if [ -r "${abs_old_location}" ]; then - drop_warning "${abs_old_location}" - if [ -h "${abs_new_location}" ]; then - # It's a symbolic link already, doing nothing. - true - elif [ -r "${abs_new_location}" ]; then - if files_are_identical "${abs_new_location}" "${abs_new_location}.CSW"; then - rm "${abs_new_location}" - ln -s "${dubdots}${old_location_noslash}" "${abs_new_location}" - else - touch "${abs_old_location}.THIS_FILE_IS_PROBABLY_UNUSED" - fi - else - # The file or directory doesn't exist. - ln -s "${dubdots}${old_location_noslash}" "${abs_new_location}" - fi - fi -done - -exit "${return_code}" Copied: csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall-linking (from rev 6462, csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall) =================================================================== --- csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall-linking (rev 0) +++ csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall-linking 2009-09-27 17:12:00 UTC (rev 6497) @@ -0,0 +1,76 @@ +#!/bin/sh +# +# $Id$ +# +# vim:set sw=2 ts=2 sts=2 expandtab: +# +# # If old_path exists: +# # Create a file named {{old_path.THIS_LOCATION_IS_DEPRECATED}} and leave a message inside the file. +# # If new_path and new_path.CSW files are identical: +# # Remove new_path (it's only a copy of the .CSW default file, no data loss) +# # Create a symlink from new_path to old_path +# # Otherwise: +# # Create a file named {{old_path.THIS_FILE_IS_PROBABLY_UNUSED}} +# +# http://wiki.opencsw.org/configuration-directory-migration + +deprecated_info=" +This location (/opt/csw/etc) is deprecated. + +Configuration files are currently being placed in /etc/opt/csw. Please make +sure your new configuration is in /etc/opt/csw and remove the old one from +/opt/csw/etc. +" +deprecated_file_ext="THIS_LOCATION_IS_DEPRECATED" + +filepairs="/opt/csw/etc/odbc.ini:/etc/opt/csw/odbc.ini" +filepairs="${filepairs} /opt/csw/etc/odbcinst.ini:/etc/opt/csw/odbcinst.ini" +dirpairs="/opt/csw/etc/ODBCDataSources:/etc/opt/csw/ODBCDataSources" + +return_code=0 + +# Generated ../../../ when given a path like /etc/opt/csw/odbc.ini +gen_dubdots() { + echo "$1" \ + | sed -e 's+[^/]+.+g' \ + | sed -e 's+\.*$++g' \ + | tr -s . \ + | sed -e 's+\.+..+g' \ + | sed -e 's+^/++' +} + +files_are_identical() { + cmp "$1" "$2" > /dev/null +} + +drop_warning() { + echo "${deprecated_info}" > "$1.${deprecated_file_ext}" +} + +for ff in ${filepairs} ${dirpairs}; do + old_location=`echo ${ff} | awk -F: '{print $1}'` + new_location=`echo ${ff} | awk -F: '{print $2}'` + abs_old_location="${PKG_INSTALL_ROOT}${old_location}" + abs_new_location="${PKG_INSTALL_ROOT}${new_location}" + old_location_noslash=`echo "${old_location}" | sed -e 's+^/++'` + dubdots=`gen_dubdots "${new_location}"` + if [ -r "${abs_old_location}" ]; then + drop_warning "${abs_old_location}" + if [ -h "${abs_new_location}" ]; then + # It's a symbolic link already, doing nothing. + true + elif [ -r "${abs_new_location}" ]; then + if files_are_identical "${abs_new_location}" "${abs_new_location}.CSW"; then + rm "${abs_new_location}" + ln -s "${dubdots}${old_location_noslash}" "${abs_new_location}" + else + touch "${abs_old_location}.THIS_FILE_IS_PROBABLY_UNUSED" + fi + else + # The file or directory doesn't exist. + ln -s "${dubdots}${old_location_noslash}" "${abs_new_location}" + fi + fi +done + +exit "${return_code}" Added: csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall-moving =================================================================== --- csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall-moving (rev 0) +++ csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall-moving 2009-09-27 17:12:00 UTC (rev 6497) @@ -0,0 +1,159 @@ +#!/bin/sh +# vim:set sw=2 ts=2 sts=2 expandtab: +# +# $Id$ +# +# old_path: e.g. /opt/csw/etc/foo.conf +# new_path: e.g. /etc/opt/csw/foo.conf +# arch_path: e.g. /etc/opt/csw/migration-archive/foo.conf +# +# # If old_path exists: +# # Create a file named {{old_path.THIS_LOCATION_IS_DEPRECATED}} and leave a message inside the file. +# # Move old_path to archive_path +# # If new_path does not exist: +# # Copy archive_path to new_path +# +# http://wiki.opencsw.org/configuration-directory-migration +# +# old_path: /opt/csw/etc/foo.conf +# arch_path: /opt/csw/etc/migration-archive/foo.conf +# new_path: /etc/opt/csw/foo.conf +# +# if old_path exists: +# move old_path to arch_path +# if arch_path exists and new_path doesn't: +# copy arch_path to new_path + +set -u + +# To prevent issues with a-z in regular expressions +unset LC_ALL +LANG=C + +MIGRATE_FILES="odbc.ini odbcinst.ini ODBCDataSources" + + +# The defaults +SOURCE_DIR___default__="/opt/csw/etc" +readonly SOURCE_DIR___default__ +ARCH_DIR___default__="/opt/csw/etc/migration-archive" +readonly ARCH_DIR___default__ +DEST_DIR___default__="/etc/opt/csw" +readonly DEST_DIR___default__ + +return_code=0 + +migration_info=" +This location (/opt/csw/etc) is deprecated. + +Configuration files are currently being placed in /etc/opt/csw. Please make +sure your new configuration is in /etc/opt/csw and remove the old one from +/opt/csw/etc. + +For more information, please see +http://wiki.opencsw.org/configuration-directory-migration +" +readonly migration_info +deprecated_file_ext="README.migration" +readonly deprecated_file_ext + +give_a_chance_to_stop() { + echo + echo "*******************************************************************" + echo "* The old configuration directory ${obsolete_dir} still exists. " + echo "* Please move your configuration to ${new_dir}. " + echo "* " + echo "* Installation will continue in 10 seconds. " + echo "* Press CTRL+C if you want to stop now. " + echo "*******************************************************************" + echo + sleep 10 +} + + +files_are_identical() { + cmp "$1" "$2" > /dev/null +} + +drop_warning() { + echo "${migration_info}" > "$1.${deprecated_file_ext}" +} + +sanitize() { + echo "$1" | sed -e 's/[^a-zA-Z0-9]/_/g' +} + +expand_modifiers() { + # Emulating local variables + __per_file_variable="$1" + __per_file_modifier_value="$2" + eval echo `echo \\${${__per_file_variable}_${__per_file_modifier_value}:-}` +} + +place_signpost_for() { + __file_name="$1" + echo "${migration_info}" > "${__file_name}.${deprecated_file_ext}" +} + +main() { + for file_name in ${MIGRATE_FILES}; do + modifier_value=`sanitize "${file_name}"` + echo "file: ${file_name}" + echo "modifier_value: ${modifier_value}" + + # Perhaps the following three segments of code could be turned into + # a function, but it would require complicated eval calls. + per_file_srcdir=`expand_modifiers SOURCE_DIR ${modifier_value}` + default_srcdir=`expand_modifiers SOURCE_DIR __default__` + srcdir="${per_file_srcdir:-${default_srcdir}}" + per_file_dstdir=`expand_modifiers DEST_DIR ${modifier_value}` + default_dstdir=`expand_modifiers DEST_DIR __default__` + dstdir="${per_file_dstdir:-${default_dstdir}}" + per_file_archdir=`expand_modifiers ARCH_DIR ${modifier_value}` + default_archdir=`expand_modifiers ARCH_DIR __default__` + archdir="${per_file_archdir:-${default_archdir}}" + srcpath="${srcdir}/${file_name}" + dstpath="${dstdir}/${file_name}" + archpath="${archdir}/${file_name}" + + # Make sure we have the environment we expect + if [ ! -d "${archdir}" ] + then + echo "Creating ${archdir}" + mkdir -m 755 -p "${archdir}" + if [ $? -ne 0 ] + then + echo "Couldn't create '${archdir}', bailing out." + exit 1 + fi + fi + + # All variables are set, the main algorithm goes here. + + # Moving the file will only work in the global zone. The assumption is that + # the preinstall script is going to be run in the global zone first; by the + # time it gets to the non-global zones, the ${srcpath} will have been + # moved already. + if [ -r "${srcpath}" ] + then + place_signpost_for "${srcpath}" + mv "${srcpath}" "${archpath}" + fi + + # If the destination file is not there and the archived file is, copy it. + if [ ! -r "${dstpath}" ] + then + if [ -r "${archpath}" ] + then + cp "${archpath}" "${dstpath}" + else + echo "The archived file does not exist: ${archpath}" + echo "Nothing to copy to ${dstpath}." + fi + fi + done +} + +main + +exit "${return_code}" 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 Sep 27 19:13:11 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 17:13:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[6498] csw/mgar/pkg/x11 Message-ID: Revision: 6498 http://gar.svn.sourceforge.net/gar/?rev=6498&view=rev Author: wbonnet Date: 2009-09-27 17:13:11 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxvmc/ csw/mgar/pkg/x11/libxvmc/branches/ csw/mgar/pkg/x11/libxvmc/tags/ csw/mgar/pkg/x11/libxvmc/trunk/ csw/mgar/pkg/x11/libxvmc/trunk/Makefile csw/mgar/pkg/x11/libxvmc/trunk/checksums csw/mgar/pkg/x11/libxvmc/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxvmc/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/x11/libxvmc/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxvmc/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxvmc/trunk/Makefile 2009-09-27 17:13:11 UTC (rev 6498) @@ -0,0 +1,36 @@ +GARNAME = libXvMC +GARVERSION = 1.0.4 +CATEGORIES = x11 + +DESCRIPTION = XVideo Motion Compensation Library +define BLURB + X-Video Motion Compensation (XvMC) provides accelerated video playback by offloading video decoding to hardware. It is an extension of the X video extension for the X Window System. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibxvmc CSWlibxvmcdevel + +CATALOGNAME_CSWlibxvmc = libxvmc +CATALOGNAME_CSWlibxvmcdevel = libxvmc_devel + +SPKG_DESC_CSWlibxvmc = $(DESCRIPTION) +SPKG_DESC_CSWlibxvmcdevel = $(DESCRIPTION) development files + +PREREQUISITE_PKGS = CSWlibxvdevel CSWxvideoproto + +REQUIRED_PKGS_CSWlibxvmc = CSWlibx11 CSWlibxext CSWlibxv +REQUIRED_PKGS_CSWlibxvmcdevel = CSWlibxvmc + +PKGFILES_CSWlibxvmcdevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libxvmc/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxvmc/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxvmc/trunk/checksums 2009-09-27 17:13:11 UTC (rev 6498) @@ -0,0 +1 @@ +b54600573daf9d1a29b952e8d35b389e download/libXvMC-1.0.4.tar.bz2 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 Sep 27 19:22:14 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 17:22:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6499] csw/mgar/pkg/x11 Message-ID: Revision: 6499 http://gar.svn.sourceforge.net/gar/?rev=6499&view=rev Author: wbonnet Date: 2009-09-27 17:22:14 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/liboldx/ csw/mgar/pkg/x11/liboldx/branches/ csw/mgar/pkg/x11/liboldx/tags/ csw/mgar/pkg/x11/liboldx/trunk/ csw/mgar/pkg/x11/liboldx/trunk/Makefile csw/mgar/pkg/x11/liboldx/trunk/checksums csw/mgar/pkg/x11/liboldx/trunk/files/ Property changes on: csw/mgar/pkg/x11/liboldx/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/x11/liboldx/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/liboldx/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/liboldx/trunk/Makefile 2009-09-27 17:22:14 UTC (rev 6499) @@ -0,0 +1,33 @@ +GARNAME = liboldX +GARVERSION = 1.0.1 +CATEGORIES = x11 + +DESCRIPTION = The oldX Library +define BLURB + The old X10 compatibility library +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWliboldx CSWliboldxdevel + +CATALOGNAME_CSWliboldx = liboldx +CATALOGNAME_CSWliboldxdevel = liboldx_devel + +SPKG_DESC_CSWliboldx = $(DESCRIPTION) +SPKG_DESC_CSWliboldxdevel = $(DESCRIPTION) development files + +REQUIRED_PKGS_CSWliboldxdevel = CSWliboldx + +PKGFILES_CSWliboldxdevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/liboldx/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/liboldx/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/liboldx/trunk/checksums 2009-09-27 17:22:14 UTC (rev 6499) @@ -0,0 +1 @@ +6b81ffe486d76c380d08f92285758d84 download/liboldX-1.0.1.tar.bz2 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 Sep 27 19:55:06 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 17:55:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6500] csw/mgar/pkg/x11 Message-ID: Revision: 6500 http://gar.svn.sourceforge.net/gar/?rev=6500&view=rev Author: wbonnet Date: 2009-09-27 17:55:06 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libwindowswm/ csw/mgar/pkg/x11/libwindowswm/branches/ csw/mgar/pkg/x11/libwindowswm/tags/ csw/mgar/pkg/x11/libwindowswm/trunk/ csw/mgar/pkg/x11/libwindowswm/trunk/Makefile csw/mgar/pkg/x11/libwindowswm/trunk/checksums csw/mgar/pkg/x11/libwindowswm/trunk/files/ Property changes on: csw/mgar/pkg/x11/libwindowswm/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/x11/libwindowswm/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libwindowswm/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libwindowswm/trunk/Makefile 2009-09-27 17:55:06 UTC (rev 6500) @@ -0,0 +1,36 @@ +GARNAME = libWindowsWM +GARVERSION = 1.0.0 +CATEGORIES = x11 + +DESCRIPTION = Cygwin/X rootless window management extension +define BLURB + WindowsWM is a simple library designed to interface with the Windows-WM extension. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibwindowswm CSWlibwindowswmdevel + +CATALOGNAME_CSWlibwindowswm = libwindowswm +CATALOGNAME_CSWlibwindowswmdevel = libwindowswm_devel + +SPKG_DESC_CSWlibwindowswm = $(DESCRIPTION) +SPKG_DESC_CSWlibwindowswmdevel = $(DESCRIPTION) development files + +PREREQUISITE_PKGS = CSWwindowswmproto + +REQUIRED_PKGS_CSWlibwindowswm = CSWlibx11 CSWlibxext +REQUIRED_PKGS_CSWlibwindowswmdevel = CSWlibwindowswm + +PKGFILES_CSWlibwindowswmdevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libwindowswm/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libwindowswm/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libwindowswm/trunk/checksums 2009-09-27 17:55:06 UTC (rev 6500) @@ -0,0 +1 @@ +337b379fd00a67345b083100c4e6ba95 download/libWindowsWM-1.0.0.tar.bz2 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 Sep 27 20:05:13 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 18:05:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[6501] csw/mgar/pkg/x11 Message-ID: Revision: 6501 http://gar.svn.sourceforge.net/gar/?rev=6501&view=rev Author: wbonnet Date: 2009-09-27 18:05:13 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxxf86dga/ csw/mgar/pkg/x11/libxxf86dga/branches/ csw/mgar/pkg/x11/libxxf86dga/tags/ csw/mgar/pkg/x11/libxxf86dga/trunk/ csw/mgar/pkg/x11/libxxf86dga/trunk/Makefile csw/mgar/pkg/x11/libxxf86dga/trunk/checksums csw/mgar/pkg/x11/libxxf86dga/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxxf86dga/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/x11/libxxf86dga/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxxf86dga/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxxf86dga/trunk/Makefile 2009-09-27 18:05:13 UTC (rev 6501) @@ -0,0 +1,36 @@ +GARNAME = libXxf86dga +GARVERSION = 1.0.2 +CATEGORIES = x11 + +DESCRIPTION = X11 Direct Graphics Access extension library +define BLURB + libXxf86dga provides the XFree86-DGA extension, which allows direct graphics access to a framebuffer-like region, and also allows relative mouse reporting, et al. It is mainly used by games and emulators for games. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibxxf86dga CSWlibxxf86dgadevel + +CATALOGNAME_CSWlibxxf86dga = libxxf86dga +CATALOGNAME_CSWlibxxf86dgadevel = libxxf86dga_devel + +SPKG_DESC_CSWlibxxf86dga = $(DESCRIPTION) +SPKG_DESC_CSWlibxxf86dgadevel = $(DESCRIPTION) development files + +PREREQUISITE_PKGS = CSWxf86dgaproto + +REQUIRED_PKGS_CSWlibxxf86dga = CSWlibx11 CSWlibxext +REQUIRED_PKGS_CSWlibxxf86dgadevel = CSWlibxxf86dga + +PKGFILES_CSWlibxxf86dgadevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libxxf86dga/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxxf86dga/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxxf86dga/trunk/checksums 2009-09-27 18:05:13 UTC (rev 6501) @@ -0,0 +1 @@ +6f5f621804ee652b6cc6f2025c517c78 download/libXxf86dga-1.0.2.tar.bz2 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 Sep 27 20:12:09 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 18:12:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[6502] csw/mgar/pkg/x11 Message-ID: Revision: 6502 http://gar.svn.sourceforge.net/gar/?rev=6502&view=rev Author: wbonnet Date: 2009-09-27 18:12:08 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxxf86misc/ csw/mgar/pkg/x11/libxxf86misc/branches/ csw/mgar/pkg/x11/libxxf86misc/tags/ csw/mgar/pkg/x11/libxxf86misc/trunk/ csw/mgar/pkg/x11/libxxf86misc/trunk/Makefile csw/mgar/pkg/x11/libxxf86misc/trunk/checksums csw/mgar/pkg/x11/libxxf86misc/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxxf86misc/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/x11/libxxf86misc/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxxf86misc/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxxf86misc/trunk/Makefile 2009-09-27 18:12:08 UTC (rev 6502) @@ -0,0 +1,35 @@ +GARNAME = libXxf86misc +GARVERSION = 1.0.1 +CATEGORIES = x11 + +DESCRIPTION = X11 XFree86 miscellaneous extension library +define BLURB + libXxf86misc provides an interface to the XFree86-Misc extension, which allows client applications to query the current keyboard and mouse settings of the running XFree86-based (XFree86, Xorg) server. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibxxf86misc CSWlibxxf86miscdevel + +CATALOGNAME_CSWlibxxf86misc = libxxf86misc +CATALOGNAME_CSWlibxxf86miscdevel = libxxf86misc_devel + +SPKG_DESC_CSWlibxxf86misc = $(DESCRIPTION) +SPKG_DESC_CSWlibxxf86miscdevel = $(DESCRIPTION) development files + +PREREQUISITE_PKGS = CSWxf86miscproto +REQUIRED_PKGS_CSWlibxxf86misc = CSWlibx11 CSWlibxext +REQUIRED_PKGS_CSWlibxxf86miscdevel = CSWlibxxf86misc + +PKGFILES_CSWlibxxf86miscdevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libxxf86misc/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxxf86misc/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxxf86misc/trunk/checksums 2009-09-27 18:12:08 UTC (rev 6502) @@ -0,0 +1 @@ +7cee0df63903cef7f7a3fb68cdd99eef download/libXxf86misc-1.0.1.tar.bz2 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 Sep 27 20:18:05 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 18:18:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6503] csw/mgar/pkg/x11 Message-ID: Revision: 6503 http://gar.svn.sourceforge.net/gar/?rev=6503&view=rev Author: wbonnet Date: 2009-09-27 18:18:05 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxxf86vm/ csw/mgar/pkg/x11/libxxf86vm/branches/ csw/mgar/pkg/x11/libxxf86vm/tags/ csw/mgar/pkg/x11/libxxf86vm/trunk/ csw/mgar/pkg/x11/libxxf86vm/trunk/Makefile csw/mgar/pkg/x11/libxxf86vm/trunk/checksums csw/mgar/pkg/x11/libxxf86vm/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxxf86vm/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/x11/libxxf86vm/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxxf86vm/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxxf86vm/trunk/Makefile 2009-09-27 18:18:05 UTC (rev 6503) @@ -0,0 +1,35 @@ +GARNAME = libXxf86vm +GARVERSION = 1.0.2 +CATEGORIES = x11 + +DESCRIPTION = X11 XFree86 video mode extension library +define BLURB + libXxf86vm provides an interface to the XFree86-VidModeExtension extension, which allows client applications to get and set video mode timings in extensive detail. It is used by the xvidtune program in particular. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibxxf86vm CSWlibxxf86vmdevel + +CATALOGNAME_CSWlibxxf86vm = libxxf86vm +CATALOGNAME_CSWlibxxf86vmdevel = libxxf86vm_devel + +SPKG_DESC_CSWlibxxf86vm = $(DESCRIPTION) +SPKG_DESC_CSWlibxxf86vmdevel = $(DESCRIPTION) development files + +PREREQUISITE_PKGS = CSWxf86vidmodeproto +REQUIRED_PKGS_CSWlibxxf86vm = CSWlibx11 CSWlibxext +REQUIRED_PKGS_CSWlibxxf86vmdevel = CSWlibxxf86vm + +PKGFILES_CSWlibxxf86vmdevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libxxf86vm/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxxf86vm/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxxf86vm/trunk/checksums 2009-09-27 18:18:05 UTC (rev 6503) @@ -0,0 +1 @@ +304d37bd0a10d9b58aa9b64469ad73e5 download/libXxf86vm-1.0.2.tar.bz2 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 Sep 27 20:49:06 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 18:49:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6504] csw/mgar/pkg/x11 Message-ID: Revision: 6504 http://gar.svn.sourceforge.net/gar/?rev=6504&view=rev Author: wbonnet Date: 2009-09-27 18:49:06 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxprintutil/ csw/mgar/pkg/x11/libxprintutil/branches/ csw/mgar/pkg/x11/libxprintutil/tags/ csw/mgar/pkg/x11/libxprintutil/trunk/ csw/mgar/pkg/x11/libxprintutil/trunk/Makefile csw/mgar/pkg/x11/libxprintutil/trunk/checksums csw/mgar/pkg/x11/libxprintutil/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxprintutil/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/x11/libxprintutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxprintutil/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxprintutil/trunk/Makefile 2009-09-27 18:49:06 UTC (rev 6504) @@ -0,0 +1,36 @@ +GARNAME = libXprintUtil +GARVERSION = 1.0.1 +CATEGORIES = x11 + +DESCRIPTION = The XprintUtil Library +define BLURB + libxprintutil provides utility Xpu APIs allowing client applications to access and manipulate information about printer capabilities from an Xprint server. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibxprintutil CSWlibxprintutildevel + +CATALOGNAME_CSWlibxprintutil = libxprintutil +CATALOGNAME_CSWlibxprintutildevel = libxprintutil_devel + +SPKG_DESC_CSWlibxprintutil = $(DESCRIPTION) +SPKG_DESC_CSWlibxprintutildevel = $(DESCRIPTION) development files + + +PREREQUISITE_PKGS = CSWlibxpdevel CSWlibicedevel +REQUIRED_PKGS_CSWlibxprintutil = CSWlibice CSWlibx11 CSWlibxau CSWlibxp CSWlibxt +REQUIRED_PKGS_CSWlibxprintutildevel = CSWlibxprintutil + +PKGFILES_CSWlibxprintutildevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libxprintutil/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxprintutil/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxprintutil/trunk/checksums 2009-09-27 18:49:06 UTC (rev 6504) @@ -0,0 +1 @@ +22584f1aab1deba253949b562d1f0f45 download/libXprintUtil-1.0.1.tar.bz2 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 Sep 27 20:53:14 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 18:53:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6505] csw/mgar/pkg/x11 Message-ID: Revision: 6505 http://gar.svn.sourceforge.net/gar/?rev=6505&view=rev Author: wbonnet Date: 2009-09-27 18:53:14 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxprintapputil/ csw/mgar/pkg/x11/libxprintapputil/branches/ csw/mgar/pkg/x11/libxprintapputil/tags/ csw/mgar/pkg/x11/libxprintapputil/trunk/ csw/mgar/pkg/x11/libxprintapputil/trunk/Makefile csw/mgar/pkg/x11/libxprintapputil/trunk/checksums csw/mgar/pkg/x11/libxprintapputil/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxprintapputil/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/x11/libxprintapputil/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxprintapputil/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxprintapputil/trunk/Makefile 2009-09-27 18:53:14 UTC (rev 6505) @@ -0,0 +1,35 @@ +GARNAME = libXprintAppUtil +GARVERSION = 1.0.1 +CATEGORIES = x11 + +DESCRIPTION = Xprint job utility client library +define BLURB + libxprintapputil provides utility Xpau APIs allowing client applications to access information about and control Xprint jobs from an Xprint server. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibxprintapputil CSWlibxprintapputildevel + +CATALOGNAME_CSWlibxprintapputil = libxprintapputil +CATALOGNAME_CSWlibxprintapputildevel = libxprintapputil_devel + +SPKG_DESC_CSWlibxprintapputil = $(DESCRIPTION) +SPKG_DESC_CSWlibxprintapputildevel = $(DESCRIPTION) development files + +PREREQUISITE_PKGS = CSWlibxprintutildevel +REQUIRED_PKGS_CSWlibxprintapputil = CSWlibice CSWlibx11 CSWlibxau CSWlibxp CSWlibxprintutil CSWlibxt +REQUIRED_PKGS_CSWlibxprintapputildevel = CSWlibxprintapputil + +PKGFILES_CSWlibxprintapputildevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libxprintapputil/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxprintapputil/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxprintapputil/trunk/checksums 2009-09-27 18:53:14 UTC (rev 6505) @@ -0,0 +1 @@ +d2de510570aa6714681109b2ba178365 download/libXprintAppUtil-1.0.1.tar.bz2 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 Sep 27 20:57:50 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 18:57:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6506] csw/mgar/pkg/x11 Message-ID: Revision: 6506 http://gar.svn.sourceforge.net/gar/?rev=6506&view=rev Author: wbonnet Date: 2009-09-27 18:57:49 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxtrap/ csw/mgar/pkg/x11/libxtrap/branches/ csw/mgar/pkg/x11/libxtrap/tags/ csw/mgar/pkg/x11/libxtrap/trunk/ csw/mgar/pkg/x11/libxtrap/trunk/Makefile csw/mgar/pkg/x11/libxtrap/trunk/checksums csw/mgar/pkg/x11/libxtrap/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxtrap/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/x11/libxtrap/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxtrap/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxtrap/trunk/Makefile 2009-09-27 18:57:49 UTC (rev 6506) @@ -0,0 +1,35 @@ +GARNAME = libXTrap +GARVERSION = 1.0.0 +CATEGORIES = x11 + +DESCRIPTION = X11 event trapping extension library +define BLURB + libXTrap provides an interface to the DEC-XTRAP extension, which allows for capture and synthesis of core input events. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibxtrap CSWlibxtrapdevel + +CATALOGNAME_CSWlibxtrap = libxtrap +CATALOGNAME_CSWlibxtrapdevel = libxtrap_devel + +SPKG_DESC_CSWlibxtrap = $(DESCRIPTION) +SPKG_DESC_CSWlibxtrapdevel = $(DESCRIPTION) development files + +PREREQUISITE_PKGS = CSWtrapproto CSWlibxtdevel CSWlibsmdevel CSWlibicedevel +REQUIRED_PKGS_CSWlibxtrap = CSWlibice CSWlibx11 CSWlibxext CSWlibxt +REQUIRED_PKGS_CSWlibxtrapdevel = CSWlibxtrap + +PKGFILES_CSWlibxtrapdevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libxtrap/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxtrap/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxtrap/trunk/checksums 2009-09-27 18:57:49 UTC (rev 6506) @@ -0,0 +1 @@ +1e2d966b5b2b89910e418bb0f78e10de download/libXTrap-1.0.0.tar.bz2 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 Sep 27 21:06:08 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:06:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[6507] csw/mgar/pkg/x11/fixesproto/trunk Message-ID: Revision: 6507 http://gar.svn.sourceforge.net/gar/?rev=6507&view=rev Author: wbonnet Date: 2009-09-27 19:06:08 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Downgrade to version 4.0 for compilation issues. Some others libs have not yet been updated Modified Paths: -------------- csw/mgar/pkg/x11/fixesproto/trunk/Makefile csw/mgar/pkg/x11/fixesproto/trunk/checksums Modified: csw/mgar/pkg/x11/fixesproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/fixesproto/trunk/Makefile 2009-09-27 18:57:49 UTC (rev 6506) +++ csw/mgar/pkg/x11/fixesproto/trunk/Makefile 2009-09-27 19:06:08 UTC (rev 6507) @@ -1,5 +1,5 @@ GARNAME = fixesproto -GARVERSION = 4.1 +GARVERSION = 4.0 CATEGORIES = x11 DESCRIPTION = X11 Fixes extension protocol specification Modified: csw/mgar/pkg/x11/fixesproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/fixesproto/trunk/checksums 2009-09-27 18:57:49 UTC (rev 6506) +++ csw/mgar/pkg/x11/fixesproto/trunk/checksums 2009-09-27 19:06:08 UTC (rev 6507) @@ -1 +1 @@ -c8dc868f8f23bb4b545e6b98aed375b4 download/fixesproto-4.1.tar.gz +ed4af7fbf04a51aca684c259784520f3 download/fixesproto-4.0.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 Sun Sep 27 21:11:39 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:11:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[6508] csw/mgar/pkg/x11 Message-ID: Revision: 6508 http://gar.svn.sourceforge.net/gar/?rev=6508&view=rev Author: wbonnet Date: 2009-09-27 19:11:39 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxcomposite/ csw/mgar/pkg/x11/libxcomposite/branches/ csw/mgar/pkg/x11/libxcomposite/tags/ csw/mgar/pkg/x11/libxcomposite/trunk/ csw/mgar/pkg/x11/libxcomposite/trunk/Makefile csw/mgar/pkg/x11/libxcomposite/trunk/checksums csw/mgar/pkg/x11/libxcomposite/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxcomposite/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/x11/libxcomposite/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxcomposite/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxcomposite/trunk/Makefile 2009-09-27 19:11:39 UTC (rev 6508) @@ -0,0 +1,36 @@ +GARNAME = libXcomposite +GARVERSION = 0.4.0 +CATEGORIES = x11 + +DESCRIPTION = X11 Composite extension library +define BLURB + libXcomposite provides an X Window System client interface to the Composite extension to the X protocol. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibxcomposite CSWlibxcompositedevel + +CATALOGNAME_CSWlibxcomposite = libxcomposite +CATALOGNAME_CSWlibxcompositedevel = libxcomposite_devel + +SPKG_DESC_CSWlibxcomposite = $(DESCRIPTION) +SPKG_DESC_CSWlibxcompositedevel = $(DESCRIPTION) development files + +PREREQUISITE_PKGS = CSWcompositeproto +REQUIRED_PKGS_CSWlibxcompositedevel = CSWlibxcomposite +REQUIRED_PKGS_CSWlibxcomposite = CSWlibx11 CSWlibxext CSWlibxfixes + +PKGFILES_CSWlibxcompositedevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk + Added: csw/mgar/pkg/x11/libxcomposite/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxcomposite/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxcomposite/trunk/checksums 2009-09-27 19:11:39 UTC (rev 6508) @@ -0,0 +1 @@ +7e95395dea89be21bae929b9b7f16641 download/libXcomposite-0.4.0.tar.bz2 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 Sep 27 21:25:50 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:25:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6509] csw/mgar/pkg/x11 Message-ID: Revision: 6509 http://gar.svn.sourceforge.net/gar/?rev=6509&view=rev Author: wbonnet Date: 2009-09-27 19:25:50 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxfont/ csw/mgar/pkg/x11/libxfont/branches/ csw/mgar/pkg/x11/libxfont/tags/ csw/mgar/pkg/x11/libxfont/trunk/ csw/mgar/pkg/x11/libxfont/trunk/Makefile csw/mgar/pkg/x11/libxfont/trunk/checksums csw/mgar/pkg/x11/libxfont/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxfont/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/x11/libxfont/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxfont/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxfont/trunk/Makefile 2009-09-27 19:25:50 UTC (rev 6509) @@ -0,0 +1,35 @@ +GARNAME = libXfont +GARVERSION = 1.4.0 +CATEGORIES = x11 + +DESCRIPTION = X11 font rasterisation library +define BLURB + libXfont provides various services for X servers, most notably font selection and rasterisation (through external libraries). +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibxfont CSWlibxfontdevel + +CATALOGNAME_CSWlibxfont = libxfont +CATALOGNAME_CSWlibxfontdevel = libxfont_devel + +SPKG_DESC_CSWlibxfont = $(DESCRIPTION) +SPKG_DESC_CSWlibxfontdevel = $(DESCRIPTION) development files + +PREREQUISITE_PKGS = CSWlibfontencdevel +REQUIRED_PKGS_CSWlibxfontdevel = CSWlibxfont +REQUIRED_PKGS_CSWlibxfont = CSWftype2 CSWlibfontenc CSWzlib + +PKGFILES_CSWlibxfontdevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libxfont/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxfont/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxfont/trunk/checksums 2009-09-27 19:25:50 UTC (rev 6509) @@ -0,0 +1 @@ +3a8e06b25912ef339d70a8ba003da9b5 download/libXfont-1.4.0.tar.bz2 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 Sep 27 21:55:02 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:55:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[6510] csw/mgar/pkg/x11/applewmproto/Makefile Message-ID: Revision: 6510 http://gar.svn.sourceforge.net/gar/?rev=6510&view=rev Author: wbonnet Date: 2009-09-27 19:55:02 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/applewmproto/Makefile Modified: csw/mgar/pkg/x11/applewmproto/Makefile =================================================================== --- csw/mgar/pkg/x11/applewmproto/Makefile 2009-09-27 19:25:50 UTC (rev 6509) +++ csw/mgar/pkg/x11/applewmproto/Makefile 2009-09-27 19:55:02 UTC (rev 6510) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/xproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 21:55:18 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:55:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[6511] csw/mgar/pkg/x11/bigreqsproto/Makefile Message-ID: Revision: 6511 http://gar.svn.sourceforge.net/gar/?rev=6511&view=rev Author: wbonnet Date: 2009-09-27 19:55:18 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/bigreqsproto/Makefile Modified: csw/mgar/pkg/x11/bigreqsproto/Makefile =================================================================== --- csw/mgar/pkg/x11/bigreqsproto/Makefile 2009-09-27 19:55:02 UTC (rev 6510) +++ csw/mgar/pkg/x11/bigreqsproto/Makefile 2009-09-27 19:55:18 UTC (rev 6511) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/xproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 21:55:31 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:55:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[6512] csw/mgar/pkg/x11/compositeproto/Makefile Message-ID: Revision: 6512 http://gar.svn.sourceforge.net/gar/?rev=6512&view=rev Author: wbonnet Date: 2009-09-27 19:55:30 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/compositeproto/Makefile Modified: csw/mgar/pkg/x11/compositeproto/Makefile =================================================================== --- csw/mgar/pkg/x11/compositeproto/Makefile 2009-09-27 19:55:18 UTC (rev 6511) +++ csw/mgar/pkg/x11/compositeproto/Makefile 2009-09-27 19:55:30 UTC (rev 6512) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/xproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 21:55:46 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:55:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6513] csw/mgar/pkg/x11/damageproto/Makefile Message-ID: Revision: 6513 http://gar.svn.sourceforge.net/gar/?rev=6513&view=rev Author: wbonnet Date: 2009-09-27 19:55:46 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/damageproto/Makefile Modified: csw/mgar/pkg/x11/damageproto/Makefile =================================================================== --- csw/mgar/pkg/x11/damageproto/Makefile 2009-09-27 19:55:30 UTC (rev 6512) +++ csw/mgar/pkg/x11/damageproto/Makefile 2009-09-27 19:55:46 UTC (rev 6513) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/xproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 21:56:05 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:56:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6514] csw/mgar/pkg/x11/dmxproto/Makefile Message-ID: Revision: 6514 http://gar.svn.sourceforge.net/gar/?rev=6514&view=rev Author: wbonnet Date: 2009-09-27 19:56:04 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/dmxproto/Makefile Modified: csw/mgar/pkg/x11/dmxproto/Makefile =================================================================== --- csw/mgar/pkg/x11/dmxproto/Makefile 2009-09-27 19:55:46 UTC (rev 6513) +++ csw/mgar/pkg/x11/dmxproto/Makefile 2009-09-27 19:56:04 UTC (rev 6514) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/xproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 21:56:21 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:56:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[6515] csw/mgar/pkg/x11/dri2proto/Makefile Message-ID: Revision: 6515 http://gar.svn.sourceforge.net/gar/?rev=6515&view=rev Author: wbonnet Date: 2009-09-27 19:56:21 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/dri2proto/Makefile Modified: csw/mgar/pkg/x11/dri2proto/Makefile =================================================================== --- csw/mgar/pkg/x11/dri2proto/Makefile 2009-09-27 19:56:04 UTC (rev 6514) +++ csw/mgar/pkg/x11/dri2proto/Makefile 2009-09-27 19:56:21 UTC (rev 6515) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/xproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 21:56:33 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:56:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[6516] csw/mgar/pkg/x11/evieextproto/Makefile Message-ID: Revision: 6516 http://gar.svn.sourceforge.net/gar/?rev=6516&view=rev Author: wbonnet Date: 2009-09-27 19:56:33 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/evieextproto/Makefile Modified: csw/mgar/pkg/x11/evieextproto/Makefile =================================================================== --- csw/mgar/pkg/x11/evieextproto/Makefile 2009-09-27 19:56:21 UTC (rev 6515) +++ csw/mgar/pkg/x11/evieextproto/Makefile 2009-09-27 19:56:33 UTC (rev 6516) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/xproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 21:56:57 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:56:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[6517] csw/mgar/pkg/x11/fixesproto/Makefile Message-ID: Revision: 6517 http://gar.svn.sourceforge.net/gar/?rev=6517&view=rev Author: wbonnet Date: 2009-09-27 19:56:57 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/fixesproto/Makefile Modified: csw/mgar/pkg/x11/fixesproto/Makefile =================================================================== --- csw/mgar/pkg/x11/fixesproto/Makefile 2009-09-27 19:56:33 UTC (rev 6516) +++ csw/mgar/pkg/x11/fixesproto/Makefile 2009-09-27 19:56:57 UTC (rev 6517) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/xproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 21:57:16 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:57:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[6518] csw/mgar/pkg/x11/fontcacheproto/Makefile Message-ID: Revision: 6518 http://gar.svn.sourceforge.net/gar/?rev=6518&view=rev Author: wbonnet Date: 2009-09-27 19:57:16 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/fontcacheproto/Makefile Modified: csw/mgar/pkg/x11/fontcacheproto/Makefile =================================================================== --- csw/mgar/pkg/x11/fontcacheproto/Makefile 2009-09-27 19:56:57 UTC (rev 6517) +++ csw/mgar/pkg/x11/fontcacheproto/Makefile 2009-09-27 19:57:16 UTC (rev 6518) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/xproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 21:57:30 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:57:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[6519] csw/mgar/pkg/x11/fontsproto/Makefile Message-ID: Revision: 6519 http://gar.svn.sourceforge.net/gar/?rev=6519&view=rev Author: wbonnet Date: 2009-09-27 19:57:29 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/fontsproto/Makefile Added: csw/mgar/pkg/x11/fontsproto/Makefile =================================================================== --- csw/mgar/pkg/x11/fontsproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/fontsproto/Makefile 2009-09-27 19:57:29 UTC (rev 6519) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 21:57:39 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:57:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[6520] csw/mgar/pkg/x11/glproto/Makefile Message-ID: Revision: 6520 http://gar.svn.sourceforge.net/gar/?rev=6520&view=rev Author: wbonnet Date: 2009-09-27 19:57:39 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/glproto/Makefile Modified: csw/mgar/pkg/x11/glproto/Makefile =================================================================== --- csw/mgar/pkg/x11/glproto/Makefile 2009-09-27 19:57:29 UTC (rev 6519) +++ csw/mgar/pkg/x11/glproto/Makefile 2009-09-27 19:57:39 UTC (rev 6520) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/glproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 21:57:54 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:57:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[6521] csw/mgar/pkg/x11/inputproto/Makefile Message-ID: Revision: 6521 http://gar.svn.sourceforge.net/gar/?rev=6521&view=rev Author: wbonnet Date: 2009-09-27 19:57:54 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/inputproto/Makefile Modified: csw/mgar/pkg/x11/inputproto/Makefile =================================================================== --- csw/mgar/pkg/x11/inputproto/Makefile 2009-09-27 19:57:39 UTC (rev 6520) +++ csw/mgar/pkg/x11/inputproto/Makefile 2009-09-27 19:57:54 UTC (rev 6521) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/inputproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 21:58:05 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:58:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6522] csw/mgar/pkg/x11/kbproto/Makefile Message-ID: Revision: 6522 http://gar.svn.sourceforge.net/gar/?rev=6522&view=rev Author: wbonnet Date: 2009-09-27 19:58:05 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/kbproto/Makefile Modified: csw/mgar/pkg/x11/kbproto/Makefile =================================================================== --- csw/mgar/pkg/x11/kbproto/Makefile 2009-09-27 19:57:54 UTC (rev 6521) +++ csw/mgar/pkg/x11/kbproto/Makefile 2009-09-27 19:58:05 UTC (rev 6522) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/kbproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 21:58:23 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:58:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6523] csw/mgar/pkg/x11/libdmx/Makefile Message-ID: Revision: 6523 http://gar.svn.sourceforge.net/gar/?rev=6523&view=rev Author: wbonnet Date: 2009-09-27 19:58:22 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libdmx/Makefile Added: csw/mgar/pkg/x11/libdmx/Makefile =================================================================== --- csw/mgar/pkg/x11/libdmx/Makefile (rev 0) +++ csw/mgar/pkg/x11/libdmx/Makefile 2009-09-27 19:58:22 UTC (rev 6523) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 21:58:39 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:58:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[6524] csw/mgar/pkg/x11/libfontenc/Makefile Message-ID: Revision: 6524 http://gar.svn.sourceforge.net/gar/?rev=6524&view=rev Author: wbonnet Date: 2009-09-27 19:58:38 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libfontenc/Makefile Added: csw/mgar/pkg/x11/libfontenc/Makefile =================================================================== --- csw/mgar/pkg/x11/libfontenc/Makefile (rev 0) +++ csw/mgar/pkg/x11/libfontenc/Makefile 2009-09-27 19:58:38 UTC (rev 6524) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 21:58:52 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:58:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[6525] csw/mgar/pkg/x11/libfs/Makefile Message-ID: Revision: 6525 http://gar.svn.sourceforge.net/gar/?rev=6525&view=rev Author: wbonnet Date: 2009-09-27 19:58:52 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/libfs/Makefile Modified: csw/mgar/pkg/x11/libfs/Makefile =================================================================== --- csw/mgar/pkg/x11/libfs/Makefile 2009-09-27 19:58:38 UTC (rev 6524) +++ csw/mgar/pkg/x11/libfs/Makefile 2009-09-27 19:58:52 UTC (rev 6525) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/libFS directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 21:59:12 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:59:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[6526] csw/mgar/pkg/x11/libice/Makefile Message-ID: Revision: 6526 http://gar.svn.sourceforge.net/gar/?rev=6526&view=rev Author: wbonnet Date: 2009-09-27 19:59:12 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libice/Makefile Added: csw/mgar/pkg/x11/libice/Makefile =================================================================== --- csw/mgar/pkg/x11/libice/Makefile (rev 0) +++ csw/mgar/pkg/x11/libice/Makefile 2009-09-27 19:59:12 UTC (rev 6526) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 21:59:27 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:59:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[6527] csw/mgar/pkg/x11/liblbxutil/Makefile Message-ID: Revision: 6527 http://gar.svn.sourceforge.net/gar/?rev=6527&view=rev Author: wbonnet Date: 2009-09-27 19:59:26 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/liblbxutil/Makefile Added: csw/mgar/pkg/x11/liblbxutil/Makefile =================================================================== --- csw/mgar/pkg/x11/liblbxutil/Makefile (rev 0) +++ csw/mgar/pkg/x11/liblbxutil/Makefile 2009-09-27 19:59:26 UTC (rev 6527) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 21:59:48 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:59:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[6528] csw/mgar/pkg/x11/liboldx/Makefile Message-ID: Revision: 6528 http://gar.svn.sourceforge.net/gar/?rev=6528&view=rev Author: wbonnet Date: 2009-09-27 19:59:48 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/liboldx/Makefile Added: csw/mgar/pkg/x11/liboldx/Makefile =================================================================== --- csw/mgar/pkg/x11/liboldx/Makefile (rev 0) +++ csw/mgar/pkg/x11/liboldx/Makefile 2009-09-27 19:59:48 UTC (rev 6528) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:00:20 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:00:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[6529] csw/mgar/pkg/x11/libpthread-stubs/Makefile Message-ID: Revision: 6529 http://gar.svn.sourceforge.net/gar/?rev=6529&view=rev Author: wbonnet Date: 2009-09-27 20:00:19 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/libpthread-stubs/Makefile Modified: csw/mgar/pkg/x11/libpthread-stubs/Makefile =================================================================== --- csw/mgar/pkg/x11/libpthread-stubs/Makefile 2009-09-27 19:59:48 UTC (rev 6528) +++ csw/mgar/pkg/x11/libpthread-stubs/Makefile 2009-09-27 20:00:19 UTC (rev 6529) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/ directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 22:00:48 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:00:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[6530] csw/mgar/pkg/x11/libsm/Makefile Message-ID: Revision: 6530 http://gar.svn.sourceforge.net/gar/?rev=6530&view=rev Author: wbonnet Date: 2009-09-27 20:00:48 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libsm/Makefile Added: csw/mgar/pkg/x11/libsm/Makefile =================================================================== --- csw/mgar/pkg/x11/libsm/Makefile (rev 0) +++ csw/mgar/pkg/x11/libsm/Makefile 2009-09-27 20:00:48 UTC (rev 6530) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:01:03 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:01:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[6531] csw/mgar/pkg/x11/libwindowswm/Makefile Message-ID: Revision: 6531 http://gar.svn.sourceforge.net/gar/?rev=6531&view=rev Author: wbonnet Date: 2009-09-27 20:01:03 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libwindowswm/Makefile Added: csw/mgar/pkg/x11/libwindowswm/Makefile =================================================================== --- csw/mgar/pkg/x11/libwindowswm/Makefile (rev 0) +++ csw/mgar/pkg/x11/libwindowswm/Makefile 2009-09-27 20:01:03 UTC (rev 6531) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:01:19 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:01:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[6532] csw/mgar/pkg/x11/libx11/Makefile Message-ID: Revision: 6532 http://gar.svn.sourceforge.net/gar/?rev=6532&view=rev Author: wbonnet Date: 2009-09-27 20:01:18 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/libx11/Makefile Modified: csw/mgar/pkg/x11/libx11/Makefile =================================================================== --- csw/mgar/pkg/x11/libx11/Makefile 2009-09-27 20:01:03 UTC (rev 6531) +++ csw/mgar/pkg/x11/libx11/Makefile 2009-09-27 20:01:18 UTC (rev 6532) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/ directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 22:01:31 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:01:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[6533] csw/mgar/pkg/x11/libxau/Makefile Message-ID: Revision: 6533 http://gar.svn.sourceforge.net/gar/?rev=6533&view=rev Author: wbonnet Date: 2009-09-27 20:01:31 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/libxau/Makefile Modified: csw/mgar/pkg/x11/libxau/Makefile =================================================================== --- csw/mgar/pkg/x11/libxau/Makefile 2009-09-27 20:01:18 UTC (rev 6532) +++ csw/mgar/pkg/x11/libxau/Makefile 2009-09-27 20:01:31 UTC (rev 6533) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/ directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 22:01:44 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:01:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[6534] csw/mgar/pkg/x11/libxaw/Makefile Message-ID: Revision: 6534 http://gar.svn.sourceforge.net/gar/?rev=6534&view=rev Author: wbonnet Date: 2009-09-27 20:01:43 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxaw/Makefile Added: csw/mgar/pkg/x11/libxaw/Makefile =================================================================== --- csw/mgar/pkg/x11/libxaw/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxaw/Makefile 2009-09-27 20:01:43 UTC (rev 6534) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:01:57 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:01:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[6535] csw/mgar/pkg/x11/libxcb/Makefile Message-ID: Revision: 6535 http://gar.svn.sourceforge.net/gar/?rev=6535&view=rev Author: wbonnet Date: 2009-09-27 20:01:57 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/libxcb/Makefile Modified: csw/mgar/pkg/x11/libxcb/Makefile =================================================================== --- csw/mgar/pkg/x11/libxcb/Makefile 2009-09-27 20:01:43 UTC (rev 6534) +++ csw/mgar/pkg/x11/libxcb/Makefile 2009-09-27 20:01:57 UTC (rev 6535) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/ directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 22:02:13 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:02:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[6536] csw/mgar/pkg/x11/libxcomposite/Makefile Message-ID: Revision: 6536 http://gar.svn.sourceforge.net/gar/?rev=6536&view=rev Author: wbonnet Date: 2009-09-27 20:02:12 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxcomposite/Makefile Added: csw/mgar/pkg/x11/libxcomposite/Makefile =================================================================== --- csw/mgar/pkg/x11/libxcomposite/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxcomposite/Makefile 2009-09-27 20:02:12 UTC (rev 6536) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:02:25 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:02:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[6537] csw/mgar/pkg/x11/libxcursor/Makefile Message-ID: Revision: 6537 http://gar.svn.sourceforge.net/gar/?rev=6537&view=rev Author: wbonnet Date: 2009-09-27 20:02:25 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxcursor/Makefile Added: csw/mgar/pkg/x11/libxcursor/Makefile =================================================================== --- csw/mgar/pkg/x11/libxcursor/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxcursor/Makefile 2009-09-27 20:02:25 UTC (rev 6537) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:02:41 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:02:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[6538] csw/mgar/pkg/x11/libxdamage/Makefile Message-ID: Revision: 6538 http://gar.svn.sourceforge.net/gar/?rev=6538&view=rev Author: wbonnet Date: 2009-09-27 20:02:40 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxdamage/Makefile Added: csw/mgar/pkg/x11/libxdamage/Makefile =================================================================== --- csw/mgar/pkg/x11/libxdamage/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxdamage/Makefile 2009-09-27 20:02:40 UTC (rev 6538) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:02:59 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:02:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6539] csw/mgar/pkg/x11/libxdmcp/Makefile Message-ID: Revision: 6539 http://gar.svn.sourceforge.net/gar/?rev=6539&view=rev Author: wbonnet Date: 2009-09-27 20:02:59 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/libxdmcp/Makefile Modified: csw/mgar/pkg/x11/libxdmcp/Makefile =================================================================== --- csw/mgar/pkg/x11/libxdmcp/Makefile 2009-09-27 20:02:40 UTC (rev 6538) +++ csw/mgar/pkg/x11/libxdmcp/Makefile 2009-09-27 20:02:59 UTC (rev 6539) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/ directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 22:03:10 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:03:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[6540] csw/mgar/pkg/x11/libxevie/Makefile Message-ID: Revision: 6540 http://gar.svn.sourceforge.net/gar/?rev=6540&view=rev Author: wbonnet Date: 2009-09-27 20:03:09 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxevie/Makefile Added: csw/mgar/pkg/x11/libxevie/Makefile =================================================================== --- csw/mgar/pkg/x11/libxevie/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxevie/Makefile 2009-09-27 20:03:09 UTC (rev 6540) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:03:24 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:03:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[6541] csw/mgar/pkg/x11/libxext/Makefile Message-ID: Revision: 6541 http://gar.svn.sourceforge.net/gar/?rev=6541&view=rev Author: wbonnet Date: 2009-09-27 20:03:24 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxext/Makefile Added: csw/mgar/pkg/x11/libxext/Makefile =================================================================== --- csw/mgar/pkg/x11/libxext/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxext/Makefile 2009-09-27 20:03:24 UTC (rev 6541) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:03:37 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:03:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[6542] csw/mgar/pkg/x11/libxfixes/Makefile Message-ID: Revision: 6542 http://gar.svn.sourceforge.net/gar/?rev=6542&view=rev Author: wbonnet Date: 2009-09-27 20:03:37 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxfixes/Makefile Added: csw/mgar/pkg/x11/libxfixes/Makefile =================================================================== --- csw/mgar/pkg/x11/libxfixes/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxfixes/Makefile 2009-09-27 20:03:37 UTC (rev 6542) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:03:47 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:03:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[6543] csw/mgar/pkg/x11/libxfont/Makefile Message-ID: Revision: 6543 http://gar.svn.sourceforge.net/gar/?rev=6543&view=rev Author: wbonnet Date: 2009-09-27 20:03:46 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxfont/Makefile Added: csw/mgar/pkg/x11/libxfont/Makefile =================================================================== --- csw/mgar/pkg/x11/libxfont/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxfont/Makefile 2009-09-27 20:03:46 UTC (rev 6543) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:03:59 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:03:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6544] csw/mgar/pkg/x11/libxfontcache/Makefile Message-ID: Revision: 6544 http://gar.svn.sourceforge.net/gar/?rev=6544&view=rev Author: wbonnet Date: 2009-09-27 20:03:59 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxfontcache/Makefile Added: csw/mgar/pkg/x11/libxfontcache/Makefile =================================================================== --- csw/mgar/pkg/x11/libxfontcache/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxfontcache/Makefile 2009-09-27 20:03:59 UTC (rev 6544) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:04:13 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:04:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[6545] csw/mgar/pkg/x11/libxft/Makefile Message-ID: Revision: 6545 http://gar.svn.sourceforge.net/gar/?rev=6545&view=rev Author: wbonnet Date: 2009-09-27 20:04:12 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxft/Makefile Added: csw/mgar/pkg/x11/libxft/Makefile =================================================================== --- csw/mgar/pkg/x11/libxft/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxft/Makefile 2009-09-27 20:04:12 UTC (rev 6545) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:04:26 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:04:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[6546] csw/mgar/pkg/x11/libxi/Makefile Message-ID: Revision: 6546 http://gar.svn.sourceforge.net/gar/?rev=6546&view=rev Author: wbonnet Date: 2009-09-27 20:04:25 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxi/Makefile Added: csw/mgar/pkg/x11/libxi/Makefile =================================================================== --- csw/mgar/pkg/x11/libxi/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxi/Makefile 2009-09-27 20:04:25 UTC (rev 6546) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:04:37 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:04:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[6547] csw/mgar/pkg/x11/libxinerama/Makefile Message-ID: Revision: 6547 http://gar.svn.sourceforge.net/gar/?rev=6547&view=rev Author: wbonnet Date: 2009-09-27 20:04:36 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxinerama/Makefile Added: csw/mgar/pkg/x11/libxinerama/Makefile =================================================================== --- csw/mgar/pkg/x11/libxinerama/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxinerama/Makefile 2009-09-27 20:04:36 UTC (rev 6547) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:04:54 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:04:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[6548] csw/mgar/pkg/x11/libxkbfile/Makefile Message-ID: Revision: 6548 http://gar.svn.sourceforge.net/gar/?rev=6548&view=rev Author: wbonnet Date: 2009-09-27 20:04:54 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxkbfile/Makefile Added: csw/mgar/pkg/x11/libxkbfile/Makefile =================================================================== --- csw/mgar/pkg/x11/libxkbfile/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxkbfile/Makefile 2009-09-27 20:04:54 UTC (rev 6548) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:05:10 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:05:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[6549] csw/mgar/pkg/x11/libxkbui/Makefile Message-ID: Revision: 6549 http://gar.svn.sourceforge.net/gar/?rev=6549&view=rev Author: wbonnet Date: 2009-09-27 20:05:09 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxkbui/Makefile Added: csw/mgar/pkg/x11/libxkbui/Makefile =================================================================== --- csw/mgar/pkg/x11/libxkbui/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxkbui/Makefile 2009-09-27 20:05:09 UTC (rev 6549) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:05:30 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:05:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[6550] csw/mgar/pkg/x11/libxmu/Makefile Message-ID: Revision: 6550 http://gar.svn.sourceforge.net/gar/?rev=6550&view=rev Author: wbonnet Date: 2009-09-27 20:05:30 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxmu/Makefile Added: csw/mgar/pkg/x11/libxmu/Makefile =================================================================== --- csw/mgar/pkg/x11/libxmu/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxmu/Makefile 2009-09-27 20:05:30 UTC (rev 6550) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:05:59 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:05:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6551] csw/mgar/pkg/x11/libxp/Makefile Message-ID: Revision: 6551 http://gar.svn.sourceforge.net/gar/?rev=6551&view=rev Author: wbonnet Date: 2009-09-27 20:05:59 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxp/Makefile Added: csw/mgar/pkg/x11/libxp/Makefile =================================================================== --- csw/mgar/pkg/x11/libxp/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxp/Makefile 2009-09-27 20:05:59 UTC (rev 6551) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:06:43 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:06:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6552] csw/mgar/pkg/x11/libxpm/Makefile Message-ID: Revision: 6552 http://gar.svn.sourceforge.net/gar/?rev=6552&view=rev Author: wbonnet Date: 2009-09-27 20:06:43 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxpm/Makefile Added: csw/mgar/pkg/x11/libxpm/Makefile =================================================================== --- csw/mgar/pkg/x11/libxpm/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxpm/Makefile 2009-09-27 20:06:43 UTC (rev 6552) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:07:14 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:07:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6553] csw/mgar/pkg/x11/libxprintapputil/Makefile Message-ID: Revision: 6553 http://gar.svn.sourceforge.net/gar/?rev=6553&view=rev Author: wbonnet Date: 2009-09-27 20:07:13 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxprintapputil/Makefile Added: csw/mgar/pkg/x11/libxprintapputil/Makefile =================================================================== --- csw/mgar/pkg/x11/libxprintapputil/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxprintapputil/Makefile 2009-09-27 20:07:13 UTC (rev 6553) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:07:35 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:07:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[6554] csw/mgar/pkg/x11/libxprintutil/Makefile Message-ID: Revision: 6554 http://gar.svn.sourceforge.net/gar/?rev=6554&view=rev Author: wbonnet Date: 2009-09-27 20:07:34 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxprintutil/Makefile Added: csw/mgar/pkg/x11/libxprintutil/Makefile =================================================================== --- csw/mgar/pkg/x11/libxprintutil/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxprintutil/Makefile 2009-09-27 20:07:34 UTC (rev 6554) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:07:50 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:07:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6555] csw/mgar/pkg/x11/libxrandr/Makefile Message-ID: Revision: 6555 http://gar.svn.sourceforge.net/gar/?rev=6555&view=rev Author: wbonnet Date: 2009-09-27 20:07:50 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxrandr/Makefile Added: csw/mgar/pkg/x11/libxrandr/Makefile =================================================================== --- csw/mgar/pkg/x11/libxrandr/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxrandr/Makefile 2009-09-27 20:07:50 UTC (rev 6555) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:08:05 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:08:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6556] csw/mgar/pkg/x11/libxres/Makefile Message-ID: Revision: 6556 http://gar.svn.sourceforge.net/gar/?rev=6556&view=rev Author: wbonnet Date: 2009-09-27 20:08:05 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxres/Makefile Added: csw/mgar/pkg/x11/libxres/Makefile =================================================================== --- csw/mgar/pkg/x11/libxres/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxres/Makefile 2009-09-27 20:08:05 UTC (rev 6556) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:08:21 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:08:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[6557] csw/mgar/pkg/x11/libxscrnsaver/Makefile Message-ID: Revision: 6557 http://gar.svn.sourceforge.net/gar/?rev=6557&view=rev Author: wbonnet Date: 2009-09-27 20:08:21 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxscrnsaver/Makefile Added: csw/mgar/pkg/x11/libxscrnsaver/Makefile =================================================================== --- csw/mgar/pkg/x11/libxscrnsaver/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxscrnsaver/Makefile 2009-09-27 20:08:21 UTC (rev 6557) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:08:35 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:08:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[6558] csw/mgar/pkg/x11/libxt/Makefile Message-ID: Revision: 6558 http://gar.svn.sourceforge.net/gar/?rev=6558&view=rev Author: wbonnet Date: 2009-09-27 20:08:35 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxt/Makefile Added: csw/mgar/pkg/x11/libxt/Makefile =================================================================== --- csw/mgar/pkg/x11/libxt/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxt/Makefile 2009-09-27 20:08:35 UTC (rev 6558) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:08:54 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:08:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[6559] csw/mgar/pkg/x11/libxtrap/Makefile Message-ID: Revision: 6559 http://gar.svn.sourceforge.net/gar/?rev=6559&view=rev Author: wbonnet Date: 2009-09-27 20:08:54 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxtrap/Makefile Added: csw/mgar/pkg/x11/libxtrap/Makefile =================================================================== --- csw/mgar/pkg/x11/libxtrap/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxtrap/Makefile 2009-09-27 20:08:54 UTC (rev 6559) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:09:09 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:09:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[6560] csw/mgar/pkg/x11/libxtst/Makefile Message-ID: Revision: 6560 http://gar.svn.sourceforge.net/gar/?rev=6560&view=rev Author: wbonnet Date: 2009-09-27 20:09:09 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxtst/Makefile Added: csw/mgar/pkg/x11/libxtst/Makefile =================================================================== --- csw/mgar/pkg/x11/libxtst/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxtst/Makefile 2009-09-27 20:09:09 UTC (rev 6560) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:09:22 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:09:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[6561] csw/mgar/pkg/x11/libxv/Makefile Message-ID: Revision: 6561 http://gar.svn.sourceforge.net/gar/?rev=6561&view=rev Author: wbonnet Date: 2009-09-27 20:09:21 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxv/Makefile Added: csw/mgar/pkg/x11/libxv/Makefile =================================================================== --- csw/mgar/pkg/x11/libxv/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxv/Makefile 2009-09-27 20:09:21 UTC (rev 6561) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:09:38 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:09:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6562] csw/mgar/pkg/x11/libxvmc/Makefile Message-ID: Revision: 6562 http://gar.svn.sourceforge.net/gar/?rev=6562&view=rev Author: wbonnet Date: 2009-09-27 20:09:38 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxvmc/Makefile Added: csw/mgar/pkg/x11/libxvmc/Makefile =================================================================== --- csw/mgar/pkg/x11/libxvmc/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxvmc/Makefile 2009-09-27 20:09:38 UTC (rev 6562) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:09:58 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:09:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[6563] csw/mgar/pkg/x11/libxxf86dga/Makefile Message-ID: Revision: 6563 http://gar.svn.sourceforge.net/gar/?rev=6563&view=rev Author: wbonnet Date: 2009-09-27 20:09:56 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxxf86dga/Makefile Added: csw/mgar/pkg/x11/libxxf86dga/Makefile =================================================================== --- csw/mgar/pkg/x11/libxxf86dga/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxxf86dga/Makefile 2009-09-27 20:09:56 UTC (rev 6563) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:10:14 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:10:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6564] csw/mgar/pkg/x11/libxxf86misc/Makefile Message-ID: Revision: 6564 http://gar.svn.sourceforge.net/gar/?rev=6564&view=rev Author: wbonnet Date: 2009-09-27 20:10:14 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxxf86misc/Makefile Added: csw/mgar/pkg/x11/libxxf86misc/Makefile =================================================================== --- csw/mgar/pkg/x11/libxxf86misc/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxxf86misc/Makefile 2009-09-27 20:10:14 UTC (rev 6564) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:10:27 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:10:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[6565] csw/mgar/pkg/x11/libxxf86vm/Makefile Message-ID: Revision: 6565 http://gar.svn.sourceforge.net/gar/?rev=6565&view=rev Author: wbonnet Date: 2009-09-27 20:10:27 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxxf86vm/Makefile Added: csw/mgar/pkg/x11/libxxf86vm/Makefile =================================================================== --- csw/mgar/pkg/x11/libxxf86vm/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxxf86vm/Makefile 2009-09-27 20:10:27 UTC (rev 6565) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:10:39 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:10:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[6566] csw/mgar/pkg/x11/printproto/Makefile Message-ID: Revision: 6566 http://gar.svn.sourceforge.net/gar/?rev=6566&view=rev Author: wbonnet Date: 2009-09-27 20:10:39 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/printproto/Makefile Added: csw/mgar/pkg/x11/printproto/Makefile =================================================================== --- csw/mgar/pkg/x11/printproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/printproto/Makefile 2009-09-27 20:10:39 UTC (rev 6566) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:10:53 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:10:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[6567] csw/mgar/pkg/x11/randrproto/Makefile Message-ID: Revision: 6567 http://gar.svn.sourceforge.net/gar/?rev=6567&view=rev Author: wbonnet Date: 2009-09-27 20:10:52 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/randrproto/Makefile Modified: csw/mgar/pkg/x11/randrproto/Makefile =================================================================== --- csw/mgar/pkg/x11/randrproto/Makefile 2009-09-27 20:10:39 UTC (rev 6566) +++ csw/mgar/pkg/x11/randrproto/Makefile 2009-09-27 20:10:52 UTC (rev 6567) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/xproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 22:11:11 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:11:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[6568] csw/mgar/pkg/x11/recordproto/Makefile Message-ID: Revision: 6568 http://gar.svn.sourceforge.net/gar/?rev=6568&view=rev Author: wbonnet Date: 2009-09-27 20:11:11 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/recordproto/Makefile Modified: csw/mgar/pkg/x11/recordproto/Makefile =================================================================== --- csw/mgar/pkg/x11/recordproto/Makefile 2009-09-27 20:10:52 UTC (rev 6567) +++ csw/mgar/pkg/x11/recordproto/Makefile 2009-09-27 20:11:11 UTC (rev 6568) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/recordproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 22:11:23 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:11:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6569] csw/mgar/pkg/x11/renderproto/Makefile Message-ID: Revision: 6569 http://gar.svn.sourceforge.net/gar/?rev=6569&view=rev Author: wbonnet Date: 2009-09-27 20:11:22 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/renderproto/Makefile Modified: csw/mgar/pkg/x11/renderproto/Makefile =================================================================== --- csw/mgar/pkg/x11/renderproto/Makefile 2009-09-27 20:11:11 UTC (rev 6568) +++ csw/mgar/pkg/x11/renderproto/Makefile 2009-09-27 20:11:22 UTC (rev 6569) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/renderproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 22:11:33 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:11:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[6570] csw/mgar/pkg/x11/resourceproto/Makefile Message-ID: Revision: 6570 http://gar.svn.sourceforge.net/gar/?rev=6570&view=rev Author: wbonnet Date: 2009-09-27 20:11:33 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/resourceproto/Makefile Added: csw/mgar/pkg/x11/resourceproto/Makefile =================================================================== --- csw/mgar/pkg/x11/resourceproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/resourceproto/Makefile 2009-09-27 20:11:33 UTC (rev 6570) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:11:46 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:11:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6571] csw/mgar/pkg/x11/scrnsaverproto/Makefile Message-ID: Revision: 6571 http://gar.svn.sourceforge.net/gar/?rev=6571&view=rev Author: wbonnet Date: 2009-09-27 20:11:46 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/scrnsaverproto/Makefile Modified: csw/mgar/pkg/x11/scrnsaverproto/Makefile =================================================================== --- csw/mgar/pkg/x11/scrnsaverproto/Makefile 2009-09-27 20:11:33 UTC (rev 6570) +++ csw/mgar/pkg/x11/scrnsaverproto/Makefile 2009-09-27 20:11:46 UTC (rev 6571) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/xproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 22:12:06 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:12:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6572] csw/mgar/pkg/x11/trapproto/Makefile Message-ID: Revision: 6572 http://gar.svn.sourceforge.net/gar/?rev=6572&view=rev Author: wbonnet Date: 2009-09-27 20:12:05 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/trapproto/Makefile Modified: csw/mgar/pkg/x11/trapproto/Makefile =================================================================== --- csw/mgar/pkg/x11/trapproto/Makefile 2009-09-27 20:11:46 UTC (rev 6571) +++ csw/mgar/pkg/x11/trapproto/Makefile 2009-09-27 20:12:05 UTC (rev 6572) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/xproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 22:12:22 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:12:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[6573] csw/mgar/pkg/x11/videoproto/Makefile Message-ID: Revision: 6573 http://gar.svn.sourceforge.net/gar/?rev=6573&view=rev Author: wbonnet Date: 2009-09-27 20:12:20 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/videoproto/Makefile Modified: csw/mgar/pkg/x11/videoproto/Makefile =================================================================== --- csw/mgar/pkg/x11/videoproto/Makefile 2009-09-27 20:12:05 UTC (rev 6572) +++ csw/mgar/pkg/x11/videoproto/Makefile 2009-09-27 20:12:20 UTC (rev 6573) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/videoproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 22:12:36 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:12:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[6574] csw/mgar/pkg/x11/windowswmproto/Makefile Message-ID: Revision: 6574 http://gar.svn.sourceforge.net/gar/?rev=6574&view=rev Author: wbonnet Date: 2009-09-27 20:12:35 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/windowswmproto/Makefile Modified: csw/mgar/pkg/x11/windowswmproto/Makefile =================================================================== --- csw/mgar/pkg/x11/windowswmproto/Makefile 2009-09-27 20:12:20 UTC (rev 6573) +++ csw/mgar/pkg/x11/windowswmproto/Makefile 2009-09-27 20:12:35 UTC (rev 6574) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/xproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 22:12:50 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:12:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6575] csw/mgar/pkg/x11/x11common/Makefile Message-ID: Revision: 6575 http://gar.svn.sourceforge.net/gar/?rev=6575&view=rev Author: wbonnet Date: 2009-09-27 20:12:50 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11common/Makefile Added: csw/mgar/pkg/x11/x11common/Makefile =================================================================== --- csw/mgar/pkg/x11/x11common/Makefile (rev 0) +++ csw/mgar/pkg/x11/x11common/Makefile 2009-09-27 20:12:50 UTC (rev 6575) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:13:02 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:13:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[6576] csw/mgar/pkg/x11/xcb-proto/Makefile Message-ID: Revision: 6576 http://gar.svn.sourceforge.net/gar/?rev=6576&view=rev Author: wbonnet Date: 2009-09-27 20:12:59 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/xcb-proto/Makefile Modified: csw/mgar/pkg/x11/xcb-proto/Makefile =================================================================== --- csw/mgar/pkg/x11/xcb-proto/Makefile 2009-09-27 20:12:50 UTC (rev 6575) +++ csw/mgar/pkg/x11/xcb-proto/Makefile 2009-09-27 20:12:59 UTC (rev 6576) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/xcb-proto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 22:13:22 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:13:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[6577] csw/mgar/pkg/x11/xcb-util/Makefile Message-ID: Revision: 6577 http://gar.svn.sourceforge.net/gar/?rev=6577&view=rev Author: wbonnet Date: 2009-09-27 20:13:22 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/xcb-util/Makefile Added: csw/mgar/pkg/x11/xcb-util/Makefile =================================================================== --- csw/mgar/pkg/x11/xcb-util/Makefile (rev 0) +++ csw/mgar/pkg/x11/xcb-util/Makefile 2009-09-27 20:13:22 UTC (rev 6577) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:13:36 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:13:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[6578] csw/mgar/pkg/x11/xcmiscproto/Makefile Message-ID: Revision: 6578 http://gar.svn.sourceforge.net/gar/?rev=6578&view=rev Author: wbonnet Date: 2009-09-27 20:13:36 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/xcmiscproto/Makefile Modified: csw/mgar/pkg/x11/xcmiscproto/Makefile =================================================================== --- csw/mgar/pkg/x11/xcmiscproto/Makefile 2009-09-27 20:13:22 UTC (rev 6577) +++ csw/mgar/pkg/x11/xcmiscproto/Makefile 2009-09-27 20:13:36 UTC (rev 6578) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/xproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 22:13:50 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:13:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6579] csw/mgar/pkg/x11/xextproto/Makefile Message-ID: Revision: 6579 http://gar.svn.sourceforge.net/gar/?rev=6579&view=rev Author: wbonnet Date: 2009-09-27 20:13:50 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/xextproto/Makefile Modified: csw/mgar/pkg/x11/xextproto/Makefile =================================================================== --- csw/mgar/pkg/x11/xextproto/Makefile 2009-09-27 20:13:36 UTC (rev 6578) +++ csw/mgar/pkg/x11/xextproto/Makefile 2009-09-27 20:13:50 UTC (rev 6579) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/xextproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 22:14:02 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:14:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[6580] csw/mgar/pkg/x11/xf86bigfontproto/Makefile Message-ID: Revision: 6580 http://gar.svn.sourceforge.net/gar/?rev=6580&view=rev Author: wbonnet Date: 2009-09-27 20:14:02 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/xf86bigfontproto/Makefile Added: csw/mgar/pkg/x11/xf86bigfontproto/Makefile =================================================================== --- csw/mgar/pkg/x11/xf86bigfontproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/xf86bigfontproto/Makefile 2009-09-27 20:14:02 UTC (rev 6580) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:14:25 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:14:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[6581] csw/mgar/pkg/x11/xf86dgaproto/Makefile Message-ID: Revision: 6581 http://gar.svn.sourceforge.net/gar/?rev=6581&view=rev Author: wbonnet Date: 2009-09-27 20:14:24 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/xf86dgaproto/Makefile Added: csw/mgar/pkg/x11/xf86dgaproto/Makefile =================================================================== --- csw/mgar/pkg/x11/xf86dgaproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/xf86dgaproto/Makefile 2009-09-27 20:14:24 UTC (rev 6581) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:14:42 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:14:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[6582] csw/mgar/pkg/x11/xf86driproto/Makefile Message-ID: Revision: 6582 http://gar.svn.sourceforge.net/gar/?rev=6582&view=rev Author: wbonnet Date: 2009-09-27 20:14:42 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/xf86driproto/Makefile Added: csw/mgar/pkg/x11/xf86driproto/Makefile =================================================================== --- csw/mgar/pkg/x11/xf86driproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/xf86driproto/Makefile 2009-09-27 20:14:42 UTC (rev 6582) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:15:00 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:15:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6583] csw/mgar/pkg/x11/xf86miscproto/Makefile Message-ID: Revision: 6583 http://gar.svn.sourceforge.net/gar/?rev=6583&view=rev Author: wbonnet Date: 2009-09-27 20:15:00 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/xf86miscproto/Makefile Added: csw/mgar/pkg/x11/xf86miscproto/Makefile =================================================================== --- csw/mgar/pkg/x11/xf86miscproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/xf86miscproto/Makefile 2009-09-27 20:15:00 UTC (rev 6583) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:15:23 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:15:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6584] csw/mgar/pkg/x11/xf86rushproto/Makefile Message-ID: Revision: 6584 http://gar.svn.sourceforge.net/gar/?rev=6584&view=rev Author: wbonnet Date: 2009-09-27 20:15:23 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/xf86rushproto/Makefile Added: csw/mgar/pkg/x11/xf86rushproto/Makefile =================================================================== --- csw/mgar/pkg/x11/xf86rushproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/xf86rushproto/Makefile 2009-09-27 20:15:23 UTC (rev 6584) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:16:14 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:16:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6585] csw/mgar/pkg/x11/xf86vidmodeproto/Makefile Message-ID: Revision: 6585 http://gar.svn.sourceforge.net/gar/?rev=6585&view=rev Author: wbonnet Date: 2009-09-27 20:16:13 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/xf86vidmodeproto/Makefile Added: csw/mgar/pkg/x11/xf86vidmodeproto/Makefile =================================================================== --- csw/mgar/pkg/x11/xf86vidmodeproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/xf86vidmodeproto/Makefile 2009-09-27 20:16:13 UTC (rev 6585) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:16:38 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:16:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6586] csw/mgar/pkg/x11/xineramaproto/Makefile Message-ID: Revision: 6586 http://gar.svn.sourceforge.net/gar/?rev=6586&view=rev Author: wbonnet Date: 2009-09-27 20:16:38 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/xineramaproto/Makefile Modified: csw/mgar/pkg/x11/xineramaproto/Makefile =================================================================== --- csw/mgar/pkg/x11/xineramaproto/Makefile 2009-09-27 20:16:13 UTC (rev 6585) +++ csw/mgar/pkg/x11/xineramaproto/Makefile 2009-09-27 20:16:38 UTC (rev 6586) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/xproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 22:16:52 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:16:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[6587] csw/mgar/pkg/x11/xproto/Makefile Message-ID: Revision: 6587 http://gar.svn.sourceforge.net/gar/?rev=6587&view=rev Author: wbonnet Date: 2009-09-27 20:16:52 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/xproto/Makefile Modified: csw/mgar/pkg/x11/xproto/Makefile =================================================================== --- csw/mgar/pkg/x11/xproto/Makefile 2009-09-27 20:16:38 UTC (rev 6586) +++ csw/mgar/pkg/x11/xproto/Makefile 2009-09-27 20:16:52 UTC (rev 6587) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/xproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 22:17:12 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:17:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[6588] csw/mgar/pkg/x11/xrender/Makefile Message-ID: Revision: 6588 http://gar.svn.sourceforge.net/gar/?rev=6588&view=rev Author: wbonnet Date: 2009-09-27 20:17:12 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/xrender/Makefile Modified: csw/mgar/pkg/x11/xrender/Makefile =================================================================== --- csw/mgar/pkg/x11/xrender/Makefile 2009-09-27 20:16:52 UTC (rev 6587) +++ csw/mgar/pkg/x11/xrender/Makefile 2009-09-27 20:17:12 UTC (rev 6588) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/ directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 22:17:45 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:17:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[6589] csw/mgar/pkg/x11/xtrans/Makefile Message-ID: Revision: 6589 http://gar.svn.sourceforge.net/gar/?rev=6589&view=rev Author: wbonnet Date: 2009-09-27 20:17:45 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/xtrans/Makefile Modified: csw/mgar/pkg/x11/xtrans/Makefile =================================================================== --- csw/mgar/pkg/x11/xtrans/Makefile 2009-09-27 20:17:12 UTC (rev 6588) +++ csw/mgar/pkg/x11/xtrans/Makefile 2009-09-27 20:17:45 UTC (rev 6589) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/ directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 23:40:08 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 27 Sep 2009 21:40:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[6590] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 6590 http://gar.svn.sourceforge.net/gar/?rev=6590&view=rev Author: rthurner Date: 2009-09-27 21:40:08 +0000 (Sun, 27 Sep 2009) Log Message: ----------- set dependency right, see http://www.opencsw.org/bugtrack/view.php?id=3891 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-09-27 20:17:45 UTC (rev 6589) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2009-09-27 21:40:08 UTC (rev 6590) @@ -12,7 +12,7 @@ SPKG_DESC_CSWmercurial = Mercurial -REQUIRED_PKGS_CSWmercurial = CSWpython-rt +REQUIRED_PKGS_CSWmercurial = CSWpython # 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/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2009-09-27 20:17:45 UTC (rev 6589) +++ csw/mgar/pkg/mercurial/trunk/checksums 2009-09-27 21:40:08 UTC (rev 6590) @@ -1,4 +1,3 @@ -f123d5474de9aeaea428989744b12401 download/CSWmercurial-common.gspec db884ecb306bcbf49b671f880d29c431 download/CSWmercurial.changelog.CSW d280026d7687f061371e87ff306c97c2 download/CSWmercurial.gspec 6504f0dc32bd7ecf59a9f7f719432e76 download/mercurial-1.3.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 Mon Sep 28 00:42:05 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 27 Sep 2009 22:42:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6591] csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc. postinstall-moving Message-ID: Revision: 6591 http://gar.svn.sourceforge.net/gar/?rev=6591&view=rev Author: wahwah Date: 2009-09-27 22:42:05 +0000 (Sun, 27 Sep 2009) Log Message: ----------- CSWunixodbc.postinstall-moving: Some documentation in the comments. Modified Paths: -------------- csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall-moving Modified: csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall-moving =================================================================== --- csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall-moving 2009-09-27 21:40:08 UTC (rev 6590) +++ csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall-moving 2009-09-27 22:42:05 UTC (rev 6591) @@ -8,21 +8,35 @@ # arch_path: e.g. /etc/opt/csw/migration-archive/foo.conf # # # If old_path exists: -# # Create a file named {{old_path.THIS_LOCATION_IS_DEPRECATED}} and leave a message inside the file. +# # Create a file named {{old_path.README.migration}} +# and leave a message inside the file. # # Move old_path to archive_path # # If new_path does not exist: # # Copy archive_path to new_path # # http://wiki.opencsw.org/configuration-directory-migration # -# old_path: /opt/csw/etc/foo.conf -# arch_path: /opt/csw/etc/migration-archive/foo.conf -# new_path: /etc/opt/csw/foo.conf +# Usage: # -# if old_path exists: -# move old_path to arch_path -# if arch_path exists and new_path doesn't: -# copy arch_path to new_path +# A configuration should be set: +# +# A list of files to migrate: +# MIGRATE_FILES="odbc.ini odbcinst.ini ODBCDataSources" +# +# The directories to use: +# SOURCE_DIR___default__="/opt/csw/etc" +# readonly SOURCE_DIR___default__ +# ARCH_DIR___default__="/opt/csw/etc/migration-archive" +# readonly ARCH_DIR___default__ +# DEST_DIR___default__="/etc/opt/csw" +# readonly DEST_DIR___default__ +# +# If a file needs to be moved to a different directory than the default, +# a special setting can be used: +# +# DEST_DIR_odbc_ini="/etc/opt/csw/foo/odbc.ini" +# +# The same applies to DEST_DIR and ARCH_DIR. set -u @@ -131,7 +145,7 @@ # All variables are set, the main algorithm goes here. # Moving the file will only work in the global zone. The assumption is that - # the preinstall script is going to be run in the global zone first; by the + # the postinstall script is going to be run in the global zone first; by the # time it gets to the non-global zones, the ${srcpath} will have been # moved already. if [ -r "${srcpath}" ] 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 Sep 28 00:52:23 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 27 Sep 2009 22:52:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6592] csw/mgar/pkg Message-ID: Revision: 6592 http://gar.svn.sourceforge.net/gar/?rev=6592&view=rev Author: wahwah Date: 2009-09-27 22:52:22 +0000 (Sun, 27 Sep 2009) Log Message: ----------- autoproject: Initial commit Modified Paths: -------------- csw/mgar/pkg/autoproject/trunk/Makefile csw/mgar/pkg/autoproject/trunk/checksums Added Paths: ----------- csw/mgar/pkg/autoproject/ Modified: csw/mgar/pkg/autoproject/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-09-25 17:25:45 UTC (rev 6474) +++ csw/mgar/pkg/autoproject/trunk/Makefile 2009-09-27 22:52:22 UTC (rev 6592) @@ -2,181 +2,28 @@ # 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 = autoproject +GARVERSION = 0.20 + +CATEGORIES = apps +DESCRIPTION = creates a source package which follows the GNU programming standards define BLURB - + + autoproject interviews the user, then creates a source package for a new + program which follows the GNU programming standards. The new package uses + autoconf to configure itself, and automake to create the Makefile. `make + distcheck' succeeds. + + The idea is that you execute autoproject just once when you start a new + project. It will ask a few questions, then create a new directory and populate + it with standard files, customized for the new project. + 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 +SPKG_SOURCEURL = http://packages.debian.org/unstable/devel/autoproject +MASTER_SITES = http://ftp.de.debian.org/debian/pool/main/a/$(GARNAME)/ +DISTFILES = $(GARNAME)_$(GARVERSION).orig.tar.gz 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. +REQUIRED_PKGS = CSWautomake +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 +include gar/category.mk Modified: csw/mgar/pkg/autoproject/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-09-25 17:25:45 UTC (rev 6474) +++ csw/mgar/pkg/autoproject/trunk/checksums 2009-09-27 22:52:22 UTC (rev 6592) @@ -0,0 +1,2 @@ +c56275967bba34ce1864b3d917e08e55 download/autoproject_0.20-5.diff.gz +609369fa76391d58714059313b9c831c download/autoproject_0.20.orig.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 Sep 28 00:55:14 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 27 Sep 2009 22:55:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6593] csw/mgar/pkg/autoproject/trunk/Makefile Message-ID: Revision: 6593 http://gar.svn.sourceforge.net/gar/?rev=6593&view=rev Author: wahwah Date: 2009-09-27 22:55:14 +0000 (Sun, 27 Sep 2009) Log Message: ----------- autoproject: setting ARCHALL = 1 Modified Paths: -------------- csw/mgar/pkg/autoproject/trunk/Makefile Modified: csw/mgar/pkg/autoproject/trunk/Makefile =================================================================== --- csw/mgar/pkg/autoproject/trunk/Makefile 2009-09-27 22:52:22 UTC (rev 6592) +++ csw/mgar/pkg/autoproject/trunk/Makefile 2009-09-27 22:55:14 UTC (rev 6593) @@ -23,6 +23,7 @@ MASTER_SITES = http://ftp.de.debian.org/debian/pool/main/a/$(GARNAME)/ DISTFILES = $(GARNAME)_$(GARVERSION).orig.tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +ARCHALL = 1 REQUIRED_PKGS = CSWautomake TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) 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 Sep 28 13:09:20 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 28 Sep 2009 11:09:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[6594] csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc. postinstall-moving Message-ID: Revision: 6594 http://gar.svn.sourceforge.net/gar/?rev=6594&view=rev Author: wahwah Date: 2009-09-28 11:09:20 +0000 (Mon, 28 Sep 2009) Log Message: ----------- CSWunixodbc.postinstall-moving: Adding the use of PKG_INSTALL_ROOT. Modified Paths: -------------- csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall-moving Modified: csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall-moving =================================================================== --- csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall-moving 2009-09-27 22:55:14 UTC (rev 6593) +++ csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall-moving 2009-09-28 11:09:20 UTC (rev 6594) @@ -35,7 +35,7 @@ # a special setting can be used: # # DEST_DIR_odbc_ini="/etc/opt/csw/foo/odbc.ini" -# +# # The same applies to DEST_DIR and ARCH_DIR. set -u @@ -55,6 +55,8 @@ DEST_DIR___default__="/etc/opt/csw" readonly DEST_DIR___default__ +PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-/} + return_code=0 migration_info=" @@ -105,8 +107,8 @@ } place_signpost_for() { - __file_name="$1" - echo "${migration_info}" > "${__file_name}.${deprecated_file_ext}" + __file_name="$1" + echo "${migration_info}" > "${__file_name}.${deprecated_file_ext}" } main() { @@ -126,9 +128,9 @@ per_file_archdir=`expand_modifiers ARCH_DIR ${modifier_value}` default_archdir=`expand_modifiers ARCH_DIR __default__` archdir="${per_file_archdir:-${default_archdir}}" - srcpath="${srcdir}/${file_name}" - dstpath="${dstdir}/${file_name}" - archpath="${archdir}/${file_name}" + srcpath="${PKG_INSTALL_ROOT}/${srcdir}/${file_name}" + dstpath="${PKG_INSTALL_ROOT}/${dstdir}/${file_name}" + archpath="${PKG_INSTALL_ROOT}/${archdir}/${file_name}" # Make sure we have the environment we expect if [ ! -d "${archdir}" ] 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 Sep 28 15:11:25 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 28 Sep 2009 13:11:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[6595] csw/mgar/pkg/colordiff/trunk Message-ID: Revision: 6595 http://gar.svn.sourceforge.net/gar/?rev=6595&view=rev Author: dmichelsen Date: 2009-09-28 13:11:25 +0000 (Mon, 28 Sep 2009) Log Message: ----------- colordiff: Force use of CSW Perl Modified Paths: -------------- csw/mgar/pkg/colordiff/trunk/Makefile csw/mgar/pkg/colordiff/trunk/checksums Added Paths: ----------- csw/mgar/pkg/colordiff/trunk/files/force-csw-perl.patch Modified: csw/mgar/pkg/colordiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/colordiff/trunk/Makefile 2009-09-28 11:09:20 UTC (rev 6594) +++ csw/mgar/pkg/colordiff/trunk/Makefile 2009-09-28 13:11:25 UTC (rev 6595) @@ -9,10 +9,13 @@ MASTER_SITES = http://colordiff.sourceforge.net/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = fix-entity-nesting.patch +PATCHFILES += force-csw-perl.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 = CSWperl + CONFIGURE_SCRIPTS = BUILD_ARGS = doc TEST_SCRIPTS = @@ -21,6 +24,8 @@ sysconfdir = /etc/opt/csw PRESERVECONF = $(sysconfdir)/colordiffrc +ARCHALL = 1 + include gar/category.mk install-custom: Modified: csw/mgar/pkg/colordiff/trunk/checksums =================================================================== --- csw/mgar/pkg/colordiff/trunk/checksums 2009-09-28 11:09:20 UTC (rev 6594) +++ csw/mgar/pkg/colordiff/trunk/checksums 2009-09-28 13:11:25 UTC (rev 6595) @@ -1,2 +1,3 @@ 31864847eaa4e900f72bbb6bbc64f1ec download/colordiff-1.0.9.tar.gz d202632e9ec507e53445232a930c9c6f download/fix-entity-nesting.patch +b37c28fccba12407d69a9d856d81a396 download/force-csw-perl.patch Added: csw/mgar/pkg/colordiff/trunk/files/force-csw-perl.patch =================================================================== --- csw/mgar/pkg/colordiff/trunk/files/force-csw-perl.patch (rev 0) +++ csw/mgar/pkg/colordiff/trunk/files/force-csw-perl.patch 2009-09-28 13:11:25 UTC (rev 6595) @@ -0,0 +1,9 @@ +diff -Naur colordiff-1.0.9.orig/colordiff.pl colordiff-1.0.9.patched/colordiff.pl +--- colordiff-1.0.9.orig/colordiff.pl 2009-01-28 21:12:10.000000000 +0100 ++++ colordiff-1.0.9.patched/colordiff.pl 2009-09-28 14:52:56.066588736 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -w ++#!/opt/csw/bin/perl -w + + ######################################################################## + # # 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 Sep 28 15:58:17 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 28 Sep 2009 13:58:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[6596] csw/mgar/pkg/fontconfig/trunk Message-ID: Revision: 6596 http://gar.svn.sourceforge.net/gar/?rev=6596&view=rev Author: dmichelsen Date: 2009-09-28 13:58:17 +0000 (Mon, 28 Sep 2009) Log Message: ----------- fontconfig: Update to 2.7.3 Modified Paths: -------------- csw/mgar/pkg/fontconfig/trunk/Makefile csw/mgar/pkg/fontconfig/trunk/checksums Added Paths: ----------- csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch Modified: csw/mgar/pkg/fontconfig/trunk/Makefile =================================================================== --- csw/mgar/pkg/fontconfig/trunk/Makefile 2009-09-28 13:11:25 UTC (rev 6595) +++ csw/mgar/pkg/fontconfig/trunk/Makefile 2009-09-28 13:58:17 UTC (rev 6596) @@ -1,5 +1,5 @@ GARNAME = fontconfig -GARVERSION = 2.6.0 +GARVERSION = 2.7.3 CATEGORIES = lib DESCRIPTION = A library for configuring and customizing font access. @@ -15,6 +15,9 @@ DISTFILES += CSWfconfig.postinstall DISTFILES += CSWfconfig.checkinstall +PATCHFILES = fontconfig.h.diff +PATCHFILES += fix-zerowidth-struct.patch + REQUIRED_PKGS = CSWexpat CSWftype2 CSWzlib CSWiconv # We define upstream file regex so we can be notifed of new upstream software release @@ -22,18 +25,16 @@ BUILD64 = 1 PACKAGES = CSWfconfig -CATALOGNAME_CSWfconfig = fontconfig +CATALOGNAME = fontconfig +SPKG_SOURCEURL = http://www.fontconfig.org/ + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-default-fonts=/usr/openwin/lib/X11/fonts CONFIGURE_ARGS += --with-add-fonts=/usr/openwin/lib/locale,/usr/share/fonts,/opt/csw/share/fonts CONFIGURE_ARGS += --with-cache-dir=/var/opt/csw/cache/fontconfig CONFIGURE_ARGS += --with-confdir=/opt/csw/etc/fontconfig -PATCHFILES = fontconfig.h.diff -pre-package: - @rm -f $(DESTDIR)$(libdir)/libfontconfig.la* - @rm -f $(DESTDIR)/opt/csw/etc/fonts/fonts.conf.bak - @$(MAKECOOKIE) +EXTRA_MERGE_EXCLUDE_FILES = .*/fonts.conf.bak include gar/category.mk Modified: csw/mgar/pkg/fontconfig/trunk/checksums =================================================================== --- csw/mgar/pkg/fontconfig/trunk/checksums 2009-09-28 13:11:25 UTC (rev 6595) +++ csw/mgar/pkg/fontconfig/trunk/checksums 2009-09-28 13:58:17 UTC (rev 6596) @@ -1,4 +1,5 @@ +747d2c691c66b563c8e8c1784ce8d014 download/fontconfig-2.7.3.tar.gz +5a5b382b4a5e579cfc869bcffd7c034e download/CSWfconfig.postinstall 21481d18c2100203177ccab5b51e50d7 download/CSWfconfig.checkinstall -5a5b382b4a5e579cfc869bcffd7c034e download/CSWfconfig.postinstall -ab54ec1d4ddd836313fdbc0cd5299d6d download/fontconfig-2.6.0.tar.gz 0fb83ca9bf9a7b99ab7601347e8c855d download/fontconfig.h.diff +bbdb45396408c48d50c7db5747dfae4e download/fix-zerowidth-struct.patch Added: csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch =================================================================== --- csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch (rev 0) +++ csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch 2009-09-28 13:58:17 UTC (rev 6596) @@ -0,0 +1,12 @@ +diff -Naur fontconfig-2.7.3.orig/src/fcint.h fontconfig-2.7.3.patched/src/fcint.h +--- fontconfig-2.7.3.orig/src/fcint.h 2009-06-28 19:46:36.000000000 +0200 ++++ fontconfig-2.7.3.patched/src/fcint.h 2009-09-28 15:47:07.195049714 +0200 +@@ -253,7 +253,7 @@ + FcExprPage *next_page; + FcExpr *next; + FcExpr exprs[(1024 - 2/* two pointers */ - 2/* malloc overhead */) * sizeof (void *) / sizeof (FcExpr)]; +- FcExpr end[0]; ++ FcExpr end[]; + }; + + typedef enum _FcQual { 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 Sep 28 16:49:34 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 28 Sep 2009 14:49:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[6597] csw/mgar/pkg/libpcap/trunk Message-ID: Revision: 6597 http://gar.svn.sourceforge.net/gar/?rev=6597&view=rev Author: dmichelsen Date: 2009-09-28 14:49:31 +0000 (Mon, 28 Sep 2009) Log Message: ----------- libpcap: Update to 1.0.0 Modified Paths: -------------- csw/mgar/pkg/libpcap/trunk/Makefile csw/mgar/pkg/libpcap/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2224954-fix-autoconf-header.diff csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2504874-create-dir-patch.diff Modified: csw/mgar/pkg/libpcap/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpcap/trunk/Makefile 2009-09-28 13:58:17 UTC (rev 6596) +++ csw/mgar/pkg/libpcap/trunk/Makefile 2009-09-28 14:49:31 UTC (rev 6597) @@ -1,5 +1,5 @@ GARNAME = libpcap -GARVERSION = 0.9.8 +GARVERSION = 1.0.0 CATEGORIES = lib DESCRIPTION = Libraries for network diagnostics @@ -15,9 +15,12 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +PATCHFILES = sf-bugtrack-2224954-fix-autoconf-header.diff +PATCHFILES += sf-bugtrack-2504874-create-dir-patch.diff + # Shared libraries patch -PATCHFILES = Makefile.in.diff -PATCHFILES += scanner.l.diff +#PATCHFILES = Makefile.in.diff +#PATCHFILES += scanner.l.diff # No test target for libpcap TEST_SCRIPTS = Modified: csw/mgar/pkg/libpcap/trunk/checksums =================================================================== --- csw/mgar/pkg/libpcap/trunk/checksums 2009-09-28 13:58:17 UTC (rev 6596) +++ csw/mgar/pkg/libpcap/trunk/checksums 2009-09-28 14:49:31 UTC (rev 6597) @@ -1,3 +1,2 @@ -5208f24d0328ee7c20b52c43eaa9aa0e download/libpcap-0.9.8.tar.gz -d036716d6563bcad5fad70916f5c2c2e download/Makefile.in.diff -c0002322e0b90a3e9eed0b7ac9e6c050 download/scanner.l.diff +e2396bd0e71b247413ea26ced5ca923f download/fix-autoconf-header.diff +9ad1358c5dec48456405eac197a46d3d download/libpcap-1.0.0.tar.gz Added: csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2224954-fix-autoconf-header.diff =================================================================== --- csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2224954-fix-autoconf-header.diff (rev 0) +++ csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2224954-fix-autoconf-header.diff 2009-09-28 14:49:31 UTC (rev 6597) @@ -0,0 +1,172 @@ +diff -Naur libpcap-1.0.0.orig/Makefile.in libpcap-1.0.0.patched/Makefile.in +--- libpcap-1.0.0.orig/Makefile.in 2008-10-28 02:26:13.000000000 +0100 ++++ libpcap-1.0.0.patched/Makefile.in 2009-09-28 16:33:43.194864215 +0200 +@@ -445,6 +445,8 @@ + $(DESTDIR)$(includedir)/pcap-bpf.h + $(INSTALL_DATA) $(srcdir)/pcap-namedb.h \ + $(DESTDIR)$(includedir)/pcap-namedb.h ++ [ -d $(DESTDIR)$(bindir) ] || \ ++ (mkdir -p $(DESTDIR)$(bindir); chmod 755 $(DESTDIR)$(bindir)) + $(INSTALL_PROGRAM) pcap-config $(DESTDIR)$(bindir)/pcap-config + for i in $(MAN1); do \ + $(INSTALL_DATA) $(srcdir)/$$i \ +diff -Naur libpcap-1.0.0.orig/configure libpcap-1.0.0.patched/configure +--- libpcap-1.0.0.orig/configure 2008-10-28 02:26:13.000000000 +0100 ++++ libpcap-1.0.0.patched/configure 2009-09-28 16:32:19.576622377 +0200 +@@ -6655,145 +6655,6 @@ + + done + +- for ac_header in +-do +-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-fi +-ac_res=`eval echo '${'$as_ac_Header'}'` +- { echo "$as_me:$LINENO: result: $ac_res" >&5 +-echo "${ECHO_T}$ac_res" >&6; } +-else +- # Is the header compilable? +-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_compiler=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6; } +- +-# Is the header present? +-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +-fi +- +-rm -f conftest.err conftest.$ac_ext +-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- +- ;; +-esac +-{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- eval "$as_ac_Header=\$ac_header_preproc" +-fi +-ac_res=`eval echo '${'$as_ac_Header'}'` +- { echo "$as_me:$LINENO: result: $ac_res" >&5 +-echo "${ECHO_T}$ac_res" >&6; } +- +-fi +-if test `eval echo '${'$as_ac_Header'}'` = yes; then +- cat >>confdefs.h <<_ACEOF +-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +- +-done +- + { echo "$as_me:$LINENO: checking if if_packet.h has tpacket_stats defined" >&5 + echo $ECHO_N "checking if if_packet.h has tpacket_stats defined... $ECHO_C" >&6; } + if test "${ac_cv_lbl_tpacket_stats+set}" = set; then +diff -Naur libpcap-1.0.0.orig/configure.in libpcap-1.0.0.patched/configure.in +--- libpcap-1.0.0.orig/configure.in 2008-10-28 02:26:13.000000000 +0100 ++++ libpcap-1.0.0.patched/configure.in 2009-09-28 16:32:39.158704830 +0200 +@@ -358,7 +358,6 @@ + #include + #include + ]) +- AC_CHECK_HEADERS() + AC_LBL_TPACKET_STATS + AC_LBL_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI + ;; Added: csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2504874-create-dir-patch.diff =================================================================== --- csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2504874-create-dir-patch.diff (rev 0) +++ csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2504874-create-dir-patch.diff 2009-09-28 14:49:31 UTC (rev 6597) @@ -0,0 +1,47 @@ +diff --git a/Makefile.in b/Makefile.in +index 5c4d679..f2717d5 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -445,11 +445,17 @@ install: libpcap.a pcap-config + $(DESTDIR)$(includedir)/pcap-bpf.h + $(INSTALL_DATA) $(srcdir)/pcap-namedb.h \ + $(DESTDIR)$(includedir)/pcap-namedb.h ++ [ -d $(DESTDIR)$(bindir) ] || \ ++ (mkdir -p $(DESTDIR)$(bindir); chmod 755 $(DESTDIR)$(bindir)) + $(INSTALL_PROGRAM) pcap-config $(DESTDIR)$(bindir)/pcap-config + for i in $(MAN1); do \ ++ [ -d $(DESTDIR)$(mandir)/man1 ] || \ ++ (mkdir -p $(DESTDIR)$(mandir)/man1; chmod 755 $(DESTDIR)$(mandir)/man1); \ + $(INSTALL_DATA) $(srcdir)/$$i \ + $(DESTDIR)$(mandir)/man1/$$i; done + for i in $(MAN3PCAP); do \ ++ [ -d $(DESTDIR)$(mandir)/man3 ] || \ ++ (mkdir -p $(DESTDIR)$(mandir)/man3; chmod 755 $(DESTDIR)$(mandir)/man3); \ + $(INSTALL_DATA) $(srcdir)/$$i \ + $(DESTDIR)$(mandir)/man3/$$i; done + ln $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_name.3pcap \ +@@ -471,16 +477,24 @@ install: libpcap.a pcap-config + ln $(DESTDIR)$(mandir)/man3/pcap_setnonblock.3pcap \ + $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3pcap + for i in $(MANFILE); do \ ++ [ -d $(DESTDIR)$(mandir)/man at MAN_FILE_FORMATS@ ] || \ ++ (mkdir -p $(DESTDIR)$(mandir)/man at MAN_FILE_FORMATS@; chmod 755 $(DESTDIR)$(mandir)/man at MAN_FILE_FORMATS@); \ + $(INSTALL_DATA) $(srcdir)/`echo $$i | sed 's/.manfile.in/.manfile/'` \ + $(DESTDIR)$(mandir)/man at MAN_FILE_FORMATS@/`echo $$i | sed 's/.manfile.in/. at MAN_FILE_FORMATS@/'`; done + for i in $(MANMISC); do \ ++ [ -d $(DESTDIR)$(mandir)/man at MAN_MISC_INFO@ ] || \ ++ (mkdir -p $(DESTDIR)$(mandir)/man at MAN_MISC_INFO@; chmod 755 $(DESTDIR)$(mandir)/man at MAN_MISC_INFO@); \ + $(INSTALL_DATA) $(srcdir)/`echo $$i | sed 's/.manmisc.in/.manmisc/'` \ + $(DESTDIR)$(mandir)/man at MAN_MISC_INFO@/`echo $$i | sed 's/.manmisc.in/. at MAN_MISC_INFO@/'`; done + + install-shared: install-shared-$(DYEXT) + install-shared-so: libpcap.so ++ [ -d $(DESTDIR)$(libdir) ] || \ ++ (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) + $(INSTALL_PROGRAM) libpcap.so.`cat VERSION` $(DESTDIR)$(libdir)/libpcap.so.`cat VERSION` + install-shared-dylib: libpcap.dylib ++ [ -d $(DESTDIR)$(libdir) ] || \ ++ (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) + $(INSTALL_PROGRAM) libpcap.`cat VERSION`.dylib $(DESTDIR)$(libdir)/libpcap.`cat VERSION`.dylib + VER=`cat VERSION`; cd $(DESTDIR)$(libdir) && ln -sf libpcap.$$VER.dylib libpcap.A.dylib; ln -sf libpcap.A.dylib libpcap.dylib + 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 Sep 28 17:17:05 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 28 Sep 2009 15:17:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6598] csw/mgar/pkg/bdb43/trunk Message-ID: Revision: 6598 http://gar.svn.sourceforge.net/gar/?rev=6598&view=rev Author: dmichelsen Date: 2009-09-28 15:17:03 +0000 (Mon, 28 Sep 2009) Log Message: ----------- bdb43: Move to dynamic gspec, apple patch no. 1 Modified Paths: -------------- csw/mgar/pkg/bdb43/trunk/Makefile csw/mgar/pkg/bdb43/trunk/checksums Added Paths: ----------- csw/mgar/pkg/bdb43/trunk/files/patch.4.3.29.1 Removed Paths: ------------- csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-devel.depend csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-devel.gspec csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-devel.prototype csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-doc.depend csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-doc.gspec csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-doc.prototype csw/mgar/pkg/bdb43/trunk/files/CSWbdb43.depend csw/mgar/pkg/bdb43/trunk/files/CSWbdb43.gspec csw/mgar/pkg/bdb43/trunk/files/CSWbdb43.prototype csw/mgar/pkg/bdb43/trunk/legacy/ Modified: csw/mgar/pkg/bdb43/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb43/trunk/Makefile 2009-09-28 14:49:31 UTC (rev 6597) +++ csw/mgar/pkg/bdb43/trunk/Makefile 2009-09-28 15:17:03 UTC (rev 6598) @@ -13,20 +13,44 @@ (MSVC 4, 5 and 6). endef -MASTER_SITES = http://downloads.sleepycat.com/ +MASTER_SITES = http://download.oracle.com/berkeley-db/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWbdb43,depend prototype) -DISTFILES += $(call admfiles,CSWbdb43-devel,depend prototype) -DISTFILES += $(call admfiles,CSWbdb43-doc,depend prototype) +PATCHDIR = $(WORKSRC)/.. +PATCHDIRLEVEL = 0 +PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*)) + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix +PACKAGES = CSWbdb43 CSWbdb43-devel CSWbdb43-doc + +CATALOGNAME_CSWbdb43 = berkeleydb43 +CATALOGNAME_CSWbdb43-devel = berkeleydb43_devel +CATALOGNAME_CSWbdb43-doc = berkeleydb43_doc + +SPKG_DESC_CSWbdb43 = BerkeleyDB 4.3 +SPKG_DESC_CSWbdb43-devel = BerkeleyDB 4.3 development support +SPKG_DESC_CSWbdb43-doc = BerkeleyDB 4.3 documentation + +SPKG_SOURCEURL = http://www.oracle.com/technology/products/berkeley-db/index.html + +REQUIRED_PKGS_CSWbdb43-devel = CSWbdb43 + +INCOMPATIBLE_PKGS_CSWbdb43-doc = CSWbdb43doc + +LICENSE = LICENSE + +ARCHALL_CSWbdb43-doc = 1 + CONFIGURE_SCRIPTS = dist -CONFIGURE_ARGS = --prefix $(prefix)/bdb43 +prefix = $(BUILD_PREFIX)/bdb43 +docdir = $(BUILD_PREFIX)/share/doc + +CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-cryptography CONFIGURE_ARGS += --enable-compat185 CONFIGURE_ARGS += --enable-rpc @@ -42,6 +66,10 @@ # bdb tests are time consuming TEST_SCRIPTS = +PKGFILES_CSWbdb43-doc = $(prefix)/docs/.* + +PKGFILES_CSWbdb43-devel = $(PKGFILES_DEVEL) + include gar/category.mk LIBS += -lnsl Modified: csw/mgar/pkg/bdb43/trunk/checksums =================================================================== --- csw/mgar/pkg/bdb43/trunk/checksums 2009-09-28 14:49:31 UTC (rev 6597) +++ csw/mgar/pkg/bdb43/trunk/checksums 2009-09-28 15:17:03 UTC (rev 6598) @@ -1,10 +1,2 @@ -13585a20ce32f113b8e8cdb57f52e3bb download/db-4.3.29.tar.gz -a780ed74216a67b45d5bab030d29d1a8 download/CSWbdb43.gspec -8093298b67861e241b0d2499c9f2ff89 download/CSWbdb43.depend -001de61b8e01758ba15ee19184b36bcf download/CSWbdb43.prototype -d3e8da06077e095478cb493e3928eaaf download/CSWbdb43-devel.gspec -f905a2c20a7c2265a2ed126027a49b85 download/CSWbdb43-devel.depend -102c5de41ee6b1039f92836fc309eb80 download/CSWbdb43-devel.prototype -0539eef14dfa8dc02a162d946ad164b1 download/CSWbdb43-doc.gspec -8c10985a125690e3d6bc877be173e20d download/CSWbdb43-doc.depend -b7e86382632f53bae97051502bb37295 download/CSWbdb43-doc.prototype +200b9f5d74175875fcb3ee54adbf0007 download/db-4.3.29.tar.gz +947f07dd8fae5001feedb2deded40ad5 download/patch.4.3.29.1 Deleted: csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-devel.depend =================================================================== --- csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-devel.depend 2009-09-28 14:49:31 UTC (rev 6597) +++ csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-devel.depend 2009-09-28 15:17:03 UTC (rev 6598) @@ -1 +0,0 @@ -P CSWbdb43 berkeleydb43 - embedded database libraries and utilities Deleted: csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-devel.gspec =================================================================== --- csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-devel.gspec 2009-09-28 14:49:31 UTC (rev 6597) +++ csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-devel.gspec 2009-09-28 15:17:03 UTC (rev 6598) @@ -1,5 +0,0 @@ -%var bitname berkeleydb43_devel -%var pkgname CSWbdb43-devel -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%var desc BerkeleyDB 4.3 development support -%copyright url file://%{WORKSRC}/../LICENSE Deleted: csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-devel.prototype =================================================================== --- csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-devel.prototype 2009-09-28 14:49:31 UTC (rev 6597) +++ csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-devel.prototype 2009-09-28 15:17:03 UTC (rev 6598) @@ -1,16 +0,0 @@ -d none /opt/csw/bdb43 0755 root bin -d none /opt/csw/bdb43/include 0755 root bin -f none /opt/csw/bdb43/include/db.h 0444 root bin -f none /opt/csw/bdb43/include/db_185.h 0444 root bin -f none /opt/csw/bdb43/include/db_cxx.h 0444 root bin -d none /opt/csw/bdb43/lib 0755 root bin -f none /opt/csw/bdb43/lib/libdb-4.3.a 0644 root bin -f none /opt/csw/bdb43/lib/libdb-4.3.la 0644 root bin -f none /opt/csw/bdb43/lib/libdb.a 0644 root bin -f none /opt/csw/bdb43/lib/libdb_cxx-4.3.a 0644 root bin -f none /opt/csw/bdb43/lib/libdb_cxx-4.3.la 0644 root bin -f none /opt/csw/bdb43/lib/libdb_cxx.a 0644 root bin -f none /opt/csw/bdb43/lib/libdb_java-4.3.a 0644 root bin -f none /opt/csw/bdb43/lib/libdb_java-4.3.la 0644 root bin -f none /opt/csw/bdb43/lib/libdb_tcl-4.3.a 0644 root bin -f none /opt/csw/bdb43/lib/libdb_tcl-4.3.la 0644 root bin Deleted: csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-doc.depend =================================================================== --- csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-doc.depend 2009-09-28 14:49:31 UTC (rev 6597) +++ csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-doc.depend 2009-09-28 15:17:03 UTC (rev 6598) @@ -1 +0,0 @@ -I CSWbdb43doc Deleted: csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-doc.gspec =================================================================== --- csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-doc.gspec 2009-09-28 14:49:31 UTC (rev 6597) +++ csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-doc.gspec 2009-09-28 15:17:03 UTC (rev 6598) @@ -1,6 +0,0 @@ -%var bitname berkeleydb43_doc -%var pkgname CSWbdb43-doc -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%var desc BerkeleyDB 4.3 documentation -%copyright url file://%{WORKSRC}/../LICENSE Deleted: csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-doc.prototype =================================================================== --- csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-doc.prototype 2009-09-28 14:49:31 UTC (rev 6597) +++ csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-doc.prototype 2009-09-28 15:17:03 UTC (rev 6598) @@ -1,1326 +0,0 @@ -d none /opt/csw/bdb43 0755 root bin -d none /opt/csw/bdb43/docs 0755 root bin -d none /opt/csw/bdb43/docs/api_c 0755 root bin -f none /opt/csw/bdb43/docs/api_c/api_core.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/c_pindex.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_associate.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_close.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_cursor.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_del.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_err.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_fd.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_get.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_get_byteswapped.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_get_mpf.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_get_type.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_getenv.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_join.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_key_range.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_list.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_open.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_put.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_remove.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_rename.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_alloc.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_append_recno.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_bt_compare.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_bt_minkey.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_bt_prefix.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_cachesize.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_dup_compare.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_encrypt.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_errcall.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_errfile.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_errpfx.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_feedback.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_flags.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_h_ffactor.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_h_hash.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_h_nelem.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_lorder.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_msgcall.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_msgfile.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_pagesize.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_paniccall.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_q_extentsize.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_re_delim.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_re_len.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_re_pad.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_re_source.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_sync.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_truncate.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_upgrade.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_verify.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/dbc_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/dbc_close.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/dbc_count.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/dbc_del.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/dbc_dup.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/dbc_get.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/dbc_list.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/dbc_put.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/dbm.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/dbt_bulk.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/dbt_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/dbt_package.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_close.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_dbremove.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_dbrename.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_err.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_list.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_open.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_remove.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_alloc.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_app_dispatch.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_cachesize.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_data_dir.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_encrypt.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_errcall.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_errfile.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_errpfx.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_feedback.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_flags.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_lg_bsize.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_lg_dir.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_lg_max.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_lg_regionmax.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_lk_conflicts.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_lk_detect.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_lk_max_lockers.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_lk_max_locks.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_lk_max_objects.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_mp_mmapsize.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_msgcall.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_msgfile.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_paniccall.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_rpc_server.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_shm_key.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_tas_spins.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_timeout.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_tmp_dir.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_tx_max.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_tx_timestamp.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_verbose.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_strerror.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_version.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/frame.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/hsearch.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/lock_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/lock_detect.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/lock_get.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/lock_id.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/lock_id_free.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/lock_list.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/lock_put.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/lock_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/lock_vec.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/log_archive.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/log_compare.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/log_cursor.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/log_file.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/log_flush.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/log_list.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/log_put.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/log_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/logc_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/logc_close.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/logc_get.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/lsn_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_fclose.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_fcreate.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_fget.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_fopen.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_fput.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_fset.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_fsync.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_list.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_maxwrite.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_openfd.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_register.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_set_clear_len.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_set_fileid.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_set_flags.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_set_ftype.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_set_lsn_offset.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_set_maxsize.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_set_pgcookie.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_set_priority.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_sync.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_trickle.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/mempfile_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/object.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/pindex.src 0444 root bin -f none /opt/csw/bdb43/docs/api_c/rep_elect.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/rep_limit.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/rep_list.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/rep_message.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/rep_start.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/rep_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/rep_transport.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/seq_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/seq_close.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/seq_get.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/seq_init_value.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/seq_list.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/seq_open.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/seq_remove.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/seq_set_cachesize.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/seq_set_flags.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/seq_set_range.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/seq_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_close.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_dirfree.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_dirlist.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_exists.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_free.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_fsync.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_ftruncate.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_ioinfo.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_malloc.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_map.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_open.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_pread.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_pwrite.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_read.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_realloc.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_rename.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_seek.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_sleep.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_unlink.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_unmap.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_write.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_yield.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/txn_abort.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/txn_begin.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/txn_checkpoint.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/txn_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/txn_commit.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/txn_discard.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/txn_id.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/txn_list.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/txn_prepare.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/txn_recover.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/txn_set_timeout.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/txn_stat.html 0444 root bin -d none /opt/csw/bdb43/docs/api_cxx 0755 root bin -f none /opt/csw/bdb43/docs/api_cxx/api_core.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/cxx_pindex.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_associate.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_close.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_cursor.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_del.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_err.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_fd.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_get.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_get_byteswapped.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_get_mpf.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_get_type.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_getenv.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_join.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_key_range.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_list.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_open.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_put.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_remove.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_rename.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_alloc.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_append_recno.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_bt_compare.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_bt_minkey.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_bt_prefix.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_cachesize.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_dup_compare.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_encrypt.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_errcall.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_errfile.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_error_stream.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_errpfx.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_feedback.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_flags.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_h_ffactor.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_h_hash.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_h_nelem.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_lorder.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_msg_stream.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_msgcall.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_msgfile.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_pagesize.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_paniccall.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_q_extentsize.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_re_delim.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_re_len.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_re_pad.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_re_source.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_sync.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_truncate.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_upgrade.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_verify.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/dbc_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/dbc_close.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/dbc_count.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/dbc_del.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/dbc_dup.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/dbc_get.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/dbc_list.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/dbc_put.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/dbt_bulk_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/dbt_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/dbt_package.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/deadlock_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_close.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_dbremove.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_dbrename.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_err.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_list.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_open.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_remove.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_alloc.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_app_dispatch.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_cachesize.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_data_dir.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_encrypt.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_errcall.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_errfile.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_error_stream.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_errpfx.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_feedback.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_flags.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_lg_bsize.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_lg_dir.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_lg_max.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_lg_regionmax.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_lk_conflicts.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_lk_detect.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_lk_max_lockers.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_lk_max_locks.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_lk_max_objects.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_mp_mmapsize.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_msg_stream.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_msgcall.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_msgfile.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_paniccall.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_rpc_server.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_shm_key.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_tas_spins.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_timeout.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_tmp_dir.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_tx_max.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_tx_timestamp.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_verbose.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_strerror.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_version.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/exc_package.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/except_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/frame.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/lock_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/lock_detect.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/lock_get.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/lock_id.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/lock_id_free.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/lock_list.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/lock_put.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/lock_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/lock_vec.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/lockng_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/log_archive.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/log_compare.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/log_cursor.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/log_file.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/log_flush.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/log_list.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/log_put.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/log_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/logc_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/logc_close.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/logc_get.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/lsn_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_fclose.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_fcreate.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_fget.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_fopen.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_fput.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_fset.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_fsync.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_list.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_maxwrite.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_openfd.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_register.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_set_clear_len.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_set_fileid.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_set_flags.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_set_ftype.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_set_lsn_offset.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_set_maxsize.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_set_pgcookie.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_set_priority.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_sync.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_trickle.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/mempfile_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/object.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/pindex.src 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/rep_elect.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/rep_limit.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/rep_list.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/rep_message.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/rep_start.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/rep_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/rep_transport.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/runrec_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/seq_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/seq_close.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/seq_get.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/seq_init_value.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/seq_list.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/seq_open.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/seq_remove.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/seq_set_cachesize.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/seq_set_flags.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/seq_set_range.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/seq_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/txn_abort.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/txn_begin.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/txn_checkpoint.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/txn_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/txn_commit.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/txn_discard.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/txn_id.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/txn_list.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/txn_prepare.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/txn_recover.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/txn_set_timeout.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/txn_stat.html 0444 root bin -d none /opt/csw/bdb43/docs/api_tcl 0755 root bin -f none /opt/csw/bdb43/docs/api_tcl/api_tcl.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/db_close.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/db_count.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/db_cursor.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/db_del.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/db_get.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/db_get_join.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/db_get_type.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/db_is_byteswapped.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/db_join.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/db_open.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/db_put.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/db_remove.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/db_rename.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/db_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/db_sync.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/db_truncate.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/dbc_close.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/dbc_del.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/dbc_dup.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/dbc_get.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/dbc_put.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/env_close.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/env_dbremove.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/env_dbrename.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/env_open.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/env_remove.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/txn.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/txn_abort.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/txn_checkpoint.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/txn_commit.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/version.html 0444 root bin -d none /opt/csw/bdb43/docs/collections 0755 root bin -d none /opt/csw/bdb43/docs/collections/tutorial 0755 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/BasicProgram.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/BerkeleyDB-Java-Collections.pdf 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/Entity.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/SerializableEntity.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/SerializedObjectStorage.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/Summary.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/Tuple.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/UsingCollectionsAPI.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/UsingSecondaries.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/UsingStoredCollections.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/addingdatabaseitems.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/collectionOverview.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/collectionswithentities.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/createbindingscollections.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/creatingentitybindings.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/developing.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/entitieswithcollections.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/gettingStarted.css 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/handlingexceptions.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/implementingmain.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/index.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/indexedcollections.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/openclasscatalog.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/opendatabases.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/opendbenvironment.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/openingforeignkeys.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/preface.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/removingredundantvalueclasses.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/retrievingbyindexkey.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/retrievingdatabaseitems.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/sortedcollections.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/transientfieldsinbinding.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/tuple-serialentitybindings.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/tuplekeybindings.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/tupleswithkeycreators.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/tutorialintroduction.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/usingtransactions.html 0444 root bin -d none /opt/csw/bdb43/docs/gsg 0755 root bin -d none /opt/csw/bdb43/docs/gsg/C 0755 root bin -f none /opt/csw/bdb43/docs/gsg/C/BerkeleyDB-Core-C-GSG.pdf 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/CoreCursorUsage.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/CoreDBAdmin.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/CoreDbUsage.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/CoreEnvUsage.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/Cursors.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/DB.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/DBEntry.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/DBOpenFlags.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/DbUsage.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/DeleteEntryWCursor.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/Positioning.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/PutEntryWCursor.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/ReplacingEntryWCursor.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/accessmethods.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/btree.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/cachesize.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/concepts.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/coredbclose.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/coreindexusage.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/cstructs.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/databaseLimits.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/dbErrorReporting.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/dbconfig.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/environments.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/gettingStarted.css 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/gettingit.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/index.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/indexes.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/introduction.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/joins.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/keyCreator.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/preface.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/readSecondary.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/secondaryCursor.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/secondaryDelete.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/usingDbt.html 0444 root bin -d none /opt/csw/bdb43/docs/gsg/CXX 0755 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/BerkeleyDB-Core-Cxx-GSG.pdf 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/CoreCursorUsage.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/CoreDBAdmin.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/CoreDbCXXUsage.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/CoreEnvUsage.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/Cursors.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/DB.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/DBEntry.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/DBOpenFlags.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/DbCXXUsage.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/DeleteEntryWCursor.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/Positioning.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/PutEntryWCursor.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/ReplacingEntryWCursor.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/accessmethods.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/btree.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/cachesize.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/concepts.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/coreExceptions.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/coredbclose.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/coreindexusage.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/databaseLimits.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/dbErrorReporting.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/dbconfig.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/environments.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/gettingStarted.css 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/gettingit.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/index.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/indexes.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/introduction.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/joins.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/keyCreator.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/preface.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/readSecondary.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/secondaryCursor.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/secondaryDelete.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/usingDbt.html 0444 root bin -d none /opt/csw/bdb43/docs/gsg/JAVA 0755 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/BerkeleyDB-Core-JAVA-GSG.pdf 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/CoreEnvUsage.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/CoreJavaUsage.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/Cursors.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/DB.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/DBAdmin.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/DBEntry.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/DeleteEntryWCursor.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/Positioning.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/PutEntryWCursor.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/ReplacingEntryWCursor.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/accessmethods.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/bindAPI.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/btree.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/cachesize.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/concepts.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/coreExceptions.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/coredbclose.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/cursorJavaUsage.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/databaseLimits.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/dbErrorReporting.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/db_config.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/dbconfig.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/dbtJavaUsage.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/environments.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/gettingStarted.css 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/gettingit.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/index.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/indexes.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/introduction.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/javaindexusage.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/joins.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/keyCreator.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/preface.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/readSecondary.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/returns.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/secondaryCursor.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/secondaryDelete.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/secondaryProps.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/usingDbt.html 0444 root bin -d none /opt/csw/bdb43/docs/images 0755 root bin -f none /opt/csw/bdb43/docs/images/api.gif 0444 root bin -f none /opt/csw/bdb43/docs/images/next.gif 0444 root bin -f none /opt/csw/bdb43/docs/images/prev.gif 0444 root bin -f none /opt/csw/bdb43/docs/images/ps.gif 0444 root bin -f none /opt/csw/bdb43/docs/images/ref.gif 0444 root bin -f none /opt/csw/bdb43/docs/images/sleepycat.gif 0444 root bin -f none /opt/csw/bdb43/docs/index.html 0444 root bin -d none /opt/csw/bdb43/docs/java 0755 root bin -f none /opt/csw/bdb43/docs/java/allclasses-frame.html 0444 root bin -f none /opt/csw/bdb43/docs/java/allclasses-noframe.html 0444 root bin -d none /opt/csw/bdb43/docs/java/com 0755 root bin -d none /opt/csw/bdb43/docs/java/com/sleepycat 0755 root bin -d none /opt/csw/bdb43/docs/java/com/sleepycat/bind 0755 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/ByteArrayBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/EntityBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/EntryBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/RecordNumberBinding.html 0444 root bin -d none /opt/csw/bdb43/docs/java/com/sleepycat/bind/class-use 0755 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/class-use/ByteArrayBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/class-use/EntityBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/class-use/EntryBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/class-use/RecordNumberBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/package-frame.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/package-summary.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/package-tree.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/package-use.html 0444 root bin -d none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial 0755 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/ClassCatalog.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/SerialBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/SerialInput.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/SerialOutput.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/SerialSerialBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/SerialSerialKeyCreator.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/StoredClassCatalog.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/TupleSerialBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/TupleSerialKeyCreator.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/TupleSerialMarshalledBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/TupleSerialMarshalledKeyCreator.html 0444 root bin -d none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/class-use 0755 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/class-use/ClassCatalog.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/class-use/SerialBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/class-use/SerialInput.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/class-use/SerialOutput.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/class-use/SerialSerialBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/class-use/SerialSerialKeyCreator.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/class-use/StoredClassCatalog.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/class-use/TupleSerialBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/class-use/TupleSerialKeyCreator.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/class-use/TupleSerialMarshalledBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/class-use/TupleSerialMarshalledKeyCreator.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/package-frame.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/package-summary.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/package-tree.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/package-use.html 0444 root bin -d none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple 0755 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/BooleanBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/ByteBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/CharacterBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/DoubleBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/FloatBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/IntegerBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/LongBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/MarshalledTupleEntry.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/MarshalledTupleKeyEntity.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/ShortBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/StringBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/TupleBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/TupleInput.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/TupleInputBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/TupleMarshalledBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/TupleOutput.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/TupleTupleBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/TupleTupleKeyCreator.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/TupleTupleMarshalledBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/TupleTupleMarshalledKeyCreator.html 0444 root bin -d none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use 0755 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/BooleanBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/ByteBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/CharacterBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/DoubleBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/FloatBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/IntegerBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/LongBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/MarshalledTupleEntry.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/MarshalledTupleKeyEntity.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/ShortBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/StringBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/TupleBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/TupleInput.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/TupleInputBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/TupleMarshalledBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/TupleOutput.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/TupleTupleBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/TupleTupleKeyCreator.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/TupleTupleMarshalledBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/TupleTupleMarshalledKeyCreator.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/package-frame.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/package-summary.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/package-tree.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/package-use.html 0444 root bin -d none /opt/csw/bdb43/docs/java/com/sleepycat/collections 0755 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/CurrentTransaction.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/MapEntryParameter.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/PrimaryKeyAssigner.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/StoredCollection.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/StoredCollections.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/StoredContainer.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/StoredEntrySet.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/StoredIterator.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/StoredKeySet.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/StoredList.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/StoredMap.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/StoredSortedEntrySet.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/StoredSortedKeySet.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/StoredSortedMap.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/StoredSortedValueSet.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/StoredValueSet.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/TransactionRunner.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/TransactionWorker.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/TupleSerialFactory.html 0444 root bin -d none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use 0755 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/CurrentTransaction.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/MapEntryParameter.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/PrimaryKeyAssigner.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/StoredCollection.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/StoredCollections.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/StoredContainer.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/StoredEntrySet.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/StoredIterator.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/StoredKeySet.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/StoredList.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/StoredMap.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/StoredSortedEntrySet.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/StoredSortedKeySet.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/StoredSortedMap.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/StoredSortedValueSet.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/StoredValueSet.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/TransactionRunner.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/TransactionWorker.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/TupleSerialFactory.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/package-frame.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/package-summary.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/package-tree.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/package-use.html 0444 root bin -d none /opt/csw/bdb43/docs/java/com/sleepycat/db 0755 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/BtreePrefixCalculator.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/BtreeStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/CacheFile.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/CacheFilePriority.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/CacheFileStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/CacheStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/CheckpointConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/Cursor.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/CursorConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/Database.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/DatabaseConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/DatabaseEntry.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/DatabaseException.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/DatabaseStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/DatabaseType.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/DeadlockException.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/Environment.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/EnvironmentConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/ErrorHandler.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/FeedbackHandler.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/HashStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/Hasher.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/JoinConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/JoinCursor.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/KeyRange.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/Lock.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/LockDetectMode.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/LockMode.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/LockNotGrantedException.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/LockOperation.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/LockRequest.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/LockRequestMode.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/LockStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/LogCursor.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/LogRecordHandler.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/LogSequenceNumber.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/LogStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/MemoryException.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/MessageHandler.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/MultipleDataEntry.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/MultipleEntry.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/MultipleKeyDataEntry.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/MultipleRecnoDataEntry.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/OperationStatus.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/PanicHandler.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/PreparedTransaction.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/QueueStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/RecordNumberAppender.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/RecoveryOperation.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/ReplicationHandleDeadException.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/ReplicationStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/ReplicationStatus.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/ReplicationTransport.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/RunRecoveryException.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/SecondaryConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/SecondaryCursor.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/SecondaryDatabase.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/SecondaryKeyCreator.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/Sequence.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/SequenceConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/SequenceStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/StatsConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/Transaction.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/TransactionConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/TransactionStats.Active.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/TransactionStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/VerifyConfig.html 0444 root bin -d none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use 0755 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/BtreePrefixCalculator.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/BtreeStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/CacheFile.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/CacheFilePriority.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/CacheFileStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/CacheStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/CheckpointConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/Cursor.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/CursorConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/Database.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/DatabaseConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/DatabaseEntry.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/DatabaseException.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/DatabaseStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/DatabaseType.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/DeadlockException.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/Environment.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/EnvironmentConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/ErrorHandler.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/FeedbackHandler.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/HashStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/Hasher.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/JoinConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/JoinCursor.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/KeyRange.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/Lock.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/LockDetectMode.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/LockMode.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/LockNotGrantedException.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/LockOperation.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/LockRequest.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/LockRequestMode.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/LockStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/LogCursor.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/LogRecordHandler.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/LogSequenceNumber.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/LogStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/MemoryException.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/MessageHandler.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/MultipleDataEntry.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/MultipleEntry.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/MultipleKeyDataEntry.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/MultipleRecnoDataEntry.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/OperationStatus.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/PanicHandler.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/PreparedTransaction.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/QueueStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/RecordNumberAppender.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/RecoveryOperation.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/ReplicationHandleDeadException.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/ReplicationStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/ReplicationStatus.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/ReplicationTransport.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/RunRecoveryException.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/SecondaryConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/SecondaryCursor.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/SecondaryDatabase.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/SecondaryKeyCreator.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/Sequence.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/SequenceConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/SequenceStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/StatsConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/Transaction.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/TransactionConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/TransactionStats.Active.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/TransactionStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/VerifyConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/package-frame.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/package-summary.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/package-tree.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/package-use.html 0444 root bin -d none /opt/csw/bdb43/docs/java/com/sleepycat/util 0755 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/util/ExceptionUnwrapper.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/util/ExceptionWrapper.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/util/FastInputStream.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/util/FastOutputStream.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/util/IOExceptionWrapper.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/util/RuntimeExceptionWrapper.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/util/UtfOps.html 0444 root bin -d none /opt/csw/bdb43/docs/java/com/sleepycat/util/class-use 0755 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/util/class-use/ExceptionUnwrapper.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/util/class-use/ExceptionWrapper.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/util/class-use/FastInputStream.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/util/class-use/FastOutputStream.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/util/class-use/IOExceptionWrapper.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/util/class-use/RuntimeExceptionWrapper.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/util/class-use/UtfOps.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/util/package-frame.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/util/package-summary.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/util/package-tree.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/util/package-use.html 0444 root bin -f none /opt/csw/bdb43/docs/java/constant-values.html 0444 root bin -f none /opt/csw/bdb43/docs/java/deprecated-list.html 0444 root bin -f none /opt/csw/bdb43/docs/java/help-doc.html 0444 root bin -f none /opt/csw/bdb43/docs/java/index-all.html 0444 root bin -f none /opt/csw/bdb43/docs/java/index.html 0444 root bin -f none /opt/csw/bdb43/docs/java/overview-frame.html 0444 root bin -f none /opt/csw/bdb43/docs/java/overview-summary.html 0444 root bin -f none /opt/csw/bdb43/docs/java/overview-tree.html 0444 root bin -f none /opt/csw/bdb43/docs/java/package-list 0444 root bin -f none /opt/csw/bdb43/docs/java/packages.html 0444 root bin -d none /opt/csw/bdb43/docs/java/resources 0755 root bin -f none /opt/csw/bdb43/docs/java/resources/inherit.gif 0444 root bin -f none /opt/csw/bdb43/docs/java/serialized-form.html 0444 root bin -f none /opt/csw/bdb43/docs/java/style.css 0444 root bin -d none /opt/csw/bdb43/docs/ref 0755 root bin -d none /opt/csw/bdb43/docs/ref/am 0755 root bin -f none /opt/csw/bdb43/docs/ref/am/close.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/count.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/curclose.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/curdel.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/curdup.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/curget.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/curput.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/cursor.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/delete.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/get.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/join.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/open.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/opensub.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/ops.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/put.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/second.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/second.javas 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/stat.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/sync.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/truncate.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/upgrade.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/verify.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/am_conf 0755 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/bt_compare.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/bt_minkey.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/bt_prefix.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/bt_recnum.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/byteorder.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/cachesize.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/dup.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/extentsize.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/h_ffactor.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/h_hash.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/h_nelem.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/logrec.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/malloc.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/pagesize.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/re_source.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/recno.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/renumber.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/select.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/am_misc 0755 root bin -f none /opt/csw/bdb43/docs/ref/am_misc/align.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_misc/dbsizes.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_misc/diskspace.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_misc/error.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_misc/faq.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_misc/get_bulk.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_misc/partial.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_misc/perm.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_misc/stability.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_misc/struct.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_misc/tune.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/apprec 0755 root bin -f none /opt/csw/bdb43/docs/ref/apprec/auto.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/apprec/config.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/apprec/def.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/apprec/intro.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/arch 0755 root bin -f none /opt/csw/bdb43/docs/ref/arch/apis.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/arch/bigpic.gif 0444 root bin -f none /opt/csw/bdb43/docs/ref/arch/bigpic.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/arch/progmodel.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/arch/script.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/arch/smallpic.gif 0444 root bin -f none /opt/csw/bdb43/docs/ref/arch/utilities.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/build_unix 0755 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/aix.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/conf.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/flags.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/freebsd.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/hpux.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/install.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/irix.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/linux.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/macosx.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/notes.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/osf1.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/qnx.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/sco.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/shlib.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/small.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/solaris.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/sunos.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/test.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/ultrix.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/build_vxworks 0755 root bin -f none /opt/csw/bdb43/docs/ref/build_vxworks/faq.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_vxworks/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_vxworks/introae.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_vxworks/notes.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/build_win 0755 root bin -f none /opt/csw/bdb43/docs/ref/build_win/faq.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_win/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_win/notes.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_win/small.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_win/test.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_win/unicode.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/cam 0755 root bin -f none /opt/csw/bdb43/docs/ref/cam/app.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/cam/intro.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/debug 0755 root bin -f none /opt/csw/bdb43/docs/ref/debug/common.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/debug/compile.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/debug/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/debug/printlog.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/debug/runtime.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/distrib 0755 root bin -f none /opt/csw/bdb43/docs/ref/distrib/layout.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/distrib/port.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/dumpload 0755 root bin -f none /opt/csw/bdb43/docs/ref/dumpload/format.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/dumpload/text.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/dumpload/utility.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/env 0755 root bin -f none /opt/csw/bdb43/docs/ref/env/create.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/env/db_config.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/env/encrypt.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/env/error.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/env/faq.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/env/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/env/naming.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/env/open.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/env/region.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/env/remote.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/env/security.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/ext 0755 root bin -f none /opt/csw/bdb43/docs/ref/ext/mod.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/ext/perl.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/ext/php.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/install 0755 root bin -f none /opt/csw/bdb43/docs/ref/install/file.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/install/magic.s5.be.txt 0444 root bin -f none /opt/csw/bdb43/docs/ref/install/magic.s5.le.txt 0444 root bin -f none /opt/csw/bdb43/docs/ref/install/magic.txt 0444 root bin -f none /opt/csw/bdb43/docs/ref/install/multiple.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/intro 0755 root bin -f none /opt/csw/bdb43/docs/ref/intro/data.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/intro/dbis.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/intro/dbisnot.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/intro/distrib.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/intro/need.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/intro/products.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/intro/terrain.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/intro/what.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/intro/where.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/java 0755 root bin -f none /opt/csw/bdb43/docs/ref/java/compat.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/java/conf.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/java/faq.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/java/program.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/lock 0755 root bin -f none /opt/csw/bdb43/docs/ref/lock/am_conv.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/lock/cam_conv.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/lock/config.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/lock/dead.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/lock/deaddbg.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/lock/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/lock/max.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/lock/nondb.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/lock/notxn.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/lock/page.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/lock/stdmode.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/lock/timeout.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/lock/twopl.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/log 0755 root bin -f none /opt/csw/bdb43/docs/ref/log/config.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/log/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/log/limits.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/mp 0755 root bin -f none /opt/csw/bdb43/docs/ref/mp/config.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/mp/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/pindex.src 0444 root bin -d none /opt/csw/bdb43/docs/ref/program 0755 root bin -f none /opt/csw/bdb43/docs/ref/program/appsignals.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/program/cache.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/program/compatible.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/program/copy.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/program/environ.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/program/errorret.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/program/faq.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/program/mt.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/program/namespace.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/program/ram.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/program/runtime.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/program/scope.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/program/solaris.txt 0444 root bin -d none /opt/csw/bdb43/docs/ref/refs 0755 root bin -f none /opt/csw/bdb43/docs/ref/refs/bdb_usenix.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/refs/bdb_usenix.ps 0444 root bin -f none /opt/csw/bdb43/docs/ref/refs/embedded.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/refs/hash_usenix.ps 0444 root bin -f none /opt/csw/bdb43/docs/ref/refs/libtp_usenix.ps 0444 root bin -f none /opt/csw/bdb43/docs/ref/refs/refs.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/refs/witold.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/rep 0755 root bin -f none /opt/csw/bdb43/docs/ref/rep/app.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/rep/comm.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/rep/elect.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/rep/ex.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/rep/ex_comm.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/rep/ex_rq.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/rep/faq.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/rep/id.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/rep/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/rep/newsite.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/rep/partition.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/rep/pri.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/rep/trans.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/rpc 0755 root bin -f none /opt/csw/bdb43/docs/ref/rpc/client.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/rpc/faq.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/rpc/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/rpc/server.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/sequence 0755 root bin -f none /opt/csw/bdb43/docs/ref/sequence/intro.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/tcl 0755 root bin -f none /opt/csw/bdb43/docs/ref/tcl/error.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/tcl/faq.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/tcl/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/tcl/program.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/tcl/using.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/test 0755 root bin -f none /opt/csw/bdb43/docs/ref/test/faq.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/test/run.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/toc.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/transapp 0755 root bin -f none /opt/csw/bdb43/docs/ref/transapp/admin.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/app.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/archival.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/atomicity.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/checkpoint.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/cursor.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/data_open.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/deadlock.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/env_open.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/faq.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/filesys.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/hotfail.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/inc.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/logfile.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/nested.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/put.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/read.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/reclimit.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/recovery.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/term.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/throughput.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/transapp.cs 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/tune.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/why.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/writetest.cs 0444 root bin -d none /opt/csw/bdb43/docs/ref/txn 0755 root bin -f none /opt/csw/bdb43/docs/ref/txn/config.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/txn/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/txn/limits.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/upgrade 0755 root bin -d none /opt/csw/bdb43/docs/ref/upgrade.2.0 0755 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.2.0/convert.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.2.0/disk.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.2.0/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.2.0/system.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.2.0/toc.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/upgrade.3.0 0755 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/close.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/cxx.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/db.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/db_cxx.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/dbenv.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/dbenv_cxx.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/dbinfo.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/disk.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/eacces.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/eagain.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/envopen.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/func.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/java.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/join.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/jump_set.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/lock_detect.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/lock_notheld.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/lock_put.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/lock_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/log_register.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/log_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/memp_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/open.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/rmw.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/stat.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/toc.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/txn_begin.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/txn_commit.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/txn_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/value_set.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/xa.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/upgrade.3.1 0755 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.1/btstat.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.1/config.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.1/disk.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.1/dup.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.1/env.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.1/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.1/log_register.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.1/logalloc.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.1/memp_register.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.1/put.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.1/set_feedback.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.1/set_paniccall.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.1/set_tx_recover.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.1/sysmem.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.1/tcl.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.1/tmp.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.1/toc.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.1/txn_check.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/upgrade.3.2 0755 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.2/callback.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.2/db_dump.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.2/disk.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.2/handle.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.2/incomplete.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.2/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.2/mutexlock.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.2/notfound.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.2/renumber.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.2/set_flags.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.2/toc.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.2/tx_recover.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/upgrade.3.3 0755 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.3/alloc.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.3/bigfile.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.3/conflict.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.3/disk.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.3/getswap.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.3/gettype.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.3/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.3/memp_fget.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.3/rpc.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.3/shared.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.3/toc.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.3/txn_prepare.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/upgrade.4.0 0755 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.0/asr.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.0/cxx.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.0/deadlock.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.0/disk.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.0/env.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.0/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.0/java.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.0/lock.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.0/lock_id_free.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.0/log.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.0/mp.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.0/rpc.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.0/set_lk_max.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.0/toc.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.0/txn.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/upgrade.4.1 0755 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.1/app_dispatch.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.1/checkpoint.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.1/cxx.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.1/disk.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.1/excl.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.1/fop.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.1/hash_nelem.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.1/incomplete.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.1/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.1/java.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.1/log_register.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.1/log_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.1/memp_sync.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.1/toc.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/upgrade.4.2 0755 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.2/cksum.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.2/client.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.2/del.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.2/disk.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.2/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.2/java.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.2/lockng.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.2/nosync.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.2/priority.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.2/queue.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.2/repinit.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.2/tcl.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.2/toc.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.2/verify.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/upgrade.4.3 0755 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.3/cput.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.3/disk.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.3/enomem.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.3/err.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.3/fileopen.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.3/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.3/java.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.3/log.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.3/repl.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.3/rtc.html 0444 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 dmichelsen at users.sourceforge.net Mon Sep 28 17:47:39 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 28 Sep 2009 15:47:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[6599] csw/mgar/pkg/libpcap/trunk Message-ID: Revision: 6599 http://gar.svn.sourceforge.net/gar/?rev=6599&view=rev Author: dmichelsen Date: 2009-09-28 15:47:39 +0000 (Mon, 28 Sep 2009) Log Message: ----------- libpcap: Add patches, re-integration of shared lib patch still needed Modified Paths: -------------- csw/mgar/pkg/libpcap/trunk/Makefile csw/mgar/pkg/libpcap/trunk/checksums csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2224954-fix-autoconf-header.diff Removed Paths: ------------- csw/mgar/pkg/libpcap/trunk/files/CSWlibpcap.gspec Modified: csw/mgar/pkg/libpcap/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpcap/trunk/Makefile 2009-09-28 15:17:03 UTC (rev 6598) +++ csw/mgar/pkg/libpcap/trunk/Makefile 2009-09-28 15:47:39 UTC (rev 6599) @@ -37,4 +37,6 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-ipv6 +INSTALL_ARGS = install-shared + include gar/category.mk Modified: csw/mgar/pkg/libpcap/trunk/checksums =================================================================== --- csw/mgar/pkg/libpcap/trunk/checksums 2009-09-28 15:17:03 UTC (rev 6598) +++ csw/mgar/pkg/libpcap/trunk/checksums 2009-09-28 15:47:39 UTC (rev 6599) @@ -1,2 +1,3 @@ -e2396bd0e71b247413ea26ced5ca923f download/fix-autoconf-header.diff 9ad1358c5dec48456405eac197a46d3d download/libpcap-1.0.0.tar.gz +4b3aba885cc3a967721616419e1b17d1 download/sf-bugtrack-2224954-fix-autoconf-header.diff +10f021b867602038e71a48f5662467bc download/sf-bugtrack-2504874-create-dir-patch.diff Deleted: csw/mgar/pkg/libpcap/trunk/files/CSWlibpcap.gspec =================================================================== --- csw/mgar/pkg/libpcap/trunk/files/CSWlibpcap.gspec 2009-09-28 15:17:03 UTC (rev 6598) +++ csw/mgar/pkg/libpcap/trunk/files/CSWlibpcap.gspec 2009-09-28 15:47:39 UTC (rev 6599) @@ -1,4 +0,0 @@ -%var bitname libpcap -%var pkgname CSWlibpcap -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYRIGHT Modified: csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2224954-fix-autoconf-header.diff =================================================================== --- csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2224954-fix-autoconf-header.diff 2009-09-28 15:17:03 UTC (rev 6598) +++ csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2224954-fix-autoconf-header.diff 2009-09-28 15:47:39 UTC (rev 6599) @@ -1,15 +1,3 @@ -diff -Naur libpcap-1.0.0.orig/Makefile.in libpcap-1.0.0.patched/Makefile.in ---- libpcap-1.0.0.orig/Makefile.in 2008-10-28 02:26:13.000000000 +0100 -+++ libpcap-1.0.0.patched/Makefile.in 2009-09-28 16:33:43.194864215 +0200 -@@ -445,6 +445,8 @@ - $(DESTDIR)$(includedir)/pcap-bpf.h - $(INSTALL_DATA) $(srcdir)/pcap-namedb.h \ - $(DESTDIR)$(includedir)/pcap-namedb.h -+ [ -d $(DESTDIR)$(bindir) ] || \ -+ (mkdir -p $(DESTDIR)$(bindir); chmod 755 $(DESTDIR)$(bindir)) - $(INSTALL_PROGRAM) pcap-config $(DESTDIR)$(bindir)/pcap-config - for i in $(MAN1); do \ - $(INSTALL_DATA) $(srcdir)/$$i \ diff -Naur libpcap-1.0.0.orig/configure libpcap-1.0.0.patched/configure --- libpcap-1.0.0.orig/configure 2008-10-28 02:26:13.000000000 +0100 +++ libpcap-1.0.0.patched/configure 2009-09-28 16:32:19.576622377 +0200 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 Sep 29 03:35:28 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 29 Sep 2009 01:35:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[6600] csw/mgar/pkg/gitosis/Makefile Message-ID: Revision: 6600 http://gar.svn.sourceforge.net/gar/?rev=6600&view=rev Author: wahwah Date: 2009-09-29 01:35:28 +0000 (Tue, 29 Sep 2009) Log Message: ----------- gitosis: software-level Makefile Added Paths: ----------- csw/mgar/pkg/gitosis/Makefile Copied: csw/mgar/pkg/gitosis/Makefile (from rev 6474, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gitosis/Makefile (rev 0) +++ csw/mgar/pkg/gitosis/Makefile 2009-09-29 01:35:28 UTC (rev 6600) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -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 Tue Sep 29 09:47:54 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 29 Sep 2009 07:47:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[6601] csw/mgar/pkg/cswutils/trunk Message-ID: Revision: 6601 http://gar.svn.sourceforge.net/gar/?rev=6601&view=rev Author: wahwah Date: 2009-09-29 07:47:54 +0000 (Tue, 29 Sep 2009) Log Message: ----------- cswutils: Adding compare_pkgs.py 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-09-29 01:35:28 UTC (rev 6600) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2009-09-29 07:47:54 UTC (rev 6601) @@ -6,12 +6,18 @@ define BLURB endef -MASTER_SITES = +SVNROOT = http://opencsw.svn.sourceforge.net/svnroot/opencsw/utilities/ +SVN_REV = 74 + +MASTER_SITES = DISTFILES = COPYING DISTFILES += checkpkg checkpkg.8 DISTFILES += cpan2pkg DISTFILES += createpkg createpkg.8 DISTFILES += stagepkg stagepkg.8 +DISTFILES += stagepkg stagepkg.8 +DISTFILES += compare_pkgs.py-r$(SVN_REV) +DISTFILES += opencsw_lib.py-r$(SVN_REV) REQUIRED_PKGS = CSWtextutils CSWfakeroot CSWperl REQUIRED_PKGS += CSWpmyaml CSWpmlibwww CSWpmhtmltree @@ -34,6 +40,16 @@ include gar/category.mk +download/compare_pkgs.py-r$(SVN_REV): + svn export -r $(SVN_REV) $(SVNROOT)compare_pkgs.py + mv compare_pkgs.py download/compare_pkgs.py-r$(SVN_REV) + @$(MAKECOOKIE) + +download/opencsw_lib.py-r$(SVN_REV): + svn export -r $(SVN_REV) $(SVNROOT)opencsw_lib.py + mv opencsw_lib.py download/opencsw_lib.py-r$(SVN_REV) + @$(MAKECOOKIE) + install-custom: @ginstall -d $(DESTDIR)$(bindir) @ginstall $(WORKSRC)/checkpkg $(DESTDIR)$(bindir) @@ -45,4 +61,10 @@ @ginstall $(WORKSRC)/checkpkg.8 $(DESTDIR)$(mandir)/man8/ @ginstall $(WORKSRC)/createpkg.8 $(DESTDIR)$(mandir)/man8/ @ginstall $(WORKSRC)/stagepkg.8 $(DESTDIR)$(mandir)/man8/ + @ginstall -d $(DESTDIR)$(libdir)/opencsw + @ginstall $(WORKSRC)/compare_pkgs.py-r$(SVN_REV) \ + $(DESTDIR)$(libdir)/opencsw/compare_pkgs.py + @ginstall $(WORKSRC)/opencsw_lib.py-r$(SVN_REV) \ + $(DESTDIR)$(libdir)/opencsw/opencsw_lib.py + @ln -s ../lib/opencsw/compare_pkgs.py $(DESTDIR)$(bindir)/csw-pkg-diff @$(MAKECOOKIE) Modified: csw/mgar/pkg/cswutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswutils/trunk/checksums 2009-09-29 01:35:28 UTC (rev 6600) +++ csw/mgar/pkg/cswutils/trunk/checksums 2009-09-29 07:47:54 UTC (rev 6601) @@ -1,8 +1,10 @@ 091b12575ebc0e45cf8c3d8b43d8b638 download/COPYING 30b6598a4453e3ce0c1fabeede5eb5f8 download/checkpkg 6ec3b6597e04714430987ccc199db3c4 download/checkpkg.8 +280eef68336d2896ecc136152014af9c download/compare_pkgs.py-r74 9a637f6546cc50974159a987302d91c0 download/cpan2pkg 93b6a811d303ce3be0050c5a7b3c8e69 download/createpkg a605598f30195f9ab1b29fc3944d3b31 download/createpkg.8 +d2106349c17ae9e9e000e6636960c134 download/opencsw_lib.py-r74 cd4496ee27bf86d5c8bc656c9c5974be download/stagepkg 8908a0a898aa07a7a928b2b8bd8384f0 download/stagepkg.8 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 Sep 29 10:06:03 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 29 Sep 2009 08:06:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[6602] csw/mgar/pkg/tnef/trunk Message-ID: Revision: 6602 http://gar.svn.sourceforge.net/gar/?rev=6602&view=rev Author: bonivart Date: 2009-09-29 08:06:00 +0000 (Tue, 29 Sep 2009) Log Message: ----------- tnef: update to 1.4.6 Modified Paths: -------------- csw/mgar/pkg/tnef/trunk/Makefile csw/mgar/pkg/tnef/trunk/checksums Modified: csw/mgar/pkg/tnef/trunk/Makefile =================================================================== --- csw/mgar/pkg/tnef/trunk/Makefile 2009-09-29 07:47:54 UTC (rev 6601) +++ csw/mgar/pkg/tnef/trunk/Makefile 2009-09-29 08:06:00 UTC (rev 6602) @@ -1,5 +1,5 @@ GARNAME = tnef -GARVERSION = 1.4.5 +GARVERSION = 1.4.6 CATEGORIES = utils DESCRIPTION = Unpacks Microsoft TNEF MIME attachments Modified: csw/mgar/pkg/tnef/trunk/checksums =================================================================== --- csw/mgar/pkg/tnef/trunk/checksums 2009-09-29 07:47:54 UTC (rev 6601) +++ csw/mgar/pkg/tnef/trunk/checksums 2009-09-29 08:06:00 UTC (rev 6602) @@ -1,2 +1 @@ -ec46d47525c6afb928642e3edec21058 download/tnef-1.4.5.tar.gz -343e1f9b38a4dabb0d788c782131a863 download/CSWtnef.gspec +b47184c4de61322750071cca7026b1cb download/tnef-1.4.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 Tue Sep 29 11:45:06 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 29 Sep 2009 09:45:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6603] csw/mgar/pkg/cswutils/trunk/Makefile Message-ID: Revision: 6603 http://gar.svn.sourceforge.net/gar/?rev=6603&view=rev Author: dmichelsen Date: 2009-09-29 09:45:05 +0000 (Tue, 29 Sep 2009) Log Message: ----------- cswutils: Update version to 1.14.4 after adding csw-pkg-diff Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2009-09-29 08:06:00 UTC (rev 6602) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2009-09-29 09:45:05 UTC (rev 6603) @@ -1,5 +1,5 @@ GARNAME = cswutils -GARVERSION = 1.14.3 +GARVERSION = 1.14.4 CATEGORIES = utils DESCRIPTION = Utilities for CSW maintainers 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 Tue Sep 29 12:34:54 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Tue, 29 Sep 2009 10:34:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[6604] csw/mgar/pkg/nagios/trunk Message-ID: Revision: 6604 http://gar.svn.sourceforge.net/gar/?rev=6604&view=rev Author: j_arndt Date: 2009-09-29 10:34:54 +0000 (Tue, 29 Sep 2009) Log Message: ----------- nagios: moved config / log files to /etc/opt/csw/nagios / /var/opt/csw/nagios Modified Paths: -------------- csw/mgar/pkg/nagios/trunk/Makefile csw/mgar/pkg/nagios/trunk/checksums csw/mgar/pkg/nagios/trunk/files/CSWnagios.preinstall csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype Modified: csw/mgar/pkg/nagios/trunk/Makefile =================================================================== --- csw/mgar/pkg/nagios/trunk/Makefile 2009-09-29 09:45:05 UTC (rev 6603) +++ csw/mgar/pkg/nagios/trunk/Makefile 2009-09-29 10:34:54 UTC (rev 6604) @@ -32,6 +32,7 @@ prefix = $(BUILD_PREFIX)/nagios libexecdir = $(BUILD_PREFIX)/libexec/nagios-plugins +sysconfdir = /etc$(prefix) CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --prefix=$(prefix) @@ -42,6 +43,9 @@ CONFIGURE_ARGS += --with-gd-lib-dir=$(BUILD_PREFIX)/lib CONFIGURE_ARGS += --with-gd-lib-inc=$(BUILD_PREFIX)/inc CONFIGURE_ARGS += --enable-embedded-perl +CONFIGURE_ARGS += --with-checkresult-dir=/var/opt/csw/nagios/spool/checkresults +CONFIGURE_ARGS += --with-lockfile=/var/opt/csw/nagios/nagios.lock +CONFIGURE_ARGS += --localstatedir=/var$(prefix) EXTRA_LIB = $(BUILD_PREFIX)/lib EXTRA_INC = $(BUILD_PREFIX)/include @@ -64,14 +68,13 @@ DOCS = Changelog INSTALLING README UPGRADING DOCDEST = $(DESTDIR)$(BUILD_PREFIX)/share/doc/nagios HTTPD_CONF = $(DESTDIR)$(sysconfdir) -CFGDIR = $(prefix)/etc +CFGDIR = /etc/$(prefix) post-install-modulated: @ginstall -m 755 -d $(DOCDEST) @ginstall -m 755 -d $(HTTPD_CONF) @$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);) @ginstall -m 644 $(WORKSRC)/LICENSE $(DOCDEST) - @ginstall -m 644 $(WORKSRC)/sample-config/httpd.conf $(HTTPD_CONF)/httpd-nagios.conf @ginstall -d $(DESTDIR)/etc/opt/csw/init.d @ginstall -m 755 $(FILEDIR)/cswnagios $(DESTDIR)/etc/opt/csw/init.d/cswnagios @ginstall -m 775 -d $(DESTDIR)$(CFGDIR) @@ -79,6 +82,7 @@ @ginstall -b -m 664 $(WORKSRC)/sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg.CSW @ginstall -b -m 664 $(WORKSRC)/sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg.CSW @ginstall -b -m 660 $(WORKSRC)/sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg.CSW + @ginstall -b -m 644 $(WORKSRC)/sample-config/httpd.conf $(DESTDIR)$(CFGDIR)/httpd-nagios.conf @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg.CSW @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg.CSW @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg.CSW Modified: csw/mgar/pkg/nagios/trunk/checksums =================================================================== --- csw/mgar/pkg/nagios/trunk/checksums 2009-09-29 09:45:05 UTC (rev 6603) +++ csw/mgar/pkg/nagios/trunk/checksums 2009-09-29 10:34:54 UTC (rev 6604) @@ -1,7 +1,7 @@ e407a4b179bd7de72b3e8c21f309f9b7 download/CSWnagios.checkinstall -47cc36016f5518dfd5614b870f56e944 download/CSWnagios.preinstall +db3f392c725ae6e9a3f5a969d2527b41 download/CSWnagios.preinstall 92437323de0cceaa58c6238ec9e6c954 download/CSWnagios.preremove -42672e3ae1e539bf9747f369cb4db7f1 download/CSWnagios.prototype +8d38acdcd6d31711af14ad09e537ea20 download/CSWnagios.prototype e493345589ac2c592c2b958499bc8c20 download/configure.diff d3b39178a60cf866a243d4d8f8eabb9b download/cswnagios f3161bcb7c65f89707ee37b0a8d861d5 download/install-opts.diff Modified: csw/mgar/pkg/nagios/trunk/files/CSWnagios.preinstall =================================================================== --- csw/mgar/pkg/nagios/trunk/files/CSWnagios.preinstall 2009-09-29 09:45:05 UTC (rev 6603) +++ csw/mgar/pkg/nagios/trunk/files/CSWnagios.preinstall 2009-09-29 10:34:54 UTC (rev 6604) @@ -31,4 +31,17 @@ /usr/sbin/usermod -G nagioscm nagios fi +cat << EOF + +======================================================================= + +Configuration files were moved from /opt/csw/nagios/etc/ to +/etc/opt/csw/nagios/. + +Changes which were made to the existing config will automatically +moved to the new location. + +======================================================================= +EOF + exit 0 Modified: csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype =================================================================== --- csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype 2009-09-29 09:45:05 UTC (rev 6603) +++ csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype 2009-09-29 10:34:54 UTC (rev 6604) @@ -4,20 +4,21 @@ d none /opt/csw/nagios/bin 0755 nagios nagios f none /opt/csw/nagios/bin/nagios 0754 nagios nagios f none /opt/csw/nagios/bin/nagiostats 0754 nagios nagios -d none /opt/csw/nagios/etc 0755 nagios nagios -f cswpreserveconf /opt/csw/nagios/etc/cgi.cfg.CSW 0644 nagios nagios -f none /opt/csw/nagios/etc/httpd-nagios.conf 0644 nagios nagios -f cswpreserveconf /opt/csw/nagios/etc/nagios.cfg.CSW 0644 nagios nagios -d none /opt/csw/nagios/etc/objects 0755 nagios nagios -f cswpreserveconf /opt/csw/nagios/etc/objects/commands.cfg.CSW 0644 nagios nagios -f cswpreserveconf /opt/csw/nagios/etc/objects/contacts.cfg.CSW 0644 nagios nagios -f cswpreserveconf /opt/csw/nagios/etc/objects/localhost.cfg.CSW 0644 nagios nagios -f cswpreserveconf /opt/csw/nagios/etc/objects/printer.cfg.CSW 0644 nagios nagios -f cswpreserveconf /opt/csw/nagios/etc/objects/switch.cfg.CSW 0644 nagios nagios -f cswpreserveconf /opt/csw/nagios/etc/objects/templates.cfg.CSW 0644 nagios nagios -f cswpreserveconf /opt/csw/nagios/etc/objects/timeperiods.cfg.CSW 0644 nagios nagios -f cswpreserveconf /opt/csw/nagios/etc/objects/windows.cfg.CSW 0644 nagios nagios -f cswpreserveconf /opt/csw/nagios/etc/resource.cfg.CSW 0640 nagios nagios +f none /opt/csw/nagios/bin/p1.pl 075 nagios nagios +d none /etc/opt/csw/nagios 0755 nagios nagios +f cswpreserveconf /etc/opt/csw/nagios/cgi.cfg.CSW 0644 nagios nagios +f none /etc/opt/csw/nagios/httpd-nagios.conf 0644 nagios nagios +f cswpreserveconf /etc/opt/csw/nagios/nagios.cfg.CSW 0644 nagios nagios +d none /etc/opt/csw/nagios/objects 0755 nagios nagios +f cswpreserveconf /etc/opt/csw/nagios/objects/commands.cfg.CSW 0644 nagios nagios +f cswpreserveconf /etc/opt/csw/nagios/objects/contacts.cfg.CSW 0644 nagios nagios +f cswpreserveconf /etc/opt/csw/nagios/objects/localhost.cfg.CSW 0644 nagios nagios +f cswpreserveconf /etc/opt/csw/nagios/objects/printer.cfg.CSW 0644 nagios nagios +f cswpreserveconf /etc/opt/csw/nagios/objects/switch.cfg.CSW 0644 nagios nagios +f cswpreserveconf /etc/opt/csw/nagios/objects/templates.cfg.CSW 0644 nagios nagios +f cswpreserveconf /etc/opt/csw/nagios/objects/timeperiods.cfg.CSW 0644 nagios nagios +f cswpreserveconf /etc/opt/csw/nagios/objects/windows.cfg.CSW 0644 nagios nagios +f cswpreserveconf /etc/opt/csw/nagios/resource.cfg.CSW 0640 nagios nagios d none /opt/csw/nagios/sbin 0755 nagios nagios f none /opt/csw/nagios/sbin/avail.cgi 0755 nagios nagios f none /opt/csw/nagios/sbin/cmd.cgi 0755 nagios nagios @@ -383,11 +384,11 @@ f none /opt/csw/nagios/share/stylesheets/summary.css 0644 nagios nagios f none /opt/csw/nagios/share/stylesheets/tac.css 0644 nagios nagios f none /opt/csw/nagios/share/stylesheets/trends.css 0644 nagios nagios -d none /opt/csw/nagios/var 0755 nagios nagios -d none /opt/csw/nagios/var/archives 0755 nagios nagios -d none /opt/csw/nagios/var/rw 0755 nagios nagios -d none /opt/csw/nagios/var/spool 0755 nagios nagios -d none /opt/csw/nagios/var/spool/checkresults 0755 nagios nagios +d none /var/opt/csw/nagios 0755 nagios nagios +d none /var/opt/csw/nagios/archives 0755 nagios nagios +d none /var/opt/csw/nagios/rw 0755 nagios nagios +d none /var/opt/csw/nagios/spool 0755 nagios nagios +d none /var/opt/csw/nagios/spool/checkresults 0755 nagios nagios d none /opt/csw/share/doc/nagios 0755 root bin f none /opt/csw/share/doc/nagios/Changelog 0644 root bin f none /opt/csw/share/doc/nagios/INSTALLING 0644 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 Tue Sep 29 13:00:16 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 29 Sep 2009 11:00:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[6605] csw/mgar/pkg/libmm/trunk Message-ID: Revision: 6605 http://gar.svn.sourceforge.net/gar/?rev=6605&view=rev Author: dmichelsen Date: 2009-09-29 11:00:15 +0000 (Tue, 29 Sep 2009) Log Message: ----------- libmm: Add needed legacy version libmm.so.13.0.21 Modified Paths: -------------- csw/mgar/pkg/libmm/trunk/Makefile csw/mgar/pkg/libmm/trunk/checksums Modified: csw/mgar/pkg/libmm/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmm/trunk/Makefile 2009-09-29 10:34:54 UTC (rev 6604) +++ csw/mgar/pkg/libmm/trunk/Makefile 2009-09-29 11:00:15 UTC (rev 6605) @@ -2,6 +2,13 @@ GARVERSION = 1.4.2 CATEGORIES = lib +EXTRA_MODULATORS = GARVERSION +MODULATIONS_GARVERSION = 1.3.1 1.4.2 + +# No 64 bit for old version as it wasn't provided in the legacy version also +SKIP_MODULATIONS = isa-amd64-garversion-1.3.1 +SKIP_MODULATIONS += isa-sparcv9-garversion-1.3.1 + DESCRIPTION = Shared Memory Allocation abstraction library define BLURB OSSP mm is a 2-layer abstraction library which simplifies the usage @@ -14,7 +21,11 @@ endef MASTER_SITES = ftp://ftp.ossp.org/pkg/lib/mm/ -DISTFILES = mm-$(GARVERSION).tar.gz +SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),mm-$(VERSION).tar.gz) +DISTFILES = $(SOURCEFILES) + +NOEXTRACT = $(filter-out mm-$(GARVERSION).tar.gz,$(SOURCEFILES)) + PATCHFILES = 0001-libtool-cflags.diff # We define upstream file regex so we can be notifed of new upstream software release @@ -31,4 +42,23 @@ BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) +MERGE_SCRIPTS_isa-i386-garversion-1.3.1 = copy-only +MERGE_DIRS_isa-i386-garversion-1.3.1 = $(libdir) +MERGE_SCRIPTS_isa-amd64-garversion-1.3.1 = copy-relocated-only +MERGE_DIRS_isa-amd64-garversion-1.3.1 = $(libdir) + +MERGE_SCRIPTS_isa-i386-garversion-1.4.2 = copy-all +MERGE_SCRIPTS_isa-amd64-garversion-1.4.2 = copy-relocated-only +MERGE_DIRS_isa-amd64-garversion-1.4.2 = $(bindir) $(sbindir) $(libexecdir) $(libdir) + +MERGE_SCRIPTS_isa-sparcv8-garversion-1.3.1 = copy-only +MERGE_DIRS_isa-sparcv8-garversion-1.3.1 = $(libdir) +MERGE_SCRIPTS_isa-sparcv9-garversion-1.3.1 = copy-relocated-only +MERGE_DIRS_isa-sparcv9-garversion-1.3.1 = $(libdir) + +MERGE_SCRIPTS_isa-sparcv8-garversion-1.4.2 = copy-all +MERGE_SCRIPTS_isa-sparcv9-garversion-1.4.2 = copy-relocated-only +MERGE_DIRS_isa-sparcv9-garversion-1.4.2 = $(bindir) $(sbindir) $(libexecdir) $(libdir) + + include gar/category.mk Modified: csw/mgar/pkg/libmm/trunk/checksums =================================================================== --- csw/mgar/pkg/libmm/trunk/checksums 2009-09-29 10:34:54 UTC (rev 6604) +++ csw/mgar/pkg/libmm/trunk/checksums 2009-09-29 11:00:15 UTC (rev 6605) @@ -1,2 +1,3 @@ 54493069b25bc79b8f40ed5c5632b2fa download/0001-libtool-cflags.diff +7d62bc28b776f46ff5f71521ad17bf70 download/mm-1.3.1.tar.gz bdb34c6c14071364c8f69062d2e8c82b download/mm-1.4.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 Sep 29 13:32:05 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 29 Sep 2009 11:32:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6606] csw/mgar/gar/v2 Message-ID: Revision: 6606 http://gar.svn.sourceforge.net/gar/?rev=6606&view=rev Author: dmichelsen Date: 2009-09-29 11:32:04 +0000 (Tue, 29 Sep 2009) Log Message: ----------- mGAR v2: Fix handling of ISA dirs with +/- included Modified Paths: -------------- csw/mgar/gar/v2/bin/cswproto csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/bin/cswproto =================================================================== --- csw/mgar/gar/v2/bin/cswproto 2009-09-29 11:00:15 UTC (rev 6605) +++ csw/mgar/gar/v2/bin/cswproto 2009-09-29 11:32:04 UTC (rev 6606) @@ -112,6 +112,8 @@ open F, $common || die "Couldn't open $common"; while () { chomp; next if /^\s*$/ or /^#/; + s/\+/\\+/g; + s/\-/\\-/g; my @c = split( m!/! ); my @pc = map { join( '/', @c[0..$_] ) } 1..$#c; $alldirs{$_} = 1 foreach (@pc); Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-09-29 11:00:15 UTC (rev 6605) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-09-29 11:32:04 UTC (rev 6606) @@ -227,7 +227,7 @@ # between the prefix and the suffix. # usage: $(call isadirs,,) # expands to // // ... -isadirs = $(foreach ISA,$(ISALIST),$(1)/$(ISA)/$(2)) +isadirs = $(foreach ISA,$(ISALIST),$(1)/$(subst +,\+,$(subst -,\-,$(ISA)))/$(2)) # This is a helper function just like isadirs, but also contains the # prefix and suffix without an ISA subdirectories inserted. 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 Sep 29 13:37:55 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 29 Sep 2009 11:37:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[6607] csw/mgar/pkg/libpcap/trunk Message-ID: Revision: 6607 http://gar.svn.sourceforge.net/gar/?rev=6607&view=rev Author: dmichelsen Date: 2009-09-29 11:37:54 +0000 (Tue, 29 Sep 2009) Log Message: ----------- libpcap: Add shared library support Modified Paths: -------------- csw/mgar/pkg/libpcap/trunk/Makefile csw/mgar/pkg/libpcap/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libpcap/trunk/files/shared-library.diff Removed Paths: ------------- csw/mgar/pkg/libpcap/trunk/files/Makefile.in.diff csw/mgar/pkg/libpcap/trunk/files/scanner.l.diff Modified: csw/mgar/pkg/libpcap/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpcap/trunk/Makefile 2009-09-29 11:32:04 UTC (rev 6606) +++ csw/mgar/pkg/libpcap/trunk/Makefile 2009-09-29 11:37:54 UTC (rev 6607) @@ -2,7 +2,7 @@ GARVERSION = 1.0.0 CATEGORIES = lib -DESCRIPTION = Libraries for network diagnostics +DESCRIPTION = System-independent interface for user-level packet capture define BLURB A system-independent interface for user-level network packet capture. endef @@ -17,14 +17,16 @@ PATCHFILES = sf-bugtrack-2224954-fix-autoconf-header.diff PATCHFILES += sf-bugtrack-2504874-create-dir-patch.diff +PATCHFILES += shared-library.diff -# Shared libraries patch -#PATCHFILES = Makefile.in.diff -#PATCHFILES += scanner.l.diff +PACKAGES = CSWlibpcap CSWlibpcapdevel -# No test target for libpcap -TEST_SCRIPTS = +CATALOGNAME_CSWlibpcap = libpcap +CATALOGNAME_CSWlibpcapdevel = libpcap_devel +SPKG_DESC_CSWlibpcap = System-independent interface for user-level packet capture +SPKG_DESC_CSWlibpcapdevel = libpcap development files + BUILD64 = 1 EXTRA_BUILD_ISAS_sparc = sparcv8plus sparcv8plus+vis @@ -34,9 +36,25 @@ EXTRA_CFLAGS = -I. +EXTRA_CFLAGS_isa-sparcv9 = -xcode=pic32 +EXTRA_CFLAGS_isa-amd64 = -xcode=pic32 +EXTRA_CFLAGS += $(EXTRA_CFLAGS_isa-$(ISA)) + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-ipv6 +# Make sure shared libraries are built +BUILD_ARGS = shared INSTALL_ARGS = install-shared +# No test target for libpcap +TEST_SCRIPTS = + +MERGE_DIRS_isa-sparcv8plus = $(libdir) +MERGE_DIRS_isa-sparcv8plus+vis = $(libdir) +MERGE_DIRS_isa-pentium = $(libdir) +MERGE_DIRS_isa-pentium_pro+mmx = $(libdir) + +PKGFILES_CSWlibpcapdevel = $(PKGFILES_DEVEL) + include gar/category.mk Modified: csw/mgar/pkg/libpcap/trunk/checksums =================================================================== --- csw/mgar/pkg/libpcap/trunk/checksums 2009-09-29 11:32:04 UTC (rev 6606) +++ csw/mgar/pkg/libpcap/trunk/checksums 2009-09-29 11:37:54 UTC (rev 6607) @@ -1,3 +1,4 @@ 9ad1358c5dec48456405eac197a46d3d download/libpcap-1.0.0.tar.gz 4b3aba885cc3a967721616419e1b17d1 download/sf-bugtrack-2224954-fix-autoconf-header.diff 10f021b867602038e71a48f5662467bc download/sf-bugtrack-2504874-create-dir-patch.diff +3115b52dbe16ed2b4174ed19fb63f2d6 download/shared-library.diff Deleted: csw/mgar/pkg/libpcap/trunk/files/Makefile.in.diff =================================================================== --- csw/mgar/pkg/libpcap/trunk/files/Makefile.in.diff 2009-09-29 11:32:04 UTC (rev 6606) +++ csw/mgar/pkg/libpcap/trunk/files/Makefile.in.diff 2009-09-29 11:37:54 UTC (rev 6607) @@ -1,116 +0,0 @@ ---- ../build-global/libpcap-0.9.8/Makefile.in 2007-07-24 04:35:15.000000000 +0200 -+++ libpcap-0.9.8/Makefile.in 2009-04-09 04:07:28.839392745 +0200 -@@ -37,6 +37,15 @@ - srcdir = @srcdir@ - VPATH = @srcdir@ - -+# some defines for shared library compilation - FIXME -+MAJ=0 -+MIN=9.8 -+VERSION=$(MAJ).$(MIN) -+LIBNAME=pcap -+LIBRARY=lib$(LIBNAME).a -+SOLIBRARY=lib$(LIBNAME).so -+SHAREDLIB=$(SOLIBRARY).$(VERSION) -+ - # - # You shouldn't need to edit anything below. - # -@@ -52,6 +61,7 @@ - - # Standard CFLAGS - CFLAGS = $(CCOPT) $(INCLS) $(DEFS) -+CFLAGS_SHARED = -G $(LDFLAGS) -Wl,-h,$(SOLIBRARY).$(MAJ) - - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -71,7 +81,11 @@ - # problem if you don't own the file but can write to the directory. - .c.o: - @rm -f $@ -- $(CC) $(CFLAGS) -c $(srcdir)/$*.c -+ $(CC) $(CFLAGS) -c -o $@ $(srcdir)/$*.c -+ -+%_pic.o: %.c -+ @rm -f $@ -+ $(CC) -KPIC $(CFLAGS) -c -o $@ $(srcdir)/$*.c - - PSRC = pcap- at V_PCAP@.c - FSRC = fad- at V_FINDALLDEVS@.c -@@ -86,6 +100,8 @@ - # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot - # hack the extra indirection - OBJ = $(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) $(LIBOBJS) -+OBJ_PIC = $(PSRC:.c=_pic.o) $(FSRC:.c=_pic.o) $(CSRC:.c=_pic.o) $(SSRC:.c=_pic.o) $(GENSRC:.c=_pic.o) -+ - HDR = pcap.h pcap-int.h pcap-namedb.h pcap-nit.h pcap-pf.h \ - ethertype.h gencode.h gnuc.h - GENHDR = \ -@@ -98,14 +114,22 @@ - $(SRC) $(HDR) $(TAGHDR) - - CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c -+CLEANFILES = $(OBJ) $(OBJ_PIC) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c libpcap.so* - --all: libpcap.a -+all: libpcap.a $(SHAREDLIB) - - libpcap.a: $(OBJ) - @rm -f $@ - ar rc $@ $(OBJ) $(LIBS) - $(RANLIB) $@ - -+$(SHAREDLIB): $(OBJ_PIC) -+ - at rm -f $@ -+ - at rm -f $(SOLIBRARY) $(SOLIBRARY).$(MAJ) -+ $(CC) $(CFLAGS_SHARED) -o $(SHAREDLIB) $(OBJ_PIC) -lc -+ ln -s $(SHAREDLIB) $(SOLIBRARY).$(MAJ) -+ ln -s $(SOLIBRARY).$(MAJ) $(SOLIBRARY) -+ - shared: libpcap.$(DYEXT) - - # -@@ -131,6 +155,9 @@ - scanner.o: scanner.c tokdefs.h - $(CC) $(CFLAGS) -c scanner.c - -+scanner_pic.o: scanner.c tokdefs.h -+ $(CC) -KPIC $(CFLAGS) -o $@ -c scanner.c -+ - pcap.o: version.h - - tokdefs.h: grammar.c -@@ -144,9 +171,16 @@ - @rm -f $@ - $(CC) $(CFLAGS) -Dyylval=pcap_lval -c grammar.c - -+grammar_pic.o: grammar.c -+ @rm -f $@ -+ $(CC) -KPIC $(CFLAGS) -Dyylval=pcap_lval -o $@ -c grammar.c -+ - version.o: version.c - $(CC) $(CFLAGS) -c version.c - -+version_pic.o: version.c -+ $(CC) -KPIC $(CFLAGS) -o $@ -c version.c -+ - snprintf.o: $(srcdir)/missing/snprintf.c - $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c - -@@ -172,10 +206,16 @@ - bpf_filter.o: bpf_filter.c - $(CC) $(CFLAGS) -c bpf_filter.c - -+bpf_filter_pic.o: bpf_filter.c -+ $(CC) -KPIC $(CFLAGS) -o $@ -c bpf_filter.c -+ - install: libpcap.a - [ -d $(DESTDIR)$(libdir) ] || \ - (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) - $(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a -+ $(INSTALL_DATA) $(SHAREDLIB) $(DESTDIR)$(libdir)/ -+ ln -sf $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SOLIBRARY).$(MAJ) -+ ln -sf $(SOLIBRARY).$(MAJ) $(DESTDIR)$(libdir)/$(SOLIBRARY) - $(RANLIB) $(DESTDIR)$(libdir)/libpcap.a - [ -d $(DESTDIR)$(includedir) ] || \ - (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir)) Deleted: csw/mgar/pkg/libpcap/trunk/files/scanner.l.diff =================================================================== --- csw/mgar/pkg/libpcap/trunk/files/scanner.l.diff 2009-09-29 11:32:04 UTC (rev 6606) +++ csw/mgar/pkg/libpcap/trunk/files/scanner.l.diff 2009-09-29 11:37:54 UTC (rev 6607) @@ -1,11 +0,0 @@ ---- ../build-global/libpcap-0.9.8/scanner.l 2007-06-11 21:34:28.000000000 +0200 -+++ libpcap-0.9.8/scanner.l 2009-04-09 04:41:33.481612776 +0200 -@@ -32,6 +32,8 @@ - #include - #include - -+#include -+ - #include "pcap-int.h" - - #include "gencode.h" Added: csw/mgar/pkg/libpcap/trunk/files/shared-library.diff =================================================================== --- csw/mgar/pkg/libpcap/trunk/files/shared-library.diff (rev 0) +++ csw/mgar/pkg/libpcap/trunk/files/shared-library.diff 2009-09-29 11:37:54 UTC (rev 6607) @@ -0,0 +1,12 @@ +diff -Naur libpcap-1.0.0.orig/Makefile.in libpcap-1.0.0.patched/Makefile.in +--- libpcap-1.0.0.orig/Makefile.in 2008-10-28 02:26:13.000000000 +0100 ++++ libpcap-1.0.0.patched/Makefile.in 2009-09-28 21:54:53.647596468 +0200 +@@ -326,7 +326,7 @@ + # + libpcap.so: $(OBJ) + @rm -f $@ +- $(CC) -shared -Wl,-soname,$@.1 -o $@.`cat $(srcdir)/VERSION` $(OBJ) $(DAGLIBS) ++ $(CC) -G -o $@.`cat $(srcdir)/VERSION` $(LDFLAGS) $(OBJ) $(DAGLIBS) + + # + # The following rule succeeds, but the result is untested. 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 Sep 29 13:57:37 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 29 Sep 2009 11:57:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[6608] csw/mgar/pkg/tcpdump/trunk Message-ID: Revision: 6608 http://gar.svn.sourceforge.net/gar/?rev=6608&view=rev Author: dmichelsen Date: 2009-09-29 11:57:36 +0000 (Tue, 29 Sep 2009) Log Message: ----------- tcpdump: Update to 4.0 Modified Paths: -------------- csw/mgar/pkg/tcpdump/trunk/Makefile csw/mgar/pkg/tcpdump/trunk/checksums Modified: csw/mgar/pkg/tcpdump/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcpdump/trunk/Makefile 2009-09-29 11:37:54 UTC (rev 6607) +++ csw/mgar/pkg/tcpdump/trunk/Makefile 2009-09-29 11:57:36 UTC (rev 6608) @@ -1,10 +1,9 @@ GARNAME = tcpdump -GARVERSION = 3.9.8 +GARVERSION = 4.0.0 CATEGORIES = utils DESCRIPTION = tcpdump allows you to dump the traffic on a network define BLURB - endef MASTER_SITES = http://www.tcpdump.org/release/ @@ -14,9 +13,12 @@ PREREQUISITE_PKGS = CSWlibpcap CSWosslrt CSWossldevel REQUIRED_PKGS = CSWlibpcap CSWosslrt + # 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.tcpdump.org/ + # Shared libraries patch #PATCHFILES = solib.diff Modified: csw/mgar/pkg/tcpdump/trunk/checksums =================================================================== --- csw/mgar/pkg/tcpdump/trunk/checksums 2009-09-29 11:37:54 UTC (rev 6607) +++ csw/mgar/pkg/tcpdump/trunk/checksums 2009-09-29 11:57:36 UTC (rev 6608) @@ -1 +1 @@ -c491a78c52fe73f1f7271aa5d8c6ab2e download/tcpdump-3.9.8.tar.gz +b22ca72890df2301d922c9f2d17867f9 download/tcpdump-4.0.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Sep 29 14:12:08 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 29 Sep 2009 12:12:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[6609] csw/mgar/pkg Message-ID: Revision: 6609 http://gar.svn.sourceforge.net/gar/?rev=6609&view=rev Author: dmichelsen Date: 2009-09-29 12:12:08 +0000 (Tue, 29 Sep 2009) Log Message: ----------- chmlib: Initial commit Added Paths: ----------- csw/mgar/pkg/chmlib/ csw/mgar/pkg/chmlib/branches/ csw/mgar/pkg/chmlib/tags/ csw/mgar/pkg/chmlib/trunk/ csw/mgar/pkg/chmlib/trunk/Makefile csw/mgar/pkg/chmlib/trunk/checksums csw/mgar/pkg/chmlib/trunk/files/ Property changes on: csw/mgar/pkg/chmlib/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/chmlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/chmlib/trunk/Makefile (rev 0) +++ csw/mgar/pkg/chmlib/trunk/Makefile 2009-09-29 12:12:08 UTC (rev 6609) @@ -0,0 +1,33 @@ +GARNAME = chmlib +GARVERSION = 0.40 +CATEGORIES = lib + +DESCRIPTION = Library designed for accessing MS ITSS files (chm) +define BLURB + CHMLIB is a library for dealing with Microsoft ITSS/CHM format files. + Right now, it is a very simple library, but sufficient for dealing with + all of the .chm files I've come across. Due to the fairly well-designed + indexing built into this particular file format, even a small library is + able to gain reasonably good performance indexing into ITSS archives. +endef + +MASTER_SITES = http://www.jedrea.com/chmlib/ +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) +CONFIGURE_ARGS += --enable-examples + +TEST_TARGET = check + +DOCS = NEWS README +DOCS += ChmLib-ds6.zip ChmLib-ce.zip + +include gar/category.mk + +post-install-modulated: + ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) + $(foreach D,$(DOCS),ginstall $(WORKSRC)/$D $(DESTDIR)$(docdir)/$(GARNAME)/$D;) + @$(MAKECOOKIE) Added: csw/mgar/pkg/chmlib/trunk/checksums =================================================================== --- csw/mgar/pkg/chmlib/trunk/checksums (rev 0) +++ csw/mgar/pkg/chmlib/trunk/checksums 2009-09-29 12:12:08 UTC (rev 6609) @@ -0,0 +1 @@ +7ea49ed8c335215c1edc6fae83e6b912 download/chmlib-0.40.tar.bz2 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 Sep 29 17:28:52 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 29 Sep 2009 15:28:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[6610] csw/mgar/pkg Message-ID: Revision: 6610 http://gar.svn.sourceforge.net/gar/?rev=6610&view=rev Author: bonivart Date: 2009-09-29 15:28:52 +0000 (Tue, 29 Sep 2009) Log Message: ----------- jpeginfo: initial commit of 1.6.0 Added Paths: ----------- csw/mgar/pkg/jpeginfo/ csw/mgar/pkg/jpeginfo/branches/ csw/mgar/pkg/jpeginfo/tags/ csw/mgar/pkg/jpeginfo/trunk/ csw/mgar/pkg/jpeginfo/trunk/Makefile csw/mgar/pkg/jpeginfo/trunk/checksums csw/mgar/pkg/jpeginfo/trunk/files/ Property changes on: csw/mgar/pkg/jpeginfo/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/jpeginfo/trunk/Makefile =================================================================== --- csw/mgar/pkg/jpeginfo/trunk/Makefile (rev 0) +++ csw/mgar/pkg/jpeginfo/trunk/Makefile 2009-09-29 15:28:52 UTC (rev 6610) @@ -0,0 +1,38 @@ +GARNAME = jpeginfo +GARVERSION = 1.6.0 +CATEGORIES = utils + +DESCRIPTION = Info and error checking of jpeg files +define BLURB + Utility to generate informative listings from jpeg files, and to check jpeg files + for errors. Program also supports automagic deletion of broken jpegs. +endef + +MASTER_SITES = http://www.kokkonen.net/tjko/src/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +REQUIRED_PKGS = CSWjpeg + +# 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) + +TEST_TARGET = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +SPKG_SOURCEURL = http://www.kokkonen.net/tjko/projects.html#jpeginfo + +install-custom: + @echo " ==> Installing $(GARNAME) (custom)" + @rm -rf $(DESTDIR) + @ginstall -d $(DESTDIR)$(bindir) + @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -d $(DESTDIR)$(mandir)/man1 + @( cd $(WORKSRC) ; \ + cp -r $(GARNAME) $(DESTDIR)$(bindir)/$(GARNAME) ; \ + cp -r README $(DESTDIR)$(docdir)/$(GARNAME) ; \ + cp -r $(GARNAME).1 $(DESTDIR)$(mandir)/man1/$(GARNAME).1 ) + @$(MAKECOOKIE) Added: csw/mgar/pkg/jpeginfo/trunk/checksums =================================================================== --- csw/mgar/pkg/jpeginfo/trunk/checksums (rev 0) +++ csw/mgar/pkg/jpeginfo/trunk/checksums 2009-09-29 15:28:52 UTC (rev 6610) @@ -0,0 +1 @@ +eda5b0d15d7373c9b0bc96bba4af61e0 download/jpeginfo-1.6.0.tar.gz 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 Tue Sep 29 17:45:38 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Tue, 29 Sep 2009 15:45:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6611] csw/mgar/pkg/nagios/trunk Message-ID: Revision: 6611 http://gar.svn.sourceforge.net/gar/?rev=6611&view=rev Author: j_arndt Date: 2009-09-29 15:45:36 +0000 (Tue, 29 Sep 2009) Log Message: ----------- nagios: improved start / stop script, fix in prototype Modified Paths: -------------- csw/mgar/pkg/nagios/trunk/checksums csw/mgar/pkg/nagios/trunk/files/CSWnagios.preinstall csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype csw/mgar/pkg/nagios/trunk/files/cswnagios Removed Paths: ------------- csw/mgar/pkg/nagios/trunk/files/nagios Modified: csw/mgar/pkg/nagios/trunk/checksums =================================================================== --- csw/mgar/pkg/nagios/trunk/checksums 2009-09-29 15:28:52 UTC (rev 6610) +++ csw/mgar/pkg/nagios/trunk/checksums 2009-09-29 15:45:36 UTC (rev 6611) @@ -1,9 +1,9 @@ e407a4b179bd7de72b3e8c21f309f9b7 download/CSWnagios.checkinstall -db3f392c725ae6e9a3f5a969d2527b41 download/CSWnagios.preinstall +5185cf1fded86e414e134710f075f4ed download/CSWnagios.preinstall 92437323de0cceaa58c6238ec9e6c954 download/CSWnagios.preremove -8d38acdcd6d31711af14ad09e537ea20 download/CSWnagios.prototype +4aa71b54c0fa268116a41abc7f3f2b5d download/CSWnagios.prototype e493345589ac2c592c2b958499bc8c20 download/configure.diff -d3b39178a60cf866a243d4d8f8eabb9b download/cswnagios +1d43a15b685160919b82b181c118cbae download/cswnagios f3161bcb7c65f89707ee37b0a8d861d5 download/install-opts.diff 3566167cc60ddeaad34e7d2e26ed4a58 download/nagios-3.2.0.tar.gz 91407bdea2047b6ff5a1542550933144 download/patch.diff Modified: csw/mgar/pkg/nagios/trunk/files/CSWnagios.preinstall =================================================================== --- csw/mgar/pkg/nagios/trunk/files/CSWnagios.preinstall 2009-09-29 15:28:52 UTC (rev 6610) +++ csw/mgar/pkg/nagios/trunk/files/CSWnagios.preinstall 2009-09-29 15:45:36 UTC (rev 6611) @@ -4,8 +4,31 @@ # 2007-09-11 Fix PKG_INSTALL_ROOT usage. BASEDIR is not used for non # relocatable packages. + echo "Executing preinstall" +cat << EOF + +======================================================================= + +From Nagios 3.2.0 on the configuration and log files for the OpenCSW +package are stored in /etc/opt/csw/nagios/ and /var/opt/csw/nagios/. + +Changes you made to your existing config will automatically +moved to the new location. + + +Please be aware, that it's very likely that you have to change your +nagios.cfg to that changes. + + Installation will proceed in 30 seconds. + Press CTRL+C if you want to stop now. + +======================================================================= +EOF + +sleep 30 + #If installing package on a filesystem tree not running the OS; then exit. if [ ! x"$PKG_INSTALL_ROOT" = x"" ] ; then exit 0 ; fi @@ -31,17 +54,5 @@ /usr/sbin/usermod -G nagioscm nagios fi -cat << EOF -======================================================================= - -Configuration files were moved from /opt/csw/nagios/etc/ to -/etc/opt/csw/nagios/. - -Changes which were made to the existing config will automatically -moved to the new location. - -======================================================================= -EOF - exit 0 Modified: csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype =================================================================== --- csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype 2009-09-29 15:28:52 UTC (rev 6610) +++ csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype 2009-09-29 15:45:36 UTC (rev 6611) @@ -4,7 +4,7 @@ d none /opt/csw/nagios/bin 0755 nagios nagios f none /opt/csw/nagios/bin/nagios 0754 nagios nagios f none /opt/csw/nagios/bin/nagiostats 0754 nagios nagios -f none /opt/csw/nagios/bin/p1.pl 075 nagios nagios +f none /opt/csw/nagios/bin/p1.pl 0754 nagios nagios d none /etc/opt/csw/nagios 0755 nagios nagios f cswpreserveconf /etc/opt/csw/nagios/cgi.cfg.CSW 0644 nagios nagios f none /etc/opt/csw/nagios/httpd-nagios.conf 0644 nagios nagios Modified: csw/mgar/pkg/nagios/trunk/files/cswnagios =================================================================== --- csw/mgar/pkg/nagios/trunk/files/cswnagios 2009-09-29 15:28:52 UTC (rev 6610) +++ csw/mgar/pkg/nagios/trunk/files/cswnagios 2009-09-29 15:45:36 UTC (rev 6611) @@ -28,26 +28,28 @@ # # Modified for CSW by Alex Moore 2006-02-27 # Modified for OpenCSW by Juergen Arndt 2009-03-11 +# +# 2009-09-24 Alexander Skwar +# - Load Solaris SMF file, if present +# - Use SMF exitcodes, if SMF file was loaded +# - use printf instead of "echo -n" #FMRI application # FMRI path for service, see http://wiki.opencsw.org/cswclassutils-package#toc0 +# Load Solaris SMF Variables +test -r /lib/svc/share/smf_include.sh && . /lib/svc/share/smf_include.sh + status_nagios () { - if test ! -f $NagiosRun; then - echo "No lock file found in $NagiosRun" - return 1 - fi - - NagiosPID=`head -n 1 $NagiosRun` if test -x $NagiosCGI/daemonchk.cgi; then - if $NagiosCGI/daemonchk.cgi -l $NagiosRun; then + if $NagiosCGI/daemonchk.cgi -l $NagiosRunFile; then return 0 else return 1 fi else - if ps -p $NagiosPID; then + if ps -p $NagiosPID > /dev/null 2>&1; then return 0 else return 1 @@ -57,20 +59,40 @@ return 1 } +printstatus_nagios() +{ + if status_nagios $1 $2; then + echo "nagios (pid $NagiosPID) is running..." + else + echo "nagios is not running" + fi +} + killproc_nagios () { - if [ ! -f $NagiosRun ]; then - echo "No lock file found in $NagiosRun" + if [ ! -f $NagiosRunFile ]; then + echo "No lock file found in $NagiosRunFile" return 1 fi - NagiosPID=`head -n 1 $NagiosRun` + NagiosPID=`head -n 1 $NagiosRunFile` kill $2 $NagiosPID } +pid_nagios () +{ + if test ! -f $NagiosRunFile; then + echo "No lock file found in $NagiosRunFile" + test -z "$SMF_EXIT_ERR_FATAL" && exit 1 + test -n "$SMF_EXIT_ERR_FATAL" && exit $SMF_EXIT_ERR_FATAL + fi + + NagiosPID=`head -n 1 $NagiosRunFile` +} + # Source function library # Solaris doesn't have an rc.d directory, so do a test first if [ -f /etc/rc.d/init.d/functions ]; then @@ -81,91 +103,146 @@ prefix=/opt/csw/nagios exec_prefix=${prefix} +NagiosVarDir=/var/${prefix} NagiosBin=${exec_prefix}/bin/nagios -NagiosCfg=${prefix}/etc/nagios.cfg -NagiosLog=${prefix}/var/status.log -NagiosTmp=${prefix}/var/nagios.tmp -NagiosSav=${prefix}/var/status.sav -NagiosCmd=${prefix}/var/rw/nagios.cmd -NagiosVar=${prefix}/var -NagiosRun=${prefix}/var/nagios.lock -NagiosLckDir=/var/lock/subsys -NagiosLckFile=nagios -NagiosCGI=${exec_prefix}/sbin -Nagios=nagios - +NagiosCfgFile=/etc/${prefix}/nagios.cfg +NagiosStatusFile=${NagiosVarDir}/status.dat +NagiosRetentionFile=${NagiosVarDir}/retention.dat +NagiosCommandFile=${NagiosVarDir}/rw/nagios.cmd +NagiosRunFile=${NagiosVarDir}/nagios.lock +NagiosLockDir=/var/lock/subsys +NagiosLockFile=nagios +NagiosCGIDir=${exec_prefix}/sbin +NagiosUser=nagios +NagiosGroup=nagios # Check that nagios exists. -test -f $NagiosBin || exit 0 +if [ ! -f $NagiosBin ]; then + echo "Executable file $NagiosBin not found. Exiting." + test -z "$SMF_EXIT_ERR_FATAL" && exit 1 + test -n "$SMF_EXIT_ERR_FATAL" && exit $SMF_EXIT_ERR_FATAL +fi # Check that nagios.cfg exists. -test -f $NagiosCfg || exit 0 +if [ ! -f $NagiosCfgFile ]; then + echo "Configuration file $NagiosCfgFile not found. Exiting." + test -z "$SMF_EXIT_ERR_CONFIG" && exit 1 + test -n "$SMF_EXIT_ERR_CONFIG" && exit $SMF_EXIT_ERR_CONFIG +fi # See how we were called. case "$1" in start) - echo "Starting network monitor: nagios" - su - $Nagios -c "touch $NagiosVar/nagios.log $NagiosSav" - rm -f $NagiosCmd - $NagiosBin -d $NagiosCfg - if [ -d $NagiosLckDir ]; then touch $NagiosLckDir/$NagiosLckFile; fi - sleep 1 - status_nagios nagios + printf "Starting nagios:" + $NagiosBin -v $NagiosCfgFile > /dev/null 2>&1; + if [ $? -eq 0 ]; then + su - $NagiosUser -c "touch $NagiosVarDir/nagios.log $NagiosRetentionFile" + rm -f $NagiosCommandFile + touch $NagiosRunFile + chown $NagiosUser:$NagiosGroup $NagiosRunFile + $NagiosBin -d $NagiosCfgFile + if [ -d $NagiosLockDir ]; then touch $NagiosLockDir/$NagiosLockFile; fi + echo " done." + test -z "$SMF_EXIT_OK" && exit 0 + test -n "$SMF_EXIT_OK" && exit $SMF_EXIT_OK + else + echo "CONFIG ERROR! Start aborted. Check your Nagios configuration." + test -z "$SMF_EXIT_ERR_CONFIG" && exit 1 + test -n "$SMF_EXIT_ERR_CONFIG" && exit $SMF_EXIT_ERR_CONFIG + fi ;; stop) - echo "Stopping network monitor: nagios" + printf "Stopping nagios: " + + pid_nagios killproc_nagios nagios - rm -f $NagiosLog $NagiosTmp $NagiosRun $NagiosLckDir/$NagiosLckFile $NagiosCmd + + # now we have to wait for nagios to exit and remove its + # own NagiosRunFile, otherwise a following "start" could + # happen, and then the exiting nagios will remove the + # new NagiosRunFile, allowing multiple nagios daemons + # to (sooner or later) run - John Sellens + #printf 'Waiting for nagios to exit .' + for i in 1 2 3 4 5 6 7 8 9 10 ; do + if status_nagios > /dev/null; then + printf '.' + sleep 1 + else + break + fi + done + if status_nagios > /dev/null; then + echo '' + echo 'Warning - nagios did not exit in a timely manner' + else + echo 'done.' + fi + + rm -f $NagiosStatusFile $NagiosRunFile $NagiosLockDir$NagiosLockFile $NagiosCommandFile ;; status) - status_nagios nagios + pid_nagios + printstatus_nagios nagios ;; + checkconfig) + printf "Running configuration check..." + $NagiosBin -v $NagiosCfgFile > /dev/null 2>&1; + if [ $? -eq 0 ]; then + echo " OK." + else + echo " CONFIG ERROR! Check your Nagios configuration." + test -z "$SMF_EXIT_ERR_CONFIG" && exit 1 + test -n "$SMF_EXIT_ERR_CONFIG" && exit $SMF_EXIT_ERR_CONFIG + fi + ;; + restart) printf "Running configuration check..." - $NagiosBin -v $NagiosCfg > /dev/null 2>&1; + $NagiosBin -v $NagiosCfgFile > /dev/null 2>&1; if [ $? -eq 0 ]; then - echo "done" - $0 stop - $0 start + echo "done." + "$0" stop + "$0" start else - $NagiosBin -v $NagiosCfg - echo "failed - aborting restart." - exit 1 + echo " CONFIG ERROR! Restart aborted. Check your Nagios configuration." + test -z "$SMF_EXIT_ERR_CONFIG" && exit 1 + test -n "$SMF_EXIT_ERR_CONFIG" && exit $SMF_EXIT_ERR_CONFIG fi ;; reload|force-reload) printf "Running configuration check..." - $NagiosBin -v $NagiosCfg > /dev/null 2>&1; + $NagiosBin -v $NagiosCfgFile > /dev/null 2>&1; if [ $? -eq 0 ]; then - echo "done" - if test ! -f $NagiosRun; then - $0 start + echo "done." + if test ! -f $NagiosRunFile; then + "$0" start else - NagiosPID=`head -n 1 $NagiosRun` + pid_nagios if status_nagios > /dev/null; then printf "Reloading nagios configuration..." killproc_nagios nagios -HUP echo "done" else - $0 stop - $0 start + "$0" stop + "$0" start fi fi else - $NagiosBin -v $NagiosCfg - echo "failed - aborting reload." - exit 1 + echo " CONFIG ERROR! Reload aborted. Check your Nagios configuration." + test -z "$SMF_EXIT_ERR_CONFIG" && exit 1 + test -n "$SMF_EXIT_ERR_CONFIG" && exit $SMF_EXIT_ERR_CONFIG fi ;; *) - echo "Usage: nagios {start|stop|restart|reload|force-reload|status}" - exit 1 + echo "Usage: nagios {start|stop|restart|reload|force-reload|status|checkconfig}" + test -z "$SMF_EXIT_ERR_FATAL" && exit 1 + test -n "$SMF_EXIT_ERR_FATAL" && exit $SMF_EXIT_ERR_FATAL ;; esac Deleted: csw/mgar/pkg/nagios/trunk/files/nagios =================================================================== --- csw/mgar/pkg/nagios/trunk/files/nagios 2009-09-29 15:28:52 UTC (rev 6610) +++ csw/mgar/pkg/nagios/trunk/files/nagios 2009-09-29 15:45:36 UTC (rev 6611) @@ -1,171 +0,0 @@ -#!/bin/sh -# -# chkconfig: 345 99 01 -# description: Nagios network monitor -# -# File : nagios -# -# Author : Jorge Sanchez Aymar (jsanchez at lanchile.cl) -# -# Changelog : -# -# 1999-07-09 Karl DeBisschop -# - setup for autoconf -# - add reload function -# 1999-08-06 Ethan Galstad -# - Added configuration info for use with RedHat's chkconfig tool -# per Fran Boon's suggestion -# 1999-08-13 Jim Popovitch -# - added variable for nagios/var directory -# - cd into nagios/var directory before creating tmp files on startup -# 1999-08-16 Ethan Galstad -# - Added test for rc.d directory as suggested by Karl DeBisschop -# 2000-07-23 Karl DeBisschop -# - Clean out redhat macros and other dependencies -# -# Description: Starts and stops the Nagios monitor -# used to provide network services status. -# -# Modified for CSW by Alex Moore 2006-02-27 - - -status_nagios () -{ - - if test ! -f $NagiosRun; then - echo "No lock file found in $NagiosRun" - return 1 - fi - - NagiosPID=`head -n 1 $NagiosRun` - if test -x $NagiosCGI/daemonchk.cgi; then - if $NagiosCGI/daemonchk.cgi -l $NagiosRun; then - return 0 - else - return 1 - fi - else - if ps -p $NagiosPID; then - return 0 - else - return 1 - fi - fi - - return 1 -} - - -killproc_nagios () -{ - - if [ ! -f $NagiosRun ]; then - echo "No lock file found in $NagiosRun" - return 1 - fi - - NagiosPID=`head -n 1 $NagiosRun` - kill $2 $NagiosPID -} - - -# Source function library -# Solaris doesn't have an rc.d directory, so do a test first -if [ -f /etc/rc.d/init.d/functions ]; then - . /etc/rc.d/init.d/functions -elif [ -f /etc/init.d/functions ]; then - . /etc/init.d/functions -fi - -prefix=/opt/csw/nagios -exec_prefix=${prefix} -NagiosBin=${exec_prefix}/bin/nagios -NagiosCfg=${prefix}/etc/nagios.cfg -NagiosLog=${prefix}/var/status.log -NagiosTmp=${prefix}/var/nagios.tmp -NagiosSav=${prefix}/var/status.sav -NagiosCmd=${prefix}/var/rw/nagios.cmd -NagiosVar=${prefix}/var -NagiosRun=${prefix}/var/nagios.lock -NagiosLckDir=/var/lock/subsys -NagiosLckFile=nagios -NagiosCGI=${exec_prefix}/sbin -Nagios=nagios - - -# Check that nagios exists. -test -f $NagiosBin || exit 0 - -# Check that nagios.cfg exists. -test -f $NagiosCfg || exit 0 - -# See how we were called. -case "$1" in - - start) - echo "Starting network monitor: nagios" - su - $Nagios -c "touch $NagiosVar/nagios.log $NagiosSav" - rm -f $NagiosCmd - $NagiosBin -d $NagiosCfg - if [ -d $NagiosLckDir ]; then touch $NagiosLckDir/$NagiosLckFile; fi - sleep 1 - status_nagios nagios - ;; - - stop) - echo "Stopping network monitor: nagios" - killproc_nagios nagios - rm -f $NagiosLog $NagiosTmp $NagiosRun $NagiosLckDir/$NagiosLckFile $NagiosCmd - ;; - - status) - status_nagios nagios - ;; - - restart) - printf "Running configuration check..." - $NagiosBin -v $NagiosCfg > /dev/null 2>&1; - if [ $? -eq 0 ]; then - echo "done" - $0 stop - $0 start - else - $NagiosBin -v $NagiosCfg - echo "failed - aborting restart." - exit 1 - fi - ;; - - reload|force-reload) - printf "Running configuration check..." - $NagiosBin -v $NagiosCfg > /dev/null 2>&1; - if [ $? -eq 0 ]; then - echo "done" - if test ! -f $NagiosRun; then - $0 start - else - NagiosPID=`head -n 1 $NagiosRun` - if status_nagios > /dev/null; then - printf "Reloading nagios configuration..." - killproc_nagios nagios -HUP - echo "done" - else - $0 stop - $0 start - fi - fi - else - $NagiosBin -v $NagiosCfg - echo "failed - aborting reload." - exit 1 - fi - ;; - - *) - echo "Usage: nagios {start|stop|restart|reload|force-reload|status}" - exit 1 - ;; - -esac - -# End of this script 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 Tue Sep 29 17:47:37 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Tue, 29 Sep 2009 15:47:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[6612] csw/mgar/pkg/nagios/trunk/checksums Message-ID: Revision: 6612 http://gar.svn.sourceforge.net/gar/?rev=6612&view=rev Author: j_arndt Date: 2009-09-29 15:47:36 +0000 (Tue, 29 Sep 2009) Log Message: ----------- nagios: updated checksums Modified Paths: -------------- csw/mgar/pkg/nagios/trunk/checksums Modified: csw/mgar/pkg/nagios/trunk/checksums =================================================================== --- csw/mgar/pkg/nagios/trunk/checksums 2009-09-29 15:45:36 UTC (rev 6611) +++ csw/mgar/pkg/nagios/trunk/checksums 2009-09-29 15:47:36 UTC (rev 6612) @@ -3,7 +3,7 @@ 92437323de0cceaa58c6238ec9e6c954 download/CSWnagios.preremove 4aa71b54c0fa268116a41abc7f3f2b5d download/CSWnagios.prototype e493345589ac2c592c2b958499bc8c20 download/configure.diff -1d43a15b685160919b82b181c118cbae download/cswnagios +0c26e222285ad2666ca0ecf6c85cebf8 download/cswnagios f3161bcb7c65f89707ee37b0a8d861d5 download/install-opts.diff 3566167cc60ddeaad34e7d2e26ed4a58 download/nagios-3.2.0.tar.gz 91407bdea2047b6ff5a1542550933144 download/patch.diff 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 Tue Sep 29 22:35:04 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Tue, 29 Sep 2009 20:35:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[6613] csw/mgar/pkg/nagios_plugins/trunk Message-ID: Revision: 6613 http://gar.svn.sourceforge.net/gar/?rev=6613&view=rev Author: j_arndt Date: 2009-09-29 20:35:00 +0000 (Tue, 29 Sep 2009) Log Message: ----------- nagios_plugins: fixed issue #3927, perl scripts now use util.pm in /opt/csw/libexec/nagios-plugins Modified Paths: -------------- csw/mgar/pkg/nagios_plugins/trunk/Makefile csw/mgar/pkg/nagios_plugins/trunk/checksums Added Paths: ----------- csw/mgar/pkg/nagios_plugins/trunk/files/subst.in.diff Modified: csw/mgar/pkg/nagios_plugins/trunk/Makefile =================================================================== --- csw/mgar/pkg/nagios_plugins/trunk/Makefile 2009-09-29 15:47:36 UTC (rev 6612) +++ csw/mgar/pkg/nagios_plugins/trunk/Makefile 2009-09-29 20:35:00 UTC (rev 6613) @@ -12,6 +12,7 @@ DISTFILES += $(call admfiles,CSWnagiosp,prototype ) PATCHFILES += check_procs.c.diff +PATCHFILES += subst.in.diff REQUIRED_PKGS_CSWnagiosp = CSWggettextrt CSWiconv CSWlibnet CSWlibpq REQUIRED_PKGS_CSWnagiosp += CSWmysql5rt CSWoldaprt CSWosslrt CSWsasl @@ -25,6 +26,8 @@ CONFIGURE_ARGS += --with-mysql-dir=/opt/csw/mysql5/bin CONFIGURE_ARGS += --with-pg-dir=/opt/csw/postgresql/include/ CONFIGURE_ARGS += --disable-largefile +CONFIGURE_ARGS += --with-perl=/opt/csw/bin/perl +CONFIGURE_ARGS += --libexecdir=$(prefix)/libexec/nagios-plugins libexecdir ?= $(prefix)/libexec/nagios-plugins Modified: csw/mgar/pkg/nagios_plugins/trunk/checksums =================================================================== --- csw/mgar/pkg/nagios_plugins/trunk/checksums 2009-09-29 15:47:36 UTC (rev 6612) +++ csw/mgar/pkg/nagios_plugins/trunk/checksums 2009-09-29 20:35:00 UTC (rev 6613) @@ -1,4 +1,5 @@ -be6cc7699fff3ee29d1fd4d562377386 download/nagios-plugins-1.4.13.tar.gz 61f490e92b603ac8628fb0c6cebb39ce download/CSWnagiosp.gspec 65bdf1c84228ccd98397837636004761 download/CSWnagiosp.prototype 4e1d82a9b3b21ade03ad39652352857e download/check_procs.c.diff +be6cc7699fff3ee29d1fd4d562377386 download/nagios-plugins-1.4.13.tar.gz +54ff8a8e4484fd06f1edf9df4adefabf download/subst.in.diff Added: csw/mgar/pkg/nagios_plugins/trunk/files/subst.in.diff =================================================================== --- csw/mgar/pkg/nagios_plugins/trunk/files/subst.in.diff (rev 0) +++ csw/mgar/pkg/nagios_plugins/trunk/files/subst.in.diff 2009-09-29 20:35:00 UTC (rev 6613) @@ -0,0 +1,12 @@ +diff --speed-large-files --minimal -Nru nagios-plugins-1.4.13.orig/plugins-scripts/subst.in nagios-plugins-1.4.13/plugins-scripts/subst.in +--- nagios-plugins-1.4.13.orig/plugins-scripts/subst.in 2005-08-31 00:11:42.000000000 +0200 ++++ nagios-plugins-1.4.13/plugins-scripts/subst.in 2009-09-29 22:00:50.232667015 +0200 +@@ -62,7 +62,7 @@ + # subst will replace the fully qualified command with whatever is + # returned from the which subroutine + # +-/^[^#]/ && /(\/.*)?\/(bin|sbin|lib|libexec)\// { ++/^[^#]/ && /(\/.*)?\/(bin|sbin|lib)\// { + match($0,/(\/.*)?\/(bin|sbin|lib|libexec)\/[-_a-zA-Z0-9]+/); + c=substr($0,RSTART,RLENGTH); + sub(c,which(c,path)); 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 Sep 30 10:28:03 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 30 Sep 2009 08:28:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[6614] csw/mgar/pkg/phpMyAdmin/trunk Message-ID: Revision: 6614 http://gar.svn.sourceforge.net/gar/?rev=6614&view=rev Author: bonivart Date: 2009-09-30 08:28:03 +0000 (Wed, 30 Sep 2009) Log Message: ----------- phpmyadmin: update to 3.2.2 Modified Paths: -------------- csw/mgar/pkg/phpMyAdmin/trunk/Makefile csw/mgar/pkg/phpMyAdmin/trunk/checksums Modified: csw/mgar/pkg/phpMyAdmin/trunk/Makefile =================================================================== --- csw/mgar/pkg/phpMyAdmin/trunk/Makefile 2009-09-29 20:35:00 UTC (rev 6613) +++ csw/mgar/pkg/phpMyAdmin/trunk/Makefile 2009-09-30 08:28:03 UTC (rev 6614) @@ -1,5 +1,5 @@ GARNAME = phpMyAdmin -GARVERSION = 3.1.2 +GARVERSION = 3.2.2 CATEGORIES = apps DESCRIPTION = Effective MySQL Management @@ -16,10 +16,11 @@ DISTFILES = $(GARNAME)-$(GARVERSION)-all-languages.tar.bz2 DISTFILES += $(call admfiles,CSWphpmyadmin,) -REQUIRED_PKGS = CSWapache2 CSWap2modphp5 CSWmysql5 CSWphp5 CSWphp5gd CSWphp5mcrypt CSWphp5mysqli CSWphp5session CSWphp5mbstring CSWphp5ctype CSWphp5zip +REQUIRED_PKGS = CSWapache2 CSWap2modphp5 CSWmysql5 CSWphp5 CSWphp5gd CSWphp5mcrypt +REQUIRED_PKGS += CSWphp5mysqli CSWphp5session CSWphp5mbstring CSWphp5ctype CSWphp5zip # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = -(\d+(?:\.\d+)*)-all-languages.tar.bz2 +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-all-languages.tar.bz2 CONFIGURE_SCRIPTS = BUILD_SCRIPTS = @@ -36,5 +37,5 @@ @ginstall -d $(DESTDIR)$(prefix)/share/www @cp -R $(WORKSRC)-all-languages $(DESTDIR)$(prefix)/share/www/phpmyadmin @ginstall -d $(DESTDIR)$(docdir)/phpmyadmin - @cp $(WORKSRC)-all-languages/LICENSE $(DESTDIR)$(docdir)/phpmyadmin + @cp $(WORKSRC)-all-languages/LICENSE $(DESTDIR)$(docdir)/phpmyadmin/license @$(MAKECOOKIE) Modified: csw/mgar/pkg/phpMyAdmin/trunk/checksums =================================================================== --- csw/mgar/pkg/phpMyAdmin/trunk/checksums 2009-09-29 20:35:00 UTC (rev 6613) +++ csw/mgar/pkg/phpMyAdmin/trunk/checksums 2009-09-30 08:28:03 UTC (rev 6614) @@ -1,2 +1,2 @@ -cb6a6db5d684f94e71f864071b5b0d7a download/phpMyAdmin-3.1.2-all-languages.tar.bz2 +a5f6492f89ee1ff17b76593af79640ce download/phpMyAdmin-3.2.2-all-languages.tar.bz2 25157d38d820705d47f2056d67cc0c2e download/CSWphpmyadmin.gspec 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 Sep 30 10:38:47 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 30 Sep 2009 08:38:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[6615] csw/mgar/pkg/phpMyAdmin/trunk/Makefile Message-ID: Revision: 6615 http://gar.svn.sourceforge.net/gar/?rev=6615&view=rev Author: bonivart Date: 2009-09-30 08:38:47 +0000 (Wed, 30 Sep 2009) Log Message: ----------- phpmyadmin: remove gspec Modified Paths: -------------- csw/mgar/pkg/phpMyAdmin/trunk/Makefile Modified: csw/mgar/pkg/phpMyAdmin/trunk/Makefile =================================================================== --- csw/mgar/pkg/phpMyAdmin/trunk/Makefile 2009-09-30 08:28:03 UTC (rev 6614) +++ csw/mgar/pkg/phpMyAdmin/trunk/Makefile 2009-09-30 08:38:47 UTC (rev 6615) @@ -14,8 +14,10 @@ MASTER_SITES = http://garr.dl.sourceforge.net/sourceforge/phpmyadmin/ DISTFILES = $(GARNAME)-$(GARVERSION)-all-languages.tar.bz2 -DISTFILES += $(call admfiles,CSWphpmyadmin,) +PACKAGES = CSWphpmyadmin +CATALOGNAME = phpmyadmin + REQUIRED_PKGS = CSWapache2 CSWap2modphp5 CSWmysql5 CSWphp5 CSWphp5gd CSWphp5mcrypt REQUIRED_PKGS += CSWphp5mysqli CSWphp5session CSWphp5mbstring CSWphp5ctype CSWphp5zip @@ -27,6 +29,7 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = custom +ARCHALL = 1 SPKG_SOURCEURL = http://www.phpmyadmin.net include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Sep 30 10:40:25 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 30 Sep 2009 08:40:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[6616] csw/mgar/pkg/phpMyAdmin/trunk/files/CSWphpmyadmin. gspec Message-ID: Revision: 6616 http://gar.svn.sourceforge.net/gar/?rev=6616&view=rev Author: bonivart Date: 2009-09-30 08:40:24 +0000 (Wed, 30 Sep 2009) Log Message: ----------- phpmyadmin: remove gspec part II Removed Paths: ------------- csw/mgar/pkg/phpMyAdmin/trunk/files/CSWphpmyadmin.gspec Deleted: csw/mgar/pkg/phpMyAdmin/trunk/files/CSWphpmyadmin.gspec =================================================================== --- csw/mgar/pkg/phpMyAdmin/trunk/files/CSWphpmyadmin.gspec 2009-09-30 08:38:47 UTC (rev 6615) +++ csw/mgar/pkg/phpMyAdmin/trunk/files/CSWphpmyadmin.gspec 2009-09-30 08:40:24 UTC (rev 6616) @@ -1,7 +0,0 @@ -%var bitname phpmyadmin -%var pkgname CSWphpmyadmin -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - -Please see /opt/csw/share/doc/phpmyadmin/LICENSE for license information 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 Sep 30 10:47:40 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 30 Sep 2009 08:47:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[6617] csw/mgar/pkg/memconf/trunk Message-ID: Revision: 6617 http://gar.svn.sourceforge.net/gar/?rev=6617&view=rev Author: bonivart Date: 2009-09-30 08:47:40 +0000 (Wed, 30 Sep 2009) Log Message: ----------- memconf: update to 2.11 Modified Paths: -------------- csw/mgar/pkg/memconf/trunk/Makefile csw/mgar/pkg/memconf/trunk/checksums Modified: csw/mgar/pkg/memconf/trunk/Makefile =================================================================== --- csw/mgar/pkg/memconf/trunk/Makefile 2009-09-30 08:40:24 UTC (rev 6616) +++ csw/mgar/pkg/memconf/trunk/Makefile 2009-09-30 08:47:40 UTC (rev 6617) @@ -1,5 +1,5 @@ GARNAME = memconf -GARVERSION = 2.10 +GARVERSION = 2.11 CATEGORIES = utils DESCRIPTION = perl script that displays memory modules installed Modified: csw/mgar/pkg/memconf/trunk/checksums =================================================================== --- csw/mgar/pkg/memconf/trunk/checksums 2009-09-30 08:40:24 UTC (rev 6616) +++ csw/mgar/pkg/memconf/trunk/checksums 2009-09-30 08:47:40 UTC (rev 6617) @@ -1,3 +1,3 @@ -0aee8d982ef9704737a26d6721d9005d download/memconf.gz -d078ef174e55928dca398310c161ae3c download/memconf.man +0b50e833d8d48cd471f88fc42f378ed9 download/memconf.gz +fc6326ab5ca12b131f656339b515af59 download/memconf.man 818efbe29da417ad462e3f6345690c3d download/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 Sep 30 14:55:33 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 30 Sep 2009 12:55:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[6618] csw/mgar/pkg/bdb43/trunk/Makefile Message-ID: Revision: 6618 http://gar.svn.sourceforge.net/gar/?rev=6618&view=rev Author: dmichelsen Date: 2009-09-30 12:55:33 +0000 (Wed, 30 Sep 2009) Log Message: ----------- bdb43: Fix TCL includes Modified Paths: -------------- csw/mgar/pkg/bdb43/trunk/Makefile Modified: csw/mgar/pkg/bdb43/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb43/trunk/Makefile 2009-09-30 08:47:40 UTC (rev 6617) +++ csw/mgar/pkg/bdb43/trunk/Makefile 2009-09-30 12:55:33 UTC (rev 6618) @@ -56,13 +56,14 @@ CONFIGURE_ARGS += --enable-rpc CONFIGURE_ARGS += --enable-cxx CONFIGURE_ARGS += --enable-java -CONFIGURE_ARGS += --enable-tcl -CONFIGURE_ARGS += --with-tcl=$(libdir) CONFIGURE_ARGS += --enable-o_direct -LIBTOOL_LADIR = $(DESTDIR)$(prefix)/bdb43/lib -STRIP_DIRS += $(DESTDIR)$(prefix)/bdb43/bin +# Exclude TCL support for 64 bit until we have a 64 bit TCL +CONFIGURE_ARGS-mm-32 = --enable-tcl --with-tcl=$(libpath) +CONFIGURE_ARGS += $(CONFIGURE_ARGS-mm-$(MEMORYMODEL)) +FIXCONFIG_DIRS = $(DESTDIR)$(prefix)/bdb43/lib + # bdb tests are time consuming TEST_SCRIPTS = @@ -79,6 +80,6 @@ export PATH configure-dist: - @( cd $(WORKSRC) ; $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS) ) + ( cd $(WORKSRC) ; $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS) ) @$(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 Sep 30 15:32:31 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 30 Sep 2009 13:32:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[6619] csw/mgar/pkg/bdb43/trunk/Makefile Message-ID: Revision: 6619 http://gar.svn.sourceforge.net/gar/?rev=6619&view=rev Author: dmichelsen Date: 2009-09-30 13:32:30 +0000 (Wed, 30 Sep 2009) Log Message: ----------- bdb43: Make sure 64 bit version is built Modified Paths: -------------- csw/mgar/pkg/bdb43/trunk/Makefile Modified: csw/mgar/pkg/bdb43/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb43/trunk/Makefile 2009-09-30 12:55:33 UTC (rev 6618) +++ csw/mgar/pkg/bdb43/trunk/Makefile 2009-09-30 13:32:30 UTC (rev 6619) @@ -45,6 +45,9 @@ ARCHALL_CSWbdb43-doc = 1 +BUILD64 = 1 +NO_ISAEXEC = 1 + CONFIGURE_SCRIPTS = dist prefix = $(BUILD_PREFIX)/bdb43 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 Sep 30 15:42:33 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 30 Sep 2009 13:42:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[6620] csw/mgar/pkg Message-ID: Revision: 6620 http://gar.svn.sourceforge.net/gar/?rev=6620&view=rev Author: dmichelsen Date: 2009-09-30 13:42:33 +0000 (Wed, 30 Sep 2009) Log Message: ----------- bdb42: Vastly upgrade manifest Modified Paths: -------------- csw/mgar/pkg/bdb42/trunk/Makefile csw/mgar/pkg/bdb42/trunk/checksums Added Paths: ----------- csw/mgar/pkg/bdb42/ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.1.diff csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.2.diff csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.3.diff csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.4.diff csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.5.diff csw/mgar/pkg/bdb42/trunk/files/patch.64bit-libtool.diff Removed Paths: ------------- csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.1.diff csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.2.diff csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.3.diff csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.4.diff csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.5.diff Modified: csw/mgar/pkg/bdb42/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb44/trunk/Makefile 2009-09-27 22:55:14 UTC (rev 6593) +++ csw/mgar/pkg/bdb42/trunk/Makefile 2009-09-30 13:42:33 UTC (rev 6620) @@ -1,5 +1,5 @@ GARNAME = db -GARVERSION = 4.4.20 +GARVERSION = 4.2.52 CATEGORIES = lib DESCRIPTION = embedded database libraries and utilities @@ -16,7 +16,7 @@ MASTER_SITES = http://download.oracle.com/berkeley-db/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PACKAGES = CSWbdb44 CSWbdb44-devel CSWbdb44-doc +PACKAGES = CSWbdb42 CSWbdb42-devel CSWbdb42-doc # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -33,7 +33,7 @@ CONFIGURE_SCRIPTS = dist -prefix = $(BUILD_PREFIX)/bdb44 +prefix = $(BUILD_PREFIX)/bdb42 docdir = $(BUILD_PREFIX)/share/doc CONFIGURE_ARGS = $(DIRPATHS) @@ -50,38 +50,38 @@ CONFIGURE_ARGS += --with-tcl=$(libdir) endif -FIXCONFIG_DIRS = $(DESTDIR)$(prefix)/bdb44/lib +FIXCONFIG_DIRS = $(DESTDIR)$(prefix)/bdb42/lib # bdb tests are *very* time consuming TEST_SCRIPTS = NO_ISAEXEC = 1 -PACKAGES = CSWbdb44 CSWbdb44-devel CSWbdb44-doc +PACKAGES = CSWbdb42 CSWbdb42-devel CSWbdb42-doc -CATALOGNAME_CSWbdb44 = berkeleydb44 -CATALOGNAME_CSWbdb44-devel = berkeleydb44_devel -CATALOGNAME_CSWbdb44-doc = berkeleydb44_doc +CATALOGNAME_CSWbdb42 = berkeleydb42 +CATALOGNAME_CSWbdb42-devel = berkeleydb42_devel +CATALOGNAME_CSWbdb42-doc = berkeleydb42_doc -ARCHALL_CSWbdb44-doc = 1 +ARCHALL_CSWbdb42-doc = 1 -SPKG_DESC_CSWbdb44 = BerkeleyDB 4.4 embedded database libraries and utilities -SPKG_DESC_CSWbdb44-devel = BerkeleyDB 4.4 development support -SPKG_DESC_CSWbdb44-doc = BerkeleyDB 4.4 documentation +SPKG_DESC_CSWbdb42 = BerkeleyDB 4.2 embedded database libraries and utilities +SPKG_DESC_CSWbdb42-devel = BerkeleyDB 4.2 development support +SPKG_DESC_CSWbdb42-doc = BerkeleyDB 4.2 documentation -REQUIRED_PKGS_CSWbdb44-devel = CSWbdb44 -INCOMPATIBLE_PKGS_CSWbdb44-doc = CSWbdb44doc +REQUIRED_PKGS_CSWbdb42-devel = CSWbdb42 +INCOMPATIBLE_PKGS_CSWbdb42-doc = CSWbdb42doc LICENSE = LICENSE # Leave the docs where they are for now -#EXTRA_PAX_ARGS_isa-sparcv8 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb44/,p" -#EXTRA_PAX_ARGS_isa-i386 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb44/,p" +#EXTRA_PAX_ARGS_isa-sparcv8 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb42/,p" +#EXTRA_PAX_ARGS_isa-i386 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb42/,p" -#PKGFILES_CSWbdb44-doc = $(PKGFILES_DOC) -PKGFILES_CSWbdb44-doc = $(prefix)/docs/.* +#PKGFILES_CSWbdb42-doc = $(PKGFILES_DOC) +PKGFILES_CSWbdb42-doc = $(prefix)/docs/.* -PKGFILES_CSWbdb44-devel = $(PKGFILES_DEVEL) +PKGFILES_CSWbdb42-devel = $(PKGFILES_DEVEL) include gar/category.mk Modified: csw/mgar/pkg/bdb42/trunk/checksums =================================================================== --- csw/mgar/pkg/bdb44/trunk/checksums 2009-09-27 22:55:14 UTC (rev 6593) +++ csw/mgar/pkg/bdb42/trunk/checksums 2009-09-30 13:42:33 UTC (rev 6620) @@ -1,6 +1,7 @@ -d84dff288a19186b136b0daf7067ade3 download/db-4.4.20.tar.gz -66584d621355df055b6e05b4a02e9c3e download/patch.4.4.20.1.diff -85df93a0867f6cace3501671cdeb6ed1 download/patch.4.4.20.2.diff -88ee91889ebf5498b22b2e7bed945d41 download/patch.4.4.20.3.diff -c2ef7b3e59460c35950fab5f2faa3fc0 download/patch.4.4.20.4.diff -099621e0dad419188acd42c588242131 download/patch.4.4.20.5.diff +8b5cff6eb83972afdd8e0b821703c33c download/db-4.2.52.tar.gz +1227f5f9ff43d48b5b1759e113a1c2d7 download/patch.4.2.52.1.diff +3da7efd8d29919a9113e2f6f5166f5b7 download/patch.4.2.52.2.diff +0bf9ebbe852652bed433e522928d40ec download/patch.4.2.52.3.diff +9cfeff4dce0c11372c0b04b134f8faef download/patch.4.2.52.4.diff +99836f962361da8936219cc193edc7ed download/patch.4.2.52.5.diff +d49545b2691c511276b73bb6c3ec64c3 download/patch.64bit-libtool.diff Added: csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.1.diff =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.1.diff (rev 0) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.1.diff 2009-09-30 13:42:33 UTC (rev 6620) @@ -0,0 +1,36 @@ +*** mp/mp_fget.c.orig 25 Sep 2003 02:15:16 -0000 11.81 +--- mp/mp_fget.c 9 Dec 2003 19:06:28 -0000 11.82 +*************** +*** 440,446 **** + c_mp->stat.st_pages--; + alloc_bhp = NULL; + R_UNLOCK(dbenv, &dbmp->reginfo[n_cache]); +- MUTEX_LOCK(dbenv, &hp->hash_mutex); + + /* + * We can't use the page we found in the pool if DB_MPOOL_NEW +--- 440,445 ---- +*************** +*** 455,460 **** +--- 454,462 ---- + b_incr = 0; + goto alloc; + } ++ ++ /* We can use the page -- get the bucket lock. */ ++ MUTEX_LOCK(dbenv, &hp->hash_mutex); + break; + case SECOND_MISS: + /* +*** mp/mp_fput.c.orig 30 Sep 2003 17:12:00 -0000 11.48 +--- mp/mp_fput.c 13 Dec 2003 00:08:29 -0000 11.49 +*************** +*** 285,290 **** +--- 285,291 ---- + bhp != NULL; bhp = SH_TAILQ_NEXT(bhp, hq, __bh)) + if (bhp->priority != UINT32_T_MAX && + bhp->priority > MPOOL_BASE_DECREMENT) ++ bhp->priority -= MPOOL_BASE_DECREMENT; + MUTEX_UNLOCK(dbenv, &hp->hash_mutex); + } + } Added: csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.2.diff =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.2.diff (rev 0) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.2.diff 2009-09-30 13:42:33 UTC (rev 6620) @@ -0,0 +1,45 @@ +*** lock/lock.c.save 2004-01-30 10:48:33.000000000 -0800 +--- lock/lock.c 2004-01-30 10:55:58.000000000 -0800 +*************** +*** 2216,2226 **** + dp = (u_int8_t *)dp + \ + sizeof(db_pgno_t); \ + } while (0) +! #define COPY_OBJ(dp, obj) do { \ +! memcpy(dp, obj->data, obj->size); \ +! dp = (u_int8_t *)dp + \ +! ALIGN(obj->size, \ +! sizeof(u_int32_t)); \ + } while (0) + + #define GET_COUNT(dp, count) do { \ +--- 2216,2227 ---- + dp = (u_int8_t *)dp + \ + sizeof(db_pgno_t); \ + } while (0) +! #define COPY_OBJ(dp, obj) do { \ +! memcpy(dp, \ +! (obj)->data, (obj)->size); \ +! dp = (u_int8_t *)dp + \ +! ALIGN((obj)->size, \ +! sizeof(u_int32_t)); \ + } while (0) + + #define GET_COUNT(dp, count) do { \ +*************** +*** 2339,2345 **** + for (i = 0; i < nlocks; i = j) { + PUT_PCOUNT(dp, obj[i].ulen); + PUT_SIZE(dp, obj[i].size); +! COPY_OBJ(dp, obj); + lock = (DB_LOCK_ILOCK *)obj[i].data; + for (j = i + 1; j <= i + obj[i].ulen; j++) { + lock = (DB_LOCK_ILOCK *)obj[j].data; +--- 2340,2346 ---- + for (i = 0; i < nlocks; i = j) { + PUT_PCOUNT(dp, obj[i].ulen); + PUT_SIZE(dp, obj[i].size); +! COPY_OBJ(dp, &obj[i]); + lock = (DB_LOCK_ILOCK *)obj[i].data; + for (j = i + 1; j <= i + obj[i].ulen; j++) { + lock = (DB_LOCK_ILOCK *)obj[j].data; Added: csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.3.diff =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.3.diff (rev 0) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.3.diff 2009-09-30 13:42:33 UTC (rev 6620) @@ -0,0 +1,247 @@ +--- java/src/com/sleepycat/db/DbEnv.java 2003-12-03 16:26:27.000000000 -0500 ++++ java/src/com/sleepycat/db/DbEnv.java 2004-03-18 15:15:42.000000000 -0500 +@@ -61,7 +61,7 @@ + // Internally, the JNI layer creates a global reference to each DbEnv, + // which can potentially be different to this. We keep a copy here so + // we can clean up after destructors. +- private Object dbenv_ref; ++ private long dbenv_ref; + private DbAppDispatch app_dispatch_handler; + private DbEnvFeedbackHandler env_feedback_handler; + private DbErrorHandler error_handler; +@@ -94,7 +94,7 @@ + void cleanup() { + swigCPtr = 0; + db_java.deleteRef0(dbenv_ref); +- dbenv_ref = null; ++ dbenv_ref = 0L; + } + + +--- java/src/com/sleepycat/db/Db.java 2003-12-03 16:26:25.000000000 -0500 ++++ java/src/com/sleepycat/db/Db.java 2004-03-18 15:15:55.000000000 -0500 +@@ -57,7 +57,7 @@ + // Internally, the JNI layer creates a global reference to each Db, + // which can potentially be different to this. We keep a copy here so + // we can clean up after destructors. +- private Object db_ref; ++ private long db_ref; + private DbEnv dbenv; + private boolean private_dbenv; + private DbAppendRecno append_recno_handler; +@@ -84,7 +84,7 @@ + private void cleanup() { + swigCPtr = 0; + db_java.deleteRef0(db_ref); +- db_ref = null; ++ db_ref = 0L; + if (private_dbenv) { + dbenv.cleanup(); + } +--- java/src/com/sleepycat/db/db_java.java 2003-12-03 16:10:54.000000000 -0500 ++++ java/src/com/sleepycat/db/db_java.java 2004-03-18 15:17:24.000000000 -0500 +@@ -14,15 +14,15 @@ + db_javaJNI.DbEnv_lock_vec(DbEnv.getCPtr(dbenv), locker, flags, list, offset, nlist); + } + +- static Object initDbEnvRef0(DbEnv self, Object handle) { ++ static long initDbEnvRef0(DbEnv self, Object handle) { + return db_javaJNI.initDbEnvRef0(DbEnv.getCPtr(self), handle); + } + +- static Object initDbRef0(Db self, Object handle) { ++ static long initDbRef0(Db self, Object handle) { + return db_javaJNI.initDbRef0(Db.getCPtr(self), handle); + } + +- static void deleteRef0(Object ref) { ++ static void deleteRef0(long ref) { + db_javaJNI.deleteRef0(ref); + } + +--- java/src/com/sleepycat/db/db_javaJNI.java 2003-12-03 16:10:55.000000000 -0500 ++++ java/src/com/sleepycat/db/db_javaJNI.java 2004-03-18 15:16:18.000000000 -0500 +@@ -45,9 +45,9 @@ + static native final void initialize(); + + public final static native void DbEnv_lock_vec(long jarg1, int jarg2, int jarg3, DbLockRequest[] jarg4, int jarg5, int jarg6) throws DbException; +- final static native Object initDbEnvRef0(long jarg1, Object jarg2); +- final static native Object initDbRef0(long jarg1, Object jarg2); +- final static native void deleteRef0(Object jarg1); ++ final static native long initDbEnvRef0(long jarg1, Object jarg2); ++ final static native long initDbRef0(long jarg1, Object jarg2); ++ final static native void deleteRef0(long jarg1); + final static native long getDbEnv0(long jarg1); + public final static native long new_Db(long jarg1, int jarg2) throws DbException; + public final static native void Db_associate(long jarg1, long jarg2, long jarg3, DbSecondaryKeyCreate jarg4, int jarg5) throws DbException; +--- libdb_java/db_java.i 2003-11-17 15:00:52.000000000 -0500 ++++ libdb_java/db_java.i 2004-03-18 09:21:14.000000000 -0500 +@@ -53,7 +53,7 @@ + // Internally, the JNI layer creates a global reference to each DbEnv, + // which can potentially be different to this. We keep a copy here so + // we can clean up after destructors. +- private Object dbenv_ref; ++ private long dbenv_ref; + private DbAppDispatch app_dispatch_handler; + private DbEnvFeedbackHandler env_feedback_handler; + private DbErrorHandler error_handler; +@@ -76,7 +76,7 @@ + void cleanup() { + swigCPtr = 0; + db_java.deleteRef0(dbenv_ref); +- dbenv_ref = null; ++ dbenv_ref = 0L; + } + + public synchronized void close(int flags) throws DbException { +@@ -220,7 +220,7 @@ + // Internally, the JNI layer creates a global reference to each Db, + // which can potentially be different to this. We keep a copy here so + // we can clean up after destructors. +- private Object db_ref; ++ private long db_ref; + private DbEnv dbenv; + private boolean private_dbenv; + private DbAppendRecno append_recno_handler; +@@ -245,7 +245,7 @@ + private void cleanup() { + swigCPtr = 0; + db_java.deleteRef0(db_ref); +- db_ref = null; ++ db_ref = 0L; + if (private_dbenv) + dbenv.cleanup(); + dbenv = null; +@@ -503,46 +503,42 @@ + } + %} + +-%native(initDbEnvRef0) jobject initDbEnvRef0(DB_ENV *self, void *handle); +-%native(initDbRef0) jobject initDbRef0(DB *self, void *handle); +-%native(deleteRef0) void deleteRef0(jobject ref); ++%native(initDbEnvRef0) jlong initDbEnvRef0(DB_ENV *self, void *handle); ++%native(initDbRef0) jlong initDbRef0(DB *self, void *handle); ++%native(deleteRef0) void deleteRef0(jlong ref); + %native(getDbEnv0) DB_ENV *getDbEnv0(DB *self); + + %{ +-JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0( ++JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0( + JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) { + DB_ENV *self = *(DB_ENV **)&jarg1; ++ jlong ret; + COMPQUIET(jcls, NULL); + + DB_ENV_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2); + self->set_errpfx(self, (const char*)self); +- return (jobject)DB_ENV_INTERNAL(self); ++ *(jobject *)&ret = (jobject)DB_ENV_INTERNAL(self); ++ return (ret); + } + +-JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0( ++JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0( + JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) { + DB *self = *(DB **)&jarg1; ++ jlong ret; + COMPQUIET(jcls, NULL); + + DB_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2); +- return (jobject)DB_INTERNAL(self); ++ *(jobject *)&ret = (jobject)DB_INTERNAL(self); ++ return (ret); + } + + JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1javaJNI_deleteRef0( +- JNIEnv *jenv, jclass jcls, jobject jref) { +- COMPQUIET(jcls, NULL); +- +- if (jref != NULL) +- (*jenv)->DeleteGlobalRef(jenv, jref); +-} +- +-JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbRef0( + JNIEnv *jenv, jclass jcls, jlong jarg1) { +- DB *self = *(DB **)&jarg1; ++ jobject jref = *(jobject *)&jarg1; + COMPQUIET(jcls, NULL); +- COMPQUIET(jenv, NULL); + +- return (jobject)DB_INTERNAL(self); ++ if (jref != 0L) ++ (*jenv)->DeleteGlobalRef(jenv, jref); + } + + JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbEnv0( +@@ -554,7 +550,7 @@ + COMPQUIET(jcls, NULL); + + *(DB_ENV **)&env_cptr = self->dbenv; +- return env_cptr; ++ return (env_cptr); + } + + JNIEXPORT jboolean JNICALL +--- libdb_java/db_java_wrap.c 2003-12-03 16:10:36.000000000 -0500 ++++ libdb_java/db_java_wrap.c 2004-03-18 12:18:58.000000000 -0500 +@@ -1192,40 +1192,36 @@ + } + + +-JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0( ++JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0( + JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) { + DB_ENV *self = *(DB_ENV **)&jarg1; ++ jlong ret; + COMPQUIET(jcls, NULL); + + DB_ENV_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2); + self->set_errpfx(self, (const char*)self); +- return (jobject)DB_ENV_INTERNAL(self); ++ *(jobject *)&ret = (jobject)DB_ENV_INTERNAL(self); ++ return (ret); + } + +-JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0( ++JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0( + JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) { + DB *self = *(DB **)&jarg1; ++ jlong ret; + COMPQUIET(jcls, NULL); + + DB_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2); +- return (jobject)DB_INTERNAL(self); ++ *(jobject *)&ret = (jobject)DB_INTERNAL(self); ++ return (ret); + } + + JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1javaJNI_deleteRef0( +- JNIEnv *jenv, jclass jcls, jobject jref) { +- COMPQUIET(jcls, NULL); +- +- if (jref != NULL) +- (*jenv)->DeleteGlobalRef(jenv, jref); +-} +- +-JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbRef0( + JNIEnv *jenv, jclass jcls, jlong jarg1) { +- DB *self = *(DB **)&jarg1; ++ jobject jref = *(jobject *)&jarg1; + COMPQUIET(jcls, NULL); +- COMPQUIET(jenv, NULL); + +- return (jobject)DB_INTERNAL(self); ++ if (jref != 0L) ++ (*jenv)->DeleteGlobalRef(jenv, jref); + } + + JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbEnv0( +@@ -1237,7 +1233,7 @@ + COMPQUIET(jcls, NULL); + + *(DB_ENV **)&env_cptr = self->dbenv; +- return env_cptr; ++ return (env_cptr); + } + + JNIEXPORT jboolean JNICALL Added: csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.4.diff =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.4.diff (rev 0) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.4.diff 2009-09-30 13:42:33 UTC (rev 6620) @@ -0,0 +1,36 @@ +*** btree/bt_rec.c.orig Tue Mar 22 09:41:49 2005 +--- btree/bt_rec.c Tue Mar 22 09:42:11 2005 +*************** +*** 222,228 **** + * previous-page pointer updated to our new page. The next + * page must exist because we're redoing the operation. + */ +! if (!rootsplit && !IS_ZERO_LSN(argp->nlsn)) { + if ((ret = + __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) { + ret = __db_pgerr(file_dbp, argp->npgno, ret); +--- 222,228 ---- + * previous-page pointer updated to our new page. The next + * page must exist because we're redoing the operation. + */ +! if (!rootsplit && argp->npgno != PGNO_INVALID) { + if ((ret = + __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) { + ret = __db_pgerr(file_dbp, argp->npgno, ret); +*************** +*** 294,300 **** + * possible that the next-page never existed, we ignore it as + * if there's nothing to undo. + */ +! if (!rootsplit && !IS_ZERO_LSN(argp->nlsn)) { + if ((ret = + __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) { + np = NULL; +--- 294,300 ---- + * possible that the next-page never existed, we ignore it as + * if there's nothing to undo. + */ +! if (!rootsplit && argp->npgno != PGNO_INVALID) { + if ((ret = + __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) { + np = NULL; Added: csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.5.diff =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.5.diff (rev 0) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.5.diff 2009-09-30 13:42:33 UTC (rev 6620) @@ -0,0 +1,24 @@ +*** mp/mp_fget.c.orig 2003-09-25 08:29:02.000000000 -0700 +--- mp/mp_fget.c 2006-05-26 14:58:02.246963204 -0700 +*************** +*** 553,560 **** + */ + if (state != SECOND_MISS && bhp->ref == 1) { + bhp->priority = UINT32_T_MAX; +! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh); +! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq); + hp->hash_priority = + SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority; + } +--- 553,563 ---- + */ + if (state != SECOND_MISS && bhp->ref == 1) { + bhp->priority = UINT32_T_MAX; +! if (SH_TAILQ_FIRST(&hp->hash_bucket, __bh) != +! SH_TAILQ_LAST(&hp->hash_bucket, hq, __bh)) { +! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh); +! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq); +! } + hp->hash_priority = + SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority; + } Deleted: csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.1.diff =================================================================== --- csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.1.diff 2009-09-27 22:55:14 UTC (rev 6593) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.1.diff 2009-09-30 13:42:33 UTC (rev 6620) @@ -1,27 +0,0 @@ -*** qam/qam_files.c.orig 2005-10-20 11:57:12.000000000 -0700 ---- qam/qam_files.c 2006-01-27 13:38:38.000000000 -0800 -*************** -*** 411,416 **** ---- 411,422 ---- - DB_APP_DATA, buf, 0, NULL, &real_name)) != 0) - goto err; - #endif -+ -+ mpf = array->mpfarray[offset].mpf; -+ /* This extent my already be marked for delete and closed. */ -+ if (mpf == NULL) -+ goto err; -+ - /* - * The log must be flushed before the file is deleted. We depend on - * the log record of the last delete to recreate the file if we crash. -*************** -*** 418,424 **** - if (LOGGING_ON(dbenv) && (ret = __log_flush(dbenv, NULL)) != 0) - goto err; - -- mpf = array->mpfarray[offset].mpf; - (void)__memp_set_flags(mpf, DB_MPOOL_UNLINK, 1); - /* Someone could be real slow, let them close it down. */ - if (array->mpfarray[offset].pinref != 0) ---- 424,429 ---- Deleted: csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.2.diff =================================================================== --- csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.2.diff 2009-09-27 22:55:14 UTC (rev 6593) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.2.diff 2009-09-30 13:42:33 UTC (rev 6620) @@ -1,29 +0,0 @@ -*** txn/txn.c.orig Tue Nov 1 06:50:03 2005 ---- txn/txn.c Tue Jan 31 15:05:13 2006 -*************** -*** 1049,1060 **** ---- 1049,1062 ---- - return (ret); - memcpy(txn->name, name, len); - -+ TXN_SYSTEM_LOCK(dbenv); - if (td->name != INVALID_ROFF) { - __db_shalloc_free( - &mgr->reginfo, R_ADDR(&mgr->reginfo, td->name)); - td->name = INVALID_ROFF; - } - if ((ret = __db_shalloc(&mgr->reginfo, len, 0, &p)) != 0) { -+ TXN_SYSTEM_UNLOCK(dbenv); - __db_err(dbenv, - "Unable to allocate memory for transaction name"); - -*************** -*** 1063,1068 **** ---- 1065,1071 ---- - - return (ret); - } -+ TXN_SYSTEM_UNLOCK(dbenv); - td->name = R_OFFSET(&mgr->reginfo, p); - memcpy(p, name, len); - Deleted: csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.3.diff =================================================================== --- csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.3.diff 2009-09-27 22:55:14 UTC (rev 6593) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.3.diff 2009-09-30 13:42:33 UTC (rev 6620) @@ -1,49 +0,0 @@ -*** db/db_cam.c.orig 2006-01-11 03:19:21.000000000 +1100 ---- db/db_cam.c 2006-03-01 13:59:01.000000000 +1100 -*************** -*** 579,589 **** - flags == DB_NEXT || flags == DB_NEXT_DUP || flags == DB_PREV)) { - if (tmp_rmw && (ret = dbc_arg->c_am_writelock(dbc_arg)) != 0) - return (ret); -! if ((ret = __db_c_idup(cp->opd, &opd, DB_POSITION)) != 0) - return (ret); - -! switch (ret = -! opd->c_am_get(opd, key, data, flags, NULL)) { - case 0: - goto done; - case DB_NOTFOUND: ---- 579,590 ---- - flags == DB_NEXT || flags == DB_NEXT_DUP || flags == DB_PREV)) { - if (tmp_rmw && (ret = dbc_arg->c_am_writelock(dbc_arg)) != 0) - return (ret); -! if (F_ISSET(dbc_arg, DBC_TRANSIENT)) -! opd = cp->opd; -! else if ((ret = __db_c_idup(cp->opd, &opd, DB_POSITION)) != 0) - return (ret); - -! switch (ret = opd->c_am_get(opd, key, data, flags, NULL)) { - case 0: - goto done; - case DB_NOTFOUND: -*************** -*** 596,607 **** ---- 597,614 ---- - if ((ret = __db_c_close(opd)) != 0) - goto err; - opd = NULL; -+ if (F_ISSET(dbc_arg, DBC_TRANSIENT)) -+ cp->opd = NULL; - break; - } - goto err; - default: - goto err; - } -+ } else if (cp->opd != NULL && F_ISSET(dbc_arg, DBC_TRANSIENT)) { -+ if ((ret = __db_c_close(cp->opd)) != 0) -+ goto err; -+ cp->opd = NULL; - } - - /* Deleted: csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.4.diff =================================================================== --- csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.4.diff 2009-09-27 22:55:14 UTC (rev 6593) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.4.diff 2009-09-30 13:42:33 UTC (rev 6620) @@ -1,24 +0,0 @@ -*** mp/mp_fget.c.orig 2005-10-12 10:53:36.000000000 -0700 ---- mp/mp_fget.c 2006-05-30 20:48:10.000000000 -0700 -*************** -*** 587,594 **** - */ - if (state != SECOND_MISS && bhp->ref == 1) { - bhp->priority = UINT32_MAX; -! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh); -! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq); - hp->hash_priority = - SH_TAILQ_FIRSTP(&hp->hash_bucket, __bh)->priority; - } ---- 587,597 ---- - */ - if (state != SECOND_MISS && bhp->ref == 1) { - bhp->priority = UINT32_MAX; -! if (SH_TAILQ_FIRST(&hp->hash_bucket, __bh) != -! SH_TAILQ_LAST(&hp->hash_bucket, hq, __bh)) { -! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh); -! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq); -! } - hp->hash_priority = - SH_TAILQ_FIRSTP(&hp->hash_bucket, __bh)->priority; - } Deleted: csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.5.diff =================================================================== --- csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.5.diff 2009-09-27 22:55:14 UTC (rev 6593) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.5.diff 2009-09-30 13:42:33 UTC (rev 6620) @@ -1,13 +0,0 @@ -diff -Naur db-4.4.20.orig/dist/ltmain.sh db-4.4.20/dist/ltmain.sh ---- dist/ltmain.sh 2005-10-17 16:35:53.000000000 +0200 -+++ dist/ltmain.sh 2008-05-14 08:30:26.766534000 +0200 -@@ -1552,9 +1552,7 @@ - esac - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" -- if test "$with_gcc" = "yes" ; then - compiler_flags="$compiler_flags $arg" -- fi - continue - ;; - Added: csw/mgar/pkg/bdb42/trunk/files/patch.64bit-libtool.diff =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.64bit-libtool.diff (rev 0) +++ csw/mgar/pkg/bdb42/trunk/files/patch.64bit-libtool.diff 2009-09-30 13:42:33 UTC (rev 6620) @@ -0,0 +1,22 @@ +diff -Naur db-4.2.52.orig/dist/ltmain.sh db-4.2.52.patched/dist/ltmain.sh +--- dist/ltmain.sh 2003-04-26 19:45:37.000000000 +0200 ++++ dist/ltmain.sh 2009-09-30 15:15:43.792423773 +0200 +@@ -1298,7 +1298,7 @@ + # but this is not reliable with gcc because gcc may use -mfoo to + # select a different linker, different libraries, etc, while + # -Wl,-mfoo simply passes -mfoo to the linker. +- -m*) ++ -m*|-xarch=*) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` +@@ -1309,9 +1309,7 @@ + esac + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" +- if test "$with_gcc" = "yes" ; then + compiler_flags="$compiler_flags $arg" +- fi + continue + ;; + 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 Sep 30 16:00:46 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 30 Sep 2009 14:00:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6621] csw/mgar/pkg/chmlib/trunk Message-ID: Revision: 6621 http://gar.svn.sourceforge.net/gar/?rev=6621&view=rev Author: dmichelsen Date: 2009-09-30 14:00:46 +0000 (Wed, 30 Sep 2009) Log Message: ----------- chmlib: Initial commit Modified Paths: -------------- csw/mgar/pkg/chmlib/trunk/Makefile csw/mgar/pkg/chmlib/trunk/checksums Added Paths: ----------- csw/mgar/pkg/chmlib/trunk/files/0001-Add-autoconf-support-from-gnulib-for-getopt.h.patch Modified: csw/mgar/pkg/chmlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/chmlib/trunk/Makefile 2009-09-30 13:42:33 UTC (rev 6620) +++ csw/mgar/pkg/chmlib/trunk/Makefile 2009-09-30 14:00:46 UTC (rev 6621) @@ -14,6 +14,8 @@ MASTER_SITES = http://www.jedrea.com/chmlib/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +PATCHFILES = 0001-Add-autoconf-support-from-gnulib-for-getopt.h.patch + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 Modified: csw/mgar/pkg/chmlib/trunk/checksums =================================================================== --- csw/mgar/pkg/chmlib/trunk/checksums 2009-09-30 13:42:33 UTC (rev 6620) +++ csw/mgar/pkg/chmlib/trunk/checksums 2009-09-30 14:00:46 UTC (rev 6621) @@ -1 +1,2 @@ +b7276bc25fffbf7044018f94ebe1baf9 download/0001-Add-autoconf-support-from-gnulib-for-getopt.h.patch 7ea49ed8c335215c1edc6fae83e6b912 download/chmlib-0.40.tar.bz2 Added: 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 (rev 0) +++ csw/mgar/pkg/chmlib/trunk/files/0001-Add-autoconf-support-from-gnulib-for-getopt.h.patch 2009-09-30 14:00:46 UTC (rev 6621) @@ -0,0 +1,3298 @@ +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@ @@ 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 Wed Sep 30 16:02:53 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 30 Sep 2009 14:02:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[6622] csw/mgar/pkg Message-ID: Revision: 6622 http://gar.svn.sourceforge.net/gar/?rev=6622&view=rev Author: dmichelsen Date: 2009-09-30 14:02:53 +0000 (Wed, 30 Sep 2009) Log Message: ----------- bdb47: Fix prefix Modified Paths: -------------- csw/mgar/pkg/bdb47/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/bdb47/ Modified: csw/mgar/pkg/bdb47/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb/trunk/Makefile 2009-09-27 22:55:14 UTC (rev 6593) +++ csw/mgar/pkg/bdb47/trunk/Makefile 2009-09-30 14:02:53 UTC (rev 6622) @@ -30,7 +30,7 @@ BUILD64 = 1 CONFIGURE_SCRIPTS = dist -#prefix = $(BUILD_PREFIX)/bdb47 +prefix = $(BUILD_PREFIX)/bdb47 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-compat185 CONFIGURE_ARGS += --enable-o_direct @@ -39,10 +39,8 @@ CONFIGURE_ARGS += --enable-java # Exclude TCL support for 64 bit until we have a 64 bit TCL -ifeq ($(MEMORYMODEL),32) -CONFIGURE_ARGS += --enable-tcl -CONFIGURE_ARGS += --with-tcl=$(libdir) -endif +CONFIGURE_ARGS-mm-32 = --enable-tcl --with-tcl=$(libpath) +CONFIGURE_ARGS += $(CONFIGURE_ARGS-mm-$(MEMORYMODEL)) # bdb tests are *very* time consuming TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Sep 30 16:52:46 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 30 Sep 2009 14:52:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6623] csw/mgar/pkg Message-ID: Revision: 6623 http://gar.svn.sourceforge.net/gar/?rev=6623&view=rev Author: dmichelsen Date: 2009-09-30 14:52:46 +0000 (Wed, 30 Sep 2009) Log Message: ----------- bdb48: Initial commit Modified Paths: -------------- csw/mgar/pkg/bdb48/trunk/Makefile csw/mgar/pkg/bdb48/trunk/checksums Added Paths: ----------- csw/mgar/pkg/bdb48/ Modified: csw/mgar/pkg/bdb48/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb/trunk/Makefile 2009-09-27 22:55:14 UTC (rev 6593) +++ csw/mgar/pkg/bdb48/trunk/Makefile 2009-09-30 14:52:46 UTC (rev 6623) @@ -1,8 +1,8 @@ GARNAME = db -GARVERSION = 4.7.25 +GARVERSION = 4.8.24 CATEGORIES = lib -DESCRIPTION = Berkeley DB 4.7 +DESCRIPTION = Berkeley DB 4.8 define BLURB Berkeley DB (libdb) is a programmatic toolkit that provides embedded database support for both traditional and client/server applications. It includes @@ -30,19 +30,18 @@ BUILD64 = 1 CONFIGURE_SCRIPTS = dist -#prefix = $(BUILD_PREFIX)/bdb47 +prefix = $(BUILD_PREFIX)/bdb48 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-compat185 CONFIGURE_ARGS += --enable-o_direct -CONFIGURE_ARGS += --enable-rpc +# No longer there in 4.8 +#CONFIGURE_ARGS += --enable-rpc CONFIGURE_ARGS += --enable-cxx CONFIGURE_ARGS += --enable-java # Exclude TCL support for 64 bit until we have a 64 bit TCL -ifeq ($(MEMORYMODEL),32) -CONFIGURE_ARGS += --enable-tcl -CONFIGURE_ARGS += --with-tcl=$(libdir) -endif +CONFIGURE_ARGS-mm-32 = --enable-tcl --with-tcl=$(libpath) +CONFIGURE_ARGS += $(CONFIGURE_ARGS-mm-$(MEMORYMODEL)) # bdb tests are *very* time consuming TEST_SCRIPTS = @@ -65,9 +64,9 @@ ARCHALL_CSWbdbdoc = 1 -SPKG_DESC_CSWbdb = BerkeleyDB 4.7 embedded database libraries and utilities -SPKG_DESC_CSWbdbdevel = BerkeleyDB 4.7 development support -SPKG_DESC_CSWbdbdoc = BerkeleyDB 4.7 documentation +SPKG_DESC_CSWbdb = BerkeleyDB 4.8 embedded database libraries and utilities +SPKG_DESC_CSWbdbdevel = BerkeleyDB 4.8 development support +SPKG_DESC_CSWbdbdoc = BerkeleyDB 4.8 documentation REQUIRED_PKGS_CSWbdbdevel = CSWbdb Modified: csw/mgar/pkg/bdb48/trunk/checksums =================================================================== --- csw/mgar/pkg/bdb/trunk/checksums 2009-09-27 22:55:14 UTC (rev 6593) +++ csw/mgar/pkg/bdb48/trunk/checksums 2009-09-30 14:52:46 UTC (rev 6623) @@ -1,5 +1 @@ -ec2b87e833779681a0c3a814aa71359e download/db-4.7.25.tar.gz -5fdf101259e5164dea1c8c86214fde38 download/patch.4.7.25.1 -bd410a11c71fee52fddb6aa2d8d4f80c download/patch.4.7.25.2 -6fcd69f64f5b34bfe8f0a63cc2e402c1 download/patch.4.7.25.3 -42c5d1a727e4a7f59b9dce12ff2f6b84 download/patch.4.7.25.4 +147afdecf438ff99ade105a5272db158 download/db-4.8.24.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 Sep 30 16:55:24 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 30 Sep 2009 14:55:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[6624] csw/mgar/pkg/bdb47/trunk/Makefile Message-ID: Revision: 6624 http://gar.svn.sourceforge.net/gar/?rev=6624&view=rev Author: dmichelsen Date: 2009-09-30 14:55:23 +0000 (Wed, 30 Sep 2009) Log Message: ----------- bdb47: Rename packages to default name Modified Paths: -------------- csw/mgar/pkg/bdb47/trunk/Makefile Modified: csw/mgar/pkg/bdb47/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb47/trunk/Makefile 2009-09-30 14:52:46 UTC (rev 6623) +++ csw/mgar/pkg/bdb47/trunk/Makefile 2009-09-30 14:55:23 UTC (rev 6624) @@ -47,33 +47,33 @@ NO_ISAEXEC = 1 -PACKAGES = CSWbdb CSWbdbdevel CSWbdbdoc +PACKAGES = CSWbdb47 CSWbdb47devel CSWbdb47doc -CATALOGNAME_CSWbdb = berkeleydb -CATALOGNAME_CSWbdbdevel = berkeleydb_devel -CATALOGNAME_CSWbdbdoc = berkeleydb_doc +CATALOGNAME_CSWbdb47 = berkeleydb47 +CATALOGNAME_CSWbdb47devel = berkeleydb47_devel +CATALOGNAME_CSWbdb47doc = berkeleydb47_doc # Remove the license from share/doc/berkeleydb/license/.* # because GAR expects license to be a file instead of a directory EXTRA_MERGE_EXCLUDE_FILES = .*/license.* -EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb),' +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb47),' EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* ARCHALL_CSWbdbdoc = 1 -SPKG_DESC_CSWbdb = BerkeleyDB 4.7 embedded database libraries and utilities -SPKG_DESC_CSWbdbdevel = BerkeleyDB 4.7 development support -SPKG_DESC_CSWbdbdoc = BerkeleyDB 4.7 documentation +SPKG_DESC_CSWbdb47 = BerkeleyDB 4.7 embedded database libraries and utilities +SPKG_DESC_CSWbdb47devel = BerkeleyDB 4.7 development support +SPKG_DESC_CSWbdb47doc = BerkeleyDB 4.7 documentation -REQUIRED_PKGS_CSWbdbdevel = CSWbdb +REQUIRED_PKGS_CSWbdb47devel = CSWbdb47 LICENSE = LICENSE -PKGFILES_CSWbdbdoc = $(PKGFILES_DOC) +PKGFILES_CSWbdb47doc = $(PKGFILES_DOC) -PKGFILES_CSWbdbdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWbdb47devel = $(PKGFILES_DEVEL) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Sep 30 17:07:49 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 30 Sep 2009 15:07:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[6625] csw/mgar/pkg/bdb47/trunk/Makefile Message-ID: Revision: 6625 http://gar.svn.sourceforge.net/gar/?rev=6625&view=rev Author: dmichelsen Date: 2009-09-30 15:07:42 +0000 (Wed, 30 Sep 2009) Log Message: ----------- bdb47: Adjust doc location Modified Paths: -------------- csw/mgar/pkg/bdb47/trunk/Makefile Modified: csw/mgar/pkg/bdb47/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb47/trunk/Makefile 2009-09-30 14:55:23 UTC (rev 6624) +++ csw/mgar/pkg/bdb47/trunk/Makefile 2009-09-30 15:07:42 UTC (rev 6625) @@ -71,7 +71,7 @@ LICENSE = LICENSE -PKGFILES_CSWbdb47doc = $(PKGFILES_DOC) +PKGFILES_CSWbdb47doc = /opt/csw/share/doc/.* PKGFILES_CSWbdb47devel = $(PKGFILES_DEVEL) 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 Sep 30 17:27:12 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 30 Sep 2009 15:27:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[6626] csw/mgar/pkg/bdb48/trunk Message-ID: Revision: 6626 http://gar.svn.sourceforge.net/gar/?rev=6626&view=rev Author: dmichelsen Date: 2009-09-30 15:27:03 +0000 (Wed, 30 Sep 2009) Log Message: ----------- bdb48: Adjust package names Modified Paths: -------------- csw/mgar/pkg/bdb48/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/bdb48/trunk/files/patch.4.7.25.1 csw/mgar/pkg/bdb48/trunk/files/patch.4.7.25.2 csw/mgar/pkg/bdb48/trunk/files/patch.4.7.25.3 csw/mgar/pkg/bdb48/trunk/files/patch.4.7.25.4 Modified: csw/mgar/pkg/bdb48/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb48/trunk/Makefile 2009-09-30 15:07:42 UTC (rev 6625) +++ csw/mgar/pkg/bdb48/trunk/Makefile 2009-09-30 15:27:03 UTC (rev 6626) @@ -48,33 +48,33 @@ NO_ISAEXEC = 1 -PACKAGES = CSWbdb CSWbdbdevel CSWbdbdoc +PACKAGES = CSWbdb48 CSWbdb48devel CSWbdb48doc -CATALOGNAME_CSWbdb = berkeleydb -CATALOGNAME_CSWbdbdevel = berkeleydb_devel -CATALOGNAME_CSWbdbdoc = berkeleydb_doc +CATALOGNAME_CSWbdb48 = berkeleydb48 +CATALOGNAME_CSWbdb48devel = berkeleydb48_devel +CATALOGNAME_CSWbdb48doc = berkeleydb48_doc # Remove the license from share/doc/berkeleydb/license/.* # because GAR expects license to be a file instead of a directory EXTRA_MERGE_EXCLUDE_FILES = .*/license.* -EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb),' +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb48),' EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* -ARCHALL_CSWbdbdoc = 1 +ARCHALL_CSWbdb48doc = 1 -SPKG_DESC_CSWbdb = BerkeleyDB 4.8 embedded database libraries and utilities -SPKG_DESC_CSWbdbdevel = BerkeleyDB 4.8 development support -SPKG_DESC_CSWbdbdoc = BerkeleyDB 4.8 documentation +SPKG_DESC_CSWbdb48 = BerkeleyDB 4.8 embedded database libraries and utilities +SPKG_DESC_CSWbdb48devel = BerkeleyDB 4.8 development support +SPKG_DESC_CSWbdb48doc = BerkeleyDB 4.8 documentation -REQUIRED_PKGS_CSWbdbdevel = CSWbdb +REQUIRED_PKGS_CSWbdb48devel = CSWbdb48 LICENSE = LICENSE -PKGFILES_CSWbdbdoc = $(PKGFILES_DOC) +PKGFILES_CSWbdb48doc = /opt/csw/share/doc/.* -PKGFILES_CSWbdbdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWbdb48devel = $(PKGFILES_DEVEL) include gar/category.mk Deleted: csw/mgar/pkg/bdb48/trunk/files/patch.4.7.25.1 =================================================================== --- csw/mgar/pkg/bdb48/trunk/files/patch.4.7.25.1 2009-09-30 15:07:42 UTC (rev 6625) +++ csw/mgar/pkg/bdb48/trunk/files/patch.4.7.25.1 2009-09-30 15:27:03 UTC (rev 6626) @@ -1,75 +0,0 @@ -*** sequence/sequence.c.orig 2008-05-05 13:25:09.000000000 -0700 ---- sequence/sequence.c 2008-08-15 09:58:46.000000000 -0700 -*************** -*** 187,193 **** - if ((ret = __db_get_flags(dbp, &tflags)) != 0) - goto err; - -! if (DB_IS_READONLY(dbp)) { - ret = __db_rdonly(dbp->env, "DB_SEQUENCE->open"); - goto err; - } ---- 187,197 ---- - if ((ret = __db_get_flags(dbp, &tflags)) != 0) - goto err; - -! /* -! * We can let replication clients open sequences, but must -! * check later that they do not update them. -! */ -! if (F_ISSET(dbp, DB_AM_RDONLY)) { - ret = __db_rdonly(dbp->env, "DB_SEQUENCE->open"); - goto err; - } -*************** -*** 244,249 **** ---- 248,258 ---- - if ((ret != DB_NOTFOUND && ret != DB_KEYEMPTY) || - !LF_ISSET(DB_CREATE)) - goto err; -+ if (IS_REP_CLIENT(env) && -+ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { -+ ret = __db_rdonly(env, "DB_SEQUENCE->open"); -+ goto err; -+ } - ret = 0; - - rp = &seq->seq_record; -*************** -*** 296,302 **** - */ - rp = seq->seq_data.data; - if (rp->seq_version == DB_SEQUENCE_OLDVER) { -! oldver: rp->seq_version = DB_SEQUENCE_VERSION; - if (!F_ISSET(env, ENV_LITTLEENDIAN)) { - if (IS_DB_AUTO_COMMIT(dbp, txn)) { - if ((ret = ---- 305,316 ---- - */ - rp = seq->seq_data.data; - if (rp->seq_version == DB_SEQUENCE_OLDVER) { -! oldver: if (IS_REP_CLIENT(env) && -! !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { -! ret = __db_rdonly(env, "DB_SEQUENCE->open"); -! goto err; -! } -! rp->seq_version = DB_SEQUENCE_VERSION; - if (!F_ISSET(env, ENV_LITTLEENDIAN)) { - if (IS_DB_AUTO_COMMIT(dbp, txn)) { - if ((ret = -*************** -*** 707,712 **** ---- 721,733 ---- - - MUTEX_LOCK(env, seq->mtx_seq); - -+ if (handle_check && IS_REP_CLIENT(env) && -+ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { -+ ret = __db_rdonly(env, "DB_SEQUENCE->get"); -+ goto err; -+ } -+ -+ - if (rp->seq_min + delta > rp->seq_max) { - __db_errx(env, "Sequence overflow"); - ret = EINVAL; Deleted: csw/mgar/pkg/bdb48/trunk/files/patch.4.7.25.2 =================================================================== --- csw/mgar/pkg/bdb48/trunk/files/patch.4.7.25.2 2009-09-30 15:07:42 UTC (rev 6625) +++ csw/mgar/pkg/bdb48/trunk/files/patch.4.7.25.2 2009-09-30 15:27:03 UTC (rev 6626) @@ -1,71 +0,0 @@ -Index: lock/lock.c -=================================================================== -RCS file: /a/CVSROOT/db/lock/lock.c,v -retrieving revision 12.61 -diff -c -r12.61 lock.c -*** lock/lock.c 22 Jul 2008 12:08:53 -0000 12.61 ---- lock/lock.c 19 Aug 2008 17:28:24 -0000 -*************** -*** 1278,1287 **** - SH_TAILQ_REMOVE( - <->obj_tab[obj_ndx], sh_obj, links, __db_lockobj); - if (sh_obj->lockobj.size > sizeof(sh_obj->objdata)) { -! LOCK_REGION_LOCK(env); - __env_alloc_free(<->reginfo, - SH_DBT_PTR(&sh_obj->lockobj)); -! LOCK_REGION_UNLOCK(env); - } - SH_TAILQ_INSERT_HEAD( - &FREE_OBJS(lt, part_id), sh_obj, links, __db_lockobj); ---- 1278,1289 ---- - SH_TAILQ_REMOVE( - <->obj_tab[obj_ndx], sh_obj, links, __db_lockobj); - if (sh_obj->lockobj.size > sizeof(sh_obj->objdata)) { -! if (region->part_t_size != 1) -! LOCK_REGION_LOCK(env); - __env_alloc_free(<->reginfo, - SH_DBT_PTR(&sh_obj->lockobj)); -! if (region->part_t_size != 1) -! LOCK_REGION_UNLOCK(env); - } - SH_TAILQ_INSERT_HEAD( - &FREE_OBJS(lt, part_id), sh_obj, links, __db_lockobj); -*************** -*** 1470,1484 **** - if (obj->size <= sizeof(sh_obj->objdata)) - p = sh_obj->objdata; - else { -! LOCK_REGION_LOCK(env); - if ((ret = - __env_alloc(<->reginfo, obj->size, &p)) != 0) { - __db_errx(env, - "No space for lock object storage"); -! LOCK_REGION_UNLOCK(env); - goto err; - } -! LOCK_REGION_UNLOCK(env); - } - - memcpy(p, obj->data, obj->size); ---- 1472,1492 ---- - if (obj->size <= sizeof(sh_obj->objdata)) - p = sh_obj->objdata; - else { -! /* -! * If we have only one partition, the region is locked. -! */ -! if (region->part_t_size != 1) -! LOCK_REGION_LOCK(env); - if ((ret = - __env_alloc(<->reginfo, obj->size, &p)) != 0) { - __db_errx(env, - "No space for lock object storage"); -! if (region->part_t_size != 1) -! LOCK_REGION_UNLOCK(env); - goto err; - } -! if (region->part_t_size != 1) -! LOCK_REGION_UNLOCK(env); - } - - memcpy(p, obj->data, obj->size); Deleted: csw/mgar/pkg/bdb48/trunk/files/patch.4.7.25.3 =================================================================== --- csw/mgar/pkg/bdb48/trunk/files/patch.4.7.25.3 2009-09-30 15:07:42 UTC (rev 6625) +++ csw/mgar/pkg/bdb48/trunk/files/patch.4.7.25.3 2009-09-30 15:27:03 UTC (rev 6626) @@ -1,314 +0,0 @@ -*** lock/lock_deadlock.c 2008-03-11 00:31:33.000000000 +1100 ---- lock/lock_deadlock.c 2008-12-16 21:54:18.000000000 +1100 -*************** -*** 121,127 **** - DB_LOCKTAB *lt; - db_timespec now; - locker_info *idmap; -! u_int32_t *bitmap, *copymap, **deadp, **free_me, *tmpmap; - u_int32_t i, cid, keeper, killid, limit, nalloc, nlockers; - u_int32_t lock_max, txn_max; - int ret, status; ---- 121,127 ---- - DB_LOCKTAB *lt; - db_timespec now; - locker_info *idmap; -! u_int32_t *bitmap, *copymap, **deadp, **deadlist, *tmpmap; - u_int32_t i, cid, keeper, killid, limit, nalloc, nlockers; - u_int32_t lock_max, txn_max; - int ret, status; -*************** -*** 133,139 **** - if (IS_REP_CLIENT(env)) - atype = DB_LOCK_MINWRITE; - -! free_me = NULL; - - lt = env->lk_handle; - if (rejectp != NULL) ---- 133,140 ---- - if (IS_REP_CLIENT(env)) - atype = DB_LOCK_MINWRITE; - -! copymap = tmpmap = NULL; -! deadlist = NULL; - - lt = env->lk_handle; - if (rejectp != NULL) -*************** -*** 179,189 **** - memcpy(copymap, bitmap, nlockers * sizeof(u_int32_t) * nalloc); - - if ((ret = __os_calloc(env, sizeof(u_int32_t), nalloc, &tmpmap)) != 0) -! goto err1; - - /* Find a deadlock. */ - if ((ret = -! __dd_find(env, bitmap, idmap, nlockers, nalloc, &deadp)) != 0) - return (ret); - - /* ---- 180,190 ---- - memcpy(copymap, bitmap, nlockers * sizeof(u_int32_t) * nalloc); - - if ((ret = __os_calloc(env, sizeof(u_int32_t), nalloc, &tmpmap)) != 0) -! goto err; - - /* Find a deadlock. */ - if ((ret = -! __dd_find(env, bitmap, idmap, nlockers, nalloc, &deadlist)) != 0) - return (ret); - - /* -*************** -*** 204,211 **** - txn_max = TXN_MAXIMUM; - - killid = BAD_KILLID; -! free_me = deadp; -! for (; *deadp != NULL; deadp++) { - if (rejectp != NULL) - ++*rejectp; - killid = (u_int32_t)(*deadp - bitmap) / nalloc; ---- 205,211 ---- - txn_max = TXN_MAXIMUM; - - killid = BAD_KILLID; -! for (deadp = deadlist; *deadp != NULL; deadp++) { - if (rejectp != NULL) - ++*rejectp; - killid = (u_int32_t)(*deadp - bitmap) / nalloc; -*************** -*** 342,352 **** - __db_msg(env, - "Aborting locker %lx", (u_long)idmap[killid].id); - } -! __os_free(env, tmpmap); -! err1: __os_free(env, copymap); -! -! err: if (free_me != NULL) -! __os_free(env, free_me); - __os_free(env, bitmap); - __os_free(env, idmap); - ---- 342,353 ---- - __db_msg(env, - "Aborting locker %lx", (u_long)idmap[killid].id); - } -! err: if(copymap != NULL) -! __os_free(env, copymap); -! if (deadlist != NULL) -! __os_free(env, deadlist); -! if(tmpmap != NULL) -! __os_free(env, tmpmap); - __os_free(env, bitmap); - __os_free(env, idmap); - -*************** -*** 360,365 **** ---- 361,377 ---- - - #define DD_INVALID_ID ((u_int32_t) -1) - -+ /* -+ * __dd_build -- -+ * Build the lock dependency bit maps. -+ * Notes on syncronization: -+ * LOCK_SYSTEM_LOCK is used to hold objects locked when we have -+ * a single partition. -+ * LOCK_LOCKERS is held while we are walking the lockers list and -+ * to single thread the use of lockerp->dd_id. -+ * LOCK_DD protects the DD list of objects. -+ */ -+ - static int - __dd_build(env, atype, bmp, nlockers, allocp, idmap, rejectp) - ENV *env; -*************** -*** 393,398 **** ---- 405,411 ---- - * In particular we do not build the conflict array and our caller - * needs to expect this. - */ -+ LOCK_SYSTEM_LOCK(lt, region); - if (atype == DB_LOCK_EXPIRE) { - skip: LOCK_DD(env, region); - op = SH_TAILQ_FIRST(®ion->dd_objs, __db_lockobj); -*************** -*** 430,446 **** - OBJECT_UNLOCK(lt, region, indx); - } - UNLOCK_DD(env, region); - goto done; - } - - /* -! * We'll check how many lockers there are, add a few more in for -! * good measure and then allocate all the structures. Then we'll -! * verify that we have enough room when we go back in and get the -! * mutex the second time. - */ -! retry: count = region->stat.st_nlockers; - if (count == 0) { - *nlockers = 0; - return (0); - } ---- 443,460 ---- - OBJECT_UNLOCK(lt, region, indx); - } - UNLOCK_DD(env, region); -+ LOCK_SYSTEM_UNLOCK(lt, region); - goto done; - } - - /* -! * Allocate after locking the region -! * to make sure the structures are large enough. - */ -! LOCK_LOCKERS(env, region); -! count = region->stat.st_nlockers; - if (count == 0) { -+ UNLOCK_LOCKERS(env, region); - *nlockers = 0; - return (0); - } -*************** -*** 448,497 **** - if (FLD_ISSET(env->dbenv->verbose, DB_VERB_DEADLOCK)) - __db_msg(env, "%lu lockers", (u_long)count); - -- count += 20; - nentries = (u_int32_t)DB_ALIGN(count, 32) / 32; - -! /* -! * Allocate enough space for a count by count bitmap matrix. -! * -! * XXX -! * We can probably save the malloc's between iterations just -! * reallocing if necessary because count grew by too much. -! */ - if ((ret = __os_calloc(env, (size_t)count, -! sizeof(u_int32_t) * nentries, &bitmap)) != 0) - return (ret); - - if ((ret = __os_calloc(env, - sizeof(u_int32_t), nentries, &tmpmap)) != 0) { - __os_free(env, bitmap); - return (ret); - } - - if ((ret = __os_calloc(env, - (size_t)count, sizeof(locker_info), &id_array)) != 0) { - __os_free(env, bitmap); - __os_free(env, tmpmap); - return (ret); - } - - /* -- * Now go back in and actually fill in the matrix. -- */ -- if (region->stat.st_nlockers > count) { -- __os_free(env, bitmap); -- __os_free(env, tmpmap); -- __os_free(env, id_array); -- goto retry; -- } -- -- /* - * First we go through and assign each locker a deadlock detector id. - */ - id = 0; -- LOCK_LOCKERS(env, region); - SH_TAILQ_FOREACH(lip, ®ion->lockers, ulinks, __db_locker) { - if (lip->master_locker == INVALID_ROFF) { - lip->dd_id = id++; - id_array[lip->dd_id].id = lip->id; - switch (atype) { ---- 462,498 ---- - if (FLD_ISSET(env->dbenv->verbose, DB_VERB_DEADLOCK)) - __db_msg(env, "%lu lockers", (u_long)count); - - nentries = (u_int32_t)DB_ALIGN(count, 32) / 32; - -! /* Allocate enough space for a count by count bitmap matrix. */ - if ((ret = __os_calloc(env, (size_t)count, -! sizeof(u_int32_t) * nentries, &bitmap)) != 0) { -! UNLOCK_LOCKERS(env, region); - return (ret); -+ } - - if ((ret = __os_calloc(env, - sizeof(u_int32_t), nentries, &tmpmap)) != 0) { -+ UNLOCK_LOCKERS(env, region); - __os_free(env, bitmap); - return (ret); - } - - if ((ret = __os_calloc(env, - (size_t)count, sizeof(locker_info), &id_array)) != 0) { -+ UNLOCK_LOCKERS(env, region); - __os_free(env, bitmap); - __os_free(env, tmpmap); - return (ret); - } - - /* - * First we go through and assign each locker a deadlock detector id. - */ - id = 0; - SH_TAILQ_FOREACH(lip, ®ion->lockers, ulinks, __db_locker) { - if (lip->master_locker == INVALID_ROFF) { -+ DB_ASSERT(env, id < count); - lip->dd_id = id++; - id_array[lip->dd_id].id = lip->id; - switch (atype) { -*************** -*** 510,516 **** - lip->dd_id = DD_INVALID_ID; - - } -- UNLOCK_LOCKERS(env, region); - - /* - * We only need consider objects that have waiters, so we use ---- 511,516 ---- -*************** -*** 669,675 **** - * status after building the bit maps so that we will not detect - * a blocked transaction without noting that it is already aborting. - */ -- LOCK_LOCKERS(env, region); - for (id = 0; id < count; id++) { - if (!id_array[id].valid) - continue; ---- 669,674 ---- -*************** -*** 738,743 **** ---- 737,743 ---- - id_array[id].in_abort = 1; - } - UNLOCK_LOCKERS(env, region); -+ LOCK_SYSTEM_UNLOCK(lt, region); - - /* - * Now we can release everything except the bitmap matrix that we -*************** -*** 839,844 **** ---- 839,845 ---- - ret = 0; - - /* We must lock so this locker cannot go away while we abort it. */ -+ LOCK_SYSTEM_LOCK(lt, region); - LOCK_LOCKERS(env, region); - - /* -*************** -*** 895,900 **** ---- 896,902 ---- - done: OBJECT_UNLOCK(lt, region, info->last_ndx); - err: - out: UNLOCK_LOCKERS(env, region); -+ LOCK_SYSTEM_UNLOCK(lt, region); - return (ret); - } - Deleted: csw/mgar/pkg/bdb48/trunk/files/patch.4.7.25.4 =================================================================== --- csw/mgar/pkg/bdb48/trunk/files/patch.4.7.25.4 2009-09-30 15:07:42 UTC (rev 6625) +++ csw/mgar/pkg/bdb48/trunk/files/patch.4.7.25.4 2009-09-30 15:27:03 UTC (rev 6626) @@ -1,183 +0,0 @@ -*** dbinc/repmgr.h.orig 2009-05-04 10:33:55.000000000 -0400 ---- dbinc/repmgr.h 2009-05-04 10:27:26.000000000 -0400 -*************** -*** 374,379 **** ---- 374,380 ---- - #define SITE_FROM_EID(eid) (&db_rep->sites[eid]) - #define EID_FROM_SITE(s) ((int)((s) - (&db_rep->sites[0]))) - #define IS_VALID_EID(e) ((e) >= 0) -+ #define IS_KNOWN_REMOTE_SITE(e) ((e) >= 0 && ((u_int)(e)) < db_rep->site_cnt) - #define SELF_EID INT_MAX - - #define IS_PEER_POLICY(p) ((p) == DB_REPMGR_ACKS_ALL_PEERS || \ -*** rep/rep_elect.c.orig 2009-05-04 10:35:50.000000000 -0400 ---- rep/rep_elect.c 2009-05-04 10:31:24.000000000 -0400 -*************** -*** 33,39 **** - static int __rep_fire_elected __P((ENV *, REP *, u_int32_t)); - static void __rep_elect_master __P((ENV *, REP *)); - static int __rep_tally __P((ENV *, REP *, int, u_int32_t *, u_int32_t, roff_t)); -! static int __rep_wait __P((ENV *, db_timeout_t *, int *, int, u_int32_t)); - - /* - * __rep_elect -- ---- 33,39 ---- - static int __rep_fire_elected __P((ENV *, REP *, u_int32_t)); - static void __rep_elect_master __P((ENV *, REP *)); - static int __rep_tally __P((ENV *, REP *, int, u_int32_t *, u_int32_t, roff_t)); -! static int __rep_wait __P((ENV *, db_timeout_t *, int, u_int32_t)); - - /* - * __rep_elect -- -*************** -*** 55,61 **** - ENV *env; - LOG *lp; - REP *rep; -! int done, eid, elected, full_elect, locked, in_progress, need_req; - int ret, send_vote, t_ret; - u_int32_t ack, ctlflags, egen, nsites, orig_tally, priority, realpri; - u_int32_t tiebreaker; ---- 55,61 ---- - ENV *env; - LOG *lp; - REP *rep; -! int done, elected, full_elect, locked, in_progress, need_req; - int ret, send_vote, t_ret; - u_int32_t ack, ctlflags, egen, nsites, orig_tally, priority, realpri; - u_int32_t tiebreaker; -*************** -*** 181,188 **** - REP_SYSTEM_UNLOCK(env); - (void)__rep_send_message(env, DB_EID_BROADCAST, - REP_MASTER_REQ, NULL, NULL, 0, 0); -! ret = __rep_wait(env, &to, &eid, -! 0, REP_F_EPHASE0); - REP_SYSTEM_LOCK(env); - F_CLR(rep, REP_F_EPHASE0); - switch (ret) { ---- 181,187 ---- - REP_SYSTEM_UNLOCK(env); - (void)__rep_send_message(env, DB_EID_BROADCAST, - REP_MASTER_REQ, NULL, NULL, 0, 0); -! ret = __rep_wait(env, &to, 0, REP_F_EPHASE0); - REP_SYSTEM_LOCK(env); - F_CLR(rep, REP_F_EPHASE0); - switch (ret) { -*************** -*** 286,296 **** - REP_SYSTEM_LOCK(env); - goto vote; - } -! ret = __rep_wait(env, &to, &eid, full_elect, REP_F_EPHASE1); - switch (ret) { - case 0: - /* Check if election complete or phase complete. */ -! if (eid != DB_EID_INVALID && !IN_ELECTION(rep)) { - RPRINT(env, DB_VERB_REP_ELECT, - (env, "Ended election phase 1")); - goto edone; ---- 285,295 ---- - REP_SYSTEM_LOCK(env); - goto vote; - } -! ret = __rep_wait(env, &to, full_elect, REP_F_EPHASE1); - switch (ret) { - case 0: - /* Check if election complete or phase complete. */ -! if (!IN_ELECTION(rep)) { - RPRINT(env, DB_VERB_REP_ELECT, - (env, "Ended election phase 1")); - goto edone; -*************** -*** 398,412 **** - REP_SYSTEM_LOCK(env); - goto i_won; - } -! ret = __rep_wait(env, &to, &eid, full_elect, REP_F_EPHASE2); - RPRINT(env, DB_VERB_REP_ELECT, - (env, "Ended election phase 2 %d", ret)); - switch (ret) { - case 0: -! if (eid != DB_EID_INVALID) -! goto edone; -! ret = DB_REP_UNAVAIL; -! break; - case DB_REP_EGENCHG: - if (to > timeout) - to = timeout; ---- 397,408 ---- - REP_SYSTEM_LOCK(env); - goto i_won; - } -! ret = __rep_wait(env, &to, full_elect, REP_F_EPHASE2); - RPRINT(env, DB_VERB_REP_ELECT, - (env, "Ended election phase 2 %d", ret)); - switch (ret) { - case 0: -! goto edone; - case DB_REP_EGENCHG: - if (to > timeout) - to = timeout; -*************** -*** 1050,1062 **** - ENV *env; - REP *rep; - { -- /* -- * We often come through here twice, sometimes even more. We mustn't -- * let the redundant calls affect stats counting. But rep_elect relies -- * on this first part for setting eidp. -- */ -- rep->master_id = rep->eid; -- - if (F_ISSET(rep, REP_F_MASTERELECT | REP_F_MASTER)) { - /* We've been through here already; avoid double counting. */ - return; ---- 1046,1051 ---- -*************** -*** 1093,1102 **** - (timeout > 5000000) ? 500000 : ((timeout >= 10) ? timeout / 10 : 1); - - static int -! __rep_wait(env, timeoutp, eidp, full_elect, flags) - ENV *env; - db_timeout_t *timeoutp; -! int *eidp, full_elect; - u_int32_t flags; - { - DB_REP *db_rep; ---- 1082,1091 ---- - (timeout > 5000000) ? 500000 : ((timeout >= 10) ? timeout / 10 : 1); - - static int -! __rep_wait(env, timeoutp, full_elect, flags) - ENV *env; - db_timeout_t *timeoutp; -! int full_elect; - u_int32_t flags; - { - DB_REP *db_rep; -*************** -*** 1174,1180 **** - F_CLR(rep, REP_F_EGENUPDATE); - ret = DB_REP_EGENCHG; - } else if (phase_over) { -- *eidp = rep->master_id; - done = 1; - ret = 0; - } ---- 1163,1168 ---- -*** repmgr/repmgr_net.c.orig 2009-05-04 10:34:46.000000000 -0400 ---- repmgr/repmgr_net.c 2009-05-04 10:27:26.000000000 -0400 -*************** -*** 100,105 **** ---- 100,107 ---- - control, rec, &nsites_sent, &npeers_sent)) != 0) - goto out; - } else { -+ DB_ASSERT(env, IS_KNOWN_REMOTE_SITE(eid)); -+ - /* - * If this is a request that can be sent anywhere, then see if - * we can send it to our peer (to save load on the master), but This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Wed Sep 30 17:41:26 2009 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Wed, 30 Sep 2009 15:41:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[6627] csw/mgar/pkg/vim/trunk Message-ID: Revision: 6627 http://gar.svn.sourceforge.net/gar/?rev=6627&view=rev Author: harpchad Date: 2009-09-30 15:41:26 +0000 (Wed, 30 Sep 2009) Log Message: ----------- Update patch level to 266 Modified Paths: -------------- csw/mgar/pkg/vim/trunk/Makefile csw/mgar/pkg/vim/trunk/checksums Modified: csw/mgar/pkg/vim/trunk/Makefile =================================================================== --- csw/mgar/pkg/vim/trunk/Makefile 2009-09-30 15:27:03 UTC (rev 6626) +++ csw/mgar/pkg/vim/trunk/Makefile 2009-09-30 15:41:26 UTC (rev 6627) @@ -1,6 +1,6 @@ GARNAME = vim DISTVERSION = 7.2 -PATCHREV = 148 +PATCHREV = 266 GARVERSION = $(DISTVERSION).$(PATCHREV) CATEGORIES = utils SPKG_SOURCEURL = http://www.vim.org/download.php Modified: csw/mgar/pkg/vim/trunk/checksums =================================================================== --- csw/mgar/pkg/vim/trunk/checksums 2009-09-30 15:27:03 UTC (rev 6626) +++ csw/mgar/pkg/vim/trunk/checksums 2009-09-30 15:41:26 UTC (rev 6627) @@ -1,10 +1,3 @@ -f0901284b338e448bfd79ccca0041254 download/vim-7.2.tar.bz2 -d8884786979e0e520c112faf2e176f05 download/vim-7.2-lang.tar.gz -35e04482f07c57221c9a751aaa3b8dac download/vim-7.2-extra.tar.gz -f31314c40819d3414d77ea286770c17f download/vimrc -1965bc951c0a190faaa665996b1b287e download/vimrc.tiny -80304427884b8b78134bc7c7c9097679 download/gvimrc -73612b6658c597ee478abf27a0a89ed5 download/COPYING 7c2dc4a956cf315e546e347bc349968c download/7.2.001 7f16f80814f1e071a689806c2056b39d download/7.2.002 0de916fdfd450a4a0d95bed44ae2c398 download/7.2.003 @@ -153,4 +146,129 @@ cb97aca73a1f4fdd2fac894bba7e43ae download/7.2.146 4219afedebf0172118f2d078d9012995 download/7.2.147 49ca89a47315f512c7ee06f5b2617a90 download/7.2.148 +9197a669e4ee024c1a9218e861e21c7e download/7.2.149 +cbdf7ce960ad4646a8884e51bc7e037e download/7.2.150 +56b24ce6e78e71c64d05fda51748b01c download/7.2.151 +7c088583f063cd09d26f7291d9f5817b download/7.2.152 +e966483b6755f4e7b2cd92708a8ff656 download/7.2.153 +27bcb5f1d5932ee7eaae40ba0a4eb968 download/7.2.154 +611ab5b97cd9d87a1be0a84e3006b17a download/7.2.155 +27fb40dbdb85052a598be88f205484c6 download/7.2.156 +93a85a3606193b8875f0eba05dba3be3 download/7.2.157 +808ba7888bdfdf559366dfdf1446dab5 download/7.2.158 +08bd6d6db2e029beab84b32bf36494e0 download/7.2.159 +c07df493053267849115b579928a4dae download/7.2.160 +e44297c9ed5928e55ca43b4e2b3509ce download/7.2.161 +0d4768bd2395f3ebf3ebd7fa4979288c download/7.2.162 +032f90bcee8f36ad7b77a17bb76719f0 download/7.2.163 +21341ed82eb080e590d15dd6368e8d78 download/7.2.164 +51de241d7d03200a7b3490f40256c633 download/7.2.165 +9c645166c92865d644fd232760b56494 download/7.2.166 +a29266c1573ff106366ebdbd460b17ce download/7.2.167 +09105d79266562b6afe0179c07149738 download/7.2.168 +36d18f0e42f0c24722116cb823b52c8a download/7.2.169 +a00979f910f29d5062faf15e8670735b download/7.2.170 +439a415dab8a77790c7da1526da083f9 download/7.2.171 +3defcc24541cd3d62fda6cfb4af6ba4b download/7.2.172 +5f16d8af9b11f44c8e104abc942152c2 download/7.2.173 +4949fe9f14ac4f7b2717ddb05968285c download/7.2.174 +7462cd9ba69a7eb674aa8e5653fdad63 download/7.2.175 +4b5c77673b5d62f1a94e4d605e92d81e download/7.2.176 +cde1647ab09a432c134d6fbae5ca15dc download/7.2.177 +5a126dd404945088b61aaf9d8c2effaa download/7.2.178 +a15fe587377fac500d0fae2b1c3adbbf download/7.2.179 +d4db5a69da98dbda41429d66e339e515 download/7.2.180 +8b9dee3c4aeeb563cbff6f3cf0357675 download/7.2.181 +d5d50f1da385bee588348aaaa5bb2dd7 download/7.2.182 +77e46725488937910d1cf051760ad11d download/7.2.183 +3bdbab52e0ac635962ce9983ef1d9f01 download/7.2.184 +fa88ae980d6e68f9aa9f9b257f1f3e71 download/7.2.185 +2262a6034d4cf01859a1d36982f38505 download/7.2.186 +c98b89c2594d7127574d0bd9838f241a download/7.2.187 +8efff5f82388c43183739c280249b643 download/7.2.188 +bab560f5a4b1809c2859ab632f037135 download/7.2.189 +63098e6cdb253d83c30f42d3d4469900 download/7.2.190 +87a02a6db9029357d7e248bcf4923330 download/7.2.191 +88102a28fb2139fe14a66b2970958166 download/7.2.192 +66a202b39e36ac062db1432896d8d988 download/7.2.193 +3ba1ab13de695c1422e0cda65c03503d download/7.2.194 +a42b79c5328c30b0951ce67da505a3f4 download/7.2.195 +f1ece679735785c46b58ed4d791b3880 download/7.2.196 +352908f71b12a7a30aafd985c338d247 download/7.2.197 +2a4764a5df5c1d18e4c7fee81074f55c download/7.2.198 +61a30d8c51533f08a94ba23025a12f11 download/7.2.199 +1a21534f09d529a9096c5e9b978187e9 download/7.2.200 +61e01d2aef1d5c1c3b40d5e927bd83c9 download/7.2.201 +30df1365ef27c34558d4322cb71c5d83 download/7.2.202 +24ae52da6519c8f8fbd08676c64eac75 download/7.2.203 +e75f99a06eb7a03a5cf854505b1d795d download/7.2.204 +3e2da4100f83cf2d308545d0c822a196 download/7.2.205 +4895874100f932e15a8c661fb40a19b1 download/7.2.206 +e3345b11c12eedd8871b2eeb811c9234 download/7.2.207 +a7f6deca2df02cc4d23274f3104b94d1 download/7.2.208 +62e83a3e30fe5b6f96ba276a342faf1c download/7.2.209 +296e40f03bf6243583541ca440af802c download/7.2.210 +3714237966fa05c9cae8fd4518a42ac4 download/7.2.211 +3537ef914ffbe5acbdede8d3581ecf41 download/7.2.212 +9f4b0f8a1dc9c3720eca6028c987fa01 download/7.2.213 +fb46e419802a06e26d8531628f50aca9 download/7.2.214 +388c0884878256fca9db1fb1fe9df98e download/7.2.215 +cd568cf0b9b751b9ff1151fa6f5f0ae0 download/7.2.216 +288d5ee4b5ff25caa79446a95cb3ee98 download/7.2.217 +d86a84a239c25dda5101aac8c365154c download/7.2.218 +9c0f11d3c52d1756381231e1c0a6156d download/7.2.219 +bfed5d4e0bcae8eb7a7e0806d4367e0a download/7.2.220 +3b169a3f976cf1808b12230dd24c0ff5 download/7.2.221 +a3f9c7d976ad8a49250d0ff3130b6390 download/7.2.222 +3ca61604214ef919b7bfe4b24eb69518 download/7.2.223 +5c550bd6e2111c10407b7aca009b1242 download/7.2.224 +b3ae8fa424e01a0fc67c9ed7393b422e download/7.2.225 +6057e1247bd3b1538eef15c532caf881 download/7.2.226 +932e2a5394788124cbda950bfff327ff download/7.2.227 +b97e5d33fa4fb8a1ea1308558bb33d41 download/7.2.228 +2107c7d981ca14d8e795ae744a903106 download/7.2.229 +7e98ae111e74676ef88c5e3edce785ed download/7.2.230 +2abbb80186d28da703eb329d4247dd41 download/7.2.231 +5e5cfa4e5ee34cbbdd01c27ece1b7398 download/7.2.232 +9fa12db95776e9174ca7c95172a48838 download/7.2.233 +a46776a6914ec2972ada91b33b0cfb39 download/7.2.234 +4121105bf052ebac02bd9891c232137a download/7.2.235 +e9ca47c42d7de7b27910e3b35e533ecd download/7.2.236 +f48f3e3f58a7a82a1c14fd61072c69f0 download/7.2.237 +5b9cc79b5448fb71ac1b2870a861119d download/7.2.238 +28a8a33a3e2ceef51f838c2dc9fceac2 download/7.2.239 +212989ec4f90d697183c7cfb363cd453 download/7.2.240 +45f0effee324a20881e254c1b59dd5f8 download/7.2.241 +464fc788e592b19cd4d8a21d3d8b789e download/7.2.242 +eb8132b8f89393e7f39734e607fc3925 download/7.2.243 +15c654c51220c2ad94b47d6013626aef download/7.2.244 +d5ecb198dfea237e96b5ae12b9381383 download/7.2.245 +d91e62d4152877db281fdaa797cfe0c3 download/7.2.246 +a4dbbffc8ec2b377e1a1eb8279ff611c download/7.2.247 +9d97db1b426ab2c56a8e4281233c7d5f download/7.2.248 +947568ba23d4560e6292f6f1846120c4 download/7.2.249 +73948226c417143bce66ba6244443aed download/7.2.250 +2e351cf03bbcb927d93bafd8166dd82d download/7.2.251 +11cef6808a278694c61ba2c74f3911b0 download/7.2.252 +ed1731b8c74ee27d129bbc78e178da2f download/7.2.253 +1703bec4ee7a155037d3373d23bc7ca1 download/7.2.254 +57f31a4f4afc9a0ea60829bf9d36b380 download/7.2.255 +19df6e42d09a76e7c219b172204bf66a download/7.2.256 +c4775d1a1c37f288803f5d11d8d94865 download/7.2.257 +a62aae9b8281bd7e1d144c6534a27b68 download/7.2.258 +91d775ed9329eec16882eeca04708dec download/7.2.259 +d6bcf89bb0a04ce25d94f8bc0b3ba747 download/7.2.260 +7313b1644f7184ea116a0e7cccc42124 download/7.2.261 +75b2f61f81ff9af8e7f83d1885e9487f download/7.2.262 +e98be83507f72cff814aa89456fb38ee download/7.2.263 +352951ed477e83d3527c2ff95a7c2484 download/7.2.264 +4b12ddc88794c20ad3dbe238ccf91807 download/7.2.265 +9bfd540da3982b9841421cabc564f958 download/7.2.266 +73612b6658c597ee478abf27a0a89ed5 download/COPYING +80304427884b8b78134bc7c7c9097679 download/gvimrc +35e04482f07c57221c9a751aaa3b8dac download/vim-7.2-extra.tar.gz +d8884786979e0e520c112faf2e176f05 download/vim-7.2-lang.tar.gz +f0901284b338e448bfd79ccca0041254 download/vim-7.2.tar.bz2 +f31314c40819d3414d77ea286770c17f download/vimrc +1965bc951c0a190faaa665996b1b287e download/vimrc.tiny 582717146f6bbd5b73db83a2f62e62a5 download/vimtutor.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Wed Sep 30 17:47:24 2009 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Wed, 30 Sep 2009 15:47:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[6629] csw/mgar/pkg/gvim/trunk Message-ID: Revision: 6629 http://gar.svn.sourceforge.net/gar/?rev=6629&view=rev Author: harpchad Date: 2009-09-30 15:47:24 +0000 (Wed, 30 Sep 2009) Log Message: ----------- Update patch level to 266 Modified Paths: -------------- csw/mgar/pkg/gvim/trunk/Makefile csw/mgar/pkg/gvim/trunk/checksums Modified: csw/mgar/pkg/gvim/trunk/Makefile =================================================================== --- csw/mgar/pkg/gvim/trunk/Makefile 2009-09-30 15:46:02 UTC (rev 6628) +++ csw/mgar/pkg/gvim/trunk/Makefile 2009-09-30 15:47:24 UTC (rev 6629) @@ -1,6 +1,6 @@ GARNAME = vim DISTVERSION = 7.2 -PATCHREV = 148 +PATCHREV = 266 GARVERSION = $(DISTVERSION).$(PATCHREV) CATEGORIES = utils SPKG_SOURCEURL = http://www.vim.org/download.php Modified: csw/mgar/pkg/gvim/trunk/checksums =================================================================== --- csw/mgar/pkg/gvim/trunk/checksums 2009-09-30 15:46:02 UTC (rev 6628) +++ csw/mgar/pkg/gvim/trunk/checksums 2009-09-30 15:47:24 UTC (rev 6629) @@ -151,4 +151,122 @@ cb97aca73a1f4fdd2fac894bba7e43ae download/7.2.146 4219afedebf0172118f2d078d9012995 download/7.2.147 49ca89a47315f512c7ee06f5b2617a90 download/7.2.148 +9197a669e4ee024c1a9218e861e21c7e download/7.2.149 +cbdf7ce960ad4646a8884e51bc7e037e download/7.2.150 +56b24ce6e78e71c64d05fda51748b01c download/7.2.151 +7c088583f063cd09d26f7291d9f5817b download/7.2.152 +e966483b6755f4e7b2cd92708a8ff656 download/7.2.153 +27bcb5f1d5932ee7eaae40ba0a4eb968 download/7.2.154 +611ab5b97cd9d87a1be0a84e3006b17a download/7.2.155 +27fb40dbdb85052a598be88f205484c6 download/7.2.156 +93a85a3606193b8875f0eba05dba3be3 download/7.2.157 +808ba7888bdfdf559366dfdf1446dab5 download/7.2.158 +08bd6d6db2e029beab84b32bf36494e0 download/7.2.159 +c07df493053267849115b579928a4dae download/7.2.160 +e44297c9ed5928e55ca43b4e2b3509ce download/7.2.161 +0d4768bd2395f3ebf3ebd7fa4979288c download/7.2.162 +032f90bcee8f36ad7b77a17bb76719f0 download/7.2.163 +21341ed82eb080e590d15dd6368e8d78 download/7.2.164 +51de241d7d03200a7b3490f40256c633 download/7.2.165 +9c645166c92865d644fd232760b56494 download/7.2.166 +a29266c1573ff106366ebdbd460b17ce download/7.2.167 +09105d79266562b6afe0179c07149738 download/7.2.168 +36d18f0e42f0c24722116cb823b52c8a download/7.2.169 +a00979f910f29d5062faf15e8670735b download/7.2.170 +439a415dab8a77790c7da1526da083f9 download/7.2.171 +3defcc24541cd3d62fda6cfb4af6ba4b download/7.2.172 +5f16d8af9b11f44c8e104abc942152c2 download/7.2.173 +4949fe9f14ac4f7b2717ddb05968285c download/7.2.174 +7462cd9ba69a7eb674aa8e5653fdad63 download/7.2.175 +4b5c77673b5d62f1a94e4d605e92d81e download/7.2.176 +cde1647ab09a432c134d6fbae5ca15dc download/7.2.177 +5a126dd404945088b61aaf9d8c2effaa download/7.2.178 +a15fe587377fac500d0fae2b1c3adbbf download/7.2.179 +d4db5a69da98dbda41429d66e339e515 download/7.2.180 +8b9dee3c4aeeb563cbff6f3cf0357675 download/7.2.181 +d5d50f1da385bee588348aaaa5bb2dd7 download/7.2.182 +77e46725488937910d1cf051760ad11d download/7.2.183 +3bdbab52e0ac635962ce9983ef1d9f01 download/7.2.184 +fa88ae980d6e68f9aa9f9b257f1f3e71 download/7.2.185 +2262a6034d4cf01859a1d36982f38505 download/7.2.186 +c98b89c2594d7127574d0bd9838f241a download/7.2.187 +8efff5f82388c43183739c280249b643 download/7.2.188 +bab560f5a4b1809c2859ab632f037135 download/7.2.189 +63098e6cdb253d83c30f42d3d4469900 download/7.2.190 +87a02a6db9029357d7e248bcf4923330 download/7.2.191 +88102a28fb2139fe14a66b2970958166 download/7.2.192 +66a202b39e36ac062db1432896d8d988 download/7.2.193 +3ba1ab13de695c1422e0cda65c03503d download/7.2.194 +a42b79c5328c30b0951ce67da505a3f4 download/7.2.195 +f1ece679735785c46b58ed4d791b3880 download/7.2.196 +352908f71b12a7a30aafd985c338d247 download/7.2.197 +2a4764a5df5c1d18e4c7fee81074f55c download/7.2.198 +61a30d8c51533f08a94ba23025a12f11 download/7.2.199 +1a21534f09d529a9096c5e9b978187e9 download/7.2.200 +61e01d2aef1d5c1c3b40d5e927bd83c9 download/7.2.201 +30df1365ef27c34558d4322cb71c5d83 download/7.2.202 +24ae52da6519c8f8fbd08676c64eac75 download/7.2.203 +e75f99a06eb7a03a5cf854505b1d795d download/7.2.204 +3e2da4100f83cf2d308545d0c822a196 download/7.2.205 +4895874100f932e15a8c661fb40a19b1 download/7.2.206 +e3345b11c12eedd8871b2eeb811c9234 download/7.2.207 +a7f6deca2df02cc4d23274f3104b94d1 download/7.2.208 +62e83a3e30fe5b6f96ba276a342faf1c download/7.2.209 +296e40f03bf6243583541ca440af802c download/7.2.210 +3714237966fa05c9cae8fd4518a42ac4 download/7.2.211 +3537ef914ffbe5acbdede8d3581ecf41 download/7.2.212 +9f4b0f8a1dc9c3720eca6028c987fa01 download/7.2.213 +fb46e419802a06e26d8531628f50aca9 download/7.2.214 +388c0884878256fca9db1fb1fe9df98e download/7.2.215 +cd568cf0b9b751b9ff1151fa6f5f0ae0 download/7.2.216 +288d5ee4b5ff25caa79446a95cb3ee98 download/7.2.217 +d86a84a239c25dda5101aac8c365154c download/7.2.218 +9c0f11d3c52d1756381231e1c0a6156d download/7.2.219 +bfed5d4e0bcae8eb7a7e0806d4367e0a download/7.2.220 +3b169a3f976cf1808b12230dd24c0ff5 download/7.2.221 +a3f9c7d976ad8a49250d0ff3130b6390 download/7.2.222 +3ca61604214ef919b7bfe4b24eb69518 download/7.2.223 +5c550bd6e2111c10407b7aca009b1242 download/7.2.224 +b3ae8fa424e01a0fc67c9ed7393b422e download/7.2.225 +6057e1247bd3b1538eef15c532caf881 download/7.2.226 +932e2a5394788124cbda950bfff327ff download/7.2.227 +b97e5d33fa4fb8a1ea1308558bb33d41 download/7.2.228 +2107c7d981ca14d8e795ae744a903106 download/7.2.229 +7e98ae111e74676ef88c5e3edce785ed download/7.2.230 +2abbb80186d28da703eb329d4247dd41 download/7.2.231 +5e5cfa4e5ee34cbbdd01c27ece1b7398 download/7.2.232 +9fa12db95776e9174ca7c95172a48838 download/7.2.233 +a46776a6914ec2972ada91b33b0cfb39 download/7.2.234 +4121105bf052ebac02bd9891c232137a download/7.2.235 +e9ca47c42d7de7b27910e3b35e533ecd download/7.2.236 +f48f3e3f58a7a82a1c14fd61072c69f0 download/7.2.237 +5b9cc79b5448fb71ac1b2870a861119d download/7.2.238 +28a8a33a3e2ceef51f838c2dc9fceac2 download/7.2.239 +212989ec4f90d697183c7cfb363cd453 download/7.2.240 +45f0effee324a20881e254c1b59dd5f8 download/7.2.241 +464fc788e592b19cd4d8a21d3d8b789e download/7.2.242 +eb8132b8f89393e7f39734e607fc3925 download/7.2.243 +15c654c51220c2ad94b47d6013626aef download/7.2.244 +d5ecb198dfea237e96b5ae12b9381383 download/7.2.245 +d91e62d4152877db281fdaa797cfe0c3 download/7.2.246 +a4dbbffc8ec2b377e1a1eb8279ff611c download/7.2.247 +9d97db1b426ab2c56a8e4281233c7d5f download/7.2.248 +947568ba23d4560e6292f6f1846120c4 download/7.2.249 +73948226c417143bce66ba6244443aed download/7.2.250 +2e351cf03bbcb927d93bafd8166dd82d download/7.2.251 +11cef6808a278694c61ba2c74f3911b0 download/7.2.252 +ed1731b8c74ee27d129bbc78e178da2f download/7.2.253 +1703bec4ee7a155037d3373d23bc7ca1 download/7.2.254 +57f31a4f4afc9a0ea60829bf9d36b380 download/7.2.255 +19df6e42d09a76e7c219b172204bf66a download/7.2.256 +c4775d1a1c37f288803f5d11d8d94865 download/7.2.257 +a62aae9b8281bd7e1d144c6534a27b68 download/7.2.258 +91d775ed9329eec16882eeca04708dec download/7.2.259 +d6bcf89bb0a04ce25d94f8bc0b3ba747 download/7.2.260 +7313b1644f7184ea116a0e7cccc42124 download/7.2.261 +75b2f61f81ff9af8e7f83d1885e9487f download/7.2.262 +e98be83507f72cff814aa89456fb38ee download/7.2.263 +352951ed477e83d3527c2ff95a7c2484 download/7.2.264 +4b12ddc88794c20ad3dbe238ccf91807 download/7.2.265 +9bfd540da3982b9841421cabc564f958 download/7.2.266 582717146f6bbd5b73db83a2f62e62a5 download/vimtutor.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Sep 30 17:46:42 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 30 Sep 2009 15:46:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[6628] csw/mgar/pkg/bdb47/trunk Message-ID: Revision: 6628 http://gar.svn.sourceforge.net/gar/?rev=6628&view=rev Author: dmichelsen Date: 2009-09-30 15:46:02 +0000 (Wed, 30 Sep 2009) Log Message: ----------- bdb46: Adjust version Modified Paths: -------------- csw/mgar/pkg/bdb47/trunk/Makefile csw/mgar/pkg/bdb47/trunk/checksums Added Paths: ----------- csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.1 csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.2 csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.3 csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.4 Removed Paths: ------------- csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.1 csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.2 csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.3 csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.4 Modified: csw/mgar/pkg/bdb47/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb47/trunk/Makefile 2009-09-30 15:41:26 UTC (rev 6627) +++ csw/mgar/pkg/bdb47/trunk/Makefile 2009-09-30 15:46:02 UTC (rev 6628) @@ -1,8 +1,8 @@ GARNAME = db -GARVERSION = 4.7.25 +GARVERSION = 4.6.21 CATEGORIES = lib -DESCRIPTION = Berkeley DB 4.7 +DESCRIPTION = Berkeley DB 4.6 define BLURB Berkeley DB (libdb) is a programmatic toolkit that provides embedded database support for both traditional and client/server applications. It includes @@ -30,7 +30,7 @@ BUILD64 = 1 CONFIGURE_SCRIPTS = dist -prefix = $(BUILD_PREFIX)/bdb47 +prefix = $(BUILD_PREFIX)/bdb46 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-compat185 CONFIGURE_ARGS += --enable-o_direct Modified: csw/mgar/pkg/bdb47/trunk/checksums =================================================================== --- csw/mgar/pkg/bdb47/trunk/checksums 2009-09-30 15:41:26 UTC (rev 6627) +++ csw/mgar/pkg/bdb47/trunk/checksums 2009-09-30 15:46:02 UTC (rev 6628) @@ -1,5 +1,5 @@ -ec2b87e833779681a0c3a814aa71359e download/db-4.7.25.tar.gz -5fdf101259e5164dea1c8c86214fde38 download/patch.4.7.25.1 -bd410a11c71fee52fddb6aa2d8d4f80c download/patch.4.7.25.2 -6fcd69f64f5b34bfe8f0a63cc2e402c1 download/patch.4.7.25.3 -42c5d1a727e4a7f59b9dce12ff2f6b84 download/patch.4.7.25.4 +718082e7e35fc48478a2334b0bc4cd11 download/db-4.6.21.tar.gz +4878872edfc53c6ecb871b1062a4bdaf download/patch.4.6.21.1 +55074e53d3acae2dcbeae8322f96e522 download/patch.4.6.21.2 +7a6e11b54712caf752f9c4a52babe60c download/patch.4.6.21.3 +ae7d3d587355fe85b512ef09b9a77d19 download/patch.4.6.21.4 Added: csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.1 =================================================================== --- csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.1 (rev 0) +++ csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.1 2009-09-30 15:46:02 UTC (rev 6628) @@ -0,0 +1,90 @@ +*** dbinc/mp.h 2007-09-28 01:28:25.000000000 +1000 +--- dbinc/mp.h 2008-02-14 01:22:09.000000000 +1100 +*************** +*** 639,644 **** +--- 639,647 ---- + */ + #define MP_TRUNC_RECOVER 0x01 + ++ /* Private flags to DB_MPOOLFILE->close. */ ++ #define DB_MPOOL_NOLOCK 0x002 /* Already have mpf locked. */ ++ + #if defined(__cplusplus) + } + #endif +*** mp/mp_fopen.c 2007-05-18 03:18:01.000000000 +1000 +--- mp/mp_fopen.c 2008-02-12 16:09:42.000000000 +1100 +*************** +*** 888,894 **** + * when we try to flush them. + */ + deleted = 0; +! MUTEX_LOCK(dbenv, mfp->mutex); + if (F_ISSET(dbmfp, MP_MULTIVERSION)) + --mfp->multiversion; + if (--mfp->mpf_cnt == 0 || LF_ISSET(DB_MPOOL_DISCARD)) { +--- 888,895 ---- + * when we try to flush them. + */ + deleted = 0; +! if (!LF_ISSET(DB_MPOOL_NOLOCK)) +! MUTEX_LOCK(dbenv, mfp->mutex); + if (F_ISSET(dbmfp, MP_MULTIVERSION)) + --mfp->multiversion; + if (--mfp->mpf_cnt == 0 || LF_ISSET(DB_MPOOL_DISCARD)) { +*************** +*** 909,921 **** + } + } + if (mfp->block_cnt == 0) { + if ((t_ret = + __memp_mf_discard(dbmp, mfp)) != 0 && ret == 0) + ret = t_ret; + deleted = 1; + } + } +! if (!deleted) + MUTEX_UNLOCK(dbenv, mfp->mutex); + + done: /* Discard the DB_MPOOLFILE structure. */ +--- 910,928 ---- + } + } + if (mfp->block_cnt == 0) { ++ /* ++ * We should never discard this mp file if our caller ++ * is holding the lock on it. See comment in ++ * __memp_sync_file. ++ */ ++ DB_ASSERT(dbenv, !LF_ISSET(DB_MPOOL_NOLOCK)); + if ((t_ret = + __memp_mf_discard(dbmp, mfp)) != 0 && ret == 0) + ret = t_ret; + deleted = 1; + } + } +! if (!deleted && !LF_ISSET(DB_MPOOL_NOLOCK)) + MUTEX_UNLOCK(dbenv, mfp->mutex); + + done: /* Discard the DB_MPOOLFILE structure. */ +*** mp/mp_sync.c 2007-06-02 04:32:44.000000000 +1000 +--- mp/mp_sync.c 2008-02-12 16:09:42.000000000 +1100 +*************** +*** 755,761 **** + * This is important since we are called with the hash bucket + * locked. The mfp will get freed via the cleanup pass. + */ +! if (dbmfp != NULL && (t_ret = __memp_fclose(dbmfp, 0)) != 0 && ret == 0) + ret = t_ret; + + --mfp->mpf_cnt; +--- 755,762 ---- + * This is important since we are called with the hash bucket + * locked. The mfp will get freed via the cleanup pass. + */ +! if (dbmfp != NULL && +! (t_ret = __memp_fclose(dbmfp, DB_MPOOL_NOLOCK)) != 0 && ret == 0) + ret = t_ret; + + --mfp->mpf_cnt; + Added: csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.2 =================================================================== --- csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.2 (rev 0) +++ csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.2 2009-09-30 15:46:02 UTC (rev 6628) @@ -0,0 +1,27 @@ +*** mp/mp_region.c 2007-05-18 03:18:01.000000000 +1000 +--- mp/mp_region.c 2008-06-24 13:15:56.000000000 +1000 +*************** +*** 249,256 **** + mtx_base = htab[0].mtx_hash; + } + + if (mtx_base != MUTEX_INVALID) +! mtx_base += reginfo_off * htab_buckets; + + /* Allocate hash table space and initialize it. */ + if ((ret = __env_alloc(infop, +--- 249,262 ---- + mtx_base = htab[0].mtx_hash; + } + ++ /* ++ * We preallocated all of the mutexes in a block, so for regions after ++ * the first, we skip mutexes in use in earlier regions. Each region ++ * has the same number of buckets and there are two mutexes per hash ++ * bucket (the bucket mutex and the I/O mutex). ++ */ + if (mtx_base != MUTEX_INVALID) +! mtx_base += reginfo_off * htab_buckets * 2; + + /* Allocate hash table space and initialize it. */ + if ((ret = __env_alloc(infop, Added: csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.3 =================================================================== --- csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.3 (rev 0) +++ csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.3 2009-09-30 15:46:02 UTC (rev 6628) @@ -0,0 +1,74 @@ +*** sequence/sequence.c +--- sequence/sequence.c +*************** +*** 196,202 **** + if ((ret = __db_get_flags(dbp, &tflags)) != 0) + goto err; + +! if (DB_IS_READONLY(dbp)) { + ret = __db_rdonly(dbp->dbenv, "DB_SEQUENCE->open"); + goto err; + } +--- 196,206 ---- + if ((ret = __db_get_flags(dbp, &tflags)) != 0) + goto err; + +! /* +! * We can let replication clients open sequences, but must +! * check later that they do not update them. +! */ +! if (F_ISSET(dbp, DB_AM_RDONLY)) { + ret = __db_rdonly(dbp->dbenv, "DB_SEQUENCE->open"); + goto err; + } +*************** +*** 252,257 **** +--- 256,266 ---- + if ((ret != DB_NOTFOUND && ret != DB_KEYEMPTY) || + !LF_ISSET(DB_CREATE)) + goto err; ++ if (IS_REP_CLIENT(dbenv) && ++ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { ++ ret = __db_rdonly(dbenv, "DB_SEQUENCE->open"); ++ goto err; ++ } + ret = 0; + + rp = &seq->seq_record; +*************** +*** 304,310 **** + */ + rp = seq->seq_data.data; + if (rp->seq_version == DB_SEQUENCE_OLDVER) { +! oldver: rp->seq_version = DB_SEQUENCE_VERSION; + if (__db_isbigendian()) { + if (IS_DB_AUTO_COMMIT(dbp, txn)) { + if ((ret = +--- 313,324 ---- + */ + rp = seq->seq_data.data; + if (rp->seq_version == DB_SEQUENCE_OLDVER) { +! oldver: if (IS_REP_CLIENT(dbenv) && +! !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { +! ret = __db_rdonly(dbenv, "DB_SEQUENCE->open"); +! goto err; +! } +! rp->seq_version = DB_SEQUENCE_VERSION; + if (__db_isbigendian()) { + if (IS_DB_AUTO_COMMIT(dbp, txn)) { + if ((ret = +*************** +*** 713,718 **** +--- 727,738 ---- + + MUTEX_LOCK(dbenv, seq->mtx_seq); + ++ if (handle_check && IS_REP_CLIENT(dbenv) && ++ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { ++ ret = __db_rdonly(dbenv, "DB_SEQUENCE->get"); ++ goto err; ++ } ++ + if (rp->seq_min + delta > rp->seq_max) { + __db_errx(dbenv, "Sequence overflow"); + ret = EINVAL; Added: csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.4 =================================================================== --- csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.4 (rev 0) +++ csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.4 2009-09-30 15:46:02 UTC (rev 6628) @@ -0,0 +1,1414 @@ +*** dbinc/repmgr.h 2007-10-31 10:23:52.000000000 -0700 +--- dbinc/repmgr.h 2007-10-31 10:23:53.000000000 -0700 +*************** +*** 36,41 **** +--- 36,55 ---- + #endif + + /* ++ * The (arbitrary) maximum number of outgoing messages we're willing to hold, on ++ * a queue per connection, waiting for TCP buffer space to become available in ++ * the kernel. Rather than exceeding this limit, we simply discard additional ++ * messages (since this is always allowed by the replication protocol). ++ * As a special dispensation, if a message is destined for a specific remote ++ * site (i.e., it's not a broadcast), then we first try blocking the sending ++ * thread, waiting for space to become available (though we only wait a limited ++ * time). This is so as to be able to handle the immediate flood of (a ++ * potentially large number of) outgoing messages that replication generates, in ++ * a tight loop, when handling PAGE_REQ, LOG_REQ and ALL_REQ requests. ++ */ ++ #define OUT_QUEUE_LIMIT 10 ++ ++ /* + * The system value is available from sysconf(_SC_HOST_NAME_MAX). + * Historically, the maximum host name was 256. + */ +*************** +*** 47,52 **** +--- 61,71 ---- + #define MAX_SITE_LOC_STRING (MAXHOSTNAMELEN+20) + typedef char SITE_STRING_BUFFER[MAX_SITE_LOC_STRING+1]; + ++ /* Default timeout values, in seconds. */ ++ #define DB_REPMGR_DEFAULT_ACK_TIMEOUT (1 * US_PER_SEC) ++ #define DB_REPMGR_DEFAULT_CONNECTION_RETRY (30 * US_PER_SEC) ++ #define DB_REPMGR_DEFAULT_ELECTION_RETRY (10 * US_PER_SEC) ++ + struct __repmgr_connection; + typedef struct __repmgr_connection REPMGR_CONNECTION; + struct __repmgr_queue; typedef struct __repmgr_queue REPMGR_QUEUE; +*************** +*** 171,178 **** + #ifdef DB_WIN32 + WSAEVENT event_object; + #endif +! #define CONN_CONNECTING 0x01 /* nonblocking connect in progress */ +! #define CONN_DEFUNCT 0x02 /* socket close pending */ + u_int32_t flags; + + /* +--- 190,198 ---- + #ifdef DB_WIN32 + WSAEVENT event_object; + #endif +! #define CONN_CONGESTED 0x01 /* msg thread wait has exceeded timeout */ +! #define CONN_CONNECTING 0x02 /* nonblocking connect in progress */ +! #define CONN_DEFUNCT 0x04 /* socket close pending */ + u_int32_t flags; + + /* +*************** +*** 180,189 **** + * send() function's thread. But if TCP doesn't have enough network + * buffer space for us when we first try it, we instead allocate some + * memory, and copy the message, and then send it as space becomes +! * available in our main select() thread. + */ + OUT_Q_HEADER outbound_queue; + int out_queue_length; + + /* + * Input: while we're reading a message, we keep track of what phase +--- 200,215 ---- + * send() function's thread. But if TCP doesn't have enough network + * buffer space for us when we first try it, we instead allocate some + * memory, and copy the message, and then send it as space becomes +! * available in our main select() thread. In some cases, if the queue +! * gets too long we wait until it's drained, and then append to it. +! * This condition variable's associated mutex is the normal per-repmgr +! * db_rep->mutex, because that mutex is always held anyway whenever the +! * output queue is consulted. + */ + OUT_Q_HEADER outbound_queue; + int out_queue_length; ++ cond_var_t drained; ++ int blockers; /* ref count of msg threads waiting on us */ + + /* + * Input: while we're reading a message, we keep track of what phase +*** dbinc_auto/int_def.in 2007-10-31 10:23:52.000000000 -0700 +--- dbinc_auto/int_def.in 2007-10-31 10:23:52.000000000 -0700 +*************** +*** 1420,1425 **** +--- 1420,1428 ---- + #define __repmgr_wake_waiting_senders __repmgr_wake_waiting_senders at DB_VERSION_UNIQUE_NAME@ + #define __repmgr_await_ack __repmgr_await_ack at DB_VERSION_UNIQUE_NAME@ + #define __repmgr_compute_wait_deadline __repmgr_compute_wait_deadline at DB_VERSION_UNIQUE_NAME@ ++ #define __repmgr_await_drain __repmgr_await_drain at DB_VERSION_UNIQUE_NAME@ ++ #define __repmgr_alloc_cond __repmgr_alloc_cond at DB_VERSION_UNIQUE_NAME@ ++ #define __repmgr_free_cond __repmgr_free_cond at DB_VERSION_UNIQUE_NAME@ + #define __repmgr_init_sync __repmgr_init_sync at DB_VERSION_UNIQUE_NAME@ + #define __repmgr_close_sync __repmgr_close_sync at DB_VERSION_UNIQUE_NAME@ + #define __repmgr_net_init __repmgr_net_init at DB_VERSION_UNIQUE_NAME@ +*** dbinc_auto/repmgr_ext.h 2007-10-31 10:23:52.000000000 -0700 +--- dbinc_auto/repmgr_ext.h 2007-10-31 10:23:52.000000000 -0700 +*************** +*** 21,30 **** + int __repmgr_handle_event __P((DB_ENV *, u_int32_t, void *)); + void __repmgr_stash_generation __P((DB_ENV *)); + int __repmgr_send __P((DB_ENV *, const DBT *, const DBT *, const DB_LSN *, int, u_int32_t)); +! int __repmgr_send_one __P((DB_ENV *, REPMGR_CONNECTION *, u_int, const DBT *, const DBT *)); + int __repmgr_is_permanent __P((DB_ENV *, const DB_LSN *)); +! int __repmgr_bust_connection __P((DB_ENV *, REPMGR_CONNECTION *, int)); +! void __repmgr_cleanup_connection __P((DB_ENV *, REPMGR_CONNECTION *)); + int __repmgr_find_site __P((DB_ENV *, const char *, u_int)); + int __repmgr_pack_netaddr __P((DB_ENV *, const char *, u_int, ADDRINFO *, repmgr_netaddr_t *)); + int __repmgr_getaddr __P((DB_ENV *, const char *, u_int, int, ADDRINFO **)); +--- 21,30 ---- + int __repmgr_handle_event __P((DB_ENV *, u_int32_t, void *)); + void __repmgr_stash_generation __P((DB_ENV *)); + int __repmgr_send __P((DB_ENV *, const DBT *, const DBT *, const DB_LSN *, int, u_int32_t)); +! int __repmgr_send_one __P((DB_ENV *, REPMGR_CONNECTION *, u_int, const DBT *, const DBT *, int)); + int __repmgr_is_permanent __P((DB_ENV *, const DB_LSN *)); +! int __repmgr_bust_connection __P((DB_ENV *, REPMGR_CONNECTION *)); +! int __repmgr_cleanup_connection __P((DB_ENV *, REPMGR_CONNECTION *)); + int __repmgr_find_site __P((DB_ENV *, const char *, u_int)); + int __repmgr_pack_netaddr __P((DB_ENV *, const char *, u_int, ADDRINFO *, repmgr_netaddr_t *)); + int __repmgr_getaddr __P((DB_ENV *, const char *, u_int, int, ADDRINFO **)); +*************** +*** 39,44 **** +--- 39,47 ---- + int __repmgr_wake_waiting_senders __P((DB_ENV *)); + int __repmgr_await_ack __P((DB_ENV *, const DB_LSN *)); + void __repmgr_compute_wait_deadline __P((DB_ENV*, struct timespec *, db_timeout_t)); ++ int __repmgr_await_drain __P((DB_ENV *, REPMGR_CONNECTION *, db_timeout_t)); ++ int __repmgr_alloc_cond __P((cond_var_t *)); ++ int __repmgr_free_cond __P((cond_var_t *)); + int __repmgr_init_sync __P((DB_ENV *, DB_REP *)); + int __repmgr_close_sync __P((DB_ENV *)); + int __repmgr_net_init __P((DB_ENV *, DB_REP *)); +*** repmgr/repmgr_method.c 2007-10-31 10:23:52.000000000 -0700 +--- repmgr/repmgr_method.c 2007-10-31 10:23:53.000000000 -0700 +*************** +*** 196,204 **** + int ret; + + /* Set some default values. */ +! db_rep->ack_timeout = 1 * US_PER_SEC; /* 1 second */ +! db_rep->connection_retry_wait = 30 * US_PER_SEC; /* 30 seconds */ +! db_rep->election_retry_wait = 10 * US_PER_SEC; /* 10 seconds */ + db_rep->config_nsites = 0; + db_rep->peer = DB_EID_INVALID; + db_rep->perm_policy = DB_REPMGR_ACKS_QUORUM; +--- 196,204 ---- + int ret; + + /* Set some default values. */ +! db_rep->ack_timeout = DB_REPMGR_DEFAULT_ACK_TIMEOUT; +! db_rep->connection_retry_wait = DB_REPMGR_DEFAULT_CONNECTION_RETRY; +! db_rep->election_retry_wait = DB_REPMGR_DEFAULT_ELECTION_RETRY; + db_rep->config_nsites = 0; + db_rep->peer = DB_EID_INVALID; + db_rep->perm_policy = DB_REPMGR_ACKS_QUORUM; +*************** +*** 238,243 **** +--- 238,244 ---- + DB_ENV *dbenv; + { + DB_REP *db_rep; ++ REPMGR_CONNECTION *conn; + int ret; + + db_rep = dbenv->rep_handle; +*************** +*** 254,259 **** +--- 255,266 ---- + + if ((ret = __repmgr_signal(&db_rep->queue_nonempty)) != 0) + goto unlock; ++ ++ TAILQ_FOREACH(conn, &db_rep->connections, entries) { ++ if (conn->blockers > 0 && ++ ((ret = __repmgr_signal(&conn->drained)) != 0)) ++ goto unlock; ++ } + UNLOCK_MUTEX(db_rep->mutex); + + return (__repmgr_wake_main_thread(dbenv)); +*** repmgr/repmgr_msg.c 2007-10-31 10:23:52.000000000 -0700 +--- repmgr/repmgr_msg.c 2007-10-31 10:23:53.000000000 -0700 +*************** +*** 183,192 **** + + /* + * Acknowledges a message. +- * +- * !!! +- * Note that this cannot be called from the select() thread, in case we call +- * __repmgr_bust_connection(..., FALSE). + */ + static int + ack_message(dbenv, generation, lsn) +--- 183,188 ---- +*************** +*** 227,235 **** + rec2.size = 0; + + conn = site->ref.conn; + if ((ret = __repmgr_send_one(dbenv, conn, REPMGR_ACK, +! &control2, &rec2)) == DB_REP_UNAVAIL) +! ret = __repmgr_bust_connection(dbenv, conn, FALSE); + } + + UNLOCK_MUTEX(db_rep->mutex); +--- 223,236 ---- + rec2.size = 0; + + conn = site->ref.conn; ++ /* ++ * It's hard to imagine anyone would care about a lost ack if ++ * the path to the master is so congested as to need blocking; ++ * so pass "blockable" argument as FALSE. ++ */ + if ((ret = __repmgr_send_one(dbenv, conn, REPMGR_ACK, +! &control2, &rec2, FALSE)) == DB_REP_UNAVAIL) +! ret = __repmgr_bust_connection(dbenv, conn); + } + + UNLOCK_MUTEX(db_rep->mutex); +*** repmgr/repmgr_net.c 2007-10-31 10:23:52.000000000 -0700 +--- repmgr/repmgr_net.c 2007-10-31 10:23:53.000000000 -0700 +*************** +*** 63,69 **** + static void setup_sending_msg + __P((struct sending_msg *, u_int, const DBT *, const DBT *)); + static int __repmgr_send_internal +! __P((DB_ENV *, REPMGR_CONNECTION *, struct sending_msg *)); + static int enqueue_msg + __P((DB_ENV *, REPMGR_CONNECTION *, struct sending_msg *, size_t)); + static int flatten __P((DB_ENV *, struct sending_msg *)); +--- 63,69 ---- + static void setup_sending_msg + __P((struct sending_msg *, u_int, const DBT *, const DBT *)); + static int __repmgr_send_internal +! __P((DB_ENV *, REPMGR_CONNECTION *, struct sending_msg *, int)); + static int enqueue_msg + __P((DB_ENV *, REPMGR_CONNECTION *, struct sending_msg *, size_t)); + static int flatten __P((DB_ENV *, struct sending_msg *)); +*************** +*** 73,85 **** + * __repmgr_send -- + * The send function for DB_ENV->rep_set_transport. + * +- * !!! +- * This is only ever called as the replication transport call-back, which means +- * it's either on one of our message processing threads or an application +- * thread. It mustn't be called from the select() thread, because we might call +- * __repmgr_bust_connection(..., FALSE) here, and that's not allowed in the +- * select() thread. +- * + * PUBLIC: int __repmgr_send __P((DB_ENV *, const DBT *, const DBT *, + * PUBLIC: const DB_LSN *, int, u_int32_t)); + */ +--- 73,78 ---- +*************** +*** 126,134 **** + } + + conn = site->ref.conn; + if ((ret = __repmgr_send_one(dbenv, conn, REPMGR_REP_MESSAGE, +! control, rec)) == DB_REP_UNAVAIL && +! (t_ret = __repmgr_bust_connection(dbenv, conn, FALSE)) != 0) + ret = t_ret; + if (ret != 0) + goto out; +--- 119,128 ---- + } + + conn = site->ref.conn; ++ /* Pass the "blockable" argument as TRUE. */ + if ((ret = __repmgr_send_one(dbenv, conn, REPMGR_REP_MESSAGE, +! control, rec, TRUE)) == DB_REP_UNAVAIL && +! (t_ret = __repmgr_bust_connection(dbenv, conn)) != 0) + ret = t_ret; + if (ret != 0) + goto out; +*************** +*** 222,228 **** + if (site->state != SITE_CONNECTED) + return (NULL); + +! if (F_ISSET(site->ref.conn, CONN_CONNECTING)) + return (NULL); + return (site); + } +--- 216,222 ---- + if (site->state != SITE_CONNECTED) + return (NULL); + +! if (F_ISSET(site->ref.conn, CONN_CONNECTING|CONN_DEFUNCT)) + return (NULL); + return (site); + } +*************** +*** 235,244 **** + * + * !!! + * Caller must hold dbenv->mutex. +- * +- * !!! +- * Note that this cannot be called from the select() thread, in case we call +- * __repmgr_bust_connection(..., FALSE). + */ + static int + __repmgr_send_broadcast(dbenv, control, rec, nsitesp, npeersp) +--- 229,234 ---- +*************** +*** 268,281 **** + !IS_VALID_EID(conn->eid)) + continue; + +! if ((ret = __repmgr_send_internal(dbenv, conn, &msg)) == 0) { + site = SITE_FROM_EID(conn->eid); + nsites++; + if (site->priority > 0) + npeers++; + } else if (ret == DB_REP_UNAVAIL) { +! if ((ret = __repmgr_bust_connection( +! dbenv, conn, FALSE)) != 0) + return (ret); + } else + return (ret); +--- 258,277 ---- + !IS_VALID_EID(conn->eid)) + continue; + +! /* +! * Broadcast messages are either application threads committing +! * transactions, or replication status message that we can +! * afford to lose. So don't allow blocking for them (pass +! * "blockable" argument as FALSE). +! */ +! if ((ret = __repmgr_send_internal(dbenv, +! conn, &msg, FALSE)) == 0) { + site = SITE_FROM_EID(conn->eid); + nsites++; + if (site->priority > 0) + npeers++; + } else if (ret == DB_REP_UNAVAIL) { +! if ((ret = __repmgr_bust_connection(dbenv, conn)) != 0) + return (ret); + } else + return (ret); +*************** +*** 301,339 **** + * intersperse writes that are part of two single messages. + * + * PUBLIC: int __repmgr_send_one __P((DB_ENV *, REPMGR_CONNECTION *, +! * PUBLIC: u_int, const DBT *, const DBT *)); + */ + int +! __repmgr_send_one(dbenv, conn, msg_type, control, rec) + DB_ENV *dbenv; + REPMGR_CONNECTION *conn; + u_int msg_type; + const DBT *control, *rec; + { + struct sending_msg msg; + + setup_sending_msg(&msg, msg_type, control, rec); +! return (__repmgr_send_internal(dbenv, conn, &msg)); + } + + /* + * Attempts a "best effort" to send a message on the given site. If there is an +! * excessive backlog of message already queued on the connection, we simply drop +! * this message, and still return 0 even in this case. + */ + static int +! __repmgr_send_internal(dbenv, conn, msg) + DB_ENV *dbenv; + REPMGR_CONNECTION *conn; + struct sending_msg *msg; + { +! #define OUT_QUEUE_LIMIT 10 /* arbitrary, for now */ + REPMGR_IOVECS iovecs; + SITE_STRING_BUFFER buffer; + int ret; + size_t nw; + size_t total_written; + + DB_ASSERT(dbenv, !F_ISSET(conn, CONN_CONNECTING)); + if (!STAILQ_EMPTY(&conn->outbound_queue)) { + /* +--- 297,355 ---- + * intersperse writes that are part of two single messages. + * + * PUBLIC: int __repmgr_send_one __P((DB_ENV *, REPMGR_CONNECTION *, +! * PUBLIC: u_int, const DBT *, const DBT *, int)); + */ + int +! __repmgr_send_one(dbenv, conn, msg_type, control, rec, blockable) + DB_ENV *dbenv; + REPMGR_CONNECTION *conn; + u_int msg_type; + const DBT *control, *rec; ++ int blockable; + { + struct sending_msg msg; + + setup_sending_msg(&msg, msg_type, control, rec); +! return (__repmgr_send_internal(dbenv, conn, &msg, blockable)); + } + + /* + * Attempts a "best effort" to send a message on the given site. If there is an +! * excessive backlog of message already queued on the connection, what shall we +! * do? If the caller doesn't mind blocking, we'll wait (a limited amount of +! * time) for the queue to drain. Otherwise we'll simply drop the message. This +! * is always allowed by the replication protocol. But in the case of a +! * multi-message response to a request like PAGE_REQ, LOG_REQ or ALL_REQ we +! * almost always get a flood of messages that instantly fills our queue, so +! * blocking improves performance (by avoiding the need for the client to +! * re-request). +! * +! * How long shall we wait? We could of course create a new timeout +! * configuration type, so that the application could set it directly. But that +! * would start to overwhelm the user with too many choices to think about. We +! * already have an ACK timeout, which is the user's estimate of how long it +! * should take to send a message to the client, have it be processed, and return +! * a message back to us. We multiply that by the queue size, because that's how +! * many messages have to be swallowed up by the client before we're able to +! * start sending again (at least to a rough approximation). + */ + static int +! __repmgr_send_internal(dbenv, conn, msg, blockable) + DB_ENV *dbenv; + REPMGR_CONNECTION *conn; + struct sending_msg *msg; ++ int blockable; + { +! DB_REP *db_rep; + REPMGR_IOVECS iovecs; + SITE_STRING_BUFFER buffer; ++ db_timeout_t drain_to; + int ret; + size_t nw; + size_t total_written; + ++ db_rep = dbenv->rep_handle; ++ + DB_ASSERT(dbenv, !F_ISSET(conn, CONN_CONNECTING)); + if (!STAILQ_EMPTY(&conn->outbound_queue)) { + /* +*************** +*** 344,358 **** + RPRINT(dbenv, (dbenv, "msg to %s to be queued", + __repmgr_format_eid_loc(dbenv->rep_handle, + conn->eid, buffer))); + if (conn->out_queue_length < OUT_QUEUE_LIMIT) + return (enqueue_msg(dbenv, conn, msg, 0)); + else { + RPRINT(dbenv, (dbenv, "queue limit exceeded")); + STAT(dbenv->rep_handle-> + region->mstat.st_msgs_dropped++); +! return (0); + } + } + + /* + * Send as much data to the site as we can, without blocking. Keep +--- 360,393 ---- + RPRINT(dbenv, (dbenv, "msg to %s to be queued", + __repmgr_format_eid_loc(dbenv->rep_handle, + conn->eid, buffer))); ++ if (conn->out_queue_length >= OUT_QUEUE_LIMIT && ++ blockable && !F_ISSET(conn, CONN_CONGESTED)) { ++ RPRINT(dbenv, (dbenv, ++ "block msg thread, await queue space")); ++ ++ if ((drain_to = db_rep->ack_timeout) == 0) ++ drain_to = DB_REPMGR_DEFAULT_ACK_TIMEOUT; ++ conn->blockers++; ++ ret = __repmgr_await_drain(dbenv, ++ conn, drain_to * OUT_QUEUE_LIMIT); ++ conn->blockers--; ++ if (db_rep->finished) ++ return (DB_TIMEOUT); ++ if (ret != 0) ++ return (ret); ++ if (STAILQ_EMPTY(&conn->outbound_queue)) ++ goto empty; ++ } + if (conn->out_queue_length < OUT_QUEUE_LIMIT) + return (enqueue_msg(dbenv, conn, msg, 0)); + else { + RPRINT(dbenv, (dbenv, "queue limit exceeded")); + STAT(dbenv->rep_handle-> + region->mstat.st_msgs_dropped++); +! return (blockable ? DB_TIMEOUT : 0); + } + } ++ empty: + + /* + * Send as much data to the site as we can, without blocking. Keep +*************** +*** 498,521 **** + + /* + * Abandons a connection, to recover from an error. Upon entry the conn struct +! * must be on the connections list. +! * +! * If the 'do_close' flag is true, we do the whole job; the clean-up includes +! * removing the struct from the list and freeing all its memory, so upon return +! * the caller must not refer to it any further. Otherwise, we merely mark the +! * connection for clean-up later by the main thread. + * + * PUBLIC: int __repmgr_bust_connection __P((DB_ENV *, +! * PUBLIC: REPMGR_CONNECTION *, int)); + * + * !!! + * Caller holds mutex. + */ + int +! __repmgr_bust_connection(dbenv, conn, do_close) + DB_ENV *dbenv; + REPMGR_CONNECTION *conn; +- int do_close; + { + DB_REP *db_rep; + int connecting, ret, eid; +--- 533,553 ---- + + /* + * Abandons a connection, to recover from an error. Upon entry the conn struct +! * must be on the connections list. For now, just mark it as unusable; it will +! * be fully cleaned up in the top-level select thread, as soon as possible. + * + * PUBLIC: int __repmgr_bust_connection __P((DB_ENV *, +! * PUBLIC: REPMGR_CONNECTION *)); + * + * !!! + * Caller holds mutex. ++ * ++ * Must be idempotent + */ + int +! __repmgr_bust_connection(dbenv, conn) + DB_ENV *dbenv; + REPMGR_CONNECTION *conn; + { + DB_REP *db_rep; + int connecting, ret, eid; +*************** +*** 526,537 **** + DB_ASSERT(dbenv, !TAILQ_EMPTY(&db_rep->connections)); + eid = conn->eid; + connecting = F_ISSET(conn, CONN_CONNECTING); +! if (do_close) +! __repmgr_cleanup_connection(dbenv, conn); +! else { +! F_SET(conn, CONN_DEFUNCT); +! conn->eid = -1; +! } + + /* + * When we first accepted the incoming connection, we set conn->eid to +--- 558,566 ---- + DB_ASSERT(dbenv, !TAILQ_EMPTY(&db_rep->connections)); + eid = conn->eid; + connecting = F_ISSET(conn, CONN_CONNECTING); +! +! F_SET(conn, CONN_DEFUNCT); +! conn->eid = -1; + + /* + * When we first accepted the incoming connection, we set conn->eid to +*************** +*** 557,563 **** + dbenv, ELECT_FAILURE_ELECTION)) != 0) + return (ret); + } +! } else if (!do_close) { + /* + * One way or another, make sure the main thread is poked, so + * that we do the deferred clean-up. +--- 586,592 ---- + dbenv, ELECT_FAILURE_ELECTION)) != 0) + return (ret); + } +! } else { + /* + * One way or another, make sure the main thread is poked, so + * that we do the deferred clean-up. +*************** +*** 568,577 **** + } + + /* +! * PUBLIC: void __repmgr_cleanup_connection + * PUBLIC: __P((DB_ENV *, REPMGR_CONNECTION *)); + */ +! void + __repmgr_cleanup_connection(dbenv, conn) + DB_ENV *dbenv; + REPMGR_CONNECTION *conn; +--- 597,610 ---- + } + + /* +! * PUBLIC: int __repmgr_cleanup_connection + * PUBLIC: __P((DB_ENV *, REPMGR_CONNECTION *)); ++ * ++ * !!! ++ * Idempotent. This can be called repeatedly as blocking message threads (of ++ * which there could be multiples) wake up in case of error on the connection. + */ +! int + __repmgr_cleanup_connection(dbenv, conn) + DB_ENV *dbenv; + REPMGR_CONNECTION *conn; +*************** +*** 580,596 **** + QUEUED_OUTPUT *out; + REPMGR_FLAT *msg; + DBT *dbt; + + db_rep = dbenv->rep_handle; + +! TAILQ_REMOVE(&db_rep->connections, conn, entries); + if (conn->fd != INVALID_SOCKET) { +! (void)closesocket(conn->fd); + #ifdef DB_WIN32 +! (void)WSACloseEvent(conn->event_object); + #endif + } + + /* + * Deallocate any input and output buffers we may have. + */ +--- 613,643 ---- + QUEUED_OUTPUT *out; + REPMGR_FLAT *msg; + DBT *dbt; ++ int ret; + + db_rep = dbenv->rep_handle; + +! DB_ASSERT(dbenv, F_ISSET(conn, CONN_DEFUNCT) || db_rep->finished); +! + if (conn->fd != INVALID_SOCKET) { +! ret = closesocket(conn->fd); +! conn->fd = INVALID_SOCKET; +! if (ret == SOCKET_ERROR) { +! ret = net_errno; +! __db_err(dbenv, ret, "closing socket"); +! } + #ifdef DB_WIN32 +! if (!WSACloseEvent(conn->event_object) && ret != 0) +! ret = net_errno; + #endif ++ if (ret != 0) ++ return (ret); + } + ++ if (conn->blockers > 0) ++ return (__repmgr_signal(&conn->drained)); ++ ++ TAILQ_REMOVE(&db_rep->connections, conn, entries); + /* + * Deallocate any input and output buffers we may have. + */ +*************** +*** 614,620 **** +--- 661,669 ---- + __os_free(dbenv, out); + } + ++ ret = __repmgr_free_cond(&conn->drained); + __os_free(dbenv, conn); ++ return (ret); + } + + static int +*************** +*** 1063,1069 **** + + while (!TAILQ_EMPTY(&db_rep->connections)) { + conn = TAILQ_FIRST(&db_rep->connections); +! __repmgr_cleanup_connection(dbenv, conn); + } + + for (i = 0; i < db_rep->site_cnt; i++) { +--- 1112,1118 ---- + + while (!TAILQ_EMPTY(&db_rep->connections)) { + conn = TAILQ_FIRST(&db_rep->connections); +! (void)__repmgr_cleanup_connection(dbenv, conn); + } + + for (i = 0; i < db_rep->site_cnt; i++) { +*** repmgr/repmgr_posix.c 2007-10-31 10:23:52.000000000 -0700 +--- repmgr/repmgr_posix.c 2007-10-31 10:23:53.000000000 -0700 +*************** +*** 21,26 **** +--- 21,28 ---- + size_t __repmgr_guesstimated_max = (128 * 1024); + #endif + ++ static int __repmgr_conn_work __P((DB_ENV *, ++ REPMGR_CONNECTION *, fd_set *, fd_set *, int)); + static int finish_connecting __P((DB_ENV *, REPMGR_CONNECTION *)); + + /* +*************** +*** 189,194 **** +--- 191,284 ---- + } + + /* ++ * PUBLIC: int __repmgr_await_drain __P((DB_ENV *, ++ * PUBLIC: REPMGR_CONNECTION *, db_timeout_t)); ++ * ++ * Waits for space to become available on the connection's output queue. ++ * Various ways we can exit: ++ * ++ * 1. queue becomes non-full ++ * 2. exceed time limit ++ * 3. connection becomes defunct (due to error in another thread) ++ * 4. repmgr is shutting down ++ * 5. any unexpected system resource failure ++ * ++ * In cases #3 and #5 we return an error code. Caller is responsible for ++ * distinguishing the remaining cases if desired. ++ * ++ * !!! ++ * Caller must hold repmgr->mutex. ++ */ ++ int ++ __repmgr_await_drain(dbenv, conn, timeout) ++ DB_ENV *dbenv; ++ REPMGR_CONNECTION *conn; ++ db_timeout_t timeout; ++ { ++ DB_REP *db_rep; ++ struct timespec deadline; ++ int ret; ++ ++ db_rep = dbenv->rep_handle; ++ ++ __repmgr_compute_wait_deadline(dbenv, &deadline, timeout); ++ ++ ret = 0; ++ while (conn->out_queue_length >= OUT_QUEUE_LIMIT) { ++ ret = pthread_cond_timedwait(&conn->drained, ++ &db_rep->mutex, &deadline); ++ switch (ret) { ++ case 0: ++ if (db_rep->finished) ++ goto out; /* #4. */ ++ /* ++ * Another thread could have stumbled into an error on ++ * the socket while we were waiting. ++ */ ++ if (F_ISSET(conn, CONN_DEFUNCT)) { ++ ret = DB_REP_UNAVAIL; /* #3. */ ++ goto out; ++ } ++ break; ++ case ETIMEDOUT: ++ F_SET(conn, CONN_CONGESTED); ++ ret = 0; ++ goto out; /* #2. */ ++ default: ++ goto out; /* #5. */ ++ } ++ } ++ /* #1. */ ++ ++ out: ++ return (ret); ++ } ++ ++ /* ++ * PUBLIC: int __repmgr_alloc_cond __P((cond_var_t *)); ++ * ++ * Initialize a condition variable (in allocated space). ++ */ ++ int ++ __repmgr_alloc_cond(c) ++ cond_var_t *c; ++ { ++ return (pthread_cond_init(c, NULL)); ++ } ++ ++ /* ++ * PUBLIC: int __repmgr_free_cond __P((cond_var_t *)); ++ * ++ * Clean up a previously initialized condition variable. ++ */ ++ int ++ __repmgr_free_cond(c) ++ cond_var_t *c; ++ { ++ return (pthread_cond_destroy(c)); ++ } ++ ++ /* + * PUBLIC: int __repmgr_init_sync __P((DB_ENV *, DB_REP *)); + * + * Allocate/initialize all data necessary for thread synchronization. This +*************** +*** 443,449 **** + REPMGR_RETRY *retry; + db_timespec timeout; + fd_set reads, writes; +! int ret, flow_control, maxfd, nready; + u_int8_t buf[10]; /* arbitrary size */ + + flow_control = FALSE; +--- 533,539 ---- + REPMGR_RETRY *retry; + db_timespec timeout; + fd_set reads, writes; +! int ret, flow_control, maxfd; + u_int8_t buf[10]; /* arbitrary size */ + + flow_control = FALSE; +*************** +*** 477,482 **** +--- 567,575 ---- + * each one. + */ + TAILQ_FOREACH(conn, &db_rep->connections, entries) { ++ if (F_ISSET(conn, CONN_DEFUNCT)) ++ continue; ++ + if (F_ISSET(conn, CONN_CONNECTING)) { + FD_SET((u_int)conn->fd, &reads); + FD_SET((u_int)conn->fd, &writes); +*************** +*** 533,616 **** + return (ret); + } + } +- nready = ret; +- + LOCK_MUTEX(db_rep->mutex); + +- /* +- * The first priority thing we must do is to clean up any +- * pending defunct connections. Otherwise, if they have any +- * lingering pending input, we get very confused if we try to +- * process it. +- * +- * The TAILQ_FOREACH macro would be suitable here, except that +- * it doesn't allow unlinking the current element, which is +- * needed for cleanup_connection. +- */ +- for (conn = TAILQ_FIRST(&db_rep->connections); +- conn != NULL; +- conn = next) { +- next = TAILQ_NEXT(conn, entries); +- if (F_ISSET(conn, CONN_DEFUNCT)) +- __repmgr_cleanup_connection(dbenv, conn); +- } +- + if ((ret = __repmgr_retry_connections(dbenv)) != 0) + goto out; +- if (nready == 0) +- continue; + + /* +! * Traverse the linked list. (Again, like TAILQ_FOREACH, except +! * that we need the ability to unlink an element along the way.) + */ + for (conn = TAILQ_FIRST(&db_rep->connections); + conn != NULL; + conn = next) { + next = TAILQ_NEXT(conn, entries); +! if (F_ISSET(conn, CONN_CONNECTING)) { +! if (FD_ISSET((u_int)conn->fd, &reads) || +! FD_ISSET((u_int)conn->fd, &writes)) { +! if ((ret = finish_connecting(dbenv, +! conn)) == DB_REP_UNAVAIL) { +! if ((ret = +! __repmgr_bust_connection( +! dbenv, conn, TRUE)) != 0) +! goto out; +! } else if (ret != 0) +! goto out; +! } +! continue; +! } +! +! /* +! * Here, the site is connected, and the FD_SET's are +! * valid. +! */ +! if (FD_ISSET((u_int)conn->fd, &writes)) { +! if ((ret = __repmgr_write_some( +! dbenv, conn)) == DB_REP_UNAVAIL) { +! if ((ret = +! __repmgr_bust_connection(dbenv, +! conn, TRUE)) != 0) +! goto out; +! continue; +! } else if (ret != 0) +! goto out; +! } +! +! if (!flow_control && +! FD_ISSET((u_int)conn->fd, &reads)) { +! if ((ret = __repmgr_read_from_site(dbenv, conn)) +! == DB_REP_UNAVAIL) { +! if ((ret = +! __repmgr_bust_connection(dbenv, +! conn, TRUE)) != 0) +! goto out; +! continue; +! } else if (ret != 0) +! goto out; +! } + } + + /* +--- 626,650 ---- + return (ret); + } + } + LOCK_MUTEX(db_rep->mutex); + + if ((ret = __repmgr_retry_connections(dbenv)) != 0) + goto out; + + /* +! * Examine each connection, to see what work needs to be done. +! * +! * The TAILQ_FOREACH macro would be suitable here, except that +! * it doesn't allow unlinking the current element, which is +! * needed for cleanup_connection. + */ + for (conn = TAILQ_FIRST(&db_rep->connections); + conn != NULL; + conn = next) { + next = TAILQ_NEXT(conn, entries); +! if ((ret = __repmgr_conn_work(dbenv, +! conn, &reads, &writes, flow_control)) != 0) +! goto out; + } + + /* +*************** +*** 637,642 **** +--- 671,719 ---- + } + + static int ++ __repmgr_conn_work(dbenv, conn, reads, writes, flow_control) ++ DB_ENV *dbenv; ++ REPMGR_CONNECTION *conn; ++ fd_set *reads, *writes; ++ int flow_control; ++ { ++ int ret; ++ u_int fd; ++ ++ if (F_ISSET(conn, CONN_DEFUNCT)) { ++ /* ++ * Deferred clean-up, from an error that happened in another ++ * thread, while we were sleeping in select(). ++ */ ++ return (__repmgr_cleanup_connection(dbenv, conn)); ++ } ++ ++ ret = 0; ++ fd = (u_int)conn->fd; ++ ++ if (F_ISSET(conn, CONN_CONNECTING)) { ++ if (FD_ISSET(fd, reads) || FD_ISSET(fd, writes)) ++ ret = finish_connecting(dbenv, conn); ++ } else { ++ /* ++ * Here, the site is connected, and the FD_SET's are valid. ++ */ ++ if (FD_ISSET(fd, writes)) ++ ret = __repmgr_write_some(dbenv, conn); ++ ++ if (ret == 0 && !flow_control && FD_ISSET(fd, reads)) ++ ret = __repmgr_read_from_site(dbenv, conn); ++ } ++ ++ if (ret == DB_REP_UNAVAIL) { ++ if ((ret = __repmgr_bust_connection(dbenv, conn)) != 0) ++ return (ret); ++ ret = __repmgr_cleanup_connection(dbenv, conn); ++ } ++ return (ret); ++ } ++ ++ static int + finish_connecting(dbenv, conn) + DB_ENV *dbenv; + REPMGR_CONNECTION *conn; +*************** +*** 657,662 **** +--- 734,740 ---- + goto err_rpt; + } + ++ DB_ASSERT(dbenv, F_ISSET(conn, CONN_CONNECTING)); + F_CLR(conn, CONN_CONNECTING); + return (__repmgr_send_handshake(dbenv, conn)); + +*************** +*** 671,690 **** + "connecting to %s", __repmgr_format_site_loc(site, buffer)); + + /* If we've exhausted the list of possible addresses, give up. */ +! if (ADDR_LIST_NEXT(&site->net_addr) == NULL) + return (DB_REP_UNAVAIL); + + /* + * This is just like a little mini-"bust_connection", except that we + * don't reschedule for later, 'cuz we're just about to try again right +! * now. + * + * !!! + * Which means this must only be called on the select() thread, since + * only there are we allowed to actually close a connection. + */ + DB_ASSERT(dbenv, !TAILQ_EMPTY(&db_rep->connections)); +! __repmgr_cleanup_connection(dbenv, conn); + ret = __repmgr_connect_site(dbenv, eid); + DB_ASSERT(dbenv, ret != DB_REP_UNAVAIL); + return (ret); +--- 749,773 ---- + "connecting to %s", __repmgr_format_site_loc(site, buffer)); + + /* If we've exhausted the list of possible addresses, give up. */ +! if (ADDR_LIST_NEXT(&site->net_addr) == NULL) { +! STAT(db_rep->region->mstat.st_connect_fail++); + return (DB_REP_UNAVAIL); ++ } + + /* + * This is just like a little mini-"bust_connection", except that we + * don't reschedule for later, 'cuz we're just about to try again right +! * now. (Note that we don't have to worry about message threads +! * blocking on a full output queue: that can't happen when we're only +! * just connecting.) + * + * !!! + * Which means this must only be called on the select() thread, since + * only there are we allowed to actually close a connection. + */ + DB_ASSERT(dbenv, !TAILQ_EMPTY(&db_rep->connections)); +! if ((ret = __repmgr_cleanup_connection(dbenv, conn)) != 0) +! return (ret); + ret = __repmgr_connect_site(dbenv, eid); + DB_ASSERT(dbenv, ret != DB_REP_UNAVAIL); + return (ret); +*** repmgr/repmgr_sel.c 2007-10-31 10:23:52.000000000 -0700 +--- repmgr/repmgr_sel.c 2007-10-31 10:23:53.000000000 -0700 +*************** +*** 36,45 **** + + /* + * PUBLIC: int __repmgr_accept __P((DB_ENV *)); +- * +- * !!! +- * Only ever called in the select() thread, since we may call +- * __repmgr_bust_connection(..., TRUE). + */ + int + __repmgr_accept(dbenv) +--- 36,41 ---- +*************** +*** 133,139 **** + case 0: + return (0); + case DB_REP_UNAVAIL: +! return (__repmgr_bust_connection(dbenv, conn, TRUE)); + default: + return (ret); + } +--- 129,135 ---- + case 0: + return (0); + case DB_REP_UNAVAIL: +! return (__repmgr_bust_connection(dbenv, conn)); + default: + return (ret); + } +*************** +*** 254,263 **** + * starting with the "current" element of its address list and trying as many + * addresses as necessary until the list is exhausted. + * +- * !!! +- * Only ever called in the select() thread, since we may call +- * __repmgr_bust_connection(..., TRUE). +- * + * PUBLIC: int __repmgr_connect_site __P((DB_ENV *, u_int eid)); + */ + int +--- 250,255 ---- +*************** +*** 332,338 **** + case 0: + break; + case DB_REP_UNAVAIL: +! return (__repmgr_bust_connection(dbenv, con, TRUE)); + default: + return (ret); + } +--- 324,330 ---- + case 0: + break; + case DB_REP_UNAVAIL: +! return (__repmgr_bust_connection(dbenv, con)); + default: + return (ret); + } +*************** +*** 437,443 **** + + DB_SET_DBT(rec, my_addr->host, strlen(my_addr->host) + 1); + +! return (__repmgr_send_one(dbenv, conn, REPMGR_HANDSHAKE, &cntrl, &rec)); + } + + /* +--- 429,443 ---- + + DB_SET_DBT(rec, my_addr->host, strlen(my_addr->host) + 1); + +! /* +! * It would of course be disastrous to block the select() thread, so +! * pass the "blockable" argument as FALSE. Fortunately blocking should +! * never be necessary here, because the hand-shake is always the first +! * thing we send. Which is a good thing, because it would be almost as +! * disastrous if we allowed ourselves to drop a handshake. +! */ +! return (__repmgr_send_one(dbenv, +! conn, REPMGR_HANDSHAKE, &cntrl, &rec, FALSE)); + } + + /* +*************** +*** 854,859 **** +--- 854,872 ---- + conn->out_queue_length--; + if (--msg->ref_count <= 0) + __os_free(dbenv, msg); ++ ++ /* ++ * We've achieved enough movement to free up at least ++ * one space in the outgoing queue. Wake any message ++ * threads that may be waiting for space. Clear the ++ * CONGESTED status so that when the queue reaches the ++ * high-water mark again, the filling thread will be ++ * allowed to try waiting again. ++ */ ++ F_CLR(conn, CONN_CONGESTED); ++ if (conn->blockers > 0 && ++ (ret = __repmgr_signal(&conn->drained)) != 0) ++ return (ret); + } + } + +*** repmgr/repmgr_util.c 2007-10-31 10:23:52.000000000 -0700 +--- repmgr/repmgr_util.c 2007-10-31 10:23:53.000000000 -0700 +*************** +*** 103,108 **** +--- 103,113 ---- + db_rep = dbenv->rep_handle; + if ((ret = __os_malloc(dbenv, sizeof(REPMGR_CONNECTION), &c)) != 0) + return (ret); ++ if ((ret = __repmgr_alloc_cond(&c->drained)) != 0) { ++ __os_free(dbenv, c); ++ return (ret); ++ } ++ c->blockers = 0; + + c->fd = s; + c->flags = flags; +*** repmgr/repmgr_windows.c 2007-10-31 10:23:52.000000000 -0700 +--- repmgr/repmgr_windows.c 2007-10-31 10:23:53.000000000 -0700 +*************** +*** 11,16 **** +--- 11,19 ---- + #define __INCLUDE_NETWORKING 1 + #include "db_int.h" + ++ /* Convert time-out from microseconds to milliseconds, rounding up. */ ++ #define DB_TIMEOUT_TO_WINDOWS_TIMEOUT(t) (((t) + (US_PER_MS - 1)) / US_PER_MS) ++ + typedef struct __ack_waiter { + HANDLE event; + const DB_LSN *lsnp; +*************** +*** 120,136 **** + { + DB_REP *db_rep; + ACK_WAITER *me; +! DWORD ret; +! DWORD timeout; + + db_rep = dbenv->rep_handle; + + if ((ret = allocate_wait_slot(dbenv, &me)) != 0) + goto err; + +- /* convert time-out from microseconds to milliseconds, rounding up */ + timeout = db_rep->ack_timeout > 0 ? +! ((db_rep->ack_timeout + (US_PER_MS - 1)) / US_PER_MS) : INFINITE; + me->lsnp = lsnp; + if ((ret = SignalObjectAndWait(db_rep->mutex, me->event, timeout, + FALSE)) == WAIT_FAILED) { +--- 123,137 ---- + { + DB_REP *db_rep; + ACK_WAITER *me; +! DWORD ret, timeout; + + db_rep = dbenv->rep_handle; + + if ((ret = allocate_wait_slot(dbenv, &me)) != 0) + goto err; + + timeout = db_rep->ack_timeout > 0 ? +! DB_TIMEOUT_TO_WINDOWS_TIMEOUT(db_rep->ack_timeout) : INFINITE; + me->lsnp = lsnp; + if ((ret = SignalObjectAndWait(db_rep->mutex, me->event, timeout, + FALSE)) == WAIT_FAILED) { +*************** +*** 211,216 **** +--- 212,296 ---- + db_rep->waiters->first_free = slot; + } + ++ /* (See requirements described in repmgr_posix.c.) */ ++ int ++ __repmgr_await_drain(dbenv, conn, timeout) ++ DB_ENV *dbenv; ++ REPMGR_CONNECTION *conn; ++ db_timeout_t timeout; ++ { ++ DB_REP *db_rep; ++ db_timespec deadline, delta, now; ++ db_timeout_t t; ++ DWORD duration, ret; ++ int round_up; ++ ++ db_rep = dbenv->rep_handle; ++ ++ __os_gettime(dbenv, &deadline); ++ DB_TIMEOUT_TO_TIMESPEC(timeout, &delta); ++ timespecadd(&deadline, &delta); ++ ++ while (conn->out_queue_length >= OUT_QUEUE_LIMIT) { ++ if (!ResetEvent(conn->drained)) ++ return (GetLastError()); ++ ++ /* How long until the deadline? */ ++ __os_gettime(dbenv, &now); ++ if (timespeccmp(&now, &deadline, >=)) { ++ F_SET(conn, CONN_CONGESTED); ++ return (0); ++ } ++ delta = deadline; ++ timespecsub(&delta, &now); ++ round_up = TRUE; ++ DB_TIMESPEC_TO_TIMEOUT(t, &delta, round_up); ++ duration = DB_TIMEOUT_TO_WINDOWS_TIMEOUT(t); ++ ++ ret = SignalObjectAndWait(db_rep->mutex, ++ conn->drained, duration, FALSE); ++ LOCK_MUTEX(db_rep->mutex); ++ if (ret == WAIT_FAILED) ++ return (GetLastError()); ++ else if (ret == WAIT_TIMEOUT) { ++ F_SET(conn, CONN_CONGESTED); ++ return (0); ++ } else ++ DB_ASSERT(dbenv, ret == WAIT_OBJECT_0); ++ ++ if (db_rep->finished) ++ return (0); ++ if (F_ISSET(conn, CONN_DEFUNCT)) ++ return (DB_REP_UNAVAIL); ++ } ++ return (0); ++ } ++ ++ /* ++ * Creates a manual reset event, which is usually our best choice when we may ++ * have multiple threads waiting on a single event. ++ */ ++ int ++ __repmgr_alloc_cond(c) ++ cond_var_t *c; ++ { ++ HANDLE event; ++ ++ if ((event = CreateEvent(NULL, TRUE, FALSE, NULL)) == NULL) ++ return (GetLastError()); ++ *c = event; ++ return (0); ++ } ++ ++ int ++ __repmgr_free_cond(c) ++ cond_var_t *c; ++ { ++ if (CloseHandle(*c)) ++ return (0); ++ return (GetLastError()); ++ } ++ + /* + * Make resource allocation an all-or-nothing affair, outside of this and the + * close_sync function. db_rep->waiters should be non-NULL iff all of these +*************** +*** 488,493 **** +--- 568,576 ---- + * don't hurt anything flow-control-wise. + */ + TAILQ_FOREACH(conn, &db_rep->connections, entries) { ++ if (F_ISSET(conn, CONN_DEFUNCT)) ++ continue; ++ + if (F_ISSET(conn, CONN_CONNECTING) || + !STAILQ_EMPTY(&conn->outbound_queue) || + (!flow_control || !IS_VALID_EID(conn->eid))) { +*************** +*** 534,541 **** + conn != NULL; + conn = next) { + next = TAILQ_NEXT(conn, entries); +! if (F_ISSET(conn, CONN_DEFUNCT)) +! __repmgr_cleanup_connection(dbenv, conn); + } + + /* +--- 617,626 ---- + conn != NULL; + conn = next) { + next = TAILQ_NEXT(conn, entries); +! if (F_ISSET(conn, CONN_DEFUNCT) && +! (ret = __repmgr_cleanup_connection(dbenv, +! conn)) != 0) +! goto unlock; + } + + /* +*************** +*** 587,597 **** + return (ret); + } + +- /* +- * !!! +- * Only ever called on the select() thread, since we may call +- * __repmgr_bust_connection(..., TRUE). +- */ + static int + handle_completion(dbenv, conn) + DB_ENV *dbenv; +--- 672,677 ---- +*************** +*** 651,660 **** + } + } + +! return (0); +! +! err: if (ret == DB_REP_UNAVAIL) +! return (__repmgr_bust_connection(dbenv, conn, TRUE)); + return (ret); + } + +--- 731,742 ---- + } + } + +! err: +! if (ret == DB_REP_UNAVAIL) { +! if ((ret = __repmgr_bust_connection(dbenv, conn)) != 0) +! return (ret); +! ret = __repmgr_cleanup_connection(dbenv, conn); +! } + return (ret); + } + +*************** +*** 708,714 **** + } + + DB_ASSERT(dbenv, !TAILQ_EMPTY(&db_rep->connections)); +! __repmgr_cleanup_connection(dbenv, conn); + ret = __repmgr_connect_site(dbenv, eid); + DB_ASSERT(dbenv, ret != DB_REP_UNAVAIL); + return (ret); +--- 790,797 ---- + } + + DB_ASSERT(dbenv, !TAILQ_EMPTY(&db_rep->connections)); +! if ((ret = __repmgr_cleanup_connection(dbenv, conn)) != 0) +! return (ret); + ret = __repmgr_connect_site(dbenv, eid); + DB_ASSERT(dbenv, ret != DB_REP_UNAVAIL); + return (ret); Deleted: csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.1 =================================================================== --- csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.1 2009-09-30 15:41:26 UTC (rev 6627) +++ csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.1 2009-09-30 15:46:02 UTC (rev 6628) @@ -1,75 +0,0 @@ -*** sequence/sequence.c.orig 2008-05-05 13:25:09.000000000 -0700 ---- sequence/sequence.c 2008-08-15 09:58:46.000000000 -0700 -*************** -*** 187,193 **** - if ((ret = __db_get_flags(dbp, &tflags)) != 0) - goto err; - -! if (DB_IS_READONLY(dbp)) { - ret = __db_rdonly(dbp->env, "DB_SEQUENCE->open"); - goto err; - } ---- 187,197 ---- - if ((ret = __db_get_flags(dbp, &tflags)) != 0) - goto err; - -! /* -! * We can let replication clients open sequences, but must -! * check later that they do not update them. -! */ -! if (F_ISSET(dbp, DB_AM_RDONLY)) { - ret = __db_rdonly(dbp->env, "DB_SEQUENCE->open"); - goto err; - } -*************** -*** 244,249 **** ---- 248,258 ---- - if ((ret != DB_NOTFOUND && ret != DB_KEYEMPTY) || - !LF_ISSET(DB_CREATE)) - goto err; -+ if (IS_REP_CLIENT(env) && -+ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { -+ ret = __db_rdonly(env, "DB_SEQUENCE->open"); -+ goto err; -+ } - ret = 0; - - rp = &seq->seq_record; -*************** -*** 296,302 **** - */ - rp = seq->seq_data.data; - if (rp->seq_version == DB_SEQUENCE_OLDVER) { -! oldver: rp->seq_version = DB_SEQUENCE_VERSION; - if (!F_ISSET(env, ENV_LITTLEENDIAN)) { - if (IS_DB_AUTO_COMMIT(dbp, txn)) { - if ((ret = ---- 305,316 ---- - */ - rp = seq->seq_data.data; - if (rp->seq_version == DB_SEQUENCE_OLDVER) { -! oldver: if (IS_REP_CLIENT(env) && -! !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { -! ret = __db_rdonly(env, "DB_SEQUENCE->open"); -! goto err; -! } -! rp->seq_version = DB_SEQUENCE_VERSION; - if (!F_ISSET(env, ENV_LITTLEENDIAN)) { - if (IS_DB_AUTO_COMMIT(dbp, txn)) { - if ((ret = -*************** -*** 707,712 **** ---- 721,733 ---- - - MUTEX_LOCK(env, seq->mtx_seq); - -+ if (handle_check && IS_REP_CLIENT(env) && -+ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { -+ ret = __db_rdonly(env, "DB_SEQUENCE->get"); -+ goto err; -+ } -+ -+ - if (rp->seq_min + delta > rp->seq_max) { - __db_errx(env, "Sequence overflow"); - ret = EINVAL; Deleted: csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.2 =================================================================== --- csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.2 2009-09-30 15:41:26 UTC (rev 6627) +++ csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.2 2009-09-30 15:46:02 UTC (rev 6628) @@ -1,71 +0,0 @@ -Index: lock/lock.c -=================================================================== -RCS file: /a/CVSROOT/db/lock/lock.c,v -retrieving revision 12.61 -diff -c -r12.61 lock.c -*** lock/lock.c 22 Jul 2008 12:08:53 -0000 12.61 ---- lock/lock.c 19 Aug 2008 17:28:24 -0000 -*************** -*** 1278,1287 **** - SH_TAILQ_REMOVE( - <->obj_tab[obj_ndx], sh_obj, links, __db_lockobj); - if (sh_obj->lockobj.size > sizeof(sh_obj->objdata)) { -! LOCK_REGION_LOCK(env); - __env_alloc_free(<->reginfo, - SH_DBT_PTR(&sh_obj->lockobj)); -! LOCK_REGION_UNLOCK(env); - } - SH_TAILQ_INSERT_HEAD( - &FREE_OBJS(lt, part_id), sh_obj, links, __db_lockobj); ---- 1278,1289 ---- - SH_TAILQ_REMOVE( - <->obj_tab[obj_ndx], sh_obj, links, __db_lockobj); - if (sh_obj->lockobj.size > sizeof(sh_obj->objdata)) { -! if (region->part_t_size != 1) -! LOCK_REGION_LOCK(env); - __env_alloc_free(<->reginfo, - SH_DBT_PTR(&sh_obj->lockobj)); -! if (region->part_t_size != 1) -! LOCK_REGION_UNLOCK(env); - } - SH_TAILQ_INSERT_HEAD( - &FREE_OBJS(lt, part_id), sh_obj, links, __db_lockobj); -*************** -*** 1470,1484 **** - if (obj->size <= sizeof(sh_obj->objdata)) - p = sh_obj->objdata; - else { -! LOCK_REGION_LOCK(env); - if ((ret = - __env_alloc(<->reginfo, obj->size, &p)) != 0) { - __db_errx(env, - "No space for lock object storage"); -! LOCK_REGION_UNLOCK(env); - goto err; - } -! LOCK_REGION_UNLOCK(env); - } - - memcpy(p, obj->data, obj->size); ---- 1472,1492 ---- - if (obj->size <= sizeof(sh_obj->objdata)) - p = sh_obj->objdata; - else { -! /* -! * If we have only one partition, the region is locked. -! */ -! if (region->part_t_size != 1) -! LOCK_REGION_LOCK(env); - if ((ret = - __env_alloc(<->reginfo, obj->size, &p)) != 0) { - __db_errx(env, - "No space for lock object storage"); -! if (region->part_t_size != 1) -! LOCK_REGION_UNLOCK(env); - goto err; - } -! if (region->part_t_size != 1) -! LOCK_REGION_UNLOCK(env); - } - - memcpy(p, obj->data, obj->size); Deleted: csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.3 =================================================================== --- csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.3 2009-09-30 15:41:26 UTC (rev 6627) +++ csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.3 2009-09-30 15:46:02 UTC (rev 6628) @@ -1,314 +0,0 @@ -*** lock/lock_deadlock.c 2008-03-11 00:31:33.000000000 +1100 ---- lock/lock_deadlock.c 2008-12-16 21:54:18.000000000 +1100 -*************** -*** 121,127 **** - DB_LOCKTAB *lt; - db_timespec now; - locker_info *idmap; -! u_int32_t *bitmap, *copymap, **deadp, **free_me, *tmpmap; - u_int32_t i, cid, keeper, killid, limit, nalloc, nlockers; - u_int32_t lock_max, txn_max; - int ret, status; ---- 121,127 ---- - DB_LOCKTAB *lt; - db_timespec now; - locker_info *idmap; -! u_int32_t *bitmap, *copymap, **deadp, **deadlist, *tmpmap; - u_int32_t i, cid, keeper, killid, limit, nalloc, nlockers; - u_int32_t lock_max, txn_max; - int ret, status; -*************** -*** 133,139 **** - if (IS_REP_CLIENT(env)) - atype = DB_LOCK_MINWRITE; - -! free_me = NULL; - - lt = env->lk_handle; - if (rejectp != NULL) ---- 133,140 ---- - if (IS_REP_CLIENT(env)) - atype = DB_LOCK_MINWRITE; - -! copymap = tmpmap = NULL; -! deadlist = NULL; - - lt = env->lk_handle; - if (rejectp != NULL) -*************** -*** 179,189 **** - memcpy(copymap, bitmap, nlockers * sizeof(u_int32_t) * nalloc); - - if ((ret = __os_calloc(env, sizeof(u_int32_t), nalloc, &tmpmap)) != 0) -! goto err1; - - /* Find a deadlock. */ - if ((ret = -! __dd_find(env, bitmap, idmap, nlockers, nalloc, &deadp)) != 0) - return (ret); - - /* ---- 180,190 ---- - memcpy(copymap, bitmap, nlockers * sizeof(u_int32_t) * nalloc); - - if ((ret = __os_calloc(env, sizeof(u_int32_t), nalloc, &tmpmap)) != 0) -! goto err; - - /* Find a deadlock. */ - if ((ret = -! __dd_find(env, bitmap, idmap, nlockers, nalloc, &deadlist)) != 0) - return (ret); - - /* -*************** -*** 204,211 **** - txn_max = TXN_MAXIMUM; - - killid = BAD_KILLID; -! free_me = deadp; -! for (; *deadp != NULL; deadp++) { - if (rejectp != NULL) - ++*rejectp; - killid = (u_int32_t)(*deadp - bitmap) / nalloc; ---- 205,211 ---- - txn_max = TXN_MAXIMUM; - - killid = BAD_KILLID; -! for (deadp = deadlist; *deadp != NULL; deadp++) { - if (rejectp != NULL) - ++*rejectp; - killid = (u_int32_t)(*deadp - bitmap) / nalloc; -*************** -*** 342,352 **** - __db_msg(env, - "Aborting locker %lx", (u_long)idmap[killid].id); - } -! __os_free(env, tmpmap); -! err1: __os_free(env, copymap); -! -! err: if (free_me != NULL) -! __os_free(env, free_me); - __os_free(env, bitmap); - __os_free(env, idmap); - ---- 342,353 ---- - __db_msg(env, - "Aborting locker %lx", (u_long)idmap[killid].id); - } -! err: if(copymap != NULL) -! __os_free(env, copymap); -! if (deadlist != NULL) -! __os_free(env, deadlist); -! if(tmpmap != NULL) -! __os_free(env, tmpmap); - __os_free(env, bitmap); - __os_free(env, idmap); - -*************** -*** 360,365 **** ---- 361,377 ---- - - #define DD_INVALID_ID ((u_int32_t) -1) - -+ /* -+ * __dd_build -- -+ * Build the lock dependency bit maps. -+ * Notes on syncronization: -+ * LOCK_SYSTEM_LOCK is used to hold objects locked when we have -+ * a single partition. -+ * LOCK_LOCKERS is held while we are walking the lockers list and -+ * to single thread the use of lockerp->dd_id. -+ * LOCK_DD protects the DD list of objects. -+ */ -+ - static int - __dd_build(env, atype, bmp, nlockers, allocp, idmap, rejectp) - ENV *env; -*************** -*** 393,398 **** ---- 405,411 ---- - * In particular we do not build the conflict array and our caller - * needs to expect this. - */ -+ LOCK_SYSTEM_LOCK(lt, region); - if (atype == DB_LOCK_EXPIRE) { - skip: LOCK_DD(env, region); - op = SH_TAILQ_FIRST(®ion->dd_objs, __db_lockobj); -*************** -*** 430,446 **** - OBJECT_UNLOCK(lt, region, indx); - } - UNLOCK_DD(env, region); - goto done; - } - - /* -! * We'll check how many lockers there are, add a few more in for -! * good measure and then allocate all the structures. Then we'll -! * verify that we have enough room when we go back in and get the -! * mutex the second time. - */ -! retry: count = region->stat.st_nlockers; - if (count == 0) { - *nlockers = 0; - return (0); - } ---- 443,460 ---- - OBJECT_UNLOCK(lt, region, indx); - } - UNLOCK_DD(env, region); -+ LOCK_SYSTEM_UNLOCK(lt, region); - goto done; - } - - /* -! * Allocate after locking the region -! * to make sure the structures are large enough. - */ -! LOCK_LOCKERS(env, region); -! count = region->stat.st_nlockers; - if (count == 0) { -+ UNLOCK_LOCKERS(env, region); - *nlockers = 0; - return (0); - } -*************** -*** 448,497 **** - if (FLD_ISSET(env->dbenv->verbose, DB_VERB_DEADLOCK)) - __db_msg(env, "%lu lockers", (u_long)count); - -- count += 20; - nentries = (u_int32_t)DB_ALIGN(count, 32) / 32; - -! /* -! * Allocate enough space for a count by count bitmap matrix. -! * -! * XXX -! * We can probably save the malloc's between iterations just -! * reallocing if necessary because count grew by too much. -! */ - if ((ret = __os_calloc(env, (size_t)count, -! sizeof(u_int32_t) * nentries, &bitmap)) != 0) - return (ret); - - if ((ret = __os_calloc(env, - sizeof(u_int32_t), nentries, &tmpmap)) != 0) { - __os_free(env, bitmap); - return (ret); - } - - if ((ret = __os_calloc(env, - (size_t)count, sizeof(locker_info), &id_array)) != 0) { - __os_free(env, bitmap); - __os_free(env, tmpmap); - return (ret); - } - - /* -- * Now go back in and actually fill in the matrix. -- */ -- if (region->stat.st_nlockers > count) { -- __os_free(env, bitmap); -- __os_free(env, tmpmap); -- __os_free(env, id_array); -- goto retry; -- } -- -- /* - * First we go through and assign each locker a deadlock detector id. - */ - id = 0; -- LOCK_LOCKERS(env, region); - SH_TAILQ_FOREACH(lip, ®ion->lockers, ulinks, __db_locker) { - if (lip->master_locker == INVALID_ROFF) { - lip->dd_id = id++; - id_array[lip->dd_id].id = lip->id; - switch (atype) { ---- 462,498 ---- - if (FLD_ISSET(env->dbenv->verbose, DB_VERB_DEADLOCK)) - __db_msg(env, "%lu lockers", (u_long)count); - - nentries = (u_int32_t)DB_ALIGN(count, 32) / 32; - -! /* Allocate enough space for a count by count bitmap matrix. */ - if ((ret = __os_calloc(env, (size_t)count, -! sizeof(u_int32_t) * nentries, &bitmap)) != 0) { -! UNLOCK_LOCKERS(env, region); - return (ret); -+ } - - if ((ret = __os_calloc(env, - sizeof(u_int32_t), nentries, &tmpmap)) != 0) { -+ UNLOCK_LOCKERS(env, region); - __os_free(env, bitmap); - return (ret); - } - - if ((ret = __os_calloc(env, - (size_t)count, sizeof(locker_info), &id_array)) != 0) { -+ UNLOCK_LOCKERS(env, region); - __os_free(env, bitmap); - __os_free(env, tmpmap); - return (ret); - } - - /* - * First we go through and assign each locker a deadlock detector id. - */ - id = 0; - SH_TAILQ_FOREACH(lip, ®ion->lockers, ulinks, __db_locker) { - if (lip->master_locker == INVALID_ROFF) { -+ DB_ASSERT(env, id < count); - lip->dd_id = id++; - id_array[lip->dd_id].id = lip->id; - switch (atype) { -*************** -*** 510,516 **** - lip->dd_id = DD_INVALID_ID; - - } -- UNLOCK_LOCKERS(env, region); - - /* - * We only need consider objects that have waiters, so we use ---- 511,516 ---- -*************** -*** 669,675 **** - * status after building the bit maps so that we will not detect - * a blocked transaction without noting that it is already aborting. - */ -- LOCK_LOCKERS(env, region); - for (id = 0; id < count; id++) { - if (!id_array[id].valid) - continue; ---- 669,674 ---- -*************** -*** 738,743 **** ---- 737,743 ---- - id_array[id].in_abort = 1; - } - UNLOCK_LOCKERS(env, region); -+ LOCK_SYSTEM_UNLOCK(lt, region); - - /* - * Now we can release everything except the bitmap matrix that we -*************** -*** 839,844 **** ---- 839,845 ---- - ret = 0; - - /* We must lock so this locker cannot go away while we abort it. */ -+ LOCK_SYSTEM_LOCK(lt, region); - LOCK_LOCKERS(env, region); - - /* -*************** -*** 895,900 **** ---- 896,902 ---- - done: OBJECT_UNLOCK(lt, region, info->last_ndx); - err: - out: UNLOCK_LOCKERS(env, region); -+ LOCK_SYSTEM_UNLOCK(lt, region); - return (ret); - } - Deleted: csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.4 =================================================================== --- csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.4 2009-09-30 15:41:26 UTC (rev 6627) +++ csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.4 2009-09-30 15:46:02 UTC (rev 6628) @@ -1,183 +0,0 @@ -*** dbinc/repmgr.h.orig 2009-05-04 10:33:55.000000000 -0400 ---- dbinc/repmgr.h 2009-05-04 10:27:26.000000000 -0400 -*************** -*** 374,379 **** ---- 374,380 ---- - #define SITE_FROM_EID(eid) (&db_rep->sites[eid]) - #define EID_FROM_SITE(s) ((int)((s) - (&db_rep->sites[0]))) - #define IS_VALID_EID(e) ((e) >= 0) -+ #define IS_KNOWN_REMOTE_SITE(e) ((e) >= 0 && ((u_int)(e)) < db_rep->site_cnt) - #define SELF_EID INT_MAX - - #define IS_PEER_POLICY(p) ((p) == DB_REPMGR_ACKS_ALL_PEERS || \ -*** rep/rep_elect.c.orig 2009-05-04 10:35:50.000000000 -0400 ---- rep/rep_elect.c 2009-05-04 10:31:24.000000000 -0400 -*************** -*** 33,39 **** - static int __rep_fire_elected __P((ENV *, REP *, u_int32_t)); - static void __rep_elect_master __P((ENV *, REP *)); - static int __rep_tally __P((ENV *, REP *, int, u_int32_t *, u_int32_t, roff_t)); -! static int __rep_wait __P((ENV *, db_timeout_t *, int *, int, u_int32_t)); - - /* - * __rep_elect -- ---- 33,39 ---- - static int __rep_fire_elected __P((ENV *, REP *, u_int32_t)); - static void __rep_elect_master __P((ENV *, REP *)); - static int __rep_tally __P((ENV *, REP *, int, u_int32_t *, u_int32_t, roff_t)); -! static int __rep_wait __P((ENV *, db_timeout_t *, int, u_int32_t)); - - /* - * __rep_elect -- -*************** -*** 55,61 **** - ENV *env; - LOG *lp; - REP *rep; -! int done, eid, elected, full_elect, locked, in_progress, need_req; - int ret, send_vote, t_ret; - u_int32_t ack, ctlflags, egen, nsites, orig_tally, priority, realpri; - u_int32_t tiebreaker; ---- 55,61 ---- - ENV *env; - LOG *lp; - REP *rep; -! int done, elected, full_elect, locked, in_progress, need_req; - int ret, send_vote, t_ret; - u_int32_t ack, ctlflags, egen, nsites, orig_tally, priority, realpri; - u_int32_t tiebreaker; -*************** -*** 181,188 **** - REP_SYSTEM_UNLOCK(env); - (void)__rep_send_message(env, DB_EID_BROADCAST, - REP_MASTER_REQ, NULL, NULL, 0, 0); -! ret = __rep_wait(env, &to, &eid, -! 0, REP_F_EPHASE0); - REP_SYSTEM_LOCK(env); - F_CLR(rep, REP_F_EPHASE0); - switch (ret) { ---- 181,187 ---- - REP_SYSTEM_UNLOCK(env); - (void)__rep_send_message(env, DB_EID_BROADCAST, - REP_MASTER_REQ, NULL, NULL, 0, 0); -! ret = __rep_wait(env, &to, 0, REP_F_EPHASE0); - REP_SYSTEM_LOCK(env); - F_CLR(rep, REP_F_EPHASE0); - switch (ret) { -*************** -*** 286,296 **** - REP_SYSTEM_LOCK(env); - goto vote; - } -! ret = __rep_wait(env, &to, &eid, full_elect, REP_F_EPHASE1); - switch (ret) { - case 0: - /* Check if election complete or phase complete. */ -! if (eid != DB_EID_INVALID && !IN_ELECTION(rep)) { - RPRINT(env, DB_VERB_REP_ELECT, - (env, "Ended election phase 1")); - goto edone; ---- 285,295 ---- - REP_SYSTEM_LOCK(env); - goto vote; - } -! ret = __rep_wait(env, &to, full_elect, REP_F_EPHASE1); - switch (ret) { - case 0: - /* Check if election complete or phase complete. */ -! if (!IN_ELECTION(rep)) { - RPRINT(env, DB_VERB_REP_ELECT, - (env, "Ended election phase 1")); - goto edone; -*************** -*** 398,412 **** - REP_SYSTEM_LOCK(env); - goto i_won; - } -! ret = __rep_wait(env, &to, &eid, full_elect, REP_F_EPHASE2); - RPRINT(env, DB_VERB_REP_ELECT, - (env, "Ended election phase 2 %d", ret)); - switch (ret) { - case 0: -! if (eid != DB_EID_INVALID) -! goto edone; -! ret = DB_REP_UNAVAIL; -! break; - case DB_REP_EGENCHG: - if (to > timeout) - to = timeout; ---- 397,408 ---- - REP_SYSTEM_LOCK(env); - goto i_won; - } -! ret = __rep_wait(env, &to, full_elect, REP_F_EPHASE2); - RPRINT(env, DB_VERB_REP_ELECT, - (env, "Ended election phase 2 %d", ret)); - switch (ret) { - case 0: -! goto edone; - case DB_REP_EGENCHG: - if (to > timeout) - to = timeout; -*************** -*** 1050,1062 **** - ENV *env; - REP *rep; - { -- /* -- * We often come through here twice, sometimes even more. We mustn't -- * let the redundant calls affect stats counting. But rep_elect relies -- * on this first part for setting eidp. -- */ -- rep->master_id = rep->eid; -- - if (F_ISSET(rep, REP_F_MASTERELECT | REP_F_MASTER)) { - /* We've been through here already; avoid double counting. */ - return; ---- 1046,1051 ---- -*************** -*** 1093,1102 **** - (timeout > 5000000) ? 500000 : ((timeout >= 10) ? timeout / 10 : 1); - - static int -! __rep_wait(env, timeoutp, eidp, full_elect, flags) - ENV *env; - db_timeout_t *timeoutp; -! int *eidp, full_elect; - u_int32_t flags; - { - DB_REP *db_rep; ---- 1082,1091 ---- - (timeout > 5000000) ? 500000 : ((timeout >= 10) ? timeout / 10 : 1); - - static int -! __rep_wait(env, timeoutp, full_elect, flags) - ENV *env; - db_timeout_t *timeoutp; -! int full_elect; - u_int32_t flags; - { - DB_REP *db_rep; -*************** -*** 1174,1180 **** - F_CLR(rep, REP_F_EGENUPDATE); - ret = DB_REP_EGENCHG; - } else if (phase_over) { -- *eidp = rep->master_id; - done = 1; - ret = 0; - } ---- 1163,1168 ---- -*** repmgr/repmgr_net.c.orig 2009-05-04 10:34:46.000000000 -0400 ---- repmgr/repmgr_net.c 2009-05-04 10:27:26.000000000 -0400 -*************** -*** 100,105 **** ---- 100,107 ---- - control, rec, &nsites_sent, &npeers_sent)) != 0) - goto out; - } else { -+ DB_ASSERT(env, IS_KNOWN_REMOTE_SITE(eid)); -+ - /* - * If this is a request that can be sent anywhere, then see if - * we can send it to our peer (to save load on the master), but This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Wed Sep 30 20:37:22 2009 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Wed, 30 Sep 2009 18:37:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[6630] csw/mgar/pkg/gvim/trunk/Makefile Message-ID: Revision: 6630 http://gar.svn.sourceforge.net/gar/?rev=6630&view=rev Author: harpchad Date: 2009-09-30 18:37:22 +0000 (Wed, 30 Sep 2009) Log Message: ----------- Fix X11 paths Modified Paths: -------------- csw/mgar/pkg/gvim/trunk/Makefile Modified: csw/mgar/pkg/gvim/trunk/Makefile =================================================================== --- csw/mgar/pkg/gvim/trunk/Makefile 2009-09-30 15:47:24 UTC (rev 6629) +++ csw/mgar/pkg/gvim/trunk/Makefile 2009-09-30 18:37:22 UTC (rev 6630) @@ -31,6 +31,9 @@ WORKSRC = $(WORKDIR)/$(GARNAME)$(subst .,,$(DISTVERSION)) +EXTRA_PKG_CONFIG_DIRS = /opt/csw/X11/lib +EXTRA_LDFLAGS = -R /opt/csw/X11/lib + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-global-runtime=$(sharedstatedir)/$(GARNAME) CONFIGURE_ARGS += --with-features=huge @@ -39,7 +42,10 @@ CONFIGURE_ARGS += --enable-cscope CONFIGURE_ARGS += --with-vim-name="vim-x11" CONFIGURE_ARGS += --enable-gui=gnome2 +CONFIGURE_ARGS += --x-includes=/opt/csw/X11/include +CONFIGURE_ARGS += --x-libraries=/opt/csw/X11/lib + BUILD_ARGS = "VIMRCLOC=/opt/csw/share/vim" BUILD_ARGS += "VIMRUNTIMEDIR=/opt/csw/share/vim/vim72" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Wed Sep 30 20:43:44 2009 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Wed, 30 Sep 2009 18:43:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[6631] csw/mgar/pkg/gvim/trunk/Makefile Message-ID: Revision: 6631 http://gar.svn.sourceforge.net/gar/?rev=6631&view=rev Author: harpchad Date: 2009-09-30 18:43:43 +0000 (Wed, 30 Sep 2009) Log Message: ----------- Add missing depend Modified Paths: -------------- csw/mgar/pkg/gvim/trunk/Makefile Modified: csw/mgar/pkg/gvim/trunk/Makefile =================================================================== --- csw/mgar/pkg/gvim/trunk/Makefile 2009-09-30 18:37:22 UTC (rev 6630) +++ csw/mgar/pkg/gvim/trunk/Makefile 2009-09-30 18:43:43 UTC (rev 6631) @@ -56,7 +56,7 @@ REQUIRED_PKGS_CSWgvim += CSWiconv CSWlibart CSWlibatk CSWlibbonoboui CSWlibcairo REQUIRED_PKGS_CSWgvim += CSWlibgnome CSWlibgnomecanvas CSWlibgnomeui CSWlibpopt REQUIRED_PKGS_CSWgvim += CSWlibxml2 CSWlibxrender CSWncurses CSWorbit2 CSWpango -REQUIRED_PKGS_CSWgvim += CSWperl CSWpng CSWzlib +REQUIRED_PKGS_CSWgvim += CSWperl CSWpng CSWzlib CSWlibx11 INSTALL_SCRIPTS = minimal This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Sep 30 22:38:04 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 30 Sep 2009 20:38:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[6632] csw/mgar/pkg/x11 Message-ID: Revision: 6632 http://gar.svn.sourceforge.net/gar/?rev=6632&view=rev Author: wbonnet Date: 2009-09-30 20:38:04 +0000 (Wed, 30 Sep 2009) Log Message: ----------- Add the x11 prefix Modified Paths: -------------- csw/mgar/pkg/x11/x11_appleproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_appleproto/ Removed Paths: ------------- csw/mgar/pkg/x11/applewmproto/ Modified: csw/mgar/pkg/x11/x11_appleproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/applewmproto/trunk/Makefile 2009-09-29 15:47:36 UTC (rev 6612) +++ csw/mgar/pkg/x11/x11_appleproto/trunk/Makefile 2009-09-30 20:38:04 UTC (rev 6632) @@ -1,6 +1,8 @@ -GARNAME = applewmproto +PROTONAME = applewmproto GARVERSION = 1.4.1 CATEGORIES = x11 +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = AppleWM extension headers from X.org define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(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 +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11applewmproto +CATALOGNAME_CSWx11applewmproto = x11_applewmproto + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Sep 30 22:38:57 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 30 Sep 2009 20:38:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[6633] csw/mgar/pkg/x11 Message-ID: Revision: 6633 http://gar.svn.sourceforge.net/gar/?rev=6633&view=rev Author: wbonnet Date: 2009-09-30 20:38:57 +0000 (Wed, 30 Sep 2009) Log Message: ----------- fix directory name Added Paths: ----------- csw/mgar/pkg/x11/x11_applewmproto/ Removed Paths: ------------- csw/mgar/pkg/x11/x11_appleproto/ 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 Sep 1 11:48:33 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Sep 2009 09:48:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[6151] csw/mgar/pkg/pigz/trunk/Makefile Message-ID: Revision: 6151 http://gar.svn.sourceforge.net/gar/?rev=6151&view=rev Author: dmichelsen Date: 2009-09-01 09:48:33 +0000 (Tue, 01 Sep 2009) Log Message: ----------- pigz: Disable unneeded ISAs, set runpath and add unpigz Modified Paths: -------------- csw/mgar/pkg/pigz/trunk/Makefile Modified: csw/mgar/pkg/pigz/trunk/Makefile =================================================================== --- csw/mgar/pkg/pigz/trunk/Makefile 2009-08-31 15:52:29 UTC (rev 6150) +++ csw/mgar/pkg/pigz/trunk/Makefile 2009-09-01 09:48:33 UTC (rev 6151) @@ -26,7 +26,8 @@ REQUIRED_PKGS = CSWzlib -REQUESTED_ISAS = $(ISALIST_$(GARCOMPILER)) +# Optimization show effects < 5% +#REQUESTED_ISAS = $(ISALIST_$(GARCOMPILER)) CONFIGURE_SCRIPTS = BUILD_SCRIPTS = custom @@ -38,12 +39,13 @@ build-custom: cd $(WORKSRC) && $(CC) $(CFLAGS) -c yarn.c cd $(WORKSRC) && $(CC) $(CFLAGS) -c pigz.c - cd $(WORKSRC) && $(CC) $(LDFLAGS) -o pigz yarn.o pigz.o -lpthread -lz + cd $(WORKSRC) && LD_OPTIONS="$(LD_OPTIONS)" $(CC) $(LDFLAGS) -o pigz yarn.o pigz.o -lpthread -lz @$(MAKECOOKIE) install-custom: ginstall -d $(DESTDIR)$(bindir) ginstall $(WORKSRC)/pigz $(DESTDIR)$(bindir) + cd $(DESTDIR)$(bindir) && gln pigz unpigz ginstall -d $(DESTDIR)$(mandir)/man1 ginstall $(WORKSRC)/pigz.1 $(DESTDIR)$(mandir)/man1 ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Tue Sep 1 18:04:02 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Tue, 01 Sep 2009 16:04:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[6152] csw/mgar/pkg Message-ID: Revision: 6152 http://gar.svn.sourceforge.net/gar/?rev=6152&view=rev Author: idogan23 Date: 2009-09-01 16:04:02 +0000 (Tue, 01 Sep 2009) Log Message: ----------- freeradius: Initial commit Added Paths: ----------- csw/mgar/pkg/freeradius/ csw/mgar/pkg/freeradius/branches/ csw/mgar/pkg/freeradius/tags/ csw/mgar/pkg/freeradius/trunk/ csw/mgar/pkg/freeradius/trunk/Makefile csw/mgar/pkg/freeradius/trunk/checksums csw/mgar/pkg/freeradius/trunk/files/ Property changes on: csw/mgar/pkg/freeradius/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/freeradius/trunk/Makefile =================================================================== --- csw/mgar/pkg/freeradius/trunk/Makefile (rev 0) +++ csw/mgar/pkg/freeradius/trunk/Makefile 2009-09-01 16:04:02 UTC (rev 6152) @@ -0,0 +1,52 @@ +GARNAME = freeradius +GARVERSION = 2.1.6 +CATEGORIES = server + +DESCRIPTION = A free RADIUS server implementation +define BLURB + A free RADIUS server implementation +endef + +MASTER_SITES = http://freeradius.org/ +DISTFILES = $(GARNAME)-server-$(GARVERSION).tar.gz +DISTNAME = $(GARNAME)-server-$(GARVERSION) + +# 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 = GCC3 + +STRIP_LIBTOOL = 1 + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-system-libtool +CONFIGURE_ARGS += --without-rlm_sqlippool +CONFIGURE_ARGS += --without-rlm_sql_mysql +CONFIGURE_ARGS += --without-rlm_sql_postgresql +CONFIGURE_ARGS += --without-rlm_sql_db2 +CONFIGURE_ARGS += --without-rlm_sql_firebird +CONFIGURE_ARGS += --without-rlm_sql_freetds +CONFIGURE_ARGS += --without-rlm_sql_iodbc +CONFIGURE_ARGS += --without-rlm_sql_oracle +CONFIGURE_ARGS += --without-rlm_sql_sybase +CONFIGURE_ARGS += --without-rlm_sql_unixodbc +CONFIGURE_ARGS += --without-rlm-ldap +CONFIGURE_ARGS += --without-rlm_eap_ikev2 +CONFIGURE_ARGS += --without-rlm_eap_sim +CONFIGURE_ARGS += --without-rlm_eap_tls +CONFIGURE_ARGS += --without-rlm_eap_peap +CONFIGURE_ARGS += --without-rlm_eap_ttls +CONFIGURE_ARGS += --without-rlm_eap_tnc +CONFIGURE_ARGS += --without-rlm_krb5 +CONFIGURE_ARGS += --without-rlm_dbm +CONFIGURE_ARGS += --without-rlm_otp +CONFIGURE_ARGS += --without-rlm_pam +CONFIGURE_ARGS += --without-rlm_python +CONFIGURE_ARGS += --without-snmp + +include gar/category.mk +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/freeradius/trunk/checksums =================================================================== --- csw/mgar/pkg/freeradius/trunk/checksums (rev 0) +++ csw/mgar/pkg/freeradius/trunk/checksums 2009-09-01 16:04:02 UTC (rev 6152) @@ -0,0 +1 @@ +078f7d29b4d2d34f7c992abf772c28a0 download/freeradius-server-2.1.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 Tue Sep 1 18:28:18 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Sep 2009 16:28:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[6153] csw/mgar/pkg/libxml2/trunk/Makefile Message-ID: Revision: 6153 http://gar.svn.sourceforge.net/gar/?rev=6153&view=rev Author: dmichelsen Date: 2009-09-01 16:28:18 +0000 (Tue, 01 Sep 2009) Log Message: ----------- libxml2: Adjust catalog name of python module to be prefixed with py_ and set package descriptions Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2009-09-01 16:04:02 UTC (rev 6152) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2009-09-01 16:28:18 UTC (rev 6153) @@ -17,8 +17,12 @@ CATALOGNAME_CSWlibxml2 = libxml2 CATALOGNAME_CSWlibxml2devel = libxml2_devel -CATALOGNAME_CSWpylibxml2 = pylibxml2 +CATALOGNAME_CSWpylibxml2 = py_libxml2 +SPKG_DESC_CSWlibxml2 = XML Parser Library +SPKG_DESC_CSWlibxml2devel = XML Parser Library Developer Files +SPKG_DESC_CSWpylibxml2 = XML Parser Library Python Bindings + REQUIRED_PKGS_CSWlibxml2 = CSWiconv CSWzlib REQUIRED_PKGS_CSWlibxml2devel = CSWlibxml2 REQUIRED_PKGS_CSWpylibxml2 = CSWpython CSWlibxml2 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 Sep 1 20:12:04 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 01 Sep 2009 18:12:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[6154] csw/mgar/pkg/unixodbc/trunk Message-ID: Revision: 6154 http://gar.svn.sourceforge.net/gar/?rev=6154&view=rev Author: wahwah Date: 2009-09-01 18:12:04 +0000 (Tue, 01 Sep 2009) Log Message: ----------- unixodbc: Postinstall script which helps migrate configuration files to /etc/opt/csw. Modified Paths: -------------- csw/mgar/pkg/unixodbc/trunk/Makefile csw/mgar/pkg/unixodbc/trunk/checksums Added Paths: ----------- csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall Modified: csw/mgar/pkg/unixodbc/trunk/Makefile =================================================================== --- csw/mgar/pkg/unixodbc/trunk/Makefile 2009-09-01 16:28:18 UTC (rev 6153) +++ csw/mgar/pkg/unixodbc/trunk/Makefile 2009-09-01 18:12:04 UTC (rev 6154) @@ -10,33 +10,19 @@ define BLURB It does stuff with things endef - DL_NAME = unixODBC - MASTER_SITES = http://www.unixodbc.org/ DISTFILES = $(DL_NAME)-$(GARVERSION).tar.gz +DISTFILES += CSWunixodbc.postinstall WORKSRC = $(WORKDIR)/$(DL_NAME)-$(GARVERSION) - -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz - -SPKG_CLASSES = none cswcpsampleconf - +UFILES_REGEX = $(DL_NAME)-(\d+(?:\.\d+)*).tar.gz REQUIRED_PKGS = CSWiconv REQUIRED_PKGS += CSWreadline -REQUIRED_PKGS += CSWcswclassutils - sysconfdir = /etc/opt/csw localstatedir = /var/opt/csw - -CONFIGURE_ARGS = $(DIRPATHS) --enable-gui=no +CONFIGURE_ARGS = $(DIRPATHS) --enable-gui=no BUILD64 = 1 - -PROTOTYPE_FILTER = awk ' \ - $$$$3 ~ /\/etc\/opt\/csw\/.*\.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ - { print }' - - +SAMPLECONF = /\/etc\/opt\/csw\/.*\.CSW TEST_SCRIPTS = post-install-modulated: @@ -46,5 +32,4 @@ done) @$(MAKECOOKIE) - include gar/category.mk Modified: csw/mgar/pkg/unixodbc/trunk/checksums =================================================================== --- csw/mgar/pkg/unixodbc/trunk/checksums 2009-09-01 16:28:18 UTC (rev 6153) +++ csw/mgar/pkg/unixodbc/trunk/checksums 2009-09-01 18:12:04 UTC (rev 6154) @@ -1 +1,2 @@ +a3e220ed8b903f2bc8d8ac2654071f9a download/CSWunixodbc.postinstall f47c2efb28618ecf5f33319140a7acd0 download/unixODBC-2.2.14.tar.gz Added: csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall =================================================================== --- csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall (rev 0) +++ csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall 2009-09-01 18:12:04 UTC (rev 6154) @@ -0,0 +1,73 @@ +#!/bin/sh +# +# $Id$ +# +# vim:set sw=2 ts=2 sts=2 expandtab: +# +# # If old_path exists: +# # Create a file named {{old_path.THIS_LOCATION_IS_DEPRECATED}} and leave a message inside the file. +# # If new_path and new_path.CSW files are identical: +# # Remove new_path (it's only a copy of the .CSW default file, no data loss) +# # Create a symlink from new_path to old_path +# # Otherwise: +# # Create a file named {{old_path.THIS_FILE_IS_PROBABLY_UNUSED}} +# +# http://wiki.opencsw.org/configuration-directory-migration + +deprecated_info=" +This location (/opt/csw/etc) is deprecated. + +Configuration files are currently being placed in /etc/opt/csw. Please make +sure your new configuration is in /etc/opt/csw and remove the old one from +/opt/csw/etc. +" +deprecated_file_ext="THIS_LOCATION_IS_DEPRECATED" + +filepairs="/opt/csw/etc/odbc.ini:/etc/opt/csw/odbc.ini" +filepairs="${filepairs} /opt/csw/etc/odbcinst.ini:/etc/opt/csw/odbcinst.ini" +dirpairs="/opt/csw/etc/ODBCDataSources:/etc/opt/csw/ODBCDataSources" + +return_code=0 + +# Generated ../../../ when given a path like /etc/opt/csw/odbc.ini +gen_dubdots() { + echo "$1" \ + | sed -e 's+[^/]+.+g' \ + | sed -e 's+\.*$++g' \ + | tr -s . \ + | sed -e 's+\.+..+g' \ + | sed -e 's+^/++' +} + +files_are_identical() { + cmp "$1" "$2" > /dev/null +} + +drop_warning() { + echo "${deprecated_info}" > "$1.${deprecated_file_ext}" +} + +for ff in ${filepairs} ${dirpairs}; do + old_location=`echo ${ff} | awk -F: '{print $1}'` + new_location=`echo ${ff} | awk -F: '{print $2}'` + abs_old_location="${PKG_INSTSALL_ROOT}${old_location}" + abs_new_location="${PKG_INSTSALL_ROOT}${new_location}" + old_location_noslash=`echo "${old_location}" | sed -e 's+^/++'` + dubdots=`gen_dubdots "${new_location}"` + if [ -r "${abs_old_location}" ]; then + drop_warning "${abs_old_location}" + if [ -r "${abs_new_location}" ]; then + if files_are_identical "${abs_new_location}" "${abs_new_location}.CSW"; then + rm "${abs_new_location}" + ln -s "${dubdots}${old_location_noslash}" "${abs_new_location}" + else + touch "${abs_old_location}.THIS_FILE_IS_PROBABLY_UNUSED" + fi + else + # The file doesn't exist. + ln -s "${dubdots}${old_location_noslash}" "${abs_new_location}" + fi + fi +done + +exit "${return_code}" 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 Sep 1 20:22:23 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 01 Sep 2009 18:22:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6155] csw/mgar/pkg/unixodbc/trunk Message-ID: Revision: 6155 http://gar.svn.sourceforge.net/gar/?rev=6155&view=rev Author: wahwah Date: 2009-09-01 18:22:23 +0000 (Tue, 01 Sep 2009) Log Message: ----------- unixodbc: File migration postinstall, handling an already existing symbolic link Modified Paths: -------------- csw/mgar/pkg/unixodbc/trunk/checksums csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall Modified: csw/mgar/pkg/unixodbc/trunk/checksums =================================================================== --- csw/mgar/pkg/unixodbc/trunk/checksums 2009-09-01 18:12:04 UTC (rev 6154) +++ csw/mgar/pkg/unixodbc/trunk/checksums 2009-09-01 18:22:23 UTC (rev 6155) @@ -1,2 +1,2 @@ -a3e220ed8b903f2bc8d8ac2654071f9a download/CSWunixodbc.postinstall +ccfa98210f71e0322cf3cab3b5ddd0d0 download/CSWunixodbc.postinstall f47c2efb28618ecf5f33319140a7acd0 download/unixODBC-2.2.14.tar.gz Modified: csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall =================================================================== --- csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall 2009-09-01 18:12:04 UTC (rev 6154) +++ csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall 2009-09-01 18:22:23 UTC (rev 6155) @@ -56,7 +56,10 @@ dubdots=`gen_dubdots "${new_location}"` if [ -r "${abs_old_location}" ]; then drop_warning "${abs_old_location}" - if [ -r "${abs_new_location}" ]; then + if [ -h "${abs_new_location}" ]; then + # It's a symbolic link already, doing nothing. + true + elif [ -r "${abs_new_location}" ]; then if files_are_identical "${abs_new_location}" "${abs_new_location}.CSW"; then rm "${abs_new_location}" ln -s "${dubdots}${old_location_noslash}" "${abs_new_location}" @@ -64,7 +67,7 @@ touch "${abs_old_location}.THIS_FILE_IS_PROBABLY_UNUSED" fi else - # The file doesn't exist. + # The file or directory doesn't exist. ln -s "${dubdots}${old_location_noslash}" "${abs_new_location}" fi 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 Tue Sep 1 20:30:37 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 01 Sep 2009 18:30:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[6156] csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc. postinstall Message-ID: Revision: 6156 http://gar.svn.sourceforge.net/gar/?rev=6156&view=rev Author: wahwah Date: 2009-09-01 18:30:37 +0000 (Tue, 01 Sep 2009) Log Message: ----------- unixodbc: Setting the Id keyword on the postinstall script Property Changed: ---------------- csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall Property changes on: csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall ___________________________________________________________________ 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 Sep 1 20:38:33 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 01 Sep 2009 18:38:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[6157] csw/mgar/pkg/unixodbc/trunk/checksums Message-ID: Revision: 6157 http://gar.svn.sourceforge.net/gar/?rev=6157&view=rev Author: wahwah Date: 2009-09-01 18:38:33 +0000 (Tue, 01 Sep 2009) Log Message: ----------- unixodbc: Updating the checksums Modified Paths: -------------- csw/mgar/pkg/unixodbc/trunk/checksums Modified: csw/mgar/pkg/unixodbc/trunk/checksums =================================================================== --- csw/mgar/pkg/unixodbc/trunk/checksums 2009-09-01 18:30:37 UTC (rev 6156) +++ csw/mgar/pkg/unixodbc/trunk/checksums 2009-09-01 18:38:33 UTC (rev 6157) @@ -1,2 +1,2 @@ -ccfa98210f71e0322cf3cab3b5ddd0d0 download/CSWunixodbc.postinstall +81eb84115b647ee2e95c69882de7a415 download/CSWunixodbc.postinstall f47c2efb28618ecf5f33319140a7acd0 download/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 wahwah at users.sourceforge.net Wed Sep 2 08:15:21 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 02 Sep 2009 06:15:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[6158] csw/mgar/pkg/wxwidgets/trunk/Makefile Message-ID: Revision: 6158 http://gar.svn.sourceforge.net/gar/?rev=6158&view=rev Author: wahwah Date: 2009-09-02 06:15:21 +0000 (Wed, 02 Sep 2009) Log Message: ----------- wxwidgets: Adding the contrib module Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-09-01 18:38:33 UTC (rev 6157) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-09-02 06:15:21 UTC (rev 6158) @@ -78,4 +78,11 @@ EXTRA_LIB = /opt/csw/X11/lib PKG_CONFIG_PATH = /opt/csw/lib/pkgconfig:/opt/csw/X11/lib/pkgconfig +INSTALL_SCRIPTS = wxwidgets + +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 dmichelsen at users.sourceforge.net Wed Sep 2 10:08:23 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 02 Sep 2009 08:08:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6159] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 6159 http://gar.svn.sourceforge.net/gar/?rev=6159&view=rev Author: dmichelsen Date: 2009-09-02 08:08:23 +0000 (Wed, 02 Sep 2009) Log Message: ----------- mGAR v2: Fix reinstall so that it works for custom targets too Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-09-02 06:15:21 UTC (rev 6158) +++ csw/mgar/gar/v2/gar.mk 2009-09-02 08:08:23 UTC (rev 6159) @@ -493,6 +493,7 @@ @rm -f $(foreach C,pre-install-modulated install-modulated post-install-modulated,$(COOKIEDIR)/$C) @rm -f $(COOKIEDIR)/pre-install-$(MODULATION) $(COOKIEDIR)/post-install-$(MODULATION) @rm -f $(COOKIEDIR)/strip + @rm -f $(foreach S,$(INSTALL_TARGETS),$(COOKIEDIR)/$S) @rm -f $(COOKIEROOTDIR)/global/install-$(MODULATION) # merge in all isas to the package directory after installation 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 Sep 2 10:17:53 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 02 Sep 2009 08:17:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[6160] csw/mgar/pkg/jdk6/trunk Message-ID: Revision: 6160 http://gar.svn.sourceforge.net/gar/?rev=6160&view=rev Author: dmichelsen Date: 2009-09-02 08:17:53 +0000 (Wed, 02 Sep 2009) Log Message: ----------- jdk6: Move to dynamic gspec Modified Paths: -------------- csw/mgar/pkg/jdk6/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.gspec csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec Modified: csw/mgar/pkg/jdk6/trunk/Makefile =================================================================== --- csw/mgar/pkg/jdk6/trunk/Makefile 2009-09-02 08:08:23 UTC (rev 6159) +++ csw/mgar/pkg/jdk6/trunk/Makefile 2009-09-02 08:17:53 UTC (rev 6160) @@ -18,13 +18,21 @@ DISTNAME = jdk$(SPKG_VERSION) DISTFILES = $(foreach S,$(SUFFIXES),jdk-$(GARVERSION)-solaris-$S.sh) NOEXTRACT = $(foreach S,$(filter-out $(SUFFIXES_$(GARCH)),$(SUFFIXES)),jdk-$(GARVERSION)-solaris-$S.sh) -DISTFILES += $(call admfiles,CSWjdk6) -DISTFILES += $(call admfiles,CSWjre6) -DISTFILES += $(call admfiles,CSWjdk) -DISTFILES += $(call admfiles,CSWjre) SPKG_SOURCEURL = http://java.sun.com/javase/downloads/index.jsp +PACKAGES = CSWjdk6 CSWjre6 CSWjdk CSWjre + +CATALOGNAME_CSWjdk6 = jdk6 +CATALOGNAME_CSWjre6 = jre6 +CATALOGNAME_CSWjdk = jdk +CATALOGNAME_CSWjre = jre + +ARCHALL_CSWjdk = 1 +ARCHALL_CSWjre = 1 + +LICENSE = LICENSE + SPKG_DESC_CSWjdk6 = Java Development Kit 6 SPKG_DESC_CSWjre6 = Java Runtime Environment 6 SPKG_DESC_CSWjdk = Java Delopment Kit - Latest Version (now CSWjdk6) Deleted: csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec 2009-09-02 08:08:23 UTC (rev 6159) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec 2009-09-02 08:17:53 UTC (rev 6160) @@ -1,5 +0,0 @@ -%var bitname jdk -%var pkgname CSWjdk -%var arch all -%include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Deleted: csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.gspec =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.gspec 2009-09-02 08:08:23 UTC (rev 6159) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.gspec 2009-09-02 08:17:53 UTC (rev 6160) @@ -1,4 +0,0 @@ -%var bitname jdk6 -%var pkgname CSWjdk6 -%include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Deleted: csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec 2009-09-02 08:08:23 UTC (rev 6159) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec 2009-09-02 08:17:53 UTC (rev 6160) @@ -1,5 +0,0 @@ -%var bitname jre -%var pkgname CSWjre -%var arch all -%include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Deleted: csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec 2009-09-02 08:08:23 UTC (rev 6159) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec 2009-09-02 08:17:53 UTC (rev 6160) @@ -1,4 +0,0 @@ -%var bitname jre6 -%var pkgname CSWjre6 -%include url file://%{PKGLIB}/csw_standard.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 wahwah at users.sourceforge.net Wed Sep 2 10:50:47 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 02 Sep 2009 08:50:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[6161] csw/mgar/pkg/wxwidgets/trunk/Makefile Message-ID: Revision: 6161 http://gar.svn.sourceforge.net/gar/?rev=6161&view=rev Author: wahwah Date: 2009-09-02 08:50:39 +0000 (Wed, 02 Sep 2009) Log Message: ----------- wxwidgets: Added blurb and separate package descriptions Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-09-02 08:17:53 UTC (rev 6160) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-09-02 08:50:39 UTC (rev 6161) @@ -5,8 +5,12 @@ GARNAME = wxWidgets GARVERSION = 2.8.10 CATEGORIES = lib -DESCRIPTION = A portable widget library define BLURB + wxWidgets lets developers create applications for Win32, Mac OS X, GTK+, X11, + Motif, WinCE, and more using one codebase. It can be used from languages such + as C++, Python, Perl, and C#/.NET. Unlike other cross-platform toolkits, + wxWidgets applications look and feel native. This is because wxWidgets uses + the platform's own native controls rather than emulating them. endef SPKG_SOURCEURL = http://www.wxwidgets.org/ MASTER_SITES = $(SF_MIRRORS) @@ -20,6 +24,9 @@ PACKAGES += CSWwxwidgetsdevel PACKAGES += CSWwxwidgetsgtk2 ARCHALL_CSWwxwidgetsdevel = 1 +SPKG_DESC_CSWwxwidgetscommon = A cross-platform toolkit, common files +SPKG_DESC_CSWwxwidgetsdevel = A cross-platform toolkit, header files +SPKG_DESC_CSWwxwidgetsgtk2 = A cross-platform toolkit, gtk2 support REQUIRED_PKGS = CSWexpat REQUIRED_PKGS += CSWfconfig REQUIRED_PKGS += CSWftype2 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 Sep 2 12:01:03 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 02 Sep 2009 10:01:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[6162] csw/mgar/pkg/jdk5/trunk Message-ID: Revision: 6162 http://gar.svn.sourceforge.net/gar/?rev=6162&view=rev Author: dmichelsen Date: 2009-09-02 10:00:58 +0000 (Wed, 02 Sep 2009) Log Message: ----------- jdk5: Update to u19 Modified Paths: -------------- csw/mgar/pkg/jdk5/trunk/Makefile csw/mgar/pkg/jdk5/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/jdk5/trunk/files/CSWjdk5.gspec csw/mgar/pkg/jdk5/trunk/files/CSWjre5.gspec Modified: csw/mgar/pkg/jdk5/trunk/Makefile =================================================================== --- csw/mgar/pkg/jdk5/trunk/Makefile 2009-09-02 08:50:39 UTC (rev 6161) +++ csw/mgar/pkg/jdk5/trunk/Makefile 2009-09-02 10:00:58 UTC (rev 6162) @@ -1,5 +1,5 @@ GARNAME = jdk5 -SPKG_VERSION = 1.5.0_17 +SPKG_VERSION = 1.5.0_19 GARVERSION = $(shell echo $(SPKG_VERSION) | sed -e 's/\./_/g') CATEGORIES = lang @@ -18,9 +18,11 @@ DISTNAME = jdk$(SPKG_VERSION) DISTFILES = $(foreach S,$(SUFFIXES),jdk-$(GARVERSION)-solaris-$S.sh) NOEXTRACT = $(foreach S,$(filter-out $(SUFFIXES_$(GARCH)),$(SUFFIXES)),jdk-$(GARVERSION)-solaris-$S.sh) -DISTFILES += $(call admfiles,CSWjdk5) -DISTFILES += $(call admfiles,CSWjre5) +PACKAGES = CSWjdk5 CSWjre5 + +LICENSE = LICENSE + SPKG_SOURCEURL = http://java.sun.com/javase/downloads/index_jdk5.jsp SPKG_DESC_CSWjdk5 = Java Development Kit 6 @@ -43,6 +45,10 @@ PKGFILES_CSWjre5 += $(prefix)/java/jre/jre$(SPKG_VERSION) PKGFILES_CSWjre5 += $(prefix)/java/jre/jre5 +# The package must not be checked on Solaris 8 as the package contains +# partly material for Solaris 10 +ENABLE_CHECK = 0 + # Tell the user to download the file manually manual//%: @echo Modified: csw/mgar/pkg/jdk5/trunk/checksums =================================================================== --- csw/mgar/pkg/jdk5/trunk/checksums 2009-09-02 08:50:39 UTC (rev 6161) +++ csw/mgar/pkg/jdk5/trunk/checksums 2009-09-02 10:00:58 UTC (rev 6162) @@ -1,6 +1,4 @@ -7d8b35d7eb7664d36ff2387e73baa15b download/jdk-1_5_0_17-solaris-sparc.sh -7e0ccd19d636bc3fdf1781c07a99cb8d download/jdk-1_5_0_17-solaris-sparcv9.sh -f000bd7d44c2964dd811f3f526572106 download/jdk-1_5_0_17-solaris-i586.sh -419310f32f7f2bfff715bc6f1d1258c4 download/jdk-1_5_0_17-solaris-amd64.sh -43194293b08b51d47ebc1c78af346942 download/CSWjdk5.gspec -68ebd77b4f7648109eb11c58f8959b5b download/CSWjre5.gspec +8b8a01786a9dc91a38c3cc2208ec9df5 download/jdk-1_5_0_19-solaris-amd64.sh +28f99e41bec07c9a458c2cc625876ced download/jdk-1_5_0_19-solaris-i586.sh +d7d5385d69629d03393d4ff02e91c406 download/jdk-1_5_0_19-solaris-sparc.sh +8df216d7b51f333efeb9fd9f2407d5c6 download/jdk-1_5_0_19-solaris-sparcv9.sh Deleted: csw/mgar/pkg/jdk5/trunk/files/CSWjdk5.gspec =================================================================== --- csw/mgar/pkg/jdk5/trunk/files/CSWjdk5.gspec 2009-09-02 08:50:39 UTC (rev 6161) +++ csw/mgar/pkg/jdk5/trunk/files/CSWjdk5.gspec 2009-09-02 10:00:58 UTC (rev 6162) @@ -1,4 +0,0 @@ -%var bitname jdk5 -%var pkgname CSWjdk5 -%include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Deleted: csw/mgar/pkg/jdk5/trunk/files/CSWjre5.gspec =================================================================== --- csw/mgar/pkg/jdk5/trunk/files/CSWjre5.gspec 2009-09-02 08:50:39 UTC (rev 6161) +++ csw/mgar/pkg/jdk5/trunk/files/CSWjre5.gspec 2009-09-02 10:00:58 UTC (rev 6162) @@ -1,4 +0,0 @@ -%var bitname jre5 -%var pkgname CSWjre5 -%include url file://%{PKGLIB}/csw_standard.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 wahwah at users.sourceforge.net Wed Sep 2 13:54:40 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 02 Sep 2009 11:54:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[6163] csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc. postinstall Message-ID: Revision: 6163 http://gar.svn.sourceforge.net/gar/?rev=6163&view=rev Author: wahwah Date: 2009-09-02 11:54:40 +0000 (Wed, 02 Sep 2009) Log Message: ----------- unixodbc: Fixing a typo in the postinstall script Modified Paths: -------------- csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall Modified: csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall =================================================================== --- csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall 2009-09-02 10:00:58 UTC (rev 6162) +++ csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall 2009-09-02 11:54:40 UTC (rev 6163) @@ -50,8 +50,8 @@ for ff in ${filepairs} ${dirpairs}; do old_location=`echo ${ff} | awk -F: '{print $1}'` new_location=`echo ${ff} | awk -F: '{print $2}'` - abs_old_location="${PKG_INSTSALL_ROOT}${old_location}" - abs_new_location="${PKG_INSTSALL_ROOT}${new_location}" + abs_old_location="${PKG_INSTALL_ROOT}${old_location}" + abs_new_location="${PKG_INSTALL_ROOT}${new_location}" old_location_noslash=`echo "${old_location}" | sed -e 's+^/++'` dubdots=`gen_dubdots "${new_location}"` if [ -r "${abs_old_location}" ]; 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 Wed Sep 2 23:05:26 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 02 Sep 2009 21:05:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[6164] csw/mgar/pkg/unixodbc/trunk/checksums Message-ID: Revision: 6164 http://gar.svn.sourceforge.net/gar/?rev=6164&view=rev Author: wahwah Date: 2009-09-02 21:05:25 +0000 (Wed, 02 Sep 2009) Log Message: ----------- unixodbc: Updating checksums Modified Paths: -------------- csw/mgar/pkg/unixodbc/trunk/checksums Modified: csw/mgar/pkg/unixodbc/trunk/checksums =================================================================== --- csw/mgar/pkg/unixodbc/trunk/checksums 2009-09-02 11:54:40 UTC (rev 6163) +++ csw/mgar/pkg/unixodbc/trunk/checksums 2009-09-02 21:05:25 UTC (rev 6164) @@ -1,2 +1,2 @@ -81eb84115b647ee2e95c69882de7a415 download/CSWunixodbc.postinstall +cc65f5642a9b5965da7d6978587e8ac4 download/CSWunixodbc.postinstall f47c2efb28618ecf5f33319140a7acd0 download/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 d_pocock at users.sourceforge.net Thu Sep 3 12:31:43 2009 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 03 Sep 2009 10:31:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6165] csw/mgar/pkg/libconfuse/trunk Message-ID: Revision: 6165 http://gar.svn.sourceforge.net/gar/?rev=6165&view=rev Author: d_pocock Date: 2009-09-03 10:31:43 +0000 (Thu, 03 Sep 2009) Log Message: ----------- Add patch from trunk to expose cfg_setopt() function. Adjust code for skipping tests. Modified Paths: -------------- csw/mgar/pkg/libconfuse/trunk/Makefile csw/mgar/pkg/libconfuse/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libconfuse/trunk/files/setopt.diff Modified: csw/mgar/pkg/libconfuse/trunk/Makefile =================================================================== --- csw/mgar/pkg/libconfuse/trunk/Makefile 2009-09-02 21:05:25 UTC (rev 6164) +++ csw/mgar/pkg/libconfuse/trunk/Makefile 2009-09-03 10:31:43 UTC (rev 6165) @@ -8,9 +8,7 @@ # upstream. ifeq ($(GARVERSION),2.6) #TEST_TARGET = check -TEST_SCRIPTS = skip -test-skip: - $(DONADA) +TEST_SCRIPTS = endif DESCRIPTION = a configuration file parser library @@ -25,9 +23,13 @@ endef MASTER_SITES = http://bzero.se/confuse/ +PATCHFILES = setopt.diff DISTFILES = confuse-$(GARVERSION).tar.gz +DISTFILES += $(PATCHFILES) DISTNAME = confuse-$(GARVERSION) +EXTRA_DOCS = $(PATCHFILES) + # 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/libconfuse/trunk/checksums =================================================================== --- csw/mgar/pkg/libconfuse/trunk/checksums 2009-09-02 21:05:25 UTC (rev 6164) +++ csw/mgar/pkg/libconfuse/trunk/checksums 2009-09-03 10:31:43 UTC (rev 6165) @@ -1 +1,2 @@ 0e883d66f0f58fc33585b430c652aa30 download/confuse-2.6.tar.gz +5a7d6c8406a18340e7508b4d9d0da2ca download/setopt.diff Added: csw/mgar/pkg/libconfuse/trunk/files/setopt.diff =================================================================== --- csw/mgar/pkg/libconfuse/trunk/files/setopt.diff (rev 0) +++ csw/mgar/pkg/libconfuse/trunk/files/setopt.diff 2009-09-03 10:31:43 UTC (rev 6165) @@ -0,0 +1,39 @@ +--- confuse-2.6/src/confuse.c (revision x) ++++ confuse-2.6/src/confuse.c (revision y) +@@ -65,7 +65,6 @@ + + static int cfg_parse_internal(cfg_t *cfg, int level, + int force_state, cfg_opt_t *force_opt); +-static cfg_value_t *cfg_setopt(cfg_t *cfg, cfg_opt_t *opt, char *value); + + #define STATE_CONTINUE 0 + #define STATE_EOF -1 +@@ -531,7 +530,7 @@ + } + } + +-static cfg_value_t *cfg_setopt(cfg_t *cfg, cfg_opt_t *opt, char *value) ++DLLIMPORT cfg_value_t *cfg_setopt(cfg_t *cfg, cfg_opt_t *opt, char *value) + { + cfg_value_t *val = 0; + int b; +--- confuse-2.6/src/confuse.h (revision x) ++++ confuse-2.6/src/confuse.h (revision y) +@@ -839,6 +839,16 @@ + */ + DLLIMPORT int __export cfg_parse_boolean(const char *s); + ++/** Set an option (create an instance of an option). ++ * ++ * @param cfg The configuration file context. ++ * @param opt The option definition. ++ * @param value The initial value for the option. ++ * ++ * @return Returns a pointer to the value object. ++ */ ++DLLIMPORT cfg_value_t __export *cfg_setopt(cfg_t *cfg, cfg_opt_t *opt, char *value); ++ + /** Return an option given it's name. + * + * @param cfg The configuration file context. + 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 Sep 3 12:47:39 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 03 Sep 2009 10:47:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[6166] csw/mgar/pkg/template/trunk/Makefile Message-ID: Revision: 6166 http://gar.svn.sourceforge.net/gar/?rev=6166&view=rev Author: wahwah Date: 2009-09-03 10:47:39 +0000 (Thu, 03 Sep 2009) Log Message: ----------- template: added the python category Modified Paths: -------------- csw/mgar/pkg/template/trunk/Makefile Modified: csw/mgar/pkg/template/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-09-03 10:31:43 UTC (rev 6165) +++ csw/mgar/pkg/template/trunk/Makefile 2009-09-03 10:47:39 UTC (rev 6166) @@ -20,15 +20,15 @@ ## adjust the build settings for the respective category. ## ## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, server, utils, x11, -## xfce, xorg, xtra +## 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. +## inside the Makefile and is not used elsewhere. define BLURB endef @@ -39,11 +39,11 @@ ## ## 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 = ## ## 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. +## 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 @@ -68,7 +68,7 @@ ## ## 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 ~. +## 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 @@ -76,19 +76,19 @@ ## 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. +## 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. +## 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. +## 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 @@ -103,7 +103,7 @@ ## 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. +## the file permissions of a file to be set-UID. ## See http://wiki.opencsw.org/cswclassutils-package for common usage information ## PROTOTYPE_FILTER = ## @@ -153,7 +153,7 @@ ## 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. +## for example, if you need to override Makefile variables. ## BUILD_ARGS = ## ## Arguments passed to the ./configure script. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Sep 4 09:30:41 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Sep 2009 07:30:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[6167] csw/mgar/pkg/libtool/tags/libtool-2.2. 6-legacy-gcctags/ Message-ID: Revision: 6167 http://gar.svn.sourceforge.net/gar/?rev=6167&view=rev Author: dmichelsen Date: 2009-09-04 07:30:40 +0000 (Fri, 04 Sep 2009) Log Message: ----------- Put legacy tags and patch aside for further reference Added Paths: ----------- csw/mgar/pkg/libtool/tags/libtool-2.2.6-legacy-gcctags/ 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 Sep 4 09:35:00 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Sep 2009 07:35:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6168] csw/mgar/pkg/libtool/trunk Message-ID: Revision: 6168 http://gar.svn.sourceforge.net/gar/?rev=6168&view=rev Author: dmichelsen Date: 2009-09-04 07:34:59 +0000 (Fri, 04 Sep 2009) Log Message: ----------- libtool: Enable additional tags for gcc3 and gcc4 Modified Paths: -------------- csw/mgar/pkg/libtool/trunk/Makefile csw/mgar/pkg/libtool/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libtool/trunk/files/patch-libtool.diff Removed Paths: ------------- csw/mgar/pkg/libtool/trunk/files/i386-gcc2.conf csw/mgar/pkg/libtool/trunk/files/i386-gcc2.tags csw/mgar/pkg/libtool/trunk/files/i386-gcc3.conf csw/mgar/pkg/libtool/trunk/files/i386-gcc3.tags csw/mgar/pkg/libtool/trunk/files/libtool-gcc-tags.patch csw/mgar/pkg/libtool/trunk/files/sparc-gcc2.conf csw/mgar/pkg/libtool/trunk/files/sparc-gcc2.tags csw/mgar/pkg/libtool/trunk/files/sparc-gcc3.conf csw/mgar/pkg/libtool/trunk/files/sparc-gcc3.tags Modified: csw/mgar/pkg/libtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtool/trunk/Makefile 2009-09-04 07:30:40 UTC (rev 6167) +++ csw/mgar/pkg/libtool/trunk/Makefile 2009-09-04 07:34:59 UTC (rev 6168) @@ -3,9 +3,13 @@ GARVERSION = 2.2.6 CATEGORIES = devel -EXTRA_MODULATORS = GARVERSION +EXTRA_MODULATORS = GARVERSION GARCOMPILER MODULATIONS_GARVERSION = 1.5.26 2.2.6 +MODULATIONS_GARCOMPILER = GCC3 GCC4 SOS11 +# 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)) + FILEVERSION_1.5.26 = 1.5.26 FILEVERSION_2.2.6 = 2.2.6$(RELEASE) @@ -19,8 +23,18 @@ MASTER_SITES = $(GNU_MIRROR) SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(GARNAME)-$(FILEVERSION_$(VERSION)).tar.gz) DISTFILES = $(SOURCEFILES) -DISTFILES += $(foreach ARCH,i386 sparc,$(ARCH)-gcc2.conf $(ARCH)-gcc2.tags $(ARCH)-gcc3.conf $(ARCH)-gcc3.tags) +PATCH_LIBTOOL = patch-libtool.diff +PATCHFILES_POSTINSTALL_isa-i386-garversion-2.2.6-garcompiler-SOS11 = $(PATCH_LIBTOOL) +PATCHFILES_POSTINSTALL_isa-sparcv8-garversion-2.2.6-garcompiler-SOS11 = $(PATCH_LIBTOOL) +DISTFILES += $(PATCH_LIBTOOL) + +NOEXTRACT = $(filter-out $(GARNAME)-$(FILEVERSION_$(GARVERSION)).tar.gz,$(SOURCEFILES)) + +EXTRA_TAGS = gcc3 gcc4 +COMPILER_TAGNAME_GCC3 = gcc3 +COMPILER_TAGNAME_GCC4 = gcc4 + PACKAGES = CSWlibtool CSWlibtoolrt CATALOGNAME_CSWlibtoolrt = libtool_rt @@ -29,7 +43,7 @@ REQUIRED_PKGS_CSWlibtool = CSWlibtoolrt SPKG_DESC_CSWlibtool = A generic library support tool -SPKG_DESC_CSWlibtoolrt = A Generic library support tool runtime libraries +SPKG_DESC_CSWlibtoolrt = A generic library support tool runtime libraries # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -42,35 +56,56 @@ SKIPTEST = 1 TEST_TARGET = check -MERGE_SCRIPTS_isa-i386-garversion-1.5.26 = copy-only -MERGE_DIRS_isa-i386-garversion-1.5.26 = $(libdir) -MERGE_SCRIPTS_isa-amd64-garversion-1.5.26 = copy-relocated-only -MERGE_DIRS_isa-amd64-garversion-1.5.26 = $(libdir) + 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-i386-garversion-2.2.6 = copy-all -MERGE_SCRIPTS_isa-amd64-garversion-2.2.6 = copy-relocated-only -MERGE_DIRS_isa-amd64-garversion-2.2.6 = $(bindir) $(sbindir) $(libexecdir) $(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-sparcv8-garversion-1.5.26 = copy-only -MERGE_DIRS_isa-sparcv8-garversion-1.5.26 = $(libdir) -MERGE_SCRIPTS_isa-sparcv9-garversion-1.5.26 = copy-relocated-only -MERGE_DIRS_isa-sparcv9-garversion-1.5.26 = $(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-sparcv8-garversion-2.2.6 = copy-all -MERGE_SCRIPTS_isa-sparcv9-garversion-2.2.6 = copy-relocated-only -MERGE_DIRS_isa-sparcv9-garversion-2.2.6 = $(bindir) $(sbindir) $(libexecdir) $(libdir) +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: - @echo " ==> Fixing install anomalies" - @rm -f $(DESTDIR)$(infodir)/dir - @(for f in gcc2.conf gcc2.tags gcc3.conf gcc3.tags; do \ - ginstall -D $(WORKDIR)/$(GARCH)-$$f $(DESTDIR)$(datadir)/$(GARNAME)/$$f; \ - done) +post-install-modulated: $(if $(PATCHFILES_POSTINSTALL_$(MODULATION)),patch-libtool) +post-install-modulated: $(if $(COMPILER_TAGNAME_$(GARCOMPILER)),install-libtool-$(COMPILER_TAGNAME_$(GARCOMPILER))) + +patch-libtool: + cat $(WORKDIR)/$(PATCHFILES_POSTINSTALL_$(MODULATION)) | (cd $(DESTDIR)$(bindir) && gpatch -p1) + +install-libtool-%: + perl -ane 'print if( /^available_tags/ ); $$p = 1 if( /^# ### BEGIN LIBTOOL CONFIG/ ); print if( $$p ); $$p = 0 if( /^# ### END LIBTOOL CONFIG/ )' \ + <$(DESTDIR)$(bindir)/libtool >$(DESTDIR)$(datadir)/libtool/$*.conf + perl -ane '$$p = 1 if( /^# ### BEGIN LIBTOOL TAG CONFIG/ ); print if( $$p ); if( /^# ### END LIBTOOL TAG CONFIG/ ) { $$p = 0; print "\n"; }' \ + <$(DESTDIR)$(bindir)/libtool >$(DESTDIR)$(datadir)/libtool/$*.tags @$(MAKECOOKIE) +merge-copy-tags: + $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \ + -s ",^\(\..*\.conf\)\$$,\1,p" \ + -s ",^\(\..*\.tags\)\$$,\1,p" \ + -s ",.*,," \ + . $(PKGROOT) \ + ) + @$(MAKECOOKIE) + + Modified: csw/mgar/pkg/libtool/trunk/checksums =================================================================== --- csw/mgar/pkg/libtool/trunk/checksums 2009-09-04 07:30:40 UTC (rev 6167) +++ csw/mgar/pkg/libtool/trunk/checksums 2009-09-04 07:34:59 UTC (rev 6168) @@ -1,10 +1,3 @@ -9016437c874268bf70e52aba2af93735 download/i386-gcc2.conf -11fbabbb916c4c4e7b6e811980f41e1a download/i386-gcc2.tags -c39493d590239e70d40220ee8effca5d download/i386-gcc3.conf -706757d554bcc0c20f0af0d5de0848e3 download/i386-gcc3.tags aa9c5107f3ec9ef4200eb6556f3b3c29 download/libtool-1.5.26.tar.gz 8ca1ea241cd27ff9832e045fe9afe4fd download/libtool-2.2.6a.tar.gz -29cb518dd29fda50f9a3e727fd204cfe download/sparc-gcc2.conf -cd32539473e785263c56a2e46fa76cbc download/sparc-gcc2.tags -f78119c4f0f5366735285ca2bf17b829 download/sparc-gcc3.conf -b47cbb95750c4edd59d17479867ebf7b download/sparc-gcc3.tags +7fb6410a02f5fd74aa3696a65ba434e2 download/patch-libtool.diff Deleted: csw/mgar/pkg/libtool/trunk/files/i386-gcc2.conf =================================================================== --- csw/mgar/pkg/libtool/trunk/files/i386-gcc2.conf 2009-09-04 07:30:40 UTC (rev 6167) +++ csw/mgar/pkg/libtool/trunk/files/i386-gcc2.conf 2009-09-04 07:34:59 UTC (rev 6168) @@ -1,318 +0,0 @@ -# A sed program that does not truncate output. -SED="/opt/csw/bin/gsed" - -# Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="/opt/csw/bin/gsed -e 1s/^X//" - -# 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 - -# The names of the tagged configurations supported by this script. -available_tags=" CXX" - -# ### BEGIN LIBTOOL CONFIG - -# Libtool was configured on host ra: - -# Shell to use when invoking shell scripts. -SHELL="/bin/bash" - -# Whether or not to build shared libraries. -build_libtool_libs=yes - -# Whether or not to build static libraries. -build_old_libs=yes - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=yes - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=no - -# Whether or not to optimize for fast installation. -fast_install=needless - -# The host system. -host_alias= -host=i386-pc-solaris2.8 -host_os=solaris2.8 - -# The build system. -build_alias= -build=i386-pc-solaris2.8 -build_os=solaris2.8 - -# An echo program that does not interpret backslashes. -echo="echo" - -# The archiver. -AR="ar" -AR_FLAGS="cru" - -# A C compiler. -LTCC="/opt/csw/gcc2/bin/gcc" - -# LTCC compiler flags. -LTCFLAGS="-O2" - -# A language-specific compiler. -CC="/opt/csw/gcc2/bin/gcc" - -# Is the compiler the GNU C compiler? -with_gcc=yes - -# An ERE matcher. -EGREP="/opt/csw/bin/ggrep -E" - -# The linker used to build libraries. -LD="/usr/ccs/bin/ld" - -# Whether we need hard or soft links. -LN_S="ln -s" - -# A BSD-compatible nm program. -NM="/usr/ccs/bin/nm -p" - -# A symbol stripping program -STRIP="strip" - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=file - -# Used on cygwin: DLL creation program. -DLLTOOL="dlltool" - -# Used on cygwin: object dumper. -OBJDUMP="objdump" - -# Used on cygwin: assembler. -AS="as" - -# The name of the directory that contains temporary libtool files. -objdir=.libs - -# How to create reloadable object files. -reload_flag=" -r" -reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs" - -# How to pass a linker flag through the compiler. -wl="-Wl," - -# Object file suffix (normally "o"). -objext="o" - -# Old archive suffix (normally "a"). -libext="a" - -# Shared library suffix (normally ".so"). -shrext_cmds='.so' - -# Executable file suffix (normally ""). -exeext="" - -# Additional compiler flags for building library objects. -pic_flag=" -fPIC -DPIC" -pic_mode=default - -# What is the maximum length of a command? -max_cmd_len=262144 - -# Does compiler simultaneously support -c and -o options? -compiler_c_o="yes" - -# Must we lock files when doing compilation? -need_locks="no" - -# Do we need the lib prefix for modules? -need_lib_prefix=no - -# Do we need a version for libraries? -need_version=no - -# Whether dlopen is supported. -dlopen_support=yes - -# Whether dlopen of programs is supported. -dlopen_self=yes - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=no - -# Compiler flag to prevent dynamic linking. -link_static_flag="-static" - -# Compiler flag to turn off builtin functions. -no_builtin_flag=" -fno-builtin -fno-rtti -fno-exceptions" - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec="" - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec="\${wl}-z \${wl}allextract\`for conv in \$convenience\\\"\\\"; do test -n \\\"\$conv\\\" && new_convenience=\\\"\$new_convenience,\$conv\\\"; done; \$echo \\\"\$new_convenience\\\"\` \${wl}-z \${wl}defaultextract" - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec="" - -# Library versioning type. -version_type=linux - -# Format of library name prefix. -libname_spec="lib\$name" - -# 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. -library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}" - -# The coded name of the library, if different from the real name. -soname_spec="\${libname}\${release}\${shared_ext}\$major" - -# Commands used to build and install an old-style archive. -RANLIB="ranlib" -old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib" -old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib" -old_postuninstall_cmds="" - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds="" - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds="" - -# Commands used to build and install a shared archive. -archive_cmds="\$CC -shared \${wl}-h \${wl}\$soname -o \$lib \$libobjs \$deplibs \$compiler_flags" -archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$lib.exp~cat \$export_symbols | \$SED -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$lib.exp~\$echo \\\"local: *; };\\\" >> \$lib.exp~ - \$CC -shared \${wl}-M \${wl}\$lib.exp \${wl}-h \${wl}\$soname -o \$lib \$libobjs \$deplibs \$compiler_flags~\$rm \$lib.exp" -postinstall_cmds="chmod +x \$lib" -postuninstall_cmds="" - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds="" -module_expsym_cmds="" - -# Commands to strip libraries. -old_striplib="" -striplib="" - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects="" - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects="" - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps="" - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps="" - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path="" - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method="pass_all" - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd="\$MAGIC_CMD" - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag="" - -# Flag that forces no undefined symbols. -no_undefined_flag=" -z text" - -# Commands used to finish a libtool library installation in a directory. -finish_cmds="" - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval="" - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe="sed -n -e 's/^.*[ ]\\([BDRT][BDRT]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'" - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'" - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (lt_ptr) \\&\\2},/p'" - -# This is the shared library runtime path variable. -runpath_var= - -# This is the shared library path variable. -shlibpath_var=LD_LIBRARY_PATH - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=yes - -# How to hardcode a shared library path into an executable. -hardcode_action=immediate - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=yes - -# Flag to hardcode $libdir into a binary during linking. -# This must work even if $libdir does not exist. -hardcode_libdir_flag_spec="-R\$libdir" - -# If ld is used when linking, flag to hardcode $libdir into -# a binary during linking. This must work even if $libdir does -# not exist. -hardcode_libdir_flag_spec_ld="" - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator="" - -# Set to yes if using DIR/libNAME during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=no - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=no - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=no - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=no - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="PATH LD_LIBRARY_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=yes - -# Compile-time system search path for libraries -sys_lib_search_path_spec=" /opt/csw/gcc2/lib/gcc-lib/i386-pc-solaris2.8/2.95.3/ /usr/lib/gcc/i386-pc-solaris2.8/2.95.3/ /opt/csw/gcc2/i386-pc-solaris2.8/lib/i386-pc-solaris2.8/2.95.3/ /opt/csw/gcc2/i386-pc-solaris2.8/lib/ /usr/ccs/bin/i386-pc-solaris2.8/2.95.3/ /usr/ccs/bin/ /usr/ccs/lib/i386-pc-solaris2.8/2.95.3/ /usr/ccs/lib/ /opt/csw/gcc2/lib/i386-pc-solaris2.8/2.95.3/ /opt/csw/gcc2/lib/ /lib/i386-pc-solaris2.8/2.95.3/ /lib/ /usr/lib/i386-pc-solaris2.8/2.95.3/ /usr/lib/" - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec="/lib /usr/lib" - -# Fix the shell variable $srcfile for the compiler. -fix_srcfile_path="" - -# Set to yes if exported symbols are required. -always_export_symbols=no - -# The commands to list exported symbols. -export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols" - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds="" - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms="_GLOBAL_OFFSET_TABLE_" - -# Symbols that must always be exported. -include_expsyms="" - -# ### END LIBTOOL CONFIG Deleted: csw/mgar/pkg/libtool/trunk/files/i386-gcc2.tags =================================================================== --- csw/mgar/pkg/libtool/trunk/files/i386-gcc2.tags 2009-09-04 07:30:40 UTC (rev 6167) +++ csw/mgar/pkg/libtool/trunk/files/i386-gcc2.tags 2009-09-04 07:34:59 UTC (rev 6168) @@ -1,317 +0,0 @@ -# ### BEGIN LIBTOOL TAG CONFIG: disable-shared -disable_libs=shared -# ### END LIBTOOL TAG CONFIG: disable-shared - -# ### BEGIN LIBTOOL TAG CONFIG: disable-static -disable_libs=static -# ### END LIBTOOL TAG CONFIG: disable-static - -# Local Variables: -# mode:shell-script -# sh-indentation:2 -# End: -# ### BEGIN LIBTOOL TAG CONFIG: CXX - -# Libtool was configured on host ra: - -# Shell to use when invoking shell scripts. -SHELL="/bin/bash" - -# Whether or not to build shared libraries. -build_libtool_libs=yes - -# Whether or not to build static libraries. -build_old_libs=yes - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=no - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=no - -# Whether or not to optimize for fast installation. -fast_install=needless - -# The host system. -host_alias= -host=i386-pc-solaris2.8 -host_os=solaris2.8 - -# The build system. -build_alias= -build=i386-pc-solaris2.8 -build_os=solaris2.8 - -# An echo program that does not interpret backslashes. -echo="echo" - -# The archiver. -AR="ar" -AR_FLAGS="cru" - -# A C compiler. -LTCC="/opt/csw/gcc2/bin/gcc" - -# LTCC compiler flags. -LTCFLAGS="-O2" - -# A language-specific compiler. -CC="/opt/csw/gcc2/bin/g++" - -# Is the compiler the GNU C compiler? -with_gcc=yes - -# An ERE matcher. -EGREP="/opt/csw/bin/ggrep -E" - -# The linker used to build libraries. -LD="/usr/ccs/bin/ld" - -# Whether we need hard or soft links. -LN_S="ln -s" - -# A BSD-compatible nm program. -NM="/usr/ccs/bin/nm -p" - -# A symbol stripping program -STRIP="strip" - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=file - -# Used on cygwin: DLL creation program. -DLLTOOL="dlltool" - -# Used on cygwin: object dumper. -OBJDUMP="objdump" - -# Used on cygwin: assembler. -AS="as" - -# The name of the directory that contains temporary libtool files. -objdir=.libs - -# How to create reloadable object files. -reload_flag=" -r" -reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs" - -# How to pass a linker flag through the compiler. -wl="-Wl," - -# Object file suffix (normally "o"). -objext="o" - -# Old archive suffix (normally "a"). -libext="a" - -# Shared library suffix (normally ".so"). -shrext_cmds='.so' - -# Executable file suffix (normally ""). -exeext="" - -# Additional compiler flags for building library objects. -pic_flag=" -fPIC -DPIC" -pic_mode=default - -# What is the maximum length of a command? -max_cmd_len=262144 - -# Does compiler simultaneously support -c and -o options? -compiler_c_o="yes" - -# Must we lock files when doing compilation? -need_locks="no" - -# Do we need the lib prefix for modules? -need_lib_prefix=no - -# Do we need a version for libraries? -need_version=no - -# Whether dlopen is supported. -dlopen_support=yes - -# Whether dlopen of programs is supported. -dlopen_self=yes - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=no - -# Compiler flag to prevent dynamic linking. -link_static_flag="-static" - -# Compiler flag to turn off builtin functions. -no_builtin_flag=" -fno-builtin" - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec="" - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec="" - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec="" - -# Library versioning type. -version_type=linux - -# Format of library name prefix. -libname_spec="lib\$name" - -# 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. -library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}" - -# The coded name of the library, if different from the real name. -soname_spec="\${libname}\${release}\${shared_ext}\$major" - -# Commands used to build and install an old-style archive. -RANLIB="ranlib" -old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib" -old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib" -old_postuninstall_cmds="" - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds="" - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds="" - -# Commands used to build and install a shared archive. -archive_cmds="\$CC -shared -nostdlib \$LDFLAGS \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-h \$wl\$soname -o \$lib" -archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$lib.exp~cat \$export_symbols | \$SED -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$lib.exp~\$echo \\\"local: *; };\\\" >> \$lib.exp~ - \$CC -shared -nostdlib \${wl}-M \$wl\$lib.exp -o \$lib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags~\$rm \$lib.exp" -postinstall_cmds="chmod +x \$lib" -postuninstall_cmds="" - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds="" -module_expsym_cmds="" - -# Commands to strip libraries. -old_striplib="" -striplib="" - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects="/opt/csw/gcc2/lib/gcc-lib/i386-pc-solaris2.8/2.95.3/crti.o /usr/ccs/lib/values-Xa.o /opt/csw/gcc2/lib/gcc-lib/i386-pc-solaris2.8/2.95.3/crtbegin.o" - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects="/opt/csw/gcc2/lib/gcc-lib/i386-pc-solaris2.8/2.95.3/crtend.o /opt/csw/gcc2/lib/gcc-lib/i386-pc-solaris2.8/2.95.3/crtn.o" - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps="" - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps="-lstdc++ -lm -lgcc -lgcc" - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path="-L/opt/csw/gcc2/lib/gcc-lib/i386-pc-solaris2.8/2.95.3 -L/usr/ccs/bin -L/usr/ccs/lib -L/opt/csw/gcc2/lib" - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method="pass_all" - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd="\$MAGIC_CMD" - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag="" - -# Flag that forces no undefined symbols. -no_undefined_flag=" \${wl}-z \${wl}defs" - -# Commands used to finish a libtool library installation in a directory. -finish_cmds="" - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval="" - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe="sed -n -e 's/^.*[ ]\\([BDRT][BDRT]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'" - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'" - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (lt_ptr) \\&\\2},/p'" - -# This is the shared library runtime path variable. -runpath_var= - -# This is the shared library path variable. -shlibpath_var=LD_LIBRARY_PATH - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=yes - -# How to hardcode a shared library path into an executable. -hardcode_action=immediate - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=yes - -# Flag to hardcode $libdir into a binary during linking. -# This must work even if $libdir does not exist. -hardcode_libdir_flag_spec="\${wl}-R \$wl\$libdir" - -# If ld is used when linking, flag to hardcode $libdir into -# a binary during linking. This must work even if $libdir does -# not exist. -hardcode_libdir_flag_spec_ld="" - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator="" - -# Set to yes if using DIR/libNAME during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=no - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=no - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=unsupported - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=no - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="PATH LD_LIBRARY_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=unknown - -# Compile-time system search path for libraries -sys_lib_search_path_spec=" /opt/csw/gcc2/lib/gcc-lib/i386-pc-solaris2.8/2.95.3/ /usr/lib/gcc/i386-pc-solaris2.8/2.95.3/ /opt/csw/gcc2/i386-pc-solaris2.8/lib/i386-pc-solaris2.8/2.95.3/ /opt/csw/gcc2/i386-pc-solaris2.8/lib/ /usr/ccs/bin/i386-pc-solaris2.8/2.95.3/ /usr/ccs/bin/ /usr/ccs/lib/i386-pc-solaris2.8/2.95.3/ /usr/ccs/lib/ /opt/csw/gcc2/lib/i386-pc-solaris2.8/2.95.3/ /opt/csw/gcc2/lib/ /lib/i386-pc-solaris2.8/2.95.3/ /lib/ /usr/lib/i386-pc-solaris2.8/2.95.3/ /usr/lib/" - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec="/lib /usr/lib" - -# Fix the shell variable $srcfile for the compiler. -fix_srcfile_path="" - -# Set to yes if exported symbols are required. -always_export_symbols=no - -# The commands to list exported symbols. -export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols" - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds="" - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms="" - -# Symbols that must always be exported. -include_expsyms="" - -# ### END LIBTOOL TAG CONFIG: CXX Deleted: csw/mgar/pkg/libtool/trunk/files/i386-gcc3.conf =================================================================== --- csw/mgar/pkg/libtool/trunk/files/i386-gcc3.conf 2009-09-04 07:30:40 UTC (rev 6167) +++ csw/mgar/pkg/libtool/trunk/files/i386-gcc3.conf 2009-09-04 07:34:59 UTC (rev 6168) @@ -1,318 +0,0 @@ -# A sed program that does not truncate output. -SED="/opt/csw/bin/gsed" - -# Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="/opt/csw/bin/gsed -e 1s/^X//" - -# 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 - -# The names of the tagged configurations supported by this script. -available_tags=" CXX F77" - -# ### BEGIN LIBTOOL CONFIG - -# Libtool was configured on host ra: - -# Shell to use when invoking shell scripts. -SHELL="/bin/bash" - -# Whether or not to build shared libraries. -build_libtool_libs=yes - -# Whether or not to build static libraries. -build_old_libs=yes - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=yes - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=no - -# Whether or not to optimize for fast installation. -fast_install=needless - -# The host system. -host_alias= -host=i386-pc-solaris2.8 -host_os=solaris2.8 - -# The build system. -build_alias= -build=i386-pc-solaris2.8 -build_os=solaris2.8 - -# An echo program that does not interpret backslashes. -echo="echo" - -# The archiver. -AR="ar" -AR_FLAGS="cru" - -# A C compiler. -LTCC="/opt/csw/gcc3/bin/gcc" - -# LTCC compiler flags. -LTCFLAGS="-O2" - -# A language-specific compiler. -CC="/opt/csw/gcc3/bin/gcc" - -# Is the compiler the GNU C compiler? -with_gcc=yes - -# An ERE matcher. -EGREP="/opt/csw/bin/ggrep -E" - -# The linker used to build libraries. -LD="/usr/ccs/bin/ld" - -# Whether we need hard or soft links. -LN_S="ln -s" - -# A BSD-compatible nm program. -NM="/usr/ccs/bin/nm -p" - -# A symbol stripping program -STRIP="strip" - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=file - -# Used on cygwin: DLL creation program. -DLLTOOL="dlltool" - -# Used on cygwin: object dumper. -OBJDUMP="objdump" - -# Used on cygwin: assembler. -AS="as" - -# The name of the directory that contains temporary libtool files. -objdir=.libs - -# How to create reloadable object files. -reload_flag=" -r" -reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs" - -# How to pass a linker flag through the compiler. -wl="-Wl," - -# Object file suffix (normally "o"). -objext="o" - -# Old archive suffix (normally "a"). -libext="a" - -# Shared library suffix (normally ".so"). -shrext_cmds='.so' - -# Executable file suffix (normally ""). -exeext="" - -# Additional compiler flags for building library objects. -pic_flag=" -fPIC -DPIC" -pic_mode=default - -# What is the maximum length of a command? -max_cmd_len=262144 - -# Does compiler simultaneously support -c and -o options? -compiler_c_o="yes" - -# Must we lock files when doing compilation? -need_locks="no" - -# Do we need the lib prefix for modules? -need_lib_prefix=no - -# Do we need a version for libraries? -need_version=no - -# Whether dlopen is supported. -dlopen_support=yes - -# Whether dlopen of programs is supported. -dlopen_self=yes - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=no - -# Compiler flag to prevent dynamic linking. -link_static_flag="-static" - -# Compiler flag to turn off builtin functions. -no_builtin_flag=" -fno-builtin" - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec="" - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec="\${wl}-z \${wl}allextract\`for conv in \$convenience\\\"\\\"; do test -n \\\"\$conv\\\" && new_convenience=\\\"\$new_convenience,\$conv\\\"; done; \$echo \\\"\$new_convenience\\\"\` \${wl}-z \${wl}defaultextract" - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec="" - -# Library versioning type. -version_type=linux - -# Format of library name prefix. -libname_spec="lib\$name" - -# 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. -library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}" - -# The coded name of the library, if different from the real name. -soname_spec="\${libname}\${release}\${shared_ext}\$major" - -# Commands used to build and install an old-style archive. -RANLIB="ranlib" -old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib" -old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib" -old_postuninstall_cmds="" - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds="" - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds="" - -# Commands used to build and install a shared archive. -archive_cmds="\$CC -shared \${wl}-h \${wl}\$soname -o \$lib \$libobjs \$deplibs \$compiler_flags" -archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$lib.exp~cat \$export_symbols | \$SED -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$lib.exp~\$echo \\\"local: *; };\\\" >> \$lib.exp~ - \$CC -shared \${wl}-M \${wl}\$lib.exp \${wl}-h \${wl}\$soname -o \$lib \$libobjs \$deplibs \$compiler_flags~\$rm \$lib.exp" -postinstall_cmds="chmod +x \$lib" -postuninstall_cmds="" - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds="" -module_expsym_cmds="" - -# Commands to strip libraries. -old_striplib="" -striplib="" - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects="" - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects="" - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps="" - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps="" - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path="" - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method="pass_all" - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd="\$MAGIC_CMD" - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag="" - -# Flag that forces no undefined symbols. -no_undefined_flag=" -z text" - -# Commands used to finish a libtool library installation in a directory. -finish_cmds="" - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval="" - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe="sed -n -e 's/^.*[ ]\\([BDRT][BDRT]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'" - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'" - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (lt_ptr) \\&\\2},/p'" - -# This is the shared library runtime path variable. -runpath_var= - -# This is the shared library path variable. -shlibpath_var=LD_LIBRARY_PATH - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=yes - -# How to hardcode a shared library path into an executable. -hardcode_action=immediate - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=yes - -# Flag to hardcode $libdir into a binary during linking. -# This must work even if $libdir does not exist. -hardcode_libdir_flag_spec="-R\$libdir" - -# If ld is used when linking, flag to hardcode $libdir into -# a binary during linking. This must work even if $libdir does -# not exist. -hardcode_libdir_flag_spec_ld="" - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator="" - -# Set to yes if using DIR/libNAME during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=no - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=no - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=no - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=no - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="PATH LD_LIBRARY_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=yes - -# Compile-time system search path for libraries -sys_lib_search_path_spec=" /opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/ /usr/lib/gcc/i386-pc-solaris2.8/3.4.5/ /opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/../../../../i386-pc-solaris2.8/lib/i386-pc-solaris2.8/3.4.5/ /opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/../../../../i386-pc-solaris2.8/lib/ /usr/ccs/bin/i386-pc-solaris2.8/3.4.5/ /usr/ccs/bin/ /usr/ccs/lib/i386-pc-solaris2.8/3.4.5/ /usr/ccs/lib/ /opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/../../../i386-pc-solaris2.8/3.4.5/ /opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/../../../ /lib/i386-pc-solaris2.8/3.4.5/ /lib/ /usr/lib/i386-pc-solaris2.8/3.4.5/ /usr/lib/" - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec="/lib /usr/lib" - -# Fix the shell variable $srcfile for the compiler. -fix_srcfile_path="" - -# Set to yes if exported symbols are required. -always_export_symbols=no - -# The commands to list exported symbols. -export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols" - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds="" - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms="_GLOBAL_OFFSET_TABLE_" - -# Symbols that must always be exported. -include_expsyms="" - -# ### END LIBTOOL CONFIG Deleted: csw/mgar/pkg/libtool/trunk/files/i386-gcc3.tags =================================================================== --- csw/mgar/pkg/libtool/trunk/files/i386-gcc3.tags 2009-09-04 07:30:40 UTC (rev 6167) +++ csw/mgar/pkg/libtool/trunk/files/i386-gcc3.tags 2009-09-04 07:34:59 UTC (rev 6168) @@ -1,624 +0,0 @@ -# ### BEGIN LIBTOOL TAG CONFIG: disable-shared -disable_libs=shared -# ### END LIBTOOL TAG CONFIG: disable-shared - -# ### BEGIN LIBTOOL TAG CONFIG: disable-static -disable_libs=static -# ### END LIBTOOL TAG CONFIG: disable-static - -# Local Variables: -# mode:shell-script -# sh-indentation:2 -# End: -# ### BEGIN LIBTOOL TAG CONFIG: CXX - -# Libtool was configured on host ra: - -# Shell to use when invoking shell scripts. -SHELL="/bin/bash" - -# Whether or not to build shared libraries. -build_libtool_libs=yes - -# Whether or not to build static libraries. -build_old_libs=yes - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=no - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=no - -# Whether or not to optimize for fast installation. -fast_install=needless - -# The host system. -host_alias= -host=i386-pc-solaris2.8 -host_os=solaris2.8 - -# The build system. -build_alias= -build=i386-pc-solaris2.8 -build_os=solaris2.8 - -# An echo program that does not interpret backslashes. -echo="echo" - -# The archiver. -AR="ar" -AR_FLAGS="cru" - -# A C compiler. -LTCC="/opt/csw/gcc3/bin/gcc" - -# LTCC compiler flags. -LTCFLAGS="-O2" - -# A language-specific compiler. -CC="/opt/csw/gcc3/bin/g++" - -# Is the compiler the GNU C compiler? -with_gcc=yes - -# An ERE matcher. -EGREP="/opt/csw/bin/ggrep -E" - -# The linker used to build libraries. -LD="/usr/ccs/bin/ld" - -# Whether we need hard or soft links. -LN_S="ln -s" - -# A BSD-compatible nm program. -NM="/usr/ccs/bin/nm -p" - -# A symbol stripping program -STRIP="strip" - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=file - -# Used on cygwin: DLL creation program. -DLLTOOL="dlltool" - -# Used on cygwin: object dumper. -OBJDUMP="objdump" - -# Used on cygwin: assembler. -AS="as" - -# The name of the directory that contains temporary libtool files. -objdir=.libs - -# How to create reloadable object files. -reload_flag=" -r" -reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs" - -# How to pass a linker flag through the compiler. -wl="-Wl," - -# Object file suffix (normally "o"). -objext="o" - -# Old archive suffix (normally "a"). -libext="a" - -# Shared library suffix (normally ".so"). -shrext_cmds='.so' - -# Executable file suffix (normally ""). -exeext="" - -# Additional compiler flags for building library objects. -pic_flag=" -fPIC -DPIC" -pic_mode=default - -# What is the maximum length of a command? -max_cmd_len=262144 - -# Does compiler simultaneously support -c and -o options? -compiler_c_o="yes" - -# Must we lock files when doing compilation? -need_locks="no" - -# Do we need the lib prefix for modules? -need_lib_prefix=no - -# Do we need a version for libraries? -need_version=no - -# Whether dlopen is supported. -dlopen_support=yes - -# Whether dlopen of programs is supported. -dlopen_self=yes - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=no - -# Compiler flag to prevent dynamic linking. -link_static_flag="-static" - -# Compiler flag to turn off builtin functions. -no_builtin_flag=" -fno-builtin" - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec="" - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec="" - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec="" - -# Library versioning type. -version_type=linux - -# Format of library name prefix. -libname_spec="lib\$name" - -# 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. -library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}" - -# The coded name of the library, if different from the real name. -soname_spec="\${libname}\${release}\${shared_ext}\$major" - -# Commands used to build and install an old-style archive. -RANLIB="ranlib" -old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib" -old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib" -old_postuninstall_cmds="" - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds="" - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds="" - -# Commands used to build and install a shared archive. -archive_cmds="\$CC -shared -nostdlib \$LDFLAGS \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-h \$wl\$soname -o \$lib" -archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$lib.exp~cat \$export_symbols | \$SED -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$lib.exp~\$echo \\\"local: *; };\\\" >> \$lib.exp~ - \$CC -shared -nostdlib \${wl}-M \$wl\$lib.exp -o \$lib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags~\$rm \$lib.exp" -postinstall_cmds="chmod +x \$lib" -postuninstall_cmds="" - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds="" -module_expsym_cmds="" - -# Commands to strip libraries. -old_striplib="" -striplib="" - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects="/opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/crti.o /usr/ccs/lib/values-Xa.o /opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/crtbegin.o" - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects="/opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/crtend.o /opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/crtn.o" - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps="" - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps="-lstdc++ -lm -lgcc_s -lgcc_s" - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path="-L/opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5 -L/usr/ccs/bin -L/usr/ccs/lib -L/opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/../../.." - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method="pass_all" - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd="\$MAGIC_CMD" - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag="" - -# Flag that forces no undefined symbols. -no_undefined_flag=" \${wl}-z \${wl}defs" - -# Commands used to finish a libtool library installation in a directory. -finish_cmds="" - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval="" - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe="sed -n -e 's/^.*[ ]\\([BDRT][BDRT]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'" - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'" - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (lt_ptr) \\&\\2},/p'" - -# This is the shared library runtime path variable. -runpath_var= - -# This is the shared library path variable. -shlibpath_var=LD_LIBRARY_PATH - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=yes - -# How to hardcode a shared library path into an executable. -hardcode_action=immediate - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=yes - -# Flag to hardcode $libdir into a binary during linking. -# This must work even if $libdir does not exist. -hardcode_libdir_flag_spec="\${wl}-R \$wl\$libdir" - -# If ld is used when linking, flag to hardcode $libdir into -# a binary during linking. This must work even if $libdir does -# not exist. -hardcode_libdir_flag_spec_ld="" - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator="" - -# Set to yes if using DIR/libNAME during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=no - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=no - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=unsupported - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=no - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="PATH LD_LIBRARY_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=unknown - -# Compile-time system search path for libraries -sys_lib_search_path_spec=" /opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/ /usr/lib/gcc/i386-pc-solaris2.8/3.4.5/ /opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/../../../../i386-pc-solaris2.8/lib/i386-pc-solaris2.8/3.4.5/ /opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/../../../../i386-pc-solaris2.8/lib/ /usr/ccs/bin/i386-pc-solaris2.8/3.4.5/ /usr/ccs/bin/ /usr/ccs/lib/i386-pc-solaris2.8/3.4.5/ /usr/ccs/lib/ /opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/../../../i386-pc-solaris2.8/3.4.5/ /opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/../../../ /lib/i386-pc-solaris2.8/3.4.5/ /lib/ /usr/lib/i386-pc-solaris2.8/3.4.5/ /usr/lib/" - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec="/lib /usr/lib" - -# Fix the shell variable $srcfile for the compiler. -fix_srcfile_path="" - -# Set to yes if exported symbols are required. -always_export_symbols=no - -# The commands to list exported symbols. -export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols" - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds="" - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms="" - -# Symbols that must always be exported. -include_expsyms="" - -# ### END LIBTOOL TAG CONFIG: CXX - -# ### BEGIN LIBTOOL TAG CONFIG: F77 - -# Libtool was configured on host ra: - -# Shell to use when invoking shell scripts. -SHELL="/bin/bash" - -# Whether or not to build shared libraries. -build_libtool_libs=yes - -# Whether or not to build static libraries. -build_old_libs=yes - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=no - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=no - -# Whether or not to optimize for fast installation. -fast_install=needless - -# The host system. -host_alias= -host=i386-pc-solaris2.8 -host_os=solaris2.8 - -# The build system. -build_alias= -build=i386-pc-solaris2.8 -build_os=solaris2.8 - -# An echo program that does not interpret backslashes. -echo="echo" - -# The archiver. -AR="ar" -AR_FLAGS="cru" - -# A C compiler. -LTCC="/opt/csw/gcc3/bin/gcc" - -# LTCC compiler flags. -LTCFLAGS="-O2" - -# A language-specific compiler. -CC="/opt/csw/gcc3/bin/g77" - -# Is the compiler the GNU C compiler? -with_gcc=yes - -# An ERE matcher. -EGREP="/opt/csw/bin/ggrep -E" - -# The linker used to build libraries. -LD="/usr/ccs/bin/ld" - -# Whether we need hard or soft links. -LN_S="ln -s" - -# A BSD-compatible nm program. -NM="/usr/ccs/bin/nm -p" - -# A symbol stripping program -STRIP="strip" - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=file - -# Used on cygwin: DLL creation program. -DLLTOOL="dlltool" - -# Used on cygwin: object dumper. -OBJDUMP="objdump" - -# Used on cygwin: assembler. -AS="as" - -# The name of the directory that contains temporary libtool files. -objdir=.libs - -# How to create reloadable object files. -reload_flag=" -r" -reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs" - -# How to pass a linker flag through the compiler. -wl="-Wl," - -# Object file suffix (normally "o"). -objext="o" - -# Old archive suffix (normally "a"). -libext="a" - -# Shared library suffix (normally ".so"). -shrext_cmds='.so' - -# Executable file suffix (normally ""). -exeext="" - -# Additional compiler flags for building library objects. -pic_flag=" -fPIC" -pic_mode=default - -# What is the maximum length of a command? -max_cmd_len=262144 - -# Does compiler simultaneously support -c and -o options? -compiler_c_o="yes" - -# Must we lock files when doing compilation? -need_locks="no" - -# Do we need the lib prefix for modules? -need_lib_prefix=no - -# Do we need a version for libraries? -need_version=no - -# Whether dlopen is supported. -dlopen_support=yes - -# Whether dlopen of programs is supported. -dlopen_self=yes - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=no - -# Compiler flag to prevent dynamic linking. -link_static_flag="-static" - -# Compiler flag to turn off builtin functions. -no_builtin_flag="" - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec="" - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec="\${wl}-z \${wl}allextract\`for conv in \$convenience\\\"\\\"; do test -n \\\"\$conv\\\" && new_convenience=\\\"\$new_convenience,\$conv\\\"; done; \$echo \\\"\$new_convenience\\\"\` \${wl}-z \${wl}defaultextract" - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec="" - -# Library versioning type. -version_type=linux - -# Format of library name prefix. -libname_spec="lib\$name" - -# 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. -library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}" - -# The coded name of the library, if different from the real name. -soname_spec="\${libname}\${release}\${shared_ext}\$major" - -# Commands used to build and install an old-style archive. -RANLIB="ranlib" -old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib" -old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib" -old_postuninstall_cmds="" - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds="" - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds="" - -# Commands used to build and install a shared archive. -archive_cmds="\$CC -shared \${wl}-h \${wl}\$soname -o \$lib \$libobjs \$deplibs \$compiler_flags" -archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$lib.exp~cat \$export_symbols | \$SED -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$lib.exp~\$echo \\\"local: *; };\\\" >> \$lib.exp~ - \$CC -shared \${wl}-M \${wl}\$lib.exp \${wl}-h \${wl}\$soname -o \$lib \$libobjs \$deplibs \$compiler_flags~\$rm \$lib.exp" -postinstall_cmds="chmod +x \$lib" -postuninstall_cmds="" - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds="" -module_expsym_cmds="" - -# Commands to strip libraries. -old_striplib="" -striplib="" - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects="" - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects="" - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps="" - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps="" - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path="" - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method="pass_all" - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd="\$MAGIC_CMD" - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag="" - -# Flag that forces no undefined symbols. -no_undefined_flag=" -z text" - -# Commands used to finish a libtool library installation in a directory. -finish_cmds="" - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval="" - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe="sed -n -e 's/^.*[ ]\\([BDRT][BDRT]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'" - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'" - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (lt_ptr) \\&\\2},/p'" - -# This is the shared library runtime path variable. -runpath_var= - -# This is the shared library path variable. -shlibpath_var=LD_LIBRARY_PATH - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=yes - -# How to hardcode a shared library path into an executable. -hardcode_action=immediate - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=yes - -# Flag to hardcode $libdir into a binary during linking. -# This must work even if $libdir does not exist. -hardcode_libdir_flag_spec="-R\$libdir" - -# If ld is used when linking, flag to hardcode $libdir into -# a binary during linking. This must work even if $libdir does -# not exist. -hardcode_libdir_flag_spec_ld="" - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator="" - -# Set to yes if using DIR/libNAME during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=no - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=no - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=no - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=no - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="PATH LD_LIBRARY_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=yes - -# Compile-time system search path for libraries -sys_lib_search_path_spec=" /opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/ /usr/lib/gcc/i386-pc-solaris2.8/3.4.5/ /opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/../../../../i386-pc-solaris2.8/lib/i386-pc-solaris2.8/3.4.5/ /opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/../../../../i386-pc-solaris2.8/lib/ /usr/ccs/bin/i386-pc-solaris2.8/3.4.5/ /usr/ccs/bin/ /usr/ccs/lib/i386-pc-solaris2.8/3.4.5/ /usr/ccs/lib/ /opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/../../../i386-pc-solaris2.8/3.4.5/ /opt/csw/gcc3/lib/gcc/i386-pc-solaris2.8/3.4.5/../../../ /lib/i386-pc-solaris2.8/3.4.5/ /lib/ /usr/lib/i386-pc-solaris2.8/3.4.5/ /usr/lib/" - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec="/lib /usr/lib" - -# Fix the shell variable $srcfile for the compiler. -fix_srcfile_path="" - -# Set to yes if exported symbols are required. -always_export_symbols=no - -# The commands to list exported symbols. -export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols" - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds="" - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms="_GLOBAL_OFFSET_TABLE_" - -# Symbols that must always be exported. -include_expsyms="" - -# ### END LIBTOOL TAG CONFIG: F77 - Deleted: csw/mgar/pkg/libtool/trunk/files/libtool-gcc-tags.patch =================================================================== --- csw/mgar/pkg/libtool/trunk/files/libtool-gcc-tags.patch 2009-09-04 07:30:40 UTC (rev 6167) +++ csw/mgar/pkg/libtool/trunk/files/libtool-gcc-tags.patch 2009-09-04 07:34:59 UTC (rev 6168) @@ -1,128 +0,0 @@ ---- src-tree/libtool-1.5.22/libtool 2006-06-27 09:01:20.017045000 -0400 -+++ libtool/i386/libtool 2006-06-17 23:25:28.793268000 -0400 -@@ -44,7 +44,7 @@ - - # ### BEGIN LIBTOOL CONFIG - --# Libtool was configured on host thor: -+# Libtool was configured on host ra: - - # Shell to use when invoking shell scripts. - SHELL="/bin/bash" -@@ -85,7 +85,7 @@ - LTCC="cc" - - # LTCC compiler flags. --LTCFLAGS="-I/opt/csw/include -fsimple=2 -nofstore -xO5 -xalias_level=basic -xdepend -xarch=386 -xstrconst -xildoff" -+LTCFLAGS="-O" - - # A language-specific compiler. - CC="cc" -@@ -382,6 +382,8 @@ - # positional parameter $0, within a function call, is the name of the - # function. - progpath="$0" -+confpath="$0" -+tagspath="$0" - - # The name of this program: - progname=`echo "$progpath" | $SED $basename` -@@ -594,9 +596,9 @@ - # if we don't check for them as well. - *) - for z in $available_tags; do -- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then -+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$tagspath" > /dev/null; then - # Evaluate the configuration. -- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" -+ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $tagspath`" - CC_quoted= - for arg in $CC; do - # Double-quote args containing other shell metacharacters. -@@ -777,10 +779,10 @@ - # not specially marked. - ;; - *) -- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then -+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$tagspath" > /dev/null; then - taglist="$taglist $tagname" - # Evaluate the configuration. -- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`" -+ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $tagspath`" - else - $echo "$progname: ignoring unknown tag $tagname" 1>&2 - fi -@@ -816,7 +818,7 @@ - ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath - # Now print the configurations for the tags. - for tagname in $taglist; do -- ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath" -+ ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$tagspath" - done - exit $? - ;; -@@ -894,6 +896,17 @@ - exit $EXIT_FAILURE - fi - -+case `which "$nonopt"` in -+/opt/csw/gcc2/bin/*) -+ . /opt/csw/share/libtool/gcc2.conf -+ tagspath=/opt/csw/share/libtool/gcc2.tags -+ ;; -+/opt/csw/gcc3/bin/*) -+ . /opt/csw/share/libtool/gcc3.conf -+ tagspath=/opt/csw/share/libtool/gcc3.tags -+ ;; -+esac -+ - case $disable_libs in - no) - ;; -@@ -7207,13 +7220,9 @@ - disable_libs=static - # ### END LIBTOOL TAG CONFIG: disable-static - --# Local Variables: --# mode:shell-script --# sh-indentation:2 --# End: - # ### BEGIN LIBTOOL TAG CONFIG: CXX - --# Libtool was configured on host thor: -+# Libtool was configured on host ra: - - # Shell to use when invoking shell scripts. - SHELL="/bin/bash" -@@ -7254,7 +7263,7 @@ - LTCC="cc" - - # LTCC compiler flags. --LTCFLAGS="-I/opt/csw/include -fsimple=2 -nofstore -xO5 -xalias_level=basic -xdepend -xarch=386 -xstrconst -xildoff" -+LTCFLAGS="-O" - - # A language-specific compiler. - CC="CC" -@@ -7519,7 +7528,7 @@ - - # ### BEGIN LIBTOOL TAG CONFIG: F77 - --# Libtool was configured on host thor: -+# Libtool was configured on host ra: - - # Shell to use when invoking shell scripts. - SHELL="/bin/bash" -@@ -7560,7 +7569,7 @@ - LTCC="cc" - - # LTCC compiler flags. --LTCFLAGS="-I/opt/csw/include -fsimple=2 -nofstore -xO5 -xalias_level=basic -xdepend -xarch=386 -xstrconst -xildoff" -+LTCFLAGS="-O" - - # A language-specific compiler. - CC="f77" -@@ -7822,4 +7831,3 @@ - include_expsyms="" - - # ### END LIBTOOL TAG CONFIG: F77 -- Added: csw/mgar/pkg/libtool/trunk/files/patch-libtool.diff =================================================================== --- csw/mgar/pkg/libtool/trunk/files/patch-libtool.diff (rev 0) +++ csw/mgar/pkg/libtool/trunk/files/patch-libtool.diff 2009-09-04 07:34:59 UTC (rev 6168) @@ -0,0 +1,87 @@ +diff -Naur lt-orig/libtool lt-patched/libtool +--- lt-orig/libtool 2009-09-03 20:43:39.235079615 +0200 ++++ lt-patched/libtool 2009-09-03 20:56:11.509318512 +0200 +@@ -138,7 +138,7 @@ + LTCC="/opt/studio/SOS11/SUNWspro/bin/cc" + + # LTCC compiler flags. +-LTCFLAGS="-xO3 -xarch=v8 -I/opt/csw/include" ++LTCFLAGS="-O" + + # Take the output of nm and produce a listing of raw symbols and C names. + global_symbol_pipe="sed -n -e 's/^.*[ ]\\([BDRT][BDRT]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'" +@@ -682,6 +682,8 @@ + # positional parameter $0, within a function call, is the name of the + # function. + progpath="$0" ++confpath="$0" ++tagspath="$0" + + # The name of this program: + # In the unlikely event $progname began with a '-', it would play havoc with +@@ -1128,11 +1130,11 @@ + re_endcf='^# ### END LIBTOOL' + + # Default configuration. +- $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath" ++ $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$confpath" + + # Now print the configurations for the tags. + for tagname in $taglist; do +- $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath" ++ $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$tagspath" + done + + exit $? +@@ -1182,14 +1184,14 @@ + case $tagname in + CC) ;; + *) +- if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then ++ if $GREP "$re_begincf" "$tagspath" >/dev/null 2>&1; then + taglist="$taglist $tagname" + + # Evaluate the configuration. Be careful to quote the path + # and the sed script, to avoid splitting on whitespace, but + # also don't use non-portable quotes within backquotes within + # quotes we have to do it in 2 steps: +- extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` ++ extractedcf=`$SED -n -e "$sed_extractcf" < "$tagspath"` + eval "$extractedcf" + else + func_error "ignoring unknown tag $tagname" +@@ -1303,7 +1305,21 @@ + + -*) func_fatal_help "unrecognized option \`$opt'" ;; + +- *) nonopt="$opt" ++ *) case `which "$opt"` in ++ /opt/csw/gcc3/bin/*) ++ . /opt/csw/share/libtool/gcc3.conf ++ tagspath=/opt/csw/share/libtool/gcc3.tags ++ ;; ++ /opt/csw/gcc4/bin/*) ++ . /opt/csw/share/libtool/gcc4.conf ++ tagspath=/opt/csw/share/libtool/gcc4.tags ++ ;; ++ esac ++ ++ ++ ++ ++nonopt="$opt" + break + ;; + esac +@@ -1530,9 +1546,9 @@ + # if we don't check for them as well. + *) + for z in $available_tags; do +- if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then ++ if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$tagspath" > /dev/null; then + # Evaluate the configuration. +- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" ++ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $tagspath`" + CC_quoted= + for arg in $CC; do + # Double-quote args containing other shell metacharacters. Deleted: csw/mgar/pkg/libtool/trunk/files/sparc-gcc2.conf =================================================================== --- csw/mgar/pkg/libtool/trunk/files/sparc-gcc2.conf 2009-09-04 07:30:40 UTC (rev 6167) +++ csw/mgar/pkg/libtool/trunk/files/sparc-gcc2.conf 2009-09-04 07:34:59 UTC (rev 6168) @@ -1,318 +0,0 @@ -# A sed program that does not truncate output. -SED="/opt/csw/bin/gsed" - -# Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="/opt/csw/bin/gsed -e 1s/^X//" - -# 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 - -# The names of the tagged configurations supported by this script. -available_tags=" CXX" - -# ### BEGIN LIBTOOL CONFIG - -# Libtool was configured on host ra: - -# Shell to use when invoking shell scripts. -SHELL="/bin/bash" - -# Whether or not to build shared libraries. -build_libtool_libs=yes - -# Whether or not to build static libraries. -build_old_libs=yes - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=yes - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=no - -# Whether or not to optimize for fast installation. -fast_install=needless - -# The host system. -host_alias= -host=sparc-sun-solaris2.8 -host_os=solaris2.8 - -# The build system. -build_alias= -build=sparc-sun-solaris2.8 -build_os=solaris2.8 - -# An echo program that does not interpret backslashes. -echo="echo" - -# The archiver. -AR="ar" -AR_FLAGS="cru" - -# A C compiler. -LTCC="/opt/csw/gcc2/bin/gcc" - -# LTCC compiler flags. -LTCFLAGS="-O2" - -# A language-specific compiler. -CC="/opt/csw/gcc2/bin/gcc" - -# Is the compiler the GNU C compiler? -with_gcc=yes - -# An ERE matcher. -EGREP="/opt/csw/bin/ggrep -E" - -# The linker used to build libraries. -LD="/usr/ccs/bin/ld" - -# Whether we need hard or soft links. -LN_S="ln -s" - -# A BSD-compatible nm program. -NM="/usr/ccs/bin/nm -p" - -# A symbol stripping program -STRIP="strip" - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=file - -# Used on cygwin: DLL creation program. -DLLTOOL="dlltool" - -# Used on cygwin: object dumper. -OBJDUMP="objdump" - -# Used on cygwin: assembler. -AS="as" - -# The name of the directory that contains temporary libtool files. -objdir=.libs - -# How to create reloadable object files. -reload_flag=" -r" -reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs" - -# How to pass a linker flag through the compiler. -wl="-Wl," - -# Object file suffix (normally "o"). -objext="o" - -# Old archive suffix (normally "a"). -libext="a" - -# Shared library suffix (normally ".so"). -shrext_cmds='.so' - -# Executable file suffix (normally ""). -exeext="" - -# Additional compiler flags for building library objects. -pic_flag=" -fPIC -DPIC" -pic_mode=default - -# What is the maximum length of a command? -max_cmd_len=262144 - -# Does compiler simultaneously support -c and -o options? -compiler_c_o="yes" - -# Must we lock files when doing compilation? -need_locks="no" - -# Do we need the lib prefix for modules? -need_lib_prefix=no - -# Do we need a version for libraries? -need_version=no - -# Whether dlopen is supported. -dlopen_support=yes - -# Whether dlopen of programs is supported. -dlopen_self=yes - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=no - -# Compiler flag to prevent dynamic linking. -link_static_flag="-static" - -# Compiler flag to turn off builtin functions. -no_builtin_flag=" -fno-builtin -fno-rtti -fno-exceptions" - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec="" - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec="\${wl}-z \${wl}allextract\`for conv in \$convenience\\\"\\\"; do test -n \\\"\$conv\\\" && new_convenience=\\\"\$new_convenience,\$conv\\\"; done; \$echo \\\"\$new_convenience\\\"\` \${wl}-z \${wl}defaultextract" - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec="" - -# Library versioning type. -version_type=linux - -# Format of library name prefix. -libname_spec="lib\$name" - -# 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. -library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}" - -# The coded name of the library, if different from the real name. -soname_spec="\${libname}\${release}\${shared_ext}\$major" - -# Commands used to build and install an old-style archive. -RANLIB="ranlib" -old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib" -old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib" -old_postuninstall_cmds="" - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds="" - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds="" - -# Commands used to build and install a shared archive. -archive_cmds="\$CC -shared \${wl}-h \${wl}\$soname -o \$lib \$libobjs \$deplibs \$compiler_flags" -archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$lib.exp~cat \$export_symbols | \$SED -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$lib.exp~\$echo \\\"local: *; };\\\" >> \$lib.exp~ - \$CC -shared \${wl}-M \${wl}\$lib.exp \${wl}-h \${wl}\$soname -o \$lib \$libobjs \$deplibs \$compiler_flags~\$rm \$lib.exp" -postinstall_cmds="chmod +x \$lib" -postuninstall_cmds="" - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds="" -module_expsym_cmds="" - -# Commands to strip libraries. -old_striplib="" -striplib="" - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects="" - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects="" - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps="" - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps="" - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path="" - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method="pass_all" - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd="\$MAGIC_CMD" - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag="" - -# Flag that forces no undefined symbols. -no_undefined_flag=" -z text" - -# Commands used to finish a libtool library installation in a directory. -finish_cmds="" - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval="" - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe="sed -n -e 's/^.*[ ]\\([BDRT][BDRT]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'" - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'" - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (lt_ptr) \\&\\2},/p'" - -# This is the shared library runtime path variable. -runpath_var= - -# This is the shared library path variable. -shlibpath_var=LD_LIBRARY_PATH - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=yes - -# How to hardcode a shared library path into an executable. -hardcode_action=immediate - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=yes - -# Flag to hardcode $libdir into a binary during linking. -# This must work even if $libdir does not exist. -hardcode_libdir_flag_spec="-R\$libdir" - -# If ld is used when linking, flag to hardcode $libdir into -# a binary during linking. This must work even if $libdir does -# not exist. -hardcode_libdir_flag_spec_ld="" - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator="" - -# Set to yes if using DIR/libNAME during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=no - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=no - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=no - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=no - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="PATH LD_LIBRARY_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=yes - -# Compile-time system search path for libraries -sys_lib_search_path_spec=" /opt/csw/gcc2/lib/gcc-lib/sparc-sun-solaris2.8/2.95.3/ /usr/lib/gcc/sparc-sun-solaris2.8/2.95.3/ /opt/csw/gcc2/sparc-sun-solaris2.8/lib/sparc-sun-solaris2.8/2.95.3/ /opt/csw/gcc2/sparc-sun-solaris2.8/lib/ /usr/ccs/bin/sparc-sun-solaris2.8/2.95.3/ /usr/ccs/bin/ /usr/ccs/lib/sparc-sun-solaris2.8/2.95.3/ /usr/ccs/lib/ /opt/csw/gcc2/lib/sparc-sun-solaris2.8/2.95.3/ /opt/csw/gcc2/lib/ /lib/sparc-sun-solaris2.8/2.95.3/ /lib/ /usr/lib/sparc-sun-solaris2.8/2.95.3/ /usr/lib/" - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec="/lib /usr/lib" - -# Fix the shell variable $srcfile for the compiler. -fix_srcfile_path="" - -# Set to yes if exported symbols are required. -always_export_symbols=no - -# The commands to list exported symbols. -export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols" - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds="" - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms="_GLOBAL_OFFSET_TABLE_" - -# Symbols that must always be exported. -include_expsyms="" - -# ### END LIBTOOL CONFIG Deleted: csw/mgar/pkg/libtool/trunk/files/sparc-gcc2.tags =================================================================== --- csw/mgar/pkg/libtool/trunk/files/sparc-gcc2.tags 2009-09-04 07:30:40 UTC (rev 6167) +++ csw/mgar/pkg/libtool/trunk/files/sparc-gcc2.tags 2009-09-04 07:34:59 UTC (rev 6168) @@ -1,317 +0,0 @@ -# ### BEGIN LIBTOOL TAG CONFIG: disable-shared -disable_libs=shared -# ### END LIBTOOL TAG CONFIG: disable-shared - -# ### BEGIN LIBTOOL TAG CONFIG: disable-static -disable_libs=static -# ### END LIBTOOL TAG CONFIG: disable-static - -# Local Variables: -# mode:shell-script -# sh-indentation:2 -# End: -# ### BEGIN LIBTOOL TAG CONFIG: CXX - -# Libtool was configured on host ra: - -# Shell to use when invoking shell scripts. -SHELL="/bin/bash" - -# Whether or not to build shared libraries. -build_libtool_libs=yes - -# Whether or not to build static libraries. -build_old_libs=yes - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=no - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=no - -# Whether or not to optimize for fast installation. -fast_install=needless - -# The host system. -host_alias= -host=sparc-sun-solaris2.8 -host_os=solaris2.8 - -# The build system. -build_alias= -build=sparc-sun-solaris2.8 -build_os=solaris2.8 - -# An echo program that does not interpret backslashes. -echo="echo" - -# The archiver. -AR="ar" -AR_FLAGS="cru" - -# A C compiler. -LTCC="/opt/csw/gcc2/bin/gcc" - -# LTCC compiler flags. -LTCFLAGS="-O2" - -# A language-specific compiler. -CC="/opt/csw/gcc2/bin/g++" - -# Is the compiler the GNU C compiler? -with_gcc=yes - -# An ERE matcher. -EGREP="/opt/csw/bin/ggrep -E" - -# The linker used to build libraries. -LD="/usr/ccs/bin/ld" - -# Whether we need hard or soft links. -LN_S="ln -s" - -# A BSD-compatible nm program. -NM="/usr/ccs/bin/nm -p" - -# A symbol stripping program -STRIP="strip" - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=file - -# Used on cygwin: DLL creation program. -DLLTOOL="dlltool" - -# Used on cygwin: object dumper. -OBJDUMP="objdump" - -# Used on cygwin: assembler. -AS="as" - -# The name of the directory that contains temporary libtool files. -objdir=.libs - -# How to create reloadable object files. -reload_flag=" -r" -reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs" - -# How to pass a linker flag through the compiler. -wl="-Wl," - -# Object file suffix (normally "o"). -objext="o" - -# Old archive suffix (normally "a"). -libext="a" - -# Shared library suffix (normally ".so"). -shrext_cmds='.so' - -# Executable file suffix (normally ""). -exeext="" - -# Additional compiler flags for building library objects. -pic_flag=" -fPIC -DPIC" -pic_mode=default - -# What is the maximum length of a command? -max_cmd_len=262144 - -# Does compiler simultaneously support -c and -o options? -compiler_c_o="yes" - -# Must we lock files when doing compilation? -need_locks="no" - -# Do we need the lib prefix for modules? -need_lib_prefix=no - -# Do we need a version for libraries? -need_version=no - -# Whether dlopen is supported. -dlopen_support=yes - -# Whether dlopen of programs is supported. -dlopen_self=yes - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=no - -# Compiler flag to prevent dynamic linking. -link_static_flag="-static" - -# Compiler flag to turn off builtin functions. -no_builtin_flag=" -fno-builtin" - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec="" - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec="" - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec="" - -# Library versioning type. -version_type=linux - -# Format of library name prefix. -libname_spec="lib\$name" - -# 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. -library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}" - -# The coded name of the library, if different from the real name. -soname_spec="\${libname}\${release}\${shared_ext}\$major" - -# Commands used to build and install an old-style archive. -RANLIB="ranlib" -old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib" -old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib" -old_postuninstall_cmds="" - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds="" - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds="" - -# Commands used to build and install a shared archive. -archive_cmds="\$CC -shared -nostdlib \$LDFLAGS \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-h \$wl\$soname -o \$lib" -archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$lib.exp~cat \$export_symbols | \$SED -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$lib.exp~\$echo \\\"local: *; };\\\" >> \$lib.exp~ - \$CC -shared -nostdlib \${wl}-M \$wl\$lib.exp -o \$lib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags~\$rm \$lib.exp" -postinstall_cmds="chmod +x \$lib" -postuninstall_cmds="" - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds="" -module_expsym_cmds="" - -# Commands to strip libraries. -old_striplib="" -striplib="" - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects="/opt/csw/gcc2/lib/gcc-lib/sparc-sun-solaris2.8/2.95.3/crti.o /usr/ccs/lib/values-Xa.o /opt/csw/gcc2/lib/gcc-lib/sparc-sun-solaris2.8/2.95.3/crtbegin.o" - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects="/opt/csw/gcc2/lib/gcc-lib/sparc-sun-solaris2.8/2.95.3/crtend.o /opt/csw/gcc2/lib/gcc-lib/sparc-sun-solaris2.8/2.95.3/crtn.o" - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps="" - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps="-lstdc++ -lm -lgcc -lgcc" - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path="-L/opt/csw/gcc2/lib/gcc-lib/sparc-sun-solaris2.8/2.95.3 -L/usr/ccs/bin -L/usr/ccs/lib -L/opt/csw/gcc2/lib" - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method="pass_all" - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd="\$MAGIC_CMD" - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag="" - -# Flag that forces no undefined symbols. -no_undefined_flag=" \${wl}-z \${wl}defs" - -# Commands used to finish a libtool library installation in a directory. -finish_cmds="" - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval="" - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe="sed -n -e 's/^.*[ ]\\([BDRT][BDRT]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'" - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'" - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (lt_ptr) \\&\\2},/p'" - -# This is the shared library runtime path variable. -runpath_var= - -# This is the shared library path variable. -shlibpath_var=LD_LIBRARY_PATH - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=yes - -# How to hardcode a shared library path into an executable. -hardcode_action=immediate - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=yes - -# Flag to hardcode $libdir into a binary during linking. -# This must work even if $libdir does not exist. -hardcode_libdir_flag_spec="\${wl}-R \$wl\$libdir" - -# If ld is used when linking, flag to hardcode $libdir into -# a binary during linking. This must work even if $libdir does -# not exist. -hardcode_libdir_flag_spec_ld="" - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator="" - -# Set to yes if using DIR/libNAME during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=no - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=no - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=unsupported - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=no - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="PATH LD_LIBRARY_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=unknown - -# Compile-time system search path for libraries -sys_lib_search_path_spec=" /opt/csw/gcc2/lib/gcc-lib/sparc-sun-solaris2.8/2.95.3/ /usr/lib/gcc/sparc-sun-solaris2.8/2.95.3/ /opt/csw/gcc2/sparc-sun-solaris2.8/lib/sparc-sun-solaris2.8/2.95.3/ /opt/csw/gcc2/sparc-sun-solaris2.8/lib/ /usr/ccs/bin/sparc-sun-solaris2.8/2.95.3/ /usr/ccs/bin/ /usr/ccs/lib/sparc-sun-solaris2.8/2.95.3/ /usr/ccs/lib/ /opt/csw/gcc2/lib/sparc-sun-solaris2.8/2.95.3/ /opt/csw/gcc2/lib/ /lib/sparc-sun-solaris2.8/2.95.3/ /lib/ /usr/lib/sparc-sun-solaris2.8/2.95.3/ /usr/lib/" - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec="/lib /usr/lib" - -# Fix the shell variable $srcfile for the compiler. -fix_srcfile_path="" - -# Set to yes if exported symbols are required. -always_export_symbols=no - -# The commands to list exported symbols. -export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols" - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds="" - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms="" - -# Symbols that must always be exported. -include_expsyms="" - -# ### END LIBTOOL TAG CONFIG: CXX Deleted: csw/mgar/pkg/libtool/trunk/files/sparc-gcc3.conf =================================================================== --- csw/mgar/pkg/libtool/trunk/files/sparc-gcc3.conf 2009-09-04 07:30:40 UTC (rev 6167) +++ csw/mgar/pkg/libtool/trunk/files/sparc-gcc3.conf 2009-09-04 07:34:59 UTC (rev 6168) @@ -1,318 +0,0 @@ -# A sed program that does not truncate output. -SED="/opt/csw/bin/gsed" - -# Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="/opt/csw/bin/gsed -e 1s/^X//" - -# 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 - -# The names of the tagged configurations supported by this script. -available_tags=" CXX F77" - -# ### BEGIN LIBTOOL CONFIG - -# Libtool was configured on host ra: - -# Shell to use when invoking shell scripts. -SHELL="/bin/bash" - -# Whether or not to build shared libraries. -build_libtool_libs=yes - -# Whether or not to build static libraries. -build_old_libs=yes - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=yes - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=no - -# Whether or not to optimize for fast installation. -fast_install=needless - -# The host system. -host_alias= -host=sparc-sun-solaris2.8 -host_os=solaris2.8 - -# The build system. -build_alias= -build=sparc-sun-solaris2.8 -build_os=solaris2.8 - -# An echo program that does not interpret backslashes. -echo="echo" - -# The archiver. -AR="ar" -AR_FLAGS="cru" - -# A C compiler. -LTCC="/opt/csw/gcc3/bin/gcc" - -# LTCC compiler flags. -LTCFLAGS="-O2" - -# A language-specific compiler. -CC="/opt/csw/gcc3/bin/gcc" - -# Is the compiler the GNU C compiler? -with_gcc=yes - -# An ERE matcher. -EGREP="/opt/csw/bin/ggrep -E" - -# The linker used to build libraries. -LD="/usr/ccs/bin/ld" - -# Whether we need hard or soft links. -LN_S="ln -s" - -# A BSD-compatible nm program. -NM="/usr/ccs/bin/nm -p" - -# A symbol stripping program -STRIP="strip" - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=file - -# Used on cygwin: DLL creation program. -DLLTOOL="dlltool" - -# Used on cygwin: object dumper. -OBJDUMP="objdump" - -# Used on cygwin: assembler. -AS="as" - -# The name of the directory that contains temporary libtool files. -objdir=.libs - -# How to create reloadable object files. -reload_flag=" -r" -reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs" - -# How to pass a linker flag through the compiler. -wl="-Wl," - -# Object file suffix (normally "o"). -objext="o" - -# Old archive suffix (normally "a"). -libext="a" - -# Shared library suffix (normally ".so"). -shrext_cmds='.so' - -# Executable file suffix (normally ""). -exeext="" - -# Additional compiler flags for building library objects. -pic_flag=" -fPIC -DPIC" -pic_mode=default - -# What is the maximum length of a command? -max_cmd_len=262144 - -# Does compiler simultaneously support -c and -o options? -compiler_c_o="yes" - -# Must we lock files when doing compilation? -need_locks="no" - -# Do we need the lib prefix for modules? -need_lib_prefix=no - -# Do we need a version for libraries? -need_version=no - -# Whether dlopen is supported. -dlopen_support=yes - -# Whether dlopen of programs is supported. -dlopen_self=yes - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=no - -# Compiler flag to prevent dynamic linking. -link_static_flag="-static" - -# Compiler flag to turn off builtin functions. -no_builtin_flag=" -fno-builtin" - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec="" - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec="\${wl}-z \${wl}allextract\`for conv in \$convenience\\\"\\\"; do test -n \\\"\$conv\\\" && new_convenience=\\\"\$new_convenience,\$conv\\\"; done; \$echo \\\"\$new_convenience\\\"\` \${wl}-z \${wl}defaultextract" - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec="" - -# Library versioning type. -version_type=linux - -# Format of library name prefix. -libname_spec="lib\$name" - -# 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. -library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}" - -# The coded name of the library, if different from the real name. -soname_spec="\${libname}\${release}\${shared_ext}\$major" - -# Commands used to build and install an old-style archive. -RANLIB="ranlib" -old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib" -old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib" -old_postuninstall_cmds="" - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds="" - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds="" - -# Commands used to build and install a shared archive. -archive_cmds="\$CC -shared \${wl}-h \${wl}\$soname -o \$lib \$libobjs \$deplibs \$compiler_flags" -archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$lib.exp~cat \$export_symbols | \$SED -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$lib.exp~\$echo \\\"local: *; };\\\" >> \$lib.exp~ - \$CC -shared \${wl}-M \${wl}\$lib.exp \${wl}-h \${wl}\$soname -o \$lib \$libobjs \$deplibs \$compiler_flags~\$rm \$lib.exp" -postinstall_cmds="chmod +x \$lib" -postuninstall_cmds="" - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds="" -module_expsym_cmds="" - -# Commands to strip libraries. -old_striplib="" -striplib="" - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects="" - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects="" - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps="" - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps="" - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path="" - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method="pass_all" - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd="\$MAGIC_CMD" - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag="" - -# Flag that forces no undefined symbols. -no_undefined_flag=" -z text" - -# Commands used to finish a libtool library installation in a directory. -finish_cmds="" - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval="" - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe="sed -n -e 's/^.*[ ]\\([BDRT][BDRT]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'" - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'" - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (lt_ptr) \\&\\2},/p'" - -# This is the shared library runtime path variable. -runpath_var= - -# This is the shared library path variable. -shlibpath_var=LD_LIBRARY_PATH - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=yes - -# How to hardcode a shared library path into an executable. -hardcode_action=immediate - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=yes - -# Flag to hardcode $libdir into a binary during linking. -# This must work even if $libdir does not exist. -hardcode_libdir_flag_spec="-R\$libdir" - -# If ld is used when linking, flag to hardcode $libdir into -# a binary during linking. This must work even if $libdir does -# not exist. -hardcode_libdir_flag_spec_ld="" - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator="" - -# Set to yes if using DIR/libNAME during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=no - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=no - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=no - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=no - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="PATH LD_LIBRARY_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=yes - -# Compile-time system search path for libraries -sys_lib_search_path_spec=" /opt/csw/gcc3/lib/gcc/sparc-sun-solaris2.8/3.4.5/ /usr/lib/gcc/sparc-sun-solaris2.8/3.4.5/ /opt/csw/gcc3/lib/gcc/sparc-sun-solaris2.8/3.4.5/../../../../sparc-sun-solaris2.8/lib/sparc-sun-solaris2.8/3.4.5/ /opt/csw/gcc3/lib/gcc/sparc-sun-solaris2.8/3.4.5/../../../../sparc-sun-solaris2.8/lib/ /usr/ccs/bin/sparc-sun-solaris2.8/3.4.5/ /usr/ccs/bin/ /usr/ccs/lib/sparc-sun-solaris2.8/3.4.5/ /usr/ccs/lib/ /opt/csw/gcc3/lib/gcc/sparc-sun-solaris2.8/3.4.5/../../../sparc-sun-solaris2.8/3.4.5/ /opt/csw/gcc3/lib/gcc/sparc-sun-solaris2.8/3.4.5/../../../ /lib/sparc-sun-solaris2.8/3.4.5/ /lib/ /usr/lib/sparc-sun-solaris2.8/3.4.5/ /usr/lib/" - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec="/lib /usr/lib" - -# Fix the shell variable $srcfile for the compiler. -fix_srcfile_path="" - -# Set to yes if exported symbols are required. -always_export_symbols=no - -# The commands to list exported symbols. -export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols" - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds="" - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms="_GLOBAL_OFFSET_TABLE_" - -# Symbols that must always be exported. -include_expsyms="" - -# ### END LIBTOOL CONFIG Deleted: csw/mgar/pkg/libtool/trunk/files/sparc-gcc3.tags =================================================================== --- csw/mgar/pkg/libtool/trunk/files/sparc-gcc3.tags 2009-09-04 07:30:40 UTC (rev 6167) +++ csw/mgar/pkg/libtool/trunk/files/sparc-gcc3.tags 2009-09-04 07:34:59 UTC (rev 6168) @@ -1,624 +0,0 @@ -# ### BEGIN LIBTOOL TAG CONFIG: disable-shared -disable_libs=shared -# ### END LIBTOOL TAG CONFIG: disable-shared - -# ### BEGIN LIBTOOL TAG CONFIG: disable-static -disable_libs=static -# ### END LIBTOOL TAG CONFIG: disable-static - -# Local Variables: -# mode:shell-script -# sh-indentation:2 -# End: -# ### BEGIN LIBTOOL TAG CONFIG: CXX - -# Libtool was configured on host ra: - -# Shell to use when invoking shell scripts. -SHELL="/bin/bash" - -# Whether or not to build shared libraries. -build_libtool_libs=yes - -# Whether or not to build static libraries. -build_old_libs=yes - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=no - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=no - -# Whether or not to optimize for fast installation. -fast_install=needless - -# The host system. -host_alias= -host=sparc-sun-solaris2.8 -host_os=solaris2.8 - -# The build system. -build_alias= -build=sparc-sun-solaris2.8 -build_os=solaris2.8 - -# An echo program that does not interpret backslashes. -echo="echo" - -# The archiver. -AR="ar" -AR_FLAGS="cru" - -# A C compiler. -LTCC="/opt/csw/gcc3/bin/gcc" - -# LTCC compiler flags. -LTCFLAGS="-O2" - -# A language-specific compiler. -CC="/opt/csw/gcc3/bin/g++" - -# Is the compiler the GNU C compiler? -with_gcc=yes - -# An ERE matcher. -EGREP="/opt/csw/bin/ggrep -E" - -# The linker used to build libraries. -LD="/usr/ccs/bin/ld" - -# Whether we need hard or soft links. -LN_S="ln -s" - -# A BSD-compatible nm program. -NM="/usr/ccs/bin/nm -p" - -# A symbol stripping program -STRIP="strip" - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=file - -# Used on cygwin: DLL creation program. -DLLTOOL="dlltool" - -# Used on cygwin: object dumper. -OBJDUMP="objdump" - -# Used on cygwin: assembler. -AS="as" - -# The name of the directory that contains temporary libtool files. -objdir=.libs - -# How to create reloadable object files. -reload_flag=" -r" -reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs" - -# How to pass a linker flag through the compiler. -wl="-Wl," - -# Object file suffix (normally "o"). -objext="o" - -# Old archive suffix (normally "a"). -libext="a" - -# Shared library suffix (normally ".so"). -shrext_cmds='.so' - -# Executable file suffix (normally ""). -exeext="" - -# Additional compiler flags for building library objects. -pic_flag=" -fPIC -DPIC" -pic_mode=default - -# What is the maximum length of a command? -max_cmd_len=262144 - -# Does compiler simultaneously support -c and -o options? -compiler_c_o="yes" - -# Must we lock files when doing compilation? -need_locks="no" - -# Do we need the lib prefix for modules? -need_lib_prefix=no - -# Do we need a version for libraries? -need_version=no - -# Whether dlopen is supported. -dlopen_support=yes - -# Whether dlopen of programs is supported. -dlopen_self=yes - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=no - -# Compiler flag to prevent dynamic linking. -link_static_flag="-static" - -# Compiler flag to turn off builtin functions. -no_builtin_flag=" -fno-builtin" - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec="" - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec="" - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec="" - -# Library versioning type. -version_type=linux - -# Format of library name prefix. -libname_spec="lib\$name" - -# 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. -library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}" - -# The coded name of the library, if different from the real name. -soname_spec="\${libname}\${release}\${shared_ext}\$major" - -# Commands used to build and install an old-style archive. -RANLIB="ranlib" -old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib" -old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib" -old_postuninstall_cmds="" - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds="" - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds="" - -# Commands used to build and install a shared archive. -archive_cmds="\$CC -shared -nostdlib \$LDFLAGS \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-h \$wl\$soname -o \$lib" -archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$lib.exp~cat \$export_symbols | \$SED -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$lib.exp~\$echo \\\"local: *; };\\\" >> \$lib.exp~ - \$CC -shared -nostdlib \${wl}-M \$wl\$lib.exp -o \$lib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags~\$rm \$lib.exp" -postinstall_cmds="chmod +x \$lib" -postuninstall_cmds="" - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds="" -module_expsym_cmds="" - -# Commands to strip libraries. -old_striplib="" -striplib="" - @@ 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 Fri Sep 4 09:53:42 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Sep 2009 07:53:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[6169] csw/mgar/pkg/freeradius/trunk/Makefile Message-ID: Revision: 6169 http://gar.svn.sourceforge.net/gar/?rev=6169&view=rev Author: dmichelsen Date: 2009-09-04 07:53:42 +0000 (Fri, 04 Sep 2009) Log Message: ----------- freeradius: Minor fixes Modified Paths: -------------- csw/mgar/pkg/freeradius/trunk/Makefile Modified: csw/mgar/pkg/freeradius/trunk/Makefile =================================================================== --- csw/mgar/pkg/freeradius/trunk/Makefile 2009-09-04 07:34:59 UTC (rev 6168) +++ csw/mgar/pkg/freeradius/trunk/Makefile 2009-09-04 07:53:42 UTC (rev 6169) @@ -7,7 +7,7 @@ A free RADIUS server implementation endef -MASTER_SITES = http://freeradius.org/ +MASTER_SITES = ftp://ftp.freeradius.org:/pub/freeradius/ DISTFILES = $(GARNAME)-server-$(GARVERSION).tar.gz DISTNAME = $(GARNAME)-server-$(GARVERSION) @@ -18,8 +18,10 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = -#GARCOMPILER = GCC3 +SPKG_SOURCEURL = http://freeradius.org/ +GARCOMPILER = GCC3 + STRIP_LIBTOOL = 1 CONFIGURE_ARGS = $(DIRPATHS) @@ -48,5 +50,9 @@ CONFIGURE_ARGS += --without-rlm_python CONFIGURE_ARGS += --without-snmp +# No tests available +TEST_TARGET = + 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 Sep 4 11:48:26 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Sep 2009 09:48:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[6170] csw/mgar/pkg/libtool/trunk Message-ID: Revision: 6170 http://gar.svn.sourceforge.net/gar/?rev=6170&view=rev Author: dmichelsen Date: 2009-09-04 09:48:26 +0000 (Fri, 04 Sep 2009) Log Message: ----------- libtool: Do some patching dynamically due to differences in flags between archs Modified Paths: -------------- csw/mgar/pkg/libtool/trunk/Makefile csw/mgar/pkg/libtool/trunk/checksums csw/mgar/pkg/libtool/trunk/files/patch-libtool.diff Modified: csw/mgar/pkg/libtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtool/trunk/Makefile 2009-09-04 07:53:42 UTC (rev 6169) +++ csw/mgar/pkg/libtool/trunk/Makefile 2009-09-04 09:48:26 UTC (rev 6170) @@ -9,6 +9,8 @@ # 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)) FILEVERSION_1.5.26 = 1.5.26 FILEVERSION_2.2.6 = 2.2.6$(RELEASE) @@ -91,6 +93,8 @@ patch-libtool: cat $(WORKDIR)/$(PATCHFILES_POSTINSTALL_$(MODULATION)) | (cd $(DESTDIR)$(bindir) && gpatch -p1) + # Remove arch-specific flags from the libtool-compilation so they don't spoil the target build + perl -pi -e 's/^LTCFLAGS=.*/LTCFLAGS="-O"/' $(DESTDIR)$(bindir)/libtool install-libtool-%: perl -ane 'print if( /^available_tags/ ); $$p = 1 if( /^# ### BEGIN LIBTOOL CONFIG/ ); print if( $$p ); $$p = 0 if( /^# ### END LIBTOOL CONFIG/ )' \ Modified: csw/mgar/pkg/libtool/trunk/checksums =================================================================== --- csw/mgar/pkg/libtool/trunk/checksums 2009-09-04 07:53:42 UTC (rev 6169) +++ csw/mgar/pkg/libtool/trunk/checksums 2009-09-04 09:48:26 UTC (rev 6170) @@ -1,3 +1,3 @@ aa9c5107f3ec9ef4200eb6556f3b3c29 download/libtool-1.5.26.tar.gz 8ca1ea241cd27ff9832e045fe9afe4fd download/libtool-2.2.6a.tar.gz -7fb6410a02f5fd74aa3696a65ba434e2 download/patch-libtool.diff +92bb3c7712498b6a5993ab5d5fc8f077 download/patch-libtool.diff Modified: csw/mgar/pkg/libtool/trunk/files/patch-libtool.diff =================================================================== --- csw/mgar/pkg/libtool/trunk/files/patch-libtool.diff 2009-09-04 07:53:42 UTC (rev 6169) +++ csw/mgar/pkg/libtool/trunk/files/patch-libtool.diff 2009-09-04 09:48:26 UTC (rev 6170) @@ -1,15 +1,6 @@ diff -Naur lt-orig/libtool lt-patched/libtool --- lt-orig/libtool 2009-09-03 20:43:39.235079615 +0200 +++ lt-patched/libtool 2009-09-03 20:56:11.509318512 +0200 -@@ -138,7 +138,7 @@ - LTCC="/opt/studio/SOS11/SUNWspro/bin/cc" - - # LTCC compiler flags. --LTCFLAGS="-xO3 -xarch=v8 -I/opt/csw/include" -+LTCFLAGS="-O" - - # Take the output of nm and produce a listing of raw symbols and C names. - global_symbol_pipe="sed -n -e 's/^.*[ ]\\([BDRT][BDRT]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'" @@ -682,6 +682,8 @@ # positional parameter $0, within a function call, is the name of the # function. 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 Sep 4 11:56:37 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Sep 2009 09:56:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[6171] csw/mgar/pkg/pango/trunk Message-ID: Revision: 6171 http://gar.svn.sourceforge.net/gar/?rev=6171&view=rev Author: dmichelsen Date: 2009-09-04 09:56:37 +0000 (Fri, 04 Sep 2009) Log Message: ----------- pango: Update to 1.24.5 Modified Paths: -------------- csw/mgar/pkg/pango/trunk/Makefile csw/mgar/pkg/pango/trunk/checksums Modified: csw/mgar/pkg/pango/trunk/Makefile =================================================================== --- csw/mgar/pkg/pango/trunk/Makefile 2009-09-04 09:48:26 UTC (rev 6170) +++ csw/mgar/pkg/pango/trunk/Makefile 2009-09-04 09:56:37 UTC (rev 6171) @@ -1,5 +1,5 @@ GARNAME = libpango -GARVERSION = 1.24.3 +GARVERSION = 1.24.5 CATEGORIES = lib DESCRIPTION = A framework for the layout and rendering of international text @@ -25,6 +25,10 @@ REQUIRED_PKGS_CSWpango += CSWlibcairo CSWlibxft2 CSWlibxrender CSWzlib CSWlibx11 REQUIRED_PKGS_CSWpangodevel = CSWpango +SPKG_DESC_CSWpango = Pango, a framework for the layout and rendering of international text +SPKG_DESC_CSWpangodevel = Pango Developer Files +SPKG_DESC_CSWpangodoc = Pango Documentation + SPKG_SOURCEURL = http://www.pango.org/ # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/pango/trunk/checksums =================================================================== --- csw/mgar/pkg/pango/trunk/checksums 2009-09-04 09:48:26 UTC (rev 6170) +++ csw/mgar/pkg/pango/trunk/checksums 2009-09-04 09:56:37 UTC (rev 6171) @@ -1,2 +1,2 @@ 236547eb782b42500d0d743f25340599 download/CSWpango.postinstall -63979efe16fe5abaa93c8ea48959e8f3 download/pango-1.24.3.tar.bz2 +815416a452e9cccc172fed9862401f37 download/pango-1.24.5.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Sep 4 12:46:07 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Sep 2009 10:46:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[6172] csw/mgar/pkg/curl/trunk/Makefile Message-ID: Revision: 6172 http://gar.svn.sourceforge.net/gar/?rev=6172&view=rev Author: dmichelsen Date: 2009-09-04 10:46:07 +0000 (Fri, 04 Sep 2009) Log Message: ----------- curl: Enable 64 bit builds for i386 Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2009-09-04 09:56:37 UTC (rev 6171) +++ csw/mgar/pkg/curl/trunk/Makefile 2009-09-04 10:46:07 UTC (rev 6172) @@ -26,15 +26,21 @@ CATALOGNAME_CSWcurlrt = curlrt CATALOGNAME_CSWcurldevel = curldevel +SPKG_DESC_CSWcurl = Curl, a command line tool and library for client-side URL transfers +SPKG_DESC_CSWcurlrt = Curl Runtime Libraries +SPKG_DESC_CSWcurldevel = Curl Developer Files + SPKG_SOURCEURL = http://curl.haxx.se UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +EXTRA_CONFIGURE_ARGS_isa-amd64 = --disable-ldap CONFIGURE_ARGS = $(DIRPATHS) --with-ssl +CONFIGURE_ARGS += $(EXTRA_CONFIGURE_ARGS_isa-$(ISA)) -#Can't build amd64 until openldap has an amd64 build (Mantis 3028) -#BUILD64 = 1 -EXTRA_BUILD_ISAS_sparc = sparcv9 +# amd64 is built without openldap because there are no libs available right now (Mantis 3028) +BUILD64 = 1 +#EXTRA_BUILD_ISAS_sparc = sparcv9 REQUIRED_PKGS_CSWcurl = CSWiconv CSWlibidn CSWlibnet CSWoldaprt CSWosslrt REQUIRED_PKGS_CSWcurl += CSWsasl CSWzlib CSWcurlrt 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 Sep 4 14:28:24 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 04 Sep 2009 12:28:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[6173] csw/mgar/pkg Message-ID: Revision: 6173 http://gar.svn.sourceforge.net/gar/?rev=6173&view=rev Author: wahwah Date: 2009-09-04 12:28:24 +0000 (Fri, 04 Sep 2009) Log Message: ----------- tree: Initial commit Modified Paths: -------------- csw/mgar/pkg/tree/trunk/Makefile csw/mgar/pkg/tree/trunk/checksums Added Paths: ----------- csw/mgar/pkg/tree/ csw/mgar/pkg/tree/trunk/files/solaris.patch Modified: csw/mgar/pkg/tree/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-09-04 07:53:42 UTC (rev 6169) +++ csw/mgar/pkg/tree/trunk/Makefile 2009-09-04 12:28:24 UTC (rev 6173) @@ -11,8 +11,8 @@ ## For more information about GAR variables, please see: ## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference ## -GARNAME = mypkg -GARVERSION = 1.0 +GARNAME = tree +GARVERSION = 1.5.2.2 ## ## The category that your software fits in. This is not a descriptive field, but ## influences the build process. Depending on the CATEGORIES setting, different @@ -22,24 +22,27 @@ ## Possible settings are: ## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, ## utils, x11, xfce, xorg, xtra -CATEGORIES = lib +CATEGORIES = utils ## ## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = +DESCRIPTION = A recursive directory listing program ## ## A longer description of the package. This is only for descriptive purposes ## inside the Makefile and is not used elsewhere. define BLURB - + Tree is a recursive directory listing program that produces a depth indented + listing of files, which is colorized ala dircolors if the LS_COLORS + environment variable is set and output is to tty. endef ## ## Upstream URL that should show up in the VENDOR field as well as on ## http://opencsw.org/packages/. -SPKG_SOURCEURL = +SPKG_SOURCEURL = http://mama.indstate.edu/users/ice/tree/ ## ## 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 = ftp://mama.indstate.edu/linux/tree/ +MASTER_SITES += http://www.sfr-fresh.com/linux/misc/ ## ## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the ## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge @@ -49,15 +52,17 @@ ## 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 = +# PATCHFILES = 0001-Solaris-settings.patch +# PATCHFILES += 0002-install-binary-as-a-parameter.patch +# PATCHFILES += 0003-Destdir-support.patch +PATCHFILES = solaris.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).tgz ## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz ## ## 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. @@ -142,10 +147,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 = +CONFIGURE_SCRIPTS = ## BUILD_SCRIPTS = ## INSTALL_SCRIPTS = -## TEST_SCRIPTS = +SKIPTEST = 1 ## ## Compilation settings ## @@ -157,7 +162,7 @@ ## BUILD_ARGS = ## ## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) +## CONFIGURE_ARGS = $(DIRPATHS) ## ## BUILD64 = ## CONFIGURE_ENV = @@ -173,10 +178,4 @@ ## 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 Modified: csw/mgar/pkg/tree/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-09-04 07:53:42 UTC (rev 6169) +++ csw/mgar/pkg/tree/trunk/checksums 2009-09-04 12:28:24 UTC (rev 6173) @@ -0,0 +1,2 @@ +e714975edbf63afd3037b3c75b0c5319 download/solaris.patch +a7731a898e2c0d7e422a57a84ffbb06c download/tree-1.5.2.2.tgz Added: csw/mgar/pkg/tree/trunk/files/solaris.patch =================================================================== --- csw/mgar/pkg/tree/trunk/files/solaris.patch (rev 0) +++ csw/mgar/pkg/tree/trunk/files/solaris.patch 2009-09-04 12:28:24 UTC (rev 6173) @@ -0,0 +1,64 @@ +diff --git a/Makefile b/Makefile +index 54260a7..e622acd 100644 +--- a/Makefile ++++ b/Makefile +@@ -6,9 +6,9 @@ + # warranties, including, without limitation, the implied warranties + # of merchant-ability and fitness for a particular purpose. + +-prefix = /usr ++prefix = /opt/csw + +-CC=gcc ++# CC=gcc + + VERSION=1.5.2.2 + TREE_DEST=tree +@@ -20,8 +20,9 @@ MANDIR=${prefix}/man/man1 + + # Linux defaults: + #CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +-CFLAGS=-O2 -Wall -fomit-frame-pointer -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +-LDFLAGS=-s ++#CFLAGS=-O2 -Wall -fomit-frame-pointer -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 ++#LDFLAGS=-s ++#INSTALL=$(INSTALL) + + # Uncomment for FreeBSD: + #CFLAGS=-O2 -Wall -fomit-frame-pointer +@@ -29,11 +30,12 @@ LDFLAGS=-s + #XOBJS=strverscmp.o + + # Uncomment for Solaris: +-#CC=cc +-#CFLAGS=-xO0 -v +-#LDFLAGS= +-#XOBJS=strverscmp.o +-#MANDIR=${prefix}/share/man/man1 ++CC=cc ++CFLAGS=-xO0 -v ++LDFLAGS= ++XOBJS=strverscmp.o ++MANDIR=${prefix}/share/man/man1 ++INSTALL=ginstall + + # Uncomment for Cygwin: + #CFLAGS=-O2 -Wall -fomit-frame-pointer -DCYGWIN +@@ -83,12 +85,12 @@ clean: + rm -f *~ + + install: tree +- install -d $(BINDIR) +- install -d $(MANDIR) +- if [ -e $(TREE_DEST) ]; then \ +- install -s $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \ ++ $(INSTALL) -d $(DESTDIR)$(BINDIR) ++ $(INSTALL) -d $(DESTDIR)$(MANDIR) ++ if [ -r $(TREE_DEST) ]; then \ ++ $(INSTALL) -s $(TREE_DEST) $(DESTDIR)$(BINDIR)/$(TREE_DEST); \ + fi +- install man/$(MAN) $(MANDIR)/$(MAN) ++ $(INSTALL) man/$(MAN) $(DESTDIR)$(MANDIR)/$(MAN) + + distclean: + if [ -f tree.o ]; then rm *.o; 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 Fri Sep 4 14:47:44 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 04 Sep 2009 12:47:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[6174] csw/mgar/pkg/tree/trunk/Makefile Message-ID: Revision: 6174 http://gar.svn.sourceforge.net/gar/?rev=6174&view=rev Author: wahwah Date: 2009-09-04 12:47:44 +0000 (Fri, 04 Sep 2009) Log Message: ----------- tree: Removed unnecessary comments from the Makefile Modified Paths: -------------- csw/mgar/pkg/tree/trunk/Makefile Modified: csw/mgar/pkg/tree/trunk/Makefile =================================================================== --- csw/mgar/pkg/tree/trunk/Makefile 2009-09-04 12:28:24 UTC (rev 6173) +++ csw/mgar/pkg/tree/trunk/Makefile 2009-09-04 12:47:44 UTC (rev 6174) @@ -2,180 +2,21 @@ # 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 = tree GARVERSION = 1.5.2.2 -## -## 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 = utils -## -## A one-line description of the package, which will appear in the pkginfo. DESCRIPTION = A recursive directory listing program -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. define BLURB Tree is a recursive directory listing program that produces a depth indented listing of files, which is colorized ala dircolors if the LS_COLORS environment variable is set and output is to tty. endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. SPKG_SOURCEURL = http://mama.indstate.edu/users/ice/tree/ -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). MASTER_SITES = ftp://mama.indstate.edu/linux/tree/ MASTER_SITES += http://www.sfr-fresh.com/linux/misc/ -## -## 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 = 0001-Solaris-settings.patch -# PATCHFILES += 0002-install-binary-as-a-parameter.patch -# PATCHFILES += 0003-Destdir-support.patch PATCHFILES = solaris.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).tgz -## UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz -## -## 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 = SKIPTEST = 1 -## -## 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 -## 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 Sep 4 15:35:00 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Sep 2009 13:35:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6175] csw/mgar/pkg/curl/trunk/Makefile Message-ID: Revision: 6175 http://gar.svn.sourceforge.net/gar/?rev=6175&view=rev Author: dmichelsen Date: 2009-09-04 13:34:55 +0000 (Fri, 04 Sep 2009) Log Message: ----------- curl: Don't include 64 bit curl binary as it serves no purpose Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2009-09-04 12:47:44 UTC (rev 6174) +++ csw/mgar/pkg/curl/trunk/Makefile 2009-09-04 13:34:55 UTC (rev 6175) @@ -40,8 +40,10 @@ # amd64 is built without openldap because there are no libs available right now (Mantis 3028) BUILD64 = 1 -#EXTRA_BUILD_ISAS_sparc = sparcv9 +# We are doing 64 bit only for the libs +NO_ISAEXEC = 1 + REQUIRED_PKGS_CSWcurl = CSWiconv CSWlibidn CSWlibnet CSWoldaprt CSWosslrt REQUIRED_PKGS_CSWcurl += CSWsasl CSWzlib CSWcurlrt REQUIRED_PKGS_CSWcurlrt = CSWlibidn CSWlibnet CSWoldaprt CSWosslrt CSWzlib CSWsasl @@ -49,6 +51,10 @@ SKIPTEST = 1 +# The 64 bit binary just takes space +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = $(bindir)/curl +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = $(bindir)/curl + EXTRA_PAX_ARGS_32 = -s ",^\.$(includedir)/curl/curlbuild.h$$,.$(includedir)/curl/curlbuild-32.h,p" EXTRA_PAX_ARGS_64 = -s ",^\.$(includedir)/curl/curlbuild.h$$,.$(includedir)/curl/curlbuild-64.h,p" EXTRA_PAX_ARGS_isa-sparcv8 = $(EXTRA_PAX_ARGS_32) 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 Sep 4 15:52:59 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Sep 2009 13:52:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6176] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 6176 http://gar.svn.sourceforge.net/gar/?rev=6176&view=rev Author: dmichelsen Date: 2009-09-04 13:52:59 +0000 (Fri, 04 Sep 2009) Log Message: ----------- mGAR v2: Don't make symlinks isaexec Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-09-04 13:34:55 UTC (rev 6175) +++ csw/mgar/gar/v2/gar.mk 2009-09-04 13:52:59 UTC (rev 6176) @@ -539,7 +539,7 @@ ) ISAEXEC_FILES ?= $(if $(_ISAEXEC_FILES),$(patsubst $(PKGROOT)%,%, \ $(shell for F in $(_ISAEXEC_FILES); do \ - if test -f "$$F"; then echo $$F; fi; \ + if test -f "$$F" -a \! -h "$$F"; then echo $$F; fi; \ done)),) ifneq ($(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 Fri Sep 4 16:02:42 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Sep 2009 14:02:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[6177] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 6177 http://gar.svn.sourceforge.net/gar/?rev=6177&view=rev Author: dmichelsen Date: 2009-09-04 14:02:38 +0000 (Fri, 04 Sep 2009) Log Message: ----------- mGAR v2: Reordering NEEDED_ISAS from r6148 broke some checks, remove additional spaces to make it work again 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-09-04 13:52:59 UTC (rev 6176) +++ csw/mgar/gar/v2/gar.conf.mk 2009-09-04 14:02:38 UTC (rev 6177) @@ -363,8 +363,8 @@ # It is guaranteed that all BUILD_ISAS come first in NEEDED_ISAS # Set 'BUILD64 = 1' to build 64 bit versions automatically REQUESTED_ISAS ?= $(strip $(foreach A,$(GARCHLIST),$(ISA_DEFAULT_$A) $(if $(BUILD64),$(ISA_DEFAULT64_$A)) $(EXTRA_BUILD_ISAS_$A)) $(EXTRA_BUILD_ISAS)) -NEEDED_ISAS ?= $(filter $(ISALIST_$(KERNELISA)),$(filter $(ISALIST_$(ISA_DEFAULT64_$(GARCH))),$(REQUESTED_ISAS))) \ - $(filter-out $(ISALIST_$(KERNELISA)),$(filter $(ISALIST_$(ISA_DEFAULT64_$(GARCH))),$(REQUESTED_ISAS))) +NEEDED_ISAS ?= $(strip $(filter $(ISALIST_$(KERNELISA)),$(filter $(ISALIST_$(ISA_DEFAULT64_$(GARCH))),$(REQUESTED_ISAS))) \ + $(filter-out $(ISALIST_$(KERNELISA)),$(filter $(ISALIST_$(ISA_DEFAULT64_$(GARCH))),$(REQUESTED_ISAS)))) BUILD_ISAS ?= $(filter $(ISALIST_$(KERNELISA)),$(NEEDED_ISAS)) # Subdirectories for specialized binaries and libraries 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 Sep 4 16:36:09 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Sep 2009 14:36:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[6178] csw/mgar/pkg/pigz/trunk Message-ID: Revision: 6178 http://gar.svn.sourceforge.net/gar/?rev=6178&view=rev Author: dmichelsen Date: 2009-09-04 14:36:09 +0000 (Fri, 04 Sep 2009) Log Message: ----------- pigz: Use wrapper script to force new thread model on Solaris 8 Modified Paths: -------------- csw/mgar/pkg/pigz/trunk/Makefile csw/mgar/pkg/pigz/trunk/checksums Modified: csw/mgar/pkg/pigz/trunk/Makefile =================================================================== --- csw/mgar/pkg/pigz/trunk/Makefile 2009-09-04 14:02:38 UTC (rev 6177) +++ csw/mgar/pkg/pigz/trunk/Makefile 2009-09-04 14:36:09 UTC (rev 6178) @@ -12,6 +12,7 @@ MASTER_SITES = http://www.zlib.net/pigz/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += pigz-wrapper # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -29,6 +30,8 @@ # Optimization show effects < 5% #REQUESTED_ISAS = $(ISALIST_$(GARCOMPILER)) +EXTRA_CFLAGS = -mt + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = custom INSTALL_SCRIPTS = custom @@ -44,8 +47,11 @@ install-custom: ginstall -d $(DESTDIR)$(bindir) - ginstall $(WORKSRC)/pigz $(DESTDIR)$(bindir) + ginstall $(WORKDIR)/pigz-wrapper $(DESTDIR)$(bindir)/pigz cd $(DESTDIR)$(bindir) && gln pigz unpigz + ginstall -d $(DESTDIR)$(libexecdir) + ginstall $(WORKSRC)/pigz $(DESTDIR)$(libexecdir) + cd $(DESTDIR)$(libexecdir) && gln pigz unpigz ginstall -d $(DESTDIR)$(mandir)/man1 ginstall $(WORKSRC)/pigz.1 $(DESTDIR)$(mandir)/man1 ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) Modified: csw/mgar/pkg/pigz/trunk/checksums =================================================================== --- csw/mgar/pkg/pigz/trunk/checksums 2009-09-04 14:02:38 UTC (rev 6177) +++ csw/mgar/pkg/pigz/trunk/checksums 2009-09-04 14:36:09 UTC (rev 6178) @@ -1 +1,2 @@ 580873165ef3a369674f0c0af4c96d67 download/pigz-2.1.5.tar.gz +2c89ba7ba8b26b2b91a7a061f39fd7e8 download/pigz-wrapper 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 Sep 4 16:37:09 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Sep 2009 14:37:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[6179] csw/mgar/pkg/pigz/trunk/files/pigz-wrapper Message-ID: Revision: 6179 http://gar.svn.sourceforge.net/gar/?rev=6179&view=rev Author: dmichelsen Date: 2009-09-04 14:37:09 +0000 (Fri, 04 Sep 2009) Log Message: ----------- pigz: Add missing wrapper script Added Paths: ----------- csw/mgar/pkg/pigz/trunk/files/pigz-wrapper Added: csw/mgar/pkg/pigz/trunk/files/pigz-wrapper =================================================================== --- csw/mgar/pkg/pigz/trunk/files/pigz-wrapper (rev 0) +++ csw/mgar/pkg/pigz/trunk/files/pigz-wrapper 2009-09-04 14:37:09 UTC (rev 6179) @@ -0,0 +1,8 @@ +#!/bin/sh + +# Needed on native Solaris 8 +# See http://www.opencsw.org/bugtrack/view.php?id=3879 +# and http://developers.sun.com/solaris/articles/alt_thread_lib.html +LD_LIBRARY_PATH=/usr/lib/lwp +export LD_LIBRARY_PATH +exec `/usr/bin/dirname $0`/../libexec/`/usr/bin/basename $0` "$@" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Sep 4 19:26:24 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 04 Sep 2009 17:26:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[6180] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 6180 http://gar.svn.sourceforge.net/gar/?rev=6180&view=rev Author: bonivart Date: 2009-09-04 17:26:24 +0000 (Fri, 04 Sep 2009) Log Message: ----------- pkgutil: 1.7 beta 1 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-09-04 14:37:09 UTC (rev 6179) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-09-04 17:26:24 UTC (rev 6180) @@ -1,5 +1,5 @@ GARNAME = pkgutil -GARVERSION = 1.6.1 +GARVERSION = 1.7b1 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-09-04 14:37:09 UTC (rev 6179) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-09-04 17:26:24 UTC (rev 6180) @@ -2,4 +2,4 @@ e1407c24d47306dbc4cea22dcb291f1d download/CSWpkgutil.postinstall 2fb6c94a2d212f08b71d462082a2d31a download/CSWpkgutil.preremove 4ef9d7ba62987112987311d96e249e3e download/CSWpkgutil.prototype -82c500662d2871e70633a1c58d02cacc download/pkgutil-1.6.1.zip +146008e20dacbb7541f6505cd34d2277 download/pkgutil-1.7b1.zip 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 Sep 4 20:30:10 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Fri, 04 Sep 2009 18:30:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[6181] csw/mgar/pkg/thunderbird/trunk/files/.mozconfig Message-ID: Revision: 6181 http://gar.svn.sourceforge.net/gar/?rev=6181&view=rev Author: wbonnet Date: 2009-09-04 18:30:10 +0000 (Fri, 04 Sep 2009) Log Message: ----------- Use system sqlite instead of Mozilla version Modified Paths: -------------- csw/mgar/pkg/thunderbird/trunk/files/.mozconfig Modified: csw/mgar/pkg/thunderbird/trunk/files/.mozconfig =================================================================== --- csw/mgar/pkg/thunderbird/trunk/files/.mozconfig 2009-09-04 17:26:24 UTC (rev 6180) +++ csw/mgar/pkg/thunderbird/trunk/files/.mozconfig 2009-09-04 18:30:10 UTC (rev 6181) @@ -24,6 +24,7 @@ ac_add_options --disable-debug ac_add_options --disable-updater ac_add_options --disable-js-ultrasparc +ac_add_options --enable-system-sqlite ac_add_options --enable-system-cairo 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 Sep 4 20:41:55 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 04 Sep 2009 18:41:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[6182] csw/mgar/pkg/pkgutil/trunk/checksums Message-ID: Revision: 6182 http://gar.svn.sourceforge.net/gar/?rev=6182&view=rev Author: bonivart Date: 2009-09-04 18:41:55 +0000 (Fri, 04 Sep 2009) Log Message: ----------- pkgutil: update checksums Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/checksums Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-09-04 18:30:10 UTC (rev 6181) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-09-04 18:41:55 UTC (rev 6182) @@ -2,4 +2,4 @@ e1407c24d47306dbc4cea22dcb291f1d download/CSWpkgutil.postinstall 2fb6c94a2d212f08b71d462082a2d31a download/CSWpkgutil.preremove 4ef9d7ba62987112987311d96e249e3e download/CSWpkgutil.prototype -146008e20dacbb7541f6505cd34d2277 download/pkgutil-1.7b1.zip +6c95eb1d1de28e74b72ea2bb4ce249af download/pkgutil-1.7b1.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Fri Sep 4 22:33:08 2009 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Fri, 04 Sep 2009 20:33:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[6183] csw/mgar/pkg/ganglia/trunk Message-ID: Revision: 6183 http://gar.svn.sourceforge.net/gar/?rev=6183&view=rev Author: d_pocock Date: 2009-09-04 20:33:08 +0000 (Fri, 04 Sep 2009) Log Message: ----------- ganglia: Add support for gmetad, web, python, devel packages Modified Paths: -------------- csw/mgar/pkg/ganglia/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/ganglia/trunk/files/CSWgangliaweb.postinstall csw/mgar/pkg/ganglia/trunk/files/CSWgangliaweb.preremove csw/mgar/pkg/ganglia/trunk/files/conf.php csw/mgar/pkg/ganglia/trunk/files/gmetad.conf csw/mgar/pkg/ganglia/trunk/files/httpd-ganglia.conf.CSW Modified: csw/mgar/pkg/ganglia/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia/trunk/Makefile 2009-09-04 18:41:55 UTC (rev 6182) +++ csw/mgar/pkg/ganglia/trunk/Makefile 2009-09-04 20:33:08 UTC (rev 6183) @@ -2,6 +2,15 @@ GARVERSION = 3.1.2 CATEGORIES = utils +# How should we set this? +# There is a release number in configure.in, maybe use that? +# RELVER = + +USER_GMOND = nobody +# nobody shouldn't really be allowed to own any files +# maybe we should add a ganglia user to own the RRD files? +USER_GMETAD = nobody + DESCRIPTION = A scalable distributed monitoring system define BLURB Ganglia is a scalable distributed monitoring system for high-performance computing @@ -12,23 +21,39 @@ SF_PROJ = ganglia MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -#DISTFILES += $(call admfiles,CSWpackage,) +DISTFILES += CSWgangliaweb.postinstall CSWgangliaweb.preremove +DISTFILES += httpd-ganglia.conf.CSW -PACKAGES = CSWgangliaagent CSWgangliart +PACKAGES = CSWgangliaagent CSWgangliart CSWgangliadevel CSWgangliagmetad CSWgangliaweb CSWgangliamodpython CATALOGNAME_CSWganglia = ganglia CATALOGNAME_CSWgangliart = ganglia_rt CATALOGNAME_CSWgangliaagent = ganglia_agent +CATALOGNAME_CSWgangliamodpython = ganglia_modpython +CATALOGNAME_CSWgangliadevel = ganglia_devel +CATALOGNAME_CSWgangliagmetad = ganglia_gmetad +CATALOGNAME_CSWgangliaweb = ganglia_web SPKG_DESC_CSWganglia = Dummy package SPKG_DESC_CSWgangliart = Ganglia runtime libraries SPKG_DESC_CSWgangliaagent = Ganglia performance monitoring agent gmond +SPKG_DESC_CSWgangliamodpython = Ganglia agent module for Python metrics +SPKG_DESC_CSWgangliadevel = Ganglia headers for metric module development +SPKG_DESC_CSWgangliagmetad = Ganglia gmetad +SPKG_DESC_CSWgangliaweb = Ganglia web -PREREQUISITE_PKGS = CSWexpat CSWlibconfuse CSWapache2rt +PREREQUISITE_PKGS = CSWexpat CSWlibconfuse CSWapache2rt CSWapache2-devel CSWrrd REQUIRED_PKGS_CSWgangliart = CSWexpat CSWlibconfuse CSWapache2rt REQUIRED_PKGS_CSWgangliaagent = CSWexpat CSWlibconfuse CSWapache2rt REQUIRED_PKGS_CSWgangliaagent += CSWgangliart +REQUIRED_PKGS_CSWgangliamodpython = CSWlibconfuse CSWapache2rt CSWgangliart +REQUIRED_PKGS_CSWgangliamodpython += CSWgangliaagent +REQUIRED_PKGS_CSWgangliadevel = CSWexpat CSWlibconfuse CSWapache2rt +REQUIRED_PKGS_CSWgangliagmetad = CSWexpat CSWlibconfuse CSWapache2rt +REQUIRED_PKGS_CSWgangliagmetad += CSWgangliart CSWgangliaagent CSWrrd +REQUIRED_PKGS_CSWgangliaweb = CSWgangliagmetad +REQUIRED_PKGS_CSWgangliaweb += CSWapache2 CSWphp5 CSWap2modphp5 CSWrrd # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=43021 @@ -42,23 +67,83 @@ CONFIGURE_ARGS = $(DIRPATHS) # Don't build gmetad (not tested yet on Solaris, more deps required to build) -CONFIGURE_ARGS += --without-gmetad +#CONFIGURE_ARGS += --without-gmetad +CONFIGURE_ARGS += --with-gmetad # Reduce dependencies, no gettext: CONFIGURE_ARGS += --disable-nls +# Use apr from CSWapache2rt +CONFIGURE_ARGS += --with-libapr=/opt/csw/apache2/bin/apr-1-config + +# Include the status module +CONFIGURE_ARGS += --with-status + +# When we enable this, modpython will have to go in a separate package, +# otherwise CSWgangliaagent will have lots of dependencies +# TODO: define a CSWgangliamodpython package +# Depends: some issues exist getting the Python support working on Solaris, +# Ganglia's configure.in needs to be further enhanced for this to work +CONFIGURE_ARGS += --without-python +#CONFIGURE_ARGS += --with-python=/opt/csw + # For Ganglia 3.1.2, the test suite doesn't compile cleanly on Solaris, # so we skip it. This should be re-assessed with each new release # from upstream. Proposed fixes for the test suite to be submitted # upstream. ifeq ($(GARVERSION),3.1.2) -#TEST_TARGET = check -TEST_SCRIPTS = skip -test-skip: - $(DONADA) +TEST_SCRIPTS = endif +INSTALL_SCRIPTS = $(WORKSRC)/Makefile custom + +WWWROOT = /opt/csw/share/www +WWWGANGLIA = $(WWWROOT)/ganglia +ETCGANGLIA = /opt/csw/etc/ganglia + PKGFILES_CSWganglia = PKGFILES_CSWgangliart = $(libdir)/libganglia.* +PKGFILES_CSWgangliamodpython = .*python.* +PKGFILES_CSWgangliadevel = .*/include/.*.h .*/bin/ganglia-config +PKGFILES_CSWgangliagmetad = .*/gmetad.* /opt/csw/var/ganglia/rrds +PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.* /opt/csw/apache2/etc/extra/.* +PROTOTYPE_FILTER_CSWgangliagmetad = awk '\ +$$$$3 ~ /\/opt\/csw\/var\/ganglia\/rrds/ { $$$$5 = "nobody"; $$$$6 = "nogroup" } \ +{ print }' + + +#ARCHALL_CSWgangliadevel = 1 +#ARCHALL_CSWgangliaweb = 1 + include gar/category.mk + +install-custom: + @ginstall -d $(DESTDIR)$(WWWGANGLIA) + @cd $(WORKSRC)/web; \ + cp -R * $(DESTDIR)$(WWWGANGLIA) + @ginstall -D $(FILEDIR)/conf.php \ + $(DESTDIR)$(WWWGANGLIA)/conf.php + @rm -rf $(DESTDIR)$(WWWGANGLIA)/*.in + @ginstall -D $(FILEDIR)/httpd-ganglia.conf.CSW \ + $(DESTDIR)/opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW + @ginstall -d $(DESTDIR)$(ETCGANGLIA)/conf.d + @$(WORKSRC)/gmond/gmond -t | grep -v "^include" \ + > $(DESTDIR)$(ETCGANGLIA)/gmond.conf + @echo "include ('/opt/csw/etc/ganglia/conf.d/*.conf')" \ + >> $(DESTDIR)$(ETCGANGLIA)/gmond.conf +# @ginstall -D $(FILEDIR)/gmond.conf \ +# $(DESTDIR)$(ETCGANGLIA)/gmond.conf + @ginstall -D $(FILEDIR)/gmetad.conf \ + $(DESTDIR)$(ETCGANGLIA)/gmetad.conf + @cd $(WORKSRC)/gmond/modules/conf.d; \ + cp -R *.conf $(DESTDIR)$(ETCGANGLIA)/conf.d + @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/example.conf \ + $(DESTDIR)$(ETCGANGLIA)/conf.d/multicpu.conf +ifeq ($(GARVERSION),3.1.2) + @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/modgstatus.conf +endif + @ginstall -d $(DESTDIR)/opt/csw/var/ganglia/rrds + + + Added: csw/mgar/pkg/ganglia/trunk/files/CSWgangliaweb.postinstall =================================================================== --- csw/mgar/pkg/ganglia/trunk/files/CSWgangliaweb.postinstall (rev 0) +++ csw/mgar/pkg/ganglia/trunk/files/CSWgangliaweb.postinstall 2009-09-04 20:33:08 UTC (rev 6183) @@ -0,0 +1,33 @@ +#!/bin/sh + +AP2EXTRADIR=/opt/csw/apache2/etc/extra +AP2CONF=/opt/csw/apache2/etc/httpd.conf + +if [ -f "${AP2EXTRADIR}/httpd-ganglia.conf" ]; +then + echo "Existing config found" +else + cp "${AP2EXTRADIR}/httpd-ganglia.conf.CSW" "${AP2EXTRADIR}/httpd-ganglia.conf" +fi + +if [ -n "`grep 'Include etc/extra/httpd-ganglia.conf' ${AP2CONF}`" ]; then + perl -i -pne 's|#(Include etc/extra/httpd-ganglia.conf)|$1|' ${AP2CONF} +else + cat << END >>${AP2CONF} + +Include etc/extra/httpd-ganglia.conf + +END +fi + +cat << _EOM_ +********************************************************************* +* NOTICE: +* Ganglia has been enabled in ${AP2CONF} +* You will need to restart your web server +* To finish the install. +********************************************************************* + +_EOM_ + +exit 0 Added: csw/mgar/pkg/ganglia/trunk/files/CSWgangliaweb.preremove =================================================================== --- csw/mgar/pkg/ganglia/trunk/files/CSWgangliaweb.preremove (rev 0) +++ csw/mgar/pkg/ganglia/trunk/files/CSWgangliaweb.preremove 2009-09-04 20:33:08 UTC (rev 6183) @@ -0,0 +1,21 @@ +#!/bin/sh + +PATH=/usr/bin:/usr/sbin + +AP2CONF=/opt/csw/apache2/etc/httpd.conf + +perl -i -pne 's|(? "ff634f", + "75-100" =>"ffa15e", + "50-75" => "ffde5e", + "25-50" => "caff98", + "0-25" => "e2ecff", + "down" => "515151" +); + +# +# Load scaling +# +$load_scale = 1.0; + +# +# Default color for single metric graphs +# +$default_metric_color = "555555"; + +# +# Default metric +# +$default_metric = "load_one"; + +# +# remove the domainname from the FQDN hostnames in graphs +# (to help with long hostnames in small charts) +# +$strip_domainname = false; + +# +# Optional summary graphs +# +#$optional_graphs = array('packet'); + +# +# Time ranges +# Each value is the # of seconds in that range. +# +$time_ranges = array( + 'hour'=>3600, + 'day'=>86400, + 'week'=>604800, + 'month'=>2419200, + 'year'=>31449600 +); + +# this key must exist in $time_ranges +$default_time_range = 'hour'; + +# +# Graph sizes +# +$graph_sizes = array( + 'small'=>array( + 'height'=>40, + 'width'=>130, + 'fudge_0'=>0, + 'fudge_1'=>0, + 'fudge_2'=>0 + ), + 'medium'=>array( + 'height'=>75, + 'width'=>300, + 'fudge_0'=>0, + 'fudge_1'=>14, + 'fudge_2'=>28 + ), + 'large'=>array( + 'height'=>600, + 'width'=>800, + 'fudge_0'=>0, + 'fudge_1'=>0, + 'fudge_2'=>0 + ), + # this was the default value when no other size was provided. + 'default'=>array( + 'height'=>100, + 'width'=>400, + 'fudge_0'=>0, + 'fudge_1'=>0, + 'fudge_2'=>0 + ) +); +$default_graph_size = 'default'; +$graph_sizes_keys = array_keys( $graph_sizes ); +?> Added: csw/mgar/pkg/ganglia/trunk/files/gmetad.conf =================================================================== --- csw/mgar/pkg/ganglia/trunk/files/gmetad.conf (rev 0) +++ csw/mgar/pkg/ganglia/trunk/files/gmetad.conf 2009-09-04 20:33:08 UTC (rev 6183) @@ -0,0 +1,116 @@ +# This is an example of a Ganglia Meta Daemon configuration file +# http://ganglia.sourceforge.net/ +# +# $Id: gmetad.conf.in 1639 2008-08-09 23:30:32Z carenas $ +# +#------------------------------------------------------------------------------- +# Setting the debug_level to 1 will keep daemon in the forground and +# show only error messages. Setting this value higher than 1 will make +# gmetad output debugging information and stay in the foreground. +# default: 0 +# debug_level 10 +# +#------------------------------------------------------------------------------- +# What to monitor. The most important section of this file. +# +# The data_source tag specifies either a cluster or a grid to +# monitor. If we detect the source is a cluster, we will maintain a complete +# set of RRD databases for it, which can be used to create historical +# graphs of the metrics. If the source is a grid (it comes from another gmetad), +# we will only maintain summary RRDs for it. +# +# Format: +# data_source "my cluster" [polling interval] address1:port addreses2:port ... +# +# The keyword 'data_source' must immediately be followed by a unique +# string which identifies the source, then an optional polling interval in +# seconds. The source will be polled at this interval on average. +# If the polling interval is omitted, 15sec is asssumed. +# +# A list of machines which service the data source follows, in the +# format ip:port, or name:port. If a port is not specified then 8649 +# (the default gmond port) is assumed. +# default: There is no default value +# +# data_source "my cluster" 10 localhost my.machine.edu:8649 1.2.3.5:8655 +# data_source "my grid" 50 1.3.4.7:8655 grid.org:8651 grid-backup.org:8651 +# data_source "another source" 1.3.4.7:8655 1.3.4.8 + +data_source "my cluster" localhost + +# +# Round-Robin Archives +# You can specify custom Round-Robin archives here (defaults are listed below) +# +# RRAs "RRA:AVERAGE:0.5:1:244" "RRA:AVERAGE:0.5:24:244" "RRA:AVERAGE:0.5:168:244" "RRA:AVERAGE:0.5:672:244" \ +# "RRA:AVERAGE:0.5:5760:374" +# + +# +#------------------------------------------------------------------------------- +# Scalability mode. If on, we summarize over downstream grids, and respect +# authority tags. If off, we take on 2.5.0-era behavior: we do not wrap our output +# in tags, we ignore all tags we see, and always assume +# we are the "authority" on data source feeds. This approach does not scale to +# large groups of clusters, but is provided for backwards compatibility. +# default: on +# scalable off +# +#------------------------------------------------------------------------------- +# The name of this Grid. All the data sources above will be wrapped in a GRID +# tag with this name. +# default: unspecified +# gridname "MyGrid" +# +#------------------------------------------------------------------------------- +# The authority URL for this grid. Used by other gmetads to locate graphs +# for our data sources. Generally points to a ganglia/ +# website on this machine. +# default: "http://hostname/ganglia/", +# where hostname is the name of this machine, as defined by gethostname(). +# authority "http://mycluster.org/newprefix/" +# +#------------------------------------------------------------------------------- +# List of machines this gmetad will share XML with. Localhost +# is always trusted. +# default: There is no default value +# trusted_hosts 127.0.0.1 169.229.50.165 my.gmetad.org +# +#------------------------------------------------------------------------------- +# If you want any host which connects to the gmetad XML to receive +# data, then set this value to "on" +# default: off +# all_trusted on +# +#------------------------------------------------------------------------------- +# If you don't want gmetad to setuid then set this to off +# default: on +# setuid off +# +#------------------------------------------------------------------------------- +# User gmetad will setuid to (defaults to "nobody") +# default: "nobody" +# setuid_username "nobody" +# +#------------------------------------------------------------------------------- +# The port gmetad will answer requests for XML +# default: 8651 +# xml_port 8651 +# +#------------------------------------------------------------------------------- +# The port gmetad will answer queries for XML. This facility allows +# simple subtree and summation views of the XML tree. +# default: 8652 +# interactive_port 8652 +# +#------------------------------------------------------------------------------- +# The number of threads answering XML requests +# default: 4 +# server_threads 10 +# +#------------------------------------------------------------------------------- +# Where gmetad stores its round-robin databases +# default: "/var/lib/ganglia/rrds" +# rrd_rootdir "/some/other/place" +rrd_rootdir "/opt/csw/var/ganglia/rrds" + Added: csw/mgar/pkg/ganglia/trunk/files/httpd-ganglia.conf.CSW =================================================================== --- csw/mgar/pkg/ganglia/trunk/files/httpd-ganglia.conf.CSW (rev 0) +++ csw/mgar/pkg/ganglia/trunk/files/httpd-ganglia.conf.CSW 2009-09-04 20:33:08 UTC (rev 6183) @@ -0,0 +1,13 @@ + +Alias /ganglia "/opt/csw/share/www/ganglia" + + + AllowOverride None + DirectoryIndex index.html index.php + + Order allow,deny + Allow from all + + + + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Sep 4 22:35:47 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Sep 2009 20:35:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[6184] csw/mgar/pkg Message-ID: Revision: 6184 http://gar.svn.sourceforge.net/gar/?rev=6184&view=rev Author: dmichelsen Date: 2009-09-04 20:35:46 +0000 (Fri, 04 Sep 2009) Log Message: ----------- giflib: Initial commit (also builds libungif) Added Paths: ----------- csw/mgar/pkg/giflib/ csw/mgar/pkg/giflib/branches/ csw/mgar/pkg/giflib/tags/ csw/mgar/pkg/giflib/trunk/ csw/mgar/pkg/giflib/trunk/Makefile csw/mgar/pkg/giflib/trunk/checksums csw/mgar/pkg/giflib/trunk/files/ Property changes on: csw/mgar/pkg/giflib/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/giflib/trunk/Makefile =================================================================== --- csw/mgar/pkg/giflib/trunk/Makefile (rev 0) +++ csw/mgar/pkg/giflib/trunk/Makefile 2009-09-04 20:35:46 UTC (rev 6184) @@ -0,0 +1,51 @@ +GARNAME = giflib +GARVERSION = 4.1.6 +CATEGORIES = lib + +DESCRIPTION = A library for reading and writing gif images +define BLURB + giflib is a library for reading and writing gif images. + It is API and ABI compatible with libungif which was in + wide use while the LZW compression algorithm was patented. +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 + +PACKAGES = CSWgiflib CSWlibungif + +SPKG_DESC_CSWgiflib = A library for reading and writing gif images +SPKG_DESC_CSWlibungif = Links to giflib now the patent is dropped + +REQUIRED_PKGS_CSWlibungif = CSWgiflib + +BUILD64 = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +# We don't want 64 bit executables as they gain no speed +NO_ISAEXEC = 1 +MERGE_DIRS_isa-sparcv9 = $(libdir) +MERGE_DIRS_isa-amd64 = $(libdir) + +PKGFILES_CSWlibungif = .*/libungif\..* + +include gar/category.mk + +DOCFILES = AUTHORS BUGS COPYING ChangeLog DEVELOPERS INSTALL NEWS ONEWS README TODO + +post-install-modulated: + @mkdir -p $(DESTDIR)$(docdir)/giflib + cd $(WORKSRC) && cp $(DOCFILES) $(DESTDIR)$(docdir)/giflib + cd $(WORKSRC)/doc && cp *.html *.png *.txt $(DESTDIR)$(docdir)/giflib + @$(MAKECOOKIE) + +post-merge: + gln -s libgif.so.4 $(PKGROOT)$(libdir)/libungif.so.4 + gln -s libgif.so $(PKGROOT)$(libdir)/libungif.so + @$(MAKECOOKIE) Added: csw/mgar/pkg/giflib/trunk/checksums =================================================================== --- csw/mgar/pkg/giflib/trunk/checksums (rev 0) +++ csw/mgar/pkg/giflib/trunk/checksums 2009-09-04 20:35:46 UTC (rev 6184) @@ -0,0 +1 @@ +7125644155ae6ad33dbc9fc15a14735f download/giflib-4.1.6.tar.bz2 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 Sep 4 22:55:55 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 04 Sep 2009 20:55:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[6185] csw/mgar/pkg/elinks/trunk Message-ID: Revision: 6185 http://gar.svn.sourceforge.net/gar/?rev=6185&view=rev Author: chninkel Date: 2009-09-04 20:55:55 +0000 (Fri, 04 Sep 2009) Log Message: ----------- elinks: updated to 0.11.7 Modified Paths: -------------- csw/mgar/pkg/elinks/trunk/Makefile csw/mgar/pkg/elinks/trunk/checksums csw/mgar/pkg/elinks/trunk/files/changelog.CSW Modified: csw/mgar/pkg/elinks/trunk/Makefile =================================================================== --- csw/mgar/pkg/elinks/trunk/Makefile 2009-09-04 20:35:46 UTC (rev 6184) +++ csw/mgar/pkg/elinks/trunk/Makefile 2009-09-04 20:55:55 UTC (rev 6185) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = elinks -GARVERSION = 0.11.6 +GARVERSION = 0.11.7 CATEGORIES = net DESCRIPTION = An advanced text mode web browser Modified: csw/mgar/pkg/elinks/trunk/checksums =================================================================== --- csw/mgar/pkg/elinks/trunk/checksums 2009-09-04 20:35:46 UTC (rev 6184) +++ csw/mgar/pkg/elinks/trunk/checksums 2009-09-04 20:55:55 UTC (rev 6185) @@ -1,4 +1,4 @@ 9998467007acbd4cb8e46db6e5a9b306 download/CSWelinks.prototype -14b871e8361937a10490cf1018d6f218 download/changelog.CSW -463ec007b013822a82d197580117ea16 download/elinks-0.11.6.tar.bz2 +dccc134301c3dfa95ca4748e9ca948a7 download/changelog.CSW +fcd087a6d2415cd4c6fd1db53dceb646 download/elinks-0.11.7.tar.bz2 858331d6cc6c8459b2dba5e24f0c8cc3 download/elinks-417789.diff Modified: csw/mgar/pkg/elinks/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/elinks/trunk/files/changelog.CSW 2009-09-04 20:35:46 UTC (rev 6184) +++ csw/mgar/pkg/elinks/trunk/files/changelog.CSW 2009-09-04 20:55:55 UTC (rev 6185) @@ -1,3 +1,9 @@ +elinks (0.11.7,REV=2009.09.04) unstable + + * New upstream version. + + -- Yann Rouillard Sun, 04 Sep 2009 10:38:39 +0100 + elinks (0.11.6,REV=2009.03.22) unstable * New upstream version. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Fri Sep 4 23:08:11 2009 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Fri, 04 Sep 2009 21:08:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[6186] csw/mgar/pkg/ganglia/trunk Message-ID: Revision: 6186 http://gar.svn.sourceforge.net/gar/?rev=6186&view=rev Author: d_pocock Date: 2009-09-04 21:08:11 +0000 (Fri, 04 Sep 2009) Log Message: ----------- ganglia: Move to /etc/opt/csw/ganglia. Use PRESERVECONF. Modified Paths: -------------- csw/mgar/pkg/ganglia/trunk/Makefile csw/mgar/pkg/ganglia/trunk/files/CSWgangliaweb.postinstall Modified: csw/mgar/pkg/ganglia/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia/trunk/Makefile 2009-09-04 20:55:55 UTC (rev 6185) +++ csw/mgar/pkg/ganglia/trunk/Makefile 2009-09-04 21:08:11 UTC (rev 6186) @@ -99,7 +99,7 @@ WWWROOT = /opt/csw/share/www WWWGANGLIA = $(WWWROOT)/ganglia -ETCGANGLIA = /opt/csw/etc/ganglia +ETCGANGLIA = /etc/opt/csw/ganglia PKGFILES_CSWganglia = PKGFILES_CSWgangliart = $(libdir)/libganglia.* @@ -108,6 +108,8 @@ PKGFILES_CSWgangliagmetad = .*/gmetad.* /opt/csw/var/ganglia/rrds PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.* /opt/csw/apache2/etc/extra/.* +PRESERVECONF = /opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW + PROTOTYPE_FILTER_CSWgangliagmetad = awk '\ $$$$3 ~ /\/opt\/csw\/var\/ganglia\/rrds/ { $$$$5 = "nobody"; $$$$6 = "nogroup" } \ { print }' @@ -130,7 +132,7 @@ @ginstall -d $(DESTDIR)$(ETCGANGLIA)/conf.d @$(WORKSRC)/gmond/gmond -t | grep -v "^include" \ > $(DESTDIR)$(ETCGANGLIA)/gmond.conf - @echo "include ('/opt/csw/etc/ganglia/conf.d/*.conf')" \ + @echo "include ('/etc/opt/csw/ganglia/conf.d/*.conf')" \ >> $(DESTDIR)$(ETCGANGLIA)/gmond.conf # @ginstall -D $(FILEDIR)/gmond.conf \ # $(DESTDIR)$(ETCGANGLIA)/gmond.conf Modified: csw/mgar/pkg/ganglia/trunk/files/CSWgangliaweb.postinstall =================================================================== --- csw/mgar/pkg/ganglia/trunk/files/CSWgangliaweb.postinstall 2009-09-04 20:55:55 UTC (rev 6185) +++ csw/mgar/pkg/ganglia/trunk/files/CSWgangliaweb.postinstall 2009-09-04 21:08:11 UTC (rev 6186) @@ -3,12 +3,13 @@ AP2EXTRADIR=/opt/csw/apache2/etc/extra AP2CONF=/opt/csw/apache2/etc/httpd.conf -if [ -f "${AP2EXTRADIR}/httpd-ganglia.conf" ]; -then - echo "Existing config found" -else - cp "${AP2EXTRADIR}/httpd-ganglia.conf.CSW" "${AP2EXTRADIR}/httpd-ganglia.conf" -fi +# no longer needed thanks to cswpreserveconf +#if [ -f "${AP2EXTRADIR}/httpd-ganglia.conf" ]; +#then +# echo "Existing config found" +#else +# cp "${AP2EXTRADIR}/httpd-ganglia.conf.CSW" "${AP2EXTRADIR}/httpd-ganglia.conf" +#fi if [ -n "`grep 'Include etc/extra/httpd-ganglia.conf' ${AP2CONF}`" ]; then perl -i -pne 's|#(Include etc/extra/httpd-ganglia.conf)|$1|' ${AP2CONF} 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 Sep 4 23:12:57 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Sep 2009 21:12:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[6187] csw/mgar/pkg/giflib/trunk/Makefile Message-ID: Revision: 6187 http://gar.svn.sourceforge.net/gar/?rev=6187&view=rev Author: dmichelsen Date: 2009-09-04 21:12:56 +0000 (Fri, 04 Sep 2009) Log Message: ----------- giflib: Fix legacy package name Modified Paths: -------------- csw/mgar/pkg/giflib/trunk/Makefile Modified: csw/mgar/pkg/giflib/trunk/Makefile =================================================================== --- csw/mgar/pkg/giflib/trunk/Makefile 2009-09-04 21:08:11 UTC (rev 6186) +++ csw/mgar/pkg/giflib/trunk/Makefile 2009-09-04 21:12:56 UTC (rev 6187) @@ -15,12 +15,12 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -PACKAGES = CSWgiflib CSWlibungif +PACKAGES = CSWgiflib CSWungif SPKG_DESC_CSWgiflib = A library for reading and writing gif images -SPKG_DESC_CSWlibungif = Links to giflib now the patent is dropped +SPKG_DESC_CSWungif = Links to giflib now the patent is dropped -REQUIRED_PKGS_CSWlibungif = CSWgiflib +REQUIRED_PKGS_CSWungif = CSWgiflib BUILD64 = 1 @@ -33,7 +33,7 @@ MERGE_DIRS_isa-sparcv9 = $(libdir) MERGE_DIRS_isa-amd64 = $(libdir) -PKGFILES_CSWlibungif = .*/libungif\..* +PKGFILES_CSWungif = .*/libungif\..* 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 Sep 4 23:34:22 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Sep 2009 21:34:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[6188] csw/mgar/pkg/curl/trunk/Makefile Message-ID: Revision: 6188 http://gar.svn.sourceforge.net/gar/?rev=6188&view=rev Author: dmichelsen Date: 2009-09-04 21:34:22 +0000 (Fri, 04 Sep 2009) Log Message: ----------- curl: Enhance package description Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2009-09-04 21:12:56 UTC (rev 6187) +++ csw/mgar/pkg/curl/trunk/Makefile 2009-09-04 21:34:22 UTC (rev 6188) @@ -26,7 +26,7 @@ CATALOGNAME_CSWcurlrt = curlrt CATALOGNAME_CSWcurldevel = curldevel -SPKG_DESC_CSWcurl = Curl, a command line tool and library for client-side URL transfers +SPKG_DESC_CSWcurl = A command line tool and library for client-side URL transfers SPKG_DESC_CSWcurlrt = Curl Runtime Libraries SPKG_DESC_CSWcurldevel = Curl Developer Files This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Sat Sep 5 01:21:50 2009 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Fri, 04 Sep 2009 23:21:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6189] csw/mgar/pkg/ganglia/trunk Message-ID: Revision: 6189 http://gar.svn.sourceforge.net/gar/?rev=6189&view=rev Author: d_pocock Date: 2009-09-04 23:21:50 +0000 (Fri, 04 Sep 2009) Log Message: ----------- ganglia: init.d script and SMF support Modified Paths: -------------- csw/mgar/pkg/ganglia/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/ganglia/trunk/files/cswgmetad csw/mgar/pkg/ganglia/trunk/files/cswgmond Modified: csw/mgar/pkg/ganglia/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia/trunk/Makefile 2009-09-04 21:34:22 UTC (rev 6188) +++ csw/mgar/pkg/ganglia/trunk/Makefile 2009-09-04 23:21:50 UTC (rev 6189) @@ -22,7 +22,7 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += CSWgangliaweb.postinstall CSWgangliaweb.preremove -DISTFILES += httpd-ganglia.conf.CSW +DISTFILES += httpd-ganglia.conf.CSW cswgmond cswgmetad PACKAGES = CSWgangliaagent CSWgangliart CSWgangliadevel CSWgangliagmetad CSWgangliaweb CSWgangliamodpython @@ -105,11 +105,16 @@ PKGFILES_CSWgangliart = $(libdir)/libganglia.* PKGFILES_CSWgangliamodpython = .*python.* PKGFILES_CSWgangliadevel = .*/include/.*.h .*/bin/ganglia-config -PKGFILES_CSWgangliagmetad = .*/gmetad.* /opt/csw/var/ganglia/rrds +PKGFILES_CSWgangliagmetad = .*/gmetad.* /opt/csw/var/ganglia/rrds /etc/opt/csw/init.d/cswgmetad PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.* /opt/csw/apache2/etc/extra/.* PRESERVECONF = /opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW +# For gmond +INITSMF = /etc/opt/csw/init.d/cswgmond +# For gmetad +INITSMF += /etc/opt/csw/init.d/cswgmetad + PROTOTYPE_FILTER_CSWgangliagmetad = awk '\ $$$$3 ~ /\/opt\/csw\/var\/ganglia\/rrds/ { $$$$5 = "nobody"; $$$$6 = "nogroup" } \ { print }' @@ -121,6 +126,10 @@ include gar/category.mk install-custom: + @ginstall -D $(DOWNLOADDIR)/cswgmond \ + $(PKGROOT)/etc/opt/csw/init.d/cswgmond + @ginstall -D $(DOWNLOADDIR)/cswgmetad \ + $(PKGROOT)/etc/opt/csw/init.d/cswgmetad @ginstall -d $(DESTDIR)$(WWWGANGLIA) @cd $(WORKSRC)/web; \ cp -R * $(DESTDIR)$(WWWGANGLIA) Added: csw/mgar/pkg/ganglia/trunk/files/cswgmetad =================================================================== --- csw/mgar/pkg/ganglia/trunk/files/cswgmetad (rev 0) +++ csw/mgar/pkg/ganglia/trunk/files/cswgmetad 2009-09-04 23:21:50 UTC (rev 6189) @@ -0,0 +1,29 @@ +#!/bin/sh + +GANGLIA_BASEDIR=/opt/csw +GMETAD=${GANGLIA_BASEDIR}/sbin/gmetad +GMETAD_CONF=/etc/opt/csw/ganglia/gmetad.conf + +test -f /etc/default/gmetad && . /etc/default/gmetad + +[ ! -d ${GANGLIA_BASEDIR} ] && exit 1 + +case "$1" in + + 'start') + ${GMETAD} -c "${GMETAD_CONF}" + ;; + + 'stop') + /usr/bin/pkill -x gmetad + ;; + + *) + echo "Usage: $0 { start | stop }" + exit 1 + ;; + +esac +exit 0 + + Added: csw/mgar/pkg/ganglia/trunk/files/cswgmond =================================================================== --- csw/mgar/pkg/ganglia/trunk/files/cswgmond (rev 0) +++ csw/mgar/pkg/ganglia/trunk/files/cswgmond 2009-09-04 23:21:50 UTC (rev 6189) @@ -0,0 +1,29 @@ +#!/bin/sh + +GANGLIA_BASEDIR=/opt/csw +GMOND=${GANGLIA_BASEDIR}/sbin/gmond +GMOND_CONF=/etc/opt/csw/ganglia/gmond.conf + +test -f /etc/default/gmond && . /etc/default/gmond + +[ ! -d ${GANGLIA_BASEDIR} ] && exit 1 + +case "$1" in + + 'start') + ${GMOND} -c "${GMOND_CONF}" + ;; + + 'stop') + /usr/bin/pkill -x gmond + ;; + + *) + echo "Usage: $0 { start | stop }" + 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 Sat Sep 5 02:41:38 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 05 Sep 2009 00:41:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6190] csw/mgar/pkg/cups/branches/cups-1.4/ Message-ID: Revision: 6190 http://gar.svn.sourceforge.net/gar/?rev=6190&view=rev Author: wahwah Date: 2009-09-05 00:41:38 +0000 (Sat, 05 Sep 2009) Log Message: ----------- cups: branching out for 1.4 Added Paths: ----------- csw/mgar/pkg/cups/branches/cups-1.4/ 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 Sep 5 10:03:46 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 05 Sep 2009 08:03:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6191] csw/mgar/pkg/cups/branches/cups-1.4 Message-ID: Revision: 6191 http://gar.svn.sourceforge.net/gar/?rev=6191&view=rev Author: wahwah Date: 2009-09-05 08:03:46 +0000 (Sat, 05 Sep 2009) Log Message: ----------- cups: Branch 1.4 first iteration Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4/Makefile csw/mgar/pkg/cups/branches/cups-1.4/checksums Added Paths: ----------- csw/mgar/pkg/cups/branches/cups-1.4/files/0001-Makefile.patch Removed Paths: ------------- csw/mgar/pkg/cups/branches/cups-1.4/files/Makefile-cups-1.3.11.patch Modified: csw/mgar/pkg/cups/branches/cups-1.4/Makefile =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-05 00:41:38 UTC (rev 6190) +++ csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-05 08:03:46 UTC (rev 6191) @@ -1,5 +1,5 @@ GARNAME = cups -GARVERSION = 1.3.11 +GARVERSION = 1.4.0 CATEGORIES = net define BLURB @@ -21,12 +21,13 @@ FULL_MIRRORS = $(foreach S,$(CUPS_MIRRORS),$(S)/$(GARNAME)/$(GARVERSION)/) MASTER_SITES += $(FULL_MIRRORS) -PATCHFILES = Makefile-cups-$(GARVERSION).patch +PATCHFILES = 0001-Makefile.patch DISTFILES = cups-$(GARVERSION)-source.tar.bz2 $(PATCHFILES) DISTFILES += CSWcupsd.postremove PREREQUISITE_PKGS = CSWggettext PREREQUISITE_PKGS += CSWjpeg +PREREQUISITE_PKGS += CSWkrb5libdev PREREQUISITE_PKGS += CSWoldapdevel PREREQUISITE_PKGS += CSWossldevel PREREQUISITE_PKGS += CSWtiff @@ -62,10 +63,13 @@ PKGFILES_CSWcupsdoc = $(datadir)/doc PKGFILES_CSWcupsdoc += $(datadir)/doc/.* +PKGFILES_CSWcupsdoc += $(datadir)/cups/examples.* PKGFILES_CSWcupsdev = $(includedir)/cups/?.* PKGFILES_CSWcupsdev += $(mandir)/man1/cups-config.1 PKGFILES_CSWcupsdev += $(bindir)/cups-config +PKGFILES_CSWcupsdev += $(datadir)/cups/ppdc.* +PKGFILES_CSWcupsdev += $(datadir)/cups/drv.* PKGFILES_CSWcupsd = $(sysconfdir)/.* PKGFILES_CSWcupsd += $(mandir)/man1m @@ -79,22 +83,30 @@ PKGFILES_CSWcupsd += $(datadir)/cups/(banners|data|profiles|charsets).* PKGFILES_CSWcupsd += $(datadir)/locale/.* PKGFILES_CSWcupsd += $(datadir)/applications/.* +PKGFILES_CSWcupsd += $(datadir)/cups/mime.* +PKGFILES_CSWcupsd += $(datadir)/icons.* PKGFILES_CSWcupsd += $(libdir)/cups/.* PKGFILES_CSWcupsd += $(libdir)/svc/.* +PKGFILES_CSWcupsd += $(bindir)/ppd(c|html|i|merge|po) PKGFILES_CSWcupsd += $(sbindir)/(cupsfilter|cupsd) PKGFILES_CSWcupsd += $(localstatedir)/.* PKGFILES_CSWcupsclient = $(sbindir)/(accept|reject|cups(addsmb|ctl|(en|dis)able)) +PKGFILES_CSWcupsclient += $(sbindir)/cups(accept|reject) PKGFILES_CSWcupsclient += $(sbindir)/(lp(admin|p|c|info|move)) PKGFILES_CSWcupsclient += $(bindir)/(cancel|cupstest(dsc|ppd)) PKGFILES_CSWcupsclient += $(bindir)/(lp(|options|passwd|q|r|rm|stat)) PKGFILES_CSWcupsclient += $(mandir)/man1/(cancel|cupstest(dsc|ppd)|lp).1 PKGFILES_CSWcupsclient += $(mandir)/man1/(lpoptions|lppasswd|lpq|lpr|lprm).1 PKGFILES_CSWcupsclient += $(mandir)/man1/lpstat.1 +PKGFILES_CSWcupsclient += $(mandir)/man1/ppd.*\.1 +PKGFILES_CSWcupsclient += $(mandir)/man1m/cups.*\.1m PKGFILES_CSWcupsclient += $(mandir)/man1m/(accept|cupsaddsmb|cupsctl).1m PKGFILES_CSWcupsclient += $(mandir)/man1m/(cups(en|dis)able).1m PKGFILES_CSWcupsclient += $(mandir)/man1m/(lpadmin|lpc|lpinfo|lpmove|reject).1m PKGFILES_CSWcupsclient += $(mandir)/man5/client.conf.5 +PKGFILES_CSWcupsclient += $(mandir)/man5/ppdcfile\.5 +PKGFILES_CSWcupsclient += $(mandir)/man7/(drv|notifier)\.7 Modified: csw/mgar/pkg/cups/branches/cups-1.4/checksums =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-09-05 00:41:38 UTC (rev 6190) +++ csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-09-05 08:03:46 UTC (rev 6191) @@ -1,3 +1,3 @@ ca7718998e56c320c08a77cfefe046f6 download/CSWcupsd.postremove -09203e5a1274f71b0d6730456aa80c99 download/Makefile-cups-1.3.11.patch -17f3e2bcb3cae3dd9dceb65a2bfd295f download/cups-1.3.11-source.tar.bz2 +09203e5a1274f71b0d6730456aa80c99 download/Makefile-cups-1.4.0.patch +bc5e777d4320cecdd1a64de8035171a8 download/cups-1.4.0-source.tar.bz2 Added: csw/mgar/pkg/cups/branches/cups-1.4/files/0001-Makefile.patch =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/0001-Makefile.patch (rev 0) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/0001-Makefile.patch 2009-09-05 08:03:46 UTC (rev 6191) @@ -0,0 +1,72 @@ +From 77ba01db2d7f7b8585bb05bb8652aedf09860bd5 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sat, 5 Sep 2009 03:31:57 +0200 +Subject: [PATCH] Makefile + +--- + Makefile | 12 ++++++------ + locale/Makefile | 3 ++- + 2 files changed, 8 insertions(+), 7 deletions(-) + +diff --git a/Makefile b/Makefile +index 91be6e5..a1ff6f8 100644 +--- a/Makefile ++++ b/Makefile +@@ -178,18 +178,18 @@ install-data: + if test "x$(INITDIR)" != x; then \ + echo Installing init scripts...; \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \ +- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \ ++ $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cswcups; \ + for level in $(RCLEVELS); do \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \ +- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups; \ ++ $(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups; \ + if test `uname` = HP-UX; then \ + level=`expr $$level - 1`; \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \ + fi; \ +- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups; \ ++ $(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups; \ + done; \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \ +- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \ ++ $(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \ + fi + if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \ + $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \ +@@ -227,7 +227,7 @@ install-data: + $(INSTALL_DATA) init/cups-lpd $(BUILDROOT)$(XINETD)/cups-lpd; \ + fi + if test "x$(MENUDIR)" != x; then \ +- echo Installing desktop menu...; \ ++ echo Installing desktop menu into $(BUILDROOT)$(MENUDIR)...; \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(MENUDIR); \ + $(INSTALL_DATA) desktop/cups.desktop $(BUILDROOT)$(MENUDIR); \ + fi +@@ -290,7 +290,7 @@ uninstall: + -$(RMDIR) $(BINDIR) + echo Uninstalling startup script... + if test "x$(INITDIR)" != x; then \ +- $(RM) $(BUILDROOT)$(INITDIR)/init.d/cups; \ ++ $(RM) $(BUILDROOT)$(INITDIR)/init.d/cswcups; \ + $(RMDIR) $(BUILDROOT)$(INITDIR)/init.d; \ + $(RM) $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \ + $(RMDIR) $(BUILDROOT)$(INITDIR)/rc0.d; \ +diff --git a/locale/Makefile b/locale/Makefile +index 6241b66..f76b8bc 100644 +--- a/locale/Makefile ++++ b/locale/Makefile +@@ -75,7 +75,8 @@ install-languages: + for loc in $(LANGUAGES) ; do \ + if test -f cups_$$loc.po; then \ + $(INSTALL_DIR) -m 755 $(LOCALEDIR)/$$loc ; \ +- $(INSTALL_DATA) cups_$$loc.po $(LOCALEDIR)/$$loc/cups_$$loc.po ; \ ++ $(INSTALL_DIR) -m 755 $(LOCALEDIR)/$$loc/LC_MESSAGES ; \ ++ $(INSTALL_DATA) cups_$$loc.po $(LOCALEDIR)/$$loc/LC_MESSAGES/cups_$$loc.po ; \ + fi ; \ + done + +-- +1.6.3.2 + Deleted: csw/mgar/pkg/cups/branches/cups-1.4/files/Makefile-cups-1.3.11.patch =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/Makefile-cups-1.3.11.patch 2009-09-05 00:41:38 UTC (rev 6190) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/Makefile-cups-1.3.11.patch 2009-09-05 08:03:46 UTC (rev 6191) @@ -1,57 +0,0 @@ -diff -ru cups-1.3.11.orig/locale/Makefile cups-1.3.11/locale/Makefile ---- cups-1.3.11.orig/locale/Makefile 2007-09-28 19:30:31.000000000 +0100 -+++ cups-1.3.11/locale/Makefile 2009-07-23 16:35:44.275047072 +0100 -@@ -54,7 +54,8 @@ - for loc in $(LANGUAGES) ; do \ - if test -f cups_$$loc.po; then \ - $(INSTALL_DIR) -m 755 $(LOCALEDIR)/$$loc ; \ -- $(INSTALL_DATA) cups_$$loc.po $(LOCALEDIR)/$$loc/cups_$$loc.po ; \ -+ $(INSTALL_DIR) -m 755 $(LOCALEDIR)/$$loc/LC_MESSAGES ; \ -+ $(INSTALL_DATA) cups_$$loc.po $(LOCALEDIR)/$$loc/LC_MESSAGES/cups_$$loc.po ; \ - fi ; \ - done - -diff -ru cups-1.3.11.orig/Makefile cups-1.3.11/Makefile ---- cups-1.3.11.orig/Makefile 2009-06-05 18:55:57.000000000 +0100 -+++ cups-1.3.11/Makefile 2009-07-24 13:05:36.723168569 +0100 -@@ -118,18 +118,18 @@ - if test "x$(INITDIR)" != x; then \ - echo Installing init scripts...; \ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \ -- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \ -+ $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cswcups; \ - for level in $(RCLEVELS); do \ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \ -- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups; \ -+ $(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups; \ - if test `uname` = HP-UX; then \ - level=`expr $$level - 1`; \ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \ - fi; \ -- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups; \ -+ $(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups; \ - done; \ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \ -- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \ -+ $(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \ - fi - if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \ - $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \ -@@ -168,7 +168,7 @@ - $(INSTALL_DATA) init/cups-lpd $(BUILDROOT)$(XINETD)/cups-lpd; \ - fi - if test "x$(MENUDIR)" != x; then \ -- echo Installing desktop menu...; \ -+ echo Installing desktop menu into $(BUILDROOT)$(MENUDIR)...; \ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(MENUDIR); \ - $(INSTALL_DATA) desktop/cups.desktop $(BUILDROOT)$(MENUDIR); \ - fi -@@ -211,7 +211,7 @@ - -$(RMDIR) $(BINDIR) - echo Uninstalling startup script... - if test "x$(INITDIR)" != x; then \ -- $(RM) $(BUILDROOT)$(INITDIR)/init.d/cups; \ -+ $(RM) $(BUILDROOT)$(INITDIR)/init.d/cswcups; \ - $(RMDIR) $(BUILDROOT)$(INITDIR)/init.d; \ - $(RM) $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \ - $(RMDIR) $(BUILDROOT)$(INITDIR)/rc0.d; \ 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 Sep 5 10:05:30 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 05 Sep 2009 08:05:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[6192] csw/mgar/pkg/cups/branches/cups-1.4/checksums Message-ID: Revision: 6192 http://gar.svn.sourceforge.net/gar/?rev=6192&view=rev Author: wahwah Date: 2009-09-05 08:05:30 +0000 (Sat, 05 Sep 2009) Log Message: ----------- cupsd: branch 1.4 checksums Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4/checksums Modified: csw/mgar/pkg/cups/branches/cups-1.4/checksums =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-09-05 08:03:46 UTC (rev 6191) +++ csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-09-05 08:05:30 UTC (rev 6192) @@ -1,3 +1,3 @@ +682e10ff0ab0e094c3de2061369038bc download/0001-Makefile.patch ca7718998e56c320c08a77cfefe046f6 download/CSWcupsd.postremove -09203e5a1274f71b0d6730456aa80c99 download/Makefile-cups-1.4.0.patch bc5e777d4320cecdd1a64de8035171a8 download/cups-1.4.0-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 Sat Sep 5 13:51:15 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 05 Sep 2009 11:51:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[6193] csw/mgar/pkg/curl/trunk Message-ID: Revision: 6193 http://gar.svn.sourceforge.net/gar/?rev=6193&view=rev Author: dmichelsen Date: 2009-09-05 11:51:15 +0000 (Sat, 05 Sep 2009) Log Message: ----------- curl: Correct detection of 64 bit on x86 Modified Paths: -------------- csw/mgar/pkg/curl/trunk/checksums csw/mgar/pkg/curl/trunk/files/curlbuild.h Modified: csw/mgar/pkg/curl/trunk/checksums =================================================================== --- csw/mgar/pkg/curl/trunk/checksums 2009-09-05 08:05:30 UTC (rev 6192) +++ csw/mgar/pkg/curl/trunk/checksums 2009-09-05 11:51:15 UTC (rev 6193) @@ -1,5 +1,5 @@ 8402c1f654c51ad7287aad57c3aa79be download/curl-7.19.6.tar.bz2 -5aebb27149d80000d1107b58d65b551b download/curlbuild.h +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 Modified: csw/mgar/pkg/curl/trunk/files/curlbuild.h =================================================================== --- csw/mgar/pkg/curl/trunk/files/curlbuild.h 2009-09-05 08:05:30 UTC (rev 6192) +++ csw/mgar/pkg/curl/trunk/files/curlbuild.h 2009-09-05 11:51:15 UTC (rev 6193) @@ -1,5 +1,5 @@ /* Allow 32 and 64 bit headers to coexist */ -#if defined __arch64__ || defined __sparcv9 +#if defined __amd64 || defined __x86_64 || defined __sparcv9 #include "curlbuild-64.h" #else #include "curlbuild-32.h" 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 Sep 5 13:55:41 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 05 Sep 2009 11:55:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[6194] csw/mgar/pkg/flac/trunk/Makefile Message-ID: Revision: 6194 http://gar.svn.sourceforge.net/gar/?rev=6194&view=rev Author: dmichelsen Date: 2009-09-05 11:55:40 +0000 (Sat, 05 Sep 2009) Log Message: ----------- flac: Disable assembler optimizations for now as they don't link properly Modified Paths: -------------- csw/mgar/pkg/flac/trunk/Makefile Modified: csw/mgar/pkg/flac/trunk/Makefile =================================================================== --- csw/mgar/pkg/flac/trunk/Makefile 2009-09-05 11:51:15 UTC (rev 6193) +++ csw/mgar/pkg/flac/trunk/Makefile 2009-09-05 11:55:40 UTC (rev 6194) @@ -27,8 +27,11 @@ SF_PROJ = flac MASTER_SITES = $(SF_MIRRORS) DISTNAME = $(SF_PROJ)-$(GARVERSION) -DISTFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(SF_PROJ)-$(VERSION).tar.gz) +SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(SF_PROJ)-$(VERSION).tar.gz) +DISTFILES = $(SOURCEFILES) +NOEXTRACT = $(filter-out $(SF_PROJ)-$(GARVERSION).tar.gz,$(SOURCEFILES)) + PATCHFILES_isa-sparcv8-garversion-1.1.2 = libtool-64bit.patch PATCHFILES_isa-sparcv9-garversion-1.1.2 = libtool-64bit.patch PATCHFILES_isa-sparcv8-garversion-1.2.1 = libtool-64bit.patch no-stdint.patch @@ -38,7 +41,7 @@ PATCHFILES_isa-i386-garversion-1.1.2 = strip-nasm-1.1.2.patch libtool-64bit.patch PATCHFILES_isa-amd64-garversion-1.1.2 = libtool-64bit.patch PATCHFILES_isa-i386-garversion-1.2.1 = strip-nasm-1.2.1.patch libtool-64bit.patch no-stdint.patch -PATCHFILES_isa-amd64-garversion-1.2.1 = libtool-64bit.patch no-stdint.patch +PATCHFILES_isa-amd64-garversion-1.2.1 = strip-nasm-1.2.1.patch libtool-64bit.patch no-stdint.patch PACKAGES = CSWflac CSWxmmsflac CATALOGNAME_CSWflac = libflac @@ -77,6 +80,9 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += $(EXTRA_CONFIGURE_ARGS_mm-$(MEMORYMODEL)) +# XXX: Assembler optimization just doesn't work. Disable for now. +CONFIGURE_ARGS += --disable-asm-optimizations + TEST_TARGET = check MERGE_SCRIPTS_isa-i386-garversion-1.0.4 = copy-only 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 Sep 5 18:26:51 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 05 Sep 2009 16:26:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[6195] csw/mgar/pkg/vncserver/trunk Message-ID: Revision: 6195 http://gar.svn.sourceforge.net/gar/?rev=6195&view=rev Author: wahwah Date: 2009-09-05 16:26:49 +0000 (Sat, 05 Sep 2009) Log Message: ----------- vncserver: Some more work. Doesn't compile yet, calls 'clean' target on directories with no Makefiles. Modified Paths: -------------- csw/mgar/pkg/vncserver/trunk/Makefile csw/mgar/pkg/vncserver/trunk/checksums Added Paths: ----------- csw/mgar/pkg/vncserver/trunk/files/0001-GNU-make-by-default.patch Modified: csw/mgar/pkg/vncserver/trunk/Makefile =================================================================== --- csw/mgar/pkg/vncserver/trunk/Makefile 2009-09-05 11:55:40 UTC (rev 6194) +++ csw/mgar/pkg/vncserver/trunk/Makefile 2009-09-05 16:26:49 UTC (rev 6195) @@ -18,7 +18,6 @@ REQUIRED_PKGS = CSWjpeg CSWtcpwrap -# We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_USE_SF = 1 UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=14067 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)_unixsrc.tar.bz2 @@ -28,7 +27,8 @@ # Use tightvnc.spec EXTRA_DEFINES = -DUSE_LIBWRAP=1 -EXTRA_INCLUDE = $(CFLAGS) +EXTRA_INC = /usr/openwin/share/include/X11 +EXTRA_LDFLAGS = /opt/csw/lib LOCAL_LDFLAGS = $(LINKER_FLAGS) BUILD_OVERRIDE_DIRS = EXTRA_DEFINES EXTRA_INCLUDE LOCAL_LDFLAGS @@ -38,10 +38,13 @@ BUILD_SCRIPTS = vnc Xvnc # VNC doesn't come with tests -TEST_SCRIPTS = +SKIPTEST = 1 INSTALL_SCRIPTS = vnc +PATCHFILES = 0001-GNU-make-by-default.patch +# PATCHFILES += work-in-progress.patch + include gar/category.mk pre-configure-modulated: @@ -62,7 +65,10 @@ build-Xvnc: configure-Xvnc banner "Build Xvnc" - cd $(WORKSRC)/Xvnc && $(MAKE) EXTRA_LIBRARIES="-lwrap" EXTRA_DEFINES="-DUSE_LIBWRAP=1" + # $(MAKE) -C $(WORKSRC)/Xvnc $(BUILD_ENV) EXTRA_LIBRARIES="-lwrap" EXTRA_DEFINES="-DUSE_LIBWRAP=1" World + $(MAKE) -C $(WORKSRC) $(BUILD_ENV) EXTRA_LIBRARIES="-lwrap" EXTRA_DEFINES="-DUSE_LIBWRAP=1" World + $(MAKE) -C $(WORKSRC)/Xvnc $(BUILD_ENV) EXTRA_LIBRARIES="-lwrap -lsocket" EXTRA_DEFINES="-DUSE_LIBWRAP=1" EXTRA_LDOPTIONS="-L/opt/csw/lib -L/usr/lib" World + @$(MAKECOOKIE) #xmkmf -a #make CDEBUGFLAGS="$RPM_OPT_FLAGS" World @@ -129,4 +135,3 @@ # VNCSERVERS="1:myusername" #EOF #chmod 644 %{buildroot}/etc/sysconfig/vncservers - Modified: csw/mgar/pkg/vncserver/trunk/checksums =================================================================== --- csw/mgar/pkg/vncserver/trunk/checksums 2009-09-05 11:55:40 UTC (rev 6194) +++ csw/mgar/pkg/vncserver/trunk/checksums 2009-09-05 16:26:49 UTC (rev 6195) @@ -1,2 +1,3 @@ +ccaa72230aff091ca3863896b5c36885 download/0001-GNU-make-by-default.patch 397b35faad32d5246b6d44b142f8304f download/tightvnc-1.3.10_unixsrc.tar.bz2 56c09be17c17184e96193c13246fd649 download/vncservers Added: csw/mgar/pkg/vncserver/trunk/files/0001-GNU-make-by-default.patch =================================================================== --- csw/mgar/pkg/vncserver/trunk/files/0001-GNU-make-by-default.patch (rev 0) +++ csw/mgar/pkg/vncserver/trunk/files/0001-GNU-make-by-default.patch 2009-09-05 16:26:49 UTC (rev 6195) @@ -0,0 +1,25 @@ +From 985baba7fd98f7e329fdbe09559f8f98c1bcce82 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Sat, 5 Sep 2009 14:18:18 +0100 +Subject: [PATCH] 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 wahwah at users.sourceforge.net Sat Sep 5 18:42:10 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 05 Sep 2009 16:42:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[6196] csw/mgar/pkg/cups/branches/cups-1.4/Makefile Message-ID: Revision: 6196 http://gar.svn.sourceforge.net/gar/?rev=6196&view=rev Author: wahwah Date: 2009-09-05 16:42:10 +0000 (Sat, 05 Sep 2009) Log Message: ----------- cups: added dependency on CSWosslrt for branch 1.4 Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4/Makefile Modified: csw/mgar/pkg/cups/branches/cups-1.4/Makefile =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-05 16:26:49 UTC (rev 6195) +++ csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-05 16:42:10 UTC (rev 6196) @@ -51,13 +51,13 @@ REQUIRED_PKGS_CSWcupsd = CSWcswclassutils CSWlibcups CSWoldaprt CSWzlib REQUIRED_PKGS_CSWcupsd += CSWjpeg CSWpng CSWtiff CSWlibtasn1 REQUIRED_PKGS_CSWcupsd += CSWgcrypt CSWgnutls CSWgpgerr CSWlibdbus -REQUIRED_PKGS_CSWcupsd += CSWkrb5lib +REQUIRED_PKGS_CSWcupsd += CSWkrb5lib CSWosslrt REQUIRED_PKGS_CSWcupsclient = CSWcswclassutils CSWlibcups CSWoldaprt CSWzlib -REQUIRED_PKGS_CSWcupsclient += CSWgcrypt CSWgnutls CSWgpgerr CSWlibtasn1 +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_CSWlibcups += CSWgcrypt CSWgnutls CSWgpgerr CSWlibtasn1 +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 j_arndt at users.sourceforge.net Sat Sep 5 20:00:09 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sat, 05 Sep 2009 18:00:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[6197] csw/mgar/pkg/munin/trunk Message-ID: Revision: 6197 http://gar.svn.sourceforge.net/gar/?rev=6197&view=rev Author: j_arndt Date: 2009-09-05 18:00:09 +0000 (Sat, 05 Sep 2009) Log Message: ----------- munin: run level links will be created on Sol 8, improved package description Modified Paths: -------------- csw/mgar/pkg/munin/trunk/Makefile csw/mgar/pkg/munin/trunk/checksums csw/mgar/pkg/munin/trunk/files/cswmuninnode Modified: csw/mgar/pkg/munin/trunk/Makefile =================================================================== --- csw/mgar/pkg/munin/trunk/Makefile 2009-09-05 16:42:10 UTC (rev 6196) +++ csw/mgar/pkg/munin/trunk/Makefile 2009-09-05 18:00:09 UTC (rev 6197) @@ -2,19 +2,18 @@ GARVERSION = 1.3.4 CATEGORIES = apps -SPKG_DESC_CSWmuninmaster = munin master -SPKG_DESC_CSWmuninnode = munin node +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 -#DESCRIPTION = graphical network and system monitoring define BLURB - Long description + Munin the monitoring tool surveys all your computers and remembers what it saw. It presents all the information in graphs through a web interface. endef SF_PROJ = munin MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)_$(GARVERSION).tar.gz DISTFILES += CSWmuninmaster.prototype CSWmuninmaster.postinstall -DISTFILES += CSWmuninnode.prototype +DISTFILES += CSWmuninnode.prototype cswmuninnode DISTFILES += cswusergroup DISTFILES += apache-munin.conf.CSW apache-munin-cgi.conf.CSW DISTFILES += README.CSW Modified: csw/mgar/pkg/munin/trunk/checksums =================================================================== --- csw/mgar/pkg/munin/trunk/checksums 2009-09-05 16:42:10 UTC (rev 6196) +++ csw/mgar/pkg/munin/trunk/checksums 2009-09-05 18:00:09 UTC (rev 6197) @@ -4,6 +4,7 @@ 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 Modified: csw/mgar/pkg/munin/trunk/files/cswmuninnode =================================================================== --- csw/mgar/pkg/munin/trunk/files/cswmuninnode 2009-09-05 16:42:10 UTC (rev 6196) +++ csw/mgar/pkg/munin/trunk/files/cswmuninnode 2009-09-05 18:00:09 UTC (rev 6197) @@ -4,9 +4,14 @@ # All rights reserved. # # For OpenCSW by Juergen Arndt 2009-07-03 +# Run levels added - 2009-09-05 #FMRI application # FMRI path for service #AUTOENABLE yes +#RC_KNUM 20 # Number used for kill script symlink, e.g. K20cswfoo +#RC_SNUM 80 # Number used for start script symlink, e.g. S80cswfoo +#RC_KLEV 0,1,2,S # Run levels that should have a kill script symlink +#RC_SLEV 3 # Run levels that should have a start script symlink SMF_EXIT_ERR_CONFIG=1 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 Sep 5 20:53:15 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sat, 05 Sep 2009 18:53:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[6198] csw/mgar/pkg/spine/trunk Message-ID: Revision: 6198 http://gar.svn.sourceforge.net/gar/?rev=6198&view=rev Author: j_arndt Date: 2009-09-05 18:53:15 +0000 (Sat, 05 Sep 2009) Log Message: ----------- spine: tweaked the configure script Modified Paths: -------------- csw/mgar/pkg/spine/trunk/checksums csw/mgar/pkg/spine/trunk/files/configure.diff Modified: csw/mgar/pkg/spine/trunk/checksums =================================================================== --- csw/mgar/pkg/spine/trunk/checksums 2009-09-05 18:00:09 UTC (rev 6197) +++ csw/mgar/pkg/spine/trunk/checksums 2009-09-05 18:53:15 UTC (rev 6198) @@ -1,4 +1,4 @@ 54e3c3f6ca757815ac1cccf78b7a086c download/CSWspine.postinstall 99e5bde07fc31d1ed8aa23c59de00417 download/cacti-spine-0.8.7e.tar.gz -40235c60873e4097a44b07db653211ae download/configure.diff +2fbbedbfc20811cbc81ddf748ebdb58e download/configure.diff b762d50320246dc8ce21c20233479231 download/cswusergroup Modified: csw/mgar/pkg/spine/trunk/files/configure.diff =================================================================== --- csw/mgar/pkg/spine/trunk/files/configure.diff 2009-09-05 18:00:09 UTC (rev 6197) +++ csw/mgar/pkg/spine/trunk/files/configure.diff 2009-09-05 18:53:15 UTC (rev 6198) @@ -18,7 +18,7 @@ fi -LDFLAGS="-L$SNMP_LIBDIR $LDFLAGS" -+LDFLAGS="-L/opt/csw/lib -L/opt/csw/lib/mysql $LDFLAGS" ++LDFLAGS="-L/opt/csw/lib -L/opt/csw/lib/mysql -L/opt/csw/mysql5/lib/mysql $LDFLAGS" CFLAGS="-I$SNMP_INCDIR -I$SNMP_INCDIR/.. $CFLAGS" # Net/UCD-SNMP includes v3 support and insists on crypto unless compiled --without-openssl This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sat Sep 5 22:58:25 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sat, 05 Sep 2009 20:58:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[6199] csw/mgar/pkg/spine/trunk/Makefile Message-ID: Revision: 6199 http://gar.svn.sourceforge.net/gar/?rev=6199&view=rev Author: skayser Date: 2009-09-05 20:58:25 +0000 (Sat, 05 Sep 2009) Log Message: ----------- spine: tweaked configure phase Modified Paths: -------------- csw/mgar/pkg/spine/trunk/Makefile Modified: csw/mgar/pkg/spine/trunk/Makefile =================================================================== --- csw/mgar/pkg/spine/trunk/Makefile 2009-09-05 18:53:15 UTC (rev 6198) +++ csw/mgar/pkg/spine/trunk/Makefile 2009-09-05 20:58:25 UTC (rev 6199) @@ -12,6 +12,7 @@ #DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES = cacti-$(GARNAME)-$(GARVERSION).tar.gz DISTFILES += cswusergroup CSWspine.postinstall +DISTNAME = cacti-$(GARNAME)-$(GARVERSION) PATCHFILES += configure.diff @@ -30,16 +31,10 @@ SPKG_CLASSES = none cswpreserveconf -WORKSRC = $(WORKDIR)/cacti-$(GARNAME)-$(GARVERSION) - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-mysql=/opt/csw/mysql5 CONFIGURE_ARGS += --with-snmp=/opt/csw/include/net-snmp -EXTRA_LIB += $(BUILD_PREFIX)/lib -LD_OPTIONS += -L/opt/csw/lib - -CONFIGURE_SCRIPTS = custom INSTALL_SCRIPTS = custom SKIPTEST = 1 @@ -50,15 +45,14 @@ include gar/category.mk -configure-custom: - @echo " ==> Configuring in $(WORKSRC)" +pre-configure-modulated: + @echo " ==> Pre-configure in $(WORKSRC)" @rm $(WORKSRC)/config/ltmain.sh @rm $(WORKSRC)/config/config.sub @rm $(WORKSRC)/config/config.guess @ln -s /opt/csw/share/libtool/config/ltmain.sh $(WORKSRC)/config/ltmain.sh @ln -s /opt/csw/share/libtool/config/config.sub $(WORKSRC)/config/config.sub @ln -s /opt/csw/share/libtool/config/config.guess $(WORKSRC)/config/config.guess - @( cd $(WORKSRC) ; ./configure $(CONFIGURE_ARGS) ) @$(MAKECOOKIE) install-custom: 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 Sep 5 23:04:51 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 05 Sep 2009 21:04:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[6200] csw/mgar/pkg/thunderbird/trunk Message-ID: Revision: 6200 http://gar.svn.sourceforge.net/gar/?rev=6200&view=rev Author: wbonnet Date: 2009-09-05 21:04:51 +0000 (Sat, 05 Sep 2009) Log Message: ----------- Remove call to sqlite_os_switch Modified Paths: -------------- csw/mgar/pkg/thunderbird/trunk/Makefile csw/mgar/pkg/thunderbird/trunk/checksums Added Paths: ----------- csw/mgar/pkg/thunderbird/trunk/files/mozStorageAsyncIO.cpp.diff Modified: csw/mgar/pkg/thunderbird/trunk/Makefile =================================================================== --- csw/mgar/pkg/thunderbird/trunk/Makefile 2009-09-05 20:58:25 UTC (rev 6199) +++ csw/mgar/pkg/thunderbird/trunk/Makefile 2009-09-05 21:04:51 UTC (rev 6200) @@ -62,6 +62,7 @@ PATCHFILES += lber-int.h.diff PATCHFILES += ldappr-int.h.diff PATCHFILES += ldap-int.h.diff +PATCHFILES += mozStorageAsyncIO.cpp.diff TEST_SCRIPTS = Modified: csw/mgar/pkg/thunderbird/trunk/checksums =================================================================== --- csw/mgar/pkg/thunderbird/trunk/checksums 2009-09-05 20:58:25 UTC (rev 6199) +++ csw/mgar/pkg/thunderbird/trunk/checksums 2009-09-05 21:04:51 UTC (rev 6200) @@ -2,4 +2,5 @@ 46527aded9c373b6095fea546d4d74f0 download/lber-int.h.diff 46ef334e67dab2301b53b661494f9d58 download/ldap-int.h.diff e7054c1d1d6dc708805a6110ccfa7f70 download/ldappr-int.h.diff +14a88ff4a88cd308b5cd7e25cb4b6172 download/mozStorageAsyncIO.cpp.diff 2e118fcf752ee60ce994f1471f9632d1 download/thunderbird-2.0.0.23-source.tar.bz2 Added: csw/mgar/pkg/thunderbird/trunk/files/mozStorageAsyncIO.cpp.diff =================================================================== --- csw/mgar/pkg/thunderbird/trunk/files/mozStorageAsyncIO.cpp.diff (rev 0) +++ csw/mgar/pkg/thunderbird/trunk/files/mozStorageAsyncIO.cpp.diff 2009-09-05 21:04:51 UTC (rev 6200) @@ -0,0 +1,13 @@ +diff --speed-large-files --minimal -Nru thunderbird.orig/storage/src/mozStorageAsyncIO.cpp.orig thunderbird/storage/src/mozStorageAsyncIO.cpp +--- thunderbird.orig/storage/src/mozStorageAsyncIO.cpp 2009-09-05 22:39:51.740805104 +0200 ++++ thunderbird/storage/src/mozStorageAsyncIO.cpp 2009-09-05 22:41:38.590070067 +0200 +@@ -503,7 +503,8 @@ + nsresult + mozStorageService::InitStorageAsyncIO() + { +- sqlite3OsVtbl* vtable = sqlite3_os_switch(); ++ sqlite3OsVtbl* vtable = &sqlite3Os; ++//sqlite3_os_switch(); + + sqliteOrigOpenReadWrite = vtable->xOpenReadWrite; + sqliteOrigOpenReadOnly = vtable->xOpenReadOnly; 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 Sep 6 00:18:05 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 05 Sep 2009 22:18:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6201] csw/mgar/pkg/vncserver/trunk Message-ID: Revision: 6201 http://gar.svn.sourceforge.net/gar/?rev=6201&view=rev Author: wahwah Date: 2009-09-05 22:18:05 +0000 (Sat, 05 Sep 2009) Log Message: ----------- vncserver: Build phase completes now Modified Paths: -------------- csw/mgar/pkg/vncserver/trunk/Makefile csw/mgar/pkg/vncserver/trunk/checksums csw/mgar/pkg/vncserver/trunk/files/0001-GNU-make-by-default.patch Modified: csw/mgar/pkg/vncserver/trunk/Makefile =================================================================== --- csw/mgar/pkg/vncserver/trunk/Makefile 2009-09-05 21:04:51 UTC (rev 6200) +++ csw/mgar/pkg/vncserver/trunk/Makefile 2009-09-05 22:18:05 UTC (rev 6201) @@ -43,7 +43,7 @@ INSTALL_SCRIPTS = vnc PATCHFILES = 0001-GNU-make-by-default.patch -# PATCHFILES += work-in-progress.patch +PATCHFILES += 0002-Test-for-Makefile-presence.patch include gar/category.mk Modified: csw/mgar/pkg/vncserver/trunk/checksums =================================================================== --- csw/mgar/pkg/vncserver/trunk/checksums 2009-09-05 21:04:51 UTC (rev 6200) +++ csw/mgar/pkg/vncserver/trunk/checksums 2009-09-05 22:18:05 UTC (rev 6201) @@ -1,3 +1,4 @@ -ccaa72230aff091ca3863896b5c36885 download/0001-GNU-make-by-default.patch +c041ccc52996cf7e085e8f3a51747aea download/0001-GNU-make-by-default.patch +88d1dfca0c88c191f54f5aa5c6aab460 download/0002-Test-for-Makefile-presence.patch 397b35faad32d5246b6d44b142f8304f download/tightvnc-1.3.10_unixsrc.tar.bz2 56c09be17c17184e96193c13246fd649 download/vncservers Modified: csw/mgar/pkg/vncserver/trunk/files/0001-GNU-make-by-default.patch =================================================================== --- csw/mgar/pkg/vncserver/trunk/files/0001-GNU-make-by-default.patch 2009-09-05 21:04:51 UTC (rev 6200) +++ csw/mgar/pkg/vncserver/trunk/files/0001-GNU-make-by-default.patch 2009-09-05 22:18:05 UTC (rev 6201) @@ -1,7 +1,7 @@ -From 985baba7fd98f7e329fdbe09559f8f98c1bcce82 Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= -Date: Sat, 5 Sep 2009 14:18:18 +0100 -Subject: [PATCH] GNU make by default +From f12b77cb177de6014ac23913c385c7f4ab9717e3 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sat, 5 Sep 2009 22:52:49 +0200 +Subject: [PATCH 1/2] GNU make by default --- Xvnc/config/cf/svr4.cf | 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 Sun Sep 6 00:18:43 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 05 Sep 2009 22:18:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6202] csw/mgar/pkg/vncserver/trunk/files/ 0002-Test-for-Makefile-presence.patch Message-ID: Revision: 6202 http://gar.svn.sourceforge.net/gar/?rev=6202&view=rev Author: wahwah Date: 2009-09-05 22:18:43 +0000 (Sat, 05 Sep 2009) Log Message: ----------- vncserver: Adding a patch: testing for Makefile presence Added Paths: ----------- csw/mgar/pkg/vncserver/trunk/files/0002-Test-for-Makefile-presence.patch Added: csw/mgar/pkg/vncserver/trunk/files/0002-Test-for-Makefile-presence.patch =================================================================== --- csw/mgar/pkg/vncserver/trunk/files/0002-Test-for-Makefile-presence.patch (rev 0) +++ csw/mgar/pkg/vncserver/trunk/files/0002-Test-for-Makefile-presence.patch 2009-09-05 22:18:43 UTC (rev 6202) @@ -0,0 +1,27 @@ +From 1045270d1e76278f5c613eb74e2a8f347632dc73 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 6 Sep 2009 00:16:10 +0200 +Subject: [PATCH 2/2] Test for Makefile presence + +--- + Xvnc/config/cf/Imake.rules | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Xvnc/config/cf/Imake.rules b/Xvnc/config/cf/Imake.rules +index 5ab9a18..6f5f7c4 100644 +--- a/Xvnc/config/cf/Imake.rules ++++ b/Xvnc/config/cf/Imake.rules +@@ -1304,8 +1304,8 @@ InstallNamedTargetNoClobber(install,srcname,$(INSTBINFLAGS),dest,dstname) + */ + #ifndef MakeNamedTargetSubdir + #define MakeNamedTargetSubdir(dir,flags,subname)\ +- (cd dir && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) \ @@\ +- flags subname) ++ (cd dir && [ -r Makefile ] && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) \ @@\ ++ flags subname || true) + #endif + + /* +-- +1.6.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Sep 6 03:04:38 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 06 Sep 2009 01:04:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6203] csw/mgar/gar/v2/bin/checkpkg Message-ID: Revision: 6203 http://gar.svn.sourceforge.net/gar/?rev=6203&view=rev Author: bdwalton Date: 2009-09-06 01:04:38 +0000 (Sun, 06 Sep 2009) Log Message: ----------- GAR: update checkpkg to handle multiple package sets (inter-dependencies) Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2009-09-05 22:18:43 UTC (rev 6202) +++ csw/mgar/gar/v2/bin/checkpkg 2009-09-06 01:04:38 UTC (rev 6203) @@ -1,8 +1,8 @@ #!/bin/ksh -p -# checkpkg 1.46a (diff to 1.46: modified errmsg -> warnmsg on two places) +# checkpkg 1.50 (diff to 1.46a: check multiple package files) # This script examines a package that has been put together -# for submittal to the CSW archive +# for submittal to the CSW archive at opencsw.org # # It examines it for compliance with the packaging standards at # http://www.opencsw.org/standards/ @@ -29,10 +29,15 @@ rm -rf $EXTRACTDIR fi if [[ "$TMPARCHIVE" != "" ]] ; then - rm $TMPARCHIVE + [ -f "$TMPARCHIVE" ] && rm $TMPARCHIVE fi } +cleanupset(){ + if [ "`echo $SETINF*`" != "$SETINF*" ]; then + rm $SETINF* + fi +} warnmsg(){ print WARNING: $* >/dev/fd/2 if [[ "$quit_on_warn" != "" ]] ; then @@ -45,6 +50,7 @@ errmsg(){ print ERROR: $* >/dev/fd/2 cleanup + cleanupset exit 1 } @@ -58,6 +64,12 @@ shift fi +# a unique filename for the list of package deps and libs we see in a 'set' +SETINF=/tmp/checkpkg.$$.`date +%Y%m%d%H%M%S` +SETLIBS=$SETINF.libs +SETDEPS=$SETINF.deps + + for f in "$@" do @@ -123,7 +135,6 @@ TMPFILE=$EXTRACTDIR/pkginfo - dd if=$f skip=1 | (cd $EXTRACTDIR; cpio -ivd $pkgname/pkginfo) if [[ $? -ne 0 ]] ; then print ERROR: could not extract $f @@ -217,6 +228,13 @@ print ERROR: VERSION field not allowed to have '"-"' in it exit 1 ;; + *,REV=20[01][0-9].[0-9][0-9].[0-9][0-9]*) + : + ;; + *) + print ERROR: no REV=YYYY.MM.DD field in VERSION + exit 1 + ;; esac case $pkgarch in @@ -377,17 +395,19 @@ # man ld.so.1 for more info on this hack export LD_NOAUXFLTR=1 - listbinaries $EXTRACTDIR/$pkgname >$EXTRACTDIR/tmplist + listbinaries $EXTRACTDIR/$pkgname >$EXTRACTDIR/elflist # have to do this for ldd to work. arrg. - if [ -s "$EXTRACTDIR/tmplist" ] ; then - chmod 0755 `cat $EXTRACTDIR/tmplist` + if [ -s "$EXTRACTDIR/elflist" ] ; then + chmod 0755 `cat $EXTRACTDIR/elflist` - #cat $EXTRACTDIR/tmplist| xargs ldd 2>/dev/null |fgrep '.so' | + #cat $EXTRACTDIR/elflist| xargs ldd 2>/dev/null |fgrep '.so' | # sed 's:^.*=>[^/]*::' | nawk '{print $1}' |sort -u >$EXTRACTDIR/liblist - cat $EXTRACTDIR/tmplist| xargs dump -Lv |nawk '$2=="NEEDED"{print $3}' | + cat $EXTRACTDIR/elflist| xargs dump -Lv |nawk '$2=="NEEDED"{print $3}' | sort -u | egrep -v $EXTRACTDIR >$EXTRACTDIR/liblist + + print libraries used are: cat $EXTRACTDIR/liblist print "cross-referencing with depend file (May take a while)" @@ -399,6 +419,10 @@ #If these dont exist, it is Bad. touch $EXTRACTDIR/liblist $EXTRACTDIR/libpkgs +# store things that look like shared objects from the package map for +# delayed library validation. +grep "\.so" $EXTRACTDIR/$pkgname/pkgmap >> $SETLIBS + if [[ -f $EXTRACTDIR/$pkgname/install/depend ]] ; then print print "Examining 'depend' file" @@ -416,11 +440,26 @@ exit 1 fi +#to retain a record of all packages currently being examined from $@ +echo $pkgname >> $SETDEPS + nawk '$1=="P" {print $2}' $EXTRACTDIR/$pkgname/install/depend | sort >$EXTRACTDIR/deppkgs for dep in `cat $EXTRACTDIR/deppkgs` do - pkginfo $dep || warnmsg invalid package $dep specified + pkginfo $dep + 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 + 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. + echo "$dep $pkgname" >> $SETDEPS.missing + else + echo "Found $dep as part of the package set being evaluated." + fi + fi done egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' /var/sadm/install/contents | @@ -433,13 +472,20 @@ if [[ $? -eq 0 ]] ; then echo $lib provided by package itself continue + else + grep "[/=]$lib[ =]" $SETLIBS + if [[ $? -eq 0 ]]; then + echo "$lib provided by package set being evaluated." + continue + fi fi libpkg=`grep /$lib $EXTRACTDIR/shortcatalog | sed 's/^.* \([^ ]*\)$/\1/' |sort -u` if [[ -z "$libpkg" ]] ; then - warnmsg cannot find package for $lib + echo "$lib $pkgname" >> $SETLIBS.missing + print Cannot find package providing $lib. Storing for delayed validation. else print $libpkg | fmt -1 >>$EXTRACTDIR/libpkgs fi @@ -458,19 +504,53 @@ if [[ "$basedir" != "" ]] ; then - print - print "Checking relocation ability..." - xargs strings <$EXTRACTDIR/tmplist | grep /opt/csw - if [[ $? -eq 0 ]] ; then - errmsg package build as relocatable, but binaries have hardcoded /opt/csw paths in them + print + if [[ -f $EXTRACTDIR/elflist ]] ; then + print "Checking relocation ability..." + xargs strings < $EXTRACTDIR/elflist| grep /opt/csw + if [[ $? -eq 0 ]] ; then + errmsg package build as relocatable, but binaries have hardcoded /opt/csw paths in them + else + print trivial check passed + fi else - print trivial check passed + echo No relocation check done for non-binary relocatable package. fi fi + cleanup - print "" done + +if [ -s $SETDEPS.missing ]; then + print "Doing late evaluations of package dependencies." + while read mdep; do + dep=`echo $mdep | nawk '{print $1}'` + pkg=`echo $mdep | nawk '{print $2}'` + /usr/xpg4/bin/grep -q $dep $SETDEPS + if [ $? -ne 0 ]; then + errmsg "Couldn't validate $dep as a dependency in package $pkg" + else + print "Validated $dep as a dependency for $pkg." + fi + done < $SETDEPS.missing +fi + +if [ -s $SETLIBS.missing ]; then + print "Doing late evaluations of package library dependencies." + while read ldep; do + lib=`echo $ldep | nawk '{print $1}'` + pkg=`echo $ldep | nawk '{print $2}'` + /usr/xpg4/bin/grep -q "[/=]$lib[ =]" $SETLIBS + if [ $? -ne 0 ]; then + errmsg "Couldn't find a package providing $lib" + else + print "A package in the set being evaluated provides $lib" + fi + done < $SETLIBS.missing +fi + +cleanupset 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 Sep 6 09:41:24 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 06 Sep 2009 07:41:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[6204] csw/mgar/pkg/vncserver/trunk/Makefile Message-ID: Revision: 6204 http://gar.svn.sourceforge.net/gar/?rev=6204&view=rev Author: wahwah Date: 2009-09-06 07:41:24 +0000 (Sun, 06 Sep 2009) Log Message: ----------- vncserver: Compiles correctly now. To be tested. Modified Paths: -------------- csw/mgar/pkg/vncserver/trunk/Makefile Modified: csw/mgar/pkg/vncserver/trunk/Makefile =================================================================== --- csw/mgar/pkg/vncserver/trunk/Makefile 2009-09-06 01:04:38 UTC (rev 6203) +++ csw/mgar/pkg/vncserver/trunk/Makefile 2009-09-06 07:41:24 UTC (rev 6204) @@ -3,65 +3,67 @@ CATEGORIES = utils DESCRIPTION = TightVNC server is a free remote control package derived from the popular VNC software + define BLURB + TightVNC is a free remote control software package. With TightVNC, you can see + the desktop of a remote machine and control it with your local mouse and + keyboard, just like you would do it sitting in the front of that computer. endef SF_PROJ = vnc-tight MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION)_unixsrc.tar.bz2 DISTFILES += vncservers - -PACKAGES = CSWvncs -CATALOGNAME = vncserver - +PACKAGES = CSWvncs CSWvncv +CATALOGNAME_CSWvncs = vncserver +CATALOGNAME_CSWvncv = vncviewer SPKG_SOURCEURL = http://www.tightvnc.org/ - -REQUIRED_PKGS = CSWjpeg CSWtcpwrap - UPSTREAM_USE_SF = 1 UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=14067 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)_unixsrc.tar.bz2 - DISTNAME = vnc_unixsrc +PKGFILES_CSWvncv = $(bindir)/vncviewer +PKGFILES_CSWvncv += $(mandir)/man1/vncviewer\.1 +SPKG_DESC_CSWvncs = TightVNC server +SPKG_DESC_CSWvncv = TightVNC viewer -# Use tightvnc.spec +REQUIRED_PKGS = CSWjpeg CSWtcpwrap CSWzlib +REQUIRED_PKGS += SUNWcslr SUNWlibmsr SUNWxwice SUNWxwplt +sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw + EXTRA_DEFINES = -DUSE_LIBWRAP=1 EXTRA_INC = /usr/openwin/share/include/X11 EXTRA_LDFLAGS = /opt/csw/lib LOCAL_LDFLAGS = $(LINKER_FLAGS) BUILD_OVERRIDE_DIRS = EXTRA_DEFINES EXTRA_INCLUDE LOCAL_LDFLAGS - CONFIGURE_SCRIPTS = $(WORKSRC)/Imakefile Xvnc CONFIGURE_ARGS = -a - BUILD_SCRIPTS = vnc Xvnc - -# VNC doesn't come with tests SKIPTEST = 1 - INSTALL_SCRIPTS = vnc - PATCHFILES = 0001-GNU-make-by-default.patch +# This patch has been sent upstream with a bug report. +# http://sourceforge.net/tracker/?func=detail&aid=2852808&group_id=14067&atid=114067 PATCHFILES += 0002-Test-for-Makefile-presence.patch include gar/category.mk pre-configure-modulated: perl -pi -e "s|/usr/local/vnc/classes|$(datadir)/vnc/classes|" $(WORKSRC)/vncserver - $(MAKECOOKIE) + @$(MAKECOOKIE) configure-Xvnc: banner "Config Xvnc" perl -pi -e "s|^(\s*make)\s*$$|\1 CC=$(CC)|" $(WORKSRC)/Xvnc/configure cd $(WORKSRC)/Xvnc && ./configure - $(MAKECOOKIE) + @$(MAKECOOKIE) build-vnc: banner "Build VNC" - #$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) cd $(WORKSRC) && $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") World - $(MAKECOOKIE) + @$(MAKECOOKIE) build-Xvnc: configure-Xvnc banner "Build Xvnc" @@ -85,53 +87,5 @@ (cd $(WORKSRC); cp -pR classes $(DESTDIR)$(datadir)/vnc) #mkdir -p %{buildroot}/etc/rc.d/init.d #install -m755 vncserver.init %{buildroot}/etc/rc.d/init.d/vncserver + ginstall -d $(DESTDIR)$(sysconfdir)/vncservers ginstall -m 644 $(WORKDIR)/vncservers $(DESTDIR)$(sysconfdir)/vncservers - - - -# Build - -#patch < vnc-xclients.patch - -#xmkmf -a -#make CDEBUGFLAGS="$RPM_OPT_FLAGS" World -#cd Xvnc -#./configure -#make EXTRA_LIBRARIES="-lwrap -lnss_nis" CDEBUGFLAGS="$RPM_OPT_FLAGS" \ -# EXTRA_DEFINES="-DUSE_LIBWRAP=1" - - - - -# Install - -#rm -rf %{buildroot} - -#mkdir -p %{buildroot}%{_bindir} -#mkdir -p %{buildroot}%{_mandir}/man1 -#./vncinstall %{buildroot}%{_bindir} %{buildroot}%{_mandir} - -#mkdir -p %{buildroot}%{_datadir}/vnc -#cp -aR classes %{buildroot}%{_datadir}/vnc - -#strip %{buildroot}%{_bindir}/* || : - -#mkdir -p %{buildroot}/etc/rc.d/init.d -#install -m755 vncserver.init %{buildroot}/etc/rc.d/init.d/vncserver -# -#mkdir -p %{buildroot}/etc/sysconfig -#cat > %{buildroot}/etc/sysconfig/vncservers << EOF -# The VNCSERVERS variable is a list of display:user pairs. -# -# Uncomment the line below to start a VNC server on display :1 -# as my 'myusername' (adjust this to your own). You will also -# need to set a VNC password; run 'man vncpasswd' to see how -# to do that. -# -# DO NOT RUN THIS SERVICE if your local area network is -# untrusted! For a secure way of using VNC, see -# . - -# VNCSERVERS="1:myusername" -#EOF -#chmod 644 %{buildroot}/etc/sysconfig/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 Sun Sep 6 09:42:40 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 06 Sep 2009 07:42:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[6205] csw/mgar/pkg Message-ID: Revision: 6205 http://gar.svn.sourceforge.net/gar/?rev=6205&view=rev Author: wahwah Date: 2009-09-06 07:42:39 +0000 (Sun, 06 Sep 2009) Log Message: ----------- Renaming the 'vncserver' directory to 'tightvnc' (building both server and viewer). Added Paths: ----------- csw/mgar/pkg/tightvnc/ Removed Paths: ------------- csw/mgar/pkg/vncserver/ 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 Sep 6 09:51:47 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 06 Sep 2009 07:51:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[6206] csw/mgar/pkg/tightvnc/trunk/Makefile Message-ID: Revision: 6206 http://gar.svn.sourceforge.net/gar/?rev=6206&view=rev Author: wahwah Date: 2009-09-06 07:51:46 +0000 (Sun, 06 Sep 2009) Log Message: ----------- tightvnc: Removing references to SUNW packages Modified Paths: -------------- csw/mgar/pkg/tightvnc/trunk/Makefile Modified: csw/mgar/pkg/tightvnc/trunk/Makefile =================================================================== --- csw/mgar/pkg/tightvnc/trunk/Makefile 2009-09-06 07:42:39 UTC (rev 6205) +++ csw/mgar/pkg/tightvnc/trunk/Makefile 2009-09-06 07:51:46 UTC (rev 6206) @@ -28,7 +28,7 @@ SPKG_DESC_CSWvncv = TightVNC viewer REQUIRED_PKGS = CSWjpeg CSWtcpwrap CSWzlib -REQUIRED_PKGS += SUNWcslr SUNWlibmsr SUNWxwice SUNWxwplt +PREREQUISITE_PKGS = $(REQUIRED_PKGS) sysconfdir = /etc/opt/csw localstatedir = /var/opt/csw This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Sep 6 14:00:13 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 06 Sep 2009 12:00:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[6207] csw/mgar/pkg/libxslt/trunk Message-ID: Revision: 6207 http://gar.svn.sourceforge.net/gar/?rev=6207&view=rev Author: bdwalton Date: 2009-09-06 12:00:13 +0000 (Sun, 06 Sep 2009) Log Message: ----------- add patch to stop segfault while debugging Modified Paths: -------------- csw/mgar/pkg/libxslt/trunk/Makefile csw/mgar/pkg/libxslt/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libxslt/trunk/files/fix-segfault-in-debug.patch Modified: csw/mgar/pkg/libxslt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxslt/trunk/Makefile 2009-09-06 07:51:46 UTC (rev 6206) +++ csw/mgar/pkg/libxslt/trunk/Makefile 2009-09-06 12:00:13 UTC (rev 6207) @@ -14,6 +14,8 @@ DISTFILES += $(call admfiles,CSWlibxsltdevel,) DISTFILES += $(call admfiles,CSWpylibxslt,) +PATCHFILES = fix-segfault-in-debug.patch + PREREQUISITE_PKGS = CSWlibxml2 CSWlibxml2devel SPKG_DESC_CSWlibxslt = XSLT engine runtime package Modified: csw/mgar/pkg/libxslt/trunk/checksums =================================================================== --- csw/mgar/pkg/libxslt/trunk/checksums 2009-09-06 07:51:46 UTC (rev 6206) +++ csw/mgar/pkg/libxslt/trunk/checksums 2009-09-06 12:00:13 UTC (rev 6207) @@ -1,4 +1,5 @@ 01dba7c998bd516e5c6845d5babe3d21 download/CSWlibxslt.gspec 9d6a28c9ac7dea73ae95423e2f431fcd download/CSWlibxsltdevel.gspec 1fb5e9ee1b80283247e56231713082e0 download/CSWpylibxslt.gspec +967047de707d0f20d7fa3b0d0916fdd9 download/fix-segfault-in-debug.patch e83ec5d27fc4c10c6f612879bea9a153 download/libxslt-1.1.24.tar.gz Added: csw/mgar/pkg/libxslt/trunk/files/fix-segfault-in-debug.patch =================================================================== --- csw/mgar/pkg/libxslt/trunk/files/fix-segfault-in-debug.patch (rev 0) +++ csw/mgar/pkg/libxslt/trunk/files/fix-segfault-in-debug.patch 2009-09-06 12:00:13 UTC (rev 6207) @@ -0,0 +1,28 @@ +diff --speed-large-files --minimal -Nru libxslt-1.1.24.orig/libxslt/extensions.c libxslt-1.1.24/libxslt/extensions.c +--- libxslt-1.1.24.orig/libxslt/extensions.c 2008-05-13 17:36:26.000000000 +0200 ++++ libxslt-1.1.24/libxslt/extensions.c 2009-08-16 05:00:34.108691758 +0200 +@@ -366,16 +366,17 @@ + /* determine module directory */ + ext_directory = (xmlChar *) getenv("LIBXSLT_PLUGINS_PATH"); + ++ if (NULL == ext_directory) { ++ ext_directory = BAD_CAST LIBXSLT_DEFAULT_PLUGINS_PATH(); ++ if (NULL == ext_directory) ++ return (-1); ++ } + #ifdef WITH_XSLT_DEBUG_EXTENSIONS +- xsltGenericDebug(xsltGenericDebugContext, +- "LIBXSLT_PLUGINS_PATH is %s\n", ext_directory); ++ else ++ xsltGenericDebug(xsltGenericDebugContext, ++ "LIBXSLT_PLUGINS_PATH is %s\n", ext_directory); + #endif + +- if (NULL == ext_directory) +- ext_directory = BAD_CAST LIBXSLT_DEFAULT_PLUGINS_PATH(); +- if (NULL == ext_directory) +- return (-1); +- + /* build the module filename, and confirm the module exists */ + xmlStrPrintf((xmlChar *) module_filename, sizeof(module_filename), + BAD_CAST "%s/%s%s", 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 Sep 6 14:00:50 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 06 Sep 2009 12:00:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6208] csw/mgar/pkg/libxslt/trunk/Makefile Message-ID: Revision: 6208 http://gar.svn.sourceforge.net/gar/?rev=6208&view=rev Author: bdwalton Date: 2009-09-06 12:00:50 +0000 (Sun, 06 Sep 2009) Log Message: ----------- libxslt: enable libtool strip Modified Paths: -------------- csw/mgar/pkg/libxslt/trunk/Makefile Modified: csw/mgar/pkg/libxslt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxslt/trunk/Makefile 2009-09-06 12:00:13 UTC (rev 6207) +++ csw/mgar/pkg/libxslt/trunk/Makefile 2009-09-06 12:00:50 UTC (rev 6208) @@ -38,6 +38,7 @@ BUILD64 = 1 NO_ISAEXEC = 1 +STRIP_LIBTOOL = 1 REQUIRED_PKGS_CSWlibxslt = CSWgcrypt CSWgpgerr CSWiconv CSWlibxml2 CSWzlib REQUIRED_PKGS_CSWlibxsltdevel = CSWlibxslt 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 Sun Sep 6 15:39:10 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sun, 06 Sep 2009 13:39:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[6209] csw/mgar/pkg/spine/trunk Message-ID: Revision: 6209 http://gar.svn.sourceforge.net/gar/?rev=6209&view=rev Author: j_arndt Date: 2009-09-06 13:39:10 +0000 (Sun, 06 Sep 2009) Log Message: ----------- spine: added new default config path, patched configuration file Modified Paths: -------------- csw/mgar/pkg/spine/trunk/Makefile csw/mgar/pkg/spine/trunk/checksums csw/mgar/pkg/spine/trunk/files/CSWspine.postinstall csw/mgar/pkg/spine/trunk/files/CSWspine.prototype Added Paths: ----------- csw/mgar/pkg/spine/trunk/files/spine.conf.diff csw/mgar/pkg/spine/trunk/files/spine.h.diff csw/mgar/pkg/spine/trunk/files/util.c.diff Modified: csw/mgar/pkg/spine/trunk/Makefile =================================================================== --- csw/mgar/pkg/spine/trunk/Makefile 2009-09-06 12:00:50 UTC (rev 6208) +++ csw/mgar/pkg/spine/trunk/Makefile 2009-09-06 13:39:10 UTC (rev 6209) @@ -11,10 +11,13 @@ MASTER_SITES = http://www.cacti.net/downloads/spine/ #DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES = cacti-$(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += cswusergroup CSWspine.postinstall +DISTFILES += cswusergroup CSWspine.postinstall CSWspine.prototype DISTNAME = cacti-$(GARNAME)-$(GARVERSION) PATCHFILES += configure.diff +PATCHFILES += spine.h.diff +PATCHFILES += util.c.diff +PATCHFILES += spine.conf.diff NOISALIST = 1 @@ -39,9 +42,11 @@ SKIPTEST = 1 +EXTRA_LIB += /opt/csw/mysql5/lib/mysql + DOCDEST = $(DESTDIR)$(BUILD_PREFIX)/share/doc/spine BINDIR = $(DESTDIR)$(BUILD_PREFIX)/bin -CFGDIR = $(DESTDIR)$(BUILD_PREFIX)/etc +CFGDIR = $(DESTDIR)/etc$(BUILD_PREFIX) include gar/category.mk Modified: csw/mgar/pkg/spine/trunk/checksums =================================================================== --- csw/mgar/pkg/spine/trunk/checksums 2009-09-06 12:00:50 UTC (rev 6208) +++ csw/mgar/pkg/spine/trunk/checksums 2009-09-06 13:39:10 UTC (rev 6209) @@ -1,4 +1,8 @@ -54e3c3f6ca757815ac1cccf78b7a086c download/CSWspine.postinstall +6c312db77872d0ab0fa66b02774ce066 download/CSWspine.postinstall +75d4f19e408bbd07fc3205d76841b5e3 download/CSWspine.prototype 99e5bde07fc31d1ed8aa23c59de00417 download/cacti-spine-0.8.7e.tar.gz 2fbbedbfc20811cbc81ddf748ebdb58e download/configure.diff b762d50320246dc8ce21c20233479231 download/cswusergroup +e38aac4a5f8c7c3145d45c4d0dba141c download/spine.conf.diff +cc35553f4bcd9dc4ab961330484a959b download/spine.h.diff +5e66f551b2d320a3a6b68ce170e9fec7 download/util.c.diff Modified: csw/mgar/pkg/spine/trunk/files/CSWspine.postinstall =================================================================== --- csw/mgar/pkg/spine/trunk/files/CSWspine.postinstall 2009-09-06 12:00:50 UTC (rev 6208) +++ csw/mgar/pkg/spine/trunk/files/CSWspine.postinstall 2009-09-06 13:39:10 UTC (rev 6209) @@ -4,8 +4,12 @@ ======================================================================= -Please check and edit your configuration in /opt/csw/etc/spine.conf ! +To get spine running, follow these steps: +(1) Check and edit the configuration file /etc/opt/csw/spine.conf + +(2) Follow the instructions on http://www.cacti.net/spine_install.php + ======================================================================= EOF Modified: csw/mgar/pkg/spine/trunk/files/CSWspine.prototype =================================================================== --- csw/mgar/pkg/spine/trunk/files/CSWspine.prototype 2009-09-06 12:00:50 UTC (rev 6208) +++ csw/mgar/pkg/spine/trunk/files/CSWspine.prototype 2009-09-06 13:39:10 UTC (rev 6209) @@ -1,5 +1,5 @@ f none /opt/csw/bin/spine 0755 root bin -f cswpreserveconf /opt/csw/etc/spine.conf.CSW 0644 root bin +f cswpreserveconf /etc/opt/csw/spine.conf.CSW 0644 root bin d none /opt/csw/share/doc/spine 0755 root bin f none /opt/csw/share/doc/spine/COPYING 0644 root bin f none /opt/csw/share/doc/spine/ChangeLog 0644 root bin Added: csw/mgar/pkg/spine/trunk/files/spine.conf.diff =================================================================== --- csw/mgar/pkg/spine/trunk/files/spine.conf.diff (rev 0) +++ csw/mgar/pkg/spine/trunk/files/spine.conf.diff 2009-09-06 13:39:10 UTC (rev 6209) @@ -0,0 +1,29 @@ +diff --speed-large-files --minimal -Nru cacti-spine-0.8.7e.orig/spine.conf cacti-spine-0.8.7e/spine.conf +--- cacti-spine-0.8.7e.orig/spine.conf 2009-06-29 04:03:36.000000000 +0200 ++++ cacti-spine-0.8.7e/spine.conf 2009-09-06 15:11:25.880901586 +0200 +@@ -11,7 +11,7 @@ + # | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | + # | GNU General Public License for more details. | + # +-------------------------------------------------------------------------+ +-# | spine: a backend data gatherer for Cacti | ++# | spine: a backend data gatherer for Cacti | + # +-------------------------------------------------------------------------+ + # | This poller would not have been possible without: | + # | - Larry Adams (current development and enhancements) | +@@ -25,11 +25,11 @@ + # | IP Address for Windows | + # | DB_Database Database name, typically 'cacti' | + # | DB_Port The database port to use | +-# | DB_User The user to access the database, typically 'cactiuser' | ++# | DB_User The user to access the database, typically 'cacti' | + # | DB_Pass The password for the Cacti user | + # +-------------------------------------------------------------------------+ + DB_Host localhost + DB_Database cacti +-DB_User cactiuser +-DB_Pass cactiuser +-DB_Port 3306 +\ No newline at end of file ++DB_User cacti ++DB_Pass cacti ++DB_Port 3306 Added: csw/mgar/pkg/spine/trunk/files/spine.h.diff =================================================================== --- csw/mgar/pkg/spine/trunk/files/spine.h.diff (rev 0) +++ csw/mgar/pkg/spine/trunk/files/spine.h.diff 2009-09-06 13:39:10 UTC (rev 6209) @@ -0,0 +1,30 @@ +diff --speed-large-files --minimal -Nru cacti-spine-0.8.7e.orig/spine.h cacti-spine-0.8.7e/spine.h +--- cacti-spine-0.8.7e.orig/spine.h 2009-06-29 04:03:36.000000000 +0200 ++++ cacti-spine-0.8.7e/spine.h 2009-09-06 12:09:46.987245799 +0200 +@@ -135,21 +135,22 @@ + #define SPINE_FORK 0 + + /* locations to search for the config file */ +-#define CONFIG_PATHS 4 ++#define CONFIG_PATHS 5 + #define CONFIG_PATH_1 "" + #define CONFIG_PATH_2 "/etc/" + #define CONFIG_PATH_3 "/etc/cacti/" + #define CONFIG_PATH_4 "../etc/" ++#define CONFIG_PATH_5 "/etc/opt/csw/" + + /* config file defaults */ + #define DEFAULT_CONF_FILE "spine.conf" + #define DEFAULT_THREADS 5 + #define DEFAULT_DB_HOST "localhost" + #define DEFAULT_DB_DB "cacti" +-#define DEFAULT_DB_USER "cactiuser" +-#define DEFAULT_DB_PASS "cactiuser" ++#define DEFAULT_DB_USER "cacti" ++#define DEFAULT_DB_PASS "cacti" + #define DEFAULT_DB_PORT 3306 +-#define DEFAULT_LOGFILE "/var/www/html/cacti/log/cacti.log" ++#define DEFAULT_LOGFILE "/var/opt/csw/cacti/log/cacti.log" + #define DEFAULT_TIMEOUT 294000000 + + /* threads constants */ Added: csw/mgar/pkg/spine/trunk/files/util.c.diff =================================================================== --- csw/mgar/pkg/spine/trunk/files/util.c.diff (rev 0) +++ csw/mgar/pkg/spine/trunk/files/util.c.diff 2009-09-06 13:39:10 UTC (rev 6209) @@ -0,0 +1,11 @@ +diff --speed-large-files --minimal -Nru cacti-spine-0.8.7e.orig/util.c cacti-spine-0.8.7e/util.c +--- cacti-spine-0.8.7e.orig/util.c 2009-06-29 04:03:36.000000000 +0200 ++++ cacti-spine-0.8.7e/util.c 2009-09-06 12:30:28.429083179 +0200 +@@ -503,6 +503,7 @@ + STRNCOPY(config_paths[1], CONFIG_PATH_2); + STRNCOPY(config_paths[2], CONFIG_PATH_3); + STRNCOPY(config_paths[3], CONFIG_PATH_4); ++ STRNCOPY(config_paths[4], CONFIG_PATH_5); + + set.log_destination = LOGDEST_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 Sun Sep 6 20:31:31 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 06 Sep 2009 18:31:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[6210] csw/mgar/pkg/libxslt/trunk Message-ID: Revision: 6210 http://gar.svn.sourceforge.net/gar/?rev=6210&view=rev Author: bdwalton Date: 2009-09-06 18:31:31 +0000 (Sun, 06 Sep 2009) Log Message: ----------- libxslt: remove manual gspec files Modified Paths: -------------- csw/mgar/pkg/libxslt/trunk/Makefile csw/mgar/pkg/libxslt/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/libxslt/trunk/files/CSWlibxslt.gspec csw/mgar/pkg/libxslt/trunk/files/CSWlibxsltdevel.gspec csw/mgar/pkg/libxslt/trunk/files/CSWpylibxslt.gspec Modified: csw/mgar/pkg/libxslt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxslt/trunk/Makefile 2009-09-06 13:39:10 UTC (rev 6209) +++ csw/mgar/pkg/libxslt/trunk/Makefile 2009-09-06 18:31:31 UTC (rev 6210) @@ -10,10 +10,9 @@ MASTER_SITES = ftp://xmlsoft.org/libxslt/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWlibxslt,) -DISTFILES += $(call admfiles,CSWlibxsltdevel,) -DISTFILES += $(call admfiles,CSWpylibxslt,) +PACKAGES = CSWlibxslt CSWlibxsltdevel CSWpylibxslt + PATCHFILES = fix-segfault-in-debug.patch PREREQUISITE_PKGS = CSWlibxml2 CSWlibxml2devel Modified: csw/mgar/pkg/libxslt/trunk/checksums =================================================================== --- csw/mgar/pkg/libxslt/trunk/checksums 2009-09-06 13:39:10 UTC (rev 6209) +++ csw/mgar/pkg/libxslt/trunk/checksums 2009-09-06 18:31:31 UTC (rev 6210) @@ -1,5 +1,2 @@ -01dba7c998bd516e5c6845d5babe3d21 download/CSWlibxslt.gspec -9d6a28c9ac7dea73ae95423e2f431fcd download/CSWlibxsltdevel.gspec -1fb5e9ee1b80283247e56231713082e0 download/CSWpylibxslt.gspec 967047de707d0f20d7fa3b0d0916fdd9 download/fix-segfault-in-debug.patch e83ec5d27fc4c10c6f612879bea9a153 download/libxslt-1.1.24.tar.gz Deleted: csw/mgar/pkg/libxslt/trunk/files/CSWlibxslt.gspec =================================================================== --- csw/mgar/pkg/libxslt/trunk/files/CSWlibxslt.gspec 2009-09-06 13:39:10 UTC (rev 6209) +++ csw/mgar/pkg/libxslt/trunk/files/CSWlibxslt.gspec 2009-09-06 18:31:31 UTC (rev 6210) @@ -1,4 +0,0 @@ -%var bitname libxslt -%var pkgname CSWlibxslt -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Deleted: csw/mgar/pkg/libxslt/trunk/files/CSWlibxsltdevel.gspec =================================================================== --- csw/mgar/pkg/libxslt/trunk/files/CSWlibxsltdevel.gspec 2009-09-06 13:39:10 UTC (rev 6209) +++ csw/mgar/pkg/libxslt/trunk/files/CSWlibxsltdevel.gspec 2009-09-06 18:31:31 UTC (rev 6210) @@ -1,4 +0,0 @@ -%var bitname libxslt_devel -%var pkgname CSWlibxsltdevel -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Deleted: csw/mgar/pkg/libxslt/trunk/files/CSWpylibxslt.gspec =================================================================== --- csw/mgar/pkg/libxslt/trunk/files/CSWpylibxslt.gspec 2009-09-06 13:39:10 UTC (rev 6209) +++ csw/mgar/pkg/libxslt/trunk/files/CSWpylibxslt.gspec 2009-09-06 18:31:31 UTC (rev 6210) @@ -1,4 +0,0 @@ -%var bitname pylibxslt -%var pkgname CSWpylibxslt -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Sep 7 04:01:10 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 07 Sep 2009 02:01:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[6211] csw/mgar/pkg/libxslt/trunk/Makefile Message-ID: Revision: 6211 http://gar.svn.sourceforge.net/gar/?rev=6211&view=rev Author: bdwalton Date: 2009-09-07 02:01:10 +0000 (Mon, 07 Sep 2009) Log Message: ----------- libxslt: set catalog names according to new preferred conventions Modified Paths: -------------- csw/mgar/pkg/libxslt/trunk/Makefile Modified: csw/mgar/pkg/libxslt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxslt/trunk/Makefile 2009-09-06 18:31:31 UTC (rev 6210) +++ csw/mgar/pkg/libxslt/trunk/Makefile 2009-09-07 02:01:10 UTC (rev 6211) @@ -13,6 +13,9 @@ PACKAGES = CSWlibxslt CSWlibxsltdevel CSWpylibxslt +CATALOGNAME_CSWlibxsltdevel = libxslt_devel +CATALOGNAME_CSWpylibxslt = py_libxslt + PATCHFILES = fix-segfault-in-debug.patch PREREQUISITE_PKGS = CSWlibxml2 CSWlibxml2devel This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Sep 7 04:02:27 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 07 Sep 2009 02:02:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[6212] csw/mgar/pkg/libxslt/trunk/Makefile Message-ID: Revision: 6212 http://gar.svn.sourceforge.net/gar/?rev=6212&view=rev Author: bdwalton Date: 2009-09-07 02:02:26 +0000 (Mon, 07 Sep 2009) Log Message: ----------- libxslt: correct typo in memory model configure flags Modified Paths: -------------- csw/mgar/pkg/libxslt/trunk/Makefile Modified: csw/mgar/pkg/libxslt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxslt/trunk/Makefile 2009-09-07 02:01:10 UTC (rev 6211) +++ csw/mgar/pkg/libxslt/trunk/Makefile 2009-09-07 02:02:26 UTC (rev 6212) @@ -34,7 +34,7 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = -CONFIGURE_AGGS_32 = +CONFIGURE_ARGS_32 = CONFIGURE_ARGS_64 = --without-python CONFIGURE_ARGS = $(DIRPATHS) $(CONFIGURE_ARGS_$(MEMORYMODEL)) 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 Sep 7 10:14:03 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 07 Sep 2009 08:14:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[6213] csw/mgar/pkg/tightvnc/trunk Message-ID: Revision: 6213 http://gar.svn.sourceforge.net/gar/?rev=6213&view=rev Author: wahwah Date: 2009-09-07 08:14:03 +0000 (Mon, 07 Sep 2009) Log Message: ----------- tightvnc: Jumped over one more hoop. Modified Paths: -------------- csw/mgar/pkg/tightvnc/trunk/Makefile csw/mgar/pkg/tightvnc/trunk/checksums Added Paths: ----------- csw/mgar/pkg/tightvnc/trunk/files/0001-Sun-compiler-in-sun.cf.patch csw/mgar/pkg/tightvnc/trunk/files/0002-pass-f-xmakefile-flag-when-appropriate.patch 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-09-07 02:02:26 UTC (rev 6212) +++ csw/mgar/pkg/tightvnc/trunk/Makefile 2009-09-07 08:14:03 UTC (rev 6213) @@ -38,15 +38,19 @@ EXTRA_LDFLAGS = /opt/csw/lib LOCAL_LDFLAGS = $(LINKER_FLAGS) BUILD_OVERRIDE_DIRS = EXTRA_DEFINES EXTRA_INCLUDE LOCAL_LDFLAGS -CONFIGURE_SCRIPTS = $(WORKSRC)/Imakefile Xvnc +CONFIGURE_SCRIPTS = $(WORKSRC)/Imakefile +# Xvnc CONFIGURE_ARGS = -a BUILD_SCRIPTS = vnc Xvnc -SKIPTEST = 1 +TEST_SCRIPTS = INSTALL_SCRIPTS = vnc -PATCHFILES = 0001-GNU-make-by-default.patch # This patch has been sent upstream with a bug report. # http://sourceforge.net/tracker/?func=detail&aid=2852808&group_id=14067&atid=114067 -PATCHFILES += 0002-Test-for-Makefile-presence.patch +# PATCHFILES += 0002-Test-for-Makefile-presence.patch +# +PATCHFILES = 0001-Sun-compiler-in-sun.cf.patch +PATCHFILES += 0002-pass-f-xmakefile-flag-when-appropriate.patch +PATCHFILES += 0003-GNU-make-by-default.patch include gar/category.mk @@ -57,28 +61,25 @@ configure-Xvnc: banner "Config Xvnc" perl -pi -e "s|^(\s*make)\s*$$|\1 CC=$(CC)|" $(WORKSRC)/Xvnc/configure - cd $(WORKSRC)/Xvnc && ./configure + (cd $(WORKSRC)/Xvnc && $(BUILD_ENV) ./configure) @$(MAKECOOKIE) build-vnc: banner "Build VNC" cd $(WORKSRC) && $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") World + # $(MAKE) -C $(WORKSRC) $(BUILD_ENV) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") World @$(MAKECOOKIE) build-Xvnc: configure-Xvnc + # $(MAKE) -C $(WORKSRC) $(BUILD_ENV) EXTRA_LIBRARIES="-lwrap" EXTRA_DEFINES="-DUSE_LIBWRAP=1" World + # banner "Config Xvnc" + # (cd $(WORKSRC)/Xvnc && $(BUILD_ENV) ./configure) banner "Build Xvnc" - # $(MAKE) -C $(WORKSRC)/Xvnc $(BUILD_ENV) EXTRA_LIBRARIES="-lwrap" EXTRA_DEFINES="-DUSE_LIBWRAP=1" World - $(MAKE) -C $(WORKSRC) $(BUILD_ENV) EXTRA_LIBRARIES="-lwrap" EXTRA_DEFINES="-DUSE_LIBWRAP=1" World $(MAKE) -C $(WORKSRC)/Xvnc $(BUILD_ENV) EXTRA_LIBRARIES="-lwrap -lsocket" EXTRA_DEFINES="-DUSE_LIBWRAP=1" EXTRA_LDOPTIONS="-L/opt/csw/lib -L/usr/lib" World + # cd $(WORKSRC) && $(MAKE) $(BUILD_ENV) EXTRA_LIBRARIES="-lwrap" EXTRA_DEFINES="-DUSE_LIBWRAP=1" World + # cd $(WORKSRC)/Xvnc && $(MAKE) $(BUILD_ENV) EXTRA_LIBRARIES="-lwrap -lsocket" EXTRA_DEFINES="-DUSE_LIBWRAP=1" EXTRA_LDOPTIONS="-L/opt/csw/lib -L/usr/lib" World @$(MAKECOOKIE) -#xmkmf -a -#make CDEBUGFLAGS="$RPM_OPT_FLAGS" World -#cd Xvnc -#./configure -#make EXTRA_LIBRARIES="-lwrap -lnss_nis" CDEBUGFLAGS="$RPM_OPT_FLAGS" \ -# EXTRA_DEFINES="-DUSE_LIBWRAP=1" - install-vnc: ginstall -d $(DESTDIR)$(bindir) ginstall -d $(DESTDIR)$(mandir)/man1 Modified: csw/mgar/pkg/tightvnc/trunk/checksums =================================================================== --- csw/mgar/pkg/tightvnc/trunk/checksums 2009-09-07 02:02:26 UTC (rev 6212) +++ csw/mgar/pkg/tightvnc/trunk/checksums 2009-09-07 08:14:03 UTC (rev 6213) @@ -1,4 +1,5 @@ -c041ccc52996cf7e085e8f3a51747aea download/0001-GNU-make-by-default.patch -88d1dfca0c88c191f54f5aa5c6aab460 download/0002-Test-for-Makefile-presence.patch +76166d097bf2e70627cb6c87d312bca5 download/0001-Sun-compiler-in-sun.cf.patch +51441e1d47891f910f0929cd65a487a7 download/0002-pass-f-xmakefile-flag-when-appropriate.patch +1264014c1ce47a119a724f17a6e0a768 download/0003-GNU-make-by-default.patch 397b35faad32d5246b6d44b142f8304f download/tightvnc-1.3.10_unixsrc.tar.bz2 56c09be17c17184e96193c13246fd649 download/vncservers Added: csw/mgar/pkg/tightvnc/trunk/files/0001-Sun-compiler-in-sun.cf.patch =================================================================== --- csw/mgar/pkg/tightvnc/trunk/files/0001-Sun-compiler-in-sun.cf.patch (rev 0) +++ csw/mgar/pkg/tightvnc/trunk/files/0001-Sun-compiler-in-sun.cf.patch 2009-09-07 08:14:03 UTC (rev 6213) @@ -0,0 +1,41 @@ +From dce24615e4e31aadf4a50bd07a502b9f9a8104b8 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Mon, 7 Sep 2009 10:08:09 +0200 +Subject: [PATCH 1/3] Sun compiler in sun.cf + +--- + Xvnc/config/cf/sun.cf | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Xvnc/config/cf/sun.cf b/Xvnc/config/cf/sun.cf +index 01d76dc..622c73a 100644 +--- a/Xvnc/config/cf/sun.cf ++++ b/Xvnc/config/cf/sun.cf +@@ -146,19 +146,19 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe + #if OSMajorVersion > 4 + #if HasSunC + /* +- * Assume /opt/SUNWspro/bin/ contains symlinks to the appropriate tools ++ * Assume /opt/studio/SOS11/SUNWspro/bin/ contains symlinks to the appropriate tools + */ + #ifndef CcCmd +-# define CcCmd /opt/SUNWspro/bin/cc ++# define CcCmd /opt/studio/SOS11/SUNWspro/bin/cc + #endif + #ifndef CplusplusCmd +-# define CplusplusCmd /opt/SUNWspro/bin/CC ++# define CplusplusCmd /opt/studio/SOS11/SUNWspro/bin/CC + #endif + #ifndef CplusplusFilt +-# define CplusplusFilt /opt/SUNWspro/bin/c++filt ++# define CplusplusFilt /opt/studio/SOS11/SUNWspro/bin/c++filt + #endif + #ifndef CplusplusDependIncludes +-# define CplusplusDependIncludes -I/opt/SUNWspro/SC3.0/include/CC ++# define CplusplusDependIncludes -I/opt/studio/SOS11/SUNWspro/SC3.0/include/CC + #endif + #endif + +-- +1.6.3.2 + Added: csw/mgar/pkg/tightvnc/trunk/files/0002-pass-f-xmakefile-flag-when-appropriate.patch =================================================================== --- csw/mgar/pkg/tightvnc/trunk/files/0002-pass-f-xmakefile-flag-when-appropriate.patch (rev 0) +++ csw/mgar/pkg/tightvnc/trunk/files/0002-pass-f-xmakefile-flag-when-appropriate.patch 2009-09-07 08:14:03 UTC (rev 6213) @@ -0,0 +1,50 @@ +From 796212b91212ad84a516554ba5bb6250d8fd1c87 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Mon, 7 Sep 2009 10:08:34 +0200 +Subject: [PATCH 2/3] pass -f xmakefile flag when appropriate + +--- + Xvnc/config/cf/Imake.rules | 13 ++++++++++--- + 1 files changed, 10 insertions(+), 3 deletions(-) + +diff --git a/Xvnc/config/cf/Imake.rules b/Xvnc/config/cf/Imake.rules +index 5ab9a18..353dabf 100644 +--- a/Xvnc/config/cf/Imake.rules ++++ b/Xvnc/config/cf/Imake.rules +@@ -2469,7 +2469,7 @@ $(ONESUBDIR)/Makefile: @@\ + fi; @@\ + @@\ + target:: @@\ +- - at MakeFlagsToShellFlags(ik,set +e); \ @@\ ++ MakeFlagsToShellFlags(ik,set +e); \ @@\ + MakeFlagsToShellFlags(n,executeit="no"); \ @@\ + for i in dirs ;\ @@\ + do \ @@\ +@@ -2477,7 +2477,7 @@ target:: @@\ + .) curdir= ;; \ @@\ + *) curdir=$(CURRENT_DIR)/ ;; \ @@\ + esac; \ @@\ +- echo "making Makefiles in $$curdir$$i..."; \ @@\ ++ echo "making Makefiles in '$$curdir'::'$$i'..."; \ @@\ + itmp=`echo $$i | sed -e 's;^\./;;g' -e 's;/\./;/;g'`; \ @@\ + curtmp="$(CURRENT_DIR)" \ @@\ + toptmp=""; \ @@\ +@@ -2514,7 +2514,14 @@ target:: @@\ + $(MV) $$i/Makefile $$i/Makefile.bak; \ @@\ + fi; \ @@\ + fi; \ @@\ +- $(MAKE) $(MFLAGS) $(MAKE_OPTS) ONESUBDIR=$$i ONECURDIR=$$curdir IMAKETOP=$$imaketop IMAKEPREFIX=$$imakeprefix $$i/Makefile; \ @@\ ++ [ -r xmakefile ] && $(MAKE) -f xmakefile $(MFLAGS) \ @@\ ++ $(MAKE_OPTS) ONESUBDIR=$$i ONECURDIR=$$curdir \ @@\ ++ IMAKETOP=$$imaketop IMAKEPREFIX=$$imakeprefix \ @@\ ++ $$i/Makefile || \ @@\ ++ $(MAKE) $(MFLAGS) \ @@\ ++ $(MAKE_OPTS) ONESUBDIR=$$i ONECURDIR=$$curdir \ @@\ ++ IMAKETOP=$$imaketop IMAKEPREFIX=$$imakeprefix \ @@\ ++ $$i/Makefile; \ @@\ + if [ -d $$i ] ; then \ @@\ + cd $$i; \ @@\ + $(MAKE) $(MFLAGS) Makefiles; \ @@\ +-- +1.6.3.2 + Added: csw/mgar/pkg/tightvnc/trunk/files/0003-GNU-make-by-default.patch =================================================================== --- csw/mgar/pkg/tightvnc/trunk/files/0003-GNU-make-by-default.patch (rev 0) +++ csw/mgar/pkg/tightvnc/trunk/files/0003-GNU-make-by-default.patch 2009-09-07 08:14:03 UTC (rev 6213) @@ -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 + 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 Sep 7 10:22:41 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 07 Sep 2009 08:22:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[6214] csw/mgar/pkg/tightvnc/trunk/files Message-ID: Revision: 6214 http://gar.svn.sourceforge.net/gar/?rev=6214&view=rev Author: wahwah Date: 2009-09-07 08:22:41 +0000 (Mon, 07 Sep 2009) Log Message: ----------- tightvnc: Removed old patches Removed Paths: ------------- csw/mgar/pkg/tightvnc/trunk/files/0001-GNU-make-by-default.patch csw/mgar/pkg/tightvnc/trunk/files/0002-Test-for-Makefile-presence.patch Deleted: csw/mgar/pkg/tightvnc/trunk/files/0001-GNU-make-by-default.patch =================================================================== --- csw/mgar/pkg/tightvnc/trunk/files/0001-GNU-make-by-default.patch 2009-09-07 08:14:03 UTC (rev 6213) +++ csw/mgar/pkg/tightvnc/trunk/files/0001-GNU-make-by-default.patch 2009-09-07 08:22:41 UTC (rev 6214) @@ -1,25 +0,0 @@ -From f12b77cb177de6014ac23913c385c7f4ab9717e3 Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Sat, 5 Sep 2009 22:52:49 +0200 -Subject: [PATCH 1/2] 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/0002-Test-for-Makefile-presence.patch =================================================================== --- csw/mgar/pkg/tightvnc/trunk/files/0002-Test-for-Makefile-presence.patch 2009-09-07 08:14:03 UTC (rev 6213) +++ csw/mgar/pkg/tightvnc/trunk/files/0002-Test-for-Makefile-presence.patch 2009-09-07 08:22:41 UTC (rev 6214) @@ -1,27 +0,0 @@ -From 1045270d1e76278f5c613eb74e2a8f347632dc73 Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Sun, 6 Sep 2009 00:16:10 +0200 -Subject: [PATCH 2/2] Test for Makefile presence - ---- - Xvnc/config/cf/Imake.rules | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Xvnc/config/cf/Imake.rules b/Xvnc/config/cf/Imake.rules -index 5ab9a18..6f5f7c4 100644 ---- a/Xvnc/config/cf/Imake.rules -+++ b/Xvnc/config/cf/Imake.rules -@@ -1304,8 +1304,8 @@ InstallNamedTargetNoClobber(install,srcname,$(INSTBINFLAGS),dest,dstname) - */ - #ifndef MakeNamedTargetSubdir - #define MakeNamedTargetSubdir(dir,flags,subname)\ -- (cd dir && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) \ @@\ -- flags subname) -+ (cd dir && [ -r Makefile ] && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) \ @@\ -+ flags subname || true) - #endif - - /* --- -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 Mon Sep 7 11:04:57 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 07 Sep 2009 09:04:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[6215] csw/mgar/pkg/tightvnc/branches/tightvnc-1.5/ Message-ID: Revision: 6215 http://gar.svn.sourceforge.net/gar/?rev=6215&view=rev Author: wahwah Date: 2009-09-07 09:04:57 +0000 (Mon, 07 Sep 2009) Log Message: ----------- Branching out to try version 1.5a0. Added Paths: ----------- csw/mgar/pkg/tightvnc/branches/tightvnc-1.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 Mon Sep 7 13:16:15 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 07 Sep 2009 11:16:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[6216] csw/mgar/pkg/diffstat/trunk Message-ID: Revision: 6216 http://gar.svn.sourceforge.net/gar/?rev=6216&view=rev Author: dmichelsen Date: 2009-09-07 11:16:14 +0000 (Mon, 07 Sep 2009) Log Message: ----------- diffstat: Update to 1.49 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-09-07 09:04:57 UTC (rev 6215) +++ csw/mgar/pkg/diffstat/trunk/Makefile 2009-09-07 11:16:14 UTC (rev 6216) @@ -1,5 +1,5 @@ GARNAME = diffstat -GARVERSION = 1.48 +GARVERSION = 1.49 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-09-07 09:04:57 UTC (rev 6215) +++ csw/mgar/pkg/diffstat/trunk/checksums 2009-09-07 11:16:14 UTC (rev 6216) @@ -1 +1 @@ -8593e79189dd4b9c4ec32862e19d716c download/diffstat.tar.gz +63fa6d90f137f5d839e94aa93882db98 download/diffstat.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 Sep 7 14:13:53 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 07 Sep 2009 12:13:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[6217] csw/mgar/pkg/ctags/trunk Message-ID: Revision: 6217 http://gar.svn.sourceforge.net/gar/?rev=6217&view=rev Author: dmichelsen Date: 2009-09-07 12:13:52 +0000 (Mon, 07 Sep 2009) Log Message: ----------- ctags: Update to 5.8, naming of binaries still unclear Modified Paths: -------------- csw/mgar/pkg/ctags/trunk/Makefile csw/mgar/pkg/ctags/trunk/checksums csw/mgar/pkg/ctags/trunk/files/install.diff Removed Paths: ------------- csw/mgar/pkg/ctags/trunk/files/CSWctags.gspec csw/mgar/pkg/ctags/trunk/files/CSWctags.prototype Property Changed: ---------------- csw/mgar/pkg/ctags/trunk/ Property changes on: csw/mgar/pkg/ctags/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/ctags/trunk/Makefile =================================================================== --- csw/mgar/pkg/ctags/trunk/Makefile 2009-09-07 11:16:14 UTC (rev 6216) +++ csw/mgar/pkg/ctags/trunk/Makefile 2009-09-07 12:13:52 UTC (rev 6217) @@ -1,8 +1,8 @@ GARNAME = ctags -GARVERSION = 5.5.4 +GARVERSION = 5.8 CATEGORIES = utils -DESCRIPTION = Exuberant ctags +DESCRIPTION = Exuberant Ctags: A multilanguage implementation of Ctags define BLURB Ctags generates an index (or tag) file of language objects found in source files that allows these items to be quickly and easily located by a text @@ -11,18 +11,20 @@ object). endef -MASTER_SITES = $(SF_MIRROR)/$(GARNAME)/ +MASTER_SITES = $(SF_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += CSWctags.gspec CSWctags.prototype +# Respect DESTDIR +PATCHFILES = install.diff + +PACKAGES = CSWectags +CATALOGNAME = ectags + # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=6556 UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) -# Respect DESTDIR -PATCHFILES += install.diff - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-custom-config=$(sysconfdir)/ctags.conf Modified: csw/mgar/pkg/ctags/trunk/checksums =================================================================== --- csw/mgar/pkg/ctags/trunk/checksums 2009-09-07 11:16:14 UTC (rev 6216) +++ csw/mgar/pkg/ctags/trunk/checksums 2009-09-07 12:13:52 UTC (rev 6217) @@ -1,4 +1,2 @@ -a84124caadd4103270e0b84596ecfe83 download/ctags-5.5.4.tar.gz -9fdddaa1280d5f51201f392969060db5 download/CSWctags.gspec -0680c5e068a114f9559da00bf167ee51 download/CSWctags.prototype -ffee120c44f24a8b4492d1aa296c0854 download/install.diff +c00f82ecdcc357434731913e5b48630d download/ctags-5.8.tar.gz +31a698b2e9d2379302183fe03be9eadd download/install.diff Deleted: csw/mgar/pkg/ctags/trunk/files/CSWctags.gspec =================================================================== --- csw/mgar/pkg/ctags/trunk/files/CSWctags.gspec 2009-09-07 11:16:14 UTC (rev 6216) +++ csw/mgar/pkg/ctags/trunk/files/CSWctags.gspec 2009-09-07 12:13:52 UTC (rev 6217) @@ -1,4 +0,0 @@ -%var bitname ctags -%var pkgname CSWctags -%include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/ctags/trunk/files/CSWctags.prototype =================================================================== --- csw/mgar/pkg/ctags/trunk/files/CSWctags.prototype 2009-09-07 11:16:14 UTC (rev 6216) +++ csw/mgar/pkg/ctags/trunk/files/CSWctags.prototype 2009-09-07 12:13:52 UTC (rev 6217) @@ -1,8 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/ctags 0755 root bin -s none /opt/csw/bin/etags=ctags -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/ctags.1 0644 root bin -s none /opt/csw/share/man/man1/etags.1=ctags.1 Modified: csw/mgar/pkg/ctags/trunk/files/install.diff =================================================================== --- csw/mgar/pkg/ctags/trunk/files/install.diff 2009-09-07 11:16:14 UTC (rev 6216) +++ csw/mgar/pkg/ctags/trunk/files/install.diff 2009-09-07 12:13:52 UTC (rev 6217) @@ -1,21 +1,22 @@ -diff --speed-large-files --minimal -Nru ctags-5.5.4.orig/Makefile.in ctags-5.5.4/Makefile.in ---- ctags-5.5.4.orig/Makefile.in 2005-01-27 11:22:14.851370000 -0500 -+++ ctags-5.5.4/Makefile.in 2005-01-27 11:19:56.676032000 -0500 -@@ -16,13 +16,13 @@ +diff -Naur ctags-5.8.orig/Makefile.in ctags-5.8.patched/Makefile.in +--- ctags-5.8.orig/Makefile.in 2009-07-04 07:29:28.000000000 +0200 ++++ ctags-5.8.patched/Makefile.in 2009-09-07 14:02:27.768451180 +0200 +@@ -16,14 +16,14 @@ # GNU Autoconf variables. These are set by the "configure" script when it # runs. # -exec_prefix = @exec_prefix@ +-datarootdir = @datarootdir@ -prefix = @prefix@ -bindir = @bindir@ --srcdir = @srcdir@ ++exec_prefix = $(DESTDIR)@exec_prefix@ ++datarootdir = $(DESTDIR)@datarootdir@ ++prefix = $(DESTDIR)@prefix@ ++bindir = $(DESTDIR)@bindir@ + srcdir = @srcdir@ -libdir = @libdir@ -incdir = @includedir@ -mandir = @mandir@ -+exec_prefix = $(DESTDIR)@exec_prefix@ -+prefix = $(DESTDIR)@prefix@ -+bindir = $(DESTDIR)@bindir@ -+srcdir = @srcdir@ +libdir = $(DESTDIR)@libdir@ +incdir = $(DESTDIR)@includedir@ +mandir = $(DESTDIR)@mandir@ 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 Sep 7 14:51:20 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 07 Sep 2009 12:51:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[6218] csw/mgar/pkg/diffstat/trunk Message-ID: Revision: 6218 http://gar.svn.sourceforge.net/gar/?rev=6218&view=rev Author: dmichelsen Date: 2009-09-07 12:51:20 +0000 (Mon, 07 Sep 2009) Log Message: ----------- diffstat: Update to use versioned upstream archives 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-09-07 12:13:52 UTC (rev 6217) +++ csw/mgar/pkg/diffstat/trunk/Makefile 2009-09-07 12:51:20 UTC (rev 6218) @@ -7,10 +7,10 @@ endef MASTER_SITES = ftp://invisible-island.net/diffstat/ -DISTFILES = $(GARNAME).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION).tgz # We define upstream file regex so we can be notifed of new upstream software release -#UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz SPKG_SOURCEURL = http://invisible-island.net/diffstat/ Modified: csw/mgar/pkg/diffstat/trunk/checksums =================================================================== --- csw/mgar/pkg/diffstat/trunk/checksums 2009-09-07 12:13:52 UTC (rev 6217) +++ csw/mgar/pkg/diffstat/trunk/checksums 2009-09-07 12:51:20 UTC (rev 6218) @@ -1 +1 @@ -63fa6d90f137f5d839e94aa93882db98 download/diffstat.tar.gz +63fa6d90f137f5d839e94aa93882db98 download/diffstat-1.49.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 Mon Sep 7 16:14:35 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 07 Sep 2009 14:14:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[6219] csw/mgar/gar/v2/bin/mkpackage Message-ID: Revision: 6219 http://gar.svn.sourceforge.net/gar/?rev=6219&view=rev Author: dmichelsen Date: 2009-09-07 14:14:35 +0000 (Mon, 07 Sep 2009) Log Message: ----------- mGAR v2: Use OpenCSW perl instead of just finding one as the shipped one is too old Modified Paths: -------------- csw/mgar/gar/v2/bin/mkpackage Modified: csw/mgar/gar/v2/bin/mkpackage =================================================================== --- csw/mgar/gar/v2/bin/mkpackage 2009-09-07 12:51:20 UTC (rev 6218) +++ csw/mgar/gar/v2/bin/mkpackage 2009-09-07 14:14:35 UTC (rev 6219) @@ -1,4 +1,4 @@ -#!/bin/env perl -w +#!/opt/csw/bin/perl -w # # $Id$ # 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 Sep 7 16:34:38 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 07 Sep 2009 14:34:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6220] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 6220 http://gar.svn.sourceforge.net/gar/?rev=6220&view=rev Author: dmichelsen Date: 2009-09-07 14:34:37 +0000 (Mon, 07 Sep 2009) Log Message: ----------- mGAR v2: Print names and pathes to built packages. This fixes #7 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-09-07 14:14:35 UTC (rev 6219) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-09-07 14:34:37 UTC (rev 6220) @@ -561,7 +561,12 @@ # unpacked to global/ for packaging. E. g. 'merge' depends only on the specific # modulations and does not fill global/. package: extract merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package - $(DONADA) + @echo + @echo "The following packages have been built:" + @echo + @$(foreach SPEC,$(_PKG_SPECS),echo $(SPEC);echo " $(SPKG_EXPORT)/$(shell $(call _PKG_ENV,$(SPEC)) $(GARBIN)/mkpackage -qs $(WORKDIR)/$(SPEC).gspec -D pkgfile).gz";) + @echo + @$(DONADA) # The dynamic pkginfo is only generated for dynamic gspec-files package-%: $(WORKDIR)/%.gspec $(if $(findstring %.gspec,$(DISTFILES)),,$(WORKDIR)/%.pkginfo) $(WORKDIR)/%.prototype-$(GARCH) $(WORKDIR)/%.depend 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 Sep 8 00:07:18 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 07 Sep 2009 22:07:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[6221] csw/mgar/pkg/cups/branches Message-ID: Revision: 6221 http://gar.svn.sourceforge.net/gar/?rev=6221&view=rev Author: wahwah Date: 2009-09-07 22:07:18 +0000 (Mon, 07 Sep 2009) Log Message: ----------- cups: branch renamed to cups-1.3 Added Paths: ----------- csw/mgar/pkg/cups/branches/cups-1.3/ Removed Paths: ------------- csw/mgar/pkg/cups/branches/cups-with-classutils/ 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 Sep 8 02:15:11 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 08 Sep 2009 00:15:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[6222] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 6222 http://gar.svn.sourceforge.net/gar/?rev=6222&view=rev Author: bdwalton Date: 2009-09-08 00:15:11 +0000 (Tue, 08 Sep 2009) Log Message: ----------- git: version bump to 1.6.4.2 Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-09-07 22:07:18 UTC (rev 6221) +++ csw/mgar/pkg/git/trunk/Makefile 2009-09-08 00:15:11 UTC (rev 6222) @@ -1,5 +1,5 @@ GARNAME = git -GARVERSION = 1.6.4 +GARVERSION = 1.6.4.2 #xPATCHLEVEL = rc3 CATEGORIES = devel 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 Sep 8 08:50:46 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 08 Sep 2009 06:50:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6223] csw/mgar/pkg/ctags/trunk Message-ID: Revision: 6223 http://gar.svn.sourceforge.net/gar/?rev=6223&view=rev Author: dmichelsen Date: 2009-09-08 06:50:46 +0000 (Tue, 08 Sep 2009) Log Message: ----------- ctags: Add rationale and renaming of binary to ectags Modified Paths: -------------- csw/mgar/pkg/ctags/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/ctags/trunk/files/README Modified: csw/mgar/pkg/ctags/trunk/Makefile =================================================================== --- csw/mgar/pkg/ctags/trunk/Makefile 2009-09-08 00:15:11 UTC (rev 6222) +++ csw/mgar/pkg/ctags/trunk/Makefile 2009-09-08 06:50:46 UTC (rev 6223) @@ -31,4 +31,6 @@ # No test suite TEST_SCRIPTS = +EXTRA_PAX_ARGS = -s ",/ctags,/ectags,p" + include gar/category.mk Added: csw/mgar/pkg/ctags/trunk/files/README =================================================================== --- csw/mgar/pkg/ctags/trunk/files/README (rev 0) +++ csw/mgar/pkg/ctags/trunk/files/README 2009-09-08 06:50:46 UTC (rev 6223) @@ -0,0 +1,70 @@ + Von: car at crank.org.uk + Betreff: Re: ctags + Datum: 14. April 2007 22:52:11 MESZ + An: enh at jessies.org + + +On 15/04/2007, at 7:37 AM, Elliott Hughes wrote: +/etc/alternatives, overwriting/uninstalling the system ctags, or arranging for the new "ctags" to be higher on the path seem to be the most common solutions. + +Yeah, unfortunately none of those is open to me. I'm not allowed to remove or declare and incompatibility with the existing package, and I'm not allowed to clash. My two options are to rename my executable or stick it somewhere other than /opt/csw/bin. + +i've seen it called ectags before where it would otherwise be ambiguous, but not xctags. + +That's good enough for me. I can't even call it gtags/gctags because the other one's GNU. Which came first. + +etags is Emacs' crippled ctags variant. + +Exuberant ctags comes with a symbolic link, on request, to cripple it so. I'm not tempted to to prefix that, too, and call the pair ectags and eetags -- I'll have to alter the code, which I don't like doing. + +Yuck, Emacs. + +Evergreen currently relies on it being the first "ctags" on the path. + +Yes. Unfortunately we'll have to rely on the symbolic link trick to achieve that end. + +-- +Chris Reece +http://www.crank.org.uk/ + + + + Von: car at crank.org.uk + Betreff: /newpkgs ectags + Datum: 26. April 2007 00:16:52 MESZ + An: phil at bolthole.com + +Phil, + +I'll get back to you on the matter of autoenabling and bandwidthd, just a +wee bit busy at the moment, I'm sure you're even more so. + +I do have another package, though, in newpkgs: + +/export/medusa/newpkgs/ectags-5.6,REV=2007.04.25-SunOS5.8-i386-CSW.pkg.gz +/export/medusa/newpkgs/ectags-5.6,REV=2007.04.25-SunOS5.8-sparc-CSW.pkg.gz + +Unfortunately, by default it clashes with the GNU Ctags binary "ctags" +(why these people can't find a new name when they fork, I don't know) +which is bundled with CSWemacs. I am assured, however, that this is the +default ctags on many Linuxes, it certainly seems fairly popular, and it +has tag support for a wider range of languages. There's precedent for +renaming it "ectags" or "exuberant-ctags" where it co-exists with GNU +ctags. The former seems most popular, so that's what I've gone with. + +It's compiled to read configuration from /opt/csw/etc/ectags.conf, and I +*would* include a dummy config file listing the sensible defaults except +that there's no way to comment the config file without causing ectags to +spout a warning every time it's executed I'm reliably informed that +no-one uses the configuration file, and it certainly smells of an +abandoned, half implemented feature. So, instead of a config file, a +message at install-time, that seems the best we can do. + +Cheers, + +Chris. + + + + + 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 Sep 8 09:00:36 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 08 Sep 2009 07:00:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[6224] csw/mgar/pkg Message-ID: Revision: 6224 http://gar.svn.sourceforge.net/gar/?rev=6224&view=rev Author: dmichelsen Date: 2009-09-08 07:00:36 +0000 (Tue, 08 Sep 2009) Log Message: ----------- ectags: Rename in GAR from ctags to ectags Added Paths: ----------- csw/mgar/pkg/ectags/ csw/mgar/pkg/ectags/trunk/ csw/mgar/pkg/ectags/trunk/Makefile csw/mgar/pkg/ectags/trunk/files/ csw/mgar/pkg/ectags/trunk/files/README csw/mgar/pkg/ectags/trunk/files/install.diff Removed Paths: ------------- csw/mgar/pkg/ctags/ csw/mgar/pkg/ectags/trunk/ csw/mgar/pkg/ectags/trunk/Makefile csw/mgar/pkg/ectags/trunk/files/ csw/mgar/pkg/ectags/trunk/files/CSWctags.gspec csw/mgar/pkg/ectags/trunk/files/CSWctags.prototype csw/mgar/pkg/ectags/trunk/files/install.diff Deleted: csw/mgar/pkg/ectags/trunk/Makefile =================================================================== --- csw/mgar/pkg/ctags/trunk/Makefile 2009-09-07 12:13:52 UTC (rev 6217) +++ csw/mgar/pkg/ectags/trunk/Makefile 2009-09-08 07:00:36 UTC (rev 6224) @@ -1,34 +0,0 @@ -GARNAME = ctags -GARVERSION = 5.8 -CATEGORIES = utils - -DESCRIPTION = Exuberant Ctags: A multilanguage implementation of Ctags -define BLURB - Ctags generates an index (or tag) file of language objects found in source - files that allows these items to be quickly and easily located by a text - editor or other utility. A tag signifies a language object for which an index - entry is available (or, alternatively, the index entry created for that - object). -endef - -MASTER_SITES = $(SF_MIRROR) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz - -# Respect DESTDIR -PATCHFILES = install.diff - -PACKAGES = CSWectags -CATALOGNAME = ectags - -# We define upstream file regex so we can be notifed of new upstream software release -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=6556 -UPSTREAM_USE_SF = 1 -UFILES_REGEX = (\d+(?:\.\d+)*) - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --enable-custom-config=$(sysconfdir)/ctags.conf - -# No test suite -TEST_SCRIPTS = - -include gar/category.mk Copied: csw/mgar/pkg/ectags/trunk/Makefile (from rev 6223, csw/mgar/pkg/ctags/trunk/Makefile) =================================================================== --- csw/mgar/pkg/ectags/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ectags/trunk/Makefile 2009-09-08 07:00:36 UTC (rev 6224) @@ -0,0 +1,36 @@ +GARNAME = ctags +GARVERSION = 5.8 +CATEGORIES = utils + +DESCRIPTION = Exuberant Ctags: A multilanguage implementation of Ctags +define BLURB + Ctags generates an index (or tag) file of language objects found in source + files that allows these items to be quickly and easily located by a text + editor or other utility. A tag signifies a language object for which an index + entry is available (or, alternatively, the index entry created for that + object). +endef + +MASTER_SITES = $(SF_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# Respect DESTDIR +PATCHFILES = install.diff + +PACKAGES = CSWectags +CATALOGNAME = ectags + +# We define upstream file regex so we can be notifed of new upstream software release +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=6556 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-custom-config=$(sysconfdir)/ctags.conf + +# No test suite +TEST_SCRIPTS = + +EXTRA_PAX_ARGS = -s ",/ctags,/ectags,p" + +include gar/category.mk Deleted: csw/mgar/pkg/ectags/trunk/files/CSWctags.gspec =================================================================== --- csw/mgar/pkg/ctags/trunk/files/CSWctags.gspec 2009-09-01 16:04:02 UTC (rev 6152) +++ csw/mgar/pkg/ectags/trunk/files/CSWctags.gspec 2009-09-08 07:00:36 UTC (rev 6224) @@ -1,4 +0,0 @@ -%var bitname ctags -%var pkgname CSWctags -%include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/ectags/trunk/files/CSWctags.prototype =================================================================== --- csw/mgar/pkg/ctags/trunk/files/CSWctags.prototype 2009-09-01 16:04:02 UTC (rev 6152) +++ csw/mgar/pkg/ectags/trunk/files/CSWctags.prototype 2009-09-08 07:00:36 UTC (rev 6224) @@ -1,8 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/ctags 0755 root bin -s none /opt/csw/bin/etags=ctags -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/ctags.1 0644 root bin -s none /opt/csw/share/man/man1/etags.1=ctags.1 Copied: csw/mgar/pkg/ectags/trunk/files/README (from rev 6223, csw/mgar/pkg/ctags/trunk/files/README) =================================================================== --- csw/mgar/pkg/ectags/trunk/files/README (rev 0) +++ csw/mgar/pkg/ectags/trunk/files/README 2009-09-08 07:00:36 UTC (rev 6224) @@ -0,0 +1,70 @@ + Von: car at crank.org.uk + Betreff: Re: ctags + Datum: 14. April 2007 22:52:11 MESZ + An: enh at jessies.org + + +On 15/04/2007, at 7:37 AM, Elliott Hughes wrote: +/etc/alternatives, overwriting/uninstalling the system ctags, or arranging for the new "ctags" to be higher on the path seem to be the most common solutions. + +Yeah, unfortunately none of those is open to me. I'm not allowed to remove or declare and incompatibility with the existing package, and I'm not allowed to clash. My two options are to rename my executable or stick it somewhere other than /opt/csw/bin. + +i've seen it called ectags before where it would otherwise be ambiguous, but not xctags. + +That's good enough for me. I can't even call it gtags/gctags because the other one's GNU. Which came first. + +etags is Emacs' crippled ctags variant. + +Exuberant ctags comes with a symbolic link, on request, to cripple it so. I'm not tempted to to prefix that, too, and call the pair ectags and eetags -- I'll have to alter the code, which I don't like doing. + +Yuck, Emacs. + +Evergreen currently relies on it being the first "ctags" on the path. + +Yes. Unfortunately we'll have to rely on the symbolic link trick to achieve that end. + +-- +Chris Reece +http://www.crank.org.uk/ + + + + Von: car at crank.org.uk + Betreff: /newpkgs ectags + Datum: 26. April 2007 00:16:52 MESZ + An: phil at bolthole.com + +Phil, + +I'll get back to you on the matter of autoenabling and bandwidthd, just a +wee bit busy at the moment, I'm sure you're even more so. + +I do have another package, though, in newpkgs: + +/export/medusa/newpkgs/ectags-5.6,REV=2007.04.25-SunOS5.8-i386-CSW.pkg.gz +/export/medusa/newpkgs/ectags-5.6,REV=2007.04.25-SunOS5.8-sparc-CSW.pkg.gz + +Unfortunately, by default it clashes with the GNU Ctags binary "ctags" +(why these people can't find a new name when they fork, I don't know) +which is bundled with CSWemacs. I am assured, however, that this is the +default ctags on many Linuxes, it certainly seems fairly popular, and it +has tag support for a wider range of languages. There's precedent for +renaming it "ectags" or "exuberant-ctags" where it co-exists with GNU +ctags. The former seems most popular, so that's what I've gone with. + +It's compiled to read configuration from /opt/csw/etc/ectags.conf, and I +*would* include a dummy config file listing the sensible defaults except +that there's no way to comment the config file without causing ectags to +spout a warning every time it's executed I'm reliably informed that +no-one uses the configuration file, and it certainly smells of an +abandoned, half implemented feature. So, instead of a config file, a +message at install-time, that seems the best we can do. + +Cheers, + +Chris. + + + + + Deleted: csw/mgar/pkg/ectags/trunk/files/install.diff =================================================================== --- csw/mgar/pkg/ctags/trunk/files/install.diff 2009-09-01 16:04:02 UTC (rev 6152) +++ csw/mgar/pkg/ectags/trunk/files/install.diff 2009-09-08 07:00:36 UTC (rev 6224) @@ -1,24 +0,0 @@ -diff --speed-large-files --minimal -Nru ctags-5.5.4.orig/Makefile.in ctags-5.5.4/Makefile.in ---- ctags-5.5.4.orig/Makefile.in 2005-01-27 11:22:14.851370000 -0500 -+++ ctags-5.5.4/Makefile.in 2005-01-27 11:19:56.676032000 -0500 -@@ -16,13 +16,13 @@ - # GNU Autoconf variables. These are set by the "configure" script when it - # runs. - # --exec_prefix = @exec_prefix@ --prefix = @prefix@ --bindir = @bindir@ --srcdir = @srcdir@ --libdir = @libdir@ --incdir = @includedir@ --mandir = @mandir@ -+exec_prefix = $(DESTDIR)@exec_prefix@ -+prefix = $(DESTDIR)@prefix@ -+bindir = $(DESTDIR)@bindir@ -+srcdir = @srcdir@ -+libdir = $(DESTDIR)@libdir@ -+incdir = $(DESTDIR)@includedir@ -+mandir = $(DESTDIR)@mandir@ - SLINK = @LN_S@ - STRIP = @STRIP@ - CC = @CC@ Copied: csw/mgar/pkg/ectags/trunk/files/install.diff (from rev 6217, csw/mgar/pkg/ctags/trunk/files/install.diff) =================================================================== --- csw/mgar/pkg/ectags/trunk/files/install.diff (rev 0) +++ csw/mgar/pkg/ectags/trunk/files/install.diff 2009-09-08 07:00:36 UTC (rev 6224) @@ -0,0 +1,25 @@ +diff -Naur ctags-5.8.orig/Makefile.in ctags-5.8.patched/Makefile.in +--- ctags-5.8.orig/Makefile.in 2009-07-04 07:29:28.000000000 +0200 ++++ ctags-5.8.patched/Makefile.in 2009-09-07 14:02:27.768451180 +0200 +@@ -16,14 +16,14 @@ + # GNU Autoconf variables. These are set by the "configure" script when it + # runs. + # +-exec_prefix = @exec_prefix@ +-datarootdir = @datarootdir@ +-prefix = @prefix@ +-bindir = @bindir@ ++exec_prefix = $(DESTDIR)@exec_prefix@ ++datarootdir = $(DESTDIR)@datarootdir@ ++prefix = $(DESTDIR)@prefix@ ++bindir = $(DESTDIR)@bindir@ + srcdir = @srcdir@ +-libdir = @libdir@ +-incdir = @includedir@ +-mandir = @mandir@ ++libdir = $(DESTDIR)@libdir@ ++incdir = $(DESTDIR)@includedir@ ++mandir = $(DESTDIR)@mandir@ + SLINK = @LN_S@ + STRIP = @STRIP@ + CC = @CC@ 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 Sep 8 13:21:14 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 08 Sep 2009 11:21:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6225] csw/mgar/pkg/cups/branches/cups-1.4 Message-ID: Revision: 6225 http://gar.svn.sourceforge.net/gar/?rev=6225&view=rev Author: wahwah Date: 2009-09-08 11:21:14 +0000 (Tue, 08 Sep 2009) Log Message: ----------- cups: Postinstall scripts which fail when the old configuration is present Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4/Makefile csw/mgar/pkg/cups/branches/cups-1.4/checksums Added Paths: ----------- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.postinstall csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.postinstall Property Changed: ---------------- csw/mgar/pkg/cups/branches/cups-1.4/Makefile Modified: csw/mgar/pkg/cups/branches/cups-1.4/Makefile =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-08 07:00:36 UTC (rev 6224) +++ csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-08 11:21:14 UTC (rev 6225) @@ -1,3 +1,7 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + GARNAME = cups GARVERSION = 1.4.0 CATEGORIES = net @@ -23,6 +27,8 @@ PATCHFILES = 0001-Makefile.patch DISTFILES = cups-$(GARVERSION)-source.tar.bz2 $(PATCHFILES) +DISTFILES += CSWcupsclient.postinstall +DISTFILES += CSWcupsd.postinstall DISTFILES += CSWcupsd.postremove PREREQUISITE_PKGS = CSWggettext @@ -36,7 +42,6 @@ PREREQUISITE_PKGS += SUNWlibm PREREQUISITE_PKGS += SUNWslpu -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = cups-(\d+(?:\.\d+)*)-source.tar.bz2 SPKG_CLASSES = none cswcpsampleconf cswinitsmf @@ -108,8 +113,6 @@ PKGFILES_CSWcupsclient += $(mandir)/man5/ppdcfile\.5 PKGFILES_CSWcupsclient += $(mandir)/man7/(drv|notifier)\.7 - - SPKG_DESC_CSWcups = Common Unix Printing System SPKG_DESC_CSWlibcups = CUPS libraries SPKG_DESC_CSWcupsd = CUPS daemon @@ -122,7 +125,6 @@ $$$$3 ~ /\/cupsd\.conf\.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ { print }' - LD_OPTIONS = -R/opt/csw/lib/\$$ISALIST -R/opt/csw/lib CONFIGURE_ARGS = $(DIRPATHS) --enable-pdftops Property changes on: csw/mgar/pkg/cups/branches/cups-1.4/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/cups/branches/cups-1.4/checksums =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-09-08 07:00:36 UTC (rev 6224) +++ csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-09-08 11:21:14 UTC (rev 6225) @@ -1,3 +1,5 @@ 682e10ff0ab0e094c3de2061369038bc download/0001-Makefile.patch +236c432ef6c8f0e93f634276278f3c4c download/CSWcupsclient.postinstall +236c432ef6c8f0e93f634276278f3c4c download/CSWcupsd.postinstall ca7718998e56c320c08a77cfefe046f6 download/CSWcupsd.postremove bc5e777d4320cecdd1a64de8035171a8 download/cups-1.4.0-source.tar.bz2 Added: csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.postinstall =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.postinstall (rev 0) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.postinstall 2009-09-08 11:21:14 UTC (rev 6225) @@ -0,0 +1,12 @@ +#!/bin/sh +# +# $Id$ +# + +if [ -d "${PKG_INSTALL_ROOT}/opt/csw/etc/cups" ]; then + echo + echo "The old configuration directory /opt/csw/etc/cup exists." + echo "Please move your configuration to /etc/opt/csw/cups." + echo + exit 1 +fi Added: csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.postinstall =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.postinstall (rev 0) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.postinstall 2009-09-08 11:21:14 UTC (rev 6225) @@ -0,0 +1,12 @@ +#!/bin/sh +# +# $Id$ +# + +if [ -d "${PKG_INSTALL_ROOT}/opt/csw/etc/cups" ]; then + echo + echo "The old configuration directory /opt/csw/etc/cup exists." + echo "Please move your configuration to /etc/opt/csw/cups." + echo + exit 1 +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 Tue Sep 8 14:09:22 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 08 Sep 2009 12:09:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[6226] csw/mgar/pkg/cups/branches/cups-1.4 Message-ID: Revision: 6226 http://gar.svn.sourceforge.net/gar/?rev=6226&view=rev Author: wahwah Date: 2009-09-08 12:09:17 +0000 (Tue, 08 Sep 2009) Log Message: ----------- cups: More visible messages from the postinstall files. Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4/checksums csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.postinstall csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.postinstall Modified: csw/mgar/pkg/cups/branches/cups-1.4/checksums =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-09-08 11:21:14 UTC (rev 6225) +++ csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-09-08 12:09:17 UTC (rev 6226) @@ -1,5 +1,5 @@ 682e10ff0ab0e094c3de2061369038bc download/0001-Makefile.patch -236c432ef6c8f0e93f634276278f3c4c download/CSWcupsclient.postinstall -236c432ef6c8f0e93f634276278f3c4c download/CSWcupsd.postinstall +e950ccba9b35ca698de7c52ba1c54688 download/CSWcupsclient.postinstall +e950ccba9b35ca698de7c52ba1c54688 download/CSWcupsd.postinstall ca7718998e56c320c08a77cfefe046f6 download/CSWcupsd.postremove bc5e777d4320cecdd1a64de8035171a8 download/cups-1.4.0-source.tar.bz2 Modified: csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.postinstall =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.postinstall 2009-09-08 11:21:14 UTC (rev 6225) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.postinstall 2009-09-08 12:09:17 UTC (rev 6226) @@ -5,8 +5,10 @@ if [ -d "${PKG_INSTALL_ROOT}/opt/csw/etc/cups" ]; then echo - echo "The old configuration directory /opt/csw/etc/cup exists." - echo "Please move your configuration to /etc/opt/csw/cups." + echo "*************************************************************" + echo "* The old configuration directory /opt/csw/etc/cups exists. *" + echo "* Please move your configuration to /etc/opt/csw/cups. *" + echo "*************************************************************" echo exit 1 fi Modified: csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.postinstall =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.postinstall 2009-09-08 11:21:14 UTC (rev 6225) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.postinstall 2009-09-08 12:09:17 UTC (rev 6226) @@ -5,8 +5,10 @@ if [ -d "${PKG_INSTALL_ROOT}/opt/csw/etc/cups" ]; then echo - echo "The old configuration directory /opt/csw/etc/cup exists." - echo "Please move your configuration to /etc/opt/csw/cups." + echo "*************************************************************" + echo "* The old configuration directory /opt/csw/etc/cups exists. *" + echo "* Please move your configuration to /etc/opt/csw/cups. *" + echo "*************************************************************" echo exit 1 fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Sep 8 14:15:56 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 08 Sep 2009 12:15:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[6227] csw/mgar/pkg Message-ID: Revision: 6227 http://gar.svn.sourceforge.net/gar/?rev=6227&view=rev Author: dmichelsen Date: 2009-09-08 12:15:56 +0000 (Tue, 08 Sep 2009) Log Message: ----------- fping: Initial commit Added Paths: ----------- csw/mgar/pkg/fping/ csw/mgar/pkg/fping/branches/ csw/mgar/pkg/fping/tags/ csw/mgar/pkg/fping/trunk/ csw/mgar/pkg/fping/trunk/Makefile csw/mgar/pkg/fping/trunk/checksums csw/mgar/pkg/fping/trunk/files/ Property changes on: csw/mgar/pkg/fping/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/fping/trunk/Makefile =================================================================== --- csw/mgar/pkg/fping/trunk/Makefile (rev 0) +++ csw/mgar/pkg/fping/trunk/Makefile 2009-09-08 12:15:56 UTC (rev 6227) @@ -0,0 +1,46 @@ +GARNAME = fping +GARVERSION = 2.4 +REV = b2_to +CATEGORIES = utils + +DESCRIPTION = A ping like program accepting any number of hosts +define BLURB + fping is a ping(1) like program which uses the Internet Control + Message Protocol (ICMP) echo request to determine if a host is up. + fping is different from ping in that you can specify any number of + hosts on the command line, or specify a file containing the lists + of hosts to ping. Instead of trying one host until it timeouts or + replies, fping will send out a ping packet and move on to the next + host in a round-robin fashion. If a host replies, it is noted and + removed from the list of hosts to check. If a host does not respond + within a certain time limit and/or retry limit it will be considered + unreachable. +endef + +MASTER_SITES = http://fping.sourceforge.net/download/ +MASTER_SITES += http://oss.oetiker.ch/smokeping/pub/ +DISTFILES = $(GARNAME).tar.gz +PATCHFILES = fping-2.4b2_to-sequence-fix.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 = http://fping.sourceforge.net/ + +SPKG_SOURCEURL = http://fping.sourceforge.net/ + +WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)$(REV) + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + +SPKG_VERSION := $(SPKG_VERSION)_rev=$(REV) + + + + Added: csw/mgar/pkg/fping/trunk/checksums =================================================================== --- csw/mgar/pkg/fping/trunk/checksums (rev 0) +++ csw/mgar/pkg/fping/trunk/checksums 2009-09-08 12:15:56 UTC (rev 6227) @@ -0,0 +1,2 @@ +ee105906fc48b78f72866e121a7c179e download/fping-2.4b2_to-sequence-fix.patch +d5e8be59e307cef76bc479e1684df705 download/fping.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Sep 8 20:12:28 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 08 Sep 2009 18:12:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[6228] csw/mgar/pkg/xterm/trunk Message-ID: Revision: 6228 http://gar.svn.sourceforge.net/gar/?rev=6228&view=rev Author: skayser Date: 2009-09-08 18:12:27 +0000 (Tue, 08 Sep 2009) Log Message: ----------- xterm: bump version to 247 Modified Paths: -------------- csw/mgar/pkg/xterm/trunk/Makefile csw/mgar/pkg/xterm/trunk/checksums Modified: csw/mgar/pkg/xterm/trunk/Makefile =================================================================== --- csw/mgar/pkg/xterm/trunk/Makefile 2009-09-08 12:15:56 UTC (rev 6227) +++ csw/mgar/pkg/xterm/trunk/Makefile 2009-09-08 18:12:27 UTC (rev 6228) @@ -1,5 +1,5 @@ GARNAME = xterm -GARVERSION = 243 +GARVERSION = 247 CATEGORIES = apps DESCRIPTION = Terminal emulator for the X Window System @@ -52,12 +52,6 @@ include gar/category.mk -# Hack for now to address the double /opt/csw/lib in $R*PATH. One comes -# from LD_OPTIONS and this one from pkg-config i suppose. -pre-build-modulated: - @perl -pi -e 's|-R/opt/csw/lib ||' $(WORKSRC)/Makefile - @$(MAKECOOKIE) - post-install-modulated: @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) @cp $(FILEDIR)/README.CSW $(DESTDIR)$(docdir)/$(GARNAME) Modified: csw/mgar/pkg/xterm/trunk/checksums =================================================================== --- csw/mgar/pkg/xterm/trunk/checksums 2009-09-08 12:15:56 UTC (rev 6227) +++ csw/mgar/pkg/xterm/trunk/checksums 2009-09-08 18:12:27 UTC (rev 6228) @@ -1,2 +1,2 @@ -be25d2d3661d0bb77fc66e1bcbb3caba download/xterm-243.tgz 347f24b7ed3e42a3d40b1db1ed0061f0 download/patch-mkwidth.diff +ef73f7f1eb8c863c51f2bfac1f55efd1 download/xterm-247.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 Sep 8 21:07:06 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 08 Sep 2009 19:07:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6229] csw/mgar/pkg Message-ID: Revision: 6229 http://gar.svn.sourceforge.net/gar/?rev=6229&view=rev Author: wahwah Date: 2009-09-08 19:07:06 +0000 (Tue, 08 Sep 2009) Log Message: ----------- pinentry: initial commit Modified Paths: -------------- csw/mgar/pkg/pinentry/trunk/Makefile csw/mgar/pkg/pinentry/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pinentry/ csw/mgar/pkg/pinentry/trunk/files/0001-remove-__extension__-from-util.c.patch csw/mgar/pkg/pinentry/trunk/files/0002-ncurses-include.patch Modified: csw/mgar/pkg/pinentry/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-09-08 12:15:56 UTC (rev 6227) +++ csw/mgar/pkg/pinentry/trunk/Makefile 2009-09-08 19:07:06 UTC (rev 6229) @@ -2,181 +2,22 @@ # 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 = pinentry +GARVERSION = 0.7.6 +CATEGORIES = utils +DESCRIPTION = Allows entering passwords into gpg-agent. 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). +SPKG_SOURCEURL = http://www.gnupg.org/ +PKG_CONFIG_PATH = /opt/csw/lib/pkgconfig +MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/pinentry/ +PATCHFILES = 0001-remove-__extension__-from-util.c.patch +PATCHFILES += 0002-ncurses-include.patch 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. +REQUIRED_PKGS = CSWglib CSWgtk CSWiconv CSWncurses +PREREQUISITE_PKGS = $(REQUIRED_PKGS) +PREREQUISITE_PKGS += CSWgtk2devel +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 +include gar/category.mk Modified: csw/mgar/pkg/pinentry/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-09-08 12:15:56 UTC (rev 6227) +++ csw/mgar/pkg/pinentry/trunk/checksums 2009-09-08 19:07:06 UTC (rev 6229) @@ -0,0 +1,3 @@ +2964e403781bf656b04b46b3846057e4 download/0001-remove-__extension__-from-util.c.patch +1cfd306236b7fb0bc01a2a408f4f5abb download/0002-ncurses-include.patch +5a4f676375fa882009da02013d77210f download/pinentry-0.7.6.tar.gz Added: csw/mgar/pkg/pinentry/trunk/files/0001-remove-__extension__-from-util.c.patch =================================================================== --- csw/mgar/pkg/pinentry/trunk/files/0001-remove-__extension__-from-util.c.patch (rev 0) +++ csw/mgar/pkg/pinentry/trunk/files/0001-remove-__extension__-from-util.c.patch 2009-09-08 19:07:06 UTC (rev 6229) @@ -0,0 +1,25 @@ +From 26f9938de29f65324acaedf376801f2e40f04b27 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Tue, 8 Sep 2009 20:02:35 +0100 +Subject: [PATCH 1/2] remove __extension__ from util.c + +--- + secmem/util.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/secmem/util.c b/secmem/util.c +index 580fd34..c836ad0 100644 +--- a/secmem/util.c ++++ b/secmem/util.c +@@ -34,7 +34,7 @@ + + #ifndef TEMP_FAILURE_RETRY + #define TEMP_FAILURE_RETRY(expression) \ +- (__extension__ \ ++ ( \ + ({ long int __result; \ + do __result = (long int) (expression); \ + while (__result == -1L && errno == EINTR); \ +-- +1.6.3.2 + Added: csw/mgar/pkg/pinentry/trunk/files/0002-ncurses-include.patch =================================================================== --- csw/mgar/pkg/pinentry/trunk/files/0002-ncurses-include.patch (rev 0) +++ csw/mgar/pkg/pinentry/trunk/files/0002-ncurses-include.patch 2009-09-08 19:07:06 UTC (rev 6229) @@ -0,0 +1,25 @@ +From 257626c95990b2f220bccf2fbc08e51d4eb07e76 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Tue, 8 Sep 2009 20:02:57 +0100 +Subject: [PATCH 2/2] ncurses include + +--- + pinentry/pinentry-curses.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/pinentry/pinentry-curses.c b/pinentry/pinentry-curses.c +index b4417fb..60721f1 100644 +--- a/pinentry/pinentry-curses.c ++++ b/pinentry/pinentry-curses.c +@@ -22,7 +22,7 @@ + #include + #endif + #include +-#include ++#include + #include + #include + #include +-- +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 Tue Sep 8 21:11:37 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 08 Sep 2009 19:11:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[6230] csw/mgar/pkg/pinentry/trunk/Makefile Message-ID: Revision: 6230 http://gar.svn.sourceforge.net/gar/?rev=6230&view=rev Author: wahwah Date: 2009-09-08 19:11:35 +0000 (Tue, 08 Sep 2009) Log Message: ----------- pinentry: Adding /opt/csw/X11/lib/pkgconfig to PKG_CONFIG_PATH Modified Paths: -------------- csw/mgar/pkg/pinentry/trunk/Makefile Modified: csw/mgar/pkg/pinentry/trunk/Makefile =================================================================== --- csw/mgar/pkg/pinentry/trunk/Makefile 2009-09-08 19:07:06 UTC (rev 6229) +++ csw/mgar/pkg/pinentry/trunk/Makefile 2009-09-08 19:11:35 UTC (rev 6230) @@ -9,7 +9,7 @@ define BLURB endef SPKG_SOURCEURL = http://www.gnupg.org/ -PKG_CONFIG_PATH = /opt/csw/lib/pkgconfig +PKG_CONFIG_PATH = /opt/csw/lib/pkgconfig:/opt/csw/X11/lib/pkgconfig MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/pinentry/ PATCHFILES = 0001-remove-__extension__-from-util.c.patch PATCHFILES += 0002-ncurses-include.patch 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 Sep 8 21:25:16 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 08 Sep 2009 19:25:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[6231] csw/mgar/pkg/pinentry/trunk/Makefile Message-ID: Revision: 6231 http://gar.svn.sourceforge.net/gar/?rev=6231&view=rev Author: wahwah Date: 2009-09-08 19:25:16 +0000 (Tue, 08 Sep 2009) Log Message: ----------- pinentry: set the compiler to SOS12 Modified Paths: -------------- csw/mgar/pkg/pinentry/trunk/Makefile Modified: csw/mgar/pkg/pinentry/trunk/Makefile =================================================================== --- csw/mgar/pkg/pinentry/trunk/Makefile 2009-09-08 19:11:35 UTC (rev 6230) +++ csw/mgar/pkg/pinentry/trunk/Makefile 2009-09-08 19:25:16 UTC (rev 6231) @@ -20,4 +20,5 @@ PREREQUISITE_PKGS += CSWgtk2devel TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) +GARCOMPILER = SOS12 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Sep 9 02:21:36 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 09 Sep 2009 00:21:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[6232] csw/mgar/pkg/xmlto/trunk Message-ID: Revision: 6232 http://gar.svn.sourceforge.net/gar/?rev=6232&view=rev Author: bdwalton Date: 2009-09-09 00:21:36 +0000 (Wed, 09 Sep 2009) Log Message: ----------- xmlto: bump version 0.0.21 -> 0.0.22 Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile csw/mgar/pkg/xmlto/trunk/checksums Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-08 19:25:16 UTC (rev 6231) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-09 00:21:36 UTC (rev 6232) @@ -1,5 +1,5 @@ GARNAME = xmlto -GARVERSION = 0.0.21 +GARVERSION = 0.0.22 CATEGORIES = utils PREREQUISITE_PKGS += CSWmktemp CSWfindutils CSWdocbookxsl CSWlibxslt @@ -16,7 +16,7 @@ It also performs any necessary post-processing. endef -MASTER_SITES = https://fedorahosted.org/$(GARNAME)/export/1/ +MASTER_SITES = https://fedorahosted.org/releases/x/m/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 TEST_TARGET = check Modified: csw/mgar/pkg/xmlto/trunk/checksums =================================================================== --- csw/mgar/pkg/xmlto/trunk/checksums 2009-09-08 19:25:16 UTC (rev 6231) +++ csw/mgar/pkg/xmlto/trunk/checksums 2009-09-09 00:21:36 UTC (rev 6232) @@ -1,2 +1 @@ -cc2039dedc81f1a56b06e5fdac6f7570 download/xmlto-0.0.21.tar.bz2 -0eddffc425d6a0439d4ba307ec3a668b download/CSWxmlto.gspec +12f297dc7051e4fef08339980f88a1dd download/xmlto-0.0.22.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 Wed Sep 9 02:53:03 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 09 Sep 2009 00:53:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[6233] csw/mgar/pkg/xmlto/trunk Message-ID: Revision: 6233 http://gar.svn.sourceforge.net/gar/?rev=6233&view=rev Author: bdwalton Date: 2009-09-09 00:53:03 +0000 (Wed, 09 Sep 2009) Log Message: ----------- xmlto: add patch to remove hardcoding of bash path in configure Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile csw/mgar/pkg/xmlto/trunk/checksums Added Paths: ----------- csw/mgar/pkg/xmlto/trunk/files/no-hardcode-bash.patch Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-09 00:21:36 UTC (rev 6232) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-09 00:53:03 UTC (rev 6233) @@ -19,6 +19,8 @@ MASTER_SITES = https://fedorahosted.org/releases/x/m/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +PATCHFILES = no-hardcode-bash.patch + TEST_TARGET = check # We define upstream file regex so we can be notifed of new upstream software release @@ -27,8 +29,9 @@ # we don't link to anything besides libc and libm. NORUNPATH = 1 -pre-configure: +pre-configure-modulated: @(cd $(WORKSRC); \ + autoreconf; \ touch doc/xmlto.xml doc/xmlif.xml ) @$(MAKECOOKIE) Modified: csw/mgar/pkg/xmlto/trunk/checksums =================================================================== --- csw/mgar/pkg/xmlto/trunk/checksums 2009-09-09 00:21:36 UTC (rev 6232) +++ csw/mgar/pkg/xmlto/trunk/checksums 2009-09-09 00:53:03 UTC (rev 6233) @@ -1 +1,2 @@ +a39f8b6fdb2219dca513145a4fca63ac download/no-hardcode-bash.patch 12f297dc7051e4fef08339980f88a1dd download/xmlto-0.0.22.tar.bz2 Added: csw/mgar/pkg/xmlto/trunk/files/no-hardcode-bash.patch =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/no-hardcode-bash.patch (rev 0) +++ csw/mgar/pkg/xmlto/trunk/files/no-hardcode-bash.patch 2009-09-09 00:53:03 UTC (rev 6233) @@ -0,0 +1,14 @@ +diff --speed-large-files --minimal -Nru xmlto-0.0.22.orig/configure.in xmlto-0.0.22/configure.in +--- xmlto-0.0.22.orig/configure.in 2009-03-25 14:48:02.000000000 +0100 ++++ xmlto-0.0.22/configure.in 2009-09-09 02:43:47.431319471 +0200 +@@ -18,9 +18,8 @@ + AC_ARG_VAR([FIND], [Name of the GNU `find' program.]) + AC_CHECK_PROG([FIND], [find],, [find] ) + +-BASH=/bin/bash + AC_ARG_VAR([BASH], [Name and path of the GNU `bash' shell.]) +-AC_PATH_PROG([BASH], [bash], [/bin/bash]) ++AC_PATH_PROG([BASH], [bash],, [bash]) + + AC_ARG_VAR([GETOPT], [Name of the `getopt' program (requires longopt support).]) + AC_CHECK_PROG([GETOPT], [getopt],, [getopt]) 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 Sep 9 02:54:53 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 09 Sep 2009 00:54:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[6234] csw/mgar/pkg/xmlto/trunk/Makefile Message-ID: Revision: 6234 http://gar.svn.sourceforge.net/gar/?rev=6234&view=rev Author: bdwalton Date: 2009-09-09 00:54:53 +0000 (Wed, 09 Sep 2009) Log Message: ----------- xmlto: change configure args to new required input format Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-09 00:53:03 UTC (rev 6233) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-09 00:54:53 UTC (rev 6234) @@ -36,10 +36,10 @@ @$(MAKECOOKIE) CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-mktemp=/opt/csw/bin/mktemp -CONFIGURE_ARGS += --with-find=/opt/csw/bin/gfind -CONFIGURE_ARGS += --with-bash=/opt/csw/bin/bash -CONFIGURE_ARGS += --with-getopt=/opt/csw/bin/ggetopt +CONFIGURE_ARGS += GETOPT=/opt/csw/bin/ggetopt +CONFIGURE_ARGS += BASH=/opt/csw/bin/bash +CONFIGURE_ARGS += FIND=/opt/csw/bin/gfind +CONFIGURE_ARGS += MKTEMP=/opt/csw/bin/mktemp include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Sep 9 03:05:49 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 09 Sep 2009 01:05:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[6235] csw/mgar/pkg/sgml-xml-common/trunk/Makefile Message-ID: Revision: 6235 http://gar.svn.sourceforge.net/gar/?rev=6235&view=rev Author: bdwalton Date: 2009-09-09 01:05:49 +0000 (Wed, 09 Sep 2009) Log Message: ----------- sgml-xml-common: update sysconfdir to /etc/opt/csw Modified Paths: -------------- csw/mgar/pkg/sgml-xml-common/trunk/Makefile Modified: csw/mgar/pkg/sgml-xml-common/trunk/Makefile =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/Makefile 2009-09-09 00:54:53 UTC (rev 6234) +++ csw/mgar/pkg/sgml-xml-common/trunk/Makefile 2009-09-09 01:05:49 UTC (rev 6235) @@ -44,10 +44,12 @@ # a destination xml catalog XMLCATALOG=$(DESTDIR)/$(sysconfdir)/xml/catalog +sysconfdir=/etc/opt/csw/ + include gar/category.mk # fix up auto* stuff -pre-configure: +pre-configure-modulated: ( cd $(WORKSRC)/; \ for f in $(RH_AM_LINKS); do \ rm $$f; \ 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 Sep 9 04:06:30 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 09 Sep 2009 02:06:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[6236] csw/mgar/pkg/sgml-xml-common/trunk/ Message-ID: Revision: 6236 http://gar.svn.sourceforge.net/gar/?rev=6236&view=rev Author: bdwalton Date: 2009-09-09 02:06:26 +0000 (Wed, 09 Sep 2009) Log Message: ----------- sgml-xml-common: move to gar v2 Property Changed: ---------------- csw/mgar/pkg/sgml-xml-common/trunk/ Property changes on: csw/mgar/pkg/sgml-xml-common/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 hson at users.sourceforge.net Wed Sep 9 11:47:56 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Wed, 09 Sep 2009 09:47:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[6237] csw/mgar/pkg/exiftool/trunk/Makefile Message-ID: Revision: 6237 http://gar.svn.sourceforge.net/gar/?rev=6237&view=rev Author: hson Date: 2009-09-09 09:47:55 +0000 (Wed, 09 Sep 2009) Log Message: ----------- exiftool: Update to 7.93, changed dependency Modified Paths: -------------- csw/mgar/pkg/exiftool/trunk/Makefile Modified: csw/mgar/pkg/exiftool/trunk/Makefile =================================================================== --- csw/mgar/pkg/exiftool/trunk/Makefile 2009-09-09 02:06:26 UTC (rev 6236) +++ csw/mgar/pkg/exiftool/trunk/Makefile 2009-09-09 09:47:55 UTC (rev 6237) @@ -1,5 +1,5 @@ GARNAME = exiftool -GARVERSION = 7.81 +GARVERSION = 7.93 CATEGORIES = cpan DESCRIPTION = Read, Write and Edit Image File Meta Information @@ -15,7 +15,7 @@ DISTFILES = $(DISTNAME).tar.gz DISTFILES += $(call admfiles,CSWexiftool,) -REQUIRED_PKGS += CSWperl CSWpmcompresszlib +REQUIRED_PKGS += CSWperl CSWpmiocompress # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = Image-ExifTool-(\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 Wed Sep 9 12:32:06 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 09 Sep 2009 10:32:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6238] csw/mgar/pkg/msmtp/trunk Message-ID: Revision: 6238 http://gar.svn.sourceforge.net/gar/?rev=6238&view=rev Author: dmichelsen Date: 2009-09-09 10:32:06 +0000 (Wed, 09 Sep 2009) Log Message: ----------- msmtp: Update to 1.4.18 Modified Paths: -------------- csw/mgar/pkg/msmtp/trunk/Makefile csw/mgar/pkg/msmtp/trunk/checksums Modified: csw/mgar/pkg/msmtp/trunk/Makefile =================================================================== --- csw/mgar/pkg/msmtp/trunk/Makefile 2009-09-09 09:47:55 UTC (rev 6237) +++ csw/mgar/pkg/msmtp/trunk/Makefile 2009-09-09 10:32:06 UTC (rev 6238) @@ -1,5 +1,5 @@ GARNAME = msmtp -GARVERSION = 1.4.17 +GARVERSION = 1.4.18 CATEGORIES = net DESCRIPTION = SMTP client Modified: csw/mgar/pkg/msmtp/trunk/checksums =================================================================== --- csw/mgar/pkg/msmtp/trunk/checksums 2009-09-09 09:47:55 UTC (rev 6237) +++ csw/mgar/pkg/msmtp/trunk/checksums 2009-09-09 10:32:06 UTC (rev 6238) @@ -1,2 +1 @@ -b0b74f1144812b60688f590c62a0d3dd download/msmtp-1.4.17.tar.bz2 -42e9683c63a21aeb281bbb72d9e4b527 download/CSWmsmtp.gspec +74f80b41c058a0ee34819d6bf5ff3b1a download/msmtp-1.4.18.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Wed Sep 9 13:36:59 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Wed, 09 Sep 2009 11:36:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6239] csw/mgar/pkg/exiftool/trunk/checksums Message-ID: Revision: 6239 http://gar.svn.sourceforge.net/gar/?rev=6239&view=rev Author: hson Date: 2009-09-09 11:36:59 +0000 (Wed, 09 Sep 2009) Log Message: ----------- exiftool: checksums file update Modified Paths: -------------- csw/mgar/pkg/exiftool/trunk/checksums Modified: csw/mgar/pkg/exiftool/trunk/checksums =================================================================== --- csw/mgar/pkg/exiftool/trunk/checksums 2009-09-09 10:32:06 UTC (rev 6238) +++ csw/mgar/pkg/exiftool/trunk/checksums 2009-09-09 11:36:59 UTC (rev 6239) @@ -1,2 +1,2 @@ 13f9aae615a5de5e3c145b374950a75c download/CSWexiftool.gspec -5716c0dec3ffa2b167b73ec27b6a235f download/Image-ExifTool-7.81.tar.gz +da1077cc9a8910f38b97cf5475a37360 download/Image-ExifTool-7.93.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 Sep 9 14:40:32 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 09 Sep 2009 12:40:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[6240] csw/mgar/pkg/cups/branches/cups-1.4/Makefile Message-ID: Revision: 6240 http://gar.svn.sourceforge.net/gar/?rev=6240&view=rev Author: wahwah Date: 2009-09-09 12:40:32 +0000 (Wed, 09 Sep 2009) Log Message: ----------- cups: Adding support for debugging builds Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4/Makefile Modified: csw/mgar/pkg/cups/branches/cups-1.4/Makefile =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-09 11:36:59 UTC (rev 6239) +++ csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-09 12:40:32 UTC (rev 6240) @@ -133,6 +133,13 @@ CONFIGURE_ARGS += --with-rcdir=$(sysconfdir) CONFIGURE_ARGS += --with-icondir=$(datadir)/icons +CONFIGURE_ARGS_DBG = --enable-debug +CONFIGURE_ARGS_DBG += --enable-debug-guards +CONFIGURE_ARGS_DBG += --enable-debug-printfs + +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) + + # This is a hack that's needed, because configure (Makedefs) will otherwise # plase -ltiff, etc. first and -L/opt/csw/lib afterwards, thus being unable # to find any of the image libraries. @@ -156,6 +163,11 @@ PRIVATE_CUPS_INC = $(DESTDIR)$(includedir)/cups +# CUPS uses the 'OPTIM' variable to set the optimization flags. +OPTIM_DBG = -g -xO0 +OPTIM = $(OPTIM_$(GARFLAVOR)) +export OPTIM + post-install-modulated: (cd $(DESTDIR)$(sysconfdir)/cups; \ echo "Making .CSW configs in $(DESTDIR)$(sysconfdir)/cups"; \ 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 Sep 9 15:26:42 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 09 Sep 2009 13:26:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[6241] csw/mgar/pkg/ectags/trunk/Makefile Message-ID: Revision: 6241 http://gar.svn.sourceforge.net/gar/?rev=6241&view=rev Author: dmichelsen Date: 2009-09-09 13:26:42 +0000 (Wed, 09 Sep 2009) Log Message: ----------- ectags: Set SOURCEURL Modified Paths: -------------- csw/mgar/pkg/ectags/trunk/Makefile Modified: csw/mgar/pkg/ectags/trunk/Makefile =================================================================== --- csw/mgar/pkg/ectags/trunk/Makefile 2009-09-09 12:40:32 UTC (rev 6240) +++ csw/mgar/pkg/ectags/trunk/Makefile 2009-09-09 13:26:42 UTC (rev 6241) @@ -20,6 +20,8 @@ PACKAGES = CSWectags CATALOGNAME = ectags +SPKG_SOURCEURL = http://ctags.sourceforge.net/ + # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=6556 UPSTREAM_USE_SF = 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 Sep 9 15:32:13 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 09 Sep 2009 13:32:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[6242] csw/mgar/pkg/orbit2/trunk Message-ID: Revision: 6242 http://gar.svn.sourceforge.net/gar/?rev=6242&view=rev Author: dmichelsen Date: 2009-09-09 13:32:12 +0000 (Wed, 09 Sep 2009) Log Message: ----------- orbit2: Add patch and set package name Modified Paths: -------------- csw/mgar/pkg/orbit2/trunk/Makefile csw/mgar/pkg/orbit2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/orbit2/trunk/files/ csw/mgar/pkg/orbit2/trunk/files/patch-test-foo.diff Modified: csw/mgar/pkg/orbit2/trunk/Makefile =================================================================== --- csw/mgar/pkg/orbit2/trunk/Makefile 2009-09-09 13:26:42 UTC (rev 6241) +++ csw/mgar/pkg/orbit2/trunk/Makefile 2009-09-09 13:32:12 UTC (rev 6242) @@ -9,10 +9,21 @@ endef MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +PACKAGES = CSWorbit2 +CATALOGNAME = orbit2 + +REQUIRED_PKGS = CSWggettextrt CSWglib2 CSWlibidl + SPKG_SOURCEURL = http://projects.gnome.org/ORBit2/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +# Patch from +# https://bugzilla.gnome.org/show_bug.cgi?id=563046 +# This also solves +# https://bugzilla.gnome.org/show_bug.cgi?id=558796 +PATCHFILES = patch-test-foo.diff +PATCHDIRLEVEL = 0 CONFIGURE_ARGS = $(DIRPATHS) STRIP_LIBTOOL = 1 Modified: csw/mgar/pkg/orbit2/trunk/checksums =================================================================== --- csw/mgar/pkg/orbit2/trunk/checksums 2009-09-09 13:26:42 UTC (rev 6241) +++ csw/mgar/pkg/orbit2/trunk/checksums 2009-09-09 13:32:12 UTC (rev 6242) @@ -1 +1,2 @@ 10bfb957fa4a8935a0b4afaee7d71df7 download/ORBit2-2.14.17.tar.bz2 +f0854ac5f081775fc2b7c8afbf769843 download/patch-test-foo.diff Added: csw/mgar/pkg/orbit2/trunk/files/patch-test-foo.diff =================================================================== --- csw/mgar/pkg/orbit2/trunk/files/patch-test-foo.diff (rev 0) +++ csw/mgar/pkg/orbit2/trunk/files/patch-test-foo.diff 2009-09-09 13:32:12 UTC (rev 6242) @@ -0,0 +1,46 @@ +$NetBSD: patch-aa,v 1.7 2009/03/06 14:02:32 wiz Exp $ + +--- src/idl-compiler/orbit-idl-c-headers.c.orig 2008-08-31 14:04:43.000000000 +0000 ++++ src/idl-compiler/orbit-idl-c-headers.c +@@ -574,21 +574,29 @@ static void + ch_output_codefrag(IDL_tree tree, OIDL_Run_Info *rinfo, OIDL_C_Info *ci) + { + GSList *list; ++ char *ctmp; + + for(list = IDL_CODEFRAG(tree).lines; list; + list = g_slist_next(list)) { +- if(!strncmp(list->data, +- "#pragma include_defs", +- sizeof("#pragma include_defs")-1)) { +- char *ctmp, *cte; +- ctmp = ((char *)list->data) + sizeof("#pragma include_defs"); +- while(*ctmp && (isspace((int)*ctmp) || *ctmp == '"')) ctmp++; +- cte = ctmp; +- while(*cte && !isspace((int)*cte) && *cte != '"') cte++; +- *cte = '\0'; +- fprintf(ci->fh, "#include <%s>\n", ctmp); +- } else +- fprintf(ci->fh, "%s\n", (char *)list->data); ++ ctmp = list->data; ++ if(!strncmp(ctmp, "#pragma", sizeof("#pragma")-1)) { ++ ctmp += sizeof("#pragma")-1; ++ if (*ctmp && (isspace((int)*ctmp))) { ++ while(*ctmp && (isspace((int)*ctmp))) ctmp++; ++ if(!strncmp(ctmp, "include_defs", sizeof("include_defs")-1)) { ++ char *cte; ++ ++ ctmp += sizeof("include_defs")-1; ++ while(*ctmp && (isspace((int)*ctmp) || *ctmp == '"')) ctmp++; ++ cte = ctmp; ++ while(*cte && !isspace((int)*cte) && *cte != '"') cte++; ++ *cte = '\0'; ++ fprintf(ci->fh, "#include <%s>\n", ctmp); ++ continue; ++ } ++ } ++ } ++ fprintf(ci->fh, "%s\n", (char *)list->data); + } + } + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Sep 9 16:23:22 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 09 Sep 2009 14:23:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[6243] csw/mgar/pkg/pixman/branches Message-ID: Revision: 6243 http://gar.svn.sourceforge.net/gar/?rev=6243&view=rev Author: wbonnet Date: 2009-09-09 14:23:22 +0000 (Wed, 09 Sep 2009) Log Message: ----------- Create the branch used for packaging of the upstream latest version Update testing version to 0.16.0 Modified Paths: -------------- csw/mgar/pkg/pixman/branches/latest-upstream/Makefile csw/mgar/pkg/pixman/branches/latest-upstream/checksums Added Paths: ----------- csw/mgar/pkg/pixman/branches/latest-upstream/ Modified: csw/mgar/pkg/pixman/branches/latest-upstream/Makefile =================================================================== --- csw/mgar/pkg/pixman/trunk/Makefile 2009-09-09 13:32:12 UTC (rev 6242) +++ csw/mgar/pkg/pixman/branches/latest-upstream/Makefile 2009-09-09 14:23:22 UTC (rev 6243) @@ -1,5 +1,5 @@ GARNAME = pixman -GARVERSION = 0.15.14 +GARVERSION = 0.16.0 CATEGORIES = lib DESCRIPTION = The pixel-manipulation library for X and cairo Modified: csw/mgar/pkg/pixman/branches/latest-upstream/checksums =================================================================== --- csw/mgar/pkg/pixman/trunk/checksums 2009-09-09 13:32:12 UTC (rev 6242) +++ csw/mgar/pkg/pixman/branches/latest-upstream/checksums 2009-09-09 14:23:22 UTC (rev 6243) @@ -1,2 +1,2 @@ -bfbb075dd60402e86528add13f8e27ad download/pixman-0.15.14.tar.gz +46147b142ea530847e2228940f1cd535 download/pixman-0.16.0.tar.gz f78d71433a7d574ff66b7d2bf3ea2a49 download/pixman-private.h.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 Wed Sep 9 16:45:01 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 09 Sep 2009 14:45:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[6244] csw/mgar/pkg Message-ID: Revision: 6244 http://gar.svn.sourceforge.net/gar/?rev=6244&view=rev Author: dmichelsen Date: 2009-09-09 14:45:00 +0000 (Wed, 09 Sep 2009) Log Message: ----------- libmm: Initial commit Added Paths: ----------- csw/mgar/pkg/libmm/ csw/mgar/pkg/libmm/branches/ csw/mgar/pkg/libmm/tags/ csw/mgar/pkg/libmm/trunk/ csw/mgar/pkg/libmm/trunk/Makefile csw/mgar/pkg/libmm/trunk/checksums csw/mgar/pkg/libmm/trunk/files/ csw/mgar/pkg/libmm/trunk/files/0001-libtool-cflags.diff Property changes on: csw/mgar/pkg/libmm/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/libmm/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmm/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libmm/trunk/Makefile 2009-09-09 14:45:00 UTC (rev 6244) @@ -0,0 +1,34 @@ +GARNAME = libmm +GARVERSION = 1.4.2 +CATEGORIES = lib + +DESCRIPTION = Shared Memory Allocation abstraction library +define BLURB + OSSP mm is a 2-layer abstraction library which simplifies the usage + of shared memory between forked (and this way strongly related) processes + under Unix platforms. On the first layer it hides all platform dependent + implementation details (allocation and locking) when dealing with shared + memory segments and on the second layer it provides a high-level + malloc(3)-style API for a convenient and well known way to work with data + structures inside those shared memory segments. +endef + +MASTER_SITES = ftp://ftp.ossp.org/pkg/lib/mm/ +DISTFILES = mm-$(GARVERSION).tar.gz +PATCHFILES = 0001-libtool-cflags.diff + +# 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 = + +SPKG_SOURCEURL = http://www.ossp.org/pkg/lib/mm/ + +DISTNAME = mm-$(GARVERSION) + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/libmm/trunk/checksums =================================================================== --- csw/mgar/pkg/libmm/trunk/checksums (rev 0) +++ csw/mgar/pkg/libmm/trunk/checksums 2009-09-09 14:45:00 UTC (rev 6244) @@ -0,0 +1,2 @@ +54493069b25bc79b8f40ed5c5632b2fa download/0001-libtool-cflags.diff +bdb34c6c14071364c8f69062d2e8c82b download/mm-1.4.2.tar.gz Added: csw/mgar/pkg/libmm/trunk/files/0001-libtool-cflags.diff =================================================================== --- csw/mgar/pkg/libmm/trunk/files/0001-libtool-cflags.diff (rev 0) +++ csw/mgar/pkg/libmm/trunk/files/0001-libtool-cflags.diff 2009-09-09 14:45:00 UTC (rev 6244) @@ -0,0 +1,20 @@ +diff -Naur mm-1.4.2.orig/Makefile.in mm-1.4.2.patched/Makefile.in +--- mm-1.4.2.orig/Makefile.in 2006-08-10 21:05:55.000000000 +0200 ++++ mm-1.4.2.patched/Makefile.in 2009-09-09 16:25:45.161331795 +0200 +@@ -75,14 +75,14 @@ + all: $(LIBS) $(MANS) $(TSTS) + + libmm.la: $(OBJS) +- $(LIBTOOL) --quiet --mode=link $(CC) -o $@ $(OBJS) \ ++ $(LIBTOOL) --quiet --mode=link $(CC) $(CFLAGS) -o $@ $(OBJS) \ + -rpath $(libdir) -version-info `$(SHTOOL) version -l c -d libtool mm_vers.c` + + mm_alloc.c mm_core.c mm_global.c: mm.h mm_vers.c + mm.h: config.h + + mm_test: mm_test.lo libmm.la +- $(LIBTOOL) --quiet --mode=link $(CC) -o $@ mm_test.lo libmm.la ++ $(LIBTOOL) --quiet --mode=link $(CC) $(CFLAGS) -o $@ mm_test.lo libmm.la + + mm.3: mm.pod + V1=`$(SHTOOL) version -l c -d short mm_vers.c`; \ 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 Sep 9 17:30:30 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 09 Sep 2009 15:30:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[6245] csw/mgar/pkg/tightvnc/trunk Message-ID: Revision: 6245 http://gar.svn.sourceforge.net/gar/?rev=6245&view=rev Author: wahwah Date: 2009-09-09 15:30:27 +0000 (Wed, 09 Sep 2009) Log Message: ----------- tightvnc: Builds fine on Solaris 10 with SOS12. Doesn't USE_LIBWRAP. Modified Paths: -------------- csw/mgar/pkg/tightvnc/trunk/Makefile csw/mgar/pkg/tightvnc/trunk/checksums Added Paths: ----------- csw/mgar/pkg/tightvnc/trunk/files/0003-libdix.a-after-libos.a.patch Removed Paths: ------------- csw/mgar/pkg/tightvnc/trunk/files/0002-pass-f-xmakefile-flag-when-appropriate.patch Modified: csw/mgar/pkg/tightvnc/trunk/Makefile =================================================================== --- csw/mgar/pkg/tightvnc/trunk/Makefile 2009-09-09 14:45:00 UTC (rev 6244) +++ csw/mgar/pkg/tightvnc/trunk/Makefile 2009-09-09 15:30:27 UTC (rev 6245) @@ -35,22 +35,17 @@ EXTRA_DEFINES = -DUSE_LIBWRAP=1 EXTRA_INC = /usr/openwin/share/include/X11 +EXTRA_INCLUDES = $(EXTRA_INC) EXTRA_LDFLAGS = /opt/csw/lib LOCAL_LDFLAGS = $(LINKER_FLAGS) -BUILD_OVERRIDE_DIRS = EXTRA_DEFINES EXTRA_INCLUDE LOCAL_LDFLAGS -CONFIGURE_SCRIPTS = $(WORKSRC)/Imakefile -# Xvnc -CONFIGURE_ARGS = -a -BUILD_SCRIPTS = vnc Xvnc +BUILD_OVERRIDE_DIRS = EXTRA_DEFINES EXTRA_INCLUDES LOCAL_LDFLAGS +CONFIGURE_SCRIPTS = vnc +BUILD_SCRIPTS = maciej TEST_SCRIPTS = INSTALL_SCRIPTS = vnc -# This patch has been sent upstream with a bug report. -# http://sourceforge.net/tracker/?func=detail&aid=2852808&group_id=14067&atid=114067 -# PATCHFILES += 0002-Test-for-Makefile-presence.patch -# PATCHFILES = 0001-Sun-compiler-in-sun.cf.patch -PATCHFILES += 0002-pass-f-xmakefile-flag-when-appropriate.patch PATCHFILES += 0003-GNU-make-by-default.patch +PATCHFILES += 0003-libdix.a-after-libos.a.patch include gar/category.mk @@ -58,28 +53,34 @@ perl -pi -e "s|/usr/local/vnc/classes|$(datadir)/vnc/classes|" $(WORKSRC)/vncserver @$(MAKECOOKIE) -configure-Xvnc: - banner "Config Xvnc" - perl -pi -e "s|^(\s*make)\s*$$|\1 CC=$(CC)|" $(WORKSRC)/Xvnc/configure - (cd $(WORKSRC)/Xvnc && $(BUILD_ENV) ./configure) +configure-vnc: + (cd $(WORKSRC) && $(CONFIGURE_ENV) xmkmf) @$(MAKECOOKIE) -build-vnc: - banner "Build VNC" - cd $(WORKSRC) && $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") World - # $(MAKE) -C $(WORKSRC) $(BUILD_ENV) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") World - @$(MAKECOOKIE) +build-maciej: + (cd $(WORKSRC) && $(BUILD_ENV) \ + EXTRA_INCLUDES="-I/opt/csw/include" \ + LOCAL_LDFLAGS="-L/opt/csw/lib" \ + gmake World) + (cd $(WORKSRC)/Xvnc && $(CONFIGURE_ENV) \ + EXTRA_LIBRARIES="-lwrap -lsocket" \ + EXTRA_DEFINES="-DUSE_LIBWRAP=1" \ + EXTRA_INCLUDES="-I/opt/csw/include" \ + LOCAL_LDFLAGS="-L/opt/csw/lib" \ + ./configure) + (cd $(WORKSRC)/Xvnc && $(BUILD_ENV) \ + EXTRA_INCLUDES="-I/opt/csw/include" \ + LOCAL_LDFLAGS="-L/opt/csw/lib" \ + gmake) + # This is something that Dago wanted to do, but it causes the build to + # fail. I'm leaving it for future reference. + # (cd $(WORKSRC)/Xvnc && $(BUILD_ENV) \ + # EXTRA_LIBRARIES="-lwrap -lsocket" \ + # EXTRA_DEFINES="-DUSE_LIBWRAP=1" \ + # LOCAL_LDFLAGS="-L/opt/csw/lib" \ + # EXTRA_INCLUDES="-I/opt/csw/include" \ + # $(MAKE)) -build-Xvnc: configure-Xvnc - # $(MAKE) -C $(WORKSRC) $(BUILD_ENV) EXTRA_LIBRARIES="-lwrap" EXTRA_DEFINES="-DUSE_LIBWRAP=1" World - # banner "Config Xvnc" - # (cd $(WORKSRC)/Xvnc && $(BUILD_ENV) ./configure) - banner "Build Xvnc" - $(MAKE) -C $(WORKSRC)/Xvnc $(BUILD_ENV) EXTRA_LIBRARIES="-lwrap -lsocket" EXTRA_DEFINES="-DUSE_LIBWRAP=1" EXTRA_LDOPTIONS="-L/opt/csw/lib -L/usr/lib" World - # cd $(WORKSRC) && $(MAKE) $(BUILD_ENV) EXTRA_LIBRARIES="-lwrap" EXTRA_DEFINES="-DUSE_LIBWRAP=1" World - # cd $(WORKSRC)/Xvnc && $(MAKE) $(BUILD_ENV) EXTRA_LIBRARIES="-lwrap -lsocket" EXTRA_DEFINES="-DUSE_LIBWRAP=1" EXTRA_LDOPTIONS="-L/opt/csw/lib -L/usr/lib" World - @$(MAKECOOKIE) - install-vnc: ginstall -d $(DESTDIR)$(bindir) ginstall -d $(DESTDIR)$(mandir)/man1 Modified: csw/mgar/pkg/tightvnc/trunk/checksums =================================================================== --- csw/mgar/pkg/tightvnc/trunk/checksums 2009-09-09 14:45:00 UTC (rev 6244) +++ csw/mgar/pkg/tightvnc/trunk/checksums 2009-09-09 15:30:27 UTC (rev 6245) @@ -1,5 +1,5 @@ 76166d097bf2e70627cb6c87d312bca5 download/0001-Sun-compiler-in-sun.cf.patch -51441e1d47891f910f0929cd65a487a7 download/0002-pass-f-xmakefile-flag-when-appropriate.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 Deleted: csw/mgar/pkg/tightvnc/trunk/files/0002-pass-f-xmakefile-flag-when-appropriate.patch =================================================================== --- csw/mgar/pkg/tightvnc/trunk/files/0002-pass-f-xmakefile-flag-when-appropriate.patch 2009-09-09 14:45:00 UTC (rev 6244) +++ csw/mgar/pkg/tightvnc/trunk/files/0002-pass-f-xmakefile-flag-when-appropriate.patch 2009-09-09 15:30:27 UTC (rev 6245) @@ -1,50 +0,0 @@ -From 796212b91212ad84a516554ba5bb6250d8fd1c87 Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Mon, 7 Sep 2009 10:08:34 +0200 -Subject: [PATCH 2/3] pass -f xmakefile flag when appropriate - ---- - Xvnc/config/cf/Imake.rules | 13 ++++++++++--- - 1 files changed, 10 insertions(+), 3 deletions(-) - -diff --git a/Xvnc/config/cf/Imake.rules b/Xvnc/config/cf/Imake.rules -index 5ab9a18..353dabf 100644 ---- a/Xvnc/config/cf/Imake.rules -+++ b/Xvnc/config/cf/Imake.rules -@@ -2469,7 +2469,7 @@ $(ONESUBDIR)/Makefile: @@\ - fi; @@\ - @@\ - target:: @@\ -- - at MakeFlagsToShellFlags(ik,set +e); \ @@\ -+ MakeFlagsToShellFlags(ik,set +e); \ @@\ - MakeFlagsToShellFlags(n,executeit="no"); \ @@\ - for i in dirs ;\ @@\ - do \ @@\ -@@ -2477,7 +2477,7 @@ target:: @@\ - .) curdir= ;; \ @@\ - *) curdir=$(CURRENT_DIR)/ ;; \ @@\ - esac; \ @@\ -- echo "making Makefiles in $$curdir$$i..."; \ @@\ -+ echo "making Makefiles in '$$curdir'::'$$i'..."; \ @@\ - itmp=`echo $$i | sed -e 's;^\./;;g' -e 's;/\./;/;g'`; \ @@\ - curtmp="$(CURRENT_DIR)" \ @@\ - toptmp=""; \ @@\ -@@ -2514,7 +2514,14 @@ target:: @@\ - $(MV) $$i/Makefile $$i/Makefile.bak; \ @@\ - fi; \ @@\ - fi; \ @@\ -- $(MAKE) $(MFLAGS) $(MAKE_OPTS) ONESUBDIR=$$i ONECURDIR=$$curdir IMAKETOP=$$imaketop IMAKEPREFIX=$$imakeprefix $$i/Makefile; \ @@\ -+ [ -r xmakefile ] && $(MAKE) -f xmakefile $(MFLAGS) \ @@\ -+ $(MAKE_OPTS) ONESUBDIR=$$i ONECURDIR=$$curdir \ @@\ -+ IMAKETOP=$$imaketop IMAKEPREFIX=$$imakeprefix \ @@\ -+ $$i/Makefile || \ @@\ -+ $(MAKE) $(MFLAGS) \ @@\ -+ $(MAKE_OPTS) ONESUBDIR=$$i ONECURDIR=$$curdir \ @@\ -+ IMAKETOP=$$imaketop IMAKEPREFIX=$$imakeprefix \ @@\ -+ $$i/Makefile; \ @@\ - if [ -d $$i ] ; then \ @@\ - cd $$i; \ @@\ - $(MAKE) $(MFLAGS) Makefiles; \ @@\ --- -1.6.3.2 - Added: csw/mgar/pkg/tightvnc/trunk/files/0003-libdix.a-after-libos.a.patch =================================================================== --- csw/mgar/pkg/tightvnc/trunk/files/0003-libdix.a-after-libos.a.patch (rev 0) +++ csw/mgar/pkg/tightvnc/trunk/files/0003-libdix.a-after-libos.a.patch 2009-09-09 15:30:27 UTC (rev 6245) @@ -0,0 +1,25 @@ +From 490679f2825057f4516557abce0109a324c95a8a Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Wed, 9 Sep 2009 11:36:02 +0200 +Subject: [PATCH 3/3] libdix.a after libos.a + +--- + Xvnc/programs/Xserver/Imakefile | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Xvnc/programs/Xserver/Imakefile b/Xvnc/programs/Xserver/Imakefile +index 4209d1f..89a1a97 100644 +--- a/Xvnc/programs/Xserver/Imakefile ++++ b/Xvnc/programs/Xserver/Imakefile +@@ -11,7 +11,7 @@ XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.85.2.8 1998/02/07 00:44:33 daw + INSTPGMFLAGS = + #endif + +-#define PreFbLibs $(DIX) $(OS) $(FONT) $(XPDDX) ++#define PreFbLibs $(DIX) $(OS) $(DIX) $(FONT) $(XPDDX) + #define BarePostFbLibs $(MFB) $(XPFBLIBS) $(MI) + #define PostFbLibs BarePostFbLibs $(EXTENSIONS) + #define NoMfbBarePostFbLibs $(XPFBLIBS) $(MI) +-- +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 Wed Sep 9 18:51:21 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 09 Sep 2009 16:51:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[6246] csw/mgar/pkg/tightvnc/trunk Message-ID: Revision: 6246 http://gar.svn.sourceforge.net/gar/?rev=6246&view=rev Author: wahwah Date: 2009-09-09 16:51:21 +0000 (Wed, 09 Sep 2009) Log Message: ----------- tightvnc: Enabling libwrap. Modified Paths: -------------- csw/mgar/pkg/tightvnc/trunk/Makefile csw/mgar/pkg/tightvnc/trunk/checksums Added Paths: ----------- csw/mgar/pkg/tightvnc/trunk/files/0001-Force-the-use-of-libwrap.patch Modified: csw/mgar/pkg/tightvnc/trunk/Makefile =================================================================== --- csw/mgar/pkg/tightvnc/trunk/Makefile 2009-09-09 15:30:27 UTC (rev 6245) +++ csw/mgar/pkg/tightvnc/trunk/Makefile 2009-09-09 16:51:21 UTC (rev 6246) @@ -38,14 +38,16 @@ EXTRA_INCLUDES = $(EXTRA_INC) EXTRA_LDFLAGS = /opt/csw/lib LOCAL_LDFLAGS = $(LINKER_FLAGS) -BUILD_OVERRIDE_DIRS = EXTRA_DEFINES EXTRA_INCLUDES LOCAL_LDFLAGS +EXTRA_LIBRARIES = -lwrap -lsocket +BUILD_OVERRIDE_DIRS = EXTRA_DEFINES EXTRA_INCLUDES LOCAL_LDFLAGS EXTRA_LIBRARIES CONFIGURE_SCRIPTS = vnc -BUILD_SCRIPTS = maciej +BUILD_SCRIPTS = vnc TEST_SCRIPTS = INSTALL_SCRIPTS = vnc PATCHFILES = 0001-Sun-compiler-in-sun.cf.patch PATCHFILES += 0003-GNU-make-by-default.patch PATCHFILES += 0003-libdix.a-after-libos.a.patch +PATCHFILES += 0001-Force-the-use-of-libwrap.patch include gar/category.mk @@ -57,7 +59,7 @@ (cd $(WORKSRC) && $(CONFIGURE_ENV) xmkmf) @$(MAKECOOKIE) -build-maciej: +build-vnc: (cd $(WORKSRC) && $(BUILD_ENV) \ EXTRA_INCLUDES="-I/opt/csw/include" \ LOCAL_LDFLAGS="-L/opt/csw/lib" \ @@ -69,17 +71,11 @@ LOCAL_LDFLAGS="-L/opt/csw/lib" \ ./configure) (cd $(WORKSRC)/Xvnc && $(BUILD_ENV) \ - EXTRA_INCLUDES="-I/opt/csw/include" \ + EXTRA_LIBRARIES="-lwrap -lsocket" \ + EXTRA_DEFINES="-DUSE_LIBWRAP=1" \ LOCAL_LDFLAGS="-L/opt/csw/lib" \ - gmake) - # This is something that Dago wanted to do, but it causes the build to - # fail. I'm leaving it for future reference. - # (cd $(WORKSRC)/Xvnc && $(BUILD_ENV) \ - # EXTRA_LIBRARIES="-lwrap -lsocket" \ - # EXTRA_DEFINES="-DUSE_LIBWRAP=1" \ - # LOCAL_LDFLAGS="-L/opt/csw/lib" \ - # EXTRA_INCLUDES="-I/opt/csw/include" \ - # $(MAKE)) + EXTRA_INCLUDES="-I/opt/csw/include" \ + $(MAKE)) install-vnc: ginstall -d $(DESTDIR)$(bindir) Modified: csw/mgar/pkg/tightvnc/trunk/checksums =================================================================== --- csw/mgar/pkg/tightvnc/trunk/checksums 2009-09-09 15:30:27 UTC (rev 6245) +++ csw/mgar/pkg/tightvnc/trunk/checksums 2009-09-09 16:51:21 UTC (rev 6246) @@ -1,3 +1,4 @@ +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 Added: csw/mgar/pkg/tightvnc/trunk/files/0001-Force-the-use-of-libwrap.patch =================================================================== --- csw/mgar/pkg/tightvnc/trunk/files/0001-Force-the-use-of-libwrap.patch (rev 0) +++ csw/mgar/pkg/tightvnc/trunk/files/0001-Force-the-use-of-libwrap.patch 2009-09-09 16:51:21 UTC (rev 6246) @@ -0,0 +1,25 @@ +From dd810a41debde8e4e24241a87b7ba19766407032 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Wed, 9 Sep 2009 18:18:18 +0200 +Subject: [PATCH] Force the use of libwrap + +--- + Xvnc/config/cf/vnclibs.def | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Xvnc/config/cf/vnclibs.def b/Xvnc/config/cf/vnclibs.def +index c033ca7..948fd7a 100644 +--- a/Xvnc/config/cf/vnclibs.def ++++ b/Xvnc/config/cf/vnclibs.def +@@ -11,7 +11,7 @@ VNCLIBS = $(TOP)/../libvncauth/libvncauth.a + /* Avoid linking with different libjpeg in /usr/shlib under Tru64. */ + VNCSYSLIBS = /usr/local/lib/libjpeg.a /usr/local/lib/libz.a -lcrypt + #else +-VNCSYSLIBS = -L/usr/local/lib -ljpeg -lz -lcrypt ++VNCSYSLIBS = -L/usr/local/lib -ljpeg -lz -lcrypt -lwrap + #endif + + VNCCPPFLAGS = -I$(TOP)/../include -I/usr/local/include +-- +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 Wed Sep 9 22:03:32 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 09 Sep 2009 20:03:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[6247] csw/mgar/pkg/myodbc/trunk/Makefile Message-ID: Revision: 6247 http://gar.svn.sourceforge.net/gar/?rev=6247&view=rev Author: wahwah Date: 2009-09-09 20:03:32 +0000 (Wed, 09 Sep 2009) Log Message: ----------- myodbc: Add /opt/csw/mysql5/lib/mysql to the runtime library search path Modified Paths: -------------- csw/mgar/pkg/myodbc/trunk/Makefile Modified: csw/mgar/pkg/myodbc/trunk/Makefile =================================================================== --- csw/mgar/pkg/myodbc/trunk/Makefile 2009-09-09 16:51:21 UTC (rev 6246) +++ csw/mgar/pkg/myodbc/trunk/Makefile 2009-09-09 20:03:32 UTC (rev 6247) @@ -40,6 +40,7 @@ CONFIGURE_ARGS += --with-unixODBC=/opt/csw --with-mysql-path=/opt/csw/mysql5 --enable-gui=no CONFIGURE_ARGS += --with-odbc-ini=/etc/opt/csw EXTRA_INC = $(abspath $(WORKDIR))/mysql-5.0.84/include +EXTRA_LD_OPTIONS = -R/opt/csw/mysql5/lib/mysql include gar/category.mk SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(PATCHLEVEL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Sep 10 02:11:57 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 10 Sep 2009 00:11:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[6248] csw/mgar/pkg/sgml-xml-common/trunk/Makefile Message-ID: Revision: 6248 http://gar.svn.sourceforge.net/gar/?rev=6248&view=rev Author: bdwalton Date: 2009-09-10 00:11:57 +0000 (Thu, 10 Sep 2009) Log Message: ----------- sgml-xml-common: add gar v2 variables Modified Paths: -------------- csw/mgar/pkg/sgml-xml-common/trunk/Makefile Modified: csw/mgar/pkg/sgml-xml-common/trunk/Makefile =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/Makefile 2009-09-09 20:03:32 UTC (rev 6247) +++ csw/mgar/pkg/sgml-xml-common/trunk/Makefile 2009-09-10 00:11:57 UTC (rev 6248) @@ -14,6 +14,22 @@ PREREQUISITE_PKGS = CSWautomake CSWautoconf +PACKAGES = CSWxmlcommon CSWsgmlcommon + +SPKG_DESC_CSWsgmlcommon = A collection of sgml entities and DTDs +SPKG_DESC_CSWxmlcommon = A collection of xml entities and DTDs + +CATALOGNAME_CSWsgmlcommon = sgmlcommon +CATALOGNAME_CSWxmlcommon = xmlcommon + +PKGFILES_CSWsgmlcommon = .*sgmlwhich.* .*install-catalog.* +PKGFILES_CSWsgmlcommon += /opt/csw/share/sgml/.* /etc/opt/csw/sgml/.* +PKGFILES_CSWsgmlcommon += /opt/csw/share/doc/sgml.* + +PKGFILES_CSWxmlcommon = /etc/opt/csw/xml/.* /opt/csw/share/xml.* .*xmlcatalog + +REQUIRED_PKGS_CSWsgmlcommon = CSWbash CSWggrep CSWgsed + EXTRA_FILES = xml.dcl html.dcl xml.soc html.soc MASTER_SITES = ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/ 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 Sep 10 02:14:20 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 10 Sep 2009 00:14:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[6249] csw/mgar/pkg/sgml-xml-common/trunk/files Message-ID: Revision: 6249 http://gar.svn.sourceforge.net/gar/?rev=6249&view=rev Author: bdwalton Date: 2009-09-10 00:14:20 +0000 (Thu, 10 Sep 2009) Log Message: ----------- sgml-xml-common: remove old manual prototypes, etc Removed Paths: ------------- csw/mgar/pkg/sgml-xml-common/trunk/files/CSWsgmlcommon.depend csw/mgar/pkg/sgml-xml-common/trunk/files/CSWsgmlcommon.gspec csw/mgar/pkg/sgml-xml-common/trunk/files/CSWsgmlcommon.prototype csw/mgar/pkg/sgml-xml-common/trunk/files/CSWxmlcommon.gspec csw/mgar/pkg/sgml-xml-common/trunk/files/CSWxmlcommon.prototype Deleted: csw/mgar/pkg/sgml-xml-common/trunk/files/CSWsgmlcommon.depend =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/files/CSWsgmlcommon.depend 2009-09-10 00:11:57 UTC (rev 6248) +++ csw/mgar/pkg/sgml-xml-common/trunk/files/CSWsgmlcommon.depend 2009-09-10 00:14:20 UTC (rev 6249) @@ -1,5 +0,0 @@ -P CSWbash bash - A sh-compatible command language interpreter -P CSWggrep ggrep - GNU grep -P CSWgsed gsed - The GNU non-interactive text Stream-oriented EDitor (sed) - - Deleted: csw/mgar/pkg/sgml-xml-common/trunk/files/CSWsgmlcommon.gspec =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/files/CSWsgmlcommon.gspec 2009-09-10 00:11:57 UTC (rev 6248) +++ csw/mgar/pkg/sgml-xml-common/trunk/files/CSWsgmlcommon.gspec 2009-09-10 00:14:20 UTC (rev 6249) @@ -1,5 +0,0 @@ -%var bitname sgmlcommon -%var pkgname CSWsgmlcommon -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/sgml-xml-common/trunk/files/CSWsgmlcommon.prototype =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/files/CSWsgmlcommon.prototype 2009-09-10 00:11:57 UTC (rev 6248) +++ csw/mgar/pkg/sgml-xml-common/trunk/files/CSWsgmlcommon.prototype 2009-09-10 00:14:20 UTC (rev 6249) @@ -1,46 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/install-catalog 0755 root bin -f none /opt/csw/bin/sgmlwhich 0755 root bin -d none /opt/csw/etc 0755 root bin -d none /opt/csw/etc/sgml 0755 root bin -f none /opt/csw/etc/sgml/sgml.conf 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/doc 0755 root bin -d none /opt/csw/share/doc/sgml-common-0.6.3 0755 root bin -d none /opt/csw/share/doc/sgml-common-0.6.3/html 0755 root bin -f none /opt/csw/share/doc/sgml-common-0.6.3/html/fdl.html 0644 root bin -f none /opt/csw/share/doc/sgml-common-0.6.3/html/index.html 0644 root bin -f none /opt/csw/share/doc/sgml-common-0.6.3/html/install-catalog.html 0644 root bin -f none /opt/csw/share/doc/sgml-common-0.6.3/html/introduction.html 0644 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man8 0755 root bin -f none /opt/csw/share/man/man8/install-catalog.8 0644 root bin -d none /opt/csw/share/sgml 0755 root bin -f none /opt/csw/share/sgml/html.dcl 0644 root bin -f none /opt/csw/share/sgml/html.soc 0644 root bin -d none /opt/csw/share/sgml/sgml-iso-entities-8879.1986 0755 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISOamsa.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISOamsb.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISOamsc.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISOamsn.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISOamso.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISOamsr.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISObox.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISOcyr1.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISOcyr2.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISOdia.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISOgrk1.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISOgrk2.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISOgrk3.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISOgrk4.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISOlat1.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISOlat2.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISOnum.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISOpub.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/ISOtech.ent 0644 root bin -f none /opt/csw/share/sgml/sgml-iso-entities-8879.1986/catalog 0644 root bin -f none /opt/csw/share/sgml/xml.dcl 0644 root bin -f none /opt/csw/share/sgml/xml.soc 0644 root bin -i copyright=CSWsgmlcommon.copyright -i depend=CSWsgmlcommon.depend -i pkginfo=CSWsgmlcommon.pkginfo Deleted: csw/mgar/pkg/sgml-xml-common/trunk/files/CSWxmlcommon.gspec =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/files/CSWxmlcommon.gspec 2009-09-10 00:11:57 UTC (rev 6248) +++ csw/mgar/pkg/sgml-xml-common/trunk/files/CSWxmlcommon.gspec 2009-09-10 00:14:20 UTC (rev 6249) @@ -1,5 +0,0 @@ -%var bitname xmlcommon -%var pkgname CSWxmlcommon -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/sgml-xml-common/trunk/files/CSWxmlcommon.prototype =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/files/CSWxmlcommon.prototype 2009-09-10 00:11:57 UTC (rev 6248) +++ csw/mgar/pkg/sgml-xml-common/trunk/files/CSWxmlcommon.prototype 2009-09-10 00:14:20 UTC (rev 6249) @@ -1,11 +0,0 @@ -d none /opt/csw/etc 0755 root bin -d none /opt/csw/etc/xml 0755 root bin -f none /opt/csw/etc/xml/catalog 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/sgml 0755 root bin -d none /opt/csw/share/sgml/docbook 0755 root bin -f none /opt/csw/share/sgml/docbook/xmlcatalog 0644 root bin -d none /opt/csw/share/xml 0755 root bin -i copyright=CSWxmlcommon.copyright -i depend=CSWxmlcommon.depend -i pkginfo=CSWxmlcommon.pkginfo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Sep 10 02:15:58 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 10 Sep 2009 00:15:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[6250] csw/mgar/pkg/sgml-xml-common/trunk/files/ sgmlwhich-sanity.patch Message-ID: Revision: 6250 http://gar.svn.sourceforge.net/gar/?rev=6250&view=rev Author: bdwalton Date: 2009-09-10 00:15:58 +0000 (Thu, 10 Sep 2009) Log Message: ----------- sgml-xml-common: update patch (/opt/csw/etc -> /etc/opt/csw) Modified Paths: -------------- csw/mgar/pkg/sgml-xml-common/trunk/files/sgmlwhich-sanity.patch Modified: csw/mgar/pkg/sgml-xml-common/trunk/files/sgmlwhich-sanity.patch =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/files/sgmlwhich-sanity.patch 2009-09-10 00:14:20 UTC (rev 6249) +++ csw/mgar/pkg/sgml-xml-common/trunk/files/sgmlwhich-sanity.patch 2009-09-10 00:15:58 UTC (rev 6250) @@ -6,5 +6,5 @@ -echo "/etc/sgml/sgml.conf" +# modified for CSW (this should be handled with autoconf, but i'm lazy) -+echo "/opt/csw/etc/sgml/sgml.conf" ++echo "/etc/opt/csw/sgml/sgml.conf" # Simple, isn't it? ;-) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Sep 10 02:26:26 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 10 Sep 2009 00:26:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[6251] csw/mgar/pkg/sgml-xml-common/trunk/Makefile Message-ID: Revision: 6251 http://gar.svn.sourceforge.net/gar/?rev=6251&view=rev Author: bdwalton Date: 2009-09-10 00:26:26 +0000 (Thu, 10 Sep 2009) Log Message: ----------- sgml-xml-common: remove distfiles related to gar v1 stuff Modified Paths: -------------- csw/mgar/pkg/sgml-xml-common/trunk/Makefile Modified: csw/mgar/pkg/sgml-xml-common/trunk/Makefile =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/Makefile 2009-09-10 00:15:58 UTC (rev 6250) +++ csw/mgar/pkg/sgml-xml-common/trunk/Makefile 2009-09-10 00:26:26 UTC (rev 6251) @@ -34,8 +34,6 @@ MASTER_SITES = ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/ DISTFILES = $(GARNAME)-$(GARVERSION).tgz -DISTFILES += CSWsgmlcommon.gspec CSWsgmlcommon.prototype CSWsgmlcommon.depend -DISTFILES += CSWxmlcommon.gspec CSWxmlcommon.prototype DISTFILES += $(EXTRA_FILES) # 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 bdwalton at users.sourceforge.net Thu Sep 10 02:27:44 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 10 Sep 2009 00:27:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[6252] csw/mgar/pkg/sgml-xml-common/trunk/checksums Message-ID: Revision: 6252 http://gar.svn.sourceforge.net/gar/?rev=6252&view=rev Author: bdwalton Date: 2009-09-10 00:27:44 +0000 (Thu, 10 Sep 2009) Log Message: ----------- sgml-xml-common: update makesums Modified Paths: -------------- csw/mgar/pkg/sgml-xml-common/trunk/checksums Modified: csw/mgar/pkg/sgml-xml-common/trunk/checksums =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/checksums 2009-09-10 00:26:26 UTC (rev 6251) +++ csw/mgar/pkg/sgml-xml-common/trunk/checksums 2009-09-10 00:27:44 UTC (rev 6252) @@ -1,21 +1,16 @@ -103c9828f24820df86e55e7862e28974 download/sgml-common-0.6.3.tgz -8344f78748603b2870f2d7f401ef49eb download/CSWsgmlcommon.gspec -fc5cd6cb77e22b8a1e21d0d9f662f891 download/CSWsgmlcommon.prototype -48a802f691734579ef4afefaad1a5423 download/CSWsgmlcommon.depend -f68c56d0904b311d4d254130a63eeee6 download/CSWxmlcommon.gspec -cd5928d3ad12438a4725b3469a6b98fd download/CSWxmlcommon.prototype -9ef2e183281920ecced665a3f644bace download/xml.dcl +99ac766ea29643aa33236a39596d943c download/configure-man.patch +458bbce42a19fe1aa8066e1c7175f144 download/configure-sgml-conf.patch e0135e28b7f6c566a3e0ee379528091b download/html.dcl -8f56c7a27cbe7c8251a385ddb90dd641 download/xml.soc cc6d164ed52f3d96f8e520255bf650ff download/html.soc +12b32f2a5ad0ab2edb70bfb83f3aecd6 download/install-catalog-man.patch +78febdc7f5b8535ef5e90e2c94a6e804 download/install-catalog-sanity.patch 7296f5f2cf78a74f94f5e1ceb48e3555 download/sgml-common-0.6.3-docdir.patch +103c9828f24820df86e55e7862e28974 download/sgml-common-0.6.3.tgz dcda4302e1b43256a55a658280651f42 download/sgml-common-automake.patch 24ff49d6310889d0f423b35893623151 download/sgml-common-quotes.patch b51552a733ae70753b6e7ea997a4e482 download/sgml-common-umask.patch d36dcc47efa67f41d7e406386754bb67 download/sgml-common-xmldir.patch -78febdc7f5b8535ef5e90e2c94a6e804 download/install-catalog-sanity.patch -b35d53333ca6dbc6cd96f0135cd4f85d download/sgmlwhich-sanity.patch -99ac766ea29643aa33236a39596d943c download/configure-man.patch -12b32f2a5ad0ab2edb70bfb83f3aecd6 download/install-catalog-man.patch 267d4e173f9a1e4c75fd65733b179449 download/sgml-conf-autoconf.patch -458bbce42a19fe1aa8066e1c7175f144 download/configure-sgml-conf.patch +fa04b53ee341326b32adced251214485 download/sgmlwhich-sanity.patch +9ef2e183281920ecced665a3f644bace download/xml.dcl +8f56c7a27cbe7c8251a385ddb90dd641 download/xml.soc 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 Sep 10 02:47:09 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 10 Sep 2009 00:47:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[6253] csw/mgar/pkg/sgml-xml-common/trunk/Makefile Message-ID: Revision: 6253 http://gar.svn.sourceforge.net/gar/?rev=6253&view=rev Author: bdwalton Date: 2009-09-10 00:47:09 +0000 (Thu, 10 Sep 2009) Log Message: ----------- sgml-xml-common: archall = 1 Modified Paths: -------------- csw/mgar/pkg/sgml-xml-common/trunk/Makefile Modified: csw/mgar/pkg/sgml-xml-common/trunk/Makefile =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/Makefile 2009-09-10 00:27:44 UTC (rev 6252) +++ csw/mgar/pkg/sgml-xml-common/trunk/Makefile 2009-09-10 00:47:09 UTC (rev 6253) @@ -14,6 +14,8 @@ PREREQUISITE_PKGS = CSWautomake CSWautoconf +ARCHALL = 1 + PACKAGES = CSWxmlcommon CSWsgmlcommon SPKG_DESC_CSWsgmlcommon = A collection of sgml entities and DTDs 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 Sep 10 03:00:17 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 10 Sep 2009 01:00:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[6254] csw/mgar/pkg/sgml-xml-common/trunk/Makefile Message-ID: Revision: 6254 http://gar.svn.sourceforge.net/gar/?rev=6254&view=rev Author: bdwalton Date: 2009-09-10 01:00:16 +0000 (Thu, 10 Sep 2009) Log Message: ----------- sgml-xml-common: use post-install-modulated, not post-install Modified Paths: -------------- csw/mgar/pkg/sgml-xml-common/trunk/Makefile Modified: csw/mgar/pkg/sgml-xml-common/trunk/Makefile =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/Makefile 2009-09-10 00:47:09 UTC (rev 6253) +++ csw/mgar/pkg/sgml-xml-common/trunk/Makefile 2009-09-10 01:00:16 UTC (rev 6254) @@ -75,7 +75,7 @@ automake --add-missing --copy ) @$(MAKECOOKIE) -post-install: +post-install-modulated: # this is almost 100% copy from the sgml-common rpm spec from rhel5 mkdir -p $(DESTDIR)/$(sysconfdir)/xml mkdir -p $(DESTDIR)/$(datadir)/sgml/docbook @@ -98,7 +98,6 @@ "http://www.oasis-open.org/docbook/" \ "file://$(datadir)/sgml/docbook/xmlcatalog" $(XMLCATALOG) # Also create the common DocBook catalog - xmlcatalog --noout --create \ $(DESTDIR)/$(datadir)/sgml/docbook/xmlcatalog rm -f $(DESTDIR)/$(datadir)/sgml/xml.dcl 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 Sep 10 09:38:16 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 10 Sep 2009 07:38:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[6255] csw/mgar/pkg/firefox/trunk Message-ID: Revision: 6255 http://gar.svn.sourceforge.net/gar/?rev=6255&view=rev Author: wbonnet Date: 2009-09-10 07:38:16 +0000 (Thu, 10 Sep 2009) Log Message: ----------- Upgrade to 3.0.14 Modified Paths: -------------- csw/mgar/pkg/firefox/trunk/Makefile csw/mgar/pkg/firefox/trunk/files/.mozconfig Modified: csw/mgar/pkg/firefox/trunk/Makefile =================================================================== --- csw/mgar/pkg/firefox/trunk/Makefile 2009-09-10 01:00:16 UTC (rev 6254) +++ csw/mgar/pkg/firefox/trunk/Makefile 2009-09-10 07:38:16 UTC (rev 6255) @@ -1,5 +1,5 @@ GARNAME = firefox -GARVERSION = 3.0.13 +GARVERSION = 3.0.14 CATEGORIES = x11 DISTNAME = $(GARNAME) Modified: csw/mgar/pkg/firefox/trunk/files/.mozconfig =================================================================== --- csw/mgar/pkg/firefox/trunk/files/.mozconfig 2009-09-10 01:00:16 UTC (rev 6254) +++ csw/mgar/pkg/firefox/trunk/files/.mozconfig 2009-09-10 07:38:16 UTC (rev 6255) @@ -20,6 +20,7 @@ ac_add_options --enable-canvas ac_add_options --enable-system-cairo ac_add_options --disable-pthreads +ac_add_options --enable-system-sqlite ac_add_options --enable-official-branding #ac_add_options --enable-xinerama 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 Sep 10 14:17:31 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 10 Sep 2009 12:17:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[6256] csw/mgar/pkg/cups/branches/cups-1.4 Message-ID: Revision: 6256 http://gar.svn.sourceforge.net/gar/?rev=6256&view=rev Author: wahwah Date: 2009-09-10 12:17:30 +0000 (Thu, 10 Sep 2009) Log Message: ----------- cups: Displaying information about /etc/opt/csw in preinstall scripts. Dropping a note if appropriate. Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4/Makefile csw/mgar/pkg/cups/branches/cups-1.4/checksums Added Paths: ----------- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.preinstall csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.preinstall Removed Paths: ------------- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.postinstall csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.postinstall Modified: csw/mgar/pkg/cups/branches/cups-1.4/Makefile =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-10 07:38:16 UTC (rev 6255) +++ csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-10 12:17:30 UTC (rev 6256) @@ -27,8 +27,8 @@ PATCHFILES = 0001-Makefile.patch DISTFILES = cups-$(GARVERSION)-source.tar.bz2 $(PATCHFILES) -DISTFILES += CSWcupsclient.postinstall -DISTFILES += CSWcupsd.postinstall +DISTFILES += CSWcupsclient.preinstall +DISTFILES += CSWcupsd.preinstall DISTFILES += CSWcupsd.postremove PREREQUISITE_PKGS = CSWggettext Modified: csw/mgar/pkg/cups/branches/cups-1.4/checksums =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-09-10 07:38:16 UTC (rev 6255) +++ csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-09-10 12:17:30 UTC (rev 6256) @@ -1,5 +1,5 @@ 682e10ff0ab0e094c3de2061369038bc download/0001-Makefile.patch -e950ccba9b35ca698de7c52ba1c54688 download/CSWcupsclient.postinstall -e950ccba9b35ca698de7c52ba1c54688 download/CSWcupsd.postinstall +8418cf872043eada2d46c8db6e6451c0 download/CSWcupsclient.preinstall ca7718998e56c320c08a77cfefe046f6 download/CSWcupsd.postremove +8418cf872043eada2d46c8db6e6451c0 download/CSWcupsd.preinstall bc5e777d4320cecdd1a64de8035171a8 download/cups-1.4.0-source.tar.bz2 Deleted: csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.postinstall =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.postinstall 2009-09-10 07:38:16 UTC (rev 6255) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.postinstall 2009-09-10 12:17:30 UTC (rev 6256) @@ -1,14 +0,0 @@ -#!/bin/sh -# -# $Id$ -# - -if [ -d "${PKG_INSTALL_ROOT}/opt/csw/etc/cups" ]; then - echo - echo "*************************************************************" - echo "* The old configuration directory /opt/csw/etc/cups exists. *" - echo "* Please move your configuration to /etc/opt/csw/cups. *" - echo "*************************************************************" - echo - exit 1 -fi Copied: csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.preinstall (from rev 6255, csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.postinstall) =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.preinstall (rev 0) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.preinstall 2009-09-10 12:17:30 UTC (rev 6256) @@ -0,0 +1,34 @@ +#!/bin/sh +# vim:set sw=2 ts=2 sts=2 expandtab: +# +# $Id$ +# + +obsolete_dir_information=" +This configuration directory is obsolete. Current CUPS package is using the +/etc/opt/csw/cups directory. Files in this directory are going to be ignored. +Please move your configuration to /etc/opt/csw/cups. + +Feel free to remove this file afterwards. +" +obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE" + +if [ -d "${PKG_INSTALL_ROOT}/opt/csw/etc/cups" ]; then + echo + echo "*******************************************************************" + echo "* The old configuration directory /opt/csw/etc/cups still exists. *" + echo "* Please move your configuration to /etc/opt/csw/cups. *" + echo "* *" + echo "* Installation will continue in 10 seconds. *" + echo "* Press CTRL+C if you want to stop now. *" + echo "*******************************************************************" + echo + sleep 10 + + # Leaving a note for the sysadmin if the they proceed with the installation. + fn="${PKG_INSTALL_ROOT}/opt/csw/etc/cups/${obsolete_dir_file_name}" + if touch "${fn}" 2>/dev/null; then + echo "${obsolete_dir_information}" > "${fn}" + fi + exit 0 +fi Deleted: csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.postinstall =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.postinstall 2009-09-10 07:38:16 UTC (rev 6255) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.postinstall 2009-09-10 12:17:30 UTC (rev 6256) @@ -1,14 +0,0 @@ -#!/bin/sh -# -# $Id$ -# - -if [ -d "${PKG_INSTALL_ROOT}/opt/csw/etc/cups" ]; then - echo - echo "*************************************************************" - echo "* The old configuration directory /opt/csw/etc/cups exists. *" - echo "* Please move your configuration to /etc/opt/csw/cups. *" - echo "*************************************************************" - echo - exit 1 -fi Copied: csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.preinstall (from rev 6255, csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.postinstall) =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.preinstall (rev 0) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.preinstall 2009-09-10 12:17:30 UTC (rev 6256) @@ -0,0 +1,34 @@ +#!/bin/sh +# vim:set sw=2 ts=2 sts=2 expandtab: +# +# $Id$ +# + +obsolete_dir_information=" +This configuration directory is obsolete. Current CUPS package is using the +/etc/opt/csw/cups directory. Files in this directory are going to be ignored. +Please move your configuration to /etc/opt/csw/cups. + +Feel free to remove this file afterwards. +" +obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE" + +if [ -d "${PKG_INSTALL_ROOT}/opt/csw/etc/cups" ]; then + echo + echo "*******************************************************************" + echo "* The old configuration directory /opt/csw/etc/cups still exists. *" + echo "* Please move your configuration to /etc/opt/csw/cups. *" + echo "* *" + echo "* Installation will continue in 10 seconds. *" + echo "* Press CTRL+C if you want to stop now. *" + echo "*******************************************************************" + echo + sleep 10 + + # Leaving a note for the sysadmin if the they proceed with the installation. + fn="${PKG_INSTALL_ROOT}/opt/csw/etc/cups/${obsolete_dir_file_name}" + if touch "${fn}" 2>/dev/null; then + echo "${obsolete_dir_information}" > "${fn}" + fi + exit 0 +fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Sep 10 16:30:51 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 10 Sep 2009 14:30:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[6257] csw/mgar/pkg Message-ID: Revision: 6257 http://gar.svn.sourceforge.net/gar/?rev=6257&view=rev Author: dmichelsen Date: 2009-09-10 14:30:50 +0000 (Thu, 10 Sep 2009) Log Message: ----------- tcsh: Initial commit Added Paths: ----------- csw/mgar/pkg/tcsh/ csw/mgar/pkg/tcsh/branches/ csw/mgar/pkg/tcsh/tags/ csw/mgar/pkg/tcsh/trunk/ csw/mgar/pkg/tcsh/trunk/Makefile csw/mgar/pkg/tcsh/trunk/checksums csw/mgar/pkg/tcsh/trunk/files/ csw/mgar/pkg/tcsh/trunk/files/CSWtcsh.postinstall csw/mgar/pkg/tcsh/trunk/files/CSWtcsh.postremove Property changes on: csw/mgar/pkg/tcsh/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/tcsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcsh/trunk/Makefile (rev 0) +++ csw/mgar/pkg/tcsh/trunk/Makefile 2009-09-10 14:30:50 UTC (rev 6257) @@ -0,0 +1,33 @@ +GARNAME = tcsh +GARVERSION = 6.17.00 +CATEGORIES = apps + +DESCRIPTION = Enhanced version of the Berkeley C shell (csh) +define BLURB + Tcsh is an enhanced, but completely compatible version of the Berkeley UNIX C shell (csh). + It is a command language interpreter usable both as an interactive login shell and a shell + script command processor. It includes a command-line editor, programmable word completion, + spelling correction, a history mechanism, job control and a C-like syntax. +endef + +MASTER_SITES = ftp://ftp.astron.com/pub/tcsh/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += CSWtcsh.postinstall +DISTFILES += CSWtcsh.postremove + +# 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.tcsh.org/ + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +# Skip tests until this one is fixed: +# http://bugs.gw.com/view.php?id=87 +SKIPTEST = 1 + +INSTALL_ARGS = install.man + +include gar/category.mk Added: csw/mgar/pkg/tcsh/trunk/checksums =================================================================== --- csw/mgar/pkg/tcsh/trunk/checksums (rev 0) +++ csw/mgar/pkg/tcsh/trunk/checksums 2009-09-10 14:30:50 UTC (rev 6257) @@ -0,0 +1,3 @@ +241bfedfd51c5a02581dc60caba3386d download/CSWtcsh.postinstall +9400adc4cb0311fd60635399760926bb download/CSWtcsh.postremove +c47de903e3d52f6824c8dd0c91eeb477 download/tcsh-6.17.00.tar.gz Added: csw/mgar/pkg/tcsh/trunk/files/CSWtcsh.postinstall =================================================================== --- csw/mgar/pkg/tcsh/trunk/files/CSWtcsh.postinstall (rev 0) +++ csw/mgar/pkg/tcsh/trunk/files/CSWtcsh.postinstall 2009-09-10 14:30:50 UTC (rev 6257) @@ -0,0 +1,52 @@ +#!/bin/sh +PATH=/usr/bin +export PATH + +SHELLS=/etc/shells +TCSH=/opt/csw/bin/tcsh + +if [ -z "${PKG_INSTALL_ROOT}" -o "${PKG_INSTALL_ROOT}" = "/" ] +then + RSHELLS=${SHELLS} + RTCSH=${TCSH} +else + RSHELLS=${PKG_INSTALL_ROOT}${SHELLS} + RTCSH=${TCSH} +fi + +if [ -f "${RSHELLS}" ]; then + echo "${RSHELLS} already exists." +else + cat > ${RSHELLS} < /dev/null 2>&1; then + echo "${RSHELLS} UNCHANGED because entry ${RTCSH} already exists." +else + echo "${RTCSH} # Added by CSWtcsh" >> ${RSHELLS} + echo "ADDED ${RTCSH} to ${RSHELLS}." +fi Added: csw/mgar/pkg/tcsh/trunk/files/CSWtcsh.postremove =================================================================== --- csw/mgar/pkg/tcsh/trunk/files/CSWtcsh.postremove (rev 0) +++ csw/mgar/pkg/tcsh/trunk/files/CSWtcsh.postremove 2009-09-10 14:30:50 UTC (rev 6257) @@ -0,0 +1,22 @@ +#!/bin/sh +PATH=/usr/bin +export PATH + +SHELLS=/etc/shells +TCSH=/opt/csw/bin/tcsh + +if [ -z "${PKG_INSTALL_ROOT}" -o "${PKG_INSTALL_ROOT}" = "/" ] +then + RSHELLS=${SHELLS} + RTCSH=${TCSH} +else + RSHELLS=${PKG_INSTALL_ROOT}${SHELLS} + RTCSH=${TCSH} +fi + +if /usr/bin/grep "^${RTCSH}" ${RSHELLS} > /dev/null 2>&1; then + /usr/bin/perl -i -pwe '$_ = "" if m%^'${RTCSH}'%' ${RSHELLS} + echo "REMOVED ${RTCSH} from ${RSHELLS}." +else + echo "${RSHELLS} UNCHANGED because it did not contain entry ${RTCSH}." +fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Sep 10 16:36:36 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 10 Sep 2009 14:36:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[6258] csw/mgar/pkg/tcsh/trunk/Makefile Message-ID: Revision: 6258 http://gar.svn.sourceforge.net/gar/?rev=6258&view=rev Author: dmichelsen Date: 2009-09-10 14:36:36 +0000 (Thu, 10 Sep 2009) Log Message: ----------- tcsh: Add missing dependency Modified Paths: -------------- csw/mgar/pkg/tcsh/trunk/Makefile Modified: csw/mgar/pkg/tcsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcsh/trunk/Makefile 2009-09-10 14:30:50 UTC (rev 6257) +++ csw/mgar/pkg/tcsh/trunk/Makefile 2009-09-10 14:36:36 UTC (rev 6258) @@ -18,6 +18,8 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +REQUIRED_PKGS = CSWiconv + SPKG_SOURCEURL = http://www.tcsh.org/ CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Sep 10 16:44:20 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 10 Sep 2009 14:44:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[6259] csw/mgar/pkg Message-ID: Revision: 6259 http://gar.svn.sourceforge.net/gar/?rev=6259&view=rev Author: dmichelsen Date: 2009-09-10 14:44:19 +0000 (Thu, 10 Sep 2009) Log Message: ----------- tcpwrappers: Adjust name and description Modified Paths: -------------- csw/mgar/pkg/tcpwrappers/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/tcpwrappers/ Removed Paths: ------------- csw/mgar/pkg/tcp_wrappers/ Property Changed: ---------------- csw/mgar/pkg/tcpwrappers/trunk/ Property changes on: csw/mgar/pkg/tcpwrappers/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/tcpwrappers/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcp_wrappers/trunk/Makefile 2009-09-08 06:50:46 UTC (rev 6223) +++ csw/mgar/pkg/tcpwrappers/trunk/Makefile 2009-09-10 14:44:19 UTC (rev 6259) @@ -2,7 +2,7 @@ GARVERSION = 7.6 CATEGORIES = lib -DESCRIPTION = Socket Wrappers +DESCRIPTION = Socket wrappers for pre-screening tcp connections (ipv6.4 patched) define BLURB Socket Wrappers is an improved version of tcp_wrappers by Wietse Venema. endef 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 Sep 11 02:04:28 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 11 Sep 2009 00:04:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[6260] csw/mgar/pkg/openjade/trunk Message-ID: Revision: 6260 http://gar.svn.sourceforge.net/gar/?rev=6260&view=rev Author: bdwalton Date: 2009-09-11 00:04:27 +0000 (Fri, 11 Sep 2009) Log Message: ----------- openjade: transition sysconfdir to /etc/opt/csw Modified Paths: -------------- csw/mgar/pkg/openjade/trunk/Makefile csw/mgar/pkg/openjade/trunk/checksums csw/mgar/pkg/openjade/trunk/files/CSWopenjade.postinstall csw/mgar/pkg/openjade/trunk/files/CSWopenjade.preremove Modified: csw/mgar/pkg/openjade/trunk/Makefile =================================================================== --- csw/mgar/pkg/openjade/trunk/Makefile 2009-09-10 14:44:19 UTC (rev 6259) +++ csw/mgar/pkg/openjade/trunk/Makefile 2009-09-11 00:04:27 UTC (rev 6260) @@ -35,13 +35,15 @@ CONFIGURE_ARGS = $(DIRPATHS) --disable-static CONFIGURE_ARGS += --datadir=$(datadir)/sgml/$(GARNAME) CONFIGURE_ARGS += --enable-splibdir=$(libdir) -CONFIGURE_ARGS += --enable-default-catalog=/opt/csw/etc/sgml/catalog +CONFIGURE_ARGS += --enable-default-catalog=$(sysconfdir)/sgml/catalog CONFIGURE_ARGS += --disable-static TEST_SCRIPTS = INSTALL_ARGS = install install-man +sysconfdir = /etc/opt/csw + include gar/category.mk sgmldir = $(DESTDIR)/$(datadir)/sgml/$(GARNAME) Modified: csw/mgar/pkg/openjade/trunk/checksums =================================================================== --- csw/mgar/pkg/openjade/trunk/checksums 2009-09-10 14:44:19 UTC (rev 6259) +++ csw/mgar/pkg/openjade/trunk/checksums 2009-09-11 00:04:27 UTC (rev 6260) @@ -1,4 +1,4 @@ +1539a69dfac961f0e419cf368f7428e1 download/CSWopenjade.postinstall +e229cb1006dca1505d85b43ff0501e2f download/CSWopenjade.preremove +ca3a0ff43d8ed182f432d723927cd2e9 download/openjade-1.3.1-nsl.patch 7df692e3186109cc00db6825b777201e download/openjade-1.3.2.tar.gz -6667b082aba6cb3ca4979da01af4f4e7 download/CSWopenjade.postinstall -6b1a129259142b0a41a39e984e7a4e43 download/CSWopenjade.preremove -ca3a0ff43d8ed182f432d723927cd2e9 download/openjade-1.3.1-nsl.patch Modified: csw/mgar/pkg/openjade/trunk/files/CSWopenjade.postinstall =================================================================== --- csw/mgar/pkg/openjade/trunk/files/CSWopenjade.postinstall 2009-09-10 14:44:19 UTC (rev 6259) +++ csw/mgar/pkg/openjade/trunk/files/CSWopenjade.postinstall 2009-09-11 00:04:27 UTC (rev 6260) @@ -1,6 +1,6 @@ #!/bin/sh -CONFCAT=/opt/csw/etc/sgml/openjade.soc +CONFCAT=/etc/opt/csw/sgml/openjade.soc CATALOG=/opt/csw/share/sgml/openjade/catalog insterror() @@ -8,7 +8,7 @@ cat < Revision: 6261 http://gar.svn.sourceforge.net/gar/?rev=6261&view=rev Author: bdwalton Date: 2009-09-11 00:31:04 +0000 (Fri, 11 Sep 2009) Log Message: ----------- docbook-dtds: update sysconfdir to /etc/opt/csw Modified Paths: -------------- csw/mgar/pkg/docbook-dtds/trunk/checksums csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove Modified: csw/mgar/pkg/docbook-dtds/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/checksums 2009-09-11 00:04:27 UTC (rev 6260) +++ csw/mgar/pkg/docbook-dtds/trunk/checksums 2009-09-11 00:31:04 UTC (rev 6261) @@ -1,5 +1,5 @@ -6be301db3001ff1ff49ce22187502c29 download/CSWdocbookdtds.postinstall -b531bfd5f43d49469f1bfe2daba471cf download/CSWdocbookdtds.preremove +e7ba1cae44ae889b32c326f0a46f2c81 download/CSWdocbookdtds.postinstall +da4b8f64c222276d2c291bf8afb20517 download/CSWdocbookdtds.preremove d22f42e2f4d073461f202a12fabb5b8a download/add_makefile.patch 9a7f5b1b7dd52d0ca4fb080619f0459c download/docbk30.zip 432749c0c806dbae81c8bcb70da3b5d3 download/docbk31.zip @@ -11,7 +11,6 @@ e3beb1b0b2923c24fa55a68e88654b01 download/docbook-4.3.zip f89e1bd0b2c7a361e3f1f739e16b5d0d download/docbook-4.4.zip 07c581f4bbcba6d3aac85360a19f95f7 download/docbook-4.5.zip -2411c19ed4fb141f3fa3d389fae40736 download/docbook-5.0.zip e3067045964536cc7445d5c3f1e99916 download/docbook-dtd30-sgml-1.0.catalog.patch 856d40f5d1e3fc8fd939b88bf5fedc87 download/docbook-dtd31-sgml-1.0.catalog.patch 8167663f53857ded5095768a85eee387 download/docbook-dtd40-sgml-1.0.catalog.patch Modified: csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall 2009-09-11 00:04:27 UTC (rev 6260) +++ csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall 2009-09-11 00:31:04 UTC (rev 6261) @@ -10,7 +10,7 @@ esac XMLCAT=/opt/csw/bin/xmlcatalog -CSWSGMLCNF=/opt/csw/etc/sgml +CSWSGMLCNF=/etc/opt/csw/sgml CSWSGML=/opt/csw/share/sgml ## Modified: csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove 2009-09-11 00:04:27 UTC (rev 6260) +++ csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove 2009-09-11 00:31:04 UTC (rev 6261) @@ -10,7 +10,7 @@ esac XMLCAT=/opt/csw/bin/xmlcatalog -CSWSGMLCNF=/opt/csw/etc/sgml +CSWSGMLCNF=/etc/opt/csw/sgml CSWSGML=/opt/csw/share/sgml ## 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 Sep 11 02:34:56 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 11 Sep 2009 00:34:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[6262] csw/mgar/pkg/docbook-dtds/trunk Message-ID: Revision: 6262 http://gar.svn.sourceforge.net/gar/?rev=6262&view=rev Author: bdwalton Date: 2009-09-11 00:34:56 +0000 (Fri, 11 Sep 2009) Log Message: ----------- docbook-dtds: update patch to new sysconfdir, strip docbook 5 stuff Modified Paths: -------------- csw/mgar/pkg/docbook-dtds/trunk/Makefile csw/mgar/pkg/docbook-dtds/trunk/checksums csw/mgar/pkg/docbook-dtds/trunk/files/add_makefile.patch Modified: csw/mgar/pkg/docbook-dtds/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/Makefile 2009-09-11 00:31:04 UTC (rev 6261) +++ csw/mgar/pkg/docbook-dtds/trunk/Makefile 2009-09-11 00:34:56 UTC (rev 6262) @@ -5,7 +5,7 @@ # version supplied in the package. GARNAME = docbookdtds -GARVERSION = 5.0 +GARVERSION = 4.5 CATEGORIES = xtra @@ -47,13 +47,12 @@ O_SRC += $(OASIS)/xml/4.2/ D_SRC = $(DOCBOOK)/sgml/4.3/ $(DOCBOOK)/xml/4.3/ $(DOCBOOK)/sgml/4.4/ D_SRC += $(DOCBOOK)/xml/4.4/ $(DOCBOOK)/sgml/4.5/ $(DOCBOOK)/xml/4.5/ -D_SRC += $(DOCBOOK)/xml/5.0/ # the various files we'll need to fetch from the various sources DBFILES = docbk30.zip docbk31.zip docbk40.zip docbk41.zip docbkx412.zip DBFILES += docbook-4.2.zip docbook-xml-4.2.zip docbook-4.3.zip DBFILES += docbook-xml-4.3.zip docbook-4.4.zip docbook-xml-4.4.zip -DBFILES += docbook-4.5.zip docbook-xml-4.5.zip docbook-5.0.zip +DBFILES += docbook-4.5.zip docbook-xml-4.5.zip MASTER_SITES = $(O_SRC) $(D_SRC) DISTFILES = $(DBFILES) @@ -146,13 +145,6 @@ unzip $(DOWNLOADDIR)/docbook-xml-4.5.zip -d $(WORKSRC)/4.5-xml @$(MAKECOOKIE) -zip-extract-docbook-5.0.zip: - ginstall -d $(WORKSRC)/5.0-xml - unzip $(DOWNLOADDIR)/docbook-5.0.zip -d $(WORKSRC)/5.0-xml - mv $(WORKSRC)/5.0-xml/docbook-5.0/* $(WORKSRC)/5.0-xml/ - rmdir $(WORKSRC)/5.0-xml/docbook-5.0 - @$(MAKECOOKIE) - post-extract: # Increase NAMELEN (bug #36058, bug #159382). [bug references from # rpm .spec file] Modified: csw/mgar/pkg/docbook-dtds/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/checksums 2009-09-11 00:31:04 UTC (rev 6261) +++ csw/mgar/pkg/docbook-dtds/trunk/checksums 2009-09-11 00:34:56 UTC (rev 6262) @@ -1,6 +1,6 @@ e7ba1cae44ae889b32c326f0a46f2c81 download/CSWdocbookdtds.postinstall da4b8f64c222276d2c291bf8afb20517 download/CSWdocbookdtds.preremove -d22f42e2f4d073461f202a12fabb5b8a download/add_makefile.patch +9b4a512082ff0851ad3d705072dd5523 download/add_makefile.patch 9a7f5b1b7dd52d0ca4fb080619f0459c download/docbk30.zip 432749c0c806dbae81c8bcb70da3b5d3 download/docbk31.zip fabcf7dd1d88b94797b7e5344389eab9 download/docbk40.zip Modified: csw/mgar/pkg/docbook-dtds/trunk/files/add_makefile.patch =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/add_makefile.patch 2009-09-11 00:31:04 UTC (rev 6261) +++ csw/mgar/pkg/docbook-dtds/trunk/files/add_makefile.patch 2009-09-11 00:34:56 UTC (rev 6262) @@ -1,8 +1,8 @@ --- /dev/null 2008-12-15 18:41:04.000000000 +0100 +++ docbookdtds-5.0/Makefile 2008-12-15 18:55:18.651895350 +0100 -@@ -0,0 +1,96 @@ +@@ -0,0 +1,84 @@ +prefix = /opt/csw -+sysconfdir = $(prefix)/etc ++sysconfdir = /etc/opt/csw +datadir = $(prefix)/share + + @@ -53,8 +53,6 @@ + [ -d $$dir ] || $(INSTALL_DIR) $$dir; \ + $(INSTALL_DATA) $$x.1-sgml/ChangeLog $$dir/; \ + done -+ $(INSTALL_DIR) $(DESTDIR)/$(docdir)/5.0 -+ cp -R 5.0-xml/docs/ $(DESTDIR)/$(docdir)/5.0/ + +inst-%-sgml: DD=$(DESTDIR)/$(docbookdir)/sgml-dtd-$* +inst-%-sgml: @@ -82,16 +80,6 @@ + $(INSTALL_DATA) ent/* $(DD)/ent/; \ + fi ) + -+inst-5.0-xml: DD=$(DESTDIR)/$(docbookdir)/xml-schemas-5.0 -+inst-5.0-xml: -+ @echo Installing 5.0-xml -+ @( cd 5.0-xml/; \ -+ gmkdir -p $(DD); \ -+ for d in dtd rng sch xsd; do \ -+ cp -R $$d $(DD); \ -+ done; \ -+ $(INSTALL_DATA) catalog.xml $(DD)/catalog; ) -+ +build: + @echo Nothing to build...dummy statement in action. + 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 Sep 11 02:45:21 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 11 Sep 2009 00:45:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[6263] csw/mgar/pkg/docbook-style-xsl/trunk Message-ID: Revision: 6263 http://gar.svn.sourceforge.net/gar/?rev=6263&view=rev Author: bdwalton Date: 2009-09-11 00:45:21 +0000 (Fri, 11 Sep 2009) Log Message: ----------- docbook-style-xsl: update sysconfdir to /etc/opt/csw Modified Paths: -------------- csw/mgar/pkg/docbook-style-xsl/trunk/checksums csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.preremove Modified: csw/mgar/pkg/docbook-style-xsl/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/checksums 2009-09-11 00:34:56 UTC (rev 6262) +++ csw/mgar/pkg/docbook-style-xsl/trunk/checksums 2009-09-11 00:45:21 UTC (rev 6263) @@ -1,4 +1,4 @@ -1b98827c1a02fcec57ec0f7376bb8815 download/CSWdocbookxsl.preremove +d3ed0cb0129de0b619aba6ab4d556126 download/CSWdocbookxsl.preremove 6c34caa4c60bf8bd16d6059fee60eb85 download/add_makefile.patch c77c0c317040b2f2e366842bd9df2218 download/docbook-xsl-1.74.3.tar.bz2 2a032a95fbf24367d13acc8210f9cd72 download/docbook-xsl-doc-1.74.3.tar.bz2 Modified: csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall 2009-09-11 00:34:56 UTC (rev 6262) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall 2009-09-11 00:45:21 UTC (rev 6263) @@ -12,7 +12,7 @@ DBHOME=/opt/csw/share/sgml/docbook -CATALOG=/opt/csw/etc/xml/catalog +CATALOG=/etc/opt/csw/xml/catalog #we need a version here, since that will be referenced in URLS being redirected VERSION=$(GARVERSION) Modified: csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.preremove =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.preremove 2009-09-11 00:34:56 UTC (rev 6262) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.preremove 2009-09-11 00:45:21 UTC (rev 6263) @@ -7,7 +7,7 @@ PATH=/opt/csw/bin:$PATH -CATALOG=/opt/csw/etc/xml/catalog +CATALOG=/etc/opt/csw/xml/catalog XMLCAT=/opt/csw/bin/xmlcatalog DBHOME=/opt/csw/share/sgml/docbook 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 Sep 11 10:48:23 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Sep 2009 08:48:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6264] csw/mgar/pkg/krb5/trunk Message-ID: Revision: 6264 http://gar.svn.sourceforge.net/gar/?rev=6264&view=rev Author: dmichelsen Date: 2009-09-11 08:48:23 +0000 (Fri, 11 Sep 2009) Log Message: ----------- krb5: Switch to dynamic gspec Modified Paths: -------------- csw/mgar/pkg/krb5/trunk/Makefile csw/mgar/pkg/krb5/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/krb5/trunk/files/CSWkrb5adminserver.depend csw/mgar/pkg/krb5/trunk/files/CSWkrb5adminserver.gspec csw/mgar/pkg/krb5/trunk/files/CSWkrb5doc.gspec csw/mgar/pkg/krb5/trunk/files/CSWkrb5kdc.depend csw/mgar/pkg/krb5/trunk/files/CSWkrb5kdc.gspec csw/mgar/pkg/krb5/trunk/files/CSWkrb5lib.gspec csw/mgar/pkg/krb5/trunk/files/CSWkrb5libdev.depend csw/mgar/pkg/krb5/trunk/files/CSWkrb5libdev.gspec csw/mgar/pkg/krb5/trunk/files/CSWkrb5user.depend csw/mgar/pkg/krb5/trunk/files/CSWkrb5user.gspec Modified: csw/mgar/pkg/krb5/trunk/Makefile =================================================================== --- csw/mgar/pkg/krb5/trunk/Makefile 2009-09-11 00:45:21 UTC (rev 6263) +++ csw/mgar/pkg/krb5/trunk/Makefile 2009-09-11 08:48:23 UTC (rev 6264) @@ -1,5 +1,5 @@ GARNAME = krb5 -GARVERSION = 1.6.3 +GARVERSION = 1.7 CATEGORIES = server DESCRIPTION = MIT Kerberos 5 @@ -11,23 +11,37 @@ Kerberos is available in many commercial products as well. endef -MASTER_SITES = http://web.mit.edu/kerberos/dist/krb5/1.6/ +MASTER_SITES = http://web.mit.edu/kerberos/dist/krb5/1.7/ DISTFILES = $(GARNAME)-$(GARVERSION)-signed.tar -DISTFILES += $(call admfiles,CSWkrb5adminserver,depend) -DISTFILES += $(call admfiles,CSWkrb5doc) -DISTFILES += $(call admfiles,CSWkrb5kdc,depend) -DISTFILES += $(call admfiles,CSWkrb5lib) -DISTFILES += $(call admfiles,CSWkrb5libdev,depend) -DISTFILES += $(call admfiles,CSWkrb5user,depend) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-signed.tar -PATCHFILES = patch-man2html-perl.diff -PATCHFILES += patch-ldap-const.diff +PATCHFILES = patch-man2html-perl.diff PREREQUISITE_PKGS = CSWtcl +PACKAGES = CSWkrb5adminserver CSWkrb5doc CSWkrb5kdc CSWkrb5lib CSWkrb5libdev CSWkrb5user + +CATALOGNAME_CSWkrb5adminserver = krb5_admin_server +CATALOGNAME_CSWkrb5doc = krb5_doc +CATALOGNAME_CSWkrb5kdc = krb5_kdc +CATALOGNAME_CSWkrb5lib = krb5_lib +CATALOGNAME_CSWkrb5libdev = krb5_lib_dev +CATALOGNAME_CSWkrb5user = krb5_user + +SPKG_DESC_CSWkrb5adminserver = MIT Kerberos 5 admin server +SPKG_DESC_CSWkrb5doc = MIT Kerberos 5 documentation +SPKG_DESC_CSWkrb5kdc = MIT Kerberos 5 key distribution center +SPKG_DESC_CSWkrb5lib = MIT Kerberos 5 core libraries +SPKG_DESC_CSWkrb5libdev = MIT Kerberos 5 developer libraries +SPKG_DESC_CSWkrb5user = MIT Kerberos 5 user tools + +REQUIRED_PKGS_CSWkrb5adminserver = CSWkrb5kdc CSWkrb5lib +REQUIRED_PKGS_CSWkrb5kdc = CSWkrb5lib CSWkrb5user +REQUIRED_PKGS_CSWkrb5libdev = CSWkrb5lib +REQUIRED_PKGS_CSWkrb5user = CSWkrb5lib + CONFIGURE_SCRIPTS = $(WORKSRC)/src/configure CONFIGURE_ARGS = $(DIRPATHS) @@ -51,6 +65,8 @@ INSTALL_SCRIPTS = $(WORKSRC)/src/Makefile custom +ARCHALL_CSWkrb5doc = 1 + ADMINSERVER_BINS = kprop|kadmind|kadmin\.local PKGFILES_CSWkrb5adminserver = $(mandir)/man8/($(ADMINSERVER_BINS))\.8 PKGFILES_CSWkrb5adminserver += $(sbindir)/($(ADMINSERVER_BINS)) @@ -78,7 +94,7 @@ #PKGFILES_CSWkrb5user += $(sharedstatedir)/examples/krb5/krb5.conf #PKGFILES_CSWkrb5user += $(bindir)/($(USER_BINS)) -include ../category.mk +include gar/category.mk # The flags must not contain additional spaces or the build freaks out CFLAGS := $(strip $(CFLAGS) -L$(libdir)/$(MM_LIBDIR)) Modified: csw/mgar/pkg/krb5/trunk/checksums =================================================================== --- csw/mgar/pkg/krb5/trunk/checksums 2009-09-11 00:45:21 UTC (rev 6263) +++ csw/mgar/pkg/krb5/trunk/checksums 2009-09-11 08:48:23 UTC (rev 6264) @@ -1,13 +1,2 @@ -2dc1307686eb1c2bf1ab08ea805dad46 download/krb5-1.6.3-signed.tar -4b4d4cdcfc8e1efe5b09afc99ced8b42 download/CSWkrb5adminserver.gspec -49280cd0857ae223a08f79d97f51c758 download/CSWkrb5adminserver.depend -7a114a5ffc41478c1ab44bacf6e58b18 download/CSWkrb5doc.gspec -8b64f180abcb2fc0f52862f1f0bad155 download/CSWkrb5kdc.gspec -968dff3e3871662fd18b87697486ada2 download/CSWkrb5kdc.depend -57fa9780920e48ee33abcde4468fd5aa download/CSWkrb5lib.gspec -83d0d5e0e3a583f87f7863c34ac1fc5e download/CSWkrb5libdev.gspec -c60f034ec718df26523f61b6e5f3f2cb download/CSWkrb5libdev.depend -0f7ea63e215a904821e5ad23ecb3b020 download/CSWkrb5user.gspec -c60f034ec718df26523f61b6e5f3f2cb download/CSWkrb5user.depend +9f7b3402b4731a7fa543db193bf1b564 download/krb5-1.7-signed.tar 6c2c7718f024c85f66fdc26398090c23 download/patch-man2html-perl.diff -1516a86bd7b8d0ccc4462077105723f4 download/patch-ldap-const.diff Deleted: csw/mgar/pkg/krb5/trunk/files/CSWkrb5adminserver.depend =================================================================== --- csw/mgar/pkg/krb5/trunk/files/CSWkrb5adminserver.depend 2009-09-11 00:45:21 UTC (rev 6263) +++ csw/mgar/pkg/krb5/trunk/files/CSWkrb5adminserver.depend 2009-09-11 08:48:23 UTC (rev 6264) @@ -1,2 +0,0 @@ -P CSWkrb5kdc krb5_kdc - MIT Kerberos 5 key distribution center -P CSWkrb5lib krb5_lib - MIT Kerberos 5 core libraries Deleted: csw/mgar/pkg/krb5/trunk/files/CSWkrb5adminserver.gspec =================================================================== --- csw/mgar/pkg/krb5/trunk/files/CSWkrb5adminserver.gspec 2009-09-11 00:45:21 UTC (rev 6263) +++ csw/mgar/pkg/krb5/trunk/files/CSWkrb5adminserver.gspec 2009-09-11 08:48:23 UTC (rev 6264) @@ -1,5 +0,0 @@ -%var bitname krb5_admin_server -%var pkgname CSWkrb5adminserver -%var desc MIT Kerberos 5 admin server -%include url file://%{PKGLIB}/csw_dyndepend.gspec -#%copyright url file://%{WORKSRC}/COPYRIGHT Deleted: csw/mgar/pkg/krb5/trunk/files/CSWkrb5doc.gspec =================================================================== --- csw/mgar/pkg/krb5/trunk/files/CSWkrb5doc.gspec 2009-09-11 00:45:21 UTC (rev 6263) +++ csw/mgar/pkg/krb5/trunk/files/CSWkrb5doc.gspec 2009-09-11 08:48:23 UTC (rev 6264) @@ -1,5 +0,0 @@ -%var bitname krb5_doc -%var pkgname CSWkrb5doc -%var desc MIT Kerberos 5 documentation -%include url file://%{PKGLIB}/csw_dyndepend.gspec -#%copyright url file://%{WORKSRC}/COPYRIGHT Deleted: csw/mgar/pkg/krb5/trunk/files/CSWkrb5kdc.depend =================================================================== --- csw/mgar/pkg/krb5/trunk/files/CSWkrb5kdc.depend 2009-09-11 00:45:21 UTC (rev 6263) +++ csw/mgar/pkg/krb5/trunk/files/CSWkrb5kdc.depend 2009-09-11 08:48:23 UTC (rev 6264) @@ -1,2 +0,0 @@ -P CSWkrb5lib krb5_lib - MIT Kerberos 5 core libraries -P CSWkrb5user krb5_user - MIT Kerberos 5 user tools Deleted: csw/mgar/pkg/krb5/trunk/files/CSWkrb5kdc.gspec =================================================================== --- csw/mgar/pkg/krb5/trunk/files/CSWkrb5kdc.gspec 2009-09-11 00:45:21 UTC (rev 6263) +++ csw/mgar/pkg/krb5/trunk/files/CSWkrb5kdc.gspec 2009-09-11 08:48:23 UTC (rev 6264) @@ -1,5 +0,0 @@ -%var bitname krb5_kdc -%var pkgname CSWkrb5kdc -%var desc MIT Kerberos 5 key distribution center -%include url file://%{PKGLIB}/csw_dyndepend.gspec -#%copyright url file://%{WORKSRC}/COPYRIGHT Deleted: csw/mgar/pkg/krb5/trunk/files/CSWkrb5lib.gspec =================================================================== --- csw/mgar/pkg/krb5/trunk/files/CSWkrb5lib.gspec 2009-09-11 00:45:21 UTC (rev 6263) +++ csw/mgar/pkg/krb5/trunk/files/CSWkrb5lib.gspec 2009-09-11 08:48:23 UTC (rev 6264) @@ -1,5 +0,0 @@ -%var bitname krb5_lib -%var pkgname CSWkrb5lib -%var desc MIT Kerberos 5 core libraries -%include url file://%{PKGLIB}/csw_dyndepend.gspec -#%copyright url file://%{WORKSRC}/COPYRIGHT Deleted: csw/mgar/pkg/krb5/trunk/files/CSWkrb5libdev.depend =================================================================== --- csw/mgar/pkg/krb5/trunk/files/CSWkrb5libdev.depend 2009-09-11 00:45:21 UTC (rev 6263) +++ csw/mgar/pkg/krb5/trunk/files/CSWkrb5libdev.depend 2009-09-11 08:48:23 UTC (rev 6264) @@ -1 +0,0 @@ -P CSWkrb5lib krb5_lib - MIT Kerberos 5 core libraries Deleted: csw/mgar/pkg/krb5/trunk/files/CSWkrb5libdev.gspec =================================================================== --- csw/mgar/pkg/krb5/trunk/files/CSWkrb5libdev.gspec 2009-09-11 00:45:21 UTC (rev 6263) +++ csw/mgar/pkg/krb5/trunk/files/CSWkrb5libdev.gspec 2009-09-11 08:48:23 UTC (rev 6264) @@ -1,5 +0,0 @@ -%var bitname krb5_lib_dev -%var pkgname CSWkrb5libdev -%var desc MIT Kerberos 5 developer libraries -%include url file://%{PKGLIB}/csw_dyndepend.gspec -#%copyright url file://%{WORKSRC}/COPYRIGHT Deleted: csw/mgar/pkg/krb5/trunk/files/CSWkrb5user.depend =================================================================== --- csw/mgar/pkg/krb5/trunk/files/CSWkrb5user.depend 2009-09-11 00:45:21 UTC (rev 6263) +++ csw/mgar/pkg/krb5/trunk/files/CSWkrb5user.depend 2009-09-11 08:48:23 UTC (rev 6264) @@ -1 +0,0 @@ -P CSWkrb5lib krb5_lib - MIT Kerberos 5 core libraries Deleted: csw/mgar/pkg/krb5/trunk/files/CSWkrb5user.gspec =================================================================== --- csw/mgar/pkg/krb5/trunk/files/CSWkrb5user.gspec 2009-09-11 00:45:21 UTC (rev 6263) +++ csw/mgar/pkg/krb5/trunk/files/CSWkrb5user.gspec 2009-09-11 08:48:23 UTC (rev 6264) @@ -1,5 +0,0 @@ -%var bitname krb5_user -%var pkgname CSWkrb5user -%var desc MIT Kerberos 5 user tools -%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 d_pocock at users.sourceforge.net Fri Sep 11 11:22:46 2009 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Fri, 11 Sep 2009 09:22:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6265] csw/mgar/pkg/ganglia/trunk/checksums Message-ID: Revision: 6265 http://gar.svn.sourceforge.net/gar/?rev=6265&view=rev Author: d_pocock Date: 2009-09-11 09:22:45 +0000 (Fri, 11 Sep 2009) Log Message: ----------- Add checksum Added Paths: ----------- csw/mgar/pkg/ganglia/trunk/checksums Added: csw/mgar/pkg/ganglia/trunk/checksums =================================================================== --- csw/mgar/pkg/ganglia/trunk/checksums (rev 0) +++ csw/mgar/pkg/ganglia/trunk/checksums 2009-09-11 09:22:45 UTC (rev 6265) @@ -0,0 +1,6 @@ +f3436682e339279357aa98473a9f2b8a download/CSWgangliaweb.postinstall +c4c333a46db391464e372ad8ede4993c download/CSWgangliaweb.preremove +25d302948e25837bf17757d5e23e4955 download/cswgmetad +c6bb96c949dbb989d06ebb36b6af885d download/cswgmond +aaba09a6fa897ed581789f679f7ca62d download/ganglia-3.1.2.tar.gz +2ff504ecb546aca2cdd6ee09af9a417e download/httpd-ganglia.conf.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 Sep 11 14:37:32 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Sep 2009 12:37:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[6266] csw/mgar/pkg Message-ID: Revision: 6266 http://gar.svn.sourceforge.net/gar/?rev=6266&view=rev Author: dmichelsen Date: 2009-09-11 12:37:31 +0000 (Fri, 11 Sep 2009) Log Message: ----------- gdome2: Initial commit Added Paths: ----------- csw/mgar/pkg/gdome2/ csw/mgar/pkg/gdome2/branches/ csw/mgar/pkg/gdome2/tags/ csw/mgar/pkg/gdome2/trunk/ csw/mgar/pkg/gdome2/trunk/Makefile csw/mgar/pkg/gdome2/trunk/checksums csw/mgar/pkg/gdome2/trunk/files/ csw/mgar/pkg/gdome2/trunk/files/patch-nowall.diff Property changes on: csw/mgar/pkg/gdome2/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/gdome2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdome2/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gdome2/trunk/Makefile 2009-09-11 12:37:31 UTC (rev 6266) @@ -0,0 +1,24 @@ +GARNAME = gdome2 +GARVERSION = 0.8.1 +CATEGORIES = lib + +DESCRIPTION = A DOM Level 2 Implementation +define BLURB + libgdome, the DOM C library developped for the Gnome project +endef + +MASTER_SITES = http://gdome2.cs.unibo.it/tarball/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = patch-nowall.diff + +REQUIRED_PKGS = CSWggettextrt CSWglib2 CSWiconv CSWlibxml2 CSWzlib + +# 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://gdome2.cs.unibo.it/ + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/gdome2/trunk/checksums =================================================================== --- csw/mgar/pkg/gdome2/trunk/checksums (rev 0) +++ csw/mgar/pkg/gdome2/trunk/checksums 2009-09-11 12:37:31 UTC (rev 6266) @@ -0,0 +1,2 @@ +bfc114e59eec50cbda8e4ece751ff022 download/gdome2-0.8.1.tar.gz +735f58dbc4b9524f313088fa02d0434b download/patch-nowall.diff Added: csw/mgar/pkg/gdome2/trunk/files/patch-nowall.diff =================================================================== --- csw/mgar/pkg/gdome2/trunk/files/patch-nowall.diff (rev 0) +++ csw/mgar/pkg/gdome2/trunk/files/patch-nowall.diff 2009-09-11 12:37:31 UTC (rev 6266) @@ -0,0 +1,171 @@ +diff -Naur gdome2-0.8.1.orig/configure gdome2-0.8.1.patched/configure +--- gdome2-0.8.1.orig/configure 2003-10-05 22:52:20.000000000 +0200 ++++ gdome2-0.8.1.patched/configure 2009-09-11 12:00:18.168479806 +0200 +@@ -1507,7 +1507,7 @@ + fi + + if test $ac_cv_header_stdc = yes; then +- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. ++ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using . + if test "$cross_compiling" = yes; then + : + else +diff -Naur gdome2-0.8.1.orig/libgdome/Makefile.am gdome2-0.8.1.patched/libgdome/Makefile.am +--- gdome2-0.8.1.orig/libgdome/Makefile.am 2002-07-16 16:15:56.000000000 +0200 ++++ gdome2-0.8.1.patched/libgdome/Makefile.am 2009-09-11 12:00:17.924132266 +0200 +@@ -12,7 +12,7 @@ + -I$(top_srcdir)/libgdome/events \ + -I$(top_srcdir)/libgdome/xpath \ + $(LIBXML_CFLAGS) $(GLIB_CFLAGS) \ +- -Wall -ansi \ ++ \ + $(NULL) + + lib_LTLIBRARIES = libgdome.la +diff -Naur gdome2-0.8.1.orig/libgdome/Makefile.in gdome2-0.8.1.patched/libgdome/Makefile.in +--- gdome2-0.8.1.orig/libgdome/Makefile.in 2003-10-05 22:52:47.000000000 +0200 ++++ gdome2-0.8.1.patched/libgdome/Makefile.in 2009-09-11 12:00:17.964737249 +0200 +@@ -111,7 +111,7 @@ + -I$(top_srcdir)/libgdome/events \ + -I$(top_srcdir)/libgdome/xpath \ + $(LIBXML_CFLAGS) $(GLIB_CFLAGS) \ +- -Wall -ansi \ ++ \ + $(NULL) + + +diff -Naur gdome2-0.8.1.orig/libgdome/events/Makefile.am gdome2-0.8.1.patched/libgdome/events/Makefile.am +--- gdome2-0.8.1.orig/libgdome/events/Makefile.am 2001-05-19 16:18:35.000000000 +0200 ++++ gdome2-0.8.1.patched/libgdome/events/Makefile.am 2009-09-11 12:00:17.938633857 +0200 +@@ -4,7 +4,7 @@ + -I$(top_srcdir)/libgdome/gdomecore \ + $(LIBXML_CFLAGS) \ + $(GLIB_CFLAGS) \ +- -Wall -ansi \ ++ \ + $(NULL) + + noinst_LTLIBRARIES = libgdomeevents.la +diff -Naur gdome2-0.8.1.orig/libgdome/events/Makefile.in gdome2-0.8.1.patched/libgdome/events/Makefile.in +--- gdome2-0.8.1.orig/libgdome/events/Makefile.in 2003-10-05 22:52:49.000000000 +0200 ++++ gdome2-0.8.1.patched/libgdome/events/Makefile.in 2009-09-11 12:00:17.942890311 +0200 +@@ -102,7 +102,7 @@ + -I$(top_srcdir)/libgdome/gdomecore \ + $(LIBXML_CFLAGS) \ + $(GLIB_CFLAGS) \ +- -Wall -ansi \ ++ \ + $(NULL) + + +diff -Naur gdome2-0.8.1.orig/libgdome/gdomecore/Makefile.am gdome2-0.8.1.patched/libgdome/gdomecore/Makefile.am +--- gdome2-0.8.1.orig/libgdome/gdomecore/Makefile.am 2002-04-03 09:05:00.000000000 +0200 ++++ gdome2-0.8.1.patched/libgdome/gdomecore/Makefile.am 2009-09-11 12:00:18.044626103 +0200 +@@ -6,7 +6,7 @@ + -I$(top_srcdir)/libgdome/xpath \ + $(LIBXML_CFLAGS) \ + $(GLIB_CFLAGS) \ +- -Wall -ansi \ ++ \ + $(NULL) + + noinst_LTLIBRARIES = libgdomecore.la +diff -Naur gdome2-0.8.1.orig/libgdome/gdomecore/Makefile.in gdome2-0.8.1.patched/libgdome/gdomecore/Makefile.in +--- gdome2-0.8.1.orig/libgdome/gdomecore/Makefile.in 2003-10-05 22:52:48.000000000 +0200 ++++ gdome2-0.8.1.patched/libgdome/gdomecore/Makefile.in 2009-09-11 12:00:18.056327975 +0200 +@@ -104,7 +104,7 @@ + -I$(top_srcdir)/libgdome/xpath \ + $(LIBXML_CFLAGS) \ + $(GLIB_CFLAGS) \ +- -Wall -ansi \ ++ \ + $(NULL) + + +diff -Naur gdome2-0.8.1.orig/libgdome/gdomecore/gdome-xml-node.c gdome2-0.8.1.patched/libgdome/gdomecore/gdome-xml-node.c +--- gdome2-0.8.1.orig/libgdome/gdomecore/gdome-xml-node.c 2003-10-03 17:53:33.000000000 +0200 ++++ gdome2-0.8.1.patched/libgdome/gdomecore/gdome-xml-node.c 2009-09-11 13:34:49.857555834 +0200 +@@ -252,9 +252,9 @@ + switch (type) { + case XML_DOCUMENT_TYPE_NODE: + case XML_DTD_NODE: +- return gdome_xml_dt_unref (self, exc); ++ gdome_xml_dt_unref (self, exc); return; + case XML_DOCUMENT_NODE: +- return gdome_xml_doc_unref (self, exc); ++ gdome_xml_doc_unref (self, exc); return; + default: + if (priv->refcnt > 0) + priv->refcnt--; +diff -Naur gdome2-0.8.1.orig/libgdome/xpath/Makefile.am gdome2-0.8.1.patched/libgdome/xpath/Makefile.am +--- gdome2-0.8.1.orig/libgdome/xpath/Makefile.am 2002-03-01 05:00:25.000000000 +0100 ++++ gdome2-0.8.1.patched/libgdome/xpath/Makefile.am 2009-09-11 12:00:17.952259279 +0200 +@@ -4,7 +4,7 @@ + -I$(top_srcdir)/libgdome/gdomecore \ + $(LIBXML_CFLAGS) \ + $(GLIB_CFLAGS) \ +- -Wall -ansi \ ++ \ + $(NULL) + + noinst_LTLIBRARIES = libgdomexpath.la +diff -Naur gdome2-0.8.1.orig/libgdome/xpath/Makefile.in gdome2-0.8.1.patched/libgdome/xpath/Makefile.in +--- gdome2-0.8.1.orig/libgdome/xpath/Makefile.in 2003-10-05 22:52:50.000000000 +0200 ++++ gdome2-0.8.1.patched/libgdome/xpath/Makefile.in 2009-09-11 12:00:17.951202991 +0200 +@@ -102,7 +102,7 @@ + -I$(top_srcdir)/libgdome/gdomecore \ + $(LIBXML_CFLAGS) \ + $(GLIB_CFLAGS) \ +- -Wall -ansi \ ++ \ + $(NULL) + + +diff -Naur gdome2-0.8.1.orig/test/Makefile.am gdome2-0.8.1.patched/test/Makefile.am +--- gdome2-0.8.1.orig/test/Makefile.am 2002-05-29 02:24:49.000000000 +0200 ++++ gdome2-0.8.1.patched/test/Makefile.am 2009-09-11 12:00:17.850381240 +0200 +@@ -10,7 +10,7 @@ + -I$(top_srcdir)/libgdome \ + -I$(top_srcdir)/libgdome/gdomecore \ + $(LIBXML_CFLAGS) $(GLIB_CFLAGS) \ +- -Wall -ansi \ ++ \ + $(NULL) + + noinst_PROGRAMS = \ +diff -Naur gdome2-0.8.1.orig/test/Makefile.in gdome2-0.8.1.patched/test/Makefile.in +--- gdome2-0.8.1.orig/test/Makefile.in 2003-10-05 22:52:51.000000000 +0200 ++++ gdome2-0.8.1.patched/test/Makefile.in 2009-09-11 12:00:17.859781302 +0200 +@@ -109,7 +109,7 @@ + -I$(top_srcdir)/libgdome \ + -I$(top_srcdir)/libgdome/gdomecore \ + $(LIBXML_CFLAGS) $(GLIB_CFLAGS) \ +- -Wall -ansi \ ++ \ + $(NULL) + + +diff -Naur gdome2-0.8.1.orig/test/apigen/Makefile.am gdome2-0.8.1.patched/test/apigen/Makefile.am +--- gdome2-0.8.1.orig/test/apigen/Makefile.am 2002-11-08 17:38:34.000000000 +0100 ++++ gdome2-0.8.1.patched/test/apigen/Makefile.am 2009-09-11 12:00:17.901805128 +0200 +@@ -3,7 +3,7 @@ + INCLUDES = \ + -I$(top_srcdir)/libgdome \ + $(LIBXML_CFLAGS) $(GLIB_CFLAGS) \ +- -Wall -ansi \ ++ \ + $(NULL) + + noinst_PROGRAMS = \ +diff -Naur gdome2-0.8.1.orig/test/apigen/Makefile.in gdome2-0.8.1.patched/test/apigen/Makefile.in +--- gdome2-0.8.1.orig/test/apigen/Makefile.in 2003-10-05 22:52:52.000000000 +0200 ++++ gdome2-0.8.1.patched/test/apigen/Makefile.in 2009-09-11 12:00:17.892676920 +0200 +@@ -101,7 +101,7 @@ + INCLUDES = \ + -I$(top_srcdir)/libgdome \ + $(LIBXML_CFLAGS) $(GLIB_CFLAGS) \ +- -Wall -ansi \ ++ \ + $(NULL) + + 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 Sep 11 14:48:11 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Sep 2009 12:48:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[6267] csw/mgar/pkg/openldap/trunk Message-ID: Revision: 6267 http://gar.svn.sourceforge.net/gar/?rev=6267&view=rev Author: dmichelsen Date: 2009-09-11 12:48:11 +0000 (Fri, 11 Sep 2009) Log Message: ----------- openldap: Fix building 64 bit on sparc Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/Makefile csw/mgar/pkg/openldap/trunk/checksums Added Paths: ----------- csw/mgar/pkg/openldap/trunk/files/patch-libtool-64bit.diff Property Changed: ---------------- csw/mgar/pkg/openldap/trunk/ Property changes on: csw/mgar/pkg/openldap/trunk ___________________________________________________________________ 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 Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2009-09-11 12:37:31 UTC (rev 6266) +++ csw/mgar/pkg/openldap/trunk/Makefile 2009-09-11 12:48:11 UTC (rev 6267) @@ -44,24 +44,26 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz PATCHFILES = patch-oldap-2.4.16-ntlm.diff -DISTFILES += $(PATCHFILES) +PATCHFILES += patch-libtool-64bit.diff +DISTFILES += patch-oldap-2.4.16-ntlm.diff EXTRA_DOCS = README.CSW $(PATCHFILES) #EXTRA_LIB = $(prefix)/bdb44/lib #EXTRA_INC = $(prefix)/bdb44/include -#BUILD64 = 1 +BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-crypt CONFIGURE_ARGS += --enable-lmpasswd -CONFIGURE_ARGS += --enable-spasswd CONFIGURE_ARGS += --enable-modules CONFIGURE_ARGS += --enable-rlookups CONFIGURE_ARGS += --enable-slp # Disable TCPwrappers in 64 bit until the libraries are available # CONFIGURE_ARGS_32 = --enable-wrappers +# spasswd requires Cyrus SASL +CONFIGURE_ARGS_32 += --enable-spasswd # Disable Cyrus SASL in 64 bit until the libraries are available # CONFIGURE_ARGS_64 += --without-cyrus-sasl Modified: csw/mgar/pkg/openldap/trunk/checksums =================================================================== --- csw/mgar/pkg/openldap/trunk/checksums 2009-09-11 12:37:31 UTC (rev 6266) +++ csw/mgar/pkg/openldap/trunk/checksums 2009-09-11 12:48:11 UTC (rev 6267) @@ -4,5 +4,6 @@ 5e82103780f8cfc2b2fbd0f77c47c158 download/openldap-2.4.17.tgz 0e57547ad2b5fedca9f0bd4beaddfe39 download/openldap.xml ab2ac7519b092ce8d16124c5270bfec0 download/openldaprc +93dc2a04fd943c198ad00edd4d88ce65 download/patch-libtool-64bit.diff d3dee9018137c39f357859b652e3a67c download/patch-oldap-2.4.16-ntlm.diff e15c2020566e56f02118e75c89111f15 download/svc-openldap Added: csw/mgar/pkg/openldap/trunk/files/patch-libtool-64bit.diff =================================================================== --- csw/mgar/pkg/openldap/trunk/files/patch-libtool-64bit.diff (rev 0) +++ csw/mgar/pkg/openldap/trunk/files/patch-libtool-64bit.diff 2009-09-11 12:48:11 UTC (rev 6267) @@ -0,0 +1,15 @@ +diff -Naur openldap-2.4.17.orig/build/ltmain.sh openldap-2.4.17.patched/build/ltmain.sh +--- openldap-2.4.17.orig/build/ltmain.sh 2009-01-22 01:00:41.000000000 +0100 ++++ openldap-2.4.17.patched/build/ltmain.sh 2009-09-11 14:26:06.136891084 +0200 +@@ -4745,7 +4745,10 @@ + case "$compile_command " in + *" -static "*) ;; + *) pic_flag_for_symtable=" $pic_flag";; +- esac ++ esac;; ++ *-*-solaris*) ++ LTCFLAGS="$compiler_flags" ++ ;; + esac + + # Now compile the dynamic symbol 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 Fri Sep 11 15:35:15 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Sep 2009 13:35:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[6268] csw/mgar/pkg/gdome2/trunk Message-ID: Revision: 6268 http://gar.svn.sourceforge.net/gar/?rev=6268&view=rev Author: dmichelsen Date: 2009-09-11 13:35:15 +0000 (Fri, 11 Sep 2009) Log Message: ----------- gdome2: Use ginstall and fix DESTDIR Modified Paths: -------------- csw/mgar/pkg/gdome2/trunk/Makefile csw/mgar/pkg/gdome2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gdome2/trunk/files/patch-doc-destdir.diff csw/mgar/pkg/gdome2/trunk/files/patch-use-install.diff Modified: csw/mgar/pkg/gdome2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdome2/trunk/Makefile 2009-09-11 12:48:11 UTC (rev 6267) +++ csw/mgar/pkg/gdome2/trunk/Makefile 2009-09-11 13:35:15 UTC (rev 6268) @@ -10,6 +10,8 @@ MASTER_SITES = http://gdome2.cs.unibo.it/tarball/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = patch-nowall.diff +PATCHFILES += patch-doc-destdir.diff +PATCHFILES += patch-use-install.diff REQUIRED_PKGS = CSWggettextrt CSWglib2 CSWiconv CSWlibxml2 CSWzlib Modified: csw/mgar/pkg/gdome2/trunk/checksums =================================================================== --- csw/mgar/pkg/gdome2/trunk/checksums 2009-09-11 12:48:11 UTC (rev 6267) +++ csw/mgar/pkg/gdome2/trunk/checksums 2009-09-11 13:35:15 UTC (rev 6268) @@ -1,2 +1,4 @@ bfc114e59eec50cbda8e4ece751ff022 download/gdome2-0.8.1.tar.gz +6c8799423b9ef7a21d6b1b7edff27c9d download/patch-doc-destdir.diff 735f58dbc4b9524f313088fa02d0434b download/patch-nowall.diff +c2e11ca7b8a0b05d0db6823ed40e0494 download/patch-use-install.diff Added: csw/mgar/pkg/gdome2/trunk/files/patch-doc-destdir.diff =================================================================== --- csw/mgar/pkg/gdome2/trunk/files/patch-doc-destdir.diff (rev 0) +++ csw/mgar/pkg/gdome2/trunk/files/patch-doc-destdir.diff 2009-09-11 13:35:15 UTC (rev 6268) @@ -0,0 +1,24 @@ +diff -Naur gdome2-0.8.1.orig/gtk-doc/Makefile.am gdome2-0.8.1.patched/gtk-doc/Makefile.am +--- gdome2-0.8.1.orig/gtk-doc/Makefile.am 2002-04-04 08:58:04.000000000 +0200 ++++ gdome2-0.8.1.patched/gtk-doc/Makefile.am 2009-09-11 15:29:22.320277946 +0200 +@@ -9,7 +9,7 @@ + # The directory containing the source code (if it contains documentation). + DOC_SOURCE_DIR=../libgdome + +-HTML_DIR=@HTML_DIR@ ++HTML_DIR=$(DESTDIR)@HTML_DIR@ + + TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) + +diff -Naur gdome2-0.8.1.orig/gtk-doc/Makefile.in gdome2-0.8.1.patched/gtk-doc/Makefile.in +--- gdome2-0.8.1.orig/gtk-doc/Makefile.in 2003-10-05 22:52:52.000000000 +0200 ++++ gdome2-0.8.1.patched/gtk-doc/Makefile.in 2009-09-11 15:29:44.962917775 +0200 +@@ -105,7 +105,7 @@ + # The directory containing the source code (if it contains documentation). + DOC_SOURCE_DIR = ../libgdome + +-HTML_DIR = @HTML_DIR@ ++HTML_DIR = $(DESTDIR)@HTML_DIR@ + + TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) + Added: csw/mgar/pkg/gdome2/trunk/files/patch-use-install.diff =================================================================== --- csw/mgar/pkg/gdome2/trunk/files/patch-use-install.diff (rev 0) +++ csw/mgar/pkg/gdome2/trunk/files/patch-use-install.diff 2009-09-11 13:35:15 UTC (rev 6268) @@ -0,0 +1,32 @@ +diff -Naur gdome2-0.8.1.orig/gtk-doc/Makefile.am gdome2-0.8.1.patched/gtk-doc/Makefile.am +--- gdome2-0.8.1.orig/gtk-doc/Makefile.am 2002-04-04 08:58:04.000000000 +0200 ++++ gdome2-0.8.1.patched/gtk-doc/Makefile.am 2009-09-11 15:10:49.023110574 +0200 +@@ -33,9 +33,9 @@ + rm -rf sgml html gdome2-decl-list.txt gdome2-decl.txt + + install-data-local: +- -install -d -m 0755 $(TARGET_DIR) +- -install -m 0644 $(srcdir)/html/*.html $(TARGET_DIR) +- -install -m 0644 $(srcdir)/html/index.sgml $(TARGET_DIR) ++ -$(INSTALL) -d -m 0755 $(TARGET_DIR) ++ -$(INSTALL) -m 0644 $(srcdir)/html/*.html $(TARGET_DIR) ++ -$(INSTALL) -m 0644 $(srcdir)/html/index.sgml $(TARGET_DIR) + -(cd $(DESTDIR); gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)) + + .PHONY : html sgml templates scan +diff -Naur gdome2-0.8.1.orig/gtk-doc/Makefile.in gdome2-0.8.1.patched/gtk-doc/Makefile.in +--- gdome2-0.8.1.orig/gtk-doc/Makefile.in 2003-10-05 22:52:52.000000000 +0200 ++++ gdome2-0.8.1.patched/gtk-doc/Makefile.in 2009-09-11 15:11:27.730500581 +0200 +@@ -273,9 +273,9 @@ + rm -rf sgml html gdome2-decl-list.txt gdome2-decl.txt + + install-data-local: +- -install -d -m 0755 $(TARGET_DIR) +- -install -m 0644 $(srcdir)/html/*.html $(TARGET_DIR) +- -install -m 0644 $(srcdir)/html/index.sgml $(TARGET_DIR) ++ -$(INSTALL) -d -m 0755 $(TARGET_DIR) ++ -$(INSTALL) -m 0644 $(srcdir)/html/*.html $(TARGET_DIR) ++ -$(INSTALL) -m 0644 $(srcdir)/html/index.sgml $(TARGET_DIR) + -(cd $(DESTDIR); gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)) + + .PHONY : html sgml templates scan 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 Sep 11 15:44:48 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Sep 2009 13:44:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[6269] csw/mgar/pkg/gdome2/trunk Message-ID: Revision: 6269 http://gar.svn.sourceforge.net/gar/?rev=6269&view=rev Author: dmichelsen Date: 2009-09-11 13:44:48 +0000 (Fri, 11 Sep 2009) Log Message: ----------- gdome2: Remove erranous diff from patch Modified Paths: -------------- csw/mgar/pkg/gdome2/trunk/checksums csw/mgar/pkg/gdome2/trunk/files/patch-nowall.diff Modified: csw/mgar/pkg/gdome2/trunk/checksums =================================================================== --- csw/mgar/pkg/gdome2/trunk/checksums 2009-09-11 13:35:15 UTC (rev 6268) +++ csw/mgar/pkg/gdome2/trunk/checksums 2009-09-11 13:44:48 UTC (rev 6269) @@ -1,4 +1,4 @@ bfc114e59eec50cbda8e4ece751ff022 download/gdome2-0.8.1.tar.gz 6c8799423b9ef7a21d6b1b7edff27c9d download/patch-doc-destdir.diff -735f58dbc4b9524f313088fa02d0434b download/patch-nowall.diff +c736a82f4a9f4472c724bdf620575a38 download/patch-nowall.diff c2e11ca7b8a0b05d0db6823ed40e0494 download/patch-use-install.diff Modified: csw/mgar/pkg/gdome2/trunk/files/patch-nowall.diff =================================================================== --- csw/mgar/pkg/gdome2/trunk/files/patch-nowall.diff 2009-09-11 13:35:15 UTC (rev 6268) +++ csw/mgar/pkg/gdome2/trunk/files/patch-nowall.diff 2009-09-11 13:44:48 UTC (rev 6269) @@ -1,15 +1,3 @@ -diff -Naur gdome2-0.8.1.orig/configure gdome2-0.8.1.patched/configure ---- gdome2-0.8.1.orig/configure 2003-10-05 22:52:20.000000000 +0200 -+++ gdome2-0.8.1.patched/configure 2009-09-11 12:00:18.168479806 +0200 -@@ -1507,7 +1507,7 @@ - fi - - if test $ac_cv_header_stdc = yes; then -- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using . - if test "$cross_compiling" = yes; then - : - else diff -Naur gdome2-0.8.1.orig/libgdome/Makefile.am gdome2-0.8.1.patched/libgdome/Makefile.am --- gdome2-0.8.1.orig/libgdome/Makefile.am 2002-07-16 16:15:56.000000000 +0200 +++ gdome2-0.8.1.patched/libgdome/Makefile.am 2009-09-11 12:00:17.924132266 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Sep 11 15:45:38 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Sep 2009 13:45:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6270] csw/mgar/pkg/openldap/trunk Message-ID: Revision: 6270 http://gar.svn.sourceforge.net/gar/?rev=6270&view=rev Author: dmichelsen Date: 2009-09-11 13:45:38 +0000 (Fri, 11 Sep 2009) Log Message: ----------- openldap: Update to 2.4.18 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-09-11 13:44:48 UTC (rev 6269) +++ csw/mgar/pkg/openldap/trunk/Makefile 2009-09-11 13:45:38 UTC (rev 6270) @@ -1,5 +1,5 @@ GARNAME = openldap -GARVERSION = 2.4.17 +GARVERSION = 2.4.18 CATEGORIES = server DESCRIPTION = Open source implementation of the Lightweight Directory Access Protocol Modified: csw/mgar/pkg/openldap/trunk/checksums =================================================================== --- csw/mgar/pkg/openldap/trunk/checksums 2009-09-11 13:44:48 UTC (rev 6269) +++ csw/mgar/pkg/openldap/trunk/checksums 2009-09-11 13:45:38 UTC (rev 6270) @@ -1,7 +1,7 @@ 2f6e6a8c9c3497f1c0c9d52ea2d1dafa download/CSWoldap.gspec 892dba5f625755be024c30ea0055fd55 download/README.CSW c50f5c4040139b6cf57fcc08abffbee7 download/cswopenldap -5e82103780f8cfc2b2fbd0f77c47c158 download/openldap-2.4.17.tgz +fecd7a64b6d9a0eb79b817d2562956ed download/openldap-2.4.18.tgz 0e57547ad2b5fedca9f0bd4beaddfe39 download/openldap.xml ab2ac7519b092ce8d16124c5270bfec0 download/openldaprc 93dc2a04fd943c198ad00edd4d88ce65 download/patch-libtool-64bit.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 Fri Sep 11 16:06:45 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Sep 2009 14:06:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[6271] csw/mgar/pkg/freetype/trunk/Makefile Message-ID: Revision: 6271 http://gar.svn.sourceforge.net/gar/?rev=6271&view=rev Author: dmichelsen Date: 2009-09-11 14:06:44 +0000 (Fri, 11 Sep 2009) Log Message: ----------- freetype2: /bin/sparcv9/freetype-config must not be excluded or autodetection will not work in 64 bit mode Modified Paths: -------------- csw/mgar/pkg/freetype/trunk/Makefile Modified: csw/mgar/pkg/freetype/trunk/Makefile =================================================================== --- csw/mgar/pkg/freetype/trunk/Makefile 2009-09-11 13:45:38 UTC (rev 6270) +++ csw/mgar/pkg/freetype/trunk/Makefile 2009-09-11 14:06:44 UTC (rev 6271) @@ -32,8 +32,6 @@ BUILD64 = 1 NO_ISAEXEC = 1 -MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/.* - REQUIRED_PKGS_CSWftype2 = CSWzlib TEST_TARGET = check 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 Sep 11 16:27:19 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 11 Sep 2009 14:27:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[6272] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 6272 http://gar.svn.sourceforge.net/gar/?rev=6272&view=rev Author: bonivart Date: 2009-09-11 14:27:18 +0000 (Fri, 11 Sep 2009) Log Message: ----------- pkgutil: update to 1.7 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-09-11 14:06:44 UTC (rev 6271) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-09-11 14:27:18 UTC (rev 6272) @@ -1,5 +1,5 @@ GARNAME = pkgutil -GARVERSION = 1.7b1 +GARVERSION = 1.7 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-09-11 14:06:44 UTC (rev 6271) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-09-11 14:27:18 UTC (rev 6272) @@ -2,4 +2,4 @@ e1407c24d47306dbc4cea22dcb291f1d download/CSWpkgutil.postinstall 2fb6c94a2d212f08b71d462082a2d31a download/CSWpkgutil.preremove 4ef9d7ba62987112987311d96e249e3e download/CSWpkgutil.prototype -6c95eb1d1de28e74b72ea2bb4ce249af download/pkgutil-1.7b1.zip +11c02a77d18f1fc11f23679b1b06efa8 download/pkgutil-1.7.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Sep 11 17:46:06 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Sep 2009 15:46:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6273] csw/mgar/pkg/tcpwrappers/tags Message-ID: Revision: 6273 http://gar.svn.sourceforge.net/gar/?rev=6273&view=rev Author: dmichelsen Date: 2009-09-11 15:46:06 +0000 (Fri, 11 Sep 2009) Log Message: ----------- tcpwrappers: Add legacy description Added Paths: ----------- csw/mgar/pkg/tcpwrappers/tags/legacy/ csw/mgar/pkg/tcpwrappers/tags/legacy/BUILD.NOTES csw/mgar/pkg/tcpwrappers/tags/legacy/README.t csw/mgar/pkg/tcpwrappers/tags/legacy/copyright csw/mgar/pkg/tcpwrappers/tags/legacy/makepkg.old csw/mgar/pkg/tcpwrappers/tags/legacy/man.patch csw/mgar/pkg/tcpwrappers/tags/legacy/pkginfo csw/mgar/pkg/tcpwrappers/tags/legacy/prototype csw/mgar/pkg/tcpwrappers/tags/legacy/sharedlib.patch Added: csw/mgar/pkg/tcpwrappers/tags/legacy/BUILD.NOTES =================================================================== --- csw/mgar/pkg/tcpwrappers/tags/legacy/BUILD.NOTES (rev 0) +++ csw/mgar/pkg/tcpwrappers/tags/legacy/BUILD.NOTES 2009-09-11 15:46:06 UTC (rev 6273) @@ -0,0 +1,25 @@ + +# Patch the makefile to allow for compile of a shared lib. +# Plus, define a sneaky ELF .obj that contains "weak" magic symbols + +#Note that the library is compiled to use LOG_LOCAL1 as the +#syslog type, NOT "LOG_MAIL", the default +#ALSO, it uses /opt/csw/etc, NOT /etc/hosts.XXX + +gpatch <~/pkgs/tcpwrap/sharedlib.patch + +#update manpage paths about /opt/csw/etc +gpatch <~/pkgs/tcpwrap/man.patch + + +gmake REAL_DAEMON_DIR=/usr/sbin sunos5-shared +mv libwrap.so.1 libwrap-std.so.1 +gmake clean + +gmake REAL_DAEMON_DIR=/usr/sbin sunos5-sharedext +mv libwrap.so.1 libwrap-ext.so.1 + +cd ~/pkgs/tcpwrap +cp README.t /export/home/phil/build/tcp_wrappers_7.6-ipv6.4 +createpkg -r /export/home/phil/build/tcp_wrappers_7.6-ipv6.4 + Added: csw/mgar/pkg/tcpwrappers/tags/legacy/README.t =================================================================== --- csw/mgar/pkg/tcpwrappers/tags/legacy/README.t (rev 0) +++ csw/mgar/pkg/tcpwrappers/tags/legacy/README.t 2009-09-11 15:46:06 UTC (rev 6273) @@ -0,0 +1,28 @@ +TCP-Wrappers, from http://www.porcupine.org + +Note that the library is compiled to use LOG_LOCAL1 as the +syslog facility, NOT "LOG_MAIL", the default. + +ALSO, it uses /opt/csw/etc/hosts.xxx, NOT /etc/hosts.XXX + +man hosts_access(3), hosts_access(5), hosts_options(5) +for syntax on those. + +The compile has been hacked to provide a shared-library version instead +of libwrap.a +There is an extra hack, in that there are default variable definitions of +deny_severity and allow_severity, set to 0. +This is to allow for ./configure style tests, that break in the transition +from lib.a to lib.so + + +Note also that there are TWO versions of libwrap.so: +libwrap-std.so.1 The "standard" tcp wrapper library +libwrap-ext.so.1 The "extended" tcp wrapper library + +By default, /opt/csw/lib/libwrap.so.1 is linked to the std version. +To use the extended syntax in hosts_options(5), you need to change +the link to point to libwrap-ext.so.1 +Unfortunately, the syntax for the two versions, is slightly incompatible, +which is why there are two versions. + Added: csw/mgar/pkg/tcpwrappers/tags/legacy/copyright =================================================================== --- csw/mgar/pkg/tcpwrappers/tags/legacy/copyright (rev 0) +++ csw/mgar/pkg/tcpwrappers/tags/legacy/copyright 2009-09-11 15:46:06 UTC (rev 6273) @@ -0,0 +1,16 @@ +/************************************************************************ +* Copyright 1995 by Wietse Venema. All rights reserved. Some individual +* files may be covered by other copyrights. +* +* This material was originally written and compiled by Wietse Venema at +* Eindhoven University of Technology, The Netherlands, in 1990, 1991, +* 1992, 1993, 1994 and 1995. +* +* Redistribution and use in source and binary forms are permitted +* provided that this entire copyright notice is duplicated in all such +* copies. +* +* This software is provided "as is" and without any expressed or implied +* warranties, including, without limitation, the implied warranties of +* merchantibility and fitness for any particular purpose. +************************************************************************/ Added: csw/mgar/pkg/tcpwrappers/tags/legacy/makepkg.old =================================================================== --- csw/mgar/pkg/tcpwrappers/tags/legacy/makepkg.old (rev 0) +++ csw/mgar/pkg/tcpwrappers/tags/legacy/makepkg.old 2009-09-11 15:46:06 UTC (rev 6273) @@ -0,0 +1,61 @@ +#!/bin/ksh -p + +## MODIFIED BUILDPKG - this builds directly from source tree!! + +if [ "$1" = "" ] ; then + echo ERROR: need source dir + exit 1 +fi + +if [ ! -f "$1/libwrap.a" ] ; then + echo ERROR: do not detect built libwrap.a + exit 1 +fi + + + +# This script actually builds the package.. once you have already +# put together the pkginfo and prototype file. +# See the makeproto script for a way to make a prototype file. + +ARCH=all + +die() +{ + print ERROR: $* + exit 1 +} + +PROTO=prototype + + +grep 'i copyright' $PROTO || die need copyright in $PROTO +grep 'root other' $PROTO && die fix $PROTO file + +grep 'Replace this file' copyright && die fix copyright file + +mode=relative + + +PKG=`sed -n 's/^PKG=//p' pkginfo` +PKGREV=`sed -n 's/^VERSION=//p' pkginfo` +SOFTNAME=`sed -n 's/^NAME=//p' pkginfo|awk '{print $1}'` +ARCH=`uname -p` + +PKGFILE=$SOFTNAME-$PKGREV-SunOS`uname -r`-$ARCH-CSW.pkg + +if [ "$PKGREV" = "" -o "$SOFTNAME" = "" ] ; then + echo ERROR: need VERSION and NAME defined properly in pkginfo + exit 1 +fi + +pkgmk -b $1 -a $ARCH -f $PROTO + + +if [ $? -ne 0 ] ; then die package creation failed ; fi + + +pkgtrans -s /var/spool/pkg `pwd`/$PKGFILE $PKG +echo gzipping pkgfile +gzip $PKGFILE +rm -r /var/spool/pkg/$PKG Added: csw/mgar/pkg/tcpwrappers/tags/legacy/man.patch =================================================================== --- csw/mgar/pkg/tcpwrappers/tags/legacy/man.patch (rev 0) +++ csw/mgar/pkg/tcpwrappers/tags/legacy/man.patch 2009-09-11 15:46:06 UTC (rev 6273) @@ -0,0 +1,149 @@ +--- hosts_access.3.pre-csw 1996-02-11 11:01:27.000000000 -0500 ++++ hosts_access.3 2006-03-30 17:08:22.857367000 -0500 +@@ -78,7 +78,7 @@ + hosts_access(5), format of the access control tables. + hosts_options(5), optional extensions to the base language. + .SH FILES +-/etc/hosts.allow, /etc/hosts.deny, access control tables. ++/opt/csw/etc/hosts.allow, /opt/csw/etc/hosts.deny, access control tables. + .SH BUGS + hosts_access() uses the strtok() library function. This may interfere + with other code that relies on strtok(). +--- hosts_access.5.pre-csw 1995-01-30 13:51:47.000000000 -0500 ++++ hosts_access.5 2006-03-30 17:08:22.913093000 -0500 +@@ -21,10 +21,10 @@ + at the first match: + .IP \(bu + Access will be granted when a (daemon,client) pair matches an entry in +-the \fI/etc/hosts.allow\fR file. ++the \fI/opt/csw/etc/hosts.allow\fR file. + .IP \(bu + Otherwise, access will be denied when a (daemon,client) pair matches an +-entry in the \fI/etc/hosts.deny\fR file. ++entry in the \fI/opt/csw/etc/hosts.deny\fR file. + .IP \(bu + Otherwise, access will be granted. + .PP +@@ -268,7 +268,7 @@ + file: + .PP + .ne 2 +-/etc/hosts.deny: ++/opt/csw/etc/hosts.deny: + .in +3 + ALL: ALL + .PP +@@ -279,7 +279,7 @@ + For example: + .PP + .ne 2 +-/etc/hosts.allow: ++/opt/csw/etc/hosts.allow: + .in +3 + ALL: LOCAL @some_netgroup + .br +@@ -298,7 +298,7 @@ + that it can be omitted. The explicitly non-authorized hosts are listed + in the deny file. For example: + .PP +-/etc/hosts.deny: ++/opt/csw/etc/hosts.deny: + .in +3 + ALL: some.host.name, .some.domain + .br +@@ -313,13 +313,13 @@ + host. The result is mailed to the superuser. + .PP + .ne 2 +-/etc/hosts.allow: ++/opt/csw/etc/hosts.allow: + .in +3 + .nf + in.tftpd: LOCAL, .my.domain + .PP + .ne 2 +-/etc/hosts.deny: ++/opt/csw/etc/hosts.deny: + .in +3 + .nf + in.tftpd: ALL: (/some/where/safe_finger -l @%h | \\ +@@ -353,8 +353,8 @@ + .SH FILES + .na + .nf +-/etc/hosts.allow, (daemon,client) pairs that are granted access. +-/etc/hosts.deny, (daemon,client) pairs that are denied access. ++/opt/csw/etc/hosts.allow, (daemon,client) pairs that are granted access. ++/opt/csw/etc/hosts.deny, (daemon,client) pairs that are denied access. + .ad + .fi + .SH SEE ALSO +--- tcpd.8.pre-csw 1996-02-21 10:39:16.000000000 -0500 ++++ tcpd.8 2006-03-30 17:08:22.960557000 -0500 +@@ -146,7 +146,7 @@ + only non-trivial service that is affected by this limitation is + \fIrexd\fR, which is used by the \fIon(1)\fR command. This is no great + loss. On most systems, \fIrexd\fR is less secure than a wildcard in +-/etc/hosts.equiv. ++/opt/csw/etc/hosts.equiv. + .PP + RPC broadcast requests (for example: \fIrwall, rup, rusers\fR) always + appear to come from the responding host. What happens is that the +@@ -158,9 +158,9 @@ + .PP + The default locations of the host access control tables are: + .PP +-/etc/hosts.allow ++/opt/csw/etc/hosts.allow + .br +-/etc/hosts.deny ++/opt/csw/etc/hosts.deny + .SH SEE ALSO + .na + .nf +--- tcpdchk.8.pre-csw 1995-01-08 11:00:31.000000000 -0500 ++++ tcpdchk.8 2006-03-30 17:08:23.007553000 -0500 +@@ -8,7 +8,7 @@ + \fItcpdchk\fR examines your tcp wrapper configuration and reports all + potential and real problems it can find. The program examines the + \fItcpd\fR access control files (by default, these are +-\fI/etc/hosts.allow\fR and \fI/etc/hosts.deny\fR), and compares the ++\fI/opt/csw/etc/hosts.allow\fR and \fI/opt/csw/etc/hosts.deny\fR), and compares the + entries in these files against entries in the \fIinetd\fR or \fItlid\fR + network configuration files. + .PP +@@ -44,9 +44,9 @@ + .PP + The default locations of the \fItcpd\fR access control tables are: + .PP +-/etc/hosts.allow ++/opt/csw/etc/hosts.allow + .br +-/etc/hosts.deny ++/opt/csw/etc/hosts.deny + .SH SEE ALSO + .na + .nf +--- tcpdmatch.8.pre-csw 1996-02-11 11:01:36.000000000 -0500 ++++ tcpdmatch.8 2006-03-30 17:08:23.055866000 -0500 +@@ -11,7 +11,7 @@ + request for service. Examples are given below. + .PP + The program examines the \fItcpd\fR access control tables (default +-\fI/etc/hosts.allow\fR and \fI/etc/hosts.deny\fR) and prints its ++\fI/opt/csw/etc/hosts.allow\fR and \fI/opt/csw/etc/hosts.deny\fR) and prints its + conclusion. For maximal accuracy, it extracts additional information + from your \fIinetd\fR or \fItlid\fR network configuration file. + .PP +@@ -76,9 +76,9 @@ + .PP + The default locations of the \fItcpd\fR access control tables are: + .PP +-/etc/hosts.allow ++/opt/csw/etc/hosts.allow + .br +-/etc/hosts.deny ++/opt/csw/etc/hosts.deny + .SH SEE ALSO + .na + .nf Added: csw/mgar/pkg/tcpwrappers/tags/legacy/pkginfo =================================================================== --- csw/mgar/pkg/tcpwrappers/tags/legacy/pkginfo (rev 0) +++ csw/mgar/pkg/tcpwrappers/tags/legacy/pkginfo 2009-09-11 15:46:06 UTC (rev 6273) @@ -0,0 +1,8 @@ +PKG=CSWtcpwrap +NAME=tcpwrappers - (ipv6.4 patched) lib and tools for pre-screening tcp connections +VERSION=7.6,REV=2006.03.30.ipv6.4 +ARCH=i386 +CATEGORY=system +VENDOR=http://ftp.porcupine.org/pub/security/ packaged for CSW by Philip Brown +HOTLINE=http://www.blastwave.com/bugtrack/ +EMAIL=phil at blastwave.org Added: csw/mgar/pkg/tcpwrappers/tags/legacy/prototype =================================================================== --- csw/mgar/pkg/tcpwrappers/tags/legacy/prototype (rev 0) +++ csw/mgar/pkg/tcpwrappers/tags/legacy/prototype 2009-09-11 15:46:06 UTC (rev 6273) @@ -0,0 +1,29 @@ +i pkginfo +i copyright +d none /opt/csw/share/doc 0755 root bin +d none /opt/csw/share/doc/tcpwrappers 0755 root bin +f none /opt/csw/share/doc/tcpwrappers/README=README.t 0644 root bin +d none /opt/csw/lib 0755 root bin +f none /opt/csw/lib/libwrap-std.so.1=libwrap-std.so.1 0755 root bin +f none /opt/csw/lib/libwrap-ext.so.1=libwrap-ext.so.1 0755 root bin +s none /opt/csw/lib/libwrap.so.1=libwrap-std.so.1 +s none /opt/csw/lib/libwrap.so=libwrap.so.1 +d none /opt/csw/libexec 0755 root bin +f none /opt/csw/libexec/tcpd=tcpd 0755 root bin +f none /opt/csw/libexec/tcpdmatch=tcpdmatch 0755 root bin +f none /opt/csw/libexec/try-from=try-from 0755 root bin +f none /opt/csw/libexec/safe_finger=safe_finger 0755 root bin +f none /opt/csw/libexec/tcpdchk=tcpdchk 0755 root bin +d none /opt/csw/include 0755 root bin +f none /opt/csw/include/tcpd.h=tcpd.h 0644 root bin +d none /opt/csw/share 0755 root bin +d none /opt/csw/share/man 0755 root bin +d none /opt/csw/share/man/man3 0755 root bin +d none /opt/csw/share/man/man5 0755 root bin +d none /opt/csw/share/man/man8 0755 root bin +f none /opt/csw/share/man/man3/hosts_access.3=hosts_access.3 0644 root bin +f none /opt/csw/share/man/man5/hosts_access.5=hosts_access.5 0644 root bin +f none /opt/csw/share/man/man5/hosts_options.5=hosts_options.5 0644 root bin +f none /opt/csw/share/man/man8/tcpd.8=tcpd.8 0644 root bin +f none /opt/csw/share/man/man8/tcpdchk.8=tcpdchk.8 0644 root bin +f none /opt/csw/share/man/man8/tcpdmatch.8=tcpdmatch.8 0644 root bin Added: csw/mgar/pkg/tcpwrappers/tags/legacy/sharedlib.patch =================================================================== --- csw/mgar/pkg/tcpwrappers/tags/legacy/sharedlib.patch (rev 0) +++ csw/mgar/pkg/tcpwrappers/tags/legacy/sharedlib.patch 2009-09-11 15:46:06 UTC (rev 6273) @@ -0,0 +1,71 @@ +--- Makefile.pre-csw 2006-03-30 16:47:20.849031000 -0500 ++++ Makefile 2006-03-30 16:49:56.343391000 -0500 +@@ -197,6 +197,24 @@ + BUGS="$(BUGS) -DSOLARIS_24_GETHOSTBYNAME_BUG" IPV6="$(IPV6)" \ + EXTRA_CFLAGS=-DUSE_STRERROR all + ++sunos5-shared: ++ @$(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 ++ ++sunos5-sharedext: ++ @$(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= STYLE=-DPROCESS_OPTIONS \ ++ NETGROUP=-DNETGROUP AUX_OBJ="setenv.o sharedhack.o" TLI=-DTLI \ ++ BUGS="$(BUGS) -DSOLARIS_24_GETHOSTBYNAME_BUG" IPV6="$(IPV6)" \ ++ EXTRA_CFLAGS="-DUSE_STRERROR -Kpic" all ++ + # Generic SYSV40 + esix sysv4: + @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ +@@ -481,7 +499,7 @@ + # If your system has IPv6 and supports getipnode* and inet_pton/inet_ntop + # uncomment the following (Solaris 8) + +-# IPV6 = -DHAVE_IPV6 ++IPV6 = -DHAVE_IPV6 + + # If your system does not have getipnodebyname() but uses the obsolete + # gethostbyname2() instead, use this (AIX) +@@ -527,7 +545,7 @@ + # + # The LOG_XXX names below are taken from the /usr/include/syslog.h file. + +-FACILITY= LOG_MAIL # LOG_MAIL is what most sendmail daemons use ++FACILITY= LOG_LOCAL1 # LOG_MAIL is what most sendmail daemons use + + # The syslog priority at which successful connections are logged. + +@@ -603,7 +621,7 @@ + # look for access control information. Watch out for the quotes and + # backslashes when you make changes. + +-TABLES = -DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\" ++TABLES = -DHOSTS_DENY=\"/opt/csw/etc/hosts.deny\" -DHOSTS_ALLOW=\"/opt/csw/etc/hosts.allow\" + + #################################################### + # Optional: dealing with host name/address conflicts +@@ -725,7 +743,7 @@ + $(CC) $(CFLAGS) -o $@ miscd.o $(LIB) $(LIBS) + + safe_finger: safe_finger.o $(LIB) +- $(CC) $(CFLAGS) -o $@ safe_finger.o $(LIB) $(LIBS) ++ $(CC) $(CFLAGS) -o $@ safe_finger.o $(LIBS) + + TCPDMATCH_OBJ = tcpdmatch.o fakelog.o inetcf.o scaffold.o + +--- /dev/null 2006-03-30 15:03:19.000000000 -0500 ++++ sharedhack.c 2006-03-30 16:50:50.946442000 -0500 +@@ -0,0 +1,5 @@ ++/* This must be compiled with Sun CC for the pragma */ ++#pragma weak deny_severity ++#pragma weak allow_severity ++int deny_severity=0; ++int allow_severity=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 Sep 11 20:28:00 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Sep 2009 18:28:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6274] csw/mgar/pkg/giflib/trunk/Makefile Message-ID: Revision: 6274 http://gar.svn.sourceforge.net/gar/?rev=6274&view=rev Author: dmichelsen Date: 2009-09-11 18:28:00 +0000 (Fri, 11 Sep 2009) Log Message: ----------- giflib: Fix catalogname Modified Paths: -------------- csw/mgar/pkg/giflib/trunk/Makefile Modified: csw/mgar/pkg/giflib/trunk/Makefile =================================================================== --- csw/mgar/pkg/giflib/trunk/Makefile 2009-09-11 15:46:06 UTC (rev 6273) +++ csw/mgar/pkg/giflib/trunk/Makefile 2009-09-11 18:28:00 UTC (rev 6274) @@ -17,6 +17,9 @@ PACKAGES = CSWgiflib CSWungif +CATALOGNAME_CSWgiflib = giflib +CATALOGNAME_CSWungif = libungif + SPKG_DESC_CSWgiflib = A library for reading and writing gif images SPKG_DESC_CSWungif = Links to giflib now the patent is dropped 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 Sep 11 20:33:26 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Sep 2009 18:33:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[6275] csw/mgar/pkg/libtool/tags Message-ID: Revision: 6275 http://gar.svn.sourceforge.net/gar/?rev=6275&view=rev Author: dmichelsen Date: 2009-09-11 18:33:24 +0000 (Fri, 11 Sep 2009) Log Message: ----------- libtool: Add 1.5.2 legacy build descriptions Added Paths: ----------- csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/ csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/BUILD.NOTES csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/copyright csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/depend csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/libtool.ksh csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/pkginfo csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/prototype csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/prototype.old Added: csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/BUILD.NOTES =================================================================== --- csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/BUILD.NOTES (rev 0) +++ csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/BUILD.NOTES 2009-09-11 18:33:24 UTC (rev 6275) @@ -0,0 +1,41 @@ +# sad thing: it takes 3 times as long to configure the thing, +# as it does to "make" it. + + +CFLAGS=-O CC=cc CXX=CC ./configure --prefix=/opt/csw --infodir=/opt/csw/share/info + +gmake +MAKE=gmake stagepkg + +mv cswstage/opt/csw/bin/libtool cswstage/opt/csw/bin/libtool.cc + +gmake clean # distclean does not seem to work?? + +CC=gcc CXX=g++ ./configure --prefix=/opt/csw +gmake +cp libtool cswstage/opt/csw/bin/libtool.gcc + +cp ~/pkgs/libtool/libtool.ksh cswstage/opt/csw/bin/libtool + +# [the rest is from pkg directory ....] + +cd ~/pkgs/libtool +createpkg -r $HOME/build/libtool*/cswstage + + + +############################################################ +Notes on CCvsgcc issues with libtool: +$ diff -r csw-forte cswstage|egrep '^diff|Binary' +diff -r csw-forte/opt/csw/bin/libtool cswstage/opt/csw/bin/libtool +Binary files csw-forte/opt/csw/lib/libltdl.a and cswstage/opt/csw/lib/libltdl.a differ +Binary files csw-forte/opt/csw/lib/libltdl.so and cswstage/opt/csw/lib/libltdl.so differ +Binary files csw-forte/opt/csw/lib/libltdl.so.3 and cswstage/opt/csw/lib/libltdl.so.3 differ +Binary files csw-forte/opt/csw/lib/libltdl.so.3.1.0 and cswstage/opt/csw/lib/libltdl.so.3.1.0 differ + + +According to "nm", there are ACTUAL FUNCTION DIFFERENCES between the two +libltdl.a files. The forte one is bigger, because it has a whole +bunch of things like, ".XAAj6Ia8srTA10P.archive_ext" +But only if you forget to DISABLE THE STUPID INCREMENTAL LINKER. + Added: csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/copyright =================================================================== --- csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/copyright (rev 0) +++ csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/copyright 2009-09-11 18:33:24 UTC (rev 6275) @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 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 Library General +Public License instead of this License. Added: csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/depend =================================================================== --- csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/depend (rev 0) +++ csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/depend 2009-09-11 18:33:24 UTC (rev 6275) @@ -0,0 +1,2 @@ +P CSWcommon +P CSWgsed Added: csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/libtool.ksh =================================================================== --- csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/libtool.ksh (rev 0) +++ csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/libtool.ksh 2009-09-11 18:33:24 UTC (rev 6275) @@ -0,0 +1,47 @@ +#!/bin/ksh + +# Wrapper for libtool, so that it auto-adjusts to whether you +# are using gcc, or Sun CC. +# libtool itself SHOULD do this. except it doesnt :-/ +# +# It tries to base its choice on what environment vars are set to. +# Otherwise, it defaults to Sun CC if installed, or falls back +# to gcc if all else fails. + +case CC in + gcc) + LIBTOOL=libtool.gcc + ;; + cc) + LIBTOOL=libtool.cc + ;; +esac + +case CXX in + g++) + LIBTOOL=libtool.gcc + ;; + CC) + LIBTOOL=libtool.cc + ;; +esac + +if [[ "$LIBTOOL" = "" ]] ; then + case "$*" in + *" "gcc" "*) + LIBTOOL=libtool.gcc + ;; + esac +fi + +# Hmm. No compiler specified. Try to guess which one to use. +# Although this shouldnt really get called +if [[ "$LIBTOOL" = "" ]] ; then + if [[ -x /opt/SUNWspro/bin/cc ]] ; then + LIBTOOL=libtool.cc + else + LIBTOOL=libtool.gcc + fi +fi + +exec /opt/csw/bin/$LIBTOOL "$@" Added: csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/pkginfo =================================================================== --- csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/pkginfo (rev 0) +++ csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/pkginfo 2009-09-11 18:33:24 UTC (rev 6275) @@ -0,0 +1,8 @@ +PKG=CSWlibtool +NAME=libtool - GNU tool for compiling libraries +VERSION=1.5.2 +ARCH=i386 +CATEGORY=system +VENDOR=http://ftp.gnu.org/pub/gnu/libtool packaged for CSW by Philip Brown +HOTLINE=http://www.blastwave.org/bugtrack/ +EMAIL=phil at bolthole.com Added: csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/prototype =================================================================== --- csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/prototype (rev 0) +++ csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/prototype 2009-09-11 18:33:24 UTC (rev 6275) @@ -0,0 +1,43 @@ +i pkginfo +i copyright +i depend +d none /opt/csw/share 0755 root bin +d none /opt/csw/share/info 0755 root bin +f none /opt/csw/share/info/libtool.info 0644 root bin +d none /opt/csw/share/aclocal 0755 root bin +f none /opt/csw/share/aclocal/libtool.m4 0644 root bin +f none /opt/csw/share/aclocal/ltdl.m4 0644 root bin +d none /opt/csw/share/libtool 0755 root bin +f none /opt/csw/share/libtool/ltmain.sh 0644 root bin +f none /opt/csw/share/libtool/config.guess 0755 root bin +f none /opt/csw/share/libtool/config.sub 0755 root bin +d none /opt/csw/share/libtool/libltdl 0755 root bin +f none /opt/csw/share/libtool/libltdl/README 0644 root bin +f none /opt/csw/share/libtool/libltdl/acinclude.m4 0644 root bin +f none /opt/csw/share/libtool/libltdl/configure.ac 0644 root bin +f none /opt/csw/share/libtool/libltdl/aclocal.m4 0644 root bin +f none /opt/csw/share/libtool/libltdl/ltdl.h 0644 root bin +f none /opt/csw/share/libtool/libltdl/Makefile.am 0644 root bin +f none /opt/csw/share/libtool/libltdl/Makefile.in 0644 root bin +f none /opt/csw/share/libtool/libltdl/config-h.in 0644 root bin +f none /opt/csw/share/libtool/libltdl/configure 0755 root bin +f none /opt/csw/share/libtool/libltdl/COPYING.LIB 0644 root bin +f none /opt/csw/share/libtool/libltdl/config.guess 0755 root bin +f none /opt/csw/share/libtool/libltdl/config.sub 0755 root bin +f none /opt/csw/share/libtool/libltdl/install-sh 0755 root bin +f none /opt/csw/share/libtool/libltdl/ltmain.sh 0644 root bin +f none /opt/csw/share/libtool/libltdl/missing 0755 root bin +f none /opt/csw/share/libtool/libltdl/ltdl.c 0644 root bin +d none /opt/csw/lib 0755 root bin +f none /opt/csw/lib/libltdl.so.3.1.0 0755 root bin +s none /opt/csw/lib/libltdl.so.3=libltdl.so.3.1.0 +s none /opt/csw/lib/libltdl.so=libltdl.so.3.1.0 +f none /opt/csw/lib/libltdl.la 0755 root bin +f none /opt/csw/lib/libltdl.a 0644 root bin +d none /opt/csw/bin 0755 root bin +f none /opt/csw/bin/libtool 0755 root bin +f none /opt/csw/bin/libtool.cc 0755 root bin +f none /opt/csw/bin/libtool.gcc 0755 root bin +f none /opt/csw/bin/libtoolize 0755 root bin +d none /opt/csw/include 0755 root bin +f none /opt/csw/include/ltdl.h 0644 root bin Added: csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/prototype.old =================================================================== --- csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/prototype.old (rev 0) +++ csw/mgar/pkg/libtool/tags/libtool-1.5.2-legacy/prototype.old 2009-09-11 18:33:24 UTC (rev 6275) @@ -0,0 +1,49 @@ +i pkginfo +i copyright +i depend +d none /opt/csw/share 0755 root bin +d none /opt/csw/share/info 0755 root bin +f none /opt/csw/share/info/libtool.info 0644 root bin +f none /opt/csw/share/info/libtool.info-1 0644 root bin +f none /opt/csw/share/info/libtool.info-2 0644 root bin +f none /opt/csw/share/info/libtool.info-3 0644 root bin +f none /opt/csw/share/info/libtool.info-4 0644 root bin +f none /opt/csw/share/info/libtool.info-5 0644 root bin +d none /opt/csw/share/aclocal 0755 root bin +f none /opt/csw/share/aclocal/libtool.m4 0644 root bin +f none /opt/csw/share/aclocal/ltdl.m4 0644 root bin +d none /opt/csw/share/libtool 0755 root bin +f none /opt/csw/share/libtool/ltmain.sh 0644 root bin +f none /opt/csw/share/libtool/config.guess 0755 root bin +f none /opt/csw/share/libtool/config.sub 0755 root bin +d none /opt/csw/share/libtool/libltdl 0755 root bin +f none /opt/csw/share/libtool/libltdl/README 0644 root bin +f none /opt/csw/share/libtool/libltdl/ltdl.h 0644 root bin +f none /opt/csw/share/libtool/libltdl/COPYING.LIB 0644 root bin +f none /opt/csw/share/libtool/libltdl/Makefile.am 0644 root bin +f none /opt/csw/share/libtool/libltdl/Makefile.in 0644 root bin +f none /opt/csw/share/libtool/libltdl/acinclude.m4 0644 root bin +f none /opt/csw/share/libtool/libltdl/aclocal.m4 0644 root bin +f none /opt/csw/share/libtool/libltdl/config-h.in 0644 root bin +f none /opt/csw/share/libtool/libltdl/config.guess 0755 root bin +f none /opt/csw/share/libtool/libltdl/config.sub 0755 root bin +f none /opt/csw/share/libtool/libltdl/configure 0755 root bin +f none /opt/csw/share/libtool/libltdl/configure.ac 0644 root bin +f none /opt/csw/share/libtool/libltdl/install-sh 0755 root bin +f none /opt/csw/share/libtool/libltdl/ltmain.sh 0644 root bin +f none /opt/csw/share/libtool/libltdl/missing 0755 root bin +f none /opt/csw/share/libtool/libltdl/mkinstalldirs 0755 root bin +f none /opt/csw/share/libtool/libltdl/ltdl.c 0644 root bin +d none /opt/csw/lib 0755 root bin +f none /opt/csw/lib/libltdl.so.3.1.0 0755 root bin +s none /opt/csw/lib/libltdl.so.3=libltdl.so.3.1.0 +s none /opt/csw/lib/libltdl.so=libltdl.so.3.1.0 +f none /opt/csw/lib/libltdl.la 0755 root bin +f none /opt/csw/lib/libltdl.a 0644 root bin +d none /opt/csw/bin 0755 root bin +f none /opt/csw/bin/libtool 0755 root bin +f none /opt/csw/bin/libtool.cc 0755 root bin +f none /opt/csw/bin/libtool.gcc 0755 root bin +f none /opt/csw/bin/libtoolize 0755 root bin +d none /opt/csw/include 0755 root bin +f none /opt/csw/include/ltdl.h 0644 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 Fri Sep 11 20:45:14 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Sep 2009 18:45:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6276] csw/mgar/pkg/tcpwrappers/trunk Message-ID: Revision: 6276 http://gar.svn.sourceforge.net/gar/?rev=6276&view=rev Author: dmichelsen Date: 2009-09-11 18:45:14 +0000 (Fri, 11 Sep 2009) Log Message: ----------- tcpwrappers: Initial commit Modified Paths: -------------- csw/mgar/pkg/tcpwrappers/trunk/Makefile csw/mgar/pkg/tcpwrappers/trunk/checksums Added Paths: ----------- csw/mgar/pkg/tcpwrappers/trunk/files/ csw/mgar/pkg/tcpwrappers/trunk/files/COPYING csw/mgar/pkg/tcpwrappers/trunk/files/README csw/mgar/pkg/tcpwrappers/trunk/files/man.patch csw/mgar/pkg/tcpwrappers/trunk/files/patch-cflags.diff csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch Modified: csw/mgar/pkg/tcpwrappers/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcpwrappers/trunk/Makefile 2009-09-11 18:33:24 UTC (rev 6275) +++ csw/mgar/pkg/tcpwrappers/trunk/Makefile 2009-09-11 18:45:14 UTC (rev 6276) @@ -1,5 +1,7 @@ GARNAME = tcp_wrappers -GARVERSION = 7.6 +BASEVERSION = 7.6 +RELEASE = ipv6.4 +GARVERSION = $(BASEVERSION)-$(RELEASE) CATEGORIES = lib DESCRIPTION = Socket wrappers for pre-screening tcp connections (ipv6.4 patched) @@ -10,33 +12,95 @@ MASTER_SITES = http://ftp.porcupine.org/pub/security/ DISTNAME = $(GARNAME)_$(GARVERSION) DISTFILES = $(DISTNAME).tar.gz +DISTFILES += COPYING +DISTFILES += README + +PATCHFILES = patch-cflags.diff +PATCHFILES += man.patch +PATCHFILES += sharedlib.patch + WORKSRC = $(WORKDIR)/$(DISTNAME) +PACKAGES = CSWtcpwrap +CATALOGNAME = tcpwrappers + +SPKG_VERSION = $(BASEVERSION) + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)_(\d+(?:\.\d+)*).tar.gz -#BUILD_ARGS = REAL_DAEMON_DIR=/foo/bar +EXTRA_MODULATORS = EXTENDED +MODULATIONS_EXTENDED = on off + +BUILD_ARGS = REAL_DAEMON_DIR=/usr/sbin BUILD_ARGS += STYLE=-DPROCESS_OPTIONS +BUILD_ARGS += USER_CFLAGS="$(CFLAGS)" +BUILD64 = 1 + CONFIGURE_SCRIPTS = + +BUILD_TARGET_EXTENDED_off = sunos5-shared +BUILD_TARGET_EXTENDED_on = sunos5-sharedext + BUILD_SCRIPTS = custom -INSTALL_SCRIPTS = custom # No test suite TEST_SCRIPTS = +LIBNAME_EXTENDED-off = libwrap-std.so.1 +LIBNAME_EXTENDED-on = libwrap-ext.so.1 + +INSTALL_SCRIPTS = custom + +MERGE_SCRIPTS_isa-sparcv8-extended-off = copy-all + MERGE_SCRIPTS_isa-sparcv8-extended-on = copy-relocated-only + MERGE_DIRS_isa-sparcv8-extended-on = $(libdir) + +MERGE_SCRIPTS_isa-sparcv9-extended-off = copy-relocated-only + MERGE_DIRS_isa-sparcv9-extended-off = $(libdir) + MERGE_SCRIPTS_isa-sparcv9-extended-on = copy-relocated-only + MERGE_DIRS_isa-sparcv9-extended-on = $(libdir) + + MERGE_SCRIPTS_isa-i386-extended-off = copy-all + MERGE_SCRIPTS_isa-i386-extended-on = copy-relocated-only + MERGE_DIRS_isa-i386-extended-on = $(libdir) + + MERGE_SCRIPTS_isa-amd64-extended-off = copy-relocated-only + MERGE_DIRS_isa-amd64-extended-off = $(libdir) + MERGE_SCRIPTS_isa-amd64-extended-on = copy-relocated-only + MERGE_DIRS_isa-amd64-extended-on = $(libdir) + include gar/category.mk build-custom: - @$(MAKE) -C $(WORKSRC) $(BUILD_ARGS) sunos5 + $(MAKE) -C $(WORKSRC) $(BUILD_ARGS) $(BUILD_TARGET_EXTENDED_$(EXTENDED)) + @$(MAKECOOKIE) -BINFILES = $(addprefix $(WORKSRC)/,safe_finger tcpd tcpdchk tcpdmatch try-from) -INCFILES = $(addprefix $(WORKSRC)/,tcpd.h) -LIBFILES = $(addprefix $(WORKSRC)/,libwrap.a) - install-custom: @echo " => Installing $(GARNAME)" - @install -v -m 555 $(BINFILES) $(DESTDIR)$(bindir) - @install -v -m 444 $(INCFILES) $(DESTDIR)$(includedir) - @install -v -m 444 $(LIBFILES) $(DESTDIR)$(libdir) - + ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) + cd $(WORKDIR) && ginstall -v -m 644 README $(DESTDIR)$(docdir)/$(GARNAME) + ginstall -d $(DESTDIR)$(libexecdir) + cd $(WORKSRC) && ginstall -v -m 755 safe_finger tcpd tcpdchk tcpdmatch try-from $(DESTDIR)$(libexecdir) + ginstall -d $(DESTDIR)$(includedir) + cd $(WORKSRC) && ginstall -v -m 644 tcpd.h $(DESTDIR)$(includedir) + ginstall -d $(DESTDIR)$(libdir) + cd $(WORKSRC) && ginstall -v -m 644 libwrap.so.1 $(DESTDIR)$(libdir)/$(LIBNAME_EXTENDED-$(EXTENDED)) + ginstall -d $(DESTDIR)$(mandir)/man3 + cd $(WORKSRC) && ginstall -v -m 644 *.3 $(DESTDIR)$(mandir)/man3 + ginstall -d $(DESTDIR)$(mandir)/man5 + cd $(WORKSRC) && ginstall -v -m 644 *.5 $(DESTDIR)$(mandir)/man5 + ginstall -d $(DESTDIR)$(mandir)/man8 + cd $(WORKSRC) && ginstall -v -m 644 *.8 $(DESTDIR)$(mandir)/man8 + @$(MAKECOOKIE) + +post-merge: + ln -s libwrap-std.so.1 $(PKGROOT)$(libdir)/libwrap.so.1 + ln -s libwrap.so.1 $(PKGROOT)$(libdir)/libwrap.so + ln -s libwrap-std.so.1 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libwrap.so.1 + ln -s libwrap.so.1 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libwrap.so + @$(MAKECOOKIE) + +SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) + Modified: csw/mgar/pkg/tcpwrappers/trunk/checksums =================================================================== --- csw/mgar/pkg/tcpwrappers/trunk/checksums 2009-09-11 18:33:24 UTC (rev 6275) +++ csw/mgar/pkg/tcpwrappers/trunk/checksums 2009-09-11 18:45:14 UTC (rev 6276) @@ -1 +1,6 @@ -e6fa25f71226d090f34de3f6b122fb5a download/tcp_wrappers_7.6.tar.gz +071bd69cb78b18888ea5e3da5c3127fa download/COPYING +b268880c14ab6d31140015275c82d6aa download/README +89e8f9d1ed25d8e809674af9bf3d18e6 download/man.patch +af28873e5c16c4f921237148e2507826 download/patch-cflags.diff +39ff14b0cc741a02a8427c4107c5d7d4 download/sharedlib.patch +ccbc2676977c31bbd43783abfbf2fdcf download/tcp_wrappers_7.6-ipv6.4.tar.gz Copied: csw/mgar/pkg/tcpwrappers/trunk/files/COPYING (from rev 6273, csw/mgar/pkg/tcpwrappers/tags/legacy/copyright) =================================================================== --- csw/mgar/pkg/tcpwrappers/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/tcpwrappers/trunk/files/COPYING 2009-09-11 18:45:14 UTC (rev 6276) @@ -0,0 +1,16 @@ +/************************************************************************ +* Copyright 1995 by Wietse Venema. All rights reserved. Some individual +* files may be covered by other copyrights. +* +* This material was originally written and compiled by Wietse Venema at +* Eindhoven University of Technology, The Netherlands, in 1990, 1991, +* 1992, 1993, 1994 and 1995. +* +* Redistribution and use in source and binary forms are permitted +* provided that this entire copyright notice is duplicated in all such +* copies. +* +* This software is provided "as is" and without any expressed or implied +* warranties, including, without limitation, the implied warranties of +* merchantibility and fitness for any particular purpose. +************************************************************************/ Copied: csw/mgar/pkg/tcpwrappers/trunk/files/README (from rev 6273, csw/mgar/pkg/tcpwrappers/tags/legacy/README.t) =================================================================== --- csw/mgar/pkg/tcpwrappers/trunk/files/README (rev 0) +++ csw/mgar/pkg/tcpwrappers/trunk/files/README 2009-09-11 18:45:14 UTC (rev 6276) @@ -0,0 +1,28 @@ +TCP-Wrappers, from http://www.porcupine.org + +Note that the library is compiled to use LOG_LOCAL1 as the +syslog facility, NOT "LOG_MAIL", the default. + +ALSO, it uses /etc/opt/csw/hosts.xxx, NOT /etc/hosts.XXX + +man hosts_access(3), hosts_access(5), hosts_options(5) +for syntax on those. + +The compile has been hacked to provide a shared-library version instead +of libwrap.a +There is an extra hack, in that there are default variable definitions of +deny_severity and allow_severity, set to 0. +This is to allow for ./configure style tests, that break in the transition +from lib.a to lib.so + + +Note also that there are TWO versions of libwrap.so: +libwrap-std.so.1 The "standard" tcp wrapper library +libwrap-ext.so.1 The "extended" tcp wrapper library + +By default, /opt/csw/lib/libwrap.so.1 is linked to the std version. +To use the extended syntax in hosts_options(5), you need to change +the link to point to libwrap-ext.so.1 +Unfortunately, the syntax for the two versions, is slightly incompatible, +which is why there are two versions. + Copied: csw/mgar/pkg/tcpwrappers/trunk/files/man.patch (from rev 6273, csw/mgar/pkg/tcpwrappers/tags/legacy/man.patch) =================================================================== --- csw/mgar/pkg/tcpwrappers/trunk/files/man.patch (rev 0) +++ csw/mgar/pkg/tcpwrappers/trunk/files/man.patch 2009-09-11 18:45:14 UTC (rev 6276) @@ -0,0 +1,154 @@ +diff -Naur tcp_wrappers_7.6-ipv6.4.orig/hosts_access.3 tcp_wrappers_7.6-ipv6.4.patched/hosts_access.3 +--- tcp_wrappers_7.6-ipv6.4.orig/hosts_access.3 1996-02-11 17:01:27.000000000 +0100 ++++ tcp_wrappers_7.6-ipv6.4.patched/hosts_access.3 2009-09-11 18:54:28.630235290 +0200 +@@ -78,7 +78,7 @@ + hosts_access(5), format of the access control tables. + hosts_options(5), optional extensions to the base language. + .SH FILES +-/etc/hosts.allow, /etc/hosts.deny, access control tables. ++/etc/opt/csw/hosts.allow, /etc//opt/csw/hosts.deny, access control tables. + .SH BUGS + hosts_access() uses the strtok() library function. This may interfere + with other code that relies on strtok(). +diff -Naur tcp_wrappers_7.6-ipv6.4.orig/hosts_access.5 tcp_wrappers_7.6-ipv6.4.patched/hosts_access.5 +--- tcp_wrappers_7.6-ipv6.4.orig/hosts_access.5 1995-01-30 19:51:47.000000000 +0100 ++++ tcp_wrappers_7.6-ipv6.4.patched/hosts_access.5 2009-09-11 18:54:28.633332432 +0200 +@@ -21,10 +21,10 @@ + at the first match: + .IP \(bu + Access will be granted when a (daemon,client) pair matches an entry in +-the \fI/etc/hosts.allow\fR file. ++the \fI/etc/opt/csw/hosts.allow\fR file. + .IP \(bu + Otherwise, access will be denied when a (daemon,client) pair matches an +-entry in the \fI/etc/hosts.deny\fR file. ++entry in the \fI/etc/opt/csw/hosts.deny\fR file. + .IP \(bu + Otherwise, access will be granted. + .PP +@@ -268,7 +268,7 @@ + file: + .PP + .ne 2 +-/etc/hosts.deny: ++/etc/opt/csw/hosts.deny: + .in +3 + ALL: ALL + .PP +@@ -279,7 +279,7 @@ + For example: + .PP + .ne 2 +-/etc/hosts.allow: ++/etc/opt/csw/hosts.allow: + .in +3 + ALL: LOCAL @some_netgroup + .br +@@ -298,7 +298,7 @@ + that it can be omitted. The explicitly non-authorized hosts are listed + in the deny file. For example: + .PP +-/etc/hosts.deny: ++/etc/opt/csw/hosts.deny: + .in +3 + ALL: some.host.name, .some.domain + .br +@@ -313,13 +313,13 @@ + host. The result is mailed to the superuser. + .PP + .ne 2 +-/etc/hosts.allow: ++/etc/opt/csw/hosts.allow: + .in +3 + .nf + in.tftpd: LOCAL, .my.domain + .PP + .ne 2 +-/etc/hosts.deny: ++/etc/opt/csw/hosts.deny: + .in +3 + .nf + in.tftpd: ALL: (/some/where/safe_finger -l @%h | \\ +@@ -353,8 +353,8 @@ + .SH FILES + .na + .nf +-/etc/hosts.allow, (daemon,client) pairs that are granted access. +-/etc/hosts.deny, (daemon,client) pairs that are denied access. ++/etc/opt/csw/hosts.allow, (daemon,client) pairs that are granted access. ++/etc/opt/csw/hosts.deny, (daemon,client) pairs that are denied access. + .ad + .fi + .SH SEE ALSO +diff -Naur tcp_wrappers_7.6-ipv6.4.orig/tcpd.8 tcp_wrappers_7.6-ipv6.4.patched/tcpd.8 +--- tcp_wrappers_7.6-ipv6.4.orig/tcpd.8 1996-02-21 16:39:16.000000000 +0100 ++++ tcp_wrappers_7.6-ipv6.4.patched/tcpd.8 2009-09-11 18:54:28.635231817 +0200 +@@ -146,7 +146,7 @@ + only non-trivial service that is affected by this limitation is + \fIrexd\fR, which is used by the \fIon(1)\fR command. This is no great + loss. On most systems, \fIrexd\fR is less secure than a wildcard in +-/etc/hosts.equiv. ++/etc/opt/csw/hosts.equiv. + .PP + RPC broadcast requests (for example: \fIrwall, rup, rusers\fR) always + appear to come from the responding host. What happens is that the +@@ -158,9 +158,9 @@ + .PP + The default locations of the host access control tables are: + .PP +-/etc/hosts.allow ++/etc/opt/csw/hosts.allow + .br +-/etc/hosts.deny ++/etc/opt/csw/hosts.deny + .SH SEE ALSO + .na + .nf +diff -Naur tcp_wrappers_7.6-ipv6.4.orig/tcpdchk.8 tcp_wrappers_7.6-ipv6.4.patched/tcpdchk.8 +--- tcp_wrappers_7.6-ipv6.4.orig/tcpdchk.8 1995-01-08 17:00:31.000000000 +0100 ++++ tcp_wrappers_7.6-ipv6.4.patched/tcpdchk.8 2009-09-11 18:54:28.636911201 +0200 +@@ -8,7 +8,7 @@ + \fItcpdchk\fR examines your tcp wrapper configuration and reports all + potential and real problems it can find. The program examines the + \fItcpd\fR access control files (by default, these are +-\fI/etc/hosts.allow\fR and \fI/etc/hosts.deny\fR), and compares the ++\fI/etc/opt/csw/hosts.allow\fR and \fI/etc/opt/csw/hosts.deny\fR), and compares the + entries in these files against entries in the \fIinetd\fR or \fItlid\fR + network configuration files. + .PP +@@ -44,9 +44,9 @@ + .PP + The default locations of the \fItcpd\fR access control tables are: + .PP +-/etc/hosts.allow ++/etc/opt/csw/hosts.allow + .br +-/etc/hosts.deny ++/etc/opt/csw/hosts.deny + .SH SEE ALSO + .na + .nf +diff -Naur tcp_wrappers_7.6-ipv6.4.orig/tcpdmatch.8 tcp_wrappers_7.6-ipv6.4.patched/tcpdmatch.8 +--- tcp_wrappers_7.6-ipv6.4.orig/tcpdmatch.8 1996-02-11 17:01:36.000000000 +0100 ++++ tcp_wrappers_7.6-ipv6.4.patched/tcpdmatch.8 2009-09-11 18:54:28.638584325 +0200 +@@ -11,7 +11,7 @@ + request for service. Examples are given below. + .PP + The program examines the \fItcpd\fR access control tables (default +-\fI/etc/hosts.allow\fR and \fI/etc/hosts.deny\fR) and prints its ++\fI/etc/opt/csw/hosts.allow\fR and \fI/etc/opt/csw/hosts.deny\fR) and prints its + conclusion. For maximal accuracy, it extracts additional information + from your \fIinetd\fR or \fItlid\fR network configuration file. + .PP +@@ -76,9 +76,9 @@ + .PP + The default locations of the \fItcpd\fR access control tables are: + .PP +-/etc/hosts.allow ++/etc/opt/csw/hosts.allow + .br +-/etc/hosts.deny ++/etc/opt/csw/hosts.deny + .SH SEE ALSO + .na + .nf Added: csw/mgar/pkg/tcpwrappers/trunk/files/patch-cflags.diff =================================================================== --- csw/mgar/pkg/tcpwrappers/trunk/files/patch-cflags.diff (rev 0) +++ csw/mgar/pkg/tcpwrappers/trunk/files/patch-cflags.diff 2009-09-11 18:45:14 UTC (rev 6276) @@ -0,0 +1,12 @@ +diff -Naur tcp_wrappers_7.6-ipv6.4.orig/Makefile tcp_wrappers_7.6-ipv6.4.patched/Makefile +--- tcp_wrappers_7.6-ipv6.4.orig/Makefile 2003-04-16 16:25:03.000000000 +0200 ++++ tcp_wrappers_7.6-ipv6.4.patched/Makefile 2009-09-11 17:11:48.499403164 +0200 +@@ -677,7 +677,7 @@ + -DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" $(STYLE) $(KILL_OPT) \ + -DSEVERITY=$(SEVERITY) -DRFC931_TIMEOUT=$(RFC931_TIMEOUT) \ + $(UCHAR) $(TABLES) $(STRINGS) $(TLI) $(EXTRA_CFLAGS) $(DOT) \ +- $(VSYSLOG) $(HOSTNAME) $(IPV6) ++ $(VSYSLOG) $(HOSTNAME) $(IPV6) $(USER_CFLAGS) + + LIB_OBJ= hosts_access.o options.o shell_cmd.o rfc931.o eval.o \ + hosts_ctl.o refuse.o percent_x.o clean_exit.o $(AUX_OBJ) \ Copied: csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch (from rev 6273, csw/mgar/pkg/tcpwrappers/tags/legacy/sharedlib.patch) =================================================================== --- csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch (rev 0) +++ csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch 2009-09-11 18:45:14 UTC (rev 6276) @@ -0,0 +1,73 @@ +diff -Naur tcp_wrappers_7.6-ipv6.4.orig/Makefile tcp_wrappers_7.6-ipv6.4.patched/Makefile +--- tcp_wrappers_7.6-ipv6.4.orig/Makefile 2003-04-16 16:25:03.000000000 +0200 ++++ tcp_wrappers_7.6-ipv6.4.patched/Makefile 2009-09-11 18:58:37.916723372 +0200 +@@ -197,6 +197,24 @@ + BUGS="$(BUGS) -DSOLARIS_24_GETHOSTBYNAME_BUG" IPV6="$(IPV6)" \ + EXTRA_CFLAGS=-DUSE_STRERROR all + ++sunos5-shared: ++ @$(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 ++ ++sunos5-sharedext: ++ @$(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= STYLE=-DPROCESS_OPTIONS \ ++ NETGROUP=-DNETGROUP AUX_OBJ="setenv.o sharedhack.o" TLI=-DTLI \ ++ BUGS="$(BUGS) -DSOLARIS_24_GETHOSTBYNAME_BUG" IPV6="$(IPV6)" \ ++ EXTRA_CFLAGS="-DUSE_STRERROR -Kpic" all ++ + # Generic SYSV40 + esix sysv4: + @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ +@@ -481,7 +499,7 @@ + # If your system has IPv6 and supports getipnode* and inet_pton/inet_ntop + # uncomment the following (Solaris 8) + +-# IPV6 = -DHAVE_IPV6 ++IPV6 = -DHAVE_IPV6 + + # If your system does not have getipnodebyname() but uses the obsolete + # gethostbyname2() instead, use this (AIX) +@@ -527,7 +545,7 @@ + # + # The LOG_XXX names below are taken from the /usr/include/syslog.h file. + +-FACILITY= LOG_MAIL # LOG_MAIL is what most sendmail daemons use ++FACILITY= LOG_LOCAL1 # LOG_MAIL is what most sendmail daemons use + + # The syslog priority at which successful connections are logged. + +@@ -603,7 +621,7 @@ + # look for access control information. Watch out for the quotes and + # backslashes when you make changes. + +-TABLES = -DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\" ++TABLES = -DHOSTS_DENY=\"/etc/opt/csw/hosts.deny\" -DHOSTS_ALLOW=\"/etc/opt/csw/hosts.allow\" + + #################################################### + # Optional: dealing with host name/address conflicts +@@ -725,7 +743,7 @@ + $(CC) $(CFLAGS) -o $@ miscd.o $(LIB) $(LIBS) + + safe_finger: safe_finger.o $(LIB) +- $(CC) $(CFLAGS) -o $@ safe_finger.o $(LIB) $(LIBS) ++ $(CC) $(CFLAGS) -o $@ safe_finger.o $(LIBS) + + TCPDMATCH_OBJ = tcpdmatch.o fakelog.o inetcf.o scaffold.o + +diff -Naur tcp_wrappers_7.6-ipv6.4.orig/sharedhack.c tcp_wrappers_7.6-ipv6.4.patched/sharedhack.c +--- tcp_wrappers_7.6-ipv6.4.orig/sharedhack.c 1970-01-01 01:00:00.000000000 +0100 ++++ tcp_wrappers_7.6-ipv6.4.patched/sharedhack.c 2009-09-11 18:58:37.917838872 +0200 +@@ -0,0 +1,5 @@ ++/* This must be compiled with Sun CC for the pragma */ ++#pragma weak deny_severity ++#pragma weak allow_severity ++int deny_severity=0; ++int allow_severity=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 Sep 11 20:52:20 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Sep 2009 18:52:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[6277] csw/mgar/pkg/tcpwrappers/trunk/Makefile Message-ID: Revision: 6277 http://gar.svn.sourceforge.net/gar/?rev=6277&view=rev Author: dmichelsen Date: 2009-09-11 18:52:19 +0000 (Fri, 11 Sep 2009) Log Message: ----------- tcpwrappers: Fix directory of README Modified Paths: -------------- csw/mgar/pkg/tcpwrappers/trunk/Makefile Modified: csw/mgar/pkg/tcpwrappers/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcpwrappers/trunk/Makefile 2009-09-11 18:45:14 UTC (rev 6276) +++ csw/mgar/pkg/tcpwrappers/trunk/Makefile 2009-09-11 18:52:19 UTC (rev 6277) @@ -78,9 +78,9 @@ @$(MAKECOOKIE) install-custom: - @echo " => Installing $(GARNAME)" - ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) - cd $(WORKDIR) && ginstall -v -m 644 README $(DESTDIR)$(docdir)/$(GARNAME) + @echo " => Installing $(CATALOGNAME)" + ginstall -d $(DESTDIR)$(docdir)/$(CATALOGNAME) + cd $(WORKDIR) && ginstall -v -m 644 README $(DESTDIR)$(docdir)/$(CATALOGNAME) ginstall -d $(DESTDIR)$(libexecdir) cd $(WORKSRC) && ginstall -v -m 755 safe_finger tcpd tcpdchk tcpdmatch try-from $(DESTDIR)$(libexecdir) ginstall -d $(DESTDIR)$(includedir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sat Sep 12 00:37:25 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 11 Sep 2009 22:37:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[6278] csw/mgar/pkg Message-ID: Revision: 6278 http://gar.svn.sourceforge.net/gar/?rev=6278&view=rev Author: skayser Date: 2009-09-11 22:37:24 +0000 (Fri, 11 Sep 2009) Log Message: ----------- sudosh2: initial commit Added Paths: ----------- csw/mgar/pkg/sudosh2/ csw/mgar/pkg/sudosh2/branches/ csw/mgar/pkg/sudosh2/tags/ csw/mgar/pkg/sudosh2/trunk/ csw/mgar/pkg/sudosh2/trunk/Makefile csw/mgar/pkg/sudosh2/trunk/checksums csw/mgar/pkg/sudosh2/trunk/files/ csw/mgar/pkg/sudosh2/trunk/files/001-installsudosh.conf-destdir.patch Property changes on: csw/mgar/pkg/sudosh2/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/sudosh2/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudosh2/trunk/Makefile (rev 0) +++ csw/mgar/pkg/sudosh2/trunk/Makefile 2009-09-11 22:37:24 UTC (rev 6278) @@ -0,0 +1,32 @@ +# TODO/Issues +# - Man pages don't display right now +# - Set sudosh.conf ownership to root:root? +# - Compiled in default for logdir /var/adm/..., if not existant sudosh2 +# totally hangs (^C doesn't work). Change default and include the dir in the +# package? +# - Submit DESTDIR patch upstream +GARNAME = sudosh2 +GARVERSION = 1.0.2 +CATEGORIES = apps + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tgz + +CONFIGURE_ARGS = $(DIRPATHS) + +# No tests available +TEST_SCRIPTS = + +# Installation for sudosh.conf doesn't honor DESTDIR +PATCHFILES = 001-installsudosh.conf-destdir.patch + +include gar/category.mk + +pre-configure-modulated: + perl -pi -e 's|-Werror|-errwarn|g' $(WORKSRC)/Makefile.in $(WORKSRC)/src/Makefile.in + @$(MAKECOOKIE) Added: csw/mgar/pkg/sudosh2/trunk/checksums =================================================================== --- csw/mgar/pkg/sudosh2/trunk/checksums (rev 0) +++ csw/mgar/pkg/sudosh2/trunk/checksums 2009-09-11 22:37:24 UTC (rev 6278) @@ -0,0 +1 @@ +4c837f7739d9db780ad324ed8482e8a7 download/sudosh2-1.0.2.tgz Added: csw/mgar/pkg/sudosh2/trunk/files/001-installsudosh.conf-destdir.patch =================================================================== --- csw/mgar/pkg/sudosh2/trunk/files/001-installsudosh.conf-destdir.patch (rev 0) +++ csw/mgar/pkg/sudosh2/trunk/files/001-installsudosh.conf-destdir.patch 2009-09-11 22:37:24 UTC (rev 6278) @@ -0,0 +1,14 @@ +diff --speed-large-files --minimal -Nru sudosh2-1.0.2.orig/src/Makefile.in sudosh2-1.0.2/src/Makefile.in +--- sudosh2-1.0.2.orig/src/Makefile.in 2008-02-22 22:11:01.000000000 +0100 ++++ sudosh2-1.0.2/src/Makefile.in 2009-09-12 00:15:07.491559672 +0200 +@@ -441,8 +441,8 @@ + + + install-sudosh.conf: +- test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)" +- test -f $(sysconfdir)/sudosh.conf || $(INSTALL) -o 0 -g 0 -m 0444 '$(srcdir)/sudosh.conf' '$(sysconfdir)/sudosh.conf' ++ test -z "$(DESTDIR)$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)" ++ test -f "$(DESTDIR)$(sysconfdir)/sudosh.conf" || $(INSTALL) -m 0444 '$(srcdir)/sudosh.conf' '$(DESTDIR)$(sysconfdir)/sudosh.conf' + + install: install-am install-sudosh.conf + # Tell versions [3.59,3.63) of GNU make to not export all variables. 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 Sep 12 02:24:35 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 12 Sep 2009 00:24:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[6279] csw/mgar/pkg/xmlto/trunk/Makefile Message-ID: Revision: 6279 http://gar.svn.sourceforge.net/gar/?rev=6279&view=rev Author: bdwalton Date: 2009-09-12 00:24:35 +0000 (Sat, 12 Sep 2009) Log Message: ----------- xmlto: /opt/csw/etc -> /etc/opt/csw Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-11 22:37:24 UTC (rev 6278) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-12 00:24:35 UTC (rev 6279) @@ -41,6 +41,8 @@ CONFIGURE_ARGS += FIND=/opt/csw/bin/gfind CONFIGURE_ARGS += MKTEMP=/opt/csw/bin/mktemp +sysconfdir = /etc/opt/csw + include gar/category.mk # We need this for 'tail -n' @@ -48,4 +50,4 @@ #reset XML_CATALOG lookup (we rely on having packages that provide stylesheets #etc). Having xsltproc not find them during build makes us blow up!! -XML_CATALOG_FILES = /opt/csw/etc/xml/catalog +XML_CATALOG_FILES = /etc/opt/csw/xml/catalog 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 Sep 12 03:26:57 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 12 Sep 2009 01:26:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[6280] csw/mgar/pkg/asciidoc/trunk Message-ID: Revision: 6280 http://gar.svn.sourceforge.net/gar/?rev=6280&view=rev Author: bdwalton Date: 2009-09-12 01:26:57 +0000 (Sat, 12 Sep 2009) Log Message: ----------- asciidoc: update to 8.4.5; /opt/csw/etc -> /etc/opt/csw Modified Paths: -------------- csw/mgar/pkg/asciidoc/trunk/Makefile csw/mgar/pkg/asciidoc/trunk/checksums Added Paths: ----------- csw/mgar/pkg/asciidoc/trunk/files/handle-csw-etc-paths.patch Removed Paths: ------------- csw/mgar/pkg/asciidoc/trunk/files/fix-Makefile-am.patch csw/mgar/pkg/asciidoc/trunk/files/fix-autoconf-version.patch Modified: csw/mgar/pkg/asciidoc/trunk/Makefile =================================================================== --- csw/mgar/pkg/asciidoc/trunk/Makefile 2009-09-12 00:24:35 UTC (rev 6279) +++ csw/mgar/pkg/asciidoc/trunk/Makefile 2009-09-12 01:26:57 UTC (rev 6280) @@ -1,5 +1,5 @@ GARNAME = asciidoc -GARVERSION = 8.4.2 +GARVERSION = 8.4.5 CATEGORIES = utils DESCRIPTION = An Documentation Generator @@ -24,18 +24,19 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(AUTOFILES) -#it would really seem this author "doesn't get" auto* stuff. -PATCHFILES = fix-autoconf-version.patch fix-Makefile-am.patch +PATCHFILES = handle-csw-etc-paths.patch -PREREQUISITE_PKGS = CSWautoconf - # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=67797 UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) +sysconfdir = /etc/opt/csw + CONFIGURE_ARGS = $(DIRPATHS) +INSTALL_ARGS = vimdir=/opt/csw/etc/vim + include gar/category.mk # until the autoconf stuff is included upstream, we'll maintain and import our Modified: csw/mgar/pkg/asciidoc/trunk/checksums =================================================================== --- csw/mgar/pkg/asciidoc/trunk/checksums 2009-09-12 00:24:35 UTC (rev 6279) +++ csw/mgar/pkg/asciidoc/trunk/checksums 2009-09-12 01:26:57 UTC (rev 6280) @@ -1,5 +1,2 @@ -5f04247c505cc85987c657eb6f6505db download/asciidoc-8.4.2.tar.gz -38527e11ffe879f2cac4a63b6268b4ca download/CSWasciidoc.gspec -204ab2546bda5c6fb0510ba8e366db7d download/CSWasciidoc.depend -46d75ac8ad96048e25ee1a9883e96224 download/fix-autoconf-version.patch -ca66107f476039013fe578e571f92ff5 download/fix-Makefile-am.patch +9f21d6e352b3ab668f9def3eb7497da2 download/asciidoc-8.4.5.tar.gz +ec48eeea1eafdaa7e507bc11327f6eae download/handle-csw-etc-paths.patch Deleted: csw/mgar/pkg/asciidoc/trunk/files/fix-Makefile-am.patch =================================================================== --- csw/mgar/pkg/asciidoc/trunk/files/fix-Makefile-am.patch 2009-09-12 00:24:35 UTC (rev 6279) +++ csw/mgar/pkg/asciidoc/trunk/files/fix-Makefile-am.patch 2009-09-12 01:26:57 UTC (rev 6280) @@ -1,6507 +0,0 @@ -diff --speed-large-files --minimal -Nru asciidoc-8.4.2.orig/Makefile asciidoc-8.4.2/Makefile ---- asciidoc-8.4.2.orig/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ asciidoc-8.4.2/Makefile 2009-03-27 01:07:56.327828594 +0100 -@@ -0,0 +1,162 @@ -+# -+# Make file to install/uninstall AsciiDoc -+# -+ -+.NOTPARALLEL: -+ -+INSTALL = /opt/csw/bin/ginstall -c -+INSTALL_PROG = ${INSTALL} -+INSTALL_DATA = ${INSTALL} -m 644 -+ -+SED = /opt/csw/bin/gsed -+ -+prefix = /opt/csw -+exec_prefix = /opt/csw -+bindir = /opt/csw/bin -+datadir = /opt/csw/share -+sysconfdir = /opt/csw/etc -+datarootdir = ${prefix}/share -+mandir=/opt/csw/share/man -+srcdir = . -+ -+ -+ -+ASCIIDOCCONF = $(sysconfdir)/asciidoc -+ -+prog = asciidoc.py a2x -+progdir = $(bindir) -+ -+vimdir = /opt/csw/etc/vim -+ -+manp = $(wildcard doc/*.1) -+manpdir = $(mandir)/man1 -+ -+conf = $(wildcard *.conf) -+confdir = $(ASCIIDOCCONF) -+ -+filtersdir = $(ASCIIDOCCONF)/filters -+ -+codefilter = filters/code/code-filter.py -+codefilterdir = $(filtersdir)/code -+codefilterconf = filters/code/code-filter.conf -+codefilterconfdir = $(filtersdir)/code -+ -+graphvizfilter = filters/graphviz/graphviz2png.py -+graphvizfilterdir = $(filtersdir)/graphviz -+graphvizfilterconf = filters/graphviz/graphviz-filter.conf -+graphvizfilterconfdir = $(filtersdir)/graphviz -+ -+musicfilter = filters/music/music2png.py -+musicfilterdir = $(filtersdir)/music -+musicfilterconf = filters/music/music-filter.conf -+musicfilterconfdir = $(filtersdir)/music -+ -+sourcefilterconf = filters/source/source-highlight-filter.conf -+sourcefilterconfdir = $(filtersdir)/source -+ -+docbook = $(wildcard docbook-xsl/*.xsl) -+docbookdir = $(ASCIIDOCCONF)/docbook-xsl -+ -+dblatex = $(wildcard dblatex/*.xsl) $(wildcard dblatex/*.sty) -+dblatexdir = $(ASCIIDOCCONF)/dblatex -+ -+css = $(wildcard stylesheets/*.css) -+cssdir = $(ASCIIDOCCONF)/stylesheets -+ -+js = $(wildcard javascripts/*.js) -+jsdir = $(ASCIIDOCCONF)/javascripts -+ -+callouts = $(wildcard images/icons/callouts/*) -+calloutsdir = $(ASCIIDOCCONF)/images/icons/callouts -+ -+icons = $(wildcard images/icons/*.png) images/icons/README -+iconsdir = $(ASCIIDOCCONF)/images/icons -+ -+doc = $(wildcard README*) $(wildcard BUGS*) $(wildcard INSTALL*) $(wildcard CHANGELOG*) -+docdir = $(datadir)/doc/asciidoc -+ -+DATATARGETS = manp conf docbook dblatex css js callouts icons codefilterconf musicfilterconf sourcefilterconf graphvizfilterconf -+PROGTARGETS = prog codefilter musicfilter graphvizfilter -+TARGETS = $(DATATARGETS) $(PROGTARGETS) doc -+ -+INSTDIRS = $(TARGETS:%=%dir) -+ -+.PHONY: $(TARGETS) -+ -+all: build -+ -+# create directories used during the install -+$(INSTDIRS): -+ $(INSTALL) -d $(DESTDIR)/$($@) -+ -+$(PROGTARGETS): % : %dir -+ $(INSTALL_PROG) $($@) $(DESTDIR)/$($<)/ -+ -+$(DATATARGETS): % : %dir -+ $(INSTALL_DATA) $($@) $(DESTDIR)/$($<)/ -+ -+docs: -+ $(INSTALL) -d $(DESTDIR)/$(docdir) -+ $(INSTALL_DATA) $(doc) $(DESTDIR)/$(docdir) -+ $(INSTALL) -d $(DESTDIR)/$(docdir)/docbook-xsl -+ $(INSTALL_DATA) docbook-xsl/asciidoc-docbook-xsl.txt $(DESTDIR)/$(docdir)/docbook-xsl -+ $(INSTALL) -d $(DESTDIR)/$(docdir)/dblatex -+ $(INSTALL_DATA) dblatex/dblatex-readme.txt $(DESTDIR)/$(docdir)/dblatex -+ $(INSTALL) -d $(DESTDIR)/$(docdir)/stylesheets -+ $(INSTALL_DATA) $(css) $(DESTDIR)/$(docdir)/stylesheets -+ $(INSTALL) -d $(DESTDIR)/$(docdir)/javascripts -+ $(INSTALL_DATA) $(js) $(DESTDIR)/$(docdir)/javascripts -+ $(INSTALL) -d $(DESTDIR)/$(docdir)/images -+ ( cd images && \ -+ cp -R * $(DESTDIR)/$(docdir)/images ) -+ $(INSTALL) -d $(DESTDIR)/$(docdir)/doc -+ ( cd doc && \ -+ cp -R * $(DESTDIR)/$(docdir)/doc ) -+ $(INSTALL) -d $(DESTDIR)/$(docdir)/examples/website -+ ( cd examples/website && \ -+ cp -R * $(DESTDIR)/$(docdir)/examples/website ) -+ -+progsymlink: -+ (cd $(DESTDIR)/$(progdir); ln -sf asciidoc.py asciidoc) -+ -+fixconfpath: -+ @for f in $(prog); do \ -+ echo "Fixing CONF_DIR in $$f"; \ -+ $(SED) "s#^CONF_DIR = '.*'#CONF_DIR = '$(ASCIIDOCCONF)'#; s#^CONF_DIR=.*#CONF_DIR=$(ASCIIDOCCONF)#" $$f > $$f.out; \ -+ mv $$f.out $$f; \ -+ done -+ -+install-vim: -+ @for d in $(DESTDIR)/$(vimdir) /etc/vim; do \ -+ if ! test -d $$d; then continue; fi ; \ -+ echo "installing Vim files in $$d" ; \ -+ $(INSTALL) -d $$d/syntax ; \ -+ $(INSTALL_DATA) vim/syntax/asciidoc.vim $$d/syntax ; \ -+ $(INSTALL) -d $$d/ftdetect ; \ -+ $(INSTALL_DATA) vim/ftdetect/asciidoc_filetype.vim $$d/ftdetect ; \ -+ done -+ -+uninstall-vim: -+ @for d in $(DESTDIR)/$(vimdir) /etc/vim; do \ -+ if ! test -d $$d; then continue; fi ; \ -+ echo "uninstalling Vim files in $$d" ; \ -+ rm -f $$d/syntax/asciidoc.vim ; \ -+ rm -f $$d/ftdetect/asciidoc_filetype.vim ; \ -+ done -+ -+ -+build: fixconfpath -+ -+install: $(PROGTARGETS) $(DATATARGETS) progsymlink install-vim -+ -+uninstall: uninstall-vim -+ rm -f $(DESTDIR)/$(progdir)/asciidoc -+ rm -f $(DESTDIR)/$(progdir)/asciidoc.py -+ rm -f $(DESTDIR)/$(progdir)/a2x -+ rm -f $(DESTDIR)/$(mandir)/asciidoc.1 -+ rm -f $(DESTDIR)/$(mandir)/a2x.1 -+ rm -rf $(DESTDIR)/$(confdir) -+ rm -rf $(DESTDIR)/$(docdir) -+ -+test: -+ @echo "Nothing to see here...Move along." -diff --speed-large-files --minimal -Nru asciidoc-8.4.2.orig/Makefile.in asciidoc-8.4.2/Makefile.in ---- asciidoc-8.4.2.orig/Makefile.in 2009-03-09 21:52:50.000000000 +0100 -+++ asciidoc-8.4.2/Makefile.in 2009-03-27 01:12:11.530587241 +0100 -@@ -127,7 +127,7 @@ - done - - install-vim: -- @for d in $(DESTDIR)/$(vimdir) /etc/vim; do \ -+ @for d in $(DESTDIR)/$(vimdir); do \ - if ! test -d $$d; then continue; fi ; \ - echo "installing Vim files in $$d" ; \ - $(INSTALL) -d $$d/syntax ; \ -@@ -137,7 +137,7 @@ - done - - uninstall-vim: -- @for d in $(DESTDIR)/$(vimdir) /etc/vim; do \ -+ @for d in $(DESTDIR)/$(vimdir); do \ - if ! test -d $$d; then continue; fi ; \ - echo "uninstalling Vim files in $$d" ; \ - rm -f $$d/syntax/asciidoc.vim ; \ -diff --speed-large-files --minimal -Nru asciidoc-8.4.2.orig/a2x asciidoc-8.4.2/a2x ---- asciidoc-8.4.2.orig/a2x 2008-12-31 03:46:28.000000000 +0100 -+++ asciidoc-8.4.2/a2x 2009-03-27 01:08:17.794738348 +0100 -@@ -14,7 +14,7 @@ - REALNAME=$(which "$REALNAME") - fi - REALNAME="$(readlink -f "$REALNAME")" --CONF_DIR=/etc/asciidoc -+CONF_DIR=/opt/csw/etc/asciidoc - FOP_COMMAND="fop.sh" # FOP executable. - - #-------------------------------------------------------------------- -diff --speed-large-files --minimal -Nru asciidoc-8.4.2.orig/asciidoc.py asciidoc-8.4.2/asciidoc.py ---- asciidoc-8.4.2.orig/asciidoc.py 2009-03-18 05:22:00.000000000 +0100 -+++ asciidoc-8.4.2/asciidoc.py 2009-03-27 01:08:17.758780186 +0100 -@@ -4749,7 +4749,7 @@ - APP_DIR = None # This file's directory. - USER_DIR = None # ~/.asciidoc - # Global configuration files directory (set by Makefile build target). --CONF_DIR = '/etc/asciidoc' -+CONF_DIR = '/opt/csw/etc/asciidoc' - HELP_FILE = 'help.conf' # Default (English) help file. - - # Globals -diff --speed-large-files --minimal -Nru asciidoc-8.4.2.orig/autom4te.cache/output.0 asciidoc-8.4.2/autom4te.cache/output.0 ---- asciidoc-8.4.2.orig/autom4te.cache/output.0 1970-01-01 01:00:00.000000000 +0100 -+++ asciidoc-8.4.2/autom4te.cache/output.0 2009-03-27 01:07:51.433802066 +0100 -@@ -0,0 +1,3041 @@ -+@%:@! /bin/sh -+@%:@ Guess values for system-dependent variables and create Makefiles. -+@%:@ Generated by GNU Autoconf 2.63 for asciidoc 8.4.2. -+@%:@ -+@%:@ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -+@%:@ 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+@%:@ This configure script is free software; the Free Software Foundation -+@%:@ gives unlimited permission to copy, distribute and modify it. -+## --------------------- ## -+## M4sh Initialization. ## -+## --------------------- ## -+ -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+ emulate sh -+ NULLCMD=: -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '${1+"$@"}'='"$@"' -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ -+fi -+ -+ -+ -+ -+# PATH needs CR -+# Avoid depending upon Character Ranges. -+as_cr_letters='abcdefghijklmnopqrstuvwxyz' -+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -+as_cr_Letters=$as_cr_letters$as_cr_LETTERS -+as_cr_digits='0123456789' -+as_cr_alnum=$as_cr_Letters$as_cr_digits -+ -+as_nl=' -+' -+export as_nl -+# Printing a long string crashes Solaris 7 /usr/bin/printf. -+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='printf %s\n' -+ as_echo_n='printf %s' -+else -+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' -+ as_echo_n='/usr/ucb/echo -n' -+ else -+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' -+ as_echo_n_body='eval -+ arg=$1; -+ case $arg in -+ *"$as_nl"*) -+ expr "X$arg" : "X\\(.*\\)$as_nl"; -+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -+ esac; -+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -+ ' -+ export as_echo_n_body -+ as_echo_n='sh -c $as_echo_n_body as_echo' -+ fi -+ export as_echo_body -+ as_echo='sh -c $as_echo_body as_echo' -+fi -+ -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ PATH_SEPARATOR=: -+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -+ PATH_SEPARATOR=';' -+ } -+fi -+ -+# Support unset when possible. -+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -+ as_unset=unset -+else -+ as_unset=false -+fi -+ -+ -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) -+IFS=" "" $as_nl" -+ -+# Find who we are. Look in the path if we contain no directory separator. -+case $0 in -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+# We did not find ourselves, most probably we were run as `sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then -+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ { (exit 1); exit 1; } -+fi -+ -+# Work around bugs in pre-3.0 UWIN ksh. -+for as_var in ENV MAIL MAILPATH -+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+done -+PS1='$ ' -+PS2='> ' -+PS4='+ ' -+ -+# NLS nuisances. -+LC_ALL=C -+export LC_ALL -+LANGUAGE=C -+export LANGUAGE -+ -+# Required to use basename. -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then -+ as_expr=expr -+else -+ as_expr=false -+fi -+ -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then -+ as_basename=basename -+else -+ as_basename=false -+fi -+ -+ -+# Name of the executable. -+as_me=`$as_basename -- "$0" || -+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ -+ X"$0" : 'X\(//\)$' \| \ -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X/"$0" | -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ -+# CDPATH. -+$as_unset CDPATH -+ -+ -+if test "x$CONFIG_SHELL" = x; then -+ if (eval ":") 2>/dev/null; then -+ as_have_required=yes -+else -+ as_have_required=no -+fi -+ -+ if test $as_have_required = yes && (eval ": -+(as_func_return () { -+ (exit \$1) -+} -+as_func_success () { -+ as_func_return 0 -+} -+as_func_failure () { -+ as_func_return 1 -+} -+as_func_ret_success () { -+ return 0 -+} -+as_func_ret_failure () { -+ return 1 -+} -+ -+exitcode=0 -+if as_func_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_success failed. -+fi -+ -+if as_func_failure; then -+ exitcode=1 -+ echo as_func_failure succeeded. -+fi -+ -+if as_func_ret_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_ret_success failed. -+fi -+ -+if as_func_ret_failure; then -+ exitcode=1 -+ echo as_func_ret_failure succeeded. -+fi -+ -+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then -+ : -+else -+ exitcode=1 -+ echo positional parameters were not saved. -+fi -+ -+test \$exitcode = 0) || { (exit 1); exit 1; } -+ -+( -+ as_lineno_1=\$LINENO -+ as_lineno_2=\$LINENO -+ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && -+ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -+") 2> /dev/null; then -+ : -+else -+ as_candidate_shells= -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ case $as_dir in -+ /*) -+ for as_base in sh bash ksh sh5; do -+ as_candidate_shells="$as_candidate_shells $as_dir/$as_base" -+ done;; -+ esac -+done -+IFS=$as_save_IFS -+ -+ -+ for as_shell in $as_candidate_shells $SHELL; do -+ # Try only shells that exist, to save several forks. -+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && -+ { ("$as_shell") 2> /dev/null <<\_ASEOF -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+ emulate sh -+ NULLCMD=: -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '${1+"$@"}'='"$@"' -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ -+fi -+ -+ -+: -+_ASEOF -+}; then -+ CONFIG_SHELL=$as_shell -+ as_have_required=yes -+ if { "$as_shell" 2> /dev/null <<\_ASEOF -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+ emulate sh -+ NULLCMD=: -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '${1+"$@"}'='"$@"' -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ -+fi -+ -+ -+: -+(as_func_return () { -+ (exit $1) -+} -+as_func_success () { -+ as_func_return 0 -+} -+as_func_failure () { -+ as_func_return 1 -+} -+as_func_ret_success () { -+ return 0 -+} -+as_func_ret_failure () { -+ return 1 -+} -+ -+exitcode=0 -+if as_func_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_success failed. -+fi -+ -+if as_func_failure; then -+ exitcode=1 -+ echo as_func_failure succeeded. -+fi -+ -+if as_func_ret_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_ret_success failed. -+fi -+ -+if as_func_ret_failure; then -+ exitcode=1 -+ echo as_func_ret_failure succeeded. -+fi -+ -+if ( set x; as_func_ret_success y && test x = "$1" ); then -+ : -+else -+ exitcode=1 -+ echo positional parameters were not saved. -+fi -+ -+test $exitcode = 0) || { (exit 1); exit 1; } -+ -+( -+ as_lineno_1=$LINENO -+ as_lineno_2=$LINENO -+ test "x$as_lineno_1" != "x$as_lineno_2" && -+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } -+ -+_ASEOF -+}; then -+ break -+fi -+ -+fi -+ -+ done -+ -+ if test "x$CONFIG_SHELL" != x; then -+ for as_var in BASH_ENV ENV -+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+ done -+ export CONFIG_SHELL -+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -+fi -+ -+ -+ if test $as_have_required = no; then -+ echo This script requires a shell more modern than all the -+ echo shells that I found on your system. Please install a -+ echo modern shell, or manually run the script under such a -+ echo shell if you do have one. -+ { (exit 1); exit 1; } -+fi -+ -+ -+fi -+ -+fi -+ -+ -+ -+(eval "as_func_return () { -+ (exit \$1) -+} -+as_func_success () { -+ as_func_return 0 -+} -+as_func_failure () { -+ as_func_return 1 -+} -+as_func_ret_success () { -+ return 0 -+} -+as_func_ret_failure () { -+ return 1 -+} -+ -+exitcode=0 -+if as_func_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_success failed. -+fi -+ -+if as_func_failure; then -+ exitcode=1 -+ echo as_func_failure succeeded. -+fi -+ -+if as_func_ret_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_ret_success failed. -+fi -+ -+if as_func_ret_failure; then -+ exitcode=1 -+ echo as_func_ret_failure succeeded. -+fi -+ -+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then -+ : -+else -+ exitcode=1 -+ echo positional parameters were not saved. -+fi -+ -+test \$exitcode = 0") || { -+ echo No shell found that supports shell functions. -+ echo Please tell bug-autoconf at gnu.org about your system, -+ echo including any error possibly output before this message. -+ echo This can help us improve future autoconf versions. -+ echo Configuration will now proceed without shell functions. -+} -+ -+ -+ -+ as_lineno_1=$LINENO -+ as_lineno_2=$LINENO -+ test "x$as_lineno_1" != "x$as_lineno_2" && -+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { -+ -+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -+ # uniformly replaced by the line number. The first 'sed' inserts a -+ # line-number line after each line using $LINENO; the second 'sed' -+ # does the real work. The second script uses 'N' to pair each -+ # line-number line with the line containing $LINENO, and appends -+ # trailing '-' during substitution so that $LINENO is not a special -+ # case at line end. -+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -+ # scripts with optimization help from Paolo Bonzini. Blame Lee -+ # E. McMahon (1931-1989) for sed's syntax. :-) -+ sed -n ' -+ p -+ /[$]LINENO/= -+ ' <$as_myself | -+ sed ' -+ s/[$]LINENO.*/&-/ -+ t lineno -+ b -+ :lineno -+ N -+ :loop -+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ -+ t loop -+ s/-\n.*// -+ ' >$as_me.lineno && -+ chmod +x "$as_me.lineno" || -+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -+ { (exit 1); exit 1; }; } -+ -+ # Don't try to exec as it changes $[0], causing all sort of problems -+ # (the dirname of $[0] is not the place where we might find the -+ # original and so on. Autoconf is especially sensitive to this). -+ . "./$as_me.lineno" -+ # Exit status is that of the last command. -+ exit -+} -+ -+ -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi -+ -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in -+-n*) -+ case `echo 'x\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ *) ECHO_C='\c';; -+ esac;; -+*) -+ ECHO_N='-n';; -+esac -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then -+ as_expr=expr -+else -+ as_expr=false -+fi -+ -+rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file -+else -+ rm -f conf$$.dir -+ mkdir conf$$.dir 2>/dev/null -+fi -+if (echo >conf$$.file) 2>/dev/null; then -+ if ln -s conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -p'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -p' -+ elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+ else -+ as_ln_s='cp -p' -+ fi -+else -+ as_ln_s='cp -p' -+fi -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null -+ -+if mkdir -p . 2>/dev/null; then -+ as_mkdir_p=: -+else -+ test -d ./-p && rmdir ./-p -+ as_mkdir_p=false -+fi -+ -+if test -x / >/dev/null 2>&1; then -+ as_test_x='test -x' -+else -+ if ls -dL / >/dev/null 2>&1; then -+ as_ls_L_option=L -+ else -+ as_ls_L_option= -+ fi -+ as_test_x=' -+ eval sh -c '\'' -+ if test -d "$1"; then -+ test -d "$1/."; -+ else -+ case $1 in -+ -*)set "./$1";; -+ esac; -+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in -+ ???[sx]*):;;*)false;;esac;fi -+ '\'' sh -+ ' -+fi -+as_executable_p=$as_test_x -+ -+# Sed expression to map a string onto a valid CPP name. -+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -+ -+# Sed expression to map a string onto a valid variable name. -+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -+ -+ -+ -+exec 7<&0 &1 -+ -+# Name of the host. -+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -+# so uname gets run too. -+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` -+ -+# -+# Initializations. -+# -+ac_default_prefix=/usr/local -+ac_clean_files= -+ac_config_libobj_dir=. -+LIB@&t at OBJS= -+cross_compiling=no -+subdirs= -+MFLAGS= -+MAKEFLAGS= -+SHELL=${CONFIG_SHELL-/bin/sh} -+ -+# Identity of this package. -+PACKAGE_NAME='asciidoc' -+PACKAGE_TARNAME='asciidoc' -+PACKAGE_VERSION='8.4.2' -+PACKAGE_STRING='asciidoc 8.4.2' -+PACKAGE_BUGREPORT='' -+ -+ac_subst_vars='LTLIBOBJS -+LIB@&t at OBJS -+INSTALL_DATA -+INSTALL_SCRIPT -+INSTALL_PROGRAM -+LN_S -+SED -+target_alias -+host_alias -+build_alias -+LIBS -+ECHO_T -+ECHO_N -+ECHO_C -+DEFS -+mandir -+localedir -+libdir -+psdir -+pdfdir -+dvidir -+htmldir -+infodir -+docdir -+oldincludedir -+includedir -+localstatedir -+sharedstatedir -+sysconfdir -+datadir -+datarootdir -+libexecdir -+sbindir -+bindir -+program_transform_name -+prefix -+exec_prefix -+PACKAGE_BUGREPORT -+PACKAGE_STRING -+PACKAGE_VERSION -+PACKAGE_TARNAME -+PACKAGE_NAME -+PATH_SEPARATOR -+SHELL' -+ac_subst_files='' -+ac_user_opts=' -+enable_option_checking -+' -+ ac_precious_vars='build_alias -+host_alias -+target_alias' -+ -+ -+# Initialize some variables set by options. -+ac_init_help= -+ac_init_version=false -+ac_unrecognized_opts= -+ac_unrecognized_sep= -+# The variables have the same names as the options, with -+# dashes changed to underlines. -+cache_file=/dev/null -+exec_prefix=NONE -+no_create= -+no_recursion= -+prefix=NONE -+program_prefix=NONE -+program_suffix=NONE -+program_transform_name=s,x,x, -+silent= -+site= -+srcdir= -+verbose= -+x_includes=NONE -+x_libraries=NONE -+ -+# Installation directory options. -+# These are left unexpanded so users can "make install exec_prefix=/foo" -+# and all the variables that are supposed to be based on exec_prefix -+# by default will actually change. -+# Use braces instead of parens because sh, perl, etc. also accept them. -+# (The list follows the same order as the GNU Coding Standards.) -+bindir='${exec_prefix}/bin' -+sbindir='${exec_prefix}/sbin' -+libexecdir='${exec_prefix}/libexec' -+datarootdir='${prefix}/share' -+datadir='${datarootdir}' -+sysconfdir='${prefix}/etc' -+sharedstatedir='${prefix}/com' -+localstatedir='${prefix}/var' -+includedir='${prefix}/include' -+oldincludedir='/usr/include' -+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -+infodir='${datarootdir}/info' -+htmldir='${docdir}' -+dvidir='${docdir}' -+pdfdir='${docdir}' -+psdir='${docdir}' -+libdir='${exec_prefix}/lib' -+localedir='${datarootdir}/locale' -+mandir='${datarootdir}/man' -+ -+ac_prev= -+ac_dashdash= -+for ac_option -+do -+ # If the previous option needs an argument, assign it. -+ if test -n "$ac_prev"; then -+ eval $ac_prev=\$ac_option -+ ac_prev= -+ continue -+ fi -+ -+ case $ac_option in -+ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; -+ *) ac_optarg=yes ;; -+ esac -+ -+ # Accept the important Cygnus configure options, so we can diagnose typos. -+ -+ case $ac_dashdash$ac_option in -+ --) -+ ac_dashdash=yes ;; -+ -+ -bindir | --bindir | --bindi | --bind | --bin | --bi) -+ ac_prev=bindir ;; -+ -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) -+ bindir=$ac_optarg ;; -+ -+ -build | --build | --buil | --bui | --bu) -+ ac_prev=build_alias ;; -+ -build=* | --build=* | --buil=* | --bui=* | --bu=*) -+ build_alias=$ac_optarg ;; -+ -+ -cache-file | --cache-file | --cache-fil | --cache-fi \ -+ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) -+ ac_prev=cache_file ;; -+ -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ -+ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) -+ cache_file=$ac_optarg ;; -+ -+ --config-cache | -C) -+ cache_file=config.cache ;; -+ -+ -datadir | --datadir | --datadi | --datad) -+ ac_prev=datadir ;; -+ -datadir=* | --datadir=* | --datadi=* | --datad=*) -+ datadir=$ac_optarg ;; -+ -+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ -+ | --dataroo | --dataro | --datar) -+ ac_prev=datarootdir ;; -+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ -+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) -+ datarootdir=$ac_optarg ;; -+ -+ -disable-* | --disable-*) -+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` -+ # Reject names that are not valid shell variable names. -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 -+ { (exit 1); exit 1; }; } -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"enable_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval enable_$ac_useropt=no ;; -+ -+ -docdir | --docdir | --docdi | --doc | --do) -+ ac_prev=docdir ;; -+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) -+ docdir=$ac_optarg ;; -+ -+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) -+ ac_prev=dvidir ;; -+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) -+ dvidir=$ac_optarg ;; -+ -+ -enable-* | --enable-*) -+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` -+ # Reject names that are not valid shell variable names. -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 -+ { (exit 1); exit 1; }; } -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"enable_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval enable_$ac_useropt=\$ac_optarg ;; -+ -+ -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ -+ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -+ | --exec | --exe | --ex) -+ ac_prev=exec_prefix ;; -+ -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ -+ | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ -+ | --exec=* | --exe=* | --ex=*) -+ exec_prefix=$ac_optarg ;; -+ -+ -gas | --gas | --ga | --g) -+ # Obsolete; use --with-gas. -+ with_gas=yes ;; -+ -+ -help | --help | --hel | --he | -h) -+ ac_init_help=long ;; -+ -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) -+ ac_init_help=recursive ;; -+ -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) -+ ac_init_help=short ;; -+ -+ -host | --host | --hos | --ho) -+ ac_prev=host_alias ;; -+ -host=* | --host=* | --hos=* | --ho=*) -+ host_alias=$ac_optarg ;; -+ -+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) -+ ac_prev=htmldir ;; -+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ -+ | --ht=*) -+ htmldir=$ac_optarg ;; -+ -+ -includedir | --includedir | --includedi | --included | --include \ -+ | --includ | --inclu | --incl | --inc) -+ ac_prev=includedir ;; -+ -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ -+ | --includ=* | --inclu=* | --incl=* | --inc=*) -+ includedir=$ac_optarg ;; -+ -+ -infodir | --infodir | --infodi | --infod | --info | --inf) -+ ac_prev=infodir ;; -+ -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) -+ infodir=$ac_optarg ;; -+ -+ -libdir | --libdir | --libdi | --libd) -+ ac_prev=libdir ;; -+ -libdir=* | --libdir=* | --libdi=* | --libd=*) -+ libdir=$ac_optarg ;; -+ -+ -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ -+ | --libexe | --libex | --libe) -+ ac_prev=libexecdir ;; -+ -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ -+ | --libexe=* | --libex=* | --libe=*) -+ libexecdir=$ac_optarg ;; -+ -+ -localedir | --localedir | --localedi | --localed | --locale) -+ ac_prev=localedir ;; -+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) -+ localedir=$ac_optarg ;; -+ -+ -localstatedir | --localstatedir | --localstatedi | --localstated \ -+ | --localstate | --localstat | --localsta | --localst | --locals) -+ ac_prev=localstatedir ;; -+ -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ -+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) -+ localstatedir=$ac_optarg ;; -+ -+ -mandir | --mandir | --mandi | --mand | --man | --ma | --m) -+ ac_prev=mandir ;; -+ -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) -+ mandir=$ac_optarg ;; -+ -+ -nfp | --nfp | --nf) -+ # Obsolete; use --without-fp. -+ with_fp=no ;; -+ -+ -no-create | --no-create | --no-creat | --no-crea | --no-cre \ -+ | --no-cr | --no-c | -n) -+ no_create=yes ;; -+ -+ -no-recursion | --no-recursion | --no-recursio | --no-recursi \ -+ | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) -+ no_recursion=yes ;; -+ -+ -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ -+ | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ -+ | --oldin | --oldi | --old | --ol | --o) -+ ac_prev=oldincludedir ;; -+ -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ -+ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ -+ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) -+ oldincludedir=$ac_optarg ;; -+ -+ -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) -+ ac_prev=prefix ;; -+ -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) -+ prefix=$ac_optarg ;; -+ -+ -program-prefix | --program-prefix | --program-prefi | --program-pref \ -+ | --program-pre | --program-pr | --program-p) -+ ac_prev=program_prefix ;; -+ -program-prefix=* | --program-prefix=* | --program-prefi=* \ -+ | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) -+ program_prefix=$ac_optarg ;; -+ -+ -program-suffix | --program-suffix | --program-suffi | --program-suff \ -+ | --program-suf | --program-su | --program-s) -+ ac_prev=program_suffix ;; -+ -program-suffix=* | --program-suffix=* | --program-suffi=* \ -+ | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) -+ program_suffix=$ac_optarg ;; -+ -+ -program-transform-name | --program-transform-name \ -+ | --program-transform-nam | --program-transform-na \ -+ | --program-transform-n | --program-transform- \ -+ | --program-transform | --program-transfor \ -+ | --program-transfo | --program-transf \ -+ | --program-trans | --program-tran \ -+ | --progr-tra | --program-tr | --program-t) -+ ac_prev=program_transform_name ;; -+ -program-transform-name=* | --program-transform-name=* \ -+ | --program-transform-nam=* | --program-transform-na=* \ -+ | --program-transform-n=* | --program-transform-=* \ -+ | --program-transform=* | --program-transfor=* \ -+ | --program-transfo=* | --program-transf=* \ -+ | --program-trans=* | --program-tran=* \ -+ | --progr-tra=* | --program-tr=* | --program-t=*) -+ program_transform_name=$ac_optarg ;; -+ -+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) -+ ac_prev=pdfdir ;; -+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) -+ pdfdir=$ac_optarg ;; -+ -+ -psdir | --psdir | --psdi | --psd | --ps) -+ ac_prev=psdir ;; -+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) -+ psdir=$ac_optarg ;; -+ -+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -+ | -silent | --silent | --silen | --sile | --sil) -+ silent=yes ;; -+ -+ -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) -+ ac_prev=sbindir ;; -+ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ -+ | --sbi=* | --sb=*) -+ sbindir=$ac_optarg ;; -+ -+ -sharedstatedir | --sharedstatedir | --sharedstatedi \ -+ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ -+ | --sharedst | --shareds | --shared | --share | --shar \ -+ | --sha | --sh) -+ ac_prev=sharedstatedir ;; -+ -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ -+ | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ -+ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ -+ | --sha=* | --sh=*) -+ sharedstatedir=$ac_optarg ;; -+ -+ -site | --site | --sit) -+ ac_prev=site ;; -+ -site=* | --site=* | --sit=*) -+ site=$ac_optarg ;; -+ -+ -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) -+ ac_prev=srcdir ;; -+ -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) -+ srcdir=$ac_optarg ;; -+ -+ -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ -+ | --syscon | --sysco | --sysc | --sys | --sy) -+ ac_prev=sysconfdir ;; -+ -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ -+ | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) -+ sysconfdir=$ac_optarg ;; -+ -+ -target | --target | --targe | --targ | --tar | --ta | --t) -+ ac_prev=target_alias ;; -+ -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) -+ target_alias=$ac_optarg ;; -+ -+ -v | -verbose | --verbose | --verbos | --verbo | --verb) -+ verbose=yes ;; -+ -+ -version | --version | --versio | --versi | --vers | -V) -+ ac_init_version=: ;; -+ -+ -with-* | --with-*) -+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` -+ # Reject names that are not valid shell variable names. -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 -+ { (exit 1); exit 1; }; } -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"with_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval with_$ac_useropt=\$ac_optarg ;; -+ -+ -without-* | --without-*) -+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` -+ # Reject names that are not valid shell variable names. -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 -+ { (exit 1); exit 1; }; } -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"with_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval with_$ac_useropt=no ;; -+ -+ --x) -+ # Obsolete; use --with-x. -+ with_x=yes ;; -+ -+ -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ -+ | --x-incl | --x-inc | --x-in | --x-i) -+ ac_prev=x_includes ;; -+ -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ -+ | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) -+ x_includes=$ac_optarg ;; -+ -+ -x-libraries | --x-libraries | --x-librarie | --x-librari \ -+ | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) -+ ac_prev=x_libraries ;; -+ -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ -+ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) -+ x_libraries=$ac_optarg ;; -+ -+ -*) { $as_echo "$as_me: error: unrecognized option: $ac_option -+Try \`$0 --help' for more information." >&2 -+ { (exit 1); exit 1; }; } -+ ;; -+ -+ *=*) -+ ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` -+ # Reject names that are not valid shell variable names. -+ expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && -+ { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 -+ { (exit 1); exit 1; }; } -+ eval $ac_envvar=\$ac_optarg -+ export $ac_envvar ;; -+ -+ *) -+ # FIXME: should be removed in autoconf 3.0. -+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 -+ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && -+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 -+ : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} -+ ;; -+ -+ esac -+done -+ -+if test -n "$ac_prev"; then -+ ac_option=--`echo $ac_prev | sed 's/_/-/g'` -+ { $as_echo "$as_me: error: missing argument to $ac_option" >&2 -+ { (exit 1); exit 1; }; } -+fi -+ -+if test -n "$ac_unrecognized_opts"; then -+ case $enable_option_checking in -+ no) ;; -+ fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 -+ { (exit 1); exit 1; }; } ;; -+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; -+ esac -+fi -+ -+# Check all directory arguments for consistency. -+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ -+ datadir sysconfdir sharedstatedir localstatedir includedir \ -+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ -+ libdir localedir mandir -+do -+ eval ac_val=\$$ac_var -+ # Remove trailing slashes. -+ case $ac_val in -+ */ ) -+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` -+ eval $ac_var=\$ac_val;; -+ esac -+ # Be sure to have absolute directory names. -+ case $ac_val in -+ [\\/$]* | ?:[\\/]* ) continue;; -+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;; -+ esac -+ { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -+ { (exit 1); exit 1; }; } -+done -+ -+# There might be people who depend on the old broken behavior: `$host' -+# used to hold the argument of --host etc. -+# FIXME: To remove some day. -+build=$build_alias -+host=$host_alias -+target=$target_alias -+ -+# FIXME: To remove some day. -+if test "x$host_alias" != x; then -+ if test "x$build_alias" = x; then -+ cross_compiling=maybe -+ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. -+ If a cross compiler is detected then cross compile mode will be used." >&2 -+ elif test "x$build_alias" != "x$host_alias"; then -+ cross_compiling=yes -+ fi -+fi -+ -+ac_tool_prefix= -+test -n "$host_alias" && ac_tool_prefix=$host_alias- -+ -+test "$silent" = yes && exec 6>/dev/null -+ -+ -+ac_pwd=`pwd` && test -n "$ac_pwd" && -+ac_ls_di=`ls -di .` && -+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || -+ { $as_echo "$as_me: error: working directory cannot be determined" >&2 -+ { (exit 1); exit 1; }; } -+test "X$ac_ls_di" = "X$ac_pwd_ls_di" || -+ { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 -+ { (exit 1); exit 1; }; } -+ -+ -+# Find the source files, if location was not specified. -+if test -z "$srcdir"; then -+ ac_srcdir_defaulted=yes -+ # Try the directory containing this script, then the parent directory. -+ ac_confdir=`$as_dirname -- "$as_myself" || -+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_myself" : 'X\(//\)[^/]' \| \ -+ X"$as_myself" : 'X\(//\)$' \| \ -+ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_myself" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ srcdir=$ac_confdir -+ if test ! -r "$srcdir/$ac_unique_file"; then -+ srcdir=.. -+ fi -+else -+ ac_srcdir_defaulted=no -+fi -+if test ! -r "$srcdir/$ac_unique_file"; then -+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." -+ { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 -+ { (exit 1); exit 1; }; } -+fi -+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -+ac_abs_confdir=`( -+ cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 -+ { (exit 1); exit 1; }; } -+ pwd)` -+# When building in place, set srcdir=. -+if test "$ac_abs_confdir" = "$ac_pwd"; then -+ srcdir=. -+fi -+# Remove unnecessary trailing slashes from srcdir. -+# Double slashes in file names in object file debugging info -+# mess up M-x gdb in Emacs. -+case $srcdir in -+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -+esac -+for ac_var in $ac_precious_vars; do -+ eval ac_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_env_${ac_var}_value=\$${ac_var} -+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_cv_env_${ac_var}_value=\$${ac_var} -+done -+ -+# -+# Report the --help message. -+# -+if test "$ac_init_help" = "long"; then -+ # Omit some internal or obsolete options to make the list less imposing. -+ # This message is too long to be a string in the A/UX 3.1 sh. -+ cat <<_ACEOF -+\`configure' configures asciidoc 8.4.2 to adapt to many kinds of systems. -+ -+Usage: $0 [OPTION]... [VAR=VALUE]... -+ -+To assign environment variables (e.g., CC, CFLAGS...), specify them as -+VAR=VALUE. See below for descriptions of some of the useful variables. -+ -+Defaults for the options are specified in brackets. -+ -+Configuration: -+ -h, --help display this help and exit -+ --help=short display options specific to this package -+ --help=recursive display the short help of all the included packages -+ -V, --version display version information and exit -+ -q, --quiet, --silent do not print \`checking...' messages -+ --cache-file=FILE cache test results in FILE [disabled] -+ -C, --config-cache alias for \`--cache-file=config.cache' -+ -n, --no-create do not create output files -+ --srcdir=DIR find the sources in DIR [configure dir or \`..'] -+ -+Installation directories: -+ --prefix=PREFIX install architecture-independent files in PREFIX -+ [$ac_default_prefix] -+ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX -+ [PREFIX] -+ -+By default, \`make install' will install all the files in -+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -+an installation prefix other than \`$ac_default_prefix' using \`--prefix', -+for instance \`--prefix=\$HOME'. -+ -+For better control, use the options below. -+ -+Fine tuning of the installation directories: -+ --bindir=DIR user executables [EPREFIX/bin] -+ --sbindir=DIR system admin executables [EPREFIX/sbin] -+ --libexecdir=DIR program executables [EPREFIX/libexec] -+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -+ --localstatedir=DIR modifiable single-machine data [PREFIX/var] -+ --libdir=DIR object code libraries [EPREFIX/lib] -+ --includedir=DIR C header files [PREFIX/include] -+ --oldincludedir=DIR C header files for non-gcc [/usr/include] -+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] -+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] -+ --infodir=DIR info documentation [DATAROOTDIR/info] -+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] -+ --mandir=DIR man documentation [DATAROOTDIR/man] -+ --docdir=DIR documentation root @<:@DATAROOTDIR/doc/asciidoc@:>@ -+ --htmldir=DIR html documentation [DOCDIR] -+ --dvidir=DIR dvi documentation [DOCDIR] -+ --pdfdir=DIR pdf documentation [DOCDIR] -+ --psdir=DIR ps documentation [DOCDIR] -+_ACEOF -+ -+ cat <<\_ACEOF -+_ACEOF -+fi -+ -+if test -n "$ac_init_help"; then -+ case $ac_init_help in -+ short | recursive ) echo "Configuration of asciidoc 8.4.2:";; -+ esac -+ cat <<\_ACEOF -+ -+_ACEOF -+ac_status=$? -+fi -+ -+if test "$ac_init_help" = "recursive"; then -+ # If there are subdirs, report their specific --help. -+ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue -+ test -d "$ac_dir" || -+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || -+ continue -+ ac_builddir=. -+ -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) -+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` -+ # A ".." for each directory in $ac_dir_suffix. -+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` -+ case $ac_top_builddir_sub in -+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix -+ -+case $srcdir in -+ .) # We are building in place. -+ ac_srcdir=. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. -+ ac_srcdir=$srcdir$ac_dir_suffix; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -+esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -+ -+ cd "$ac_dir" || { ac_status=$?; continue; } -+ # Check for guested configure. -+ if test -f "$ac_srcdir/configure.gnu"; then -+ echo && -+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive -+ elif test -f "$ac_srcdir/configure"; then -+ echo && -+ $SHELL "$ac_srcdir/configure" --help=recursive -+ else -+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -+ fi || ac_status=$? -+ cd "$ac_pwd" || { ac_status=$?; break; } -+ done -+fi -+ -+test -n "$ac_init_help" && exit $ac_status -+if $ac_init_version; then -+ cat <<\_ACEOF -+asciidoc configure 8.4.2 -+generated by GNU Autoconf 2.63 -+ -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+This configure script is free software; the Free Software Foundation -+gives unlimited permission to copy, distribute and modify it. -+_ACEOF -+ exit -+fi -+cat >config.log <<_ACEOF -+This file contains any messages produced by compilers while -+running configure, to aid debugging if configure makes a mistake. -+ -+It was created by asciidoc $as_me 8.4.2, which was -+generated by GNU Autoconf 2.63. Invocation command line was -+ -+ $ $0 $@ -+ -+_ACEOF -+exec 5>>config.log -+{ -+cat <<_ASUNAME -+@%:@@%:@ --------- @%:@@%:@ -+@%:@@%:@ Platform. @%:@@%:@ -+@%:@@%:@ --------- @%:@@%:@ -+ -+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -+uname -m = `(uname -m) 2>/dev/null || echo unknown` -+uname -r = `(uname -r) 2>/dev/null || echo unknown` -+uname -s = `(uname -s) 2>/dev/null || echo unknown` -+uname -v = `(uname -v) 2>/dev/null || echo unknown` -+ -+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -+/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` -+ -+/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -+/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -+/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -+ -+_ASUNAME -+ -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ $as_echo "PATH: $as_dir" -+done -+IFS=$as_save_IFS -+ -+} >&5 -+ -+cat >&5 <<_ACEOF -+ -+ -+@%:@@%:@ ----------- @%:@@%:@ -+@%:@@%:@ Core tests. @%:@@%:@ -+@%:@@%:@ ----------- @%:@@%:@ -+ -+_ACEOF -+ -+ -+# Keep a trace of the command line. -+# Strip out --no-create and --no-recursion so they do not pile up. -+# Strip out --silent because we don't want to record it for future runs. -+# Also quote any args containing shell meta-characters. -+# Make two passes to allow for proper duplicate-argument suppression. -+ac_configure_args= -+ac_configure_args0= -+ac_configure_args1= -+ac_must_keep_next=false -+for ac_pass in 1 2 -+do -+ for ac_arg -+ do -+ case $ac_arg in -+ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; -+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -+ | -silent | --silent | --silen | --sile | --sil) -+ continue ;; -+ *\'*) -+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ esac -+ case $ac_pass in -+ 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; -+ 2) -+ ac_configure_args1="$ac_configure_args1 '$ac_arg'" -+ if test $ac_must_keep_next = true; then -+ ac_must_keep_next=false # Got value, back to normal. -+ else -+ case $ac_arg in -+ *=* | --config-cache | -C | -disable-* | --disable-* \ -+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ -+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ -+ | -with-* | --with-* | -without-* | --without-* | --x) -+ case "$ac_configure_args0 " in -+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; -+ esac -+ ;; -+ -* ) ac_must_keep_next=true ;; -+ esac -+ fi -+ ac_configure_args="$ac_configure_args '$ac_arg'" -+ ;; -+ esac -+ done -+done -+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } -+ -+# When interrupted or exit'd, cleanup temporary files, and complete -+# config.log. We remove comments because anyway the quotes in there -+# would cause problems or look ugly. -+# WARNING: Use '\'' to represent an apostrophe within the trap. -+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. -+trap 'exit_status=$? -+ # Save into config.log some information that might help in debugging. -+ { -+ echo -+ -+ cat <<\_ASBOX -+@%:@@%:@ ---------------- @%:@@%:@ -+@%:@@%:@ Cache variables. @%:@@%:@ -+@%:@@%:@ ---------------- @%:@@%:@ -+_ASBOX -+ echo -+ # The following way of writing the cache mishandles newlines in values, -+( -+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 -+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -+ *) $as_unset $ac_var ;; -+ esac ;; -+ esac -+ done -+ (set) 2>&1 | -+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) -+ sed -n \ -+ "s/'\''/'\''\\\\'\'''\''/g; -+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" -+ ;; #( -+ *) -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" -+ ;; -+ esac | -+ sort -+) -+ echo -+ -+ cat <<\_ASBOX -+@%:@@%:@ ----------------- @%:@@%:@ -+@%:@@%:@ Output variables. @%:@@%:@ -+@%:@@%:@ ----------------- @%:@@%:@ -+_ASBOX -+ echo -+ for ac_var in $ac_subst_vars -+ do -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ $as_echo "$ac_var='\''$ac_val'\''" -+ done | sort -+ echo -+ -+ if test -n "$ac_subst_files"; then -+ cat <<\_ASBOX -+@%:@@%:@ ------------------- @%:@@%:@ -+@%:@@%:@ File substitutions. @%:@@%:@ -+@%:@@%:@ ------------------- @%:@@%:@ -+_ASBOX -+ echo -+ for ac_var in $ac_subst_files -+ do -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ $as_echo "$ac_var='\''$ac_val'\''" -+ done | sort -+ echo -+ fi -+ -+ if test -s confdefs.h; then -+ cat <<\_ASBOX -+@%:@@%:@ ----------- @%:@@%:@ -+@%:@@%:@ confdefs.h. @%:@@%:@ -+@%:@@%:@ ----------- @%:@@%:@ -+_ASBOX -+ echo -+ cat confdefs.h -+ echo -+ fi -+ test "$ac_signal" != 0 && -+ $as_echo "$as_me: caught signal $ac_signal" -+ $as_echo "$as_me: exit $exit_status" -+ } >&5 -+ rm -f core *.core core.conftest.* && -+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files && -+ exit $exit_status -+' 0 -+for ac_signal in 1 2 13 15; do -+ trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -+done -+ac_signal=0 -+ -+# confdefs.h avoids OS command line length limits that DEFS can exceed. -+rm -f -r conftest* confdefs.h -+ -+# Predefined preprocessor variables. -+ -+cat >>confdefs.h <<_ACEOF -+@%:@define PACKAGE_NAME "$PACKAGE_NAME" -+_ACEOF -+ -+ -+cat >>confdefs.h <<_ACEOF -+@%:@define PACKAGE_TARNAME "$PACKAGE_TARNAME" -+_ACEOF -+ -+ -+cat >>confdefs.h <<_ACEOF -+@%:@define PACKAGE_VERSION "$PACKAGE_VERSION" -+_ACEOF -+ -+ -+cat >>confdefs.h <<_ACEOF -+@%:@define PACKAGE_STRING "$PACKAGE_STRING" -+_ACEOF -+ -+ -+cat >>confdefs.h <<_ACEOF -+@%:@define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -+_ACEOF -+ -+ -+# Let the site file select an alternate cache file if it wants to. -+# Prefer an explicitly selected file to automatically selected ones. -+ac_site_file1=NONE -+ac_site_file2=NONE -+if test -n "$CONFIG_SITE"; then -+ ac_site_file1=$CONFIG_SITE -+elif test "x$prefix" != xNONE; then -+ ac_site_file1=$prefix/share/config.site -+ ac_site_file2=$prefix/etc/config.site -+else -+ ac_site_file1=$ac_default_prefix/share/config.site -+ ac_site_file2=$ac_default_prefix/etc/config.site -+fi -+for ac_site_file in "$ac_site_file1" "$ac_site_file2" -+do -+ test "x$ac_site_file" = xNONE && continue -+ if test -r "$ac_site_file"; then -+ { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -+$as_echo "$as_me: loading site script $ac_site_file" >&6;} -+ sed 's/^/| /' "$ac_site_file" >&5 -+ . "$ac_site_file" -+ fi -+done -+ -+if test -r "$cache_file"; then -+ # Some versions of bash will fail to source /dev/null (special -+ # files actually), so we avoid doing that. -+ if test -f "$cache_file"; then -+ { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 -+$as_echo "$as_me: loading cache $cache_file" >&6;} -+ case $cache_file in -+ [\\/]* | ?:[\\/]* ) . "$cache_file";; -+ *) . "./$cache_file";; -+ esac -+ fi -+else -+ { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 -+$as_echo "$as_me: creating cache $cache_file" >&6;} -+ >$cache_file -+fi -+ -+# Check that the precious variables saved in the cache have kept the same -+# value. -+ac_cache_corrupted=false -+for ac_var in $ac_precious_vars; do -+ eval ac_old_set=\$ac_cv_env_${ac_var}_set -+ eval ac_new_set=\$ac_env_${ac_var}_set -+ eval ac_old_val=\$ac_cv_env_${ac_var}_value -+ eval ac_new_val=\$ac_env_${ac_var}_value -+ case $ac_old_set,$ac_new_set in -+ set,) -+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} -+ ac_cache_corrupted=: ;; -+ ,set) -+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} -+ ac_cache_corrupted=: ;; -+ ,);; -+ *) -+ if test "x$ac_old_val" != "x$ac_new_val"; then -+ # differences in whitespace do not lead to failure. -+ ac_old_val_w=`echo x $ac_old_val` -+ ac_new_val_w=`echo x $ac_new_val` -+ if test "$ac_old_val_w" != "$ac_new_val_w"; then -+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -+ ac_cache_corrupted=: -+ else -+ { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} -+ eval $ac_var=\$ac_old_val -+ fi -+ { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 -+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} -+ { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 -+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} -+ fi;; -+ esac -+ # Pass precious variables to config.status. -+ if test "$ac_new_set" = set; then -+ case $ac_new_val in -+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *) ac_arg=$ac_var=$ac_new_val ;; -+ esac -+ case " $ac_configure_args " in -+ *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. -+ *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; -+ esac -+ fi -+done -+if $ac_cache_corrupted; then -+ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+ { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} -+ { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} -+ { (exit 1); exit 1; }; } -+fi -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ -+ -+ac_config_files="$ac_config_files Makefile" -+ -+ -+{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 -+$as_echo_n "checking for a sed that does not truncate output... " >&6; } -+if test "${ac_cv_path_SED+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ -+ for ac_i in 1 2 3 4 5 6 7; do -+ ac_script="$ac_script$as_nl$ac_script" -+ done -+ echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed -+ $as_unset ac_script || ac_script= -+ if test -z "$SED"; then -+ ac_path_SED_found=false -+ # Loop through the user's path and test for each of PROGNAME-LIST -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in sed gsed; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" -+ { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue -+# Check for GNU ac_path_SED and select it if it is found. -+ # Check for GNU $ac_path_SED -+case `"$ac_path_SED" --version 2>&1` in -+*GNU*) -+ ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; -+*) -+ ac_count=0 -+ $as_echo_n 0123456789 >"conftest.in" -+ while : -+ do -+ cat "conftest.in" "conftest.in" >"conftest.tmp" -+ mv "conftest.tmp" "conftest.in" -+ cp "conftest.in" "conftest.nl" -+ $as_echo '' >> "conftest.nl" -+ "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break -+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -+ ac_count=`expr $ac_count + 1` -+ if test $ac_count -gt ${ac_path_SED_max-0}; then -+ # Best one so far, save it but keep looking for a better one -+ ac_cv_path_SED="$ac_path_SED" -+ ac_path_SED_max=$ac_count -+ fi -+ # 10*(2^10) chars as input seems more than enough -+ test $ac_count -gt 10 && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -+esac -+ -+ $ac_path_SED_found && break 3 -+ done -+ done -+done -+IFS=$as_save_IFS -+ if test -z "$ac_cv_path_SED"; then -+ { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5 -+$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;} -+ { (exit 1); exit 1; }; } -+ fi -+else -+ ac_cv_path_SED=$SED -+fi -+ -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5 -+$as_echo "$ac_cv_path_SED" >&6; } -+ SED="$ac_cv_path_SED" -+ rm -f conftest.sed -+ -+ -+{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 -+$as_echo_n "checking whether ln -s works... " >&6; } -+LN_S=$as_ln_s -+if test "$LN_S" = "ln -s"; then -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -+$as_echo "no, using $LN_S" >&6; } -+fi -+ -+ -+ac_aux_dir= -+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do -+ if test -f "$ac_dir/install-sh"; then -+ ac_aux_dir=$ac_dir -+ ac_install_sh="$ac_aux_dir/install-sh -c" -+ break -+ elif test -f "$ac_dir/install.sh"; then -+ ac_aux_dir=$ac_dir -+ ac_install_sh="$ac_aux_dir/install.sh -c" -+ break -+ elif test -f "$ac_dir/shtool"; then -+ ac_aux_dir=$ac_dir -+ ac_install_sh="$ac_aux_dir/shtool install -c" -+ break -+ fi -+done -+if test -z "$ac_aux_dir"; then -+ { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -+$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} -+ { (exit 1); exit 1; }; } -+fi -+ -+# These three variables are undocumented and unsupported, -+# and are intended to be withdrawn in a future Autoconf release. -+# They can cause serious problems if a builder's source tree is in a directory -+# whose full name contains unusual characters. -+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -+ -+ -+# Find a good install program. We prefer a C program (faster), -+# so one script is as good as another. But avoid the broken or -+# incompatible versions: -+# SysV /etc/install, /usr/sbin/install -+# SunOS /usr/etc/install -+# IRIX /sbin/install -+# AIX /bin/install -+# AmigaOS /C/install, which installs bootblocks on floppy discs -+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -+# AFS /usr/afsws/bin/install, which mishandles nonexistent args -+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -+# OS/2's system install, which has a completely different semantic -+# ./install, which can be erroneously created by make from ./install.sh. -+# Reject install programs that cannot install multiple files. -+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -+$as_echo_n "checking for a BSD-compatible install... " >&6; } -+if test -z "$INSTALL"; then -+if test "${ac_cv_path_install+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ # Account for people who put trailing slashes in PATH elements. -+case $as_dir/ in -+ ./ | .// | /cC/* | \ -+ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ -+ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ -+ /usr/ucb/* ) ;; -+ *) -+ # OSF1 and SCO ODT 3.0 have their own names for install. -+ # Don't use installbsd from OSF since it installs stuff as root -+ # by default. -+ for ac_prog in ginstall scoinst install; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then -+ if test $ac_prog = install && -+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -+ # AIX install. It has an incompatible calling convention. -+ : -+ elif test $ac_prog = install && -+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -+ # program-specific install script used by HP pwplus--don't use. -+ : -+ else -+ rm -rf conftest.one conftest.two conftest.dir -+ echo one > conftest.one -+ echo two > conftest.two -+ mkdir conftest.dir -+ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && -+ test -s conftest.one && test -s conftest.two && -+ test -s conftest.dir/conftest.one && -+ test -s conftest.dir/conftest.two -+ then -+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -+ break 3 -+ fi -+ fi -+ fi -+ done -+ done -+ ;; -+esac -+ -+done -+IFS=$as_save_IFS -+ -+rm -rf conftest.one conftest.two conftest.dir -+ -+fi -+ if test "${ac_cv_path_install+set}" = set; then -+ INSTALL=$ac_cv_path_install -+ else -+ # As a last resort, use the slow shell script. Don't cache a -+ # value for INSTALL within a source directory, because that will -+ # break other packages using the cache if that directory is -+ # removed, or if the value is a relative name. -+ INSTALL=$ac_install_sh -+ fi -+fi -+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 -+$as_echo "$INSTALL" >&6; } -+ -+# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -+# It thinks the first close brace ends the variable substitution. -+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -+ -+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' -+ -+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -+ -+ -+cat >confcache <<\_ACEOF -+# This file is a shell script that caches the results of configure -+# tests run on this system so they can be shared between configure -+# scripts and configure runs, see configure's option --config-cache. -+# It is not useful on other systems. If it contains results you don't -+# want to keep, you may remove or edit it. -+# -+# config.status only pays attention to the cache file if you give it -+# the --recheck option to rerun configure. -+# -+# `ac_cv_env_foo' variables (set or unset) will be overridden when -+# loading this file, other *unset* `ac_cv_foo' will be assigned the -+# following values. -+ -+_ACEOF -+ -+# The following way of writing the cache mishandles newlines in values, -+# but we know of no workaround that is simple, portable, and efficient. -+# So, we kill variables containing newlines. -+# Ultrix sh set writes to stderr and can't be redirected directly, -+# and sets the high bit in the cache file unless we assign to the vars. -+( -+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 -+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -+ *) $as_unset $ac_var ;; -+ esac ;; -+ esac -+ done -+ -+ (set) 2>&1 | -+ case $as_nl`(ac_space=' '; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) -+ # `set' does not quote correctly, so add quotes (double-quote -+ # substitution turns \\\\ into \\, and sed turns \\ into \). -+ sed -n \ -+ "s/'/'\\\\''/g; -+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -+ ;; #( -+ *) -+ # `set' quotes correctly as required by POSIX, so do not add quotes. -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" -+ ;; -+ esac | -+ sort -+) | -+ sed ' -+ /^ac_cv_env_/b end -+ t clear -+ :clear -+ s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ -+ t end -+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ -+ :end' >>confcache -+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else -+ if test -w "$cache_file"; then -+ test "x$cache_file" != "x/dev/null" && -+ { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 -+$as_echo "$as_me: updating cache $cache_file" >&6;} -+ cat confcache >$cache_file -+ else -+ { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} -+ fi -+fi -+rm -f confcache -+ -+test "x$prefix" = xNONE && prefix=$ac_default_prefix -+# Let make expand exec_prefix. -+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -+ -+# Transform confdefs.h into DEFS. -+# Protect against shell expansion while executing Makefile rules. -+# Protect against Makefile macro expansion. -+# -+# If the first sed substitution is executed (which looks for macros that -+# take arguments), then branch to the quote section. Otherwise, -+# look for a macro that doesn't take arguments. -+ac_script=' -+:mline -+/\\$/{ -+ N -+ s,\\\n,, -+ b mline -+} -+t clear -+:clear -+s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g -+t quote -+s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g -+t quote -+b any -+:quote -+s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g -+s/\[/\\&/g -+s/\]/\\&/g -+s/\$/$$/g -+H -+:any -+${ -+ g -+ s/^\n// -+ s/\n/ /g -+ p -+} -+' -+DEFS=`sed -n "$ac_script" confdefs.h` -+ -+ -+ac_libobjs= -+ac_ltlibobjs= -+for ac_i in : $LIB@&t at OBJS; do test "x$ac_i" = x: && continue -+ # 1. Remove the extension, and $U if already installed. -+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' -+ ac_i=`$as_echo "$ac_i" | sed "$ac_script"` -+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR -+ # will be set to the directory where LIBOBJS objects are built. -+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" -+ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' -+done -+LIB@&t at OBJS=$ac_libobjs -+ -+LTLIBOBJS=$ac_ltlibobjs -+ -+ -+ -+: ${CONFIG_STATUS=./config.status} -+ac_write_fail=0 -+ac_clean_files_save=$ac_clean_files -+ac_clean_files="$ac_clean_files $CONFIG_STATUS" -+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+#! $SHELL -+# Generated by $as_me. -+# Run this file to recreate the current configuration. -+# Compiler output produced by configure, useful for debugging -+# configure, is in config.log if it exists. -+ -+debug=false -+ac_cs_recheck=false -+ac_cs_silent=false -+SHELL=\${CONFIG_SHELL-$SHELL} -+_ACEOF -+ -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+## --------------------- ## -+## M4sh Initialization. ## -+## --------------------- ## -+ -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+ emulate sh -+ NULLCMD=: -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '${1+"$@"}'='"$@"' -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ -+fi -+ -+ -+ -+ -+# PATH needs CR -+# Avoid depending upon Character Ranges. -+as_cr_letters='abcdefghijklmnopqrstuvwxyz' -+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -+as_cr_Letters=$as_cr_letters$as_cr_LETTERS -+as_cr_digits='0123456789' -+as_cr_alnum=$as_cr_Letters$as_cr_digits -+ -+as_nl=' -+' -+export as_nl -+# Printing a long string crashes Solaris 7 /usr/bin/printf. -+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='printf %s\n' -+ as_echo_n='printf %s' -+else -+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' -+ as_echo_n='/usr/ucb/echo -n' -+ else -+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' -+ as_echo_n_body='eval -+ arg=$1; -+ case $arg in -+ *"$as_nl"*) -+ expr "X$arg" : "X\\(.*\\)$as_nl"; -+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -+ esac; -+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -+ ' -+ export as_echo_n_body -+ as_echo_n='sh -c $as_echo_n_body as_echo' -+ fi -+ export as_echo_body -+ as_echo='sh -c $as_echo_body as_echo' -+fi -+ -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ PATH_SEPARATOR=: -+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -+ PATH_SEPARATOR=';' -+ } -+fi -+ -+# Support unset when possible. -+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -+ as_unset=unset -+else -+ as_unset=false -+fi -+ -+ -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) -+IFS=" "" $as_nl" -+ -+# Find who we are. Look in the path if we contain no directory separator. -+case $0 in -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+# We did not find ourselves, most probably we were run as `sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then -+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ { (exit 1); exit 1; } -+fi -+ -+# Work around bugs in pre-3.0 UWIN ksh. -+for as_var in ENV MAIL MAILPATH -+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+done -+PS1='$ ' -+PS2='> ' -+PS4='+ ' -+ -+# NLS nuisances. -+LC_ALL=C -+export LC_ALL -+LANGUAGE=C -+export LANGUAGE -+ -+# Required to use basename. -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then -+ as_expr=expr -+else -+ as_expr=false -+fi -+ -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then -+ as_basename=basename -+else -+ as_basename=false -+fi -+ -+ -+# Name of the executable. -+as_me=`$as_basename -- "$0" || -+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ -+ X"$0" : 'X\(//\)$' \| \ -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X/"$0" | -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ -+# CDPATH. -+$as_unset CDPATH -+ -+ -+ -+ as_lineno_1=$LINENO -+ as_lineno_2=$LINENO -+ test "x$as_lineno_1" != "x$as_lineno_2" && -+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { -+ -+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -+ # uniformly replaced by the line number. The first 'sed' inserts a -+ # line-number line after each line using $LINENO; the second 'sed' -+ # does the real work. The second script uses 'N' to pair each -+ # line-number line with the line containing $LINENO, and appends -+ # trailing '-' during substitution so that $LINENO is not a special -+ # case at line end. -+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -+ # scripts with optimization help from Paolo Bonzini. Blame Lee -+ # E. McMahon (1931-1989) for sed's syntax. :-) -+ sed -n ' -+ p -+ /[$]LINENO/= -+ ' <$as_myself | -+ sed ' -+ s/[$]LINENO.*/&-/ -+ t lineno -+ b -+ :lineno -+ N -+ :loop -+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ -+ t loop -+ s/-\n.*// -+ ' >$as_me.lineno && -+ chmod +x "$as_me.lineno" || -+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -+ { (exit 1); exit 1; }; } -+ -+ # Don't try to exec as it changes $[0], causing all sort of problems -+ # (the dirname of $[0] is not the place where we might find the -+ # original and so on. Autoconf is especially sensitive to this). -+ . "./$as_me.lineno" -+ # Exit status is that of the last command. -+ exit -+} -+ -+ -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi -+ -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in -+-n*) -+ case `echo 'x\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ *) ECHO_C='\c';; -+ esac;; -+*) -+ ECHO_N='-n';; -+esac -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then -+ as_expr=expr -+else -+ as_expr=false -+fi -+ -+rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file -+else -+ rm -f conf$$.dir -+ mkdir conf$$.dir 2>/dev/null -+fi -+if (echo >conf$$.file) 2>/dev/null; then -+ if ln -s conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -p'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -p' -+ elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+ else -+ as_ln_s='cp -p' -+ fi -+else -+ as_ln_s='cp -p' -+fi -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null -+ -+if mkdir -p . 2>/dev/null; then -+ as_mkdir_p=: -+else -+ test -d ./-p && rmdir ./-p -+ as_mkdir_p=false -+fi -+ -+if test -x / >/dev/null 2>&1; then -+ as_test_x='test -x' -+else -+ if ls -dL / >/dev/null 2>&1; then -+ as_ls_L_option=L -+ else -+ as_ls_L_option= -+ fi -+ as_test_x=' -+ eval sh -c '\'' -+ if test -d "$1"; then -+ test -d "$1/."; -+ else -+ case $1 in -+ -*)set "./$1";; -+ esac; -+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in -+ ???[sx]*):;;*)false;;esac;fi -+ '\'' sh -+ ' -+fi -+as_executable_p=$as_test_x -+ -+# Sed expression to map a string onto a valid CPP name. -+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -+ -+# Sed expression to map a string onto a valid variable name. -+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -+ -+ -+exec 6>&1 -+ -+# Save the log message, to keep $[0] and so on meaningful, and to -+# report actual input values of CONFIG_FILES etc. instead of their -+# values after options handling. -+ac_log=" -+This file was extended by asciidoc $as_me 8.4.2, which was -+generated by GNU Autoconf 2.63. Invocation command line was -+ -+ CONFIG_FILES = $CONFIG_FILES -+ CONFIG_HEADERS = $CONFIG_HEADERS -+ CONFIG_LINKS = $CONFIG_LINKS -+ CONFIG_COMMANDS = $CONFIG_COMMANDS -+ $ $0 $@ -+ -+on `(hostname || uname -n) 2>/dev/null | sed 1q` -+" -+ -+_ACEOF -+ -+case $ac_config_files in *" -+"*) set x $ac_config_files; shift; ac_config_files=$*;; -+esac -+ -+ -+ -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+# Files that config.status was made for. -+config_files="$ac_config_files" -+ -+_ACEOF -+ -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+ac_cs_usage="\ -+\`$as_me' instantiates files from templates according to the -+current configuration. -+ -+Usage: $0 [OPTION]... [FILE]... -+ -+ -h, --help print this help, then exit -+ -V, --version print version number and configuration settings, then exit -+ -q, --quiet, --silent -+ do not print progress messages -+ -d, --debug don't remove temporary files -+ --recheck update $as_me by reconfiguring in the same conditions -+ --file=FILE[:TEMPLATE] -+ instantiate the configuration file FILE -+ -+Configuration files: -+$config_files -+ -+Report bugs to ." -+ -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ac_cs_version="\\ -+asciidoc config.status 8.4.2 -+configured by $0, generated by GNU Autoconf 2.63, -+ with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -+ -+Copyright (C) 2008 Free Software Foundation, Inc. -+This config.status script is free software; the Free Software Foundation -+gives unlimited permission to copy, distribute and modify it." -+ -+ac_pwd='$ac_pwd' -+srcdir='$srcdir' -+INSTALL='$INSTALL' -+test -n "\$AWK" || AWK=awk -+_ACEOF -+ -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# The default lists apply if the user does not specify any file. -+ac_need_defaults=: -+while test $# != 0 -+do -+ case $1 in -+ --*=*) -+ ac_option=`expr "X$1" : 'X\([^=]*\)='` -+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` -+ ac_shift=: -+ ;; -+ *) -+ ac_option=$1 -+ ac_optarg=$2 -+ ac_shift=shift -+ ;; -+ esac -+ -+ case $ac_option in -+ # Handling of the options. -+ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) -+ ac_cs_recheck=: ;; -+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) -+ $as_echo "$ac_cs_version"; exit ;; -+ --debug | --debu | --deb | --de | --d | -d ) -+ debug=: ;; -+ --file | --fil | --fi | --f ) -+ $ac_shift -+ case $ac_optarg in -+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ esac -+ CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" -+ ac_need_defaults=false;; -+ --he | --h | --help | --hel | -h ) -+ $as_echo "$ac_cs_usage"; exit ;; -+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -+ | -silent | --silent | --silen | --sile | --sil | --si | --s) -+ ac_cs_silent=: ;; -+ -+ # This is an error. -+ -*) { $as_echo "$as_me: error: unrecognized option: $1 -+Try \`$0 --help' for more information." >&2 -+ { (exit 1); exit 1; }; } ;; -+ -+ *) ac_config_targets="$ac_config_targets $1" -+ ac_need_defaults=false ;; -+ -+ esac -+ shift -+done -+ -+ac_configure_extra_args= -+ -+if $ac_cs_silent; then -+ exec 6>/dev/null -+ ac_configure_extra_args="$ac_configure_extra_args --silent" -+fi -+ -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+if \$ac_cs_recheck; then -+ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+ shift -+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 -+ CONFIG_SHELL='$SHELL' -+ export CONFIG_SHELL -+ exec "\$@" -+fi -+ -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+exec 5>>config.log -+{ -+ echo -+ sed 'h;s/./-/g;s/^.../@%:@@%:@ /;s/...$/ @%:@@%:@/;p;x;p;x' <<_ASBOX -+@%:@@%:@ Running $as_me. @%:@@%:@ -+_ASBOX -+ $as_echo "$ac_log" -+} >&5 -+ -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+_ACEOF -+ -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+ -+# Handling of arguments. -+for ac_config_target in $ac_config_targets -+do -+ case $ac_config_target in -+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; -+ -+ *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -+ { (exit 1); exit 1; }; };; -+ esac -+done -+ -+ -+# If the user did not use the arguments to specify the items to instantiate, -+# then the envvar interface is used. Set only those that are not. -+# We use the long form for the default assignment because of an extremely -+# bizarre bug on SunOS 4.1.3. -+if $ac_need_defaults; then -+ test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files -+fi -+ -+# Have a temporary directory for convenience. Make it in the build tree -+# simply because there is no reason against having it here, and in addition, -+# creating and moving files from /tmp can sometimes cause problems. -+# Hook for its removal unless debugging. -+# Note that there is a small window in which the directory will not be cleaned: -+# after its creation but before its name has been assigned to `$tmp'. -+$debug || -+{ -+ tmp= -+ trap 'exit_status=$? -+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status -+' 0 -+ trap '{ (exit 1); exit 1; }' 1 2 13 15 -+} -+# Create a (secure) tmp directory for tmp files. -+ -+{ -+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && -+ test -n "$tmp" && test -d "$tmp" -+} || -+{ -+ tmp=./conf$$-$RANDOM -+ (umask 077 && mkdir "$tmp") -+} || -+{ -+ $as_echo "$as_me: cannot create a temporary directory in ." >&2 -+ { (exit 1); exit 1; } -+} -+ -+# Set up the scripts for CONFIG_FILES section. -+# No need to generate them if there are no CONFIG_FILES. -+# This happens for instance with `./config.status config.h'. -+if test -n "$CONFIG_FILES"; then -+ -+ -+ac_cr=' -' -+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` -+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then -+ ac_cs_awk_cr='\\r' -+else -+ ac_cs_awk_cr=$ac_cr -+fi -+ -+echo 'BEGIN {' >"$tmp/subs1.awk" && -+_ACEOF -+ -+ -+{ -+ echo "cat >conf$$subs.awk <<_ACEOF" && -+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && -+ echo "_ACEOF" -+} >conf$$subs.sh || -+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -+ { (exit 1); exit 1; }; } -+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` -+ac_delim='%!_!# ' -+for ac_last_try in false false false false false :; do -+ . ./conf$$subs.sh || -+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -+ { (exit 1); exit 1; }; } -+ -+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` -+ if test $ac_delim_n = $ac_delim_num; then -+ break -+ elif $ac_last_try; then -+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -+ { (exit 1); exit 1; }; } -+ else -+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " -+ fi -+done -+rm -f conf$$subs.sh -+ -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+cat >>"\$tmp/subs1.awk" <<\\_ACAWK && -+_ACEOF -+sed -n ' -+h -+s/^/S["/; s/!.*/"]=/ -+p -+g -+s/^[^!]*!// -+:repl -+t repl -+s/'"$ac_delim"'$// -+t delim -+:nl -+h -+s/\(.\{148\}\).*/\1/ -+t more1 -+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ -+p -+n -+b repl -+:more1 -+s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -+p -+g -+s/.\{148\}// -+t nl -+:delim -+h -+s/\(.\{148\}\).*/\1/ -+t more2 -+s/["\\]/\\&/g; s/^/"/; s/$/"/ -+p -+b -+:more2 -+s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -+p -+g -+s/.\{148\}// -+t delim -+' >$CONFIG_STATUS || ac_write_fail=1 -+rm -f conf$$subs.awk -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+_ACAWK -+cat >>"\$tmp/subs1.awk" <<_ACAWK && -+ for (key in S) S_is_set[key] = 1 -+ FS = "" -+ -+} -+{ -+ line = $ 0 -+ nfields = split(line, field, "@") -+ substed = 0 -+ len = length(field[1]) -+ for (i = 2; i < nfields; i++) { -+ key = field[i] -+ keylen = length(key) -+ if (S_is_set[key]) { -+ value = S[key] -+ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) -+ len += length(value) + length(field[++i]) -+ substed = 1 -+ } else -+ len += 1 + keylen -+ } -+ -+ print line -+} -+ -+_ACAWK -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then -+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" -+else -+ cat -+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ -+ || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 -+$as_echo "$as_me: error: could not setup config files machinery" >&2;} -+ { (exit 1); exit 1; }; } -+_ACEOF -+ -+# VPATH may cause trouble with some makes, so we remove $(srcdir), -+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -+# trailing colons and then remove the whole line if VPATH becomes empty -+# (actually we leave an empty line to preserve line numbers). -+if test "x$srcdir" = x.; then -+ ac_vpsub='/^[ ]*VPATH[ ]*=/{ -+s/:*\$(srcdir):*/:/ -+s/:*\${srcdir}:*/:/ -+s/:*@srcdir@:*/:/ -+s/^\([^=]*=[ ]*\):*/\1/ -+s/:*$// -+s/^[^=]*=[ ]*$// -+}' -+fi -+ -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+fi # test -n "$CONFIG_FILES" -+ -+ -+eval set X " :F $CONFIG_FILES " -+shift -+for ac_tag -+do -+ case $ac_tag in -+ :[FHLC]) ac_mode=$ac_tag; continue;; -+ esac -+ case $ac_mode$ac_tag in -+ :[FHL]*:*);; -+ :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 -+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} -+ { (exit 1); exit 1; }; };; -+ :[FH]-) ac_tag=-:-;; -+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; -+ esac -+ ac_save_IFS=$IFS -+ IFS=: -+ set x $ac_tag -+ IFS=$ac_save_IFS -+ shift -+ ac_file=$1 -+ shift -+ -+ case $ac_mode in -+ :L) ac_source=$1;; -+ :[FH]) -+ ac_file_inputs= -+ for ac_f -+ do -+ case $ac_f in -+ -) ac_f="$tmp/stdin";; -+ *) # Look for the file first in the build tree, then in the source tree -+ # (if the path is not absolute). The absolute path cannot be DOS-style, -+ # because $ac_f cannot contain `:'. -+ test -f "$ac_f" || -+ case $ac_f in -+ [\\/$]*) false;; -+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; -+ esac || -+ { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} -+ { (exit 1); exit 1; }; };; -+ esac -+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac -+ ac_file_inputs="$ac_file_inputs '$ac_f'" -+ done -+ -+ # Let's still pretend it is `configure' which instantiates (i.e., don't -+ # use $as_me), people would be surprised to read: -+ # /* config.h. Generated by config.status. */ -+ configure_input='Generated from '` -+ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' -+ `' by configure.' -+ if test x"$ac_file" != x-; then -+ configure_input="$ac_file. $configure_input" -+ { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 -+$as_echo "$as_me: creating $ac_file" >&6;} -+ fi -+ # Neutralize special characters interpreted by sed in replacement strings. -+ case $configure_input in #( -+ *\&* | *\|* | *\\* ) -+ ac_sed_conf_input=`$as_echo "$configure_input" | -+ sed 's/[\\\\&|]/\\\\&/g'`;; #( -+ *) ac_sed_conf_input=$configure_input;; -+ esac -+ -+ case $ac_tag in -+ *:-:* | *:-) cat >"$tmp/stdin" \ -+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -+$as_echo "$as_me: error: could not create $ac_file" >&2;} -+ { (exit 1); exit 1; }; } ;; -+ esac -+ ;; -+ esac -+ -+ ac_dir=`$as_dirname -- "$ac_file" || -+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$ac_file" : 'X\(//\)[^/]' \| \ -+ X"$ac_file" : 'X\(//\)$' \| \ -+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$ac_file" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ { as_dir="$ac_dir" -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { -+ as_dirs= -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break -+ done -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} -+ { (exit 1); exit 1; }; }; } -+ ac_builddir=. -+ -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) -+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` -+ # A ".." for each directory in $ac_dir_suffix. -+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` -+ case $ac_top_builddir_sub in -+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix -+ -+case $srcdir in -+ .) # We are building in place. -+ ac_srcdir=. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. -+ ac_srcdir=$srcdir$ac_dir_suffix; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -+esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -+ -+ -+ case $ac_mode in -+ :F) -+ # -+ # CONFIG_FILE -+ # -+ -+ case $INSTALL in -+ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; -+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; -+ esac -+_ACEOF -+ -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# If the template does not know about datarootdir, expand it. -+# FIXME: This hack should be removed a few years after 2.60. -+ac_datarootdir_hack=; ac_datarootdir_seen= -+ -+ac_sed_dataroot=' -+/datarootdir/ { -+ p -+ q -+} -+/@datadir@/p -+/@docdir@/p -+/@infodir@/p -+/@localedir@/p -+/@mandir@/p -+' -+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in -+*datarootdir*) ac_datarootdir_seen=yes;; -+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ ac_datarootdir_hack=' -+ s&@datadir@&$datadir&g -+ s&@docdir@&$docdir&g -+ s&@infodir@&$infodir&g -+ s&@localedir@&$localedir&g -+ s&@mandir@&$mandir&g -+ s&\\\${datarootdir}&$datarootdir&g' ;; -+esac -+_ACEOF -+ -+# Neutralize VPATH when `$srcdir' = `.'. -+# Shell code in configure.ac might set extrasub. -+# FIXME: do we really want to maintain this feature? -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ac_sed_extra="$ac_vpsub -+$extrasub -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+:t -+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -+s|@configure_input@|$ac_sed_conf_input|;t t -+s&@top_builddir@&$ac_top_builddir_sub&;t t -+s&@top_build_prefix@&$ac_top_build_prefix&;t t -+s&@srcdir@&$ac_srcdir&;t t -+s&@abs_srcdir@&$ac_abs_srcdir&;t t -+s&@top_srcdir@&$ac_top_srcdir&;t t -+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -+s&@builddir@&$ac_builddir&;t t -+s&@abs_builddir@&$ac_abs_builddir&;t t -+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -+s&@INSTALL@&$ac_INSTALL&;t t -+$ac_datarootdir_hack -+" -+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ -+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -+$as_echo "$as_me: error: could not create $ac_file" >&2;} -+ { (exit 1); exit 1; }; } -+ -+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && -+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && -+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined." >&5 -+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined." >&2;} -+ -+ rm -f "$tmp/stdin" -+ case $ac_file in -+ -) cat "$tmp/out" && rm -f "$tmp/out";; -+ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; -+ esac \ -+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -+$as_echo "$as_me: error: could not create $ac_file" >&2;} -+ { (exit 1); exit 1; }; } -+ ;; -+ -+ -+ -+ esac -+ -+done # for ac_tag -+ -+ -+{ (exit 0); exit 0; } -+_ACEOF -+chmod +x $CONFIG_STATUS -+ac_clean_files=$ac_clean_files_save -+ -+test $ac_write_fail = 0 || -+ { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 -+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} -+ { (exit 1); exit 1; }; } -+ -+ -+# configure is writing to config.log, and then calls config.status. -+# config.status does its own redirection, appending to config.log. -+# Unfortunately, on DOS this fails, as config.log is still kept open -+# by configure, so config.status won't be able to write to it; its -+# output is simply discarded. So we exec the FD to /dev/null, -+# effectively closing config.log, so it can be properly (re)opened and -+# appended to by config.status. When coming back to configure, we -+# need to make the FD available again. -+if test "$no_create" != yes; then -+ ac_cs_success=: -+ ac_config_status_args= -+ test "$silent" = yes && -+ ac_config_status_args="$ac_config_status_args --quiet" -+ exec 5>/dev/null -+ $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false -+ exec 5>>config.log -+ # Use ||, not &&, to avoid exiting from the if with $? = 1, which -+ # would make configure fail if this is the last instruction. -+ $ac_cs_success || { (exit 1); exit 1; } -+fi -+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then -+ { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} -+fi -+ -diff --speed-large-files --minimal -Nru asciidoc-8.4.2.orig/autom4te.cache/requests asciidoc-8.4.2/autom4te.cache/requests ---- asciidoc-8.4.2.orig/autom4te.cache/requests 1970-01-01 01:00:00.000000000 +0100 -+++ asciidoc-8.4.2/autom4te.cache/requests 2009-03-27 01:07:51.994374586 +0100 -@@ -0,0 +1,66 @@ -+# This file was generated. -+# It contains the lists of macros which have been traced. -+# It can be safely removed. -+ -+ at request = ( -+ bless( [ -+ '0', -+ 1, -+ [ -+ '/opt/csw/share/autoconf' -+ ], -+ [ @@ 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 wbonnet at users.sourceforge.net Sat Sep 12 17:04:59 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 12 Sep 2009 15:04:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6281] csw/mgar/pkg/firefox/trunk Message-ID: Revision: 6281 http://gar.svn.sourceforge.net/gar/?rev=6281&view=rev Author: wbonnet Date: 2009-09-12 15:04:59 +0000 (Sat, 12 Sep 2009) Log Message: ----------- Upgrade to 3.0.14 Modified Paths: -------------- csw/mgar/pkg/firefox/trunk/Makefile csw/mgar/pkg/firefox/trunk/checksums Added Paths: ----------- csw/mgar/pkg/firefox/trunk/files/legacydb.config.mk.diff csw/mgar/pkg/firefox/trunk/files/legacydb.manifest.mm.diff csw/mgar/pkg/firefox/trunk/files/nsWildCard.cpp.diff csw/mgar/pkg/firefox/trunk/files/softoken.config.mk.diff csw/mgar/pkg/firefox/trunk/files/softoken.manifest.mm.diff Modified: csw/mgar/pkg/firefox/trunk/Makefile =================================================================== --- csw/mgar/pkg/firefox/trunk/Makefile 2009-09-12 01:26:57 UTC (rev 6280) +++ csw/mgar/pkg/firefox/trunk/Makefile 2009-09-12 15:04:59 UTC (rev 6281) @@ -34,6 +34,7 @@ REQUIRED_PKGS_CSWfirefox += CSWlibx11 REQUIRED_PKGS_CSWfirefox += CSWlibxrender REQUIRED_PKGS_CSWfirefox += CSWpango +REQUIRED_PKGS_CSWfirefox += CSWzlib REQUIRED_PKGS_CSWfirefox += CSWsqlite3rt # Defines the list of patches to be applied to the sources @@ -49,6 +50,11 @@ PATCHFILES += nsNativeApSuportUnix.cpp.diff PATCHFILES += nsExceptionHandler.cpp.diff PATCHFILES += SunOS5.mk.diff +PATCHFILES += nsWildCard.cpp.diff +PATCHFILES += softoken.manifest.mm.diff +PATCHFILES += softoken.config.mk.diff +PATCHFILES += legacydb.manifest.mm.diff +PATCHFILES += legacydb.config.mk.diff # pkg-config options EXTRA_PKG_CONFIG_PATH += /opt/csw/X11/lib/pkgconfig Modified: csw/mgar/pkg/firefox/trunk/checksums =================================================================== --- csw/mgar/pkg/firefox/trunk/checksums 2009-09-12 01:26:57 UTC (rev 6280) +++ csw/mgar/pkg/firefox/trunk/checksums 2009-09-12 15:04:59 UTC (rev 6281) @@ -5,14 +5,19 @@ 45bba282258a321e5e4f73a742bcc31b download/autoconf.mk.in.diff c869762735a41bb30f417e510ccb7f31 download/configure.diff a71a4afaabc4d067f30d8fb184fea520 download/file_id.cc.diff -040d01a1e22a1ec1b28188479df06007 download/firefox-3.0.13-source.tar.bz2 +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 Added: csw/mgar/pkg/firefox/trunk/files/legacydb.config.mk.diff =================================================================== --- csw/mgar/pkg/firefox/trunk/files/legacydb.config.mk.diff (rev 0) +++ csw/mgar/pkg/firefox/trunk/files/legacydb.config.mk.diff 2009-09-12 15:04:59 UTC (rev 6281) @@ -0,0 +1,13 @@ +--- firefox.orig/security/nss/lib/softoken/legacydb/config.mk 2009-09-12 16:48:35.872144730 +0200 ++++ firefox/security/nss/lib/softoken/legacydb/config.mk 2009-09-12 16:49:37.894263860 +0200 +@@ -83,6 +83,10 @@ + # $(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 \ ++ -R/opt/csw/lib \ ++ -L/opt/csw/X11/lib \ ++ -R/opt/csw/X11/lib \ + -L$(DIST)/lib \ + -lnssutil3 \ + -L$(NSPR_LIB_DIR) \ Added: csw/mgar/pkg/firefox/trunk/files/legacydb.manifest.mm.diff =================================================================== --- csw/mgar/pkg/firefox/trunk/files/legacydb.manifest.mm.diff (rev 0) +++ csw/mgar/pkg/firefox/trunk/files/legacydb.manifest.mm.diff 2009-09-12 15:04:59 UTC (rev 6281) @@ -0,0 +1,10 @@ +--- firefox.orig/security/nss/lib/softoken/legacydb/manifest.mn 2009-09-12 16:48:43.152291326 +0200 ++++ firefox/security/nss/lib/softoken/legacydb/manifest.mn 2009-09-12 16:49:12.293669070 +0200 +@@ -48,6 +48,7 @@ + + ifdef MOZILLA_CLIENT + INCLUDES += -I$(DIST)/include/sqlite3 ++INCLUDES += -I/opt/csw/include + endif + + CSRCS = \ Added: csw/mgar/pkg/firefox/trunk/files/nsWildCard.cpp.diff =================================================================== --- csw/mgar/pkg/firefox/trunk/files/nsWildCard.cpp.diff (rev 0) +++ csw/mgar/pkg/firefox/trunk/files/nsWildCard.cpp.diff 2009-09-12 15:04:59 UTC (rev 6281) @@ -0,0 +1,199 @@ +--- 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 @@ + + typedef int static_assert_character_code_arrangement['a' > 'A' ? 1 : -1]; + +-template + static int +-alpha(T c) ++alpha(PRUnichar c) + { + return ('a' <= c && c <= 'z') || + ('A' <= c && c <= 'Z'); + } + +-template + static int +-alphanumeric(T c) ++alphanumeric(PRUnichar c) + { + return ('0' <= c && c <= '9') || alpha(c); + } + +-template + static int +-lower(T c) ++lower(PRUnichar c) + { + return ('A' <= c && c <= 'Z') ? c + ('a' - 'A') : c; + } + +-template + static int +-upper(T c) ++upper(PRUnichar c) + { + return ('a' <= c && c <= 'z') ? c - ('a' - 'A') : c; + } + + /* ----------------------------- _valid_subexp ---------------------------- */ + +-template ++template + static int + _valid_subexp(const T *expr, T stop1, T stop2) + { +@@ -162,7 +158,7 @@ + } + + +-template ++template + int + NS_WildCardValid_(const T *expr) + { +@@ -183,9 +179,8 @@ + #define NOMATCH 1 + #define ABORTED -1 + +-template + static int +-_shexp_match(const T *str, const T *expr, PRBool case_insensitive, unsigned int level); ++_shexp_match(const PRUnichar *str, const PRUnichar *expr, PRBool case_insensitive, unsigned int level); + + /** + * Count characters until we reach a NUL character or either of the +@@ -196,9 +191,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. + */ +-template + static int +-_scan_and_copy(const T *expr, T stop1, T stop2, T *dest) ++_scan_and_copy(const PRUnichar *expr, PRUnichar stop1, PRUnichar stop2, PRUnichar *dest) + { + register int sx; /* source index */ + register char cc; +@@ -219,7 +213,7 @@ + } + if (dest && sx) { + /* Copy all but the closing delimiter. */ +- memcpy(dest, expr, sx * sizeof(T)); ++ memcpy(dest, expr, sx * sizeof(PRUnichar)); + dest[sx] = 0; + } + return cc ? sx : ABORTED; /* index of closing delimiter */ +@@ -233,36 +227,35 @@ + * matches the input string. Repeat this until some alternative matches, + * or we have an abort. + */ +-template + static int +-_handle_union(const T *str, const T *expr, PRBool case_insensitive, ++_handle_union(const PRUnichar *str, const PRUnichar *expr, PRBool case_insensitive, + unsigned int level) + { + register int sx; /* source index */ + int cp; /* source index of closing parenthesis */ + int count; + int ret = NOMATCH; +- T *e2; ++ PRUnichar *e2; + + /* Find the closing parenthesis that ends this union in the expression */ +- cp = ::_scan_and_copy(expr, T(')'), T('\0'), static_cast(NULL)); ++ cp = ::_scan_and_copy(expr, PRUnichar(')'), PRUnichar('\0'), static_cast(NULL)); + if (cp == ABORTED || cp < 4) /* must be at least "(a|b" before ')' */ + return ABORTED; + ++cp; /* now index of char after closing parenthesis */ +- e2 = (T *) NS_Alloc((1 + nsCharTraits::length(expr)) * sizeof(T)); ++ e2 = (PRUnichar *) NS_Alloc((1 + nsCharTraits::length(expr)) * sizeof(PRUnichar)); + if (!e2) + return ABORTED; + for (sx = 1; ; ++sx) { + /* Here, expr[sx] is one character past the preceeding '(' or '|'. */ + /* Copy everything up to the next delimiter to e2 */ +- count = ::_scan_and_copy(expr + sx, T(')'), T('|'), e2); ++ count = ::_scan_and_copy(expr + sx, PRUnichar(')'), PRUnichar('|'), e2); + if (count == ABORTED || !count) { + ret = ABORTED; + break; + } + sx += count; + /* Append everything after closing parenthesis to e2. This is safe. */ +- nsCharTraits::copy(e2 + count, expr + cp, nsCharTraits::length(expr + cp) + 1); ++ nsCharTraits::copy(e2 + count, expr + cp, nsCharTraits::length(expr + cp) + 1); + ret = ::_shexp_match(str, e2, case_insensitive, level + 1); + if (ret != NOMATCH || !expr[sx] || expr[sx] == ')') + break; +@@ -284,9 +277,8 @@ + return map[lower(val)]; + } + +-template + static int +-_shexp_match(const T *str, const T *expr, PRBool case_insensitive, ++_shexp_match(const PRUnichar *str, const PRUnichar *expr, PRBool case_insensitive, + unsigned int level) + { + register int x; /* input string index */ +@@ -326,7 +318,7 @@ + else + return NOMATCH; + case '[': { +- T start, end = 0; ++ PRUnichar start, end = 0; + int i; + neg = ((expr[++y] == '^') && (expr[y+1] != ']')); + if (neg) +@@ -342,9 +334,9 @@ + } + if (alphanumeric(end) && expr[i] == ']') { + /* This is a range form: a-b */ +- T val = str[x]; ++ PRUnichar val = str[x]; + if (end < start) { /* swap them */ +- T tmp = end; ++ PRUnichar tmp = end; + end = start; + start = tmp; + } +@@ -405,21 +397,20 @@ + } + + +-template + static int +-ns_WildCardMatch(const T *str, const T *xp, PRBool case_insensitive) ++ns_WildCardMatch(const PRUnichar *str, const PRUnichar *xp, PRBool case_insensitive) + { +- T *expr = NULL; ++ PRUnichar *expr = NULL; + int x, ret = MATCH; + +- if (!nsCharTraits::find(xp, nsCharTraits::length(xp), T('~'))) ++ if (!nsCharTraits::find(xp, nsCharTraits::length(xp), PRUnichar('~'))) + return _shexp_match(str, xp, case_insensitive, 0); + +- expr = (T *) NS_Alloc((nsCharTraits::length(xp) + 1) * sizeof(T)); ++ expr = (PRUnichar *) NS_Alloc((nsCharTraits::length(xp) + 1) * sizeof(PRUnichar)); + if(!expr) + return NOMATCH; + +- x = ::_scan_and_copy(expr, T('~'), T('\0'), static_cast(NULL)); ++ x = ::_scan_and_copy(expr, PRUnichar('~'), PRUnichar('\0'), static_cast(NULL)); + if (x != ABORTED && expr[x] == '~') { + expr[x++] = '\0'; + ret = ::_shexp_match(str, &expr[x], case_insensitive, 0); +@@ -436,9 +427,8 @@ + return ret; + } + +-template + NS_COM int +-NS_WildCardMatch_(const T *str, const T *expr, PRBool case_insensitive) ++NS_WildCardMatch_(const PRUnichar *str, const PRUnichar *expr, PRBool case_insensitive) + { + int is_valid = NS_WildCardValid(expr); + switch(is_valid) { Added: csw/mgar/pkg/firefox/trunk/files/softoken.config.mk.diff =================================================================== --- csw/mgar/pkg/firefox/trunk/files/softoken.config.mk.diff (rev 0) +++ csw/mgar/pkg/firefox/trunk/files/softoken.config.mk.diff 2009-09-12 15:04:59 UTC (rev 6281) @@ -0,0 +1,13 @@ +--- firefox.orig/security/nss/lib/softoken/config.mk 2009-09-12 16:29:40.981589923 +0200 ++++ firefox/security/nss/lib/softoken/config.mk 2009-09-12 16:40:15.362584742 +0200 +@@ -84,6 +84,10 @@ + # $(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 \ ++ -R/opt/csw/lib \ ++ -L/opt/csw/X11/lib \ ++ -R/opt/csw/X11/lib \ + -L$(DIST)/lib \ + -lnssutil3 \ + -lsqlite3 \ Added: csw/mgar/pkg/firefox/trunk/files/softoken.manifest.mm.diff =================================================================== --- csw/mgar/pkg/firefox/trunk/files/softoken.manifest.mm.diff (rev 0) +++ csw/mgar/pkg/firefox/trunk/files/softoken.manifest.mm.diff 2009-09-12 15:04:59 UTC (rev 6281) @@ -0,0 +1,10 @@ +--- firefox.orig/security/nss/lib/softoken/manifest.mm 2009-09-12 16:29:35.109858462 +0200 ++++ firefox/security/nss/lib/softoken/manifest.mn 2009-09-12 16:39:33.257884547 +0200 +@@ -49,6 +49,7 @@ + + ifdef MOZILLA_CLIENT + INCLUDES += -I$(DIST)/include/sqlite3 ++INCLUDES += -I/opt/csw/include + endif + + EXPORTS = \ 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 Sep 12 19:57:37 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 12 Sep 2009 17:57:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[6282] csw/mgar/pkg/libxml2/trunk/Makefile Message-ID: Revision: 6282 http://gar.svn.sourceforge.net/gar/?rev=6282&view=rev Author: bdwalton Date: 2009-09-12 17:57:36 +0000 (Sat, 12 Sep 2009) Log Message: ----------- libxml2: update sysconfdir and localstatedir Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2009-09-12 15:04:59 UTC (rev 6281) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2009-09-12 17:57:36 UTC (rev 6282) @@ -56,5 +56,8 @@ PKGFILES_CSWpylibxml2 = $(libdir)/python/.* PKGFILES_CSWpylibxml2 += $(docdir)/pylibxml2/.* +sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Sep 12 20:09:20 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 12 Sep 2009 18:09:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[6283] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 6283 http://gar.svn.sourceforge.net/gar/?rev=6283&view=rev Author: bdwalton Date: 2009-09-12 18:09:20 +0000 (Sat, 12 Sep 2009) Log Message: ----------- git: install bash completion and make it a new package Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-09-12 17:57:36 UTC (rev 6282) +++ csw/mgar/pkg/git/trunk/Makefile 2009-09-12 18:09:20 UTC (rev 6283) @@ -7,6 +7,7 @@ # TEST_SCRIPTS = PACKAGES = CSWgit CSWgitk CSWgitgui CSWgitsvn CSWgitcvs CSWgitemacs CSWgitdoc +PACKAGES += CSWgitcompletion CATALOGNAME_CSWgit = git CATALOGNAME_CSWgitcvs = git_cvs @@ -15,6 +16,7 @@ CATALOGNAME_CSWgitgui = git_gui CATALOGNAME_CSWgitdoc = git_doc CATALOGNAME_CSWgitk = gitk +CATALOGNAME_CSWgitcompletion = git_completion ARCHALL_CSWgitsvn = 1 ARCHALL_CSWgitcvs = 1 @@ -22,6 +24,7 @@ ARCHALL_CSWgitgui = 1 ARCHALL_CSWgitemacs = 1 ARCHALL_CSWgitdoc = 1 +ARCHALL_CSWgitcompletion = 1 PREREQUISITE_PKGS = CSWasciidoc CSWossldevel CSWxmlto CSWbash CSWcurldevel PREREQUISITE_PKGS += CSWgsed CSWgnulinks CSWperl CSWtk CSWexpat @@ -44,6 +47,10 @@ REQUIRED_PKGS_CSWgitdoc = CSWgit +# We include bash here even though git itself depends on it because in theory +# git could use any other POSIX compliant shell and drop the dependency... +REQUIRED_PKGS_CSWgitcompletion = CSWgit CSWbash + LICENSE_CSWgit = COPYING LICENSE_CSWgitk = COPYING LICENSE_CSWgitgui = COPYING @@ -51,6 +58,7 @@ LICENSE_CSWgitcvs = COPYING LICENSE_CSWgitemacs = COPYING LICENSE_CSWgitdoc = COPYING +LICENSE_CSWgitcompletion = COPYING DESCRIPTION = Fast Version Control System define BLURB @@ -66,6 +74,7 @@ SPKG_DESC_CSWgitcvs = Git tools for working with CVS repositories SPKG_DESC_CSWgitdoc = Documentation for Git SPKG_DESC_CSWgitemacs = Git VCS support for Emacs +SPKG_DESC_CSWgitcompletion = Bash completion support for Git #NOTE: If you need to proxy git:// connections, set GIT_USE_PROXY in # your .garrc file. (That leaves this recipe in a more generic form.) @@ -83,6 +92,7 @@ PKGFILES_CSWgitcvs = $(foreach d,$(fdirs),$(d)/.*cvs.*) PKGFILES_CSWgitemacs = .*emacs.* PKGFILES_CSWgitdoc = $(docdir)/.* +PKGFILES_CSWgitcompletion = $(bashconfdir)/bash_completion.d/.* # We define upstream file regex so we can be notifed of new upstream # software release @@ -90,6 +100,8 @@ sysconfdir = /etc/opt/csw localstatedir = /var/opt/csw +#set bashconfdir to sysconfdir when bash changes +bashconfdir = /opt/csw/etc/ CONFIGURE_ARGS = $(DIRPATHS) --with-shell=$(bindir)/bash CONFIGURE_ARGS += --with-perl=$(bindir)/perl @@ -143,4 +155,8 @@ cp -R contrib/hooks README COPYING $(GD)/; \ cp -R Documentation/*.html Documentation/docbook-xsl.css $(GD)/; \ cp -R Documentation/howto Documentation/technical $(GD)/; ) + @echo Installing Bash Completion files + @( cd $(WORKSRC); \ + cp contrib/completion/* \ + $(DESTDIR)/$(bashconfdir)/bash_completion.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 Sat Sep 12 22:47:19 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 12 Sep 2009 20:47:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[6284] csw/mgar/pkg/giflib/trunk/Makefile Message-ID: Revision: 6284 http://gar.svn.sourceforge.net/gar/?rev=6284&view=rev Author: dmichelsen Date: 2009-09-12 20:47:19 +0000 (Sat, 12 Sep 2009) Log Message: ----------- giflib: Split off runtime and doc package Modified Paths: -------------- csw/mgar/pkg/giflib/trunk/Makefile Modified: csw/mgar/pkg/giflib/trunk/Makefile =================================================================== --- csw/mgar/pkg/giflib/trunk/Makefile 2009-09-12 18:09:20 UTC (rev 6283) +++ csw/mgar/pkg/giflib/trunk/Makefile 2009-09-12 20:47:19 UTC (rev 6284) @@ -15,12 +15,14 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -PACKAGES = CSWgiflib CSWungif +PACKAGES = CSWgiflib CSWgiflibrt CSWgiflibdoc CSWungif CATALOGNAME_CSWgiflib = giflib CATALOGNAME_CSWungif = libungif SPKG_DESC_CSWgiflib = A library for reading and writing gif images +SPKG_DESC_CSWgiflibrt = giflib runtime libraries +SPKG_DESC_CSWgiflibdoc = giflib documentation SPKG_DESC_CSWungif = Links to giflib now the patent is dropped REQUIRED_PKGS_CSWungif = CSWgiflib @@ -36,6 +38,8 @@ MERGE_DIRS_isa-sparcv9 = $(libdir) MERGE_DIRS_isa-amd64 = $(libdir) +PKGFILES_CSWgiflibrt = .*/libgif\..* +PKGFILES_CSWgiflibdoc = $(PKGFILES_DOC) PKGFILES_CSWungif = .*/libungif\..* 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 Sat Sep 12 22:55:49 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 12 Sep 2009 20:55:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[6285] csw/mgar/pkg/giflib/trunk/Makefile Message-ID: Revision: 6285 http://gar.svn.sourceforge.net/gar/?rev=6285&view=rev Author: dmichelsen Date: 2009-09-12 20:55:49 +0000 (Sat, 12 Sep 2009) Log Message: ----------- giflib: Add requirements Modified Paths: -------------- csw/mgar/pkg/giflib/trunk/Makefile Modified: csw/mgar/pkg/giflib/trunk/Makefile =================================================================== --- csw/mgar/pkg/giflib/trunk/Makefile 2009-09-12 20:47:19 UTC (rev 6284) +++ csw/mgar/pkg/giflib/trunk/Makefile 2009-09-12 20:55:49 UTC (rev 6285) @@ -25,7 +25,8 @@ SPKG_DESC_CSWgiflibdoc = giflib documentation SPKG_DESC_CSWungif = Links to giflib now the patent is dropped -REQUIRED_PKGS_CSWungif = CSWgiflib +REQUIRED_PKGS_CSWgiflib = CSWgiflibrt +REQUIRED_PKGS_CSWungif = CSWgiflibrt BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Sep 12 23:05:55 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 12 Sep 2009 21:05:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[6286] csw/mgar/pkg/giflib/trunk/Makefile Message-ID: Revision: 6286 http://gar.svn.sourceforge.net/gar/?rev=6286&view=rev Author: dmichelsen Date: 2009-09-12 21:05:55 +0000 (Sat, 12 Sep 2009) Log Message: ----------- giflib: Fix catalogname Modified Paths: -------------- csw/mgar/pkg/giflib/trunk/Makefile Modified: csw/mgar/pkg/giflib/trunk/Makefile =================================================================== --- csw/mgar/pkg/giflib/trunk/Makefile 2009-09-12 20:55:49 UTC (rev 6285) +++ csw/mgar/pkg/giflib/trunk/Makefile 2009-09-12 21:05:55 UTC (rev 6286) @@ -18,6 +18,8 @@ PACKAGES = CSWgiflib CSWgiflibrt CSWgiflibdoc CSWungif CATALOGNAME_CSWgiflib = giflib +CATALOGNAME_CSWgiflibrt = giflib_rt +CATALOGNAME_CSWgiflibdoc = giflib_doc CATALOGNAME_CSWungif = libungif SPKG_DESC_CSWgiflib = A library for reading and writing gif images @@ -26,7 +28,7 @@ SPKG_DESC_CSWungif = Links to giflib now the patent is dropped REQUIRED_PKGS_CSWgiflib = CSWgiflibrt -REQUIRED_PKGS_CSWungif = CSWgiflibrt +REQUIRED_PKGS_CSWungif = CSWgiflib BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Sep 13 01:25:55 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 12 Sep 2009 23:25:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[6287] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 6287 http://gar.svn.sourceforge.net/gar/?rev=6287&view=rev Author: bdwalton Date: 2009-09-12 23:25:55 +0000 (Sat, 12 Sep 2009) Log Message: ----------- git: update bash completion and doc handling Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-09-12 21:05:55 UTC (rev 6286) +++ csw/mgar/pkg/git/trunk/Makefile 2009-09-12 23:25:55 UTC (rev 6287) @@ -115,7 +115,7 @@ BUILD_ARGS = MSGFMT=gmsgfmt SHELL_PATH=/opt/csw/bin/bash \ ETC_GITCONFIG=$(sysconfdir)/gitconfig V=1 \ ASCIIDOC_NO_ROFF=YesPlease \ - all doc + all INSTALL_ARGS = ETC_GITCONFIG=$(sysconfdir)/gitconfig \ INSTALLDIRS=vendor \ @@ -138,6 +138,7 @@ post-build-modulated: @echo Builing Emacs Git extension @( cd $(WORKSRC); $(MAKE) -C contrib/emacs ) + @( cd $(WORKSRC)/Documentation; $(MAKE) ) post-install-modulated: GD=$(DESTDIR)/$(datadir)/doc/$(GARNAME) post-install-modulated: @@ -157,6 +158,7 @@ cp -R Documentation/howto Documentation/technical $(GD)/; ) @echo Installing Bash Completion files @( cd $(WORKSRC); \ + mkdir -p $(DESTDIR)/$(bashconfdir); \ cp contrib/completion/* \ $(DESTDIR)/$(bashconfdir)/bash_completion.d/ ) @$(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 Sun Sep 13 01:33:23 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 12 Sep 2009 23:33:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6288] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 6288 http://gar.svn.sourceforge.net/gar/?rev=6288&view=rev Author: bdwalton Date: 2009-09-12 23:33:23 +0000 (Sat, 12 Sep 2009) Log Message: ----------- git: tweak bash completion installation Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-09-12 23:25:55 UTC (rev 6287) +++ csw/mgar/pkg/git/trunk/Makefile 2009-09-12 23:33:23 UTC (rev 6288) @@ -141,6 +141,7 @@ @( cd $(WORKSRC)/Documentation; $(MAKE) ) post-install-modulated: GD=$(DESTDIR)/$(datadir)/doc/$(GARNAME) +post-install-modulated: BD=$(DESTDIR)/$(bashconfdir)/bash_completion.d post-install-modulated: @echo Cleaning up perl stuff @rm -rf $(DESTDIR)/$(libdir)/perl5/site_perl/5* @@ -158,7 +159,7 @@ cp -R Documentation/howto Documentation/technical $(GD)/; ) @echo Installing Bash Completion files @( cd $(WORKSRC); \ - mkdir -p $(DESTDIR)/$(bashconfdir); \ + ginstall -c -m 0755 -d $(BD); \ cp contrib/completion/* \ - $(DESTDIR)/$(bashconfdir)/bash_completion.d/ ) + $(BD)/ ) @$(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 Sun Sep 13 03:11:00 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 13 Sep 2009 01:11:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6289] csw/mgar/pkg/sgml-xml-common/trunk/Makefile Message-ID: Revision: 6289 http://gar.svn.sourceforge.net/gar/?rev=6289&view=rev Author: bdwalton Date: 2009-09-13 01:10:46 +0000 (Sun, 13 Sep 2009) Log Message: ----------- sgml-xml-common: tweak pkgfiles selection Modified Paths: -------------- csw/mgar/pkg/sgml-xml-common/trunk/Makefile Modified: csw/mgar/pkg/sgml-xml-common/trunk/Makefile =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/Makefile 2009-09-12 23:33:23 UTC (rev 6288) +++ csw/mgar/pkg/sgml-xml-common/trunk/Makefile 2009-09-13 01:10:46 UTC (rev 6289) @@ -25,10 +25,10 @@ CATALOGNAME_CSWxmlcommon = xmlcommon PKGFILES_CSWsgmlcommon = .*sgmlwhich.* .*install-catalog.* -PKGFILES_CSWsgmlcommon += /opt/csw/share/sgml/.* /etc/opt/csw/sgml/.* +PKGFILES_CSWsgmlcommon += /opt/csw/share/sgml/.* /etc/opt/csw/sgml/sgml.conf PKGFILES_CSWsgmlcommon += /opt/csw/share/doc/sgml.* -PKGFILES_CSWxmlcommon = /etc/opt/csw/xml/.* /opt/csw/share/xml.* .*xmlcatalog +PKGFILES_CSWxmlcommon = /etc/opt/csw/xml/.* /opt/csw/share/xml.* /etc/opt/csw/sgml/docbook/xmlcatalog REQUIRED_PKGS_CSWsgmlcommon = CSWbash CSWggrep CSWgsed 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 Sep 13 04:36:30 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 13 Sep 2009 02:36:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[6290] csw/mgar/pkg/sgml-xml-common/trunk/Makefile Message-ID: Revision: 6290 http://gar.svn.sourceforge.net/gar/?rev=6290&view=rev Author: bdwalton Date: 2009-09-13 02:36:30 +0000 (Sun, 13 Sep 2009) Log Message: ----------- sgml-xml-common: more pkgfiles tweaks Modified Paths: -------------- csw/mgar/pkg/sgml-xml-common/trunk/Makefile Modified: csw/mgar/pkg/sgml-xml-common/trunk/Makefile =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/Makefile 2009-09-13 01:10:46 UTC (rev 6289) +++ csw/mgar/pkg/sgml-xml-common/trunk/Makefile 2009-09-13 02:36:30 UTC (rev 6290) @@ -24,11 +24,11 @@ CATALOGNAME_CSWsgmlcommon = sgmlcommon CATALOGNAME_CSWxmlcommon = xmlcommon -PKGFILES_CSWsgmlcommon = .*sgmlwhich.* .*install-catalog.* +PKGFILES_CSWsgmlcommon = /opt/csw/bin/.* /opt/csw/share/doc/sgml/.* PKGFILES_CSWsgmlcommon += /opt/csw/share/sgml/.* /etc/opt/csw/sgml/sgml.conf -PKGFILES_CSWsgmlcommon += /opt/csw/share/doc/sgml.* +PKGFILES_CSWsgmlcommon += /opt/csw/share/man/.* -PKGFILES_CSWxmlcommon = /etc/opt/csw/xml/.* /opt/csw/share/xml.* /etc/opt/csw/sgml/docbook/xmlcatalog +PKGFILES_CSWxmlcommon = /etc/opt/csw/xml/.* /opt/csw/share/xml.* /opt/csw/share/sgml/docbook/xmlcatalog REQUIRED_PKGS_CSWsgmlcommon = CSWbash CSWggrep CSWgsed 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 Sep 13 13:08:13 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 13 Sep 2009 11:08:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[6291] csw/mgar/pkg/seamonkey/trunk Message-ID: Revision: 6291 http://gar.svn.sourceforge.net/gar/?rev=6291&view=rev Author: wbonnet Date: 2009-09-13 11:08:13 +0000 (Sun, 13 Sep 2009) Log Message: ----------- Upgrade to 1.1.18 Modified Paths: -------------- csw/mgar/pkg/seamonkey/trunk/Makefile csw/mgar/pkg/seamonkey/trunk/checksums Added Paths: ----------- csw/mgar/pkg/seamonkey/trunk/files/SunOS5.mk.diff csw/mgar/pkg/seamonkey/trunk/files/autoconfig.mk.in.diff csw/mgar/pkg/seamonkey/trunk/files/legacydb.config.mk.diff csw/mgar/pkg/seamonkey/trunk/files/legacydb.manifest.mm.diff csw/mgar/pkg/seamonkey/trunk/files/packager.mk.diff csw/mgar/pkg/seamonkey/trunk/files/softoken.config.mk.diff csw/mgar/pkg/seamonkey/trunk/files/softoken.manifest.mm.diff Modified: csw/mgar/pkg/seamonkey/trunk/Makefile =================================================================== --- csw/mgar/pkg/seamonkey/trunk/Makefile 2009-09-13 02:36:30 UTC (rev 6290) +++ csw/mgar/pkg/seamonkey/trunk/Makefile 2009-09-13 11:08:13 UTC (rev 6291) @@ -1,5 +1,5 @@ GARNAME = seamonkey -GARVERSION = 1.1.17 +GARVERSION = 1.1.18 CATEGORIES = x11 DISTNAME = $(GARNAME) @@ -16,38 +16,46 @@ MASTER_SITES = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/$(GARVERSION)/ UPSTREAM_MASTER_SITES = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/ -PACKAGES = CSWseamonkey +PACKAGES = CSWseamonkey CATALOGNAME_CSWseamonkey = $(GARNAME) SPKG_DESC_CSWseamonkey = $(DESCRIPTION) -# REQUIRED_PKGS_CSWseamonkey = CSWdbusglib -# REQUIRED_PKGS_CSWseamonkey += CSWfconfig -# REQUIRED_PKGS_CSWseamonkey += CSWftype2 -# REQUIRED_PKGS_CSWseamonkey += CSWgconf2 -# REQUIRED_PKGS_CSWseamonkey += CSWglib2 -# REQUIRED_PKGS_CSWseamonkey += CSWgnomevfs2 -# REQUIRED_PKGS_CSWseamonkey += CSWgtk2 -# REQUIRED_PKGS_CSWseamonkey += CSWlibatk -# REQUIRED_PKGS_CSWseamonkey += CSWlibcairo -# REQUIRED_PKGS_CSWseamonkey += CSWlibdbus -# REQUIRED_PKGS_CSWseamonkey += CSWlibgnome -# REQUIRED_PKGS_CSWseamonkey += CSWlibx11 -# REQUIRED_PKGS_CSWseamonkey += CSWlibxrender -# REQUIRED_PKGS_CSWseamonkey += CSWpango -# REQUIRED_PKGS_CSWseamonkey += CSWsqlite3rt +REQUIRED_PKGS_CSWseamonkey += CSWbonobo2 +REQUIRED_PKGS_CSWseamonkey += CSWfconfig +REQUIRED_PKGS_CSWseamonkey += CSWftype2 +REQUIRED_PKGS_CSWseamonkey += CSWgconf2 +REQUIRED_PKGS_CSWseamonkey += CSWggettextrt +REQUIRED_PKGS_CSWseamonkey += CSWglib2 +REQUIRED_PKGS_CSWseamonkey += CSWgnomekeyring +REQUIRED_PKGS_CSWseamonkey += CSWgnomevfs2 +REQUIRED_PKGS_CSWseamonkey += CSWgtk2 +REQUIRED_PKGS_CSWseamonkey += CSWlibart +REQUIRED_PKGS_CSWseamonkey += CSWlibatk +REQUIRED_PKGS_CSWseamonkey += CSWlibbonoboui +REQUIRED_PKGS_CSWseamonkey += CSWlibcairo +REQUIRED_PKGS_CSWseamonkey += CSWlibgnome +REQUIRED_PKGS_CSWseamonkey += CSWlibgnomecanvas +REQUIRED_PKGS_CSWseamonkey += CSWlibgnomeui +REQUIRED_PKGS_CSWseamonkey += CSWlibidl +REQUIRED_PKGS_CSWseamonkey += CSWlibpopt +REQUIRED_PKGS_CSWseamonkey += CSWlibx11 +REQUIRED_PKGS_CSWseamonkey += CSWlibxft2 +REQUIRED_PKGS_CSWseamonkey += CSWlibxrender +REQUIRED_PKGS_CSWseamonkey += CSWorbit2 +REQUIRED_PKGS_CSWseamonkey += CSWpango +REQUIRED_PKGS_CSWseamonkey += CSWsqlite3rt +REQUIRED_PKGS_CSWseamonkey += CSWzlib # Defines the list of patches to be applied to the sources -# PATCHFILES = autoconf.mk.in.diff +PATCHFILES += autoconf.mk.in.diff +PATCHFILES += SunOS5.mk.diff +PATCHFILES += legacydb.manifest.mm.diff +PATCHFILES += legacydb.config.mk.diff +PATCHFILES += softoken.manifest.mm.diff +PATCHFILES += softoken.config.mk.diff +PATCHFILES += packager.mk.diff + # PATCHFILES += configure.diff -# PATCHFILES += nsPluginsDirUnix.cpp.diff -# PATCHFILES += packager.mk.diff -# PATCHFILES += jemalloc.c.diff -# PATCHFILES += nsMathUtils.h.diff -# PATCHFILES += file_id.cc.diff -# PATCHFILES += md5.h.diff -# PATCHFILES += solaris_lwp.h.diff -# PATCHFILES += nsNativeApSuportUnix.cpp.diff -# PATCHFILES += nsExceptionHandler.cpp.diff # pkg-config options EXTRA_PKG_CONFIG_PATH += /opt/csw/X11/lib/pkgconfig @@ -57,12 +65,12 @@ CFLAGS +=-xlibmil -D__solaris__ CFLAGS += -DG_HAVE_ISO_VARARGS CXXFLAGS += -DG_HAVE_ISO_VARARGS -CPPFLAGS = -I/opt/csw/include -I/opt/csw/X11/include -XCFLAGS = -I/opt/csw/include -I/opt/csw/X11/include +CPPFLAGS = -I/opt/csw/include -I/opt/csw/X11/include -I/opt/csw/include/cairo +XCFLAGS = -I/opt/csw/include -I/opt/csw/X11/include -I/opt/csw/include/cairo EXTRA_CONFIGURE_EXPORTS = XCFLAGS -LDFLAGS+=-L/usr/lib/lwp -L/opt/csw/mozilla/seamonkey/lib -R/opt/csw/mozilla/seamonkey/lib -L/opt/csw/lib -R/opt/csw/lib -lsqlite3 +LDFLAGS+=-L/usr/lib/lwp -L/opt/csw/mozilla/seamonkey/lib -R/opt/csw/mozilla/seamonkey/lib -L/opt/csw/lib -R/opt/csw/lib -L/opt/csw/X11/lib -R/opt/csw/X11/lib -lsqlite3 export PERL CFLAGS CXXFLAGS LDFLAGS @@ -86,13 +94,13 @@ pre-install: ( if [ ! -d $(WORK_INSTALL)/opt/csw/bin ] ; then mkdir -p $(WORK_INSTALL)/opt/csw/bin ; fi ) - ( cd $(WORK_INSTALL)/opt/csw/bin && ln -sf ../mozilla/seamonkey/bin/seamonkey . ) - ( mkdir -p $(WORK_INSTALL)/opt/csw/share/pixmaps ) - ( cp $(WORK_BUILD)/other-licenses/branding/seamonkey/mozicon128.png $(WORK_INSTALL)/opt/csw/share/pixmaps/seamonkey.png ) - ( mkdir -p $(WORK_INSTALL)/opt/csw/share/applications ) - ( cp $(FILEDIR)/seamonkey.desktop $(WORK_INSTALL)/opt/csw/share/applications/seamonkey.desktop ) - ( mkdir -p $(WORK_INSTALL)/opt/csw/share/gnome/mime-info ) - ( cp $(FILEDIR)/seamonkey.keys $(WORK_INSTALL)/opt/csw/share/gnome/mime-info/seamonkey.keys ) + ( cd $(WORK_INSTALL)/opt/csw/bin ; rm -f seamonkey ; ln -sf ../mozilla/seamonkey/bin/seamonkey . ) +# ( mkdir -p $(WORK_INSTALL)/opt/csw/share/pixmaps ) +# ( cp $(WORK_BUILD)/other-licenses/branding/seamonkey/mozicon128.png $(WORK_INSTALL)/opt/csw/share/pixmaps/seamonkey.png ) +# ( mkdir -p $(WORK_INSTALL)/opt/csw/share/applications ) +# ( cp $(FILEDIR)/seamonkey.desktop $(WORK_INSTALL)/opt/csw/share/applications/seamonkey.desktop ) +# ( mkdir -p $(WORK_INSTALL)/opt/csw/share/gnome/mime-info ) +# ( cp $(FILEDIR)/seamonkey.keys $(WORK_INSTALL)/opt/csw/share/gnome/mime-info/seamonkey.keys ) post-install: ( gfind $(WORK_INSTALL)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}" \; ) Modified: csw/mgar/pkg/seamonkey/trunk/checksums =================================================================== --- csw/mgar/pkg/seamonkey/trunk/checksums 2009-09-13 02:36:30 UTC (rev 6290) +++ csw/mgar/pkg/seamonkey/trunk/checksums 2009-09-13 11:08:13 UTC (rev 6291) @@ -1 +1,3 @@ -9eba600ba6ca522b8eada9a0a8e890e2 download/seamonkey-1.1.17.source.tar.bz2 +3b03f00259d6897e017254e9dceed493 download/packager.mk.diff +ef4455becf3a12833dca7dd92854aeaa download/seamonkey-1.1.18.source.tar.bz2 +c815868b27233888ae5623967cc012f5 download/softoken.config.mk.diff Added: csw/mgar/pkg/seamonkey/trunk/files/SunOS5.mk.diff =================================================================== --- csw/mgar/pkg/seamonkey/trunk/files/SunOS5.mk.diff (rev 0) +++ csw/mgar/pkg/seamonkey/trunk/files/SunOS5.mk.diff 2009-09-13 11:08:13 UTC (rev 6291) @@ -0,0 +1,11 @@ +--- seamonkey.orig/security/coreconf/SunOS5.mk 2009-08-29 23:08:08.804586828 +0200 ++++ seamonkey/security/coreconf/SunOS5.mk 2009-08-29 23:08:32.556961245 +0200 +@@ -104,7 +104,7 @@ + endif + endif + +-INCLUDES += -I/usr/dt/include -I/usr/openwin/include ++INCLUDES += -I/usr/dt/include -I/opt/csw/X11/include + + RANLIB = echo + CPU_ARCH = sparc Added: csw/mgar/pkg/seamonkey/trunk/files/autoconfig.mk.in.diff =================================================================== --- csw/mgar/pkg/seamonkey/trunk/files/autoconfig.mk.in.diff (rev 0) +++ csw/mgar/pkg/seamonkey/trunk/files/autoconfig.mk.in.diff 2009-09-13 11:08:13 UTC (rev 6291) @@ -0,0 +1,21 @@ +--- seamonkey.orig/config/autoconf.mk.in 2009-09-13 10:26:24.361534256 +0200 ++++ seamonkey/config/autoconf.mk.in 2009-09-13 10:29:26.969746616 +0200 +@@ -57,14 +57,14 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + bindir = @bindir@ +-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++includedir = @includedir@ + libdir = @libdir@ + datadir = @datadir@ + mandir = @mandir@ +-idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++idldir = @datadir@/idl + +-mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) ++mozappdir = $(libdir) ++mredir = $(libdir)/mre + mrelibdir = $(mredir)/lib + + DIST = $(DEPTH)/dist Added: csw/mgar/pkg/seamonkey/trunk/files/legacydb.config.mk.diff =================================================================== --- csw/mgar/pkg/seamonkey/trunk/files/legacydb.config.mk.diff (rev 0) +++ csw/mgar/pkg/seamonkey/trunk/files/legacydb.config.mk.diff 2009-09-13 11:08:13 UTC (rev 6291) @@ -0,0 +1,13 @@ +--- seamonkey.orig/security/nss/lib/softoken/legacydb/config.mk 2009-09-12 16:48:35.872144730 +0200 ++++ seamonkey/security/nss/lib/softoken/legacydb/config.mk 2009-09-12 16:49:37.894263860 +0200 +@@ -83,6 +83,10 @@ + # $(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 \ ++ -R/opt/csw/lib \ ++ -L/opt/csw/X11/lib \ ++ -R/opt/csw/X11/lib \ + -L$(DIST)/lib \ + -lnssutil3 \ + -L$(NSPR_LIB_DIR) \ Added: csw/mgar/pkg/seamonkey/trunk/files/legacydb.manifest.mm.diff =================================================================== --- csw/mgar/pkg/seamonkey/trunk/files/legacydb.manifest.mm.diff (rev 0) +++ csw/mgar/pkg/seamonkey/trunk/files/legacydb.manifest.mm.diff 2009-09-13 11:08:13 UTC (rev 6291) @@ -0,0 +1,10 @@ +--- seamonkey.orig/security/nss/lib/softoken/legacydb/manifest.mn 2009-09-12 16:48:43.152291326 +0200 ++++ seamonkey/security/nss/lib/softoken/legacydb/manifest.mn 2009-09-12 16:49:12.293669070 +0200 +@@ -48,6 +48,7 @@ + + ifdef MOZILLA_CLIENT + INCLUDES += -I$(DIST)/include/sqlite3 ++INCLUDES += -I/opt/csw/include + endif + + CSRCS = \ Added: csw/mgar/pkg/seamonkey/trunk/files/packager.mk.diff =================================================================== --- csw/mgar/pkg/seamonkey/trunk/files/packager.mk.diff (rev 0) +++ csw/mgar/pkg/seamonkey/trunk/files/packager.mk.diff 2009-09-13 11:08:13 UTC (rev 6291) @@ -0,0 +1,12 @@ +diff --speed-large-files --minimal -Nru seamonkey.orig/toolkit/mozapps/installer/packager.mk seamonkey/toolkit/mozapps/installer/packager.mk +--- seamonkey.orig/toolkit/mozapps/installer/packager.mk 2008-04-28 19:14:12.000000000 +0000 ++++ seamonkey/toolkit/mozapps/installer/packager.mk 2008-11-15 20:28:41.679741300 +0000 +@@ -332,7 +332,7 @@ + endif # MOZ_PKG_MANIFEST + ifndef PKG_SKIP_STRIP + @echo "Stripping package directory..." +- @cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_APPNAME); find . ! -type d \ ++ @cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_APPNAME); gfind . ! -type d \ + ! -name "*.js" \ + ! -name "*.xpt" \ + ! -name "*.gif" \ Added: csw/mgar/pkg/seamonkey/trunk/files/softoken.config.mk.diff =================================================================== --- csw/mgar/pkg/seamonkey/trunk/files/softoken.config.mk.diff (rev 0) +++ csw/mgar/pkg/seamonkey/trunk/files/softoken.config.mk.diff 2009-09-13 11:08:13 UTC (rev 6291) @@ -0,0 +1,13 @@ +--- seamonkey.orig/security/nss/lib/softoken/config.mk 2009-09-12 16:29:40.981589923 +0200 ++++ seamonkey/security/nss/lib/softoken/config.mk 2009-09-12 16:40:15.362584742 +0200 +@@ -84,6 +84,10 @@ + # $(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 \ ++ -R/opt/csw/lib \ ++ -L/opt/csw/X11/lib \ ++ -R/opt/csw/X11/lib \ + -L$(DIST)/lib \ + -lnssutil3 \ + -lsqlite3 \ Added: csw/mgar/pkg/seamonkey/trunk/files/softoken.manifest.mm.diff =================================================================== --- csw/mgar/pkg/seamonkey/trunk/files/softoken.manifest.mm.diff (rev 0) +++ csw/mgar/pkg/seamonkey/trunk/files/softoken.manifest.mm.diff 2009-09-13 11:08:13 UTC (rev 6291) @@ -0,0 +1,10 @@ +--- seamonkey.orig/security/nss/lib/softoken/manifest.mm 2009-09-12 16:29:35.109858462 +0200 ++++ seamonkey/security/nss/lib/softoken/manifest.mn 2009-09-12 16:39:33.257884547 +0200 +@@ -49,6 +49,7 @@ + + ifdef MOZILLA_CLIENT + INCLUDES += -I$(DIST)/include/sqlite3 ++INCLUDES += -I/opt/csw/include + endif + + EXPORTS = \ 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 Sep 13 13:12:37 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 13 Sep 2009 11:12:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[6292] csw/mgar/pkg/seamonkey/trunk/files Message-ID: Revision: 6292 http://gar.svn.sourceforge.net/gar/?rev=6292&view=rev Author: wbonnet Date: 2009-09-13 11:12:37 +0000 (Sun, 13 Sep 2009) Log Message: ----------- Upgrade to 1.1.18 Added Paths: ----------- csw/mgar/pkg/seamonkey/trunk/files/autoconf.mk.in.diff Removed Paths: ------------- csw/mgar/pkg/seamonkey/trunk/files/autoconfig.mk.in.diff Copied: csw/mgar/pkg/seamonkey/trunk/files/autoconf.mk.in.diff (from rev 6291, csw/mgar/pkg/seamonkey/trunk/files/autoconfig.mk.in.diff) =================================================================== --- csw/mgar/pkg/seamonkey/trunk/files/autoconf.mk.in.diff (rev 0) +++ csw/mgar/pkg/seamonkey/trunk/files/autoconf.mk.in.diff 2009-09-13 11:12:37 UTC (rev 6292) @@ -0,0 +1,21 @@ +--- seamonkey.orig/config/autoconf.mk.in 2009-09-13 10:26:24.361534256 +0200 ++++ seamonkey/config/autoconf.mk.in 2009-09-13 10:29:26.969746616 +0200 +@@ -57,14 +57,14 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + bindir = @bindir@ +-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++includedir = @includedir@ + libdir = @libdir@ + datadir = @datadir@ + mandir = @mandir@ +-idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++idldir = @datadir@/idl + +-mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) ++mozappdir = $(libdir) ++mredir = $(libdir)/mre + mrelibdir = $(mredir)/lib + + DIST = $(DEPTH)/dist Deleted: csw/mgar/pkg/seamonkey/trunk/files/autoconfig.mk.in.diff =================================================================== --- csw/mgar/pkg/seamonkey/trunk/files/autoconfig.mk.in.diff 2009-09-13 11:08:13 UTC (rev 6291) +++ csw/mgar/pkg/seamonkey/trunk/files/autoconfig.mk.in.diff 2009-09-13 11:12:37 UTC (rev 6292) @@ -1,21 +0,0 @@ ---- seamonkey.orig/config/autoconf.mk.in 2009-09-13 10:26:24.361534256 +0200 -+++ seamonkey/config/autoconf.mk.in 2009-09-13 10:29:26.969746616 +0200 -@@ -57,14 +57,14 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = @includedir@ - libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ --idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+idldir = @datadir@/idl - --mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) -+mozappdir = $(libdir) -+mredir = $(libdir)/mre - mrelibdir = $(mredir)/lib - - DIST = $(DEPTH)/dist 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 Sep 13 15:03:44 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 13 Sep 2009 13:03:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[6293] csw/mgar/pkg/sgml-xml-common/trunk/Makefile Message-ID: Revision: 6293 http://gar.svn.sourceforge.net/gar/?rev=6293&view=rev Author: bdwalton Date: 2009-09-13 13:03:44 +0000 (Sun, 13 Sep 2009) Log Message: ----------- sgml-xml-common: more pkgfiles fiddling Modified Paths: -------------- csw/mgar/pkg/sgml-xml-common/trunk/Makefile Modified: csw/mgar/pkg/sgml-xml-common/trunk/Makefile =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/Makefile 2009-09-13 11:12:37 UTC (rev 6292) +++ csw/mgar/pkg/sgml-xml-common/trunk/Makefile 2009-09-13 13:03:44 UTC (rev 6293) @@ -24,9 +24,10 @@ CATALOGNAME_CSWsgmlcommon = sgmlcommon CATALOGNAME_CSWxmlcommon = xmlcommon -PKGFILES_CSWsgmlcommon = /opt/csw/bin/.* /opt/csw/share/doc/sgml/.* -PKGFILES_CSWsgmlcommon += /opt/csw/share/sgml/.* /etc/opt/csw/sgml/sgml.conf -PKGFILES_CSWsgmlcommon += /opt/csw/share/man/.* +PKGFILES_CSWsgmlcommon = /opt/csw/bin/.* /opt/csw/share/man/.* +PKGFILES_CSWsgmlcommon += /opt/csw/share/doc/sgml/.* /etc/opt/csw/sgml/.* +PKGFILES_CSWsgmlcommon += /opt/csw/share/sgml/sgml-iso-entities-8879.1986/.* +PKGFILES_CSWsgmlcommon += /opt/csw/share/sgml/.*soc /opt/csw/share/sgml/.*dcl PKGFILES_CSWxmlcommon = /etc/opt/csw/xml/.* /opt/csw/share/xml.* /opt/csw/share/sgml/docbook/xmlcatalog 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 Sep 13 20:16:23 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 13 Sep 2009 18:16:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6294] csw/mgar/pkg/firefox/branches Message-ID: Revision: 6294 http://gar.svn.sourceforge.net/gar/?rev=6294&view=rev Author: wbonnet Date: 2009-09-13 18:16:23 +0000 (Sun, 13 Sep 2009) Log Message: ----------- Cleanup scripts Modified Paths: -------------- csw/mgar/pkg/firefox/branches/firefox2-maintenance/files/CSWfirefox.postinstall csw/mgar/pkg/firefox/branches/firefox2-maintenance/files/CSWfirefox.postremove csw/mgar/pkg/firefox/branches/firefox3-packaging/files/CSWfirefox.postinstall csw/mgar/pkg/firefox/branches/firefox3-packaging/files/CSWfirefox.postremove csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/CSWfirefox.postinstall csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/CSWfirefox.postremove csw/mgar/pkg/firefox/branches/mwatters/files/CSWfirefox.postinstall csw/mgar/pkg/firefox/branches/mwatters/files/CSWfirefox.postremove Modified: csw/mgar/pkg/firefox/branches/firefox2-maintenance/files/CSWfirefox.postinstall =================================================================== --- csw/mgar/pkg/firefox/branches/firefox2-maintenance/files/CSWfirefox.postinstall 2009-09-13 13:03:44 UTC (rev 6293) +++ csw/mgar/pkg/firefox/branches/firefox2-maintenance/files/CSWfirefox.postinstall 2009-09-13 18:16:23 UTC (rev 6294) @@ -1,6 +1,4 @@ #!/bin/sh -# -# Blastwave.org Firefox Community Edition web browser postinstall script UNAME_P=`uname -p` UNAME_R=`uname -r` Modified: csw/mgar/pkg/firefox/branches/firefox2-maintenance/files/CSWfirefox.postremove =================================================================== --- csw/mgar/pkg/firefox/branches/firefox2-maintenance/files/CSWfirefox.postremove 2009-09-13 13:03:44 UTC (rev 6293) +++ csw/mgar/pkg/firefox/branches/firefox2-maintenance/files/CSWfirefox.postremove 2009-09-13 18:16:23 UTC (rev 6294) @@ -1,6 +1,4 @@ #!/bin/sh -# -# Blastwave.org Firefox Community Edition preremove script PLUGIN_FILE=/opt/csw/mozilla/firefox/lib/plugins/libjavaplugin_oji.so Modified: csw/mgar/pkg/firefox/branches/firefox3-packaging/files/CSWfirefox.postinstall =================================================================== --- csw/mgar/pkg/firefox/branches/firefox3-packaging/files/CSWfirefox.postinstall 2009-09-13 13:03:44 UTC (rev 6293) +++ csw/mgar/pkg/firefox/branches/firefox3-packaging/files/CSWfirefox.postinstall 2009-09-13 18:16:23 UTC (rev 6294) @@ -1,6 +1,4 @@ #!/bin/sh -# -# Blastwave.org Firefox Community Edition web browser postinstall script UNAME_P=`uname -p` UNAME_R=`uname -r` Modified: csw/mgar/pkg/firefox/branches/firefox3-packaging/files/CSWfirefox.postremove =================================================================== --- csw/mgar/pkg/firefox/branches/firefox3-packaging/files/CSWfirefox.postremove 2009-09-13 13:03:44 UTC (rev 6293) +++ csw/mgar/pkg/firefox/branches/firefox3-packaging/files/CSWfirefox.postremove 2009-09-13 18:16:23 UTC (rev 6294) @@ -1,6 +1,4 @@ #!/bin/sh -# -# Blastwave.org Firefox Community Edition preremove script PLUGIN_FILE=/opt/csw/mozilla/firefox/lib/plugins/libjavaplugin_oji.so Modified: csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/CSWfirefox.postinstall =================================================================== --- csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/CSWfirefox.postinstall 2009-09-13 13:03:44 UTC (rev 6293) +++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/CSWfirefox.postinstall 2009-09-13 18:16:23 UTC (rev 6294) @@ -1,6 +1,4 @@ #!/bin/sh -# -# Blastwave.org Firefox Community Edition web browser postinstall script UNAME_P=`uname -p` UNAME_R=`uname -r` Modified: csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/CSWfirefox.postremove =================================================================== --- csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/CSWfirefox.postremove 2009-09-13 13:03:44 UTC (rev 6293) +++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/CSWfirefox.postremove 2009-09-13 18:16:23 UTC (rev 6294) @@ -1,6 +1,4 @@ #!/bin/sh -# -# Blastwave.org Firefox Community Edition preremove script PLUGIN_FILE=/opt/csw/mozilla/firefox/lib/plugins/libjavaplugin_oji.so Modified: csw/mgar/pkg/firefox/branches/mwatters/files/CSWfirefox.postinstall =================================================================== --- csw/mgar/pkg/firefox/branches/mwatters/files/CSWfirefox.postinstall 2009-09-13 13:03:44 UTC (rev 6293) +++ csw/mgar/pkg/firefox/branches/mwatters/files/CSWfirefox.postinstall 2009-09-13 18:16:23 UTC (rev 6294) @@ -1,6 +1,4 @@ #!/bin/sh -# -# Blastwave.org Firefox Community Edition web browser postinstall script UNAME_P=`uname -p` UNAME_R=`uname -r` Modified: csw/mgar/pkg/firefox/branches/mwatters/files/CSWfirefox.postremove =================================================================== --- csw/mgar/pkg/firefox/branches/mwatters/files/CSWfirefox.postremove 2009-09-13 13:03:44 UTC (rev 6293) +++ csw/mgar/pkg/firefox/branches/mwatters/files/CSWfirefox.postremove 2009-09-13 18:16:23 UTC (rev 6294) @@ -1,6 +1,4 @@ #!/bin/sh -# -# Blastwave.org Firefox Community Edition preremove script PLUGIN_FILE=/opt/csw/mozilla/firefox/lib/plugins/libjavaplugin_oji.so 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 Sep 13 20:17:13 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 13 Sep 2009 18:17:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[6295] csw/mgar/pkg/firefox/trunk/files Message-ID: Revision: 6295 http://gar.svn.sourceforge.net/gar/?rev=6295&view=rev Author: wbonnet Date: 2009-09-13 18:17:13 +0000 (Sun, 13 Sep 2009) Log Message: ----------- Cleanup scripts Modified Paths: -------------- csw/mgar/pkg/firefox/trunk/files/CSWfirefox.postinstall csw/mgar/pkg/firefox/trunk/files/CSWfirefox.postremove Modified: csw/mgar/pkg/firefox/trunk/files/CSWfirefox.postinstall =================================================================== --- csw/mgar/pkg/firefox/trunk/files/CSWfirefox.postinstall 2009-09-13 18:16:23 UTC (rev 6294) +++ csw/mgar/pkg/firefox/trunk/files/CSWfirefox.postinstall 2009-09-13 18:17:13 UTC (rev 6295) @@ -1,6 +1,4 @@ #!/bin/sh -# -# Blastwave.org Firefox Community Edition web browser postinstall script UNAME_P=`uname -p` UNAME_R=`uname -r` Modified: csw/mgar/pkg/firefox/trunk/files/CSWfirefox.postremove =================================================================== --- csw/mgar/pkg/firefox/trunk/files/CSWfirefox.postremove 2009-09-13 18:16:23 UTC (rev 6294) +++ csw/mgar/pkg/firefox/trunk/files/CSWfirefox.postremove 2009-09-13 18:17:13 UTC (rev 6295) @@ -1,6 +1,4 @@ #!/bin/sh -# -# Blastwave.org Firefox Community Edition preremove script PLUGIN_FILE=/opt/csw/mozilla/firefox/lib/plugins/libjavaplugin_oji.so 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 Sep 13 20:27:21 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 13 Sep 2009 18:27:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[6296] csw/mgar/pkg/seamonkey/trunk Message-ID: Revision: 6296 http://gar.svn.sourceforge.net/gar/?rev=6296&view=rev Author: wbonnet Date: 2009-09-13 18:27:21 +0000 (Sun, 13 Sep 2009) Log Message: ----------- Upgrade to 1.1.18 Modified Paths: -------------- csw/mgar/pkg/seamonkey/trunk/Makefile csw/mgar/pkg/seamonkey/trunk/checksums Added Paths: ----------- csw/mgar/pkg/seamonkey/trunk/files/CSWseamonkey.postinstall csw/mgar/pkg/seamonkey/trunk/files/CSWseamonkey.postremove Modified: csw/mgar/pkg/seamonkey/trunk/Makefile =================================================================== --- csw/mgar/pkg/seamonkey/trunk/Makefile 2009-09-13 18:17:13 UTC (rev 6295) +++ csw/mgar/pkg/seamonkey/trunk/Makefile 2009-09-13 18:27:21 UTC (rev 6296) @@ -9,7 +9,7 @@ endef DISTFILES = $(GARNAME)-$(GARVERSION).source.tar.bz2 -# DISTFILES += CSWseamonkey.postremove CSWseamonkey.postinstall +DISTFILES += CSWseamonkey.postremove CSWseamonkey.postinstall # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = (\d+(?:\.\d+)*) @@ -86,7 +86,6 @@ post-extract: @mv $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/mozilla $(WORK_BUILD) -# @cp $(FILEDIR)/stdbool.h $(WORK_BUILD)/memory/jemalloc @$(MAKECOOKIE) pre-configure: @@ -95,12 +94,6 @@ pre-install: ( if [ ! -d $(WORK_INSTALL)/opt/csw/bin ] ; then mkdir -p $(WORK_INSTALL)/opt/csw/bin ; fi ) ( cd $(WORK_INSTALL)/opt/csw/bin ; rm -f seamonkey ; ln -sf ../mozilla/seamonkey/bin/seamonkey . ) -# ( mkdir -p $(WORK_INSTALL)/opt/csw/share/pixmaps ) -# ( cp $(WORK_BUILD)/other-licenses/branding/seamonkey/mozicon128.png $(WORK_INSTALL)/opt/csw/share/pixmaps/seamonkey.png ) -# ( mkdir -p $(WORK_INSTALL)/opt/csw/share/applications ) -# ( cp $(FILEDIR)/seamonkey.desktop $(WORK_INSTALL)/opt/csw/share/applications/seamonkey.desktop ) -# ( mkdir -p $(WORK_INSTALL)/opt/csw/share/gnome/mime-info ) -# ( cp $(FILEDIR)/seamonkey.keys $(WORK_INSTALL)/opt/csw/share/gnome/mime-info/seamonkey.keys ) post-install: ( gfind $(WORK_INSTALL)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}" \; ) Modified: csw/mgar/pkg/seamonkey/trunk/checksums =================================================================== --- csw/mgar/pkg/seamonkey/trunk/checksums 2009-09-13 18:17:13 UTC (rev 6295) +++ csw/mgar/pkg/seamonkey/trunk/checksums 2009-09-13 18:27:21 UTC (rev 6296) @@ -1,3 +1,10 @@ +058f97fd1a482f544e00706fa4d9b85a download/CSWseamonkey.postinstall +b7484bcb84a902a5a110758cd5ffad99 download/CSWseamonkey.postremove +23b32e46acefebe1eb21566d0336075e download/SunOS5.mk.diff +923bc1a8e0f98039c863a4f01dec9ec4 download/autoconf.mk.in.diff +e06ffefa6534521de5ed91c812a4a9c6 download/legacydb.config.mk.diff +f06035b459f608ed5032252bcaf87fb2 download/legacydb.manifest.mm.diff 3b03f00259d6897e017254e9dceed493 download/packager.mk.diff ef4455becf3a12833dca7dd92854aeaa download/seamonkey-1.1.18.source.tar.bz2 c815868b27233888ae5623967cc012f5 download/softoken.config.mk.diff +1150110fc60db3d7f5475e6906fe80c6 download/softoken.manifest.mm.diff Added: csw/mgar/pkg/seamonkey/trunk/files/CSWseamonkey.postinstall =================================================================== --- csw/mgar/pkg/seamonkey/trunk/files/CSWseamonkey.postinstall (rev 0) +++ csw/mgar/pkg/seamonkey/trunk/files/CSWseamonkey.postinstall 2009-09-13 18:27:21 UTC (rev 6296) @@ -0,0 +1,44 @@ +#!/bin/sh + +UNAME_P=`uname -p` +UNAME_R=`uname -r` + +PLUGIN_PATH=/opt/csw/mozilla/seamonkey/lib/plugins +PLUGIN_BASEFILE=libjavaplugin_oji.so +PLUGIN_DEST=$PLUGIN_PATH/$PLUGIN_BASEFILE +PLUGIN_BASE=/usr/java/jre/plugin + +# There is no need to detect the different java installed version +# This script uses default location for jre : /usr/java/jre +# This directory is linked during java installation + +# Create the link only if it does not already exist +if [ ! -f $PLUGIN_PATH/$PLUGIN_BASEFILE ]; then + # Try to use the most recent plugin version + PLUGIN_FILE="$PLUGIN_BASE/${UNAME_P}/ns7/$PLUGIN_BASEFILE" + if [ ! -f $PLUGIN_FILE ] ; then + PLUGIN_FILE="$PLUGIN_BASE/${UNAME_P}/ns610/$PLUGIN_BASEFILE" + if [ ! -f $PLUGIN_FILE ] ; then + PLUGIN_FILE="$PLUGIN_BASE/${UNAME_P}/ns600/$PLUGIN_BASEFILE" + if [ ! -f $PLUGIN_FILE ] ; then + PLUGIN_FILE="$PLUGIN_BASE/${UNAME_P}/ns4/$PLUGIN_BASEFILE" + if [ ! -f $PLUGIN_FILE ] ; then + echo "No Java plugin found." + exit 0 + fi + fi + fi + fi + + # Still here ? thus at least one of the plugin was found and var is set + echo Solaris $UNAME_R $UNAME_P + echo "Installing Java plugin..." + echo "Java plugin location:" + echo ${PLUGIN_FILE} + cd $PLUGIN_PATH && ln -s ${PLUGIN_FILE} libjavaplugin_oji.so +else + echo "Java plugin $PLUGIN_PATH/$PLUGIN_BASEFILE is already installed" + echo "The existing plugin has not been modified" +fi + +exit 0 Added: csw/mgar/pkg/seamonkey/trunk/files/CSWseamonkey.postremove =================================================================== --- csw/mgar/pkg/seamonkey/trunk/files/CSWseamonkey.postremove (rev 0) +++ csw/mgar/pkg/seamonkey/trunk/files/CSWseamonkey.postremove 2009-09-13 18:27:21 UTC (rev 6296) @@ -0,0 +1,12 @@ +#!/bin/sh + +PLUGIN_FILE=/opt/csw/mozilla/seamonkey/lib/plugins/libjavaplugin_oji.so + +if [ -f $PLUGIN_FILE ]; then + echo + echo "The java plugin has been detected in $PLUGIN_FILE" + echo "It has been installed by this package, but it may have been modified after installation" + echo "Please delete it manually if you need to remove this file definitively" + echo +fi +exit 0 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 Sep 13 21:10:36 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 13 Sep 2009 19:10:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[6297] csw/mgar/pkg/seamonkey/trunk/files/.mozconfig Message-ID: Revision: 6297 http://gar.svn.sourceforge.net/gar/?rev=6297&view=rev Author: wbonnet Date: 2009-09-13 19:10:36 +0000 (Sun, 13 Sep 2009) Log Message: ----------- Upgrade to 1.1.18 Added Paths: ----------- csw/mgar/pkg/seamonkey/trunk/files/.mozconfig Added: csw/mgar/pkg/seamonkey/trunk/files/.mozconfig =================================================================== --- csw/mgar/pkg/seamonkey/trunk/files/.mozconfig (rev 0) +++ csw/mgar/pkg/seamonkey/trunk/files/.mozconfig 2009-09-13 19:10:36 UTC (rev 6297) @@ -0,0 +1,36 @@ +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/seamonkey-opt-static +mk_add_options BUILD_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 +mk_add_options CFLAGS="-xc99=all" + +ac_add_options --enable-application=suite +ac_add_options --disable-debug +ac_add_options --disable-tests +ac_add_options --enable-xft +ac_add_options --enable-default-toolkit=gtk2 +ac_add_options --disable-auto-deps +ac_add_options --enable-optimize="-xO3" +ac_add_options --disable-updater +ac_add_options --disable-js-ultrasparc +ac_add_options --enable-extensions=default +ac_add_options --with-user-appdir=.mozilla +ac_add_options --prefix=/opt/csw/mozilla/seamonkey +ac_add_options --enable-crypto +ac_add_options --enable-canvas +ac_add_options --enable-system-cairo +ac_add_options --disable-pthreads +ac_add_options --enable-system-sqlite + +#ac_add_options --enable-xinerama + + +# ac_add_options --enable-svg +# ac_add_options --enable-svg-renderer=cairo +# ac_add_options --disable-freetype2 +# ac_add_options --enable-shared +# ac_add_options --disable-strip +# ac_add_options --enable-strip +# ac_add_options --disable-strip-libs +# ac_add_options --enable-strip-libs + + 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 Sep 13 22:39:44 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 13 Sep 2009 20:39:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[6298] csw/mgar/gar/v2-pbuild Message-ID: Revision: 6298 http://gar.svn.sourceforge.net/gar/?rev=6298&view=rev Author: dmichelsen Date: 2009-09-13 20:39:44 +0000 (Sun, 13 Sep 2009) Log Message: ----------- mGAR v2-pbuild: Fix merge rule Modified Paths: -------------- csw/mgar/gar/v2-pbuild/gar.mk csw/mgar/gar/v2-pbuild/gar.pkg.mk Modified: csw/mgar/gar/v2-pbuild/gar.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.mk 2009-09-13 19:10:36 UTC (rev 6297) +++ csw/mgar/gar/v2-pbuild/gar.mk 2009-09-13 20:39:44 UTC (rev 6298) @@ -153,22 +153,19 @@ endef define _modulate_merge -merge-$(2): $(3) -merge-$(2): BUILDHOST=$$$$(call modulation2host) +$(foreach ASSIGNMENT,$(3), +merge-$(2): $(ASSIGNMENT) +) +merge-$(2): BUILDHOST=$$(call modulation2host) merge-$(2): echo modulation: $(2) echo vars: $(3) - echo ISA: $(ISA) - echo BUILDHOST=$(BUILDHOST) - echo BUILDHOST=$(call modulation2host) - echo BUILDHOST=$$(call modulation2host) - echo BUILDHOST=$(eval $(call modulation2host)) - echo BUILDHOST=$$(eval $(call modulation2host)) - echo BUILDHOST=$$(eval $$(call modulation2host)) - echo THISHOST=$(THISHOST) - echo "Building modulation on host '$(BUILDHOST)'" - $(if $(and $(BUILDHOST),$(filter-out $(THISHOST),$(BUILDHOST))),\ - ssh $(BUILDHOST) "gmake -C $(CURDIR) MODULATION=$(2) $(3) merge-modulated",\ + echo ISA: $$(ISA) + echo BUILDHOST="$$(BUILDHOST)" + echo THISHOST="$$(THISHOST)" + echo "Building modulation on host '$$(BUILDHOST)'" + $$(if $$(and $$(BUILDHOST),$$(filter-out $$(THISHOST),$$(BUILDHOST))),\ + ssh $$(BUILDHOST) "gmake -C $$(CURDIR) MODULATION=$(2) $(3) merge-modulated",\ gmake MODULATION=$(2) $(3) merge-modulated\ ) @# The next line has intentionally been left blank to explicitly terminate this make rule Modified: csw/mgar/gar/v2-pbuild/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-09-13 19:10:36 UTC (rev 6297) +++ csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-09-13 20:39:44 UTC (rev 6298) @@ -533,6 +533,17 @@ # On a normal packaging workflow this is not used. prototypes: extract merge $(SPKG_DESTDIRS) pre-package $(foreach SPEC,$(_PKG_SPECS),$(WORKDIR)/$(SPEC).prototype-$(GARCH)) +# On these platforms packages are built. +# They will include binaries for all ISAs that are specified for the platform. +PACKAGING_PLATFORMS ?= solaris8-sparc solaris8-i386 + +# Only override for testing purposes +THIS_PLATFORM ?= solaris$(shell uname -r | sed -e 's/5.//')-$(shell uname -p) + +ifeq (,$(filter $(THIS_PLATFORM),$(PACKAGING_PLATFORMS))) + $(warn *** You are building a package on a non-requested platform ($(THIS_PLATFORM)). Requested platforms were $(PACKAGING_PLATFORMS)) +endif + # 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/. 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 Sep 13 23:39:26 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 13 Sep 2009 21:39:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[6299] csw/mgar/gar/v2-pbuild Message-ID: Revision: 6299 http://gar.svn.sourceforge.net/gar/?rev=6299&view=rev Author: dmichelsen Date: 2009-09-13 21:39:26 +0000 (Sun, 13 Sep 2009) Log Message: ----------- mGAR v2-pbuild: Add validatateplatform and platforms targets Modified Paths: -------------- csw/mgar/gar/v2-pbuild/gar.mk csw/mgar/gar/v2-pbuild/gar.pkg.mk Modified: csw/mgar/gar/v2-pbuild/gar.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.mk 2009-09-13 20:39:44 UTC (rev 6298) +++ csw/mgar/gar/v2-pbuild/gar.mk 2009-09-13 21:39:26 UTC (rev 6299) @@ -178,11 +178,9 @@ $(call _modulate_target,configure,$(2),$(4)) $(call _modulate_target_nocookie,reset-configure,$(2),$(4)) $(call _modulate_target,build,$(2),$(4)) -#$(call _modulate_build,,$(2),$(4)) $(call _modulate_target_nocookie,reset-build,$(2),$(4)) $(call _modulate_target,test,$(2),$(4)) $(call _modulate_target,install,$(2),$(4)) -#$(call _modulate_install,,$(2),$(4)) $(call _modulate_target_nocookie,reset-install,$(2),$(4)) #$(call _modulate_target,merge,$(2),$(4)) $(call _modulate_merge,,$(2),$(4)) Modified: csw/mgar/gar/v2-pbuild/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-09-13 20:39:44 UTC (rev 6298) +++ csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-09-13 21:39:26 UTC (rev 6299) @@ -537,17 +537,21 @@ # They will include binaries for all ISAs that are specified for the platform. PACKAGING_PLATFORMS ?= solaris8-sparc solaris8-i386 -# Only override for testing purposes -THIS_PLATFORM ?= solaris$(shell uname -r | sed -e 's/5.//')-$(shell uname -p) +validateplatform: + $(if $(filter $(THISHOST),$(foreach P,$(PACKAGING_PLATFORMS),$(PACKAGING_HOST_$P))),,\ + $(warning ***)\ + $(warning *** You are building this package on a non-requested platform host '$(THISHOST)'. The follow platforms were requested:)\ + $(foreach P,$(PACKAGING_PLATFORMS),\ + $(warning *** - $P $(if $(PACKAGING_HOST_$P),to be build on host '$(PACKAGING_HOST_$P)',with no suitable host available))\ + )\ + $(warning *** You can execute '$(MAKE) platforms' to automatically build on all necessary platforms.)\ + $(warning ***)\ + ) -ifeq (,$(filter $(THIS_PLATFORM),$(PACKAGING_PLATFORMS))) - $(warn *** You are building a package on a non-requested platform ($(THIS_PLATFORM)). Requested platforms were $(PACKAGING_PLATFORMS)) -endif - # 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: extract merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package +package: validateplatform extract merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package $(DONADA) # The dynamic pkginfo is only generated for dynamic gspec-files @@ -596,6 +600,19 @@ repackage: pkgreset package +# This rule automatically logs into every host where a package for this software should +# be built. It is especially suited for automated build bots. +platforms: + $(foreach P,$(PACKAGING_PLATFORMS),\ + $(if $(PACKAGING_HOST_$P),\ + $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ + $(MAKE) package;,\ + ssh $(PACKAGING_HOST_$P) "$(MAKE) -C $(CURDIR) package";\ + ),\ + $(error *** No host has been defined for platform $P)\ + )\ + ) + # dependb - update the dependency database # dependb: 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 Sep 14 03:08:22 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 14 Sep 2009 01:08:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[6300] csw/mgar/pkg/docbook-dtds/trunk Message-ID: Revision: 6300 http://gar.svn.sourceforge.net/gar/?rev=6300&view=rev Author: bdwalton Date: 2009-09-14 01:08:22 +0000 (Mon, 14 Sep 2009) Log Message: ----------- docbook-dtds: correct makefile patch Modified Paths: -------------- csw/mgar/pkg/docbook-dtds/trunk/checksums csw/mgar/pkg/docbook-dtds/trunk/files/add_makefile.patch Modified: csw/mgar/pkg/docbook-dtds/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/checksums 2009-09-13 21:39:26 UTC (rev 6299) +++ csw/mgar/pkg/docbook-dtds/trunk/checksums 2009-09-14 01:08:22 UTC (rev 6300) @@ -1,6 +1,6 @@ -e7ba1cae44ae889b32c326f0a46f2c81 download/CSWdocbookdtds.postinstall +c4074456da444839aa6010c8721a56da download/CSWdocbookdtds.postinstall da4b8f64c222276d2c291bf8afb20517 download/CSWdocbookdtds.preremove -9b4a512082ff0851ad3d705072dd5523 download/add_makefile.patch +39e1c752fddfed4f89c8276c42ec95d4 download/add_makefile.patch 9a7f5b1b7dd52d0ca4fb080619f0459c download/docbk30.zip 432749c0c806dbae81c8bcb70da3b5d3 download/docbk31.zip fabcf7dd1d88b94797b7e5344389eab9 download/docbk40.zip Modified: csw/mgar/pkg/docbook-dtds/trunk/files/add_makefile.patch =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/add_makefile.patch 2009-09-13 21:39:26 UTC (rev 6299) +++ csw/mgar/pkg/docbook-dtds/trunk/files/add_makefile.patch 2009-09-14 01:08:22 UTC (rev 6300) @@ -19,8 +19,8 @@ +SGMLTARG = $(patsubst %,inst-%,$(SGML)) +XMLTARG = $(patsubst %,inst-%,$(XML)) + -+CUR_SGML = $(lastword $(sort $(subst -sgml,,$(SGMLTARG)))) -+CUR_XML = $(lastword $(sort $(subst -xml,,$(XMLTARG)))) ++CUR_SGML = $(lastword $(sort $(subst -sgml,,$(SGML)))) ++CUR_XML = $(lastword $(sort $(subst -xml,,$(XML)))) + +.PHONY: $(SGML) $(XMLT) + 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 Sep 14 03:08:45 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 14 Sep 2009 01:08:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[6301] csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds .postinstall Message-ID: Revision: 6301 http://gar.svn.sourceforge.net/gar/?rev=6301&view=rev Author: bdwalton Date: 2009-09-14 01:08:45 +0000 (Mon, 14 Sep 2009) Log Message: ----------- docbook-dtds: strip out remaining docbook 5 stuff Modified Paths: -------------- csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall Modified: csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall 2009-09-14 01:08:22 UTC (rev 6300) +++ csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall 2009-09-14 01:08:45 UTC (rev 6301) @@ -122,14 +122,6 @@ $CSWSGMLCNF/xml-docbook-4.5.cat \ $CSWSGML/docbook/xml-dtd-4.5/catalog -# DocBook 5.0 -$PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/xml-docbook-5.0.cat \ - $CSWSGML/sgml-iso-entities-8879.1986/catalog -$PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/xml-docbook-5.0.cat \ - $CSWSGML/docbook/xml-schemas-5.0/catalog - # Fix up SGML super catalog so that there isn't an XML DTD before an # SGML one. We need to do this (*sigh*) because xmlcatalog messes up # the order of the lines, and SGML tools don't like to see XML things 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 Sep 14 07:45:50 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 14 Sep 2009 05:45:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6302] csw/mgar/pkg/seamonkey/trunk Message-ID: Revision: 6302 http://gar.svn.sourceforge.net/gar/?rev=6302&view=rev Author: wbonnet Date: 2009-09-14 05:45:50 +0000 (Mon, 14 Sep 2009) Log Message: ----------- Upgrade to 1.1.8 Modified Paths: -------------- csw/mgar/pkg/seamonkey/trunk/Makefile csw/mgar/pkg/seamonkey/trunk/checksums Added Paths: ----------- csw/mgar/pkg/seamonkey/trunk/files/lber-int.h.diff csw/mgar/pkg/seamonkey/trunk/files/ldap-int.h.diff csw/mgar/pkg/seamonkey/trunk/files/ldappr-int.h.diff Modified: csw/mgar/pkg/seamonkey/trunk/Makefile =================================================================== --- csw/mgar/pkg/seamonkey/trunk/Makefile 2009-09-14 01:08:45 UTC (rev 6301) +++ csw/mgar/pkg/seamonkey/trunk/Makefile 2009-09-14 05:45:50 UTC (rev 6302) @@ -54,6 +54,9 @@ PATCHFILES += softoken.manifest.mm.diff PATCHFILES += softoken.config.mk.diff PATCHFILES += packager.mk.diff +PATCHFILES += lber-int.h.diff +PATCHFILES += ldap-int.h.diff +PATCHFILES += ldappr-int.h.diff # PATCHFILES += configure.diff Modified: csw/mgar/pkg/seamonkey/trunk/checksums =================================================================== --- csw/mgar/pkg/seamonkey/trunk/checksums 2009-09-14 01:08:45 UTC (rev 6301) +++ csw/mgar/pkg/seamonkey/trunk/checksums 2009-09-14 05:45:50 UTC (rev 6302) @@ -2,6 +2,9 @@ b7484bcb84a902a5a110758cd5ffad99 download/CSWseamonkey.postremove 23b32e46acefebe1eb21566d0336075e download/SunOS5.mk.diff 923bc1a8e0f98039c863a4f01dec9ec4 download/autoconf.mk.in.diff +46527aded9c373b6095fea546d4d74f0 download/lber-int.h.diff +46ef334e67dab2301b53b661494f9d58 download/ldap-int.h.diff +e7054c1d1d6dc708805a6110ccfa7f70 download/ldappr-int.h.diff e06ffefa6534521de5ed91c812a4a9c6 download/legacydb.config.mk.diff f06035b459f608ed5032252bcaf87fb2 download/legacydb.manifest.mm.diff 3b03f00259d6897e017254e9dceed493 download/packager.mk.diff Added: csw/mgar/pkg/seamonkey/trunk/files/lber-int.h.diff =================================================================== --- csw/mgar/pkg/seamonkey/trunk/files/lber-int.h.diff (rev 0) +++ csw/mgar/pkg/seamonkey/trunk/files/lber-int.h.diff 2009-09-14 05:45:50 UTC (rev 6302) @@ -0,0 +1,12 @@ +diff --speed-large-files --minimal -Nru thunderbird.orig/directory/c-sdk/ldap/libraries/liblber/lber-int.h thunderbird/directory/c-sdk/ldap/libraries/liblber/lber-int.h +--- thunderbird.orig/directory/c-sdk/ldap/libraries/liblber/lber-int.h 2009-05-27 09:58:02.216472168 +0200 ++++ thunderbird/directory/c-sdk/ldap/libraries/liblber/lber-int.h 2009-05-27 09:58:25.484409572 +0200 +@@ -107,7 +107,7 @@ + #define stderr NULL + #endif + +-#include "lber.h" ++#include "../../include/lber.h" + + #ifdef macintosh + #define NSLDAPI_LBER_SOCKET_IS_PTR Added: csw/mgar/pkg/seamonkey/trunk/files/ldap-int.h.diff =================================================================== --- csw/mgar/pkg/seamonkey/trunk/files/ldap-int.h.diff (rev 0) +++ csw/mgar/pkg/seamonkey/trunk/files/ldap-int.h.diff 2009-09-14 05:45:50 UTC (rev 6302) @@ -0,0 +1,18 @@ +diff --speed-large-files --minimal -Nru thunderbird.orig/directory/c-sdk/ldap/libraries/libldap/ldap-int.h thunderbird/directory/c-sdk/ldap/libraries/libldap/ldap-int.h +--- thunderbird.orig/directory/c-sdk/ldap/libraries/libldap/ldap-int.h 2009-05-27 09:59:24.939222864 +0200 ++++ thunderbird/directory/c-sdk/ldap/libraries/libldap/ldap-int.h 2009-05-27 10:00:08.738847653 +0200 +@@ -82,10 +82,10 @@ + #include "../liblber/lber-int.h" + #endif /* macintosh */ + +-#include "ldap.h" +-#include "ldaprot.h" +-#include "ldaplog.h" +-#include "portable.h" ++#include "../../include/ldap.h" ++#include "../../include/ldaprot.h" ++#include "../../include/ldaplog.h" ++#include "../../include/portable.h" + + #ifdef LDAP_ASYNC_IO + #ifdef NEED_FILIO Added: csw/mgar/pkg/seamonkey/trunk/files/ldappr-int.h.diff =================================================================== --- csw/mgar/pkg/seamonkey/trunk/files/ldappr-int.h.diff (rev 0) +++ csw/mgar/pkg/seamonkey/trunk/files/ldappr-int.h.diff 2009-09-14 05:45:50 UTC (rev 6302) @@ -0,0 +1,15 @@ +diff --speed-large-files --minimal -Nru thunderbird.orig/directory/c-sdk/ldap/libraries/libprldap/ldappr-int.h thunderbird/directory/c-sdk/ldap/libraries/libprldap/ldappr-int.h +--- thunderbird.orig/directory/c-sdk/ldap/libraries/libprldap/ldappr-int.h 2009-05-27 10:01:14.924882377 +0200 ++++ thunderbird/directory/c-sdk/ldap/libraries/libprldap/ldappr-int.h 2009-05-27 10:02:26.014267148 +0200 +@@ -41,9 +41,9 @@ + * + */ + +-#include "ldap.h" ++#include "../../include/ldap.h" + #include "nspr.h" +-#include "ldappr.h" ++#include "../../include/ldappr.h" + + #include + #include 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 Sep 14 10:26:35 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 14 Sep 2009 08:26:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[6303] csw/mgar/pkg/neon/trunk Message-ID: Revision: 6303 http://gar.svn.sourceforge.net/gar/?rev=6303&view=rev Author: dmichelsen Date: 2009-09-14 08:26:35 +0000 (Mon, 14 Sep 2009) Log Message: ----------- neon: Update to 0.29.0 and move docs to devel-package Modified Paths: -------------- csw/mgar/pkg/neon/trunk/Makefile csw/mgar/pkg/neon/trunk/checksums Modified: csw/mgar/pkg/neon/trunk/Makefile =================================================================== --- csw/mgar/pkg/neon/trunk/Makefile 2009-09-14 05:45:50 UTC (rev 6302) +++ csw/mgar/pkg/neon/trunk/Makefile 2009-09-14 08:26:35 UTC (rev 6303) @@ -1,9 +1,9 @@ GARNAME = neon -GARVERSION = 0.28.6 +GARVERSION = 0.29.0 CATEGORIES = lib EXTRA_MODULATORS = GARVERSION -MODULATIONS_GARVERSION = 0.26.4 0.28.6 +MODULATIONS_GARVERSION = 0.26.4 0.29.0 DESCRIPTION = Neon HTTP and WebDAV client library define BLURB @@ -51,20 +51,21 @@ MERGE_SCRIPTS_isa-amd64-garversion-0.26.4 = copy-relocated-only MERGE_DIRS_isa-amd64-garversion-0.26.4 = $(libdir) -MERGE_SCRIPTS_isa-i386-garversion-0.28.6 = copy-all -MERGE_SCRIPTS_isa-amd64-garversion-0.28.6 = copy-relocated-only -MERGE_DIRS_isa-amd64-garversion-0.28.6 = $(bindir) $(sbindir) $(libexecdir) $(libdir) +MERGE_SCRIPTS_isa-i386-garversion-0.29.0 = copy-all +MERGE_SCRIPTS_isa-amd64-garversion-0.29.0 = copy-relocated-only +MERGE_DIRS_isa-amd64-garversion-0.29.0 = $(bindir) $(sbindir) $(libexecdir) $(libdir) MERGE_SCRIPTS_isa-sparcv8-garversion-0.26.4 = copy-only MERGE_DIRS_isa-sparcv8-garversion-0.26.4 = $(libdir) MERGE_SCRIPTS_isa-sparcv9-garversion-0.26.4 = copy-relocated-only MERGE_DIRS_isa-sparcv9-garversion-0.26.4 = $(libdir) -MERGE_SCRIPTS_isa-sparcv8-garversion-0.28.6 = copy-all -MERGE_SCRIPTS_isa-sparcv9-garversion-0.28.6 = copy-relocated-only -MERGE_DIRS_isa-sparcv9-garversion-0.28.6 = $(bindir) $(sbindir) $(libexecdir) $(libdir) +MERGE_SCRIPTS_isa-sparcv8-garversion-0.29.0 = copy-all +MERGE_SCRIPTS_isa-sparcv9-garversion-0.29.0 = copy-relocated-only +MERGE_DIRS_isa-sparcv9-garversion-0.29.0 = $(bindir) $(sbindir) $(libexecdir) $(libdir) PKGFILES_CSWneon-devel = $(PKGFILES_DEVEL) +PKGFILES_CSWneon-devel += $(docdir)/.* EXTRA_LINKER_FLAGS = -lintl Modified: csw/mgar/pkg/neon/trunk/checksums =================================================================== --- csw/mgar/pkg/neon/trunk/checksums 2009-09-14 05:45:50 UTC (rev 6302) +++ csw/mgar/pkg/neon/trunk/checksums 2009-09-14 08:26:35 UTC (rev 6303) @@ -1,3 +1,4 @@ 4ef5552e8930ef82b1f56c2712f8ed1e download/COPYING 2d11fff51ffa856fc6b5d4bd801d6cc4 download/neon-0.26.4.tar.gz 252578ed555552b71d15909641484951 download/neon-0.28.6.tar.gz +18a3764b70f9317f8b61509fd90d9e7a download/neon-0.29.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Sep 14 17:32:28 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 14 Sep 2009 15:32:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[6304] csw/mgar/pkg/cups/branches/cups-1.4 Message-ID: Revision: 6304 http://gar.svn.sourceforge.net/gar/?rev=6304&view=rev Author: wahwah Date: 2009-09-14 15:32:28 +0000 (Mon, 14 Sep 2009) Log Message: ----------- cups: Experimental patches with reference counts. Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4/Makefile csw/mgar/pkg/cups/branches/cups-1.4/checksums Added Paths: ----------- csw/mgar/pkg/cups/branches/cups-1.4/files/0001-cswcups-for-service-name.patch csw/mgar/pkg/cups/branches/cups-1.4/files/0002-Adding-the-refcount-member-to-mime_type_t.patch csw/mgar/pkg/cups/branches/cups-1.4/files/0003-Reference-counting-for-printers-only.patch Removed Paths: ------------- csw/mgar/pkg/cups/branches/cups-1.4/files/0001-Makefile.patch Modified: csw/mgar/pkg/cups/branches/cups-1.4/Makefile =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-14 08:26:35 UTC (rev 6303) +++ csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-14 15:32:28 UTC (rev 6304) @@ -25,7 +25,9 @@ FULL_MIRRORS = $(foreach S,$(CUPS_MIRRORS),$(S)/$(GARNAME)/$(GARVERSION)/) MASTER_SITES += $(FULL_MIRRORS) -PATCHFILES = 0001-Makefile.patch +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 DISTFILES = cups-$(GARVERSION)-source.tar.bz2 $(PATCHFILES) DISTFILES += CSWcupsclient.preinstall DISTFILES += CSWcupsd.preinstall Modified: csw/mgar/pkg/cups/branches/cups-1.4/checksums =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-09-14 08:26:35 UTC (rev 6303) +++ csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-09-14 15:32:28 UTC (rev 6304) @@ -1,4 +1,6 @@ -682e10ff0ab0e094c3de2061369038bc download/0001-Makefile.patch +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 8418cf872043eada2d46c8db6e6451c0 download/CSWcupsclient.preinstall ca7718998e56c320c08a77cfefe046f6 download/CSWcupsd.postremove 8418cf872043eada2d46c8db6e6451c0 download/CSWcupsd.preinstall Deleted: csw/mgar/pkg/cups/branches/cups-1.4/files/0001-Makefile.patch =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/0001-Makefile.patch 2009-09-14 08:26:35 UTC (rev 6303) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/0001-Makefile.patch 2009-09-14 15:32:28 UTC (rev 6304) @@ -1,72 +0,0 @@ -From 77ba01db2d7f7b8585bb05bb8652aedf09860bd5 Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Sat, 5 Sep 2009 03:31:57 +0200 -Subject: [PATCH] Makefile - ---- - Makefile | 12 ++++++------ - locale/Makefile | 3 ++- - 2 files changed, 8 insertions(+), 7 deletions(-) - -diff --git a/Makefile b/Makefile -index 91be6e5..a1ff6f8 100644 ---- a/Makefile -+++ b/Makefile -@@ -178,18 +178,18 @@ install-data: - if test "x$(INITDIR)" != x; then \ - echo Installing init scripts...; \ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \ -- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \ -+ $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cswcups; \ - for level in $(RCLEVELS); do \ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \ -- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups; \ -+ $(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups; \ - if test `uname` = HP-UX; then \ - level=`expr $$level - 1`; \ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \ - fi; \ -- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups; \ -+ $(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups; \ - done; \ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \ -- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \ -+ $(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \ - fi - if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \ - $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \ -@@ -227,7 +227,7 @@ install-data: - $(INSTALL_DATA) init/cups-lpd $(BUILDROOT)$(XINETD)/cups-lpd; \ - fi - if test "x$(MENUDIR)" != x; then \ -- echo Installing desktop menu...; \ -+ echo Installing desktop menu into $(BUILDROOT)$(MENUDIR)...; \ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(MENUDIR); \ - $(INSTALL_DATA) desktop/cups.desktop $(BUILDROOT)$(MENUDIR); \ - fi -@@ -290,7 +290,7 @@ uninstall: - -$(RMDIR) $(BINDIR) - echo Uninstalling startup script... - if test "x$(INITDIR)" != x; then \ -- $(RM) $(BUILDROOT)$(INITDIR)/init.d/cups; \ -+ $(RM) $(BUILDROOT)$(INITDIR)/init.d/cswcups; \ - $(RMDIR) $(BUILDROOT)$(INITDIR)/init.d; \ - $(RM) $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \ - $(RMDIR) $(BUILDROOT)$(INITDIR)/rc0.d; \ -diff --git a/locale/Makefile b/locale/Makefile -index 6241b66..f76b8bc 100644 ---- a/locale/Makefile -+++ b/locale/Makefile -@@ -75,7 +75,8 @@ install-languages: - for loc in $(LANGUAGES) ; do \ - if test -f cups_$$loc.po; then \ - $(INSTALL_DIR) -m 755 $(LOCALEDIR)/$$loc ; \ -- $(INSTALL_DATA) cups_$$loc.po $(LOCALEDIR)/$$loc/cups_$$loc.po ; \ -+ $(INSTALL_DIR) -m 755 $(LOCALEDIR)/$$loc/LC_MESSAGES ; \ -+ $(INSTALL_DATA) cups_$$loc.po $(LOCALEDIR)/$$loc/LC_MESSAGES/cups_$$loc.po ; \ - fi ; \ - done - --- -1.6.3.2 - Added: csw/mgar/pkg/cups/branches/cups-1.4/files/0001-cswcups-for-service-name.patch =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/0001-cswcups-for-service-name.patch (rev 0) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/0001-cswcups-for-service-name.patch 2009-09-14 15:32:28 UTC (rev 6304) @@ -0,0 +1,72 @@ +From 7ef5a09e7257782a5f8b4d9bcf681a399ef82996 Mon Sep 17 00:00:00 2001 +From: Super-User +Date: Wed, 9 Sep 2009 16:41:17 +0100 +Subject: [PATCH 1/3] cswcups for service name + +--- + Makefile | 12 ++++++------ + locale/Makefile | 3 ++- + 2 files changed, 8 insertions(+), 7 deletions(-) + +diff --git a/Makefile b/Makefile +index 91be6e5..a1ff6f8 100644 +--- a/Makefile ++++ b/Makefile +@@ -178,18 +178,18 @@ install-data: + if test "x$(INITDIR)" != x; then \ + echo Installing init scripts...; \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \ +- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \ ++ $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cswcups; \ + for level in $(RCLEVELS); do \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \ +- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups; \ ++ $(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups; \ + if test `uname` = HP-UX; then \ + level=`expr $$level - 1`; \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \ + fi; \ +- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups; \ ++ $(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups; \ + done; \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \ +- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \ ++ $(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \ + fi + if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \ + $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \ +@@ -227,7 +227,7 @@ install-data: + $(INSTALL_DATA) init/cups-lpd $(BUILDROOT)$(XINETD)/cups-lpd; \ + fi + if test "x$(MENUDIR)" != x; then \ +- echo Installing desktop menu...; \ ++ echo Installing desktop menu into $(BUILDROOT)$(MENUDIR)...; \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(MENUDIR); \ + $(INSTALL_DATA) desktop/cups.desktop $(BUILDROOT)$(MENUDIR); \ + fi +@@ -290,7 +290,7 @@ uninstall: + -$(RMDIR) $(BINDIR) + echo Uninstalling startup script... + if test "x$(INITDIR)" != x; then \ +- $(RM) $(BUILDROOT)$(INITDIR)/init.d/cups; \ ++ $(RM) $(BUILDROOT)$(INITDIR)/init.d/cswcups; \ + $(RMDIR) $(BUILDROOT)$(INITDIR)/init.d; \ + $(RM) $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \ + $(RMDIR) $(BUILDROOT)$(INITDIR)/rc0.d; \ +diff --git a/locale/Makefile b/locale/Makefile +index 6241b66..f76b8bc 100644 +--- a/locale/Makefile ++++ b/locale/Makefile +@@ -75,7 +75,8 @@ install-languages: + for loc in $(LANGUAGES) ; do \ + if test -f cups_$$loc.po; then \ + $(INSTALL_DIR) -m 755 $(LOCALEDIR)/$$loc ; \ +- $(INSTALL_DATA) cups_$$loc.po $(LOCALEDIR)/$$loc/cups_$$loc.po ; \ ++ $(INSTALL_DIR) -m 755 $(LOCALEDIR)/$$loc/LC_MESSAGES ; \ ++ $(INSTALL_DATA) cups_$$loc.po $(LOCALEDIR)/$$loc/LC_MESSAGES/cups_$$loc.po ; \ + fi ; \ + done + +-- +1.6.3.2 + Added: csw/mgar/pkg/cups/branches/cups-1.4/files/0002-Adding-the-refcount-member-to-mime_type_t.patch =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/0002-Adding-the-refcount-member-to-mime_type_t.patch (rev 0) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/0002-Adding-the-refcount-member-to-mime_type_t.patch 2009-09-14 15:32:28 UTC (rev 6304) @@ -0,0 +1,24 @@ +From ee9340922a5a998e05b2ec123233f2bbf57a84a3 Mon Sep 17 00:00:00 2001 +From: Super-User +Date: Wed, 9 Sep 2009 19:33:00 +0100 +Subject: [PATCH 2/3] Adding the refcount member to mime_type_t + +--- + scheduler/mime.h | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/scheduler/mime.h b/scheduler/mime.h +index 0194964..4bd64c2 100644 +--- a/scheduler/mime.h ++++ b/scheduler/mime.h +@@ -85,6 +85,7 @@ typedef struct _mime_magic_s /**** MIME Magic Data ****/ + + typedef struct _mime_type_s /**** MIME Type Data ****/ + { ++ int refcount; /* To allow sharing of this struct */ + mime_magic_t *rules; /* Rules used to detect this type */ + int priority; /* Priority of this type */ + char super[MIME_MAX_SUPER], /* Super-type name ("image", "application", etc.) */ +-- +1.6.3.2 + Added: csw/mgar/pkg/cups/branches/cups-1.4/files/0003-Reference-counting-for-printers-only.patch =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/0003-Reference-counting-for-printers-only.patch (rev 0) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/0003-Reference-counting-for-printers-only.patch 2009-09-14 15:32:28 UTC (rev 6304) @@ -0,0 +1,56 @@ +From b22d9f6339a2d367dd5493f8fb0e06041b26d80a Mon Sep 17 00:00:00 2001 +From: Super-User +Date: Wed, 9 Sep 2009 19:52:18 +0100 +Subject: [PATCH 3/3] Reference counting for printers only. + +--- + scheduler/mime.c | 7 +++++++ + scheduler/printers.c | 1 + + scheduler/type.c | 1 + + 3 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/scheduler/mime.c b/scheduler/mime.c +index 890f2ea..1cabf64 100644 +--- a/scheduler/mime.c ++++ b/scheduler/mime.c +@@ -156,6 +156,13 @@ mimeDeleteType(mime_t *mime, /* I - MIME database */ + if (!mime || !mt) + return; + ++ mt->refcount--; ++ if (mt->refcount) { ++ /* ++ * Other references to this instance exist, not removing. ++ */ ++ return; ++ } + cupsArrayRemove(mime->types, mt); + + delete_rules(mt->rules); +diff --git a/scheduler/printers.c b/scheduler/printers.c +index 1430946..629b86d 100644 +--- a/scheduler/printers.c ++++ b/scheduler/printers.c +@@ -127,6 +127,7 @@ cupsdAddPrinter(const char *name) /* I - Name of printer */ + p->accepting = 0; + p->shared = DefaultShared; + p->filetype = mimeAddType(MimeDatabase, "printer", name); ++ p->filetype->refcount++; + + cupsdSetString(&p->job_sheets[0], "none"); + cupsdSetString(&p->job_sheets[1], "none"); +diff --git a/scheduler/type.c b/scheduler/type.c +index 6443506..faf4381 100644 +--- a/scheduler/type.c ++++ b/scheduler/type.c +@@ -124,6 +124,7 @@ mimeAddType(mime_t *mime, /* I - MIME database */ + strlen(type) + 1)) == NULL) + return (NULL); + ++ temp->refcount = 0; /* Callers are responsible for incrementing the counter */ + strlcpy(temp->super, super, sizeof(temp->super)); + strcpy(temp->type, type); /* Safe: temp->type is allocated */ + temp->priority = 100; +-- +1.6.3.2 + 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 Sep 14 18:18:37 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 14 Sep 2009 16:18:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[6305] csw/mgar/pkg/seamonkey/Makefile Message-ID: Revision: 6305 http://gar.svn.sourceforge.net/gar/?rev=6305&view=rev Author: wbonnet Date: 2009-09-14 16:18:37 +0000 (Mon, 14 Sep 2009) Log Message: ----------- Add missing Makefile Added Paths: ----------- csw/mgar/pkg/seamonkey/Makefile Added: csw/mgar/pkg/seamonkey/Makefile =================================================================== --- csw/mgar/pkg/seamonkey/Makefile (rev 0) +++ csw/mgar/pkg/seamonkey/Makefile 2009-09-14 16:18:37 UTC (rev 6305) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -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 bdwalton at users.sourceforge.net Mon Sep 14 19:15:48 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 14 Sep 2009 17:15:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[6306] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 6306 http://gar.svn.sourceforge.net/gar/?rev=6306&view=rev Author: bdwalton Date: 2009-09-14 17:15:48 +0000 (Mon, 14 Sep 2009) Log Message: ----------- git: bump to 1.6.4.3 Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-09-14 16:18:37 UTC (rev 6305) +++ csw/mgar/pkg/git/trunk/Makefile 2009-09-14 17:15:48 UTC (rev 6306) @@ -1,5 +1,5 @@ GARNAME = git -GARVERSION = 1.6.4.2 +GARVERSION = 1.6.4.3 #xPATCHLEVEL = rc3 CATEGORIES = devel 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 Sep 14 21:29:36 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 14 Sep 2009 19:29:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[6307] csw/mgar/pkg/cups/branches/cups-1.4/Makefile Message-ID: Revision: 6307 http://gar.svn.sourceforge.net/gar/?rev=6307&view=rev Author: wahwah Date: 2009-09-14 19:29:36 +0000 (Mon, 14 Sep 2009) Log Message: ----------- cups: Rewritten man1m PKGFILES, removed duplicate manpages between cupsd and cupsclient Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4/Makefile Modified: csw/mgar/pkg/cups/branches/cups-1.4/Makefile =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-14 17:15:48 UTC (rev 6306) +++ csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-14 19:29:36 UTC (rev 6307) @@ -107,10 +107,10 @@ PKGFILES_CSWcupsclient += $(mandir)/man1/(lpoptions|lppasswd|lpq|lpr|lprm).1 PKGFILES_CSWcupsclient += $(mandir)/man1/lpstat.1 PKGFILES_CSWcupsclient += $(mandir)/man1/ppd.*\.1 -PKGFILES_CSWcupsclient += $(mandir)/man1m/cups.*\.1m -PKGFILES_CSWcupsclient += $(mandir)/man1m/(accept|cupsaddsmb|cupsctl).1m -PKGFILES_CSWcupsclient += $(mandir)/man1m/(cups(en|dis)able).1m -PKGFILES_CSWcupsclient += $(mandir)/man1m/(lpadmin|lpc|lpinfo|lpmove|reject).1m +PKGFILES_CSWcupsclient += $(mandir)/man1m/(cups|)(accept|reject)\.1m +PKGFILES_CSWcupsclient += $(mandir)/man1m/cups(en|dis)able\.1m +PKGFILES_CSWcupsclient += $(mandir)/man1m/cups(addsmb|ctl)\.1m +PKGFILES_CSWcupsclient += $(mandir)/man1m/lp(admin|c|info|move)\.1m PKGFILES_CSWcupsclient += $(mandir)/man5/client.conf.5 PKGFILES_CSWcupsclient += $(mandir)/man5/ppdcfile\.5 PKGFILES_CSWcupsclient += $(mandir)/man7/(drv|notifier)\.7 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Sep 15 00:14:08 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 14 Sep 2009 22:14:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[6308] csw/mgar/pkg/xfce/xfconf/trunk Message-ID: Revision: 6308 http://gar.svn.sourceforge.net/gar/?rev=6308&view=rev Author: wbonnet Date: 2009-09-14 22:14:08 +0000 (Mon, 14 Sep 2009) Log Message: ----------- Upgrade to 4.6.1 Modified Paths: -------------- csw/mgar/pkg/xfce/xfconf/trunk/checksums csw/mgar/pkg/xfce/xfconf/trunk/files/xfconf-gvaluefuncs.h.diff Modified: csw/mgar/pkg/xfce/xfconf/trunk/checksums =================================================================== --- csw/mgar/pkg/xfce/xfconf/trunk/checksums 2009-09-14 19:29:36 UTC (rev 6307) +++ csw/mgar/pkg/xfce/xfconf/trunk/checksums 2009-09-14 22:14:08 UTC (rev 6308) @@ -1,4 +1,4 @@ 3e43af7de9f725ed3057021862ae9899 download/Makefile.PL.in.diff a711dd1aba91d78b5a5d84e57edaa5df download/xf-conf-locking-utils.h.diff d4d3018767ea9eb4b57cc57d4038023b download/xfconf-4.6.1.tar.bz2 -bc8e1b6b529591ed0b0f0410734cee24 download/xfconf-gvaluefuncs.h.diff +dedc7f77147cc0de1919290c97032e8e download/xfconf-gvaluefuncs.h.diff Modified: csw/mgar/pkg/xfce/xfconf/trunk/files/xfconf-gvaluefuncs.h.diff =================================================================== --- csw/mgar/pkg/xfce/xfconf/trunk/files/xfconf-gvaluefuncs.h.diff 2009-09-14 19:29:36 UTC (rev 6307) +++ csw/mgar/pkg/xfce/xfconf/trunk/files/xfconf-gvaluefuncs.h.diff 2009-09-14 22:14:08 UTC (rev 6308) @@ -13,7 +13,7 @@ -gboolean _xfconf_gvalue_from_string(GValue *value, - const gchar *str) G_GNUC_INTERNAL; +G_GNUC_INTERNAL gboolean _xfconf_gvalue_from_string(GValue *value, -+ const gchar *str); ++ const gchar *str); -gchar *_xfconf_string_from_gvalue(GValue *value) G_GNUC_INTERNAL; +G_GNUC_INTERNAL gchar *_xfconf_string_from_gvalue(GValue *value); @@ -21,7 +21,7 @@ -gboolean _xfconf_gvalue_is_equal(const GValue *value1, - const GValue *value2) G_GNUC_INTERNAL; +G_GNUC_INTERNAL gboolean _xfconf_gvalue_is_equal(const GValue *value1, -+ const GValue *value2); ++ const GValue *value2); -void _xfconf_gvalue_free(GValue *value) G_GNUC_INTERNAL; +G_GNUC_INTERNAL void _xfconf_gvalue_free(GValue *value); 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 Sep 15 12:19:44 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 15 Sep 2009 10:19:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[6309] csw/mgar/pkg/wxwidgets/trunk/Makefile Message-ID: Revision: 6309 http://gar.svn.sourceforge.net/gar/?rev=6309&view=rev Author: wahwah Date: 2009-09-15 10:19:44 +0000 (Tue, 15 Sep 2009) Log Message: ----------- wxwidgets: Enabling built-in regex support, pgadmin3 seems to need it Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-09-14 22:14:08 UTC (rev 6308) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2009-09-15 10:19:44 UTC (rev 6309) @@ -70,7 +70,7 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-gtk=2 CONFIGURE_ARGS += --with-gtk-prefix=/opt/csw -CONFIGURE_ARGS += --without-regex +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 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 Sep 15 19:59:39 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 15 Sep 2009 17:59:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[6310] csw/mgar/pkg/xmlto/trunk Message-ID: Revision: 6310 http://gar.svn.sourceforge.net/gar/?rev=6310&view=rev Author: bdwalton Date: 2009-09-15 17:59:39 +0000 (Tue, 15 Sep 2009) Log Message: ----------- xmlto: update bash handling patch, autoconf tail and gcp selection Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile csw/mgar/pkg/xmlto/trunk/checksums Added Paths: ----------- csw/mgar/pkg/xmlto/trunk/files/0001-add-support-for-selection-of-posix-tail-binary.patch csw/mgar/pkg/xmlto/trunk/files/0002-add-handling-so-that-gnu-cp-can-be-specified.patch csw/mgar/pkg/xmlto/trunk/files/0003-do-no-hardcode-bin-bash-to-override-env-check.patch Removed Paths: ------------- csw/mgar/pkg/xmlto/trunk/files/no-hardcode-bash.patch Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-15 10:19:44 UTC (rev 6309) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-15 17:59:39 UTC (rev 6310) @@ -3,7 +3,7 @@ CATEGORIES = utils PREREQUISITE_PKGS += CSWmktemp CSWfindutils CSWdocbookxsl CSWlibxslt -PREREQUISITE_PKGS += CSWflex CSWggetopt CSWgnulinks +PREREQUISITE_PKGS += CSWflex CSWggetopt REQUIRED_PKGS = CSWsgmlcommon CSWxmlcommon CSWlibxml2 CSWdocbookdtds REQUIRED_PKGS += CSWdocbookxsl CSWlibxslt CSWflex CSWw3m CSWmktemp @@ -19,7 +19,9 @@ MASTER_SITES = https://fedorahosted.org/releases/x/m/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -PATCHFILES = no-hardcode-bash.patch +PATCHFILES += 0001-add-support-for-selection-of-posix-tail-binary.patch +PATCHFILES += 0002-add-handling-so-that-gnu-cp-can-be-specified.patch +PATCHFILES += 0003-do-no-hardcode-bin-bash-to-override-env-check.patch TEST_TARGET = check @@ -36,18 +38,17 @@ @$(MAKECOOKIE) CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += BASH=/opt/csw/bin/bash CONFIGURE_ARGS += GETOPT=/opt/csw/bin/ggetopt -CONFIGURE_ARGS += BASH=/opt/csw/bin/bash CONFIGURE_ARGS += FIND=/opt/csw/bin/gfind +CONFIGURE_ARGS += TAIL=/usr/xpg4/bin/tail +CONFIGURE_ARGS += GCP=/opt/csw/bin/gcp CONFIGURE_ARGS += MKTEMP=/opt/csw/bin/mktemp sysconfdir = /etc/opt/csw include gar/category.mk -# We need this for 'tail -n' -PATH := /opt/csw/gnu:/usr/xpg4/bin:/opt/csw/bin:$(PATH) - #reset XML_CATALOG lookup (we rely on having packages that provide stylesheets #etc). Having xsltproc not find them during build makes us blow up!! XML_CATALOG_FILES = /etc/opt/csw/xml/catalog Modified: csw/mgar/pkg/xmlto/trunk/checksums =================================================================== --- csw/mgar/pkg/xmlto/trunk/checksums 2009-09-15 10:19:44 UTC (rev 6309) +++ csw/mgar/pkg/xmlto/trunk/checksums 2009-09-15 17:59:39 UTC (rev 6310) @@ -1,2 +1,4 @@ -a39f8b6fdb2219dca513145a4fca63ac download/no-hardcode-bash.patch +037997ead86e0589b4e34538d7d2694a download/0001-add-support-for-selection-of-posix-tail-binary.patch +134ec47ba3f225ebd04bfb629b230e69 download/0002-add-handling-so-that-gnu-cp-can-be-specified.patch +b53522eb1413d28da8e661b76f4ab098 download/0003-do-no-hardcode-bin-bash-to-override-env-check.patch 12f297dc7051e4fef08339980f88a1dd download/xmlto-0.0.22.tar.bz2 Added: csw/mgar/pkg/xmlto/trunk/files/0001-add-support-for-selection-of-posix-tail-binary.patch =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/0001-add-support-for-selection-of-posix-tail-binary.patch (rev 0) +++ csw/mgar/pkg/xmlto/trunk/files/0001-add-support-for-selection-of-posix-tail-binary.patch 2009-09-15 17:59:39 UTC (rev 6310) @@ -0,0 +1,48 @@ +From 788a65e1792057ac1379c459e111eccf06b4a034 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Tue, 15 Sep 2009 19:01:55 +0200 +Subject: [PATCH 1/2] add support for selection of posix tail binary + +--- + configure.in | 3 +++ + xmlto.in | 3 ++- + 2 files changed, 5 insertions(+), 1 deletions(-) + +diff --git a/configure.in b/configure.in +index c41bb72..0fb685e 100644 +--- a/configure.in ++++ b/configure.in +@@ -107,6 +107,9 @@ AC_PATH_PROG([LINKS], [links], [links]) + AC_ARG_VAR([W3M], [Name and path of the `w3m' browser.]) + AC_PATH_PROG([W3M], [w3m], [w3m]) + ++AC_ARG_VAR([TAIL], [Name and path of a tail binary that supports -n.]) ++AC_PATH_PROG([TAIL], [tail], [tail]) ++ + dnl + dnl default webrowser + dnl +diff --git a/xmlto.in b/xmlto.in +index 66423b3..21f9acc 100755 +--- a/xmlto.in ++++ b/xmlto.in +@@ -21,6 +21,7 @@ FIND=@FIND@ # This must be GNU find (need -maxdepth) + MKTEMP=@MKTEMP@ # See http://www.mktemp.org if missing on your system + BASH=@BASH@ # GNU bash, for running the format scripts + GETOPT=@GETOPT@ # a getopt that supports --longoptions ++TAIL=@TAIL@ # a tail that supports -n (posix) + + version () { + echo "@PACKAGE@ version @VERSION@" +@@ -407,7 +408,7 @@ esac + # sed -e 's/^]*?>//g' -e 's/^]*>//g' -e 's/^<\([^ ]*\).*$/\1/') + + # Seems reasonable fix the file command and teach it to identify the DTD/Schema but this is faster to write: +-rootel=$(echo "xpath *" | "$XMLLINT_PATH" --shell "$INPUT_FILE" 2> /dev/null | head -n 3 |tail -n 1 | cut -f 4 -d " " ) ++rootel=$(echo "xpath *" | "$XMLLINT_PATH" --shell "$INPUT_FILE" 2> /dev/null | head -n 3 |$TAIL -n 1 | cut -f 4 -d " " ) + + case $(echo $rootel) in + fo:root) +-- +1.6.3.2 + Added: csw/mgar/pkg/xmlto/trunk/files/0002-add-handling-so-that-gnu-cp-can-be-specified.patch =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/0002-add-handling-so-that-gnu-cp-can-be-specified.patch (rev 0) +++ csw/mgar/pkg/xmlto/trunk/files/0002-add-handling-so-that-gnu-cp-can-be-specified.patch 2009-09-15 17:59:39 UTC (rev 6310) @@ -0,0 +1,191 @@ +From d8102af69b3d635abfb913771d3fe9b1d11ad971 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Tue, 15 Sep 2009 19:39:54 +0200 +Subject: [PATCH 2/2] add handling so that gnu cp can be specified + +--- + configure.in | 3 +++ + format/docbook/fo | 2 +- + format/docbook/html | 2 +- + format/docbook/html-nochunks | 2 +- + format/docbook/htmlhelp | 2 +- + format/docbook/javahelp | 2 +- + format/docbook/man | 2 +- + format/docbook/xhtml | 2 +- + format/docbook/xhtml-nochunks | 2 +- + format/fo/dvi | 2 +- + format/fo/pdf | 2 +- + format/xhtml1/fo | 2 +- + xmlto.in | 2 ++ + 13 files changed, 16 insertions(+), 11 deletions(-) + +diff --git a/configure.in b/configure.in +index 0fb685e..727da83 100644 +--- a/configure.in ++++ b/configure.in +@@ -110,6 +110,9 @@ AC_PATH_PROG([W3M], [w3m], [w3m]) + AC_ARG_VAR([TAIL], [Name and path of a tail binary that supports -n.]) + AC_PATH_PROG([TAIL], [tail], [tail]) + ++AC_ARG_VAR([GCP], [Name and path of a GNU cp binary (need at least -P)]) ++AC_PATH_PROG([GCP], [cp], [cp]) ++ + dnl + dnl default webrowser + dnl +diff --git a/format/docbook/fo b/format/docbook/fo +index 699fe3b..8b4f200 100755 +--- a/format/docbook/fo ++++ b/format/docbook/fo +@@ -7,6 +7,6 @@ stylesheet) + echo "http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl" + ;; + post-process) +- cp -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").fo" ++ ${GCP_PATH:-cp} -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").fo" + ;; + esac +diff --git a/format/docbook/html b/format/docbook/html +index 56bed62..3b2cd71 100755 +--- a/format/docbook/html ++++ b/format/docbook/html +@@ -7,6 +7,6 @@ stylesheet) + echo "http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl" + ;; + post-process) +- cp -R -P -p -- * "$OUTPUT_DIR" ++ ${GCP_PATH:-cp} -R -P -p -- * "$OUTPUT_DIR" + ;; + esac +diff --git a/format/docbook/html-nochunks b/format/docbook/html-nochunks +index 18a0a63..82b635b 100755 +--- a/format/docbook/html-nochunks ++++ b/format/docbook/html-nochunks +@@ -7,6 +7,6 @@ stylesheet) + echo "http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl" + ;; + post-process) +- cp -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").html" ++ ${GCP_PATH:-cp} -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").html" + ;; + esac +diff --git a/format/docbook/htmlhelp b/format/docbook/htmlhelp +index 6ae2750..01553df 100755 +--- a/format/docbook/htmlhelp ++++ b/format/docbook/htmlhelp +@@ -7,6 +7,6 @@ stylesheet) + echo "http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl" + ;; + post-process) +- cp -R -P -p -- * "$OUTPUT_DIR" ++ ${GCP_PATH:-cp} -R -P -p -- * "$OUTPUT_DIR" + ;; + esac +diff --git a/format/docbook/javahelp b/format/docbook/javahelp +index ad50388..57710f0 100755 +--- a/format/docbook/javahelp ++++ b/format/docbook/javahelp +@@ -7,6 +7,6 @@ stylesheet) + echo "http://docbook.sourceforge.net/release/xsl/current/javahelp/javahelp.xsl" + ;; + post-process) +- cp -R -P -p -- *.htm* *.hs *.xml *.jhm "$OUTPUT_DIR" ++ ${GCP_PATH:-cp} -R -P -p -- *.htm* *.hs *.xml *.jhm "$OUTPUT_DIR" + ;; + esac +diff --git a/format/docbook/man b/format/docbook/man +index 1b0d561..525b03b 100755 +--- a/format/docbook/man ++++ b/format/docbook/man +@@ -8,6 +8,6 @@ stylesheet) + ;; + post-process) + [ -e "$XSLT_PROCESSED" ] && rm "$XSLT_PROCESSED" +- cp -R -P -p -- * "$OUTPUT_DIR" 2>/dev/null ++ ${GCP_PATH:-cp} -R -P -p -- * "$OUTPUT_DIR" 2>/dev/null + ;; + esac +diff --git a/format/docbook/xhtml b/format/docbook/xhtml +index 940c250..8204549 100755 +--- a/format/docbook/xhtml ++++ b/format/docbook/xhtml +@@ -7,6 +7,6 @@ stylesheet) + echo "http://docbook.sourceforge.net/release/xsl/current/xhtml/chunk.xsl" + ;; + post-process) +- cp -R -P -p -- *.*htm* "$OUTPUT_DIR" ++ ${GCP_PATH:-cp} -R -P -p -- *.*htm* "$OUTPUT_DIR" + ;; + esac +diff --git a/format/docbook/xhtml-nochunks b/format/docbook/xhtml-nochunks +index 3ae4c81..82b555d 100755 +--- a/format/docbook/xhtml-nochunks ++++ b/format/docbook/xhtml-nochunks +@@ -7,6 +7,6 @@ stylesheet) + echo "http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl" + ;; + post-process) +- cp -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename ${XSLT_PROCESSED%.*}).html" ++ ${GCP_PATH:-cp} -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename ${XSLT_PROCESSED%.*}).html" + ;; + esac +diff --git a/format/fo/dvi b/format/fo/dvi +index 1c797a6..9db53c7 100755 +--- a/format/fo/dvi ++++ b/format/fo/dvi +@@ -34,6 +34,6 @@ post-process) + [ "$VERBOSE" -ge 3 ] && cat $OUT + fi + fi +- cp -R -P -p -- *.dvi "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").dvi" ++ ${GCP_PATH:-cp} -R -P -p -- *.dvi "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").dvi" + ;; + esac +diff --git a/format/fo/pdf b/format/fo/pdf +index c6f55a4..670cd3c 100755 +--- a/format/fo/pdf ++++ b/format/fo/pdf +@@ -37,7 +37,7 @@ DEFAULT|DBLATEX) + [ "$VERBOSE" -ge 3 ] && cat $OUT + fi + fi +- cp -R -P -p -- *.pdf "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").pdf" ++ ${GCP_PATH:-cp} -R -P -p -- *.pdf "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").pdf" + ;; + esac + ;; +diff --git a/format/xhtml1/fo b/format/xhtml1/fo +index 588051e..a445ea0 100755 +--- a/format/xhtml1/fo ++++ b/format/xhtml1/fo +@@ -7,6 +7,6 @@ stylesheet) + echo "http://www.antennahouse.com/XSLsample/sample-xsl-xhtml2fo/xhtml2fo.xsl" + ;; + post-process) +- cp -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").fo" ++ ${GCP_PATH:-cp} -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").fo" + ;; + esac +diff --git a/xmlto.in b/xmlto.in +index 21f9acc..dcab15e 100755 +--- a/xmlto.in ++++ b/xmlto.in +@@ -245,6 +245,7 @@ fi + LINKS_PATH=@LINKS@ + W3M_PATH=@W3M@ + LYNX_PATH=@LYNX@ ++GCP_PATH=@GCP@ + + # Process any options + ARGS=$(${GETOPT} \ +@@ -441,6 +442,7 @@ fi + XSLT_PROCESSOR="$XSLTPROC_PATH" # We only know about xsltproc right now. + export XSLT_PROCESSOR + export W3M_PATH ++export GCP_PATH + export LINKS_PATH + export LYNX_PATH + export FOP_PATH +-- +1.6.3.2 + Added: csw/mgar/pkg/xmlto/trunk/files/0003-do-no-hardcode-bin-bash-to-override-env-check.patch =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/0003-do-no-hardcode-bin-bash-to-override-env-check.patch (rev 0) +++ csw/mgar/pkg/xmlto/trunk/files/0003-do-no-hardcode-bin-bash-to-override-env-check.patch 2009-09-15 17:59:39 UTC (rev 6310) @@ -0,0 +1,24 @@ +From d9ee41aa38e8009bff734ec540c41822a7d3998f Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Tue, 15 Sep 2009 19:45:33 +0200 +Subject: [PATCH 3/3] do no hardcode /bin/bash to override env check + +--- + configure.in | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/configure.in b/configure.in +index 727da83..bf854b7 100644 +--- a/configure.in ++++ b/configure.in +@@ -18,7 +18,6 @@ AC_CHECK_PROG([MKTEMP], [mktemp],, [mktemp]) + AC_ARG_VAR([FIND], [Name of the GNU `find' program.]) + AC_CHECK_PROG([FIND], [find],, [find] ) + +-BASH=/bin/bash + AC_ARG_VAR([BASH], [Name and path of the GNU `bash' shell.]) + AC_PATH_PROG([BASH], [bash], [/bin/bash]) + +-- +1.6.3.2 + Deleted: csw/mgar/pkg/xmlto/trunk/files/no-hardcode-bash.patch =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/no-hardcode-bash.patch 2009-09-15 10:19:44 UTC (rev 6309) +++ csw/mgar/pkg/xmlto/trunk/files/no-hardcode-bash.patch 2009-09-15 17:59:39 UTC (rev 6310) @@ -1,14 +0,0 @@ -diff --speed-large-files --minimal -Nru xmlto-0.0.22.orig/configure.in xmlto-0.0.22/configure.in ---- xmlto-0.0.22.orig/configure.in 2009-03-25 14:48:02.000000000 +0100 -+++ xmlto-0.0.22/configure.in 2009-09-09 02:43:47.431319471 +0200 -@@ -18,9 +18,8 @@ - AC_ARG_VAR([FIND], [Name of the GNU `find' program.]) - AC_CHECK_PROG([FIND], [find],, [find] ) - --BASH=/bin/bash - AC_ARG_VAR([BASH], [Name and path of the GNU `bash' shell.]) --AC_PATH_PROG([BASH], [bash], [/bin/bash]) -+AC_PATH_PROG([BASH], [bash],, [bash]) - - AC_ARG_VAR([GETOPT], [Name of the `getopt' program (requires longopt support).]) - AC_CHECK_PROG([GETOPT], [getopt],, [getopt]) 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 Sep 15 20:02:39 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 15 Sep 2009 18:02:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[6311] csw/mgar/pkg/xmlto/trunk/Makefile Message-ID: Revision: 6311 http://gar.svn.sourceforge.net/gar/?rev=6311&view=rev Author: bdwalton Date: 2009-09-15 18:02:39 +0000 (Tue, 15 Sep 2009) Log Message: ----------- xmlto: depend on CSWgfile Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-15 17:59:39 UTC (rev 6310) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-15 18:02:39 UTC (rev 6311) @@ -7,7 +7,7 @@ REQUIRED_PKGS = CSWsgmlcommon CSWxmlcommon CSWlibxml2 CSWdocbookdtds REQUIRED_PKGS += CSWdocbookxsl CSWlibxslt CSWflex CSWw3m CSWmktemp -REQUIRED_PKGS += CSWggetopt CSWbash +REQUIRED_PKGS += CSWggetopt CSWbash CSWgfile DESCRIPTION = An XSL toolchain front end. define BLURB 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 Sep 16 01:28:28 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 15 Sep 2009 23:28:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[6312] csw/mgar/pkg/sudosh2/trunk Message-ID: Revision: 6312 http://gar.svn.sourceforge.net/gar/?rev=6312&view=rev Author: skayser Date: 2009-09-15 23:28:28 +0000 (Tue, 15 Sep 2009) Log Message: ----------- sudosh2: getting release ready Modified Paths: -------------- csw/mgar/pkg/sudosh2/trunk/Makefile csw/mgar/pkg/sudosh2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/sudosh2/trunk/files/002-strip-man-page-blank.patch csw/mgar/pkg/sudosh2/trunk/files/003-adjust-sudosh-man-binary-name.patch csw/mgar/pkg/sudosh2/trunk/files/changelog.CSW Modified: csw/mgar/pkg/sudosh2/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudosh2/trunk/Makefile 2009-09-15 18:02:39 UTC (rev 6311) +++ csw/mgar/pkg/sudosh2/trunk/Makefile 2009-09-15 23:28:28 UTC (rev 6312) @@ -1,32 +1,59 @@ # TODO/Issues -# - Man pages don't display right now -# - Set sudosh.conf ownership to root:root? -# - Compiled in default for logdir /var/adm/..., if not existant sudosh2 -# totally hangs (^C doesn't work). Change default and include the dir in the -# package? -# - Submit DESTDIR patch upstream +# - Submit 001- (DESTDIR) and 002- (man page) patches upstream +# - What about --logdir perms? Any other special perms required? GARNAME = sudosh2 GARVERSION = 1.0.2 CATEGORIES = apps -DESCRIPTION = Brief description +DESCRIPTION = Extensive auditing of user shell usage define BLURB - Long description + sudosh can be used as a default login shell or a filter that takes + advantage of PTY devices in order to sit between the user's keyboard and + a program, in this case a shell. It was designed specifically to be used + in conjunction with sudo, and allows the execution of a root or + application shell with logging. It is basically a VCR and will record + root shell sessions and also has the ability to play back the sessions + as they were originally recorded. It records all input/output, keyboard + input, and timing information so that the session can be played back in + the original format. + + Sudosh2 is a fork of sudosh (by Douglas Hanks). endef MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tgz CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-logdir=/var/opt/csw/sudosh # No tests available TEST_SCRIPTS = # Installation for sudosh.conf doesn't honor DESTDIR -PATCHFILES = 001-installsudosh.conf-destdir.patch +PATCHFILES = 001-installsudosh.conf-destdir.patch +# Man pages contain an empty line that becomes a full first blank page +PATCHFILES += 002-strip-man-page-blank.patch +# The binary is called sudosh (not sudosh2 - only leave sudosh2 in the title) +PATCHFILES += 003-adjust-sudosh-man-binary-name.patch include gar/category.mk pre-configure-modulated: - perl -pi -e 's|-Werror|-errwarn|g' $(WORKSRC)/Makefile.in $(WORKSRC)/src/Makefile.in + # -errwarn bails out with implicit function declarations + # http://lists.opencsw.org/pipermail/maintainers/2009-September/004159.html + #perl -pi -e 's|-Werror|-errwarn|g' \ + perl -pi -e 's|-Werror||g' \ + $(WORKSRC)/src/Makefile.in \ + $(WORKSRC)/Makefile.in \ + $(WORKSRC)/configure @$(MAKECOOKIE) + +post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) +post-install-modulated: DOCS=AUTHORS NEWS README +post-install-modulated: + ginstall -d $(DESTDIR)/var/opt/csw/sudosh + ginstall -d $(DOCDEST) + cp $(addprefix $(WORKSRC)/,$(DOCS)) $(DOCDEST) + cp $(WORKSRC)/ChangeLog $(DOCDEST)/changelog + cp $(FILEDIR)/changelog.CSW $(DOCDEST) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/sudosh2/trunk/checksums =================================================================== --- csw/mgar/pkg/sudosh2/trunk/checksums 2009-09-15 18:02:39 UTC (rev 6311) +++ csw/mgar/pkg/sudosh2/trunk/checksums 2009-09-15 23:28:28 UTC (rev 6312) @@ -1 +1,4 @@ +652d339ec04952f3d114b9aea838afc5 download/001-installsudosh.conf-destdir.patch +9752d641a2233caf7789711ecbcd890e download/002-strip-man-page-blank.patch +882f7d2ddb59330350dd2d82184aff50 download/003-adjust-sudosh-man-binary-name.patch 4c837f7739d9db780ad324ed8482e8a7 download/sudosh2-1.0.2.tgz Added: csw/mgar/pkg/sudosh2/trunk/files/002-strip-man-page-blank.patch =================================================================== --- csw/mgar/pkg/sudosh2/trunk/files/002-strip-man-page-blank.patch (rev 0) +++ csw/mgar/pkg/sudosh2/trunk/files/002-strip-man-page-blank.patch 2009-09-15 23:28:28 UTC (rev 6312) @@ -0,0 +1,36 @@ +diff --git a/sudosh-replay.8.in b/sudosh-replay.8.in +index e4b93c0..b2159e0 100644 +--- a/sudosh-replay.8.in ++++ b/sudosh-replay.8.in +@@ -1,7 +1,6 @@ + .\" Process this file with + .\" groff -man -Tascii sudosh-replay.1 + .\" +- + .TH SUDOSH-REPLAY 8 "December 20 2007" @VERSION@ "User Manuals" + .SH NAME + sudosh-replay \- view and replay sudosh sessions +diff --git a/sudosh.1.in b/sudosh.1.in +index de95301..cd60622 100644 +--- a/sudosh.1.in ++++ b/sudosh.1.in +@@ -1,7 +1,6 @@ + .\" Process this file with + .\" groff -man -Tascii sudosh.1 + .\" +- + .TH SUDOSH 1 "December 21th 2007" @VERSION@ "User Manuals" + .SH NAME + @PACKAGE_NAME@ \- works like a VCR and records shell sessions. +diff --git a/sudosh.conf.5.in b/sudosh.conf.5.in +index 9a42617..1d115fe 100644 +--- a/sudosh.conf.5.in ++++ b/sudosh.conf.5.in +@@ -1,7 +1,6 @@ + .\" Process this file with + .\" groff -man -Tascii sudosh.1 + .\" +- + .TH SUDOSH.CONF 5 "December 21th 2007" @VERSION@ "User Manuals" + .SH NAME + sudosh.conf \- configuration file for sudosh Added: csw/mgar/pkg/sudosh2/trunk/files/003-adjust-sudosh-man-binary-name.patch =================================================================== --- csw/mgar/pkg/sudosh2/trunk/files/003-adjust-sudosh-man-binary-name.patch (rev 0) +++ csw/mgar/pkg/sudosh2/trunk/files/003-adjust-sudosh-man-binary-name.patch 2009-09-15 23:28:28 UTC (rev 6312) @@ -0,0 +1,16 @@ +diff --git a/sudosh.1.in b/sudosh.1.in +index cd60622..dd46be3 100644 +--- a/sudosh.1.in ++++ b/sudosh.1.in +@@ -5,9 +5,9 @@ + .SH NAME + @PACKAGE_NAME@ \- works like a VCR and records shell sessions. + .SH SYNOPSIS +-.B @PACKAGE_NAME@ [OPTION]... ++.B sudosh [OPTION]... + .SH DESCRIPTION +-.B @PACKAGE_NAME@ ++.B sudosh + can be used as a default login shell or as a filter. sudosh takes advantage of pty devices in order to sit between the user's keyboard and a program, in this case a shell. It was designed specifically to be used in conjunction with + .BR sudo (8) + and allows execution of a shell with logging. It is basically a VCR and will record shell sessions and also has the ability to play back the sessions as they were originally recorded. It records all input/output, keyboard input, and timing information so that the session acn be played back in the original format. Added: csw/mgar/pkg/sudosh2/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/sudosh2/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/sudosh2/trunk/files/changelog.CSW 2009-09-15 23:28:28 UTC (rev 6312) @@ -0,0 +1,5 @@ +sudosh2 (1.0.2,REV=2009.09.16) + + * Initial release. + + -- Sebastian Kayser Wed, 16 Sep 2009 01:11:30 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Sep 16 02:31:47 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 16 Sep 2009 00:31:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[6313] csw/mgar/pkg/xmlto/trunk Message-ID: Revision: 6313 http://gar.svn.sourceforge.net/gar/?rev=6313&view=rev Author: bdwalton Date: 2009-09-16 00:31:46 +0000 (Wed, 16 Sep 2009) Log Message: ----------- xmlto: patch to use type instead of which to detect files Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile csw/mgar/pkg/xmlto/trunk/checksums Added Paths: ----------- csw/mgar/pkg/xmlto/trunk/files/0004-switch-file-detection-from-which-to-type.patch Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-15 23:28:28 UTC (rev 6312) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-16 00:31:46 UTC (rev 6313) @@ -22,6 +22,7 @@ PATCHFILES += 0001-add-support-for-selection-of-posix-tail-binary.patch PATCHFILES += 0002-add-handling-so-that-gnu-cp-can-be-specified.patch PATCHFILES += 0003-do-no-hardcode-bin-bash-to-override-env-check.patch +PATCHFILES += 0004-switch-file-detection-from-which-to-type.patch TEST_TARGET = check Modified: csw/mgar/pkg/xmlto/trunk/checksums =================================================================== --- csw/mgar/pkg/xmlto/trunk/checksums 2009-09-15 23:28:28 UTC (rev 6312) +++ csw/mgar/pkg/xmlto/trunk/checksums 2009-09-16 00:31:46 UTC (rev 6313) @@ -1,4 +1,5 @@ 037997ead86e0589b4e34538d7d2694a download/0001-add-support-for-selection-of-posix-tail-binary.patch 134ec47ba3f225ebd04bfb629b230e69 download/0002-add-handling-so-that-gnu-cp-can-be-specified.patch b53522eb1413d28da8e661b76f4ab098 download/0003-do-no-hardcode-bin-bash-to-override-env-check.patch +aec9edfc4fdc77ee6bc77124bb1235f4 download/0004-switch-file-detection-from-which-to-type.patch 12f297dc7051e4fef08339980f88a1dd download/xmlto-0.0.22.tar.bz2 Added: csw/mgar/pkg/xmlto/trunk/files/0004-switch-file-detection-from-which-to-type.patch =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/0004-switch-file-detection-from-which-to-type.patch (rev 0) +++ csw/mgar/pkg/xmlto/trunk/files/0004-switch-file-detection-from-which-to-type.patch 2009-09-16 00:31:46 UTC (rev 6313) @@ -0,0 +1,170 @@ +From b9b12cdac3163c55bf3af13b1d51dd7c60639d4b Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Wed, 16 Sep 2009 02:30:05 +0200 +Subject: [PATCH 4/4] switch file detection from `which` to `type` + +--- + format/docbook/txt | 6 +++--- + format/fo/dvi | 2 +- + format/fo/pdf | 2 +- + format/xhtml1/txt | 6 +++--- + xmlto.in | 18 +++++++++--------- + 5 files changed, 17 insertions(+), 17 deletions(-) + +diff --git a/format/docbook/txt b/format/docbook/txt +index 390e96a..d72f27f 100755 +--- a/format/docbook/txt ++++ b/format/docbook/txt +@@ -1,14 +1,14 @@ + case "$USE_BACKEND" in + DEFAULT|DBLATEX) +- if [ -n "`which "$W3M_PATH" 2>/dev/null`" ] ++ if [ -n "`type -t $W3M_PATH`" ] + then + CONVERT="$W3M_PATH" + ARGS="-T text/html -dump" +- elif [ -n "`which "$LYNX_PATH" 2>/dev/null`" ] ++ elif [ -n "`type -t $LYNX_PATH`" ] + then + CONVERT="$LYNX_PATH" + ARGS="-force_html -dump -nolist -width=72" +- elif [ -n "`which "$LINKS_PATH" 2>/dev/null`" ] ++ elif [ -n "`type -t $LINKS_PATH`" ] + then + CONVERT="$LINKS_PATH" + ARGS="-dump" +diff --git a/format/fo/dvi b/format/fo/dvi +index 9db53c7..a9af333 100755 +--- a/format/fo/dvi ++++ b/format/fo/dvi +@@ -6,7 +6,7 @@ post-process) + then + echo >&2 "Post-process XSL-FO to DVI" + fi +- if [ -z "`which $XMLTEX_PATH 2>/dev/null`" ] ++ if [ -z "`type -t $XMLTEX_PATH`" ] + then + echo >&2 "Can't process, xmltex tool not found at $XMLTEX_PATH." + exit 3 +diff --git a/format/fo/pdf b/format/fo/pdf +index 670cd3c..aa967aa 100755 +--- a/format/fo/pdf ++++ b/format/fo/pdf +@@ -8,7 +8,7 @@ DEFAULT|DBLATEX) + then + echo >&2 "Post-process XSL-FO to PDF" + fi +- if [ -z "`which $PDFXMLTEX_PATH 2>/dev/null`" ] ++ if [ -z "`type -t $PDFXMLTEX_PATH`" ] + then + echo >&2 "Can't process, pdfxmltex tool not found at $PDFXMLTEX_PATH." + exit 3 +diff --git a/format/xhtml1/txt b/format/xhtml1/txt +index fa34ff7..18c9559 100755 +--- a/format/xhtml1/txt ++++ b/format/xhtml1/txt +@@ -1,14 +1,14 @@ + case "$USE_BACKEND" in + DEFAULT|DBLATEX) +- if [ -n "`which "$W3M_PATH" 2>/dev/null`" ] ++ if [ -n "`type -t $W3M_PATH`" ] + then + CONVERT="$W3M_PATH" + ARGS="-T text/html -dump" +- elif [ -n "`which "$LYNX_PATH" 2>/dev/null`" ] ++ elif [ -n "`type -t $LYNX_PATH`" ] + then + CONVERT="$LYNX_PATH" + ARGS="-force_html -dump -nolist -width=72" +- elif [ -n "`which "$LINKS_PATH" 2>/dev/null`" ] ++ elif [ -n "`type -t $LINKS_PATH`" ] + then + CONVERT="$LINKS_PATH" + ARGS="-dump" +diff --git a/xmlto.in b/xmlto.in +index dcab15e..45221a6 100755 +--- a/xmlto.in ++++ b/xmlto.in +@@ -125,7 +125,7 @@ XMLLINT_PATH=@XMLLINT@ + XSLTPROC_PATH=@XSLTPROC@ + + # Try to setup papersize using libpaper first ... +-if [ -n "`which "$PAPERCONF_PATH" 2>/dev/null`" ] ++if [ -n "`type -t $PAPERCONF_PATH`" ] + then + papername=`"$PAPERCONF_PATH" -n` + paperheight=`"$PAPERCONF_PATH" -mh | sed 's/ //g'` +@@ -156,7 +156,7 @@ EOF + fi + + # ... or use magic paper size, based on LC_PAPER +-elif [ -n "`which "$LOCALE_PATH" 2>/dev/null`" ] ++elif [ -n "`type -t $LOCALE_PATH`" ] + then + # For paper sizes we know about, specify them. + h=$("$LOCALE_PATH" LC_PAPER 2>/dev/null | head -n 1) +@@ -179,7 +179,7 @@ EOF + fi + + # Magic encoding, based on locale +-if [ -n "`which "$LOCALE_PATH" 2>/dev/null`" ] ++if [ -n "`type -t $LOCALE_PATH`" ] + then + charmap=$("$LOCALE_PATH" charmap 2>/dev/null) + +@@ -228,14 +228,14 @@ XMLTEX_PATH=@XMLTEX@ + PDFXMLTEX_PATH=@PDFXMLTEX@ + + #check if we could use fop/dblatex backend as default(if not, use passivetex) +-if [ x"$USE_BACKEND" = xFOP ] && [ -z "`which "$FOP_PATH" 2>/dev/null`" ] ++if [ x"$USE_BACKEND" = xFOP ] && [ -z "`type -t $FOP_PATH`" ] + then + echo >&2 "@PACKAGE@: Warning: fop not found or not executable." + echo >&2 "@PACKAGE@: Using default backend..." + USE_BACKEND=DEFAULT + fi + if [ x"$USE_BACKEND" = xDBLATEX ] && \ +- [ -z "`which "$DBLATEX_PATH" 2>/dev/null`" ] ++ [ -z "`type -t $DBLATEX_PATH`" ] + then + echo >&2 "@PACKAGE@: Warning: dblatex not found or not executable." + echo >&2 "@PACKAGE@: Using default backend..." +@@ -330,7 +330,7 @@ while [ "$#" -gt "0" ]; do + ;; + --with-fop) + ##use fop instead of passivetex where possible +- if [ -z "`which "$FOP_PATH" 2>/dev/null`" ] ++ if [ -z "`type -t $FOP_PATH`" ] + then + echo >&2 Warning: fop not found or not executable. + echo >&2 Using default backend... +@@ -341,7 +341,7 @@ while [ "$#" -gt "0" ]; do + ;; + --with-dblatex) + ##use dblatex instead of passivetex where possible +- if [ -z "`which "$DBLATEX_PATH" 2>/dev/null`" ] ++ if [ -z "`type -t $DBLATEX_PATH`" ] + then + echo >&2 Warning: dblatex not found or not executable. + echo >&2 Using default backend... +@@ -490,7 +490,7 @@ cd "$XSLT_PROCESSED_DIR" + if [ "$SKIP_VALIDATION" -eq 0 ] && [ "$SOURCE_FORMAT" != "fo" ] + then + #do we have xmllint validation tool? +- if [ -z "`which "$XMLLINT_PATH" 2>/dev/null`" ] ++ if [ -z "`type -t $XMLLINT_PATH`" ] + then + echo >&2 "@PACKAGE@: xmllint validation tool not found or not executable." + echo >&2 "@PACKAGE@: Skipping validation... " \ +@@ -522,7 +522,7 @@ then + else + + #do we have xsltproc tool? +- if [ -z "`which "$XSLTPROC_PATH" 2>/dev/null`" ] ++ if [ -z "`type -t $XSLTPROC_PATH`" ] + then + echo >&2 "@PACKAGE@: Can't continue, xsltproc tool not found or not executable." + exit 3 +-- +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 Wed Sep 16 02:58:09 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 16 Sep 2009 00:58:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[6314] csw/mgar/pkg/facter/trunk Message-ID: Revision: 6314 http://gar.svn.sourceforge.net/gar/?rev=6314&view=rev Author: wahwah Date: 2009-09-16 00:58:08 +0000 (Wed, 16 Sep 2009) Log Message: ----------- facter: Version bump to 1.5.6 Modified Paths: -------------- csw/mgar/pkg/facter/trunk/Makefile csw/mgar/pkg/facter/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/facter/trunk/Makefile Modified: csw/mgar/pkg/facter/trunk/Makefile =================================================================== --- csw/mgar/pkg/facter/trunk/Makefile 2009-09-16 00:31:46 UTC (rev 6313) +++ csw/mgar/pkg/facter/trunk/Makefile 2009-09-16 00:58:08 UTC (rev 6314) @@ -1,33 +1,37 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + GARNAME = facter -GARVERSION = 1.5.4 +GARVERSION = 1.5.6 CATEGORIES = apps -DESCRIPTION = a system fact gatherer +DESCRIPTION = a system fact gatherer define BLURB - A cross-platform Ruby library for retrieving facts from operating systems. - Supports multiple resolution mechanisms, any of which can be restricted to - working only on certain operating systems or environments. Facter is - especially useful for retrieving things like operating system names, IP - addresses, MAC addresses, and SSH keys. + A cross-platform Ruby library for retrieving facts from operating systems. + Supports multiple resolution mechanisms, any of which can be restricted to + working only on certain operating systems or environments. Facter is + especially useful for retrieving things like operating system names, IP + addresses, MAC addresses, and SSH keys. - It is easy to extend Facter to include your own custom facts or to include - additional mechanisms for retrieving facts. + It is easy to extend Facter to include your own custom facts or to include + additional mechanisms for retrieving facts. endef MASTER_SITES = http://reductivelabs.com/downloads/facter/ -DISTFILES = $(GARNAME)-$(GARVERSION).tgz +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PREREQUISITE_PKGS += CSWruby REQUIRED_PKGS = CSWruby +PREREQUISITE_PKGS = $(REQUIRED_PKGS) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz ARCHALL=1 -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = -TEST_SCRIPTS = +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = INSTALL_SCRIPTS = facter include gar/category.mk Property changes on: csw/mgar/pkg/facter/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/facter/trunk/checksums =================================================================== --- csw/mgar/pkg/facter/trunk/checksums 2009-09-16 00:31:46 UTC (rev 6313) +++ csw/mgar/pkg/facter/trunk/checksums 2009-09-16 00:58:08 UTC (rev 6314) @@ -1 +1 @@ -0df92b81606f8e23bdd1f2ade597049b download/facter-1.5.4.tgz +f2eda650cadfdaf549fab1a436c0db4d download/facter-1.5.6.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 Sep 16 03:53:44 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 16 Sep 2009 01:53:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[6315] csw/mgar/pkg/mysql5/branches/mysql-5.0.x Message-ID: Revision: 6315 http://gar.svn.sourceforge.net/gar/?rev=6315&view=rev Author: wahwah Date: 2009-09-16 01:53:44 +0000 (Wed, 16 Sep 2009) Log Message: ----------- mysql5: First iteration of slicing it into separate packages. Things left to do: Creating mysql user and group, pre/post install/remove scripts, a check if MySQL database exists Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0001-Use-libc-not-libcrypt.patch csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0002-cast-user_info-pw_gid-to-gid_t.patch csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0003-OpenCSW-perl-for-tests.patch csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0004-basedir-and-datadir-in-the-cnf-files.patch csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW 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-09-16 00:58:08 UTC (rev 6314) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-09-16 01:53:44 UTC (rev 6315) @@ -1,5 +1,5 @@ GARNAME = mysql5 -GARVERSION = 5.1.33 +GARVERSION = 5.0.84 CATEGORIES = server DISTNAME = mysql-$(GARVERSION) @@ -10,30 +10,70 @@ (Structured Query Language) database server. endef +# Change prefix to /opt/csw/mysql5 +prefix = /opt/csw/mysql5 +sysconfdir = /etc/opt/csw/mysql5 +localstatedir = /var/opt/csw/mysql5 + +INITSMF = $(sysconfdir)/init\.d/cswmysql5 + +PATCHFILES = 0001-Use-libc-not-libcrypt.patch +PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch +PATCHFILES += 0003-OpenCSW-perl-for-tests.patch +PATCHFILES += 0004-basedir-and-datadir-in-the-cnf-files.patch + PACKAGES = CSWmysql5 CSWmysql5bench CSWmysql5client CSWmysql5devel PACKAGES += CSWmysql5rt CSWmysql5test -CATALOGNAME_CSWmysql5 = $(GARNAME) -CATALOGNAME_CSWmysql5bench = $(GARNAME)bench -CATALOGNAME_CSWmysql5clien = $(GARNAME)client -CATALOGNAME_CSWmysql5devel = $(GARNAME)devel -CATALOGNAME_CSWmysql5rt = $(GARNAME)rt -CATALOGNAME_CSWmysql5test = $(GARNAME)test +CATALOGNAME_CSWmysql5 = $(GARNAME) +CATALOGNAME_CSWmysql5bench = $(GARNAME)bench +CATALOGNAME_CSWmysql5client = $(GARNAME)client +CATALOGNAME_CSWmysql5devel = $(GARNAME)devel +CATALOGNAME_CSWmysql5rt = $(GARNAME)rt +CATALOGNAME_CSWmysql5test = $(GARNAME)test -MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.1/ +SPKG_DESC_CSWmysql5 = Multithreaded SQL database +SPKG_DESC_CSWmysql5bench = MySQL 5 benchmarking +SPKG_DESC_CSWmysql5client = MySQL 5 client binaries +SPKG_DESC_CSWmysql5devel = MySQL 5 header files +SPKG_DESC_CSWmysql5rt = MySQL 5 runtime files +SPKG_DESC_CSWmysql5test = MySQL 5 testing files + +support64 = (/(amd64|i386))? +PKGFILES_CSWmysql5client = $(bindir) +PKGFILES_CSWmysql5client += $(bindir)$(support64)/myisam(log|pack) +PKGFILES_CSWmysql5client += $(bindir)$(support64)/mysql +PKGFILES_CSWmysql5client += $(bindir)$(support64)/mysql_client_test +PKGFILES_CSWmysql5client += $(bindir)$(support64)/mysql(_zap|access|admin|binlog|check) +PKGFILES_CSWmysql5client += $(bindir)$(support64)/mysql(dump|hotcopy|import|show) +PKGFILES_CSWmysql5client += $(bindir)$(support64)/(perror|replace) +PKGFILES_CSWmysql5client += $(mandir)/man1/mysql(|\_zap|access|admin|dump|show)\.1 +PKGFILES_CSWmysql5client += $(mandir)/man1/(perror|replace)\.1 +PKGFILES_CSWmysql5devel = $(prefix)/include.* +PKGFILES_CSWmysql5devel += $(bindir)$(support64)/mysql_config +PKGFILES_CSWmysql5devel += $(mandir)/man1/mysql_config\.1 +PKGFILES_CSWmysql5rt = $(prefix)/lib/.*\.so.* +PKGFILES_CSWmysql5bench = $(prefix)/sql-bench.* +PKGFILES_CSWmysql5test = $(prefix)/mysql-test.* + +REQUIRED_PKGS_CSWmysql5client = CSWmysql5rt + +MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.0/ DISTFILES = mysql-$(GARVERSION).tar.gz +DISTFILES += cswmysql5 quick_start-csw README.CSW + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# Change prefix to /opt/csw/mysql5 -prefix = /opt/csw/mysql5 +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_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ # Set ./configure options @@ -49,9 +89,21 @@ CONFIGURE_ARGS += --with-ssl=/opt/csw CONFIGURE_ARGS += --with-plugins=max-no-ndb -#TEST_ARGS = test-force +TEST_SCRIPTS = # Enable 64 bits build BUILD64 = 1 include gar/category.mk + +post-install-modulated: + ginstall -m 755 -d $(DESTDIR)$(localstatedir) + ginstall -m 755 -d $(DESTDIR)$(datadir)/mysql5/doc + ginstall -m 644 $(FILEDIR)/README.CSW $(DESTDIR)$(datadir)/mysql5/doc + ginstall -m 755 -d $(DESTDIR)/opt/csw/share/mysql5/doc + ln -s ../../../mysql5/share/mysql5/doc/README.CSW \ + $(DESTDIR)/opt/csw/share/mysql5/doc/README.CSW + ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d + ginstall -m 755 $(FILEDIR)/cswmysql5 $(DESTDIR)/etc/opt/csw/init.d + ginstall -m 755 $(FILEDIR)/quick_start-csw $(DESTDIR)$(datadir)/mysql5 + @$(MAKECOOKIE) Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-09-16 00:58:08 UTC (rev 6314) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-09-16 01:53:44 UTC (rev 6315) @@ -1 +1,8 @@ -9c5711e9bea4514df6f2659f283f0aa0 download/mysql-5.1.33.tar.gz +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 +70d7860bfa776dfc5510fc11d7c14203 download/README.CSW +815a50011c356cd29758ca2195804952 download/cswmysql5 +671348f1a5b078da9ca76f97e1fda325 download/mysql-5.0.84.tar.gz +1d79b3cfc4f91db05952bf71f0181fe7 download/quick_start-csw Added: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0001-Use-libc-not-libcrypt.patch =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0001-Use-libc-not-libcrypt.patch (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0001-Use-libc-not-libcrypt.patch 2009-09-16 01:53:44 UTC (rev 6315) @@ -0,0 +1,28 @@ +From a527f284ef5646dbdd731af007aace3daee3e946 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Wed, 16 Sep 2009 01:27:38 +0100 +Subject: [PATCH 1/4] Use libc, not libcrypt + +--- + configure.in | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +diff --git a/configure.in b/configure.in +index ec432e1..577cfe3 100644 +--- a/configure.in ++++ b/configure.in +@@ -891,7 +891,10 @@ AC_CHECK_FUNC(p2open, , AC_CHECK_LIB(gen, p2open)) + # This may get things to compile even if bind-8 is installed + AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind)) + # Check if crypt() exists in libc or libcrypt, sets LIBS if needed +-AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt])) ++## AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt])) ++# For crypt() on Solaris use libc, not libcrypt ++AC_CHECK_LIB(c, crypt) ++AC_CHECK_FUNC(crypt, AC_DEFINE([HAVE_CRYPT], [1], [crypt])) + # See if we need a library for address lookup. + AC_SEARCH_LIBS(inet_aton, [socket nsl resolv]) + +-- +1.6.3.2 + Added: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0002-cast-user_info-pw_gid-to-gid_t.patch =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0002-cast-user_info-pw_gid-to-gid_t.patch (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0002-cast-user_info-pw_gid-to-gid_t.patch 2009-09-16 01:53:44 UTC (rev 6315) @@ -0,0 +1,27 @@ +From 8536f5925a96634950decd8779b2c6a60d183134 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Wed, 16 Sep 2009 01:29:57 +0100 +Subject: [PATCH 2/4] cast user_info->pw_gid to gid_t + +--- + sql/mysqld.cc | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/sql/mysqld.cc b/sql/mysqld.cc +index 592ae3e..695fbb9 100644 +--- a/sql/mysqld.cc ++++ b/sql/mysqld.cc +@@ -1436,7 +1436,9 @@ static void set_user(const char *user, struct passwd *user_info_arg) + output a specific message to help the user resolve this problem. + */ + calling_initgroups= TRUE; +- initgroups((char*) user, user_info_arg->pw_gid); ++/* Solaris patch */ ++/* initgroups((char*) user, user_info->pw_gid); */ ++ initgroups((char*) user,(gid_t) user_info->pw_gid); + calling_initgroups= FALSE; + #endif + if (setgid(user_info_arg->pw_gid) == -1) +-- +1.6.3.2 + Added: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0003-OpenCSW-perl-for-tests.patch =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0003-OpenCSW-perl-for-tests.patch (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0003-OpenCSW-perl-for-tests.patch 2009-09-16 01:53:44 UTC (rev 6315) @@ -0,0 +1,22 @@ +From bd9a3ff419f5a614d584aa6156a512e69f470e0f Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Wed, 16 Sep 2009 01:36:09 +0100 +Subject: [PATCH 3/4] OpenCSW perl for tests + +--- + mysql-test/mysql-test-run.pl | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl +index f60701b..cd9f843 100755 +--- a/mysql-test/mysql-test-run.pl ++++ b/mysql-test/mysql-test-run.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl ++#!/opt/csw/bin/perl + # -*- cperl -*- + + # +-- +1.6.3.2 + Added: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0004-basedir-and-datadir-in-the-cnf-files.patch =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0004-basedir-and-datadir-in-the-cnf-files.patch (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0004-basedir-and-datadir-in-the-cnf-files.patch 2009-09-16 01:53:44 UTC (rev 6315) @@ -0,0 +1,81 @@ +From 194dbf9ff230f747bb093970831fbdf4cb0f0674 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= +Date: Wed, 16 Sep 2009 01:38:35 +0100 +Subject: [PATCH 4/4] basedir and datadir in the cnf files + +--- + support-files/my-huge.cnf.sh | 2 ++ + support-files/my-innodb-heavy-4G.cnf.sh | 2 ++ + support-files/my-large.cnf.sh | 2 ++ + support-files/my-medium.cnf.sh | 2 ++ + support-files/my-small.cnf.sh | 2 ++ + 5 files changed, 10 insertions(+), 0 deletions(-) + +diff --git a/support-files/my-huge.cnf.sh b/support-files/my-huge.cnf.sh +index e4747ac..907b41d 100644 +--- a/support-files/my-huge.cnf.sh ++++ b/support-files/my-huge.cnf.sh +@@ -23,6 +23,8 @@ socket = @MYSQL_UNIX_ADDR@ + + # The MySQL server + [mysqld] ++basedir = /opt/csw/mysql5 ++datadir = /var/opt/csw/mysql5 + port = @MYSQL_TCP_PORT@ + socket = @MYSQL_UNIX_ADDR@ + skip-locking +diff --git a/support-files/my-innodb-heavy-4G.cnf.sh b/support-files/my-innodb-heavy-4G.cnf.sh +index cda11d6..a9d5514 100644 +--- a/support-files/my-innodb-heavy-4G.cnf.sh ++++ b/support-files/my-innodb-heavy-4G.cnf.sh +@@ -39,6 +39,8 @@ socket = @MYSQL_UNIX_ADDR@ + # The MySQL server + # + [mysqld] ++basedir = /opt/csw/mysql5 ++datadir = /var/opt/csw/mysql5 + + # generic configuration options + port = @MYSQL_TCP_PORT@ +diff --git a/support-files/my-large.cnf.sh b/support-files/my-large.cnf.sh +index 981b137..8b890fb 100644 +--- a/support-files/my-large.cnf.sh ++++ b/support-files/my-large.cnf.sh +@@ -23,6 +23,8 @@ socket = @MYSQL_UNIX_ADDR@ + + # The MySQL server + [mysqld] ++basedir = /opt/csw/mysql5 ++datadir = /var/opt/csw/mysql5 + port = @MYSQL_TCP_PORT@ + socket = @MYSQL_UNIX_ADDR@ + skip-locking +diff --git a/support-files/my-medium.cnf.sh b/support-files/my-medium.cnf.sh +index c3135ea..ef841db 100644 +--- a/support-files/my-medium.cnf.sh ++++ b/support-files/my-medium.cnf.sh +@@ -24,6 +24,8 @@ socket = @MYSQL_UNIX_ADDR@ + + # The MySQL server + [mysqld] ++basedir = /opt/csw/mysql5 ++datadir = /var/opt/csw/mysql5 + port = @MYSQL_TCP_PORT@ + socket = @MYSQL_UNIX_ADDR@ + skip-locking +diff --git a/support-files/my-small.cnf.sh b/support-files/my-small.cnf.sh +index 24c0840..89299dd 100644 +--- a/support-files/my-small.cnf.sh ++++ b/support-files/my-small.cnf.sh +@@ -24,6 +24,8 @@ socket = @MYSQL_UNIX_ADDR@ + + # The MySQL server + [mysqld] ++basedir = /opt/csw/mysql5 ++datadir = /var/opt/csw/mysql5 + port = @MYSQL_TCP_PORT@ + socket = @MYSQL_UNIX_ADDR@ + skip-locking +-- +1.6.3.2 + Copied: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW (from rev 6058, csw/mgar/pkg/mysql5/branches/legacy/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-09-16 01:53:44 UTC (rev 6315) @@ -0,0 +1,62 @@ +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 Copied: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 (from rev 6058, csw/mgar/pkg/mysql5/branches/legacy/cswmysql5) =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 2009-09-16 01:53:44 UTC (rev 6315) @@ -0,0 +1,180 @@ +#!/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 +# 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 +# for 'Using Option Files'. +# Support for mysql5rc still remains in this startup script. +# + +RETVAL=0 +MYSQLHOME=/opt/csw/mysql5 +MYSQLD_DATADIR=$MYSQLHOME/var +MYSQLD_PID_FILE=$MYSQLHOME/var/mysql.pid +CONFFILE=$MYSQLHOME/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 +# $MYSQLHOME/share/mysql +# For example, +# cp /opt/csw/mysql5/share/mysql/my-medium.cnf /opt/csw/mysql5/var/my.cnf +# +# Or, manually follow the database creation steps below, and have +# mysql just use defaults for everything. + +# 2006-03-11 Changed to only look for the grant tables database +# 2006-04-16 Changed again. Look for either the grant tables database +# or the options file. +# 2006-12-28 Fix problem. Look for either the grant tables database in +# the default location or the default options file. +if [ ! -d "$MYSQLD_DATADIR/mysql" -a ! -f "$CONFFILE" ] ; then + exit 0 +fi + +# If CONFFILE is the server default file, unset CONFFILE +if [ x"$CONFFILE" = x"$MYSQLHOME/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 + MYSQLD_DATADIR= +fi + +# Make sure required vars are set +MYSQLD_PID_FILE=${MYSQLD_PID_FILE:=$MYSQLHOME/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 + fi + + printf "%-60s" "Starting mysqld: " +# 2006-03-11 +# 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 +# fi + +# 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 + RETVAL=$? + if [ $RETVAL = 0 ] ; then + echo "[ OK ]" + else + echo "[FAILED]" + return 1 + fi + return 0 +} + +stop_it() { + + 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=$? + else + RETVAL=1 + fi + if [ $RETVAL = 0 ] ; then + echo "[ OK ]" + else + echo "[FAILED]" + fi + echo "" + return 0 +} + +case $1 in + start) + start_it + ;; + + stop) + stop_it + ;; + + restart) + stop_it + while pgrep mysqld > /dev/null + do + sleep 1 + done + start_it + ;; + + *) + echo "Usage: $0 { start | stop | restart } " + ;; +esac + +exit $RETVAL Copied: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw (from rev 6058, csw/mgar/pkg/mysql5/branches/legacy/quick_start-csw) =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw 2009-09-16 01:53:44 UTC (rev 6315) @@ -0,0 +1,132 @@ +#!/bin/ksh -p +# 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 +DEFAULTS_FILE=$BASEDIR/my.cnf +SAVE_DEFAULTS_FILE=$BASEDIR/my.cnf +MYSQLD_USER=mysql +# +# Provide a default data directory +MYSQLD_DATADIR=/opt/csw/mysql5/var +# +echo +echo "This is the blastwave quick start script to setup a MySQL5 database" +echo " directory." +echo +echo " The base directory is $BASEDIR." +echo " The default database directory is $MYSQLD_DATADIR." +echo +echo " If you have not setup a partition for the database and" +echo " you want one; now is a good time to exit this script and" +echo " create and mount the partition." +echo +echo " If you have not setup a my.cnf file and you do not want" +echo " one of the sample files; now is a good time to exit and" +echo " create the file $DEFAULTS_FILE." +echo +echo "Data directory: The default is $MYSQLD_DATADIR." +unset usrin +usrin=`/usr/bin/ckpath -ay -d [default] \ + -p "Accept the default or enter a directory" + ` || exit $? +if [ ! "$usrin" = "[default]" ]; then + MYSQLD_DATADIR=$usrin +fi +echo +echo "my.cnf pathname: The default is either to use the supplied file in" +echo " the base directory or to create one in the base directory from" +echo " the small memory footprint sample. If your enter a pathname," +echo " it will be used to create the options file in the base directory." +unset usrin +usrin=`/usr/bin/ckpath -f -d [default] \ + -p "Accept the default or enter a pathname" + ` || 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." + else + IN_DEFAULTS_FILE=$DEFAULTS_FILE + echo "Using $DEFAULTS_FILE as the options file." + fi +else + IN_DEFAULTS_FILE=$usrin + echo "Using $IN_DEFAULTS_FILE to create the options file." +fi + +echo "data directory is $MYSQLD_DATADIR" +if [ ! -d "$MYSQLD_DATADIR" ]; then + echo "data directory will be created." +fi + +unset usrin +usrin=`/usr/bin/ckyorn -d y \ + -p "Continue with installation or quit" + ` || exit $? +if [ "$usrin" = "n" ] ; then + echo "Leaving script without doing anything." + exit 0 +fi + +if [ -d "$MYSQLD_DATADIR/mysql" ]; then + echo "mysql database already exists. Leaving script without doing anything." + exit 0 +fi + +echo "Setting up the database" +# Create the database directory and set the permissions if needed +if [ ! -d "$MYSQLD_DATADIR" ] ; then + mkdir -p $MYSQLD_DATADIR + chown -R root:bin $MYSQLD_DATADIR + chmod -R 0755 $MYSQLD_DATADIR + chown mysql:mysql $MYSQLD_DATADIR + chmod 0700 $MYSQLD_DATADIR +fi +# +# copy the configuration file if not exists. +CNFCOPIED=no +if [ ! -f "$DEFAULTS_FILE" ] ; then + cp -p $IN_DEFAULTS_FILE $DEFAULTS_FILE + CNFCOPIED=yes +fi +# +# Run the mysql script to create the database +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 + +# +# Fix permissions on the data directory +chown -R mysql:mysql $MYSQLD_DATADIR + +# +# Update --datadir in the cnf file with the correct value if file was copied +if [ x"$CNFCOPIED" = xyes ]; then + sed -e "s|/opt/csw/mysql5/var|$MYSQLD_DATADIR|g" $DEFAULTS_FILE >$DEFAULTS_FILE.new + mv $DEFAULTS_FILE.new $DEFAULTS_FILE +fi + +# +# Ending message +echo +echo "### The following messages are from quick_start-csw." +echo "See /opt/csw/mysql5/share/mysql/doc/README.CSW for packaging changes." +echo "Please ignore references to starting mysqld_safe in the messages above." +echo " These messages are from mysql_install_db. See the following" +echo " for starting CSWmysql5." +smf=no +if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ] ; then smf=yes ; fi +if [ $smf = yes ] +then + echo "To start mysqld; run \`svcadm enable cswmysql5\` on Solaris 10 or later" +else + echo "To start mysqld; run \`/etc/init.d/cswmysql start\` on Solaris 9 or earlier" +fi + +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 Wed Sep 16 12:56:09 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 16 Sep 2009 10:56:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[6316] csw/mgar/pkg/puppet/trunk Message-ID: Revision: 6316 http://gar.svn.sourceforge.net/gar/?rev=6316&view=rev Author: wahwah Date: 2009-09-16 10:56:09 +0000 (Wed, 16 Sep 2009) Log Message: ----------- puppet: Using cswclassutils, separating CSWpuppetmaster, version bump to 0.25.0. Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/Makefile csw/mgar/pkg/puppet/trunk/checksums csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postremove csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preinstall csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preremove Added Paths: ----------- csw/mgar/pkg/puppet/trunk/files/cswusergroup Removed Paths: ------------- csw/mgar/pkg/puppet/trunk/files/CSWpuppet.gspec csw/mgar/pkg/puppet/trunk/files/cswpuppetd.xml csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd.xml csw/mgar/pkg/puppet/trunk/files/svc-cswpuppetd csw/mgar/pkg/puppet/trunk/files/svc-cswpuppetmasterd Property Changed: ---------------- csw/mgar/pkg/puppet/trunk/Makefile csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postremove csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preinstall csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preremove Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2009-09-16 01:53:44 UTC (rev 6315) +++ csw/mgar/pkg/puppet/trunk/Makefile 2009-09-16 10:56:09 UTC (rev 6316) @@ -1,58 +1,66 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + GARNAME = puppet -GARVERSION = 0.24.7 +GARVERSION = 0.25.0 CATEGORIES = apps -DESCRIPTION = a system configuration tool define BLURB Long description endef MASTER_SITES = http://reductivelabs.com/downloads/puppet/ -DISTFILES = $(GARNAME)-$(GARVERSION).tgz -DISTFILES += $(call admfiles,CSWpuppet,preinstall postinstall preremove postremove) -DISTFILES += cswpuppetd cswpuppetd.xml cswpuppetmasterd cswpuppetmasterd.xml -DISTFILES += svc-cswpuppetd svc-cswpuppetmasterd +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += cswpuppetd cswpuppetmasterd cswusergroup +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +SPKG_SOURCEURL = http://reductivelabs.com/products/puppet/ +INITSMF = $(sysconfdir)/init\.d/cswpuppetd +INITSMF += $(sysconfdir)/init\.d/cswpuppetmasterd +USERGROUP = $(sysconfdir)/pkg/CSWpuppet/cswusergroup + +# Creating a separate package CSWpuppetmaster so that the cswpuppetmaster +# service isn't started upon the installation of CSWpuppet. +PACKAGES = CSWpuppet CSWpuppetmaster + REQUIRED_PKGS = CSWfacter +REQUIRED_PKGS_CSWpuppetmaster = CSWpuppet -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +PKGFILES_CSWpuppetmaster = $(sysconfdir)/init\.d/cswpuppetmasterd +SPKG_DESC_CSWpuppet = System configuration management tool, client daemon +SPKG_DESC_CSWpuppetmaster = System configuration management tool, server ARCHALL=1 -CONFIGURE_SCRIPTS = none -BUILD_SCRIPTS = none -TEST_SCRIPTS = none +sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = INSTALL_SCRIPTS = puppet include gar/category.mk -configure-none: - @$(MAKECOOKIE) - -test-none: - @$(MAKECOOKIE) - -build-none: - @$(MAKECOOKIE) - install-puppet: @ginstall -d $(DESTDIR) - @ginstall -d $(DESTDIR)/etc/opt/csw/puppet - @ginstall -d $(DESTDIR)/var/opt/csw/puppet/run - @ginstall -d $(DESTDIR)/opt/csw/var/svc/manifest - @ginstall -d $(DESTDIR)/opt/csw/lib/svc/method + @ginstall -d $(DESTDIR)$(sysconfdir)/puppet + @ginstall -d $(DESTDIR)$(localstatedir)/puppet/run + ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/init.d + ginstall -m 755 $(FILEDIR)/cswpuppetd $(DESTDIR)$(sysconfdir)/init.d + ginstall -m 755 $(FILEDIR)/cswpuppetmasterd $(DESTDIR)$(sysconfdir)/init.d (cd $(WORKDIR)/$(DISTNAME) ; \ - gsed -e "s|/var/puppet|/var/opt/csw/puppet|g" < ./lib/puppet/defaults.rb > ./lib/puppet/defaults.rb.csw && gmv ./lib/puppet/defaults.rb.csw ./lib/puppet/defaults.rb; \ - gsed -e "s|/etc/puppet|/etc/opt/csw/puppet|g" < ./lib/puppet/defaults.rb > ./lib/puppet/defaults.rb.csw && gmv ./lib/puppet/defaults.rb.csw ./lib/puppet/defaults.rb; \ - DESTDIR=$(DESTDIR) ruby install.rb ; \ - cd $(DESTDIR)$(mandir)/man8 ; \ - gunzip * ) + gsed -e "s|/var/puppet|/var/opt/csw/puppet|g" -i ./lib/puppet/defaults.rb; \ + gsed -e "s|/etc/puppet|/etc/opt/csw/puppet|g" -i ./lib/puppet/defaults.rb; \ + gsed -e "s|/var/run/puppet|/var/opt/csw/puppet/run|g" -i ./lib/puppet/defaults.rb; \ + DESTDIR=$(DESTDIR) ruby install.rb; \ + cd $(DESTDIR)$(mandir)/man8 && gunzip *) (cd $(WORKDIR)/$(DISTNAME)/examples/etc/puppet ; \ for f in *; do \ if [ -f $$f ] ; then \ - cp $$f $(DESTDIR)/etc/opt/csw/puppet/$$f.example; \ - chmod 644 $(DESTDIR)/etc/opt/csw/puppet/$$f.example; \ + cp $$f $(DESTDIR)$(sysconfdir)/puppet/$$f.example; \ + chmod 644 $(DESTDIR)$(sysconfdir)/puppet/$$f.example; \ fi \ - done ) + done) @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/puppet/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2009-09-16 01:53:44 UTC (rev 6315) +++ csw/mgar/pkg/puppet/trunk/checksums 2009-09-16 10:56:09 UTC (rev 6316) @@ -1,12 +1,4 @@ -36f57de5c2e069d04752f0539034227d download/puppet-0.24.7.tgz -a8dc43771843b852f506f1795231d6ee download/CSWpuppet.gspec -11c352613cf14412565f26dde2dc7578 download/CSWpuppet.preinstall -b3a1e3bb293bf607368f3479b288f6eb download/CSWpuppet.postinstall -2465374a83d4fbe6e01b6eac410e62a8 download/CSWpuppet.preremove -2b76d69202476fad006d27d26364e59c download/CSWpuppet.postremove ecf6aae7bb8bd8ad9e064ed40674a7be download/cswpuppetd -dd10b02543d22bbe66994ef89409f7fd download/cswpuppetd.xml 066f9053e1342b19cf83f3f78ce2259c download/cswpuppetmasterd -38e007c1906fca70bc95dc45b5892581 download/cswpuppetmasterd.xml -ecf6aae7bb8bd8ad9e064ed40674a7be download/svc-cswpuppetd -066f9053e1342b19cf83f3f78ce2259c download/svc-cswpuppetmasterd +3ab0d4f9801075bc78b68b766b496fc7 download/cswusergroup +8900ff87260219020949ee0d21a7a1ff download/puppet-0.25.0.tar.gz Deleted: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.gspec =================================================================== --- csw/mgar/pkg/puppet/trunk/files/CSWpuppet.gspec 2009-09-16 01:53:44 UTC (rev 6315) +++ csw/mgar/pkg/puppet/trunk/files/CSWpuppet.gspec 2009-09-16 10:56:09 UTC (rev 6316) @@ -1,5 +0,0 @@ -%var bitname puppet -%var pkgname CSWpuppet -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/LICENCE -%include url file://%{PKGLIB}/smf_enabled.gspec Modified: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall =================================================================== --- csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall 2009-09-16 01:53:44 UTC (rev 6315) +++ csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall 2009-09-16 10:56:09 UTC (rev 6316) @@ -1,12 +1,24 @@ -PKG_INSTALL_ROOT=\${PKG_INSTALL_ROOT:-/} -/usr/bin/test -d \$PKG_INSTALL_ROOT/opt/csw/etc/puppet || /usr/sbin/chroot \$PKG_INSTALL_ROOT /usr/bin/ln -s /etc/opt/csw/puppet /opt/csw/etc/puppet -/usr/bin/test -d \$PKG_INSTALL_ROOT/etc/puppet || /usr/sbin/chroot \$PKG_INSTALL_ROOT /usr/bin/ln -s /opt/csw/etc/puppet /etc/puppet -/usr/bin/test -d \$PKG_INSTALL_ROOT/opt/csw/var/puppet || /usr/sbin/chroot \$PKG_INSTALL_ROOT /usr/bin/ln -s /var/opt/csw/puppet /opt/csw/var/puppet -/usr/bin/test -d \$PKG_INSTALL_ROOT/var/puppet || /usr/sbin/chroot \$PKG_INSTALL_ROOT /usr/bin/ln -s /var/opt/csw/puppet /var/puppet -touch \$PKG_INSTALL_ROOT/etc/opt/csw/puppet/puppet.conf -/usr/bin/test -f \$PKG_INSTALL_ROOT/opt/csw/etc/csw.conf && . \$PKG_INSTALL_ROOT/opt/csw/etc/csw.conf -/usr/bin/test -f \$PKG_INSTALL_ROOT/etc/opt/csw/csw.conf && . \$PKG_INSTALL_ROOT/etc/opt/csw/csw.conf -if [ "\$autoenable_daemons" != "no" ] ; then - /usr/sbin/chroot \$PKG_INSTALL_ROOT /usr/sbin/svccfg import /opt/csw/var/svc/manifest/puppetd.xml || /bin/true - /usr/sbin/chroot \$PKG_INSTALL_ROOT /usr/sbin/svcadm enable svc:network/puppetd || /bin/true +#!/bin/sh +# +# $Id$ +# + +PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-/} + +# Migration of the configuration files? +/usr/bin/test -d $PKG_INSTALL_ROOT/opt/csw/etc/puppet || /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/bin/ln -s /etc/opt/csw/puppet /opt/csw/etc/puppet +/usr/bin/test -d $PKG_INSTALL_ROOT/etc/puppet || /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/bin/ln -s /opt/csw/etc/puppet /etc/puppet +/usr/bin/test -d $PKG_INSTALL_ROOT/opt/csw/var/puppet || /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/bin/ln -s /var/opt/csw/puppet /opt/csw/var/puppet +/usr/bin/test -d $PKG_INSTALL_ROOT/var/puppet || /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/bin/ln -s /var/opt/csw/puppet /var/puppet + +# Replaced with INITSMF + +exit 0 + +touch $PKG_INSTALL_ROOT/etc/opt/csw/puppet/puppet.conf +/usr/bin/test -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf && . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf +/usr/bin/test -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf && . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf +if [ "$autoenable_daemons" != "no" ] ; then + /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/sbin/svccfg import /opt/csw/var/svc/manifest/puppetd.xml || /bin/true + /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/sbin/svcadm enable svc:network/puppetd || /bin/true fi Property changes on: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postremove =================================================================== --- csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postremove 2009-09-16 01:53:44 UTC (rev 6315) +++ csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postremove 2009-09-16 10:56:09 UTC (rev 6316) @@ -1,3 +1,10 @@ +#!/bin/sh +# +# $Id$ +# + +# 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 rm /var/puppet || /bin/true @@ -2 +9,2 @@ rm /opt/csw/var/puppet || /bin/true +rm -rf /opt/csw/lib/ruby/site_ruby/1.8/puppet Property changes on: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postremove ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preinstall =================================================================== --- csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preinstall 2009-09-16 01:53:44 UTC (rev 6315) +++ csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preinstall 2009-09-16 10:56:09 UTC (rev 6316) @@ -1,6 +1,20 @@ -PKG_INSTALL_ROOT=\${PKG_INSTALL_ROOT:-/} -\$PKG_INSTALL_ROOT/usr/sbin/chroot \$PKG_INSTALL_ROOT/ /usr/bin/getent group puppet > /dev/null || /usr/sbin/chroot \$PKG_INSTALL_ROOT /usr/sbin/groupadd puppet -\$PKG_INSTALL_ROOT/usr/sbin/chroot \$PKG_INSTALL_ROOT/ /usr/bin/getent passwd puppet > /dev/null || /usr/sbin/chroot \$PKG_INSTALL_ROOT /usr/sbin/useradd -g puppet -c "Puppet" -d /var/opt/csw/puppet -s "/bin/true" puppet +#!/bin/sh +# +# $Id$ +# -mkdir -p \$PKG_INSTALL_ROOT/etc/opt/csw/puppet -chown root:bin \$PKG_INSTALL_ROOT/etc/opt/csw/puppet +PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-/} + +# Replaced with cswusergroup + +exit 0 + +$PKG_INSTALL_ROOT/usr/sbin/chroot $PKG_INSTALL_ROOT/ /usr/bin/getent group puppet \ + > /dev/null \ + || /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/sbin/groupadd puppet +$PKG_INSTALL_ROOT/usr/sbin/chroot $PKG_INSTALL_ROOT/ /usr/bin/getent passwd puppet \ + > /dev/null \ + || /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/sbin/useradd -g puppet -c "Puppet" -d /var/opt/csw/puppet -s "/bin/true" puppet + +mkdir -p $PKG_INSTALL_ROOT/etc/opt/csw/puppet +chown root:bin $PKG_INSTALL_ROOT/etc/opt/csw/puppet Property changes on: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preinstall ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preremove =================================================================== --- csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preremove 2009-09-16 01:53:44 UTC (rev 6315) +++ csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preremove 2009-09-16 10:56:09 UTC (rev 6316) @@ -1,2 +1,11 @@ +#!/bin/sh +# +# $Id$ +# + +# Replaced with INITSMF + +exit 0 + /usr/sbin/svcadm disable svc:network/puppetd 2>/dev/null || /bin/true /usr/sbin/svccfg delete svc:network/puppetd || /bin/true Property changes on: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preremove ___________________________________________________________________ Added: svn:keywords + Id Deleted: csw/mgar/pkg/puppet/trunk/files/cswpuppetd.xml =================================================================== --- csw/mgar/pkg/puppet/trunk/files/cswpuppetd.xml 2009-09-16 01:53:44 UTC (rev 6315) +++ csw/mgar/pkg/puppet/trunk/files/cswpuppetd.xml 2009-09-16 10:56:09 UTC (rev 6316) @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Deleted: csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd.xml =================================================================== --- csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd.xml 2009-09-16 01:53:44 UTC (rev 6315) +++ csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd.xml 2009-09-16 10:56:09 UTC (rev 6316) @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Added: csw/mgar/pkg/puppet/trunk/files/cswusergroup =================================================================== --- csw/mgar/pkg/puppet/trunk/files/cswusergroup (rev 0) +++ csw/mgar/pkg/puppet/trunk/files/cswusergroup 2009-09-16 10:56:09 UTC (rev 6316) @@ -0,0 +1 @@ +puppet:puppet:Puppet configuration management:/var/opt/csw/puppet:/bin/false:: Deleted: csw/mgar/pkg/puppet/trunk/files/svc-cswpuppetd =================================================================== --- csw/mgar/pkg/puppet/trunk/files/svc-cswpuppetd 2009-09-16 01:53:44 UTC (rev 6315) +++ csw/mgar/pkg/puppet/trunk/files/svc-cswpuppetd 2009-09-16 10:56:09 UTC (rev 6316) @@ -1,66 +0,0 @@ -#!/bin/sh -# This is the /etc/init.d file for puppetd -# Modified for CSW -# -# description: puppetd - Puppet Automation Client -# - -. /lib/svc/share/smf_include.sh - -prefix=/opt/csw -exec_prefix=/opt/csw -sysconfdir=/opt/csw/etc -sbindir=/opt/csw/bin - -pidfile=/var/opt/csw/puppet/run/puppetd.pid - -case "$1" in -start) - cd / - # Start daemons. - - printf "Starting Puppet client services:" - - /opt/csw/bin/puppetd - - printf " puppetd" - echo "" - ;; -stop) - printf "Stopping Puppet client services:" - kill `cat $pidfile` - - printf " puppetd" - echo "" - ;; -restart) - printf "Restarting Puppet client services:" - kill -HUP `cat $pidfile` - - printf " puppetd" - echo "" - ;; -reload) - printf "Reloading Puppet client services:" - - kill -HUP `cat $pidfile` - - printf " puppetd" - echo "" - ;; -status) - if [ -f $pidfile ]; then - pid=`cat $pidfile` - curpid=`pgrep puppetd` - if [ "$pid" -eq "$curpid" ]; then - exit 0 - else - exit 1 - fi - else - exit 1 - fi -esac -exit 0 - -# $Id$ Deleted: csw/mgar/pkg/puppet/trunk/files/svc-cswpuppetmasterd =================================================================== --- csw/mgar/pkg/puppet/trunk/files/svc-cswpuppetmasterd 2009-09-16 01:53:44 UTC (rev 6315) +++ csw/mgar/pkg/puppet/trunk/files/svc-cswpuppetmasterd 2009-09-16 10:56:09 UTC (rev 6316) @@ -1,62 +0,0 @@ -#!/bin/sh -# - -. /lib/svc/share/smf_include.sh - -prefix=/opt/csw -exec_prefix=/opt/csw -sysconfdir=/opt/csw/etc -sbindir=/opt/csw/sbin - -pidfile=/var/opt/csw/puppet/run/puppetmasterd.pid - -case "$1" in -start) - cd / - # Start daemons. - - printf "Starting Puppet server services:" - - /opt/csw/bin/puppetmasterd - - printf " puppetmaster" - echo "" - ;; -stop) - printf "Stopping Puppet server services:" - kill `cat $pidfile` - - printf " puppetmasterd" - echo "" - ;; -restart) - printf "Restarting Puppet server services:" - kill -HUP `cat $pidfile` - - printf " puppetmasterd" - echo "" - ;; -reload) - printf "Reloading Puppet server services:" - - kill -HUP `cat $pidfile` - - printf " puppetmasterd" - echo "" - ;; -status) - if [ -f $pidfile ]; then - pid=`cat $pidfile` - curpid=`pgrep puppetmasterd` - if [ "$pid" -eq "$curpid" ]; then - exit 0 - else - exit 1 - fi - else - exit 1 - fi -esac -exit 0 - -# $Id$ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Wed Sep 16 13:56:03 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Wed, 16 Sep 2009 11:56:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[6317] csw/mgar/pkg/jetty6/trunk Message-ID: Revision: 6317 http://gar.svn.sourceforge.net/gar/?rev=6317&view=rev Author: trygvis Date: 2009-09-16 11:56:03 +0000 (Wed, 16 Sep 2009) Log Message: ----------- o Adding my Jetty6 work, even if it is not done. Modified Paths: -------------- csw/mgar/pkg/jetty6/trunk/Makefile csw/mgar/pkg/jetty6/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/jetty6/trunk/ Property changes on: csw/mgar/pkg/jetty6/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/jetty6/trunk/Makefile =================================================================== --- csw/mgar/pkg/jetty6/trunk/Makefile 2009-09-16 10:56:09 UTC (rev 6316) +++ csw/mgar/pkg/jetty6/trunk/Makefile 2009-09-16 11:56:03 UTC (rev 6317) @@ -1,7 +1,6 @@ GARNAME = jetty6 -GARVERSION = 6.1.7 +GARVERSION = 6.1.14 CATEGORIES = server - GARCH=all DESCRIPTION = Standards-based, full-featured web server and servlet container. @@ -21,20 +20,26 @@ DISTFILES += $(call admfiles,CSW$(GARNAME),prototype csw_usrgrp_config postinstall) DISTFILES += $(call admfiles,CSW$(GARNAME)doc,prototype) +REQUIRED_PKGS = + +SPKG_SOURCEURL = http://jetty.mortbay.org + +SPKG_DESC_CSWjetty6doc=Documentation for Jetty 6 + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = jetty-(\d+(?:\.\d+)*).zip -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = -TEST_SCRIPTS = -INSTALL_SCRIPTS = common +#CONFIGURE_SCRIPTS = +#BUILD_SCRIPTS = +SKIPTEST = 1 +#INSTALL_SCRIPTS = custom include gar/category.mk COPY_FILES=LICENSES README.txt VERSION.txt etc lib resources/log4j.properties start.jar javadoc TO_COPY=$(foreach file,$(COPY_FILES),cp $(WORKDIR)/jetty-$(GARVERSION)/$(COPY_FILES) $(DESTDIR)/opt/csw/share/jetty6/$(COPY_FILES)) -install-common: +install-custom: mkdir -p $(DESTDIR)/opt/csw/share mkdir -p $(DESTDIR)/etc/init.d mkdir -p $(DESTDIR)/etc/default Modified: csw/mgar/pkg/jetty6/trunk/checksums =================================================================== --- csw/mgar/pkg/jetty6/trunk/checksums 2009-09-16 10:56:09 UTC (rev 6316) +++ csw/mgar/pkg/jetty6/trunk/checksums 2009-09-16 11:56:03 UTC (rev 6317) @@ -1,4 +1,4 @@ -22b79a589bce55bc05f14fc974a24adf download/jetty-6.1.7.zip +b09a660b234e6613a866cb471280bf40 download/jetty-6.1.14.zip 240dc05bf7522e73f0fc6729ebecc77c download/default-jetty6 06f0ab966be58c3fa4d76876323db0fd download/etc-README.txt 0f3208426ea992044c35ba10b7f3a8e0 download/share-jetty.xml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Wed Sep 16 14:10:42 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Wed, 16 Sep 2009 12:10:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[6318] csw/mgar/pkg/Makefile Message-ID: Revision: 6318 http://gar.svn.sourceforge.net/gar/?rev=6318&view=rev Author: trygvis Date: 2009-09-16 12:10:42 +0000 (Wed, 16 Sep 2009) Log Message: ----------- o Adding a 'scm-help' target. Modified Paths: -------------- csw/mgar/pkg/Makefile Modified: csw/mgar/pkg/Makefile =================================================================== --- csw/mgar/pkg/Makefile 2009-09-16 11:56:03 UTC (rev 6317) +++ csw/mgar/pkg/Makefile 2009-09-16 12:10:42 UTC (rev 6318) @@ -14,6 +14,13 @@ default: @echo "You are in the pkg/ directory." +scm-update-packages: + @echo "Updating packages..." + @svn up --ignore-externals + +scm-help: + @cat ../gar/v2/scm-help + %: @for i in $(filter-out $(FILTER_DIRS),$(wildcard */)) ; do \ $(MAKE) -C $$i $* ; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Wed Sep 16 14:11:28 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Wed, 16 Sep 2009 12:11:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[6319] csw/mgar/pkg/ghc/trunk Message-ID: Revision: 6319 http://gar.svn.sourceforge.net/gar/?rev=6319&view=rev Author: trygvis Date: 2009-09-16 12:11:27 +0000 (Wed, 16 Sep 2009) Log Message: ----------- o Adding my GHC work, even if it is not done. Modified Paths: -------------- csw/mgar/pkg/ghc/trunk/Makefile csw/mgar/pkg/ghc/trunk/checksums csw/mgar/pkg/ghc/trunk/files/CSWghc-prof.gspec csw/mgar/pkg/ghc/trunk/files/CSWghc.gspec Modified: csw/mgar/pkg/ghc/trunk/Makefile =================================================================== --- csw/mgar/pkg/ghc/trunk/Makefile 2009-09-16 12:10:42 UTC (rev 6318) +++ csw/mgar/pkg/ghc/trunk/Makefile 2009-09-16 12:11:27 UTC (rev 6319) @@ -42,8 +42,15 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARVERSION)/$(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -PKGFILES_CSWghc-prof = $(prefix)/.*\.p_hi +PKGFILES_CSWghc-prof = $(prefix)/.*\.p_hi +PKGFILES_CSWghc-prof += $(prefix)/.*\.so +#PKGFILES_CSWghc = +#PKGFILES_CSWghc = $(prefix)/.* +#PKGFILES_CSWghc += $(prefix)/.*\.a +#PKGFILES_CSWghc += $(PKGFILES_DEVEL) +#PKGFILES_CSWghc += $(PKGFILES_RT) + CONFIGURE_ARGS = $(DIRPATHS) # Disabled for now TEST_SCRIPTS = Modified: csw/mgar/pkg/ghc/trunk/checksums =================================================================== --- csw/mgar/pkg/ghc/trunk/checksums 2009-09-16 12:10:42 UTC (rev 6318) +++ csw/mgar/pkg/ghc/trunk/checksums 2009-09-16 12:11:27 UTC (rev 6319) @@ -1,6 +1,6 @@ dfa31028b4d06d1d226f55fe3a2ab7b3 download/ghc-6.8.3-src.tar.bz2 +c92b368262a194e8b859815415bc10d0 download/testsuite-6.8.3.tar.gz ee43ceea42b9353b6613db6d4058ab0a download/ghc-6.8.3-sparc-sun-solaris2.tar.bz2 907c15e1d7d33dfd5a829936fe18176a download/ghc-6.8.3-i386-unknown-solaris2.tar.bz2 -c92b368262a194e8b859815415bc10d0 download/testsuite-6.8.3.tar.gz -41b4ca8ae020320be23571cd8a71d4dd download/CSWghc.gspec -2c370b5638a7c14488b6844972e74aae download/CSWghc-prof.gspec +8f73e728ba2e6f65f738a302d1cc8ff4 download/CSWghc.gspec +2a3d93a43a4499e0c3366f660ffda4bf download/CSWghc-prof.gspec Modified: csw/mgar/pkg/ghc/trunk/files/CSWghc-prof.gspec =================================================================== --- csw/mgar/pkg/ghc/trunk/files/CSWghc-prof.gspec 2009-09-16 12:10:42 UTC (rev 6318) +++ csw/mgar/pkg/ghc/trunk/files/CSWghc-prof.gspec 2009-09-16 12:11:27 UTC (rev 6319) @@ -1,3 +1,10 @@ +# Copyright 2008 OpenCSW +# +# 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. + %var bitname ghc_prof %var pkgname CSWghc-prof %include url file://%{PKGLIB}/csw_dyndepend.gspec Modified: csw/mgar/pkg/ghc/trunk/files/CSWghc.gspec =================================================================== --- csw/mgar/pkg/ghc/trunk/files/CSWghc.gspec 2009-09-16 12:10:42 UTC (rev 6318) +++ csw/mgar/pkg/ghc/trunk/files/CSWghc.gspec 2009-09-16 12:11:27 UTC (rev 6319) @@ -1,3 +1,10 @@ +# Copyright 2008 OpenCSW +# +# 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. + %var bitname ghc %var pkgname CSWghc %include url file://%{PKGLIB}/csw_dyndepend.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 Wed Sep 16 16:07:48 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 16 Sep 2009 14:07:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[6320] csw/mgar/pkg/docbook-dtds/trunk Message-ID: Revision: 6320 http://gar.svn.sourceforge.net/gar/?rev=6320&view=rev Author: bdwalton Date: 2009-09-16 14:07:48 +0000 (Wed, 16 Sep 2009) Log Message: ----------- docbook-dtds: update entities patch for 4.5 Modified Paths: -------------- csw/mgar/pkg/docbook-dtds/trunk/checksums csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtds-ents.patch Modified: csw/mgar/pkg/docbook-dtds/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/checksums 2009-09-16 12:11:27 UTC (rev 6319) +++ csw/mgar/pkg/docbook-dtds/trunk/checksums 2009-09-16 14:07:48 UTC (rev 6320) @@ -16,7 +16,7 @@ 8167663f53857ded5095768a85eee387 download/docbook-dtd40-sgml-1.0.catalog.patch e976c302070ec2e14316d4a601c224cb download/docbook-dtd41-sgml-1.0.catalog.patch 0ee42c28835cd448b6b47b2345394b28 download/docbook-dtd42-sgml-1.0.catalog.patch -1dae3f33fe7dda3fd68a4d4a3df2c653 download/docbook-dtds-ents.patch +7e4a8a4b7c5d311ab3dcaf81a9dc6a08 download/docbook-dtds-ents.patch 73fe50dfe74ca631c1602f558ed8961f download/docbook-xml-4.2.zip ab200202b9e136a144db1e0864c45074 download/docbook-xml-4.3.zip cbb04e9a700955d88c50962ef22c1634 download/docbook-xml-4.4.zip Modified: csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtds-ents.patch =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtds-ents.patch 2009-09-16 12:11:27 UTC (rev 6319) +++ csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtds-ents.patch 2009-09-16 14:07:48 UTC (rev 6320) @@ -32,3 +32,22 @@ +-- -- End of catalog data for DocBook V4.4 ................................. -- -- ...................................................................... -- +diff -urNp docbook-dtds-1.0-orig/4.5-sgml/docbook.cat docbook-dtds-1.0/4.5-sgml/docbook.cat +--- docbook-dtds-1.0-orig/4.5-sgml/docbook.cat 2009-02-19 13:45:22.000000000 +0100 ++++ docbook-dtds-1.0/4.5-sgml/docbook.cat 2009-02-19 13:47:31.000000000 +0100 +@@ -60,6 +60,7 @@ PUBLIC "-//OASIS//ENTITIES DocBook Chara + + -- ...................................................................... -- + -- ISO entity sets ...................................................... -- ++-- + + PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" + "iso-dia.gml" +@@ -118,5 +119,7 @@ PUBLIC "ISO 8879:1986//ENTITIES Russian + PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" + "iso-cyr2.gml" + ++-- ++ + -- End of catalog data for DocBook V4.5 ................................. -- + -- ...................................................................... -- 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 Sep 16 16:48:52 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 16 Sep 2009 14:48:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[6321] csw/mgar/pkg/docbook-dtds/trunk Message-ID: Revision: 6321 http://gar.svn.sourceforge.net/gar/?rev=6321&view=rev Author: bdwalton Date: 2009-09-16 14:48:51 +0000 (Wed, 16 Sep 2009) Log Message: ----------- docbook-dtds: correct registration of db 4.5 stuff Modified Paths: -------------- csw/mgar/pkg/docbook-dtds/trunk/Makefile csw/mgar/pkg/docbook-dtds/trunk/checksums csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall Added Paths: ----------- csw/mgar/pkg/docbook-dtds/trunk/files/docbook-sgml-systemrewrite.patch Modified: csw/mgar/pkg/docbook-dtds/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/Makefile 2009-09-16 14:07:48 UTC (rev 6320) +++ csw/mgar/pkg/docbook-dtds/trunk/Makefile 2009-09-16 14:48:51 UTC (rev 6321) @@ -64,6 +64,7 @@ PATCHFILES += docbook-dtd41-sgml-1.0.catalog.patch PATCHFILES += docbook-dtd42-sgml-1.0.catalog.patch PATCHFILES += docbook-dtds-ents.patch +PATCHFILES += docbook-sgml-systemrewrite.patch PATCHFILES += add_makefile.patch # we don't need no stinkin' configure! :) Modified: csw/mgar/pkg/docbook-dtds/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/checksums 2009-09-16 14:07:48 UTC (rev 6320) +++ csw/mgar/pkg/docbook-dtds/trunk/checksums 2009-09-16 14:48:51 UTC (rev 6321) @@ -1,4 +1,4 @@ -c4074456da444839aa6010c8721a56da download/CSWdocbookdtds.postinstall +f0d84543fabf17484edd08a39b2c6db0 download/CSWdocbookdtds.postinstall da4b8f64c222276d2c291bf8afb20517 download/CSWdocbookdtds.preremove 39e1c752fddfed4f89c8276c42ec95d4 download/add_makefile.patch 9a7f5b1b7dd52d0ca4fb080619f0459c download/docbk30.zip @@ -17,6 +17,7 @@ e976c302070ec2e14316d4a601c224cb download/docbook-dtd41-sgml-1.0.catalog.patch 0ee42c28835cd448b6b47b2345394b28 download/docbook-dtd42-sgml-1.0.catalog.patch 7e4a8a4b7c5d311ab3dcaf81a9dc6a08 download/docbook-dtds-ents.patch +698cd105d772a263c022a613339bb9b5 download/docbook-sgml-systemrewrite.patch 73fe50dfe74ca631c1602f558ed8961f download/docbook-xml-4.2.zip ab200202b9e136a144db1e0864c45074 download/docbook-xml-4.3.zip cbb04e9a700955d88c50962ef22c1634 download/docbook-xml-4.4.zip Modified: csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall 2009-09-16 14:07:48 UTC (rev 6320) +++ csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall 2009-09-16 14:48:51 UTC (rev 6321) @@ -590,6 +590,12 @@ $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ "xml-dtd-4.5/soextblx.dtd" $CATALOG + $PREFIX $XMLCAT --noout --add "rewriteSystem" \ + "http://www.oasis-open.org/docbook/xml/4.5" \ + "xml-dtd-4.5" $CATALOG + $PREFIX $XMLCAT --noout --add "rewriteURI" \ + "http://www.oasis-open.org/docbook/xml/4.5" \ + "xml-dtd-4.5" $CATALOG fi # Finally, make sure everything in $CSWSGMLCNF is readable! Added: csw/mgar/pkg/docbook-dtds/trunk/files/docbook-sgml-systemrewrite.patch =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/docbook-sgml-systemrewrite.patch (rev 0) +++ csw/mgar/pkg/docbook-dtds/trunk/files/docbook-sgml-systemrewrite.patch 2009-09-16 14:48:51 UTC (rev 6321) @@ -0,0 +1,210 @@ +diff -urNp docbook-dtds-1.0-orig/3.0-sgml/docbook.cat docbook-dtds-1.0/3.0-sgml/docbook.cat +--- docbook-dtds-1.0-orig/3.0-sgml/docbook.cat 2009-02-05 16:44:15.000000000 +0100 ++++ docbook-dtds-1.0/3.0-sgml/docbook.cat 2009-02-05 16:48:58.000000000 +0100 +@@ -30,6 +30,12 @@ + SGMLDECL "docbook.dcl" + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++ ++SYSTEM "http://www.oasis-open.org/docbook/sgml/3.0/docbook.dtd" ++ "docbook.dtd" ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//Davenport//DTD DocBook V3.0//EN" "docbook.dtd" +diff -urNp docbook-dtds-1.0-orig/3.1-sgml/docbook.cat docbook-dtds-1.0/3.1-sgml/docbook.cat +--- docbook-dtds-1.0-orig/3.1-sgml/docbook.cat 2009-02-05 16:44:15.000000000 +0100 ++++ docbook-dtds-1.0/3.1-sgml/docbook.cat 2009-02-05 16:56:51.000000000 +0100 +@@ -22,6 +22,12 @@ + SGMLDECL "docbook.dcl" + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++ ++SYSTEM "http://www.oasis-open.org/docbook/sgml/3.0/docbook.dtd" ++ "docbook.dtd" ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//OASIS//DTD DocBook V3.1//EN" "docbook.dtd" +diff -urNp docbook-dtds-1.0-orig/4.0-sgml/docbook.cat docbook-dtds-1.0/4.0-sgml/docbook.cat +--- docbook-dtds-1.0-orig/4.0-sgml/docbook.cat 2009-02-05 16:44:16.000000000 +0100 ++++ docbook-dtds-1.0/4.0-sgml/docbook.cat 2009-02-05 16:49:06.000000000 +0100 +@@ -22,6 +22,12 @@ + SGMLDECL "docbook.dcl" + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++ ++SYSTEM "http://www.oasis-open.org/docbook/sgml/4.0/docbook.dtd" ++ "docbook.dtd" ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//OASIS//DTD DocBook V4.0//EN" "docbook.dtd" +Bin?rn? soubory docbook-dtds-1.0-orig/4.0-sgml/.docbook.cat.swp a docbook-dtds-1.0/4.0-sgml/.docbook.cat.swp jsou r?zn? +diff -urNp docbook-dtds-1.0-orig/4.1-sgml/docbook.cat docbook-dtds-1.0/4.1-sgml/docbook.cat +--- docbook-dtds-1.0-orig/4.1-sgml/docbook.cat 2009-02-05 16:44:16.000000000 +0100 ++++ docbook-dtds-1.0/4.1-sgml/docbook.cat 2009-02-05 16:49:27.000000000 +0100 +@@ -22,6 +22,12 @@ + SGMLDECL "docbook.dcl" + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++SYSTEM "http://www.oasis-open.org/docbook/sgml/4.1/docbook.dtd" ++ "docbook.dtd" ++ ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//OASIS//DTD DocBook V4.1//EN" "docbook.dtd" +diff -urNp docbook-dtds-1.0-orig/4.1.2-xml/docbook.cat docbook-dtds-1.0/4.1.2-xml/docbook.cat +--- docbook-dtds-1.0-orig/4.1.2-xml/docbook.cat 2000-08-27 17:19:42.000000000 +0200 ++++ docbook-dtds-1.0/4.1.2-xml/docbook.cat 2009-02-05 16:52:16.000000000 +0100 +@@ -17,6 +17,12 @@ + -- + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++ ++SYSTEM "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" ++ "docbookx.dtd" ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "docbookx.dtd" +diff -urNp docbook-dtds-1.0-orig/4.2-sgml/docbook.cat docbook-dtds-1.0/4.2-sgml/docbook.cat +--- docbook-dtds-1.0-orig/4.2-sgml/docbook.cat 2009-02-05 16:44:17.000000000 +0100 ++++ docbook-dtds-1.0/4.2-sgml/docbook.cat 2009-02-05 16:50:10.000000000 +0100 +@@ -17,6 +17,12 @@ + -- + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++ ++SYSTEM "http://www.oasis-open.org/docbook/sgml/4.2/docbook.dtd" ++ "docbook.dtd" ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//OASIS//DTD DocBook V4.2//EN" +diff -urNp docbook-dtds-1.0-orig/4.2-xml/docbook.cat docbook-dtds-1.0/4.2-xml/docbook.cat +--- docbook-dtds-1.0-orig/4.2-xml/docbook.cat 2002-07-17 18:14:41.000000000 +0200 ++++ docbook-dtds-1.0/4.2-xml/docbook.cat 2009-02-05 16:52:53.000000000 +0100 +@@ -17,6 +17,12 @@ + -- + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++ ++SYSTEM "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" ++ "docbookx.dtd" ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" +diff -urNp docbook-dtds-1.0-orig/4.3-sgml/docbook.cat docbook-dtds-1.0/4.3-sgml/docbook.cat +--- docbook-dtds-1.0-orig/4.3-sgml/docbook.cat 2009-02-05 16:44:18.000000000 +0100 ++++ docbook-dtds-1.0/4.3-sgml/docbook.cat 2009-02-05 16:50:37.000000000 +0100 +@@ -17,6 +17,13 @@ + -- + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++ ++SYSTEM "http://www.oasis-open.org/docbook/sgml/4.3/docbook.dtd" ++ "docbook.dtd" ++ ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//OASIS//DTD DocBook V4.3//EN" +diff -urNp docbook-dtds-1.0-orig/4.3-xml/docbook.cat docbook-dtds-1.0/4.3-xml/docbook.cat +--- docbook-dtds-1.0-orig/4.3-xml/docbook.cat 2004-03-31 13:22:18.000000000 +0200 ++++ docbook-dtds-1.0/4.3-xml/docbook.cat 2009-02-05 16:53:12.000000000 +0100 +@@ -17,6 +17,12 @@ + -- + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++ ++SYSTEM "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" ++ "docbookx.dtd" ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" +diff -urNp docbook-dtds-1.0-orig/4.4-sgml/docbook.cat docbook-dtds-1.0/4.4-sgml/docbook.cat +--- docbook-dtds-1.0-orig/4.4-sgml/docbook.cat 2009-02-05 16:44:18.000000000 +0100 ++++ docbook-dtds-1.0/4.4-sgml/docbook.cat 2009-02-05 16:50:57.000000000 +0100 +@@ -17,6 +17,12 @@ + -- + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++ ++SYSTEM "http://www.oasis-open.org/docbook/sgml/4.4/docbook.dtd" ++ "docbook.dtd" ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//OASIS//DTD DocBook V4.4//EN" +diff -urNp docbook-dtds-1.0-orig/4.4-xml/docbook.cat docbook-dtds-1.0/4.4-xml/docbook.cat +--- docbook-dtds-1.0-orig/4.4-xml/docbook.cat 2005-01-27 14:57:19.000000000 +0100 ++++ docbook-dtds-1.0/4.4-xml/docbook.cat 2009-02-05 16:53:30.000000000 +0100 +@@ -17,6 +17,12 @@ + -- + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++ ++SYSTEM "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" ++ "docbookx.dtd" ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" +diff -urNp docbook-dtds-1.0-orig/4.5-sgml/docbook.cat docbook-dtds-1.0/4.5-sgml/docbook.cat +--- docbook-dtds-1.0-orig/4.5-sgml/docbook.cat 2006-10-03 15:27:50.000000000 +0200 ++++ docbook-dtds-1.0/4.5-sgml/docbook.cat 2009-02-05 16:51:22.000000000 +0100 +@@ -17,6 +17,12 @@ + -- + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++ ++SYSTEM "http://www.oasis-open.org/docbook/sgml/4.5/docbook.dtd" ++ "docbook.dtd" ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//OASIS//DTD DocBook V4.5//EN" +diff -urNp docbook-dtds-1.0-orig/4.5-xml/docbook.cat docbook-dtds-1.0/4.5-xml/docbook.cat +--- docbook-dtds-1.0-orig/4.5-xml/docbook.cat 2006-10-03 15:26:00.000000000 +0200 ++++ docbook-dtds-1.0/4.5-xml/docbook.cat 2009-02-05 16:55:45.000000000 +0100 +@@ -17,6 +17,12 @@ + -- + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++ ++SYSTEM "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" ++ "docbookx.dtd" ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" 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 Sep 16 17:29:52 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 16 Sep 2009 15:29:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[6322] csw/mgar/pkg/puppet/trunk Message-ID: Revision: 6322 http://gar.svn.sourceforge.net/gar/?rev=6322&view=rev Author: wahwah Date: 2009-09-16 15:29:51 +0000 (Wed, 16 Sep 2009) Log Message: ----------- puppet: Version downgrade to 0.24.8, small formatting changes. Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/Makefile csw/mgar/pkg/puppet/trunk/checksums csw/mgar/pkg/puppet/trunk/files/cswpuppetd Property Changed: ---------------- csw/mgar/pkg/puppet/trunk/files/cswpuppetd csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd csw/mgar/pkg/puppet/trunk/files/cswusergroup Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2009-09-16 14:48:51 UTC (rev 6321) +++ csw/mgar/pkg/puppet/trunk/Makefile 2009-09-16 15:29:51 UTC (rev 6322) @@ -1,19 +1,29 @@ # Copyright 2009 OpenCSW # Distributed under the terms of the GNU General Public License v2 # $Id$ +# +# Based on a build script[1] written by Gary Law. +# +# [1] http://garylaw.net/packages/puppet-build.sh GARNAME = puppet -GARVERSION = 0.25.0 +GARVERSION = 0.24.8 CATEGORIES = apps define BLURB - Long description + Puppet helps accomplish the goal of a hands-off, automated infrastructure. + The benefits of automated infrastructure go beyond policy-enforced + consistency and auditing. The impact of hardware failure and other disaster + scenarios can be mitigated, as services can be quickly restored by Puppet. In + conjunction with virtualizaton, the ability to reliably create new systems + running consistent services can be leveraged to create autoscaling + applications as well as test systems identical to production environments. endef MASTER_SITES = http://reductivelabs.com/downloads/puppet/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION).tgz DISTFILES += cswpuppetd cswpuppetmasterd cswusergroup -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz SPKG_SOURCEURL = http://reductivelabs.com/products/puppet/ INITSMF = $(sysconfdir)/init\.d/cswpuppetd @@ -25,6 +35,7 @@ PACKAGES = CSWpuppet CSWpuppetmaster REQUIRED_PKGS = CSWfacter +PREREQUISITE_PKGS = $(REQUIRED_PKGS) REQUIRED_PKGS_CSWpuppetmaster = CSWpuppet PKGFILES_CSWpuppetmaster = $(sysconfdir)/init\.d/cswpuppetmasterd @@ -44,23 +55,23 @@ include gar/category.mk install-puppet: - @ginstall -d $(DESTDIR) - @ginstall -d $(DESTDIR)$(sysconfdir)/puppet - @ginstall -d $(DESTDIR)$(localstatedir)/puppet/run + ginstall -d $(DESTDIR) + ginstall -d $(DESTDIR)$(sysconfdir)/puppet + ginstall -d $(DESTDIR)$(localstatedir)/puppet/run ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/init.d ginstall -m 755 $(FILEDIR)/cswpuppetd $(DESTDIR)$(sysconfdir)/init.d ginstall -m 755 $(FILEDIR)/cswpuppetmasterd $(DESTDIR)$(sysconfdir)/init.d - (cd $(WORKDIR)/$(DISTNAME) ; \ + (cd $(WORKSRC) && \ gsed -e "s|/var/puppet|/var/opt/csw/puppet|g" -i ./lib/puppet/defaults.rb; \ gsed -e "s|/etc/puppet|/etc/opt/csw/puppet|g" -i ./lib/puppet/defaults.rb; \ - gsed -e "s|/var/run/puppet|/var/opt/csw/puppet/run|g" -i ./lib/puppet/defaults.rb; \ - DESTDIR=$(DESTDIR) ruby install.rb; \ - cd $(DESTDIR)$(mandir)/man8 && gunzip *) - (cd $(WORKDIR)/$(DISTNAME)/examples/etc/puppet ; \ + gsed -e "s|/var/run/puppet|/var/opt/csw/puppet/run|g" -i ./lib/puppet/defaults.rb) + cd $(WORKSRC) && DESTDIR=$(DESTDIR) ruby install.rb + cd $(DESTDIR)$(mandir)/man8 && gunzip * + (cd $(WORKSRC)/examples/etc/puppet && \ for f in *; do \ - if [ -f $$f ] ; then \ - cp $$f $(DESTDIR)$(sysconfdir)/puppet/$$f.example; \ - chmod 644 $(DESTDIR)$(sysconfdir)/puppet/$$f.example; \ - fi \ + if [ -f $$f ] ; then \ + cp $$f $(DESTDIR)$(sysconfdir)/puppet/$$f.example; \ + chmod 644 $(DESTDIR)$(sysconfdir)/puppet/$$f.example; \ + fi \ done) @$(MAKECOOKIE) Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2009-09-16 14:48:51 UTC (rev 6321) +++ csw/mgar/pkg/puppet/trunk/checksums 2009-09-16 15:29:51 UTC (rev 6322) @@ -1,4 +1,4 @@ -ecf6aae7bb8bd8ad9e064ed40674a7be download/cswpuppetd +7331526709cf8cbce59421157068c184 download/cswpuppetd 066f9053e1342b19cf83f3f78ce2259c download/cswpuppetmasterd 3ab0d4f9801075bc78b68b766b496fc7 download/cswusergroup -8900ff87260219020949ee0d21a7a1ff download/puppet-0.25.0.tar.gz +288d46dee00acad64d0f3ecc6d8ba6fa download/puppet-0.24.8.tgz Modified: csw/mgar/pkg/puppet/trunk/files/cswpuppetd =================================================================== --- csw/mgar/pkg/puppet/trunk/files/cswpuppetd 2009-09-16 14:48:51 UTC (rev 6321) +++ csw/mgar/pkg/puppet/trunk/files/cswpuppetd 2009-09-16 15:29:51 UTC (rev 6322) @@ -1,4 +1,7 @@ #!/bin/sh +# +# $Id$ +# # This is the /etc/init.d file for puppetd # Modified for CSW # @@ -21,7 +24,7 @@ printf "Starting Puppet client services:" - /opt/csw/bin/puppetd + ${sbindir}/puppetd printf " puppetd" echo "" @@ -45,8 +48,8 @@ kill -HUP `cat $pidfile` - printf " puppetd" - echo "" + printf " puppetd" + echo "" ;; status) if [ -f $pidfile ]; then @@ -62,5 +65,3 @@ fi esac exit 0 - -# $Id$ Property changes on: csw/mgar/pkg/puppet/trunk/files/cswpuppetd ___________________________________________________________________ Added: svn:keywords + Id Property changes on: csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd ___________________________________________________________________ Added: svn:keywords + Id Property changes on: csw/mgar/pkg/puppet/trunk/files/cswusergroup ___________________________________________________________________ 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 Sep 17 01:50:55 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 16 Sep 2009 23:50:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[6323] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 6323 http://gar.svn.sourceforge.net/gar/?rev=6323&view=rev Author: bdwalton Date: 2009-09-16 23:50:55 +0000 (Wed, 16 Sep 2009) Log Message: ----------- git: add headers, static libs; carve out a _devel package Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-09-16 15:29:51 UTC (rev 6322) +++ csw/mgar/pkg/git/trunk/Makefile 2009-09-16 23:50:55 UTC (rev 6323) @@ -7,7 +7,7 @@ # TEST_SCRIPTS = PACKAGES = CSWgit CSWgitk CSWgitgui CSWgitsvn CSWgitcvs CSWgitemacs CSWgitdoc -PACKAGES += CSWgitcompletion +PACKAGES += CSWgitcompletion CSWgitdevel CATALOGNAME_CSWgit = git CATALOGNAME_CSWgitcvs = git_cvs @@ -17,6 +17,7 @@ CATALOGNAME_CSWgitdoc = git_doc CATALOGNAME_CSWgitk = gitk CATALOGNAME_CSWgitcompletion = git_completion +CATALOGNAME_CSWgitdevel = git_devel ARCHALL_CSWgitsvn = 1 ARCHALL_CSWgitcvs = 1 @@ -47,6 +48,8 @@ REQUIRED_PKGS_CSWgitdoc = CSWgit +REQUIRED_PKGS_CSWgitdevel = CSWgit + # We include bash here even though git itself depends on it because in theory # git could use any other POSIX compliant shell and drop the dependency... REQUIRED_PKGS_CSWgitcompletion = CSWgit CSWbash @@ -59,6 +62,7 @@ LICENSE_CSWgitemacs = COPYING LICENSE_CSWgitdoc = COPYING LICENSE_CSWgitcompletion = COPYING +LICENSE_CSWgitdevel = COPYING DESCRIPTION = Fast Version Control System define BLURB @@ -75,6 +79,7 @@ SPKG_DESC_CSWgitdoc = Documentation for Git SPKG_DESC_CSWgitemacs = Git VCS support for Emacs SPKG_DESC_CSWgitcompletion = Bash completion support for Git +SPKG_DESC_CSWgitdevel = Headers and static libraries for Git #NOTE: If you need to proxy git:// connections, set GIT_USE_PROXY in # your .garrc file. (That leaves this recipe in a more generic form.) @@ -93,6 +98,7 @@ PKGFILES_CSWgitemacs = .*emacs.* PKGFILES_CSWgitdoc = $(docdir)/.* PKGFILES_CSWgitcompletion = $(bashconfdir)/bash_completion.d/.* +PKGFILES_CSWgitdevel = $(includedir)/.* $(libdir)/.* # We define upstream file regex so we can be notifed of new upstream # software release @@ -121,6 +127,9 @@ INSTALLDIRS=vendor \ install-doc +# We want static libs installed for our devel package +MERGE_EXCLUDE_STATICLIBS = + include gar/category.mk # for tail -n and to override things like, etc with the gnu counterparts @@ -142,6 +151,8 @@ post-install-modulated: GD=$(DESTDIR)/$(datadir)/doc/$(GARNAME) post-install-modulated: BD=$(DESTDIR)/$(bashconfdir)/bash_completion.d +post-install-modulated: ID=$(DESTDIR)/$(includedir)/git +post-install-modulated: LD=$(DESTDIR)/$(libdir_install)/git post-install-modulated: @echo Cleaning up perl stuff @rm -rf $(DESTDIR)/$(libdir)/perl5/site_perl/5* @@ -150,6 +161,16 @@ @echo Installing Emacs Git extension @( cd $(WORKSRC); $(MAKE) -C contrib/emacs install \ emacsdir=$(DESTDIR)/$(datadir)/emacs/site-lisp ) + @echo Installing devel files + @( cd $(WORKSRC); \ + ginstall -c -m 0755 -d $(ID) $(LD); \ + for f in `find . -name "*.h"`; do \ + dn=`dirname $$f`; \ + ginstall -c -m 0755 -d $(ID)/$$dn; \ + ginstall -c -m 0644 $$f $(ID)/$$dn; \ + done; \ + ginstall -c -m 0444 libgit.a $(LD)/; \ + ginstall -c -m 0444 ./xdiff/lib.a $(LD)/libxdiff.a ) @echo Installing Documentation @( cd $(WORKSRC); \ ginstall -c -m 0755 -d $(GD); \ 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 Sep 17 01:51:40 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 16 Sep 2009 23:51:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[6324] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 6324 http://gar.svn.sourceforge.net/gar/?rev=6324&view=rev Author: bdwalton Date: 2009-09-16 23:51:40 +0000 (Wed, 16 Sep 2009) Log Message: ----------- git: bump version to 1.6.4.4 Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-09-16 23:50:55 UTC (rev 6323) +++ csw/mgar/pkg/git/trunk/Makefile 2009-09-16 23:51:40 UTC (rev 6324) @@ -1,5 +1,5 @@ GARNAME = git -GARVERSION = 1.6.4.3 +GARVERSION = 1.6.4.4 #xPATCHLEVEL = rc3 CATEGORIES = devel This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Sep 17 01:58:42 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 16 Sep 2009 23:58:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[6325] csw/mgar/pkg/git/trunk Message-ID: Revision: 6325 http://gar.svn.sourceforge.net/gar/?rev=6325&view=rev Author: bdwalton Date: 2009-09-16 23:58:42 +0000 (Wed, 16 Sep 2009) Log Message: ----------- git: add a postinstall script to migrate config to /etc/opt/csw Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/git/trunk/files/CSWgit.postinstall Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-09-16 23:51:40 UTC (rev 6324) +++ csw/mgar/pkg/git/trunk/Makefile 2009-09-16 23:58:42 UTC (rev 6325) @@ -86,6 +86,8 @@ GIT_REPOS = git://git.kernel.org/pub/scm/git/git.git GIT_TREEISH_git.git = v$(GARVERSION)$(if $(PATCHLEVEL),-$(PATCHLEVEL)) +DISTFILES = CSWgit.postinstall + fdirs = $(bindir_install) $(mandir) $(libexecdir_install) define _git_files $(foreach d,$(fdirs),$(d)/.*$(1).*) $(sharedstatedir)/$(1).* Added: csw/mgar/pkg/git/trunk/files/CSWgit.postinstall =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgit.postinstall (rev 0) +++ csw/mgar/pkg/git/trunk/files/CSWgit.postinstall 2009-09-16 23:58:42 UTC (rev 6325) @@ -0,0 +1,11 @@ +#!/bin/sh + +GC_OLD="$PKG_INSTALL_ROOT/opt/csw/etc/gitconfig" +GC_NEW="$PKG_INSTALL_ROOT/etc/opt/csw/gitconfig" + +# this will hopefully ease the /opt/csw/etc -> /etc/opt/csw +# transition. +if [ -f "$GC_OLD" -a ! -f "$GC_NEW" ]; then + echo "Copying /opt/csw/etc/gitconfig to /etc/opt/csw/gitconfig" + cp -p "$GC_OLD" "$GC_NEW" +fi 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 Sep 17 01:59:51 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 16 Sep 2009 23:59:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[6326] csw/mgar/pkg/git/trunk/checksums Message-ID: Revision: 6326 http://gar.svn.sourceforge.net/gar/?rev=6326&view=rev Author: bdwalton Date: 2009-09-16 23:59:50 +0000 (Wed, 16 Sep 2009) Log Message: ----------- git: update makesums Modified Paths: -------------- csw/mgar/pkg/git/trunk/checksums Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2009-09-16 23:58:42 UTC (rev 6325) +++ csw/mgar/pkg/git/trunk/checksums 2009-09-16 23:59:50 UTC (rev 6326) @@ -1,8 +1 @@ -075441ea2a95cfa5fd7aaebb888a93f3 download/doc-makefile.patch -d88d34fc8e4ce18fe738753a06417eac download/0001-configure-ensure-settings-from-user-are-also-usable.patch -9f1f5c3f7759319d647420d330f87c28 download/0002-configure-reorganize-flow-of-argument-checks.patch -dc54bd8c79b58724eaab77e15f9e2029 download/0003-configure-add-macros-to-stash-FLAG-variables.patch -b1c0911b53bcccb943b1f7bdc6db5237 download/0004-configure-wrap-some-library-tests-with-GIT_STASH_FL.patch -50fa0de30bbc019e6c5e43c20cef423a download/0005-configure-asciidoc-version-test-cleanup.patch -cde5cd3ceebe13864dd8e3718e104387 download/0006-configure-make-iconv-tests-aware-of-user-arguments.patch -89dbcc3180bf4e651e9e64d4de3f6df0 download/0007-configure-rework-pthread-handling-to-allow-for-user.patch +76a83b807edbcc41a01d3792d4a0322d download/CSWgit.postinstall 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 Sep 17 10:02:38 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 17 Sep 2009 08:02:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6327] csw/mgar/pkg/pgadmin3/trunk Message-ID: Revision: 6327 http://gar.svn.sourceforge.net/gar/?rev=6327&view=rev Author: wahwah Date: 2009-09-17 08:02:38 +0000 (Thu, 17 Sep 2009) Log Message: ----------- pgadmin3: Initial commit Modified Paths: -------------- csw/mgar/pkg/pgadmin3/trunk/Makefile csw/mgar/pkg/pgadmin3/trunk/checksums Modified: csw/mgar/pkg/pgadmin3/trunk/Makefile =================================================================== --- csw/mgar/pkg/pgadmin3/trunk/Makefile 2009-09-16 23:59:50 UTC (rev 6326) +++ csw/mgar/pkg/pgadmin3/trunk/Makefile 2009-09-17 08:02:38 UTC (rev 6327) @@ -2,181 +2,26 @@ # 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, 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 = pgadmin3 +GARVERSION = 1.10.0 +CATEGORIES = apps +DESCRIPTION = An administration and development platform for PostgreSQL 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). +SPKG_SOURCEURL = http://www.pgadmin.org/ +MASTER_SITES = http://wwwmaster.postgresql.org/redir/76/h/pgadmin3/release/v$(GARVERSION)/src/ 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. +REQUIRED_PKGS += CSWpostgresql +REQUIRED_PKGS += CSWkrb5lib +REQUIRED_PKGS += CSWlibpq +REQUIRED_PKGS += CSWlibxml2 +REQUIRED_PKGS += CSWlibxslt +REQUIRED_PKGS += CSWosslrt +REQUIRED_PKGS += CSWwxwidgetscommon +REQUIRED_PKGS += CSWwxwidgetsgtk2 +REQUIRED_PKGS += CSWzlib +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWwxwidgetsdevel +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 +include gar/category.mk Modified: csw/mgar/pkg/pgadmin3/trunk/checksums =================================================================== --- csw/mgar/pkg/pgadmin3/trunk/checksums 2009-09-16 23:59:50 UTC (rev 6326) +++ csw/mgar/pkg/pgadmin3/trunk/checksums 2009-09-17 08:02:38 UTC (rev 6327) @@ -0,0 +1 @@ +3f2032c78657e3db4e0719613751060c download/pgadmin3-1.10.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Sep 17 10:55:43 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 17 Sep 2009 08:55:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6328] csw/mgar/pkg/sudosh2/trunk/Makefile Message-ID: Revision: 6328 http://gar.svn.sourceforge.net/gar/?rev=6328&view=rev Author: skayser Date: 2009-09-17 08:55:43 +0000 (Thu, 17 Sep 2009) Log Message: ----------- sudosh2: added SAMPLECONF, moved config to /etc/opt/csw Modified Paths: -------------- csw/mgar/pkg/sudosh2/trunk/Makefile Modified: csw/mgar/pkg/sudosh2/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudosh2/trunk/Makefile 2009-09-17 08:02:38 UTC (rev 6327) +++ csw/mgar/pkg/sudosh2/trunk/Makefile 2009-09-17 08:55:43 UTC (rev 6328) @@ -23,8 +23,13 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tgz +sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw + +SAMPLECONF = $(sysconfdir)/sudosh.conf + CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-logdir=/var/opt/csw/sudosh +CONFIGURE_ARGS += --with-logdir=$(localstatedir)/sudosh # No tests available TEST_SCRIPTS = @@ -51,7 +56,7 @@ post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) post-install-modulated: DOCS=AUTHORS NEWS README post-install-modulated: - ginstall -d $(DESTDIR)/var/opt/csw/sudosh + ginstall -d $(DESTDIR)$(localstatedir)/sudosh ginstall -d $(DOCDEST) cp $(addprefix $(WORKSRC)/,$(DOCS)) $(DOCDEST) cp $(WORKSRC)/ChangeLog $(DOCDEST)/changelog This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Sep 17 12:31:04 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 17 Sep 2009 10:31:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[6329] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 6329 http://gar.svn.sourceforge.net/gar/?rev=6329&view=rev Author: skayser Date: 2009-09-17 10:31:04 +0000 (Thu, 17 Sep 2009) Log Message: ----------- gar/v2: SAMPLECONF needs to result in cswcpsampleconf, not cswsampleconf 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-09-17 08:55:43 UTC (rev 6328) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-09-17 10:31:04 UTC (rev 6329) @@ -161,7 +161,7 @@ # Handle cswclassutils # - prepend cswpreserveconf if it is not already in SPKG_CLASSES -SPKG_CLASSES := $(SPKG_CLASSES) $(if $(SAMPLECONF),$(if $(filter cswsampleconf,$(SPKG_CLASSES)),,cswsampleconf)) +SPKG_CLASSES := $(SPKG_CLASSES) $(if $(SAMPLECONF),$(if $(filter cswcpsampleconf,$(SPKG_CLASSES)),,cswcpsampleconf)) SPKG_CLASSES := $(SPKG_CLASSES) $(if $(PRESERVECONF),$(if $(filter cswpreserveconf,$(SPKG_CLASSES)),,cswpreserveconf)) SPKG_CLASSES := $(SPKG_CLASSES) $(if $(INITSMF),$(if $(filter cswinitsmf,$(SPKG_CLASSES)),,cswinitsmf)) SPKG_CLASSES := $(SPKG_CLASSES) $(if $(USERGROUP),$(if $(filter cswusergroup,$(SPKG_CLASSES)),,cswusergroup)) @@ -169,7 +169,7 @@ # - set class for all config files ifneq ($(SAMPLECONF)$(PRESERVECONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),) _CSWCLASS_FILTER = | perl -ane '\ - $(foreach FILE,$(SAMPLECONF:%.CSW=%),$$F[1] = "cswsampleconf" if ( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ + $(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,$(INITSMF),$$F[1] = "cswinitsmf" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(USERGROUP),$$F[1] = "cswusergroup" if( $$F[2] =~ m(^$(FILE)$$) );)\ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Sep 17 13:39:21 2009 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 17 Sep 2009 11:39:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[6330] csw/mgar/pkg/ganglia/branches Message-ID: Revision: 6330 http://gar.svn.sourceforge.net/gar/?rev=6330&view=rev Author: d_pocock Date: 2009-09-17 11:39:21 +0000 (Thu, 17 Sep 2009) Log Message: ----------- ganglia: testing a release candidate Modified Paths: -------------- csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/Makefile csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/checksums Added Paths: ----------- csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/ Modified: csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/Makefile =================================================================== --- csw/mgar/pkg/ganglia/trunk/Makefile 2009-09-11 09:22:45 UTC (rev 6265) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/Makefile 2009-09-17 11:39:21 UTC (rev 6330) @@ -1,5 +1,5 @@ GARNAME = ganglia -GARVERSION = 3.1.2 +GARVERSION = 3.1.3 CATEGORIES = utils # How should we set this? @@ -24,7 +24,7 @@ DISTFILES += CSWgangliaweb.postinstall CSWgangliaweb.preremove DISTFILES += httpd-ganglia.conf.CSW cswgmond cswgmetad -PACKAGES = CSWgangliaagent CSWgangliart CSWgangliadevel CSWgangliagmetad CSWgangliaweb CSWgangliamodpython +PACKAGES = CSWgangliart CSWgangliaagent CSWgangliadevel CSWgangliagmetad CSWgangliaweb CSWgangliamodpython CATALOGNAME_CSWganglia = ganglia CATALOGNAME_CSWgangliart = ganglia_rt @@ -84,14 +84,14 @@ # TODO: define a CSWgangliamodpython package # Depends: some issues exist getting the Python support working on Solaris, # Ganglia's configure.in needs to be further enhanced for this to work -CONFIGURE_ARGS += --without-python +CONFIGURE_ARGS += --disable-python #CONFIGURE_ARGS += --with-python=/opt/csw # For Ganglia 3.1.2, the test suite doesn't compile cleanly on Solaris, # so we skip it. This should be re-assessed with each new release # from upstream. Proposed fixes for the test suite to be submitted # upstream. -ifeq ($(GARVERSION),3.1.2) +ifeq ($(GARVERSION),3.1.3) TEST_SCRIPTS = endif Modified: csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/checksums =================================================================== --- csw/mgar/pkg/ganglia/trunk/checksums 2009-09-11 09:22:45 UTC (rev 6265) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/checksums 2009-09-17 11:39:21 UTC (rev 6330) @@ -2,5 +2,5 @@ c4c333a46db391464e372ad8ede4993c download/CSWgangliaweb.preremove 25d302948e25837bf17757d5e23e4955 download/cswgmetad c6bb96c949dbb989d06ebb36b6af885d download/cswgmond -aaba09a6fa897ed581789f679f7ca62d download/ganglia-3.1.2.tar.gz +cd502229ea934b433fa2ddc6fd3a2706 download/ganglia-3.1.3.tar.gz 2ff504ecb546aca2cdd6ee09af9a417e download/httpd-ganglia.conf.CSW 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 Sep 17 14:13:00 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 17 Sep 2009 12:13:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6331] csw/mgar/pkg/sudosh2/trunk/Makefile Message-ID: Revision: 6331 http://gar.svn.sourceforge.net/gar/?rev=6331&view=rev Author: skayser Date: 2009-09-17 12:13:00 +0000 (Thu, 17 Sep 2009) Log Message: ----------- sudosh2: secure logdir, adjust sudosh paths in README Modified Paths: -------------- csw/mgar/pkg/sudosh2/trunk/Makefile Modified: csw/mgar/pkg/sudosh2/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudosh2/trunk/Makefile 2009-09-17 11:39:21 UTC (rev 6330) +++ csw/mgar/pkg/sudosh2/trunk/Makefile 2009-09-17 12:13:00 UTC (rev 6331) @@ -27,6 +27,7 @@ localstatedir = /var/opt/csw SAMPLECONF = $(sysconfdir)/sudosh.conf +PROTOTYPE_FILTER = awk '$$$$3 ~/^\/var\/opt\/csw\/sudosh$$$$/ { $$$$4 = 0700 } { print }' CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-logdir=$(localstatedir)/sudosh @@ -61,4 +62,6 @@ cp $(addprefix $(WORKSRC)/,$(DOCS)) $(DOCDEST) cp $(WORKSRC)/ChangeLog $(DOCDEST)/changelog cp $(FILEDIR)/changelog.CSW $(DOCDEST) + + perl -pi -e 's|/usr/local/bin|$(bindir)|g' $(DOCDEST)/README @$(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 Sep 17 15:31:21 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 17 Sep 2009 13:31:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[6332] csw/mgar/pkg Message-ID: Revision: 6332 http://gar.svn.sourceforge.net/gar/?rev=6332&view=rev Author: dmichelsen Date: 2009-09-17 13:31:20 +0000 (Thu, 17 Sep 2009) Log Message: ----------- keepassx: Initial commit, wait for Qt >= 4.3 Added Paths: ----------- csw/mgar/pkg/keepassx/ csw/mgar/pkg/keepassx/branches/ csw/mgar/pkg/keepassx/tags/ csw/mgar/pkg/keepassx/trunk/ csw/mgar/pkg/keepassx/trunk/Makefile csw/mgar/pkg/keepassx/trunk/checksums csw/mgar/pkg/keepassx/trunk/files/ Property changes on: csw/mgar/pkg/keepassx/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/keepassx/trunk/Makefile =================================================================== --- csw/mgar/pkg/keepassx/trunk/Makefile (rev 0) +++ csw/mgar/pkg/keepassx/trunk/Makefile 2009-09-17 13:31:20 UTC (rev 6332) @@ -0,0 +1,20 @@ +GARNAME = keepassx +GARVERSION = 0.4.1 +CATEGORIES = apps + +DESCRIPTION = Cross platform password manager +define BLURB + Long description +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +# This needs qmake from Qt >= 4.3 + +include gar/category.mk Added: csw/mgar/pkg/keepassx/trunk/checksums =================================================================== --- csw/mgar/pkg/keepassx/trunk/checksums (rev 0) +++ csw/mgar/pkg/keepassx/trunk/checksums 2009-09-17 13:31:20 UTC (rev 6332) @@ -0,0 +1 @@ +96efdf5855703e3d2817973d5e2b0fcf download/keepassx-0.4.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 Thu Sep 17 15:39:35 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 17 Sep 2009 13:39:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[6333] csw/mgar Message-ID: Revision: 6333 http://gar.svn.sourceforge.net/gar/?rev=6333&view=rev Author: dmichelsen Date: 2009-09-17 13:39:35 +0000 (Thu, 17 Sep 2009) Log Message: ----------- x11: Add variable for xorg individual libs Modified Paths: -------------- csw/mgar/gar/v2/categories/x11/category.mk csw/mgar/pkg/x11/libX11/trunk/Makefile csw/mgar/pkg/x11/libXau/trunk/Makefile csw/mgar/pkg/x11/libXdmcp/trunk/Makefile csw/mgar/pkg/x11/libxft/trunk/Makefile csw/mgar/pkg/x11/xrender/trunk/Makefile csw/mgar/pkg/x11/xtrans/trunk/Makefile Modified: csw/mgar/gar/v2/categories/x11/category.mk =================================================================== --- csw/mgar/gar/v2/categories/x11/category.mk 2009-09-17 13:31:20 UTC (rev 6332) +++ csw/mgar/gar/v2/categories/x11/category.mk 2009-09-17 13:39:35 UTC (rev 6333) @@ -1,5 +1,6 @@ # X11 X11_PROTO_MASTER_SITE = http://xorg.freedesktop.org/releases/individual/proto/ +X11_LIB_MASTER_SITE = http://xorg.freedesktop.org/releases/individual/lib/ XCB_MASTER_SITES = http://xcb.freedesktop.org/dist/ # C and C++ compiler flags Modified: csw/mgar/pkg/x11/libX11/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libX11/trunk/Makefile 2009-09-17 13:31:20 UTC (rev 6332) +++ csw/mgar/pkg/x11/libX11/trunk/Makefile 2009-09-17 13:39:35 UTC (rev 6333) @@ -9,7 +9,7 @@ functions of the window system. endef -MASTER_SITES =http://xorg.freedesktop.org/releases/individual/lib/ +MASTER_SITES = $(X11_LIB_MASTER_SITE) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = patch-stdint.diff # Add workaround for http://bugs.sourcemage.org/show_bug.cgi?id=13476 Modified: csw/mgar/pkg/x11/libXau/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libXau/trunk/Makefile 2009-09-17 13:31:20 UTC (rev 6332) +++ csw/mgar/pkg/x11/libXau/trunk/Makefile 2009-09-17 13:39:35 UTC (rev 6333) @@ -8,7 +8,7 @@ which controls authorisation for X connections, both client-side and server-side. endef -MASTER_SITES = http://xorg.freedesktop.org/releases/individual/lib/ +MASTER_SITES = $(X11_LIB_MASTER_SITE) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PREREQUISITE_PKGS = CSWinputproto CSWkbproto CSWrenderproto CSWxcbproto Modified: csw/mgar/pkg/x11/libXdmcp/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libXdmcp/trunk/Makefile 2009-09-17 13:31:20 UTC (rev 6332) +++ csw/mgar/pkg/x11/libXdmcp/trunk/Makefile 2009-09-17 13:39:35 UTC (rev 6333) @@ -8,7 +8,7 @@ protocol library, which allows for remote logins to display managers. endef -MASTER_SITES = http://xorg.freedesktop.org/releases/individual/lib/ +MASTER_SITES = $(X11_LIB_MASTER_SITE) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/x11/libxft/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxft/trunk/Makefile 2009-09-17 13:31:20 UTC (rev 6332) +++ csw/mgar/pkg/x11/libxft/trunk/Makefile 2009-09-17 13:39:35 UTC (rev 6333) @@ -10,7 +10,7 @@ extension handles glyph drawing; otherwise, the core X protocol is used. endef -MASTER_SITES = http://xorg.freedesktop.org/releases/individual/lib/ +MASTER_SITES = $(X11_LIB_MASTER_SITE) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz # Legacy libraries Modified: csw/mgar/pkg/x11/xrender/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xrender/trunk/Makefile 2009-09-17 13:31:20 UTC (rev 6332) +++ csw/mgar/pkg/x11/xrender/trunk/Makefile 2009-09-17 13:39:35 UTC (rev 6333) @@ -10,7 +10,7 @@ into either triangles or trapezoids. endef -MASTER_SITES = http://xorg.freedesktop.org/releases/individual/lib/ +MASTER_SITES = $(X11_LIB_MASTER_SITE) DISTNAME = libXrender-$(GARVERSION) DISTFILES = $(DISTNAME).tar.gz Modified: csw/mgar/pkg/x11/xtrans/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xtrans/trunk/Makefile 2009-09-17 13:31:20 UTC (rev 6332) +++ csw/mgar/pkg/x11/xtrans/trunk/Makefile 2009-09-17 13:39:35 UTC (rev 6333) @@ -8,7 +8,7 @@ at time of writing, it includes support for UNIX sockets, IPv4, IPv6, and DECnet. endef -MASTER_SITES = http://xorg.freedesktop.org/releases/individual/lib/ +MASTER_SITES = $(X11_LIB_MASTER_SITE) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz # 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 Thu Sep 17 15:43:54 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 17 Sep 2009 13:43:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[6334] csw/mgar/pkg/x11 Message-ID: Revision: 6334 http://gar.svn.sourceforge.net/gar/?rev=6334&view=rev Author: dmichelsen Date: 2009-09-17 13:43:50 +0000 (Thu, 17 Sep 2009) Log Message: ----------- x11/libxtst: Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxtst/ csw/mgar/pkg/x11/libxtst/branches/ csw/mgar/pkg/x11/libxtst/tags/ csw/mgar/pkg/x11/libxtst/trunk/ csw/mgar/pkg/x11/libxtst/trunk/Makefile csw/mgar/pkg/x11/libxtst/trunk/checksums csw/mgar/pkg/x11/libxtst/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxtst/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/x11/libxtst/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxtst/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxtst/trunk/Makefile 2009-09-17 13:43:50 UTC (rev 6334) @@ -0,0 +1,25 @@ +GARNAME = libxtst +GARVERSION = 1.0.99.2 +CATEGORIES = x11 + +DESCRIPTION = +define BLURB + Long description +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +DISTNAME = libXtst-$(GARVERSION) +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.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 +NOISALIST = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/x11/libxtst/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxtst/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxtst/trunk/checksums 2009-09-17 13:43:50 UTC (rev 6334) @@ -0,0 +1 @@ +b5edc35ca9b9ba4133a3fa34cb1b00f8 download/libXtst-1.0.99.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Sep 17 15:52:11 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 17 Sep 2009 13:52:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[6335] csw/mgar/pkg/x11/xextproto/trunk Message-ID: Revision: 6335 http://gar.svn.sourceforge.net/gar/?rev=6335&view=rev Author: dmichelsen Date: 2009-09-17 13:52:08 +0000 (Thu, 17 Sep 2009) Log Message: ----------- x11/xextproto: Update to 7.1.1 Modified Paths: -------------- csw/mgar/pkg/x11/xextproto/trunk/Makefile csw/mgar/pkg/x11/xextproto/trunk/checksums Modified: csw/mgar/pkg/x11/xextproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xextproto/trunk/Makefile 2009-09-17 13:43:50 UTC (rev 6334) +++ csw/mgar/pkg/x11/xextproto/trunk/Makefile 2009-09-17 13:52:08 UTC (rev 6335) @@ -1,5 +1,5 @@ GARNAME = xextproto -GARVERSION = 7.0.5 +GARVERSION = 7.1.1 CATEGORIES = x11 Modified: csw/mgar/pkg/x11/xextproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xextproto/trunk/checksums 2009-09-17 13:43:50 UTC (rev 6334) +++ csw/mgar/pkg/x11/xextproto/trunk/checksums 2009-09-17 13:52:08 UTC (rev 6335) @@ -1 +1 @@ -f6274c778e571130484fb0650651ac02 download/xextproto-7.0.5.tar.gz +6c55283718dbeb826bcf899b9e89faba download/xextproto-7.1.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Sep 17 16:03:56 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 17 Sep 2009 14:03:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[6336] csw/mgar/pkg/x11 Message-ID: Revision: 6336 http://gar.svn.sourceforge.net/gar/?rev=6336&view=rev Author: dmichelsen Date: 2009-09-17 14:03:55 +0000 (Thu, 17 Sep 2009) Log Message: ----------- libxext: Initial commit Modified Paths: -------------- csw/mgar/pkg/x11/libxext/trunk/Makefile csw/mgar/pkg/x11/libxext/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/libxext/ Modified: csw/mgar/pkg/x11/libxext/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxtst/trunk/Makefile 2009-09-17 13:43:50 UTC (rev 6334) +++ csw/mgar/pkg/x11/libxext/trunk/Makefile 2009-09-17 14:03:55 UTC (rev 6336) @@ -1,22 +1,24 @@ -GARNAME = libxtst -GARVERSION = 1.0.99.2 +GARNAME = libxext +GARVERSION = 1.0.99.4 CATEGORIES = x11 -DESCRIPTION = +DESCRIPTION = X11 miscellaneous extensions library1 define BLURB - Long description + LibXext provides an X Window System client interface to several extensions + to the X protocol, iincluding DOUBLE-BUFFER (DBE), DPMS, Extended-Visual-Information + (EVI), LBX, MIT-SHM, MIT-SUNDRY-NONSTANDARD, Multi-Buffering, SECURITY, SHAPE, + SHAPE, SYNC, TOG-CUP, XC-APPGROUP, XC-MISC, XTEST and possibly others. endef MASTER_SITES = $(X11_LIB_MASTER_SITE) -DISTNAME = libXtst-$(GARVERSION) +DISTNAME = libXext-$(GARVERSION) 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.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_PKGS = CSWxextproto +REQUIRED_PKGS = CSWlibx11 BUILD64 = 1 NOISALIST = 1 Modified: csw/mgar/pkg/x11/libxext/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxtst/trunk/checksums 2009-09-17 13:43:50 UTC (rev 6334) +++ csw/mgar/pkg/x11/libxext/trunk/checksums 2009-09-17 14:03:55 UTC (rev 6336) @@ -1 +1 @@ -b5edc35ca9b9ba4133a3fa34cb1b00f8 download/libXtst-1.0.99.2.tar.bz2 +24da44888b87c66edb326acec35b85aa download/libXext-1.0.99.4.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Sep 17 16:15:10 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 17 Sep 2009 14:15:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[6337] csw/mgar/pkg/pidgin/trunk Message-ID: Revision: 6337 http://gar.svn.sourceforge.net/gar/?rev=6337&view=rev Author: wahwah Date: 2009-09-17 14:15:10 +0000 (Thu, 17 Sep 2009) Log Message: ----------- pidgin: Version bump to 2.6.2. Fixed the REQUIRED_PKGS variable and added PREREQUISITE_PKGS. I'm not intending to take the package over, only building it for my own selfish needs. ;-) Modified Paths: -------------- csw/mgar/pkg/pidgin/trunk/Makefile csw/mgar/pkg/pidgin/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/pidgin/trunk/Makefile Modified: csw/mgar/pkg/pidgin/trunk/Makefile =================================================================== --- csw/mgar/pkg/pidgin/trunk/Makefile 2009-09-17 14:03:55 UTC (rev 6336) +++ csw/mgar/pkg/pidgin/trunk/Makefile 2009-09-17 14:15:10 UTC (rev 6337) @@ -1,5 +1,7 @@ +# $Id$ + GARNAME = pidgin -GARVERSION = 2.5.8 +GARVERSION = 2.6.2 CATEGORIES = apps DESCRIPTION = Multi-protocol IM client @@ -21,6 +23,7 @@ CONFIGURE_ARGS += '--disable-nm' CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include CONFIGURE_ARGS += --x-libraries=$(prefix)/X11/lib +CONFIGURE_ARGS += --disable-vv PATH = $(SOS11_CC_HOME)/bin:$(PATH) @@ -47,12 +50,14 @@ EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod -REQUIRED_PKGS_CSWpidgin = CSWaspell CSWdbusglib CSWgcrypt CSWggettextrt CSWglib2 -REQUIRED_PKGS_CSWpidgin += CSWgnutls CSWgstreamer CSWgtk2 CSWgtkspell CSWlibatk -REQUIRED_PKGS_CSWpidgin += CSWlibcairo CSWlibdbus CSWlibxml2 CSWmeanwhile CSWncurses -REQUIRED_PKGS_CSWpidgin += CSWpango CSWperl CSWpython CSWsilctoolkit CSWstartupnotif -REQUIRED_PKGS_CSWpidgin += CSWtcl CSWtk CSWiconv CSWsunmath CSWzlib CSWdbus -REQUIRED_PKGS_CSWpidgin += CSWfconfig CSWftype2 CSWlibx11 +REQUIRED_PKGS = CSWaspell CSWdbusglib CSWgcrypt CSWggettextrt CSWglib2 +REQUIRED_PKGS += CSWgnutls CSWgstreamer CSWgtk2 CSWgtkspell CSWlibatk +REQUIRED_PKGS += CSWlibcairo CSWlibdbus CSWlibxml2 CSWmeanwhile CSWncurses +REQUIRED_PKGS += CSWpango CSWperl CSWpython CSWsilctoolkit CSWstartupnotif +REQUIRED_PKGS += CSWtcl CSWtk CSWiconv CSWsunmath CSWzlib CSWdbus +REQUIRED_PKGS += CSWfconfig CSWftype2 CSWlibx11 CSWbdb CSWlibidn + +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWlibdbusdev CSWdbusglibdev CSWgnutlsdevel + include gar/category.mk - Property changes on: csw/mgar/pkg/pidgin/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/pidgin/trunk/checksums =================================================================== --- csw/mgar/pkg/pidgin/trunk/checksums 2009-09-17 14:03:55 UTC (rev 6336) +++ csw/mgar/pkg/pidgin/trunk/checksums 2009-09-17 14:15:10 UTC (rev 6337) @@ -1 +1 @@ -bf8215d85a7ab0bc1c99dbd6d83937f6 download/pidgin-2.5.8.tar.gz +2db20c9c44e9a84ae4a9290f9e47ae83 download/pidgin-2.6.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Sep 17 17:52:21 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 17 Sep 2009 15:52:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[6338] csw/mgar/pkg/sudosh2/trunk/Makefile Message-ID: Revision: 6338 http://gar.svn.sourceforge.net/gar/?rev=6338&view=rev Author: skayser Date: 2009-09-17 15:52:21 +0000 (Thu, 17 Sep 2009) Log Message: ----------- sudosh2: adjusted logdir perms to 0733 Modified Paths: -------------- csw/mgar/pkg/sudosh2/trunk/Makefile Modified: csw/mgar/pkg/sudosh2/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudosh2/trunk/Makefile 2009-09-17 14:15:10 UTC (rev 6337) +++ csw/mgar/pkg/sudosh2/trunk/Makefile 2009-09-17 15:52:21 UTC (rev 6338) @@ -1,6 +1,5 @@ # TODO/Issues # - Submit 001- (DESTDIR) and 002- (man page) patches upstream -# - What about --logdir perms? Any other special perms required? GARNAME = sudosh2 GARVERSION = 1.0.2 CATEGORIES = apps @@ -27,8 +26,21 @@ localstatedir = /var/opt/csw SAMPLECONF = $(sysconfdir)/sudosh.conf -PROTOTYPE_FILTER = awk '$$$$3 ~/^\/var\/opt\/csw\/sudosh$$$$/ { $$$$4 = 0700 } { print }' +# logdir is writable by all users (needs to be so that all users can use +# sudosh). This might look horribly wrong at first, but when looking at +# the logfile names one can see that they are created with some entropy. +# +# skayser-root-input-1253202076-FMssssssOOOOOOuu +# skayser-root-script-1253202076-FMssssssOOOOOOuu +# skayser-root-time-1253202076-FMssssssOOOOOOuu +# +# This way, an ordinary user would need to guess such a name to be able to +# access or modify the related session files. Might not be 100% bullet-proof, +# but then again, you probably will use something else than sudosh in an +# environment that calls for 100% bullet-proof. +PROTOTYPE_FILTER = awk '$$$$3 ~/^\/var\/opt\/csw\/sudosh$$$$/ { $$$$4 = 0733 } { print }' + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-logdir=$(localstatedir)/sudosh 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 Sep 17 18:07:46 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 17 Sep 2009 16:07:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6339] csw/mgar/pkg/sudosh2/trunk/files/changelog.CSW Message-ID: Revision: 6339 http://gar.svn.sourceforge.net/gar/?rev=6339&view=rev Author: skayser Date: 2009-09-17 16:07:46 +0000 (Thu, 17 Sep 2009) Log Message: ----------- sudosh2: updated changelog.CSW Modified Paths: -------------- csw/mgar/pkg/sudosh2/trunk/files/changelog.CSW Modified: csw/mgar/pkg/sudosh2/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/sudosh2/trunk/files/changelog.CSW 2009-09-17 15:52:21 UTC (rev 6338) +++ csw/mgar/pkg/sudosh2/trunk/files/changelog.CSW 2009-09-17 16:07:46 UTC (rev 6339) @@ -1,5 +1,5 @@ -sudosh2 (1.0.2,REV=2009.09.16) +sudosh2 (1.0.2,REV=2009.09.17) * Initial release. - -- Sebastian Kayser Wed, 16 Sep 2009 01:11:30 +0200 + -- Sebastian Kayser Thu, 17 Sep 2009 18:07:17 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Sep 17 18:33:32 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 17 Sep 2009 16:33:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[6340] csw/mgar/pkg Message-ID: Revision: 6340 http://gar.svn.sourceforge.net/gar/?rev=6340&view=rev Author: dmichelsen Date: 2009-09-17 16:33:32 +0000 (Thu, 17 Sep 2009) Log Message: ----------- xapian: Initial commit Added Paths: ----------- csw/mgar/pkg/xapian/ csw/mgar/pkg/xapian/branches/ csw/mgar/pkg/xapian/tags/ csw/mgar/pkg/xapian/trunk/ csw/mgar/pkg/xapian/trunk/Makefile csw/mgar/pkg/xapian/trunk/checksums csw/mgar/pkg/xapian/trunk/files/ Property changes on: csw/mgar/pkg/xapian/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/xapian/trunk/Makefile =================================================================== --- csw/mgar/pkg/xapian/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xapian/trunk/Makefile 2009-09-17 16:33:32 UTC (rev 6340) @@ -0,0 +1,30 @@ +GARNAME = xapian-core +GARVERSION = 1.0.11 +CATEGORIES = lib + +DESCRIPTION = An open source search engine library +define BLURB + Xapian is an Open Source Probabilistic Information Retrieval Library. It + offers a highly adaptable toolkit that allows developers to easily add + advanced indexing and search facilities to applications. +endef + +MASTER_SITES = http://oligarchy.co.uk/xapian/$(GARVERSION)/ + +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 = CSWxapiancore +CATALOGNAME_CSWxapiancore = xapian_core + +REQUIRED_PKGS = CSWstlport CSWzlib + +EXTRA_LD_FLAGS = -lm + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/xapian/trunk/checksums =================================================================== --- csw/mgar/pkg/xapian/trunk/checksums (rev 0) +++ csw/mgar/pkg/xapian/trunk/checksums 2009-09-17 16:33:32 UTC (rev 6340) @@ -0,0 +1 @@ +f80a2f51b109e2a065bdcbf1ba03b808 download/xapian-core-1.0.11.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Sep 17 20:23:47 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 17 Sep 2009 18:23:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[6341] csw/mgar/pkg/xterm/trunk Message-ID: Revision: 6341 http://gar.svn.sourceforge.net/gar/?rev=6341&view=rev Author: skayser Date: 2009-09-17 18:23:47 +0000 (Thu, 17 Sep 2009) Log Message: ----------- xterm: bump to 248 Modified Paths: -------------- csw/mgar/pkg/xterm/trunk/Makefile csw/mgar/pkg/xterm/trunk/checksums Modified: csw/mgar/pkg/xterm/trunk/Makefile =================================================================== --- csw/mgar/pkg/xterm/trunk/Makefile 2009-09-17 16:33:32 UTC (rev 6340) +++ csw/mgar/pkg/xterm/trunk/Makefile 2009-09-17 18:23:47 UTC (rev 6341) @@ -1,5 +1,5 @@ GARNAME = xterm -GARVERSION = 247 +GARVERSION = 248 CATEGORIES = apps DESCRIPTION = Terminal emulator for the X Window System @@ -19,7 +19,9 @@ # 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 -PATCHFILES = patch-mkwidth.diff +# +# fixed in #244, let's see whether it works +#PATCHFILES = patch-mkwidth.diff # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz Modified: csw/mgar/pkg/xterm/trunk/checksums =================================================================== --- csw/mgar/pkg/xterm/trunk/checksums 2009-09-17 16:33:32 UTC (rev 6340) +++ csw/mgar/pkg/xterm/trunk/checksums 2009-09-17 18:23:47 UTC (rev 6341) @@ -1,2 +1,2 @@ 347f24b7ed3e42a3d40b1db1ed0061f0 download/patch-mkwidth.diff -ef73f7f1eb8c863c51f2bfac1f55efd1 download/xterm-247.tgz +70771a21fbc54a79f68374cebb49935a download/xterm-248.tgz 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 Sep 17 21:46:16 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 17 Sep 2009 19:46:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[6342] csw/mgar/pkg/xfce/libxfce4util/trunk/checksums Message-ID: Revision: 6342 http://gar.svn.sourceforge.net/gar/?rev=6342&view=rev Author: wbonnet Date: 2009-09-17 19:46:09 +0000 (Thu, 17 Sep 2009) Log Message: ----------- Update checksums for version 4.6.1 Modified Paths: -------------- csw/mgar/pkg/xfce/libxfce4util/trunk/checksums Modified: csw/mgar/pkg/xfce/libxfce4util/trunk/checksums =================================================================== --- csw/mgar/pkg/xfce/libxfce4util/trunk/checksums 2009-09-17 18:23:47 UTC (rev 6341) +++ csw/mgar/pkg/xfce/libxfce4util/trunk/checksums 2009-09-17 19:46:09 UTC (rev 6342) @@ -1,4 +1 @@ -ecee743bfbd594e7c56e69189b72f5b6 download/CSWlibxfce4util.gspec -e6acf26d8418a68961f6e6ebf5168739 download/CSWlibxfce4utildev.gspec -89bbdc03bcb397ceae359246900ef96d download/CSWlibxfce4utildoc.gspec eac51d58179cbcadc3f802450a8ec9cd download/libxfce4util-4.6.1.tar.bz2 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 Sep 17 21:56:35 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 17 Sep 2009 19:56:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[6343] csw/mgar/pkg/xfce/libxfcegui4/trunk/Makefile Message-ID: Revision: 6343 http://gar.svn.sourceforge.net/gar/?rev=6343&view=rev Author: wbonnet Date: 2009-09-17 19:56:22 +0000 (Thu, 17 Sep 2009) Log Message: ----------- Add missing dependencies Modified Paths: -------------- csw/mgar/pkg/xfce/libxfcegui4/trunk/Makefile Modified: csw/mgar/pkg/xfce/libxfcegui4/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/libxfcegui4/trunk/Makefile 2009-09-17 19:46:09 UTC (rev 6342) +++ csw/mgar/pkg/xfce/libxfcegui4/trunk/Makefile 2009-09-17 19:56:22 UTC (rev 6343) @@ -33,7 +33,10 @@ # Defines dependencies REQUIRED_PKGS_CSWlibxfcegui4 = CSWdbusglib CSWggettextrt CSWglib2 CSWgtk2 CSWlibatk CSWlibcairo REQUIRED_PKGS_CSWlibxfcegui4 += CSWlibdbus CSWlibglade2 CSWlibxfce4util CSWlibxml2 CSWpango -REQUIRED_PKGS_CSWlibxfcegui4 += CSWstartupnotif CSWxfconf +REQUIRED_PKGS_CSWlibxfcegui4 += CSWstartupnotif CSWxfconf CSWfconfig +REQUIRED_PKGS_CSWlibxfcegui4 += CSWftype2 +REQUIRED_PKGS_CSWlibxfcegui4 += CSWsunmath + REQUIRED_PKGS_CSWlibxfcegui4devel = REQUIRED_PKGS_CSWlibxfcegui4doc = 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 Sep 18 13:57:00 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Fri, 18 Sep 2009 11:57:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6344] csw/mgar/pkg Message-ID: Revision: 6344 http://gar.svn.sourceforge.net/gar/?rev=6344&view=rev Author: trygvis Date: 2009-09-18 11:56:59 +0000 (Fri, 18 Sep 2009) Log Message: ----------- o Initial add of the 'cgit' package. Added Paths: ----------- csw/mgar/pkg/cgit/ csw/mgar/pkg/cgit/branches/ csw/mgar/pkg/cgit/tags/ csw/mgar/pkg/cgit/trunk/ csw/mgar/pkg/cgit/trunk/Makefile csw/mgar/pkg/cgit/trunk/checksums csw/mgar/pkg/cgit/trunk/files/ csw/mgar/pkg/cgit/trunk/files/0001-cgit.conf csw/mgar/pkg/cgit/trunk/files/apache.conf.CSW csw/mgar/pkg/cgit/trunk/files/cgitrc.CSW Property changes on: csw/mgar/pkg/cgit/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/cgit/trunk/Makefile =================================================================== --- csw/mgar/pkg/cgit/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cgit/trunk/Makefile 2009-09-18 11:56:59 UTC (rev 6344) @@ -0,0 +1,61 @@ +GARNAME = cgit +GARVERSION = 0.8.3-opencsw-1 +CATEGORIES = devel + +DESCRIPTION = Web front-end for Git +define BLURB +cgit is + * a cgi application implemented in C: it's basically (yet) another git command, used to generate html. + * not forking: all git operations are performed by linking with libgit.a. + * using a built-in cache: the generated html is stored on disk for the benefit of later requests. + * fond of virtual urls - using PATH_INFO or modules like mod_rewrite makes cgit generate urls with few or no querystring parameters, e.g. + * http://hjemli.net/git/cgit/log/Makefile vs. + * http://hjemli.net/git?r=cgit&p=log&path=Makefile. + * not too visual, but sometimes a bit of graphics can be justified. + * open source - it is licensed under GPL v2. + * maintained by Lars Hjemli, who is happy to receive patches, suggestions and bug reports. +endef + +REQUIRED_PKGS_CSWcgit = CSWiconv CSWosslrt CSWzlib + +#MASTER_SITES = http://hjemli.net/git/cgit/snapshot/ +#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 + +#GIT_REPOS = git://github.com/trygvis/cgit.git +GIT_REPOS = http://localhost/cgit/cgit +#GIT_TREEISH_cgit = v$(GARVERSION)$(if $(PATCHLEVEL),-$(PATCHLEVEL)) +GIT_TREEISH_cgit = solaris + +DISTFILES = apache.conf.CSW cgitrc.CSW + +# The Makefile use "install" to install files but the Sun one is not really compatible +PATH := /usr/ucb:$(PATH) + +# 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 = + +PATCHFILES = 0001-cgit.conf + +CONFIGURE_SCRIPTS = + +# Disable tests for now, need a round GNU'ism removal there too +TEST_SCRIPTS = + +PRESERVECONF = /etc/opt/csw/cgit/apache.conf.CSW +PRESERVECONF += /etc/opt/csw/cgit/cgitrc.CSW + +# Trick to get the gar+git support to export the source code +pre-extract-modulated: git-extract-cgit + +post-install-modulated: + @mkdir -p $(DESTDIR)/etc/opt/csw/cgit/ + @cp $(FILEDIR)/apache.conf.CSW \ + $(FILEDIR)/cgitrc.CSW \ + $(DESTDIR)/etc/opt/csw/cgit/ +# @$(MAKECOOKIE) + +include gar/category.mk Added: csw/mgar/pkg/cgit/trunk/checksums =================================================================== --- csw/mgar/pkg/cgit/trunk/checksums (rev 0) +++ csw/mgar/pkg/cgit/trunk/checksums 2009-09-18 11:56:59 UTC (rev 6344) @@ -0,0 +1,3 @@ +b013ec63820f1841df1cddaa35d66ed3 download/0001-cgit.conf +27ef98eeb9066a301e60def5b6895a2c download/apache.conf.CSW +03d013bbfdad0143ddcb4c29acf1b637 download/cgitrc.CSW Added: csw/mgar/pkg/cgit/trunk/files/0001-cgit.conf =================================================================== --- csw/mgar/pkg/cgit/trunk/files/0001-cgit.conf (rev 0) +++ csw/mgar/pkg/cgit/trunk/files/0001-cgit.conf 2009-09-18 11:56:59 UTC (rev 6344) @@ -0,0 +1,35 @@ +--- a/dev/null 2009-09-18 13:04:46.000000000 +0200 ++++ b/cgit.conf 2009-09-18 13:08:12.674658346 +0200 +@@ -0,0 +1,32 @@ ++# Sun Studio ++CC=/opt/studio/ss11/SUNWspro/bin/cc ++#CFLAGS += -v ++MMFLAGS = -xM1 ++ ++# GCC ++#CC=/opt/csw/gcc4/bin/gcc ++ ++# Common ++LDFLAGS += -R/opt/csw/lib ++ ++LIBGIT_PATH=/opt/csw/lib/git/libgit.a ++ ++# Common ++CFLAGS += -I/opt/csw/include ++CFLAGS += -I/opt/csw/include/git ++ ++LDFLAGS += -L/opt/csw/lib ++LDFLAGS += -L/opt/csw/lib/git ++ ++# Solaris ++EXTLIBS = -lsocket -lnsl -lgit -lxdiff ++NEEDS_LIBICONV=1 ++NO_STRCASESTR=1 ++ ++# OpenCSW ++CGIT_SCRIPT_PATH = /opt/csw/libexec/cgit ++CGIT_DATA_PATH = /opt/csw/share/cgit/httpd ++CGIT_CONFIG = /etc/opt/csw/cgit/cgitrc ++CACHE_ROOT = /var/opt/csw/cgit/cache ++ ++INSTALL = /usr/ucb/install Added: csw/mgar/pkg/cgit/trunk/files/apache.conf.CSW =================================================================== --- csw/mgar/pkg/cgit/trunk/files/apache.conf.CSW (rev 0) +++ csw/mgar/pkg/cgit/trunk/files/apache.conf.CSW 2009-09-18 11:56:59 UTC (rev 6344) @@ -0,0 +1,12 @@ + + AllowOverride None + Options ExecCGI + Order allow,deny + Allow from all + + + + AllowOverride None + Order allow,deny + Allow from all + Added: csw/mgar/pkg/cgit/trunk/files/cgitrc.CSW =================================================================== --- csw/mgar/pkg/cgit/trunk/files/cgitrc.CSW (rev 0) +++ csw/mgar/pkg/cgit/trunk/files/cgitrc.CSW 2009-09-18 11:56:59 UTC (rev 6344) @@ -0,0 +1,12 @@ +cache-size=1000 + +snapshots=tar.gz tar.bz2 zip + +#scan-path=/var/opt/csw/gitosis/repositories + +repo.url=cgit +repo.path=/home/trygvis/dev/net.hjemli/cgit/.git +repo.desc=the master foo repository +repo.owner=fooman at foobar.com +repo.readme=info/web/about.html + 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 Sep 18 17:12:23 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Fri, 18 Sep 2009 15:12:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6345] csw/mgar/gar/v2/general-help Message-ID: Revision: 6345 http://gar.svn.sourceforge.net/gar/?rev=6345&view=rev Author: trygvis Date: 2009-09-18 15:12:23 +0000 (Fri, 18 Sep 2009) Log Message: ----------- o Adding a generic help message. Added Paths: ----------- csw/mgar/gar/v2/general-help Added: csw/mgar/gar/v2/general-help =================================================================== --- csw/mgar/gar/v2/general-help (rev 0) +++ csw/mgar/gar/v2/general-help 2009-09-18 15:12:23 UTC (rev 6345) @@ -0,0 +1,4 @@ +Please go here for more detailed documentation: + + http://sourceforge.net/apps/trac/gar/wiki/GarRepository + 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 Sep 18 17:26:31 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Fri, 18 Sep 2009 15:26:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[6346] csw/mgar/gar/v2/gar.lib.mk Message-ID: Revision: 6346 http://gar.svn.sourceforge.net/gar/?rev=6346&view=rev Author: trygvis Date: 2009-09-18 15:26:30 +0000 (Fri, 18 Sep 2009) Log Message: ----------- o Fixing a typo in the git support. Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2009-09-18 15:12:23 UTC (rev 6345) +++ csw/mgar/gar/v2/gar.lib.mk 2009-09-18 15:26:30 UTC (rev 6346) @@ -68,7 +68,7 @@ # to update the code. # we possibly proxy the git:// references depending on GIT_USE_PROXY git-http//%: - @$git clone --bare http://$* $(PARTIALDIR)/$(call GITPROJ,$*) + @git clone --bare http://$* $(PARTIALDIR)/$(call GITPROJ,$*) @( cd $(PARTIALDIR)/$(call GITPROJ,$*); \ git remote add origin http://$*; \ git config remote.origin.fetch $(if $(GIT_REFS_$(call GITPROJ,$*)),$(GIT_REFS_$(call GITPROJ,$*)),$(GIT_DEFAULT_TRACK)); ) 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 Sep 18 18:27:11 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 18 Sep 2009 16:27:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[6347] csw/mgar/pkg/cpan Message-ID: Revision: 6347 http://gar.svn.sourceforge.net/gar/?rev=6347&view=rev Author: dmichelsen Date: 2009-09-18 16:27:11 +0000 (Fri, 18 Sep 2009) Log Message: ----------- cpan/Search-Xapian: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Search-Xapian/ csw/mgar/pkg/cpan/Search-Xapian/branches/ csw/mgar/pkg/cpan/Search-Xapian/tags/ csw/mgar/pkg/cpan/Search-Xapian/trunk/ csw/mgar/pkg/cpan/Search-Xapian/trunk/Makefile csw/mgar/pkg/cpan/Search-Xapian/trunk/checksums csw/mgar/pkg/cpan/Search-Xapian/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Search-Xapian/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/Search-Xapian/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Search-Xapian/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Search-Xapian/trunk/Makefile 2009-09-18 16:27:11 UTC (rev 6347) @@ -0,0 +1,16 @@ +GARNAME = Search-Xapian +GARVERSION = 1.0.16.0 +CATEGORIES = cpan +AUTHOR = OLLY + +DESCRIPTION = A Perl XS frontend to the Xapian C++ search library +define BLURB +endef + +PACKAGES = CSWpmsearchxapian +CATALOGNAME = pm_searchxapian + +PREREQUISITE_PKGS = CSWxapiancore +REQUIRED_PKGS = $(PREREQUISITE_PKGS) + +include gar/category.mk Added: csw/mgar/pkg/cpan/Search-Xapian/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Search-Xapian/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Search-Xapian/trunk/checksums 2009-09-18 16:27:11 UTC (rev 6347) @@ -0,0 +1 @@ +732c23816cdb79f66ed83a3c25e8975f download/Search-Xapian-1.0.16.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 Fri Sep 18 18:28:01 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 18 Sep 2009 16:28:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[6348] csw/mgar/pkg Message-ID: Revision: 6348 http://gar.svn.sourceforge.net/gar/?rev=6348&view=rev Author: dmichelsen Date: 2009-09-18 16:28:01 +0000 (Fri, 18 Sep 2009) Log Message: ----------- xapian: Split into core and bindings Modified Paths: -------------- csw/mgar/pkg/xapian-bindings/trunk/Makefile csw/mgar/pkg/xapian-bindings/trunk/checksums csw/mgar/pkg/xapian-core/trunk/Makefile csw/mgar/pkg/xapian-core/trunk/checksums Added Paths: ----------- csw/mgar/pkg/xapian-bindings/ csw/mgar/pkg/xapian-core/ Removed Paths: ------------- csw/mgar/pkg/xapian/ Modified: csw/mgar/pkg/xapian-bindings/trunk/Makefile =================================================================== --- csw/mgar/pkg/xapian/trunk/Makefile 2009-09-17 16:33:32 UTC (rev 6340) +++ csw/mgar/pkg/xapian-bindings/trunk/Makefile 2009-09-18 16:28:01 UTC (rev 6348) @@ -1,8 +1,8 @@ -GARNAME = xapian-core -GARVERSION = 1.0.11 +GARNAME = xapian-bindings +GARVERSION = 1.0.16 CATEGORIES = lib -DESCRIPTION = An open source search engine library +DESCRIPTION = Xapian bindings for SWIG and JNI define BLURB Xapian is an Open Source Probabilistic Information Retrieval Library. It offers a highly adaptable toolkit that allows developers to easily add @@ -16,15 +16,17 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWxapiancore -CATALOGNAME_CSWxapiancore = xapian_core +PACKAGES = CSWxapianbindings +CATALOGNAME_CSWxapianbindings = xapian_bindings -REQUIRED_PKGS = CSWstlport CSWzlib +REQUIRED_PKGS = CSWxapiancore -EXTRA_LD_FLAGS = -lm +#EXTRA_LD_FLAGS = -lm CONFIGURE_ARGS = $(DIRPATHS) +#BUILD_ARGS = AM_CXXFLAGS="-library=stlport4 -features=tmplife" + TEST_TARGET = check include gar/category.mk Modified: csw/mgar/pkg/xapian-bindings/trunk/checksums =================================================================== --- csw/mgar/pkg/xapian/trunk/checksums 2009-09-17 16:33:32 UTC (rev 6340) +++ csw/mgar/pkg/xapian-bindings/trunk/checksums 2009-09-18 16:28:01 UTC (rev 6348) @@ -1 +1 @@ -f80a2f51b109e2a065bdcbf1ba03b808 download/xapian-core-1.0.11.tar.gz +c330b2ccc451c890916c44446e148f07 download/xapian-bindings-1.0.16.tar.gz Modified: csw/mgar/pkg/xapian-core/trunk/Makefile =================================================================== --- csw/mgar/pkg/xapian/trunk/Makefile 2009-09-17 16:33:32 UTC (rev 6340) +++ csw/mgar/pkg/xapian-core/trunk/Makefile 2009-09-18 16:28:01 UTC (rev 6348) @@ -1,5 +1,5 @@ GARNAME = xapian-core -GARVERSION = 1.0.11 +GARVERSION = 1.0.12 CATEGORIES = lib DESCRIPTION = An open source search engine library @@ -25,6 +25,11 @@ CONFIGURE_ARGS = $(DIRPATHS) +BUILD_ARGS = AM_CXXFLAGS="-library=stlport4 -features=tmplife" + TEST_TARGET = check +# We need the .la-file, otherwise xapian-config doesn't work +MERGE_EXCLUDE_LIBTOOL = + include gar/category.mk Modified: csw/mgar/pkg/xapian-core/trunk/checksums =================================================================== --- csw/mgar/pkg/xapian/trunk/checksums 2009-09-17 16:33:32 UTC (rev 6340) +++ csw/mgar/pkg/xapian-core/trunk/checksums 2009-09-18 16:28:01 UTC (rev 6348) @@ -1 +1 @@ -f80a2f51b109e2a065bdcbf1ba03b808 download/xapian-core-1.0.11.tar.gz +060efc364062704528bbfed5328e907b download/xapian-core-1.0.12.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 Sep 18 19:47:25 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 18 Sep 2009 17:47:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[6349] csw/mgar/pkg/gitosis/trunk/files/README.csw Message-ID: Revision: 6349 http://gar.svn.sourceforge.net/gar/?rev=6349&view=rev Author: bdwalton Date: 2009-09-18 17:47:24 +0000 (Fri, 18 Sep 2009) Log Message: ----------- add note about no-login gitosis account Modified Paths: -------------- csw/mgar/pkg/gitosis/trunk/files/README.csw Modified: csw/mgar/pkg/gitosis/trunk/files/README.csw =================================================================== --- csw/mgar/pkg/gitosis/trunk/files/README.csw 2009-09-18 16:28:01 UTC (rev 6348) +++ csw/mgar/pkg/gitosis/trunk/files/README.csw 2009-09-18 17:47:24 UTC (rev 6349) @@ -11,7 +11,7 @@ Perform the following steps on the gitosis server: -1. su - gitosis +1. su - gitosis (as root, since gitosis is a no-login account) 2. gitosis-init < /tmp/id_dsa.pub The server should now be ready to go. Now, in the account holding the 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 Sep 18 19:56:58 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 18 Sep 2009 17:56:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[6350] csw/mgar/pkg/gitosis/trunk/Makefile Message-ID: Revision: 6350 http://gar.svn.sourceforge.net/gar/?rev=6350&view=rev Author: bdwalton Date: 2009-09-18 17:56:57 +0000 (Fri, 18 Sep 2009) Log Message: ----------- gitosis: update recipe to use pycompile and usergroup auto gar stuff Modified Paths: -------------- csw/mgar/pkg/gitosis/trunk/Makefile Modified: csw/mgar/pkg/gitosis/trunk/Makefile =================================================================== --- csw/mgar/pkg/gitosis/trunk/Makefile 2009-09-18 17:47:24 UTC (rev 6349) +++ csw/mgar/pkg/gitosis/trunk/Makefile 2009-09-18 17:56:57 UTC (rev 6350) @@ -3,7 +3,7 @@ # This represents the tip of master as of 20090516. It is ahead of # release/0.2 PATCHLEVEL = 73a03 -CATEGORIES = utils +CATEGORIES = python DESCRIPTION = Software for hosting git repositories define BLURB @@ -24,7 +24,7 @@ PREREQUISITE_PKGS_CSWgitosis = CSWpython CSWpysetuptools -REQUIRED_PKGS_CSWgitosis = CSWgit CSWpython CSWcswclassutils CSWpysetuptools +REQUIRED_PKGS_CSWgitosis = CSWgit CSWpysetuptools GIT_REPOS = git://eagain.net/gitosis.git GIT_USE_PROXY = 1 @@ -52,19 +52,17 @@ CSWUG = gitosis:gitosis:Gitosis Host:$(GITOSISHOME):/bin/bash:: CSWUGD = $(INSTALLISADIR)/opt/csw/etc/pkg/CSW$(GARNAME) -EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc +USERGROUP = /opt/csw/etc/pkg/CSWgitosis/cswusergroup -PROTOTYPE_FILTER = awk '$$$$3 ~ /\/CSWgitosis\/cswusergroup$$$$/ { $$$$2 = "cswusergroup" }; $$$$3 ~ /\/var\/opt\/csw\/gitosis/ { $$$$2 = "ugfiles"; $$$$5 = "gitosis"; $$$$6 = "gitosis" }; $$$$3 ~ /\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' +PROTOTYPE_FILTER = awk '$$$$3 ~ /\/var\/opt\/csw\/gitosis/ { $$$$2 = "ugfiles"; $$$$5 = "gitosis"; $$$$6 = "gitosis" }; { print }' -SPKG_CLASSES = none cswpycompile cswusergroup ugfiles +SPKG_CLASSES = none ugfiles include gar/category.mk -PATH := /opt/csw/gnu:$(PATH) - # Set a slightly altered revstamp to indicate that we're not using a # pressed release. -SPKG_REVSTAMP := $(SPKG_REVSTAMP)_$(PATCHLEVEL) +SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(PATCHLEVEL) post-install-modulated: @( gmkdir -p $(CSWUGD); \ 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 Sep 18 20:16:47 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 18 Sep 2009 18:16:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[6351] csw/mgar/pkg/gitosis/trunk/Makefile Message-ID: Revision: 6351 http://gar.svn.sourceforge.net/gar/?rev=6351&view=rev Author: bdwalton Date: 2009-09-18 18:16:47 +0000 (Fri, 18 Sep 2009) Log Message: ----------- gitosis: add note about where to find first use instructions in postinstall script Modified Paths: -------------- csw/mgar/pkg/gitosis/trunk/Makefile Modified: csw/mgar/pkg/gitosis/trunk/Makefile =================================================================== --- csw/mgar/pkg/gitosis/trunk/Makefile 2009-09-18 17:56:57 UTC (rev 6350) +++ csw/mgar/pkg/gitosis/trunk/Makefile 2009-09-18 18:16:47 UTC (rev 6351) @@ -16,6 +16,8 @@ #!/bin/sh /usr/bin/passwd -N gitosis + +echo See $(docdir)/$(GARNAME)/README.csw for first use instructions. endef PACKAGES = CSWgitosis 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 Sep 18 21:29:07 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 18 Sep 2009 19:29:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[6352] csw/mgar/pkg/xapian-core/trunk Message-ID: Revision: 6352 http://gar.svn.sourceforge.net/gar/?rev=6352&view=rev Author: dmichelsen Date: 2009-09-18 19:29:07 +0000 (Fri, 18 Sep 2009) Log Message: ----------- xapian-core: Downgrade to 1.0.11 after compile problems tracked at http://trac.xapian.org/ticket/403 Modified Paths: -------------- csw/mgar/pkg/xapian-core/trunk/Makefile csw/mgar/pkg/xapian-core/trunk/checksums Modified: csw/mgar/pkg/xapian-core/trunk/Makefile =================================================================== --- csw/mgar/pkg/xapian-core/trunk/Makefile 2009-09-18 18:16:47 UTC (rev 6351) +++ csw/mgar/pkg/xapian-core/trunk/Makefile 2009-09-18 19:29:07 UTC (rev 6352) @@ -1,5 +1,5 @@ GARNAME = xapian-core -GARVERSION = 1.0.12 +GARVERSION = 1.0.11 CATEGORIES = lib DESCRIPTION = An open source search engine library @@ -25,7 +25,7 @@ CONFIGURE_ARGS = $(DIRPATHS) -BUILD_ARGS = AM_CXXFLAGS="-library=stlport4 -features=tmplife" +#BUILD_ARGS = AM_CXXFLAGS="-library=stlport4 -features=tmplife" TEST_TARGET = check Modified: csw/mgar/pkg/xapian-core/trunk/checksums =================================================================== --- csw/mgar/pkg/xapian-core/trunk/checksums 2009-09-18 18:16:47 UTC (rev 6351) +++ csw/mgar/pkg/xapian-core/trunk/checksums 2009-09-18 19:29:07 UTC (rev 6352) @@ -1 +1 @@ -060efc364062704528bbfed5328e907b download/xapian-core-1.0.12.tar.gz +f80a2f51b109e2a065bdcbf1ba03b808 download/xapian-core-1.0.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 Fri Sep 18 21:40:15 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 18 Sep 2009 19:40:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[6353] csw/mgar/pkg/gnulinks/trunk/ Message-ID: Revision: 6353 http://gar.svn.sourceforge.net/gar/?rev=6353&view=rev Author: bdwalton Date: 2009-09-18 19:40:15 +0000 (Fri, 18 Sep 2009) Log Message: ----------- gnulinks: update to gar2 external Property Changed: ---------------- csw/mgar/pkg/gnulinks/trunk/ Property changes on: csw/mgar/pkg/gnulinks/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 dmichelsen at users.sourceforge.net Fri Sep 18 22:18:06 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 18 Sep 2009 20:18:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6354] csw/mgar/pkg/xapian-bindings/trunk Message-ID: Revision: 6354 http://gar.svn.sourceforge.net/gar/?rev=6354&view=rev Author: dmichelsen Date: 2009-09-18 20:18:05 +0000 (Fri, 18 Sep 2009) Log Message: ----------- xapian-bindings: Downreved according to xapian-core Modified Paths: -------------- csw/mgar/pkg/xapian-bindings/trunk/Makefile csw/mgar/pkg/xapian-bindings/trunk/checksums Modified: csw/mgar/pkg/xapian-bindings/trunk/Makefile =================================================================== --- csw/mgar/pkg/xapian-bindings/trunk/Makefile 2009-09-18 19:40:15 UTC (rev 6353) +++ csw/mgar/pkg/xapian-bindings/trunk/Makefile 2009-09-18 20:18:05 UTC (rev 6354) @@ -1,5 +1,5 @@ GARNAME = xapian-bindings -GARVERSION = 1.0.16 +GARVERSION = 1.0.11 CATEGORIES = lib DESCRIPTION = Xapian bindings for SWIG and JNI @@ -19,7 +19,7 @@ PACKAGES = CSWxapianbindings CATALOGNAME_CSWxapianbindings = xapian_bindings -REQUIRED_PKGS = CSWxapiancore +REQUIRED_PKGS = CSWxapiancore CSWstlport #EXTRA_LD_FLAGS = -lm Modified: csw/mgar/pkg/xapian-bindings/trunk/checksums =================================================================== --- csw/mgar/pkg/xapian-bindings/trunk/checksums 2009-09-18 19:40:15 UTC (rev 6353) +++ csw/mgar/pkg/xapian-bindings/trunk/checksums 2009-09-18 20:18:05 UTC (rev 6354) @@ -1 +1 @@ -c330b2ccc451c890916c44446e148f07 download/xapian-bindings-1.0.16.tar.gz +7297a1d09564fe31b768fe58eabd219d download/xapian-bindings-1.0.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 Fri Sep 18 23:15:51 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 18 Sep 2009 21:15:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[6355] csw/mgar/pkg/gnulinks/trunk Message-ID: Revision: 6355 http://gar.svn.sourceforge.net/gar/?rev=6355&view=rev Author: bdwalton Date: 2009-09-18 21:15:51 +0000 (Fri, 18 Sep 2009) Log Message: ----------- gnulinks: update to include ggetopt, gyacc and a few other minor changes Modified Paths: -------------- csw/mgar/pkg/gnulinks/trunk/Makefile csw/mgar/pkg/gnulinks/trunk/checksums csw/mgar/pkg/gnulinks/trunk/files/CSWgnulinks.prototype Modified: csw/mgar/pkg/gnulinks/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnulinks/trunk/Makefile 2009-09-18 20:18:05 UTC (rev 6354) +++ csw/mgar/pkg/gnulinks/trunk/Makefile 2009-09-18 21:15:51 UTC (rev 6355) @@ -1,5 +1,5 @@ GARNAME = gnulinks -GARVERSION = 1.1 +GARVERSION = 1.2 CATEGORIES = xtra SPKG_SOURCEURL = No Source @@ -24,4 +24,3 @@ @/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 - Modified: csw/mgar/pkg/gnulinks/trunk/checksums =================================================================== --- csw/mgar/pkg/gnulinks/trunk/checksums 2009-09-18 20:18:05 UTC (rev 6354) +++ csw/mgar/pkg/gnulinks/trunk/checksums 2009-09-18 21:15:51 UTC (rev 6355) @@ -1,2 +1,2 @@ 28514c1726839b6e47728d188d2a1edd download/CSWgnulinks.gspec -154d1f6d3f4174bee6a930854c0ea931 download/CSWgnulinks.prototype +0f630eb8dae8b4c155c10c95383822f6 download/CSWgnulinks.prototype Modified: csw/mgar/pkg/gnulinks/trunk/files/CSWgnulinks.prototype =================================================================== --- csw/mgar/pkg/gnulinks/trunk/files/CSWgnulinks.prototype 2009-09-18 20:18:05 UTC (rev 6354) +++ csw/mgar/pkg/gnulinks/trunk/files/CSWgnulinks.prototype 2009-09-18 21:15:51 UTC (rev 6355) @@ -28,17 +28,18 @@ s none /opt/csw/gnu/dirname=../bin/gdirname s none /opt/csw/gnu/du=../bin/gdu s none /opt/csw/gnu/echo=../bin/gecho -s none /opt/csw/gnu/egrep=../bin/ggrep +s none /opt/csw/gnu/egrep=../bin/gegrep s none /opt/csw/gnu/env=../bin/genv s none /opt/csw/gnu/envsubst=../bin/genvsubst s none /opt/csw/gnu/expand=../bin/gexpand s none /opt/csw/gnu/expr=../bin/gexpr s none /opt/csw/gnu/factor=../bin/gfactor s none /opt/csw/gnu/false=../bin/gfalse -s none /opt/csw/gnu/fgrep=../bin/ggrep +s none /opt/csw/gnu/fgrep=../bin/gfgrep s none /opt/csw/gnu/find=../bin/gfind 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=../bin/ggettext s none /opt/csw/gnu/gettextize=../bin/ggettextize s none /opt/csw/gnu/gprof=../bin/ggprof @@ -84,8 +85,9 @@ s none /opt/csw/gnu/objcopy=../bin/gobjcopy s none /opt/csw/gnu/objdump=../bin/gobjdump s none /opt/csw/gnu/od=../bin/god +s none /opt/csw/gnu/oldfind=../bin/goldfind s none /opt/csw/gnu/paste=../bin/gpaste -s none /opt/csw/gnu/patch=/usr/bin/gpatch +s none /opt/csw/gnu/patch=../bin/gpatch s none /opt/csw/gnu/pathchk=../bin/gpathchk s none /opt/csw/gnu/pinky=../bin/gpinky s none /opt/csw/gnu/pr=../bin/gpr @@ -132,6 +134,8 @@ s none /opt/csw/gnu/wc=../bin/gwc s none /opt/csw/gnu/who=../bin/gwho s none /opt/csw/gnu/whoami=../bin/gwhoami +s none /opt/csw/gnu/whois=../bin/gwhois s none /opt/csw/gnu/xargs=../bin/gxargs s none /opt/csw/gnu/xgettext=../bin/gxgettext +s none /opt/csw/gnu/yacc=../bin/gyacc s none /opt/csw/gnu/yes=../bin/gyes 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 Sep 18 23:29:25 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 18 Sep 2009 21:29:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[6356] csw/mgar/pkg/asciidoc/trunk Message-ID: Revision: 6356 http://gar.svn.sourceforge.net/gar/?rev=6356&view=rev Author: bdwalton Date: 2009-09-18 21:29:25 +0000 (Fri, 18 Sep 2009) Log Message: ----------- asciidoc: patch a2x so that gnu tools are found via new dep on gnulinks/ggetopt Modified Paths: -------------- csw/mgar/pkg/asciidoc/trunk/Makefile csw/mgar/pkg/asciidoc/trunk/checksums Added Paths: ----------- csw/mgar/pkg/asciidoc/trunk/files/add-csw-gnu-path-to-a2x.patch Modified: csw/mgar/pkg/asciidoc/trunk/Makefile =================================================================== --- csw/mgar/pkg/asciidoc/trunk/Makefile 2009-09-18 21:15:51 UTC (rev 6355) +++ csw/mgar/pkg/asciidoc/trunk/Makefile 2009-09-18 21:29:25 UTC (rev 6356) @@ -18,13 +18,14 @@ ARCHALL_CSWasciidoc = 1 -REQUIRED_PKGS_CSWasciidoc = CSWpython +REQUIRED_PKGS_CSWasciidoc = CSWpython CSWgnulinks CSWggetopt MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(AUTOFILES) PATCHFILES = handle-csw-etc-paths.patch +PATCHFILES += add-csw-gnu-path-to-a2x.patch # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=67797 Modified: csw/mgar/pkg/asciidoc/trunk/checksums =================================================================== --- csw/mgar/pkg/asciidoc/trunk/checksums 2009-09-18 21:15:51 UTC (rev 6355) +++ csw/mgar/pkg/asciidoc/trunk/checksums 2009-09-18 21:29:25 UTC (rev 6356) @@ -1,2 +1,3 @@ +4f81539ae1a7796a55770bfb977e063a download/add-csw-gnu-path-to-a2x.patch 9f21d6e352b3ab668f9def3eb7497da2 download/asciidoc-8.4.5.tar.gz ec48eeea1eafdaa7e507bc11327f6eae download/handle-csw-etc-paths.patch Added: csw/mgar/pkg/asciidoc/trunk/files/add-csw-gnu-path-to-a2x.patch =================================================================== --- csw/mgar/pkg/asciidoc/trunk/files/add-csw-gnu-path-to-a2x.patch (rev 0) +++ csw/mgar/pkg/asciidoc/trunk/files/add-csw-gnu-path-to-a2x.patch 2009-09-18 21:29:25 UTC (rev 6356) @@ -0,0 +1,13 @@ +diff --speed-large-files --minimal -Nru asciidoc-8.4.5.orig/a2x asciidoc-8.4.5/a2x +--- asciidoc-8.4.5.orig/a2x 2009-05-12 00:26:16.000000000 +0200 ++++ asciidoc-8.4.5/a2x 2009-09-18 21:32:44.546730245 +0200 +@@ -7,6 +7,9 @@ + # under the terms of the GNU General Public License (GPL). + # + ++PATH=/opt/csw/gnu:$PATH ++export PATH ++ + VERSION=1.0.0 + BASENAME=$(basename "$0") + REALNAME="$0" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Sep 19 03:36:05 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 19 Sep 2009 01:36:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6357] csw/mgar/pkg/gitosis/trunk/Makefile Message-ID: Revision: 6357 http://gar.svn.sourceforge.net/gar/?rev=6357&view=rev Author: bdwalton Date: 2009-09-19 01:36:05 +0000 (Sat, 19 Sep 2009) Log Message: ----------- gitosis: work around merge exludes that strip required files Modified Paths: -------------- csw/mgar/pkg/gitosis/trunk/Makefile Modified: csw/mgar/pkg/gitosis/trunk/Makefile =================================================================== --- csw/mgar/pkg/gitosis/trunk/Makefile 2009-09-18 21:29:25 UTC (rev 6356) +++ csw/mgar/pkg/gitosis/trunk/Makefile 2009-09-19 01:36:05 UTC (rev 6357) @@ -62,6 +62,9 @@ include gar/category.mk +# override the category exclusion +_MERGE_EXCLUDE_CATEGORY = + # Set a slightly altered revstamp to indicate that we're not using a # pressed release. SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(PATCHLEVEL) 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 Sep 19 13:56:58 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 19 Sep 2009 11:56:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[6358] csw/mgar/pkg/xapian-bindings/trunk/Makefile Message-ID: Revision: 6358 http://gar.svn.sourceforge.net/gar/?rev=6358&view=rev Author: dmichelsen Date: 2009-09-19 11:56:58 +0000 (Sat, 19 Sep 2009) Log Message: ----------- xapian-bindings: Adjust compilation Modified Paths: -------------- csw/mgar/pkg/xapian-bindings/trunk/Makefile Modified: csw/mgar/pkg/xapian-bindings/trunk/Makefile =================================================================== --- csw/mgar/pkg/xapian-bindings/trunk/Makefile 2009-09-19 01:36:05 UTC (rev 6357) +++ csw/mgar/pkg/xapian-bindings/trunk/Makefile 2009-09-19 11:56:58 UTC (rev 6358) @@ -2,6 +2,10 @@ GARVERSION = 1.0.11 CATEGORIES = lib +EXTRA_MODULATORS = BINDING +#MODULATIONS_BINDING = ruby python +MODULATIONS_BINDING = ruby + DESCRIPTION = Xapian bindings for SWIG and JNI define BLURB Xapian is an Open Source Probabilistic Information Retrieval Library. It @@ -16,17 +20,30 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWxapianbindings -CATALOGNAME_CSWxapianbindings = xapian_bindings +PACKAGES = CSWpyxapian CSWrbxapian +CATALOGNAME_CSWpyxapian = py_xapian +CATALOGNAME_CSWrbxapian = rb_xapian -REQUIRED_PKGS = CSWxapiancore CSWstlport +SPKG_DESC_CSWpyxapian = Xapian bindings for Python +SPKG_DESC_CSWrbxapian = Xapian bindings for Ruby -#EXTRA_LD_FLAGS = -lm +PREREQUISITE_PKGS = CSWrubydev +REQUIRED_PKGS_CSWpyxapian = CSWpython CSWxapianrt +REQUIRED_PKGS_CSWrbxapian = CSWruby CSWxapianrt CSWgcc3corert +GARCOMPILER_ruby = GCC3 +GARCOMPILER_python = SOS11 +GARCOMPILER = $(if $(GARCOMPILER_$(BINDING)),$(GARCOMPILER_$(BINDING)),SOS11) + +CONFIGURE_ARGS_ruby = --without-python --without-php --with-ruby --without-tcl --without-csharp --without-java +CONFIGURE_ARGS_python = --with-python --without-php --without-ruby --without-tcl --without-csharp --without-java + CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(BINDING)) -#BUILD_ARGS = AM_CXXFLAGS="-library=stlport4 -features=tmplife" - TEST_TARGET = check +MERGE_SCRIPTS_isa-sparcv8-binding-ruby = copy-all +MERGE_SCRIPTS_isa-sparcv8-binding-python = copy-all + 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 Sat Sep 19 13:59:58 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 19 Sep 2009 11:59:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[6359] csw/mgar/pkg/xapian-bindings/trunk/Makefile Message-ID: Revision: 6359 http://gar.svn.sourceforge.net/gar/?rev=6359&view=rev Author: dmichelsen Date: 2009-09-19 11:59:58 +0000 (Sat, 19 Sep 2009) Log Message: ----------- xapian-bindings: Splitted files Modified Paths: -------------- csw/mgar/pkg/xapian-bindings/trunk/Makefile Modified: csw/mgar/pkg/xapian-bindings/trunk/Makefile =================================================================== --- csw/mgar/pkg/xapian-bindings/trunk/Makefile 2009-09-19 11:56:58 UTC (rev 6358) +++ csw/mgar/pkg/xapian-bindings/trunk/Makefile 2009-09-19 11:59:58 UTC (rev 6359) @@ -46,4 +46,7 @@ MERGE_SCRIPTS_isa-sparcv8-binding-ruby = copy-all MERGE_SCRIPTS_isa-sparcv8-binding-python = copy-all +PKGFILES_CSWrbxapian = $(libdir)/ruby/.* +PKGFILES_CSWrbxapian += $(docdir)/xapian-bindings/ruby/.* + 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 Sat Sep 19 15:07:14 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 19 Sep 2009 13:07:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6360] csw/mgar/pkg/xapian-core/trunk/Makefile Message-ID: Revision: 6360 http://gar.svn.sourceforge.net/gar/?rev=6360&view=rev Author: dmichelsen Date: 2009-09-19 13:07:14 +0000 (Sat, 19 Sep 2009) Log Message: ----------- xapian-core: Split files Modified Paths: -------------- csw/mgar/pkg/xapian-core/trunk/Makefile Modified: csw/mgar/pkg/xapian-core/trunk/Makefile =================================================================== --- csw/mgar/pkg/xapian-core/trunk/Makefile 2009-09-19 11:59:58 UTC (rev 6359) +++ csw/mgar/pkg/xapian-core/trunk/Makefile 2009-09-19 13:07:14 UTC (rev 6360) @@ -16,13 +16,27 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWxapiancore -CATALOGNAME_CSWxapiancore = xapian_core +PACKAGES = CSWxapian CSWxapianrt CSWxapiandevel +CATALOGNAME_CSWxapian = xapian +CATALOGNAME_CSWxapianrt = xapian_rt +CATALOGNAME_CSWxapiandevel = xapian_devel -REQUIRED_PKGS = CSWstlport CSWzlib +SPKG_DESC_CSWxapian = An open source search engine library +SPKG_DESC_CSWxapianrt = Xapian runtime libraries +SPKG_DESC_CSWxapiandevel = Xapian development files +REQUIRED_PKGS_CSWxapianrt = CSWstlport CSWzlib +REQUIRED_PKGS_CSWxapian = CSWxapianrt +REQUIRED_PKGS_CSWxapiandevel = CSWxapian +# If we compile with Sun Studio it is impossible to build the Ruby bindings as +# Ruby is compiled with GCC. +# Compiling with GCC4 yields the error "__sync_fetch_and_add_4 not found". +GARCOMPILER = GCC3 + EXTRA_LD_FLAGS = -lm +# GCC3 can not build amd64 +#BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) #BUILD_ARGS = AM_CXXFLAGS="-library=stlport4 -features=tmplife" @@ -32,4 +46,8 @@ # We need the .la-file, otherwise xapian-config doesn't work MERGE_EXCLUDE_LIBTOOL = +PKGFILES_CSWxapianrt = $(PKGFILES_RT) +PKGFILES_CSWxapiandevel = $(PKGFILES_DEVEL) +PKGFILES_CSWxapiandevel += $(docdir)/xapian-core/apidoc/.* + 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 Sat Sep 19 16:28:57 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 19 Sep 2009 14:28:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[6361] csw/mgar/pkg/xapian-bindings/trunk/Makefile Message-ID: Revision: 6361 http://gar.svn.sourceforge.net/gar/?rev=6361&view=rev Author: dmichelsen Date: 2009-09-19 14:28:57 +0000 (Sat, 19 Sep 2009) Log Message: ----------- xapian-bindings: Add merge scripts for i386 Modified Paths: -------------- csw/mgar/pkg/xapian-bindings/trunk/Makefile Modified: csw/mgar/pkg/xapian-bindings/trunk/Makefile =================================================================== --- csw/mgar/pkg/xapian-bindings/trunk/Makefile 2009-09-19 13:07:14 UTC (rev 6360) +++ csw/mgar/pkg/xapian-bindings/trunk/Makefile 2009-09-19 14:28:57 UTC (rev 6361) @@ -30,6 +30,8 @@ PREREQUISITE_PKGS = CSWrubydev REQUIRED_PKGS_CSWpyxapian = CSWpython CSWxapianrt REQUIRED_PKGS_CSWrbxapian = CSWruby CSWxapianrt CSWgcc3corert +# This should be CSWgcc3g++rt, but the lib is actually in CSWgcc3g++ +REQUIRED_PKGS_CSWrbxapian += CSWgcc3g++ GARCOMPILER_ruby = GCC3 GARCOMPILER_python = SOS11 @@ -46,6 +48,9 @@ MERGE_SCRIPTS_isa-sparcv8-binding-ruby = copy-all MERGE_SCRIPTS_isa-sparcv8-binding-python = copy-all +MERGE_SCRIPTS_isa-i386-binding-ruby = copy-all +MERGE_SCRIPTS_isa-i386-binding-python = copy-all + PKGFILES_CSWrbxapian = $(libdir)/ruby/.* PKGFILES_CSWrbxapian += $(docdir)/xapian-bindings/ruby/.* 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 Sep 19 16:58:03 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 19 Sep 2009 14:58:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[6362] csw/mgar/pkg Message-ID: Revision: 6362 http://gar.svn.sourceforge.net/gar/?rev=6362&view=rev Author: dmichelsen Date: 2009-09-19 14:58:03 +0000 (Sat, 19 Sep 2009) Log Message: ----------- colordiff: Initial commit Added Paths: ----------- csw/mgar/pkg/colordiff/ csw/mgar/pkg/colordiff/branches/ csw/mgar/pkg/colordiff/tags/ csw/mgar/pkg/colordiff/trunk/ csw/mgar/pkg/colordiff/trunk/Makefile csw/mgar/pkg/colordiff/trunk/checksums csw/mgar/pkg/colordiff/trunk/files/ Property changes on: csw/mgar/pkg/colordiff/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/colordiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/colordiff/trunk/Makefile (rev 0) +++ csw/mgar/pkg/colordiff/trunk/Makefile 2009-09-19 14:58:03 UTC (rev 6362) @@ -0,0 +1,36 @@ +GARNAME = colordiff +GARVERSION = 1.0.9 +CATEGORIES = utils + +DESCRIPTION = Wrapper for for the diff command producing colored output +define BLURB +endef + +MASTER_SITES = http://colordiff.sourceforge.net/ +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 = +BUILD_ARGS = doc +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +sysconfdir = /etc/opt/csw +PRESERVECONF = $(sysconfdir)/colordiffrc + +include gar/category.mk + +install-custom: + ginstall -d $(DESTDIR)$(docdir) + (cd $(WORKSRC) && ginstall BUGS CHANGES INSTALL README TODO $(DESTDIR)$(docdir)) + ginstall -d $(DESTDIR)$(mandir)/man1 + (cd $(WORKSRC) && ginstall cdiff.1 colordiff.1 $(DESTDIR)$(mandir)/man1) + ginstall -d $(DESTDIR)$(sysconfdir) + (cd $(WORKSRC) && ginstall colordiffrc colordiffrc-lightbg $(DESTDIR)$(sysconfdir)) + ginstall -d $(DESTDIR)$(bindir) + sed -e "s%/etc%$(sysconfdir)%g" $(WORKSRC)/colordiff.pl >$(DESTDIR)$(bindir)/colordiff + chmod 755 $(DESTDIR)$(bindir)/colordiff + ginstall $(WORKSRC)/cdiff.sh $(DESTDIR)$(bindir)/cdiff + @$(MAKECOOKIE) Added: csw/mgar/pkg/colordiff/trunk/checksums =================================================================== --- csw/mgar/pkg/colordiff/trunk/checksums (rev 0) +++ csw/mgar/pkg/colordiff/trunk/checksums 2009-09-19 14:58:03 UTC (rev 6362) @@ -0,0 +1 @@ +31864847eaa4e900f72bbb6bbc64f1ec download/colordiff-1.0.9.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Sep 21 10:42:27 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Sep 2009 08:42:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[6363] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/ cswmysql5 Message-ID: Revision: 6363 http://gar.svn.sourceforge.net/gar/?rev=6363&view=rev Author: wahwah Date: 2009-09-21 08:42:26 +0000 (Mon, 21 Sep 2009) Log Message: ----------- mysql5: Fixing a syntax error in the startup script .../files/cswmysql5. Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 2009-09-19 14:58:03 UTC (rev 6362) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 2009-09-21 08:42:26 UTC (rev 6363) @@ -99,7 +99,7 @@ `[ -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_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"` \ 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 Sep 21 12:14:21 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 21 Sep 2009 10:14:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[6364] csw/mgar/pkg Message-ID: Revision: 6364 http://gar.svn.sourceforge.net/gar/?rev=6364&view=rev Author: skayser Date: 2009-09-21 10:14:21 +0000 (Mon, 21 Sep 2009) Log Message: ----------- stalonetray: initial commit Added Paths: ----------- csw/mgar/pkg/stalonetray/ csw/mgar/pkg/stalonetray/branches/ csw/mgar/pkg/stalonetray/tags/ csw/mgar/pkg/stalonetray/trunk/ csw/mgar/pkg/stalonetray/trunk/Makefile csw/mgar/pkg/stalonetray/trunk/checksums csw/mgar/pkg/stalonetray/trunk/files/ Property changes on: csw/mgar/pkg/stalonetray/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/stalonetray/trunk/Makefile =================================================================== --- csw/mgar/pkg/stalonetray/trunk/Makefile (rev 0) +++ csw/mgar/pkg/stalonetray/trunk/Makefile 2009-09-21 10:14:21 UTC (rev 6364) @@ -0,0 +1,31 @@ +GARNAME = stalonetray +GARVERSION = 0.7.6 +CATEGORIES = apps + +DESCRIPTION = Stand-alone freedesktop.org and KDE system tray +define BLURB + Stalonetray is a stand-alone freedesktop.org and KDE system tray + (notification area) for X Window System/X11 (e.g. X.Org or XFree 86). + It has full XEMBED support and minimal dependencies: an X11 lib only. + Stalonetray works with virtually any EWMH-compliant window manager. +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# No test target for stalonetray +TEST_SCRIPTS = + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += $(CONFIGURE_ARGS)_$(GARFLAVOR) +CONFIGURE_ARGS_OPT = --disable-debug + +include gar/category.mk + +post-install-modulated: DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME) +post-install-modulated: DOCS = README AUTHORS stalonetrayrc.sample +post-install-modulated: + ginstall -d $(DOCDEST) + cp $(FILEDIR)/changelog.CSW $(DOCDEST) + cp $(addprefix $(WORKSRC)/, $(DOCS)) $(DOCDEST) + @$(MAKECOOKIE) Added: csw/mgar/pkg/stalonetray/trunk/checksums =================================================================== --- csw/mgar/pkg/stalonetray/trunk/checksums (rev 0) +++ csw/mgar/pkg/stalonetray/trunk/checksums 2009-09-21 10:14:21 UTC (rev 6364) @@ -0,0 +1 @@ +0389f28ac8a790fb6f8cf6dc33811d68 download/stalonetray-0.7.6.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 Mon Sep 21 12:31:43 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 21 Sep 2009 10:31:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6365] csw/mgar/pkg/stalonetray/trunk/Makefile Message-ID: Revision: 6365 http://gar.svn.sourceforge.net/gar/?rev=6365&view=rev Author: skayser Date: 2009-09-21 10:31:43 +0000 (Mon, 21 Sep 2009) Log Message: ----------- stalonetray: fix GARFLAVOR-dependent CONFIGURE_ARGS assignment Modified Paths: -------------- csw/mgar/pkg/stalonetray/trunk/Makefile Modified: csw/mgar/pkg/stalonetray/trunk/Makefile =================================================================== --- csw/mgar/pkg/stalonetray/trunk/Makefile 2009-09-21 10:14:21 UTC (rev 6364) +++ csw/mgar/pkg/stalonetray/trunk/Makefile 2009-09-21 10:31:43 UTC (rev 6365) @@ -17,7 +17,7 @@ TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += $(CONFIGURE_ARGS)_$(GARFLAVOR) +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) CONFIGURE_ARGS_OPT = --disable-debug include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Mon Sep 21 12:33:00 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 21 Sep 2009 10:33:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6366] csw/mgar/pkg/stalonetray/trunk/files/changelog.CSW Message-ID: Revision: 6366 http://gar.svn.sourceforge.net/gar/?rev=6366&view=rev Author: skayser Date: 2009-09-21 10:33:00 +0000 (Mon, 21 Sep 2009) Log Message: ----------- stalonetray: add changelog.CSW Added Paths: ----------- csw/mgar/pkg/stalonetray/trunk/files/changelog.CSW Added: csw/mgar/pkg/stalonetray/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/stalonetray/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/stalonetray/trunk/files/changelog.CSW 2009-09-21 10:33:00 UTC (rev 6366) @@ -0,0 +1,5 @@ +stalonetray (0.7.6,REV=2009.09.21) + + * Initial release. + + -- Sebastian Kayser Mon, 21 Sep 2009 12:04:14 +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 Sep 21 18:11:42 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 21 Sep 2009 16:11:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[6367] csw/mgar/pkg/xterm/trunk Message-ID: Revision: 6367 http://gar.svn.sourceforge.net/gar/?rev=6367&view=rev Author: skayser Date: 2009-09-21 16:11:41 +0000 (Mon, 21 Sep 2009) Log Message: ----------- xterm: working towards a build against CSWlibx11 Modified Paths: -------------- csw/mgar/pkg/xterm/trunk/Makefile csw/mgar/pkg/xterm/trunk/checksums Modified: csw/mgar/pkg/xterm/trunk/Makefile =================================================================== --- csw/mgar/pkg/xterm/trunk/Makefile 2009-09-21 10:33:00 UTC (rev 6366) +++ csw/mgar/pkg/xterm/trunk/Makefile 2009-09-21 16:11:41 UTC (rev 6367) @@ -43,6 +43,8 @@ CONFIGURE_ARGS += --enable-wide-chars CONFIGURE_ARGS += --program-suffix=86 --with-xterm-symlink CONFIGURE_ARGS += --with-freetype-cflags="-I$(includedir)/freetype2" +CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(prefix)/X11/lib # luit comes with snv_85 # http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6662431 Modified: csw/mgar/pkg/xterm/trunk/checksums =================================================================== --- csw/mgar/pkg/xterm/trunk/checksums 2009-09-21 10:33:00 UTC (rev 6366) +++ csw/mgar/pkg/xterm/trunk/checksums 2009-09-21 16:11:41 UTC (rev 6367) @@ -1,2 +1 @@ -347f24b7ed3e42a3d40b1db1ed0061f0 download/patch-mkwidth.diff 70771a21fbc54a79f68374cebb49935a download/xterm-248.tgz 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 Sep 21 18:18:43 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 21 Sep 2009 16:18:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6368] csw/mgar/pkg/xmlto/trunk Message-ID: Revision: 6368 http://gar.svn.sourceforge.net/gar/?rev=6368&view=rev Author: bdwalton Date: 2009-09-21 16:18:43 +0000 (Mon, 21 Sep 2009) Log Message: ----------- xmlto: bump to 0.0.23, remove patches that got rolled in upstream Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile csw/mgar/pkg/xmlto/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/xmlto/trunk/files/0001-add-support-for-selection-of-posix-tail-binary.patch csw/mgar/pkg/xmlto/trunk/files/0002-add-handling-so-that-gnu-cp-can-be-specified.patch csw/mgar/pkg/xmlto/trunk/files/0003-do-no-hardcode-bin-bash-to-override-env-check.patch csw/mgar/pkg/xmlto/trunk/files/0004-switch-file-detection-from-which-to-type.patch Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-21 16:11:41 UTC (rev 6367) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-21 16:18:43 UTC (rev 6368) @@ -1,5 +1,5 @@ GARNAME = xmlto -GARVERSION = 0.0.22 +GARVERSION = 0.0.23 CATEGORIES = utils PREREQUISITE_PKGS += CSWmktemp CSWfindutils CSWdocbookxsl CSWlibxslt @@ -19,11 +19,6 @@ MASTER_SITES = https://fedorahosted.org/releases/x/m/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -PATCHFILES += 0001-add-support-for-selection-of-posix-tail-binary.patch -PATCHFILES += 0002-add-handling-so-that-gnu-cp-can-be-specified.patch -PATCHFILES += 0003-do-no-hardcode-bin-bash-to-override-env-check.patch -PATCHFILES += 0004-switch-file-detection-from-which-to-type.patch - TEST_TARGET = check # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/xmlto/trunk/checksums =================================================================== --- csw/mgar/pkg/xmlto/trunk/checksums 2009-09-21 16:11:41 UTC (rev 6367) +++ csw/mgar/pkg/xmlto/trunk/checksums 2009-09-21 16:18:43 UTC (rev 6368) @@ -1,5 +1 @@ -037997ead86e0589b4e34538d7d2694a download/0001-add-support-for-selection-of-posix-tail-binary.patch -134ec47ba3f225ebd04bfb629b230e69 download/0002-add-handling-so-that-gnu-cp-can-be-specified.patch -b53522eb1413d28da8e661b76f4ab098 download/0003-do-no-hardcode-bin-bash-to-override-env-check.patch -aec9edfc4fdc77ee6bc77124bb1235f4 download/0004-switch-file-detection-from-which-to-type.patch -12f297dc7051e4fef08339980f88a1dd download/xmlto-0.0.22.tar.bz2 +3001d6bb2bbc2c8f6c2301f05120f074 download/xmlto-0.0.23.tar.bz2 Deleted: csw/mgar/pkg/xmlto/trunk/files/0001-add-support-for-selection-of-posix-tail-binary.patch =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/0001-add-support-for-selection-of-posix-tail-binary.patch 2009-09-21 16:11:41 UTC (rev 6367) +++ csw/mgar/pkg/xmlto/trunk/files/0001-add-support-for-selection-of-posix-tail-binary.patch 2009-09-21 16:18:43 UTC (rev 6368) @@ -1,48 +0,0 @@ -From 788a65e1792057ac1379c459e111eccf06b4a034 Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Tue, 15 Sep 2009 19:01:55 +0200 -Subject: [PATCH 1/2] add support for selection of posix tail binary - ---- - configure.in | 3 +++ - xmlto.in | 3 ++- - 2 files changed, 5 insertions(+), 1 deletions(-) - -diff --git a/configure.in b/configure.in -index c41bb72..0fb685e 100644 ---- a/configure.in -+++ b/configure.in -@@ -107,6 +107,9 @@ AC_PATH_PROG([LINKS], [links], [links]) - AC_ARG_VAR([W3M], [Name and path of the `w3m' browser.]) - AC_PATH_PROG([W3M], [w3m], [w3m]) - -+AC_ARG_VAR([TAIL], [Name and path of a tail binary that supports -n.]) -+AC_PATH_PROG([TAIL], [tail], [tail]) -+ - dnl - dnl default webrowser - dnl -diff --git a/xmlto.in b/xmlto.in -index 66423b3..21f9acc 100755 ---- a/xmlto.in -+++ b/xmlto.in -@@ -21,6 +21,7 @@ FIND=@FIND@ # This must be GNU find (need -maxdepth) - MKTEMP=@MKTEMP@ # See http://www.mktemp.org if missing on your system - BASH=@BASH@ # GNU bash, for running the format scripts - GETOPT=@GETOPT@ # a getopt that supports --longoptions -+TAIL=@TAIL@ # a tail that supports -n (posix) - - version () { - echo "@PACKAGE@ version @VERSION@" -@@ -407,7 +408,7 @@ esac - # sed -e 's/^]*?>//g' -e 's/^]*>//g' -e 's/^<\([^ ]*\).*$/\1/') - - # Seems reasonable fix the file command and teach it to identify the DTD/Schema but this is faster to write: --rootel=$(echo "xpath *" | "$XMLLINT_PATH" --shell "$INPUT_FILE" 2> /dev/null | head -n 3 |tail -n 1 | cut -f 4 -d " " ) -+rootel=$(echo "xpath *" | "$XMLLINT_PATH" --shell "$INPUT_FILE" 2> /dev/null | head -n 3 |$TAIL -n 1 | cut -f 4 -d " " ) - - case $(echo $rootel) in - fo:root) --- -1.6.3.2 - Deleted: csw/mgar/pkg/xmlto/trunk/files/0002-add-handling-so-that-gnu-cp-can-be-specified.patch =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/0002-add-handling-so-that-gnu-cp-can-be-specified.patch 2009-09-21 16:11:41 UTC (rev 6367) +++ csw/mgar/pkg/xmlto/trunk/files/0002-add-handling-so-that-gnu-cp-can-be-specified.patch 2009-09-21 16:18:43 UTC (rev 6368) @@ -1,191 +0,0 @@ -From d8102af69b3d635abfb913771d3fe9b1d11ad971 Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Tue, 15 Sep 2009 19:39:54 +0200 -Subject: [PATCH 2/2] add handling so that gnu cp can be specified - ---- - configure.in | 3 +++ - format/docbook/fo | 2 +- - format/docbook/html | 2 +- - format/docbook/html-nochunks | 2 +- - format/docbook/htmlhelp | 2 +- - format/docbook/javahelp | 2 +- - format/docbook/man | 2 +- - format/docbook/xhtml | 2 +- - format/docbook/xhtml-nochunks | 2 +- - format/fo/dvi | 2 +- - format/fo/pdf | 2 +- - format/xhtml1/fo | 2 +- - xmlto.in | 2 ++ - 13 files changed, 16 insertions(+), 11 deletions(-) - -diff --git a/configure.in b/configure.in -index 0fb685e..727da83 100644 ---- a/configure.in -+++ b/configure.in -@@ -110,6 +110,9 @@ AC_PATH_PROG([W3M], [w3m], [w3m]) - AC_ARG_VAR([TAIL], [Name and path of a tail binary that supports -n.]) - AC_PATH_PROG([TAIL], [tail], [tail]) - -+AC_ARG_VAR([GCP], [Name and path of a GNU cp binary (need at least -P)]) -+AC_PATH_PROG([GCP], [cp], [cp]) -+ - dnl - dnl default webrowser - dnl -diff --git a/format/docbook/fo b/format/docbook/fo -index 699fe3b..8b4f200 100755 ---- a/format/docbook/fo -+++ b/format/docbook/fo -@@ -7,6 +7,6 @@ stylesheet) - echo "http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl" - ;; - post-process) -- cp -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").fo" -+ ${GCP_PATH:-cp} -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").fo" - ;; - esac -diff --git a/format/docbook/html b/format/docbook/html -index 56bed62..3b2cd71 100755 ---- a/format/docbook/html -+++ b/format/docbook/html -@@ -7,6 +7,6 @@ stylesheet) - echo "http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl" - ;; - post-process) -- cp -R -P -p -- * "$OUTPUT_DIR" -+ ${GCP_PATH:-cp} -R -P -p -- * "$OUTPUT_DIR" - ;; - esac -diff --git a/format/docbook/html-nochunks b/format/docbook/html-nochunks -index 18a0a63..82b635b 100755 ---- a/format/docbook/html-nochunks -+++ b/format/docbook/html-nochunks -@@ -7,6 +7,6 @@ stylesheet) - echo "http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl" - ;; - post-process) -- cp -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").html" -+ ${GCP_PATH:-cp} -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").html" - ;; - esac -diff --git a/format/docbook/htmlhelp b/format/docbook/htmlhelp -index 6ae2750..01553df 100755 ---- a/format/docbook/htmlhelp -+++ b/format/docbook/htmlhelp -@@ -7,6 +7,6 @@ stylesheet) - echo "http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl" - ;; - post-process) -- cp -R -P -p -- * "$OUTPUT_DIR" -+ ${GCP_PATH:-cp} -R -P -p -- * "$OUTPUT_DIR" - ;; - esac -diff --git a/format/docbook/javahelp b/format/docbook/javahelp -index ad50388..57710f0 100755 ---- a/format/docbook/javahelp -+++ b/format/docbook/javahelp -@@ -7,6 +7,6 @@ stylesheet) - echo "http://docbook.sourceforge.net/release/xsl/current/javahelp/javahelp.xsl" - ;; - post-process) -- cp -R -P -p -- *.htm* *.hs *.xml *.jhm "$OUTPUT_DIR" -+ ${GCP_PATH:-cp} -R -P -p -- *.htm* *.hs *.xml *.jhm "$OUTPUT_DIR" - ;; - esac -diff --git a/format/docbook/man b/format/docbook/man -index 1b0d561..525b03b 100755 ---- a/format/docbook/man -+++ b/format/docbook/man -@@ -8,6 +8,6 @@ stylesheet) - ;; - post-process) - [ -e "$XSLT_PROCESSED" ] && rm "$XSLT_PROCESSED" -- cp -R -P -p -- * "$OUTPUT_DIR" 2>/dev/null -+ ${GCP_PATH:-cp} -R -P -p -- * "$OUTPUT_DIR" 2>/dev/null - ;; - esac -diff --git a/format/docbook/xhtml b/format/docbook/xhtml -index 940c250..8204549 100755 ---- a/format/docbook/xhtml -+++ b/format/docbook/xhtml -@@ -7,6 +7,6 @@ stylesheet) - echo "http://docbook.sourceforge.net/release/xsl/current/xhtml/chunk.xsl" - ;; - post-process) -- cp -R -P -p -- *.*htm* "$OUTPUT_DIR" -+ ${GCP_PATH:-cp} -R -P -p -- *.*htm* "$OUTPUT_DIR" - ;; - esac -diff --git a/format/docbook/xhtml-nochunks b/format/docbook/xhtml-nochunks -index 3ae4c81..82b555d 100755 ---- a/format/docbook/xhtml-nochunks -+++ b/format/docbook/xhtml-nochunks -@@ -7,6 +7,6 @@ stylesheet) - echo "http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl" - ;; - post-process) -- cp -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename ${XSLT_PROCESSED%.*}).html" -+ ${GCP_PATH:-cp} -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename ${XSLT_PROCESSED%.*}).html" - ;; - esac -diff --git a/format/fo/dvi b/format/fo/dvi -index 1c797a6..9db53c7 100755 ---- a/format/fo/dvi -+++ b/format/fo/dvi -@@ -34,6 +34,6 @@ post-process) - [ "$VERBOSE" -ge 3 ] && cat $OUT - fi - fi -- cp -R -P -p -- *.dvi "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").dvi" -+ ${GCP_PATH:-cp} -R -P -p -- *.dvi "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").dvi" - ;; - esac -diff --git a/format/fo/pdf b/format/fo/pdf -index c6f55a4..670cd3c 100755 ---- a/format/fo/pdf -+++ b/format/fo/pdf -@@ -37,7 +37,7 @@ DEFAULT|DBLATEX) - [ "$VERBOSE" -ge 3 ] && cat $OUT - fi - fi -- cp -R -P -p -- *.pdf "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").pdf" -+ ${GCP_PATH:-cp} -R -P -p -- *.pdf "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").pdf" - ;; - esac - ;; -diff --git a/format/xhtml1/fo b/format/xhtml1/fo -index 588051e..a445ea0 100755 ---- a/format/xhtml1/fo -+++ b/format/xhtml1/fo -@@ -7,6 +7,6 @@ stylesheet) - echo "http://www.antennahouse.com/XSLsample/sample-xsl-xhtml2fo/xhtml2fo.xsl" - ;; - post-process) -- cp -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").fo" -+ ${GCP_PATH:-cp} -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").fo" - ;; - esac -diff --git a/xmlto.in b/xmlto.in -index 21f9acc..dcab15e 100755 ---- a/xmlto.in -+++ b/xmlto.in -@@ -245,6 +245,7 @@ fi - LINKS_PATH=@LINKS@ - W3M_PATH=@W3M@ - LYNX_PATH=@LYNX@ -+GCP_PATH=@GCP@ - - # Process any options - ARGS=$(${GETOPT} \ -@@ -441,6 +442,7 @@ fi - XSLT_PROCESSOR="$XSLTPROC_PATH" # We only know about xsltproc right now. - export XSLT_PROCESSOR - export W3M_PATH -+export GCP_PATH - export LINKS_PATH - export LYNX_PATH - export FOP_PATH --- -1.6.3.2 - Deleted: csw/mgar/pkg/xmlto/trunk/files/0003-do-no-hardcode-bin-bash-to-override-env-check.patch =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/0003-do-no-hardcode-bin-bash-to-override-env-check.patch 2009-09-21 16:11:41 UTC (rev 6367) +++ csw/mgar/pkg/xmlto/trunk/files/0003-do-no-hardcode-bin-bash-to-override-env-check.patch 2009-09-21 16:18:43 UTC (rev 6368) @@ -1,24 +0,0 @@ -From d9ee41aa38e8009bff734ec540c41822a7d3998f Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Tue, 15 Sep 2009 19:45:33 +0200 -Subject: [PATCH 3/3] do no hardcode /bin/bash to override env check - ---- - configure.in | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/configure.in b/configure.in -index 727da83..bf854b7 100644 ---- a/configure.in -+++ b/configure.in -@@ -18,7 +18,6 @@ AC_CHECK_PROG([MKTEMP], [mktemp],, [mktemp]) - AC_ARG_VAR([FIND], [Name of the GNU `find' program.]) - AC_CHECK_PROG([FIND], [find],, [find] ) - --BASH=/bin/bash - AC_ARG_VAR([BASH], [Name and path of the GNU `bash' shell.]) - AC_PATH_PROG([BASH], [bash], [/bin/bash]) - --- -1.6.3.2 - Deleted: csw/mgar/pkg/xmlto/trunk/files/0004-switch-file-detection-from-which-to-type.patch =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/0004-switch-file-detection-from-which-to-type.patch 2009-09-21 16:11:41 UTC (rev 6367) +++ csw/mgar/pkg/xmlto/trunk/files/0004-switch-file-detection-from-which-to-type.patch 2009-09-21 16:18:43 UTC (rev 6368) @@ -1,170 +0,0 @@ -From b9b12cdac3163c55bf3af13b1d51dd7c60639d4b Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Wed, 16 Sep 2009 02:30:05 +0200 -Subject: [PATCH 4/4] switch file detection from `which` to `type` - ---- - format/docbook/txt | 6 +++--- - format/fo/dvi | 2 +- - format/fo/pdf | 2 +- - format/xhtml1/txt | 6 +++--- - xmlto.in | 18 +++++++++--------- - 5 files changed, 17 insertions(+), 17 deletions(-) - -diff --git a/format/docbook/txt b/format/docbook/txt -index 390e96a..d72f27f 100755 ---- a/format/docbook/txt -+++ b/format/docbook/txt -@@ -1,14 +1,14 @@ - case "$USE_BACKEND" in - DEFAULT|DBLATEX) -- if [ -n "`which "$W3M_PATH" 2>/dev/null`" ] -+ if [ -n "`type -t $W3M_PATH`" ] - then - CONVERT="$W3M_PATH" - ARGS="-T text/html -dump" -- elif [ -n "`which "$LYNX_PATH" 2>/dev/null`" ] -+ elif [ -n "`type -t $LYNX_PATH`" ] - then - CONVERT="$LYNX_PATH" - ARGS="-force_html -dump -nolist -width=72" -- elif [ -n "`which "$LINKS_PATH" 2>/dev/null`" ] -+ elif [ -n "`type -t $LINKS_PATH`" ] - then - CONVERT="$LINKS_PATH" - ARGS="-dump" -diff --git a/format/fo/dvi b/format/fo/dvi -index 9db53c7..a9af333 100755 ---- a/format/fo/dvi -+++ b/format/fo/dvi -@@ -6,7 +6,7 @@ post-process) - then - echo >&2 "Post-process XSL-FO to DVI" - fi -- if [ -z "`which $XMLTEX_PATH 2>/dev/null`" ] -+ if [ -z "`type -t $XMLTEX_PATH`" ] - then - echo >&2 "Can't process, xmltex tool not found at $XMLTEX_PATH." - exit 3 -diff --git a/format/fo/pdf b/format/fo/pdf -index 670cd3c..aa967aa 100755 ---- a/format/fo/pdf -+++ b/format/fo/pdf -@@ -8,7 +8,7 @@ DEFAULT|DBLATEX) - then - echo >&2 "Post-process XSL-FO to PDF" - fi -- if [ -z "`which $PDFXMLTEX_PATH 2>/dev/null`" ] -+ if [ -z "`type -t $PDFXMLTEX_PATH`" ] - then - echo >&2 "Can't process, pdfxmltex tool not found at $PDFXMLTEX_PATH." - exit 3 -diff --git a/format/xhtml1/txt b/format/xhtml1/txt -index fa34ff7..18c9559 100755 ---- a/format/xhtml1/txt -+++ b/format/xhtml1/txt -@@ -1,14 +1,14 @@ - case "$USE_BACKEND" in - DEFAULT|DBLATEX) -- if [ -n "`which "$W3M_PATH" 2>/dev/null`" ] -+ if [ -n "`type -t $W3M_PATH`" ] - then - CONVERT="$W3M_PATH" - ARGS="-T text/html -dump" -- elif [ -n "`which "$LYNX_PATH" 2>/dev/null`" ] -+ elif [ -n "`type -t $LYNX_PATH`" ] - then - CONVERT="$LYNX_PATH" - ARGS="-force_html -dump -nolist -width=72" -- elif [ -n "`which "$LINKS_PATH" 2>/dev/null`" ] -+ elif [ -n "`type -t $LINKS_PATH`" ] - then - CONVERT="$LINKS_PATH" - ARGS="-dump" -diff --git a/xmlto.in b/xmlto.in -index dcab15e..45221a6 100755 ---- a/xmlto.in -+++ b/xmlto.in -@@ -125,7 +125,7 @@ XMLLINT_PATH=@XMLLINT@ - XSLTPROC_PATH=@XSLTPROC@ - - # Try to setup papersize using libpaper first ... --if [ -n "`which "$PAPERCONF_PATH" 2>/dev/null`" ] -+if [ -n "`type -t $PAPERCONF_PATH`" ] - then - papername=`"$PAPERCONF_PATH" -n` - paperheight=`"$PAPERCONF_PATH" -mh | sed 's/ //g'` -@@ -156,7 +156,7 @@ EOF - fi - - # ... or use magic paper size, based on LC_PAPER --elif [ -n "`which "$LOCALE_PATH" 2>/dev/null`" ] -+elif [ -n "`type -t $LOCALE_PATH`" ] - then - # For paper sizes we know about, specify them. - h=$("$LOCALE_PATH" LC_PAPER 2>/dev/null | head -n 1) -@@ -179,7 +179,7 @@ EOF - fi - - # Magic encoding, based on locale --if [ -n "`which "$LOCALE_PATH" 2>/dev/null`" ] -+if [ -n "`type -t $LOCALE_PATH`" ] - then - charmap=$("$LOCALE_PATH" charmap 2>/dev/null) - -@@ -228,14 +228,14 @@ XMLTEX_PATH=@XMLTEX@ - PDFXMLTEX_PATH=@PDFXMLTEX@ - - #check if we could use fop/dblatex backend as default(if not, use passivetex) --if [ x"$USE_BACKEND" = xFOP ] && [ -z "`which "$FOP_PATH" 2>/dev/null`" ] -+if [ x"$USE_BACKEND" = xFOP ] && [ -z "`type -t $FOP_PATH`" ] - then - echo >&2 "@PACKAGE@: Warning: fop not found or not executable." - echo >&2 "@PACKAGE@: Using default backend..." - USE_BACKEND=DEFAULT - fi - if [ x"$USE_BACKEND" = xDBLATEX ] && \ -- [ -z "`which "$DBLATEX_PATH" 2>/dev/null`" ] -+ [ -z "`type -t $DBLATEX_PATH`" ] - then - echo >&2 "@PACKAGE@: Warning: dblatex not found or not executable." - echo >&2 "@PACKAGE@: Using default backend..." -@@ -330,7 +330,7 @@ while [ "$#" -gt "0" ]; do - ;; - --with-fop) - ##use fop instead of passivetex where possible -- if [ -z "`which "$FOP_PATH" 2>/dev/null`" ] -+ if [ -z "`type -t $FOP_PATH`" ] - then - echo >&2 Warning: fop not found or not executable. - echo >&2 Using default backend... -@@ -341,7 +341,7 @@ while [ "$#" -gt "0" ]; do - ;; - --with-dblatex) - ##use dblatex instead of passivetex where possible -- if [ -z "`which "$DBLATEX_PATH" 2>/dev/null`" ] -+ if [ -z "`type -t $DBLATEX_PATH`" ] - then - echo >&2 Warning: dblatex not found or not executable. - echo >&2 Using default backend... -@@ -490,7 +490,7 @@ cd "$XSLT_PROCESSED_DIR" - if [ "$SKIP_VALIDATION" -eq 0 ] && [ "$SOURCE_FORMAT" != "fo" ] - then - #do we have xmllint validation tool? -- if [ -z "`which "$XMLLINT_PATH" 2>/dev/null`" ] -+ if [ -z "`type -t $XMLLINT_PATH`" ] - then - echo >&2 "@PACKAGE@: xmllint validation tool not found or not executable." - echo >&2 "@PACKAGE@: Skipping validation... " \ -@@ -522,7 +522,7 @@ then - else - - #do we have xsltproc tool? -- if [ -z "`which "$XSLTPROC_PATH" 2>/dev/null`" ] -+ if [ -z "`type -t $XSLTPROC_PATH`" ] - then - echo >&2 "@PACKAGE@: Can't continue, xsltproc tool not found or not executable." - exit 3 --- -1.6.3.2 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Mon Sep 21 23:07:44 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 21 Sep 2009 21:07:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[6369] csw/mgar/pkg/x11 Message-ID: Revision: 6369 http://gar.svn.sourceforge.net/gar/?rev=6369&view=rev Author: skayser Date: 2009-09-21 21:07:41 +0000 (Mon, 21 Sep 2009) Log Message: ----------- x11/libICE: initial commit Added Paths: ----------- csw/mgar/pkg/x11/libICE/ csw/mgar/pkg/x11/libICE/branches/ csw/mgar/pkg/x11/libICE/tags/ csw/mgar/pkg/x11/libICE/trunk/ csw/mgar/pkg/x11/libICE/trunk/Makefile csw/mgar/pkg/x11/libICE/trunk/checksums csw/mgar/pkg/x11/libICE/trunk/files/ Property changes on: csw/mgar/pkg/x11/libICE/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/x11/libICE/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libICE/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libICE/trunk/Makefile 2009-09-21 21:07:41 UTC (rev 6369) @@ -0,0 +1,31 @@ +GARNAME = libICE +GARVERSION = 1.0.6 +CATEGORIES = x11 + +DESCRIPTION = X11 Inter-Client Exchange Library +define BLURB + Long description +endef + +MASTER_SITES = http://xorg.freedesktop.org/releases/individual/lib/ +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_ARGS = $(DIRPATHS) + +PACKAGES = CSWlibice CSWlibicedevel + +CATALOGNAME_CSWlibice = libice +CATALOGNAME_CSWlibice = libice_devel + +SPKG_DESC_CSWlibice = X11 Inter-Client Exchange library +SPKG_DESC_CSWlibicedevel = X11 Inter-Client Exchange library development files + +PKGFILES_CSWlibicedevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libICE/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libICE/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libICE/trunk/checksums 2009-09-21 21:07:41 UTC (rev 6369) @@ -0,0 +1 @@ +4a8f09f15fc92196b91d61e2dc9afcea download/libICE-1.0.6.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 Sep 22 00:38:38 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 21 Sep 2009 22:38:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6370] csw/mgar/pkg/mysql5/branches/mysql-5.0.x Message-ID: Revision: 6370 http://gar.svn.sourceforge.net/gar/?rev=6370&view=rev Author: wahwah Date: 2009-09-21 22:38:38 +0000 (Mon, 21 Sep 2009) Log Message: ----------- mysql5: Better prototypes for mysql5 subpackages. Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql.preinstall csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswusergroup Property Changed: ---------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Property changes on: csw/mgar/pkg/mysql5/branches/mysql-5.0.x ___________________________________________________________________ Modified: svn:ignore - cookies download work + cookies download work mysql-5.0.84 old-pkgs CSWmysql5 Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-09-21 21:07:41 UTC (rev 6369) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-09-21 22:38:38 UTC (rev 6370) @@ -1,3 +1,14 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# TODO(maciej): +# - include the right symlinks in the right packages +# - declare mysql4 incompatible +# - reduce the size of the package +# - define file ownerships with cswusergroup +# - verify file permissions + GARNAME = mysql5 GARVERSION = 5.0.84 CATEGORIES = server @@ -4,7 +15,7 @@ DISTNAME = mysql-$(GARVERSION) -DESCRIPTION = Multithreaded SQL database +DESCRIPTION = Multithreaded SQL database server define BLURB MySQL is a very fast, multi-threaded, multi-user and robust SQL (Structured Query Language) database server. @@ -14,8 +25,10 @@ prefix = /opt/csw/mysql5 sysconfdir = /etc/opt/csw/mysql5 localstatedir = /var/opt/csw/mysql5 +global_sysconfdir = /etc/opt/csw +global_bindir = /opt/csw/bin -INITSMF = $(sysconfdir)/init\.d/cswmysql5 +INITSMF = $(global_sysconfdir)/init\.d/cswmysql5 PATCHFILES = 0001-Use-libc-not-libcrypt.patch PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch @@ -32,6 +45,8 @@ CATALOGNAME_CSWmysql5rt = $(GARNAME)rt CATALOGNAME_CSWmysql5test = $(GARNAME)test +INCOMPATIBLE_PKGS_CSWmysql5 = CSWmysql4 + SPKG_DESC_CSWmysql5 = Multithreaded SQL database SPKG_DESC_CSWmysql5bench = MySQL 5 benchmarking SPKG_DESC_CSWmysql5client = MySQL 5 client binaries @@ -40,15 +55,32 @@ 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 +CSWmysql5client_programs += myisampack +CSWmysql5client_programs += mysql +CSWmysql5client_programs += mysql_client_test +CSWmysql5client_programs += mysql_zap +CSWmysql5client_programs += mysqlaccess +CSWmysql5client_programs += mysqladmin +CSWmysql5client_programs += mysqlbin +CSWmysql5client_programs += mysqlbinlog +CSWmysql5client_programs += mysqlcheck +CSWmysql5client_programs += mysqldump +CSWmysql5client_programs += mysqlhotcopy +CSWmysql5client_programs += mysqlimport +CSWmysql5client_programs += mysqlshow +CSWmysql5client_programs += perror +CSWmysql5client_programs += replace + + PKGFILES_CSWmysql5client = $(bindir) -PKGFILES_CSWmysql5client += $(bindir)$(support64)/myisam(log|pack) -PKGFILES_CSWmysql5client += $(bindir)$(support64)/mysql -PKGFILES_CSWmysql5client += $(bindir)$(support64)/mysql_client_test -PKGFILES_CSWmysql5client += $(bindir)$(support64)/mysql(_zap|access|admin|binlog|check) -PKGFILES_CSWmysql5client += $(bindir)$(support64)/mysql(dump|hotcopy|import|show) -PKGFILES_CSWmysql5client += $(bindir)$(support64)/(perror|replace) -PKGFILES_CSWmysql5client += $(mandir)/man1/mysql(|\_zap|access|admin|dump|show)\.1 -PKGFILES_CSWmysql5client += $(mandir)/man1/(perror|replace)\.1 +PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(bindir)$(support64)/$(bin_name)) +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_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(mandir)/man1/$(bin_name)\.1) PKGFILES_CSWmysql5devel = $(prefix)/include.* PKGFILES_CSWmysql5devel += $(bindir)$(support64)/mysql_config PKGFILES_CSWmysql5devel += $(mandir)/man1/mysql_config\.1 @@ -61,9 +93,8 @@ 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 += CSWmysql.preinstall - -# 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 CSWzlib @@ -94,6 +125,14 @@ # Enable 64 bits build BUILD64 = 1 +USERGROUP = /opt/csw/etc/pkg/CSWmysql5/cswusergroup +PROTOTYPE_FILTER = awk ' \ + $$$$3 ~ /\/var\/opt\/csw\/mysql5$$$$/ { $$$$2 = "ugfiles"; \ + $$$$4 = "0700"; \ + $$$$5 = "mysql"; \ + $$$$6 = "mysql" } \ + { print }' + include gar/category.mk post-install-modulated: @@ -101,9 +140,18 @@ ginstall -m 755 -d $(DESTDIR)$(datadir)/mysql5/doc ginstall -m 644 $(FILEDIR)/README.CSW $(DESTDIR)$(datadir)/mysql5/doc ginstall -m 755 -d $(DESTDIR)/opt/csw/share/mysql5/doc - ln -s ../../../mysql5/share/mysql5/doc/README.CSW \ + ln -sf ../../../mysql5/share/mysql5/doc/README.CSW \ $(DESTDIR)/opt/csw/share/mysql5/doc/README.CSW ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d ginstall -m 755 $(FILEDIR)/cswmysql5 $(DESTDIR)/etc/opt/csw/init.d ginstall -m 755 $(FILEDIR)/quick_start-csw $(DESTDIR)$(datadir)/mysql5 + ginstall -m 755 -d $(DESTDIR)$(global_sysconfdir)/pkg/CSWmysql5 + ginstall -m 644 $(FILEDIR)/cswusergroup \ + $(DESTDIR)$(global_sysconfdir)/pkg/CSWmysql5 + + # Create symlinks + ginstall -m 755 -d $(DESTDIR)$(global_bindir) + for f in $(DESTDIR)$(bindir)/*; do \ + ln -s ../mysql5/bin/`basename $$f` $(DESTDIR)$(global_bindir)/`basename $$f`; \ + done @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-09-21 21:07:41 UTC (rev 6369) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-09-21 22:38:38 UTC (rev 6370) @@ -2,7 +2,8 @@ 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 +cc2a219abbe7dc6049775cff070a27a5 download/CSWmysql.preinstall 70d7860bfa776dfc5510fc11d7c14203 download/README.CSW -815a50011c356cd29758ca2195804952 download/cswmysql5 +fa8f33c812604457f2c0792e875f6967 download/cswmysql5 671348f1a5b078da9ca76f97e1fda325 download/mysql-5.0.84.tar.gz 1d79b3cfc4f91db05952bf71f0181fe7 download/quick_start-csw Added: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql.preinstall =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql.preinstall (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql.preinstall 2009-09-21 22:38:38 UTC (rev 6370) @@ -0,0 +1,40 @@ +#!/bin/sh +# vim:set sw=2 ts=2 sts=2 expandtab: +# +# $Id$ +# + +obsolete_directories="/opt/csw/mysql5/var:/var/opt/csw/mysql5" + +obsolete_dir_information=" +This directory is obsolete. Files in this directory are going to be ignored. +Please move your data to the new location. + +Feel free to remove this file afterwards. +" +obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE" + +for dirpair in ${obsolete_directories}; do + obsolete_dir=`echo ${dirpair} | cut -d: -f1` + new_dir=`echo ${dirpair} | cut -d: -f2` + if [ -d "${PKG_INSTALL_ROOT}${obsolete_dir}" ]; then + echo + echo "*******************************************************************" + echo "* The old configuration directory ${obsolete_dir} still exists. " + echo "* Please move your configuration to ${new_dir}. " + echo "* " + echo "* Installation will continue in 10 seconds. " + echo "* Press CTRL+C if you want to stop now. " + echo "*******************************************************************" + echo + sleep 10 + + # Leaving a note for the sysadmin if the they proceed with the installation. + fn="${PKG_INSTALL_ROOT}${obsolete_dir}/${obsolete_dir_file_name}" + if touch "${fn}" 2>/dev/null; then + echo "${obsolete_dir_information}" > "${fn}" + fi + fi +done + +exit 0 Added: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswusergroup =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswusergroup (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswusergroup 2009-09-21 22:38:38 UTC (rev 6370) @@ -0,0 +1 @@ +mysql:mysql:MySQL database user:/opt/csw/mysql:/bin/false:: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Sep 22 03:26:33 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 22 Sep 2009 01:26:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[6371] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 6371 http://gar.svn.sourceforge.net/gar/?rev=6371&view=rev Author: bdwalton Date: 2009-09-22 01:26:33 +0000 (Tue, 22 Sep 2009) Log Message: ----------- git: disable tests until next version bump Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-09-21 22:38:38 UTC (rev 6370) +++ csw/mgar/pkg/git/trunk/Makefile 2009-09-22 01:26:33 UTC (rev 6371) @@ -4,7 +4,7 @@ CATEGORIES = devel # disable tests until next version bump (at the top so it stands out) -# TEST_SCRIPTS = +TEST_SCRIPTS = PACKAGES = CSWgit CSWgitk CSWgitgui CSWgitsvn CSWgitcvs CSWgitemacs CSWgitdoc PACKAGES += CSWgitcompletion CSWgitdevel 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 Sep 22 09:12:16 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 07:12:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[6372] csw/mgar/pkg/x11/libxft/trunk/Makefile Message-ID: Revision: 6372 http://gar.svn.sourceforge.net/gar/?rev=6372&view=rev Author: dmichelsen Date: 2009-09-22 07:12:16 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libxft: Fix description Modified Paths: -------------- csw/mgar/pkg/x11/libxft/trunk/Makefile Modified: csw/mgar/pkg/x11/libxft/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxft/trunk/Makefile 2009-09-22 01:26:33 UTC (rev 6371) +++ csw/mgar/pkg/x11/libxft/trunk/Makefile 2009-09-22 07:12:16 UTC (rev 6372) @@ -2,7 +2,7 @@ GARVERSION = 2.1.13 CATEGORIES = x11 -DESCRIPTION = X11 authorisation library +DESCRIPTION = A client-side font API for X applications define BLURB Xft provides a client-side font API for X applications, making the FreeType font rasterizer available to X clients. Fontconfig is used 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 Sep 22 10:29:08 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 22 Sep 2009 08:29:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[6373] csw/mgar/pkg/mysql5/branches/mysql-5.0.x Message-ID: Revision: 6373 http://gar.svn.sourceforge.net/gar/?rev=6373&view=rev Author: wahwah Date: 2009-09-22 08:29:08 +0000 (Tue, 22 Sep 2009) Log Message: ----------- mysql5: Defined incompatible packages, set runtime dependencies, set the ownership of /var/opt/csw/mysql directory, added a preinstall script with a warning. Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.preinstall Removed Paths: ------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql.preinstall Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-09-22 07:12:16 UTC (rev 6372) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-09-22 08:29:08 UTC (rev 6373) @@ -2,13 +2,6 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -# TODO(maciej): -# - include the right symlinks in the right packages -# - declare mysql4 incompatible -# - reduce the size of the package -# - define file ownerships with cswusergroup -# - verify file permissions - GARNAME = mysql5 GARVERSION = 5.0.84 CATEGORIES = server @@ -45,7 +38,12 @@ CATALOGNAME_CSWmysql5rt = $(GARNAME)rt CATALOGNAME_CSWmysql5test = $(GARNAME)test -INCOMPATIBLE_PKGS_CSWmysql5 = CSWmysql4 +INCOMPATIBLE_PKGS_CSWmysql5bench = CSWmysql4bench +INCOMPATIBLE_PKGS_CSWmysql5client = CSWmysql4client +INCOMPATIBLE_PKGS_CSWmysql5 = CSWmysql4 +INCOMPATIBLE_PKGS_CSWmysql5devel = CSWmysql4devel +INCOMPATIBLE_PKGS_CSWmysql5rt = CSWmysql4rt +INCOMPATIBLE_PKGS_CSWmysql5test = CSWmysql4test SPKG_DESC_CSWmysql5 = Multithreaded SQL database SPKG_DESC_CSWmysql5bench = MySQL 5 benchmarking @@ -61,39 +59,43 @@ CSWmysql5client_programs = myisamlog CSWmysql5client_programs += myisampack CSWmysql5client_programs += mysql -CSWmysql5client_programs += mysql_client_test -CSWmysql5client_programs += mysql_zap CSWmysql5client_programs += mysqlaccess CSWmysql5client_programs += mysqladmin CSWmysql5client_programs += mysqlbin CSWmysql5client_programs += mysqlbinlog CSWmysql5client_programs += mysqlcheck +CSWmysql5client_programs += mysql_client_test CSWmysql5client_programs += mysqldump CSWmysql5client_programs += mysqlhotcopy CSWmysql5client_programs += mysqlimport CSWmysql5client_programs += mysqlshow +CSWmysql5client_programs += mysql_zap CSWmysql5client_programs += perror CSWmysql5client_programs += replace +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),$(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_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(mandir)/man1/$(bin_name)\.1) -PKGFILES_CSWmysql5devel = $(prefix)/include.* PKGFILES_CSWmysql5devel += $(bindir)$(support64)/mysql_config PKGFILES_CSWmysql5devel += $(mandir)/man1/mysql_config\.1 +PKGFILES_CSWmysql5devel = $(prefix)/include.* PKGFILES_CSWmysql5rt = $(prefix)/lib/.*\.so.* -PKGFILES_CSWmysql5bench = $(prefix)/sql-bench.* PKGFILES_CSWmysql5test = $(prefix)/mysql-test.* -REQUIRED_PKGS_CSWmysql5client = CSWmysql5rt +REQUIRED_PKGS_CSWmysql5bench = CSWmysql5 +REQUIRED_PKGS_CSWmysql5client = CSWmysql5rt +REQUIRED_PKGS_CSWmysql5 = CSWmysql5client CSWmysql5rt +REQUIRED_PKGS_CSWmysql5devel = CSWmysql5 +REQUIRED_PKGS_CSWmysql5test = CSWmysql5 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 += CSWmysql.preinstall +DISTFILES += CSWmysql5.preinstall UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -132,6 +134,7 @@ $$$$5 = "mysql"; \ $$$$6 = "mysql" } \ { print }' +SPKG_CLASSES = none ugfiles include gar/category.mk Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-09-22 07:12:16 UTC (rev 6372) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-09-22 08:29:08 UTC (rev 6373) @@ -2,7 +2,7 @@ 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 -cc2a219abbe7dc6049775cff070a27a5 download/CSWmysql.preinstall +cc2a219abbe7dc6049775cff070a27a5 download/CSWmysql5.preinstall 70d7860bfa776dfc5510fc11d7c14203 download/README.CSW fa8f33c812604457f2c0792e875f6967 download/cswmysql5 671348f1a5b078da9ca76f97e1fda325 download/mysql-5.0.84.tar.gz Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql.preinstall =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql.preinstall 2009-09-22 07:12:16 UTC (rev 6372) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql.preinstall 2009-09-22 08:29:08 UTC (rev 6373) @@ -1,40 +0,0 @@ -#!/bin/sh -# vim:set sw=2 ts=2 sts=2 expandtab: -# -# $Id$ -# - -obsolete_directories="/opt/csw/mysql5/var:/var/opt/csw/mysql5" - -obsolete_dir_information=" -This directory is obsolete. Files in this directory are going to be ignored. -Please move your data to the new location. - -Feel free to remove this file afterwards. -" -obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE" - -for dirpair in ${obsolete_directories}; do - obsolete_dir=`echo ${dirpair} | cut -d: -f1` - new_dir=`echo ${dirpair} | cut -d: -f2` - if [ -d "${PKG_INSTALL_ROOT}${obsolete_dir}" ]; then - echo - echo "*******************************************************************" - echo "* The old configuration directory ${obsolete_dir} still exists. " - echo "* Please move your configuration to ${new_dir}. " - echo "* " - echo "* Installation will continue in 10 seconds. " - echo "* Press CTRL+C if you want to stop now. " - echo "*******************************************************************" - echo - sleep 10 - - # Leaving a note for the sysadmin if the they proceed with the installation. - fn="${PKG_INSTALL_ROOT}${obsolete_dir}/${obsolete_dir_file_name}" - if touch "${fn}" 2>/dev/null; then - echo "${obsolete_dir_information}" > "${fn}" - fi - fi -done - -exit 0 Copied: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.preinstall (from rev 6370, csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql.preinstall) =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.preinstall (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.preinstall 2009-09-22 08:29:08 UTC (rev 6373) @@ -0,0 +1,40 @@ +#!/bin/sh +# vim:set sw=2 ts=2 sts=2 expandtab: +# +# $Id$ +# + +obsolete_directories="/opt/csw/mysql5/var:/var/opt/csw/mysql5" + +obsolete_dir_information=" +This directory is obsolete. Files in this directory are going to be ignored. +Please move your data to the new location. + +Feel free to remove this file afterwards. +" +obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE" + +for dirpair in ${obsolete_directories}; do + obsolete_dir=`echo ${dirpair} | cut -d: -f1` + new_dir=`echo ${dirpair} | cut -d: -f2` + if [ -d "${PKG_INSTALL_ROOT}${obsolete_dir}" ]; then + echo + echo "*******************************************************************" + echo "* The old configuration directory ${obsolete_dir} still exists. " + echo "* Please move your configuration to ${new_dir}. " + echo "* " + echo "* Installation will continue in 10 seconds. " + echo "* Press CTRL+C if you want to stop now. " + echo "*******************************************************************" + echo + sleep 10 + + # Leaving a note for the sysadmin if the they proceed with the installation. + fn="${PKG_INSTALL_ROOT}${obsolete_dir}/${obsolete_dir_file_name}" + if touch "${fn}" 2>/dev/null; then + echo "${obsolete_dir_information}" > "${fn}" + fi + fi +done + +exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Sep 22 11:34:54 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 22 Sep 2009 09:34:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[6374] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 6374 http://gar.svn.sourceforge.net/gar/?rev=6374&view=rev Author: skayser Date: 2009-09-22 09:34:54 +0000 (Tue, 22 Sep 2009) Log Message: ----------- gar/v2: fix USERGROUP handling, cswusergroup needs to be prepended 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-09-22 08:29:08 UTC (rev 6373) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-09-22 09:34:54 UTC (rev 6374) @@ -160,11 +160,12 @@ SPKG_PKGFILE ?= %{bitname}-%{SPKG_VERSION}%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-%{arch}-$(or $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),CSW).pkg # Handle cswclassutils -# - prepend cswpreserveconf if it is not already in SPKG_CLASSES +# - append csw* classes if they are used and not already contained in SPKG_CLASSES +# - exception: prepend cswusergroup so that required accounts are setup first SPKG_CLASSES := $(SPKG_CLASSES) $(if $(SAMPLECONF),$(if $(filter cswcpsampleconf,$(SPKG_CLASSES)),,cswcpsampleconf)) SPKG_CLASSES := $(SPKG_CLASSES) $(if $(PRESERVECONF),$(if $(filter cswpreserveconf,$(SPKG_CLASSES)),,cswpreserveconf)) SPKG_CLASSES := $(SPKG_CLASSES) $(if $(INITSMF),$(if $(filter cswinitsmf,$(SPKG_CLASSES)),,cswinitsmf)) -SPKG_CLASSES := $(SPKG_CLASSES) $(if $(USERGROUP),$(if $(filter cswusergroup,$(SPKG_CLASSES)),,cswusergroup)) +SPKG_CLASSES := $(if $(USERGROUP),$(if $(filter cswusergroup,$(SPKG_CLASSES)),,cswusergroup)) $(SPKG_CLASSES) SPKG_CLASSES := $(SPKG_CLASSES) $(if $(PYCOMPILE),$(if $(filter cswpycompile,$(SPKG_CLASSES)),,cswpycompile)) # - set class for all config files ifneq ($(SAMPLECONF)$(PRESERVECONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),) 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 Sep 22 11:35:13 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 09:35:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[6375] csw/mgar/pkg/x11 Message-ID: Revision: 6375 http://gar.svn.sourceforge.net/gar/?rev=6375&view=rev Author: dmichelsen Date: 2009-09-22 09:35:13 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libice: make dirname conform catalog Modified Paths: -------------- csw/mgar/pkg/x11/libice/trunk/Makefile csw/mgar/pkg/x11/libice/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/libice/ Removed Paths: ------------- csw/mgar/pkg/x11/libICE/ Modified: csw/mgar/pkg/x11/libice/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libICE/trunk/Makefile 2009-09-22 01:26:33 UTC (rev 6371) +++ csw/mgar/pkg/x11/libice/trunk/Makefile 2009-09-22 09:35:13 UTC (rev 6375) @@ -4,14 +4,14 @@ DESCRIPTION = X11 Inter-Client Exchange Library define BLURB - Long description + X Inter-Client Exchange (ICE) protocol library endef -MASTER_SITES = http://xorg.freedesktop.org/releases/individual/lib/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/x11/libice/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libICE/trunk/checksums 2009-09-22 01:26:33 UTC (rev 6371) +++ csw/mgar/pkg/x11/libice/trunk/checksums 2009-09-22 09:35:13 UTC (rev 6375) @@ -1 +1 @@ -4a8f09f15fc92196b91d61e2dc9afcea download/libICE-1.0.6.tar.gz +2d39bc924af24325dae589e9a849180c download/libICE-1.0.6.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 Sep 22 11:36:48 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 09:36:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[6376] csw/mgar/pkg/x11/libice/trunk/Makefile Message-ID: Revision: 6376 http://gar.svn.sourceforge.net/gar/?rev=6376&view=rev Author: dmichelsen Date: 2009-09-22 09:36:48 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libice: Add dependency Modified Paths: -------------- csw/mgar/pkg/x11/libice/trunk/Makefile Modified: csw/mgar/pkg/x11/libice/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libice/trunk/Makefile 2009-09-22 09:35:13 UTC (rev 6375) +++ csw/mgar/pkg/x11/libice/trunk/Makefile 2009-09-22 09:36:48 UTC (rev 6376) @@ -23,6 +23,8 @@ SPKG_DESC_CSWlibice = X11 Inter-Client Exchange library SPKG_DESC_CSWlibicedevel = X11 Inter-Client Exchange library development files +REQUIRED_PKGS_CSWlibicedevel = CSWlibice + PKGFILES_CSWlibicedevel = $(PKGFILES_DEVEL) BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Sep 22 11:38:41 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 09:38:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[6377] csw/mgar/pkg/x11/libice/trunk/Makefile Message-ID: Revision: 6377 http://gar.svn.sourceforge.net/gar/?rev=6377&view=rev Author: dmichelsen Date: 2009-09-22 09:38:37 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libice: Fix catalog name Modified Paths: -------------- csw/mgar/pkg/x11/libice/trunk/Makefile Modified: csw/mgar/pkg/x11/libice/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libice/trunk/Makefile 2009-09-22 09:36:48 UTC (rev 6376) +++ csw/mgar/pkg/x11/libice/trunk/Makefile 2009-09-22 09:38:37 UTC (rev 6377) @@ -18,7 +18,7 @@ PACKAGES = CSWlibice CSWlibicedevel CATALOGNAME_CSWlibice = libice -CATALOGNAME_CSWlibice = libice_devel +CATALOGNAME_CSWlibicedevel = libice_devel SPKG_DESC_CSWlibice = X11 Inter-Client Exchange library SPKG_DESC_CSWlibicedevel = X11 Inter-Client Exchange library development files 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 Sep 22 11:41:00 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 22 Sep 2009 09:41:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6378] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 6378 http://gar.svn.sourceforge.net/gar/?rev=6378&view=rev Author: skayser Date: 2009-09-22 09:41:00 +0000 (Tue, 22 Sep 2009) Log Message: ----------- gar/v2: rolled back naive r6374, cswusergroup and ugfiles need to be handled BOTH by GAR 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-09-22 09:38:37 UTC (rev 6377) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-09-22 09:41:00 UTC (rev 6378) @@ -160,12 +160,11 @@ SPKG_PKGFILE ?= %{bitname}-%{SPKG_VERSION}%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-%{arch}-$(or $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),CSW).pkg # Handle cswclassutils -# - append csw* classes if they are used and not already contained in SPKG_CLASSES -# - exception: prepend cswusergroup so that required accounts are setup first +# - prepend cswpreserveconf if it is not already in SPKG_CLASSES SPKG_CLASSES := $(SPKG_CLASSES) $(if $(SAMPLECONF),$(if $(filter cswcpsampleconf,$(SPKG_CLASSES)),,cswcpsampleconf)) SPKG_CLASSES := $(SPKG_CLASSES) $(if $(PRESERVECONF),$(if $(filter cswpreserveconf,$(SPKG_CLASSES)),,cswpreserveconf)) SPKG_CLASSES := $(SPKG_CLASSES) $(if $(INITSMF),$(if $(filter cswinitsmf,$(SPKG_CLASSES)),,cswinitsmf)) -SPKG_CLASSES := $(if $(USERGROUP),$(if $(filter cswusergroup,$(SPKG_CLASSES)),,cswusergroup)) $(SPKG_CLASSES) +SPKG_CLASSES := $(SPKG_CLASSES) $(if $(USERGROUP),$(if $(filter cswusergroup,$(SPKG_CLASSES)),,cswusergroup)) SPKG_CLASSES := $(SPKG_CLASSES) $(if $(PYCOMPILE),$(if $(filter cswpycompile,$(SPKG_CLASSES)),,cswpycompile)) # - set class for all config files ifneq ($(SAMPLECONF)$(PRESERVECONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),) 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 Sep 22 11:46:46 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 22 Sep 2009 09:46:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6379] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 6379 http://gar.svn.sourceforge.net/gar/?rev=6379&view=rev Author: wahwah Date: 2009-09-22 09:46:46 +0000 (Tue, 22 Sep 2009) Log Message: ----------- mysql5: cswusergroup must be listed as well 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-09-22 09:41:00 UTC (rev 6378) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-09-22 09:46:46 UTC (rev 6379) @@ -134,7 +134,7 @@ $$$$5 = "mysql"; \ $$$$6 = "mysql" } \ { print }' -SPKG_CLASSES = none ugfiles +SPKG_CLASSES = none cswusergroup ugfiles 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 Sep 22 11:53:16 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 09:53:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[6380] csw/mgar/pkg/x11 Message-ID: Revision: 6380 http://gar.svn.sourceforge.net/gar/?rev=6380&view=rev Author: dmichelsen Date: 2009-09-22 09:53:16 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libsm: Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libsm/ csw/mgar/pkg/x11/libsm/branches/ csw/mgar/pkg/x11/libsm/tags/ csw/mgar/pkg/x11/libsm/trunk/ csw/mgar/pkg/x11/libsm/trunk/Makefile csw/mgar/pkg/x11/libsm/trunk/checksums csw/mgar/pkg/x11/libsm/trunk/files/ Property changes on: csw/mgar/pkg/x11/libsm/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/x11/libsm/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libsm/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libsm/trunk/Makefile 2009-09-22 09:53:16 UTC (rev 6380) @@ -0,0 +1,37 @@ +GARNAME = libsm +GARVERSION = 1.1.1 +CATEGORIES = x11 + +DESCRIPTION = X11 Session Management library +define BLURB + This package provides the main interface to the X11 Session Management + library, which allows for applications to both manage sessions, and make + use of session managers to save and restore their state for later use. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +DISTNAME = libSM-$(GARVERSION) +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 + +PREREQUISITE_PKGS = CSWlibicedevel +REQUIRED_PKGS = CSWlibice + +PACKAGES = CSWlibsm CSWlibsmdevel + +CATALOGNAME_CSWlibsm = libsm +CATALOGNAME_CSWlibsmdevel = libsm_devel + +SPKG_DESC_CSWlibsm = X11 Session Management library +SPKG_DESC_CSWlibsmdevel = X11 Session Management library development files + +BUILD64 = 1 +NOISALIST = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +PKGFILES_CSWlibsmdevel = $(PKGFILES_DEVEL) + +include gar/category.mk Added: csw/mgar/pkg/x11/libsm/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libsm/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libsm/trunk/checksums 2009-09-22 09:53:16 UTC (rev 6380) @@ -0,0 +1 @@ +6889a455496aaaa65b1fa05fc518d179 download/libSM-1.1.1.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 Sep 22 12:18:07 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 10:18:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[6381] csw/mgar/pkg/x11 Message-ID: Revision: 6381 http://gar.svn.sourceforge.net/gar/?rev=6381&view=rev Author: dmichelsen Date: 2009-09-22 10:18:07 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libxt: Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxt/ csw/mgar/pkg/x11/libxt/branches/ csw/mgar/pkg/x11/libxt/tags/ csw/mgar/pkg/x11/libxt/trunk/ csw/mgar/pkg/x11/libxt/trunk/Makefile csw/mgar/pkg/x11/libxt/trunk/checksums csw/mgar/pkg/x11/libxt/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxt/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/x11/libxt/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxt/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxt/trunk/Makefile 2009-09-22 10:18:07 UTC (rev 6381) @@ -0,0 +1,38 @@ +GARNAME = libxt +GARVERSION = 1.0.6 +CATEGORIES = x11 + +DESCRIPTION = X11 toolkit intrinsics library +define BLURB + LibXt provides the X Toolkit Intrinsics, an abstract widget library + upon which other toolkits are based. Xt is the basis for many toolkits, + including the Athena widgets (Xaw), and LessTif. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +DISTNAME = libXt-$(GARVERSION) +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 + +PREREQUISITE_PKGS = CSWlibsmdevel + +PACKAGES = CSWlibxt CSWlibxtdevel + +CATALOGNAME_CSWlibxt = libxt +CATALOGNAME_CSWlibxtdevel = libxt_devel + +SPKG_DESC_CSWlibxt = X11 toolkit intrinsics library +SPKG_DESC_CSWlibxtdevel = X11 toolkit intrinsics library development files + +REQUIRED_PKGS_CSWlibxtdevel = CSWlibxt + +PKGFILES_CSWlibxtdevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/x11/libxt/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxt/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxt/trunk/checksums 2009-09-22 10:18:07 UTC (rev 6381) @@ -0,0 +1 @@ +953930ddf9fdaa1405732c7f01e9e599 download/libXt-1.0.6.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Sep 22 12:36:07 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 22 Sep 2009 10:36:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[6382] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 6382 http://gar.svn.sourceforge.net/gar/?rev=6382&view=rev Author: wahwah Date: 2009-09-22 10:36:07 +0000 (Tue, 22 Sep 2009) Log Message: ----------- mysql5: Runtime libraries can live together with mysql4. 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-09-22 10:18:07 UTC (rev 6381) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-09-22 10:36:07 UTC (rev 6382) @@ -42,7 +42,6 @@ INCOMPATIBLE_PKGS_CSWmysql5client = CSWmysql4client INCOMPATIBLE_PKGS_CSWmysql5 = CSWmysql4 INCOMPATIBLE_PKGS_CSWmysql5devel = CSWmysql4devel -INCOMPATIBLE_PKGS_CSWmysql5rt = CSWmysql4rt INCOMPATIBLE_PKGS_CSWmysql5test = CSWmysql4test SPKG_DESC_CSWmysql5 = Multithreaded SQL database 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 Sep 22 12:39:38 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 10:39:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6383] csw/mgar/pkg/x11/xextproto/trunk Message-ID: Revision: 6383 http://gar.svn.sourceforge.net/gar/?rev=6383&view=rev Author: dmichelsen Date: 2009-09-22 10:39:38 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/xextproto: Downrev as not all other libs have been updated and problems occur with libxext Modified Paths: -------------- csw/mgar/pkg/x11/xextproto/trunk/Makefile csw/mgar/pkg/x11/xextproto/trunk/checksums Modified: csw/mgar/pkg/x11/xextproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xextproto/trunk/Makefile 2009-09-22 10:36:07 UTC (rev 6382) +++ csw/mgar/pkg/x11/xextproto/trunk/Makefile 2009-09-22 10:39:38 UTC (rev 6383) @@ -1,5 +1,5 @@ GARNAME = xextproto -GARVERSION = 7.1.1 +GARVERSION = 7.0.5 CATEGORIES = x11 Modified: csw/mgar/pkg/x11/xextproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xextproto/trunk/checksums 2009-09-22 10:36:07 UTC (rev 6382) +++ csw/mgar/pkg/x11/xextproto/trunk/checksums 2009-09-22 10:39:38 UTC (rev 6383) @@ -1 +1 @@ -6c55283718dbeb826bcf899b9e89faba download/xextproto-7.1.1.tar.gz +f6274c778e571130484fb0650651ac02 work/download/xextproto-7.0.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 Tue Sep 22 12:42:59 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 10:42:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6384] csw/mgar/pkg/x11/xextproto/trunk Message-ID: Revision: 6384 http://gar.svn.sourceforge.net/gar/?rev=6384&view=rev Author: dmichelsen Date: 2009-09-22 10:42:59 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/xextproto: Switch to bz2 Modified Paths: -------------- csw/mgar/pkg/x11/xextproto/trunk/Makefile csw/mgar/pkg/x11/xextproto/trunk/checksums Modified: csw/mgar/pkg/x11/xextproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xextproto/trunk/Makefile 2009-09-22 10:39:38 UTC (rev 6383) +++ csw/mgar/pkg/x11/xextproto/trunk/Makefile 2009-09-22 10:42:59 UTC (rev 6384) @@ -9,10 +9,10 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +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.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 REQUIRED_PKGS = CSWx11common Modified: csw/mgar/pkg/x11/xextproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xextproto/trunk/checksums 2009-09-22 10:39:38 UTC (rev 6383) +++ csw/mgar/pkg/x11/xextproto/trunk/checksums 2009-09-22 10:42:59 UTC (rev 6384) @@ -1 +1 @@ -f6274c778e571130484fb0650651ac02 work/download/xextproto-7.0.5.tar.gz +e6841018a7c64983b0954aa2c564d115 download/xextproto-7.0.5.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 Sep 22 12:51:09 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 10:51:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[6385] csw/mgar/pkg/x11/libxext/trunk Message-ID: Revision: 6385 http://gar.svn.sourceforge.net/gar/?rev=6385&view=rev Author: dmichelsen Date: 2009-09-22 10:51:09 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libxext: Downgrade to 1.0.5 and split off devel Modified Paths: -------------- csw/mgar/pkg/x11/libxext/trunk/Makefile csw/mgar/pkg/x11/libxext/trunk/checksums Modified: csw/mgar/pkg/x11/libxext/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxext/trunk/Makefile 2009-09-22 10:42:59 UTC (rev 6384) +++ csw/mgar/pkg/x11/libxext/trunk/Makefile 2009-09-22 10:51:09 UTC (rev 6385) @@ -1,5 +1,5 @@ GARNAME = libxext -GARVERSION = 1.0.99.4 +GARVERSION = 1.0.5 CATEGORIES = x11 DESCRIPTION = X11 miscellaneous extensions library1 @@ -20,6 +20,18 @@ PREREQUISITE_PKGS = CSWxextproto REQUIRED_PKGS = CSWlibx11 +PACKAGES = CSWlibxext CSWlibxextdevel + +CATALOGNAME_CSWlibxext = libxext +CATALOGNAME_CSWlibxextdevel = libxext_devel + +SPKG_DESC_CSWlibxext = X11 miscellaneous extensions library +SPKG_DESC_CSWlibxextdevel = X11 miscellaneous extensions library development files + +REQUIRED_PKGS_CSWlibxextdevel = CSWlibxext + +PKGFILES_CSWlibxextdevel = $(PKGFILES_DEVEL) + BUILD64 = 1 NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/x11/libxext/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxext/trunk/checksums 2009-09-22 10:42:59 UTC (rev 6384) +++ csw/mgar/pkg/x11/libxext/trunk/checksums 2009-09-22 10:51:09 UTC (rev 6385) @@ -1 +1 @@ -24da44888b87c66edb326acec35b85aa download/libXext-1.0.99.4.tar.bz2 +aa11d859cc8e9a0bad3bb55e1666547b download/libXext-1.0.5.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 Sep 22 13:03:04 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 11:03:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[6386] csw/mgar/pkg/x11 Message-ID: Revision: 6386 http://gar.svn.sourceforge.net/gar/?rev=6386&view=rev Author: dmichelsen Date: 2009-09-22 11:03:04 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libxmu: Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxmu/ csw/mgar/pkg/x11/libxmu/branches/ csw/mgar/pkg/x11/libxmu/tags/ csw/mgar/pkg/x11/libxmu/trunk/ csw/mgar/pkg/x11/libxmu/trunk/Makefile csw/mgar/pkg/x11/libxmu/trunk/checksums csw/mgar/pkg/x11/libxmu/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxmu/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/x11/libxmu/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxmu/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxmu/trunk/Makefile 2009-09-22 11:03:04 UTC (rev 6386) @@ -0,0 +1,37 @@ +GARNAME = libxmu +GARVERSION = 1.0.4 +CATEGORIES = x11 + +DESCRIPTION = A set of miscellaneous utility convenience functions for X libraries to use +define BLURB + LibXmu provides a set of miscellaneous utility convenience functions for X libraries to use. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +DISTNAME = libXmu-$(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 + +PREREQUISITE_PKGS = CSWlibxtdevel CSWlibxextdevel + +PACKAGES = CSWlibxmu CSWlibxmudevel + +CATALOGNAME_CSWlibxmu = libxmu +CATALOGNAME_CSWlibxmudevel = libxmu_devel + +SPKG_DESC_CSWlibxmu = X11 miscellaneous utility library +SPKG_DESC_CSWlibxmudevel = X11 miscellaneous utility library development files + +REQUIRED_PKGS_CSWlibxmu = CSWlibice CSWlibsm CSWlibx11 CSWlibxext CSWlibxt +REQUIRED_PKGS_CSWlibxmudevel = CSWlibxmu + +PKGFILES_CSWlibxmudevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/x11/libxmu/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxmu/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxmu/trunk/checksums 2009-09-22 11:03:04 UTC (rev 6386) @@ -0,0 +1 @@ +48b432e84035c664ece80a33695d5254 download/libXmu-1.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 Tue Sep 22 14:23:14 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 22 Sep 2009 12:23:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6387] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 6387 http://gar.svn.sourceforge.net/gar/?rev=6387&view=rev Author: wahwah Date: 2009-09-22 12:23:14 +0000 (Tue, 22 Sep 2009) Log Message: ----------- mysql5: Fixing the cswusergroup path (changing to /etc/opt/csw) 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-09-22 11:03:04 UTC (rev 6386) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-09-22 12:23:14 UTC (rev 6387) @@ -126,7 +126,7 @@ # Enable 64 bits build BUILD64 = 1 -USERGROUP = /opt/csw/etc/pkg/CSWmysql5/cswusergroup +USERGROUP = /etc/opt/csw/pkg/CSWmysql5/cswusergroup PROTOTYPE_FILTER = awk ' \ $$$$3 ~ /\/var\/opt\/csw\/mysql5$$$$/ { $$$$2 = "ugfiles"; \ $$$$4 = "0700"; \ 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 Sep 22 15:24:47 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 13:24:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[6388] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 6388 http://gar.svn.sourceforge.net/gar/?rev=6388&view=rev Author: dmichelsen Date: 2009-09-22 13:24:36 +0000 (Tue, 22 Sep 2009) Log Message: ----------- mGAR v2: Exclude pkgconfig .pc-files for ISAs other then the 32- and 64 bit defaults Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-09-22 12:23:14 UTC (rev 6387) +++ csw/mgar/gar/v2/gar.mk 2009-09-22 13:24:36 UTC (rev 6388) @@ -569,7 +569,9 @@ MERGE_EXCLUDE_LIBTOOL ?= $(libdir)/.*\.la MERGE_EXCLUDE_BACKUPFILES ?= .*\~ MERGE_EXCLUDE_STATICLIBS ?= $(libdir)/.*\.a -MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_CATEGORY) $(MERGE_EXCLUDE_INFODIR) $(MERGE_EXCLUDE_LIBTOOL) $(MERGE_EXCLUDE_BACKUPFILES) $(MERGE_EXCLUDE_STATICLIBS) $(MERGE_EXCLUDE_PYCOMPILE) +# Exclude all other .pc-files apart from the default 32- and 64 bit versions +MERGE_EXCLUDE_EXTRA_ISA_PKGCONFIG ?= $(if $(filter-out $(ISA_DEFAULT) $(ISA_DEFAULT64),$(ISA)),$(libdir)/.*\.pc) +MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_CATEGORY) $(MERGE_EXCLUDE_INFODIR) $(MERGE_EXCLUDE_LIBTOOL) $(MERGE_EXCLUDE_BACKUPFILES) $(MERGE_EXCLUDE_STATICLIBS) $(MERGE_EXCLUDE_EXTRA_ISA_PKGCONFIG) $(MERGE_EXCLUDE_PYCOMPILE) # Exclude these files ifeq ($(origin MERGE_EXCLUDE_FILES_$(MODULATION)), undefined) 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 Sep 22 15:26:22 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 13:26:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[6389] csw/mgar/pkg/x11 Message-ID: Revision: 6389 http://gar.svn.sourceforge.net/gar/?rev=6389&view=rev Author: dmichelsen Date: 2009-09-22 13:26:21 +0000 (Tue, 22 Sep 2009) Log Message: ----------- libxaw: Initial commit Modified Paths: -------------- csw/mgar/pkg/x11/libxaw/trunk/Makefile csw/mgar/pkg/x11/libxaw/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/libxaw/ Modified: csw/mgar/pkg/x11/libxaw/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libsm/trunk/Makefile 2009-09-22 09:53:16 UTC (rev 6380) +++ csw/mgar/pkg/x11/libxaw/trunk/Makefile 2009-09-22 13:26:21 UTC (rev 6389) @@ -1,37 +1,36 @@ -GARNAME = libsm -GARVERSION = 1.1.1 +GARNAME = libxaw +GARVERSION = 1.0.6 CATEGORIES = x11 -DESCRIPTION = X11 Session Management library +DESCRIPTION = X Athena Widgets define BLURB - This package provides the main interface to the X11 Session Management - library, which allows for applications to both manage sessions, and make - use of session managers to save and restore their state for later use. + Xaw is a widget set based on the X Toolkit Intrinsics (Xt) Library. endef MASTER_SITES = $(X11_LIB_MASTER_SITE) -DISTNAME = libSM-$(GARVERSION) +DISTNAME = libXaw-$(GARVERSION) 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 -PREREQUISITE_PKGS = CSWlibicedevel -REQUIRED_PKGS = CSWlibice +# xproto x11 xext xextproto xt xmu xpm +#PREREQUISITE_PKGS = CSWlibicedevel +#REQUIRED_PKGS = CSWlibice -PACKAGES = CSWlibsm CSWlibsmdevel +PACKAGES = CSWlibxaw CSWlibxawdevel -CATALOGNAME_CSWlibsm = libsm -CATALOGNAME_CSWlibsmdevel = libsm_devel +CATALOGNAME_CSWlibxaw = libxaw +CATALOGNAME_CSWlibxawdevel = libxaw_devel -SPKG_DESC_CSWlibsm = X11 Session Management library -SPKG_DESC_CSWlibsmdevel = X11 Session Management library development files +SPKG_DESC_CSWlibxaw = X Athena Widgets +SPKG_DESC_CSWlibxawdevel = X Athena Widgets development files BUILD64 = 1 NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) -PKGFILES_CSWlibsmdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibxawdevel = $(PKGFILES_DEVEL) include gar/category.mk Modified: csw/mgar/pkg/x11/libxaw/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libsm/trunk/checksums 2009-09-22 09:53:16 UTC (rev 6380) +++ csw/mgar/pkg/x11/libxaw/trunk/checksums 2009-09-22 13:26:21 UTC (rev 6389) @@ -1 +1 @@ -6889a455496aaaa65b1fa05fc518d179 download/libSM-1.1.1.tar.bz2 +066218dceb82eb8da0e11d259ed3ceda download/libXaw-1.0.6.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 Sep 22 15:26:56 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 13:26:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[6390] csw/mgar/pkg/x11 Message-ID: Revision: 6390 http://gar.svn.sourceforge.net/gar/?rev=6390&view=rev Author: dmichelsen Date: 2009-09-22 13:26:55 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libxi: Initial commit Modified Paths: -------------- csw/mgar/pkg/x11/libxi/trunk/Makefile csw/mgar/pkg/x11/libxi/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/libxi/ Modified: csw/mgar/pkg/x11/libxi/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxtst/trunk/Makefile 2009-09-17 13:43:50 UTC (rev 6334) +++ csw/mgar/pkg/x11/libxi/trunk/Makefile 2009-09-22 13:26:55 UTC (rev 6390) @@ -1,23 +1,18 @@ -GARNAME = libxtst -GARVERSION = 1.0.99.2 +GARNAME = libxi +GARVERSION = 1.2.99.4 CATEGORIES = x11 -DESCRIPTION = +DESCRIPTION = Client library for XInput define BLURB - Long description endef MASTER_SITES = $(X11_LIB_MASTER_SITE) -DISTNAME = libXtst-$(GARVERSION) +DISTNAME = libXi-$(GARVERSION) 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.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 NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/x11/libxi/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxtst/trunk/checksums 2009-09-17 13:43:50 UTC (rev 6334) +++ csw/mgar/pkg/x11/libxi/trunk/checksums 2009-09-22 13:26:55 UTC (rev 6390) @@ -1 +1 @@ -b5edc35ca9b9ba4133a3fa34cb1b00f8 download/libXtst-1.0.99.2.tar.bz2 +0f3e9002b5797b01c84c302cb124dc55 download/libXi-1.2.99.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 Tue Sep 22 15:28:49 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 13:28:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[6391] csw/mgar/pkg/x11 Message-ID: Revision: 6391 http://gar.svn.sourceforge.net/gar/?rev=6391&view=rev Author: dmichelsen Date: 2009-09-22 13:28:49 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libxpm: Initial commit Modified Paths: -------------- csw/mgar/pkg/x11/libxpm/trunk/Makefile csw/mgar/pkg/x11/libxpm/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/libxpm/ Modified: csw/mgar/pkg/x11/libxpm/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxaw/trunk/Makefile 2009-09-22 13:26:21 UTC (rev 6389) +++ csw/mgar/pkg/x11/libxpm/trunk/Makefile 2009-09-22 13:28:49 UTC (rev 6391) @@ -1,36 +1,66 @@ -GARNAME = libxaw -GARVERSION = 1.0.6 +GARNAME = libxpm +GARVERSION = 3.5.7 CATEGORIES = x11 -DESCRIPTION = X Athena Widgets +DESCRIPTION = X11 pixmap library define BLURB - Xaw is a widget set based on the X Toolkit Intrinsics (Xt) Library. + LibXpm provides support and common operation for the XPM pixmap format, + which is commonly used in legacy X applications. XPM is an extension of + the monochrome XBM bitmap. endef MASTER_SITES = $(X11_LIB_MASTER_SITE) -DISTNAME = libXaw-$(GARVERSION) +DISTNAME = libXpm-$(GARVERSION) 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 -# xproto x11 xext xextproto xt xmu xpm -#PREREQUISITE_PKGS = CSWlibicedevel -#REQUIRED_PKGS = CSWlibice +# CSWxpm is the legacy library +PACKAGES = CSWlibxpm CSWlibxpmdevel CSWxpm -PACKAGES = CSWlibxaw CSWlibxawdevel +CATALOGNAME_CSWlibxpm = libxpm +CATALOGNAME_CSWlibxpmdevel = libxpm_devel -CATALOGNAME_CSWlibxaw = libxaw -CATALOGNAME_CSWlibxawdevel = libxaw_devel +SPKG_DESC_CSWlibxpm = X11 pixmap library +SPKG_DESC_CSWlibxpmdevel = X11 pixmap library development files -SPKG_DESC_CSWlibxaw = X Athena Widgets -SPKG_DESC_CSWlibxawdevel = X Athena Widgets development files +REQUIRED_PKGS_CSWlibxpm = CSWlibice CSWlibsm CSWlibx11 CSWlibxext CSWlibxt +REQUIRED_PKGS_CSWlibxpmdevel = CSWlibxpm +REQUIRED_PKGS_CSWxpm = CSWlibxpm +PKGFILES_CSWlibxpmdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWxpm = /opt/csw/bin/.* +PKGFILES_CSWxpm += /opt/csw/lib/.* + BUILD64 = 1 -NOISALIST = 1 - +NO_ISAEXEC = 1 +EXTRA_BUILD_ISAS = sparcv8plus+vis CONFIGURE_ARGS = $(DIRPATHS) -PKGFILES_CSWlibxawdevel = $(PKGFILES_DEVEL) +# We don't want optimized binaries, optimized libs are sufficient + MERGE_DIRS_isa-sparcv9 = $(libdir) +MERGE_DIRS_isa-sparcv8plus+vis = $(libdir) + MERGE_DIRS_isa-amd64 = $(libdir) include gar/category.mk + +post-merge: +ifeq ($(GARCH),sparc) + @ginstall -d $(PKGROOT)/opt/csw/lib/sparcv8plus+vis + ln -s ../../X11/lib/sparcv8plus+vis/libXpm.so.4.11 $(PKGROOT)/opt/csw/lib/sparcv8plus+vis + ln -s ../../X11/lib/sparcv8plus+vis/libXpm.so.4 $(PKGROOT)/opt/csw/lib/sparcv8plus+vis + ln -s ../../X11/lib/sparcv8plus+vis/libXpm.so $(PKGROOT)/opt/csw/lib/sparcv8plus+vis + @ginstall -d $(PKGROOT)/opt/csw/lib/sparcv9 + ln -s ../../X11/lib/sparcv9/libXpm.so.4.11 $(PKGROOT)/opt/csw/lib/sparcv9 + ln -s ../../X11/lib/sparcv9/libXpm.so.4 $(PKGROOT)/opt/csw/lib/sparcv9 + ln -s ../../X11/lib/sparcv9/libXpm.so $(PKGROOT)/opt/csw/lib/sparcv9 +endif + @ginstall -d $(PKGROOT)/opt/csw/lib + ln -s ../X11/lib/libXpm.so.4.11 $(PKGROOT)/opt/csw/lib + ln -s ../X11/lib/libXpm.so.4 $(PKGROOT)/opt/csw/lib + ln -s ../X11/lib/libXpm.so $(PKGROOT)/opt/csw/lib + @ginstall -d $(PKGROOT)/opt/csw/bin + ln -s ../X11/bin/sxpm $(PKGROOT)/opt/csw/bin + ln -s ../X11/bin/cxpm $(PKGROOT)/opt/csw/bin + @$(MAKECOOKIE) Modified: csw/mgar/pkg/x11/libxpm/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxaw/trunk/checksums 2009-09-22 13:26:21 UTC (rev 6389) +++ csw/mgar/pkg/x11/libxpm/trunk/checksums 2009-09-22 13:28:49 UTC (rev 6391) @@ -1 +1 @@ -066218dceb82eb8da0e11d259ed3ceda download/libXaw-1.0.6.tar.bz2 +cd15ee542d9f515538b4462a6f79d977 download/libXpm-3.5.7.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Sep 22 15:47:10 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 22 Sep 2009 13:47:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[6392] csw/mgar/pkg/cups/branches/cups-1.4 Message-ID: Revision: 6392 http://gar.svn.sourceforge.net/gar/?rev=6392&view=rev Author: wahwah Date: 2009-09-22 13:47:10 +0000 (Tue, 22 Sep 2009) Log Message: ----------- cups: A more generic preinstall script Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4/checksums csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.preinstall csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.preinstall Modified: csw/mgar/pkg/cups/branches/cups-1.4/checksums =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-09-22 13:28:49 UTC (rev 6391) +++ csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-09-22 13:47:10 UTC (rev 6392) @@ -1,7 +1,7 @@ 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 -8418cf872043eada2d46c8db6e6451c0 download/CSWcupsclient.preinstall +dec0baa8c3ec0e171183496da8f24323 download/CSWcupsclient.preinstall ca7718998e56c320c08a77cfefe046f6 download/CSWcupsd.postremove -8418cf872043eada2d46c8db6e6451c0 download/CSWcupsd.preinstall +dec0baa8c3ec0e171183496da8f24323 download/CSWcupsd.preinstall bc5e777d4320cecdd1a64de8035171a8 download/cups-1.4.0-source.tar.bz2 Modified: csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.preinstall =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.preinstall 2009-09-22 13:28:49 UTC (rev 6391) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.preinstall 2009-09-22 13:47:10 UTC (rev 6392) @@ -4,31 +4,37 @@ # $Id$ # +obsolete_directories="/opt/csw/etc/cups:/etc/opt/csw/cups" + obsolete_dir_information=" -This configuration directory is obsolete. Current CUPS package is using the -/etc/opt/csw/cups directory. Files in this directory are going to be ignored. -Please move your configuration to /etc/opt/csw/cups. +This directory is obsolete. Files in this directory are going to be ignored. +Please move your data to the new location. Feel free to remove this file afterwards. " obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE" -if [ -d "${PKG_INSTALL_ROOT}/opt/csw/etc/cups" ]; then - echo - echo "*******************************************************************" - echo "* The old configuration directory /opt/csw/etc/cups still exists. *" - echo "* Please move your configuration to /etc/opt/csw/cups. *" - echo "* *" - echo "* Installation will continue in 10 seconds. *" - echo "* Press CTRL+C if you want to stop now. *" - echo "*******************************************************************" - echo - sleep 10 - - # Leaving a note for the sysadmin if the they proceed with the installation. - fn="${PKG_INSTALL_ROOT}/opt/csw/etc/cups/${obsolete_dir_file_name}" - if touch "${fn}" 2>/dev/null; then - echo "${obsolete_dir_information}" > "${fn}" +for dirpair in ${obsolete_directories}; do + obsolete_dir=`echo ${dirpair} | cut -d: -f1` + new_dir=`echo ${dirpair} | cut -d: -f2` + if [ -d "${PKG_INSTALL_ROOT}${obsolete_dir}" ]; then + echo + echo "*******************************************************************" + echo "* The old configuration directory ${obsolete_dir} still exists. " + echo "* Please move your configuration to ${new_dir}. " + echo "* " + echo "* Installation will continue in 10 seconds. " + echo "* Press CTRL+C if you want to stop now. " + echo "*******************************************************************" + echo + sleep 10 + + # Leaving a note for the sysadmin if the they proceed with the installation. + fn="${PKG_INSTALL_ROOT}${obsolete_dir}/${obsolete_dir_file_name}" + if touch "${fn}" 2>/dev/null; then + echo "${obsolete_dir_information}" > "${fn}" + fi fi - exit 0 -fi +done + +exit 0 Modified: csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.preinstall =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.preinstall 2009-09-22 13:28:49 UTC (rev 6391) +++ csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.preinstall 2009-09-22 13:47:10 UTC (rev 6392) @@ -4,31 +4,37 @@ # $Id$ # +obsolete_directories="/opt/csw/etc/cups:/etc/opt/csw/cups" + obsolete_dir_information=" -This configuration directory is obsolete. Current CUPS package is using the -/etc/opt/csw/cups directory. Files in this directory are going to be ignored. -Please move your configuration to /etc/opt/csw/cups. +This directory is obsolete. Files in this directory are going to be ignored. +Please move your data to the new location. Feel free to remove this file afterwards. " obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE" -if [ -d "${PKG_INSTALL_ROOT}/opt/csw/etc/cups" ]; then - echo - echo "*******************************************************************" - echo "* The old configuration directory /opt/csw/etc/cups still exists. *" - echo "* Please move your configuration to /etc/opt/csw/cups. *" - echo "* *" - echo "* Installation will continue in 10 seconds. *" - echo "* Press CTRL+C if you want to stop now. *" - echo "*******************************************************************" - echo - sleep 10 - - # Leaving a note for the sysadmin if the they proceed with the installation. - fn="${PKG_INSTALL_ROOT}/opt/csw/etc/cups/${obsolete_dir_file_name}" - if touch "${fn}" 2>/dev/null; then - echo "${obsolete_dir_information}" > "${fn}" +for dirpair in ${obsolete_directories}; do + obsolete_dir=`echo ${dirpair} | cut -d: -f1` + new_dir=`echo ${dirpair} | cut -d: -f2` + if [ -d "${PKG_INSTALL_ROOT}${obsolete_dir}" ]; then + echo + echo "*******************************************************************" + echo "* The old configuration directory ${obsolete_dir} still exists. " + echo "* Please move your configuration to ${new_dir}. " + echo "* " + echo "* Installation will continue in 10 seconds. " + echo "* Press CTRL+C if you want to stop now. " + echo "*******************************************************************" + echo + sleep 10 + + # Leaving a note for the sysadmin if the they proceed with the installation. + fn="${PKG_INSTALL_ROOT}${obsolete_dir}/${obsolete_dir_file_name}" + if touch "${fn}" 2>/dev/null; then + echo "${obsolete_dir_information}" > "${fn}" + fi fi - exit 0 -fi +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 Tue Sep 22 15:55:59 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 13:55:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6393] csw/mgar/pkg/x11/libxaw/trunk/Makefile Message-ID: Revision: 6393 http://gar.svn.sourceforge.net/gar/?rev=6393&view=rev Author: dmichelsen Date: 2009-09-22 13:55:59 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libxaw: Fix requirements Modified Paths: -------------- csw/mgar/pkg/x11/libxaw/trunk/Makefile Modified: csw/mgar/pkg/x11/libxaw/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxaw/trunk/Makefile 2009-09-22 13:47:10 UTC (rev 6392) +++ csw/mgar/pkg/x11/libxaw/trunk/Makefile 2009-09-22 13:55:59 UTC (rev 6393) @@ -15,8 +15,7 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 # xproto x11 xext xextproto xt xmu xpm -#PREREQUISITE_PKGS = CSWlibicedevel -#REQUIRED_PKGS = CSWlibice +PREREQUISITE_PKGS = CSWlibxpmdevel PACKAGES = CSWlibxaw CSWlibxawdevel @@ -26,9 +25,11 @@ SPKG_DESC_CSWlibxaw = X Athena Widgets SPKG_DESC_CSWlibxawdevel = X Athena Widgets development files +REQUIRED_PKGS_CSWlibxaw = CSWlibice CSWlibsm CSWlibx11 CSWlibxext CSWlibxmu CSWlibxt +REQUIRED_PKGS_CSWlibxawdevel = CSWlibxpm + BUILD64 = 1 NOISALIST = 1 - CONFIGURE_ARGS = $(DIRPATHS) PKGFILES_CSWlibxawdevel = $(PKGFILES_DEVEL) 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 Sep 22 16:49:21 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 14:49:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[6394] csw/mgar/pkg/x11/libxi/trunk Message-ID: Revision: 6394 http://gar.svn.sourceforge.net/gar/?rev=6394&view=rev Author: dmichelsen Date: 2009-09-22 14:49:21 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libxi: Split off devel Modified Paths: -------------- csw/mgar/pkg/x11/libxi/trunk/Makefile csw/mgar/pkg/x11/libxi/trunk/checksums Modified: csw/mgar/pkg/x11/libxi/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxi/trunk/Makefile 2009-09-22 13:55:59 UTC (rev 6393) +++ csw/mgar/pkg/x11/libxi/trunk/Makefile 2009-09-22 14:49:21 UTC (rev 6394) @@ -1,5 +1,5 @@ GARNAME = libxi -GARVERSION = 1.2.99.4 +GARVERSION = 1.2.1 CATEGORIES = x11 DESCRIPTION = Client library for XInput @@ -13,8 +13,23 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +#PREREQUISITE_PKGS = CSWlibxpmdevel + +PACKAGES = CSWlibxi CSWlibxidevel + +CATALOGNAME_CSWlibxi = libxii +CATALOGNAME_CSWlibxidevel = libxi_devel + +SPKG_DESC_CSWlibxi = Client library for XInput +SPKG_DESC_CSWlibxi = Client library for XInput development files + +#REQUIRED_PKGS_CSWlibxi = +REQUIRED_PKGS_CSWlibxidevel = CSWlibxi + BUILD64 = 1 NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) +PKGFILES_CSWlibxidevel = $(PKGFILES_DEVEL) + include gar/category.mk Modified: csw/mgar/pkg/x11/libxi/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxi/trunk/checksums 2009-09-22 13:55:59 UTC (rev 6393) +++ csw/mgar/pkg/x11/libxi/trunk/checksums 2009-09-22 14:49:21 UTC (rev 6394) @@ -1 +1 @@ -0f3e9002b5797b01c84c302cb124dc55 download/libXi-1.2.99.4.tar.bz2 +cfb36307e8e7ffafe40848dba24e0b11 download/libXi-1.2.1.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 Sep 22 16:50:46 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 14:50:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6395] csw/mgar/pkg/x11/libxi/trunk/Makefile Message-ID: Revision: 6395 http://gar.svn.sourceforge.net/gar/?rev=6395&view=rev Author: dmichelsen Date: 2009-09-22 14:50:46 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libxi: Fix typo Modified Paths: -------------- csw/mgar/pkg/x11/libxi/trunk/Makefile Modified: csw/mgar/pkg/x11/libxi/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxi/trunk/Makefile 2009-09-22 14:49:21 UTC (rev 6394) +++ csw/mgar/pkg/x11/libxi/trunk/Makefile 2009-09-22 14:50:46 UTC (rev 6395) @@ -17,7 +17,7 @@ PACKAGES = CSWlibxi CSWlibxidevel -CATALOGNAME_CSWlibxi = libxii +CATALOGNAME_CSWlibxi = libxi CATALOGNAME_CSWlibxidevel = libxi_devel SPKG_DESC_CSWlibxi = Client library for XInput 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 Sep 22 16:56:02 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 14:56:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[6396] csw/mgar/pkg/x11 Message-ID: Revision: 6396 http://gar.svn.sourceforge.net/gar/?rev=6396&view=rev Author: dmichelsen Date: 2009-09-22 14:56:02 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/recordproto: Initial commit Modified Paths: -------------- csw/mgar/pkg/x11/recordproto/trunk/Makefile csw/mgar/pkg/x11/recordproto/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/recordproto/ Modified: csw/mgar/pkg/x11/recordproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/renderproto/trunk/Makefile 2009-09-22 13:55:59 UTC (rev 6393) +++ csw/mgar/pkg/x11/recordproto/trunk/Makefile 2009-09-22 14:56:02 UTC (rev 6396) @@ -1,15 +1,14 @@ -GARNAME = renderproto -GARVERSION = 0.9.3 - +GARNAME = recordproto +GARVERSION = 1.13.2 CATEGORIES = x11 -DESCRIPTION = Render extension headers from modular X.org +DESCRIPTION = Record extension headers define BLURB - This provides the Render extension headers from modular X.org X11 project. + Record extension headers endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +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.gz Modified: csw/mgar/pkg/x11/recordproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/renderproto/trunk/checksums 2009-09-22 13:55:59 UTC (rev 6393) +++ csw/mgar/pkg/x11/recordproto/trunk/checksums 2009-09-22 14:56:02 UTC (rev 6396) @@ -1 +1 @@ -ab8f3e356973d9c99810a8f092db3a2e download/renderproto-0.9.3.tar.gz +0ed4706564a34fc2aff724aa16d3ff00 download/recordproto-1.13.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 Tue Sep 22 17:06:19 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 15:06:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[6397] csw/mgar/pkg/x11/libxtst/trunk Message-ID: Revision: 6397 http://gar.svn.sourceforge.net/gar/?rev=6397&view=rev Author: dmichelsen Date: 2009-09-22 15:06:19 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libxtst: Split off devel Modified Paths: -------------- csw/mgar/pkg/x11/libxtst/trunk/Makefile csw/mgar/pkg/x11/libxtst/trunk/checksums Modified: csw/mgar/pkg/x11/libxtst/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxtst/trunk/Makefile 2009-09-22 14:56:02 UTC (rev 6396) +++ csw/mgar/pkg/x11/libxtst/trunk/Makefile 2009-09-22 15:06:19 UTC (rev 6397) @@ -1,10 +1,10 @@ GARNAME = libxtst -GARVERSION = 1.0.99.2 +GARVERSION = 1.0.3 CATEGORIES = x11 -DESCRIPTION = +DESCRIPTION = The Xtst Library define BLURB - Long description + The Xtst Library endef MASTER_SITES = $(X11_LIB_MASTER_SITE) @@ -14,12 +14,20 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = +PACKAGES = CSWlibxtst CSWlibxtstdevel +CATALOGNAME_CSWlibxtst = libxtst +CATALOGNAME_CSWlibxtstdevel = libxtst_devel + +SPKG_DESC_CSWlibxtst = The Xtst Library +SPKG_DESC_CSWlibxtstdevel = The Xtst Library development files + +REQUIRED_PKGS_CSWlibxtstdevel = CSWlibxtst + BUILD64 = 1 NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) +PKGFILES_CSWlibxtstdevel = $(PKGFILES_DEVEL) + include gar/category.mk Modified: csw/mgar/pkg/x11/libxtst/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxtst/trunk/checksums 2009-09-22 14:56:02 UTC (rev 6396) +++ csw/mgar/pkg/x11/libxtst/trunk/checksums 2009-09-22 15:06:19 UTC (rev 6397) @@ -1 +1 @@ -b5edc35ca9b9ba4133a3fa34cb1b00f8 download/libXtst-1.0.99.2.tar.bz2 +090c1ad04e34982eada5cf3b1a0792fd download/libXtst-1.0.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 Tue Sep 22 17:10:30 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 15:10:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[6398] csw/mgar/pkg/x11 Message-ID: Revision: 6398 http://gar.svn.sourceforge.net/gar/?rev=6398&view=rev Author: dmichelsen Date: 2009-09-22 15:10:30 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/videoproto: Initial commit Modified Paths: -------------- csw/mgar/pkg/x11/videoproto/trunk/Makefile csw/mgar/pkg/x11/videoproto/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/videoproto/ Modified: csw/mgar/pkg/x11/videoproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/renderproto/trunk/Makefile 2009-09-22 13:55:59 UTC (rev 6393) +++ csw/mgar/pkg/x11/videoproto/trunk/Makefile 2009-09-22 15:10:30 UTC (rev 6398) @@ -1,11 +1,10 @@ -GARNAME = renderproto -GARVERSION = 0.9.3 - +GARNAME = videoproto +GARVERSION = 2.3.0 CATEGORIES = x11 -DESCRIPTION = Render extension headers from modular X.org +DESCRIPTION = Video extension headers define BLURB - This provides the Render extension headers from modular X.org X11 project. + Video extension headers endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) Modified: csw/mgar/pkg/x11/videoproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/renderproto/trunk/checksums 2009-09-22 13:55:59 UTC (rev 6393) +++ csw/mgar/pkg/x11/videoproto/trunk/checksums 2009-09-22 15:10:30 UTC (rev 6398) @@ -1 +1 @@ -ab8f3e356973d9c99810a8f092db3a2e download/renderproto-0.9.3.tar.gz +888543493cd69c6c78002ac59c3f077f download/videoproto-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 Tue Sep 22 17:17:02 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 15:17:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[6399] csw/mgar/pkg/x11 Message-ID: Revision: 6399 http://gar.svn.sourceforge.net/gar/?rev=6399&view=rev Author: dmichelsen Date: 2009-09-22 15:17:02 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libxv: Initial commit Modified Paths: -------------- csw/mgar/pkg/x11/libxv/trunk/Makefile csw/mgar/pkg/x11/libxv/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/libxv/ Modified: csw/mgar/pkg/x11/libxv/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxt/trunk/Makefile 2009-09-22 13:55:59 UTC (rev 6393) +++ csw/mgar/pkg/x11/libxv/trunk/Makefile 2009-09-22 15:17:02 UTC (rev 6399) @@ -1,34 +1,33 @@ -GARNAME = libxt -GARVERSION = 1.0.6 +GARNAME = libxv +GARVERSION = 1.0.4 CATEGORIES = x11 -DESCRIPTION = X11 toolkit intrinsics library +DESCRIPTION = The Xv Library define BLURB - LibXt provides the X Toolkit Intrinsics, an abstract widget library - upon which other toolkits are based. Xt is the basis for many toolkits, - including the Athena widgets (Xaw), and LessTif. + The Xv Library endef MASTER_SITES = $(X11_LIB_MASTER_SITE) -DISTNAME = libXt-$(GARVERSION) +DISTNAME = libXv-$(GARVERSION) 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 -PREREQUISITE_PKGS = CSWlibsmdevel +PREREQUISITE_PKGS = CSWvideoproto -PACKAGES = CSWlibxt CSWlibxtdevel +PACKAGES = CSWlibxv CSWlibxvdevel -CATALOGNAME_CSWlibxt = libxt -CATALOGNAME_CSWlibxtdevel = libxt_devel +CATALOGNAME_CSWlibxv = libxv +CATALOGNAME_CSWlibxvdevel = libxv_devel -SPKG_DESC_CSWlibxt = X11 toolkit intrinsics library -SPKG_DESC_CSWlibxtdevel = X11 toolkit intrinsics library development files +SPKG_DESC_CSWlibxv = The Xv Library +SPKG_DESC_CSWlibxvdevel = The Xv Library development files -REQUIRED_PKGS_CSWlibxtdevel = CSWlibxt +REQUIRED_PKGS_CSWlibxv = CSWlibx11 CSWlibxext +REQUIRED_PKGS_CSWlibxvdevel = CSWlibxv -PKGFILES_CSWlibxtdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibxvdevel = $(PKGFILES_DEVEL) BUILD64 = 1 NOISALIST = 1 Modified: csw/mgar/pkg/x11/libxv/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxt/trunk/checksums 2009-09-22 13:55:59 UTC (rev 6393) +++ csw/mgar/pkg/x11/libxv/trunk/checksums 2009-09-22 15:17:02 UTC (rev 6399) @@ -1 +1 @@ -953930ddf9fdaa1405732c7f01e9e599 download/libXt-1.0.6.tar.bz2 +723a0275227165383e967a1ca8899b52 download/libXv-1.0.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 Tue Sep 22 17:17:15 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 15:17:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[6400] csw/mgar/pkg/x11 Message-ID: Revision: 6400 http://gar.svn.sourceforge.net/gar/?rev=6400&view=rev Author: dmichelsen Date: 2009-09-22 15:17:15 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/glproto: Initial commit Modified Paths: -------------- csw/mgar/pkg/x11/glproto/trunk/Makefile csw/mgar/pkg/x11/glproto/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/glproto/ Modified: csw/mgar/pkg/x11/glproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/videoproto/trunk/Makefile 2009-09-22 15:10:30 UTC (rev 6398) +++ csw/mgar/pkg/x11/glproto/trunk/Makefile 2009-09-22 15:17:15 UTC (rev 6400) @@ -1,14 +1,14 @@ -GARNAME = videoproto -GARVERSION = 2.3.0 +GARNAME = glproto +GARVERSION = 1.4.10 CATEGORIES = x11 -DESCRIPTION = Video extension headers +DESCRIPTION = GL extension headers define BLURB - Video extension headers + GL extension headers endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +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.gz Modified: csw/mgar/pkg/x11/glproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/videoproto/trunk/checksums 2009-09-22 15:10:30 UTC (rev 6398) +++ csw/mgar/pkg/x11/glproto/trunk/checksums 2009-09-22 15:17:15 UTC (rev 6400) @@ -1 +1 @@ -888543493cd69c6c78002ac59c3f077f download/videoproto-2.3.0.tar.gz +c9f8cebfba72bfab674bc0170551fb8d download/glproto-1.4.10.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Sep 22 17:26:45 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 22 Sep 2009 15:26:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[6401] csw/mgar/pkg/cups/branches/cups-1.4/Makefile Message-ID: Revision: 6401 http://gar.svn.sourceforge.net/gar/?rev=6401&view=rev Author: wahwah Date: 2009-09-22 15:26:45 +0000 (Tue, 22 Sep 2009) Log Message: ----------- cups-1.4: CSWcups doesn't need CSWcupsdev or CSWcupsdoc Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4/Makefile Modified: csw/mgar/pkg/cups/branches/cups-1.4/Makefile =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-22 15:17:15 UTC (rev 6400) +++ csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-22 15:26:45 UTC (rev 6401) @@ -53,8 +53,7 @@ ARCHALL_CSWcupsdoc = 1 ARCHALL_CSWcupsdev = 1 -REQUIRED_PKGS_CSWcups = CSWcswclassutils CSWcupsd CSWcupsclient CSWcupsdoc -REQUIRED_PKGS_CSWcups += CSWcupsdev +REQUIRED_PKGS_CSWcups = CSWcswclassutils CSWcupsd CSWcupsclient REQUIRED_PKGS_CSWcupsd = CSWcswclassutils CSWlibcups CSWoldaprt CSWzlib REQUIRED_PKGS_CSWcupsd += CSWjpeg CSWpng CSWtiff CSWlibtasn1 REQUIRED_PKGS_CSWcupsd += CSWgcrypt CSWgnutls CSWgpgerr CSWlibdbus 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 Sep 22 17:37:22 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 15:37:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[6402] csw/mgar/pkg/x11 Message-ID: Revision: 6402 http://gar.svn.sourceforge.net/gar/?rev=6402&view=rev Author: dmichelsen Date: 2009-09-22 15:37:21 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libxkbfile: Initial commit Modified Paths: -------------- csw/mgar/pkg/x11/libxkbfile/trunk/Makefile csw/mgar/pkg/x11/libxkbfile/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/libxkbfile/ Modified: csw/mgar/pkg/x11/libxkbfile/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxaw/trunk/Makefile 2009-09-22 13:55:59 UTC (rev 6393) +++ csw/mgar/pkg/x11/libxkbfile/trunk/Makefile 2009-09-22 15:37:21 UTC (rev 6402) @@ -1,37 +1,34 @@ -GARNAME = libxaw -GARVERSION = 1.0.6 +GARNAME = libxkbfile +GARVERSION = 1.0.5 CATEGORIES = x11 -DESCRIPTION = X Athena Widgets +DESCRIPTION = X11 keyboard file manipulation library define BLURB - Xaw is a widget set based on the X Toolkit Intrinsics (Xt) Library. + Libxkbfile provides an interface to read and manipulate description + files for XKB, the X11 keyboard configuration extension. endef MASTER_SITES = $(X11_LIB_MASTER_SITE) -DISTNAME = libXaw-$(GARVERSION) 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 -# xproto x11 xext xextproto xt xmu xpm -PREREQUISITE_PKGS = CSWlibxpmdevel +PACKAGES = CSWlibxkbfile CSWlibxkbfiledevel -PACKAGES = CSWlibxaw CSWlibxawdevel +CATALOGNAME_CSWlibxkbfile = libxkfileb +CATALOGNAME_CSWlibxkbfiledevel = libxkbfile_devel -CATALOGNAME_CSWlibxaw = libxaw -CATALOGNAME_CSWlibxawdevel = libxaw_devel +SPKG_DESC_CSWlibxkbfile = X11 keyboard file manipulation library +SPKG_DESC_CSWlibxkbfiledevel = X11 keyboard file manipulation library development files -SPKG_DESC_CSWlibxaw = X Athena Widgets -SPKG_DESC_CSWlibxawdevel = X Athena Widgets development files +REQUIRED_PKGS_CSWlibxkbfile = CSWlibx11 +REQUIRED_PKGS_CSWlibxkbfiledevel = CSWlibxkbfile -REQUIRED_PKGS_CSWlibxaw = CSWlibice CSWlibsm CSWlibx11 CSWlibxext CSWlibxmu CSWlibxt -REQUIRED_PKGS_CSWlibxawdevel = CSWlibxpm - BUILD64 = 1 NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) -PKGFILES_CSWlibxawdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibxkbfiledevel = $(PKGFILES_DEVEL) include gar/category.mk Modified: csw/mgar/pkg/x11/libxkbfile/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxaw/trunk/checksums 2009-09-22 13:55:59 UTC (rev 6393) +++ csw/mgar/pkg/x11/libxkbfile/trunk/checksums 2009-09-22 15:37:21 UTC (rev 6402) @@ -1 +1 @@ -066218dceb82eb8da0e11d259ed3ceda download/libXaw-1.0.6.tar.bz2 +0726a845fe5a56551de2718c9f6b0e35 download/libxkbfile-1.0.5.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 Sep 22 17:38:46 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 15:38:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6403] csw/mgar/pkg/x11 Message-ID: Revision: 6403 http://gar.svn.sourceforge.net/gar/?rev=6403&view=rev Author: dmichelsen Date: 2009-09-22 15:38:46 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libxkbui: Initial commit Modified Paths: -------------- csw/mgar/pkg/x11/libxkbui/trunk/Makefile csw/mgar/pkg/x11/libxkbui/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/libxkbui/ Modified: csw/mgar/pkg/x11/libxkbui/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxkbfile/trunk/Makefile 2009-09-22 15:37:21 UTC (rev 6402) +++ csw/mgar/pkg/x11/libxkbui/trunk/Makefile 2009-09-22 15:38:46 UTC (rev 6403) @@ -1,11 +1,10 @@ -GARNAME = libxkbfile -GARVERSION = 1.0.5 +GARNAME = libxkbui +GARVERSION = 1.0.2 CATEGORIES = x11 -DESCRIPTION = X11 keyboard file manipulation library +DESCRIPTION = X11 keyboard UI presentation library define BLURB - Libxkbfile provides an interface to read and manipulate description - files for XKB, the X11 keyboard configuration extension. + X11 keyboard UI presentation library endef MASTER_SITES = $(X11_LIB_MASTER_SITE) @@ -14,21 +13,22 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -PACKAGES = CSWlibxkbfile CSWlibxkbfiledevel +PREREQUISUITE_PKGS = CSWlibxkbfiledevel -CATALOGNAME_CSWlibxkbfile = libxkfileb -CATALOGNAME_CSWlibxkbfiledevel = libxkbfile_devel +PACKAGES = CSWlibxkbui CSWlibxkbui -SPKG_DESC_CSWlibxkbfile = X11 keyboard file manipulation library -SPKG_DESC_CSWlibxkbfiledevel = X11 keyboard file manipulation library development files +CATALOGNAME_CSWlibxkbui = libxkbui +CATALOGNAME_CSWlibxkbuidevel = libxkbui_devel -REQUIRED_PKGS_CSWlibxkbfile = CSWlibx11 -REQUIRED_PKGS_CSWlibxkbfiledevel = CSWlibxkbfile +SPKG_DESC_CSWlibxkbui = X11 keyboard UI presentation library +SPKG_DESC_CSWlibxkbuidevel = X11 keyboard UI presentation library development files +REQUIRED_PKGS_CSWlibxkbuidevel = CSWlibxkbui + BUILD64 = 1 NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) -PKGFILES_CSWlibxkbfiledevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibxkbuidevel = $(PKGFILES_DEVEL) include gar/category.mk Modified: csw/mgar/pkg/x11/libxkbui/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxkbfile/trunk/checksums 2009-09-22 15:37:21 UTC (rev 6402) +++ csw/mgar/pkg/x11/libxkbui/trunk/checksums 2009-09-22 15:38:46 UTC (rev 6403) @@ -1 +1 @@ -0726a845fe5a56551de2718c9f6b0e35 download/libxkbfile-1.0.5.tar.bz2 +1143e456f7429e18e88f2eadb2f2b6b1 download/libxkbui-1.0.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 Tue Sep 22 17:39:59 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 15:39:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6404] csw/mgar/pkg/x11/libxkbfile/trunk/Makefile Message-ID: Revision: 6404 http://gar.svn.sourceforge.net/gar/?rev=6404&view=rev Author: dmichelsen Date: 2009-09-22 15:39:55 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libxkbfile: Fix typo Modified Paths: -------------- csw/mgar/pkg/x11/libxkbfile/trunk/Makefile Modified: csw/mgar/pkg/x11/libxkbfile/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxkbfile/trunk/Makefile 2009-09-22 15:38:46 UTC (rev 6403) +++ csw/mgar/pkg/x11/libxkbfile/trunk/Makefile 2009-09-22 15:39:55 UTC (rev 6404) @@ -16,7 +16,7 @@ PACKAGES = CSWlibxkbfile CSWlibxkbfiledevel -CATALOGNAME_CSWlibxkbfile = libxkfileb +CATALOGNAME_CSWlibxkbfile = libxkbfile CATALOGNAME_CSWlibxkbfiledevel = libxkbfile_devel SPKG_DESC_CSWlibxkbfile = X11 keyboard file manipulation library 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 Sep 22 17:53:05 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 15:53:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6405] csw/mgar/pkg/x11/libxkbui/trunk/Makefile Message-ID: Revision: 6405 http://gar.svn.sourceforge.net/gar/?rev=6405&view=rev Author: dmichelsen Date: 2009-09-22 15:53:05 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libxkbui: Add required pkgs Modified Paths: -------------- csw/mgar/pkg/x11/libxkbui/trunk/Makefile Modified: csw/mgar/pkg/x11/libxkbui/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxkbui/trunk/Makefile 2009-09-22 15:39:55 UTC (rev 6404) +++ csw/mgar/pkg/x11/libxkbui/trunk/Makefile 2009-09-22 15:53:05 UTC (rev 6405) @@ -23,6 +23,7 @@ SPKG_DESC_CSWlibxkbui = X11 keyboard UI presentation library SPKG_DESC_CSWlibxkbuidevel = X11 keyboard UI presentation library development files +REQUIRED_PKGS_CSWlibxkbui = CSWlibice CSWlibsm CSWlibx11 CSWlibxkbfile CSWlibxt REQUIRED_PKGS_CSWlibxkbuidevel = CSWlibxkbui BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Sep 22 22:17:45 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 22 Sep 2009 20:17:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[6406] csw/mgar/pkg/mysql5/branches/mysql-5.0.x Message-ID: Revision: 6406 http://gar.svn.sourceforge.net/gar/?rev=6406&view=rev Author: wahwah Date: 2009-09-22 20:17:45 +0000 (Tue, 22 Sep 2009) Log Message: ----------- mysql-5.0.x: Fixed runtime library paths, fixed the quickstart file, added a postinstall file. 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/cswusergroup 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/CSWmysql5.postinstall Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-09-22 15:53:05 UTC (rev 6405) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2009-09-22 20:17:45 UTC (rev 6406) @@ -95,6 +95,8 @@ DISTFILES = mysql-$(GARVERSION).tar.gz DISTFILES += cswmysql5 quick_start-csw README.CSW DISTFILES += CSWmysql5.preinstall +DISTFILES += CSWmysql5.postinstall +DISTFILES += cswusergroup UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -107,6 +109,7 @@ 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) @@ -139,14 +142,14 @@ post-install-modulated: ginstall -m 755 -d $(DESTDIR)$(localstatedir) - ginstall -m 755 -d $(DESTDIR)$(datadir)/mysql5/doc - ginstall -m 644 $(FILEDIR)/README.CSW $(DESTDIR)$(datadir)/mysql5/doc - ginstall -m 755 -d $(DESTDIR)/opt/csw/share/mysql5/doc - ln -sf ../../../mysql5/share/mysql5/doc/README.CSW \ - $(DESTDIR)/opt/csw/share/mysql5/doc/README.CSW + ginstall -m 755 -d $(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 \ + $(DESTDIR)/opt/csw/share/mysql/doc/README.CSW ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d ginstall -m 755 $(FILEDIR)/cswmysql5 $(DESTDIR)/etc/opt/csw/init.d - ginstall -m 755 $(FILEDIR)/quick_start-csw $(DESTDIR)$(datadir)/mysql5 + ginstall -m 755 $(FILEDIR)/quick_start-csw $(DESTDIR)$(datadir)/mysql ginstall -m 755 -d $(DESTDIR)$(global_sysconfdir)/pkg/CSWmysql5 ginstall -m 644 $(FILEDIR)/cswusergroup \ $(DESTDIR)$(global_sysconfdir)/pkg/CSWmysql5 Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-09-22 15:53:05 UTC (rev 6405) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-09-22 20:17:45 UTC (rev 6406) @@ -2,8 +2,10 @@ 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 fa8f33c812604457f2c0792e875f6967 download/cswmysql5 +67228e1f096fe08a94f4267439a4ec36 download/cswusergroup 671348f1a5b078da9ca76f97e1fda325 download/mysql-5.0.84.tar.gz -1d79b3cfc4f91db05952bf71f0181fe7 download/quick_start-csw +a6560d8d679f3eb3fca2dbace29baa65 download/quick_start-csw Added: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall 2009-09-22 20:17:45 UTC (rev 6406) @@ -0,0 +1,14 @@ +#!/bin/sh +# +# $Id$ +# + +MYSQLDATADIR=/var/opt/csw/mysql5 +if [ ! -d "${MYSQLDATADIR}/mysql" ] ; then + echo "No database directory found in the default location." + 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," + echo " please start mysql manually." + exit 0 +fi Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswusergroup =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswusergroup 2009-09-22 15:53:05 UTC (rev 6405) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswusergroup 2009-09-22 20:17:45 UTC (rev 6406) @@ -1 +1 @@ -mysql:mysql:MySQL database user:/opt/csw/mysql:/bin/false:: +mysql:mysql:MySQL database user:/var/opt/csw/mysql5:/bin/false:: 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-09-22 15:53:05 UTC (rev 6405) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw 2009-09-22 20:17:45 UTC (rev 6406) @@ -12,7 +12,7 @@ MYSQLD_USER=mysql # # Provide a default data directory -MYSQLD_DATADIR=/opt/csw/mysql5/var +MYSQLD_DATADIR=/var/opt/csw/mysql5 # echo echo "This is the blastwave quick start script to setup a MySQL5 database" @@ -108,7 +108,7 @@ # # Update --datadir in the cnf file with the correct value if file was copied if [ x"$CNFCOPIED" = xyes ]; then - sed -e "s|/opt/csw/mysql5/var|$MYSQLD_DATADIR|g" $DEFAULTS_FILE >$DEFAULTS_FILE.new + sed -e "s|/var/opt/csw/mysql5|$MYSQLD_DATADIR|g" $DEFAULTS_FILE >$DEFAULTS_FILE.new mv $DEFAULTS_FILE.new $DEFAULTS_FILE fi @@ -126,7 +126,7 @@ then echo "To start mysqld; run \`svcadm enable cswmysql5\` on Solaris 10 or later" else - echo "To start mysqld; run \`/etc/init.d/cswmysql start\` on Solaris 9 or earlier" + echo "To start mysqld; run \`/etc/opt/csw/init.d/cswmysql start\` on Solaris 9 or earlier" fi 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 Tue Sep 22 22:20:16 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 22 Sep 2009 20:20:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[6407] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums Message-ID: Revision: 6407 http://gar.svn.sourceforge.net/gar/?rev=6407&view=rev Author: wahwah Date: 2009-09-22 20:20:16 +0000 (Tue, 22 Sep 2009) Log Message: ----------- mysql-5.0.x: Updating checksums 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-09-22 20:17:45 UTC (rev 6406) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-09-22 20:20:16 UTC (rev 6407) @@ -8,4 +8,4 @@ fa8f33c812604457f2c0792e875f6967 download/cswmysql5 67228e1f096fe08a94f4267439a4ec36 download/cswusergroup 671348f1a5b078da9ca76f97e1fda325 download/mysql-5.0.84.tar.gz -a6560d8d679f3eb3fca2dbace29baa65 download/quick_start-csw +52ad413f019717b89bd5aa33babdedc3 download/quick_start-csw This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Sep 22 22:26:19 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 22 Sep 2009 20:26:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[6408] csw/mgar/pkg/x11 Message-ID: Revision: 6408 http://gar.svn.sourceforge.net/gar/?rev=6408&view=rev Author: wbonnet Date: 2009-09-22 20:26:18 +0000 (Tue, 22 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/fontsproto/ csw/mgar/pkg/x11/fontsproto/branches/ csw/mgar/pkg/x11/fontsproto/tags/ csw/mgar/pkg/x11/fontsproto/trunk/ csw/mgar/pkg/x11/fontsproto/trunk/Makefile csw/mgar/pkg/x11/fontsproto/trunk/checksums csw/mgar/pkg/x11/fontsproto/trunk/files/ Property changes on: csw/mgar/pkg/x11/fontsproto/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/x11/fontsproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/fontsproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/fontsproto/trunk/Makefile 2009-09-22 20:26:18 UTC (rev 6408) @@ -0,0 +1,22 @@ +GARNAME = fontsproto +GARVERSION = 2.1.0 +CATEGORIES = x11 + +DESCRIPTION = Fonts extension headers +define BLURB + Font-related prototype header files for X11 +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/fontsproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/fontsproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/fontsproto/trunk/checksums 2009-09-22 20:26:18 UTC (rev 6408) @@ -0,0 +1 @@ +6819fc82585daac68cec17938b659bf0 download/fontsproto-2.1.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Sep 22 22:45:01 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 20:45:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[6409] csw/mgar/pkg/x11/libxext/trunk/Makefile Message-ID: Revision: 6409 http://gar.svn.sourceforge.net/gar/?rev=6409&view=rev Author: dmichelsen Date: 2009-09-22 20:45:01 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libxext: Update requirements Modified Paths: -------------- csw/mgar/pkg/x11/libxext/trunk/Makefile Modified: csw/mgar/pkg/x11/libxext/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxext/trunk/Makefile 2009-09-22 20:26:18 UTC (rev 6408) +++ csw/mgar/pkg/x11/libxext/trunk/Makefile 2009-09-22 20:45:01 UTC (rev 6409) @@ -17,8 +17,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PREREQUISITE_PKGS = CSWxextproto -REQUIRED_PKGS = CSWlibx11 +PREREQUISITE_PKGS = CSWxextproto CSWlibx11devel CSWlibxaudevel PACKAGES = CSWlibxext CSWlibxextdevel @@ -28,6 +27,7 @@ SPKG_DESC_CSWlibxext = X11 miscellaneous extensions library SPKG_DESC_CSWlibxextdevel = X11 miscellaneous extensions library development files +REQUIRED_PKGS_CSWlibxext = CSWlibx11 CSWlibxau REQUIRED_PKGS_CSWlibxextdevel = CSWlibxext PKGFILES_CSWlibxextdevel = $(PKGFILES_DEVEL) 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 Sep 22 22:46:01 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 22 Sep 2009 20:46:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[6410] csw/mgar/pkg/mysql5/branches/mysql-5.0.x Message-ID: Revision: 6410 http://gar.svn.sourceforge.net/gar/?rev=6410&view=rev Author: wahwah Date: 2009-09-22 20:46:01 +0000 (Tue, 22 Sep 2009) Log Message: ----------- mysqld-5.0.x: updating the startup script to use MYSQLD_DATADIR=/var/opt/csw/mysql5 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-09-22 20:45:01 UTC (rev 6409) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2009-09-22 20:46:01 UTC (rev 6410) @@ -5,7 +5,7 @@ 9b5511de728fec4394eca7dd0097fb43 download/CSWmysql5.postinstall cc2a219abbe7dc6049775cff070a27a5 download/CSWmysql5.preinstall 70d7860bfa776dfc5510fc11d7c14203 download/README.CSW -fa8f33c812604457f2c0792e875f6967 download/cswmysql5 +9e86a7c581edf83eac11ceb827c318a2 download/cswmysql5 67228e1f096fe08a94f4267439a4ec36 download/cswusergroup 671348f1a5b078da9ca76f97e1fda325 download/mysql-5.0.84.tar.gz 52ad413f019717b89bd5aa33babdedc3 download/quick_start-csw Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 2009-09-22 20:45:01 UTC (rev 6409) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 2009-09-22 20:46:01 UTC (rev 6410) @@ -15,7 +15,7 @@ RETVAL=0 MYSQLHOME=/opt/csw/mysql5 -MYSQLD_DATADIR=$MYSQLHOME/var +MYSQLD_DATADIR=/var/opt/csw/mysql5 MYSQLD_PID_FILE=$MYSQLHOME/var/mysql.pid CONFFILE=$MYSQLHOME/my.cnf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Sep 22 22:49:25 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 22 Sep 2009 20:49:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[6411] csw/mgar/pkg/x11/inputproto/trunk/Makefile Message-ID: Revision: 6411 http://gar.svn.sourceforge.net/gar/?rev=6411&view=rev Author: wbonnet Date: 2009-09-22 20:49:25 +0000 (Tue, 22 Sep 2009) Log Message: ----------- Upgrade to 1.5.1 Modified Paths: -------------- csw/mgar/pkg/x11/inputproto/trunk/Makefile Modified: csw/mgar/pkg/x11/inputproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/inputproto/trunk/Makefile 2009-09-22 20:46:01 UTC (rev 6410) +++ csw/mgar/pkg/x11/inputproto/trunk/Makefile 2009-09-22 20:49:25 UTC (rev 6411) @@ -1,5 +1,5 @@ GARNAME = inputproto -GARVERSION = 1.5.0 +GARVERSION = 1.5.1 CATEGORIES = x11 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Sep 22 22:51:36 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 22 Sep 2009 20:51:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[6412] csw/mgar/pkg/x11/renderproto/trunk/Makefile Message-ID: Revision: 6412 http://gar.svn.sourceforge.net/gar/?rev=6412&view=rev Author: wbonnet Date: 2009-09-22 20:51:31 +0000 (Tue, 22 Sep 2009) Log Message: ----------- Upgrade to 0.11 Modified Paths: -------------- csw/mgar/pkg/x11/renderproto/trunk/Makefile Modified: csw/mgar/pkg/x11/renderproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/renderproto/trunk/Makefile 2009-09-22 20:49:25 UTC (rev 6411) +++ csw/mgar/pkg/x11/renderproto/trunk/Makefile 2009-09-22 20:51:31 UTC (rev 6412) @@ -1,5 +1,5 @@ GARNAME = renderproto -GARVERSION = 0.9.3 +GARVERSION = 0.11 CATEGORIES = x11 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 Sep 22 22:54:40 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 20:54:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[6413] csw/mgar/pkg/x11 Message-ID: Revision: 6413 http://gar.svn.sourceforge.net/gar/?rev=6413&view=rev Author: dmichelsen Date: 2009-09-22 20:54:39 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libx11: Adjust directory name to match catalog name Modified Paths: -------------- csw/mgar/pkg/x11/libx11/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/libx11/ Removed Paths: ------------- csw/mgar/pkg/x11/libX11/ Modified: csw/mgar/pkg/x11/libx11/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libX11/trunk/Makefile 2009-09-22 13:55:59 UTC (rev 6393) +++ csw/mgar/pkg/x11/libx11/trunk/Makefile 2009-09-22 20:54:39 UTC (rev 6413) @@ -1,4 +1,4 @@ -GARNAME = libX11 +GARNAME = libx11 GARVERSION = 1.2.2 CATEGORIES = x11 @@ -10,7 +10,8 @@ endef MASTER_SITES = $(X11_LIB_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTNAME = libX11-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz PATCHFILES = patch-stdint.diff # Add workaround for http://bugs.sourcemage.org/show_bug.cgi?id=13476 PATCHFILES += patch-xlib-sentinel.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 Tue Sep 22 22:56:47 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 20:56:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[6414] csw/mgar/pkg/x11 Message-ID: Revision: 6414 http://gar.svn.sourceforge.net/gar/?rev=6414&view=rev Author: dmichelsen Date: 2009-09-22 20:56:47 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libxau: Adjust directory name to match catalog name, switch to bz2 Modified Paths: -------------- csw/mgar/pkg/x11/libxau/trunk/Makefile csw/mgar/pkg/x11/libxau/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/libxau/ Removed Paths: ------------- csw/mgar/pkg/x11/libXau/ Modified: csw/mgar/pkg/x11/libxau/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libXau/trunk/Makefile 2009-09-22 13:55:59 UTC (rev 6393) +++ csw/mgar/pkg/x11/libxau/trunk/Makefile 2009-09-22 20:56:47 UTC (rev 6414) @@ -1,4 +1,4 @@ -GARNAME = libXau +GARNAME = libxau GARVERSION = 1.0.4 CATEGORIES = x11 @@ -9,7 +9,8 @@ endef MASTER_SITES = $(X11_LIB_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTNAME = libXau-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.bz2 PREREQUISITE_PKGS = CSWinputproto CSWkbproto CSWrenderproto CSWxcbproto PREREQUISITE_PKGS += CSWxextproto CSWxproto CSWxtrans CSWlibpthreadstubs Modified: csw/mgar/pkg/x11/libxau/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libXau/trunk/checksums 2009-09-22 13:55:59 UTC (rev 6393) +++ csw/mgar/pkg/x11/libxau/trunk/checksums 2009-09-22 20:56:47 UTC (rev 6414) @@ -1 +1 @@ -77c3de874155456c857b331063ad2fd9 download/libXau-1.0.4.tar.gz +0f2b88d857e0a3f5898e4759c541af46 download/libXau-1.0.4.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Sep 22 22:57:32 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 22 Sep 2009 20:57:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[6415] csw/mgar/pkg/x11/inputproto/trunk/checksums Message-ID: Revision: 6415 http://gar.svn.sourceforge.net/gar/?rev=6415&view=rev Author: wbonnet Date: 2009-09-22 20:57:32 +0000 (Tue, 22 Sep 2009) Log Message: ----------- Update checksums Modified Paths: -------------- csw/mgar/pkg/x11/inputproto/trunk/checksums Modified: csw/mgar/pkg/x11/inputproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/inputproto/trunk/checksums 2009-09-22 20:56:47 UTC (rev 6414) +++ csw/mgar/pkg/x11/inputproto/trunk/checksums 2009-09-22 20:57:32 UTC (rev 6415) @@ -1,2 +1 @@ -edab35e039779f7f967e4f29878c5421 download/inputproto-1.5.0.tar.gz -18c9a938f54119eca02836cf21b3f6bb download/CSWinputproto.gspec +2311483e8c175af3b4b5111413018dd1 download/inputproto-1.5.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 Sep 22 23:00:38 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Sep 2009 21:00:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6416] csw/mgar/pkg/x11 Message-ID: Revision: 6416 http://gar.svn.sourceforge.net/gar/?rev=6416&view=rev Author: dmichelsen Date: 2009-09-22 21:00:38 +0000 (Tue, 22 Sep 2009) Log Message: ----------- x11/libxdmcp: Several enhancements towards x11 standard Makefile Modified Paths: -------------- csw/mgar/pkg/x11/libxdmcp/trunk/Makefile csw/mgar/pkg/x11/libxdmcp/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/libxdmcp/ Removed Paths: ------------- csw/mgar/pkg/x11/libXdmcp/ Modified: csw/mgar/pkg/x11/libxdmcp/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libXdmcp/trunk/Makefile 2009-09-22 13:55:59 UTC (rev 6393) +++ csw/mgar/pkg/x11/libxdmcp/trunk/Makefile 2009-09-22 21:00:38 UTC (rev 6416) @@ -1,4 +1,4 @@ -GARNAME = libXdmcp +GARNAME = libxdmcp GARVERSION = 1.0.2 CATEGORIES = x11 @@ -9,7 +9,8 @@ endef MASTER_SITES = $(X11_LIB_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTNAME = libXdmcp-$(GARVERSION) +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.gz @@ -18,24 +19,15 @@ CATALOGNAME_CSWlibxdmcp = libxdmcp CATALOGNAME_CSWlibxdmcpdevel = libxdmcp_devel -REQUIRED_PKGS_CSWlibxdmcpdevel = CSWlibxdmcp - SPKG_DESC_CSWlibxdmcp = X11 display manager control protocol library SPKG_DESC_CSWlibxdmcpdevel = X11 display manager control protocol library development package -PKGFILES_CSWlibxdmcpdevel = $(PKGFILES_DEVEL) -PKGFILES_CSWlibxdmcpdevel += $(prefix)/X11/include/.* -PKGFILES_CSWlibxdmcpdevel += $(prefix)/X11/lib/.*\.a -PKGFILES_CSWlibxdmcpdevel += $(prefix)/X11/lib/pkgconfig/.* +REQUIRED_PKGS_CSWlibxdmcpdevel = CSWlibxdmcp BUILD64 = 1 NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) -include gar/category.mk +PKGFILES_CSWlibxdmcpdevel = $(PKGFILES_DEVEL) -post-merge: - gln -s . $(PKGROOT)$(libdir)/32 - gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 - @$(MAKECOOKIE) - +include gar/category.mk Modified: csw/mgar/pkg/x11/libxdmcp/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libXdmcp/trunk/checksums 2009-09-22 13:55:59 UTC (rev 6393) +++ csw/mgar/pkg/x11/libxdmcp/trunk/checksums 2009-09-22 21:00:38 UTC (rev 6416) @@ -1 +1 @@ -a7e23f356a2b4fe8668f9ff4a2b0413a download/libXdmcp-1.0.2.tar.gz +10facf2bc7cbd5e5c1a698b8a210a582 download/libXdmcp-1.0.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Sep 22 23:07:07 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 22 Sep 2009 21:07:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[6417] csw/mgar/pkg/x11/xextproto/trunk/Makefile Message-ID: Revision: 6417 http://gar.svn.sourceforge.net/gar/?rev=6417&view=rev Author: wbonnet Date: 2009-09-22 21:07:06 +0000 (Tue, 22 Sep 2009) Log Message: ----------- Upgrade to 7.1.1 Modified Paths: -------------- csw/mgar/pkg/x11/xextproto/trunk/Makefile Modified: csw/mgar/pkg/x11/xextproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xextproto/trunk/Makefile 2009-09-22 21:00:38 UTC (rev 6416) +++ csw/mgar/pkg/x11/xextproto/trunk/Makefile 2009-09-22 21:07:06 UTC (rev 6417) @@ -1,5 +1,5 @@ GARNAME = xextproto -GARVERSION = 7.0.5 +GARVERSION = 7.1.1 CATEGORIES = x11 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Sep 22 23:08:17 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 22 Sep 2009 21:08:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[6418] csw/mgar/pkg/x11/xextproto/trunk/checksums Message-ID: Revision: 6418 http://gar.svn.sourceforge.net/gar/?rev=6418&view=rev Author: wbonnet Date: 2009-09-22 21:08:17 +0000 (Tue, 22 Sep 2009) Log Message: ----------- Upgrade to 7.1.1 Modified Paths: -------------- csw/mgar/pkg/x11/xextproto/trunk/checksums Modified: csw/mgar/pkg/x11/xextproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xextproto/trunk/checksums 2009-09-22 21:07:06 UTC (rev 6417) +++ csw/mgar/pkg/x11/xextproto/trunk/checksums 2009-09-22 21:08:17 UTC (rev 6418) @@ -1 +1 @@ -e6841018a7c64983b0954aa2c564d115 download/xextproto-7.0.5.tar.bz2 +fb6ccaae76db7a35e49b12aea60ca6ff download/xextproto-7.1.1.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Sep 22 23:27:51 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 22 Sep 2009 21:27:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[6419] csw/mgar/pkg/x11 Message-ID: Revision: 6419 http://gar.svn.sourceforge.net/gar/?rev=6419&view=rev Author: wbonnet Date: 2009-09-22 21:27:49 +0000 (Tue, 22 Sep 2009) Log Message: ----------- Update some path in the default message Modified Paths: -------------- csw/mgar/pkg/x11/glproto/Makefile csw/mgar/pkg/x11/inputproto/Makefile csw/mgar/pkg/x11/kbproto/Makefile csw/mgar/pkg/x11/recordproto/Makefile csw/mgar/pkg/x11/renderproto/Makefile csw/mgar/pkg/x11/videoproto/Makefile csw/mgar/pkg/x11/xcb-proto/Makefile csw/mgar/pkg/x11/xextproto/Makefile csw/mgar/pkg/x11/xproto/Makefile Modified: csw/mgar/pkg/x11/glproto/Makefile =================================================================== --- csw/mgar/pkg/x11/glproto/Makefile 2009-09-22 21:08:17 UTC (rev 6418) +++ csw/mgar/pkg/x11/glproto/Makefile 2009-09-22 21:27:49 UTC (rev 6419) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/ directory." + @echo "You are in the pkg/x11/glproto directory." %: $(MAKE) -C trunk $* Modified: csw/mgar/pkg/x11/inputproto/Makefile =================================================================== --- csw/mgar/pkg/x11/inputproto/Makefile 2009-09-22 21:08:17 UTC (rev 6418) +++ csw/mgar/pkg/x11/inputproto/Makefile 2009-09-22 21:27:49 UTC (rev 6419) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/ directory." + @echo "You are in the pkg/x11/inputproto directory." %: $(MAKE) -C trunk $* Modified: csw/mgar/pkg/x11/kbproto/Makefile =================================================================== --- csw/mgar/pkg/x11/kbproto/Makefile 2009-09-22 21:08:17 UTC (rev 6418) +++ csw/mgar/pkg/x11/kbproto/Makefile 2009-09-22 21:27:49 UTC (rev 6419) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/ directory." + @echo "You are in the pkg/x11/kbproto directory." %: $(MAKE) -C trunk $* Modified: csw/mgar/pkg/x11/recordproto/Makefile =================================================================== --- csw/mgar/pkg/x11/recordproto/Makefile 2009-09-22 21:08:17 UTC (rev 6418) +++ csw/mgar/pkg/x11/recordproto/Makefile 2009-09-22 21:27:49 UTC (rev 6419) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/ directory." + @echo "You are in the pkg/x11/recordproto directory." %: $(MAKE) -C trunk $* Modified: csw/mgar/pkg/x11/renderproto/Makefile =================================================================== --- csw/mgar/pkg/x11/renderproto/Makefile 2009-09-22 21:08:17 UTC (rev 6418) +++ csw/mgar/pkg/x11/renderproto/Makefile 2009-09-22 21:27:49 UTC (rev 6419) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/ directory." + @echo "You are in the pkg/x11/renderproto directory." %: $(MAKE) -C trunk $* Modified: csw/mgar/pkg/x11/videoproto/Makefile =================================================================== --- csw/mgar/pkg/x11/videoproto/Makefile 2009-09-22 21:08:17 UTC (rev 6418) +++ csw/mgar/pkg/x11/videoproto/Makefile 2009-09-22 21:27:49 UTC (rev 6419) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/ directory." + @echo "You are in the pkg/x11/videoproto directory." %: $(MAKE) -C trunk $* Modified: csw/mgar/pkg/x11/xcb-proto/Makefile =================================================================== --- csw/mgar/pkg/x11/xcb-proto/Makefile 2009-09-22 21:08:17 UTC (rev 6418) +++ csw/mgar/pkg/x11/xcb-proto/Makefile 2009-09-22 21:27:49 UTC (rev 6419) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/ directory." + @echo "You are in the pkg/x11/xcb-proto directory." %: $(MAKE) -C trunk $* Modified: csw/mgar/pkg/x11/xextproto/Makefile =================================================================== --- csw/mgar/pkg/x11/xextproto/Makefile 2009-09-22 21:08:17 UTC (rev 6418) +++ csw/mgar/pkg/x11/xextproto/Makefile 2009-09-22 21:27:49 UTC (rev 6419) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/ directory." + @echo "You are in the pkg/x11/xextproto directory." %: $(MAKE) -C trunk $* Modified: csw/mgar/pkg/x11/xproto/Makefile =================================================================== --- csw/mgar/pkg/x11/xproto/Makefile 2009-09-22 21:08:17 UTC (rev 6418) +++ csw/mgar/pkg/x11/xproto/Makefile 2009-09-22 21:27:49 UTC (rev 6419) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/ directory." + @echo "You are in the pkg/x11/xproto directory." %: $(MAKE) -C trunk $* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Sep 22 23:40:27 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 22 Sep 2009 21:40:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[6420] csw/mgar/pkg/x11 Message-ID: Revision: 6420 http://gar.svn.sourceforge.net/gar/?rev=6420&view=rev Author: wbonnet Date: 2009-09-22 21:40:25 +0000 (Tue, 22 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/resourceproto/ csw/mgar/pkg/x11/resourceproto/branches/ csw/mgar/pkg/x11/resourceproto/tags/ csw/mgar/pkg/x11/resourceproto/trunk/ csw/mgar/pkg/x11/resourceproto/trunk/Makefile csw/mgar/pkg/x11/resourceproto/trunk/checksums csw/mgar/pkg/x11/resourceproto/trunk/files/ Property changes on: csw/mgar/pkg/x11/resourceproto/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/x11/resourceproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/resourceproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/resourceproto/trunk/Makefile 2009-09-22 21:40:25 UTC (rev 6420) @@ -0,0 +1,22 @@ +GARNAME = resourceproto +GARVERSION = 1.1.0 +CATEGORIES = x11 + +DESCRIPTION = X.Org Resource protocol headers +define BLURB + Prototype header files for the Resource extension to X11 +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/resourceproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/resourceproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/resourceproto/trunk/checksums 2009-09-22 21:40:25 UTC (rev 6420) @@ -0,0 +1 @@ +587333b4995a3e11ebe4c8ba2742efaf download/resourceproto-1.1.0.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 Tue Sep 22 23:59:43 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 22 Sep 2009 21:59:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6421] csw/mgar/pkg/x11 Message-ID: Revision: 6421 http://gar.svn.sourceforge.net/gar/?rev=6421&view=rev Author: wbonnet Date: 2009-09-22 21:59:43 +0000 (Tue, 22 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/printproto/ csw/mgar/pkg/x11/printproto/branches/ csw/mgar/pkg/x11/printproto/tags/ csw/mgar/pkg/x11/printproto/trunk/ csw/mgar/pkg/x11/printproto/trunk/Makefile csw/mgar/pkg/x11/printproto/trunk/checksums csw/mgar/pkg/x11/printproto/trunk/files/ Property changes on: csw/mgar/pkg/x11/printproto/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/x11/printproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/printproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/printproto/trunk/Makefile 2009-09-22 21:59:43 UTC (rev 6421) @@ -0,0 +1,22 @@ +GARNAME = printproto +GARVERSION = 1.0.4 +CATEGORIES = x11 + +DESCRIPTION = X.Org Print extension headers +define BLURB + X11 print extension wire protocol Headers +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/printproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/printproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/printproto/trunk/checksums 2009-09-22 21:59:43 UTC (rev 6421) @@ -0,0 +1 @@ +9726f053b3d4cbd245766de70408c30b download/printproto-1.0.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Sep 23 10:32:51 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 23 Sep 2009 08:32:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[6422] csw/mgar/pkg/phpldapadmin/trunk Message-ID: Revision: 6422 http://gar.svn.sourceforge.net/gar/?rev=6422&view=rev Author: dmichelsen Date: 2009-09-23 08:32:50 +0000 (Wed, 23 Sep 2009) Log Message: ----------- phpldapadmin: Update to 1.2.0.4 Modified Paths: -------------- csw/mgar/pkg/phpldapadmin/trunk/Makefile csw/mgar/pkg/phpldapadmin/trunk/checksums Modified: csw/mgar/pkg/phpldapadmin/trunk/Makefile =================================================================== --- csw/mgar/pkg/phpldapadmin/trunk/Makefile 2009-09-22 21:59:43 UTC (rev 6421) +++ csw/mgar/pkg/phpldapadmin/trunk/Makefile 2009-09-23 08:32:50 UTC (rev 6422) @@ -1,5 +1,5 @@ GARNAME = phpldapadmin -GARVERSION = 1.2.0 +GARVERSION = 1.2.0.4 CATEGORIES = apps DESCRIPTION = Web-based LDAP browser to manage your LDAP server @@ -14,13 +14,15 @@ endef MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(GARNAME)-$(GARVERSION).zip +DISTFILES = $(GARNAME)-$(GARVERSION).tgz DISTFILES += CSWphpldapadmin.preinstall # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = https://sourceforge.net/projects/phpldapadmin/files/ -UFILES_REGEX = (\d+(?:\.\d+)*) +UFILES_REGEX = (\d+(?:\.\d+)*).tgz +SPKG_SOURCEURL = http://phpldapadmin.sourceforge.net/ + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = Modified: csw/mgar/pkg/phpldapadmin/trunk/checksums =================================================================== --- csw/mgar/pkg/phpldapadmin/trunk/checksums 2009-09-22 21:59:43 UTC (rev 6421) +++ csw/mgar/pkg/phpldapadmin/trunk/checksums 2009-09-23 08:32:50 UTC (rev 6422) @@ -1,2 +1,2 @@ 87983d70476a8a80332f0c3c188d9c2d download/CSWphpldapadmin.preinstall -16ce69b3cc2b4d2d67619059fc25254d download/phpldapadmin-1.2.0.zip +a2d914e22c1b114738eca91c80c0d09c download/phpldapadmin-1.2.0.4.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 Wed Sep 23 10:43:30 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 23 Sep 2009 08:43:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[6423] csw/mgar/pkg/cups/branches/cups-1.4/Makefile Message-ID: Revision: 6423 http://gar.svn.sourceforge.net/gar/?rev=6423&view=rev Author: wahwah Date: 2009-09-23 08:43:30 +0000 (Wed, 23 Sep 2009) Log Message: ----------- cups-1.4: Setting GARFLAVOR to DBG, simplifying the prototype processing, added references to CUPS bug tracking system. Modified Paths: -------------- csw/mgar/pkg/cups/branches/cups-1.4/Makefile Modified: csw/mgar/pkg/cups/branches/cups-1.4/Makefile =================================================================== --- csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-23 08:32:50 UTC (rev 6422) +++ csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-23 08:43:30 UTC (rev 6423) @@ -11,8 +11,25 @@ systems. It is developed and maintained by Easy Software Products to promote a standard printing solution and is the standard printing system in MacOS(R) X and most Linux(R) distributions. + + http://www.cups.org/str.php?L3324 endef +sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw + +# There's a problem with cups-polld going into a busy-wait loop when polling +# print servers. +# +# http://www.cups.org/str.php?L3257 +# +# The problem with cups-polld seems to be going away when CUPS is compiled with +# debugging symbols. The debugging options is turned on for this package, in +# order to be able to debug the binary if it ever shows the problem. +# +# TODO: Check whether the issue is gone or not. +GARFLAVOR = DBG + # These are the source mirrors published on the CUPS home-page. CUPS_MIRRORS = http://ftp.easysw.com/pub CUPS_MIRRORS += ftp://ftp2.easysw.com/pub @@ -57,7 +74,8 @@ REQUIRED_PKGS_CSWcupsd = CSWcswclassutils CSWlibcups CSWoldaprt CSWzlib REQUIRED_PKGS_CSWcupsd += CSWjpeg CSWpng CSWtiff CSWlibtasn1 REQUIRED_PKGS_CSWcupsd += CSWgcrypt CSWgnutls CSWgpgerr CSWlibdbus -REQUIRED_PKGS_CSWcupsd += CSWkrb5lib CSWosslrt +REQUIRED_PKGS_CSWcupsd += CSWkrb5lib CSWosslrt CSWcupsdoc +REQUIRED_PKGS_CSWcupsd += CSWdbusglib CSWggettextrt CSWglib2 REQUIRED_PKGS_CSWcupsclient = CSWcswclassutils CSWlibcups CSWoldaprt CSWzlib REQUIRED_PKGS_CSWcupsclient += CSWgcrypt CSWgnutls CSWgpgerr CSWlibtasn1 CSWosslrt REQUIRED_PKGS_CSWcupsdoc = CSWcswclassutils @@ -121,10 +139,9 @@ SPKG_DESC_CSWcupsdoc = CUPS documentation SPKG_DESC_CSWcupsdev = CUPS header files -PROTOTYPE_FILTER = awk ' \ - $$$$3 ~ /\/init.d\/cswcups$$$$/ { $$$$2 = "cswinitsmf" } \ - $$$$3 ~ /\/cupsd\.conf\.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ - { print }' +# http://lists.opencsw.org/pipermail/maintainers/2009-September/004249.html +SAMPLECONF = $(sysconfdir)/cups/cupsd.conf.CSW +INITSMF = $(sysconfdir)/init\.d/cswcups LD_OPTIONS = -R/opt/csw/lib/\$$ISALIST -R/opt/csw/lib @@ -154,9 +171,6 @@ DSTROOT = $(DESTDIR) export DSTROOT -sysconfdir = /etc/opt/csw -localstatedir = /var/opt/csw - # Don't run tests (at least for now); there are some LD_LIBRARY_PATH issues TEST_TARGET = @@ -176,6 +190,7 @@ if [ -r "$$i" ]; then \ echo "$$i -> $$i.CSW"; \ mv "$$i" "$$i.CSW"; \ + chmod 0644 "$$i.CSW"; \ fi \ done) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Wed Sep 23 12:24:08 2009 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Wed, 23 Sep 2009 10:24:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[6424] csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/ checksums Message-ID: Revision: 6424 http://gar.svn.sourceforge.net/gar/?rev=6424&view=rev Author: d_pocock Date: 2009-09-23 10:24:07 +0000 (Wed, 23 Sep 2009) Log Message: ----------- Update checksum to use beta ganglia-3.1.3.tar.gz Modified Paths: -------------- csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/checksums Modified: csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/checksums =================================================================== --- csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/checksums 2009-09-23 08:43:30 UTC (rev 6423) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/checksums 2009-09-23 10:24:07 UTC (rev 6424) @@ -2,5 +2,5 @@ c4c333a46db391464e372ad8ede4993c download/CSWgangliaweb.preremove 25d302948e25837bf17757d5e23e4955 download/cswgmetad c6bb96c949dbb989d06ebb36b6af885d download/cswgmond -cd502229ea934b433fa2ddc6fd3a2706 download/ganglia-3.1.3.tar.gz +d71166060fc8dd998861837f560a0a3e download/ganglia-3.1.3.tar.gz 2ff504ecb546aca2cdd6ee09af9a417e download/httpd-ganglia.conf.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 Sep 23 12:24:13 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 23 Sep 2009 10:24:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[6425] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 6425 http://gar.svn.sourceforge.net/gar/?rev=6425&view=rev Author: dmichelsen Date: 2009-09-23 10:24:13 +0000 (Wed, 23 Sep 2009) Log Message: ----------- mGAR v2: Fix auto-replacement of .CSW in cswclassutils 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-09-23 10:24:07 UTC (rev 6424) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-09-23 10:24:13 UTC (rev 6425) @@ -169,8 +169,8 @@ # - set class for all config files ifneq ($(SAMPLECONF)$(PRESERVECONF)$(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,$(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,$(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)$$) );))\ @@ -178,7 +178,7 @@ _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. -_EXTRA_PAX_ARGS += $(foreach FILE,$(SAMPLECONF:%.CSW=%) $(PRESERVECONF:%.CSW=%),-s ",^\.\($(FILE)\)$$,.\1.CSW,p") +_EXTRA_PAX_ARGS += $(foreach FILE,$(SAMPLECONF:%\.CSW=%) $(PRESERVECONF:%\.CSW=%),-s ",^\.\($(FILE)\)$$,.\1\.CSW,p") endif PKGGET_DESTDIR ?= 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 Sep 23 12:32:49 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 23 Sep 2009 10:32:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[6426] csw/mgar/pkg/x11 Message-ID: Revision: 6426 http://gar.svn.sourceforge.net/gar/?rev=6426&view=rev Author: dmichelsen Date: 2009-09-23 10:32:49 +0000 (Wed, 23 Sep 2009) Log Message: ----------- x11/videoproto: Adjust package name with x-prefix Modified Paths: -------------- csw/mgar/pkg/x11/libxv/trunk/Makefile csw/mgar/pkg/x11/videoproto/trunk/Makefile Modified: csw/mgar/pkg/x11/libxv/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxv/trunk/Makefile 2009-09-23 10:24:13 UTC (rev 6425) +++ csw/mgar/pkg/x11/libxv/trunk/Makefile 2009-09-23 10:32:49 UTC (rev 6426) @@ -14,7 +14,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -PREREQUISITE_PKGS = CSWvideoproto +PREREQUISITE_PKGS = CSWxvideoproto PACKAGES = CSWlibxv CSWlibxvdevel Modified: csw/mgar/pkg/x11/videoproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/videoproto/trunk/Makefile 2009-09-23 10:24:13 UTC (rev 6425) +++ csw/mgar/pkg/x11/videoproto/trunk/Makefile 2009-09-23 10:32:49 UTC (rev 6426) @@ -7,6 +7,8 @@ Video extension headers endef +PACKAGES = CSWxvideoproto + MASTER_SITES = $(X11_PROTO_MASTER_SITE) DISTFILES = $(GARNAME)-$(GARVERSION).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 Sep 23 12:37:41 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 23 Sep 2009 10:37:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[6427] csw/mgar/pkg/x11 Message-ID: Revision: 6427 http://gar.svn.sourceforge.net/gar/?rev=6427&view=rev Author: dmichelsen Date: 2009-09-23 10:37:41 +0000 (Wed, 23 Sep 2009) Log Message: ----------- x11/kbproto: Adjust package name with x-prefix Modified Paths: -------------- csw/mgar/pkg/x11/kbproto/trunk/Makefile csw/mgar/pkg/x11/libx11/trunk/Makefile csw/mgar/pkg/x11/libxau/trunk/Makefile Modified: csw/mgar/pkg/x11/kbproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/kbproto/trunk/Makefile 2009-09-23 10:32:49 UTC (rev 6426) +++ csw/mgar/pkg/x11/kbproto/trunk/Makefile 2009-09-23 10:37:41 UTC (rev 6427) @@ -14,6 +14,8 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWxkbproto + REQUIRED_PKGS = CSWx11common BUILD64 = 1 Modified: csw/mgar/pkg/x11/libx11/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libx11/trunk/Makefile 2009-09-23 10:32:49 UTC (rev 6426) +++ csw/mgar/pkg/x11/libx11/trunk/Makefile 2009-09-23 10:37:41 UTC (rev 6427) @@ -19,7 +19,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PREREQUISITE_PKGS = CSWxcbproto CSWxextproto CSWxtrans CSWkbproto CSWinputproto CSWlibpthreadstubs CSWlibxcbdevel +PREREQUISITE_PKGS = CSWxcbproto CSWxextproto CSWxtrans CSWxkbproto CSWinputproto CSWlibpthreadstubs CSWlibxcbdevel PACKAGES = CSWlibx11 CSWlibx11devel Modified: csw/mgar/pkg/x11/libxau/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxau/trunk/Makefile 2009-09-23 10:32:49 UTC (rev 6426) +++ csw/mgar/pkg/x11/libxau/trunk/Makefile 2009-09-23 10:37:41 UTC (rev 6427) @@ -12,7 +12,7 @@ DISTNAME = libXau-$(GARVERSION) DISTFILES = $(DISTNAME).tar.bz2 -PREREQUISITE_PKGS = CSWinputproto CSWkbproto CSWrenderproto CSWxcbproto +PREREQUISITE_PKGS = CSWinputproto CSWxkbproto CSWrenderproto CSWxcbproto PREREQUISITE_PKGS += CSWxextproto CSWxproto CSWxtrans CSWlibpthreadstubs PACKAGES = CSWlibxau CSWlibxaudevel 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 Sep 23 12:44:16 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 23 Sep 2009 10:44:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[6428] csw/mgar/pkg/x11/glproto/trunk/Makefile Message-ID: Revision: 6428 http://gar.svn.sourceforge.net/gar/?rev=6428&view=rev Author: dmichelsen Date: 2009-09-23 10:44:15 +0000 (Wed, 23 Sep 2009) Log Message: ----------- x11/glproto: Adjust package name with x-prefix Modified Paths: -------------- csw/mgar/pkg/x11/glproto/trunk/Makefile Modified: csw/mgar/pkg/x11/glproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/glproto/trunk/Makefile 2009-09-23 10:37:41 UTC (rev 6427) +++ csw/mgar/pkg/x11/glproto/trunk/Makefile 2009-09-23 10:44:15 UTC (rev 6428) @@ -13,6 +13,8 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWxglproto + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Sep 23 12:45:14 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 23 Sep 2009 10:45:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6429] csw/mgar/pkg/x11/glproto/trunk/Makefile Message-ID: Revision: 6429 http://gar.svn.sourceforge.net/gar/?rev=6429&view=rev Author: dmichelsen Date: 2009-09-23 10:45:13 +0000 (Wed, 23 Sep 2009) Log Message: ----------- x11/glproto: Fix upstream regex Modified Paths: -------------- csw/mgar/pkg/x11/glproto/trunk/Makefile Modified: csw/mgar/pkg/x11/glproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/glproto/trunk/Makefile 2009-09-23 10:44:15 UTC (rev 6428) +++ csw/mgar/pkg/x11/glproto/trunk/Makefile 2009-09-23 10:45:13 UTC (rev 6429) @@ -11,7 +11,7 @@ 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.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 PACKAGES = CSWxglproto 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 Sep 23 12:52:25 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 23 Sep 2009 10:52:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[6430] csw/mgar/pkg/x11 Message-ID: Revision: 6430 http://gar.svn.sourceforge.net/gar/?rev=6430&view=rev Author: dmichelsen Date: 2009-09-23 10:52:21 +0000 (Wed, 23 Sep 2009) Log Message: ----------- x11/renderproto: Adjust x-prefix to packagename Modified Paths: -------------- csw/mgar/pkg/x11/libxau/trunk/Makefile csw/mgar/pkg/x11/renderproto/trunk/Makefile csw/mgar/pkg/x11/xrender/trunk/Makefile Modified: csw/mgar/pkg/x11/libxau/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxau/trunk/Makefile 2009-09-23 10:45:13 UTC (rev 6429) +++ csw/mgar/pkg/x11/libxau/trunk/Makefile 2009-09-23 10:52:21 UTC (rev 6430) @@ -12,7 +12,7 @@ DISTNAME = libXau-$(GARVERSION) DISTFILES = $(DISTNAME).tar.bz2 -PREREQUISITE_PKGS = CSWinputproto CSWxkbproto CSWrenderproto CSWxcbproto +PREREQUISITE_PKGS = CSWinputproto CSWxkbproto CSWxrenderproto CSWxcbproto PREREQUISITE_PKGS += CSWxextproto CSWxproto CSWxtrans CSWlibpthreadstubs PACKAGES = CSWlibxau CSWlibxaudevel Modified: csw/mgar/pkg/x11/renderproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/renderproto/trunk/Makefile 2009-09-23 10:45:13 UTC (rev 6429) +++ csw/mgar/pkg/x11/renderproto/trunk/Makefile 2009-09-23 10:52:21 UTC (rev 6430) @@ -14,6 +14,8 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWxrenderproto + REQUIRED_PKGS = CSWx11common BUILD64 = 1 Modified: csw/mgar/pkg/x11/xrender/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xrender/trunk/Makefile 2009-09-23 10:45:13 UTC (rev 6429) +++ csw/mgar/pkg/x11/xrender/trunk/Makefile 2009-09-23 10:52:21 UTC (rev 6430) @@ -31,7 +31,7 @@ CATALOGNAME_CSWlibxrender = libxrender CATALOGNAME_CSWlibxrenderdevel = libxrender_devel -PREREQUISITE_PKGS = CSWrenderproto +PREREQUISITE_PKGS = CSWxrenderproto REQUIRED_PKGS_CSWlibxrenderdevel = CSWlibxrender REQUIRED_PKGS_CSWlibxrender = CSWx11common CSWlibx11 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 Sep 23 12:54:09 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 23 Sep 2009 10:54:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[6431] csw/mgar/pkg/x11/renderproto/trunk/checksums Message-ID: Revision: 6431 http://gar.svn.sourceforge.net/gar/?rev=6431&view=rev Author: dmichelsen Date: 2009-09-23 10:54:09 +0000 (Wed, 23 Sep 2009) Log Message: ----------- x11/renderproto: Update checksum Modified Paths: -------------- csw/mgar/pkg/x11/renderproto/trunk/checksums Modified: csw/mgar/pkg/x11/renderproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/renderproto/trunk/checksums 2009-09-23 10:52:21 UTC (rev 6430) +++ csw/mgar/pkg/x11/renderproto/trunk/checksums 2009-09-23 10:54:09 UTC (rev 6431) @@ -1 +1 @@ -ab8f3e356973d9c99810a8f092db3a2e download/renderproto-0.9.3.tar.gz +57216f25b9a5edc561b83a7484cb17e8 download/renderproto-0.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 Wed Sep 23 13:01:21 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 23 Sep 2009 11:01:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[6432] csw/mgar/pkg/x11/recordproto/trunk/Makefile Message-ID: Revision: 6432 http://gar.svn.sourceforge.net/gar/?rev=6432&view=rev Author: dmichelsen Date: 2009-09-23 11:01:21 +0000 (Wed, 23 Sep 2009) Log Message: ----------- x11/recordproto: Adjust x-prefix to packagename Modified Paths: -------------- csw/mgar/pkg/x11/recordproto/trunk/Makefile Modified: csw/mgar/pkg/x11/recordproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/recordproto/trunk/Makefile 2009-09-23 10:54:09 UTC (rev 6431) +++ csw/mgar/pkg/x11/recordproto/trunk/Makefile 2009-09-23 11:01:21 UTC (rev 6432) @@ -13,6 +13,8 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWxrecordproto + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Sep 23 13:58:43 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 23 Sep 2009 11:58:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6433] csw/mgar/pkg Message-ID: Revision: 6433 http://gar.svn.sourceforge.net/gar/?rev=6433&view=rev Author: wahwah Date: 2009-09-23 11:58:43 +0000 (Wed, 23 Sep 2009) Log Message: ----------- rox-filer: initial commit Modified Paths: -------------- csw/mgar/pkg/rox-filer/trunk/Makefile csw/mgar/pkg/rox-filer/trunk/checksums Added Paths: ----------- csw/mgar/pkg/rox-filer/ Modified: csw/mgar/pkg/rox-filer/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-09-15 10:19:44 UTC (rev 6309) +++ csw/mgar/pkg/rox-filer/trunk/Makefile 2009-09-23 11:58:43 UTC (rev 6433) @@ -2,181 +2,44 @@ # 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. +# This software uses custom ways of executing. Gentoo portage uses wrappers to +# set icon directories. + +GARNAME = rox-filer +GARVERSION = 2.9 +CATEGORIES = apps +DESCRIPTION = A lightweight X file manager 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 -## 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://roscidus.com/desktop/ROX-Filer +MASTER_SITES = $(SF_MIRRORS) +SF_PROJ = rox +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +REQUIRED_PKGS = CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWgtk2 +REQUIRED_PKGS += CSWlibatk CSWlibcairo CSWlibglade2 CSWlibxml2 CSWpango -#include gar/category.mk +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = rox +INSTALL_SCRIPTS = rox +TEST_SCRIPTS = +PACKAGES = CSWroxfiler +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +X_EXTRA_LIBS = -lm +export X_EXTRA_LIBS + +build-rox: + (cd $(WORKSRC); $(BUILD_ENV) ./ROX-Filer/AppRun --compile) + @$(MAKECOOKIE) + +install-rox: + # $(INSTALL_ENV) gmake -C $(WORKSRC)/ROX-Filer/build install + ginstall -d $(DESTDIR)$(bindir) + ginstall $(WORKSRC)/ROX-Filer/ROX-Filer $(DESTDIR)$(bindir) + ginstall -d $(DESTDIR)$(libdir) + gcp -av $(WORKSRC)/ROX-Filer/ROX $(DESTDIR)$(libdir) + gfind $(DESTDIR)$(libdir) -type d -exec chmod 0755 {} \; + gfind $(DESTDIR)$(libdir) -type f -exec chmod 0644 {} \; + @$(MAKECOOKIE) + +include gar/category.mk Modified: csw/mgar/pkg/rox-filer/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-09-15 10:19:44 UTC (rev 6309) +++ csw/mgar/pkg/rox-filer/trunk/checksums 2009-09-23 11:58:43 UTC (rev 6433) @@ -0,0 +1 @@ +d514b409e074ad77488aa7b44372aad1 download/rox-filer-2.9.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Sep 23 21:52:46 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 23 Sep 2009 19:52:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6434] csw/mgar/pkg/x11 Message-ID: Revision: 6434 http://gar.svn.sourceforge.net/gar/?rev=6434&view=rev Author: wbonnet Date: 2009-09-23 19:52:46 +0000 (Wed, 23 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libfs/ csw/mgar/pkg/x11/libfs/branches/ csw/mgar/pkg/x11/libfs/tags/ csw/mgar/pkg/x11/libfs/trunk/ csw/mgar/pkg/x11/libfs/trunk/Makefile csw/mgar/pkg/x11/libfs/trunk/checksums csw/mgar/pkg/x11/libfs/trunk/files/ Property changes on: csw/mgar/pkg/x11/libfs/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/x11/libfs/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libfs/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libfs/trunk/Makefile 2009-09-23 19:52:46 UTC (rev 6434) @@ -0,0 +1,33 @@ +GARNAME = libFS +GARVERSION = 1.0.2 +CATEGORIES = x11 + +DESCRIPTION = X11 Font Services library +define BLURB + libFS, the Font Services library, provides various functions useful to X11 font servers, and clients connecting to font servers. It is not used outside of these implementations. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibfs CSWlibfsdevel + +CATALOGNAME_CSWlibfs = libfs +CATALOGNAME_CSWlibfsdevel = libfs_devel + +SPKG_DESC_CSWlibfs = X11 Inter-Client Exchange library +SPKG_DESC_CSWlibfsdevel = X11 Inter-Client Exchange library development files + +REQUIRED_PKGS_CSWlibfsdevel = CSWlibfs + +PKGFILES_CSWlibfsdevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libfs/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libfs/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libfs/trunk/checksums 2009-09-23 19:52:46 UTC (rev 6434) @@ -0,0 +1 @@ +ecf2d6a27da053500283e803efa2a808 download/libFS-1.0.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Wed Sep 23 23:24:02 2009 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Wed, 23 Sep 2009 21:24:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[6435] csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/ Makefile Message-ID: Revision: 6435 http://gar.svn.sourceforge.net/gar/?rev=6435&view=rev Author: d_pocock Date: 2009-09-23 21:24:01 +0000 (Wed, 23 Sep 2009) Log Message: ----------- ganglia: explicitly set sysconfdir to /etc/opt/csw/ganglia Modified Paths: -------------- csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/Makefile Modified: csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/Makefile =================================================================== --- csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/Makefile 2009-09-23 19:52:46 UTC (rev 6434) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/Makefile 2009-09-23 21:24:01 UTC (rev 6435) @@ -99,7 +99,8 @@ WWWROOT = /opt/csw/share/www WWWGANGLIA = $(WWWROOT)/ganglia -ETCGANGLIA = /etc/opt/csw/ganglia +sysconfdir = /etc/opt/csw/ganglia +ETCGANGLIA = $(sysconfdir) PKGFILES_CSWganglia = PKGFILES_CSWgangliart = $(libdir)/libganglia.* 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 Sep 24 01:12:36 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 23 Sep 2009 23:12:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[6436] csw/mgar/pkg Message-ID: Revision: 6436 http://gar.svn.sourceforge.net/gar/?rev=6436&view=rev Author: skayser Date: 2009-09-23 23:12:36 +0000 (Wed, 23 Sep 2009) Log Message: ----------- pyfpconst: initial commit Added Paths: ----------- csw/mgar/pkg/pyfpconst/ csw/mgar/pkg/pyfpconst/branches/ csw/mgar/pkg/pyfpconst/tags/ csw/mgar/pkg/pyfpconst/trunk/ csw/mgar/pkg/pyfpconst/trunk/Makefile csw/mgar/pkg/pyfpconst/trunk/checksums csw/mgar/pkg/pyfpconst/trunk/files/ Property changes on: csw/mgar/pkg/pyfpconst/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/pyfpconst/trunk/Makefile =================================================================== --- csw/mgar/pkg/pyfpconst/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pyfpconst/trunk/Makefile 2009-09-23 23:12:36 UTC (rev 6436) @@ -0,0 +1,23 @@ +GARNAME = pyfpconst +GARVERSION = 0.7.2 +CATEGORIES = python + +DESCRIPTION = Utilities for handling IEEE 754 floating point special values +define BLURB + This python module implements constants and functions for working with + IEEE754 double-precision special values. It provides constants for + Not-a-Number (NaN), Positive Infinity (PosInf), and Negative Infinity + (NegInf), as well as functions to test for these values. +endef + +MASTER_SITES = http://pypi.python.org/packages/source/f/fpconst/ +DISTNAME = fpconst-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz + +PACKAGES = CSWpyfpconst +CATALOGNAME = py_fpconst +ARCHALL = 1 + +TEST_SCRIPTS = + +include gar/category.mk Added: csw/mgar/pkg/pyfpconst/trunk/checksums =================================================================== --- csw/mgar/pkg/pyfpconst/trunk/checksums (rev 0) +++ csw/mgar/pkg/pyfpconst/trunk/checksums 2009-09-23 23:12:36 UTC (rev 6436) @@ -0,0 +1 @@ +10ba9e04129af23108d24c22c3a698b1 download/fpconst-0.7.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Sep 24 01:17:03 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 23 Sep 2009 23:17:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[6437] csw/mgar/pkg/pyfpconst/trunk Message-ID: Revision: 6437 http://gar.svn.sourceforge.net/gar/?rev=6437&view=rev Author: skayser Date: 2009-09-23 23:17:03 +0000 (Wed, 23 Sep 2009) Log Message: ----------- pyfpconst: add changelog, add SPKG_SOURCEURL Modified Paths: -------------- csw/mgar/pkg/pyfpconst/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/pyfpconst/trunk/files/changelog.CSW Modified: csw/mgar/pkg/pyfpconst/trunk/Makefile =================================================================== --- csw/mgar/pkg/pyfpconst/trunk/Makefile 2009-09-23 23:12:36 UTC (rev 6436) +++ csw/mgar/pkg/pyfpconst/trunk/Makefile 2009-09-23 23:17:03 UTC (rev 6437) @@ -13,6 +13,7 @@ MASTER_SITES = http://pypi.python.org/packages/source/f/fpconst/ DISTNAME = fpconst-$(GARVERSION) DISTFILES = $(DISTNAME).tar.gz +SPKG_SOURCEURL = http://pypi.python.org/pypi/fpconst/ PACKAGES = CSWpyfpconst CATALOGNAME = py_fpconst @@ -21,3 +22,9 @@ TEST_SCRIPTS = include gar/category.mk + +post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(CATALOGNAME) +post-install-modulated: + @ginstall -d $(DOCDEST) + @cp $(FILEDIR)/changelog.CSW $(DOCDEST) + @$(MAKECOOKIE) Added: csw/mgar/pkg/pyfpconst/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/pyfpconst/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/pyfpconst/trunk/files/changelog.CSW 2009-09-23 23:17:03 UTC (rev 6437) @@ -0,0 +1,5 @@ +py_fpconst (0.7.2,REV=2009.09.24) + + * Initial release. + + -- Sebastian Kayser Thu, 24 Sep 2009 01:14:30 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Sep 24 03:42:43 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 24 Sep 2009 01:42:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6438] csw/mgar/pkg Message-ID: Revision: 6438 http://gar.svn.sourceforge.net/gar/?rev=6438&view=rev Author: bdwalton Date: 2009-09-24 01:42:43 +0000 (Thu, 24 Sep 2009) Log Message: ----------- gardev: initial commit Added Paths: ----------- csw/mgar/pkg/gardev/ csw/mgar/pkg/gardev/branches/ csw/mgar/pkg/gardev/tags/ csw/mgar/pkg/gardev/trunk/ csw/mgar/pkg/gardev/trunk/Makefile csw/mgar/pkg/gardev/trunk/checksums csw/mgar/pkg/gardev/trunk/files/ csw/mgar/pkg/gardev/trunk/files/README.csw Property changes on: csw/mgar/pkg/gardev/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/gardev/trunk/Makefile =================================================================== --- csw/mgar/pkg/gardev/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gardev/trunk/Makefile 2009-09-24 01:42:43 UTC (rev 6438) @@ -0,0 +1,35 @@ +GARNAME = gar_devel +GARVERSION = 1.0 +CATEGORIES = devel + +DESCRIPTION = Ease setting up a GAR development environment +define BLURB +Pull in all packages required to get started developing OpenCSW packages +with GAR. +endef + +ARCHALL = 1 +PACKAGES = CSWgardevel +CATALOGNAME_CSWgardevel = gar_devel + +# git and netcat are required if a GAR repo is tracking a git repo instead +# of upstream tarballs. svn is required for commiting gar recipes +REQUIRED_PKGS_CSWgardevel = CSWgmake CSWgtar CSWggrep CSWdiffutils CSWgfile +REQUIRED_PKGS_CSWgardevel += CSWtextutils CSWwget CSWfindutils CSWgsed +REQUIRED_PKGS_CSWgardevel += CSWgawk CSWbzip2 CSWlftp CSWgit CSWnetcat +REQUIRED_PKGS_CSWgardevel += CSWsvn + +MASTER_SITES = + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: DOCDIR=$(DESTDIR)/$(docdir)/$(GARNAME) +install-custom: $(WORKSRC) + @(gmkdir -p $(DOCDIR); \ + cp $(FILEDIR)/README.csw $(DOCDIR) ) + @$(MAKECOOKIE) Added: csw/mgar/pkg/gardev/trunk/files/README.csw =================================================================== --- csw/mgar/pkg/gardev/trunk/files/README.csw (rev 0) +++ csw/mgar/pkg/gardev/trunk/files/README.csw 2009-09-24 01:42:43 UTC (rev 6438) @@ -0,0 +1,3 @@ +This is just a dummy package that depends on all CSW packages that are +required to create packages with GAR. Feel free to remove it after +you've used it to install the current requirements. 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 Sep 24 04:21:11 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 24 Sep 2009 02:21:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[6439] csw/mgar/pkg/git/trunk Message-ID: Revision: 6439 http://gar.svn.sourceforge.net/gar/?rev=6439&view=rev Author: bdwalton Date: 2009-09-24 02:21:11 +0000 (Thu, 24 Sep 2009) Log Message: ----------- git: postinstallation register of git-daemon service in /etc/services Modified Paths: -------------- csw/mgar/pkg/git/trunk/checksums csw/mgar/pkg/git/trunk/files/CSWgit.postinstall Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2009-09-24 01:42:43 UTC (rev 6438) +++ csw/mgar/pkg/git/trunk/checksums 2009-09-24 02:21:11 UTC (rev 6439) @@ -1 +1 @@ -76a83b807edbcc41a01d3792d4a0322d download/CSWgit.postinstall +6c2d8cf8dcdfc844ea32bc381f6a3bfd download/CSWgit.postinstall Modified: csw/mgar/pkg/git/trunk/files/CSWgit.postinstall =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgit.postinstall 2009-09-24 01:42:43 UTC (rev 6438) +++ csw/mgar/pkg/git/trunk/files/CSWgit.postinstall 2009-09-24 02:21:11 UTC (rev 6439) @@ -3,9 +3,16 @@ GC_OLD="$PKG_INSTALL_ROOT/opt/csw/etc/gitconfig" GC_NEW="$PKG_INSTALL_ROOT/etc/opt/csw/gitconfig" -# this will hopefully ease the /opt/csw/etc -> /etc/opt/csw -# transition. +# ease the /opt/csw/etc -> /etc/opt/csw transition. if [ -f "$GC_OLD" -a ! -f "$GC_NEW" ]; then echo "Copying /opt/csw/etc/gitconfig to /etc/opt/csw/gitconfig" cp -p "$GC_OLD" "$GC_NEW" fi + +/usr/xpg4/bin/grep -q CSWgit /etc/services +if [ $? -ne 0 ]; then + echo <>/etc/services +git 9418/tcp # CSWgit: git transfer service +git 9418/udp # CSWgit: git transfer service +EOF +fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Sep 24 11:43:50 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 24 Sep 2009 09:43:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6440] csw/mgar/pkg/libntlm/trunk Message-ID: Revision: 6440 http://gar.svn.sourceforge.net/gar/?rev=6440&view=rev Author: dmichelsen Date: 2009-09-24 09:43:50 +0000 (Thu, 24 Sep 2009) Log Message: ----------- libntlm: Interim commit before 1.2, 1.1 is broken and 1.2 not released yet. Just bump version on release 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-09-24 02:21:11 UTC (rev 6439) +++ csw/mgar/pkg/libntlm/trunk/Makefile 2009-09-24 09:43:50 UTC (rev 6440) @@ -1,5 +1,5 @@ GARNAME = libntlm -GARVERSION = 1.1 +GARVERSION = 20090924 CATEGORIES = lib DESCRIPTION = Microsoft WinNT domain authentication library @@ -13,12 +13,15 @@ MASTER_SITES = http://josefsson.org/libntlm/releases/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +WORKSRC = $(WORKDIR)/libntlm-1.2 # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +# We don't need it and if defined the test breaks +LD_OPTIONS = + BUILD64 = 1 - CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/libntlm/trunk/checksums =================================================================== --- csw/mgar/pkg/libntlm/trunk/checksums 2009-09-24 02:21:11 UTC (rev 6439) +++ csw/mgar/pkg/libntlm/trunk/checksums 2009-09-24 09:43:50 UTC (rev 6440) @@ -1 +1 @@ -9ae0b6fa77c3f789e68db1fd708159e1 download/libntlm-1.1.tar.gz +5fa3bc33be1be487de1b0f23db469d3f download/libntlm-20090924.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 Sep 24 13:18:28 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 24 Sep 2009 11:18:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[6441] csw/mgar/pkg/openldap/trunk Message-ID: Revision: 6441 http://gar.svn.sourceforge.net/gar/?rev=6441&view=rev Author: dmichelsen Date: 2009-09-24 11:18:28 +0000 (Thu, 24 Sep 2009) Log Message: ----------- openldap: Added version modulation for 2.3.x to support 2.3.so legacy lib. Release pending BDB cleanup 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-09-24 09:43:50 UTC (rev 6440) +++ csw/mgar/pkg/openldap/trunk/Makefile 2009-09-24 11:18:28 UTC (rev 6441) @@ -1,6 +1,8 @@ GARNAME = openldap GARVERSION = 2.4.18 CATEGORIES = server +EXTRA_MODULATORS = GARVERSION +MODULATIONS_GARVERSION = 2.3.43 2.4.18 DESCRIPTION = Open source implementation of the Lightweight Directory Access Protocol define BLURB @@ -11,12 +13,24 @@ 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/ -DISTFILES = $(GARNAME)-$(GARVERSION).tgz +SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(GARNAME)-$(VERSION).tgz) +DISTFILES = $(SOURCEFILES) DISTFILES += $(call admfiles,CSWoldap) 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 +DISTFILES += patch-oldap-2.4.16-ntlm.diff + + +NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tgz,$(SOURCEFILES)) + LICENSE = COPYRIGHT PACKAGES = CSWoldap CSWoldapclient CSWoldapdevel CSWoldaprt @@ -43,12 +57,9 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PATCHFILES = patch-oldap-2.4.16-ntlm.diff -PATCHFILES += patch-libtool-64bit.diff -DISTFILES += patch-oldap-2.4.16-ntlm.diff - EXTRA_DOCS = README.CSW $(PATCHFILES) +# OpenLDAP 2.3 was bound to bdb44 #EXTRA_LIB = $(prefix)/bdb44/lib #EXTRA_INC = $(prefix)/bdb44/include Modified: csw/mgar/pkg/openldap/trunk/checksums =================================================================== --- csw/mgar/pkg/openldap/trunk/checksums 2009-09-24 09:43:50 UTC (rev 6440) +++ csw/mgar/pkg/openldap/trunk/checksums 2009-09-24 11:18:28 UTC (rev 6441) @@ -1,9 +1,9 @@ 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 -93dc2a04fd943c198ad00edd4d88ce65 download/patch-libtool-64bit.diff d3dee9018137c39f357859b652e3a67c download/patch-oldap-2.4.16-ntlm.diff e15c2020566e56f02118e75c89111f15 download/svc-openldap 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 Sep 24 19:01:13 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 24 Sep 2009 17:01:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[6442] csw/mgar/pkg Message-ID: Revision: 6442 http://gar.svn.sourceforge.net/gar/?rev=6442&view=rev Author: wahwah Date: 2009-09-24 17:01:12 +0000 (Thu, 24 Sep 2009) Log Message: ----------- modulatedpkg: An example of simple modulated package Modified Paths: -------------- csw/mgar/pkg/examples/modulations/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/examples/ csw/mgar/pkg/examples/modulations/ Modified: csw/mgar/pkg/examples/modulations/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-09-24 11:18:28 UTC (rev 6441) +++ csw/mgar/pkg/examples/modulations/trunk/Makefile 2009-09-24 17:01:12 UTC (rev 6442) @@ -2,181 +2,36 @@ # 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. +# The resulting prototype should look like this: +# +# f none /opt/csw/share/example-1.0.txt 0644 root bin +# f none /opt/csw/share/example-1.1.txt 0644 root bin +# f none /opt/csw/share/example-2.0.txt 0644 root bin +# i depend=CSWmodulatedpkg.depend +# i pkginfo=CSWmodulatedpkg.pkginfo + +GARNAME = modulatedpkg +GARVERSION = 2.0 +CATEGORIES = utils +DESCRIPTION = An example of a modulated package 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 -## 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 +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = example +TEST_SCRIPTS = -#include gar/category.mk +EXTRA_MODULATORS = GARVERSION +MODULATIONS_GARVERSION = 1.0 1.1 2.0 +MERGE_SCRIPTS_isa-sparcv8-garversion-1.0 = copy-all +MERGE_SCRIPTS_isa-sparcv8-garversion-1.1 = copy-all +MERGE_SCRIPTS_isa-sparcv8-garversion-2.0 = copy-all + +# A really simple installator, creating different files for each GARVERSION. +install-example: + ginstall -d -m 755 $(DESTDIR)$(datadir) + echo "This file belongs to the $(GARNAME)-$(GARVERSION)." \ + > $(DESTDIR)$(datadir)/example-$(GARVERSION).txt + @$(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 Sep 24 19:03:41 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 24 Sep 2009 17:03:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[6443] csw/mgar/pkg Message-ID: Revision: 6443 http://gar.svn.sourceforge.net/gar/?rev=6443&view=rev Author: wahwah Date: 2009-09-24 17:03:41 +0000 (Thu, 24 Sep 2009) Log Message: ----------- minimalsmf: Moving into the examples directory Added Paths: ----------- csw/mgar/pkg/examples/minimalsmf/ Removed Paths: ------------- csw/mgar/pkg/minimalsmf/ 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 Sep 24 21:50:50 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 24 Sep 2009 19:50:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6444] csw/mgar/pkg Message-ID: Revision: 6444 http://gar.svn.sourceforge.net/gar/?rev=6444&view=rev Author: skayser Date: 2009-09-24 19:50:50 +0000 (Thu, 24 Sep 2009) Log Message: ----------- supybot: initial commit, work in progress Added Paths: ----------- csw/mgar/pkg/supybot/ csw/mgar/pkg/supybot/branches/ csw/mgar/pkg/supybot/tags/ csw/mgar/pkg/supybot/trunk/ csw/mgar/pkg/supybot/trunk/Makefile csw/mgar/pkg/supybot/trunk/checksums csw/mgar/pkg/supybot/trunk/files/ csw/mgar/pkg/supybot/trunk/files/changelog.CSW Property changes on: csw/mgar/pkg/supybot/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/supybot/trunk/Makefile =================================================================== --- csw/mgar/pkg/supybot/trunk/Makefile (rev 0) +++ csw/mgar/pkg/supybot/trunk/Makefile 2009-09-24 19:50:50 UTC (rev 6444) @@ -0,0 +1,26 @@ +# TODO +# - Check whether additional dependencies are needed +GARNAME = supybot +GARVERSION = 0.83.4.1 +CATEGORIES = python + +DESCRIPTION = Robust, user-friendly, and extensible IRC bot +define BLURB +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTNAME = Supybot-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz + +EXTRA_PAX_ARGS = '-s,ChangeLog$$,changelog,p' +TEST_SCRIPTS = + +include gar/category.mk + +post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(CATALOGNAME) +post-install-modulated: DOCS=ChangeLog ACKS +post-install-modulated: + ginstall -d $(DOCDEST) + cp $(FILEDIR)/changelog.CSW $(DOCDEST) + cp $(addprefix $(WORKSRC)/, $(DOCS)) $(DOCDEST) + @$(MAKECOOKIE) Added: csw/mgar/pkg/supybot/trunk/checksums =================================================================== --- csw/mgar/pkg/supybot/trunk/checksums (rev 0) +++ csw/mgar/pkg/supybot/trunk/checksums 2009-09-24 19:50:50 UTC (rev 6444) @@ -0,0 +1 @@ +3efd15ea1516101cbf22b68c26452889 download/Supybot-0.83.4.1.tar.gz Added: csw/mgar/pkg/supybot/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/supybot/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/supybot/trunk/files/changelog.CSW 2009-09-24 19:50:50 UTC (rev 6444) @@ -0,0 +1,5 @@ +supybot (0.83.4.1,REV=2009.09.24) + + * Initial release. + + -- Sebastian Kayser Thu, 24 Sep 2009 21:24:03 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Sep 24 22:23:37 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 24 Sep 2009 20:23:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[6445] csw/mgar/pkg/gitosis/trunk/Makefile Message-ID: Revision: 6445 http://gar.svn.sourceforge.net/gar/?rev=6445&view=rev Author: bdwalton Date: 2009-09-24 20:23:37 +0000 (Thu, 24 Sep 2009) Log Message: ----------- gitosis: make dep on bash explicit instead of via git Modified Paths: -------------- csw/mgar/pkg/gitosis/trunk/Makefile Modified: csw/mgar/pkg/gitosis/trunk/Makefile =================================================================== --- csw/mgar/pkg/gitosis/trunk/Makefile 2009-09-24 19:50:50 UTC (rev 6444) +++ csw/mgar/pkg/gitosis/trunk/Makefile 2009-09-24 20:23:37 UTC (rev 6445) @@ -26,7 +26,7 @@ PREREQUISITE_PKGS_CSWgitosis = CSWpython CSWpysetuptools -REQUIRED_PKGS_CSWgitosis = CSWgit CSWpysetuptools +REQUIRED_PKGS_CSWgitosis = CSWgit CSWpysetuptools CSWbash GIT_REPOS = git://eagain.net/gitosis.git GIT_USE_PROXY = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Sep 24 22:26:34 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 24 Sep 2009 20:26:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[6446] csw/mgar/pkg/examples/modulations/branches/ minimal-version-modulation/ Message-ID: Revision: 6446 http://gar.svn.sourceforge.net/gar/?rev=6446&view=rev Author: wahwah Date: 2009-09-24 20:26:34 +0000 (Thu, 24 Sep 2009) Log Message: ----------- examples/modulations: Storing the simplest example of version modulation. Added Paths: ----------- csw/mgar/pkg/examples/modulations/branches/minimal-version-modulation/ 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 Sep 24 23:03:54 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 24 Sep 2009 21:03:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[6447] csw/mgar/pkg/x11 Message-ID: Revision: 6447 http://gar.svn.sourceforge.net/gar/?rev=6447&view=rev Author: wbonnet Date: 2009-09-24 21:03:54 +0000 (Thu, 24 Sep 2009) Log Message: ----------- initial commit Added Paths: ----------- csw/mgar/pkg/x11/xineramaproto/ csw/mgar/pkg/x11/xineramaproto/branches/ csw/mgar/pkg/x11/xineramaproto/tags/ csw/mgar/pkg/x11/xineramaproto/trunk/ csw/mgar/pkg/x11/xineramaproto/trunk/Makefile csw/mgar/pkg/x11/xineramaproto/trunk/checksums csw/mgar/pkg/x11/xineramaproto/trunk/files/ Property changes on: csw/mgar/pkg/x11/xineramaproto/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/x11/xineramaproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xineramaproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/xineramaproto/trunk/Makefile 2009-09-24 21:03:54 UTC (rev 6447) @@ -0,0 +1,22 @@ +GARNAME = xineramaproto +GARVERSION = 1.1.2 +CATEGORIES = x11 + +DESCRIPTION = X.Org Xinerama protocol headers +define BLURB + Prototype headers for Xinerama extension to X11 +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/xineramaproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xineramaproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/xineramaproto/trunk/checksums 2009-09-24 21:03:54 UTC (rev 6447) @@ -0,0 +1 @@ +1ad90ffc98d49c0dc5abb11e78b8d1aa download/xineramaproto-1.1.2.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 Thu Sep 24 23:06:19 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 24 Sep 2009 21:06:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[6448] csw/mgar/pkg/x11/xineramaproto/Makefile Message-ID: Revision: 6448 http://gar.svn.sourceforge.net/gar/?rev=6448&view=rev Author: wbonnet Date: 2009-09-24 21:06:18 +0000 (Thu, 24 Sep 2009) Log Message: ----------- Added Paths: ----------- csw/mgar/pkg/x11/xineramaproto/Makefile Added: csw/mgar/pkg/x11/xineramaproto/Makefile =================================================================== --- csw/mgar/pkg/x11/xineramaproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/xineramaproto/Makefile 2009-09-24 21:06:18 UTC (rev 6448) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/x11/xproto directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Thu Sep 24 23:23:07 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 24 Sep 2009 21:23:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[6449] csw/mgar/pkg/x11 Message-ID: Revision: 6449 http://gar.svn.sourceforge.net/gar/?rev=6449&view=rev Author: wbonnet Date: 2009-09-24 21:23:06 +0000 (Thu, 24 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/compositeproto/ csw/mgar/pkg/x11/compositeproto/Makefile csw/mgar/pkg/x11/compositeproto/branches/ csw/mgar/pkg/x11/compositeproto/tags/ csw/mgar/pkg/x11/compositeproto/trunk/ csw/mgar/pkg/x11/compositeproto/trunk/Makefile csw/mgar/pkg/x11/compositeproto/trunk/checksums csw/mgar/pkg/x11/compositeproto/trunk/files/ Added: csw/mgar/pkg/x11/compositeproto/Makefile =================================================================== --- csw/mgar/pkg/x11/compositeproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/compositeproto/Makefile 2009-09-24 21:23:06 UTC (rev 6449) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/x11/xproto directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/x11/compositeproto/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/x11/compositeproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/compositeproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/compositeproto/trunk/Makefile 2009-09-24 21:23:06 UTC (rev 6449) @@ -0,0 +1,22 @@ +GARNAME = compositeproto +GARVERSION = 0.4 +CATEGORIES = x11 + +DESCRIPTION = X.Org Composite protocol headers +define BLURB + Composite protocol headers from modular X.org X11 +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/compositeproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/compositeproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/compositeproto/trunk/checksums 2009-09-24 21:23:06 UTC (rev 6449) @@ -0,0 +1 @@ +33a79f6ba950bc5b41e077c951871bd5 download/compositeproto-0.4.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 Thu Sep 24 23:32:35 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 24 Sep 2009 21:32:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[6450] csw/mgar/pkg/x11 Message-ID: Revision: 6450 http://gar.svn.sourceforge.net/gar/?rev=6450&view=rev Author: wbonnet Date: 2009-09-24 21:32:35 +0000 (Thu, 24 Sep 2009) Log Message: ----------- initial commit Added Paths: ----------- csw/mgar/pkg/x11/damageproto/ csw/mgar/pkg/x11/damageproto/Makefile csw/mgar/pkg/x11/damageproto/branches/ csw/mgar/pkg/x11/damageproto/tags/ csw/mgar/pkg/x11/damageproto/trunk/ csw/mgar/pkg/x11/damageproto/trunk/Makefile csw/mgar/pkg/x11/damageproto/trunk/checksums csw/mgar/pkg/x11/damageproto/trunk/files/ Added: csw/mgar/pkg/x11/damageproto/Makefile =================================================================== --- csw/mgar/pkg/x11/damageproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/damageproto/Makefile 2009-09-24 21:32:35 UTC (rev 6450) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/x11/xproto directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/x11/damageproto/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/x11/damageproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/damageproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/damageproto/trunk/Makefile 2009-09-24 21:32:35 UTC (rev 6450) @@ -0,0 +1,22 @@ +GARNAME = damageproto +GARVERSION = 1.2.0 +CATEGORIES = x11 + +DESCRIPTION = X.Org Damage protocol headers +define BLURB + X.Org Damage protocol headers from modular X.org X11 +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/damageproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/damageproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/damageproto/trunk/checksums 2009-09-24 21:32:35 UTC (rev 6450) @@ -0,0 +1 @@ +423516fd64e43e8671120056b0d9f597 download/damageproto-1.2.0.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 Thu Sep 24 23:56:30 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 24 Sep 2009 21:56:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[6451] csw/mgar/pkg/x11 Message-ID: Revision: 6451 http://gar.svn.sourceforge.net/gar/?rev=6451&view=rev Author: wbonnet Date: 2009-09-24 21:56:30 +0000 (Thu, 24 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/applewmproto/ csw/mgar/pkg/x11/applewmproto/Makefile csw/mgar/pkg/x11/applewmproto/branches/ csw/mgar/pkg/x11/applewmproto/tags/ csw/mgar/pkg/x11/applewmproto/trunk/ csw/mgar/pkg/x11/applewmproto/trunk/Makefile csw/mgar/pkg/x11/applewmproto/trunk/checksums csw/mgar/pkg/x11/applewmproto/trunk/files/ Added: csw/mgar/pkg/x11/applewmproto/Makefile =================================================================== --- csw/mgar/pkg/x11/applewmproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/applewmproto/Makefile 2009-09-24 21:56:30 UTC (rev 6451) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/x11/xproto directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/x11/applewmproto/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/x11/applewmproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/applewmproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/applewmproto/trunk/Makefile 2009-09-24 21:56:30 UTC (rev 6451) @@ -0,0 +1,22 @@ +GARNAME = applewmproto +GARVERSION = 1.4.1 +CATEGORIES = x11 + +DESCRIPTION = AppleWM extension headers from X.org +define BLURB + AppleWM extension headers from modular X.org X11 project +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/applewmproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/applewmproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/applewmproto/trunk/checksums 2009-09-24 21:56:30 UTC (rev 6451) @@ -0,0 +1 @@ +822151ea24caf7c23ced6da7a14dfb4d download/applewmproto-1.4.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 Thu Sep 24 23:59:14 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 24 Sep 2009 21:59:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6452] csw/mgar/pkg/x11 Message-ID: Revision: 6452 http://gar.svn.sourceforge.net/gar/?rev=6452&view=rev Author: wbonnet Date: 2009-09-24 21:59:14 +0000 (Thu, 24 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/bigreqsproto/ csw/mgar/pkg/x11/bigreqsproto/Makefile csw/mgar/pkg/x11/bigreqsproto/branches/ csw/mgar/pkg/x11/bigreqsproto/tags/ csw/mgar/pkg/x11/bigreqsproto/trunk/ csw/mgar/pkg/x11/bigreqsproto/trunk/Makefile csw/mgar/pkg/x11/bigreqsproto/trunk/checksums csw/mgar/pkg/x11/bigreqsproto/trunk/files/ Added: csw/mgar/pkg/x11/bigreqsproto/Makefile =================================================================== --- csw/mgar/pkg/x11/bigreqsproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/bigreqsproto/Makefile 2009-09-24 21:59:14 UTC (rev 6452) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/x11/xproto directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/x11/bigreqsproto/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/x11/bigreqsproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/bigreqsproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/bigreqsproto/trunk/Makefile 2009-09-24 21:59:14 UTC (rev 6452) @@ -0,0 +1,22 @@ +GARNAME = bigreqsproto +GARVERSION = 1.1.0 +CATEGORIES = x11 + +DESCRIPTION = Prototype headers for BigReqs extension to X11 +define BLURB + Prototype headers for BigReqs extension to X11 for modular X.org project +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/bigreqsproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/bigreqsproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/bigreqsproto/trunk/checksums 2009-09-24 21:59:14 UTC (rev 6452) @@ -0,0 +1 @@ +882d49cc3bb591dbdccdf9e680bd2e4b download/bigreqsproto-1.1.0.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 Sep 25 00:10:46 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 24 Sep 2009 22:10:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6453] csw/mgar/pkg/x11 Message-ID: Revision: 6453 http://gar.svn.sourceforge.net/gar/?rev=6453&view=rev Author: wbonnet Date: 2009-09-24 22:10:46 +0000 (Thu, 24 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/dmxproto/ csw/mgar/pkg/x11/dmxproto/Makefile csw/mgar/pkg/x11/dmxproto/branches/ csw/mgar/pkg/x11/dmxproto/tags/ csw/mgar/pkg/x11/dmxproto/trunk/ csw/mgar/pkg/x11/dmxproto/trunk/Makefile csw/mgar/pkg/x11/dmxproto/trunk/checksums csw/mgar/pkg/x11/dmxproto/trunk/files/ Added: csw/mgar/pkg/x11/dmxproto/Makefile =================================================================== --- csw/mgar/pkg/x11/dmxproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/dmxproto/Makefile 2009-09-24 22:10:46 UTC (rev 6453) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/x11/xproto directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/x11/dmxproto/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/x11/dmxproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/dmxproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/dmxproto/trunk/Makefile 2009-09-24 22:10:46 UTC (rev 6453) @@ -0,0 +1,22 @@ +GARNAME = dmxproto +GARVERSION = 2.2.2 +CATEGORIES = x11 + +DESCRIPTION = Distributed Multi-headed X protocol headers for X11 +define BLURB + Distributed Multi-headed X protocol headers from modular X.org : "your networked Xinerama". +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/dmxproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/dmxproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/dmxproto/trunk/checksums 2009-09-24 22:10:46 UTC (rev 6453) @@ -0,0 +1 @@ +c76b374240fdb37af3ff62cbd484ec72 download/dmxproto-2.2.2.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 Sep 25 00:11:47 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 24 Sep 2009 22:11:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[6454] csw/mgar/pkg/x11 Message-ID: Revision: 6454 http://gar.svn.sourceforge.net/gar/?rev=6454&view=rev Author: wbonnet Date: 2009-09-24 22:11:47 +0000 (Thu, 24 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/dri2proto/ csw/mgar/pkg/x11/dri2proto/Makefile csw/mgar/pkg/x11/dri2proto/branches/ csw/mgar/pkg/x11/dri2proto/tags/ csw/mgar/pkg/x11/dri2proto/trunk/ csw/mgar/pkg/x11/dri2proto/trunk/Makefile csw/mgar/pkg/x11/dri2proto/trunk/checksums csw/mgar/pkg/x11/dri2proto/trunk/files/ Added: csw/mgar/pkg/x11/dri2proto/Makefile =================================================================== --- csw/mgar/pkg/x11/dri2proto/Makefile (rev 0) +++ csw/mgar/pkg/x11/dri2proto/Makefile 2009-09-24 22:11:47 UTC (rev 6454) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/x11/xproto directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/x11/dri2proto/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/x11/dri2proto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/dri2proto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/dri2proto/trunk/Makefile 2009-09-24 22:11:47 UTC (rev 6454) @@ -0,0 +1,22 @@ +GARNAME = dri2proto +GARVERSION = 2.1 +CATEGORIES = x11 + +DESCRIPTION = X.Org DRI2 prototype headers +define BLURB + DRI2 prototype headers from modular X.org +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/dri2proto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/dri2proto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/dri2proto/trunk/checksums 2009-09-24 22:11:47 UTC (rev 6454) @@ -0,0 +1 @@ +4815a9ac0682528aba50759b6f611acb download/dri2proto-2.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 Sep 25 00:12:43 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 24 Sep 2009 22:12:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6455] csw/mgar/pkg/x11 Message-ID: Revision: 6455 http://gar.svn.sourceforge.net/gar/?rev=6455&view=rev Author: wbonnet Date: 2009-09-24 22:12:43 +0000 (Thu, 24 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/evieextproto/ csw/mgar/pkg/x11/evieextproto/Makefile csw/mgar/pkg/x11/evieextproto/branches/ csw/mgar/pkg/x11/evieextproto/tags/ csw/mgar/pkg/x11/evieextproto/trunk/ csw/mgar/pkg/x11/evieextproto/trunk/Makefile csw/mgar/pkg/x11/evieextproto/trunk/checksums csw/mgar/pkg/x11/evieextproto/trunk/files/ Added: csw/mgar/pkg/x11/evieextproto/Makefile =================================================================== --- csw/mgar/pkg/x11/evieextproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/evieextproto/Makefile 2009-09-24 22:12:43 UTC (rev 6455) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/x11/xproto directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/x11/evieextproto/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/x11/evieextproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/evieextproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/evieextproto/trunk/Makefile 2009-09-24 22:12:43 UTC (rev 6455) @@ -0,0 +1,22 @@ +GARNAME = evieext +GARVERSION = 1.1.0 +CATEGORIES = x11 + +DESCRIPTION = X.Org EvIE protocol headers +define BLURB + EvIE protocol headers from modular X.org X11 +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/evieextproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/evieextproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/evieextproto/trunk/checksums 2009-09-24 22:12:43 UTC (rev 6455) @@ -0,0 +1 @@ +68e61ce53caa495a3ad4085f66010eb8 download/evieext-1.1.0.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 Sep 25 00:26:14 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 24 Sep 2009 22:26:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6456] csw/mgar/pkg/x11 Message-ID: Revision: 6456 http://gar.svn.sourceforge.net/gar/?rev=6456&view=rev Author: wbonnet Date: 2009-09-24 22:26:14 +0000 (Thu, 24 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/fixesproto/ csw/mgar/pkg/x11/fixesproto/Makefile csw/mgar/pkg/x11/fixesproto/branches/ csw/mgar/pkg/x11/fixesproto/tags/ csw/mgar/pkg/x11/fixesproto/trunk/ csw/mgar/pkg/x11/fixesproto/trunk/Makefile csw/mgar/pkg/x11/fixesproto/trunk/checksums csw/mgar/pkg/x11/fixesproto/trunk/files/ Added: csw/mgar/pkg/x11/fixesproto/Makefile =================================================================== --- csw/mgar/pkg/x11/fixesproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/fixesproto/Makefile 2009-09-24 22:26:14 UTC (rev 6456) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/x11/xproto directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/x11/fixesproto/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/x11/fixesproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/fixesproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/fixesproto/trunk/Makefile 2009-09-24 22:26:14 UTC (rev 6456) @@ -0,0 +1,22 @@ +GARNAME = fixesproto +GARVERSION = 4.1 +CATEGORIES = x11 + +DESCRIPTION = X11 Fixes extension protocol specification +define BLURB + Fixes extension protocol specification modular X.org +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/fixesproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/fixesproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/fixesproto/trunk/checksums 2009-09-24 22:26:14 UTC (rev 6456) @@ -0,0 +1 @@ +c8dc868f8f23bb4b545e6b98aed375b4 download/fixesproto-4.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 Sep 25 00:27:18 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 24 Sep 2009 22:27:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[6457] csw/mgar/pkg/x11 Message-ID: Revision: 6457 http://gar.svn.sourceforge.net/gar/?rev=6457&view=rev Author: wbonnet Date: 2009-09-24 22:27:17 +0000 (Thu, 24 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/fontcacheproto/ csw/mgar/pkg/x11/fontcacheproto/Makefile csw/mgar/pkg/x11/fontcacheproto/branches/ csw/mgar/pkg/x11/fontcacheproto/tags/ csw/mgar/pkg/x11/fontcacheproto/trunk/ csw/mgar/pkg/x11/fontcacheproto/trunk/Makefile csw/mgar/pkg/x11/fontcacheproto/trunk/checksums csw/mgar/pkg/x11/fontcacheproto/trunk/files/ Added: csw/mgar/pkg/x11/fontcacheproto/Makefile =================================================================== --- csw/mgar/pkg/x11/fontcacheproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/fontcacheproto/Makefile 2009-09-24 22:27:17 UTC (rev 6457) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/x11/xproto directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/x11/fontcacheproto/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/x11/fontcacheproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/fontcacheproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/fontcacheproto/trunk/Makefile 2009-09-24 22:27:17 UTC (rev 6457) @@ -0,0 +1,22 @@ +GARNAME = fontcacheproto +GARVERSION = 0.1.2 +CATEGORIES = x11 + +DESCRIPTION = X11 Prototype headers for the Fontcache library +define BLURB + Prototype headers for the Fontcache library from modular X.org +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/fontcacheproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/fontcacheproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/fontcacheproto/trunk/checksums 2009-09-24 22:27:17 UTC (rev 6457) @@ -0,0 +1 @@ +dc8c34a8c3559bf3b008bcdf7ba5a743 download/fontcacheproto-0.1.2.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 Sep 25 00:28:34 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 24 Sep 2009 22:28:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[6458] csw/mgar/pkg/x11 Message-ID: Revision: 6458 http://gar.svn.sourceforge.net/gar/?rev=6458&view=rev Author: wbonnet Date: 2009-09-24 22:28:34 +0000 (Thu, 24 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/randrproto/ csw/mgar/pkg/x11/randrproto/Makefile csw/mgar/pkg/x11/randrproto/branches/ csw/mgar/pkg/x11/randrproto/tags/ csw/mgar/pkg/x11/randrproto/trunk/ csw/mgar/pkg/x11/randrproto/trunk/Makefile csw/mgar/pkg/x11/randrproto/trunk/checksums csw/mgar/pkg/x11/randrproto/trunk/files/ Added: csw/mgar/pkg/x11/randrproto/Makefile =================================================================== --- csw/mgar/pkg/x11/randrproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/randrproto/Makefile 2009-09-24 22:28:34 UTC (rev 6458) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/x11/xproto directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/x11/randrproto/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/x11/randrproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/randrproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/randrproto/trunk/Makefile 2009-09-24 22:28:34 UTC (rev 6458) @@ -0,0 +1,22 @@ +GARNAME = randrproto +GARVERSION = 1.3.0 +CATEGORIES = x11 + +DESCRIPTION = X.Org Randr protocol headers +define BLURB + Randr protocol headers from modular X.org +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/randrproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/randrproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/randrproto/trunk/checksums 2009-09-24 22:28:34 UTC (rev 6458) @@ -0,0 +1 @@ +5804ffeea0e40982258cc4618b8c6f07 download/randrproto-1.3.0.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 Sep 25 00:32:59 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 24 Sep 2009 22:32:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6459] csw/mgar/pkg/x11 Message-ID: Revision: 6459 http://gar.svn.sourceforge.net/gar/?rev=6459&view=rev Author: wbonnet Date: 2009-09-24 22:32:59 +0000 (Thu, 24 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/scrnsaverproto/ csw/mgar/pkg/x11/scrnsaverproto/Makefile csw/mgar/pkg/x11/scrnsaverproto/branches/ csw/mgar/pkg/x11/scrnsaverproto/tags/ csw/mgar/pkg/x11/scrnsaverproto/trunk/ csw/mgar/pkg/x11/scrnsaverproto/trunk/Makefile csw/mgar/pkg/x11/scrnsaverproto/trunk/checksums csw/mgar/pkg/x11/scrnsaverproto/trunk/files/ Added: csw/mgar/pkg/x11/scrnsaverproto/Makefile =================================================================== --- csw/mgar/pkg/x11/scrnsaverproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/scrnsaverproto/Makefile 2009-09-24 22:32:59 UTC (rev 6459) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/x11/xproto directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/x11/scrnsaverproto/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/x11/scrnsaverproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/scrnsaverproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/scrnsaverproto/trunk/Makefile 2009-09-24 22:32:59 UTC (rev 6459) @@ -0,0 +1,22 @@ +GARNAME = scrnsaverproto +GARVERSION = 1.2.0 +CATEGORIES = x11 + +DESCRIPTION = X.Org ScrnSaver protocol headers +define BLURB + ScrnSaver protocol headers from modular X.org +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/scrnsaverproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/scrnsaverproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/scrnsaverproto/trunk/checksums 2009-09-24 22:32:59 UTC (rev 6459) @@ -0,0 +1 @@ +0ed88bdd6945ba207c4f734af48e7e25 download/scrnsaverproto-1.2.0.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 Sep 25 00:33:52 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 24 Sep 2009 22:33:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[6460] csw/mgar/pkg/x11 Message-ID: Revision: 6460 http://gar.svn.sourceforge.net/gar/?rev=6460&view=rev Author: wbonnet Date: 2009-09-24 22:33:52 +0000 (Thu, 24 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/trapproto/ csw/mgar/pkg/x11/trapproto/Makefile csw/mgar/pkg/x11/trapproto/branches/ csw/mgar/pkg/x11/trapproto/tags/ csw/mgar/pkg/x11/trapproto/trunk/ csw/mgar/pkg/x11/trapproto/trunk/Makefile csw/mgar/pkg/x11/trapproto/trunk/checksums csw/mgar/pkg/x11/trapproto/trunk/files/ Added: csw/mgar/pkg/x11/trapproto/Makefile =================================================================== --- csw/mgar/pkg/x11/trapproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/trapproto/Makefile 2009-09-24 22:33:52 UTC (rev 6460) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/x11/xproto directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/x11/trapproto/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/x11/trapproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/trapproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/trapproto/trunk/Makefile 2009-09-24 22:33:52 UTC (rev 6460) @@ -0,0 +1,22 @@ +GARNAME = trapproto +GARVERSION = 3.4.3 +CATEGORIES = x11 + +DESCRIPTION = X.Org Trap protocol headers +define BLURB + Trap protocol headers from modular X.org +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/trapproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/trapproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/trapproto/trunk/checksums 2009-09-24 22:33:52 UTC (rev 6460) @@ -0,0 +1 @@ +1344759ae8d7d923e64f5eec078a679b download/trapproto-3.4.3.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 Sep 25 00:36:13 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 24 Sep 2009 22:36:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[6461] csw/mgar/pkg/x11 Message-ID: Revision: 6461 http://gar.svn.sourceforge.net/gar/?rev=6461&view=rev Author: wbonnet Date: 2009-09-24 22:36:13 +0000 (Thu, 24 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/windowswmproto/ csw/mgar/pkg/x11/windowswmproto/Makefile csw/mgar/pkg/x11/windowswmproto/branches/ csw/mgar/pkg/x11/windowswmproto/tags/ csw/mgar/pkg/x11/windowswmproto/trunk/ csw/mgar/pkg/x11/windowswmproto/trunk/Makefile csw/mgar/pkg/x11/windowswmproto/trunk/checksums csw/mgar/pkg/x11/windowswmproto/trunk/files/ Added: csw/mgar/pkg/x11/windowswmproto/Makefile =================================================================== --- csw/mgar/pkg/x11/windowswmproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/windowswmproto/Makefile 2009-09-24 22:36:13 UTC (rev 6461) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/x11/xproto directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/x11/windowswmproto/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/x11/windowswmproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/windowswmproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/windowswmproto/trunk/Makefile 2009-09-24 22:36:13 UTC (rev 6461) @@ -0,0 +1,22 @@ +GARNAME = windowswmproto +GARVERSION = 1.0.3 +CATEGORIES = x11 + +DESCRIPTION = Windowswmproto headers for X.org +define BLURB + Windowswmproto headers from modular X.org +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/windowswmproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/windowswmproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/windowswmproto/trunk/checksums 2009-09-24 22:36:13 UTC (rev 6461) @@ -0,0 +1 @@ +a306fcd4afa9c5f981b8c1b45c725dec download/windowswmproto-1.0.3.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 Sep 25 00:37:16 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 24 Sep 2009 22:37:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[6462] csw/mgar/pkg/x11 Message-ID: Revision: 6462 http://gar.svn.sourceforge.net/gar/?rev=6462&view=rev Author: wbonnet Date: 2009-09-24 22:37:16 +0000 (Thu, 24 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/xcmiscproto/ csw/mgar/pkg/x11/xcmiscproto/Makefile csw/mgar/pkg/x11/xcmiscproto/branches/ csw/mgar/pkg/x11/xcmiscproto/tags/ csw/mgar/pkg/x11/xcmiscproto/trunk/ csw/mgar/pkg/x11/xcmiscproto/trunk/Makefile csw/mgar/pkg/x11/xcmiscproto/trunk/checksums csw/mgar/pkg/x11/xcmiscproto/trunk/files/ Added: csw/mgar/pkg/x11/xcmiscproto/Makefile =================================================================== --- csw/mgar/pkg/x11/xcmiscproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/xcmiscproto/Makefile 2009-09-24 22:37:16 UTC (rev 6462) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/x11/xproto directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/x11/xcmiscproto/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/x11/xcmiscproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xcmiscproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/xcmiscproto/trunk/Makefile 2009-09-24 22:37:16 UTC (rev 6462) @@ -0,0 +1,22 @@ +GARNAME = xcmiscproto +GARVERSION = 1.2.0 +CATEGORIES = x11 + +DESCRIPTION = X.Org XCMisc extension headers +define BLURB + XCMisc extension headers from modular X.org +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/xcmiscproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xcmiscproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/xcmiscproto/trunk/checksums 2009-09-24 22:37:16 UTC (rev 6462) @@ -0,0 +1 @@ +bacfb0f3cb4d6e1a71770307bfdba129 download/xcmiscproto-1.2.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Sep 25 01:40:39 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 24 Sep 2009 23:40:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[6463] csw/mgar/pkg/gitosis/trunk/Makefile Message-ID: Revision: 6463 http://gar.svn.sourceforge.net/gar/?rev=6463&view=rev Author: bdwalton Date: 2009-09-24 23:40:39 +0000 (Thu, 24 Sep 2009) Log Message: ----------- gitosis: remove CSWbash dep; I used /bin/bash for gitosis users... Modified Paths: -------------- csw/mgar/pkg/gitosis/trunk/Makefile Modified: csw/mgar/pkg/gitosis/trunk/Makefile =================================================================== --- csw/mgar/pkg/gitosis/trunk/Makefile 2009-09-24 22:37:16 UTC (rev 6462) +++ csw/mgar/pkg/gitosis/trunk/Makefile 2009-09-24 23:40:39 UTC (rev 6463) @@ -26,7 +26,7 @@ PREREQUISITE_PKGS_CSWgitosis = CSWpython CSWpysetuptools -REQUIRED_PKGS_CSWgitosis = CSWgit CSWpysetuptools CSWbash +REQUIRED_PKGS_CSWgitosis = CSWgit CSWpysetuptools GIT_REPOS = git://eagain.net/gitosis.git GIT_USE_PROXY = 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 Sep 25 02:16:38 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 25 Sep 2009 00:16:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6464] csw/mgar/pkg/gitosis/trunk/Makefile Message-ID: Revision: 6464 http://gar.svn.sourceforge.net/gar/?rev=6464&view=rev Author: bdwalton Date: 2009-09-25 00:16:38 +0000 (Fri, 25 Sep 2009) Log Message: ----------- gitosis: set csw bash as shell for gitosis user; depend on csw bash again; rework spkg_classes handling so that ugfiles triggers _after_ cswusergroup (bug after moving to USERGROUP var) Modified Paths: -------------- csw/mgar/pkg/gitosis/trunk/Makefile Modified: csw/mgar/pkg/gitosis/trunk/Makefile =================================================================== --- csw/mgar/pkg/gitosis/trunk/Makefile 2009-09-24 23:40:39 UTC (rev 6463) +++ csw/mgar/pkg/gitosis/trunk/Makefile 2009-09-25 00:16:38 UTC (rev 6464) @@ -26,7 +26,7 @@ PREREQUISITE_PKGS_CSWgitosis = CSWpython CSWpysetuptools -REQUIRED_PKGS_CSWgitosis = CSWgit CSWpysetuptools +REQUIRED_PKGS_CSWgitosis = CSWgit CSWpysetuptools CSWbash GIT_REPOS = git://eagain.net/gitosis.git GIT_USE_PROXY = 1 @@ -51,17 +51,18 @@ INSTALL_ARGS = --root $(DESTDIR) --single-version-externally-managed GITOSISHOME = /var/opt/csw/gitosis -CSWUG = gitosis:gitosis:Gitosis Host:$(GITOSISHOME):/bin/bash:: +CSWUG = gitosis:gitosis:Gitosis Host:$(GITOSISHOME):/opt/csw/bin/bash:: CSWUGD = $(INSTALLISADIR)/opt/csw/etc/pkg/CSW$(GARNAME) USERGROUP = /opt/csw/etc/pkg/CSWgitosis/cswusergroup PROTOTYPE_FILTER = awk '$$$$3 ~ /\/var\/opt\/csw\/gitosis/ { $$$$2 = "ugfiles"; $$$$5 = "gitosis"; $$$$6 = "gitosis" }; { print }' -SPKG_CLASSES = none ugfiles - include gar/category.mk +# this has to be after cswusergroup is added automatically... +SPKG_CLASSES += ugfiles + # override the category exclusion _MERGE_EXCLUDE_CATEGORY = 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 Sep 25 02:50:13 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 25 Sep 2009 00:50:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[6465] csw/mgar/pkg/gitosis/trunk/Makefile Message-ID: Revision: 6465 http://gar.svn.sourceforge.net/gar/?rev=6465&view=rev Author: bdwalton Date: 2009-09-25 00:50:13 +0000 (Fri, 25 Sep 2009) Log Message: ----------- gitosis: add postinstall code to migrate shell to csw bash if required Modified Paths: -------------- csw/mgar/pkg/gitosis/trunk/Makefile Modified: csw/mgar/pkg/gitosis/trunk/Makefile =================================================================== --- csw/mgar/pkg/gitosis/trunk/Makefile 2009-09-25 00:16:38 UTC (rev 6464) +++ csw/mgar/pkg/gitosis/trunk/Makefile 2009-09-25 00:50:13 UTC (rev 6465) @@ -17,6 +17,13 @@ /usr/bin/passwd -N gitosis +# in case the gitosis package was still using /bin/bash. +/usr/bin/getent passwd gitosis | /usr/xpg4/bin/grep -q ':/bin/bash' +if [ $$? -eq 0 ]; then + echo Updating shell for gitosis account to /opt/csw/bin/bash. + /usr/sbin/usermod -s /opt/csw/bin/bash gitosis +fi + echo See $(docdir)/$(GARNAME)/README.csw for first use instructions. endef 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 Sep 25 09:06:16 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 25 Sep 2009 07:06:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[6466] csw/mgar/pkg/x11/libxt/trunk/Makefile Message-ID: Revision: 6466 http://gar.svn.sourceforge.net/gar/?rev=6466&view=rev Author: dmichelsen Date: 2009-09-25 07:06:16 +0000 (Fri, 25 Sep 2009) Log Message: ----------- libxt: Put makestrs in devel package Modified Paths: -------------- csw/mgar/pkg/x11/libxt/trunk/Makefile Modified: csw/mgar/pkg/x11/libxt/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxt/trunk/Makefile 2009-09-25 00:50:13 UTC (rev 6465) +++ csw/mgar/pkg/x11/libxt/trunk/Makefile 2009-09-25 07:06:16 UTC (rev 6466) @@ -29,10 +29,15 @@ REQUIRED_PKGS_CSWlibxtdevel = CSWlibxt PKGFILES_CSWlibxtdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibxtdevel += .*/makestrs.* BUILD64 = 1 NOISALIST = 1 - +NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) +# No need for 64 bit makestrs +MERGE_DIRS_isa-sparcv9 = $(libdir) +MERGE_DIRS_isa-amd64 = $(libdir) + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri Sep 25 09:07:03 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 25 Sep 2009 07:07:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[6467] csw/mgar/pkg/mbuffer/trunk Message-ID: Revision: 6467 http://gar.svn.sourceforge.net/gar/?rev=6467&view=rev Author: skayser Date: 2009-09-25 07:07:00 +0000 (Fri, 25 Sep 2009) Log Message: ----------- mbuffer: version bump, skip new ipv6 test 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-09-25 07:06:16 UTC (rev 6466) +++ csw/mgar/pkg/mbuffer/trunk/Makefile 2009-09-25 07:07:00 UTC (rev 6467) @@ -1,5 +1,20 @@ +# 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 +# + GARNAME = mbuffer -GARVERSION = 20090215 +GARVERSION = 20090628 CATEGORIES = utils DESCRIPTION = A tool for buffering data streams @@ -16,7 +31,7 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tgz LICENSE = LICENSE -# Required for the test target +# Required during packaging (for the "test" target) PREREQUISITE_PKGS = CSWmktemp CSWgcc4core REQUIRED_PKGS = CSWosslrt @@ -26,7 +41,7 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz # To build the mixed package for x86 you have to do the following -# 1) build8x: gmake build-isa-i386 +# 1) build8x: gmake merge # 2) build10x: gmake merge # 3) build8x: gmake package BUILD64 = 1 @@ -53,9 +68,12 @@ test-custom: TMPDIR := $(shell mktemp -d -p /tmp) test-custom: echo "Running target test-custom, TMPDIR = $(TMPDIR)" - @cp $(WORKSRC)/mbuffer $(WORKSRC)/Makefile $(TMPDIR)/ - @$(MAKE) -C $(TMPDIR) check - @rm -rf $(TMPDIR) + cp $(WORKSRC)/mbuffer $(WORKSRC)/Makefile $(TMPDIR)/ + + # 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) @$(MAKECOOKIE) # Solaris 10 on build10x has libm.so which points to libm.so.2. libm.so.2 Modified: csw/mgar/pkg/mbuffer/trunk/checksums =================================================================== --- csw/mgar/pkg/mbuffer/trunk/checksums 2009-09-25 07:06:16 UTC (rev 6466) +++ csw/mgar/pkg/mbuffer/trunk/checksums 2009-09-25 07:07:00 UTC (rev 6467) @@ -1 +1 @@ -0bfc7e7da04f5226e3139af6ee9d590f download/mbuffer-20090215.tgz +66a39f6e3289f2e181b4861e6a301b01 download/mbuffer-20090628.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 Fri Sep 25 09:14:18 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 25 Sep 2009 07:14:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[6468] csw/mgar/pkg/bdb44 Message-ID: Revision: 6468 http://gar.svn.sourceforge.net/gar/?rev=6468&view=rev Author: dmichelsen Date: 2009-09-25 07:14:18 +0000 (Fri, 25 Sep 2009) Log Message: ----------- bdb44: Reinstatiate full bdb44 manifest Added Paths: ----------- csw/mgar/pkg/bdb44/tags/bdb-consolidation-4.4.20,REV=2009.07.28/ csw/mgar/pkg/bdb44/trunk/Makefile csw/mgar/pkg/bdb44/trunk/checksums csw/mgar/pkg/bdb44/trunk/files/ Removed Paths: ------------- csw/mgar/pkg/bdb44/trunk/Makefile csw/mgar/pkg/bdb44/trunk/legacy/ Deleted: csw/mgar/pkg/bdb44/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb44/trunk/Makefile 2009-09-25 07:07:00 UTC (rev 6467) +++ csw/mgar/pkg/bdb44/trunk/Makefile 2009-09-25 07:14:18 UTC (rev 6468) @@ -1,91 +0,0 @@ -GARNAME = db -GARVERSION = 4.4.20 -CATEGORIES = lib - -DESCRIPTION = embedded database libraries and utilities -define BLURB - Berkeley DB (libdb) is a programmatic toolkit that provides embedded database - support for both traditional and client/server applications. It includes - b+tree, queue, extended linear hashing, fixed, and variable-length record - access methods, transactions, locking, logging, shared memory caching and - database recovery. DB supports C, C++, Java, and Perl APIs. It is available - for a wide variety of UNIX platforms as well as Windows NT and Windows 95 - (MSVC 4, 5 and 6). -endef - -MASTER_SITES = http://download.oracle.com/berkeley-db/ -SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html - -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = -INSTALL_SCRIPTS = custom-$(GARCH) custom-all -TEST_SCRIPTS = - -ENABLE_CHECK = 0 -PACKAGES = CSWbdb44 -SPKG_DESC = BerkeleyDB 4.4 embedded database libraries and utilities -CATALOGNAME = berkeleydb44 -REQUIRED_PKGS = CSWbdb - -include gar/category.mk - -install-custom-i386: - ginstall -d $(DESTDIR)$(prefix)/bdb44/lib - cd $(DESTDIR)$(prefix)/bdb44/lib && gln -s . i386 - -install-custom-sparc: - ginstall -d $(DESTDIR)$(prefix)/bdb44/lib/sparcv9 - ginstall -d $(DESTDIR)$(prefix)/bdb44/bin/sparcv9 - cd $(DESTDIR)$(prefix)/bdb44/lib && gln -s . sparcv8 - cd $(DESTDIR)$(prefix)/bdb44/lib && gln -s sparcv9 64 - cd $(DESTDIR)$(prefix)/bdb44/lib/sparcv9 && gln -s $(libdir)/sparcv9/db.jar db.jar - cd $(DESTDIR)$(prefix)/bdb44/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb-4.so libdb-4.4.so - cd $(DESTDIR)$(prefix)/bdb44/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb-4.so libdb-4.so - cd $(DESTDIR)$(prefix)/bdb44/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb.so libdb.so - cd $(DESTDIR)$(prefix)/bdb44/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb_cxx-4.so libdb_cxx-4.4.so - cd $(DESTDIR)$(prefix)/bdb44/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb_cxx-4.so libdb_cxx-4.so - cd $(DESTDIR)$(prefix)/bdb44/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb_cxx.so libdb_cxx.so - cd $(DESTDIR)$(prefix)/bdb44/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb_java-4.so libdb_java-4.4.so - cd $(DESTDIR)$(prefix)/bdb44/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb_java-4.so libdb_java-4.4_g.so - cd $(DESTDIR)$(prefix)/bdb44/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb_java-4.so libdb_java-4.so - cd $(DESTDIR)$(prefix)/bdb44/lib/sparcv9 && gln -s $(libdir)/sparcv9/libdb_java.so libdb_java.so - cd $(DESTDIR)$(prefix)/bdb44/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_archive db_archive - cd $(DESTDIR)$(prefix)/bdb44/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_checkpoint db_checkpoint - cd $(DESTDIR)$(prefix)/bdb44/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_deadlock db_deadlock - cd $(DESTDIR)$(prefix)/bdb44/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_dump db_dump - cd $(DESTDIR)$(prefix)/bdb44/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_load db_load - cd $(DESTDIR)$(prefix)/bdb44/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_printlog db_printlog - cd $(DESTDIR)$(prefix)/bdb44/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_recover db_recover - cd $(DESTDIR)$(prefix)/bdb44/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_stat db_stat - cd $(DESTDIR)$(prefix)/bdb44/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_upgrade db_upgrade - cd $(DESTDIR)$(prefix)/bdb44/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_verify db_verify - cd $(DESTDIR)$(prefix)/bdb44/bin/sparcv9 && gln -s $(bindir)/sparcv9/berkeley_db_svc berkeley_db_svc - cd $(DESTDIR)$(prefix)/bdb44/bin/sparcv9 && gln -s $(bindir)/sparcv9/db_hotbackup db_hotbackup - -install-custom-all: - ginstall -d $(DESTDIR)$(prefix)/bdb44/lib - ginstall -d $(DESTDIR)$(prefix)/bdb44/bin - cd $(DESTDIR)$(prefix)/bdb44/lib && gln -s . 32 - cd $(DESTDIR)$(prefix)/bdb44/lib && gln -s $(libdir)/db.jar db.jar - cd $(DESTDIR)$(prefix)/bdb44/lib && gln -s $(libdir)/libdb-4.so libdb-4.4.so - cd $(DESTDIR)$(prefix)/bdb44/lib && gln -s $(libdir)/libdb-4.so libdb-4.so - cd $(DESTDIR)$(prefix)/bdb44/lib && gln -s $(libdir)/libdb.so libdb.so - cd $(DESTDIR)$(prefix)/bdb44/lib && gln -s $(libdir)/libdb_cxx-4.so libdb_cxx-4.4.so - cd $(DESTDIR)$(prefix)/bdb44/lib && gln -s $(libdir)/libdb_cxx-4.so libdb_cxx-4.so - cd $(DESTDIR)$(prefix)/bdb44/lib && gln -s $(libdir)/libdb_cxx.so libdb_cxx.so - cd $(DESTDIR)$(prefix)/bdb44/lib && gln -s $(libdir)/libdb_java-4.so libdb_java-4.4.so - cd $(DESTDIR)$(prefix)/bdb44/lib && gln -s $(libdir)/libdb_java-4.so libdb_java-4.4_g.so - cd $(DESTDIR)$(prefix)/bdb44/lib && gln -s $(libdir)/libdb_java-4.so libdb_java-4.so - cd $(DESTDIR)$(prefix)/bdb44/lib && gln -s $(libdir)/libdb_java.so libdb_java.so - cd $(DESTDIR)$(prefix)/bdb44/bin && gln -s $(bindir)/db_archive db_archive - cd $(DESTDIR)$(prefix)/bdb44/bin && gln -s $(bindir)/db_checkpoint db_checkpoint - cd $(DESTDIR)$(prefix)/bdb44/bin && gln -s $(bindir)/db_deadlock db_deadlock - cd $(DESTDIR)$(prefix)/bdb44/bin && gln -s $(bindir)/db_dump db_dump - cd $(DESTDIR)$(prefix)/bdb44/bin && gln -s $(bindir)/db_load db_load - cd $(DESTDIR)$(prefix)/bdb44/bin && gln -s $(bindir)/db_printlog db_printlog - cd $(DESTDIR)$(prefix)/bdb44/bin && gln -s $(bindir)/db_recover db_recover - cd $(DESTDIR)$(prefix)/bdb44/bin && gln -s $(bindir)/db_stat db_stat - cd $(DESTDIR)$(prefix)/bdb44/bin && gln -s $(bindir)/db_upgrade db_upgrade - cd $(DESTDIR)$(prefix)/bdb44/bin && gln -s $(bindir)/db_verify db_verify - cd $(DESTDIR)$(prefix)/bdb44/bin && gln -s $(bindir)/berkeley_db_svc berkeley_db_svc - cd $(DESTDIR)$(prefix)/bdb44/bin && gln -s $(bindir)/db_hotbackup db_hotbackup Copied: csw/mgar/pkg/bdb44/trunk/Makefile (from rev 6465, csw/mgar/pkg/bdb44/trunk/legacy/Makefile) =================================================================== --- csw/mgar/pkg/bdb44/trunk/Makefile (rev 0) +++ csw/mgar/pkg/bdb44/trunk/Makefile 2009-09-25 07:14:18 UTC (rev 6468) @@ -0,0 +1,101 @@ +GARNAME = db +GARVERSION = 4.4.20 +CATEGORIES = lib + +DESCRIPTION = embedded database libraries and utilities +define BLURB + Berkeley DB (libdb) is a programmatic toolkit that provides embedded database + support for both traditional and client/server applications. It includes + b+tree, queue, extended linear hashing, fixed, and variable-length record + access methods, transactions, locking, logging, shared memory caching and + database recovery. DB supports C, C++, Java, and Perl APIs. It is available + for a wide variety of UNIX platforms as well as Windows NT and Windows 95 + (MSVC 4, 5 and 6). +endef + +MASTER_SITES = http://download.oracle.com/berkeley-db/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +PACKAGES = CSWbdb44 CSWbdb44-devel CSWbdb44-doc + +# 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.oracle.com/technology/software/products/berkeley-db/db/index.html + +WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix + +PATCHDIR = $(WORKSRC)/.. +PATCHDIRLEVEL = 0 +PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*.diff)) + +BUILD64 = 1 + +CONFIGURE_SCRIPTS = dist + +prefix = $(BUILD_PREFIX)/bdb44 +docdir = $(BUILD_PREFIX)/share/doc + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --disable-cryptography +CONFIGURE_ARGS += --enable-compat185 +CONFIGURE_ARGS += --enable-o_direct +CONFIGURE_ARGS += --enable-rpc +CONFIGURE_ARGS += --enable-cxx +CONFIGURE_ARGS += --enable-java + +# Exclude TCL support for 64 bit until we have a 64 bit TCL +ifeq ($(MEMORYMODEL),32) +CONFIGURE_ARGS += --enable-tcl +CONFIGURE_ARGS += --with-tcl=$(libdir) +endif + +FIXCONFIG_DIRS = $(DESTDIR)$(prefix)/bdb44/lib + +# bdb tests are *very* time consuming +TEST_SCRIPTS = + +NO_ISAEXEC = 1 + +PACKAGES = CSWbdb44 CSWbdb44-devel CSWbdb44-doc + +CATALOGNAME_CSWbdb44 = berkeleydb44 +CATALOGNAME_CSWbdb44-devel = berkeleydb44_devel +CATALOGNAME_CSWbdb44-doc = berkeleydb44_doc + +ARCHALL_CSWbdb44-doc = 1 + +SPKG_DESC_CSWbdb44 = BerkeleyDB 4.4 embedded database libraries and utilities +SPKG_DESC_CSWbdb44-devel = BerkeleyDB 4.4 development support +SPKG_DESC_CSWbdb44-doc = BerkeleyDB 4.4 documentation + +REQUIRED_PKGS_CSWbdb44-devel = CSWbdb44 +INCOMPATIBLE_PKGS_CSWbdb44-doc = CSWbdb44doc + +LICENSE = LICENSE + +# Leave the docs where they are for now +#EXTRA_PAX_ARGS_isa-sparcv8 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb44/,p" +#EXTRA_PAX_ARGS_isa-i386 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb44/,p" + +#PKGFILES_CSWbdb44-doc = $(PKGFILES_DOC) +PKGFILES_CSWbdb44-doc = $(prefix)/docs/.* + +PKGFILES_CSWbdb44-devel = $(PKGFILES_DEVEL) + +include gar/category.mk + +LIBS += -lnsl +export LIBS + +PATH := /usr/j2se/bin:$(PATH) +export PATH + +configure-dist: + ( cd $(WORKSRC) ; $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS) ) + @$(MAKECOOKIE) + +post-merge: + gln -s . $(PKGROOT)$(libdir)/32 + gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 + @$(MAKECOOKIE) Copied: csw/mgar/pkg/bdb44/trunk/checksums (from rev 6465, csw/mgar/pkg/bdb44/trunk/legacy/checksums) =================================================================== --- csw/mgar/pkg/bdb44/trunk/checksums (rev 0) +++ csw/mgar/pkg/bdb44/trunk/checksums 2009-09-25 07:14:18 UTC (rev 6468) @@ -0,0 +1,6 @@ +d84dff288a19186b136b0daf7067ade3 download/db-4.4.20.tar.gz +66584d621355df055b6e05b4a02e9c3e download/patch.4.4.20.1.diff +85df93a0867f6cace3501671cdeb6ed1 download/patch.4.4.20.2.diff +88ee91889ebf5498b22b2e7bed945d41 download/patch.4.4.20.3.diff +c2ef7b3e59460c35950fab5f2faa3fc0 download/patch.4.4.20.4.diff +099621e0dad419188acd42c588242131 download/patch.4.4.20.5.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 Fri Sep 25 09:26:44 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 25 Sep 2009 07:26:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[6469] csw/mgar/pkg/bdb43 Message-ID: Revision: 6469 http://gar.svn.sourceforge.net/gar/?rev=6469&view=rev Author: dmichelsen Date: 2009-09-25 07:26:44 +0000 (Fri, 25 Sep 2009) Log Message: ----------- bdb43: Reinstatiate full bdb43 manifest Added Paths: ----------- csw/mgar/pkg/bdb43/tags/bdb-consolidation-4.3.29,REV=2009.06.26/ csw/mgar/pkg/bdb43/trunk/Makefile csw/mgar/pkg/bdb43/trunk/checksums csw/mgar/pkg/bdb43/trunk/files/ Removed Paths: ------------- csw/mgar/pkg/bdb43/trunk/Makefile Deleted: csw/mgar/pkg/bdb43/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb43/trunk/Makefile 2009-09-25 07:14:18 UTC (rev 6468) +++ csw/mgar/pkg/bdb43/trunk/Makefile 2009-09-25 07:26:44 UTC (rev 6469) @@ -1,56 +0,0 @@ -GARNAME = db -GARVERSION = 4.3.29 -CATEGORIES = lib - -DESCRIPTION = BerkeleyDB 4.3 libraries and utilities -define BLURB - Berkeley DB (libdb) is a programmatic toolkit that provides embedded database - support for both traditional and client/server applications. It includes - b+tree, queue, extended linear hashing, fixed, and variable-length record - access methods, transactions, locking, logging, shared memory caching and - database recovery. DB supports C, C++, Java, and Perl APIs. It is available - for a wide variety of UNIX platforms as well as Windows NT and Windows 95 - (MSVC 4, 5 and 6). -endef - -MASTER_SITES = http://downloads.sleepycat.com/ - -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = -INSTALL_SCRIPTS = custom -TEST_SCRIPTS = - -ENABLE_CHECK = 0 -ARCHALL = 1 -PACKAGES = CSWbdb43 -SPKG_DESC = BerkeleyDB 4.3 libraries and utilities -CATALOGNAME = berkeleydb43 -REQUIRED_PKGS = CSWbdb - -include gar/category.mk -install-custom: - ginstall -d $(DESTDIR)$(prefix)/bdb43/lib - ginstall -d $(DESTDIR)$(prefix)/bdb43/bin - cd $(DESTDIR)$(prefix)/bdb43/lib && gln -s $(libdir)/db.jar db.jar - cd $(DESTDIR)$(prefix)/bdb43/lib && gln -s $(libdir)/libdb-4.so libdb-4.3.so - cd $(DESTDIR)$(prefix)/bdb43/lib && gln -s $(libdir)/libdb-4.so libdb-4.so - cd $(DESTDIR)$(prefix)/bdb43/lib && gln -s $(libdir)/libdb.so libdb.so - cd $(DESTDIR)$(prefix)/bdb43/lib && gln -s $(libdir)/libdb_cxx-4.so libdb_cxx-4.3.so - cd $(DESTDIR)$(prefix)/bdb43/lib && gln -s $(libdir)/libdb_cxx-4.so libdb_cxx-4.so - cd $(DESTDIR)$(prefix)/bdb43/lib && gln -s $(libdir)/libdb_cxx.so libdb_cxx.so - cd $(DESTDIR)$(prefix)/bdb43/lib && gln -s $(libdir)/libdb_java-4.so libdb_java-4.3.so - cd $(DESTDIR)$(prefix)/bdb43/lib && gln -s $(libdir)/libdb_java-4.so libdb_java-4.3_g.so - cd $(DESTDIR)$(prefix)/bdb43/lib && gln -s $(libdir)/libdb_java-4.so libdb_java-4.so - cd $(DESTDIR)$(prefix)/bdb43/lib && gln -s $(libdir)/libdb_java.so libdb_java.so - cd $(DESTDIR)$(prefix)/bdb43/bin && gln -s $(bindir)/db_archive db_archive - cd $(DESTDIR)$(prefix)/bdb43/bin && gln -s $(bindir)/db_checkpoint db_checkpoint - cd $(DESTDIR)$(prefix)/bdb43/bin && gln -s $(bindir)/db_deadlock db_deadlock - cd $(DESTDIR)$(prefix)/bdb43/bin && gln -s $(bindir)/db_dump db_dump - cd $(DESTDIR)$(prefix)/bdb43/bin && gln -s $(bindir)/db_load db_load - cd $(DESTDIR)$(prefix)/bdb43/bin && gln -s $(bindir)/db_printlog db_printlog - cd $(DESTDIR)$(prefix)/bdb43/bin && gln -s $(bindir)/db_recover db_recover - cd $(DESTDIR)$(prefix)/bdb43/bin && gln -s $(bindir)/db_stat db_stat - cd $(DESTDIR)$(prefix)/bdb43/bin && gln -s $(bindir)/db_upgrade db_upgrade - cd $(DESTDIR)$(prefix)/bdb43/bin && gln -s $(bindir)/db_verify db_verify - cd $(DESTDIR)$(prefix)/bdb43/bin && gln -s $(bindir)/berkeley_db_svc berkeley_db_svc - Copied: csw/mgar/pkg/bdb43/trunk/Makefile (from rev 6465, csw/mgar/pkg/bdb43/trunk/legacy/Makefile) =================================================================== --- csw/mgar/pkg/bdb43/trunk/Makefile (rev 0) +++ csw/mgar/pkg/bdb43/trunk/Makefile 2009-09-25 07:26:44 UTC (rev 6469) @@ -0,0 +1,56 @@ +GARNAME = db +GARVERSION = 4.3.29 +CATEGORIES = lib + +DESCRIPTION = BerkeleyDB 4.3 libraries and utilities +define BLURB + Berkeley DB (libdb) is a programmatic toolkit that provides embedded database + support for both traditional and client/server applications. It includes + b+tree, queue, extended linear hashing, fixed, and variable-length record + access methods, transactions, locking, logging, shared memory caching and + database recovery. DB supports C, C++, Java, and Perl APIs. It is available + for a wide variety of UNIX platforms as well as Windows NT and Windows 95 + (MSVC 4, 5 and 6). +endef + +MASTER_SITES = http://downloads.sleepycat.com/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWbdb43,depend prototype) +DISTFILES += $(call admfiles,CSWbdb43-devel,depend prototype) +DISTFILES += $(call admfiles,CSWbdb43-doc,depend prototype) + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix + +CONFIGURE_SCRIPTS = dist + +CONFIGURE_ARGS = --prefix $(prefix)/bdb43 +CONFIGURE_ARGS += --disable-cryptography +CONFIGURE_ARGS += --enable-compat185 +CONFIGURE_ARGS += --enable-rpc +CONFIGURE_ARGS += --enable-cxx +CONFIGURE_ARGS += --enable-java +CONFIGURE_ARGS += --enable-tcl +CONFIGURE_ARGS += --with-tcl=$(libdir) +CONFIGURE_ARGS += --enable-o_direct + +LIBTOOL_LADIR = $(DESTDIR)$(prefix)/bdb43/lib +STRIP_DIRS += $(DESTDIR)$(prefix)/bdb43/bin + +# bdb tests are time consuming +TEST_SCRIPTS = + +include gar/category.mk + +LIBS += -lnsl +export LIBS + +PATH := /usr/j2se/bin:$(PATH) +export PATH + +configure-dist: + @( cd $(WORKSRC) ; $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS) ) + @$(MAKECOOKIE) + Copied: csw/mgar/pkg/bdb43/trunk/checksums (from rev 6465, csw/mgar/pkg/bdb43/trunk/legacy/checksums) =================================================================== --- csw/mgar/pkg/bdb43/trunk/checksums (rev 0) +++ csw/mgar/pkg/bdb43/trunk/checksums 2009-09-25 07:26:44 UTC (rev 6469) @@ -0,0 +1,10 @@ +13585a20ce32f113b8e8cdb57f52e3bb download/db-4.3.29.tar.gz +a780ed74216a67b45d5bab030d29d1a8 download/CSWbdb43.gspec +8093298b67861e241b0d2499c9f2ff89 download/CSWbdb43.depend +001de61b8e01758ba15ee19184b36bcf download/CSWbdb43.prototype +d3e8da06077e095478cb493e3928eaaf download/CSWbdb43-devel.gspec +f905a2c20a7c2265a2ed126027a49b85 download/CSWbdb43-devel.depend +102c5de41ee6b1039f92836fc309eb80 download/CSWbdb43-devel.prototype +0539eef14dfa8dc02a162d946ad164b1 download/CSWbdb43-doc.gspec +8c10985a125690e3d6bc877be173e20d download/CSWbdb43-doc.depend +b7e86382632f53bae97051502bb37295 download/CSWbdb43-doc.prototype This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Sep 25 18:39:29 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 25 Sep 2009 16:39:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[6470] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 6470 http://gar.svn.sourceforge.net/gar/?rev=6470&view=rev Author: rthurner Date: 2009-09-25 16:39:29 +0000 (Fri, 25 Sep 2009) Log Message: ----------- upgrade to svn-1.6.5 Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2009-09-25 07:26:44 UTC (rev 6469) +++ csw/mgar/pkg/subversion/trunk/Makefile 2009-09-25 16:39:29 UTC (rev 6470) @@ -1,5 +1,5 @@ GARNAME = subversion -DISTVERSION = 1.6.4 +DISTVERSION = 1.6.5 GARVERSION = $(subst -,,$(DISTVERSION)) CATEGORIES = utils This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Sep 25 18:41:46 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 25 Sep 2009 16:41:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6471] csw/mgar/pkg/subversion/trunk/checksums Message-ID: Revision: 6471 http://gar.svn.sourceforge.net/gar/?rev=6471&view=rev Author: rthurner Date: 2009-09-25 16:41:43 +0000 (Fri, 25 Sep 2009) Log Message: ----------- upgrade to svn-1.6.5, checksums as well Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/checksums Modified: csw/mgar/pkg/subversion/trunk/checksums =================================================================== --- csw/mgar/pkg/subversion/trunk/checksums 2009-09-25 16:39:29 UTC (rev 6470) +++ csw/mgar/pkg/subversion/trunk/checksums 2009-09-25 16:41:43 UTC (rev 6471) @@ -4,6 +4,6 @@ 41ec540885de7c34625768aa1fb9682b download/fixme.sh f107831ad0c702ff32e51df6a207237b download/httpd-svn.conf.CSW f0aa58c145ae99f8e4d72499ab826169 download/javahl_headers_for_nested_classes.diff -11e3fa838c9a558cadc378f2807572e2 download/subversion-1.6.4.tar.bz2 +1a53a0e72bee0bf814f4da83a9b6a636 download/subversion-1.6.5.tar.bz2 f7d05c59656dcf01fb844295c9912f78 download/subversion161.diff 1b532d3055708a97771f5cd959983628 download/svn_access.conf.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Sep 25 18:54:47 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 25 Sep 2009 16:54:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[6472] csw/mgar/pkg/rox-filer/trunk Message-ID: Revision: 6472 http://gar.svn.sourceforge.net/gar/?rev=6472&view=rev Author: wahwah Date: 2009-09-25 16:54:35 +0000 (Fri, 25 Sep 2009) Log Message: ----------- rox-filer: Added a wrapper, which fixed the icons Modified Paths: -------------- csw/mgar/pkg/rox-filer/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/rox-filer/trunk/files/rox-filer Modified: csw/mgar/pkg/rox-filer/trunk/Makefile =================================================================== --- csw/mgar/pkg/rox-filer/trunk/Makefile 2009-09-25 16:41:43 UTC (rev 6471) +++ csw/mgar/pkg/rox-filer/trunk/Makefile 2009-09-25 16:54:35 UTC (rev 6472) @@ -18,6 +18,7 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 REQUIRED_PKGS = CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWgtk2 REQUIRED_PKGS += CSWlibatk CSWlibcairo CSWlibglade2 CSWlibxml2 CSWpango +REQUIRED_PKGS += CSWbash CONFIGURE_SCRIPTS = BUILD_SCRIPTS = rox @@ -33,13 +34,15 @@ @$(MAKECOOKIE) install-rox: - # $(INSTALL_ENV) gmake -C $(WORKSRC)/ROX-Filer/build install ginstall -d $(DESTDIR)$(bindir) - ginstall $(WORKSRC)/ROX-Filer/ROX-Filer $(DESTDIR)$(bindir) - ginstall -d $(DESTDIR)$(libdir) - gcp -av $(WORKSRC)/ROX-Filer/ROX $(DESTDIR)$(libdir) - gfind $(DESTDIR)$(libdir) -type d -exec chmod 0755 {} \; - gfind $(DESTDIR)$(libdir) -type f -exec chmod 0644 {} \; + ginstall -m 755 $(FILEDIR)/rox-filer $(DESTDIR)$(bindir) + ginstall -d $(DESTDIR)$(libexecdir) + ginstall $(WORKSRC)/ROX-Filer/ROX-Filer $(DESTDIR)$(libexecdir) + ginstall -d $(DESTDIR)$(datadir)/ROX + gcp -av $(WORKSRC)/ROX-Filer/ROX $(DESTDIR)$(datadir) + gcp -av $(WORKSRC)/ROX-Filer/images $(DESTDIR)$(datadir)/ROX + gfind $(DESTDIR)$(datadir) -type d -exec chmod 0755 {} \; + gfind $(DESTDIR)$(datadir) -type f -exec chmod 0644 {} \; @$(MAKECOOKIE) include gar/category.mk Added: csw/mgar/pkg/rox-filer/trunk/files/rox-filer =================================================================== --- csw/mgar/pkg/rox-filer/trunk/files/rox-filer (rev 0) +++ csw/mgar/pkg/rox-filer/trunk/files/rox-filer 2009-09-25 16:54:35 UTC (rev 6472) @@ -0,0 +1,4 @@ +#!/opt/csw/bin/bash + +export APP_DIR="/opt/csw/share/ROX" +exec /opt/csw/libexec/ROX-Filer Property changes on: csw/mgar/pkg/rox-filer/trunk/files/rox-filer ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Sep 25 19:24:38 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 25 Sep 2009 17:24:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6473] csw/mgar/pkg/x11/libxt/trunk/Makefile Message-ID: Revision: 6473 http://gar.svn.sourceforge.net/gar/?rev=6473&view=rev Author: dmichelsen Date: 2009-09-25 17:24:38 +0000 (Fri, 25 Sep 2009) Log Message: ----------- x11/libxt: Add dependency to CSWlibx11 Modified Paths: -------------- csw/mgar/pkg/x11/libxt/trunk/Makefile Modified: csw/mgar/pkg/x11/libxt/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxt/trunk/Makefile 2009-09-25 16:54:35 UTC (rev 6472) +++ csw/mgar/pkg/x11/libxt/trunk/Makefile 2009-09-25 17:24:38 UTC (rev 6473) @@ -26,6 +26,7 @@ SPKG_DESC_CSWlibxt = X11 toolkit intrinsics library SPKG_DESC_CSWlibxtdevel = X11 toolkit intrinsics library development files +REQUIRED_PKGS_CSWlibxt = CSWlibx11 REQUIRED_PKGS_CSWlibxtdevel = CSWlibxt PKGFILES_CSWlibxtdevel = $(PKGFILES_DEVEL) 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 Sep 25 19:25:48 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 25 Sep 2009 17:25:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[6474] csw/mgar/pkg/x11/libxt/trunk/Makefile Message-ID: Revision: 6474 http://gar.svn.sourceforge.net/gar/?rev=6474&view=rev Author: dmichelsen Date: 2009-09-25 17:25:45 +0000 (Fri, 25 Sep 2009) Log Message: ----------- x11/libxt: Add dependency to CSWlibx11 Modified Paths: -------------- csw/mgar/pkg/x11/libxt/trunk/Makefile Modified: csw/mgar/pkg/x11/libxt/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxt/trunk/Makefile 2009-09-25 17:24:38 UTC (rev 6473) +++ csw/mgar/pkg/x11/libxt/trunk/Makefile 2009-09-25 17:25:45 UTC (rev 6474) @@ -26,7 +26,7 @@ SPKG_DESC_CSWlibxt = X11 toolkit intrinsics library SPKG_DESC_CSWlibxtdevel = X11 toolkit intrinsics library development files -REQUIRED_PKGS_CSWlibxt = CSWlibx11 +REQUIRED_PKGS_CSWlibxt = CSWlibx11 CSWlibice REQUIRED_PKGS_CSWlibxtdevel = CSWlibxt PKGFILES_CSWlibxtdevel = $(PKGFILES_DEVEL) 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 Sep 26 14:09:16 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 26 Sep 2009 12:09:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[6475] csw/mgar/pkg Message-ID: Revision: 6475 http://gar.svn.sourceforge.net/gar/?rev=6475&view=rev Author: wahwah Date: 2009-09-26 12:09:16 +0000 (Sat, 26 Sep 2009) Log Message: ----------- libxdg-basedir: Initial commit Modified Paths: -------------- csw/mgar/pkg/libxdg-basedir/trunk/Makefile csw/mgar/pkg/libxdg-basedir/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libxdg-basedir/ Modified: csw/mgar/pkg/libxdg-basedir/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-09-25 17:25:45 UTC (rev 6474) +++ csw/mgar/pkg/libxdg-basedir/trunk/Makefile 2009-09-26 12:09:16 UTC (rev 6475) @@ -2,181 +2,26 @@ # 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 +GARNAME = libxdg-basedir +GARVERSION = 1.0.2 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. +DESCRIPTION = implements functions according to the XDG Base Directory Specification define BLURB - + + The XDG Base Directory Specification defines where should user files be + looked for by defining one or more base directories relative in with + they should be located. + + This library implements functions to list the directories according to + the specification and provides a few higher-level functions. + 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). +SPKG_SOURCEURL = http://n.ethz.ch/student/nevillm/download/libxdg-basedir +MASTER_SITES = http://n.ethz.ch/~nevillm/download/libxdg-basedir/ 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. +PACKAGES = CSWlibxdgbasedir +CATALOGNAME = libxdg_basedir +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 +include gar/category.mk Modified: csw/mgar/pkg/libxdg-basedir/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-09-25 17:25:45 UTC (rev 6474) +++ csw/mgar/pkg/libxdg-basedir/trunk/checksums 2009-09-26 12:09:16 UTC (rev 6475) @@ -0,0 +1 @@ +944202425e5359666f268d18671303d4 download/libxdg-basedir-1.0.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Sep 26 15:08:20 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 26 Sep 2009 13:08:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[6476] csw/mgar/pkg/coreutils/trunk Message-ID: Revision: 6476 http://gar.svn.sourceforge.net/gar/?rev=6476&view=rev Author: bdwalton Date: 2009-09-26 13:08:19 +0000 (Sat, 26 Sep 2009) Log Message: ----------- coreutils: gar2; version bump to 7.6; no static; 6 tests fail Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile csw/mgar/pkg/coreutils/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/coreutils/trunk/ Property changes on: csw/mgar/pkg/coreutils/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/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2009-09-26 12:09:16 UTC (rev 6475) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2009-09-26 13:08:19 UTC (rev 6476) @@ -1,35 +1,33 @@ GARNAME = coreutils -GARVERSION = 5.94 +GARVERSION = 7.6 CATEGORIES = utils DESCRIPTION = Basic file, shell and text manipulation 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 the coreutils. endef MASTER_SITES = $(GNU_MIRROR) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +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.bz2 -# Prevent autoconf from running --recheck -PATCHFILES += autoconf.diff - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --program-prefix=g -CONFIGURE_ARGS += --program-suffix=-static +CONFIGURE_ARGS += --enable-silent-rules +CONFIGURE_ARGS += --disable-libcap +CONFIGURE_ARGS += --with-packager="$(SPKG_PACKAGER) <$(SPKG_EMAIL)>" +TEST_ARGS = check + GARCOMPILER = GNU include gar/category.mk - -LDFLAGS := -static $(CFLAGS) -export LDFLAGS - Modified: csw/mgar/pkg/coreutils/trunk/checksums =================================================================== --- csw/mgar/pkg/coreutils/trunk/checksums 2009-09-26 12:09:16 UTC (rev 6475) +++ csw/mgar/pkg/coreutils/trunk/checksums 2009-09-26 13:08:19 UTC (rev 6476) @@ -1,2 +1 @@ -11985c8345371546da8ff13f7efae359 download/coreutils-5.94.tar.bz2 -7fc1c7c3372e2708bdab539431f8a879 download/autoconf.diff +3d82f979229365f880da750642e67cf3 download/coreutils-7.6.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 Sat Sep 26 16:56:05 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 26 Sep 2009 14:56:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6477] csw/mgar/pkg/x11 Message-ID: Revision: 6477 http://gar.svn.sourceforge.net/gar/?rev=6477&view=rev Author: wbonnet Date: 2009-09-26 14:56:05 +0000 (Sat, 26 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/xf86bigfontproto/ csw/mgar/pkg/x11/xf86bigfontproto/branches/ csw/mgar/pkg/x11/xf86bigfontproto/tags/ csw/mgar/pkg/x11/xf86bigfontproto/trunk/ csw/mgar/pkg/x11/xf86bigfontproto/trunk/Makefile csw/mgar/pkg/x11/xf86bigfontproto/trunk/checksums csw/mgar/pkg/x11/xf86bigfontproto/trunk/files/ csw/mgar/pkg/x11/xf86dgaproto/ csw/mgar/pkg/x11/xf86dgaproto/branches/ csw/mgar/pkg/x11/xf86dgaproto/tags/ csw/mgar/pkg/x11/xf86dgaproto/trunk/ csw/mgar/pkg/x11/xf86dgaproto/trunk/Makefile csw/mgar/pkg/x11/xf86dgaproto/trunk/checksums csw/mgar/pkg/x11/xf86dgaproto/trunk/files/ csw/mgar/pkg/x11/xf86driproto/ csw/mgar/pkg/x11/xf86driproto/branches/ csw/mgar/pkg/x11/xf86driproto/tags/ csw/mgar/pkg/x11/xf86driproto/trunk/ csw/mgar/pkg/x11/xf86driproto/trunk/Makefile csw/mgar/pkg/x11/xf86driproto/trunk/checksums csw/mgar/pkg/x11/xf86driproto/trunk/files/ csw/mgar/pkg/x11/xf86miscproto/ csw/mgar/pkg/x11/xf86miscproto/branches/ csw/mgar/pkg/x11/xf86miscproto/tags/ csw/mgar/pkg/x11/xf86miscproto/trunk/ csw/mgar/pkg/x11/xf86miscproto/trunk/Makefile csw/mgar/pkg/x11/xf86miscproto/trunk/checksums csw/mgar/pkg/x11/xf86miscproto/trunk/files/ csw/mgar/pkg/x11/xf86rushproto/ csw/mgar/pkg/x11/xf86rushproto/branches/ csw/mgar/pkg/x11/xf86rushproto/tags/ csw/mgar/pkg/x11/xf86rushproto/trunk/ csw/mgar/pkg/x11/xf86rushproto/trunk/Makefile csw/mgar/pkg/x11/xf86rushproto/trunk/checksums csw/mgar/pkg/x11/xf86rushproto/trunk/files/ csw/mgar/pkg/x11/xf86vidmodeproto/ csw/mgar/pkg/x11/xf86vidmodeproto/branches/ csw/mgar/pkg/x11/xf86vidmodeproto/tags/ csw/mgar/pkg/x11/xf86vidmodeproto/trunk/ csw/mgar/pkg/x11/xf86vidmodeproto/trunk/Makefile csw/mgar/pkg/x11/xf86vidmodeproto/trunk/checksums csw/mgar/pkg/x11/xf86vidmodeproto/trunk/files/ Property changes on: csw/mgar/pkg/x11/xf86bigfontproto/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/x11/xf86bigfontproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xf86bigfontproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/xf86bigfontproto/trunk/Makefile 2009-09-26 14:56:05 UTC (rev 6477) @@ -0,0 +1,22 @@ +GARNAME = xf86bigfontproto +GARVERSION = 1.2.0 +CATEGORIES = x11 + +DESCRIPTION = X.Org XF86BigFont protocol headers +define BLURB + XF86BigFont protocol headersX protocol and ancillary headers from modular X.org +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/xf86bigfontproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xf86bigfontproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/xf86bigfontproto/trunk/checksums 2009-09-26 14:56:05 UTC (rev 6477) @@ -0,0 +1 @@ +91b0733ff4cbe55808d96073258aa3d1 download/xf86bigfontproto-1.2.0.tar.gz Property changes on: csw/mgar/pkg/x11/xf86dgaproto/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/x11/xf86dgaproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xf86dgaproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/xf86dgaproto/trunk/Makefile 2009-09-26 14:56:05 UTC (rev 6477) @@ -0,0 +1,22 @@ +GARNAME = xf86dgaproto +GARVERSION = 2.0.3 +CATEGORIES = x11 + +DESCRIPTION = X.Org XF86DGA protocol headers +define BLURB + XF86DGA protocol headers from modular X.org +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/xf86dgaproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xf86dgaproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/xf86dgaproto/trunk/checksums 2009-09-26 14:56:05 UTC (rev 6477) @@ -0,0 +1 @@ +f73c1d99b557249662bc75b9b872b61b download/xf86dgaproto-2.0.3.tar.gz Property changes on: csw/mgar/pkg/x11/xf86driproto/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/x11/xf86driproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xf86driproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/xf86driproto/trunk/Makefile 2009-09-26 14:56:05 UTC (rev 6477) @@ -0,0 +1,22 @@ +GARNAME = xf86driproto +GARVERSION = 2.1.0 +CATEGORIES = x11 + +DESCRIPTION = X.Org XF86DRI protocol headers +define BLURB + X.Org XF86DRI protocol headers from modular X.org +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/xf86driproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xf86driproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/xf86driproto/trunk/checksums 2009-09-26 14:56:05 UTC (rev 6477) @@ -0,0 +1 @@ +da848afcd5c41ac05e3aa994bdacdf1c download/xf86driproto-2.1.0.tar.gz Property changes on: csw/mgar/pkg/x11/xf86miscproto/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/x11/xf86miscproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xf86miscproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/xf86miscproto/trunk/Makefile 2009-09-26 14:56:05 UTC (rev 6477) @@ -0,0 +1,22 @@ +GARNAME = xf86miscproto +GARVERSION = 0.9.2 +CATEGORIES = x11 + +DESCRIPTION = X.Org XF86Misc protocol headers +define BLURB + X.Org XF86Misc protocol headers from modular X.org +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/xf86miscproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xf86miscproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/xf86miscproto/trunk/checksums 2009-09-26 14:56:05 UTC (rev 6477) @@ -0,0 +1 @@ +c4f03f37e2afd9c7f1b1f33db1e9c75a download/xf86miscproto-0.9.2.tar.gz Property changes on: csw/mgar/pkg/x11/xf86rushproto/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/x11/xf86rushproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xf86rushproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/xf86rushproto/trunk/Makefile 2009-09-26 14:56:05 UTC (rev 6477) @@ -0,0 +1,22 @@ +GARNAME = xf86rushproto +GARVERSION = 1.1.2 +CATEGORIES = x11 + +DESCRIPTION = X.Org XF86Rush protocol headers +define BLURB + X.Org XF86Rush protocol headers from modular X.org +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/xf86rushproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xf86rushproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/xf86rushproto/trunk/checksums 2009-09-26 14:56:05 UTC (rev 6477) @@ -0,0 +1 @@ +6a6389473332ace01146cccfef228576 download/xf86rushproto-1.1.2.tar.gz Property changes on: csw/mgar/pkg/x11/xf86vidmodeproto/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/x11/xf86vidmodeproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xf86vidmodeproto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/xf86vidmodeproto/trunk/Makefile 2009-09-26 14:56:05 UTC (rev 6477) @@ -0,0 +1,22 @@ +GARNAME = xf86vidmodeproto +GARVERSION = 2.2.2 +CATEGORIES = x11 + +DESCRIPTION = X.Org XF86VidMode protocol headers +define BLURB + X.Org XF86VidMode protocol headers from modular X.org +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +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 = CSWx11common + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/xf86vidmodeproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xf86vidmodeproto/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/xf86vidmodeproto/trunk/checksums 2009-09-26 14:56:05 UTC (rev 6477) @@ -0,0 +1 @@ +67c93ee2c2c4941e866d96d63329a471 download/xf86vidmodeproto-2.2.2.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 Sat Sep 26 19:31:43 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 26 Sep 2009 17:31:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6478] csw/mgar/pkg/x11 Message-ID: Revision: 6478 http://gar.svn.sourceforge.net/gar/?rev=6478&view=rev Author: wbonnet Date: 2009-09-26 17:31:43 +0000 (Sat, 26 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxfixes/ csw/mgar/pkg/x11/libxfixes/branches/ csw/mgar/pkg/x11/libxfixes/tags/ csw/mgar/pkg/x11/libxfixes/trunk/ csw/mgar/pkg/x11/libxfixes/trunk/Makefile csw/mgar/pkg/x11/libxfixes/trunk/checksums csw/mgar/pkg/x11/libxfixes/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxfixes/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/x11/libxfixes/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxfixes/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxfixes/trunk/Makefile 2009-09-26 17:31:43 UTC (rev 6478) @@ -0,0 +1,35 @@ +GARNAME = libXfixes +GARVERSION = 4.0.3 +CATEGORIES = x11 + +DESCRIPTION = X11 miscellaneous 'fixes' extension library +define BLURB + libXfixes provides an X Window System client interface to the 'XFIXES' extension to the X protocol. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibxfixes CSWlibxfixesdevel + +CATALOGNAME_CSWlibxfixes = libxfixes +CATALOGNAME_CSWlibxfixesdevel = libxfixes_devel + +SPKG_DESC_CSWlibxfixes = $(DESCRIPTION) +SPKG_DESC_CSWlibxfixesdevel = $(DESCRIPTION) development files + +PREREQUISITE_PKGS = CSWfixesproto + +REQUIRED_PKGS_CSWlibxfixesdevel = CSWlibxfixes + +PKGFILES_CSWlibxfixesdevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libxfixes/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxfixes/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxfixes/trunk/checksums 2009-09-26 17:31:43 UTC (rev 6478) @@ -0,0 +1 @@ +1990d19725a3c7f32290037f02d3737f download/libXfixes-4.0.3.tar.bz2 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 Sep 26 19:34:50 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 26 Sep 2009 17:34:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6479] csw/mgar/pkg/x11 Message-ID: Revision: 6479 http://gar.svn.sourceforge.net/gar/?rev=6479&view=rev Author: wbonnet Date: 2009-09-26 17:34:49 +0000 (Sat, 26 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxcursor/ csw/mgar/pkg/x11/libxcursor/branches/ csw/mgar/pkg/x11/libxcursor/tags/ csw/mgar/pkg/x11/libxcursor/trunk/ csw/mgar/pkg/x11/libxcursor/trunk/Makefile csw/mgar/pkg/x11/libxcursor/trunk/checksums csw/mgar/pkg/x11/libxcursor/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxcursor/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/x11/libxcursor/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxcursor/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxcursor/trunk/Makefile 2009-09-26 17:34:49 UTC (rev 6479) @@ -0,0 +1,33 @@ +GARNAME = libXcursor +GARVERSION = 1.1.10 +CATEGORIES = x11 + +DESCRIPTION = X client-side cursor loading library +define BLURB + Xcursor is a simple library designed to help locate and load cursors for the X Window System. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibfs CSWlibfsdevel + +CATALOGNAME_CSWlibfs = libfs +CATALOGNAME_CSWlibfsdevel = libfs_devel + +SPKG_DESC_CSWlibfs = X11 Inter-Client Exchange library +SPKG_DESC_CSWlibfsdevel = X11 Inter-Client Exchange library development files + +REQUIRED_PKGS_CSWlibfsdevel = CSWlibfs + +PKGFILES_CSWlibfsdevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libxcursor/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxcursor/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxcursor/trunk/checksums 2009-09-26 17:34:49 UTC (rev 6479) @@ -0,0 +1 @@ +7dcdad1c10daea872cb3355af414b2ca download/libXcursor-1.1.10.tar.bz2 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 Sep 26 19:53:57 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 26 Sep 2009 17:53:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[6480] csw/mgar/pkg/x11/libxcursor/trunk/Makefile Message-ID: Revision: 6480 http://gar.svn.sourceforge.net/gar/?rev=6480&view=rev Author: wbonnet Date: 2009-09-26 17:53:56 +0000 (Sat, 26 Sep 2009) Log Message: ----------- Initial commit Modified Paths: -------------- csw/mgar/pkg/x11/libxcursor/trunk/Makefile Modified: csw/mgar/pkg/x11/libxcursor/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxcursor/trunk/Makefile 2009-09-26 17:34:49 UTC (rev 6479) +++ csw/mgar/pkg/x11/libxcursor/trunk/Makefile 2009-09-26 17:53:56 UTC (rev 6480) @@ -15,17 +15,18 @@ CONFIGURE_ARGS = $(DIRPATHS) -PACKAGES = CSWlibfs CSWlibfsdevel +PACKAGES = CSWlibxcursor CSWlibxcursordevel -CATALOGNAME_CSWlibfs = libfs -CATALOGNAME_CSWlibfsdevel = libfs_devel +CATALOGNAME_CSWlibxcursor = libxcursor +CATALOGNAME_CSWlibxcursordevel = libxcursor_devel -SPKG_DESC_CSWlibfs = X11 Inter-Client Exchange library -SPKG_DESC_CSWlibfsdevel = X11 Inter-Client Exchange library development files +SPKG_DESC_CSWlibxcursor = $(DESCRIPTION) +SPKG_DESC_CSWlibxcursordevel = $(DESCRIPTION) development files -REQUIRED_PKGS_CSWlibfsdevel = CSWlibfs +REQUIRED_PKGS_CSWlibxcursordevel = CSWlibxcursor +REQUIRED_PKGS_CSWlibxcursor = CSWlibx11 CSWlibxcomposite CSWlibxfixes CSWlibxrender -PKGFILES_CSWlibfsdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibxcursordevel = $(PKGFILES_DEVEL) BUILD64 = 1 NOISALIST = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Sep 26 20:01:09 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 26 Sep 2009 18:01:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[6481] csw/mgar/pkg/x11 Message-ID: Revision: 6481 http://gar.svn.sourceforge.net/gar/?rev=6481&view=rev Author: wbonnet Date: 2009-09-26 18:01:09 +0000 (Sat, 26 Sep 2009) Log Message: ----------- Update depends Modified Paths: -------------- csw/mgar/pkg/x11/libfs/trunk/Makefile csw/mgar/pkg/x11/libxfixes/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/libfs/Makefile Added: csw/mgar/pkg/x11/libfs/Makefile =================================================================== --- csw/mgar/pkg/x11/libfs/Makefile (rev 0) +++ csw/mgar/pkg/x11/libfs/Makefile 2009-09-26 18:01:09 UTC (rev 6481) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/x11/libFS directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Modified: csw/mgar/pkg/x11/libfs/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libfs/trunk/Makefile 2009-09-26 17:53:56 UTC (rev 6480) +++ csw/mgar/pkg/x11/libfs/trunk/Makefile 2009-09-26 18:01:09 UTC (rev 6481) @@ -20,8 +20,8 @@ CATALOGNAME_CSWlibfs = libfs CATALOGNAME_CSWlibfsdevel = libfs_devel -SPKG_DESC_CSWlibfs = X11 Inter-Client Exchange library -SPKG_DESC_CSWlibfsdevel = X11 Inter-Client Exchange library development files +SPKG_DESC_CSWlibfs = $(DESCRIPTION) +SPKG_DESC_CSWlibfsdevel = $(DESCRIPTION) development files REQUIRED_PKGS_CSWlibfsdevel = CSWlibfs Modified: csw/mgar/pkg/x11/libxfixes/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxfixes/trunk/Makefile 2009-09-26 17:53:56 UTC (rev 6480) +++ csw/mgar/pkg/x11/libxfixes/trunk/Makefile 2009-09-26 18:01:09 UTC (rev 6481) @@ -25,6 +25,7 @@ PREREQUISITE_PKGS = CSWfixesproto +REQUIRED_PKGS_CSWlibxfixes = CSWlibx11 REQUIRED_PKGS_CSWlibxfixesdevel = CSWlibxfixes PKGFILES_CSWlibxfixesdevel = $(PKGFILES_DEVEL) 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 Sep 26 21:28:38 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 26 Sep 2009 19:28:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6482] csw/mgar/pkg/x11 Message-ID: Revision: 6482 http://gar.svn.sourceforge.net/gar/?rev=6482&view=rev Author: wbonnet Date: 2009-09-26 19:28:36 +0000 (Sat, 26 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxdamage/ csw/mgar/pkg/x11/libxdamage/branches/ csw/mgar/pkg/x11/libxdamage/tags/ csw/mgar/pkg/x11/libxdamage/trunk/ csw/mgar/pkg/x11/libxdamage/trunk/Makefile csw/mgar/pkg/x11/libxdamage/trunk/checksums csw/mgar/pkg/x11/libxdamage/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxdamage/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/x11/libxdamage/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxdamage/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxdamage/trunk/Makefile 2009-09-26 19:28:36 UTC (rev 6482) @@ -0,0 +1,35 @@ +GARNAME = libXdamage +GARVERSION = 1.1.1 +CATEGORIES = x11 + +DESCRIPTION = X11 Font Services library +define BLURB + libxdamage, the Font Services library, provides various functions useful to X11 font servers, and clients connecting to font servers. It is not used outside of these implementations. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibxdamage CSWlibxdamagedevel + +CATALOGNAME_CSWlibxdamage = libxdamage +CATALOGNAME_CSWlibxdamagedevel = libxdamage_devel + +SPKG_DESC_CSWlibxdamage = $(DESCRIPTION) +SPKG_DESC_CSWlibxdamagedevel = $(DESCRIPTION) development files + +REQUIRED_PKGS_CSWlibxdamagedevel = CSWlibxdamage + +PREREQUISITE_PKGS = CSWdamageproto + +PKGFILES_CSWlibxdamagedevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libxdamage/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxdamage/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxdamage/trunk/checksums 2009-09-26 19:28:36 UTC (rev 6482) @@ -0,0 +1 @@ +ac0ce6b0063a9858c8f24ddb4c60487d download/libXdamage-1.1.1.tar.bz2 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 Sep 26 22:13:45 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 26 Sep 2009 20:13:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[6483] csw/mgar/pkg/x11 Message-ID: Revision: 6483 http://gar.svn.sourceforge.net/gar/?rev=6483&view=rev Author: wbonnet Date: 2009-09-26 20:13:45 +0000 (Sat, 26 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxrandr/ csw/mgar/pkg/x11/libxrandr/branches/ csw/mgar/pkg/x11/libxrandr/tags/ csw/mgar/pkg/x11/libxrandr/trunk/ csw/mgar/pkg/x11/libxrandr/trunk/Makefile csw/mgar/pkg/x11/libxrandr/trunk/checksums csw/mgar/pkg/x11/libxrandr/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxrandr/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/x11/libxrandr/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxrandr/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxrandr/trunk/Makefile 2009-09-26 20:13:45 UTC (rev 6483) @@ -0,0 +1,36 @@ +GARNAME = libXrandr +GARVERSION = 1.3.0 +CATEGORIES = x11 + +DESCRIPTION = X11 RandR extension library +define BLURB + libXrandr provides an X Window System client interface to the RandR extension to the X protocol. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibxrandr CSWlibxrandrdevel + +CATALOGNAME_CSWlibxrandr = libxrandr +CATALOGNAME_CSWlibxrandrdevel = libxrandr_devel + +SPKG_DESC_CSWlibxrandr = $(DESCRIPTION) +SPKG_DESC_CSWlibxrandrdevel = $(DESCRIPTION) development files + +REQUIRED_PKGS_CSWlibxrandrdevel = CSWlibxrandr + +PREREQUISITE_PKGS = CSWrandrproto CSWlibxextdevel + +PKGFILES_CSWlibxrandrdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibxrandr = CSWlibx11 CSWlibxext CSWlibxrender + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libxrandr/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxrandr/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxrandr/trunk/checksums 2009-09-26 20:13:45 UTC (rev 6483) @@ -0,0 +1 @@ +68eb59c3b7524db6ffd78746ee893d1d download/libXrandr-1.3.0.tar.bz2 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 Sep 26 22:25:38 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 26 Sep 2009 20:25:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6484] csw/mgar/pkg/x11 Message-ID: Revision: 6484 http://gar.svn.sourceforge.net/gar/?rev=6484&view=rev Author: wbonnet Date: 2009-09-26 20:25:38 +0000 (Sat, 26 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxinerama/ csw/mgar/pkg/x11/libxinerama/branches/ csw/mgar/pkg/x11/libxinerama/tags/ csw/mgar/pkg/x11/libxinerama/trunk/ csw/mgar/pkg/x11/libxinerama/trunk/Makefile csw/mgar/pkg/x11/libxinerama/trunk/checksums csw/mgar/pkg/x11/libxinerama/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxinerama/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/x11/libxinerama/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxinerama/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxinerama/trunk/Makefile 2009-09-26 20:25:38 UTC (rev 6484) @@ -0,0 +1,36 @@ +GARNAME = libXinerama +GARVERSION = 1.0.3 +CATEGORIES = x11 + +DESCRIPTION = X11 Xinerama extension library +define BLURB + libXinerama provides an X Window System client interface to the XINERAMA extension to the X protocol. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibxinerama CSWlibxineramadevel + +CATALOGNAME_CSWlibxinerama = libxinerama +CATALOGNAME_CSWlibxineramadevel = libxinerama_devel + +SPKG_DESC_CSWlibxinerama = $(DESCRIPTION) +SPKG_DESC_CSWlibxineramadevel = $(DESCRIPTION) development files + +PREREQUISITE_PKGS = CSWxineramaproto + +REQUIRED_PKGS_CSWlibxineramadevel = CSWlibxinerama +REQUIRED_PKGS_CSWlibxinerama = CSWlibx11 CSWlibxext + +PKGFILES_CSWlibxineramadevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libxinerama/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxinerama/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxinerama/trunk/checksums 2009-09-26 20:25:38 UTC (rev 6484) @@ -0,0 +1 @@ +cd9f7c46439ac40e0517a302d2434d2c download/libXinerama-1.0.3.tar.bz2 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 Sep 26 22:40:40 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 26 Sep 2009 20:40:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[6485] csw/mgar/pkg/x11 Message-ID: Revision: 6485 http://gar.svn.sourceforge.net/gar/?rev=6485&view=rev Author: wbonnet Date: 2009-09-26 20:40:40 +0000 (Sat, 26 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxevie/ csw/mgar/pkg/x11/libxevie/branches/ csw/mgar/pkg/x11/libxevie/tags/ csw/mgar/pkg/x11/libxevie/trunk/ csw/mgar/pkg/x11/libxevie/trunk/Makefile csw/mgar/pkg/x11/libxevie/trunk/checksums csw/mgar/pkg/x11/libxevie/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxevie/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/x11/libxevie/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxevie/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxevie/trunk/Makefile 2009-09-26 20:40:40 UTC (rev 6485) @@ -0,0 +1,36 @@ +GARNAME = libXevie +GARVERSION = 1.0.2 +CATEGORIES = x11 + +DESCRIPTION = X11 EvIE extension library +define BLURB + libXevie provides an X Window System client interface to the EvIE extension to the X protocol. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibxevie CSWlibxeviedevel + +CATALOGNAME_CSWlibxevie = libxevie +CATALOGNAME_CSWlibxeviedevel = libxevie_devel + +SPKG_DESC_CSWlibxevie = $(DESCRIPTION) +SPKG_DESC_CSWlibxeviedevel = $(DESCRIPTION) development files + +PREREQUISITE_PKGS = CSWevieext + +REQUIRED_PKGS_CSWlibxeviedevel = CSWlibxevie +REQUIRED_PKGS_CSWlibxevie = CSWlibx11 CSWlibxext + +PKGFILES_CSWlibxeviedevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libxevie/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxevie/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxevie/trunk/checksums 2009-09-26 20:40:40 UTC (rev 6485) @@ -0,0 +1 @@ +88e9bf535364e7c821ef4014fb1ca2dd download/libXevie-1.0.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Sep 27 03:39:57 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 27 Sep 2009 01:39:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[6486] csw/mgar/pkg/xmlto/trunk Message-ID: Revision: 6486 http://gar.svn.sourceforge.net/gar/?rev=6486&view=rev Author: bdwalton Date: 2009-09-27 01:39:57 +0000 (Sun, 27 Sep 2009) Log Message: ----------- xmlto: add patch to use long args for gcp Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile csw/mgar/pkg/xmlto/trunk/checksums Added Paths: ----------- csw/mgar/pkg/xmlto/trunk/files/gcp-explicit-args.patch Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-26 20:40:40 UTC (rev 6485) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-27 01:39:57 UTC (rev 6486) @@ -19,6 +19,11 @@ MASTER_SITES = https://fedorahosted.org/releases/x/m/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +# Out gcp (from the very old fileutils) spits out warnings about -P changing +# meanings. xmlto is depending on the new meaning. We'll explicitly use +# the long forms of -P (--no-dereference) and -p (--presever). +PATCHFILES = gcp-explicit-args.patch + TEST_TARGET = check # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/xmlto/trunk/checksums =================================================================== --- csw/mgar/pkg/xmlto/trunk/checksums 2009-09-26 20:40:40 UTC (rev 6485) +++ csw/mgar/pkg/xmlto/trunk/checksums 2009-09-27 01:39:57 UTC (rev 6486) @@ -1 +1,2 @@ +52189e7619044dfb7d15773cd4256353 download/gcp-explicit-args.patch 3001d6bb2bbc2c8f6c2301f05120f074 download/xmlto-0.0.23.tar.bz2 Added: csw/mgar/pkg/xmlto/trunk/files/gcp-explicit-args.patch =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/gcp-explicit-args.patch (rev 0) +++ csw/mgar/pkg/xmlto/trunk/files/gcp-explicit-args.patch 2009-09-27 01:39:57 UTC (rev 6486) @@ -0,0 +1,122 @@ +diff --speed-large-files --minimal -Nru xmlto-0.0.23.orig/format/docbook/fo xmlto-0.0.23/format/docbook/fo +--- xmlto-0.0.23.orig/format/docbook/fo 2009-09-18 12:02:48.000000000 +0200 ++++ xmlto-0.0.23/format/docbook/fo 2009-09-27 03:29:35.202032412 +0200 +@@ -7,6 +7,6 @@ + echo "http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl" + ;; + post-process) +- ${GCP_PATH:-cp} -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").fo" ++ ${GCP_PATH:-cp} -R --no-dereference --preserve -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").fo" + ;; + esac +diff --speed-large-files --minimal -Nru xmlto-0.0.23.orig/format/docbook/html xmlto-0.0.23/format/docbook/html +--- xmlto-0.0.23.orig/format/docbook/html 2009-09-18 12:02:48.000000000 +0200 ++++ xmlto-0.0.23/format/docbook/html 2009-09-27 03:29:11.664862459 +0200 +@@ -7,6 +7,6 @@ + echo "http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl" + ;; + post-process) +- ${GCP_PATH:-cp} -R -P -p -- * "$OUTPUT_DIR" ++ ${GCP_PATH:-cp} -R --no-dereference --preserve -- * "$OUTPUT_DIR" + ;; + esac +diff --speed-large-files --minimal -Nru xmlto-0.0.23.orig/format/docbook/html-nochunks xmlto-0.0.23/format/docbook/html-nochunks +--- xmlto-0.0.23.orig/format/docbook/html-nochunks 2009-09-18 12:02:48.000000000 +0200 ++++ xmlto-0.0.23/format/docbook/html-nochunks 2009-09-27 03:29:01.147776511 +0200 +@@ -7,6 +7,6 @@ + echo "http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl" + ;; + post-process) +- ${GCP_PATH:-cp} -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").html" ++ ${GCP_PATH:-cp} -R --no-dereference --preserve -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").html" + ;; + esac +diff --speed-large-files --minimal -Nru xmlto-0.0.23.orig/format/docbook/htmlhelp xmlto-0.0.23/format/docbook/htmlhelp +--- xmlto-0.0.23.orig/format/docbook/htmlhelp 2009-09-18 12:02:48.000000000 +0200 ++++ xmlto-0.0.23/format/docbook/htmlhelp 2009-09-27 03:28:44.785383980 +0200 +@@ -7,6 +7,6 @@ + echo "http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl" + ;; + post-process) +- ${GCP_PATH:-cp} -R -P -p -- * "$OUTPUT_DIR" ++ ${GCP_PATH:-cp} -R --no-dereference --preserve -- * "$OUTPUT_DIR" + ;; + esac +diff --speed-large-files --minimal -Nru xmlto-0.0.23.orig/format/docbook/javahelp xmlto-0.0.23/format/docbook/javahelp +--- xmlto-0.0.23.orig/format/docbook/javahelp 2009-09-18 12:02:48.000000000 +0200 ++++ xmlto-0.0.23/format/docbook/javahelp 2009-09-27 03:28:30.573820522 +0200 +@@ -7,6 +7,6 @@ + echo "http://docbook.sourceforge.net/release/xsl/current/javahelp/javahelp.xsl" + ;; + post-process) +- ${GCP_PATH:-cp} -R -P -p -- *.htm* *.hs *.xml *.jhm "$OUTPUT_DIR" ++ ${GCP_PATH:-cp} -R --no-dereference --preserve -- *.htm* *.hs *.xml *.jhm "$OUTPUT_DIR" + ;; + esac +diff --speed-large-files --minimal -Nru xmlto-0.0.23.orig/format/docbook/man xmlto-0.0.23/format/docbook/man +--- xmlto-0.0.23.orig/format/docbook/man 2009-09-18 12:02:48.000000000 +0200 ++++ xmlto-0.0.23/format/docbook/man 2009-09-27 03:32:18.415718330 +0200 +@@ -8,6 +8,6 @@ + ;; + post-process) + [ -e "$XSLT_PROCESSED" ] && rm "$XSLT_PROCESSED" +- ${GCP_PATH:-cp} -R -P -p -- * "$OUTPUT_DIR" 2>/dev/null ++ ${GCP_PATH:-cp} -R --no-dereference --preserve -- * "$OUTPUT_DIR" 2>/dev/null + ;; + esac +diff --speed-large-files --minimal -Nru xmlto-0.0.23.orig/format/docbook/xhtml xmlto-0.0.23/format/docbook/xhtml +--- xmlto-0.0.23.orig/format/docbook/xhtml 2009-09-18 12:02:48.000000000 +0200 ++++ xmlto-0.0.23/format/docbook/xhtml 2009-09-27 03:27:05.450989625 +0200 +@@ -7,6 +7,6 @@ + echo "http://docbook.sourceforge.net/release/xsl/current/xhtml/chunk.xsl" + ;; + post-process) +- ${GCP_PATH:-cp} -R -P -p -- *.*htm* "$OUTPUT_DIR" ++ ${GCP_PATH:-cp} -R --no-dereference --preserve -- *.*htm* "$OUTPUT_DIR" + ;; + esac +diff --speed-large-files --minimal -Nru xmlto-0.0.23.orig/format/docbook/xhtml-nochunks xmlto-0.0.23/format/docbook/xhtml-nochunks +--- xmlto-0.0.23.orig/format/docbook/xhtml-nochunks 2009-09-18 12:02:48.000000000 +0200 ++++ xmlto-0.0.23/format/docbook/xhtml-nochunks 2009-09-27 03:30:29.045829717 +0200 +@@ -7,6 +7,6 @@ + echo "http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl" + ;; + post-process) +- ${GCP_PATH:-cp} -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename ${XSLT_PROCESSED%.*}).html" ++ ${GCP_PATH:-cp} -R --no-dereference --preserve -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename ${XSLT_PROCESSED%.*}).html" + ;; + esac +diff --speed-large-files --minimal -Nru xmlto-0.0.23.orig/format/fo/dvi xmlto-0.0.23/format/fo/dvi +--- xmlto-0.0.23.orig/format/fo/dvi 2009-09-18 12:06:23.000000000 +0200 ++++ xmlto-0.0.23/format/fo/dvi 2009-09-27 03:31:55.252241931 +0200 +@@ -34,6 +34,6 @@ + [ "$VERBOSE" -ge 3 ] && cat $OUT + fi + fi +- ${GCP_PATH:-cp} -R -P -p -- *.dvi "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").dvi" ++ ${GCP_PATH:-cp} -R --no-dereference --preserve -- *.dvi "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").dvi" + ;; + esac +diff --speed-large-files --minimal -Nru xmlto-0.0.23.orig/format/fo/pdf xmlto-0.0.23/format/fo/pdf +--- xmlto-0.0.23.orig/format/fo/pdf 2009-09-18 12:06:23.000000000 +0200 ++++ xmlto-0.0.23/format/fo/pdf 2009-09-27 03:32:06.485584110 +0200 +@@ -37,7 +37,7 @@ + [ "$VERBOSE" -ge 3 ] && cat $OUT + fi + fi +- ${GCP_PATH:-cp} -R -P -p -- *.pdf "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").pdf" ++ ${GCP_PATH:-cp} -R --no-dereference --preserve -- *.pdf "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").pdf" + ;; + esac + ;; +diff --speed-large-files --minimal -Nru xmlto-0.0.23.orig/format/xhtml1/fo xmlto-0.0.23/format/xhtml1/fo +--- xmlto-0.0.23.orig/format/xhtml1/fo 2009-09-18 12:02:48.000000000 +0200 ++++ xmlto-0.0.23/format/xhtml1/fo 2009-09-27 03:31:43.246030247 +0200 +@@ -7,6 +7,6 @@ + echo "http://www.antennahouse.com/XSLsample/sample-xsl-xhtml2fo/xhtml2fo.xsl" + ;; + post-process) +- ${GCP_PATH:-cp} -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").fo" ++ ${GCP_PATH:-cp} -R --no-dereference --preserve -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").fo" + ;; + esac 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 Sep 27 03:54:13 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 27 Sep 2009 01:54:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[6487] csw/mgar/pkg/colordiff/trunk Message-ID: Revision: 6487 http://gar.svn.sourceforge.net/gar/?rev=6487&view=rev Author: bdwalton Date: 2009-09-27 01:54:12 +0000 (Sun, 27 Sep 2009) Log Message: ----------- colordiff: patch xml to be docbook 4.1.2 conformant Modified Paths: -------------- csw/mgar/pkg/colordiff/trunk/Makefile csw/mgar/pkg/colordiff/trunk/checksums Added Paths: ----------- csw/mgar/pkg/colordiff/trunk/files/fix-entity-nesting.patch Modified: csw/mgar/pkg/colordiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/colordiff/trunk/Makefile 2009-09-27 01:39:57 UTC (rev 6486) +++ csw/mgar/pkg/colordiff/trunk/Makefile 2009-09-27 01:54:12 UTC (rev 6487) @@ -8,6 +8,7 @@ MASTER_SITES = http://colordiff.sourceforge.net/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = fix-entity-nesting.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/colordiff/trunk/checksums =================================================================== --- csw/mgar/pkg/colordiff/trunk/checksums 2009-09-27 01:39:57 UTC (rev 6486) +++ csw/mgar/pkg/colordiff/trunk/checksums 2009-09-27 01:54:12 UTC (rev 6487) @@ -1 +1,2 @@ 31864847eaa4e900f72bbb6bbc64f1ec download/colordiff-1.0.9.tar.gz +d202632e9ec507e53445232a930c9c6f download/fix-entity-nesting.patch Added: csw/mgar/pkg/colordiff/trunk/files/fix-entity-nesting.patch =================================================================== --- csw/mgar/pkg/colordiff/trunk/files/fix-entity-nesting.patch (rev 0) +++ csw/mgar/pkg/colordiff/trunk/files/fix-entity-nesting.patch 2009-09-27 01:54:12 UTC (rev 6487) @@ -0,0 +1,14 @@ +diff --speed-large-files --minimal -Nru colordiff-1.0.9.orig/colordiff.xml colordiff-1.0.9/colordiff.xml +--- colordiff-1.0.9.orig/colordiff.xml 2009-01-25 05:59:25.000000000 -0500 ++++ colordiff-1.0.9/colordiff.xml 2009-09-25 20:07:56.801979000 -0400 +@@ -22,8 +22,8 @@ + + + colordiff +- &diff; options +- &colordiff; options ++ diff options ++ colordiff options + file1 + file2 + 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 Sep 27 12:13:43 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 10:13:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6488] csw/mgar/pkg/x11 Message-ID: Revision: 6488 http://gar.svn.sourceforge.net/gar/?rev=6488&view=rev Author: wbonnet Date: 2009-09-27 10:13:43 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxp/ csw/mgar/pkg/x11/libxp/branches/ csw/mgar/pkg/x11/libxp/tags/ csw/mgar/pkg/x11/libxp/trunk/ csw/mgar/pkg/x11/libxp/trunk/Makefile csw/mgar/pkg/x11/libxp/trunk/checksums csw/mgar/pkg/x11/libxp/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxp/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/x11/libxp/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxp/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxp/trunk/Makefile 2009-09-27 10:13:43 UTC (rev 6488) @@ -0,0 +1,36 @@ +GARNAME = libXp +GARVERSION = 1.0.0 +CATEGORIES = x11 + +DESCRIPTION = X Print Library +define BLURB + libXp provides public APIs to allow client applications to render to non-display devices. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibxp CSWlibxpdevel + +CATALOGNAME_CSWlibxp = libxp +CATALOGNAME_CSWlibxpdevel = libxp_devel + +SPKG_DESC_CSWlibxp = $(DESCRIPTION) +SPKG_DESC_CSWlibxpdevel = $(DESCRIPTION) development files + +PREREQUISITE_PKGS = CSWdamageproto + +REQUIRED_PKGS_CSWlibxp = CSWlibx11 CSWlibxau CSWlibxext +REQUIRED_PKGS_CSWlibxpdevel = CSWlibxp + +PKGFILES_CSWlibxpdevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libxp/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxp/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxp/trunk/checksums 2009-09-27 10:13:43 UTC (rev 6488) @@ -0,0 +1 @@ +0f4ac39108c1ae8c443cdfac259b58fa download/libXp-1.0.0.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 Sun Sep 27 12:15:46 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 27 Sep 2009 10:15:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6489] csw/mgar/pkg/freetype/trunk/Makefile Message-ID: Revision: 6489 http://gar.svn.sourceforge.net/gar/?rev=6489&view=rev Author: dmichelsen Date: 2009-09-27 10:15:45 +0000 (Sun, 27 Sep 2009) Log Message: ----------- freetype: Reorder rules and fix SOURCEURL Modified Paths: -------------- csw/mgar/pkg/freetype/trunk/Makefile Modified: csw/mgar/pkg/freetype/trunk/Makefile =================================================================== --- csw/mgar/pkg/freetype/trunk/Makefile 2009-09-27 10:13:43 UTC (rev 6488) +++ csw/mgar/pkg/freetype/trunk/Makefile 2009-09-27 10:15:45 UTC (rev 6489) @@ -14,9 +14,6 @@ Windows FNT/FON. endef -PACKAGES = CSWftype2 -CATALOGNAME_CSWftype2 = freetype2 - MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += COPYING @@ -25,6 +22,12 @@ UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) +PACKAGES = CSWftype2 +CATALOGNAME_CSWftype2 = freetype2 +SPKG_SOURCEURL = http://www.freetype.org/ + +REQUIRED_PKGS_CSWftype2 = CSWzlib + CONFIGURE_ARGS = $(DIRPATHS) GNUMAKE = gmake EXTRA_CONFIGURE_EXPORTS = GNUMAKE @@ -32,8 +35,6 @@ BUILD64 = 1 NO_ISAEXEC = 1 -REQUIRED_PKGS_CSWftype2 = CSWzlib - 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 dmichelsen at users.sourceforge.net Sun Sep 27 12:19:00 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 27 Sep 2009 10:19:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6490] csw/mgar/pkg/giflib/trunk/Makefile Message-ID: Revision: 6490 http://gar.svn.sourceforge.net/gar/?rev=6490&view=rev Author: dmichelsen Date: 2009-09-27 10:19:00 +0000 (Sun, 27 Sep 2009) Log Message: ----------- giflib: Adjust SOURCEURL Modified Paths: -------------- csw/mgar/pkg/giflib/trunk/Makefile Modified: csw/mgar/pkg/giflib/trunk/Makefile =================================================================== --- csw/mgar/pkg/giflib/trunk/Makefile 2009-09-27 10:15:45 UTC (rev 6489) +++ csw/mgar/pkg/giflib/trunk/Makefile 2009-09-27 10:19:00 UTC (rev 6490) @@ -27,6 +27,8 @@ SPKG_DESC_CSWgiflibdoc = giflib documentation SPKG_DESC_CSWungif = Links to giflib now the patent is dropped +SPKG_SOURCEURL = http://giflib.sourceforge.net/ + REQUIRED_PKGS_CSWgiflib = CSWgiflibrt REQUIRED_PKGS_CSWungif = CSWgiflib 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 Sep 27 12:22:15 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 10:22:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[6491] csw/mgar/pkg/x11 Message-ID: Revision: 6491 http://gar.svn.sourceforge.net/gar/?rev=6491&view=rev Author: wbonnet Date: 2009-09-27 10:22:15 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxres/ csw/mgar/pkg/x11/libxres/branches/ csw/mgar/pkg/x11/libxres/tags/ csw/mgar/pkg/x11/libxres/trunk/ csw/mgar/pkg/x11/libxres/trunk/Makefile csw/mgar/pkg/x11/libxres/trunk/checksums csw/mgar/pkg/x11/libxres/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxres/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/x11/libxres/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxres/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxres/trunk/Makefile 2009-09-27 10:22:15 UTC (rev 6491) @@ -0,0 +1,34 @@ +GARNAME = libXres +GARVERSION = 1.0.3 +CATEGORIES = x11 + +DESCRIPTION = X11 Resource extension library +define BLURB + libXRes provides an X Window System client interface to the Resource extension to the X protocol. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibxres CSWlibxresdevel + +CATALOGNAME_CSWlibxres = libxres +CATALOGNAME_CSWlibxresdevel = libxres_devel + +SPKG_DESC_CSWlibxres = $(DESCRIPTION) +SPKG_DESC_CSWlibxresdevel = $(DESCRIPTION) development files + +REQUIRED_PKGS_CSWlibxres = CSWlibx11 CSWlibxext +REQUIRED_PKGS_CSWlibxresdevel = CSWlibxres + +PKGFILES_CSWlibxresdevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libxres/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxres/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxres/trunk/checksums 2009-09-27 10:22:15 UTC (rev 6491) @@ -0,0 +1 @@ +de66ffb657aba64c9d6dbdeabb757f3e download/libXres-1.0.3.tar.bz2 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 Sep 27 12:42:25 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 10:42:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[6492] csw/mgar/pkg/x11 Message-ID: Revision: 6492 http://gar.svn.sourceforge.net/gar/?rev=6492&view=rev Author: wbonnet Date: 2009-09-27 10:42:25 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxfontcache/ csw/mgar/pkg/x11/libxfontcache/branches/ csw/mgar/pkg/x11/libxfontcache/tags/ csw/mgar/pkg/x11/libxfontcache/trunk/ csw/mgar/pkg/x11/libxfontcache/trunk/Makefile csw/mgar/pkg/x11/libxfontcache/trunk/checksums csw/mgar/pkg/x11/libxfontcache/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxfontcache/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/x11/libxfontcache/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxfontcache/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxfontcache/trunk/Makefile 2009-09-27 10:42:25 UTC (rev 6492) @@ -0,0 +1,35 @@ +GARNAME = libXfontcache +GARVERSION = 1.0.4 +CATEGORIES = x11 + +DESCRIPTION = X-TrueType font cache extension client library +define BLURB + FontCache is an extension that is used by X-TrueType to cache information about fonts. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibxfontcache CSWlibxfontcachedevel + +CATALOGNAME_CSWlibxfontcache = libxfontcache +CATALOGNAME_CSWlibxfontcachedevel = libxfontcache_devel + +SPKG_DESC_CSWlibxfontcache = $(DESCRIPTION) +SPKG_DESC_CSWlibxfontcachedevel = $(DESCRIPTION) development files + +PREREQUISITE_PKGS = CSWfontcacheproto +REQUIRED_PKGS_CSWlibxfontcachedevel = CSWlibxfontcache +REQUIRED_PKGS_CSWlibxfontcache = CSWlibx11 CSWlibxext + +PKGFILES_CSWlibxfontcachedevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libxfontcache/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxfontcache/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxfontcache/trunk/checksums 2009-09-27 10:42:25 UTC (rev 6492) @@ -0,0 +1 @@ +1adca018aa7bf2d215f20a69c10828ad download/libXfontcache-1.0.4.tar.bz2 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 Sep 27 12:55:45 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 10:55:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[6493] csw/mgar/pkg/x11 Message-ID: Revision: 6493 http://gar.svn.sourceforge.net/gar/?rev=6493&view=rev Author: wbonnet Date: 2009-09-27 10:55:45 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxscrnsaver/ csw/mgar/pkg/x11/libxscrnsaver/branches/ csw/mgar/pkg/x11/libxscrnsaver/tags/ csw/mgar/pkg/x11/libxscrnsaver/trunk/ csw/mgar/pkg/x11/libxscrnsaver/trunk/Makefile csw/mgar/pkg/x11/libxscrnsaver/trunk/checksums csw/mgar/pkg/x11/libxscrnsaver/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxscrnsaver/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/x11/libxscrnsaver/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxscrnsaver/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxscrnsaver/trunk/Makefile 2009-09-27 10:55:45 UTC (rev 6493) @@ -0,0 +1,35 @@ +GARNAME = libXScrnSaver +GARVERSION = 1.2.0 +CATEGORIES = x11 + +DESCRIPTION = The XScrnSaver Library +define BLURB + libXScrnSaver provides an X Window System client interface to the MIT-SCREEN-SAVER extension to the X protocol. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibxscrnsaver CSWlibxscrnsaverdevel + +CATALOGNAME_CSWlibxscrnsaver = libxscrnsaver +CATALOGNAME_CSWlibxscrnsaverdevel = libxscrnsaver_devel + +SPKG_DESC_CSWlibxscrnsaver = $(DESCRIPTION) +SPKG_DESC_CSWlibxscrnsaverdevel = $(DESCRIPTION) development files + +PREREQUISITE_PKGS = CSWscrnsaverproto +REQUIRED_PKGS_CSWlibxscrnsaver = CSWlibx11 CSWlibxext +REQUIRED_PKGS_CSWlibxscrnsaverdevel = CSWlibxscrnsaver + +PKGFILES_CSWlibxscrnsaverdevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libxscrnsaver/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxscrnsaver/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxscrnsaver/trunk/checksums 2009-09-27 10:55:45 UTC (rev 6493) @@ -0,0 +1 @@ +33e54f64b55f22d8bbe822a5b62568cb download/libXScrnSaver-1.2.0.tar.bz2 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 Sep 27 18:07:50 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 16:07:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6494] csw/mgar/pkg/x11 Message-ID: Revision: 6494 http://gar.svn.sourceforge.net/gar/?rev=6494&view=rev Author: wbonnet Date: 2009-09-27 16:07:50 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libfontenc/ csw/mgar/pkg/x11/libfontenc/branches/ csw/mgar/pkg/x11/libfontenc/tags/ csw/mgar/pkg/x11/libfontenc/trunk/ csw/mgar/pkg/x11/libfontenc/trunk/Makefile csw/mgar/pkg/x11/libfontenc/trunk/checksums csw/mgar/pkg/x11/libfontenc/trunk/files/ Property changes on: csw/mgar/pkg/x11/libfontenc/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/x11/libfontenc/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libfontenc/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libfontenc/trunk/Makefile 2009-09-27 16:07:50 UTC (rev 6494) @@ -0,0 +1,34 @@ +GARNAME = libfontenc +GARVERSION = 1.0.5 +CATEGORIES = x11 + +DESCRIPTION = X11 font encoding library +define BLURB + libfontenc is a library which helps font libraries portably determine and deal with different encodings of fonts. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibfontenc CSWlibfontencdevel + +CATALOGNAME_CSWlibfontenc = libfontenc +CATALOGNAME_CSWlibfontencdevel = libfontenc_devel + +SPKG_DESC_CSWlibfontenc = $(DESCRIPTION) +SPKG_DESC_CSWlibfontencdevel = $(DESCRIPTION) development files + +REQUIRED_PKGS_CSWlibfontencdevel = CSWlibfontenc +REQUIRED_PKGS_CSWlibfontenc = CSWzlib + +PKGFILES_CSWlibfontencdevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libfontenc/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libfontenc/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libfontenc/trunk/checksums 2009-09-27 16:07:50 UTC (rev 6494) @@ -0,0 +1 @@ +4f0d8191819be9f2bdf9dad49a65e43b download/libfontenc-1.0.5.tar.bz2 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 Sep 27 18:18:57 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 16:18:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[6495] csw/mgar/pkg/x11 Message-ID: Revision: 6495 http://gar.svn.sourceforge.net/gar/?rev=6495&view=rev Author: wbonnet Date: 2009-09-27 16:18:57 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libdmx/ csw/mgar/pkg/x11/libdmx/branches/ csw/mgar/pkg/x11/libdmx/tags/ csw/mgar/pkg/x11/libdmx/trunk/ csw/mgar/pkg/x11/libdmx/trunk/Makefile csw/mgar/pkg/x11/libdmx/trunk/checksums csw/mgar/pkg/x11/libdmx/trunk/files/ Property changes on: csw/mgar/pkg/x11/libdmx/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/x11/libdmx/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libdmx/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libdmx/trunk/Makefile 2009-09-27 16:18:57 UTC (rev 6495) @@ -0,0 +1,36 @@ +GARNAME = libdmx +GARVERSION = 1.0.2 +CATEGORIES = x11 + +DESCRIPTION = X11 Distributed Multihead extension library +define BLURB + libdmx is an interface to the DMX extension for X, which allows a single server to be set up as a proxy spanning multiple servers -- not unlike Xinerama across discrete physical machines. It can be reconfigured on the fly to change the layout, and it is presented as a single logical display to clients. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibdmx CSWlibdmxdevel + +CATALOGNAME_CSWlibdmx = libdmx +CATALOGNAME_CSWlibdmxdevel = libdmx_devel + +SPKG_DESC_CSWlibdmx = $(DESCRIPTION) +SPKG_DESC_CSWlibdmxdevel = $(DESCRIPTION) development files + +PREREQUISITE_PKGS = CSWdmxproto + +REQUIRED_PKGS_CSWlibdmx = CSWlibx11 CSWlibxext +REQUIRED_PKGS_CSWlibdmxdevel = CSWlibdmx + +PKGFILES_CSWlibdmxdevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libdmx/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libdmx/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libdmx/trunk/checksums 2009-09-27 16:18:57 UTC (rev 6495) @@ -0,0 +1 @@ +4d866967210d06098fc9f302ed4c79b1 download/libdmx-1.0.2.tar.bz2 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 Sep 27 18:44:37 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 16:44:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[6496] csw/mgar/pkg/x11 Message-ID: Revision: 6496 http://gar.svn.sourceforge.net/gar/?rev=6496&view=rev Author: wbonnet Date: 2009-09-27 16:44:37 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/liblbxutil/ csw/mgar/pkg/x11/liblbxutil/branches/ csw/mgar/pkg/x11/liblbxutil/tags/ csw/mgar/pkg/x11/liblbxutil/trunk/ csw/mgar/pkg/x11/liblbxutil/trunk/Makefile csw/mgar/pkg/x11/liblbxutil/trunk/checksums csw/mgar/pkg/x11/liblbxutil/trunk/files/ Property changes on: csw/mgar/pkg/x11/liblbxutil/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/x11/liblbxutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/liblbxutil/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/liblbxutil/trunk/Makefile 2009-09-27 16:44:37 UTC (rev 6496) @@ -0,0 +1,34 @@ +GARNAME = liblbxutil +GARVERSION = 1.0.1 +CATEGORIES = x11 + +DESCRIPTION = LBX utilities library from modular X.org. +define BLURB + LBX (Low Bandwidth X) is an X server extension which performs compression and caching on the X protocol to improve the performance of X over low-bandwidth, high-latency links. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWliblbxutil CSWliblbxutildevel + +CATALOGNAME_CSWliblbxutil = liblbxutil +CATALOGNAME_CSWliblbxutildevel = liblbxutil_devel + +SPKG_DESC_CSWliblbxutil = $(DESCRIPTION) +SPKG_DESC_CSWliblbxutildevel = $(DESCRIPTION) development files + +REQUIRED_PKGS_CSWliblbxutil = CSWzlib +REQUIRED_PKGS_CSWliblbxutildevel = CSWliblbxutil + +PKGFILES_CSWliblbxutildevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/liblbxutil/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/liblbxutil/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/liblbxutil/trunk/checksums 2009-09-27 16:44:37 UTC (rev 6496) @@ -0,0 +1 @@ +b73cbd5bc3cd268722a624a5f1318fde download/liblbxutil-1.0.1.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 Sun Sep 27 19:12:00 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 27 Sep 2009 17:12:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6497] csw/mgar/pkg/unixodbc/trunk Message-ID: Revision: 6497 http://gar.svn.sourceforge.net/gar/?rev=6497&view=rev Author: wahwah Date: 2009-09-27 17:12:00 +0000 (Sun, 27 Sep 2009) Log Message: ----------- unixodbc: An example implementation of configuration migration using an archive directory. Modified Paths: -------------- csw/mgar/pkg/unixodbc/trunk/Makefile csw/mgar/pkg/unixodbc/trunk/checksums Added Paths: ----------- csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall-linking csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall-moving Removed Paths: ------------- csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall Modified: csw/mgar/pkg/unixodbc/trunk/Makefile =================================================================== --- csw/mgar/pkg/unixodbc/trunk/Makefile 2009-09-27 16:44:37 UTC (rev 6496) +++ csw/mgar/pkg/unixodbc/trunk/Makefile 2009-09-27 17:12:00 UTC (rev 6497) @@ -13,7 +13,8 @@ DL_NAME = unixODBC MASTER_SITES = http://www.unixodbc.org/ DISTFILES = $(DL_NAME)-$(GARVERSION).tar.gz -DISTFILES += CSWunixodbc.postinstall +# The configuration migratin is pending decision. +# DISTFILES += CSWunixodbc.postinstall WORKSRC = $(WORKDIR)/$(DL_NAME)-$(GARVERSION) UFILES_REGEX = $(DL_NAME)-(\d+(?:\.\d+)*).tar.gz REQUIRED_PKGS = CSWiconv Modified: csw/mgar/pkg/unixodbc/trunk/checksums =================================================================== --- csw/mgar/pkg/unixodbc/trunk/checksums 2009-09-27 16:44:37 UTC (rev 6496) +++ csw/mgar/pkg/unixodbc/trunk/checksums 2009-09-27 17:12:00 UTC (rev 6497) @@ -1,2 +1 @@ -cc65f5642a9b5965da7d6978587e8ac4 download/CSWunixodbc.postinstall f47c2efb28618ecf5f33319140a7acd0 download/unixODBC-2.2.14.tar.gz Deleted: csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall =================================================================== --- csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall 2009-09-27 16:44:37 UTC (rev 6496) +++ csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall 2009-09-27 17:12:00 UTC (rev 6497) @@ -1,76 +0,0 @@ -#!/bin/sh -# -# $Id$ -# -# vim:set sw=2 ts=2 sts=2 expandtab: -# -# # If old_path exists: -# # Create a file named {{old_path.THIS_LOCATION_IS_DEPRECATED}} and leave a message inside the file. -# # If new_path and new_path.CSW files are identical: -# # Remove new_path (it's only a copy of the .CSW default file, no data loss) -# # Create a symlink from new_path to old_path -# # Otherwise: -# # Create a file named {{old_path.THIS_FILE_IS_PROBABLY_UNUSED}} -# -# http://wiki.opencsw.org/configuration-directory-migration - -deprecated_info=" -This location (/opt/csw/etc) is deprecated. - -Configuration files are currently being placed in /etc/opt/csw. Please make -sure your new configuration is in /etc/opt/csw and remove the old one from -/opt/csw/etc. -" -deprecated_file_ext="THIS_LOCATION_IS_DEPRECATED" - -filepairs="/opt/csw/etc/odbc.ini:/etc/opt/csw/odbc.ini" -filepairs="${filepairs} /opt/csw/etc/odbcinst.ini:/etc/opt/csw/odbcinst.ini" -dirpairs="/opt/csw/etc/ODBCDataSources:/etc/opt/csw/ODBCDataSources" - -return_code=0 - -# Generated ../../../ when given a path like /etc/opt/csw/odbc.ini -gen_dubdots() { - echo "$1" \ - | sed -e 's+[^/]+.+g' \ - | sed -e 's+\.*$++g' \ - | tr -s . \ - | sed -e 's+\.+..+g' \ - | sed -e 's+^/++' -} - -files_are_identical() { - cmp "$1" "$2" > /dev/null -} - -drop_warning() { - echo "${deprecated_info}" > "$1.${deprecated_file_ext}" -} - -for ff in ${filepairs} ${dirpairs}; do - old_location=`echo ${ff} | awk -F: '{print $1}'` - new_location=`echo ${ff} | awk -F: '{print $2}'` - abs_old_location="${PKG_INSTALL_ROOT}${old_location}" - abs_new_location="${PKG_INSTALL_ROOT}${new_location}" - old_location_noslash=`echo "${old_location}" | sed -e 's+^/++'` - dubdots=`gen_dubdots "${new_location}"` - if [ -r "${abs_old_location}" ]; then - drop_warning "${abs_old_location}" - if [ -h "${abs_new_location}" ]; then - # It's a symbolic link already, doing nothing. - true - elif [ -r "${abs_new_location}" ]; then - if files_are_identical "${abs_new_location}" "${abs_new_location}.CSW"; then - rm "${abs_new_location}" - ln -s "${dubdots}${old_location_noslash}" "${abs_new_location}" - else - touch "${abs_old_location}.THIS_FILE_IS_PROBABLY_UNUSED" - fi - else - # The file or directory doesn't exist. - ln -s "${dubdots}${old_location_noslash}" "${abs_new_location}" - fi - fi -done - -exit "${return_code}" Copied: csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall-linking (from rev 6462, csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall) =================================================================== --- csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall-linking (rev 0) +++ csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall-linking 2009-09-27 17:12:00 UTC (rev 6497) @@ -0,0 +1,76 @@ +#!/bin/sh +# +# $Id$ +# +# vim:set sw=2 ts=2 sts=2 expandtab: +# +# # If old_path exists: +# # Create a file named {{old_path.THIS_LOCATION_IS_DEPRECATED}} and leave a message inside the file. +# # If new_path and new_path.CSW files are identical: +# # Remove new_path (it's only a copy of the .CSW default file, no data loss) +# # Create a symlink from new_path to old_path +# # Otherwise: +# # Create a file named {{old_path.THIS_FILE_IS_PROBABLY_UNUSED}} +# +# http://wiki.opencsw.org/configuration-directory-migration + +deprecated_info=" +This location (/opt/csw/etc) is deprecated. + +Configuration files are currently being placed in /etc/opt/csw. Please make +sure your new configuration is in /etc/opt/csw and remove the old one from +/opt/csw/etc. +" +deprecated_file_ext="THIS_LOCATION_IS_DEPRECATED" + +filepairs="/opt/csw/etc/odbc.ini:/etc/opt/csw/odbc.ini" +filepairs="${filepairs} /opt/csw/etc/odbcinst.ini:/etc/opt/csw/odbcinst.ini" +dirpairs="/opt/csw/etc/ODBCDataSources:/etc/opt/csw/ODBCDataSources" + +return_code=0 + +# Generated ../../../ when given a path like /etc/opt/csw/odbc.ini +gen_dubdots() { + echo "$1" \ + | sed -e 's+[^/]+.+g' \ + | sed -e 's+\.*$++g' \ + | tr -s . \ + | sed -e 's+\.+..+g' \ + | sed -e 's+^/++' +} + +files_are_identical() { + cmp "$1" "$2" > /dev/null +} + +drop_warning() { + echo "${deprecated_info}" > "$1.${deprecated_file_ext}" +} + +for ff in ${filepairs} ${dirpairs}; do + old_location=`echo ${ff} | awk -F: '{print $1}'` + new_location=`echo ${ff} | awk -F: '{print $2}'` + abs_old_location="${PKG_INSTALL_ROOT}${old_location}" + abs_new_location="${PKG_INSTALL_ROOT}${new_location}" + old_location_noslash=`echo "${old_location}" | sed -e 's+^/++'` + dubdots=`gen_dubdots "${new_location}"` + if [ -r "${abs_old_location}" ]; then + drop_warning "${abs_old_location}" + if [ -h "${abs_new_location}" ]; then + # It's a symbolic link already, doing nothing. + true + elif [ -r "${abs_new_location}" ]; then + if files_are_identical "${abs_new_location}" "${abs_new_location}.CSW"; then + rm "${abs_new_location}" + ln -s "${dubdots}${old_location_noslash}" "${abs_new_location}" + else + touch "${abs_old_location}.THIS_FILE_IS_PROBABLY_UNUSED" + fi + else + # The file or directory doesn't exist. + ln -s "${dubdots}${old_location_noslash}" "${abs_new_location}" + fi + fi +done + +exit "${return_code}" Added: csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall-moving =================================================================== --- csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall-moving (rev 0) +++ csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall-moving 2009-09-27 17:12:00 UTC (rev 6497) @@ -0,0 +1,159 @@ +#!/bin/sh +# vim:set sw=2 ts=2 sts=2 expandtab: +# +# $Id$ +# +# old_path: e.g. /opt/csw/etc/foo.conf +# new_path: e.g. /etc/opt/csw/foo.conf +# arch_path: e.g. /etc/opt/csw/migration-archive/foo.conf +# +# # If old_path exists: +# # Create a file named {{old_path.THIS_LOCATION_IS_DEPRECATED}} and leave a message inside the file. +# # Move old_path to archive_path +# # If new_path does not exist: +# # Copy archive_path to new_path +# +# http://wiki.opencsw.org/configuration-directory-migration +# +# old_path: /opt/csw/etc/foo.conf +# arch_path: /opt/csw/etc/migration-archive/foo.conf +# new_path: /etc/opt/csw/foo.conf +# +# if old_path exists: +# move old_path to arch_path +# if arch_path exists and new_path doesn't: +# copy arch_path to new_path + +set -u + +# To prevent issues with a-z in regular expressions +unset LC_ALL +LANG=C + +MIGRATE_FILES="odbc.ini odbcinst.ini ODBCDataSources" + + +# The defaults +SOURCE_DIR___default__="/opt/csw/etc" +readonly SOURCE_DIR___default__ +ARCH_DIR___default__="/opt/csw/etc/migration-archive" +readonly ARCH_DIR___default__ +DEST_DIR___default__="/etc/opt/csw" +readonly DEST_DIR___default__ + +return_code=0 + +migration_info=" +This location (/opt/csw/etc) is deprecated. + +Configuration files are currently being placed in /etc/opt/csw. Please make +sure your new configuration is in /etc/opt/csw and remove the old one from +/opt/csw/etc. + +For more information, please see +http://wiki.opencsw.org/configuration-directory-migration +" +readonly migration_info +deprecated_file_ext="README.migration" +readonly deprecated_file_ext + +give_a_chance_to_stop() { + echo + echo "*******************************************************************" + echo "* The old configuration directory ${obsolete_dir} still exists. " + echo "* Please move your configuration to ${new_dir}. " + echo "* " + echo "* Installation will continue in 10 seconds. " + echo "* Press CTRL+C if you want to stop now. " + echo "*******************************************************************" + echo + sleep 10 +} + + +files_are_identical() { + cmp "$1" "$2" > /dev/null +} + +drop_warning() { + echo "${migration_info}" > "$1.${deprecated_file_ext}" +} + +sanitize() { + echo "$1" | sed -e 's/[^a-zA-Z0-9]/_/g' +} + +expand_modifiers() { + # Emulating local variables + __per_file_variable="$1" + __per_file_modifier_value="$2" + eval echo `echo \\${${__per_file_variable}_${__per_file_modifier_value}:-}` +} + +place_signpost_for() { + __file_name="$1" + echo "${migration_info}" > "${__file_name}.${deprecated_file_ext}" +} + +main() { + for file_name in ${MIGRATE_FILES}; do + modifier_value=`sanitize "${file_name}"` + echo "file: ${file_name}" + echo "modifier_value: ${modifier_value}" + + # Perhaps the following three segments of code could be turned into + # a function, but it would require complicated eval calls. + per_file_srcdir=`expand_modifiers SOURCE_DIR ${modifier_value}` + default_srcdir=`expand_modifiers SOURCE_DIR __default__` + srcdir="${per_file_srcdir:-${default_srcdir}}" + per_file_dstdir=`expand_modifiers DEST_DIR ${modifier_value}` + default_dstdir=`expand_modifiers DEST_DIR __default__` + dstdir="${per_file_dstdir:-${default_dstdir}}" + per_file_archdir=`expand_modifiers ARCH_DIR ${modifier_value}` + default_archdir=`expand_modifiers ARCH_DIR __default__` + archdir="${per_file_archdir:-${default_archdir}}" + srcpath="${srcdir}/${file_name}" + dstpath="${dstdir}/${file_name}" + archpath="${archdir}/${file_name}" + + # Make sure we have the environment we expect + if [ ! -d "${archdir}" ] + then + echo "Creating ${archdir}" + mkdir -m 755 -p "${archdir}" + if [ $? -ne 0 ] + then + echo "Couldn't create '${archdir}', bailing out." + exit 1 + fi + fi + + # All variables are set, the main algorithm goes here. + + # Moving the file will only work in the global zone. The assumption is that + # the preinstall script is going to be run in the global zone first; by the + # time it gets to the non-global zones, the ${srcpath} will have been + # moved already. + if [ -r "${srcpath}" ] + then + place_signpost_for "${srcpath}" + mv "${srcpath}" "${archpath}" + fi + + # If the destination file is not there and the archived file is, copy it. + if [ ! -r "${dstpath}" ] + then + if [ -r "${archpath}" ] + then + cp "${archpath}" "${dstpath}" + else + echo "The archived file does not exist: ${archpath}" + echo "Nothing to copy to ${dstpath}." + fi + fi + done +} + +main + +exit "${return_code}" 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 Sep 27 19:13:11 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 17:13:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[6498] csw/mgar/pkg/x11 Message-ID: Revision: 6498 http://gar.svn.sourceforge.net/gar/?rev=6498&view=rev Author: wbonnet Date: 2009-09-27 17:13:11 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxvmc/ csw/mgar/pkg/x11/libxvmc/branches/ csw/mgar/pkg/x11/libxvmc/tags/ csw/mgar/pkg/x11/libxvmc/trunk/ csw/mgar/pkg/x11/libxvmc/trunk/Makefile csw/mgar/pkg/x11/libxvmc/trunk/checksums csw/mgar/pkg/x11/libxvmc/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxvmc/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/x11/libxvmc/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxvmc/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxvmc/trunk/Makefile 2009-09-27 17:13:11 UTC (rev 6498) @@ -0,0 +1,36 @@ +GARNAME = libXvMC +GARVERSION = 1.0.4 +CATEGORIES = x11 + +DESCRIPTION = XVideo Motion Compensation Library +define BLURB + X-Video Motion Compensation (XvMC) provides accelerated video playback by offloading video decoding to hardware. It is an extension of the X video extension for the X Window System. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibxvmc CSWlibxvmcdevel + +CATALOGNAME_CSWlibxvmc = libxvmc +CATALOGNAME_CSWlibxvmcdevel = libxvmc_devel + +SPKG_DESC_CSWlibxvmc = $(DESCRIPTION) +SPKG_DESC_CSWlibxvmcdevel = $(DESCRIPTION) development files + +PREREQUISITE_PKGS = CSWlibxvdevel CSWxvideoproto + +REQUIRED_PKGS_CSWlibxvmc = CSWlibx11 CSWlibxext CSWlibxv +REQUIRED_PKGS_CSWlibxvmcdevel = CSWlibxvmc + +PKGFILES_CSWlibxvmcdevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libxvmc/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxvmc/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxvmc/trunk/checksums 2009-09-27 17:13:11 UTC (rev 6498) @@ -0,0 +1 @@ +b54600573daf9d1a29b952e8d35b389e download/libXvMC-1.0.4.tar.bz2 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 Sep 27 19:22:14 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 17:22:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6499] csw/mgar/pkg/x11 Message-ID: Revision: 6499 http://gar.svn.sourceforge.net/gar/?rev=6499&view=rev Author: wbonnet Date: 2009-09-27 17:22:14 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/liboldx/ csw/mgar/pkg/x11/liboldx/branches/ csw/mgar/pkg/x11/liboldx/tags/ csw/mgar/pkg/x11/liboldx/trunk/ csw/mgar/pkg/x11/liboldx/trunk/Makefile csw/mgar/pkg/x11/liboldx/trunk/checksums csw/mgar/pkg/x11/liboldx/trunk/files/ Property changes on: csw/mgar/pkg/x11/liboldx/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/x11/liboldx/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/liboldx/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/liboldx/trunk/Makefile 2009-09-27 17:22:14 UTC (rev 6499) @@ -0,0 +1,33 @@ +GARNAME = liboldX +GARVERSION = 1.0.1 +CATEGORIES = x11 + +DESCRIPTION = The oldX Library +define BLURB + The old X10 compatibility library +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWliboldx CSWliboldxdevel + +CATALOGNAME_CSWliboldx = liboldx +CATALOGNAME_CSWliboldxdevel = liboldx_devel + +SPKG_DESC_CSWliboldx = $(DESCRIPTION) +SPKG_DESC_CSWliboldxdevel = $(DESCRIPTION) development files + +REQUIRED_PKGS_CSWliboldxdevel = CSWliboldx + +PKGFILES_CSWliboldxdevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/liboldx/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/liboldx/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/liboldx/trunk/checksums 2009-09-27 17:22:14 UTC (rev 6499) @@ -0,0 +1 @@ +6b81ffe486d76c380d08f92285758d84 download/liboldX-1.0.1.tar.bz2 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 Sep 27 19:55:06 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 17:55:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6500] csw/mgar/pkg/x11 Message-ID: Revision: 6500 http://gar.svn.sourceforge.net/gar/?rev=6500&view=rev Author: wbonnet Date: 2009-09-27 17:55:06 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libwindowswm/ csw/mgar/pkg/x11/libwindowswm/branches/ csw/mgar/pkg/x11/libwindowswm/tags/ csw/mgar/pkg/x11/libwindowswm/trunk/ csw/mgar/pkg/x11/libwindowswm/trunk/Makefile csw/mgar/pkg/x11/libwindowswm/trunk/checksums csw/mgar/pkg/x11/libwindowswm/trunk/files/ Property changes on: csw/mgar/pkg/x11/libwindowswm/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/x11/libwindowswm/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libwindowswm/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libwindowswm/trunk/Makefile 2009-09-27 17:55:06 UTC (rev 6500) @@ -0,0 +1,36 @@ +GARNAME = libWindowsWM +GARVERSION = 1.0.0 +CATEGORIES = x11 + +DESCRIPTION = Cygwin/X rootless window management extension +define BLURB + WindowsWM is a simple library designed to interface with the Windows-WM extension. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibwindowswm CSWlibwindowswmdevel + +CATALOGNAME_CSWlibwindowswm = libwindowswm +CATALOGNAME_CSWlibwindowswmdevel = libwindowswm_devel + +SPKG_DESC_CSWlibwindowswm = $(DESCRIPTION) +SPKG_DESC_CSWlibwindowswmdevel = $(DESCRIPTION) development files + +PREREQUISITE_PKGS = CSWwindowswmproto + +REQUIRED_PKGS_CSWlibwindowswm = CSWlibx11 CSWlibxext +REQUIRED_PKGS_CSWlibwindowswmdevel = CSWlibwindowswm + +PKGFILES_CSWlibwindowswmdevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libwindowswm/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libwindowswm/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libwindowswm/trunk/checksums 2009-09-27 17:55:06 UTC (rev 6500) @@ -0,0 +1 @@ +337b379fd00a67345b083100c4e6ba95 download/libWindowsWM-1.0.0.tar.bz2 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 Sep 27 20:05:13 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 18:05:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[6501] csw/mgar/pkg/x11 Message-ID: Revision: 6501 http://gar.svn.sourceforge.net/gar/?rev=6501&view=rev Author: wbonnet Date: 2009-09-27 18:05:13 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxxf86dga/ csw/mgar/pkg/x11/libxxf86dga/branches/ csw/mgar/pkg/x11/libxxf86dga/tags/ csw/mgar/pkg/x11/libxxf86dga/trunk/ csw/mgar/pkg/x11/libxxf86dga/trunk/Makefile csw/mgar/pkg/x11/libxxf86dga/trunk/checksums csw/mgar/pkg/x11/libxxf86dga/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxxf86dga/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/x11/libxxf86dga/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxxf86dga/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxxf86dga/trunk/Makefile 2009-09-27 18:05:13 UTC (rev 6501) @@ -0,0 +1,36 @@ +GARNAME = libXxf86dga +GARVERSION = 1.0.2 +CATEGORIES = x11 + +DESCRIPTION = X11 Direct Graphics Access extension library +define BLURB + libXxf86dga provides the XFree86-DGA extension, which allows direct graphics access to a framebuffer-like region, and also allows relative mouse reporting, et al. It is mainly used by games and emulators for games. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibxxf86dga CSWlibxxf86dgadevel + +CATALOGNAME_CSWlibxxf86dga = libxxf86dga +CATALOGNAME_CSWlibxxf86dgadevel = libxxf86dga_devel + +SPKG_DESC_CSWlibxxf86dga = $(DESCRIPTION) +SPKG_DESC_CSWlibxxf86dgadevel = $(DESCRIPTION) development files + +PREREQUISITE_PKGS = CSWxf86dgaproto + +REQUIRED_PKGS_CSWlibxxf86dga = CSWlibx11 CSWlibxext +REQUIRED_PKGS_CSWlibxxf86dgadevel = CSWlibxxf86dga + +PKGFILES_CSWlibxxf86dgadevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libxxf86dga/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxxf86dga/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxxf86dga/trunk/checksums 2009-09-27 18:05:13 UTC (rev 6501) @@ -0,0 +1 @@ +6f5f621804ee652b6cc6f2025c517c78 download/libXxf86dga-1.0.2.tar.bz2 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 Sep 27 20:12:09 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 18:12:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[6502] csw/mgar/pkg/x11 Message-ID: Revision: 6502 http://gar.svn.sourceforge.net/gar/?rev=6502&view=rev Author: wbonnet Date: 2009-09-27 18:12:08 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxxf86misc/ csw/mgar/pkg/x11/libxxf86misc/branches/ csw/mgar/pkg/x11/libxxf86misc/tags/ csw/mgar/pkg/x11/libxxf86misc/trunk/ csw/mgar/pkg/x11/libxxf86misc/trunk/Makefile csw/mgar/pkg/x11/libxxf86misc/trunk/checksums csw/mgar/pkg/x11/libxxf86misc/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxxf86misc/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/x11/libxxf86misc/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxxf86misc/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxxf86misc/trunk/Makefile 2009-09-27 18:12:08 UTC (rev 6502) @@ -0,0 +1,35 @@ +GARNAME = libXxf86misc +GARVERSION = 1.0.1 +CATEGORIES = x11 + +DESCRIPTION = X11 XFree86 miscellaneous extension library +define BLURB + libXxf86misc provides an interface to the XFree86-Misc extension, which allows client applications to query the current keyboard and mouse settings of the running XFree86-based (XFree86, Xorg) server. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibxxf86misc CSWlibxxf86miscdevel + +CATALOGNAME_CSWlibxxf86misc = libxxf86misc +CATALOGNAME_CSWlibxxf86miscdevel = libxxf86misc_devel + +SPKG_DESC_CSWlibxxf86misc = $(DESCRIPTION) +SPKG_DESC_CSWlibxxf86miscdevel = $(DESCRIPTION) development files + +PREREQUISITE_PKGS = CSWxf86miscproto +REQUIRED_PKGS_CSWlibxxf86misc = CSWlibx11 CSWlibxext +REQUIRED_PKGS_CSWlibxxf86miscdevel = CSWlibxxf86misc + +PKGFILES_CSWlibxxf86miscdevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libxxf86misc/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxxf86misc/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxxf86misc/trunk/checksums 2009-09-27 18:12:08 UTC (rev 6502) @@ -0,0 +1 @@ +7cee0df63903cef7f7a3fb68cdd99eef download/libXxf86misc-1.0.1.tar.bz2 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 Sep 27 20:18:05 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 18:18:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6503] csw/mgar/pkg/x11 Message-ID: Revision: 6503 http://gar.svn.sourceforge.net/gar/?rev=6503&view=rev Author: wbonnet Date: 2009-09-27 18:18:05 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxxf86vm/ csw/mgar/pkg/x11/libxxf86vm/branches/ csw/mgar/pkg/x11/libxxf86vm/tags/ csw/mgar/pkg/x11/libxxf86vm/trunk/ csw/mgar/pkg/x11/libxxf86vm/trunk/Makefile csw/mgar/pkg/x11/libxxf86vm/trunk/checksums csw/mgar/pkg/x11/libxxf86vm/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxxf86vm/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/x11/libxxf86vm/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxxf86vm/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxxf86vm/trunk/Makefile 2009-09-27 18:18:05 UTC (rev 6503) @@ -0,0 +1,35 @@ +GARNAME = libXxf86vm +GARVERSION = 1.0.2 +CATEGORIES = x11 + +DESCRIPTION = X11 XFree86 video mode extension library +define BLURB + libXxf86vm provides an interface to the XFree86-VidModeExtension extension, which allows client applications to get and set video mode timings in extensive detail. It is used by the xvidtune program in particular. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibxxf86vm CSWlibxxf86vmdevel + +CATALOGNAME_CSWlibxxf86vm = libxxf86vm +CATALOGNAME_CSWlibxxf86vmdevel = libxxf86vm_devel + +SPKG_DESC_CSWlibxxf86vm = $(DESCRIPTION) +SPKG_DESC_CSWlibxxf86vmdevel = $(DESCRIPTION) development files + +PREREQUISITE_PKGS = CSWxf86vidmodeproto +REQUIRED_PKGS_CSWlibxxf86vm = CSWlibx11 CSWlibxext +REQUIRED_PKGS_CSWlibxxf86vmdevel = CSWlibxxf86vm + +PKGFILES_CSWlibxxf86vmdevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libxxf86vm/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxxf86vm/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxxf86vm/trunk/checksums 2009-09-27 18:18:05 UTC (rev 6503) @@ -0,0 +1 @@ +304d37bd0a10d9b58aa9b64469ad73e5 download/libXxf86vm-1.0.2.tar.bz2 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 Sep 27 20:49:06 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 18:49:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6504] csw/mgar/pkg/x11 Message-ID: Revision: 6504 http://gar.svn.sourceforge.net/gar/?rev=6504&view=rev Author: wbonnet Date: 2009-09-27 18:49:06 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxprintutil/ csw/mgar/pkg/x11/libxprintutil/branches/ csw/mgar/pkg/x11/libxprintutil/tags/ csw/mgar/pkg/x11/libxprintutil/trunk/ csw/mgar/pkg/x11/libxprintutil/trunk/Makefile csw/mgar/pkg/x11/libxprintutil/trunk/checksums csw/mgar/pkg/x11/libxprintutil/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxprintutil/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/x11/libxprintutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxprintutil/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxprintutil/trunk/Makefile 2009-09-27 18:49:06 UTC (rev 6504) @@ -0,0 +1,36 @@ +GARNAME = libXprintUtil +GARVERSION = 1.0.1 +CATEGORIES = x11 + +DESCRIPTION = The XprintUtil Library +define BLURB + libxprintutil provides utility Xpu APIs allowing client applications to access and manipulate information about printer capabilities from an Xprint server. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibxprintutil CSWlibxprintutildevel + +CATALOGNAME_CSWlibxprintutil = libxprintutil +CATALOGNAME_CSWlibxprintutildevel = libxprintutil_devel + +SPKG_DESC_CSWlibxprintutil = $(DESCRIPTION) +SPKG_DESC_CSWlibxprintutildevel = $(DESCRIPTION) development files + + +PREREQUISITE_PKGS = CSWlibxpdevel CSWlibicedevel +REQUIRED_PKGS_CSWlibxprintutil = CSWlibice CSWlibx11 CSWlibxau CSWlibxp CSWlibxt +REQUIRED_PKGS_CSWlibxprintutildevel = CSWlibxprintutil + +PKGFILES_CSWlibxprintutildevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libxprintutil/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxprintutil/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxprintutil/trunk/checksums 2009-09-27 18:49:06 UTC (rev 6504) @@ -0,0 +1 @@ +22584f1aab1deba253949b562d1f0f45 download/libXprintUtil-1.0.1.tar.bz2 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 Sep 27 20:53:14 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 18:53:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6505] csw/mgar/pkg/x11 Message-ID: Revision: 6505 http://gar.svn.sourceforge.net/gar/?rev=6505&view=rev Author: wbonnet Date: 2009-09-27 18:53:14 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxprintapputil/ csw/mgar/pkg/x11/libxprintapputil/branches/ csw/mgar/pkg/x11/libxprintapputil/tags/ csw/mgar/pkg/x11/libxprintapputil/trunk/ csw/mgar/pkg/x11/libxprintapputil/trunk/Makefile csw/mgar/pkg/x11/libxprintapputil/trunk/checksums csw/mgar/pkg/x11/libxprintapputil/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxprintapputil/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/x11/libxprintapputil/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxprintapputil/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxprintapputil/trunk/Makefile 2009-09-27 18:53:14 UTC (rev 6505) @@ -0,0 +1,35 @@ +GARNAME = libXprintAppUtil +GARVERSION = 1.0.1 +CATEGORIES = x11 + +DESCRIPTION = Xprint job utility client library +define BLURB + libxprintapputil provides utility Xpau APIs allowing client applications to access information about and control Xprint jobs from an Xprint server. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibxprintapputil CSWlibxprintapputildevel + +CATALOGNAME_CSWlibxprintapputil = libxprintapputil +CATALOGNAME_CSWlibxprintapputildevel = libxprintapputil_devel + +SPKG_DESC_CSWlibxprintapputil = $(DESCRIPTION) +SPKG_DESC_CSWlibxprintapputildevel = $(DESCRIPTION) development files + +PREREQUISITE_PKGS = CSWlibxprintutildevel +REQUIRED_PKGS_CSWlibxprintapputil = CSWlibice CSWlibx11 CSWlibxau CSWlibxp CSWlibxprintutil CSWlibxt +REQUIRED_PKGS_CSWlibxprintapputildevel = CSWlibxprintapputil + +PKGFILES_CSWlibxprintapputildevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libxprintapputil/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxprintapputil/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxprintapputil/trunk/checksums 2009-09-27 18:53:14 UTC (rev 6505) @@ -0,0 +1 @@ +d2de510570aa6714681109b2ba178365 download/libXprintAppUtil-1.0.1.tar.bz2 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 Sep 27 20:57:50 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 18:57:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6506] csw/mgar/pkg/x11 Message-ID: Revision: 6506 http://gar.svn.sourceforge.net/gar/?rev=6506&view=rev Author: wbonnet Date: 2009-09-27 18:57:49 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxtrap/ csw/mgar/pkg/x11/libxtrap/branches/ csw/mgar/pkg/x11/libxtrap/tags/ csw/mgar/pkg/x11/libxtrap/trunk/ csw/mgar/pkg/x11/libxtrap/trunk/Makefile csw/mgar/pkg/x11/libxtrap/trunk/checksums csw/mgar/pkg/x11/libxtrap/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxtrap/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/x11/libxtrap/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxtrap/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxtrap/trunk/Makefile 2009-09-27 18:57:49 UTC (rev 6506) @@ -0,0 +1,35 @@ +GARNAME = libXTrap +GARVERSION = 1.0.0 +CATEGORIES = x11 + +DESCRIPTION = X11 event trapping extension library +define BLURB + libXTrap provides an interface to the DEC-XTRAP extension, which allows for capture and synthesis of core input events. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibxtrap CSWlibxtrapdevel + +CATALOGNAME_CSWlibxtrap = libxtrap +CATALOGNAME_CSWlibxtrapdevel = libxtrap_devel + +SPKG_DESC_CSWlibxtrap = $(DESCRIPTION) +SPKG_DESC_CSWlibxtrapdevel = $(DESCRIPTION) development files + +PREREQUISITE_PKGS = CSWtrapproto CSWlibxtdevel CSWlibsmdevel CSWlibicedevel +REQUIRED_PKGS_CSWlibxtrap = CSWlibice CSWlibx11 CSWlibxext CSWlibxt +REQUIRED_PKGS_CSWlibxtrapdevel = CSWlibxtrap + +PKGFILES_CSWlibxtrapdevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libxtrap/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxtrap/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxtrap/trunk/checksums 2009-09-27 18:57:49 UTC (rev 6506) @@ -0,0 +1 @@ +1e2d966b5b2b89910e418bb0f78e10de download/libXTrap-1.0.0.tar.bz2 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 Sep 27 21:06:08 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:06:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[6507] csw/mgar/pkg/x11/fixesproto/trunk Message-ID: Revision: 6507 http://gar.svn.sourceforge.net/gar/?rev=6507&view=rev Author: wbonnet Date: 2009-09-27 19:06:08 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Downgrade to version 4.0 for compilation issues. Some others libs have not yet been updated Modified Paths: -------------- csw/mgar/pkg/x11/fixesproto/trunk/Makefile csw/mgar/pkg/x11/fixesproto/trunk/checksums Modified: csw/mgar/pkg/x11/fixesproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/fixesproto/trunk/Makefile 2009-09-27 18:57:49 UTC (rev 6506) +++ csw/mgar/pkg/x11/fixesproto/trunk/Makefile 2009-09-27 19:06:08 UTC (rev 6507) @@ -1,5 +1,5 @@ GARNAME = fixesproto -GARVERSION = 4.1 +GARVERSION = 4.0 CATEGORIES = x11 DESCRIPTION = X11 Fixes extension protocol specification Modified: csw/mgar/pkg/x11/fixesproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/fixesproto/trunk/checksums 2009-09-27 18:57:49 UTC (rev 6506) +++ csw/mgar/pkg/x11/fixesproto/trunk/checksums 2009-09-27 19:06:08 UTC (rev 6507) @@ -1 +1 @@ -c8dc868f8f23bb4b545e6b98aed375b4 download/fixesproto-4.1.tar.gz +ed4af7fbf04a51aca684c259784520f3 download/fixesproto-4.0.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 Sun Sep 27 21:11:39 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:11:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[6508] csw/mgar/pkg/x11 Message-ID: Revision: 6508 http://gar.svn.sourceforge.net/gar/?rev=6508&view=rev Author: wbonnet Date: 2009-09-27 19:11:39 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxcomposite/ csw/mgar/pkg/x11/libxcomposite/branches/ csw/mgar/pkg/x11/libxcomposite/tags/ csw/mgar/pkg/x11/libxcomposite/trunk/ csw/mgar/pkg/x11/libxcomposite/trunk/Makefile csw/mgar/pkg/x11/libxcomposite/trunk/checksums csw/mgar/pkg/x11/libxcomposite/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxcomposite/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/x11/libxcomposite/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxcomposite/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxcomposite/trunk/Makefile 2009-09-27 19:11:39 UTC (rev 6508) @@ -0,0 +1,36 @@ +GARNAME = libXcomposite +GARVERSION = 0.4.0 +CATEGORIES = x11 + +DESCRIPTION = X11 Composite extension library +define BLURB + libXcomposite provides an X Window System client interface to the Composite extension to the X protocol. +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibxcomposite CSWlibxcompositedevel + +CATALOGNAME_CSWlibxcomposite = libxcomposite +CATALOGNAME_CSWlibxcompositedevel = libxcomposite_devel + +SPKG_DESC_CSWlibxcomposite = $(DESCRIPTION) +SPKG_DESC_CSWlibxcompositedevel = $(DESCRIPTION) development files + +PREREQUISITE_PKGS = CSWcompositeproto +REQUIRED_PKGS_CSWlibxcompositedevel = CSWlibxcomposite +REQUIRED_PKGS_CSWlibxcomposite = CSWlibx11 CSWlibxext CSWlibxfixes + +PKGFILES_CSWlibxcompositedevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk + Added: csw/mgar/pkg/x11/libxcomposite/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxcomposite/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxcomposite/trunk/checksums 2009-09-27 19:11:39 UTC (rev 6508) @@ -0,0 +1 @@ +7e95395dea89be21bae929b9b7f16641 download/libXcomposite-0.4.0.tar.bz2 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 Sep 27 21:25:50 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:25:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6509] csw/mgar/pkg/x11 Message-ID: Revision: 6509 http://gar.svn.sourceforge.net/gar/?rev=6509&view=rev Author: wbonnet Date: 2009-09-27 19:25:50 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxfont/ csw/mgar/pkg/x11/libxfont/branches/ csw/mgar/pkg/x11/libxfont/tags/ csw/mgar/pkg/x11/libxfont/trunk/ csw/mgar/pkg/x11/libxfont/trunk/Makefile csw/mgar/pkg/x11/libxfont/trunk/checksums csw/mgar/pkg/x11/libxfont/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxfont/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/x11/libxfont/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxfont/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxfont/trunk/Makefile 2009-09-27 19:25:50 UTC (rev 6509) @@ -0,0 +1,35 @@ +GARNAME = libXfont +GARVERSION = 1.4.0 +CATEGORIES = x11 + +DESCRIPTION = X11 font rasterisation library +define BLURB + libXfont provides various services for X servers, most notably font selection and rasterisation (through external libraries). +endef + +MASTER_SITES = $(X11_LIB_MASTER_SITE) +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) + +PACKAGES = CSWlibxfont CSWlibxfontdevel + +CATALOGNAME_CSWlibxfont = libxfont +CATALOGNAME_CSWlibxfontdevel = libxfont_devel + +SPKG_DESC_CSWlibxfont = $(DESCRIPTION) +SPKG_DESC_CSWlibxfontdevel = $(DESCRIPTION) development files + +PREREQUISITE_PKGS = CSWlibfontencdevel +REQUIRED_PKGS_CSWlibxfontdevel = CSWlibxfont +REQUIRED_PKGS_CSWlibxfont = CSWftype2 CSWlibfontenc CSWzlib + +PKGFILES_CSWlibxfontdevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 + +include gar/category.mk Added: csw/mgar/pkg/x11/libxfont/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxfont/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxfont/trunk/checksums 2009-09-27 19:25:50 UTC (rev 6509) @@ -0,0 +1 @@ +3a8e06b25912ef339d70a8ba003da9b5 download/libXfont-1.4.0.tar.bz2 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 Sep 27 21:55:02 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:55:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[6510] csw/mgar/pkg/x11/applewmproto/Makefile Message-ID: Revision: 6510 http://gar.svn.sourceforge.net/gar/?rev=6510&view=rev Author: wbonnet Date: 2009-09-27 19:55:02 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/applewmproto/Makefile Modified: csw/mgar/pkg/x11/applewmproto/Makefile =================================================================== --- csw/mgar/pkg/x11/applewmproto/Makefile 2009-09-27 19:25:50 UTC (rev 6509) +++ csw/mgar/pkg/x11/applewmproto/Makefile 2009-09-27 19:55:02 UTC (rev 6510) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/xproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 21:55:18 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:55:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[6511] csw/mgar/pkg/x11/bigreqsproto/Makefile Message-ID: Revision: 6511 http://gar.svn.sourceforge.net/gar/?rev=6511&view=rev Author: wbonnet Date: 2009-09-27 19:55:18 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/bigreqsproto/Makefile Modified: csw/mgar/pkg/x11/bigreqsproto/Makefile =================================================================== --- csw/mgar/pkg/x11/bigreqsproto/Makefile 2009-09-27 19:55:02 UTC (rev 6510) +++ csw/mgar/pkg/x11/bigreqsproto/Makefile 2009-09-27 19:55:18 UTC (rev 6511) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/xproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 21:55:31 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:55:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[6512] csw/mgar/pkg/x11/compositeproto/Makefile Message-ID: Revision: 6512 http://gar.svn.sourceforge.net/gar/?rev=6512&view=rev Author: wbonnet Date: 2009-09-27 19:55:30 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/compositeproto/Makefile Modified: csw/mgar/pkg/x11/compositeproto/Makefile =================================================================== --- csw/mgar/pkg/x11/compositeproto/Makefile 2009-09-27 19:55:18 UTC (rev 6511) +++ csw/mgar/pkg/x11/compositeproto/Makefile 2009-09-27 19:55:30 UTC (rev 6512) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/xproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 21:55:46 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:55:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6513] csw/mgar/pkg/x11/damageproto/Makefile Message-ID: Revision: 6513 http://gar.svn.sourceforge.net/gar/?rev=6513&view=rev Author: wbonnet Date: 2009-09-27 19:55:46 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/damageproto/Makefile Modified: csw/mgar/pkg/x11/damageproto/Makefile =================================================================== --- csw/mgar/pkg/x11/damageproto/Makefile 2009-09-27 19:55:30 UTC (rev 6512) +++ csw/mgar/pkg/x11/damageproto/Makefile 2009-09-27 19:55:46 UTC (rev 6513) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/xproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 21:56:05 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:56:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6514] csw/mgar/pkg/x11/dmxproto/Makefile Message-ID: Revision: 6514 http://gar.svn.sourceforge.net/gar/?rev=6514&view=rev Author: wbonnet Date: 2009-09-27 19:56:04 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/dmxproto/Makefile Modified: csw/mgar/pkg/x11/dmxproto/Makefile =================================================================== --- csw/mgar/pkg/x11/dmxproto/Makefile 2009-09-27 19:55:46 UTC (rev 6513) +++ csw/mgar/pkg/x11/dmxproto/Makefile 2009-09-27 19:56:04 UTC (rev 6514) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/xproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 21:56:21 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:56:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[6515] csw/mgar/pkg/x11/dri2proto/Makefile Message-ID: Revision: 6515 http://gar.svn.sourceforge.net/gar/?rev=6515&view=rev Author: wbonnet Date: 2009-09-27 19:56:21 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/dri2proto/Makefile Modified: csw/mgar/pkg/x11/dri2proto/Makefile =================================================================== --- csw/mgar/pkg/x11/dri2proto/Makefile 2009-09-27 19:56:04 UTC (rev 6514) +++ csw/mgar/pkg/x11/dri2proto/Makefile 2009-09-27 19:56:21 UTC (rev 6515) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/xproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 21:56:33 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:56:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[6516] csw/mgar/pkg/x11/evieextproto/Makefile Message-ID: Revision: 6516 http://gar.svn.sourceforge.net/gar/?rev=6516&view=rev Author: wbonnet Date: 2009-09-27 19:56:33 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/evieextproto/Makefile Modified: csw/mgar/pkg/x11/evieextproto/Makefile =================================================================== --- csw/mgar/pkg/x11/evieextproto/Makefile 2009-09-27 19:56:21 UTC (rev 6515) +++ csw/mgar/pkg/x11/evieextproto/Makefile 2009-09-27 19:56:33 UTC (rev 6516) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/xproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 21:56:57 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:56:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[6517] csw/mgar/pkg/x11/fixesproto/Makefile Message-ID: Revision: 6517 http://gar.svn.sourceforge.net/gar/?rev=6517&view=rev Author: wbonnet Date: 2009-09-27 19:56:57 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/fixesproto/Makefile Modified: csw/mgar/pkg/x11/fixesproto/Makefile =================================================================== --- csw/mgar/pkg/x11/fixesproto/Makefile 2009-09-27 19:56:33 UTC (rev 6516) +++ csw/mgar/pkg/x11/fixesproto/Makefile 2009-09-27 19:56:57 UTC (rev 6517) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/xproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 21:57:16 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:57:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[6518] csw/mgar/pkg/x11/fontcacheproto/Makefile Message-ID: Revision: 6518 http://gar.svn.sourceforge.net/gar/?rev=6518&view=rev Author: wbonnet Date: 2009-09-27 19:57:16 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/fontcacheproto/Makefile Modified: csw/mgar/pkg/x11/fontcacheproto/Makefile =================================================================== --- csw/mgar/pkg/x11/fontcacheproto/Makefile 2009-09-27 19:56:57 UTC (rev 6517) +++ csw/mgar/pkg/x11/fontcacheproto/Makefile 2009-09-27 19:57:16 UTC (rev 6518) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/xproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 21:57:30 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:57:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[6519] csw/mgar/pkg/x11/fontsproto/Makefile Message-ID: Revision: 6519 http://gar.svn.sourceforge.net/gar/?rev=6519&view=rev Author: wbonnet Date: 2009-09-27 19:57:29 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/fontsproto/Makefile Added: csw/mgar/pkg/x11/fontsproto/Makefile =================================================================== --- csw/mgar/pkg/x11/fontsproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/fontsproto/Makefile 2009-09-27 19:57:29 UTC (rev 6519) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 21:57:39 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:57:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[6520] csw/mgar/pkg/x11/glproto/Makefile Message-ID: Revision: 6520 http://gar.svn.sourceforge.net/gar/?rev=6520&view=rev Author: wbonnet Date: 2009-09-27 19:57:39 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/glproto/Makefile Modified: csw/mgar/pkg/x11/glproto/Makefile =================================================================== --- csw/mgar/pkg/x11/glproto/Makefile 2009-09-27 19:57:29 UTC (rev 6519) +++ csw/mgar/pkg/x11/glproto/Makefile 2009-09-27 19:57:39 UTC (rev 6520) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/glproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 21:57:54 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:57:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[6521] csw/mgar/pkg/x11/inputproto/Makefile Message-ID: Revision: 6521 http://gar.svn.sourceforge.net/gar/?rev=6521&view=rev Author: wbonnet Date: 2009-09-27 19:57:54 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/inputproto/Makefile Modified: csw/mgar/pkg/x11/inputproto/Makefile =================================================================== --- csw/mgar/pkg/x11/inputproto/Makefile 2009-09-27 19:57:39 UTC (rev 6520) +++ csw/mgar/pkg/x11/inputproto/Makefile 2009-09-27 19:57:54 UTC (rev 6521) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/inputproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 21:58:05 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:58:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6522] csw/mgar/pkg/x11/kbproto/Makefile Message-ID: Revision: 6522 http://gar.svn.sourceforge.net/gar/?rev=6522&view=rev Author: wbonnet Date: 2009-09-27 19:58:05 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/kbproto/Makefile Modified: csw/mgar/pkg/x11/kbproto/Makefile =================================================================== --- csw/mgar/pkg/x11/kbproto/Makefile 2009-09-27 19:57:54 UTC (rev 6521) +++ csw/mgar/pkg/x11/kbproto/Makefile 2009-09-27 19:58:05 UTC (rev 6522) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/kbproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 21:58:23 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:58:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6523] csw/mgar/pkg/x11/libdmx/Makefile Message-ID: Revision: 6523 http://gar.svn.sourceforge.net/gar/?rev=6523&view=rev Author: wbonnet Date: 2009-09-27 19:58:22 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libdmx/Makefile Added: csw/mgar/pkg/x11/libdmx/Makefile =================================================================== --- csw/mgar/pkg/x11/libdmx/Makefile (rev 0) +++ csw/mgar/pkg/x11/libdmx/Makefile 2009-09-27 19:58:22 UTC (rev 6523) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 21:58:39 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:58:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[6524] csw/mgar/pkg/x11/libfontenc/Makefile Message-ID: Revision: 6524 http://gar.svn.sourceforge.net/gar/?rev=6524&view=rev Author: wbonnet Date: 2009-09-27 19:58:38 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libfontenc/Makefile Added: csw/mgar/pkg/x11/libfontenc/Makefile =================================================================== --- csw/mgar/pkg/x11/libfontenc/Makefile (rev 0) +++ csw/mgar/pkg/x11/libfontenc/Makefile 2009-09-27 19:58:38 UTC (rev 6524) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 21:58:52 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:58:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[6525] csw/mgar/pkg/x11/libfs/Makefile Message-ID: Revision: 6525 http://gar.svn.sourceforge.net/gar/?rev=6525&view=rev Author: wbonnet Date: 2009-09-27 19:58:52 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/libfs/Makefile Modified: csw/mgar/pkg/x11/libfs/Makefile =================================================================== --- csw/mgar/pkg/x11/libfs/Makefile 2009-09-27 19:58:38 UTC (rev 6524) +++ csw/mgar/pkg/x11/libfs/Makefile 2009-09-27 19:58:52 UTC (rev 6525) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/libFS directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 21:59:12 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:59:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[6526] csw/mgar/pkg/x11/libice/Makefile Message-ID: Revision: 6526 http://gar.svn.sourceforge.net/gar/?rev=6526&view=rev Author: wbonnet Date: 2009-09-27 19:59:12 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libice/Makefile Added: csw/mgar/pkg/x11/libice/Makefile =================================================================== --- csw/mgar/pkg/x11/libice/Makefile (rev 0) +++ csw/mgar/pkg/x11/libice/Makefile 2009-09-27 19:59:12 UTC (rev 6526) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 21:59:27 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:59:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[6527] csw/mgar/pkg/x11/liblbxutil/Makefile Message-ID: Revision: 6527 http://gar.svn.sourceforge.net/gar/?rev=6527&view=rev Author: wbonnet Date: 2009-09-27 19:59:26 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/liblbxutil/Makefile Added: csw/mgar/pkg/x11/liblbxutil/Makefile =================================================================== --- csw/mgar/pkg/x11/liblbxutil/Makefile (rev 0) +++ csw/mgar/pkg/x11/liblbxutil/Makefile 2009-09-27 19:59:26 UTC (rev 6527) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 21:59:48 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 19:59:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[6528] csw/mgar/pkg/x11/liboldx/Makefile Message-ID: Revision: 6528 http://gar.svn.sourceforge.net/gar/?rev=6528&view=rev Author: wbonnet Date: 2009-09-27 19:59:48 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/liboldx/Makefile Added: csw/mgar/pkg/x11/liboldx/Makefile =================================================================== --- csw/mgar/pkg/x11/liboldx/Makefile (rev 0) +++ csw/mgar/pkg/x11/liboldx/Makefile 2009-09-27 19:59:48 UTC (rev 6528) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:00:20 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:00:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[6529] csw/mgar/pkg/x11/libpthread-stubs/Makefile Message-ID: Revision: 6529 http://gar.svn.sourceforge.net/gar/?rev=6529&view=rev Author: wbonnet Date: 2009-09-27 20:00:19 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/libpthread-stubs/Makefile Modified: csw/mgar/pkg/x11/libpthread-stubs/Makefile =================================================================== --- csw/mgar/pkg/x11/libpthread-stubs/Makefile 2009-09-27 19:59:48 UTC (rev 6528) +++ csw/mgar/pkg/x11/libpthread-stubs/Makefile 2009-09-27 20:00:19 UTC (rev 6529) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/ directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 22:00:48 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:00:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[6530] csw/mgar/pkg/x11/libsm/Makefile Message-ID: Revision: 6530 http://gar.svn.sourceforge.net/gar/?rev=6530&view=rev Author: wbonnet Date: 2009-09-27 20:00:48 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libsm/Makefile Added: csw/mgar/pkg/x11/libsm/Makefile =================================================================== --- csw/mgar/pkg/x11/libsm/Makefile (rev 0) +++ csw/mgar/pkg/x11/libsm/Makefile 2009-09-27 20:00:48 UTC (rev 6530) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:01:03 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:01:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[6531] csw/mgar/pkg/x11/libwindowswm/Makefile Message-ID: Revision: 6531 http://gar.svn.sourceforge.net/gar/?rev=6531&view=rev Author: wbonnet Date: 2009-09-27 20:01:03 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libwindowswm/Makefile Added: csw/mgar/pkg/x11/libwindowswm/Makefile =================================================================== --- csw/mgar/pkg/x11/libwindowswm/Makefile (rev 0) +++ csw/mgar/pkg/x11/libwindowswm/Makefile 2009-09-27 20:01:03 UTC (rev 6531) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:01:19 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:01:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[6532] csw/mgar/pkg/x11/libx11/Makefile Message-ID: Revision: 6532 http://gar.svn.sourceforge.net/gar/?rev=6532&view=rev Author: wbonnet Date: 2009-09-27 20:01:18 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/libx11/Makefile Modified: csw/mgar/pkg/x11/libx11/Makefile =================================================================== --- csw/mgar/pkg/x11/libx11/Makefile 2009-09-27 20:01:03 UTC (rev 6531) +++ csw/mgar/pkg/x11/libx11/Makefile 2009-09-27 20:01:18 UTC (rev 6532) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/ directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 22:01:31 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:01:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[6533] csw/mgar/pkg/x11/libxau/Makefile Message-ID: Revision: 6533 http://gar.svn.sourceforge.net/gar/?rev=6533&view=rev Author: wbonnet Date: 2009-09-27 20:01:31 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/libxau/Makefile Modified: csw/mgar/pkg/x11/libxau/Makefile =================================================================== --- csw/mgar/pkg/x11/libxau/Makefile 2009-09-27 20:01:18 UTC (rev 6532) +++ csw/mgar/pkg/x11/libxau/Makefile 2009-09-27 20:01:31 UTC (rev 6533) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/ directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 22:01:44 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:01:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[6534] csw/mgar/pkg/x11/libxaw/Makefile Message-ID: Revision: 6534 http://gar.svn.sourceforge.net/gar/?rev=6534&view=rev Author: wbonnet Date: 2009-09-27 20:01:43 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxaw/Makefile Added: csw/mgar/pkg/x11/libxaw/Makefile =================================================================== --- csw/mgar/pkg/x11/libxaw/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxaw/Makefile 2009-09-27 20:01:43 UTC (rev 6534) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:01:57 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:01:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[6535] csw/mgar/pkg/x11/libxcb/Makefile Message-ID: Revision: 6535 http://gar.svn.sourceforge.net/gar/?rev=6535&view=rev Author: wbonnet Date: 2009-09-27 20:01:57 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/libxcb/Makefile Modified: csw/mgar/pkg/x11/libxcb/Makefile =================================================================== --- csw/mgar/pkg/x11/libxcb/Makefile 2009-09-27 20:01:43 UTC (rev 6534) +++ csw/mgar/pkg/x11/libxcb/Makefile 2009-09-27 20:01:57 UTC (rev 6535) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/ directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 22:02:13 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:02:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[6536] csw/mgar/pkg/x11/libxcomposite/Makefile Message-ID: Revision: 6536 http://gar.svn.sourceforge.net/gar/?rev=6536&view=rev Author: wbonnet Date: 2009-09-27 20:02:12 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxcomposite/Makefile Added: csw/mgar/pkg/x11/libxcomposite/Makefile =================================================================== --- csw/mgar/pkg/x11/libxcomposite/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxcomposite/Makefile 2009-09-27 20:02:12 UTC (rev 6536) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:02:25 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:02:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[6537] csw/mgar/pkg/x11/libxcursor/Makefile Message-ID: Revision: 6537 http://gar.svn.sourceforge.net/gar/?rev=6537&view=rev Author: wbonnet Date: 2009-09-27 20:02:25 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxcursor/Makefile Added: csw/mgar/pkg/x11/libxcursor/Makefile =================================================================== --- csw/mgar/pkg/x11/libxcursor/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxcursor/Makefile 2009-09-27 20:02:25 UTC (rev 6537) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:02:41 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:02:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[6538] csw/mgar/pkg/x11/libxdamage/Makefile Message-ID: Revision: 6538 http://gar.svn.sourceforge.net/gar/?rev=6538&view=rev Author: wbonnet Date: 2009-09-27 20:02:40 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxdamage/Makefile Added: csw/mgar/pkg/x11/libxdamage/Makefile =================================================================== --- csw/mgar/pkg/x11/libxdamage/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxdamage/Makefile 2009-09-27 20:02:40 UTC (rev 6538) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:02:59 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:02:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6539] csw/mgar/pkg/x11/libxdmcp/Makefile Message-ID: Revision: 6539 http://gar.svn.sourceforge.net/gar/?rev=6539&view=rev Author: wbonnet Date: 2009-09-27 20:02:59 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/libxdmcp/Makefile Modified: csw/mgar/pkg/x11/libxdmcp/Makefile =================================================================== --- csw/mgar/pkg/x11/libxdmcp/Makefile 2009-09-27 20:02:40 UTC (rev 6538) +++ csw/mgar/pkg/x11/libxdmcp/Makefile 2009-09-27 20:02:59 UTC (rev 6539) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/ directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 22:03:10 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:03:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[6540] csw/mgar/pkg/x11/libxevie/Makefile Message-ID: Revision: 6540 http://gar.svn.sourceforge.net/gar/?rev=6540&view=rev Author: wbonnet Date: 2009-09-27 20:03:09 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxevie/Makefile Added: csw/mgar/pkg/x11/libxevie/Makefile =================================================================== --- csw/mgar/pkg/x11/libxevie/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxevie/Makefile 2009-09-27 20:03:09 UTC (rev 6540) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:03:24 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:03:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[6541] csw/mgar/pkg/x11/libxext/Makefile Message-ID: Revision: 6541 http://gar.svn.sourceforge.net/gar/?rev=6541&view=rev Author: wbonnet Date: 2009-09-27 20:03:24 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxext/Makefile Added: csw/mgar/pkg/x11/libxext/Makefile =================================================================== --- csw/mgar/pkg/x11/libxext/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxext/Makefile 2009-09-27 20:03:24 UTC (rev 6541) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:03:37 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:03:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[6542] csw/mgar/pkg/x11/libxfixes/Makefile Message-ID: Revision: 6542 http://gar.svn.sourceforge.net/gar/?rev=6542&view=rev Author: wbonnet Date: 2009-09-27 20:03:37 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxfixes/Makefile Added: csw/mgar/pkg/x11/libxfixes/Makefile =================================================================== --- csw/mgar/pkg/x11/libxfixes/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxfixes/Makefile 2009-09-27 20:03:37 UTC (rev 6542) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:03:47 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:03:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[6543] csw/mgar/pkg/x11/libxfont/Makefile Message-ID: Revision: 6543 http://gar.svn.sourceforge.net/gar/?rev=6543&view=rev Author: wbonnet Date: 2009-09-27 20:03:46 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxfont/Makefile Added: csw/mgar/pkg/x11/libxfont/Makefile =================================================================== --- csw/mgar/pkg/x11/libxfont/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxfont/Makefile 2009-09-27 20:03:46 UTC (rev 6543) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:03:59 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:03:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6544] csw/mgar/pkg/x11/libxfontcache/Makefile Message-ID: Revision: 6544 http://gar.svn.sourceforge.net/gar/?rev=6544&view=rev Author: wbonnet Date: 2009-09-27 20:03:59 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxfontcache/Makefile Added: csw/mgar/pkg/x11/libxfontcache/Makefile =================================================================== --- csw/mgar/pkg/x11/libxfontcache/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxfontcache/Makefile 2009-09-27 20:03:59 UTC (rev 6544) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:04:13 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:04:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[6545] csw/mgar/pkg/x11/libxft/Makefile Message-ID: Revision: 6545 http://gar.svn.sourceforge.net/gar/?rev=6545&view=rev Author: wbonnet Date: 2009-09-27 20:04:12 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxft/Makefile Added: csw/mgar/pkg/x11/libxft/Makefile =================================================================== --- csw/mgar/pkg/x11/libxft/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxft/Makefile 2009-09-27 20:04:12 UTC (rev 6545) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:04:26 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:04:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[6546] csw/mgar/pkg/x11/libxi/Makefile Message-ID: Revision: 6546 http://gar.svn.sourceforge.net/gar/?rev=6546&view=rev Author: wbonnet Date: 2009-09-27 20:04:25 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxi/Makefile Added: csw/mgar/pkg/x11/libxi/Makefile =================================================================== --- csw/mgar/pkg/x11/libxi/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxi/Makefile 2009-09-27 20:04:25 UTC (rev 6546) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:04:37 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:04:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[6547] csw/mgar/pkg/x11/libxinerama/Makefile Message-ID: Revision: 6547 http://gar.svn.sourceforge.net/gar/?rev=6547&view=rev Author: wbonnet Date: 2009-09-27 20:04:36 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxinerama/Makefile Added: csw/mgar/pkg/x11/libxinerama/Makefile =================================================================== --- csw/mgar/pkg/x11/libxinerama/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxinerama/Makefile 2009-09-27 20:04:36 UTC (rev 6547) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:04:54 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:04:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[6548] csw/mgar/pkg/x11/libxkbfile/Makefile Message-ID: Revision: 6548 http://gar.svn.sourceforge.net/gar/?rev=6548&view=rev Author: wbonnet Date: 2009-09-27 20:04:54 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxkbfile/Makefile Added: csw/mgar/pkg/x11/libxkbfile/Makefile =================================================================== --- csw/mgar/pkg/x11/libxkbfile/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxkbfile/Makefile 2009-09-27 20:04:54 UTC (rev 6548) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:05:10 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:05:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[6549] csw/mgar/pkg/x11/libxkbui/Makefile Message-ID: Revision: 6549 http://gar.svn.sourceforge.net/gar/?rev=6549&view=rev Author: wbonnet Date: 2009-09-27 20:05:09 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxkbui/Makefile Added: csw/mgar/pkg/x11/libxkbui/Makefile =================================================================== --- csw/mgar/pkg/x11/libxkbui/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxkbui/Makefile 2009-09-27 20:05:09 UTC (rev 6549) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:05:30 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:05:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[6550] csw/mgar/pkg/x11/libxmu/Makefile Message-ID: Revision: 6550 http://gar.svn.sourceforge.net/gar/?rev=6550&view=rev Author: wbonnet Date: 2009-09-27 20:05:30 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxmu/Makefile Added: csw/mgar/pkg/x11/libxmu/Makefile =================================================================== --- csw/mgar/pkg/x11/libxmu/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxmu/Makefile 2009-09-27 20:05:30 UTC (rev 6550) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:05:59 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:05:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[6551] csw/mgar/pkg/x11/libxp/Makefile Message-ID: Revision: 6551 http://gar.svn.sourceforge.net/gar/?rev=6551&view=rev Author: wbonnet Date: 2009-09-27 20:05:59 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxp/Makefile Added: csw/mgar/pkg/x11/libxp/Makefile =================================================================== --- csw/mgar/pkg/x11/libxp/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxp/Makefile 2009-09-27 20:05:59 UTC (rev 6551) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:06:43 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:06:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[6552] csw/mgar/pkg/x11/libxpm/Makefile Message-ID: Revision: 6552 http://gar.svn.sourceforge.net/gar/?rev=6552&view=rev Author: wbonnet Date: 2009-09-27 20:06:43 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxpm/Makefile Added: csw/mgar/pkg/x11/libxpm/Makefile =================================================================== --- csw/mgar/pkg/x11/libxpm/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxpm/Makefile 2009-09-27 20:06:43 UTC (rev 6552) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:07:14 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:07:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6553] csw/mgar/pkg/x11/libxprintapputil/Makefile Message-ID: Revision: 6553 http://gar.svn.sourceforge.net/gar/?rev=6553&view=rev Author: wbonnet Date: 2009-09-27 20:07:13 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxprintapputil/Makefile Added: csw/mgar/pkg/x11/libxprintapputil/Makefile =================================================================== --- csw/mgar/pkg/x11/libxprintapputil/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxprintapputil/Makefile 2009-09-27 20:07:13 UTC (rev 6553) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:07:35 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:07:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[6554] csw/mgar/pkg/x11/libxprintutil/Makefile Message-ID: Revision: 6554 http://gar.svn.sourceforge.net/gar/?rev=6554&view=rev Author: wbonnet Date: 2009-09-27 20:07:34 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxprintutil/Makefile Added: csw/mgar/pkg/x11/libxprintutil/Makefile =================================================================== --- csw/mgar/pkg/x11/libxprintutil/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxprintutil/Makefile 2009-09-27 20:07:34 UTC (rev 6554) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:07:50 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:07:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6555] csw/mgar/pkg/x11/libxrandr/Makefile Message-ID: Revision: 6555 http://gar.svn.sourceforge.net/gar/?rev=6555&view=rev Author: wbonnet Date: 2009-09-27 20:07:50 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxrandr/Makefile Added: csw/mgar/pkg/x11/libxrandr/Makefile =================================================================== --- csw/mgar/pkg/x11/libxrandr/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxrandr/Makefile 2009-09-27 20:07:50 UTC (rev 6555) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:08:05 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:08:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6556] csw/mgar/pkg/x11/libxres/Makefile Message-ID: Revision: 6556 http://gar.svn.sourceforge.net/gar/?rev=6556&view=rev Author: wbonnet Date: 2009-09-27 20:08:05 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxres/Makefile Added: csw/mgar/pkg/x11/libxres/Makefile =================================================================== --- csw/mgar/pkg/x11/libxres/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxres/Makefile 2009-09-27 20:08:05 UTC (rev 6556) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:08:21 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:08:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[6557] csw/mgar/pkg/x11/libxscrnsaver/Makefile Message-ID: Revision: 6557 http://gar.svn.sourceforge.net/gar/?rev=6557&view=rev Author: wbonnet Date: 2009-09-27 20:08:21 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxscrnsaver/Makefile Added: csw/mgar/pkg/x11/libxscrnsaver/Makefile =================================================================== --- csw/mgar/pkg/x11/libxscrnsaver/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxscrnsaver/Makefile 2009-09-27 20:08:21 UTC (rev 6557) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:08:35 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:08:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[6558] csw/mgar/pkg/x11/libxt/Makefile Message-ID: Revision: 6558 http://gar.svn.sourceforge.net/gar/?rev=6558&view=rev Author: wbonnet Date: 2009-09-27 20:08:35 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxt/Makefile Added: csw/mgar/pkg/x11/libxt/Makefile =================================================================== --- csw/mgar/pkg/x11/libxt/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxt/Makefile 2009-09-27 20:08:35 UTC (rev 6558) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:08:54 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:08:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[6559] csw/mgar/pkg/x11/libxtrap/Makefile Message-ID: Revision: 6559 http://gar.svn.sourceforge.net/gar/?rev=6559&view=rev Author: wbonnet Date: 2009-09-27 20:08:54 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxtrap/Makefile Added: csw/mgar/pkg/x11/libxtrap/Makefile =================================================================== --- csw/mgar/pkg/x11/libxtrap/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxtrap/Makefile 2009-09-27 20:08:54 UTC (rev 6559) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:09:09 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:09:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[6560] csw/mgar/pkg/x11/libxtst/Makefile Message-ID: Revision: 6560 http://gar.svn.sourceforge.net/gar/?rev=6560&view=rev Author: wbonnet Date: 2009-09-27 20:09:09 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxtst/Makefile Added: csw/mgar/pkg/x11/libxtst/Makefile =================================================================== --- csw/mgar/pkg/x11/libxtst/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxtst/Makefile 2009-09-27 20:09:09 UTC (rev 6560) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:09:22 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:09:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[6561] csw/mgar/pkg/x11/libxv/Makefile Message-ID: Revision: 6561 http://gar.svn.sourceforge.net/gar/?rev=6561&view=rev Author: wbonnet Date: 2009-09-27 20:09:21 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxv/Makefile Added: csw/mgar/pkg/x11/libxv/Makefile =================================================================== --- csw/mgar/pkg/x11/libxv/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxv/Makefile 2009-09-27 20:09:21 UTC (rev 6561) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:09:38 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:09:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6562] csw/mgar/pkg/x11/libxvmc/Makefile Message-ID: Revision: 6562 http://gar.svn.sourceforge.net/gar/?rev=6562&view=rev Author: wbonnet Date: 2009-09-27 20:09:38 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxvmc/Makefile Added: csw/mgar/pkg/x11/libxvmc/Makefile =================================================================== --- csw/mgar/pkg/x11/libxvmc/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxvmc/Makefile 2009-09-27 20:09:38 UTC (rev 6562) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:09:58 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:09:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[6563] csw/mgar/pkg/x11/libxxf86dga/Makefile Message-ID: Revision: 6563 http://gar.svn.sourceforge.net/gar/?rev=6563&view=rev Author: wbonnet Date: 2009-09-27 20:09:56 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxxf86dga/Makefile Added: csw/mgar/pkg/x11/libxxf86dga/Makefile =================================================================== --- csw/mgar/pkg/x11/libxxf86dga/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxxf86dga/Makefile 2009-09-27 20:09:56 UTC (rev 6563) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:10:14 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:10:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6564] csw/mgar/pkg/x11/libxxf86misc/Makefile Message-ID: Revision: 6564 http://gar.svn.sourceforge.net/gar/?rev=6564&view=rev Author: wbonnet Date: 2009-09-27 20:10:14 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxxf86misc/Makefile Added: csw/mgar/pkg/x11/libxxf86misc/Makefile =================================================================== --- csw/mgar/pkg/x11/libxxf86misc/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxxf86misc/Makefile 2009-09-27 20:10:14 UTC (rev 6564) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:10:27 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:10:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[6565] csw/mgar/pkg/x11/libxxf86vm/Makefile Message-ID: Revision: 6565 http://gar.svn.sourceforge.net/gar/?rev=6565&view=rev Author: wbonnet Date: 2009-09-27 20:10:27 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/libxxf86vm/Makefile Added: csw/mgar/pkg/x11/libxxf86vm/Makefile =================================================================== --- csw/mgar/pkg/x11/libxxf86vm/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxxf86vm/Makefile 2009-09-27 20:10:27 UTC (rev 6565) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:10:39 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:10:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[6566] csw/mgar/pkg/x11/printproto/Makefile Message-ID: Revision: 6566 http://gar.svn.sourceforge.net/gar/?rev=6566&view=rev Author: wbonnet Date: 2009-09-27 20:10:39 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/printproto/Makefile Added: csw/mgar/pkg/x11/printproto/Makefile =================================================================== --- csw/mgar/pkg/x11/printproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/printproto/Makefile 2009-09-27 20:10:39 UTC (rev 6566) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:10:53 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:10:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[6567] csw/mgar/pkg/x11/randrproto/Makefile Message-ID: Revision: 6567 http://gar.svn.sourceforge.net/gar/?rev=6567&view=rev Author: wbonnet Date: 2009-09-27 20:10:52 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/randrproto/Makefile Modified: csw/mgar/pkg/x11/randrproto/Makefile =================================================================== --- csw/mgar/pkg/x11/randrproto/Makefile 2009-09-27 20:10:39 UTC (rev 6566) +++ csw/mgar/pkg/x11/randrproto/Makefile 2009-09-27 20:10:52 UTC (rev 6567) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/xproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 22:11:11 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:11:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[6568] csw/mgar/pkg/x11/recordproto/Makefile Message-ID: Revision: 6568 http://gar.svn.sourceforge.net/gar/?rev=6568&view=rev Author: wbonnet Date: 2009-09-27 20:11:11 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/recordproto/Makefile Modified: csw/mgar/pkg/x11/recordproto/Makefile =================================================================== --- csw/mgar/pkg/x11/recordproto/Makefile 2009-09-27 20:10:52 UTC (rev 6567) +++ csw/mgar/pkg/x11/recordproto/Makefile 2009-09-27 20:11:11 UTC (rev 6568) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/recordproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 22:11:23 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:11:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6569] csw/mgar/pkg/x11/renderproto/Makefile Message-ID: Revision: 6569 http://gar.svn.sourceforge.net/gar/?rev=6569&view=rev Author: wbonnet Date: 2009-09-27 20:11:22 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/renderproto/Makefile Modified: csw/mgar/pkg/x11/renderproto/Makefile =================================================================== --- csw/mgar/pkg/x11/renderproto/Makefile 2009-09-27 20:11:11 UTC (rev 6568) +++ csw/mgar/pkg/x11/renderproto/Makefile 2009-09-27 20:11:22 UTC (rev 6569) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/renderproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 22:11:33 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:11:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[6570] csw/mgar/pkg/x11/resourceproto/Makefile Message-ID: Revision: 6570 http://gar.svn.sourceforge.net/gar/?rev=6570&view=rev Author: wbonnet Date: 2009-09-27 20:11:33 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/resourceproto/Makefile Added: csw/mgar/pkg/x11/resourceproto/Makefile =================================================================== --- csw/mgar/pkg/x11/resourceproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/resourceproto/Makefile 2009-09-27 20:11:33 UTC (rev 6570) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:11:46 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:11:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6571] csw/mgar/pkg/x11/scrnsaverproto/Makefile Message-ID: Revision: 6571 http://gar.svn.sourceforge.net/gar/?rev=6571&view=rev Author: wbonnet Date: 2009-09-27 20:11:46 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/scrnsaverproto/Makefile Modified: csw/mgar/pkg/x11/scrnsaverproto/Makefile =================================================================== --- csw/mgar/pkg/x11/scrnsaverproto/Makefile 2009-09-27 20:11:33 UTC (rev 6570) +++ csw/mgar/pkg/x11/scrnsaverproto/Makefile 2009-09-27 20:11:46 UTC (rev 6571) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/xproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 22:12:06 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:12:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6572] csw/mgar/pkg/x11/trapproto/Makefile Message-ID: Revision: 6572 http://gar.svn.sourceforge.net/gar/?rev=6572&view=rev Author: wbonnet Date: 2009-09-27 20:12:05 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/trapproto/Makefile Modified: csw/mgar/pkg/x11/trapproto/Makefile =================================================================== --- csw/mgar/pkg/x11/trapproto/Makefile 2009-09-27 20:11:46 UTC (rev 6571) +++ csw/mgar/pkg/x11/trapproto/Makefile 2009-09-27 20:12:05 UTC (rev 6572) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/xproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 22:12:22 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:12:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[6573] csw/mgar/pkg/x11/videoproto/Makefile Message-ID: Revision: 6573 http://gar.svn.sourceforge.net/gar/?rev=6573&view=rev Author: wbonnet Date: 2009-09-27 20:12:20 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/videoproto/Makefile Modified: csw/mgar/pkg/x11/videoproto/Makefile =================================================================== --- csw/mgar/pkg/x11/videoproto/Makefile 2009-09-27 20:12:05 UTC (rev 6572) +++ csw/mgar/pkg/x11/videoproto/Makefile 2009-09-27 20:12:20 UTC (rev 6573) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/videoproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 22:12:36 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:12:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[6574] csw/mgar/pkg/x11/windowswmproto/Makefile Message-ID: Revision: 6574 http://gar.svn.sourceforge.net/gar/?rev=6574&view=rev Author: wbonnet Date: 2009-09-27 20:12:35 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/windowswmproto/Makefile Modified: csw/mgar/pkg/x11/windowswmproto/Makefile =================================================================== --- csw/mgar/pkg/x11/windowswmproto/Makefile 2009-09-27 20:12:20 UTC (rev 6573) +++ csw/mgar/pkg/x11/windowswmproto/Makefile 2009-09-27 20:12:35 UTC (rev 6574) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/xproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 22:12:50 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:12:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6575] csw/mgar/pkg/x11/x11common/Makefile Message-ID: Revision: 6575 http://gar.svn.sourceforge.net/gar/?rev=6575&view=rev Author: wbonnet Date: 2009-09-27 20:12:50 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11common/Makefile Added: csw/mgar/pkg/x11/x11common/Makefile =================================================================== --- csw/mgar/pkg/x11/x11common/Makefile (rev 0) +++ csw/mgar/pkg/x11/x11common/Makefile 2009-09-27 20:12:50 UTC (rev 6575) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:13:02 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:13:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[6576] csw/mgar/pkg/x11/xcb-proto/Makefile Message-ID: Revision: 6576 http://gar.svn.sourceforge.net/gar/?rev=6576&view=rev Author: wbonnet Date: 2009-09-27 20:12:59 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/xcb-proto/Makefile Modified: csw/mgar/pkg/x11/xcb-proto/Makefile =================================================================== --- csw/mgar/pkg/x11/xcb-proto/Makefile 2009-09-27 20:12:50 UTC (rev 6575) +++ csw/mgar/pkg/x11/xcb-proto/Makefile 2009-09-27 20:12:59 UTC (rev 6576) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/xcb-proto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 22:13:22 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:13:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[6577] csw/mgar/pkg/x11/xcb-util/Makefile Message-ID: Revision: 6577 http://gar.svn.sourceforge.net/gar/?rev=6577&view=rev Author: wbonnet Date: 2009-09-27 20:13:22 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/xcb-util/Makefile Added: csw/mgar/pkg/x11/xcb-util/Makefile =================================================================== --- csw/mgar/pkg/x11/xcb-util/Makefile (rev 0) +++ csw/mgar/pkg/x11/xcb-util/Makefile 2009-09-27 20:13:22 UTC (rev 6577) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:13:36 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:13:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[6578] csw/mgar/pkg/x11/xcmiscproto/Makefile Message-ID: Revision: 6578 http://gar.svn.sourceforge.net/gar/?rev=6578&view=rev Author: wbonnet Date: 2009-09-27 20:13:36 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/xcmiscproto/Makefile Modified: csw/mgar/pkg/x11/xcmiscproto/Makefile =================================================================== --- csw/mgar/pkg/x11/xcmiscproto/Makefile 2009-09-27 20:13:22 UTC (rev 6577) +++ csw/mgar/pkg/x11/xcmiscproto/Makefile 2009-09-27 20:13:36 UTC (rev 6578) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/xproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 22:13:50 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:13:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[6579] csw/mgar/pkg/x11/xextproto/Makefile Message-ID: Revision: 6579 http://gar.svn.sourceforge.net/gar/?rev=6579&view=rev Author: wbonnet Date: 2009-09-27 20:13:50 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/xextproto/Makefile Modified: csw/mgar/pkg/x11/xextproto/Makefile =================================================================== --- csw/mgar/pkg/x11/xextproto/Makefile 2009-09-27 20:13:36 UTC (rev 6578) +++ csw/mgar/pkg/x11/xextproto/Makefile 2009-09-27 20:13:50 UTC (rev 6579) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/xextproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 22:14:02 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:14:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[6580] csw/mgar/pkg/x11/xf86bigfontproto/Makefile Message-ID: Revision: 6580 http://gar.svn.sourceforge.net/gar/?rev=6580&view=rev Author: wbonnet Date: 2009-09-27 20:14:02 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/xf86bigfontproto/Makefile Added: csw/mgar/pkg/x11/xf86bigfontproto/Makefile =================================================================== --- csw/mgar/pkg/x11/xf86bigfontproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/xf86bigfontproto/Makefile 2009-09-27 20:14:02 UTC (rev 6580) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:14:25 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:14:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[6581] csw/mgar/pkg/x11/xf86dgaproto/Makefile Message-ID: Revision: 6581 http://gar.svn.sourceforge.net/gar/?rev=6581&view=rev Author: wbonnet Date: 2009-09-27 20:14:24 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/xf86dgaproto/Makefile Added: csw/mgar/pkg/x11/xf86dgaproto/Makefile =================================================================== --- csw/mgar/pkg/x11/xf86dgaproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/xf86dgaproto/Makefile 2009-09-27 20:14:24 UTC (rev 6581) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:14:42 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:14:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[6582] csw/mgar/pkg/x11/xf86driproto/Makefile Message-ID: Revision: 6582 http://gar.svn.sourceforge.net/gar/?rev=6582&view=rev Author: wbonnet Date: 2009-09-27 20:14:42 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/xf86driproto/Makefile Added: csw/mgar/pkg/x11/xf86driproto/Makefile =================================================================== --- csw/mgar/pkg/x11/xf86driproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/xf86driproto/Makefile 2009-09-27 20:14:42 UTC (rev 6582) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:15:00 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:15:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[6583] csw/mgar/pkg/x11/xf86miscproto/Makefile Message-ID: Revision: 6583 http://gar.svn.sourceforge.net/gar/?rev=6583&view=rev Author: wbonnet Date: 2009-09-27 20:15:00 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/xf86miscproto/Makefile Added: csw/mgar/pkg/x11/xf86miscproto/Makefile =================================================================== --- csw/mgar/pkg/x11/xf86miscproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/xf86miscproto/Makefile 2009-09-27 20:15:00 UTC (rev 6583) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:15:23 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:15:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6584] csw/mgar/pkg/x11/xf86rushproto/Makefile Message-ID: Revision: 6584 http://gar.svn.sourceforge.net/gar/?rev=6584&view=rev Author: wbonnet Date: 2009-09-27 20:15:23 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/xf86rushproto/Makefile Added: csw/mgar/pkg/x11/xf86rushproto/Makefile =================================================================== --- csw/mgar/pkg/x11/xf86rushproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/xf86rushproto/Makefile 2009-09-27 20:15:23 UTC (rev 6584) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:16:14 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:16:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6585] csw/mgar/pkg/x11/xf86vidmodeproto/Makefile Message-ID: Revision: 6585 http://gar.svn.sourceforge.net/gar/?rev=6585&view=rev Author: wbonnet Date: 2009-09-27 20:16:13 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Added Paths: ----------- csw/mgar/pkg/x11/xf86vidmodeproto/Makefile Added: csw/mgar/pkg/x11/xf86vidmodeproto/Makefile =================================================================== --- csw/mgar/pkg/x11/xf86vidmodeproto/Makefile (rev 0) +++ csw/mgar/pkg/x11/xf86vidmodeproto/Makefile 2009-09-27 20:16:13 UTC (rev 6585) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the `pwd` directory." + +%: + $(MAKE) -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 wbonnet at users.sourceforge.net Sun Sep 27 22:16:38 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:16:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6586] csw/mgar/pkg/x11/xineramaproto/Makefile Message-ID: Revision: 6586 http://gar.svn.sourceforge.net/gar/?rev=6586&view=rev Author: wbonnet Date: 2009-09-27 20:16:38 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/xineramaproto/Makefile Modified: csw/mgar/pkg/x11/xineramaproto/Makefile =================================================================== --- csw/mgar/pkg/x11/xineramaproto/Makefile 2009-09-27 20:16:13 UTC (rev 6585) +++ csw/mgar/pkg/x11/xineramaproto/Makefile 2009-09-27 20:16:38 UTC (rev 6586) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/xproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 22:16:52 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:16:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[6587] csw/mgar/pkg/x11/xproto/Makefile Message-ID: Revision: 6587 http://gar.svn.sourceforge.net/gar/?rev=6587&view=rev Author: wbonnet Date: 2009-09-27 20:16:52 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/xproto/Makefile Modified: csw/mgar/pkg/x11/xproto/Makefile =================================================================== --- csw/mgar/pkg/x11/xproto/Makefile 2009-09-27 20:16:38 UTC (rev 6586) +++ csw/mgar/pkg/x11/xproto/Makefile 2009-09-27 20:16:52 UTC (rev 6587) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/x11/xproto directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 22:17:12 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:17:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[6588] csw/mgar/pkg/x11/xrender/Makefile Message-ID: Revision: 6588 http://gar.svn.sourceforge.net/gar/?rev=6588&view=rev Author: wbonnet Date: 2009-09-27 20:17:12 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/xrender/Makefile Modified: csw/mgar/pkg/x11/xrender/Makefile =================================================================== --- csw/mgar/pkg/x11/xrender/Makefile 2009-09-27 20:16:52 UTC (rev 6587) +++ csw/mgar/pkg/x11/xrender/Makefile 2009-09-27 20:17:12 UTC (rev 6588) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/ directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 22:17:45 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 27 Sep 2009 20:17:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[6589] csw/mgar/pkg/x11/xtrans/Makefile Message-ID: Revision: 6589 http://gar.svn.sourceforge.net/gar/?rev=6589&view=rev Author: wbonnet Date: 2009-09-27 20:17:45 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Update default Makefile Modified Paths: -------------- csw/mgar/pkg/x11/xtrans/Makefile Modified: csw/mgar/pkg/x11/xtrans/Makefile =================================================================== --- csw/mgar/pkg/x11/xtrans/Makefile 2009-09-27 20:17:12 UTC (rev 6588) +++ csw/mgar/pkg/x11/xtrans/Makefile 2009-09-27 20:17:45 UTC (rev 6589) @@ -1,7 +1,7 @@ # vim: ft=make ts=4 sw=4 noet default: - @echo "You are in the pkg/ directory." + @echo "You are in the `pwd` directory." %: $(MAKE) -C trunk $* 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 Sep 27 23:40:08 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 27 Sep 2009 21:40:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[6590] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 6590 http://gar.svn.sourceforge.net/gar/?rev=6590&view=rev Author: rthurner Date: 2009-09-27 21:40:08 +0000 (Sun, 27 Sep 2009) Log Message: ----------- set dependency right, see http://www.opencsw.org/bugtrack/view.php?id=3891 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-09-27 20:17:45 UTC (rev 6589) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2009-09-27 21:40:08 UTC (rev 6590) @@ -12,7 +12,7 @@ SPKG_DESC_CSWmercurial = Mercurial -REQUIRED_PKGS_CSWmercurial = CSWpython-rt +REQUIRED_PKGS_CSWmercurial = CSWpython # 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/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2009-09-27 20:17:45 UTC (rev 6589) +++ csw/mgar/pkg/mercurial/trunk/checksums 2009-09-27 21:40:08 UTC (rev 6590) @@ -1,4 +1,3 @@ -f123d5474de9aeaea428989744b12401 download/CSWmercurial-common.gspec db884ecb306bcbf49b671f880d29c431 download/CSWmercurial.changelog.CSW d280026d7687f061371e87ff306c97c2 download/CSWmercurial.gspec 6504f0dc32bd7ecf59a9f7f719432e76 download/mercurial-1.3.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 Mon Sep 28 00:42:05 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 27 Sep 2009 22:42:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6591] csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc. postinstall-moving Message-ID: Revision: 6591 http://gar.svn.sourceforge.net/gar/?rev=6591&view=rev Author: wahwah Date: 2009-09-27 22:42:05 +0000 (Sun, 27 Sep 2009) Log Message: ----------- CSWunixodbc.postinstall-moving: Some documentation in the comments. Modified Paths: -------------- csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall-moving Modified: csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall-moving =================================================================== --- csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall-moving 2009-09-27 21:40:08 UTC (rev 6590) +++ csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall-moving 2009-09-27 22:42:05 UTC (rev 6591) @@ -8,21 +8,35 @@ # arch_path: e.g. /etc/opt/csw/migration-archive/foo.conf # # # If old_path exists: -# # Create a file named {{old_path.THIS_LOCATION_IS_DEPRECATED}} and leave a message inside the file. +# # Create a file named {{old_path.README.migration}} +# and leave a message inside the file. # # Move old_path to archive_path # # If new_path does not exist: # # Copy archive_path to new_path # # http://wiki.opencsw.org/configuration-directory-migration # -# old_path: /opt/csw/etc/foo.conf -# arch_path: /opt/csw/etc/migration-archive/foo.conf -# new_path: /etc/opt/csw/foo.conf +# Usage: # -# if old_path exists: -# move old_path to arch_path -# if arch_path exists and new_path doesn't: -# copy arch_path to new_path +# A configuration should be set: +# +# A list of files to migrate: +# MIGRATE_FILES="odbc.ini odbcinst.ini ODBCDataSources" +# +# The directories to use: +# SOURCE_DIR___default__="/opt/csw/etc" +# readonly SOURCE_DIR___default__ +# ARCH_DIR___default__="/opt/csw/etc/migration-archive" +# readonly ARCH_DIR___default__ +# DEST_DIR___default__="/etc/opt/csw" +# readonly DEST_DIR___default__ +# +# If a file needs to be moved to a different directory than the default, +# a special setting can be used: +# +# DEST_DIR_odbc_ini="/etc/opt/csw/foo/odbc.ini" +# +# The same applies to DEST_DIR and ARCH_DIR. set -u @@ -131,7 +145,7 @@ # All variables are set, the main algorithm goes here. # Moving the file will only work in the global zone. The assumption is that - # the preinstall script is going to be run in the global zone first; by the + # the postinstall script is going to be run in the global zone first; by the # time it gets to the non-global zones, the ${srcpath} will have been # moved already. if [ -r "${srcpath}" ] 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 Sep 28 00:52:23 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 27 Sep 2009 22:52:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[6592] csw/mgar/pkg Message-ID: Revision: 6592 http://gar.svn.sourceforge.net/gar/?rev=6592&view=rev Author: wahwah Date: 2009-09-27 22:52:22 +0000 (Sun, 27 Sep 2009) Log Message: ----------- autoproject: Initial commit Modified Paths: -------------- csw/mgar/pkg/autoproject/trunk/Makefile csw/mgar/pkg/autoproject/trunk/checksums Added Paths: ----------- csw/mgar/pkg/autoproject/ Modified: csw/mgar/pkg/autoproject/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-09-25 17:25:45 UTC (rev 6474) +++ csw/mgar/pkg/autoproject/trunk/Makefile 2009-09-27 22:52:22 UTC (rev 6592) @@ -2,181 +2,28 @@ # 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 = autoproject +GARVERSION = 0.20 + +CATEGORIES = apps +DESCRIPTION = creates a source package which follows the GNU programming standards define BLURB - + + autoproject interviews the user, then creates a source package for a new + program which follows the GNU programming standards. The new package uses + autoconf to configure itself, and automake to create the Makefile. `make + distcheck' succeeds. + + The idea is that you execute autoproject just once when you start a new + project. It will ask a few questions, then create a new directory and populate + it with standard files, customized for the new project. + 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 +SPKG_SOURCEURL = http://packages.debian.org/unstable/devel/autoproject +MASTER_SITES = http://ftp.de.debian.org/debian/pool/main/a/$(GARNAME)/ +DISTFILES = $(GARNAME)_$(GARVERSION).orig.tar.gz 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. +REQUIRED_PKGS = CSWautomake +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 +include gar/category.mk Modified: csw/mgar/pkg/autoproject/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-09-25 17:25:45 UTC (rev 6474) +++ csw/mgar/pkg/autoproject/trunk/checksums 2009-09-27 22:52:22 UTC (rev 6592) @@ -0,0 +1,2 @@ +c56275967bba34ce1864b3d917e08e55 download/autoproject_0.20-5.diff.gz +609369fa76391d58714059313b9c831c download/autoproject_0.20.orig.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 Sep 28 00:55:14 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 27 Sep 2009 22:55:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[6593] csw/mgar/pkg/autoproject/trunk/Makefile Message-ID: Revision: 6593 http://gar.svn.sourceforge.net/gar/?rev=6593&view=rev Author: wahwah Date: 2009-09-27 22:55:14 +0000 (Sun, 27 Sep 2009) Log Message: ----------- autoproject: setting ARCHALL = 1 Modified Paths: -------------- csw/mgar/pkg/autoproject/trunk/Makefile Modified: csw/mgar/pkg/autoproject/trunk/Makefile =================================================================== --- csw/mgar/pkg/autoproject/trunk/Makefile 2009-09-27 22:52:22 UTC (rev 6592) +++ csw/mgar/pkg/autoproject/trunk/Makefile 2009-09-27 22:55:14 UTC (rev 6593) @@ -23,6 +23,7 @@ MASTER_SITES = http://ftp.de.debian.org/debian/pool/main/a/$(GARNAME)/ DISTFILES = $(GARNAME)_$(GARVERSION).orig.tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +ARCHALL = 1 REQUIRED_PKGS = CSWautomake TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) 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 Sep 28 13:09:20 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 28 Sep 2009 11:09:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[6594] csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc. postinstall-moving Message-ID: Revision: 6594 http://gar.svn.sourceforge.net/gar/?rev=6594&view=rev Author: wahwah Date: 2009-09-28 11:09:20 +0000 (Mon, 28 Sep 2009) Log Message: ----------- CSWunixodbc.postinstall-moving: Adding the use of PKG_INSTALL_ROOT. Modified Paths: -------------- csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall-moving Modified: csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall-moving =================================================================== --- csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall-moving 2009-09-27 22:55:14 UTC (rev 6593) +++ csw/mgar/pkg/unixodbc/trunk/files/CSWunixodbc.postinstall-moving 2009-09-28 11:09:20 UTC (rev 6594) @@ -35,7 +35,7 @@ # a special setting can be used: # # DEST_DIR_odbc_ini="/etc/opt/csw/foo/odbc.ini" -# +# # The same applies to DEST_DIR and ARCH_DIR. set -u @@ -55,6 +55,8 @@ DEST_DIR___default__="/etc/opt/csw" readonly DEST_DIR___default__ +PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-/} + return_code=0 migration_info=" @@ -105,8 +107,8 @@ } place_signpost_for() { - __file_name="$1" - echo "${migration_info}" > "${__file_name}.${deprecated_file_ext}" + __file_name="$1" + echo "${migration_info}" > "${__file_name}.${deprecated_file_ext}" } main() { @@ -126,9 +128,9 @@ per_file_archdir=`expand_modifiers ARCH_DIR ${modifier_value}` default_archdir=`expand_modifiers ARCH_DIR __default__` archdir="${per_file_archdir:-${default_archdir}}" - srcpath="${srcdir}/${file_name}" - dstpath="${dstdir}/${file_name}" - archpath="${archdir}/${file_name}" + srcpath="${PKG_INSTALL_ROOT}/${srcdir}/${file_name}" + dstpath="${PKG_INSTALL_ROOT}/${dstdir}/${file_name}" + archpath="${PKG_INSTALL_ROOT}/${archdir}/${file_name}" # Make sure we have the environment we expect if [ ! -d "${archdir}" ] 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 Sep 28 15:11:25 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 28 Sep 2009 13:11:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[6595] csw/mgar/pkg/colordiff/trunk Message-ID: Revision: 6595 http://gar.svn.sourceforge.net/gar/?rev=6595&view=rev Author: dmichelsen Date: 2009-09-28 13:11:25 +0000 (Mon, 28 Sep 2009) Log Message: ----------- colordiff: Force use of CSW Perl Modified Paths: -------------- csw/mgar/pkg/colordiff/trunk/Makefile csw/mgar/pkg/colordiff/trunk/checksums Added Paths: ----------- csw/mgar/pkg/colordiff/trunk/files/force-csw-perl.patch Modified: csw/mgar/pkg/colordiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/colordiff/trunk/Makefile 2009-09-28 11:09:20 UTC (rev 6594) +++ csw/mgar/pkg/colordiff/trunk/Makefile 2009-09-28 13:11:25 UTC (rev 6595) @@ -9,10 +9,13 @@ MASTER_SITES = http://colordiff.sourceforge.net/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = fix-entity-nesting.patch +PATCHFILES += force-csw-perl.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 = CSWperl + CONFIGURE_SCRIPTS = BUILD_ARGS = doc TEST_SCRIPTS = @@ -21,6 +24,8 @@ sysconfdir = /etc/opt/csw PRESERVECONF = $(sysconfdir)/colordiffrc +ARCHALL = 1 + include gar/category.mk install-custom: Modified: csw/mgar/pkg/colordiff/trunk/checksums =================================================================== --- csw/mgar/pkg/colordiff/trunk/checksums 2009-09-28 11:09:20 UTC (rev 6594) +++ csw/mgar/pkg/colordiff/trunk/checksums 2009-09-28 13:11:25 UTC (rev 6595) @@ -1,2 +1,3 @@ 31864847eaa4e900f72bbb6bbc64f1ec download/colordiff-1.0.9.tar.gz d202632e9ec507e53445232a930c9c6f download/fix-entity-nesting.patch +b37c28fccba12407d69a9d856d81a396 download/force-csw-perl.patch Added: csw/mgar/pkg/colordiff/trunk/files/force-csw-perl.patch =================================================================== --- csw/mgar/pkg/colordiff/trunk/files/force-csw-perl.patch (rev 0) +++ csw/mgar/pkg/colordiff/trunk/files/force-csw-perl.patch 2009-09-28 13:11:25 UTC (rev 6595) @@ -0,0 +1,9 @@ +diff -Naur colordiff-1.0.9.orig/colordiff.pl colordiff-1.0.9.patched/colordiff.pl +--- colordiff-1.0.9.orig/colordiff.pl 2009-01-28 21:12:10.000000000 +0100 ++++ colordiff-1.0.9.patched/colordiff.pl 2009-09-28 14:52:56.066588736 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -w ++#!/opt/csw/bin/perl -w + + ######################################################################## + # # 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 Sep 28 15:58:17 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 28 Sep 2009 13:58:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[6596] csw/mgar/pkg/fontconfig/trunk Message-ID: Revision: 6596 http://gar.svn.sourceforge.net/gar/?rev=6596&view=rev Author: dmichelsen Date: 2009-09-28 13:58:17 +0000 (Mon, 28 Sep 2009) Log Message: ----------- fontconfig: Update to 2.7.3 Modified Paths: -------------- csw/mgar/pkg/fontconfig/trunk/Makefile csw/mgar/pkg/fontconfig/trunk/checksums Added Paths: ----------- csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch Modified: csw/mgar/pkg/fontconfig/trunk/Makefile =================================================================== --- csw/mgar/pkg/fontconfig/trunk/Makefile 2009-09-28 13:11:25 UTC (rev 6595) +++ csw/mgar/pkg/fontconfig/trunk/Makefile 2009-09-28 13:58:17 UTC (rev 6596) @@ -1,5 +1,5 @@ GARNAME = fontconfig -GARVERSION = 2.6.0 +GARVERSION = 2.7.3 CATEGORIES = lib DESCRIPTION = A library for configuring and customizing font access. @@ -15,6 +15,9 @@ DISTFILES += CSWfconfig.postinstall DISTFILES += CSWfconfig.checkinstall +PATCHFILES = fontconfig.h.diff +PATCHFILES += fix-zerowidth-struct.patch + REQUIRED_PKGS = CSWexpat CSWftype2 CSWzlib CSWiconv # We define upstream file regex so we can be notifed of new upstream software release @@ -22,18 +25,16 @@ BUILD64 = 1 PACKAGES = CSWfconfig -CATALOGNAME_CSWfconfig = fontconfig +CATALOGNAME = fontconfig +SPKG_SOURCEURL = http://www.fontconfig.org/ + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-default-fonts=/usr/openwin/lib/X11/fonts CONFIGURE_ARGS += --with-add-fonts=/usr/openwin/lib/locale,/usr/share/fonts,/opt/csw/share/fonts CONFIGURE_ARGS += --with-cache-dir=/var/opt/csw/cache/fontconfig CONFIGURE_ARGS += --with-confdir=/opt/csw/etc/fontconfig -PATCHFILES = fontconfig.h.diff -pre-package: - @rm -f $(DESTDIR)$(libdir)/libfontconfig.la* - @rm -f $(DESTDIR)/opt/csw/etc/fonts/fonts.conf.bak - @$(MAKECOOKIE) +EXTRA_MERGE_EXCLUDE_FILES = .*/fonts.conf.bak include gar/category.mk Modified: csw/mgar/pkg/fontconfig/trunk/checksums =================================================================== --- csw/mgar/pkg/fontconfig/trunk/checksums 2009-09-28 13:11:25 UTC (rev 6595) +++ csw/mgar/pkg/fontconfig/trunk/checksums 2009-09-28 13:58:17 UTC (rev 6596) @@ -1,4 +1,5 @@ +747d2c691c66b563c8e8c1784ce8d014 download/fontconfig-2.7.3.tar.gz +5a5b382b4a5e579cfc869bcffd7c034e download/CSWfconfig.postinstall 21481d18c2100203177ccab5b51e50d7 download/CSWfconfig.checkinstall -5a5b382b4a5e579cfc869bcffd7c034e download/CSWfconfig.postinstall -ab54ec1d4ddd836313fdbc0cd5299d6d download/fontconfig-2.6.0.tar.gz 0fb83ca9bf9a7b99ab7601347e8c855d download/fontconfig.h.diff +bbdb45396408c48d50c7db5747dfae4e download/fix-zerowidth-struct.patch Added: csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch =================================================================== --- csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch (rev 0) +++ csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch 2009-09-28 13:58:17 UTC (rev 6596) @@ -0,0 +1,12 @@ +diff -Naur fontconfig-2.7.3.orig/src/fcint.h fontconfig-2.7.3.patched/src/fcint.h +--- fontconfig-2.7.3.orig/src/fcint.h 2009-06-28 19:46:36.000000000 +0200 ++++ fontconfig-2.7.3.patched/src/fcint.h 2009-09-28 15:47:07.195049714 +0200 +@@ -253,7 +253,7 @@ + FcExprPage *next_page; + FcExpr *next; + FcExpr exprs[(1024 - 2/* two pointers */ - 2/* malloc overhead */) * sizeof (void *) / sizeof (FcExpr)]; +- FcExpr end[0]; ++ FcExpr end[]; + }; + + typedef enum _FcQual { 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 Sep 28 16:49:34 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 28 Sep 2009 14:49:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[6597] csw/mgar/pkg/libpcap/trunk Message-ID: Revision: 6597 http://gar.svn.sourceforge.net/gar/?rev=6597&view=rev Author: dmichelsen Date: 2009-09-28 14:49:31 +0000 (Mon, 28 Sep 2009) Log Message: ----------- libpcap: Update to 1.0.0 Modified Paths: -------------- csw/mgar/pkg/libpcap/trunk/Makefile csw/mgar/pkg/libpcap/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2224954-fix-autoconf-header.diff csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2504874-create-dir-patch.diff Modified: csw/mgar/pkg/libpcap/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpcap/trunk/Makefile 2009-09-28 13:58:17 UTC (rev 6596) +++ csw/mgar/pkg/libpcap/trunk/Makefile 2009-09-28 14:49:31 UTC (rev 6597) @@ -1,5 +1,5 @@ GARNAME = libpcap -GARVERSION = 0.9.8 +GARVERSION = 1.0.0 CATEGORIES = lib DESCRIPTION = Libraries for network diagnostics @@ -15,9 +15,12 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +PATCHFILES = sf-bugtrack-2224954-fix-autoconf-header.diff +PATCHFILES += sf-bugtrack-2504874-create-dir-patch.diff + # Shared libraries patch -PATCHFILES = Makefile.in.diff -PATCHFILES += scanner.l.diff +#PATCHFILES = Makefile.in.diff +#PATCHFILES += scanner.l.diff # No test target for libpcap TEST_SCRIPTS = Modified: csw/mgar/pkg/libpcap/trunk/checksums =================================================================== --- csw/mgar/pkg/libpcap/trunk/checksums 2009-09-28 13:58:17 UTC (rev 6596) +++ csw/mgar/pkg/libpcap/trunk/checksums 2009-09-28 14:49:31 UTC (rev 6597) @@ -1,3 +1,2 @@ -5208f24d0328ee7c20b52c43eaa9aa0e download/libpcap-0.9.8.tar.gz -d036716d6563bcad5fad70916f5c2c2e download/Makefile.in.diff -c0002322e0b90a3e9eed0b7ac9e6c050 download/scanner.l.diff +e2396bd0e71b247413ea26ced5ca923f download/fix-autoconf-header.diff +9ad1358c5dec48456405eac197a46d3d download/libpcap-1.0.0.tar.gz Added: csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2224954-fix-autoconf-header.diff =================================================================== --- csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2224954-fix-autoconf-header.diff (rev 0) +++ csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2224954-fix-autoconf-header.diff 2009-09-28 14:49:31 UTC (rev 6597) @@ -0,0 +1,172 @@ +diff -Naur libpcap-1.0.0.orig/Makefile.in libpcap-1.0.0.patched/Makefile.in +--- libpcap-1.0.0.orig/Makefile.in 2008-10-28 02:26:13.000000000 +0100 ++++ libpcap-1.0.0.patched/Makefile.in 2009-09-28 16:33:43.194864215 +0200 +@@ -445,6 +445,8 @@ + $(DESTDIR)$(includedir)/pcap-bpf.h + $(INSTALL_DATA) $(srcdir)/pcap-namedb.h \ + $(DESTDIR)$(includedir)/pcap-namedb.h ++ [ -d $(DESTDIR)$(bindir) ] || \ ++ (mkdir -p $(DESTDIR)$(bindir); chmod 755 $(DESTDIR)$(bindir)) + $(INSTALL_PROGRAM) pcap-config $(DESTDIR)$(bindir)/pcap-config + for i in $(MAN1); do \ + $(INSTALL_DATA) $(srcdir)/$$i \ +diff -Naur libpcap-1.0.0.orig/configure libpcap-1.0.0.patched/configure +--- libpcap-1.0.0.orig/configure 2008-10-28 02:26:13.000000000 +0100 ++++ libpcap-1.0.0.patched/configure 2009-09-28 16:32:19.576622377 +0200 +@@ -6655,145 +6655,6 @@ + + done + +- for ac_header in +-do +-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-fi +-ac_res=`eval echo '${'$as_ac_Header'}'` +- { echo "$as_me:$LINENO: result: $ac_res" >&5 +-echo "${ECHO_T}$ac_res" >&6; } +-else +- # Is the header compilable? +-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_compiler=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6; } +- +-# Is the header present? +-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +-fi +- +-rm -f conftest.err conftest.$ac_ext +-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- +- ;; +-esac +-{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- eval "$as_ac_Header=\$ac_header_preproc" +-fi +-ac_res=`eval echo '${'$as_ac_Header'}'` +- { echo "$as_me:$LINENO: result: $ac_res" >&5 +-echo "${ECHO_T}$ac_res" >&6; } +- +-fi +-if test `eval echo '${'$as_ac_Header'}'` = yes; then +- cat >>confdefs.h <<_ACEOF +-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +- +-done +- + { echo "$as_me:$LINENO: checking if if_packet.h has tpacket_stats defined" >&5 + echo $ECHO_N "checking if if_packet.h has tpacket_stats defined... $ECHO_C" >&6; } + if test "${ac_cv_lbl_tpacket_stats+set}" = set; then +diff -Naur libpcap-1.0.0.orig/configure.in libpcap-1.0.0.patched/configure.in +--- libpcap-1.0.0.orig/configure.in 2008-10-28 02:26:13.000000000 +0100 ++++ libpcap-1.0.0.patched/configure.in 2009-09-28 16:32:39.158704830 +0200 +@@ -358,7 +358,6 @@ + #include + #include + ]) +- AC_CHECK_HEADERS() + AC_LBL_TPACKET_STATS + AC_LBL_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI + ;; Added: csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2504874-create-dir-patch.diff =================================================================== --- csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2504874-create-dir-patch.diff (rev 0) +++ csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2504874-create-dir-patch.diff 2009-09-28 14:49:31 UTC (rev 6597) @@ -0,0 +1,47 @@ +diff --git a/Makefile.in b/Makefile.in +index 5c4d679..f2717d5 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -445,11 +445,17 @@ install: libpcap.a pcap-config + $(DESTDIR)$(includedir)/pcap-bpf.h + $(INSTALL_DATA) $(srcdir)/pcap-namedb.h \ + $(DESTDIR)$(includedir)/pcap-namedb.h ++ [ -d $(DESTDIR)$(bindir) ] || \ ++ (mkdir -p $(DESTDIR)$(bindir); chmod 755 $(DESTDIR)$(bindir)) + $(INSTALL_PROGRAM) pcap-config $(DESTDIR)$(bindir)/pcap-config + for i in $(MAN1); do \ ++ [ -d $(DESTDIR)$(mandir)/man1 ] || \ ++ (mkdir -p $(DESTDIR)$(mandir)/man1; chmod 755 $(DESTDIR)$(mandir)/man1); \ + $(INSTALL_DATA) $(srcdir)/$$i \ + $(DESTDIR)$(mandir)/man1/$$i; done + for i in $(MAN3PCAP); do \ ++ [ -d $(DESTDIR)$(mandir)/man3 ] || \ ++ (mkdir -p $(DESTDIR)$(mandir)/man3; chmod 755 $(DESTDIR)$(mandir)/man3); \ + $(INSTALL_DATA) $(srcdir)/$$i \ + $(DESTDIR)$(mandir)/man3/$$i; done + ln $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_name.3pcap \ +@@ -471,16 +477,24 @@ install: libpcap.a pcap-config + ln $(DESTDIR)$(mandir)/man3/pcap_setnonblock.3pcap \ + $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3pcap + for i in $(MANFILE); do \ ++ [ -d $(DESTDIR)$(mandir)/man at MAN_FILE_FORMATS@ ] || \ ++ (mkdir -p $(DESTDIR)$(mandir)/man at MAN_FILE_FORMATS@; chmod 755 $(DESTDIR)$(mandir)/man at MAN_FILE_FORMATS@); \ + $(INSTALL_DATA) $(srcdir)/`echo $$i | sed 's/.manfile.in/.manfile/'` \ + $(DESTDIR)$(mandir)/man at MAN_FILE_FORMATS@/`echo $$i | sed 's/.manfile.in/. at MAN_FILE_FORMATS@/'`; done + for i in $(MANMISC); do \ ++ [ -d $(DESTDIR)$(mandir)/man at MAN_MISC_INFO@ ] || \ ++ (mkdir -p $(DESTDIR)$(mandir)/man at MAN_MISC_INFO@; chmod 755 $(DESTDIR)$(mandir)/man at MAN_MISC_INFO@); \ + $(INSTALL_DATA) $(srcdir)/`echo $$i | sed 's/.manmisc.in/.manmisc/'` \ + $(DESTDIR)$(mandir)/man at MAN_MISC_INFO@/`echo $$i | sed 's/.manmisc.in/. at MAN_MISC_INFO@/'`; done + + install-shared: install-shared-$(DYEXT) + install-shared-so: libpcap.so ++ [ -d $(DESTDIR)$(libdir) ] || \ ++ (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) + $(INSTALL_PROGRAM) libpcap.so.`cat VERSION` $(DESTDIR)$(libdir)/libpcap.so.`cat VERSION` + install-shared-dylib: libpcap.dylib ++ [ -d $(DESTDIR)$(libdir) ] || \ ++ (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) + $(INSTALL_PROGRAM) libpcap.`cat VERSION`.dylib $(DESTDIR)$(libdir)/libpcap.`cat VERSION`.dylib + VER=`cat VERSION`; cd $(DESTDIR)$(libdir) && ln -sf libpcap.$$VER.dylib libpcap.A.dylib; ln -sf libpcap.A.dylib libpcap.dylib + 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 Sep 28 17:17:05 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 28 Sep 2009 15:17:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6598] csw/mgar/pkg/bdb43/trunk Message-ID: Revision: 6598 http://gar.svn.sourceforge.net/gar/?rev=6598&view=rev Author: dmichelsen Date: 2009-09-28 15:17:03 +0000 (Mon, 28 Sep 2009) Log Message: ----------- bdb43: Move to dynamic gspec, apple patch no. 1 Modified Paths: -------------- csw/mgar/pkg/bdb43/trunk/Makefile csw/mgar/pkg/bdb43/trunk/checksums Added Paths: ----------- csw/mgar/pkg/bdb43/trunk/files/patch.4.3.29.1 Removed Paths: ------------- csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-devel.depend csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-devel.gspec csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-devel.prototype csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-doc.depend csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-doc.gspec csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-doc.prototype csw/mgar/pkg/bdb43/trunk/files/CSWbdb43.depend csw/mgar/pkg/bdb43/trunk/files/CSWbdb43.gspec csw/mgar/pkg/bdb43/trunk/files/CSWbdb43.prototype csw/mgar/pkg/bdb43/trunk/legacy/ Modified: csw/mgar/pkg/bdb43/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb43/trunk/Makefile 2009-09-28 14:49:31 UTC (rev 6597) +++ csw/mgar/pkg/bdb43/trunk/Makefile 2009-09-28 15:17:03 UTC (rev 6598) @@ -13,20 +13,44 @@ (MSVC 4, 5 and 6). endef -MASTER_SITES = http://downloads.sleepycat.com/ +MASTER_SITES = http://download.oracle.com/berkeley-db/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWbdb43,depend prototype) -DISTFILES += $(call admfiles,CSWbdb43-devel,depend prototype) -DISTFILES += $(call admfiles,CSWbdb43-doc,depend prototype) +PATCHDIR = $(WORKSRC)/.. +PATCHDIRLEVEL = 0 +PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*)) + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix +PACKAGES = CSWbdb43 CSWbdb43-devel CSWbdb43-doc + +CATALOGNAME_CSWbdb43 = berkeleydb43 +CATALOGNAME_CSWbdb43-devel = berkeleydb43_devel +CATALOGNAME_CSWbdb43-doc = berkeleydb43_doc + +SPKG_DESC_CSWbdb43 = BerkeleyDB 4.3 +SPKG_DESC_CSWbdb43-devel = BerkeleyDB 4.3 development support +SPKG_DESC_CSWbdb43-doc = BerkeleyDB 4.3 documentation + +SPKG_SOURCEURL = http://www.oracle.com/technology/products/berkeley-db/index.html + +REQUIRED_PKGS_CSWbdb43-devel = CSWbdb43 + +INCOMPATIBLE_PKGS_CSWbdb43-doc = CSWbdb43doc + +LICENSE = LICENSE + +ARCHALL_CSWbdb43-doc = 1 + CONFIGURE_SCRIPTS = dist -CONFIGURE_ARGS = --prefix $(prefix)/bdb43 +prefix = $(BUILD_PREFIX)/bdb43 +docdir = $(BUILD_PREFIX)/share/doc + +CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-cryptography CONFIGURE_ARGS += --enable-compat185 CONFIGURE_ARGS += --enable-rpc @@ -42,6 +66,10 @@ # bdb tests are time consuming TEST_SCRIPTS = +PKGFILES_CSWbdb43-doc = $(prefix)/docs/.* + +PKGFILES_CSWbdb43-devel = $(PKGFILES_DEVEL) + include gar/category.mk LIBS += -lnsl Modified: csw/mgar/pkg/bdb43/trunk/checksums =================================================================== --- csw/mgar/pkg/bdb43/trunk/checksums 2009-09-28 14:49:31 UTC (rev 6597) +++ csw/mgar/pkg/bdb43/trunk/checksums 2009-09-28 15:17:03 UTC (rev 6598) @@ -1,10 +1,2 @@ -13585a20ce32f113b8e8cdb57f52e3bb download/db-4.3.29.tar.gz -a780ed74216a67b45d5bab030d29d1a8 download/CSWbdb43.gspec -8093298b67861e241b0d2499c9f2ff89 download/CSWbdb43.depend -001de61b8e01758ba15ee19184b36bcf download/CSWbdb43.prototype -d3e8da06077e095478cb493e3928eaaf download/CSWbdb43-devel.gspec -f905a2c20a7c2265a2ed126027a49b85 download/CSWbdb43-devel.depend -102c5de41ee6b1039f92836fc309eb80 download/CSWbdb43-devel.prototype -0539eef14dfa8dc02a162d946ad164b1 download/CSWbdb43-doc.gspec -8c10985a125690e3d6bc877be173e20d download/CSWbdb43-doc.depend -b7e86382632f53bae97051502bb37295 download/CSWbdb43-doc.prototype +200b9f5d74175875fcb3ee54adbf0007 download/db-4.3.29.tar.gz +947f07dd8fae5001feedb2deded40ad5 download/patch.4.3.29.1 Deleted: csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-devel.depend =================================================================== --- csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-devel.depend 2009-09-28 14:49:31 UTC (rev 6597) +++ csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-devel.depend 2009-09-28 15:17:03 UTC (rev 6598) @@ -1 +0,0 @@ -P CSWbdb43 berkeleydb43 - embedded database libraries and utilities Deleted: csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-devel.gspec =================================================================== --- csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-devel.gspec 2009-09-28 14:49:31 UTC (rev 6597) +++ csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-devel.gspec 2009-09-28 15:17:03 UTC (rev 6598) @@ -1,5 +0,0 @@ -%var bitname berkeleydb43_devel -%var pkgname CSWbdb43-devel -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%var desc BerkeleyDB 4.3 development support -%copyright url file://%{WORKSRC}/../LICENSE Deleted: csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-devel.prototype =================================================================== --- csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-devel.prototype 2009-09-28 14:49:31 UTC (rev 6597) +++ csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-devel.prototype 2009-09-28 15:17:03 UTC (rev 6598) @@ -1,16 +0,0 @@ -d none /opt/csw/bdb43 0755 root bin -d none /opt/csw/bdb43/include 0755 root bin -f none /opt/csw/bdb43/include/db.h 0444 root bin -f none /opt/csw/bdb43/include/db_185.h 0444 root bin -f none /opt/csw/bdb43/include/db_cxx.h 0444 root bin -d none /opt/csw/bdb43/lib 0755 root bin -f none /opt/csw/bdb43/lib/libdb-4.3.a 0644 root bin -f none /opt/csw/bdb43/lib/libdb-4.3.la 0644 root bin -f none /opt/csw/bdb43/lib/libdb.a 0644 root bin -f none /opt/csw/bdb43/lib/libdb_cxx-4.3.a 0644 root bin -f none /opt/csw/bdb43/lib/libdb_cxx-4.3.la 0644 root bin -f none /opt/csw/bdb43/lib/libdb_cxx.a 0644 root bin -f none /opt/csw/bdb43/lib/libdb_java-4.3.a 0644 root bin -f none /opt/csw/bdb43/lib/libdb_java-4.3.la 0644 root bin -f none /opt/csw/bdb43/lib/libdb_tcl-4.3.a 0644 root bin -f none /opt/csw/bdb43/lib/libdb_tcl-4.3.la 0644 root bin Deleted: csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-doc.depend =================================================================== --- csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-doc.depend 2009-09-28 14:49:31 UTC (rev 6597) +++ csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-doc.depend 2009-09-28 15:17:03 UTC (rev 6598) @@ -1 +0,0 @@ -I CSWbdb43doc Deleted: csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-doc.gspec =================================================================== --- csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-doc.gspec 2009-09-28 14:49:31 UTC (rev 6597) +++ csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-doc.gspec 2009-09-28 15:17:03 UTC (rev 6598) @@ -1,6 +0,0 @@ -%var bitname berkeleydb43_doc -%var pkgname CSWbdb43-doc -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%var desc BerkeleyDB 4.3 documentation -%copyright url file://%{WORKSRC}/../LICENSE Deleted: csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-doc.prototype =================================================================== --- csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-doc.prototype 2009-09-28 14:49:31 UTC (rev 6597) +++ csw/mgar/pkg/bdb43/trunk/files/CSWbdb43-doc.prototype 2009-09-28 15:17:03 UTC (rev 6598) @@ -1,1326 +0,0 @@ -d none /opt/csw/bdb43 0755 root bin -d none /opt/csw/bdb43/docs 0755 root bin -d none /opt/csw/bdb43/docs/api_c 0755 root bin -f none /opt/csw/bdb43/docs/api_c/api_core.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/c_pindex.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_associate.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_close.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_cursor.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_del.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_err.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_fd.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_get.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_get_byteswapped.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_get_mpf.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_get_type.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_getenv.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_join.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_key_range.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_list.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_open.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_put.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_remove.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_rename.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_alloc.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_append_recno.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_bt_compare.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_bt_minkey.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_bt_prefix.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_cachesize.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_dup_compare.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_encrypt.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_errcall.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_errfile.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_errpfx.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_feedback.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_flags.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_h_ffactor.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_h_hash.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_h_nelem.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_lorder.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_msgcall.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_msgfile.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_pagesize.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_paniccall.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_q_extentsize.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_re_delim.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_re_len.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_re_pad.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_set_re_source.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_sync.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_truncate.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_upgrade.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/db_verify.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/dbc_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/dbc_close.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/dbc_count.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/dbc_del.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/dbc_dup.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/dbc_get.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/dbc_list.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/dbc_put.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/dbm.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/dbt_bulk.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/dbt_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/dbt_package.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_close.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_dbremove.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_dbrename.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_err.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_list.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_open.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_remove.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_alloc.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_app_dispatch.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_cachesize.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_data_dir.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_encrypt.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_errcall.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_errfile.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_errpfx.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_feedback.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_flags.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_lg_bsize.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_lg_dir.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_lg_max.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_lg_regionmax.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_lk_conflicts.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_lk_detect.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_lk_max_lockers.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_lk_max_locks.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_lk_max_objects.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_mp_mmapsize.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_msgcall.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_msgfile.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_paniccall.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_rpc_server.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_shm_key.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_tas_spins.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_timeout.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_tmp_dir.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_tx_max.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_tx_timestamp.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_set_verbose.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_strerror.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/env_version.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/frame.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/hsearch.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/lock_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/lock_detect.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/lock_get.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/lock_id.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/lock_id_free.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/lock_list.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/lock_put.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/lock_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/lock_vec.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/log_archive.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/log_compare.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/log_cursor.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/log_file.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/log_flush.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/log_list.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/log_put.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/log_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/logc_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/logc_close.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/logc_get.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/lsn_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_fclose.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_fcreate.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_fget.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_fopen.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_fput.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_fset.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_fsync.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_list.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_maxwrite.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_openfd.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_register.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_set_clear_len.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_set_fileid.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_set_flags.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_set_ftype.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_set_lsn_offset.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_set_maxsize.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_set_pgcookie.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_set_priority.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_sync.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/memp_trickle.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/mempfile_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/object.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/pindex.src 0444 root bin -f none /opt/csw/bdb43/docs/api_c/rep_elect.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/rep_limit.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/rep_list.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/rep_message.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/rep_start.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/rep_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/rep_transport.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/seq_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/seq_close.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/seq_get.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/seq_init_value.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/seq_list.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/seq_open.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/seq_remove.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/seq_set_cachesize.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/seq_set_flags.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/seq_set_range.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/seq_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_close.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_dirfree.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_dirlist.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_exists.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_free.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_fsync.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_ftruncate.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_ioinfo.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_malloc.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_map.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_open.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_pread.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_pwrite.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_read.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_realloc.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_rename.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_seek.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_sleep.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_unlink.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_unmap.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_write.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/set_func_yield.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/txn_abort.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/txn_begin.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/txn_checkpoint.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/txn_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/txn_commit.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/txn_discard.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/txn_id.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/txn_list.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/txn_prepare.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/txn_recover.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/txn_set_timeout.html 0444 root bin -f none /opt/csw/bdb43/docs/api_c/txn_stat.html 0444 root bin -d none /opt/csw/bdb43/docs/api_cxx 0755 root bin -f none /opt/csw/bdb43/docs/api_cxx/api_core.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/cxx_pindex.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_associate.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_close.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_cursor.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_del.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_err.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_fd.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_get.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_get_byteswapped.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_get_mpf.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_get_type.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_getenv.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_join.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_key_range.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_list.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_open.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_put.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_remove.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_rename.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_alloc.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_append_recno.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_bt_compare.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_bt_minkey.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_bt_prefix.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_cachesize.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_dup_compare.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_encrypt.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_errcall.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_errfile.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_error_stream.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_errpfx.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_feedback.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_flags.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_h_ffactor.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_h_hash.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_h_nelem.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_lorder.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_msg_stream.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_msgcall.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_msgfile.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_pagesize.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_paniccall.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_q_extentsize.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_re_delim.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_re_len.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_re_pad.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_set_re_source.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_sync.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_truncate.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_upgrade.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/db_verify.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/dbc_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/dbc_close.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/dbc_count.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/dbc_del.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/dbc_dup.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/dbc_get.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/dbc_list.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/dbc_put.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/dbt_bulk_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/dbt_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/dbt_package.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/deadlock_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_close.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_dbremove.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_dbrename.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_err.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_list.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_open.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_remove.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_alloc.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_app_dispatch.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_cachesize.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_data_dir.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_encrypt.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_errcall.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_errfile.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_error_stream.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_errpfx.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_feedback.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_flags.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_lg_bsize.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_lg_dir.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_lg_max.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_lg_regionmax.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_lk_conflicts.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_lk_detect.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_lk_max_lockers.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_lk_max_locks.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_lk_max_objects.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_mp_mmapsize.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_msg_stream.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_msgcall.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_msgfile.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_paniccall.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_rpc_server.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_shm_key.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_tas_spins.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_timeout.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_tmp_dir.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_tx_max.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_tx_timestamp.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_set_verbose.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_strerror.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/env_version.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/exc_package.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/except_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/frame.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/lock_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/lock_detect.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/lock_get.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/lock_id.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/lock_id_free.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/lock_list.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/lock_put.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/lock_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/lock_vec.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/lockng_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/log_archive.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/log_compare.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/log_cursor.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/log_file.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/log_flush.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/log_list.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/log_put.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/log_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/logc_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/logc_close.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/logc_get.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/lsn_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_fclose.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_fcreate.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_fget.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_fopen.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_fput.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_fset.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_fsync.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_list.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_maxwrite.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_openfd.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_register.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_set_clear_len.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_set_fileid.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_set_flags.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_set_ftype.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_set_lsn_offset.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_set_maxsize.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_set_pgcookie.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_set_priority.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_sync.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/memp_trickle.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/mempfile_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/object.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/pindex.src 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/rep_elect.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/rep_limit.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/rep_list.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/rep_message.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/rep_start.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/rep_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/rep_transport.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/runrec_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/seq_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/seq_close.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/seq_get.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/seq_init_value.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/seq_list.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/seq_open.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/seq_remove.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/seq_set_cachesize.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/seq_set_flags.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/seq_set_range.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/seq_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/txn_abort.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/txn_begin.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/txn_checkpoint.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/txn_class.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/txn_commit.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/txn_discard.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/txn_id.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/txn_list.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/txn_prepare.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/txn_recover.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/txn_set_timeout.html 0444 root bin -f none /opt/csw/bdb43/docs/api_cxx/txn_stat.html 0444 root bin -d none /opt/csw/bdb43/docs/api_tcl 0755 root bin -f none /opt/csw/bdb43/docs/api_tcl/api_tcl.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/db_close.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/db_count.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/db_cursor.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/db_del.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/db_get.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/db_get_join.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/db_get_type.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/db_is_byteswapped.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/db_join.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/db_open.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/db_put.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/db_remove.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/db_rename.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/db_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/db_sync.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/db_truncate.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/dbc_close.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/dbc_del.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/dbc_dup.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/dbc_get.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/dbc_put.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/env_close.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/env_dbremove.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/env_dbrename.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/env_open.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/env_remove.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/txn.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/txn_abort.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/txn_checkpoint.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/txn_commit.html 0444 root bin -f none /opt/csw/bdb43/docs/api_tcl/version.html 0444 root bin -d none /opt/csw/bdb43/docs/collections 0755 root bin -d none /opt/csw/bdb43/docs/collections/tutorial 0755 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/BasicProgram.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/BerkeleyDB-Java-Collections.pdf 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/Entity.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/SerializableEntity.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/SerializedObjectStorage.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/Summary.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/Tuple.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/UsingCollectionsAPI.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/UsingSecondaries.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/UsingStoredCollections.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/addingdatabaseitems.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/collectionOverview.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/collectionswithentities.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/createbindingscollections.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/creatingentitybindings.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/developing.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/entitieswithcollections.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/gettingStarted.css 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/handlingexceptions.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/implementingmain.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/index.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/indexedcollections.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/openclasscatalog.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/opendatabases.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/opendbenvironment.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/openingforeignkeys.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/preface.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/removingredundantvalueclasses.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/retrievingbyindexkey.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/retrievingdatabaseitems.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/sortedcollections.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/transientfieldsinbinding.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/tuple-serialentitybindings.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/tuplekeybindings.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/tupleswithkeycreators.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/tutorialintroduction.html 0444 root bin -f none /opt/csw/bdb43/docs/collections/tutorial/usingtransactions.html 0444 root bin -d none /opt/csw/bdb43/docs/gsg 0755 root bin -d none /opt/csw/bdb43/docs/gsg/C 0755 root bin -f none /opt/csw/bdb43/docs/gsg/C/BerkeleyDB-Core-C-GSG.pdf 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/CoreCursorUsage.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/CoreDBAdmin.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/CoreDbUsage.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/CoreEnvUsage.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/Cursors.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/DB.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/DBEntry.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/DBOpenFlags.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/DbUsage.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/DeleteEntryWCursor.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/Positioning.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/PutEntryWCursor.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/ReplacingEntryWCursor.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/accessmethods.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/btree.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/cachesize.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/concepts.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/coredbclose.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/coreindexusage.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/cstructs.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/databaseLimits.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/dbErrorReporting.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/dbconfig.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/environments.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/gettingStarted.css 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/gettingit.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/index.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/indexes.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/introduction.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/joins.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/keyCreator.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/preface.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/readSecondary.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/secondaryCursor.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/secondaryDelete.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/C/usingDbt.html 0444 root bin -d none /opt/csw/bdb43/docs/gsg/CXX 0755 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/BerkeleyDB-Core-Cxx-GSG.pdf 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/CoreCursorUsage.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/CoreDBAdmin.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/CoreDbCXXUsage.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/CoreEnvUsage.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/Cursors.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/DB.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/DBEntry.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/DBOpenFlags.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/DbCXXUsage.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/DeleteEntryWCursor.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/Positioning.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/PutEntryWCursor.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/ReplacingEntryWCursor.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/accessmethods.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/btree.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/cachesize.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/concepts.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/coreExceptions.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/coredbclose.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/coreindexusage.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/databaseLimits.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/dbErrorReporting.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/dbconfig.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/environments.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/gettingStarted.css 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/gettingit.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/index.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/indexes.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/introduction.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/joins.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/keyCreator.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/preface.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/readSecondary.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/secondaryCursor.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/secondaryDelete.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/CXX/usingDbt.html 0444 root bin -d none /opt/csw/bdb43/docs/gsg/JAVA 0755 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/BerkeleyDB-Core-JAVA-GSG.pdf 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/CoreEnvUsage.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/CoreJavaUsage.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/Cursors.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/DB.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/DBAdmin.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/DBEntry.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/DeleteEntryWCursor.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/Positioning.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/PutEntryWCursor.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/ReplacingEntryWCursor.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/accessmethods.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/bindAPI.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/btree.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/cachesize.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/concepts.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/coreExceptions.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/coredbclose.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/cursorJavaUsage.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/databaseLimits.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/dbErrorReporting.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/db_config.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/dbconfig.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/dbtJavaUsage.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/environments.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/gettingStarted.css 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/gettingit.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/index.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/indexes.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/introduction.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/javaindexusage.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/joins.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/keyCreator.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/preface.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/readSecondary.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/returns.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/secondaryCursor.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/secondaryDelete.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/secondaryProps.html 0444 root bin -f none /opt/csw/bdb43/docs/gsg/JAVA/usingDbt.html 0444 root bin -d none /opt/csw/bdb43/docs/images 0755 root bin -f none /opt/csw/bdb43/docs/images/api.gif 0444 root bin -f none /opt/csw/bdb43/docs/images/next.gif 0444 root bin -f none /opt/csw/bdb43/docs/images/prev.gif 0444 root bin -f none /opt/csw/bdb43/docs/images/ps.gif 0444 root bin -f none /opt/csw/bdb43/docs/images/ref.gif 0444 root bin -f none /opt/csw/bdb43/docs/images/sleepycat.gif 0444 root bin -f none /opt/csw/bdb43/docs/index.html 0444 root bin -d none /opt/csw/bdb43/docs/java 0755 root bin -f none /opt/csw/bdb43/docs/java/allclasses-frame.html 0444 root bin -f none /opt/csw/bdb43/docs/java/allclasses-noframe.html 0444 root bin -d none /opt/csw/bdb43/docs/java/com 0755 root bin -d none /opt/csw/bdb43/docs/java/com/sleepycat 0755 root bin -d none /opt/csw/bdb43/docs/java/com/sleepycat/bind 0755 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/ByteArrayBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/EntityBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/EntryBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/RecordNumberBinding.html 0444 root bin -d none /opt/csw/bdb43/docs/java/com/sleepycat/bind/class-use 0755 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/class-use/ByteArrayBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/class-use/EntityBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/class-use/EntryBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/class-use/RecordNumberBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/package-frame.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/package-summary.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/package-tree.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/package-use.html 0444 root bin -d none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial 0755 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/ClassCatalog.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/SerialBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/SerialInput.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/SerialOutput.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/SerialSerialBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/SerialSerialKeyCreator.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/StoredClassCatalog.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/TupleSerialBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/TupleSerialKeyCreator.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/TupleSerialMarshalledBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/TupleSerialMarshalledKeyCreator.html 0444 root bin -d none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/class-use 0755 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/class-use/ClassCatalog.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/class-use/SerialBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/class-use/SerialInput.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/class-use/SerialOutput.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/class-use/SerialSerialBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/class-use/SerialSerialKeyCreator.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/class-use/StoredClassCatalog.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/class-use/TupleSerialBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/class-use/TupleSerialKeyCreator.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/class-use/TupleSerialMarshalledBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/class-use/TupleSerialMarshalledKeyCreator.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/package-frame.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/package-summary.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/package-tree.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/serial/package-use.html 0444 root bin -d none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple 0755 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/BooleanBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/ByteBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/CharacterBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/DoubleBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/FloatBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/IntegerBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/LongBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/MarshalledTupleEntry.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/MarshalledTupleKeyEntity.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/ShortBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/StringBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/TupleBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/TupleInput.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/TupleInputBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/TupleMarshalledBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/TupleOutput.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/TupleTupleBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/TupleTupleKeyCreator.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/TupleTupleMarshalledBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/TupleTupleMarshalledKeyCreator.html 0444 root bin -d none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use 0755 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/BooleanBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/ByteBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/CharacterBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/DoubleBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/FloatBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/IntegerBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/LongBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/MarshalledTupleEntry.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/MarshalledTupleKeyEntity.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/ShortBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/StringBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/TupleBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/TupleInput.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/TupleInputBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/TupleMarshalledBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/TupleOutput.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/TupleTupleBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/TupleTupleKeyCreator.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/TupleTupleMarshalledBinding.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/class-use/TupleTupleMarshalledKeyCreator.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/package-frame.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/package-summary.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/package-tree.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/bind/tuple/package-use.html 0444 root bin -d none /opt/csw/bdb43/docs/java/com/sleepycat/collections 0755 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/CurrentTransaction.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/MapEntryParameter.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/PrimaryKeyAssigner.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/StoredCollection.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/StoredCollections.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/StoredContainer.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/StoredEntrySet.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/StoredIterator.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/StoredKeySet.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/StoredList.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/StoredMap.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/StoredSortedEntrySet.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/StoredSortedKeySet.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/StoredSortedMap.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/StoredSortedValueSet.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/StoredValueSet.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/TransactionRunner.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/TransactionWorker.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/TupleSerialFactory.html 0444 root bin -d none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use 0755 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/CurrentTransaction.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/MapEntryParameter.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/PrimaryKeyAssigner.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/StoredCollection.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/StoredCollections.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/StoredContainer.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/StoredEntrySet.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/StoredIterator.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/StoredKeySet.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/StoredList.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/StoredMap.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/StoredSortedEntrySet.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/StoredSortedKeySet.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/StoredSortedMap.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/StoredSortedValueSet.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/StoredValueSet.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/TransactionRunner.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/TransactionWorker.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/class-use/TupleSerialFactory.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/package-frame.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/package-summary.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/package-tree.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/collections/package-use.html 0444 root bin -d none /opt/csw/bdb43/docs/java/com/sleepycat/db 0755 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/BtreePrefixCalculator.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/BtreeStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/CacheFile.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/CacheFilePriority.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/CacheFileStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/CacheStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/CheckpointConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/Cursor.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/CursorConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/Database.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/DatabaseConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/DatabaseEntry.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/DatabaseException.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/DatabaseStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/DatabaseType.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/DeadlockException.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/Environment.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/EnvironmentConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/ErrorHandler.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/FeedbackHandler.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/HashStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/Hasher.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/JoinConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/JoinCursor.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/KeyRange.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/Lock.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/LockDetectMode.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/LockMode.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/LockNotGrantedException.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/LockOperation.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/LockRequest.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/LockRequestMode.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/LockStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/LogCursor.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/LogRecordHandler.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/LogSequenceNumber.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/LogStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/MemoryException.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/MessageHandler.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/MultipleDataEntry.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/MultipleEntry.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/MultipleKeyDataEntry.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/MultipleRecnoDataEntry.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/OperationStatus.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/PanicHandler.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/PreparedTransaction.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/QueueStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/RecordNumberAppender.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/RecoveryOperation.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/ReplicationHandleDeadException.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/ReplicationStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/ReplicationStatus.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/ReplicationTransport.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/RunRecoveryException.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/SecondaryConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/SecondaryCursor.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/SecondaryDatabase.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/SecondaryKeyCreator.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/Sequence.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/SequenceConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/SequenceStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/StatsConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/Transaction.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/TransactionConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/TransactionStats.Active.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/TransactionStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/VerifyConfig.html 0444 root bin -d none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use 0755 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/BtreePrefixCalculator.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/BtreeStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/CacheFile.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/CacheFilePriority.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/CacheFileStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/CacheStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/CheckpointConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/Cursor.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/CursorConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/Database.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/DatabaseConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/DatabaseEntry.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/DatabaseException.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/DatabaseStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/DatabaseType.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/DeadlockException.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/Environment.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/EnvironmentConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/ErrorHandler.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/FeedbackHandler.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/HashStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/Hasher.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/JoinConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/JoinCursor.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/KeyRange.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/Lock.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/LockDetectMode.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/LockMode.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/LockNotGrantedException.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/LockOperation.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/LockRequest.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/LockRequestMode.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/LockStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/LogCursor.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/LogRecordHandler.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/LogSequenceNumber.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/LogStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/MemoryException.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/MessageHandler.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/MultipleDataEntry.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/MultipleEntry.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/MultipleKeyDataEntry.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/MultipleRecnoDataEntry.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/OperationStatus.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/PanicHandler.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/PreparedTransaction.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/QueueStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/RecordNumberAppender.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/RecoveryOperation.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/ReplicationHandleDeadException.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/ReplicationStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/ReplicationStatus.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/ReplicationTransport.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/RunRecoveryException.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/SecondaryConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/SecondaryCursor.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/SecondaryDatabase.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/SecondaryKeyCreator.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/Sequence.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/SequenceConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/SequenceStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/StatsConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/Transaction.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/TransactionConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/TransactionStats.Active.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/TransactionStats.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/class-use/VerifyConfig.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/package-frame.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/package-summary.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/package-tree.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/db/package-use.html 0444 root bin -d none /opt/csw/bdb43/docs/java/com/sleepycat/util 0755 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/util/ExceptionUnwrapper.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/util/ExceptionWrapper.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/util/FastInputStream.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/util/FastOutputStream.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/util/IOExceptionWrapper.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/util/RuntimeExceptionWrapper.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/util/UtfOps.html 0444 root bin -d none /opt/csw/bdb43/docs/java/com/sleepycat/util/class-use 0755 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/util/class-use/ExceptionUnwrapper.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/util/class-use/ExceptionWrapper.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/util/class-use/FastInputStream.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/util/class-use/FastOutputStream.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/util/class-use/IOExceptionWrapper.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/util/class-use/RuntimeExceptionWrapper.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/util/class-use/UtfOps.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/util/package-frame.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/util/package-summary.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/util/package-tree.html 0444 root bin -f none /opt/csw/bdb43/docs/java/com/sleepycat/util/package-use.html 0444 root bin -f none /opt/csw/bdb43/docs/java/constant-values.html 0444 root bin -f none /opt/csw/bdb43/docs/java/deprecated-list.html 0444 root bin -f none /opt/csw/bdb43/docs/java/help-doc.html 0444 root bin -f none /opt/csw/bdb43/docs/java/index-all.html 0444 root bin -f none /opt/csw/bdb43/docs/java/index.html 0444 root bin -f none /opt/csw/bdb43/docs/java/overview-frame.html 0444 root bin -f none /opt/csw/bdb43/docs/java/overview-summary.html 0444 root bin -f none /opt/csw/bdb43/docs/java/overview-tree.html 0444 root bin -f none /opt/csw/bdb43/docs/java/package-list 0444 root bin -f none /opt/csw/bdb43/docs/java/packages.html 0444 root bin -d none /opt/csw/bdb43/docs/java/resources 0755 root bin -f none /opt/csw/bdb43/docs/java/resources/inherit.gif 0444 root bin -f none /opt/csw/bdb43/docs/java/serialized-form.html 0444 root bin -f none /opt/csw/bdb43/docs/java/style.css 0444 root bin -d none /opt/csw/bdb43/docs/ref 0755 root bin -d none /opt/csw/bdb43/docs/ref/am 0755 root bin -f none /opt/csw/bdb43/docs/ref/am/close.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/count.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/curclose.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/curdel.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/curdup.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/curget.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/curput.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/cursor.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/delete.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/get.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/join.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/open.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/opensub.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/ops.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/put.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/second.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/second.javas 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/stat.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/sync.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/truncate.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/upgrade.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am/verify.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/am_conf 0755 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/bt_compare.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/bt_minkey.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/bt_prefix.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/bt_recnum.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/byteorder.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/cachesize.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/dup.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/extentsize.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/h_ffactor.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/h_hash.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/h_nelem.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/logrec.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/malloc.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/pagesize.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/re_source.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/recno.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/renumber.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_conf/select.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/am_misc 0755 root bin -f none /opt/csw/bdb43/docs/ref/am_misc/align.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_misc/dbsizes.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_misc/diskspace.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_misc/error.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_misc/faq.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_misc/get_bulk.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_misc/partial.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_misc/perm.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_misc/stability.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_misc/struct.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/am_misc/tune.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/apprec 0755 root bin -f none /opt/csw/bdb43/docs/ref/apprec/auto.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/apprec/config.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/apprec/def.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/apprec/intro.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/arch 0755 root bin -f none /opt/csw/bdb43/docs/ref/arch/apis.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/arch/bigpic.gif 0444 root bin -f none /opt/csw/bdb43/docs/ref/arch/bigpic.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/arch/progmodel.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/arch/script.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/arch/smallpic.gif 0444 root bin -f none /opt/csw/bdb43/docs/ref/arch/utilities.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/build_unix 0755 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/aix.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/conf.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/flags.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/freebsd.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/hpux.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/install.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/irix.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/linux.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/macosx.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/notes.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/osf1.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/qnx.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/sco.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/shlib.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/small.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/solaris.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/sunos.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/test.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_unix/ultrix.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/build_vxworks 0755 root bin -f none /opt/csw/bdb43/docs/ref/build_vxworks/faq.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_vxworks/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_vxworks/introae.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_vxworks/notes.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/build_win 0755 root bin -f none /opt/csw/bdb43/docs/ref/build_win/faq.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_win/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_win/notes.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_win/small.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_win/test.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/build_win/unicode.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/cam 0755 root bin -f none /opt/csw/bdb43/docs/ref/cam/app.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/cam/intro.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/debug 0755 root bin -f none /opt/csw/bdb43/docs/ref/debug/common.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/debug/compile.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/debug/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/debug/printlog.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/debug/runtime.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/distrib 0755 root bin -f none /opt/csw/bdb43/docs/ref/distrib/layout.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/distrib/port.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/dumpload 0755 root bin -f none /opt/csw/bdb43/docs/ref/dumpload/format.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/dumpload/text.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/dumpload/utility.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/env 0755 root bin -f none /opt/csw/bdb43/docs/ref/env/create.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/env/db_config.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/env/encrypt.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/env/error.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/env/faq.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/env/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/env/naming.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/env/open.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/env/region.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/env/remote.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/env/security.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/ext 0755 root bin -f none /opt/csw/bdb43/docs/ref/ext/mod.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/ext/perl.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/ext/php.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/install 0755 root bin -f none /opt/csw/bdb43/docs/ref/install/file.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/install/magic.s5.be.txt 0444 root bin -f none /opt/csw/bdb43/docs/ref/install/magic.s5.le.txt 0444 root bin -f none /opt/csw/bdb43/docs/ref/install/magic.txt 0444 root bin -f none /opt/csw/bdb43/docs/ref/install/multiple.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/intro 0755 root bin -f none /opt/csw/bdb43/docs/ref/intro/data.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/intro/dbis.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/intro/dbisnot.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/intro/distrib.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/intro/need.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/intro/products.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/intro/terrain.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/intro/what.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/intro/where.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/java 0755 root bin -f none /opt/csw/bdb43/docs/ref/java/compat.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/java/conf.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/java/faq.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/java/program.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/lock 0755 root bin -f none /opt/csw/bdb43/docs/ref/lock/am_conv.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/lock/cam_conv.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/lock/config.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/lock/dead.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/lock/deaddbg.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/lock/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/lock/max.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/lock/nondb.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/lock/notxn.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/lock/page.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/lock/stdmode.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/lock/timeout.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/lock/twopl.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/log 0755 root bin -f none /opt/csw/bdb43/docs/ref/log/config.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/log/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/log/limits.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/mp 0755 root bin -f none /opt/csw/bdb43/docs/ref/mp/config.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/mp/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/pindex.src 0444 root bin -d none /opt/csw/bdb43/docs/ref/program 0755 root bin -f none /opt/csw/bdb43/docs/ref/program/appsignals.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/program/cache.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/program/compatible.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/program/copy.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/program/environ.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/program/errorret.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/program/faq.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/program/mt.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/program/namespace.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/program/ram.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/program/runtime.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/program/scope.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/program/solaris.txt 0444 root bin -d none /opt/csw/bdb43/docs/ref/refs 0755 root bin -f none /opt/csw/bdb43/docs/ref/refs/bdb_usenix.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/refs/bdb_usenix.ps 0444 root bin -f none /opt/csw/bdb43/docs/ref/refs/embedded.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/refs/hash_usenix.ps 0444 root bin -f none /opt/csw/bdb43/docs/ref/refs/libtp_usenix.ps 0444 root bin -f none /opt/csw/bdb43/docs/ref/refs/refs.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/refs/witold.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/rep 0755 root bin -f none /opt/csw/bdb43/docs/ref/rep/app.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/rep/comm.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/rep/elect.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/rep/ex.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/rep/ex_comm.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/rep/ex_rq.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/rep/faq.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/rep/id.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/rep/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/rep/newsite.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/rep/partition.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/rep/pri.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/rep/trans.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/rpc 0755 root bin -f none /opt/csw/bdb43/docs/ref/rpc/client.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/rpc/faq.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/rpc/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/rpc/server.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/sequence 0755 root bin -f none /opt/csw/bdb43/docs/ref/sequence/intro.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/tcl 0755 root bin -f none /opt/csw/bdb43/docs/ref/tcl/error.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/tcl/faq.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/tcl/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/tcl/program.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/tcl/using.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/test 0755 root bin -f none /opt/csw/bdb43/docs/ref/test/faq.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/test/run.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/toc.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/transapp 0755 root bin -f none /opt/csw/bdb43/docs/ref/transapp/admin.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/app.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/archival.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/atomicity.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/checkpoint.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/cursor.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/data_open.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/deadlock.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/env_open.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/faq.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/filesys.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/hotfail.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/inc.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/logfile.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/nested.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/put.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/read.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/reclimit.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/recovery.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/term.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/throughput.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/transapp.cs 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/tune.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/why.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/transapp/writetest.cs 0444 root bin -d none /opt/csw/bdb43/docs/ref/txn 0755 root bin -f none /opt/csw/bdb43/docs/ref/txn/config.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/txn/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/txn/limits.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/upgrade 0755 root bin -d none /opt/csw/bdb43/docs/ref/upgrade.2.0 0755 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.2.0/convert.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.2.0/disk.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.2.0/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.2.0/system.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.2.0/toc.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/upgrade.3.0 0755 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/close.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/cxx.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/db.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/db_cxx.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/dbenv.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/dbenv_cxx.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/dbinfo.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/disk.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/eacces.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/eagain.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/envopen.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/func.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/java.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/join.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/jump_set.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/lock_detect.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/lock_notheld.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/lock_put.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/lock_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/log_register.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/log_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/memp_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/open.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/rmw.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/stat.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/toc.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/txn_begin.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/txn_commit.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/txn_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/value_set.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.0/xa.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/upgrade.3.1 0755 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.1/btstat.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.1/config.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.1/disk.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.1/dup.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.1/env.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.1/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.1/log_register.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.1/logalloc.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.1/memp_register.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.1/put.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.1/set_feedback.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.1/set_paniccall.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.1/set_tx_recover.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.1/sysmem.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.1/tcl.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.1/tmp.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.1/toc.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.1/txn_check.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/upgrade.3.2 0755 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.2/callback.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.2/db_dump.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.2/disk.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.2/handle.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.2/incomplete.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.2/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.2/mutexlock.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.2/notfound.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.2/renumber.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.2/set_flags.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.2/toc.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.2/tx_recover.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/upgrade.3.3 0755 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.3/alloc.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.3/bigfile.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.3/conflict.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.3/disk.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.3/getswap.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.3/gettype.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.3/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.3/memp_fget.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.3/rpc.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.3/shared.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.3/toc.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.3.3/txn_prepare.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/upgrade.4.0 0755 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.0/asr.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.0/cxx.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.0/deadlock.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.0/disk.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.0/env.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.0/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.0/java.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.0/lock.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.0/lock_id_free.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.0/log.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.0/mp.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.0/rpc.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.0/set_lk_max.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.0/toc.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.0/txn.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/upgrade.4.1 0755 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.1/app_dispatch.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.1/checkpoint.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.1/cxx.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.1/disk.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.1/excl.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.1/fop.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.1/hash_nelem.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.1/incomplete.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.1/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.1/java.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.1/log_register.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.1/log_stat.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.1/memp_sync.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.1/toc.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/upgrade.4.2 0755 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.2/cksum.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.2/client.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.2/del.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.2/disk.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.2/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.2/java.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.2/lockng.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.2/nosync.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.2/priority.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.2/queue.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.2/repinit.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.2/tcl.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.2/toc.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.2/verify.html 0444 root bin -d none /opt/csw/bdb43/docs/ref/upgrade.4.3 0755 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.3/cput.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.3/disk.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.3/enomem.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.3/err.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.3/fileopen.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.3/intro.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.3/java.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.3/log.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.3/repl.html 0444 root bin -f none /opt/csw/bdb43/docs/ref/upgrade.4.3/rtc.html 0444 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 dmichelsen at users.sourceforge.net Mon Sep 28 17:47:39 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 28 Sep 2009 15:47:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[6599] csw/mgar/pkg/libpcap/trunk Message-ID: Revision: 6599 http://gar.svn.sourceforge.net/gar/?rev=6599&view=rev Author: dmichelsen Date: 2009-09-28 15:47:39 +0000 (Mon, 28 Sep 2009) Log Message: ----------- libpcap: Add patches, re-integration of shared lib patch still needed Modified Paths: -------------- csw/mgar/pkg/libpcap/trunk/Makefile csw/mgar/pkg/libpcap/trunk/checksums csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2224954-fix-autoconf-header.diff Removed Paths: ------------- csw/mgar/pkg/libpcap/trunk/files/CSWlibpcap.gspec Modified: csw/mgar/pkg/libpcap/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpcap/trunk/Makefile 2009-09-28 15:17:03 UTC (rev 6598) +++ csw/mgar/pkg/libpcap/trunk/Makefile 2009-09-28 15:47:39 UTC (rev 6599) @@ -37,4 +37,6 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-ipv6 +INSTALL_ARGS = install-shared + include gar/category.mk Modified: csw/mgar/pkg/libpcap/trunk/checksums =================================================================== --- csw/mgar/pkg/libpcap/trunk/checksums 2009-09-28 15:17:03 UTC (rev 6598) +++ csw/mgar/pkg/libpcap/trunk/checksums 2009-09-28 15:47:39 UTC (rev 6599) @@ -1,2 +1,3 @@ -e2396bd0e71b247413ea26ced5ca923f download/fix-autoconf-header.diff 9ad1358c5dec48456405eac197a46d3d download/libpcap-1.0.0.tar.gz +4b3aba885cc3a967721616419e1b17d1 download/sf-bugtrack-2224954-fix-autoconf-header.diff +10f021b867602038e71a48f5662467bc download/sf-bugtrack-2504874-create-dir-patch.diff Deleted: csw/mgar/pkg/libpcap/trunk/files/CSWlibpcap.gspec =================================================================== --- csw/mgar/pkg/libpcap/trunk/files/CSWlibpcap.gspec 2009-09-28 15:17:03 UTC (rev 6598) +++ csw/mgar/pkg/libpcap/trunk/files/CSWlibpcap.gspec 2009-09-28 15:47:39 UTC (rev 6599) @@ -1,4 +0,0 @@ -%var bitname libpcap -%var pkgname CSWlibpcap -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYRIGHT Modified: csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2224954-fix-autoconf-header.diff =================================================================== --- csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2224954-fix-autoconf-header.diff 2009-09-28 15:17:03 UTC (rev 6598) +++ csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2224954-fix-autoconf-header.diff 2009-09-28 15:47:39 UTC (rev 6599) @@ -1,15 +1,3 @@ -diff -Naur libpcap-1.0.0.orig/Makefile.in libpcap-1.0.0.patched/Makefile.in ---- libpcap-1.0.0.orig/Makefile.in 2008-10-28 02:26:13.000000000 +0100 -+++ libpcap-1.0.0.patched/Makefile.in 2009-09-28 16:33:43.194864215 +0200 -@@ -445,6 +445,8 @@ - $(DESTDIR)$(includedir)/pcap-bpf.h - $(INSTALL_DATA) $(srcdir)/pcap-namedb.h \ - $(DESTDIR)$(includedir)/pcap-namedb.h -+ [ -d $(DESTDIR)$(bindir) ] || \ -+ (mkdir -p $(DESTDIR)$(bindir); chmod 755 $(DESTDIR)$(bindir)) - $(INSTALL_PROGRAM) pcap-config $(DESTDIR)$(bindir)/pcap-config - for i in $(MAN1); do \ - $(INSTALL_DATA) $(srcdir)/$$i \ diff -Naur libpcap-1.0.0.orig/configure libpcap-1.0.0.patched/configure --- libpcap-1.0.0.orig/configure 2008-10-28 02:26:13.000000000 +0100 +++ libpcap-1.0.0.patched/configure 2009-09-28 16:32:19.576622377 +0200 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 Sep 29 03:35:28 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 29 Sep 2009 01:35:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[6600] csw/mgar/pkg/gitosis/Makefile Message-ID: Revision: 6600 http://gar.svn.sourceforge.net/gar/?rev=6600&view=rev Author: wahwah Date: 2009-09-29 01:35:28 +0000 (Tue, 29 Sep 2009) Log Message: ----------- gitosis: software-level Makefile Added Paths: ----------- csw/mgar/pkg/gitosis/Makefile Copied: csw/mgar/pkg/gitosis/Makefile (from rev 6474, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gitosis/Makefile (rev 0) +++ csw/mgar/pkg/gitosis/Makefile 2009-09-29 01:35:28 UTC (rev 6600) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -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 Tue Sep 29 09:47:54 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 29 Sep 2009 07:47:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[6601] csw/mgar/pkg/cswutils/trunk Message-ID: Revision: 6601 http://gar.svn.sourceforge.net/gar/?rev=6601&view=rev Author: wahwah Date: 2009-09-29 07:47:54 +0000 (Tue, 29 Sep 2009) Log Message: ----------- cswutils: Adding compare_pkgs.py 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-09-29 01:35:28 UTC (rev 6600) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2009-09-29 07:47:54 UTC (rev 6601) @@ -6,12 +6,18 @@ define BLURB endef -MASTER_SITES = +SVNROOT = http://opencsw.svn.sourceforge.net/svnroot/opencsw/utilities/ +SVN_REV = 74 + +MASTER_SITES = DISTFILES = COPYING DISTFILES += checkpkg checkpkg.8 DISTFILES += cpan2pkg DISTFILES += createpkg createpkg.8 DISTFILES += stagepkg stagepkg.8 +DISTFILES += stagepkg stagepkg.8 +DISTFILES += compare_pkgs.py-r$(SVN_REV) +DISTFILES += opencsw_lib.py-r$(SVN_REV) REQUIRED_PKGS = CSWtextutils CSWfakeroot CSWperl REQUIRED_PKGS += CSWpmyaml CSWpmlibwww CSWpmhtmltree @@ -34,6 +40,16 @@ include gar/category.mk +download/compare_pkgs.py-r$(SVN_REV): + svn export -r $(SVN_REV) $(SVNROOT)compare_pkgs.py + mv compare_pkgs.py download/compare_pkgs.py-r$(SVN_REV) + @$(MAKECOOKIE) + +download/opencsw_lib.py-r$(SVN_REV): + svn export -r $(SVN_REV) $(SVNROOT)opencsw_lib.py + mv opencsw_lib.py download/opencsw_lib.py-r$(SVN_REV) + @$(MAKECOOKIE) + install-custom: @ginstall -d $(DESTDIR)$(bindir) @ginstall $(WORKSRC)/checkpkg $(DESTDIR)$(bindir) @@ -45,4 +61,10 @@ @ginstall $(WORKSRC)/checkpkg.8 $(DESTDIR)$(mandir)/man8/ @ginstall $(WORKSRC)/createpkg.8 $(DESTDIR)$(mandir)/man8/ @ginstall $(WORKSRC)/stagepkg.8 $(DESTDIR)$(mandir)/man8/ + @ginstall -d $(DESTDIR)$(libdir)/opencsw + @ginstall $(WORKSRC)/compare_pkgs.py-r$(SVN_REV) \ + $(DESTDIR)$(libdir)/opencsw/compare_pkgs.py + @ginstall $(WORKSRC)/opencsw_lib.py-r$(SVN_REV) \ + $(DESTDIR)$(libdir)/opencsw/opencsw_lib.py + @ln -s ../lib/opencsw/compare_pkgs.py $(DESTDIR)$(bindir)/csw-pkg-diff @$(MAKECOOKIE) Modified: csw/mgar/pkg/cswutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswutils/trunk/checksums 2009-09-29 01:35:28 UTC (rev 6600) +++ csw/mgar/pkg/cswutils/trunk/checksums 2009-09-29 07:47:54 UTC (rev 6601) @@ -1,8 +1,10 @@ 091b12575ebc0e45cf8c3d8b43d8b638 download/COPYING 30b6598a4453e3ce0c1fabeede5eb5f8 download/checkpkg 6ec3b6597e04714430987ccc199db3c4 download/checkpkg.8 +280eef68336d2896ecc136152014af9c download/compare_pkgs.py-r74 9a637f6546cc50974159a987302d91c0 download/cpan2pkg 93b6a811d303ce3be0050c5a7b3c8e69 download/createpkg a605598f30195f9ab1b29fc3944d3b31 download/createpkg.8 +d2106349c17ae9e9e000e6636960c134 download/opencsw_lib.py-r74 cd4496ee27bf86d5c8bc656c9c5974be download/stagepkg 8908a0a898aa07a7a928b2b8bd8384f0 download/stagepkg.8 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 Sep 29 10:06:03 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 29 Sep 2009 08:06:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[6602] csw/mgar/pkg/tnef/trunk Message-ID: Revision: 6602 http://gar.svn.sourceforge.net/gar/?rev=6602&view=rev Author: bonivart Date: 2009-09-29 08:06:00 +0000 (Tue, 29 Sep 2009) Log Message: ----------- tnef: update to 1.4.6 Modified Paths: -------------- csw/mgar/pkg/tnef/trunk/Makefile csw/mgar/pkg/tnef/trunk/checksums Modified: csw/mgar/pkg/tnef/trunk/Makefile =================================================================== --- csw/mgar/pkg/tnef/trunk/Makefile 2009-09-29 07:47:54 UTC (rev 6601) +++ csw/mgar/pkg/tnef/trunk/Makefile 2009-09-29 08:06:00 UTC (rev 6602) @@ -1,5 +1,5 @@ GARNAME = tnef -GARVERSION = 1.4.5 +GARVERSION = 1.4.6 CATEGORIES = utils DESCRIPTION = Unpacks Microsoft TNEF MIME attachments Modified: csw/mgar/pkg/tnef/trunk/checksums =================================================================== --- csw/mgar/pkg/tnef/trunk/checksums 2009-09-29 07:47:54 UTC (rev 6601) +++ csw/mgar/pkg/tnef/trunk/checksums 2009-09-29 08:06:00 UTC (rev 6602) @@ -1,2 +1 @@ -ec46d47525c6afb928642e3edec21058 download/tnef-1.4.5.tar.gz -343e1f9b38a4dabb0d788c782131a863 download/CSWtnef.gspec +b47184c4de61322750071cca7026b1cb download/tnef-1.4.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 Tue Sep 29 11:45:06 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 29 Sep 2009 09:45:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[6603] csw/mgar/pkg/cswutils/trunk/Makefile Message-ID: Revision: 6603 http://gar.svn.sourceforge.net/gar/?rev=6603&view=rev Author: dmichelsen Date: 2009-09-29 09:45:05 +0000 (Tue, 29 Sep 2009) Log Message: ----------- cswutils: Update version to 1.14.4 after adding csw-pkg-diff Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2009-09-29 08:06:00 UTC (rev 6602) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2009-09-29 09:45:05 UTC (rev 6603) @@ -1,5 +1,5 @@ GARNAME = cswutils -GARVERSION = 1.14.3 +GARVERSION = 1.14.4 CATEGORIES = utils DESCRIPTION = Utilities for CSW maintainers 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 Tue Sep 29 12:34:54 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Tue, 29 Sep 2009 10:34:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[6604] csw/mgar/pkg/nagios/trunk Message-ID: Revision: 6604 http://gar.svn.sourceforge.net/gar/?rev=6604&view=rev Author: j_arndt Date: 2009-09-29 10:34:54 +0000 (Tue, 29 Sep 2009) Log Message: ----------- nagios: moved config / log files to /etc/opt/csw/nagios / /var/opt/csw/nagios Modified Paths: -------------- csw/mgar/pkg/nagios/trunk/Makefile csw/mgar/pkg/nagios/trunk/checksums csw/mgar/pkg/nagios/trunk/files/CSWnagios.preinstall csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype Modified: csw/mgar/pkg/nagios/trunk/Makefile =================================================================== --- csw/mgar/pkg/nagios/trunk/Makefile 2009-09-29 09:45:05 UTC (rev 6603) +++ csw/mgar/pkg/nagios/trunk/Makefile 2009-09-29 10:34:54 UTC (rev 6604) @@ -32,6 +32,7 @@ prefix = $(BUILD_PREFIX)/nagios libexecdir = $(BUILD_PREFIX)/libexec/nagios-plugins +sysconfdir = /etc$(prefix) CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --prefix=$(prefix) @@ -42,6 +43,9 @@ CONFIGURE_ARGS += --with-gd-lib-dir=$(BUILD_PREFIX)/lib CONFIGURE_ARGS += --with-gd-lib-inc=$(BUILD_PREFIX)/inc CONFIGURE_ARGS += --enable-embedded-perl +CONFIGURE_ARGS += --with-checkresult-dir=/var/opt/csw/nagios/spool/checkresults +CONFIGURE_ARGS += --with-lockfile=/var/opt/csw/nagios/nagios.lock +CONFIGURE_ARGS += --localstatedir=/var$(prefix) EXTRA_LIB = $(BUILD_PREFIX)/lib EXTRA_INC = $(BUILD_PREFIX)/include @@ -64,14 +68,13 @@ DOCS = Changelog INSTALLING README UPGRADING DOCDEST = $(DESTDIR)$(BUILD_PREFIX)/share/doc/nagios HTTPD_CONF = $(DESTDIR)$(sysconfdir) -CFGDIR = $(prefix)/etc +CFGDIR = /etc/$(prefix) post-install-modulated: @ginstall -m 755 -d $(DOCDEST) @ginstall -m 755 -d $(HTTPD_CONF) @$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);) @ginstall -m 644 $(WORKSRC)/LICENSE $(DOCDEST) - @ginstall -m 644 $(WORKSRC)/sample-config/httpd.conf $(HTTPD_CONF)/httpd-nagios.conf @ginstall -d $(DESTDIR)/etc/opt/csw/init.d @ginstall -m 755 $(FILEDIR)/cswnagios $(DESTDIR)/etc/opt/csw/init.d/cswnagios @ginstall -m 775 -d $(DESTDIR)$(CFGDIR) @@ -79,6 +82,7 @@ @ginstall -b -m 664 $(WORKSRC)/sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg.CSW @ginstall -b -m 664 $(WORKSRC)/sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg.CSW @ginstall -b -m 660 $(WORKSRC)/sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg.CSW + @ginstall -b -m 644 $(WORKSRC)/sample-config/httpd.conf $(DESTDIR)$(CFGDIR)/httpd-nagios.conf @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg.CSW @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg.CSW @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg.CSW Modified: csw/mgar/pkg/nagios/trunk/checksums =================================================================== --- csw/mgar/pkg/nagios/trunk/checksums 2009-09-29 09:45:05 UTC (rev 6603) +++ csw/mgar/pkg/nagios/trunk/checksums 2009-09-29 10:34:54 UTC (rev 6604) @@ -1,7 +1,7 @@ e407a4b179bd7de72b3e8c21f309f9b7 download/CSWnagios.checkinstall -47cc36016f5518dfd5614b870f56e944 download/CSWnagios.preinstall +db3f392c725ae6e9a3f5a969d2527b41 download/CSWnagios.preinstall 92437323de0cceaa58c6238ec9e6c954 download/CSWnagios.preremove -42672e3ae1e539bf9747f369cb4db7f1 download/CSWnagios.prototype +8d38acdcd6d31711af14ad09e537ea20 download/CSWnagios.prototype e493345589ac2c592c2b958499bc8c20 download/configure.diff d3b39178a60cf866a243d4d8f8eabb9b download/cswnagios f3161bcb7c65f89707ee37b0a8d861d5 download/install-opts.diff Modified: csw/mgar/pkg/nagios/trunk/files/CSWnagios.preinstall =================================================================== --- csw/mgar/pkg/nagios/trunk/files/CSWnagios.preinstall 2009-09-29 09:45:05 UTC (rev 6603) +++ csw/mgar/pkg/nagios/trunk/files/CSWnagios.preinstall 2009-09-29 10:34:54 UTC (rev 6604) @@ -31,4 +31,17 @@ /usr/sbin/usermod -G nagioscm nagios fi +cat << EOF + +======================================================================= + +Configuration files were moved from /opt/csw/nagios/etc/ to +/etc/opt/csw/nagios/. + +Changes which were made to the existing config will automatically +moved to the new location. + +======================================================================= +EOF + exit 0 Modified: csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype =================================================================== --- csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype 2009-09-29 09:45:05 UTC (rev 6603) +++ csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype 2009-09-29 10:34:54 UTC (rev 6604) @@ -4,20 +4,21 @@ d none /opt/csw/nagios/bin 0755 nagios nagios f none /opt/csw/nagios/bin/nagios 0754 nagios nagios f none /opt/csw/nagios/bin/nagiostats 0754 nagios nagios -d none /opt/csw/nagios/etc 0755 nagios nagios -f cswpreserveconf /opt/csw/nagios/etc/cgi.cfg.CSW 0644 nagios nagios -f none /opt/csw/nagios/etc/httpd-nagios.conf 0644 nagios nagios -f cswpreserveconf /opt/csw/nagios/etc/nagios.cfg.CSW 0644 nagios nagios -d none /opt/csw/nagios/etc/objects 0755 nagios nagios -f cswpreserveconf /opt/csw/nagios/etc/objects/commands.cfg.CSW 0644 nagios nagios -f cswpreserveconf /opt/csw/nagios/etc/objects/contacts.cfg.CSW 0644 nagios nagios -f cswpreserveconf /opt/csw/nagios/etc/objects/localhost.cfg.CSW 0644 nagios nagios -f cswpreserveconf /opt/csw/nagios/etc/objects/printer.cfg.CSW 0644 nagios nagios -f cswpreserveconf /opt/csw/nagios/etc/objects/switch.cfg.CSW 0644 nagios nagios -f cswpreserveconf /opt/csw/nagios/etc/objects/templates.cfg.CSW 0644 nagios nagios -f cswpreserveconf /opt/csw/nagios/etc/objects/timeperiods.cfg.CSW 0644 nagios nagios -f cswpreserveconf /opt/csw/nagios/etc/objects/windows.cfg.CSW 0644 nagios nagios -f cswpreserveconf /opt/csw/nagios/etc/resource.cfg.CSW 0640 nagios nagios +f none /opt/csw/nagios/bin/p1.pl 075 nagios nagios +d none /etc/opt/csw/nagios 0755 nagios nagios +f cswpreserveconf /etc/opt/csw/nagios/cgi.cfg.CSW 0644 nagios nagios +f none /etc/opt/csw/nagios/httpd-nagios.conf 0644 nagios nagios +f cswpreserveconf /etc/opt/csw/nagios/nagios.cfg.CSW 0644 nagios nagios +d none /etc/opt/csw/nagios/objects 0755 nagios nagios +f cswpreserveconf /etc/opt/csw/nagios/objects/commands.cfg.CSW 0644 nagios nagios +f cswpreserveconf /etc/opt/csw/nagios/objects/contacts.cfg.CSW 0644 nagios nagios +f cswpreserveconf /etc/opt/csw/nagios/objects/localhost.cfg.CSW 0644 nagios nagios +f cswpreserveconf /etc/opt/csw/nagios/objects/printer.cfg.CSW 0644 nagios nagios +f cswpreserveconf /etc/opt/csw/nagios/objects/switch.cfg.CSW 0644 nagios nagios +f cswpreserveconf /etc/opt/csw/nagios/objects/templates.cfg.CSW 0644 nagios nagios +f cswpreserveconf /etc/opt/csw/nagios/objects/timeperiods.cfg.CSW 0644 nagios nagios +f cswpreserveconf /etc/opt/csw/nagios/objects/windows.cfg.CSW 0644 nagios nagios +f cswpreserveconf /etc/opt/csw/nagios/resource.cfg.CSW 0640 nagios nagios d none /opt/csw/nagios/sbin 0755 nagios nagios f none /opt/csw/nagios/sbin/avail.cgi 0755 nagios nagios f none /opt/csw/nagios/sbin/cmd.cgi 0755 nagios nagios @@ -383,11 +384,11 @@ f none /opt/csw/nagios/share/stylesheets/summary.css 0644 nagios nagios f none /opt/csw/nagios/share/stylesheets/tac.css 0644 nagios nagios f none /opt/csw/nagios/share/stylesheets/trends.css 0644 nagios nagios -d none /opt/csw/nagios/var 0755 nagios nagios -d none /opt/csw/nagios/var/archives 0755 nagios nagios -d none /opt/csw/nagios/var/rw 0755 nagios nagios -d none /opt/csw/nagios/var/spool 0755 nagios nagios -d none /opt/csw/nagios/var/spool/checkresults 0755 nagios nagios +d none /var/opt/csw/nagios 0755 nagios nagios +d none /var/opt/csw/nagios/archives 0755 nagios nagios +d none /var/opt/csw/nagios/rw 0755 nagios nagios +d none /var/opt/csw/nagios/spool 0755 nagios nagios +d none /var/opt/csw/nagios/spool/checkresults 0755 nagios nagios d none /opt/csw/share/doc/nagios 0755 root bin f none /opt/csw/share/doc/nagios/Changelog 0644 root bin f none /opt/csw/share/doc/nagios/INSTALLING 0644 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 Tue Sep 29 13:00:16 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 29 Sep 2009 11:00:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[6605] csw/mgar/pkg/libmm/trunk Message-ID: Revision: 6605 http://gar.svn.sourceforge.net/gar/?rev=6605&view=rev Author: dmichelsen Date: 2009-09-29 11:00:15 +0000 (Tue, 29 Sep 2009) Log Message: ----------- libmm: Add needed legacy version libmm.so.13.0.21 Modified Paths: -------------- csw/mgar/pkg/libmm/trunk/Makefile csw/mgar/pkg/libmm/trunk/checksums Modified: csw/mgar/pkg/libmm/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmm/trunk/Makefile 2009-09-29 10:34:54 UTC (rev 6604) +++ csw/mgar/pkg/libmm/trunk/Makefile 2009-09-29 11:00:15 UTC (rev 6605) @@ -2,6 +2,13 @@ GARVERSION = 1.4.2 CATEGORIES = lib +EXTRA_MODULATORS = GARVERSION +MODULATIONS_GARVERSION = 1.3.1 1.4.2 + +# No 64 bit for old version as it wasn't provided in the legacy version also +SKIP_MODULATIONS = isa-amd64-garversion-1.3.1 +SKIP_MODULATIONS += isa-sparcv9-garversion-1.3.1 + DESCRIPTION = Shared Memory Allocation abstraction library define BLURB OSSP mm is a 2-layer abstraction library which simplifies the usage @@ -14,7 +21,11 @@ endef MASTER_SITES = ftp://ftp.ossp.org/pkg/lib/mm/ -DISTFILES = mm-$(GARVERSION).tar.gz +SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),mm-$(VERSION).tar.gz) +DISTFILES = $(SOURCEFILES) + +NOEXTRACT = $(filter-out mm-$(GARVERSION).tar.gz,$(SOURCEFILES)) + PATCHFILES = 0001-libtool-cflags.diff # We define upstream file regex so we can be notifed of new upstream software release @@ -31,4 +42,23 @@ BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) +MERGE_SCRIPTS_isa-i386-garversion-1.3.1 = copy-only +MERGE_DIRS_isa-i386-garversion-1.3.1 = $(libdir) +MERGE_SCRIPTS_isa-amd64-garversion-1.3.1 = copy-relocated-only +MERGE_DIRS_isa-amd64-garversion-1.3.1 = $(libdir) + +MERGE_SCRIPTS_isa-i386-garversion-1.4.2 = copy-all +MERGE_SCRIPTS_isa-amd64-garversion-1.4.2 = copy-relocated-only +MERGE_DIRS_isa-amd64-garversion-1.4.2 = $(bindir) $(sbindir) $(libexecdir) $(libdir) + +MERGE_SCRIPTS_isa-sparcv8-garversion-1.3.1 = copy-only +MERGE_DIRS_isa-sparcv8-garversion-1.3.1 = $(libdir) +MERGE_SCRIPTS_isa-sparcv9-garversion-1.3.1 = copy-relocated-only +MERGE_DIRS_isa-sparcv9-garversion-1.3.1 = $(libdir) + +MERGE_SCRIPTS_isa-sparcv8-garversion-1.4.2 = copy-all +MERGE_SCRIPTS_isa-sparcv9-garversion-1.4.2 = copy-relocated-only +MERGE_DIRS_isa-sparcv9-garversion-1.4.2 = $(bindir) $(sbindir) $(libexecdir) $(libdir) + + include gar/category.mk Modified: csw/mgar/pkg/libmm/trunk/checksums =================================================================== --- csw/mgar/pkg/libmm/trunk/checksums 2009-09-29 10:34:54 UTC (rev 6604) +++ csw/mgar/pkg/libmm/trunk/checksums 2009-09-29 11:00:15 UTC (rev 6605) @@ -1,2 +1,3 @@ 54493069b25bc79b8f40ed5c5632b2fa download/0001-libtool-cflags.diff +7d62bc28b776f46ff5f71521ad17bf70 download/mm-1.3.1.tar.gz bdb34c6c14071364c8f69062d2e8c82b download/mm-1.4.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 Sep 29 13:32:05 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 29 Sep 2009 11:32:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[6606] csw/mgar/gar/v2 Message-ID: Revision: 6606 http://gar.svn.sourceforge.net/gar/?rev=6606&view=rev Author: dmichelsen Date: 2009-09-29 11:32:04 +0000 (Tue, 29 Sep 2009) Log Message: ----------- mGAR v2: Fix handling of ISA dirs with +/- included Modified Paths: -------------- csw/mgar/gar/v2/bin/cswproto csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/bin/cswproto =================================================================== --- csw/mgar/gar/v2/bin/cswproto 2009-09-29 11:00:15 UTC (rev 6605) +++ csw/mgar/gar/v2/bin/cswproto 2009-09-29 11:32:04 UTC (rev 6606) @@ -112,6 +112,8 @@ open F, $common || die "Couldn't open $common"; while () { chomp; next if /^\s*$/ or /^#/; + s/\+/\\+/g; + s/\-/\\-/g; my @c = split( m!/! ); my @pc = map { join( '/', @c[0..$_] ) } 1..$#c; $alldirs{$_} = 1 foreach (@pc); Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-09-29 11:00:15 UTC (rev 6605) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-09-29 11:32:04 UTC (rev 6606) @@ -227,7 +227,7 @@ # between the prefix and the suffix. # usage: $(call isadirs,,) # expands to // // ... -isadirs = $(foreach ISA,$(ISALIST),$(1)/$(ISA)/$(2)) +isadirs = $(foreach ISA,$(ISALIST),$(1)/$(subst +,\+,$(subst -,\-,$(ISA)))/$(2)) # This is a helper function just like isadirs, but also contains the # prefix and suffix without an ISA subdirectories inserted. 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 Sep 29 13:37:55 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 29 Sep 2009 11:37:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[6607] csw/mgar/pkg/libpcap/trunk Message-ID: Revision: 6607 http://gar.svn.sourceforge.net/gar/?rev=6607&view=rev Author: dmichelsen Date: 2009-09-29 11:37:54 +0000 (Tue, 29 Sep 2009) Log Message: ----------- libpcap: Add shared library support Modified Paths: -------------- csw/mgar/pkg/libpcap/trunk/Makefile csw/mgar/pkg/libpcap/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libpcap/trunk/files/shared-library.diff Removed Paths: ------------- csw/mgar/pkg/libpcap/trunk/files/Makefile.in.diff csw/mgar/pkg/libpcap/trunk/files/scanner.l.diff Modified: csw/mgar/pkg/libpcap/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpcap/trunk/Makefile 2009-09-29 11:32:04 UTC (rev 6606) +++ csw/mgar/pkg/libpcap/trunk/Makefile 2009-09-29 11:37:54 UTC (rev 6607) @@ -2,7 +2,7 @@ GARVERSION = 1.0.0 CATEGORIES = lib -DESCRIPTION = Libraries for network diagnostics +DESCRIPTION = System-independent interface for user-level packet capture define BLURB A system-independent interface for user-level network packet capture. endef @@ -17,14 +17,16 @@ PATCHFILES = sf-bugtrack-2224954-fix-autoconf-header.diff PATCHFILES += sf-bugtrack-2504874-create-dir-patch.diff +PATCHFILES += shared-library.diff -# Shared libraries patch -#PATCHFILES = Makefile.in.diff -#PATCHFILES += scanner.l.diff +PACKAGES = CSWlibpcap CSWlibpcapdevel -# No test target for libpcap -TEST_SCRIPTS = +CATALOGNAME_CSWlibpcap = libpcap +CATALOGNAME_CSWlibpcapdevel = libpcap_devel +SPKG_DESC_CSWlibpcap = System-independent interface for user-level packet capture +SPKG_DESC_CSWlibpcapdevel = libpcap development files + BUILD64 = 1 EXTRA_BUILD_ISAS_sparc = sparcv8plus sparcv8plus+vis @@ -34,9 +36,25 @@ EXTRA_CFLAGS = -I. +EXTRA_CFLAGS_isa-sparcv9 = -xcode=pic32 +EXTRA_CFLAGS_isa-amd64 = -xcode=pic32 +EXTRA_CFLAGS += $(EXTRA_CFLAGS_isa-$(ISA)) + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-ipv6 +# Make sure shared libraries are built +BUILD_ARGS = shared INSTALL_ARGS = install-shared +# No test target for libpcap +TEST_SCRIPTS = + +MERGE_DIRS_isa-sparcv8plus = $(libdir) +MERGE_DIRS_isa-sparcv8plus+vis = $(libdir) +MERGE_DIRS_isa-pentium = $(libdir) +MERGE_DIRS_isa-pentium_pro+mmx = $(libdir) + +PKGFILES_CSWlibpcapdevel = $(PKGFILES_DEVEL) + include gar/category.mk Modified: csw/mgar/pkg/libpcap/trunk/checksums =================================================================== --- csw/mgar/pkg/libpcap/trunk/checksums 2009-09-29 11:32:04 UTC (rev 6606) +++ csw/mgar/pkg/libpcap/trunk/checksums 2009-09-29 11:37:54 UTC (rev 6607) @@ -1,3 +1,4 @@ 9ad1358c5dec48456405eac197a46d3d download/libpcap-1.0.0.tar.gz 4b3aba885cc3a967721616419e1b17d1 download/sf-bugtrack-2224954-fix-autoconf-header.diff 10f021b867602038e71a48f5662467bc download/sf-bugtrack-2504874-create-dir-patch.diff +3115b52dbe16ed2b4174ed19fb63f2d6 download/shared-library.diff Deleted: csw/mgar/pkg/libpcap/trunk/files/Makefile.in.diff =================================================================== --- csw/mgar/pkg/libpcap/trunk/files/Makefile.in.diff 2009-09-29 11:32:04 UTC (rev 6606) +++ csw/mgar/pkg/libpcap/trunk/files/Makefile.in.diff 2009-09-29 11:37:54 UTC (rev 6607) @@ -1,116 +0,0 @@ ---- ../build-global/libpcap-0.9.8/Makefile.in 2007-07-24 04:35:15.000000000 +0200 -+++ libpcap-0.9.8/Makefile.in 2009-04-09 04:07:28.839392745 +0200 -@@ -37,6 +37,15 @@ - srcdir = @srcdir@ - VPATH = @srcdir@ - -+# some defines for shared library compilation - FIXME -+MAJ=0 -+MIN=9.8 -+VERSION=$(MAJ).$(MIN) -+LIBNAME=pcap -+LIBRARY=lib$(LIBNAME).a -+SOLIBRARY=lib$(LIBNAME).so -+SHAREDLIB=$(SOLIBRARY).$(VERSION) -+ - # - # You shouldn't need to edit anything below. - # -@@ -52,6 +61,7 @@ - - # Standard CFLAGS - CFLAGS = $(CCOPT) $(INCLS) $(DEFS) -+CFLAGS_SHARED = -G $(LDFLAGS) -Wl,-h,$(SOLIBRARY).$(MAJ) - - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -71,7 +81,11 @@ - # problem if you don't own the file but can write to the directory. - .c.o: - @rm -f $@ -- $(CC) $(CFLAGS) -c $(srcdir)/$*.c -+ $(CC) $(CFLAGS) -c -o $@ $(srcdir)/$*.c -+ -+%_pic.o: %.c -+ @rm -f $@ -+ $(CC) -KPIC $(CFLAGS) -c -o $@ $(srcdir)/$*.c - - PSRC = pcap- at V_PCAP@.c - FSRC = fad- at V_FINDALLDEVS@.c -@@ -86,6 +100,8 @@ - # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot - # hack the extra indirection - OBJ = $(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) $(LIBOBJS) -+OBJ_PIC = $(PSRC:.c=_pic.o) $(FSRC:.c=_pic.o) $(CSRC:.c=_pic.o) $(SSRC:.c=_pic.o) $(GENSRC:.c=_pic.o) -+ - HDR = pcap.h pcap-int.h pcap-namedb.h pcap-nit.h pcap-pf.h \ - ethertype.h gencode.h gnuc.h - GENHDR = \ -@@ -98,14 +114,22 @@ - $(SRC) $(HDR) $(TAGHDR) - - CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c -+CLEANFILES = $(OBJ) $(OBJ_PIC) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c libpcap.so* - --all: libpcap.a -+all: libpcap.a $(SHAREDLIB) - - libpcap.a: $(OBJ) - @rm -f $@ - ar rc $@ $(OBJ) $(LIBS) - $(RANLIB) $@ - -+$(SHAREDLIB): $(OBJ_PIC) -+ - at rm -f $@ -+ - at rm -f $(SOLIBRARY) $(SOLIBRARY).$(MAJ) -+ $(CC) $(CFLAGS_SHARED) -o $(SHAREDLIB) $(OBJ_PIC) -lc -+ ln -s $(SHAREDLIB) $(SOLIBRARY).$(MAJ) -+ ln -s $(SOLIBRARY).$(MAJ) $(SOLIBRARY) -+ - shared: libpcap.$(DYEXT) - - # -@@ -131,6 +155,9 @@ - scanner.o: scanner.c tokdefs.h - $(CC) $(CFLAGS) -c scanner.c - -+scanner_pic.o: scanner.c tokdefs.h -+ $(CC) -KPIC $(CFLAGS) -o $@ -c scanner.c -+ - pcap.o: version.h - - tokdefs.h: grammar.c -@@ -144,9 +171,16 @@ - @rm -f $@ - $(CC) $(CFLAGS) -Dyylval=pcap_lval -c grammar.c - -+grammar_pic.o: grammar.c -+ @rm -f $@ -+ $(CC) -KPIC $(CFLAGS) -Dyylval=pcap_lval -o $@ -c grammar.c -+ - version.o: version.c - $(CC) $(CFLAGS) -c version.c - -+version_pic.o: version.c -+ $(CC) -KPIC $(CFLAGS) -o $@ -c version.c -+ - snprintf.o: $(srcdir)/missing/snprintf.c - $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c - -@@ -172,10 +206,16 @@ - bpf_filter.o: bpf_filter.c - $(CC) $(CFLAGS) -c bpf_filter.c - -+bpf_filter_pic.o: bpf_filter.c -+ $(CC) -KPIC $(CFLAGS) -o $@ -c bpf_filter.c -+ - install: libpcap.a - [ -d $(DESTDIR)$(libdir) ] || \ - (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) - $(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a -+ $(INSTALL_DATA) $(SHAREDLIB) $(DESTDIR)$(libdir)/ -+ ln -sf $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SOLIBRARY).$(MAJ) -+ ln -sf $(SOLIBRARY).$(MAJ) $(DESTDIR)$(libdir)/$(SOLIBRARY) - $(RANLIB) $(DESTDIR)$(libdir)/libpcap.a - [ -d $(DESTDIR)$(includedir) ] || \ - (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir)) Deleted: csw/mgar/pkg/libpcap/trunk/files/scanner.l.diff =================================================================== --- csw/mgar/pkg/libpcap/trunk/files/scanner.l.diff 2009-09-29 11:32:04 UTC (rev 6606) +++ csw/mgar/pkg/libpcap/trunk/files/scanner.l.diff 2009-09-29 11:37:54 UTC (rev 6607) @@ -1,11 +0,0 @@ ---- ../build-global/libpcap-0.9.8/scanner.l 2007-06-11 21:34:28.000000000 +0200 -+++ libpcap-0.9.8/scanner.l 2009-04-09 04:41:33.481612776 +0200 -@@ -32,6 +32,8 @@ - #include - #include - -+#include -+ - #include "pcap-int.h" - - #include "gencode.h" Added: csw/mgar/pkg/libpcap/trunk/files/shared-library.diff =================================================================== --- csw/mgar/pkg/libpcap/trunk/files/shared-library.diff (rev 0) +++ csw/mgar/pkg/libpcap/trunk/files/shared-library.diff 2009-09-29 11:37:54 UTC (rev 6607) @@ -0,0 +1,12 @@ +diff -Naur libpcap-1.0.0.orig/Makefile.in libpcap-1.0.0.patched/Makefile.in +--- libpcap-1.0.0.orig/Makefile.in 2008-10-28 02:26:13.000000000 +0100 ++++ libpcap-1.0.0.patched/Makefile.in 2009-09-28 21:54:53.647596468 +0200 +@@ -326,7 +326,7 @@ + # + libpcap.so: $(OBJ) + @rm -f $@ +- $(CC) -shared -Wl,-soname,$@.1 -o $@.`cat $(srcdir)/VERSION` $(OBJ) $(DAGLIBS) ++ $(CC) -G -o $@.`cat $(srcdir)/VERSION` $(LDFLAGS) $(OBJ) $(DAGLIBS) + + # + # The following rule succeeds, but the result is untested. 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 Sep 29 13:57:37 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 29 Sep 2009 11:57:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[6608] csw/mgar/pkg/tcpdump/trunk Message-ID: Revision: 6608 http://gar.svn.sourceforge.net/gar/?rev=6608&view=rev Author: dmichelsen Date: 2009-09-29 11:57:36 +0000 (Tue, 29 Sep 2009) Log Message: ----------- tcpdump: Update to 4.0 Modified Paths: -------------- csw/mgar/pkg/tcpdump/trunk/Makefile csw/mgar/pkg/tcpdump/trunk/checksums Modified: csw/mgar/pkg/tcpdump/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcpdump/trunk/Makefile 2009-09-29 11:37:54 UTC (rev 6607) +++ csw/mgar/pkg/tcpdump/trunk/Makefile 2009-09-29 11:57:36 UTC (rev 6608) @@ -1,10 +1,9 @@ GARNAME = tcpdump -GARVERSION = 3.9.8 +GARVERSION = 4.0.0 CATEGORIES = utils DESCRIPTION = tcpdump allows you to dump the traffic on a network define BLURB - endef MASTER_SITES = http://www.tcpdump.org/release/ @@ -14,9 +13,12 @@ PREREQUISITE_PKGS = CSWlibpcap CSWosslrt CSWossldevel REQUIRED_PKGS = CSWlibpcap CSWosslrt + # 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.tcpdump.org/ + # Shared libraries patch #PATCHFILES = solib.diff Modified: csw/mgar/pkg/tcpdump/trunk/checksums =================================================================== --- csw/mgar/pkg/tcpdump/trunk/checksums 2009-09-29 11:37:54 UTC (rev 6607) +++ csw/mgar/pkg/tcpdump/trunk/checksums 2009-09-29 11:57:36 UTC (rev 6608) @@ -1 +1 @@ -c491a78c52fe73f1f7271aa5d8c6ab2e download/tcpdump-3.9.8.tar.gz +b22ca72890df2301d922c9f2d17867f9 download/tcpdump-4.0.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Sep 29 14:12:08 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 29 Sep 2009 12:12:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[6609] csw/mgar/pkg Message-ID: Revision: 6609 http://gar.svn.sourceforge.net/gar/?rev=6609&view=rev Author: dmichelsen Date: 2009-09-29 12:12:08 +0000 (Tue, 29 Sep 2009) Log Message: ----------- chmlib: Initial commit Added Paths: ----------- csw/mgar/pkg/chmlib/ csw/mgar/pkg/chmlib/branches/ csw/mgar/pkg/chmlib/tags/ csw/mgar/pkg/chmlib/trunk/ csw/mgar/pkg/chmlib/trunk/Makefile csw/mgar/pkg/chmlib/trunk/checksums csw/mgar/pkg/chmlib/trunk/files/ Property changes on: csw/mgar/pkg/chmlib/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/chmlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/chmlib/trunk/Makefile (rev 0) +++ csw/mgar/pkg/chmlib/trunk/Makefile 2009-09-29 12:12:08 UTC (rev 6609) @@ -0,0 +1,33 @@ +GARNAME = chmlib +GARVERSION = 0.40 +CATEGORIES = lib + +DESCRIPTION = Library designed for accessing MS ITSS files (chm) +define BLURB + CHMLIB is a library for dealing with Microsoft ITSS/CHM format files. + Right now, it is a very simple library, but sufficient for dealing with + all of the .chm files I've come across. Due to the fairly well-designed + indexing built into this particular file format, even a small library is + able to gain reasonably good performance indexing into ITSS archives. +endef + +MASTER_SITES = http://www.jedrea.com/chmlib/ +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) +CONFIGURE_ARGS += --enable-examples + +TEST_TARGET = check + +DOCS = NEWS README +DOCS += ChmLib-ds6.zip ChmLib-ce.zip + +include gar/category.mk + +post-install-modulated: + ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) + $(foreach D,$(DOCS),ginstall $(WORKSRC)/$D $(DESTDIR)$(docdir)/$(GARNAME)/$D;) + @$(MAKECOOKIE) Added: csw/mgar/pkg/chmlib/trunk/checksums =================================================================== --- csw/mgar/pkg/chmlib/trunk/checksums (rev 0) +++ csw/mgar/pkg/chmlib/trunk/checksums 2009-09-29 12:12:08 UTC (rev 6609) @@ -0,0 +1 @@ +7ea49ed8c335215c1edc6fae83e6b912 download/chmlib-0.40.tar.bz2 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 Sep 29 17:28:52 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 29 Sep 2009 15:28:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[6610] csw/mgar/pkg Message-ID: Revision: 6610 http://gar.svn.sourceforge.net/gar/?rev=6610&view=rev Author: bonivart Date: 2009-09-29 15:28:52 +0000 (Tue, 29 Sep 2009) Log Message: ----------- jpeginfo: initial commit of 1.6.0 Added Paths: ----------- csw/mgar/pkg/jpeginfo/ csw/mgar/pkg/jpeginfo/branches/ csw/mgar/pkg/jpeginfo/tags/ csw/mgar/pkg/jpeginfo/trunk/ csw/mgar/pkg/jpeginfo/trunk/Makefile csw/mgar/pkg/jpeginfo/trunk/checksums csw/mgar/pkg/jpeginfo/trunk/files/ Property changes on: csw/mgar/pkg/jpeginfo/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/jpeginfo/trunk/Makefile =================================================================== --- csw/mgar/pkg/jpeginfo/trunk/Makefile (rev 0) +++ csw/mgar/pkg/jpeginfo/trunk/Makefile 2009-09-29 15:28:52 UTC (rev 6610) @@ -0,0 +1,38 @@ +GARNAME = jpeginfo +GARVERSION = 1.6.0 +CATEGORIES = utils + +DESCRIPTION = Info and error checking of jpeg files +define BLURB + Utility to generate informative listings from jpeg files, and to check jpeg files + for errors. Program also supports automagic deletion of broken jpegs. +endef + +MASTER_SITES = http://www.kokkonen.net/tjko/src/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +REQUIRED_PKGS = CSWjpeg + +# 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) + +TEST_TARGET = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +SPKG_SOURCEURL = http://www.kokkonen.net/tjko/projects.html#jpeginfo + +install-custom: + @echo " ==> Installing $(GARNAME) (custom)" + @rm -rf $(DESTDIR) + @ginstall -d $(DESTDIR)$(bindir) + @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -d $(DESTDIR)$(mandir)/man1 + @( cd $(WORKSRC) ; \ + cp -r $(GARNAME) $(DESTDIR)$(bindir)/$(GARNAME) ; \ + cp -r README $(DESTDIR)$(docdir)/$(GARNAME) ; \ + cp -r $(GARNAME).1 $(DESTDIR)$(mandir)/man1/$(GARNAME).1 ) + @$(MAKECOOKIE) Added: csw/mgar/pkg/jpeginfo/trunk/checksums =================================================================== --- csw/mgar/pkg/jpeginfo/trunk/checksums (rev 0) +++ csw/mgar/pkg/jpeginfo/trunk/checksums 2009-09-29 15:28:52 UTC (rev 6610) @@ -0,0 +1 @@ +eda5b0d15d7373c9b0bc96bba4af61e0 download/jpeginfo-1.6.0.tar.gz 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 Tue Sep 29 17:45:38 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Tue, 29 Sep 2009 15:45:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[6611] csw/mgar/pkg/nagios/trunk Message-ID: Revision: 6611 http://gar.svn.sourceforge.net/gar/?rev=6611&view=rev Author: j_arndt Date: 2009-09-29 15:45:36 +0000 (Tue, 29 Sep 2009) Log Message: ----------- nagios: improved start / stop script, fix in prototype Modified Paths: -------------- csw/mgar/pkg/nagios/trunk/checksums csw/mgar/pkg/nagios/trunk/files/CSWnagios.preinstall csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype csw/mgar/pkg/nagios/trunk/files/cswnagios Removed Paths: ------------- csw/mgar/pkg/nagios/trunk/files/nagios Modified: csw/mgar/pkg/nagios/trunk/checksums =================================================================== --- csw/mgar/pkg/nagios/trunk/checksums 2009-09-29 15:28:52 UTC (rev 6610) +++ csw/mgar/pkg/nagios/trunk/checksums 2009-09-29 15:45:36 UTC (rev 6611) @@ -1,9 +1,9 @@ e407a4b179bd7de72b3e8c21f309f9b7 download/CSWnagios.checkinstall -db3f392c725ae6e9a3f5a969d2527b41 download/CSWnagios.preinstall +5185cf1fded86e414e134710f075f4ed download/CSWnagios.preinstall 92437323de0cceaa58c6238ec9e6c954 download/CSWnagios.preremove -8d38acdcd6d31711af14ad09e537ea20 download/CSWnagios.prototype +4aa71b54c0fa268116a41abc7f3f2b5d download/CSWnagios.prototype e493345589ac2c592c2b958499bc8c20 download/configure.diff -d3b39178a60cf866a243d4d8f8eabb9b download/cswnagios +1d43a15b685160919b82b181c118cbae download/cswnagios f3161bcb7c65f89707ee37b0a8d861d5 download/install-opts.diff 3566167cc60ddeaad34e7d2e26ed4a58 download/nagios-3.2.0.tar.gz 91407bdea2047b6ff5a1542550933144 download/patch.diff Modified: csw/mgar/pkg/nagios/trunk/files/CSWnagios.preinstall =================================================================== --- csw/mgar/pkg/nagios/trunk/files/CSWnagios.preinstall 2009-09-29 15:28:52 UTC (rev 6610) +++ csw/mgar/pkg/nagios/trunk/files/CSWnagios.preinstall 2009-09-29 15:45:36 UTC (rev 6611) @@ -4,8 +4,31 @@ # 2007-09-11 Fix PKG_INSTALL_ROOT usage. BASEDIR is not used for non # relocatable packages. + echo "Executing preinstall" +cat << EOF + +======================================================================= + +From Nagios 3.2.0 on the configuration and log files for the OpenCSW +package are stored in /etc/opt/csw/nagios/ and /var/opt/csw/nagios/. + +Changes you made to your existing config will automatically +moved to the new location. + + +Please be aware, that it's very likely that you have to change your +nagios.cfg to that changes. + + Installation will proceed in 30 seconds. + Press CTRL+C if you want to stop now. + +======================================================================= +EOF + +sleep 30 + #If installing package on a filesystem tree not running the OS; then exit. if [ ! x"$PKG_INSTALL_ROOT" = x"" ] ; then exit 0 ; fi @@ -31,17 +54,5 @@ /usr/sbin/usermod -G nagioscm nagios fi -cat << EOF -======================================================================= - -Configuration files were moved from /opt/csw/nagios/etc/ to -/etc/opt/csw/nagios/. - -Changes which were made to the existing config will automatically -moved to the new location. - -======================================================================= -EOF - exit 0 Modified: csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype =================================================================== --- csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype 2009-09-29 15:28:52 UTC (rev 6610) +++ csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype 2009-09-29 15:45:36 UTC (rev 6611) @@ -4,7 +4,7 @@ d none /opt/csw/nagios/bin 0755 nagios nagios f none /opt/csw/nagios/bin/nagios 0754 nagios nagios f none /opt/csw/nagios/bin/nagiostats 0754 nagios nagios -f none /opt/csw/nagios/bin/p1.pl 075 nagios nagios +f none /opt/csw/nagios/bin/p1.pl 0754 nagios nagios d none /etc/opt/csw/nagios 0755 nagios nagios f cswpreserveconf /etc/opt/csw/nagios/cgi.cfg.CSW 0644 nagios nagios f none /etc/opt/csw/nagios/httpd-nagios.conf 0644 nagios nagios Modified: csw/mgar/pkg/nagios/trunk/files/cswnagios =================================================================== --- csw/mgar/pkg/nagios/trunk/files/cswnagios 2009-09-29 15:28:52 UTC (rev 6610) +++ csw/mgar/pkg/nagios/trunk/files/cswnagios 2009-09-29 15:45:36 UTC (rev 6611) @@ -28,26 +28,28 @@ # # Modified for CSW by Alex Moore 2006-02-27 # Modified for OpenCSW by Juergen Arndt 2009-03-11 +# +# 2009-09-24 Alexander Skwar +# - Load Solaris SMF file, if present +# - Use SMF exitcodes, if SMF file was loaded +# - use printf instead of "echo -n" #FMRI application # FMRI path for service, see http://wiki.opencsw.org/cswclassutils-package#toc0 +# Load Solaris SMF Variables +test -r /lib/svc/share/smf_include.sh && . /lib/svc/share/smf_include.sh + status_nagios () { - if test ! -f $NagiosRun; then - echo "No lock file found in $NagiosRun" - return 1 - fi - - NagiosPID=`head -n 1 $NagiosRun` if test -x $NagiosCGI/daemonchk.cgi; then - if $NagiosCGI/daemonchk.cgi -l $NagiosRun; then + if $NagiosCGI/daemonchk.cgi -l $NagiosRunFile; then return 0 else return 1 fi else - if ps -p $NagiosPID; then + if ps -p $NagiosPID > /dev/null 2>&1; then return 0 else return 1 @@ -57,20 +59,40 @@ return 1 } +printstatus_nagios() +{ + if status_nagios $1 $2; then + echo "nagios (pid $NagiosPID) is running..." + else + echo "nagios is not running" + fi +} + killproc_nagios () { - if [ ! -f $NagiosRun ]; then - echo "No lock file found in $NagiosRun" + if [ ! -f $NagiosRunFile ]; then + echo "No lock file found in $NagiosRunFile" return 1 fi - NagiosPID=`head -n 1 $NagiosRun` + NagiosPID=`head -n 1 $NagiosRunFile` kill $2 $NagiosPID } +pid_nagios () +{ + if test ! -f $NagiosRunFile; then + echo "No lock file found in $NagiosRunFile" + test -z "$SMF_EXIT_ERR_FATAL" && exit 1 + test -n "$SMF_EXIT_ERR_FATAL" && exit $SMF_EXIT_ERR_FATAL + fi + + NagiosPID=`head -n 1 $NagiosRunFile` +} + # Source function library # Solaris doesn't have an rc.d directory, so do a test first if [ -f /etc/rc.d/init.d/functions ]; then @@ -81,91 +103,146 @@ prefix=/opt/csw/nagios exec_prefix=${prefix} +NagiosVarDir=/var/${prefix} NagiosBin=${exec_prefix}/bin/nagios -NagiosCfg=${prefix}/etc/nagios.cfg -NagiosLog=${prefix}/var/status.log -NagiosTmp=${prefix}/var/nagios.tmp -NagiosSav=${prefix}/var/status.sav -NagiosCmd=${prefix}/var/rw/nagios.cmd -NagiosVar=${prefix}/var -NagiosRun=${prefix}/var/nagios.lock -NagiosLckDir=/var/lock/subsys -NagiosLckFile=nagios -NagiosCGI=${exec_prefix}/sbin -Nagios=nagios - +NagiosCfgFile=/etc/${prefix}/nagios.cfg +NagiosStatusFile=${NagiosVarDir}/status.dat +NagiosRetentionFile=${NagiosVarDir}/retention.dat +NagiosCommandFile=${NagiosVarDir}/rw/nagios.cmd +NagiosRunFile=${NagiosVarDir}/nagios.lock +NagiosLockDir=/var/lock/subsys +NagiosLockFile=nagios +NagiosCGIDir=${exec_prefix}/sbin +NagiosUser=nagios +NagiosGroup=nagios # Check that nagios exists. -test -f $NagiosBin || exit 0 +if [ ! -f $NagiosBin ]; then + echo "Executable file $NagiosBin not found. Exiting." + test -z "$SMF_EXIT_ERR_FATAL" && exit 1 + test -n "$SMF_EXIT_ERR_FATAL" && exit $SMF_EXIT_ERR_FATAL +fi # Check that nagios.cfg exists. -test -f $NagiosCfg || exit 0 +if [ ! -f $NagiosCfgFile ]; then + echo "Configuration file $NagiosCfgFile not found. Exiting." + test -z "$SMF_EXIT_ERR_CONFIG" && exit 1 + test -n "$SMF_EXIT_ERR_CONFIG" && exit $SMF_EXIT_ERR_CONFIG +fi # See how we were called. case "$1" in start) - echo "Starting network monitor: nagios" - su - $Nagios -c "touch $NagiosVar/nagios.log $NagiosSav" - rm -f $NagiosCmd - $NagiosBin -d $NagiosCfg - if [ -d $NagiosLckDir ]; then touch $NagiosLckDir/$NagiosLckFile; fi - sleep 1 - status_nagios nagios + printf "Starting nagios:" + $NagiosBin -v $NagiosCfgFile > /dev/null 2>&1; + if [ $? -eq 0 ]; then + su - $NagiosUser -c "touch $NagiosVarDir/nagios.log $NagiosRetentionFile" + rm -f $NagiosCommandFile + touch $NagiosRunFile + chown $NagiosUser:$NagiosGroup $NagiosRunFile + $NagiosBin -d $NagiosCfgFile + if [ -d $NagiosLockDir ]; then touch $NagiosLockDir/$NagiosLockFile; fi + echo " done." + test -z "$SMF_EXIT_OK" && exit 0 + test -n "$SMF_EXIT_OK" && exit $SMF_EXIT_OK + else + echo "CONFIG ERROR! Start aborted. Check your Nagios configuration." + test -z "$SMF_EXIT_ERR_CONFIG" && exit 1 + test -n "$SMF_EXIT_ERR_CONFIG" && exit $SMF_EXIT_ERR_CONFIG + fi ;; stop) - echo "Stopping network monitor: nagios" + printf "Stopping nagios: " + + pid_nagios killproc_nagios nagios - rm -f $NagiosLog $NagiosTmp $NagiosRun $NagiosLckDir/$NagiosLckFile $NagiosCmd + + # now we have to wait for nagios to exit and remove its + # own NagiosRunFile, otherwise a following "start" could + # happen, and then the exiting nagios will remove the + # new NagiosRunFile, allowing multiple nagios daemons + # to (sooner or later) run - John Sellens + #printf 'Waiting for nagios to exit .' + for i in 1 2 3 4 5 6 7 8 9 10 ; do + if status_nagios > /dev/null; then + printf '.' + sleep 1 + else + break + fi + done + if status_nagios > /dev/null; then + echo '' + echo 'Warning - nagios did not exit in a timely manner' + else + echo 'done.' + fi + + rm -f $NagiosStatusFile $NagiosRunFile $NagiosLockDir$NagiosLockFile $NagiosCommandFile ;; status) - status_nagios nagios + pid_nagios + printstatus_nagios nagios ;; + checkconfig) + printf "Running configuration check..." + $NagiosBin -v $NagiosCfgFile > /dev/null 2>&1; + if [ $? -eq 0 ]; then + echo " OK." + else + echo " CONFIG ERROR! Check your Nagios configuration." + test -z "$SMF_EXIT_ERR_CONFIG" && exit 1 + test -n "$SMF_EXIT_ERR_CONFIG" && exit $SMF_EXIT_ERR_CONFIG + fi + ;; + restart) printf "Running configuration check..." - $NagiosBin -v $NagiosCfg > /dev/null 2>&1; + $NagiosBin -v $NagiosCfgFile > /dev/null 2>&1; if [ $? -eq 0 ]; then - echo "done" - $0 stop - $0 start + echo "done." + "$0" stop + "$0" start else - $NagiosBin -v $NagiosCfg - echo "failed - aborting restart." - exit 1 + echo " CONFIG ERROR! Restart aborted. Check your Nagios configuration." + test -z "$SMF_EXIT_ERR_CONFIG" && exit 1 + test -n "$SMF_EXIT_ERR_CONFIG" && exit $SMF_EXIT_ERR_CONFIG fi ;; reload|force-reload) printf "Running configuration check..." - $NagiosBin -v $NagiosCfg > /dev/null 2>&1; + $NagiosBin -v $NagiosCfgFile > /dev/null 2>&1; if [ $? -eq 0 ]; then - echo "done" - if test ! -f $NagiosRun; then - $0 start + echo "done." + if test ! -f $NagiosRunFile; then + "$0" start else - NagiosPID=`head -n 1 $NagiosRun` + pid_nagios if status_nagios > /dev/null; then printf "Reloading nagios configuration..." killproc_nagios nagios -HUP echo "done" else - $0 stop - $0 start + "$0" stop + "$0" start fi fi else - $NagiosBin -v $NagiosCfg - echo "failed - aborting reload." - exit 1 + echo " CONFIG ERROR! Reload aborted. Check your Nagios configuration." + test -z "$SMF_EXIT_ERR_CONFIG" && exit 1 + test -n "$SMF_EXIT_ERR_CONFIG" && exit $SMF_EXIT_ERR_CONFIG fi ;; *) - echo "Usage: nagios {start|stop|restart|reload|force-reload|status}" - exit 1 + echo "Usage: nagios {start|stop|restart|reload|force-reload|status|checkconfig}" + test -z "$SMF_EXIT_ERR_FATAL" && exit 1 + test -n "$SMF_EXIT_ERR_FATAL" && exit $SMF_EXIT_ERR_FATAL ;; esac Deleted: csw/mgar/pkg/nagios/trunk/files/nagios =================================================================== --- csw/mgar/pkg/nagios/trunk/files/nagios 2009-09-29 15:28:52 UTC (rev 6610) +++ csw/mgar/pkg/nagios/trunk/files/nagios 2009-09-29 15:45:36 UTC (rev 6611) @@ -1,171 +0,0 @@ -#!/bin/sh -# -# chkconfig: 345 99 01 -# description: Nagios network monitor -# -# File : nagios -# -# Author : Jorge Sanchez Aymar (jsanchez at lanchile.cl) -# -# Changelog : -# -# 1999-07-09 Karl DeBisschop -# - setup for autoconf -# - add reload function -# 1999-08-06 Ethan Galstad -# - Added configuration info for use with RedHat's chkconfig tool -# per Fran Boon's suggestion -# 1999-08-13 Jim Popovitch -# - added variable for nagios/var directory -# - cd into nagios/var directory before creating tmp files on startup -# 1999-08-16 Ethan Galstad -# - Added test for rc.d directory as suggested by Karl DeBisschop -# 2000-07-23 Karl DeBisschop -# - Clean out redhat macros and other dependencies -# -# Description: Starts and stops the Nagios monitor -# used to provide network services status. -# -# Modified for CSW by Alex Moore 2006-02-27 - - -status_nagios () -{ - - if test ! -f $NagiosRun; then - echo "No lock file found in $NagiosRun" - return 1 - fi - - NagiosPID=`head -n 1 $NagiosRun` - if test -x $NagiosCGI/daemonchk.cgi; then - if $NagiosCGI/daemonchk.cgi -l $NagiosRun; then - return 0 - else - return 1 - fi - else - if ps -p $NagiosPID; then - return 0 - else - return 1 - fi - fi - - return 1 -} - - -killproc_nagios () -{ - - if [ ! -f $NagiosRun ]; then - echo "No lock file found in $NagiosRun" - return 1 - fi - - NagiosPID=`head -n 1 $NagiosRun` - kill $2 $NagiosPID -} - - -# Source function library -# Solaris doesn't have an rc.d directory, so do a test first -if [ -f /etc/rc.d/init.d/functions ]; then - . /etc/rc.d/init.d/functions -elif [ -f /etc/init.d/functions ]; then - . /etc/init.d/functions -fi - -prefix=/opt/csw/nagios -exec_prefix=${prefix} -NagiosBin=${exec_prefix}/bin/nagios -NagiosCfg=${prefix}/etc/nagios.cfg -NagiosLog=${prefix}/var/status.log -NagiosTmp=${prefix}/var/nagios.tmp -NagiosSav=${prefix}/var/status.sav -NagiosCmd=${prefix}/var/rw/nagios.cmd -NagiosVar=${prefix}/var -NagiosRun=${prefix}/var/nagios.lock -NagiosLckDir=/var/lock/subsys -NagiosLckFile=nagios -NagiosCGI=${exec_prefix}/sbin -Nagios=nagios - - -# Check that nagios exists. -test -f $NagiosBin || exit 0 - -# Check that nagios.cfg exists. -test -f $NagiosCfg || exit 0 - -# See how we were called. -case "$1" in - - start) - echo "Starting network monitor: nagios" - su - $Nagios -c "touch $NagiosVar/nagios.log $NagiosSav" - rm -f $NagiosCmd - $NagiosBin -d $NagiosCfg - if [ -d $NagiosLckDir ]; then touch $NagiosLckDir/$NagiosLckFile; fi - sleep 1 - status_nagios nagios - ;; - - stop) - echo "Stopping network monitor: nagios" - killproc_nagios nagios - rm -f $NagiosLog $NagiosTmp $NagiosRun $NagiosLckDir/$NagiosLckFile $NagiosCmd - ;; - - status) - status_nagios nagios - ;; - - restart) - printf "Running configuration check..." - $NagiosBin -v $NagiosCfg > /dev/null 2>&1; - if [ $? -eq 0 ]; then - echo "done" - $0 stop - $0 start - else - $NagiosBin -v $NagiosCfg - echo "failed - aborting restart." - exit 1 - fi - ;; - - reload|force-reload) - printf "Running configuration check..." - $NagiosBin -v $NagiosCfg > /dev/null 2>&1; - if [ $? -eq 0 ]; then - echo "done" - if test ! -f $NagiosRun; then - $0 start - else - NagiosPID=`head -n 1 $NagiosRun` - if status_nagios > /dev/null; then - printf "Reloading nagios configuration..." - killproc_nagios nagios -HUP - echo "done" - else - $0 stop - $0 start - fi - fi - else - $NagiosBin -v $NagiosCfg - echo "failed - aborting reload." - exit 1 - fi - ;; - - *) - echo "Usage: nagios {start|stop|restart|reload|force-reload|status}" - exit 1 - ;; - -esac - -# End of this script 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 Tue Sep 29 17:47:37 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Tue, 29 Sep 2009 15:47:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[6612] csw/mgar/pkg/nagios/trunk/checksums Message-ID: Revision: 6612 http://gar.svn.sourceforge.net/gar/?rev=6612&view=rev Author: j_arndt Date: 2009-09-29 15:47:36 +0000 (Tue, 29 Sep 2009) Log Message: ----------- nagios: updated checksums Modified Paths: -------------- csw/mgar/pkg/nagios/trunk/checksums Modified: csw/mgar/pkg/nagios/trunk/checksums =================================================================== --- csw/mgar/pkg/nagios/trunk/checksums 2009-09-29 15:45:36 UTC (rev 6611) +++ csw/mgar/pkg/nagios/trunk/checksums 2009-09-29 15:47:36 UTC (rev 6612) @@ -3,7 +3,7 @@ 92437323de0cceaa58c6238ec9e6c954 download/CSWnagios.preremove 4aa71b54c0fa268116a41abc7f3f2b5d download/CSWnagios.prototype e493345589ac2c592c2b958499bc8c20 download/configure.diff -1d43a15b685160919b82b181c118cbae download/cswnagios +0c26e222285ad2666ca0ecf6c85cebf8 download/cswnagios f3161bcb7c65f89707ee37b0a8d861d5 download/install-opts.diff 3566167cc60ddeaad34e7d2e26ed4a58 download/nagios-3.2.0.tar.gz 91407bdea2047b6ff5a1542550933144 download/patch.diff 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 Tue Sep 29 22:35:04 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Tue, 29 Sep 2009 20:35:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[6613] csw/mgar/pkg/nagios_plugins/trunk Message-ID: Revision: 6613 http://gar.svn.sourceforge.net/gar/?rev=6613&view=rev Author: j_arndt Date: 2009-09-29 20:35:00 +0000 (Tue, 29 Sep 2009) Log Message: ----------- nagios_plugins: fixed issue #3927, perl scripts now use util.pm in /opt/csw/libexec/nagios-plugins Modified Paths: -------------- csw/mgar/pkg/nagios_plugins/trunk/Makefile csw/mgar/pkg/nagios_plugins/trunk/checksums Added Paths: ----------- csw/mgar/pkg/nagios_plugins/trunk/files/subst.in.diff Modified: csw/mgar/pkg/nagios_plugins/trunk/Makefile =================================================================== --- csw/mgar/pkg/nagios_plugins/trunk/Makefile 2009-09-29 15:47:36 UTC (rev 6612) +++ csw/mgar/pkg/nagios_plugins/trunk/Makefile 2009-09-29 20:35:00 UTC (rev 6613) @@ -12,6 +12,7 @@ DISTFILES += $(call admfiles,CSWnagiosp,prototype ) PATCHFILES += check_procs.c.diff +PATCHFILES += subst.in.diff REQUIRED_PKGS_CSWnagiosp = CSWggettextrt CSWiconv CSWlibnet CSWlibpq REQUIRED_PKGS_CSWnagiosp += CSWmysql5rt CSWoldaprt CSWosslrt CSWsasl @@ -25,6 +26,8 @@ CONFIGURE_ARGS += --with-mysql-dir=/opt/csw/mysql5/bin CONFIGURE_ARGS += --with-pg-dir=/opt/csw/postgresql/include/ CONFIGURE_ARGS += --disable-largefile +CONFIGURE_ARGS += --with-perl=/opt/csw/bin/perl +CONFIGURE_ARGS += --libexecdir=$(prefix)/libexec/nagios-plugins libexecdir ?= $(prefix)/libexec/nagios-plugins Modified: csw/mgar/pkg/nagios_plugins/trunk/checksums =================================================================== --- csw/mgar/pkg/nagios_plugins/trunk/checksums 2009-09-29 15:47:36 UTC (rev 6612) +++ csw/mgar/pkg/nagios_plugins/trunk/checksums 2009-09-29 20:35:00 UTC (rev 6613) @@ -1,4 +1,5 @@ -be6cc7699fff3ee29d1fd4d562377386 download/nagios-plugins-1.4.13.tar.gz 61f490e92b603ac8628fb0c6cebb39ce download/CSWnagiosp.gspec 65bdf1c84228ccd98397837636004761 download/CSWnagiosp.prototype 4e1d82a9b3b21ade03ad39652352857e download/check_procs.c.diff +be6cc7699fff3ee29d1fd4d562377386 download/nagios-plugins-1.4.13.tar.gz +54ff8a8e4484fd06f1edf9df4adefabf download/subst.in.diff Added: csw/mgar/pkg/nagios_plugins/trunk/files/subst.in.diff =================================================================== --- csw/mgar/pkg/nagios_plugins/trunk/files/subst.in.diff (rev 0) +++ csw/mgar/pkg/nagios_plugins/trunk/files/subst.in.diff 2009-09-29 20:35:00 UTC (rev 6613) @@ -0,0 +1,12 @@ +diff --speed-large-files --minimal -Nru nagios-plugins-1.4.13.orig/plugins-scripts/subst.in nagios-plugins-1.4.13/plugins-scripts/subst.in +--- nagios-plugins-1.4.13.orig/plugins-scripts/subst.in 2005-08-31 00:11:42.000000000 +0200 ++++ nagios-plugins-1.4.13/plugins-scripts/subst.in 2009-09-29 22:00:50.232667015 +0200 +@@ -62,7 +62,7 @@ + # subst will replace the fully qualified command with whatever is + # returned from the which subroutine + # +-/^[^#]/ && /(\/.*)?\/(bin|sbin|lib|libexec)\// { ++/^[^#]/ && /(\/.*)?\/(bin|sbin|lib)\// { + match($0,/(\/.*)?\/(bin|sbin|lib|libexec)\/[-_a-zA-Z0-9]+/); + c=substr($0,RSTART,RLENGTH); + sub(c,which(c,path)); 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 Sep 30 10:28:03 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 30 Sep 2009 08:28:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[6614] csw/mgar/pkg/phpMyAdmin/trunk Message-ID: Revision: 6614 http://gar.svn.sourceforge.net/gar/?rev=6614&view=rev Author: bonivart Date: 2009-09-30 08:28:03 +0000 (Wed, 30 Sep 2009) Log Message: ----------- phpmyadmin: update to 3.2.2 Modified Paths: -------------- csw/mgar/pkg/phpMyAdmin/trunk/Makefile csw/mgar/pkg/phpMyAdmin/trunk/checksums Modified: csw/mgar/pkg/phpMyAdmin/trunk/Makefile =================================================================== --- csw/mgar/pkg/phpMyAdmin/trunk/Makefile 2009-09-29 20:35:00 UTC (rev 6613) +++ csw/mgar/pkg/phpMyAdmin/trunk/Makefile 2009-09-30 08:28:03 UTC (rev 6614) @@ -1,5 +1,5 @@ GARNAME = phpMyAdmin -GARVERSION = 3.1.2 +GARVERSION = 3.2.2 CATEGORIES = apps DESCRIPTION = Effective MySQL Management @@ -16,10 +16,11 @@ DISTFILES = $(GARNAME)-$(GARVERSION)-all-languages.tar.bz2 DISTFILES += $(call admfiles,CSWphpmyadmin,) -REQUIRED_PKGS = CSWapache2 CSWap2modphp5 CSWmysql5 CSWphp5 CSWphp5gd CSWphp5mcrypt CSWphp5mysqli CSWphp5session CSWphp5mbstring CSWphp5ctype CSWphp5zip +REQUIRED_PKGS = CSWapache2 CSWap2modphp5 CSWmysql5 CSWphp5 CSWphp5gd CSWphp5mcrypt +REQUIRED_PKGS += CSWphp5mysqli CSWphp5session CSWphp5mbstring CSWphp5ctype CSWphp5zip # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = -(\d+(?:\.\d+)*)-all-languages.tar.bz2 +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-all-languages.tar.bz2 CONFIGURE_SCRIPTS = BUILD_SCRIPTS = @@ -36,5 +37,5 @@ @ginstall -d $(DESTDIR)$(prefix)/share/www @cp -R $(WORKSRC)-all-languages $(DESTDIR)$(prefix)/share/www/phpmyadmin @ginstall -d $(DESTDIR)$(docdir)/phpmyadmin - @cp $(WORKSRC)-all-languages/LICENSE $(DESTDIR)$(docdir)/phpmyadmin + @cp $(WORKSRC)-all-languages/LICENSE $(DESTDIR)$(docdir)/phpmyadmin/license @$(MAKECOOKIE) Modified: csw/mgar/pkg/phpMyAdmin/trunk/checksums =================================================================== --- csw/mgar/pkg/phpMyAdmin/trunk/checksums 2009-09-29 20:35:00 UTC (rev 6613) +++ csw/mgar/pkg/phpMyAdmin/trunk/checksums 2009-09-30 08:28:03 UTC (rev 6614) @@ -1,2 +1,2 @@ -cb6a6db5d684f94e71f864071b5b0d7a download/phpMyAdmin-3.1.2-all-languages.tar.bz2 +a5f6492f89ee1ff17b76593af79640ce download/phpMyAdmin-3.2.2-all-languages.tar.bz2 25157d38d820705d47f2056d67cc0c2e download/CSWphpmyadmin.gspec 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 Sep 30 10:38:47 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 30 Sep 2009 08:38:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[6615] csw/mgar/pkg/phpMyAdmin/trunk/Makefile Message-ID: Revision: 6615 http://gar.svn.sourceforge.net/gar/?rev=6615&view=rev Author: bonivart Date: 2009-09-30 08:38:47 +0000 (Wed, 30 Sep 2009) Log Message: ----------- phpmyadmin: remove gspec Modified Paths: -------------- csw/mgar/pkg/phpMyAdmin/trunk/Makefile Modified: csw/mgar/pkg/phpMyAdmin/trunk/Makefile =================================================================== --- csw/mgar/pkg/phpMyAdmin/trunk/Makefile 2009-09-30 08:28:03 UTC (rev 6614) +++ csw/mgar/pkg/phpMyAdmin/trunk/Makefile 2009-09-30 08:38:47 UTC (rev 6615) @@ -14,8 +14,10 @@ MASTER_SITES = http://garr.dl.sourceforge.net/sourceforge/phpmyadmin/ DISTFILES = $(GARNAME)-$(GARVERSION)-all-languages.tar.bz2 -DISTFILES += $(call admfiles,CSWphpmyadmin,) +PACKAGES = CSWphpmyadmin +CATALOGNAME = phpmyadmin + REQUIRED_PKGS = CSWapache2 CSWap2modphp5 CSWmysql5 CSWphp5 CSWphp5gd CSWphp5mcrypt REQUIRED_PKGS += CSWphp5mysqli CSWphp5session CSWphp5mbstring CSWphp5ctype CSWphp5zip @@ -27,6 +29,7 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = custom +ARCHALL = 1 SPKG_SOURCEURL = http://www.phpmyadmin.net include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Sep 30 10:40:25 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 30 Sep 2009 08:40:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[6616] csw/mgar/pkg/phpMyAdmin/trunk/files/CSWphpmyadmin. gspec Message-ID: Revision: 6616 http://gar.svn.sourceforge.net/gar/?rev=6616&view=rev Author: bonivart Date: 2009-09-30 08:40:24 +0000 (Wed, 30 Sep 2009) Log Message: ----------- phpmyadmin: remove gspec part II Removed Paths: ------------- csw/mgar/pkg/phpMyAdmin/trunk/files/CSWphpmyadmin.gspec Deleted: csw/mgar/pkg/phpMyAdmin/trunk/files/CSWphpmyadmin.gspec =================================================================== --- csw/mgar/pkg/phpMyAdmin/trunk/files/CSWphpmyadmin.gspec 2009-09-30 08:38:47 UTC (rev 6615) +++ csw/mgar/pkg/phpMyAdmin/trunk/files/CSWphpmyadmin.gspec 2009-09-30 08:40:24 UTC (rev 6616) @@ -1,7 +0,0 @@ -%var bitname phpmyadmin -%var pkgname CSWphpmyadmin -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - -Please see /opt/csw/share/doc/phpmyadmin/LICENSE for license information 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 Sep 30 10:47:40 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 30 Sep 2009 08:47:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[6617] csw/mgar/pkg/memconf/trunk Message-ID: Revision: 6617 http://gar.svn.sourceforge.net/gar/?rev=6617&view=rev Author: bonivart Date: 2009-09-30 08:47:40 +0000 (Wed, 30 Sep 2009) Log Message: ----------- memconf: update to 2.11 Modified Paths: -------------- csw/mgar/pkg/memconf/trunk/Makefile csw/mgar/pkg/memconf/trunk/checksums Modified: csw/mgar/pkg/memconf/trunk/Makefile =================================================================== --- csw/mgar/pkg/memconf/trunk/Makefile 2009-09-30 08:40:24 UTC (rev 6616) +++ csw/mgar/pkg/memconf/trunk/Makefile 2009-09-30 08:47:40 UTC (rev 6617) @@ -1,5 +1,5 @@ GARNAME = memconf -GARVERSION = 2.10 +GARVERSION = 2.11 CATEGORIES = utils DESCRIPTION = perl script that displays memory modules installed Modified: csw/mgar/pkg/memconf/trunk/checksums =================================================================== --- csw/mgar/pkg/memconf/trunk/checksums 2009-09-30 08:40:24 UTC (rev 6616) +++ csw/mgar/pkg/memconf/trunk/checksums 2009-09-30 08:47:40 UTC (rev 6617) @@ -1,3 +1,3 @@ -0aee8d982ef9704737a26d6721d9005d download/memconf.gz -d078ef174e55928dca398310c161ae3c download/memconf.man +0b50e833d8d48cd471f88fc42f378ed9 download/memconf.gz +fc6326ab5ca12b131f656339b515af59 download/memconf.man 818efbe29da417ad462e3f6345690c3d download/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 Sep 30 14:55:33 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 30 Sep 2009 12:55:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[6618] csw/mgar/pkg/bdb43/trunk/Makefile Message-ID: Revision: 6618 http://gar.svn.sourceforge.net/gar/?rev=6618&view=rev Author: dmichelsen Date: 2009-09-30 12:55:33 +0000 (Wed, 30 Sep 2009) Log Message: ----------- bdb43: Fix TCL includes Modified Paths: -------------- csw/mgar/pkg/bdb43/trunk/Makefile Modified: csw/mgar/pkg/bdb43/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb43/trunk/Makefile 2009-09-30 08:47:40 UTC (rev 6617) +++ csw/mgar/pkg/bdb43/trunk/Makefile 2009-09-30 12:55:33 UTC (rev 6618) @@ -56,13 +56,14 @@ CONFIGURE_ARGS += --enable-rpc CONFIGURE_ARGS += --enable-cxx CONFIGURE_ARGS += --enable-java -CONFIGURE_ARGS += --enable-tcl -CONFIGURE_ARGS += --with-tcl=$(libdir) CONFIGURE_ARGS += --enable-o_direct -LIBTOOL_LADIR = $(DESTDIR)$(prefix)/bdb43/lib -STRIP_DIRS += $(DESTDIR)$(prefix)/bdb43/bin +# Exclude TCL support for 64 bit until we have a 64 bit TCL +CONFIGURE_ARGS-mm-32 = --enable-tcl --with-tcl=$(libpath) +CONFIGURE_ARGS += $(CONFIGURE_ARGS-mm-$(MEMORYMODEL)) +FIXCONFIG_DIRS = $(DESTDIR)$(prefix)/bdb43/lib + # bdb tests are time consuming TEST_SCRIPTS = @@ -79,6 +80,6 @@ export PATH configure-dist: - @( cd $(WORKSRC) ; $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS) ) + ( cd $(WORKSRC) ; $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS) ) @$(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 Sep 30 15:32:31 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 30 Sep 2009 13:32:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[6619] csw/mgar/pkg/bdb43/trunk/Makefile Message-ID: Revision: 6619 http://gar.svn.sourceforge.net/gar/?rev=6619&view=rev Author: dmichelsen Date: 2009-09-30 13:32:30 +0000 (Wed, 30 Sep 2009) Log Message: ----------- bdb43: Make sure 64 bit version is built Modified Paths: -------------- csw/mgar/pkg/bdb43/trunk/Makefile Modified: csw/mgar/pkg/bdb43/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb43/trunk/Makefile 2009-09-30 12:55:33 UTC (rev 6618) +++ csw/mgar/pkg/bdb43/trunk/Makefile 2009-09-30 13:32:30 UTC (rev 6619) @@ -45,6 +45,9 @@ ARCHALL_CSWbdb43-doc = 1 +BUILD64 = 1 +NO_ISAEXEC = 1 + CONFIGURE_SCRIPTS = dist prefix = $(BUILD_PREFIX)/bdb43 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 Sep 30 15:42:33 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 30 Sep 2009 13:42:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[6620] csw/mgar/pkg Message-ID: Revision: 6620 http://gar.svn.sourceforge.net/gar/?rev=6620&view=rev Author: dmichelsen Date: 2009-09-30 13:42:33 +0000 (Wed, 30 Sep 2009) Log Message: ----------- bdb42: Vastly upgrade manifest Modified Paths: -------------- csw/mgar/pkg/bdb42/trunk/Makefile csw/mgar/pkg/bdb42/trunk/checksums Added Paths: ----------- csw/mgar/pkg/bdb42/ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.1.diff csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.2.diff csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.3.diff csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.4.diff csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.5.diff csw/mgar/pkg/bdb42/trunk/files/patch.64bit-libtool.diff Removed Paths: ------------- csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.1.diff csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.2.diff csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.3.diff csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.4.diff csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.5.diff Modified: csw/mgar/pkg/bdb42/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb44/trunk/Makefile 2009-09-27 22:55:14 UTC (rev 6593) +++ csw/mgar/pkg/bdb42/trunk/Makefile 2009-09-30 13:42:33 UTC (rev 6620) @@ -1,5 +1,5 @@ GARNAME = db -GARVERSION = 4.4.20 +GARVERSION = 4.2.52 CATEGORIES = lib DESCRIPTION = embedded database libraries and utilities @@ -16,7 +16,7 @@ MASTER_SITES = http://download.oracle.com/berkeley-db/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PACKAGES = CSWbdb44 CSWbdb44-devel CSWbdb44-doc +PACKAGES = CSWbdb42 CSWbdb42-devel CSWbdb42-doc # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -33,7 +33,7 @@ CONFIGURE_SCRIPTS = dist -prefix = $(BUILD_PREFIX)/bdb44 +prefix = $(BUILD_PREFIX)/bdb42 docdir = $(BUILD_PREFIX)/share/doc CONFIGURE_ARGS = $(DIRPATHS) @@ -50,38 +50,38 @@ CONFIGURE_ARGS += --with-tcl=$(libdir) endif -FIXCONFIG_DIRS = $(DESTDIR)$(prefix)/bdb44/lib +FIXCONFIG_DIRS = $(DESTDIR)$(prefix)/bdb42/lib # bdb tests are *very* time consuming TEST_SCRIPTS = NO_ISAEXEC = 1 -PACKAGES = CSWbdb44 CSWbdb44-devel CSWbdb44-doc +PACKAGES = CSWbdb42 CSWbdb42-devel CSWbdb42-doc -CATALOGNAME_CSWbdb44 = berkeleydb44 -CATALOGNAME_CSWbdb44-devel = berkeleydb44_devel -CATALOGNAME_CSWbdb44-doc = berkeleydb44_doc +CATALOGNAME_CSWbdb42 = berkeleydb42 +CATALOGNAME_CSWbdb42-devel = berkeleydb42_devel +CATALOGNAME_CSWbdb42-doc = berkeleydb42_doc -ARCHALL_CSWbdb44-doc = 1 +ARCHALL_CSWbdb42-doc = 1 -SPKG_DESC_CSWbdb44 = BerkeleyDB 4.4 embedded database libraries and utilities -SPKG_DESC_CSWbdb44-devel = BerkeleyDB 4.4 development support -SPKG_DESC_CSWbdb44-doc = BerkeleyDB 4.4 documentation +SPKG_DESC_CSWbdb42 = BerkeleyDB 4.2 embedded database libraries and utilities +SPKG_DESC_CSWbdb42-devel = BerkeleyDB 4.2 development support +SPKG_DESC_CSWbdb42-doc = BerkeleyDB 4.2 documentation -REQUIRED_PKGS_CSWbdb44-devel = CSWbdb44 -INCOMPATIBLE_PKGS_CSWbdb44-doc = CSWbdb44doc +REQUIRED_PKGS_CSWbdb42-devel = CSWbdb42 +INCOMPATIBLE_PKGS_CSWbdb42-doc = CSWbdb42doc LICENSE = LICENSE # Leave the docs where they are for now -#EXTRA_PAX_ARGS_isa-sparcv8 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb44/,p" -#EXTRA_PAX_ARGS_isa-i386 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb44/,p" +#EXTRA_PAX_ARGS_isa-sparcv8 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb42/,p" +#EXTRA_PAX_ARGS_isa-i386 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb42/,p" -#PKGFILES_CSWbdb44-doc = $(PKGFILES_DOC) -PKGFILES_CSWbdb44-doc = $(prefix)/docs/.* +#PKGFILES_CSWbdb42-doc = $(PKGFILES_DOC) +PKGFILES_CSWbdb42-doc = $(prefix)/docs/.* -PKGFILES_CSWbdb44-devel = $(PKGFILES_DEVEL) +PKGFILES_CSWbdb42-devel = $(PKGFILES_DEVEL) include gar/category.mk Modified: csw/mgar/pkg/bdb42/trunk/checksums =================================================================== --- csw/mgar/pkg/bdb44/trunk/checksums 2009-09-27 22:55:14 UTC (rev 6593) +++ csw/mgar/pkg/bdb42/trunk/checksums 2009-09-30 13:42:33 UTC (rev 6620) @@ -1,6 +1,7 @@ -d84dff288a19186b136b0daf7067ade3 download/db-4.4.20.tar.gz -66584d621355df055b6e05b4a02e9c3e download/patch.4.4.20.1.diff -85df93a0867f6cace3501671cdeb6ed1 download/patch.4.4.20.2.diff -88ee91889ebf5498b22b2e7bed945d41 download/patch.4.4.20.3.diff -c2ef7b3e59460c35950fab5f2faa3fc0 download/patch.4.4.20.4.diff -099621e0dad419188acd42c588242131 download/patch.4.4.20.5.diff +8b5cff6eb83972afdd8e0b821703c33c download/db-4.2.52.tar.gz +1227f5f9ff43d48b5b1759e113a1c2d7 download/patch.4.2.52.1.diff +3da7efd8d29919a9113e2f6f5166f5b7 download/patch.4.2.52.2.diff +0bf9ebbe852652bed433e522928d40ec download/patch.4.2.52.3.diff +9cfeff4dce0c11372c0b04b134f8faef download/patch.4.2.52.4.diff +99836f962361da8936219cc193edc7ed download/patch.4.2.52.5.diff +d49545b2691c511276b73bb6c3ec64c3 download/patch.64bit-libtool.diff Added: csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.1.diff =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.1.diff (rev 0) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.1.diff 2009-09-30 13:42:33 UTC (rev 6620) @@ -0,0 +1,36 @@ +*** mp/mp_fget.c.orig 25 Sep 2003 02:15:16 -0000 11.81 +--- mp/mp_fget.c 9 Dec 2003 19:06:28 -0000 11.82 +*************** +*** 440,446 **** + c_mp->stat.st_pages--; + alloc_bhp = NULL; + R_UNLOCK(dbenv, &dbmp->reginfo[n_cache]); +- MUTEX_LOCK(dbenv, &hp->hash_mutex); + + /* + * We can't use the page we found in the pool if DB_MPOOL_NEW +--- 440,445 ---- +*************** +*** 455,460 **** +--- 454,462 ---- + b_incr = 0; + goto alloc; + } ++ ++ /* We can use the page -- get the bucket lock. */ ++ MUTEX_LOCK(dbenv, &hp->hash_mutex); + break; + case SECOND_MISS: + /* +*** mp/mp_fput.c.orig 30 Sep 2003 17:12:00 -0000 11.48 +--- mp/mp_fput.c 13 Dec 2003 00:08:29 -0000 11.49 +*************** +*** 285,290 **** +--- 285,291 ---- + bhp != NULL; bhp = SH_TAILQ_NEXT(bhp, hq, __bh)) + if (bhp->priority != UINT32_T_MAX && + bhp->priority > MPOOL_BASE_DECREMENT) ++ bhp->priority -= MPOOL_BASE_DECREMENT; + MUTEX_UNLOCK(dbenv, &hp->hash_mutex); + } + } Added: csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.2.diff =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.2.diff (rev 0) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.2.diff 2009-09-30 13:42:33 UTC (rev 6620) @@ -0,0 +1,45 @@ +*** lock/lock.c.save 2004-01-30 10:48:33.000000000 -0800 +--- lock/lock.c 2004-01-30 10:55:58.000000000 -0800 +*************** +*** 2216,2226 **** + dp = (u_int8_t *)dp + \ + sizeof(db_pgno_t); \ + } while (0) +! #define COPY_OBJ(dp, obj) do { \ +! memcpy(dp, obj->data, obj->size); \ +! dp = (u_int8_t *)dp + \ +! ALIGN(obj->size, \ +! sizeof(u_int32_t)); \ + } while (0) + + #define GET_COUNT(dp, count) do { \ +--- 2216,2227 ---- + dp = (u_int8_t *)dp + \ + sizeof(db_pgno_t); \ + } while (0) +! #define COPY_OBJ(dp, obj) do { \ +! memcpy(dp, \ +! (obj)->data, (obj)->size); \ +! dp = (u_int8_t *)dp + \ +! ALIGN((obj)->size, \ +! sizeof(u_int32_t)); \ + } while (0) + + #define GET_COUNT(dp, count) do { \ +*************** +*** 2339,2345 **** + for (i = 0; i < nlocks; i = j) { + PUT_PCOUNT(dp, obj[i].ulen); + PUT_SIZE(dp, obj[i].size); +! COPY_OBJ(dp, obj); + lock = (DB_LOCK_ILOCK *)obj[i].data; + for (j = i + 1; j <= i + obj[i].ulen; j++) { + lock = (DB_LOCK_ILOCK *)obj[j].data; +--- 2340,2346 ---- + for (i = 0; i < nlocks; i = j) { + PUT_PCOUNT(dp, obj[i].ulen); + PUT_SIZE(dp, obj[i].size); +! COPY_OBJ(dp, &obj[i]); + lock = (DB_LOCK_ILOCK *)obj[i].data; + for (j = i + 1; j <= i + obj[i].ulen; j++) { + lock = (DB_LOCK_ILOCK *)obj[j].data; Added: csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.3.diff =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.3.diff (rev 0) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.3.diff 2009-09-30 13:42:33 UTC (rev 6620) @@ -0,0 +1,247 @@ +--- java/src/com/sleepycat/db/DbEnv.java 2003-12-03 16:26:27.000000000 -0500 ++++ java/src/com/sleepycat/db/DbEnv.java 2004-03-18 15:15:42.000000000 -0500 +@@ -61,7 +61,7 @@ + // Internally, the JNI layer creates a global reference to each DbEnv, + // which can potentially be different to this. We keep a copy here so + // we can clean up after destructors. +- private Object dbenv_ref; ++ private long dbenv_ref; + private DbAppDispatch app_dispatch_handler; + private DbEnvFeedbackHandler env_feedback_handler; + private DbErrorHandler error_handler; +@@ -94,7 +94,7 @@ + void cleanup() { + swigCPtr = 0; + db_java.deleteRef0(dbenv_ref); +- dbenv_ref = null; ++ dbenv_ref = 0L; + } + + +--- java/src/com/sleepycat/db/Db.java 2003-12-03 16:26:25.000000000 -0500 ++++ java/src/com/sleepycat/db/Db.java 2004-03-18 15:15:55.000000000 -0500 +@@ -57,7 +57,7 @@ + // Internally, the JNI layer creates a global reference to each Db, + // which can potentially be different to this. We keep a copy here so + // we can clean up after destructors. +- private Object db_ref; ++ private long db_ref; + private DbEnv dbenv; + private boolean private_dbenv; + private DbAppendRecno append_recno_handler; +@@ -84,7 +84,7 @@ + private void cleanup() { + swigCPtr = 0; + db_java.deleteRef0(db_ref); +- db_ref = null; ++ db_ref = 0L; + if (private_dbenv) { + dbenv.cleanup(); + } +--- java/src/com/sleepycat/db/db_java.java 2003-12-03 16:10:54.000000000 -0500 ++++ java/src/com/sleepycat/db/db_java.java 2004-03-18 15:17:24.000000000 -0500 +@@ -14,15 +14,15 @@ + db_javaJNI.DbEnv_lock_vec(DbEnv.getCPtr(dbenv), locker, flags, list, offset, nlist); + } + +- static Object initDbEnvRef0(DbEnv self, Object handle) { ++ static long initDbEnvRef0(DbEnv self, Object handle) { + return db_javaJNI.initDbEnvRef0(DbEnv.getCPtr(self), handle); + } + +- static Object initDbRef0(Db self, Object handle) { ++ static long initDbRef0(Db self, Object handle) { + return db_javaJNI.initDbRef0(Db.getCPtr(self), handle); + } + +- static void deleteRef0(Object ref) { ++ static void deleteRef0(long ref) { + db_javaJNI.deleteRef0(ref); + } + +--- java/src/com/sleepycat/db/db_javaJNI.java 2003-12-03 16:10:55.000000000 -0500 ++++ java/src/com/sleepycat/db/db_javaJNI.java 2004-03-18 15:16:18.000000000 -0500 +@@ -45,9 +45,9 @@ + static native final void initialize(); + + public final static native void DbEnv_lock_vec(long jarg1, int jarg2, int jarg3, DbLockRequest[] jarg4, int jarg5, int jarg6) throws DbException; +- final static native Object initDbEnvRef0(long jarg1, Object jarg2); +- final static native Object initDbRef0(long jarg1, Object jarg2); +- final static native void deleteRef0(Object jarg1); ++ final static native long initDbEnvRef0(long jarg1, Object jarg2); ++ final static native long initDbRef0(long jarg1, Object jarg2); ++ final static native void deleteRef0(long jarg1); + final static native long getDbEnv0(long jarg1); + public final static native long new_Db(long jarg1, int jarg2) throws DbException; + public final static native void Db_associate(long jarg1, long jarg2, long jarg3, DbSecondaryKeyCreate jarg4, int jarg5) throws DbException; +--- libdb_java/db_java.i 2003-11-17 15:00:52.000000000 -0500 ++++ libdb_java/db_java.i 2004-03-18 09:21:14.000000000 -0500 +@@ -53,7 +53,7 @@ + // Internally, the JNI layer creates a global reference to each DbEnv, + // which can potentially be different to this. We keep a copy here so + // we can clean up after destructors. +- private Object dbenv_ref; ++ private long dbenv_ref; + private DbAppDispatch app_dispatch_handler; + private DbEnvFeedbackHandler env_feedback_handler; + private DbErrorHandler error_handler; +@@ -76,7 +76,7 @@ + void cleanup() { + swigCPtr = 0; + db_java.deleteRef0(dbenv_ref); +- dbenv_ref = null; ++ dbenv_ref = 0L; + } + + public synchronized void close(int flags) throws DbException { +@@ -220,7 +220,7 @@ + // Internally, the JNI layer creates a global reference to each Db, + // which can potentially be different to this. We keep a copy here so + // we can clean up after destructors. +- private Object db_ref; ++ private long db_ref; + private DbEnv dbenv; + private boolean private_dbenv; + private DbAppendRecno append_recno_handler; +@@ -245,7 +245,7 @@ + private void cleanup() { + swigCPtr = 0; + db_java.deleteRef0(db_ref); +- db_ref = null; ++ db_ref = 0L; + if (private_dbenv) + dbenv.cleanup(); + dbenv = null; +@@ -503,46 +503,42 @@ + } + %} + +-%native(initDbEnvRef0) jobject initDbEnvRef0(DB_ENV *self, void *handle); +-%native(initDbRef0) jobject initDbRef0(DB *self, void *handle); +-%native(deleteRef0) void deleteRef0(jobject ref); ++%native(initDbEnvRef0) jlong initDbEnvRef0(DB_ENV *self, void *handle); ++%native(initDbRef0) jlong initDbRef0(DB *self, void *handle); ++%native(deleteRef0) void deleteRef0(jlong ref); + %native(getDbEnv0) DB_ENV *getDbEnv0(DB *self); + + %{ +-JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0( ++JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0( + JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) { + DB_ENV *self = *(DB_ENV **)&jarg1; ++ jlong ret; + COMPQUIET(jcls, NULL); + + DB_ENV_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2); + self->set_errpfx(self, (const char*)self); +- return (jobject)DB_ENV_INTERNAL(self); ++ *(jobject *)&ret = (jobject)DB_ENV_INTERNAL(self); ++ return (ret); + } + +-JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0( ++JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0( + JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) { + DB *self = *(DB **)&jarg1; ++ jlong ret; + COMPQUIET(jcls, NULL); + + DB_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2); +- return (jobject)DB_INTERNAL(self); ++ *(jobject *)&ret = (jobject)DB_INTERNAL(self); ++ return (ret); + } + + JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1javaJNI_deleteRef0( +- JNIEnv *jenv, jclass jcls, jobject jref) { +- COMPQUIET(jcls, NULL); +- +- if (jref != NULL) +- (*jenv)->DeleteGlobalRef(jenv, jref); +-} +- +-JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbRef0( + JNIEnv *jenv, jclass jcls, jlong jarg1) { +- DB *self = *(DB **)&jarg1; ++ jobject jref = *(jobject *)&jarg1; + COMPQUIET(jcls, NULL); +- COMPQUIET(jenv, NULL); + +- return (jobject)DB_INTERNAL(self); ++ if (jref != 0L) ++ (*jenv)->DeleteGlobalRef(jenv, jref); + } + + JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbEnv0( +@@ -554,7 +550,7 @@ + COMPQUIET(jcls, NULL); + + *(DB_ENV **)&env_cptr = self->dbenv; +- return env_cptr; ++ return (env_cptr); + } + + JNIEXPORT jboolean JNICALL +--- libdb_java/db_java_wrap.c 2003-12-03 16:10:36.000000000 -0500 ++++ libdb_java/db_java_wrap.c 2004-03-18 12:18:58.000000000 -0500 +@@ -1192,40 +1192,36 @@ + } + + +-JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0( ++JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0( + JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) { + DB_ENV *self = *(DB_ENV **)&jarg1; ++ jlong ret; + COMPQUIET(jcls, NULL); + + DB_ENV_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2); + self->set_errpfx(self, (const char*)self); +- return (jobject)DB_ENV_INTERNAL(self); ++ *(jobject *)&ret = (jobject)DB_ENV_INTERNAL(self); ++ return (ret); + } + +-JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0( ++JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0( + JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) { + DB *self = *(DB **)&jarg1; ++ jlong ret; + COMPQUIET(jcls, NULL); + + DB_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2); +- return (jobject)DB_INTERNAL(self); ++ *(jobject *)&ret = (jobject)DB_INTERNAL(self); ++ return (ret); + } + + JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1javaJNI_deleteRef0( +- JNIEnv *jenv, jclass jcls, jobject jref) { +- COMPQUIET(jcls, NULL); +- +- if (jref != NULL) +- (*jenv)->DeleteGlobalRef(jenv, jref); +-} +- +-JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbRef0( + JNIEnv *jenv, jclass jcls, jlong jarg1) { +- DB *self = *(DB **)&jarg1; ++ jobject jref = *(jobject *)&jarg1; + COMPQUIET(jcls, NULL); +- COMPQUIET(jenv, NULL); + +- return (jobject)DB_INTERNAL(self); ++ if (jref != 0L) ++ (*jenv)->DeleteGlobalRef(jenv, jref); + } + + JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbEnv0( +@@ -1237,7 +1233,7 @@ + COMPQUIET(jcls, NULL); + + *(DB_ENV **)&env_cptr = self->dbenv; +- return env_cptr; ++ return (env_cptr); + } + + JNIEXPORT jboolean JNICALL Added: csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.4.diff =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.4.diff (rev 0) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.4.diff 2009-09-30 13:42:33 UTC (rev 6620) @@ -0,0 +1,36 @@ +*** btree/bt_rec.c.orig Tue Mar 22 09:41:49 2005 +--- btree/bt_rec.c Tue Mar 22 09:42:11 2005 +*************** +*** 222,228 **** + * previous-page pointer updated to our new page. The next + * page must exist because we're redoing the operation. + */ +! if (!rootsplit && !IS_ZERO_LSN(argp->nlsn)) { + if ((ret = + __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) { + ret = __db_pgerr(file_dbp, argp->npgno, ret); +--- 222,228 ---- + * previous-page pointer updated to our new page. The next + * page must exist because we're redoing the operation. + */ +! if (!rootsplit && argp->npgno != PGNO_INVALID) { + if ((ret = + __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) { + ret = __db_pgerr(file_dbp, argp->npgno, ret); +*************** +*** 294,300 **** + * possible that the next-page never existed, we ignore it as + * if there's nothing to undo. + */ +! if (!rootsplit && !IS_ZERO_LSN(argp->nlsn)) { + if ((ret = + __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) { + np = NULL; +--- 294,300 ---- + * possible that the next-page never existed, we ignore it as + * if there's nothing to undo. + */ +! if (!rootsplit && argp->npgno != PGNO_INVALID) { + if ((ret = + __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) { + np = NULL; Added: csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.5.diff =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.5.diff (rev 0) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.5.diff 2009-09-30 13:42:33 UTC (rev 6620) @@ -0,0 +1,24 @@ +*** mp/mp_fget.c.orig 2003-09-25 08:29:02.000000000 -0700 +--- mp/mp_fget.c 2006-05-26 14:58:02.246963204 -0700 +*************** +*** 553,560 **** + */ + if (state != SECOND_MISS && bhp->ref == 1) { + bhp->priority = UINT32_T_MAX; +! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh); +! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq); + hp->hash_priority = + SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority; + } +--- 553,563 ---- + */ + if (state != SECOND_MISS && bhp->ref == 1) { + bhp->priority = UINT32_T_MAX; +! if (SH_TAILQ_FIRST(&hp->hash_bucket, __bh) != +! SH_TAILQ_LAST(&hp->hash_bucket, hq, __bh)) { +! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh); +! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq); +! } + hp->hash_priority = + SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority; + } Deleted: csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.1.diff =================================================================== --- csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.1.diff 2009-09-27 22:55:14 UTC (rev 6593) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.1.diff 2009-09-30 13:42:33 UTC (rev 6620) @@ -1,27 +0,0 @@ -*** qam/qam_files.c.orig 2005-10-20 11:57:12.000000000 -0700 ---- qam/qam_files.c 2006-01-27 13:38:38.000000000 -0800 -*************** -*** 411,416 **** ---- 411,422 ---- - DB_APP_DATA, buf, 0, NULL, &real_name)) != 0) - goto err; - #endif -+ -+ mpf = array->mpfarray[offset].mpf; -+ /* This extent my already be marked for delete and closed. */ -+ if (mpf == NULL) -+ goto err; -+ - /* - * The log must be flushed before the file is deleted. We depend on - * the log record of the last delete to recreate the file if we crash. -*************** -*** 418,424 **** - if (LOGGING_ON(dbenv) && (ret = __log_flush(dbenv, NULL)) != 0) - goto err; - -- mpf = array->mpfarray[offset].mpf; - (void)__memp_set_flags(mpf, DB_MPOOL_UNLINK, 1); - /* Someone could be real slow, let them close it down. */ - if (array->mpfarray[offset].pinref != 0) ---- 424,429 ---- Deleted: csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.2.diff =================================================================== --- csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.2.diff 2009-09-27 22:55:14 UTC (rev 6593) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.2.diff 2009-09-30 13:42:33 UTC (rev 6620) @@ -1,29 +0,0 @@ -*** txn/txn.c.orig Tue Nov 1 06:50:03 2005 ---- txn/txn.c Tue Jan 31 15:05:13 2006 -*************** -*** 1049,1060 **** ---- 1049,1062 ---- - return (ret); - memcpy(txn->name, name, len); - -+ TXN_SYSTEM_LOCK(dbenv); - if (td->name != INVALID_ROFF) { - __db_shalloc_free( - &mgr->reginfo, R_ADDR(&mgr->reginfo, td->name)); - td->name = INVALID_ROFF; - } - if ((ret = __db_shalloc(&mgr->reginfo, len, 0, &p)) != 0) { -+ TXN_SYSTEM_UNLOCK(dbenv); - __db_err(dbenv, - "Unable to allocate memory for transaction name"); - -*************** -*** 1063,1068 **** ---- 1065,1071 ---- - - return (ret); - } -+ TXN_SYSTEM_UNLOCK(dbenv); - td->name = R_OFFSET(&mgr->reginfo, p); - memcpy(p, name, len); - Deleted: csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.3.diff =================================================================== --- csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.3.diff 2009-09-27 22:55:14 UTC (rev 6593) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.3.diff 2009-09-30 13:42:33 UTC (rev 6620) @@ -1,49 +0,0 @@ -*** db/db_cam.c.orig 2006-01-11 03:19:21.000000000 +1100 ---- db/db_cam.c 2006-03-01 13:59:01.000000000 +1100 -*************** -*** 579,589 **** - flags == DB_NEXT || flags == DB_NEXT_DUP || flags == DB_PREV)) { - if (tmp_rmw && (ret = dbc_arg->c_am_writelock(dbc_arg)) != 0) - return (ret); -! if ((ret = __db_c_idup(cp->opd, &opd, DB_POSITION)) != 0) - return (ret); - -! switch (ret = -! opd->c_am_get(opd, key, data, flags, NULL)) { - case 0: - goto done; - case DB_NOTFOUND: ---- 579,590 ---- - flags == DB_NEXT || flags == DB_NEXT_DUP || flags == DB_PREV)) { - if (tmp_rmw && (ret = dbc_arg->c_am_writelock(dbc_arg)) != 0) - return (ret); -! if (F_ISSET(dbc_arg, DBC_TRANSIENT)) -! opd = cp->opd; -! else if ((ret = __db_c_idup(cp->opd, &opd, DB_POSITION)) != 0) - return (ret); - -! switch (ret = opd->c_am_get(opd, key, data, flags, NULL)) { - case 0: - goto done; - case DB_NOTFOUND: -*************** -*** 596,607 **** ---- 597,614 ---- - if ((ret = __db_c_close(opd)) != 0) - goto err; - opd = NULL; -+ if (F_ISSET(dbc_arg, DBC_TRANSIENT)) -+ cp->opd = NULL; - break; - } - goto err; - default: - goto err; - } -+ } else if (cp->opd != NULL && F_ISSET(dbc_arg, DBC_TRANSIENT)) { -+ if ((ret = __db_c_close(cp->opd)) != 0) -+ goto err; -+ cp->opd = NULL; - } - - /* Deleted: csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.4.diff =================================================================== --- csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.4.diff 2009-09-27 22:55:14 UTC (rev 6593) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.4.diff 2009-09-30 13:42:33 UTC (rev 6620) @@ -1,24 +0,0 @@ -*** mp/mp_fget.c.orig 2005-10-12 10:53:36.000000000 -0700 ---- mp/mp_fget.c 2006-05-30 20:48:10.000000000 -0700 -*************** -*** 587,594 **** - */ - if (state != SECOND_MISS && bhp->ref == 1) { - bhp->priority = UINT32_MAX; -! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh); -! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq); - hp->hash_priority = - SH_TAILQ_FIRSTP(&hp->hash_bucket, __bh)->priority; - } ---- 587,597 ---- - */ - if (state != SECOND_MISS && bhp->ref == 1) { - bhp->priority = UINT32_MAX; -! if (SH_TAILQ_FIRST(&hp->hash_bucket, __bh) != -! SH_TAILQ_LAST(&hp->hash_bucket, hq, __bh)) { -! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh); -! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq); -! } - hp->hash_priority = - SH_TAILQ_FIRSTP(&hp->hash_bucket, __bh)->priority; - } Deleted: csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.5.diff =================================================================== --- csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.5.diff 2009-09-27 22:55:14 UTC (rev 6593) +++ csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.5.diff 2009-09-30 13:42:33 UTC (rev 6620) @@ -1,13 +0,0 @@ -diff -Naur db-4.4.20.orig/dist/ltmain.sh db-4.4.20/dist/ltmain.sh ---- dist/ltmain.sh 2005-10-17 16:35:53.000000000 +0200 -+++ dist/ltmain.sh 2008-05-14 08:30:26.766534000 +0200 -@@ -1552,9 +1552,7 @@ - esac - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" -- if test "$with_gcc" = "yes" ; then - compiler_flags="$compiler_flags $arg" -- fi - continue - ;; - Added: csw/mgar/pkg/bdb42/trunk/files/patch.64bit-libtool.diff =================================================================== --- csw/mgar/pkg/bdb42/trunk/files/patch.64bit-libtool.diff (rev 0) +++ csw/mgar/pkg/bdb42/trunk/files/patch.64bit-libtool.diff 2009-09-30 13:42:33 UTC (rev 6620) @@ -0,0 +1,22 @@ +diff -Naur db-4.2.52.orig/dist/ltmain.sh db-4.2.52.patched/dist/ltmain.sh +--- dist/ltmain.sh 2003-04-26 19:45:37.000000000 +0200 ++++ dist/ltmain.sh 2009-09-30 15:15:43.792423773 +0200 +@@ -1298,7 +1298,7 @@ + # but this is not reliable with gcc because gcc may use -mfoo to + # select a different linker, different libraries, etc, while + # -Wl,-mfoo simply passes -mfoo to the linker. +- -m*) ++ -m*|-xarch=*) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` +@@ -1309,9 +1309,7 @@ + esac + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" +- if test "$with_gcc" = "yes" ; then + compiler_flags="$compiler_flags $arg" +- fi + continue + ;; + 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 Sep 30 16:00:46 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 30 Sep 2009 14:00:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6621] csw/mgar/pkg/chmlib/trunk Message-ID: Revision: 6621 http://gar.svn.sourceforge.net/gar/?rev=6621&view=rev Author: dmichelsen Date: 2009-09-30 14:00:46 +0000 (Wed, 30 Sep 2009) Log Message: ----------- chmlib: Initial commit Modified Paths: -------------- csw/mgar/pkg/chmlib/trunk/Makefile csw/mgar/pkg/chmlib/trunk/checksums Added Paths: ----------- csw/mgar/pkg/chmlib/trunk/files/0001-Add-autoconf-support-from-gnulib-for-getopt.h.patch Modified: csw/mgar/pkg/chmlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/chmlib/trunk/Makefile 2009-09-30 13:42:33 UTC (rev 6620) +++ csw/mgar/pkg/chmlib/trunk/Makefile 2009-09-30 14:00:46 UTC (rev 6621) @@ -14,6 +14,8 @@ MASTER_SITES = http://www.jedrea.com/chmlib/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +PATCHFILES = 0001-Add-autoconf-support-from-gnulib-for-getopt.h.patch + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 Modified: csw/mgar/pkg/chmlib/trunk/checksums =================================================================== --- csw/mgar/pkg/chmlib/trunk/checksums 2009-09-30 13:42:33 UTC (rev 6620) +++ csw/mgar/pkg/chmlib/trunk/checksums 2009-09-30 14:00:46 UTC (rev 6621) @@ -1 +1,2 @@ +b7276bc25fffbf7044018f94ebe1baf9 download/0001-Add-autoconf-support-from-gnulib-for-getopt.h.patch 7ea49ed8c335215c1edc6fae83e6b912 download/chmlib-0.40.tar.bz2 Added: 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 (rev 0) +++ csw/mgar/pkg/chmlib/trunk/files/0001-Add-autoconf-support-from-gnulib-for-getopt.h.patch 2009-09-30 14:00:46 UTC (rev 6621) @@ -0,0 +1,3298 @@ +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@ @@ 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 Wed Sep 30 16:02:53 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 30 Sep 2009 14:02:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[6622] csw/mgar/pkg Message-ID: Revision: 6622 http://gar.svn.sourceforge.net/gar/?rev=6622&view=rev Author: dmichelsen Date: 2009-09-30 14:02:53 +0000 (Wed, 30 Sep 2009) Log Message: ----------- bdb47: Fix prefix Modified Paths: -------------- csw/mgar/pkg/bdb47/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/bdb47/ Modified: csw/mgar/pkg/bdb47/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb/trunk/Makefile 2009-09-27 22:55:14 UTC (rev 6593) +++ csw/mgar/pkg/bdb47/trunk/Makefile 2009-09-30 14:02:53 UTC (rev 6622) @@ -30,7 +30,7 @@ BUILD64 = 1 CONFIGURE_SCRIPTS = dist -#prefix = $(BUILD_PREFIX)/bdb47 +prefix = $(BUILD_PREFIX)/bdb47 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-compat185 CONFIGURE_ARGS += --enable-o_direct @@ -39,10 +39,8 @@ CONFIGURE_ARGS += --enable-java # Exclude TCL support for 64 bit until we have a 64 bit TCL -ifeq ($(MEMORYMODEL),32) -CONFIGURE_ARGS += --enable-tcl -CONFIGURE_ARGS += --with-tcl=$(libdir) -endif +CONFIGURE_ARGS-mm-32 = --enable-tcl --with-tcl=$(libpath) +CONFIGURE_ARGS += $(CONFIGURE_ARGS-mm-$(MEMORYMODEL)) # bdb tests are *very* time consuming TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Sep 30 16:52:46 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 30 Sep 2009 14:52:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[6623] csw/mgar/pkg Message-ID: Revision: 6623 http://gar.svn.sourceforge.net/gar/?rev=6623&view=rev Author: dmichelsen Date: 2009-09-30 14:52:46 +0000 (Wed, 30 Sep 2009) Log Message: ----------- bdb48: Initial commit Modified Paths: -------------- csw/mgar/pkg/bdb48/trunk/Makefile csw/mgar/pkg/bdb48/trunk/checksums Added Paths: ----------- csw/mgar/pkg/bdb48/ Modified: csw/mgar/pkg/bdb48/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb/trunk/Makefile 2009-09-27 22:55:14 UTC (rev 6593) +++ csw/mgar/pkg/bdb48/trunk/Makefile 2009-09-30 14:52:46 UTC (rev 6623) @@ -1,8 +1,8 @@ GARNAME = db -GARVERSION = 4.7.25 +GARVERSION = 4.8.24 CATEGORIES = lib -DESCRIPTION = Berkeley DB 4.7 +DESCRIPTION = Berkeley DB 4.8 define BLURB Berkeley DB (libdb) is a programmatic toolkit that provides embedded database support for both traditional and client/server applications. It includes @@ -30,19 +30,18 @@ BUILD64 = 1 CONFIGURE_SCRIPTS = dist -#prefix = $(BUILD_PREFIX)/bdb47 +prefix = $(BUILD_PREFIX)/bdb48 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-compat185 CONFIGURE_ARGS += --enable-o_direct -CONFIGURE_ARGS += --enable-rpc +# No longer there in 4.8 +#CONFIGURE_ARGS += --enable-rpc CONFIGURE_ARGS += --enable-cxx CONFIGURE_ARGS += --enable-java # Exclude TCL support for 64 bit until we have a 64 bit TCL -ifeq ($(MEMORYMODEL),32) -CONFIGURE_ARGS += --enable-tcl -CONFIGURE_ARGS += --with-tcl=$(libdir) -endif +CONFIGURE_ARGS-mm-32 = --enable-tcl --with-tcl=$(libpath) +CONFIGURE_ARGS += $(CONFIGURE_ARGS-mm-$(MEMORYMODEL)) # bdb tests are *very* time consuming TEST_SCRIPTS = @@ -65,9 +64,9 @@ ARCHALL_CSWbdbdoc = 1 -SPKG_DESC_CSWbdb = BerkeleyDB 4.7 embedded database libraries and utilities -SPKG_DESC_CSWbdbdevel = BerkeleyDB 4.7 development support -SPKG_DESC_CSWbdbdoc = BerkeleyDB 4.7 documentation +SPKG_DESC_CSWbdb = BerkeleyDB 4.8 embedded database libraries and utilities +SPKG_DESC_CSWbdbdevel = BerkeleyDB 4.8 development support +SPKG_DESC_CSWbdbdoc = BerkeleyDB 4.8 documentation REQUIRED_PKGS_CSWbdbdevel = CSWbdb Modified: csw/mgar/pkg/bdb48/trunk/checksums =================================================================== --- csw/mgar/pkg/bdb/trunk/checksums 2009-09-27 22:55:14 UTC (rev 6593) +++ csw/mgar/pkg/bdb48/trunk/checksums 2009-09-30 14:52:46 UTC (rev 6623) @@ -1,5 +1 @@ -ec2b87e833779681a0c3a814aa71359e download/db-4.7.25.tar.gz -5fdf101259e5164dea1c8c86214fde38 download/patch.4.7.25.1 -bd410a11c71fee52fddb6aa2d8d4f80c download/patch.4.7.25.2 -6fcd69f64f5b34bfe8f0a63cc2e402c1 download/patch.4.7.25.3 -42c5d1a727e4a7f59b9dce12ff2f6b84 download/patch.4.7.25.4 +147afdecf438ff99ade105a5272db158 download/db-4.8.24.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 Sep 30 16:55:24 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 30 Sep 2009 14:55:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[6624] csw/mgar/pkg/bdb47/trunk/Makefile Message-ID: Revision: 6624 http://gar.svn.sourceforge.net/gar/?rev=6624&view=rev Author: dmichelsen Date: 2009-09-30 14:55:23 +0000 (Wed, 30 Sep 2009) Log Message: ----------- bdb47: Rename packages to default name Modified Paths: -------------- csw/mgar/pkg/bdb47/trunk/Makefile Modified: csw/mgar/pkg/bdb47/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb47/trunk/Makefile 2009-09-30 14:52:46 UTC (rev 6623) +++ csw/mgar/pkg/bdb47/trunk/Makefile 2009-09-30 14:55:23 UTC (rev 6624) @@ -47,33 +47,33 @@ NO_ISAEXEC = 1 -PACKAGES = CSWbdb CSWbdbdevel CSWbdbdoc +PACKAGES = CSWbdb47 CSWbdb47devel CSWbdb47doc -CATALOGNAME_CSWbdb = berkeleydb -CATALOGNAME_CSWbdbdevel = berkeleydb_devel -CATALOGNAME_CSWbdbdoc = berkeleydb_doc +CATALOGNAME_CSWbdb47 = berkeleydb47 +CATALOGNAME_CSWbdb47devel = berkeleydb47_devel +CATALOGNAME_CSWbdb47doc = berkeleydb47_doc # Remove the license from share/doc/berkeleydb/license/.* # because GAR expects license to be a file instead of a directory EXTRA_MERGE_EXCLUDE_FILES = .*/license.* -EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb),' +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb47),' EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* ARCHALL_CSWbdbdoc = 1 -SPKG_DESC_CSWbdb = BerkeleyDB 4.7 embedded database libraries and utilities -SPKG_DESC_CSWbdbdevel = BerkeleyDB 4.7 development support -SPKG_DESC_CSWbdbdoc = BerkeleyDB 4.7 documentation +SPKG_DESC_CSWbdb47 = BerkeleyDB 4.7 embedded database libraries and utilities +SPKG_DESC_CSWbdb47devel = BerkeleyDB 4.7 development support +SPKG_DESC_CSWbdb47doc = BerkeleyDB 4.7 documentation -REQUIRED_PKGS_CSWbdbdevel = CSWbdb +REQUIRED_PKGS_CSWbdb47devel = CSWbdb47 LICENSE = LICENSE -PKGFILES_CSWbdbdoc = $(PKGFILES_DOC) +PKGFILES_CSWbdb47doc = $(PKGFILES_DOC) -PKGFILES_CSWbdbdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWbdb47devel = $(PKGFILES_DEVEL) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Sep 30 17:07:49 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 30 Sep 2009 15:07:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[6625] csw/mgar/pkg/bdb47/trunk/Makefile Message-ID: Revision: 6625 http://gar.svn.sourceforge.net/gar/?rev=6625&view=rev Author: dmichelsen Date: 2009-09-30 15:07:42 +0000 (Wed, 30 Sep 2009) Log Message: ----------- bdb47: Adjust doc location Modified Paths: -------------- csw/mgar/pkg/bdb47/trunk/Makefile Modified: csw/mgar/pkg/bdb47/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb47/trunk/Makefile 2009-09-30 14:55:23 UTC (rev 6624) +++ csw/mgar/pkg/bdb47/trunk/Makefile 2009-09-30 15:07:42 UTC (rev 6625) @@ -71,7 +71,7 @@ LICENSE = LICENSE -PKGFILES_CSWbdb47doc = $(PKGFILES_DOC) +PKGFILES_CSWbdb47doc = /opt/csw/share/doc/.* PKGFILES_CSWbdb47devel = $(PKGFILES_DEVEL) 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 Sep 30 17:27:12 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 30 Sep 2009 15:27:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[6626] csw/mgar/pkg/bdb48/trunk Message-ID: Revision: 6626 http://gar.svn.sourceforge.net/gar/?rev=6626&view=rev Author: dmichelsen Date: 2009-09-30 15:27:03 +0000 (Wed, 30 Sep 2009) Log Message: ----------- bdb48: Adjust package names Modified Paths: -------------- csw/mgar/pkg/bdb48/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/bdb48/trunk/files/patch.4.7.25.1 csw/mgar/pkg/bdb48/trunk/files/patch.4.7.25.2 csw/mgar/pkg/bdb48/trunk/files/patch.4.7.25.3 csw/mgar/pkg/bdb48/trunk/files/patch.4.7.25.4 Modified: csw/mgar/pkg/bdb48/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb48/trunk/Makefile 2009-09-30 15:07:42 UTC (rev 6625) +++ csw/mgar/pkg/bdb48/trunk/Makefile 2009-09-30 15:27:03 UTC (rev 6626) @@ -48,33 +48,33 @@ NO_ISAEXEC = 1 -PACKAGES = CSWbdb CSWbdbdevel CSWbdbdoc +PACKAGES = CSWbdb48 CSWbdb48devel CSWbdb48doc -CATALOGNAME_CSWbdb = berkeleydb -CATALOGNAME_CSWbdbdevel = berkeleydb_devel -CATALOGNAME_CSWbdbdoc = berkeleydb_doc +CATALOGNAME_CSWbdb48 = berkeleydb48 +CATALOGNAME_CSWbdb48devel = berkeleydb48_devel +CATALOGNAME_CSWbdb48doc = berkeleydb48_doc # Remove the license from share/doc/berkeleydb/license/.* # because GAR expects license to be a file instead of a directory EXTRA_MERGE_EXCLUDE_FILES = .*/license.* -EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb),' +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb48),' EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* -ARCHALL_CSWbdbdoc = 1 +ARCHALL_CSWbdb48doc = 1 -SPKG_DESC_CSWbdb = BerkeleyDB 4.8 embedded database libraries and utilities -SPKG_DESC_CSWbdbdevel = BerkeleyDB 4.8 development support -SPKG_DESC_CSWbdbdoc = BerkeleyDB 4.8 documentation +SPKG_DESC_CSWbdb48 = BerkeleyDB 4.8 embedded database libraries and utilities +SPKG_DESC_CSWbdb48devel = BerkeleyDB 4.8 development support +SPKG_DESC_CSWbdb48doc = BerkeleyDB 4.8 documentation -REQUIRED_PKGS_CSWbdbdevel = CSWbdb +REQUIRED_PKGS_CSWbdb48devel = CSWbdb48 LICENSE = LICENSE -PKGFILES_CSWbdbdoc = $(PKGFILES_DOC) +PKGFILES_CSWbdb48doc = /opt/csw/share/doc/.* -PKGFILES_CSWbdbdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWbdb48devel = $(PKGFILES_DEVEL) include gar/category.mk Deleted: csw/mgar/pkg/bdb48/trunk/files/patch.4.7.25.1 =================================================================== --- csw/mgar/pkg/bdb48/trunk/files/patch.4.7.25.1 2009-09-30 15:07:42 UTC (rev 6625) +++ csw/mgar/pkg/bdb48/trunk/files/patch.4.7.25.1 2009-09-30 15:27:03 UTC (rev 6626) @@ -1,75 +0,0 @@ -*** sequence/sequence.c.orig 2008-05-05 13:25:09.000000000 -0700 ---- sequence/sequence.c 2008-08-15 09:58:46.000000000 -0700 -*************** -*** 187,193 **** - if ((ret = __db_get_flags(dbp, &tflags)) != 0) - goto err; - -! if (DB_IS_READONLY(dbp)) { - ret = __db_rdonly(dbp->env, "DB_SEQUENCE->open"); - goto err; - } ---- 187,197 ---- - if ((ret = __db_get_flags(dbp, &tflags)) != 0) - goto err; - -! /* -! * We can let replication clients open sequences, but must -! * check later that they do not update them. -! */ -! if (F_ISSET(dbp, DB_AM_RDONLY)) { - ret = __db_rdonly(dbp->env, "DB_SEQUENCE->open"); - goto err; - } -*************** -*** 244,249 **** ---- 248,258 ---- - if ((ret != DB_NOTFOUND && ret != DB_KEYEMPTY) || - !LF_ISSET(DB_CREATE)) - goto err; -+ if (IS_REP_CLIENT(env) && -+ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { -+ ret = __db_rdonly(env, "DB_SEQUENCE->open"); -+ goto err; -+ } - ret = 0; - - rp = &seq->seq_record; -*************** -*** 296,302 **** - */ - rp = seq->seq_data.data; - if (rp->seq_version == DB_SEQUENCE_OLDVER) { -! oldver: rp->seq_version = DB_SEQUENCE_VERSION; - if (!F_ISSET(env, ENV_LITTLEENDIAN)) { - if (IS_DB_AUTO_COMMIT(dbp, txn)) { - if ((ret = ---- 305,316 ---- - */ - rp = seq->seq_data.data; - if (rp->seq_version == DB_SEQUENCE_OLDVER) { -! oldver: if (IS_REP_CLIENT(env) && -! !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { -! ret = __db_rdonly(env, "DB_SEQUENCE->open"); -! goto err; -! } -! rp->seq_version = DB_SEQUENCE_VERSION; - if (!F_ISSET(env, ENV_LITTLEENDIAN)) { - if (IS_DB_AUTO_COMMIT(dbp, txn)) { - if ((ret = -*************** -*** 707,712 **** ---- 721,733 ---- - - MUTEX_LOCK(env, seq->mtx_seq); - -+ if (handle_check && IS_REP_CLIENT(env) && -+ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { -+ ret = __db_rdonly(env, "DB_SEQUENCE->get"); -+ goto err; -+ } -+ -+ - if (rp->seq_min + delta > rp->seq_max) { - __db_errx(env, "Sequence overflow"); - ret = EINVAL; Deleted: csw/mgar/pkg/bdb48/trunk/files/patch.4.7.25.2 =================================================================== --- csw/mgar/pkg/bdb48/trunk/files/patch.4.7.25.2 2009-09-30 15:07:42 UTC (rev 6625) +++ csw/mgar/pkg/bdb48/trunk/files/patch.4.7.25.2 2009-09-30 15:27:03 UTC (rev 6626) @@ -1,71 +0,0 @@ -Index: lock/lock.c -=================================================================== -RCS file: /a/CVSROOT/db/lock/lock.c,v -retrieving revision 12.61 -diff -c -r12.61 lock.c -*** lock/lock.c 22 Jul 2008 12:08:53 -0000 12.61 ---- lock/lock.c 19 Aug 2008 17:28:24 -0000 -*************** -*** 1278,1287 **** - SH_TAILQ_REMOVE( - <->obj_tab[obj_ndx], sh_obj, links, __db_lockobj); - if (sh_obj->lockobj.size > sizeof(sh_obj->objdata)) { -! LOCK_REGION_LOCK(env); - __env_alloc_free(<->reginfo, - SH_DBT_PTR(&sh_obj->lockobj)); -! LOCK_REGION_UNLOCK(env); - } - SH_TAILQ_INSERT_HEAD( - &FREE_OBJS(lt, part_id), sh_obj, links, __db_lockobj); ---- 1278,1289 ---- - SH_TAILQ_REMOVE( - <->obj_tab[obj_ndx], sh_obj, links, __db_lockobj); - if (sh_obj->lockobj.size > sizeof(sh_obj->objdata)) { -! if (region->part_t_size != 1) -! LOCK_REGION_LOCK(env); - __env_alloc_free(<->reginfo, - SH_DBT_PTR(&sh_obj->lockobj)); -! if (region->part_t_size != 1) -! LOCK_REGION_UNLOCK(env); - } - SH_TAILQ_INSERT_HEAD( - &FREE_OBJS(lt, part_id), sh_obj, links, __db_lockobj); -*************** -*** 1470,1484 **** - if (obj->size <= sizeof(sh_obj->objdata)) - p = sh_obj->objdata; - else { -! LOCK_REGION_LOCK(env); - if ((ret = - __env_alloc(<->reginfo, obj->size, &p)) != 0) { - __db_errx(env, - "No space for lock object storage"); -! LOCK_REGION_UNLOCK(env); - goto err; - } -! LOCK_REGION_UNLOCK(env); - } - - memcpy(p, obj->data, obj->size); ---- 1472,1492 ---- - if (obj->size <= sizeof(sh_obj->objdata)) - p = sh_obj->objdata; - else { -! /* -! * If we have only one partition, the region is locked. -! */ -! if (region->part_t_size != 1) -! LOCK_REGION_LOCK(env); - if ((ret = - __env_alloc(<->reginfo, obj->size, &p)) != 0) { - __db_errx(env, - "No space for lock object storage"); -! if (region->part_t_size != 1) -! LOCK_REGION_UNLOCK(env); - goto err; - } -! if (region->part_t_size != 1) -! LOCK_REGION_UNLOCK(env); - } - - memcpy(p, obj->data, obj->size); Deleted: csw/mgar/pkg/bdb48/trunk/files/patch.4.7.25.3 =================================================================== --- csw/mgar/pkg/bdb48/trunk/files/patch.4.7.25.3 2009-09-30 15:07:42 UTC (rev 6625) +++ csw/mgar/pkg/bdb48/trunk/files/patch.4.7.25.3 2009-09-30 15:27:03 UTC (rev 6626) @@ -1,314 +0,0 @@ -*** lock/lock_deadlock.c 2008-03-11 00:31:33.000000000 +1100 ---- lock/lock_deadlock.c 2008-12-16 21:54:18.000000000 +1100 -*************** -*** 121,127 **** - DB_LOCKTAB *lt; - db_timespec now; - locker_info *idmap; -! u_int32_t *bitmap, *copymap, **deadp, **free_me, *tmpmap; - u_int32_t i, cid, keeper, killid, limit, nalloc, nlockers; - u_int32_t lock_max, txn_max; - int ret, status; ---- 121,127 ---- - DB_LOCKTAB *lt; - db_timespec now; - locker_info *idmap; -! u_int32_t *bitmap, *copymap, **deadp, **deadlist, *tmpmap; - u_int32_t i, cid, keeper, killid, limit, nalloc, nlockers; - u_int32_t lock_max, txn_max; - int ret, status; -*************** -*** 133,139 **** - if (IS_REP_CLIENT(env)) - atype = DB_LOCK_MINWRITE; - -! free_me = NULL; - - lt = env->lk_handle; - if (rejectp != NULL) ---- 133,140 ---- - if (IS_REP_CLIENT(env)) - atype = DB_LOCK_MINWRITE; - -! copymap = tmpmap = NULL; -! deadlist = NULL; - - lt = env->lk_handle; - if (rejectp != NULL) -*************** -*** 179,189 **** - memcpy(copymap, bitmap, nlockers * sizeof(u_int32_t) * nalloc); - - if ((ret = __os_calloc(env, sizeof(u_int32_t), nalloc, &tmpmap)) != 0) -! goto err1; - - /* Find a deadlock. */ - if ((ret = -! __dd_find(env, bitmap, idmap, nlockers, nalloc, &deadp)) != 0) - return (ret); - - /* ---- 180,190 ---- - memcpy(copymap, bitmap, nlockers * sizeof(u_int32_t) * nalloc); - - if ((ret = __os_calloc(env, sizeof(u_int32_t), nalloc, &tmpmap)) != 0) -! goto err; - - /* Find a deadlock. */ - if ((ret = -! __dd_find(env, bitmap, idmap, nlockers, nalloc, &deadlist)) != 0) - return (ret); - - /* -*************** -*** 204,211 **** - txn_max = TXN_MAXIMUM; - - killid = BAD_KILLID; -! free_me = deadp; -! for (; *deadp != NULL; deadp++) { - if (rejectp != NULL) - ++*rejectp; - killid = (u_int32_t)(*deadp - bitmap) / nalloc; ---- 205,211 ---- - txn_max = TXN_MAXIMUM; - - killid = BAD_KILLID; -! for (deadp = deadlist; *deadp != NULL; deadp++) { - if (rejectp != NULL) - ++*rejectp; - killid = (u_int32_t)(*deadp - bitmap) / nalloc; -*************** -*** 342,352 **** - __db_msg(env, - "Aborting locker %lx", (u_long)idmap[killid].id); - } -! __os_free(env, tmpmap); -! err1: __os_free(env, copymap); -! -! err: if (free_me != NULL) -! __os_free(env, free_me); - __os_free(env, bitmap); - __os_free(env, idmap); - ---- 342,353 ---- - __db_msg(env, - "Aborting locker %lx", (u_long)idmap[killid].id); - } -! err: if(copymap != NULL) -! __os_free(env, copymap); -! if (deadlist != NULL) -! __os_free(env, deadlist); -! if(tmpmap != NULL) -! __os_free(env, tmpmap); - __os_free(env, bitmap); - __os_free(env, idmap); - -*************** -*** 360,365 **** ---- 361,377 ---- - - #define DD_INVALID_ID ((u_int32_t) -1) - -+ /* -+ * __dd_build -- -+ * Build the lock dependency bit maps. -+ * Notes on syncronization: -+ * LOCK_SYSTEM_LOCK is used to hold objects locked when we have -+ * a single partition. -+ * LOCK_LOCKERS is held while we are walking the lockers list and -+ * to single thread the use of lockerp->dd_id. -+ * LOCK_DD protects the DD list of objects. -+ */ -+ - static int - __dd_build(env, atype, bmp, nlockers, allocp, idmap, rejectp) - ENV *env; -*************** -*** 393,398 **** ---- 405,411 ---- - * In particular we do not build the conflict array and our caller - * needs to expect this. - */ -+ LOCK_SYSTEM_LOCK(lt, region); - if (atype == DB_LOCK_EXPIRE) { - skip: LOCK_DD(env, region); - op = SH_TAILQ_FIRST(®ion->dd_objs, __db_lockobj); -*************** -*** 430,446 **** - OBJECT_UNLOCK(lt, region, indx); - } - UNLOCK_DD(env, region); - goto done; - } - - /* -! * We'll check how many lockers there are, add a few more in for -! * good measure and then allocate all the structures. Then we'll -! * verify that we have enough room when we go back in and get the -! * mutex the second time. - */ -! retry: count = region->stat.st_nlockers; - if (count == 0) { - *nlockers = 0; - return (0); - } ---- 443,460 ---- - OBJECT_UNLOCK(lt, region, indx); - } - UNLOCK_DD(env, region); -+ LOCK_SYSTEM_UNLOCK(lt, region); - goto done; - } - - /* -! * Allocate after locking the region -! * to make sure the structures are large enough. - */ -! LOCK_LOCKERS(env, region); -! count = region->stat.st_nlockers; - if (count == 0) { -+ UNLOCK_LOCKERS(env, region); - *nlockers = 0; - return (0); - } -*************** -*** 448,497 **** - if (FLD_ISSET(env->dbenv->verbose, DB_VERB_DEADLOCK)) - __db_msg(env, "%lu lockers", (u_long)count); - -- count += 20; - nentries = (u_int32_t)DB_ALIGN(count, 32) / 32; - -! /* -! * Allocate enough space for a count by count bitmap matrix. -! * -! * XXX -! * We can probably save the malloc's between iterations just -! * reallocing if necessary because count grew by too much. -! */ - if ((ret = __os_calloc(env, (size_t)count, -! sizeof(u_int32_t) * nentries, &bitmap)) != 0) - return (ret); - - if ((ret = __os_calloc(env, - sizeof(u_int32_t), nentries, &tmpmap)) != 0) { - __os_free(env, bitmap); - return (ret); - } - - if ((ret = __os_calloc(env, - (size_t)count, sizeof(locker_info), &id_array)) != 0) { - __os_free(env, bitmap); - __os_free(env, tmpmap); - return (ret); - } - - /* -- * Now go back in and actually fill in the matrix. -- */ -- if (region->stat.st_nlockers > count) { -- __os_free(env, bitmap); -- __os_free(env, tmpmap); -- __os_free(env, id_array); -- goto retry; -- } -- -- /* - * First we go through and assign each locker a deadlock detector id. - */ - id = 0; -- LOCK_LOCKERS(env, region); - SH_TAILQ_FOREACH(lip, ®ion->lockers, ulinks, __db_locker) { - if (lip->master_locker == INVALID_ROFF) { - lip->dd_id = id++; - id_array[lip->dd_id].id = lip->id; - switch (atype) { ---- 462,498 ---- - if (FLD_ISSET(env->dbenv->verbose, DB_VERB_DEADLOCK)) - __db_msg(env, "%lu lockers", (u_long)count); - - nentries = (u_int32_t)DB_ALIGN(count, 32) / 32; - -! /* Allocate enough space for a count by count bitmap matrix. */ - if ((ret = __os_calloc(env, (size_t)count, -! sizeof(u_int32_t) * nentries, &bitmap)) != 0) { -! UNLOCK_LOCKERS(env, region); - return (ret); -+ } - - if ((ret = __os_calloc(env, - sizeof(u_int32_t), nentries, &tmpmap)) != 0) { -+ UNLOCK_LOCKERS(env, region); - __os_free(env, bitmap); - return (ret); - } - - if ((ret = __os_calloc(env, - (size_t)count, sizeof(locker_info), &id_array)) != 0) { -+ UNLOCK_LOCKERS(env, region); - __os_free(env, bitmap); - __os_free(env, tmpmap); - return (ret); - } - - /* - * First we go through and assign each locker a deadlock detector id. - */ - id = 0; - SH_TAILQ_FOREACH(lip, ®ion->lockers, ulinks, __db_locker) { - if (lip->master_locker == INVALID_ROFF) { -+ DB_ASSERT(env, id < count); - lip->dd_id = id++; - id_array[lip->dd_id].id = lip->id; - switch (atype) { -*************** -*** 510,516 **** - lip->dd_id = DD_INVALID_ID; - - } -- UNLOCK_LOCKERS(env, region); - - /* - * We only need consider objects that have waiters, so we use ---- 511,516 ---- -*************** -*** 669,675 **** - * status after building the bit maps so that we will not detect - * a blocked transaction without noting that it is already aborting. - */ -- LOCK_LOCKERS(env, region); - for (id = 0; id < count; id++) { - if (!id_array[id].valid) - continue; ---- 669,674 ---- -*************** -*** 738,743 **** ---- 737,743 ---- - id_array[id].in_abort = 1; - } - UNLOCK_LOCKERS(env, region); -+ LOCK_SYSTEM_UNLOCK(lt, region); - - /* - * Now we can release everything except the bitmap matrix that we -*************** -*** 839,844 **** ---- 839,845 ---- - ret = 0; - - /* We must lock so this locker cannot go away while we abort it. */ -+ LOCK_SYSTEM_LOCK(lt, region); - LOCK_LOCKERS(env, region); - - /* -*************** -*** 895,900 **** ---- 896,902 ---- - done: OBJECT_UNLOCK(lt, region, info->last_ndx); - err: - out: UNLOCK_LOCKERS(env, region); -+ LOCK_SYSTEM_UNLOCK(lt, region); - return (ret); - } - Deleted: csw/mgar/pkg/bdb48/trunk/files/patch.4.7.25.4 =================================================================== --- csw/mgar/pkg/bdb48/trunk/files/patch.4.7.25.4 2009-09-30 15:07:42 UTC (rev 6625) +++ csw/mgar/pkg/bdb48/trunk/files/patch.4.7.25.4 2009-09-30 15:27:03 UTC (rev 6626) @@ -1,183 +0,0 @@ -*** dbinc/repmgr.h.orig 2009-05-04 10:33:55.000000000 -0400 ---- dbinc/repmgr.h 2009-05-04 10:27:26.000000000 -0400 -*************** -*** 374,379 **** ---- 374,380 ---- - #define SITE_FROM_EID(eid) (&db_rep->sites[eid]) - #define EID_FROM_SITE(s) ((int)((s) - (&db_rep->sites[0]))) - #define IS_VALID_EID(e) ((e) >= 0) -+ #define IS_KNOWN_REMOTE_SITE(e) ((e) >= 0 && ((u_int)(e)) < db_rep->site_cnt) - #define SELF_EID INT_MAX - - #define IS_PEER_POLICY(p) ((p) == DB_REPMGR_ACKS_ALL_PEERS || \ -*** rep/rep_elect.c.orig 2009-05-04 10:35:50.000000000 -0400 ---- rep/rep_elect.c 2009-05-04 10:31:24.000000000 -0400 -*************** -*** 33,39 **** - static int __rep_fire_elected __P((ENV *, REP *, u_int32_t)); - static void __rep_elect_master __P((ENV *, REP *)); - static int __rep_tally __P((ENV *, REP *, int, u_int32_t *, u_int32_t, roff_t)); -! static int __rep_wait __P((ENV *, db_timeout_t *, int *, int, u_int32_t)); - - /* - * __rep_elect -- ---- 33,39 ---- - static int __rep_fire_elected __P((ENV *, REP *, u_int32_t)); - static void __rep_elect_master __P((ENV *, REP *)); - static int __rep_tally __P((ENV *, REP *, int, u_int32_t *, u_int32_t, roff_t)); -! static int __rep_wait __P((ENV *, db_timeout_t *, int, u_int32_t)); - - /* - * __rep_elect -- -*************** -*** 55,61 **** - ENV *env; - LOG *lp; - REP *rep; -! int done, eid, elected, full_elect, locked, in_progress, need_req; - int ret, send_vote, t_ret; - u_int32_t ack, ctlflags, egen, nsites, orig_tally, priority, realpri; - u_int32_t tiebreaker; ---- 55,61 ---- - ENV *env; - LOG *lp; - REP *rep; -! int done, elected, full_elect, locked, in_progress, need_req; - int ret, send_vote, t_ret; - u_int32_t ack, ctlflags, egen, nsites, orig_tally, priority, realpri; - u_int32_t tiebreaker; -*************** -*** 181,188 **** - REP_SYSTEM_UNLOCK(env); - (void)__rep_send_message(env, DB_EID_BROADCAST, - REP_MASTER_REQ, NULL, NULL, 0, 0); -! ret = __rep_wait(env, &to, &eid, -! 0, REP_F_EPHASE0); - REP_SYSTEM_LOCK(env); - F_CLR(rep, REP_F_EPHASE0); - switch (ret) { ---- 181,187 ---- - REP_SYSTEM_UNLOCK(env); - (void)__rep_send_message(env, DB_EID_BROADCAST, - REP_MASTER_REQ, NULL, NULL, 0, 0); -! ret = __rep_wait(env, &to, 0, REP_F_EPHASE0); - REP_SYSTEM_LOCK(env); - F_CLR(rep, REP_F_EPHASE0); - switch (ret) { -*************** -*** 286,296 **** - REP_SYSTEM_LOCK(env); - goto vote; - } -! ret = __rep_wait(env, &to, &eid, full_elect, REP_F_EPHASE1); - switch (ret) { - case 0: - /* Check if election complete or phase complete. */ -! if (eid != DB_EID_INVALID && !IN_ELECTION(rep)) { - RPRINT(env, DB_VERB_REP_ELECT, - (env, "Ended election phase 1")); - goto edone; ---- 285,295 ---- - REP_SYSTEM_LOCK(env); - goto vote; - } -! ret = __rep_wait(env, &to, full_elect, REP_F_EPHASE1); - switch (ret) { - case 0: - /* Check if election complete or phase complete. */ -! if (!IN_ELECTION(rep)) { - RPRINT(env, DB_VERB_REP_ELECT, - (env, "Ended election phase 1")); - goto edone; -*************** -*** 398,412 **** - REP_SYSTEM_LOCK(env); - goto i_won; - } -! ret = __rep_wait(env, &to, &eid, full_elect, REP_F_EPHASE2); - RPRINT(env, DB_VERB_REP_ELECT, - (env, "Ended election phase 2 %d", ret)); - switch (ret) { - case 0: -! if (eid != DB_EID_INVALID) -! goto edone; -! ret = DB_REP_UNAVAIL; -! break; - case DB_REP_EGENCHG: - if (to > timeout) - to = timeout; ---- 397,408 ---- - REP_SYSTEM_LOCK(env); - goto i_won; - } -! ret = __rep_wait(env, &to, full_elect, REP_F_EPHASE2); - RPRINT(env, DB_VERB_REP_ELECT, - (env, "Ended election phase 2 %d", ret)); - switch (ret) { - case 0: -! goto edone; - case DB_REP_EGENCHG: - if (to > timeout) - to = timeout; -*************** -*** 1050,1062 **** - ENV *env; - REP *rep; - { -- /* -- * We often come through here twice, sometimes even more. We mustn't -- * let the redundant calls affect stats counting. But rep_elect relies -- * on this first part for setting eidp. -- */ -- rep->master_id = rep->eid; -- - if (F_ISSET(rep, REP_F_MASTERELECT | REP_F_MASTER)) { - /* We've been through here already; avoid double counting. */ - return; ---- 1046,1051 ---- -*************** -*** 1093,1102 **** - (timeout > 5000000) ? 500000 : ((timeout >= 10) ? timeout / 10 : 1); - - static int -! __rep_wait(env, timeoutp, eidp, full_elect, flags) - ENV *env; - db_timeout_t *timeoutp; -! int *eidp, full_elect; - u_int32_t flags; - { - DB_REP *db_rep; ---- 1082,1091 ---- - (timeout > 5000000) ? 500000 : ((timeout >= 10) ? timeout / 10 : 1); - - static int -! __rep_wait(env, timeoutp, full_elect, flags) - ENV *env; - db_timeout_t *timeoutp; -! int full_elect; - u_int32_t flags; - { - DB_REP *db_rep; -*************** -*** 1174,1180 **** - F_CLR(rep, REP_F_EGENUPDATE); - ret = DB_REP_EGENCHG; - } else if (phase_over) { -- *eidp = rep->master_id; - done = 1; - ret = 0; - } ---- 1163,1168 ---- -*** repmgr/repmgr_net.c.orig 2009-05-04 10:34:46.000000000 -0400 ---- repmgr/repmgr_net.c 2009-05-04 10:27:26.000000000 -0400 -*************** -*** 100,105 **** ---- 100,107 ---- - control, rec, &nsites_sent, &npeers_sent)) != 0) - goto out; - } else { -+ DB_ASSERT(env, IS_KNOWN_REMOTE_SITE(eid)); -+ - /* - * If this is a request that can be sent anywhere, then see if - * we can send it to our peer (to save load on the master), but This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Wed Sep 30 17:41:26 2009 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Wed, 30 Sep 2009 15:41:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[6627] csw/mgar/pkg/vim/trunk Message-ID: Revision: 6627 http://gar.svn.sourceforge.net/gar/?rev=6627&view=rev Author: harpchad Date: 2009-09-30 15:41:26 +0000 (Wed, 30 Sep 2009) Log Message: ----------- Update patch level to 266 Modified Paths: -------------- csw/mgar/pkg/vim/trunk/Makefile csw/mgar/pkg/vim/trunk/checksums Modified: csw/mgar/pkg/vim/trunk/Makefile =================================================================== --- csw/mgar/pkg/vim/trunk/Makefile 2009-09-30 15:27:03 UTC (rev 6626) +++ csw/mgar/pkg/vim/trunk/Makefile 2009-09-30 15:41:26 UTC (rev 6627) @@ -1,6 +1,6 @@ GARNAME = vim DISTVERSION = 7.2 -PATCHREV = 148 +PATCHREV = 266 GARVERSION = $(DISTVERSION).$(PATCHREV) CATEGORIES = utils SPKG_SOURCEURL = http://www.vim.org/download.php Modified: csw/mgar/pkg/vim/trunk/checksums =================================================================== --- csw/mgar/pkg/vim/trunk/checksums 2009-09-30 15:27:03 UTC (rev 6626) +++ csw/mgar/pkg/vim/trunk/checksums 2009-09-30 15:41:26 UTC (rev 6627) @@ -1,10 +1,3 @@ -f0901284b338e448bfd79ccca0041254 download/vim-7.2.tar.bz2 -d8884786979e0e520c112faf2e176f05 download/vim-7.2-lang.tar.gz -35e04482f07c57221c9a751aaa3b8dac download/vim-7.2-extra.tar.gz -f31314c40819d3414d77ea286770c17f download/vimrc -1965bc951c0a190faaa665996b1b287e download/vimrc.tiny -80304427884b8b78134bc7c7c9097679 download/gvimrc -73612b6658c597ee478abf27a0a89ed5 download/COPYING 7c2dc4a956cf315e546e347bc349968c download/7.2.001 7f16f80814f1e071a689806c2056b39d download/7.2.002 0de916fdfd450a4a0d95bed44ae2c398 download/7.2.003 @@ -153,4 +146,129 @@ cb97aca73a1f4fdd2fac894bba7e43ae download/7.2.146 4219afedebf0172118f2d078d9012995 download/7.2.147 49ca89a47315f512c7ee06f5b2617a90 download/7.2.148 +9197a669e4ee024c1a9218e861e21c7e download/7.2.149 +cbdf7ce960ad4646a8884e51bc7e037e download/7.2.150 +56b24ce6e78e71c64d05fda51748b01c download/7.2.151 +7c088583f063cd09d26f7291d9f5817b download/7.2.152 +e966483b6755f4e7b2cd92708a8ff656 download/7.2.153 +27bcb5f1d5932ee7eaae40ba0a4eb968 download/7.2.154 +611ab5b97cd9d87a1be0a84e3006b17a download/7.2.155 +27fb40dbdb85052a598be88f205484c6 download/7.2.156 +93a85a3606193b8875f0eba05dba3be3 download/7.2.157 +808ba7888bdfdf559366dfdf1446dab5 download/7.2.158 +08bd6d6db2e029beab84b32bf36494e0 download/7.2.159 +c07df493053267849115b579928a4dae download/7.2.160 +e44297c9ed5928e55ca43b4e2b3509ce download/7.2.161 +0d4768bd2395f3ebf3ebd7fa4979288c download/7.2.162 +032f90bcee8f36ad7b77a17bb76719f0 download/7.2.163 +21341ed82eb080e590d15dd6368e8d78 download/7.2.164 +51de241d7d03200a7b3490f40256c633 download/7.2.165 +9c645166c92865d644fd232760b56494 download/7.2.166 +a29266c1573ff106366ebdbd460b17ce download/7.2.167 +09105d79266562b6afe0179c07149738 download/7.2.168 +36d18f0e42f0c24722116cb823b52c8a download/7.2.169 +a00979f910f29d5062faf15e8670735b download/7.2.170 +439a415dab8a77790c7da1526da083f9 download/7.2.171 +3defcc24541cd3d62fda6cfb4af6ba4b download/7.2.172 +5f16d8af9b11f44c8e104abc942152c2 download/7.2.173 +4949fe9f14ac4f7b2717ddb05968285c download/7.2.174 +7462cd9ba69a7eb674aa8e5653fdad63 download/7.2.175 +4b5c77673b5d62f1a94e4d605e92d81e download/7.2.176 +cde1647ab09a432c134d6fbae5ca15dc download/7.2.177 +5a126dd404945088b61aaf9d8c2effaa download/7.2.178 +a15fe587377fac500d0fae2b1c3adbbf download/7.2.179 +d4db5a69da98dbda41429d66e339e515 download/7.2.180 +8b9dee3c4aeeb563cbff6f3cf0357675 download/7.2.181 +d5d50f1da385bee588348aaaa5bb2dd7 download/7.2.182 +77e46725488937910d1cf051760ad11d download/7.2.183 +3bdbab52e0ac635962ce9983ef1d9f01 download/7.2.184 +fa88ae980d6e68f9aa9f9b257f1f3e71 download/7.2.185 +2262a6034d4cf01859a1d36982f38505 download/7.2.186 +c98b89c2594d7127574d0bd9838f241a download/7.2.187 +8efff5f82388c43183739c280249b643 download/7.2.188 +bab560f5a4b1809c2859ab632f037135 download/7.2.189 +63098e6cdb253d83c30f42d3d4469900 download/7.2.190 +87a02a6db9029357d7e248bcf4923330 download/7.2.191 +88102a28fb2139fe14a66b2970958166 download/7.2.192 +66a202b39e36ac062db1432896d8d988 download/7.2.193 +3ba1ab13de695c1422e0cda65c03503d download/7.2.194 +a42b79c5328c30b0951ce67da505a3f4 download/7.2.195 +f1ece679735785c46b58ed4d791b3880 download/7.2.196 +352908f71b12a7a30aafd985c338d247 download/7.2.197 +2a4764a5df5c1d18e4c7fee81074f55c download/7.2.198 +61a30d8c51533f08a94ba23025a12f11 download/7.2.199 +1a21534f09d529a9096c5e9b978187e9 download/7.2.200 +61e01d2aef1d5c1c3b40d5e927bd83c9 download/7.2.201 +30df1365ef27c34558d4322cb71c5d83 download/7.2.202 +24ae52da6519c8f8fbd08676c64eac75 download/7.2.203 +e75f99a06eb7a03a5cf854505b1d795d download/7.2.204 +3e2da4100f83cf2d308545d0c822a196 download/7.2.205 +4895874100f932e15a8c661fb40a19b1 download/7.2.206 +e3345b11c12eedd8871b2eeb811c9234 download/7.2.207 +a7f6deca2df02cc4d23274f3104b94d1 download/7.2.208 +62e83a3e30fe5b6f96ba276a342faf1c download/7.2.209 +296e40f03bf6243583541ca440af802c download/7.2.210 +3714237966fa05c9cae8fd4518a42ac4 download/7.2.211 +3537ef914ffbe5acbdede8d3581ecf41 download/7.2.212 +9f4b0f8a1dc9c3720eca6028c987fa01 download/7.2.213 +fb46e419802a06e26d8531628f50aca9 download/7.2.214 +388c0884878256fca9db1fb1fe9df98e download/7.2.215 +cd568cf0b9b751b9ff1151fa6f5f0ae0 download/7.2.216 +288d5ee4b5ff25caa79446a95cb3ee98 download/7.2.217 +d86a84a239c25dda5101aac8c365154c download/7.2.218 +9c0f11d3c52d1756381231e1c0a6156d download/7.2.219 +bfed5d4e0bcae8eb7a7e0806d4367e0a download/7.2.220 +3b169a3f976cf1808b12230dd24c0ff5 download/7.2.221 +a3f9c7d976ad8a49250d0ff3130b6390 download/7.2.222 +3ca61604214ef919b7bfe4b24eb69518 download/7.2.223 +5c550bd6e2111c10407b7aca009b1242 download/7.2.224 +b3ae8fa424e01a0fc67c9ed7393b422e download/7.2.225 +6057e1247bd3b1538eef15c532caf881 download/7.2.226 +932e2a5394788124cbda950bfff327ff download/7.2.227 +b97e5d33fa4fb8a1ea1308558bb33d41 download/7.2.228 +2107c7d981ca14d8e795ae744a903106 download/7.2.229 +7e98ae111e74676ef88c5e3edce785ed download/7.2.230 +2abbb80186d28da703eb329d4247dd41 download/7.2.231 +5e5cfa4e5ee34cbbdd01c27ece1b7398 download/7.2.232 +9fa12db95776e9174ca7c95172a48838 download/7.2.233 +a46776a6914ec2972ada91b33b0cfb39 download/7.2.234 +4121105bf052ebac02bd9891c232137a download/7.2.235 +e9ca47c42d7de7b27910e3b35e533ecd download/7.2.236 +f48f3e3f58a7a82a1c14fd61072c69f0 download/7.2.237 +5b9cc79b5448fb71ac1b2870a861119d download/7.2.238 +28a8a33a3e2ceef51f838c2dc9fceac2 download/7.2.239 +212989ec4f90d697183c7cfb363cd453 download/7.2.240 +45f0effee324a20881e254c1b59dd5f8 download/7.2.241 +464fc788e592b19cd4d8a21d3d8b789e download/7.2.242 +eb8132b8f89393e7f39734e607fc3925 download/7.2.243 +15c654c51220c2ad94b47d6013626aef download/7.2.244 +d5ecb198dfea237e96b5ae12b9381383 download/7.2.245 +d91e62d4152877db281fdaa797cfe0c3 download/7.2.246 +a4dbbffc8ec2b377e1a1eb8279ff611c download/7.2.247 +9d97db1b426ab2c56a8e4281233c7d5f download/7.2.248 +947568ba23d4560e6292f6f1846120c4 download/7.2.249 +73948226c417143bce66ba6244443aed download/7.2.250 +2e351cf03bbcb927d93bafd8166dd82d download/7.2.251 +11cef6808a278694c61ba2c74f3911b0 download/7.2.252 +ed1731b8c74ee27d129bbc78e178da2f download/7.2.253 +1703bec4ee7a155037d3373d23bc7ca1 download/7.2.254 +57f31a4f4afc9a0ea60829bf9d36b380 download/7.2.255 +19df6e42d09a76e7c219b172204bf66a download/7.2.256 +c4775d1a1c37f288803f5d11d8d94865 download/7.2.257 +a62aae9b8281bd7e1d144c6534a27b68 download/7.2.258 +91d775ed9329eec16882eeca04708dec download/7.2.259 +d6bcf89bb0a04ce25d94f8bc0b3ba747 download/7.2.260 +7313b1644f7184ea116a0e7cccc42124 download/7.2.261 +75b2f61f81ff9af8e7f83d1885e9487f download/7.2.262 +e98be83507f72cff814aa89456fb38ee download/7.2.263 +352951ed477e83d3527c2ff95a7c2484 download/7.2.264 +4b12ddc88794c20ad3dbe238ccf91807 download/7.2.265 +9bfd540da3982b9841421cabc564f958 download/7.2.266 +73612b6658c597ee478abf27a0a89ed5 download/COPYING +80304427884b8b78134bc7c7c9097679 download/gvimrc +35e04482f07c57221c9a751aaa3b8dac download/vim-7.2-extra.tar.gz +d8884786979e0e520c112faf2e176f05 download/vim-7.2-lang.tar.gz +f0901284b338e448bfd79ccca0041254 download/vim-7.2.tar.bz2 +f31314c40819d3414d77ea286770c17f download/vimrc +1965bc951c0a190faaa665996b1b287e download/vimrc.tiny 582717146f6bbd5b73db83a2f62e62a5 download/vimtutor.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Wed Sep 30 17:47:24 2009 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Wed, 30 Sep 2009 15:47:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[6629] csw/mgar/pkg/gvim/trunk Message-ID: Revision: 6629 http://gar.svn.sourceforge.net/gar/?rev=6629&view=rev Author: harpchad Date: 2009-09-30 15:47:24 +0000 (Wed, 30 Sep 2009) Log Message: ----------- Update patch level to 266 Modified Paths: -------------- csw/mgar/pkg/gvim/trunk/Makefile csw/mgar/pkg/gvim/trunk/checksums Modified: csw/mgar/pkg/gvim/trunk/Makefile =================================================================== --- csw/mgar/pkg/gvim/trunk/Makefile 2009-09-30 15:46:02 UTC (rev 6628) +++ csw/mgar/pkg/gvim/trunk/Makefile 2009-09-30 15:47:24 UTC (rev 6629) @@ -1,6 +1,6 @@ GARNAME = vim DISTVERSION = 7.2 -PATCHREV = 148 +PATCHREV = 266 GARVERSION = $(DISTVERSION).$(PATCHREV) CATEGORIES = utils SPKG_SOURCEURL = http://www.vim.org/download.php Modified: csw/mgar/pkg/gvim/trunk/checksums =================================================================== --- csw/mgar/pkg/gvim/trunk/checksums 2009-09-30 15:46:02 UTC (rev 6628) +++ csw/mgar/pkg/gvim/trunk/checksums 2009-09-30 15:47:24 UTC (rev 6629) @@ -151,4 +151,122 @@ cb97aca73a1f4fdd2fac894bba7e43ae download/7.2.146 4219afedebf0172118f2d078d9012995 download/7.2.147 49ca89a47315f512c7ee06f5b2617a90 download/7.2.148 +9197a669e4ee024c1a9218e861e21c7e download/7.2.149 +cbdf7ce960ad4646a8884e51bc7e037e download/7.2.150 +56b24ce6e78e71c64d05fda51748b01c download/7.2.151 +7c088583f063cd09d26f7291d9f5817b download/7.2.152 +e966483b6755f4e7b2cd92708a8ff656 download/7.2.153 +27bcb5f1d5932ee7eaae40ba0a4eb968 download/7.2.154 +611ab5b97cd9d87a1be0a84e3006b17a download/7.2.155 +27fb40dbdb85052a598be88f205484c6 download/7.2.156 +93a85a3606193b8875f0eba05dba3be3 download/7.2.157 +808ba7888bdfdf559366dfdf1446dab5 download/7.2.158 +08bd6d6db2e029beab84b32bf36494e0 download/7.2.159 +c07df493053267849115b579928a4dae download/7.2.160 +e44297c9ed5928e55ca43b4e2b3509ce download/7.2.161 +0d4768bd2395f3ebf3ebd7fa4979288c download/7.2.162 +032f90bcee8f36ad7b77a17bb76719f0 download/7.2.163 +21341ed82eb080e590d15dd6368e8d78 download/7.2.164 +51de241d7d03200a7b3490f40256c633 download/7.2.165 +9c645166c92865d644fd232760b56494 download/7.2.166 +a29266c1573ff106366ebdbd460b17ce download/7.2.167 +09105d79266562b6afe0179c07149738 download/7.2.168 +36d18f0e42f0c24722116cb823b52c8a download/7.2.169 +a00979f910f29d5062faf15e8670735b download/7.2.170 +439a415dab8a77790c7da1526da083f9 download/7.2.171 +3defcc24541cd3d62fda6cfb4af6ba4b download/7.2.172 +5f16d8af9b11f44c8e104abc942152c2 download/7.2.173 +4949fe9f14ac4f7b2717ddb05968285c download/7.2.174 +7462cd9ba69a7eb674aa8e5653fdad63 download/7.2.175 +4b5c77673b5d62f1a94e4d605e92d81e download/7.2.176 +cde1647ab09a432c134d6fbae5ca15dc download/7.2.177 +5a126dd404945088b61aaf9d8c2effaa download/7.2.178 +a15fe587377fac500d0fae2b1c3adbbf download/7.2.179 +d4db5a69da98dbda41429d66e339e515 download/7.2.180 +8b9dee3c4aeeb563cbff6f3cf0357675 download/7.2.181 +d5d50f1da385bee588348aaaa5bb2dd7 download/7.2.182 +77e46725488937910d1cf051760ad11d download/7.2.183 +3bdbab52e0ac635962ce9983ef1d9f01 download/7.2.184 +fa88ae980d6e68f9aa9f9b257f1f3e71 download/7.2.185 +2262a6034d4cf01859a1d36982f38505 download/7.2.186 +c98b89c2594d7127574d0bd9838f241a download/7.2.187 +8efff5f82388c43183739c280249b643 download/7.2.188 +bab560f5a4b1809c2859ab632f037135 download/7.2.189 +63098e6cdb253d83c30f42d3d4469900 download/7.2.190 +87a02a6db9029357d7e248bcf4923330 download/7.2.191 +88102a28fb2139fe14a66b2970958166 download/7.2.192 +66a202b39e36ac062db1432896d8d988 download/7.2.193 +3ba1ab13de695c1422e0cda65c03503d download/7.2.194 +a42b79c5328c30b0951ce67da505a3f4 download/7.2.195 +f1ece679735785c46b58ed4d791b3880 download/7.2.196 +352908f71b12a7a30aafd985c338d247 download/7.2.197 +2a4764a5df5c1d18e4c7fee81074f55c download/7.2.198 +61a30d8c51533f08a94ba23025a12f11 download/7.2.199 +1a21534f09d529a9096c5e9b978187e9 download/7.2.200 +61e01d2aef1d5c1c3b40d5e927bd83c9 download/7.2.201 +30df1365ef27c34558d4322cb71c5d83 download/7.2.202 +24ae52da6519c8f8fbd08676c64eac75 download/7.2.203 +e75f99a06eb7a03a5cf854505b1d795d download/7.2.204 +3e2da4100f83cf2d308545d0c822a196 download/7.2.205 +4895874100f932e15a8c661fb40a19b1 download/7.2.206 +e3345b11c12eedd8871b2eeb811c9234 download/7.2.207 +a7f6deca2df02cc4d23274f3104b94d1 download/7.2.208 +62e83a3e30fe5b6f96ba276a342faf1c download/7.2.209 +296e40f03bf6243583541ca440af802c download/7.2.210 +3714237966fa05c9cae8fd4518a42ac4 download/7.2.211 +3537ef914ffbe5acbdede8d3581ecf41 download/7.2.212 +9f4b0f8a1dc9c3720eca6028c987fa01 download/7.2.213 +fb46e419802a06e26d8531628f50aca9 download/7.2.214 +388c0884878256fca9db1fb1fe9df98e download/7.2.215 +cd568cf0b9b751b9ff1151fa6f5f0ae0 download/7.2.216 +288d5ee4b5ff25caa79446a95cb3ee98 download/7.2.217 +d86a84a239c25dda5101aac8c365154c download/7.2.218 +9c0f11d3c52d1756381231e1c0a6156d download/7.2.219 +bfed5d4e0bcae8eb7a7e0806d4367e0a download/7.2.220 +3b169a3f976cf1808b12230dd24c0ff5 download/7.2.221 +a3f9c7d976ad8a49250d0ff3130b6390 download/7.2.222 +3ca61604214ef919b7bfe4b24eb69518 download/7.2.223 +5c550bd6e2111c10407b7aca009b1242 download/7.2.224 +b3ae8fa424e01a0fc67c9ed7393b422e download/7.2.225 +6057e1247bd3b1538eef15c532caf881 download/7.2.226 +932e2a5394788124cbda950bfff327ff download/7.2.227 +b97e5d33fa4fb8a1ea1308558bb33d41 download/7.2.228 +2107c7d981ca14d8e795ae744a903106 download/7.2.229 +7e98ae111e74676ef88c5e3edce785ed download/7.2.230 +2abbb80186d28da703eb329d4247dd41 download/7.2.231 +5e5cfa4e5ee34cbbdd01c27ece1b7398 download/7.2.232 +9fa12db95776e9174ca7c95172a48838 download/7.2.233 +a46776a6914ec2972ada91b33b0cfb39 download/7.2.234 +4121105bf052ebac02bd9891c232137a download/7.2.235 +e9ca47c42d7de7b27910e3b35e533ecd download/7.2.236 +f48f3e3f58a7a82a1c14fd61072c69f0 download/7.2.237 +5b9cc79b5448fb71ac1b2870a861119d download/7.2.238 +28a8a33a3e2ceef51f838c2dc9fceac2 download/7.2.239 +212989ec4f90d697183c7cfb363cd453 download/7.2.240 +45f0effee324a20881e254c1b59dd5f8 download/7.2.241 +464fc788e592b19cd4d8a21d3d8b789e download/7.2.242 +eb8132b8f89393e7f39734e607fc3925 download/7.2.243 +15c654c51220c2ad94b47d6013626aef download/7.2.244 +d5ecb198dfea237e96b5ae12b9381383 download/7.2.245 +d91e62d4152877db281fdaa797cfe0c3 download/7.2.246 +a4dbbffc8ec2b377e1a1eb8279ff611c download/7.2.247 +9d97db1b426ab2c56a8e4281233c7d5f download/7.2.248 +947568ba23d4560e6292f6f1846120c4 download/7.2.249 +73948226c417143bce66ba6244443aed download/7.2.250 +2e351cf03bbcb927d93bafd8166dd82d download/7.2.251 +11cef6808a278694c61ba2c74f3911b0 download/7.2.252 +ed1731b8c74ee27d129bbc78e178da2f download/7.2.253 +1703bec4ee7a155037d3373d23bc7ca1 download/7.2.254 +57f31a4f4afc9a0ea60829bf9d36b380 download/7.2.255 +19df6e42d09a76e7c219b172204bf66a download/7.2.256 +c4775d1a1c37f288803f5d11d8d94865 download/7.2.257 +a62aae9b8281bd7e1d144c6534a27b68 download/7.2.258 +91d775ed9329eec16882eeca04708dec download/7.2.259 +d6bcf89bb0a04ce25d94f8bc0b3ba747 download/7.2.260 +7313b1644f7184ea116a0e7cccc42124 download/7.2.261 +75b2f61f81ff9af8e7f83d1885e9487f download/7.2.262 +e98be83507f72cff814aa89456fb38ee download/7.2.263 +352951ed477e83d3527c2ff95a7c2484 download/7.2.264 +4b12ddc88794c20ad3dbe238ccf91807 download/7.2.265 +9bfd540da3982b9841421cabc564f958 download/7.2.266 582717146f6bbd5b73db83a2f62e62a5 download/vimtutor.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Sep 30 17:46:42 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 30 Sep 2009 15:46:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[6628] csw/mgar/pkg/bdb47/trunk Message-ID: Revision: 6628 http://gar.svn.sourceforge.net/gar/?rev=6628&view=rev Author: dmichelsen Date: 2009-09-30 15:46:02 +0000 (Wed, 30 Sep 2009) Log Message: ----------- bdb46: Adjust version Modified Paths: -------------- csw/mgar/pkg/bdb47/trunk/Makefile csw/mgar/pkg/bdb47/trunk/checksums Added Paths: ----------- csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.1 csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.2 csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.3 csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.4 Removed Paths: ------------- csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.1 csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.2 csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.3 csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.4 Modified: csw/mgar/pkg/bdb47/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb47/trunk/Makefile 2009-09-30 15:41:26 UTC (rev 6627) +++ csw/mgar/pkg/bdb47/trunk/Makefile 2009-09-30 15:46:02 UTC (rev 6628) @@ -1,8 +1,8 @@ GARNAME = db -GARVERSION = 4.7.25 +GARVERSION = 4.6.21 CATEGORIES = lib -DESCRIPTION = Berkeley DB 4.7 +DESCRIPTION = Berkeley DB 4.6 define BLURB Berkeley DB (libdb) is a programmatic toolkit that provides embedded database support for both traditional and client/server applications. It includes @@ -30,7 +30,7 @@ BUILD64 = 1 CONFIGURE_SCRIPTS = dist -prefix = $(BUILD_PREFIX)/bdb47 +prefix = $(BUILD_PREFIX)/bdb46 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-compat185 CONFIGURE_ARGS += --enable-o_direct Modified: csw/mgar/pkg/bdb47/trunk/checksums =================================================================== --- csw/mgar/pkg/bdb47/trunk/checksums 2009-09-30 15:41:26 UTC (rev 6627) +++ csw/mgar/pkg/bdb47/trunk/checksums 2009-09-30 15:46:02 UTC (rev 6628) @@ -1,5 +1,5 @@ -ec2b87e833779681a0c3a814aa71359e download/db-4.7.25.tar.gz -5fdf101259e5164dea1c8c86214fde38 download/patch.4.7.25.1 -bd410a11c71fee52fddb6aa2d8d4f80c download/patch.4.7.25.2 -6fcd69f64f5b34bfe8f0a63cc2e402c1 download/patch.4.7.25.3 -42c5d1a727e4a7f59b9dce12ff2f6b84 download/patch.4.7.25.4 +718082e7e35fc48478a2334b0bc4cd11 download/db-4.6.21.tar.gz +4878872edfc53c6ecb871b1062a4bdaf download/patch.4.6.21.1 +55074e53d3acae2dcbeae8322f96e522 download/patch.4.6.21.2 +7a6e11b54712caf752f9c4a52babe60c download/patch.4.6.21.3 +ae7d3d587355fe85b512ef09b9a77d19 download/patch.4.6.21.4 Added: csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.1 =================================================================== --- csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.1 (rev 0) +++ csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.1 2009-09-30 15:46:02 UTC (rev 6628) @@ -0,0 +1,90 @@ +*** dbinc/mp.h 2007-09-28 01:28:25.000000000 +1000 +--- dbinc/mp.h 2008-02-14 01:22:09.000000000 +1100 +*************** +*** 639,644 **** +--- 639,647 ---- + */ + #define MP_TRUNC_RECOVER 0x01 + ++ /* Private flags to DB_MPOOLFILE->close. */ ++ #define DB_MPOOL_NOLOCK 0x002 /* Already have mpf locked. */ ++ + #if defined(__cplusplus) + } + #endif +*** mp/mp_fopen.c 2007-05-18 03:18:01.000000000 +1000 +--- mp/mp_fopen.c 2008-02-12 16:09:42.000000000 +1100 +*************** +*** 888,894 **** + * when we try to flush them. + */ + deleted = 0; +! MUTEX_LOCK(dbenv, mfp->mutex); + if (F_ISSET(dbmfp, MP_MULTIVERSION)) + --mfp->multiversion; + if (--mfp->mpf_cnt == 0 || LF_ISSET(DB_MPOOL_DISCARD)) { +--- 888,895 ---- + * when we try to flush them. + */ + deleted = 0; +! if (!LF_ISSET(DB_MPOOL_NOLOCK)) +! MUTEX_LOCK(dbenv, mfp->mutex); + if (F_ISSET(dbmfp, MP_MULTIVERSION)) + --mfp->multiversion; + if (--mfp->mpf_cnt == 0 || LF_ISSET(DB_MPOOL_DISCARD)) { +*************** +*** 909,921 **** + } + } + if (mfp->block_cnt == 0) { + if ((t_ret = + __memp_mf_discard(dbmp, mfp)) != 0 && ret == 0) + ret = t_ret; + deleted = 1; + } + } +! if (!deleted) + MUTEX_UNLOCK(dbenv, mfp->mutex); + + done: /* Discard the DB_MPOOLFILE structure. */ +--- 910,928 ---- + } + } + if (mfp->block_cnt == 0) { ++ /* ++ * We should never discard this mp file if our caller ++ * is holding the lock on it. See comment in ++ * __memp_sync_file. ++ */ ++ DB_ASSERT(dbenv, !LF_ISSET(DB_MPOOL_NOLOCK)); + if ((t_ret = + __memp_mf_discard(dbmp, mfp)) != 0 && ret == 0) + ret = t_ret; + deleted = 1; + } + } +! if (!deleted && !LF_ISSET(DB_MPOOL_NOLOCK)) + MUTEX_UNLOCK(dbenv, mfp->mutex); + + done: /* Discard the DB_MPOOLFILE structure. */ +*** mp/mp_sync.c 2007-06-02 04:32:44.000000000 +1000 +--- mp/mp_sync.c 2008-02-12 16:09:42.000000000 +1100 +*************** +*** 755,761 **** + * This is important since we are called with the hash bucket + * locked. The mfp will get freed via the cleanup pass. + */ +! if (dbmfp != NULL && (t_ret = __memp_fclose(dbmfp, 0)) != 0 && ret == 0) + ret = t_ret; + + --mfp->mpf_cnt; +--- 755,762 ---- + * This is important since we are called with the hash bucket + * locked. The mfp will get freed via the cleanup pass. + */ +! if (dbmfp != NULL && +! (t_ret = __memp_fclose(dbmfp, DB_MPOOL_NOLOCK)) != 0 && ret == 0) + ret = t_ret; + + --mfp->mpf_cnt; + Added: csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.2 =================================================================== --- csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.2 (rev 0) +++ csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.2 2009-09-30 15:46:02 UTC (rev 6628) @@ -0,0 +1,27 @@ +*** mp/mp_region.c 2007-05-18 03:18:01.000000000 +1000 +--- mp/mp_region.c 2008-06-24 13:15:56.000000000 +1000 +*************** +*** 249,256 **** + mtx_base = htab[0].mtx_hash; + } + + if (mtx_base != MUTEX_INVALID) +! mtx_base += reginfo_off * htab_buckets; + + /* Allocate hash table space and initialize it. */ + if ((ret = __env_alloc(infop, +--- 249,262 ---- + mtx_base = htab[0].mtx_hash; + } + ++ /* ++ * We preallocated all of the mutexes in a block, so for regions after ++ * the first, we skip mutexes in use in earlier regions. Each region ++ * has the same number of buckets and there are two mutexes per hash ++ * bucket (the bucket mutex and the I/O mutex). ++ */ + if (mtx_base != MUTEX_INVALID) +! mtx_base += reginfo_off * htab_buckets * 2; + + /* Allocate hash table space and initialize it. */ + if ((ret = __env_alloc(infop, Added: csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.3 =================================================================== --- csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.3 (rev 0) +++ csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.3 2009-09-30 15:46:02 UTC (rev 6628) @@ -0,0 +1,74 @@ +*** sequence/sequence.c +--- sequence/sequence.c +*************** +*** 196,202 **** + if ((ret = __db_get_flags(dbp, &tflags)) != 0) + goto err; + +! if (DB_IS_READONLY(dbp)) { + ret = __db_rdonly(dbp->dbenv, "DB_SEQUENCE->open"); + goto err; + } +--- 196,206 ---- + if ((ret = __db_get_flags(dbp, &tflags)) != 0) + goto err; + +! /* +! * We can let replication clients open sequences, but must +! * check later that they do not update them. +! */ +! if (F_ISSET(dbp, DB_AM_RDONLY)) { + ret = __db_rdonly(dbp->dbenv, "DB_SEQUENCE->open"); + goto err; + } +*************** +*** 252,257 **** +--- 256,266 ---- + if ((ret != DB_NOTFOUND && ret != DB_KEYEMPTY) || + !LF_ISSET(DB_CREATE)) + goto err; ++ if (IS_REP_CLIENT(dbenv) && ++ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { ++ ret = __db_rdonly(dbenv, "DB_SEQUENCE->open"); ++ goto err; ++ } + ret = 0; + + rp = &seq->seq_record; +*************** +*** 304,310 **** + */ + rp = seq->seq_data.data; + if (rp->seq_version == DB_SEQUENCE_OLDVER) { +! oldver: rp->seq_version = DB_SEQUENCE_VERSION; + if (__db_isbigendian()) { + if (IS_DB_AUTO_COMMIT(dbp, txn)) { + if ((ret = +--- 313,324 ---- + */ + rp = seq->seq_data.data; + if (rp->seq_version == DB_SEQUENCE_OLDVER) { +! oldver: if (IS_REP_CLIENT(dbenv) && +! !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { +! ret = __db_rdonly(dbenv, "DB_SEQUENCE->open"); +! goto err; +! } +! rp->seq_version = DB_SEQUENCE_VERSION; + if (__db_isbigendian()) { + if (IS_DB_AUTO_COMMIT(dbp, txn)) { + if ((ret = +*************** +*** 713,718 **** +--- 727,738 ---- + + MUTEX_LOCK(dbenv, seq->mtx_seq); + ++ if (handle_check && IS_REP_CLIENT(dbenv) && ++ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { ++ ret = __db_rdonly(dbenv, "DB_SEQUENCE->get"); ++ goto err; ++ } ++ + if (rp->seq_min + delta > rp->seq_max) { + __db_errx(dbenv, "Sequence overflow"); + ret = EINVAL; Added: csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.4 =================================================================== --- csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.4 (rev 0) +++ csw/mgar/pkg/bdb47/trunk/files/patch.4.6.21.4 2009-09-30 15:46:02 UTC (rev 6628) @@ -0,0 +1,1414 @@ +*** dbinc/repmgr.h 2007-10-31 10:23:52.000000000 -0700 +--- dbinc/repmgr.h 2007-10-31 10:23:53.000000000 -0700 +*************** +*** 36,41 **** +--- 36,55 ---- + #endif + + /* ++ * The (arbitrary) maximum number of outgoing messages we're willing to hold, on ++ * a queue per connection, waiting for TCP buffer space to become available in ++ * the kernel. Rather than exceeding this limit, we simply discard additional ++ * messages (since this is always allowed by the replication protocol). ++ * As a special dispensation, if a message is destined for a specific remote ++ * site (i.e., it's not a broadcast), then we first try blocking the sending ++ * thread, waiting for space to become available (though we only wait a limited ++ * time). This is so as to be able to handle the immediate flood of (a ++ * potentially large number of) outgoing messages that replication generates, in ++ * a tight loop, when handling PAGE_REQ, LOG_REQ and ALL_REQ requests. ++ */ ++ #define OUT_QUEUE_LIMIT 10 ++ ++ /* + * The system value is available from sysconf(_SC_HOST_NAME_MAX). + * Historically, the maximum host name was 256. + */ +*************** +*** 47,52 **** +--- 61,71 ---- + #define MAX_SITE_LOC_STRING (MAXHOSTNAMELEN+20) + typedef char SITE_STRING_BUFFER[MAX_SITE_LOC_STRING+1]; + ++ /* Default timeout values, in seconds. */ ++ #define DB_REPMGR_DEFAULT_ACK_TIMEOUT (1 * US_PER_SEC) ++ #define DB_REPMGR_DEFAULT_CONNECTION_RETRY (30 * US_PER_SEC) ++ #define DB_REPMGR_DEFAULT_ELECTION_RETRY (10 * US_PER_SEC) ++ + struct __repmgr_connection; + typedef struct __repmgr_connection REPMGR_CONNECTION; + struct __repmgr_queue; typedef struct __repmgr_queue REPMGR_QUEUE; +*************** +*** 171,178 **** + #ifdef DB_WIN32 + WSAEVENT event_object; + #endif +! #define CONN_CONNECTING 0x01 /* nonblocking connect in progress */ +! #define CONN_DEFUNCT 0x02 /* socket close pending */ + u_int32_t flags; + + /* +--- 190,198 ---- + #ifdef DB_WIN32 + WSAEVENT event_object; + #endif +! #define CONN_CONGESTED 0x01 /* msg thread wait has exceeded timeout */ +! #define CONN_CONNECTING 0x02 /* nonblocking connect in progress */ +! #define CONN_DEFUNCT 0x04 /* socket close pending */ + u_int32_t flags; + + /* +*************** +*** 180,189 **** + * send() function's thread. But if TCP doesn't have enough network + * buffer space for us when we first try it, we instead allocate some + * memory, and copy the message, and then send it as space becomes +! * available in our main select() thread. + */ + OUT_Q_HEADER outbound_queue; + int out_queue_length; + + /* + * Input: while we're reading a message, we keep track of what phase +--- 200,215 ---- + * send() function's thread. But if TCP doesn't have enough network + * buffer space for us when we first try it, we instead allocate some + * memory, and copy the message, and then send it as space becomes +! * available in our main select() thread. In some cases, if the queue +! * gets too long we wait until it's drained, and then append to it. +! * This condition variable's associated mutex is the normal per-repmgr +! * db_rep->mutex, because that mutex is always held anyway whenever the +! * output queue is consulted. + */ + OUT_Q_HEADER outbound_queue; + int out_queue_length; ++ cond_var_t drained; ++ int blockers; /* ref count of msg threads waiting on us */ + + /* + * Input: while we're reading a message, we keep track of what phase +*** dbinc_auto/int_def.in 2007-10-31 10:23:52.000000000 -0700 +--- dbinc_auto/int_def.in 2007-10-31 10:23:52.000000000 -0700 +*************** +*** 1420,1425 **** +--- 1420,1428 ---- + #define __repmgr_wake_waiting_senders __repmgr_wake_waiting_senders at DB_VERSION_UNIQUE_NAME@ + #define __repmgr_await_ack __repmgr_await_ack at DB_VERSION_UNIQUE_NAME@ + #define __repmgr_compute_wait_deadline __repmgr_compute_wait_deadline at DB_VERSION_UNIQUE_NAME@ ++ #define __repmgr_await_drain __repmgr_await_drain at DB_VERSION_UNIQUE_NAME@ ++ #define __repmgr_alloc_cond __repmgr_alloc_cond at DB_VERSION_UNIQUE_NAME@ ++ #define __repmgr_free_cond __repmgr_free_cond at DB_VERSION_UNIQUE_NAME@ + #define __repmgr_init_sync __repmgr_init_sync at DB_VERSION_UNIQUE_NAME@ + #define __repmgr_close_sync __repmgr_close_sync at DB_VERSION_UNIQUE_NAME@ + #define __repmgr_net_init __repmgr_net_init at DB_VERSION_UNIQUE_NAME@ +*** dbinc_auto/repmgr_ext.h 2007-10-31 10:23:52.000000000 -0700 +--- dbinc_auto/repmgr_ext.h 2007-10-31 10:23:52.000000000 -0700 +*************** +*** 21,30 **** + int __repmgr_handle_event __P((DB_ENV *, u_int32_t, void *)); + void __repmgr_stash_generation __P((DB_ENV *)); + int __repmgr_send __P((DB_ENV *, const DBT *, const DBT *, const DB_LSN *, int, u_int32_t)); +! int __repmgr_send_one __P((DB_ENV *, REPMGR_CONNECTION *, u_int, const DBT *, const DBT *)); + int __repmgr_is_permanent __P((DB_ENV *, const DB_LSN *)); +! int __repmgr_bust_connection __P((DB_ENV *, REPMGR_CONNECTION *, int)); +! void __repmgr_cleanup_connection __P((DB_ENV *, REPMGR_CONNECTION *)); + int __repmgr_find_site __P((DB_ENV *, const char *, u_int)); + int __repmgr_pack_netaddr __P((DB_ENV *, const char *, u_int, ADDRINFO *, repmgr_netaddr_t *)); + int __repmgr_getaddr __P((DB_ENV *, const char *, u_int, int, ADDRINFO **)); +--- 21,30 ---- + int __repmgr_handle_event __P((DB_ENV *, u_int32_t, void *)); + void __repmgr_stash_generation __P((DB_ENV *)); + int __repmgr_send __P((DB_ENV *, const DBT *, const DBT *, const DB_LSN *, int, u_int32_t)); +! int __repmgr_send_one __P((DB_ENV *, REPMGR_CONNECTION *, u_int, const DBT *, const DBT *, int)); + int __repmgr_is_permanent __P((DB_ENV *, const DB_LSN *)); +! int __repmgr_bust_connection __P((DB_ENV *, REPMGR_CONNECTION *)); +! int __repmgr_cleanup_connection __P((DB_ENV *, REPMGR_CONNECTION *)); + int __repmgr_find_site __P((DB_ENV *, const char *, u_int)); + int __repmgr_pack_netaddr __P((DB_ENV *, const char *, u_int, ADDRINFO *, repmgr_netaddr_t *)); + int __repmgr_getaddr __P((DB_ENV *, const char *, u_int, int, ADDRINFO **)); +*************** +*** 39,44 **** +--- 39,47 ---- + int __repmgr_wake_waiting_senders __P((DB_ENV *)); + int __repmgr_await_ack __P((DB_ENV *, const DB_LSN *)); + void __repmgr_compute_wait_deadline __P((DB_ENV*, struct timespec *, db_timeout_t)); ++ int __repmgr_await_drain __P((DB_ENV *, REPMGR_CONNECTION *, db_timeout_t)); ++ int __repmgr_alloc_cond __P((cond_var_t *)); ++ int __repmgr_free_cond __P((cond_var_t *)); + int __repmgr_init_sync __P((DB_ENV *, DB_REP *)); + int __repmgr_close_sync __P((DB_ENV *)); + int __repmgr_net_init __P((DB_ENV *, DB_REP *)); +*** repmgr/repmgr_method.c 2007-10-31 10:23:52.000000000 -0700 +--- repmgr/repmgr_method.c 2007-10-31 10:23:53.000000000 -0700 +*************** +*** 196,204 **** + int ret; + + /* Set some default values. */ +! db_rep->ack_timeout = 1 * US_PER_SEC; /* 1 second */ +! db_rep->connection_retry_wait = 30 * US_PER_SEC; /* 30 seconds */ +! db_rep->election_retry_wait = 10 * US_PER_SEC; /* 10 seconds */ + db_rep->config_nsites = 0; + db_rep->peer = DB_EID_INVALID; + db_rep->perm_policy = DB_REPMGR_ACKS_QUORUM; +--- 196,204 ---- + int ret; + + /* Set some default values. */ +! db_rep->ack_timeout = DB_REPMGR_DEFAULT_ACK_TIMEOUT; +! db_rep->connection_retry_wait = DB_REPMGR_DEFAULT_CONNECTION_RETRY; +! db_rep->election_retry_wait = DB_REPMGR_DEFAULT_ELECTION_RETRY; + db_rep->config_nsites = 0; + db_rep->peer = DB_EID_INVALID; + db_rep->perm_policy = DB_REPMGR_ACKS_QUORUM; +*************** +*** 238,243 **** +--- 238,244 ---- + DB_ENV *dbenv; + { + DB_REP *db_rep; ++ REPMGR_CONNECTION *conn; + int ret; + + db_rep = dbenv->rep_handle; +*************** +*** 254,259 **** +--- 255,266 ---- + + if ((ret = __repmgr_signal(&db_rep->queue_nonempty)) != 0) + goto unlock; ++ ++ TAILQ_FOREACH(conn, &db_rep->connections, entries) { ++ if (conn->blockers > 0 && ++ ((ret = __repmgr_signal(&conn->drained)) != 0)) ++ goto unlock; ++ } + UNLOCK_MUTEX(db_rep->mutex); + + return (__repmgr_wake_main_thread(dbenv)); +*** repmgr/repmgr_msg.c 2007-10-31 10:23:52.000000000 -0700 +--- repmgr/repmgr_msg.c 2007-10-31 10:23:53.000000000 -0700 +*************** +*** 183,192 **** + + /* + * Acknowledges a message. +- * +- * !!! +- * Note that this cannot be called from the select() thread, in case we call +- * __repmgr_bust_connection(..., FALSE). + */ + static int + ack_message(dbenv, generation, lsn) +--- 183,188 ---- +*************** +*** 227,235 **** + rec2.size = 0; + + conn = site->ref.conn; + if ((ret = __repmgr_send_one(dbenv, conn, REPMGR_ACK, +! &control2, &rec2)) == DB_REP_UNAVAIL) +! ret = __repmgr_bust_connection(dbenv, conn, FALSE); + } + + UNLOCK_MUTEX(db_rep->mutex); +--- 223,236 ---- + rec2.size = 0; + + conn = site->ref.conn; ++ /* ++ * It's hard to imagine anyone would care about a lost ack if ++ * the path to the master is so congested as to need blocking; ++ * so pass "blockable" argument as FALSE. ++ */ + if ((ret = __repmgr_send_one(dbenv, conn, REPMGR_ACK, +! &control2, &rec2, FALSE)) == DB_REP_UNAVAIL) +! ret = __repmgr_bust_connection(dbenv, conn); + } + + UNLOCK_MUTEX(db_rep->mutex); +*** repmgr/repmgr_net.c 2007-10-31 10:23:52.000000000 -0700 +--- repmgr/repmgr_net.c 2007-10-31 10:23:53.000000000 -0700 +*************** +*** 63,69 **** + static void setup_sending_msg + __P((struct sending_msg *, u_int, const DBT *, const DBT *)); + static int __repmgr_send_internal +! __P((DB_ENV *, REPMGR_CONNECTION *, struct sending_msg *)); + static int enqueue_msg + __P((DB_ENV *, REPMGR_CONNECTION *, struct sending_msg *, size_t)); + static int flatten __P((DB_ENV *, struct sending_msg *)); +--- 63,69 ---- + static void setup_sending_msg + __P((struct sending_msg *, u_int, const DBT *, const DBT *)); + static int __repmgr_send_internal +! __P((DB_ENV *, REPMGR_CONNECTION *, struct sending_msg *, int)); + static int enqueue_msg + __P((DB_ENV *, REPMGR_CONNECTION *, struct sending_msg *, size_t)); + static int flatten __P((DB_ENV *, struct sending_msg *)); +*************** +*** 73,85 **** + * __repmgr_send -- + * The send function for DB_ENV->rep_set_transport. + * +- * !!! +- * This is only ever called as the replication transport call-back, which means +- * it's either on one of our message processing threads or an application +- * thread. It mustn't be called from the select() thread, because we might call +- * __repmgr_bust_connection(..., FALSE) here, and that's not allowed in the +- * select() thread. +- * + * PUBLIC: int __repmgr_send __P((DB_ENV *, const DBT *, const DBT *, + * PUBLIC: const DB_LSN *, int, u_int32_t)); + */ +--- 73,78 ---- +*************** +*** 126,134 **** + } + + conn = site->ref.conn; + if ((ret = __repmgr_send_one(dbenv, conn, REPMGR_REP_MESSAGE, +! control, rec)) == DB_REP_UNAVAIL && +! (t_ret = __repmgr_bust_connection(dbenv, conn, FALSE)) != 0) + ret = t_ret; + if (ret != 0) + goto out; +--- 119,128 ---- + } + + conn = site->ref.conn; ++ /* Pass the "blockable" argument as TRUE. */ + if ((ret = __repmgr_send_one(dbenv, conn, REPMGR_REP_MESSAGE, +! control, rec, TRUE)) == DB_REP_UNAVAIL && +! (t_ret = __repmgr_bust_connection(dbenv, conn)) != 0) + ret = t_ret; + if (ret != 0) + goto out; +*************** +*** 222,228 **** + if (site->state != SITE_CONNECTED) + return (NULL); + +! if (F_ISSET(site->ref.conn, CONN_CONNECTING)) + return (NULL); + return (site); + } +--- 216,222 ---- + if (site->state != SITE_CONNECTED) + return (NULL); + +! if (F_ISSET(site->ref.conn, CONN_CONNECTING|CONN_DEFUNCT)) + return (NULL); + return (site); + } +*************** +*** 235,244 **** + * + * !!! + * Caller must hold dbenv->mutex. +- * +- * !!! +- * Note that this cannot be called from the select() thread, in case we call +- * __repmgr_bust_connection(..., FALSE). + */ + static int + __repmgr_send_broadcast(dbenv, control, rec, nsitesp, npeersp) +--- 229,234 ---- +*************** +*** 268,281 **** + !IS_VALID_EID(conn->eid)) + continue; + +! if ((ret = __repmgr_send_internal(dbenv, conn, &msg)) == 0) { + site = SITE_FROM_EID(conn->eid); + nsites++; + if (site->priority > 0) + npeers++; + } else if (ret == DB_REP_UNAVAIL) { +! if ((ret = __repmgr_bust_connection( +! dbenv, conn, FALSE)) != 0) + return (ret); + } else + return (ret); +--- 258,277 ---- + !IS_VALID_EID(conn->eid)) + continue; + +! /* +! * Broadcast messages are either application threads committing +! * transactions, or replication status message that we can +! * afford to lose. So don't allow blocking for them (pass +! * "blockable" argument as FALSE). +! */ +! if ((ret = __repmgr_send_internal(dbenv, +! conn, &msg, FALSE)) == 0) { + site = SITE_FROM_EID(conn->eid); + nsites++; + if (site->priority > 0) + npeers++; + } else if (ret == DB_REP_UNAVAIL) { +! if ((ret = __repmgr_bust_connection(dbenv, conn)) != 0) + return (ret); + } else + return (ret); +*************** +*** 301,339 **** + * intersperse writes that are part of two single messages. + * + * PUBLIC: int __repmgr_send_one __P((DB_ENV *, REPMGR_CONNECTION *, +! * PUBLIC: u_int, const DBT *, const DBT *)); + */ + int +! __repmgr_send_one(dbenv, conn, msg_type, control, rec) + DB_ENV *dbenv; + REPMGR_CONNECTION *conn; + u_int msg_type; + const DBT *control, *rec; + { + struct sending_msg msg; + + setup_sending_msg(&msg, msg_type, control, rec); +! return (__repmgr_send_internal(dbenv, conn, &msg)); + } + + /* + * Attempts a "best effort" to send a message on the given site. If there is an +! * excessive backlog of message already queued on the connection, we simply drop +! * this message, and still return 0 even in this case. + */ + static int +! __repmgr_send_internal(dbenv, conn, msg) + DB_ENV *dbenv; + REPMGR_CONNECTION *conn; + struct sending_msg *msg; + { +! #define OUT_QUEUE_LIMIT 10 /* arbitrary, for now */ + REPMGR_IOVECS iovecs; + SITE_STRING_BUFFER buffer; + int ret; + size_t nw; + size_t total_written; + + DB_ASSERT(dbenv, !F_ISSET(conn, CONN_CONNECTING)); + if (!STAILQ_EMPTY(&conn->outbound_queue)) { + /* +--- 297,355 ---- + * intersperse writes that are part of two single messages. + * + * PUBLIC: int __repmgr_send_one __P((DB_ENV *, REPMGR_CONNECTION *, +! * PUBLIC: u_int, const DBT *, const DBT *, int)); + */ + int +! __repmgr_send_one(dbenv, conn, msg_type, control, rec, blockable) + DB_ENV *dbenv; + REPMGR_CONNECTION *conn; + u_int msg_type; + const DBT *control, *rec; ++ int blockable; + { + struct sending_msg msg; + + setup_sending_msg(&msg, msg_type, control, rec); +! return (__repmgr_send_internal(dbenv, conn, &msg, blockable)); + } + + /* + * Attempts a "best effort" to send a message on the given site. If there is an +! * excessive backlog of message already queued on the connection, what shall we +! * do? If the caller doesn't mind blocking, we'll wait (a limited amount of +! * time) for the queue to drain. Otherwise we'll simply drop the message. This +! * is always allowed by the replication protocol. But in the case of a +! * multi-message response to a request like PAGE_REQ, LOG_REQ or ALL_REQ we +! * almost always get a flood of messages that instantly fills our queue, so +! * blocking improves performance (by avoiding the need for the client to +! * re-request). +! * +! * How long shall we wait? We could of course create a new timeout +! * configuration type, so that the application could set it directly. But that +! * would start to overwhelm the user with too many choices to think about. We +! * already have an ACK timeout, which is the user's estimate of how long it +! * should take to send a message to the client, have it be processed, and return +! * a message back to us. We multiply that by the queue size, because that's how +! * many messages have to be swallowed up by the client before we're able to +! * start sending again (at least to a rough approximation). + */ + static int +! __repmgr_send_internal(dbenv, conn, msg, blockable) + DB_ENV *dbenv; + REPMGR_CONNECTION *conn; + struct sending_msg *msg; ++ int blockable; + { +! DB_REP *db_rep; + REPMGR_IOVECS iovecs; + SITE_STRING_BUFFER buffer; ++ db_timeout_t drain_to; + int ret; + size_t nw; + size_t total_written; + ++ db_rep = dbenv->rep_handle; ++ + DB_ASSERT(dbenv, !F_ISSET(conn, CONN_CONNECTING)); + if (!STAILQ_EMPTY(&conn->outbound_queue)) { + /* +*************** +*** 344,358 **** + RPRINT(dbenv, (dbenv, "msg to %s to be queued", + __repmgr_format_eid_loc(dbenv->rep_handle, + conn->eid, buffer))); + if (conn->out_queue_length < OUT_QUEUE_LIMIT) + return (enqueue_msg(dbenv, conn, msg, 0)); + else { + RPRINT(dbenv, (dbenv, "queue limit exceeded")); + STAT(dbenv->rep_handle-> + region->mstat.st_msgs_dropped++); +! return (0); + } + } + + /* + * Send as much data to the site as we can, without blocking. Keep +--- 360,393 ---- + RPRINT(dbenv, (dbenv, "msg to %s to be queued", + __repmgr_format_eid_loc(dbenv->rep_handle, + conn->eid, buffer))); ++ if (conn->out_queue_length >= OUT_QUEUE_LIMIT && ++ blockable && !F_ISSET(conn, CONN_CONGESTED)) { ++ RPRINT(dbenv, (dbenv, ++ "block msg thread, await queue space")); ++ ++ if ((drain_to = db_rep->ack_timeout) == 0) ++ drain_to = DB_REPMGR_DEFAULT_ACK_TIMEOUT; ++ conn->blockers++; ++ ret = __repmgr_await_drain(dbenv, ++ conn, drain_to * OUT_QUEUE_LIMIT); ++ conn->blockers--; ++ if (db_rep->finished) ++ return (DB_TIMEOUT); ++ if (ret != 0) ++ return (ret); ++ if (STAILQ_EMPTY(&conn->outbound_queue)) ++ goto empty; ++ } + if (conn->out_queue_length < OUT_QUEUE_LIMIT) + return (enqueue_msg(dbenv, conn, msg, 0)); + else { + RPRINT(dbenv, (dbenv, "queue limit exceeded")); + STAT(dbenv->rep_handle-> + region->mstat.st_msgs_dropped++); +! return (blockable ? DB_TIMEOUT : 0); + } + } ++ empty: + + /* + * Send as much data to the site as we can, without blocking. Keep +*************** +*** 498,521 **** + + /* + * Abandons a connection, to recover from an error. Upon entry the conn struct +! * must be on the connections list. +! * +! * If the 'do_close' flag is true, we do the whole job; the clean-up includes +! * removing the struct from the list and freeing all its memory, so upon return +! * the caller must not refer to it any further. Otherwise, we merely mark the +! * connection for clean-up later by the main thread. + * + * PUBLIC: int __repmgr_bust_connection __P((DB_ENV *, +! * PUBLIC: REPMGR_CONNECTION *, int)); + * + * !!! + * Caller holds mutex. + */ + int +! __repmgr_bust_connection(dbenv, conn, do_close) + DB_ENV *dbenv; + REPMGR_CONNECTION *conn; +- int do_close; + { + DB_REP *db_rep; + int connecting, ret, eid; +--- 533,553 ---- + + /* + * Abandons a connection, to recover from an error. Upon entry the conn struct +! * must be on the connections list. For now, just mark it as unusable; it will +! * be fully cleaned up in the top-level select thread, as soon as possible. + * + * PUBLIC: int __repmgr_bust_connection __P((DB_ENV *, +! * PUBLIC: REPMGR_CONNECTION *)); + * + * !!! + * Caller holds mutex. ++ * ++ * Must be idempotent + */ + int +! __repmgr_bust_connection(dbenv, conn) + DB_ENV *dbenv; + REPMGR_CONNECTION *conn; + { + DB_REP *db_rep; + int connecting, ret, eid; +*************** +*** 526,537 **** + DB_ASSERT(dbenv, !TAILQ_EMPTY(&db_rep->connections)); + eid = conn->eid; + connecting = F_ISSET(conn, CONN_CONNECTING); +! if (do_close) +! __repmgr_cleanup_connection(dbenv, conn); +! else { +! F_SET(conn, CONN_DEFUNCT); +! conn->eid = -1; +! } + + /* + * When we first accepted the incoming connection, we set conn->eid to +--- 558,566 ---- + DB_ASSERT(dbenv, !TAILQ_EMPTY(&db_rep->connections)); + eid = conn->eid; + connecting = F_ISSET(conn, CONN_CONNECTING); +! +! F_SET(conn, CONN_DEFUNCT); +! conn->eid = -1; + + /* + * When we first accepted the incoming connection, we set conn->eid to +*************** +*** 557,563 **** + dbenv, ELECT_FAILURE_ELECTION)) != 0) + return (ret); + } +! } else if (!do_close) { + /* + * One way or another, make sure the main thread is poked, so + * that we do the deferred clean-up. +--- 586,592 ---- + dbenv, ELECT_FAILURE_ELECTION)) != 0) + return (ret); + } +! } else { + /* + * One way or another, make sure the main thread is poked, so + * that we do the deferred clean-up. +*************** +*** 568,577 **** + } + + /* +! * PUBLIC: void __repmgr_cleanup_connection + * PUBLIC: __P((DB_ENV *, REPMGR_CONNECTION *)); + */ +! void + __repmgr_cleanup_connection(dbenv, conn) + DB_ENV *dbenv; + REPMGR_CONNECTION *conn; +--- 597,610 ---- + } + + /* +! * PUBLIC: int __repmgr_cleanup_connection + * PUBLIC: __P((DB_ENV *, REPMGR_CONNECTION *)); ++ * ++ * !!! ++ * Idempotent. This can be called repeatedly as blocking message threads (of ++ * which there could be multiples) wake up in case of error on the connection. + */ +! int + __repmgr_cleanup_connection(dbenv, conn) + DB_ENV *dbenv; + REPMGR_CONNECTION *conn; +*************** +*** 580,596 **** + QUEUED_OUTPUT *out; + REPMGR_FLAT *msg; + DBT *dbt; + + db_rep = dbenv->rep_handle; + +! TAILQ_REMOVE(&db_rep->connections, conn, entries); + if (conn->fd != INVALID_SOCKET) { +! (void)closesocket(conn->fd); + #ifdef DB_WIN32 +! (void)WSACloseEvent(conn->event_object); + #endif + } + + /* + * Deallocate any input and output buffers we may have. + */ +--- 613,643 ---- + QUEUED_OUTPUT *out; + REPMGR_FLAT *msg; + DBT *dbt; ++ int ret; + + db_rep = dbenv->rep_handle; + +! DB_ASSERT(dbenv, F_ISSET(conn, CONN_DEFUNCT) || db_rep->finished); +! + if (conn->fd != INVALID_SOCKET) { +! ret = closesocket(conn->fd); +! conn->fd = INVALID_SOCKET; +! if (ret == SOCKET_ERROR) { +! ret = net_errno; +! __db_err(dbenv, ret, "closing socket"); +! } + #ifdef DB_WIN32 +! if (!WSACloseEvent(conn->event_object) && ret != 0) +! ret = net_errno; + #endif ++ if (ret != 0) ++ return (ret); + } + ++ if (conn->blockers > 0) ++ return (__repmgr_signal(&conn->drained)); ++ ++ TAILQ_REMOVE(&db_rep->connections, conn, entries); + /* + * Deallocate any input and output buffers we may have. + */ +*************** +*** 614,620 **** +--- 661,669 ---- + __os_free(dbenv, out); + } + ++ ret = __repmgr_free_cond(&conn->drained); + __os_free(dbenv, conn); ++ return (ret); + } + + static int +*************** +*** 1063,1069 **** + + while (!TAILQ_EMPTY(&db_rep->connections)) { + conn = TAILQ_FIRST(&db_rep->connections); +! __repmgr_cleanup_connection(dbenv, conn); + } + + for (i = 0; i < db_rep->site_cnt; i++) { +--- 1112,1118 ---- + + while (!TAILQ_EMPTY(&db_rep->connections)) { + conn = TAILQ_FIRST(&db_rep->connections); +! (void)__repmgr_cleanup_connection(dbenv, conn); + } + + for (i = 0; i < db_rep->site_cnt; i++) { +*** repmgr/repmgr_posix.c 2007-10-31 10:23:52.000000000 -0700 +--- repmgr/repmgr_posix.c 2007-10-31 10:23:53.000000000 -0700 +*************** +*** 21,26 **** +--- 21,28 ---- + size_t __repmgr_guesstimated_max = (128 * 1024); + #endif + ++ static int __repmgr_conn_work __P((DB_ENV *, ++ REPMGR_CONNECTION *, fd_set *, fd_set *, int)); + static int finish_connecting __P((DB_ENV *, REPMGR_CONNECTION *)); + + /* +*************** +*** 189,194 **** +--- 191,284 ---- + } + + /* ++ * PUBLIC: int __repmgr_await_drain __P((DB_ENV *, ++ * PUBLIC: REPMGR_CONNECTION *, db_timeout_t)); ++ * ++ * Waits for space to become available on the connection's output queue. ++ * Various ways we can exit: ++ * ++ * 1. queue becomes non-full ++ * 2. exceed time limit ++ * 3. connection becomes defunct (due to error in another thread) ++ * 4. repmgr is shutting down ++ * 5. any unexpected system resource failure ++ * ++ * In cases #3 and #5 we return an error code. Caller is responsible for ++ * distinguishing the remaining cases if desired. ++ * ++ * !!! ++ * Caller must hold repmgr->mutex. ++ */ ++ int ++ __repmgr_await_drain(dbenv, conn, timeout) ++ DB_ENV *dbenv; ++ REPMGR_CONNECTION *conn; ++ db_timeout_t timeout; ++ { ++ DB_REP *db_rep; ++ struct timespec deadline; ++ int ret; ++ ++ db_rep = dbenv->rep_handle; ++ ++ __repmgr_compute_wait_deadline(dbenv, &deadline, timeout); ++ ++ ret = 0; ++ while (conn->out_queue_length >= OUT_QUEUE_LIMIT) { ++ ret = pthread_cond_timedwait(&conn->drained, ++ &db_rep->mutex, &deadline); ++ switch (ret) { ++ case 0: ++ if (db_rep->finished) ++ goto out; /* #4. */ ++ /* ++ * Another thread could have stumbled into an error on ++ * the socket while we were waiting. ++ */ ++ if (F_ISSET(conn, CONN_DEFUNCT)) { ++ ret = DB_REP_UNAVAIL; /* #3. */ ++ goto out; ++ } ++ break; ++ case ETIMEDOUT: ++ F_SET(conn, CONN_CONGESTED); ++ ret = 0; ++ goto out; /* #2. */ ++ default: ++ goto out; /* #5. */ ++ } ++ } ++ /* #1. */ ++ ++ out: ++ return (ret); ++ } ++ ++ /* ++ * PUBLIC: int __repmgr_alloc_cond __P((cond_var_t *)); ++ * ++ * Initialize a condition variable (in allocated space). ++ */ ++ int ++ __repmgr_alloc_cond(c) ++ cond_var_t *c; ++ { ++ return (pthread_cond_init(c, NULL)); ++ } ++ ++ /* ++ * PUBLIC: int __repmgr_free_cond __P((cond_var_t *)); ++ * ++ * Clean up a previously initialized condition variable. ++ */ ++ int ++ __repmgr_free_cond(c) ++ cond_var_t *c; ++ { ++ return (pthread_cond_destroy(c)); ++ } ++ ++ /* + * PUBLIC: int __repmgr_init_sync __P((DB_ENV *, DB_REP *)); + * + * Allocate/initialize all data necessary for thread synchronization. This +*************** +*** 443,449 **** + REPMGR_RETRY *retry; + db_timespec timeout; + fd_set reads, writes; +! int ret, flow_control, maxfd, nready; + u_int8_t buf[10]; /* arbitrary size */ + + flow_control = FALSE; +--- 533,539 ---- + REPMGR_RETRY *retry; + db_timespec timeout; + fd_set reads, writes; +! int ret, flow_control, maxfd; + u_int8_t buf[10]; /* arbitrary size */ + + flow_control = FALSE; +*************** +*** 477,482 **** +--- 567,575 ---- + * each one. + */ + TAILQ_FOREACH(conn, &db_rep->connections, entries) { ++ if (F_ISSET(conn, CONN_DEFUNCT)) ++ continue; ++ + if (F_ISSET(conn, CONN_CONNECTING)) { + FD_SET((u_int)conn->fd, &reads); + FD_SET((u_int)conn->fd, &writes); +*************** +*** 533,616 **** + return (ret); + } + } +- nready = ret; +- + LOCK_MUTEX(db_rep->mutex); + +- /* +- * The first priority thing we must do is to clean up any +- * pending defunct connections. Otherwise, if they have any +- * lingering pending input, we get very confused if we try to +- * process it. +- * +- * The TAILQ_FOREACH macro would be suitable here, except that +- * it doesn't allow unlinking the current element, which is +- * needed for cleanup_connection. +- */ +- for (conn = TAILQ_FIRST(&db_rep->connections); +- conn != NULL; +- conn = next) { +- next = TAILQ_NEXT(conn, entries); +- if (F_ISSET(conn, CONN_DEFUNCT)) +- __repmgr_cleanup_connection(dbenv, conn); +- } +- + if ((ret = __repmgr_retry_connections(dbenv)) != 0) + goto out; +- if (nready == 0) +- continue; + + /* +! * Traverse the linked list. (Again, like TAILQ_FOREACH, except +! * that we need the ability to unlink an element along the way.) + */ + for (conn = TAILQ_FIRST(&db_rep->connections); + conn != NULL; + conn = next) { + next = TAILQ_NEXT(conn, entries); +! if (F_ISSET(conn, CONN_CONNECTING)) { +! if (FD_ISSET((u_int)conn->fd, &reads) || +! FD_ISSET((u_int)conn->fd, &writes)) { +! if ((ret = finish_connecting(dbenv, +! conn)) == DB_REP_UNAVAIL) { +! if ((ret = +! __repmgr_bust_connection( +! dbenv, conn, TRUE)) != 0) +! goto out; +! } else if (ret != 0) +! goto out; +! } +! continue; +! } +! +! /* +! * Here, the site is connected, and the FD_SET's are +! * valid. +! */ +! if (FD_ISSET((u_int)conn->fd, &writes)) { +! if ((ret = __repmgr_write_some( +! dbenv, conn)) == DB_REP_UNAVAIL) { +! if ((ret = +! __repmgr_bust_connection(dbenv, +! conn, TRUE)) != 0) +! goto out; +! continue; +! } else if (ret != 0) +! goto out; +! } +! +! if (!flow_control && +! FD_ISSET((u_int)conn->fd, &reads)) { +! if ((ret = __repmgr_read_from_site(dbenv, conn)) +! == DB_REP_UNAVAIL) { +! if ((ret = +! __repmgr_bust_connection(dbenv, +! conn, TRUE)) != 0) +! goto out; +! continue; +! } else if (ret != 0) +! goto out; +! } + } + + /* +--- 626,650 ---- + return (ret); + } + } + LOCK_MUTEX(db_rep->mutex); + + if ((ret = __repmgr_retry_connections(dbenv)) != 0) + goto out; + + /* +! * Examine each connection, to see what work needs to be done. +! * +! * The TAILQ_FOREACH macro would be suitable here, except that +! * it doesn't allow unlinking the current element, which is +! * needed for cleanup_connection. + */ + for (conn = TAILQ_FIRST(&db_rep->connections); + conn != NULL; + conn = next) { + next = TAILQ_NEXT(conn, entries); +! if ((ret = __repmgr_conn_work(dbenv, +! conn, &reads, &writes, flow_control)) != 0) +! goto out; + } + + /* +*************** +*** 637,642 **** +--- 671,719 ---- + } + + static int ++ __repmgr_conn_work(dbenv, conn, reads, writes, flow_control) ++ DB_ENV *dbenv; ++ REPMGR_CONNECTION *conn; ++ fd_set *reads, *writes; ++ int flow_control; ++ { ++ int ret; ++ u_int fd; ++ ++ if (F_ISSET(conn, CONN_DEFUNCT)) { ++ /* ++ * Deferred clean-up, from an error that happened in another ++ * thread, while we were sleeping in select(). ++ */ ++ return (__repmgr_cleanup_connection(dbenv, conn)); ++ } ++ ++ ret = 0; ++ fd = (u_int)conn->fd; ++ ++ if (F_ISSET(conn, CONN_CONNECTING)) { ++ if (FD_ISSET(fd, reads) || FD_ISSET(fd, writes)) ++ ret = finish_connecting(dbenv, conn); ++ } else { ++ /* ++ * Here, the site is connected, and the FD_SET's are valid. ++ */ ++ if (FD_ISSET(fd, writes)) ++ ret = __repmgr_write_some(dbenv, conn); ++ ++ if (ret == 0 && !flow_control && FD_ISSET(fd, reads)) ++ ret = __repmgr_read_from_site(dbenv, conn); ++ } ++ ++ if (ret == DB_REP_UNAVAIL) { ++ if ((ret = __repmgr_bust_connection(dbenv, conn)) != 0) ++ return (ret); ++ ret = __repmgr_cleanup_connection(dbenv, conn); ++ } ++ return (ret); ++ } ++ ++ static int + finish_connecting(dbenv, conn) + DB_ENV *dbenv; + REPMGR_CONNECTION *conn; +*************** +*** 657,662 **** +--- 734,740 ---- + goto err_rpt; + } + ++ DB_ASSERT(dbenv, F_ISSET(conn, CONN_CONNECTING)); + F_CLR(conn, CONN_CONNECTING); + return (__repmgr_send_handshake(dbenv, conn)); + +*************** +*** 671,690 **** + "connecting to %s", __repmgr_format_site_loc(site, buffer)); + + /* If we've exhausted the list of possible addresses, give up. */ +! if (ADDR_LIST_NEXT(&site->net_addr) == NULL) + return (DB_REP_UNAVAIL); + + /* + * This is just like a little mini-"bust_connection", except that we + * don't reschedule for later, 'cuz we're just about to try again right +! * now. + * + * !!! + * Which means this must only be called on the select() thread, since + * only there are we allowed to actually close a connection. + */ + DB_ASSERT(dbenv, !TAILQ_EMPTY(&db_rep->connections)); +! __repmgr_cleanup_connection(dbenv, conn); + ret = __repmgr_connect_site(dbenv, eid); + DB_ASSERT(dbenv, ret != DB_REP_UNAVAIL); + return (ret); +--- 749,773 ---- + "connecting to %s", __repmgr_format_site_loc(site, buffer)); + + /* If we've exhausted the list of possible addresses, give up. */ +! if (ADDR_LIST_NEXT(&site->net_addr) == NULL) { +! STAT(db_rep->region->mstat.st_connect_fail++); + return (DB_REP_UNAVAIL); ++ } + + /* + * This is just like a little mini-"bust_connection", except that we + * don't reschedule for later, 'cuz we're just about to try again right +! * now. (Note that we don't have to worry about message threads +! * blocking on a full output queue: that can't happen when we're only +! * just connecting.) + * + * !!! + * Which means this must only be called on the select() thread, since + * only there are we allowed to actually close a connection. + */ + DB_ASSERT(dbenv, !TAILQ_EMPTY(&db_rep->connections)); +! if ((ret = __repmgr_cleanup_connection(dbenv, conn)) != 0) +! return (ret); + ret = __repmgr_connect_site(dbenv, eid); + DB_ASSERT(dbenv, ret != DB_REP_UNAVAIL); + return (ret); +*** repmgr/repmgr_sel.c 2007-10-31 10:23:52.000000000 -0700 +--- repmgr/repmgr_sel.c 2007-10-31 10:23:53.000000000 -0700 +*************** +*** 36,45 **** + + /* + * PUBLIC: int __repmgr_accept __P((DB_ENV *)); +- * +- * !!! +- * Only ever called in the select() thread, since we may call +- * __repmgr_bust_connection(..., TRUE). + */ + int + __repmgr_accept(dbenv) +--- 36,41 ---- +*************** +*** 133,139 **** + case 0: + return (0); + case DB_REP_UNAVAIL: +! return (__repmgr_bust_connection(dbenv, conn, TRUE)); + default: + return (ret); + } +--- 129,135 ---- + case 0: + return (0); + case DB_REP_UNAVAIL: +! return (__repmgr_bust_connection(dbenv, conn)); + default: + return (ret); + } +*************** +*** 254,263 **** + * starting with the "current" element of its address list and trying as many + * addresses as necessary until the list is exhausted. + * +- * !!! +- * Only ever called in the select() thread, since we may call +- * __repmgr_bust_connection(..., TRUE). +- * + * PUBLIC: int __repmgr_connect_site __P((DB_ENV *, u_int eid)); + */ + int +--- 250,255 ---- +*************** +*** 332,338 **** + case 0: + break; + case DB_REP_UNAVAIL: +! return (__repmgr_bust_connection(dbenv, con, TRUE)); + default: + return (ret); + } +--- 324,330 ---- + case 0: + break; + case DB_REP_UNAVAIL: +! return (__repmgr_bust_connection(dbenv, con)); + default: + return (ret); + } +*************** +*** 437,443 **** + + DB_SET_DBT(rec, my_addr->host, strlen(my_addr->host) + 1); + +! return (__repmgr_send_one(dbenv, conn, REPMGR_HANDSHAKE, &cntrl, &rec)); + } + + /* +--- 429,443 ---- + + DB_SET_DBT(rec, my_addr->host, strlen(my_addr->host) + 1); + +! /* +! * It would of course be disastrous to block the select() thread, so +! * pass the "blockable" argument as FALSE. Fortunately blocking should +! * never be necessary here, because the hand-shake is always the first +! * thing we send. Which is a good thing, because it would be almost as +! * disastrous if we allowed ourselves to drop a handshake. +! */ +! return (__repmgr_send_one(dbenv, +! conn, REPMGR_HANDSHAKE, &cntrl, &rec, FALSE)); + } + + /* +*************** +*** 854,859 **** +--- 854,872 ---- + conn->out_queue_length--; + if (--msg->ref_count <= 0) + __os_free(dbenv, msg); ++ ++ /* ++ * We've achieved enough movement to free up at least ++ * one space in the outgoing queue. Wake any message ++ * threads that may be waiting for space. Clear the ++ * CONGESTED status so that when the queue reaches the ++ * high-water mark again, the filling thread will be ++ * allowed to try waiting again. ++ */ ++ F_CLR(conn, CONN_CONGESTED); ++ if (conn->blockers > 0 && ++ (ret = __repmgr_signal(&conn->drained)) != 0) ++ return (ret); + } + } + +*** repmgr/repmgr_util.c 2007-10-31 10:23:52.000000000 -0700 +--- repmgr/repmgr_util.c 2007-10-31 10:23:53.000000000 -0700 +*************** +*** 103,108 **** +--- 103,113 ---- + db_rep = dbenv->rep_handle; + if ((ret = __os_malloc(dbenv, sizeof(REPMGR_CONNECTION), &c)) != 0) + return (ret); ++ if ((ret = __repmgr_alloc_cond(&c->drained)) != 0) { ++ __os_free(dbenv, c); ++ return (ret); ++ } ++ c->blockers = 0; + + c->fd = s; + c->flags = flags; +*** repmgr/repmgr_windows.c 2007-10-31 10:23:52.000000000 -0700 +--- repmgr/repmgr_windows.c 2007-10-31 10:23:53.000000000 -0700 +*************** +*** 11,16 **** +--- 11,19 ---- + #define __INCLUDE_NETWORKING 1 + #include "db_int.h" + ++ /* Convert time-out from microseconds to milliseconds, rounding up. */ ++ #define DB_TIMEOUT_TO_WINDOWS_TIMEOUT(t) (((t) + (US_PER_MS - 1)) / US_PER_MS) ++ + typedef struct __ack_waiter { + HANDLE event; + const DB_LSN *lsnp; +*************** +*** 120,136 **** + { + DB_REP *db_rep; + ACK_WAITER *me; +! DWORD ret; +! DWORD timeout; + + db_rep = dbenv->rep_handle; + + if ((ret = allocate_wait_slot(dbenv, &me)) != 0) + goto err; + +- /* convert time-out from microseconds to milliseconds, rounding up */ + timeout = db_rep->ack_timeout > 0 ? +! ((db_rep->ack_timeout + (US_PER_MS - 1)) / US_PER_MS) : INFINITE; + me->lsnp = lsnp; + if ((ret = SignalObjectAndWait(db_rep->mutex, me->event, timeout, + FALSE)) == WAIT_FAILED) { +--- 123,137 ---- + { + DB_REP *db_rep; + ACK_WAITER *me; +! DWORD ret, timeout; + + db_rep = dbenv->rep_handle; + + if ((ret = allocate_wait_slot(dbenv, &me)) != 0) + goto err; + + timeout = db_rep->ack_timeout > 0 ? +! DB_TIMEOUT_TO_WINDOWS_TIMEOUT(db_rep->ack_timeout) : INFINITE; + me->lsnp = lsnp; + if ((ret = SignalObjectAndWait(db_rep->mutex, me->event, timeout, + FALSE)) == WAIT_FAILED) { +*************** +*** 211,216 **** +--- 212,296 ---- + db_rep->waiters->first_free = slot; + } + ++ /* (See requirements described in repmgr_posix.c.) */ ++ int ++ __repmgr_await_drain(dbenv, conn, timeout) ++ DB_ENV *dbenv; ++ REPMGR_CONNECTION *conn; ++ db_timeout_t timeout; ++ { ++ DB_REP *db_rep; ++ db_timespec deadline, delta, now; ++ db_timeout_t t; ++ DWORD duration, ret; ++ int round_up; ++ ++ db_rep = dbenv->rep_handle; ++ ++ __os_gettime(dbenv, &deadline); ++ DB_TIMEOUT_TO_TIMESPEC(timeout, &delta); ++ timespecadd(&deadline, &delta); ++ ++ while (conn->out_queue_length >= OUT_QUEUE_LIMIT) { ++ if (!ResetEvent(conn->drained)) ++ return (GetLastError()); ++ ++ /* How long until the deadline? */ ++ __os_gettime(dbenv, &now); ++ if (timespeccmp(&now, &deadline, >=)) { ++ F_SET(conn, CONN_CONGESTED); ++ return (0); ++ } ++ delta = deadline; ++ timespecsub(&delta, &now); ++ round_up = TRUE; ++ DB_TIMESPEC_TO_TIMEOUT(t, &delta, round_up); ++ duration = DB_TIMEOUT_TO_WINDOWS_TIMEOUT(t); ++ ++ ret = SignalObjectAndWait(db_rep->mutex, ++ conn->drained, duration, FALSE); ++ LOCK_MUTEX(db_rep->mutex); ++ if (ret == WAIT_FAILED) ++ return (GetLastError()); ++ else if (ret == WAIT_TIMEOUT) { ++ F_SET(conn, CONN_CONGESTED); ++ return (0); ++ } else ++ DB_ASSERT(dbenv, ret == WAIT_OBJECT_0); ++ ++ if (db_rep->finished) ++ return (0); ++ if (F_ISSET(conn, CONN_DEFUNCT)) ++ return (DB_REP_UNAVAIL); ++ } ++ return (0); ++ } ++ ++ /* ++ * Creates a manual reset event, which is usually our best choice when we may ++ * have multiple threads waiting on a single event. ++ */ ++ int ++ __repmgr_alloc_cond(c) ++ cond_var_t *c; ++ { ++ HANDLE event; ++ ++ if ((event = CreateEvent(NULL, TRUE, FALSE, NULL)) == NULL) ++ return (GetLastError()); ++ *c = event; ++ return (0); ++ } ++ ++ int ++ __repmgr_free_cond(c) ++ cond_var_t *c; ++ { ++ if (CloseHandle(*c)) ++ return (0); ++ return (GetLastError()); ++ } ++ + /* + * Make resource allocation an all-or-nothing affair, outside of this and the + * close_sync function. db_rep->waiters should be non-NULL iff all of these +*************** +*** 488,493 **** +--- 568,576 ---- + * don't hurt anything flow-control-wise. + */ + TAILQ_FOREACH(conn, &db_rep->connections, entries) { ++ if (F_ISSET(conn, CONN_DEFUNCT)) ++ continue; ++ + if (F_ISSET(conn, CONN_CONNECTING) || + !STAILQ_EMPTY(&conn->outbound_queue) || + (!flow_control || !IS_VALID_EID(conn->eid))) { +*************** +*** 534,541 **** + conn != NULL; + conn = next) { + next = TAILQ_NEXT(conn, entries); +! if (F_ISSET(conn, CONN_DEFUNCT)) +! __repmgr_cleanup_connection(dbenv, conn); + } + + /* +--- 617,626 ---- + conn != NULL; + conn = next) { + next = TAILQ_NEXT(conn, entries); +! if (F_ISSET(conn, CONN_DEFUNCT) && +! (ret = __repmgr_cleanup_connection(dbenv, +! conn)) != 0) +! goto unlock; + } + + /* +*************** +*** 587,597 **** + return (ret); + } + +- /* +- * !!! +- * Only ever called on the select() thread, since we may call +- * __repmgr_bust_connection(..., TRUE). +- */ + static int + handle_completion(dbenv, conn) + DB_ENV *dbenv; +--- 672,677 ---- +*************** +*** 651,660 **** + } + } + +! return (0); +! +! err: if (ret == DB_REP_UNAVAIL) +! return (__repmgr_bust_connection(dbenv, conn, TRUE)); + return (ret); + } + +--- 731,742 ---- + } + } + +! err: +! if (ret == DB_REP_UNAVAIL) { +! if ((ret = __repmgr_bust_connection(dbenv, conn)) != 0) +! return (ret); +! ret = __repmgr_cleanup_connection(dbenv, conn); +! } + return (ret); + } + +*************** +*** 708,714 **** + } + + DB_ASSERT(dbenv, !TAILQ_EMPTY(&db_rep->connections)); +! __repmgr_cleanup_connection(dbenv, conn); + ret = __repmgr_connect_site(dbenv, eid); + DB_ASSERT(dbenv, ret != DB_REP_UNAVAIL); + return (ret); +--- 790,797 ---- + } + + DB_ASSERT(dbenv, !TAILQ_EMPTY(&db_rep->connections)); +! if ((ret = __repmgr_cleanup_connection(dbenv, conn)) != 0) +! return (ret); + ret = __repmgr_connect_site(dbenv, eid); + DB_ASSERT(dbenv, ret != DB_REP_UNAVAIL); + return (ret); Deleted: csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.1 =================================================================== --- csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.1 2009-09-30 15:41:26 UTC (rev 6627) +++ csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.1 2009-09-30 15:46:02 UTC (rev 6628) @@ -1,75 +0,0 @@ -*** sequence/sequence.c.orig 2008-05-05 13:25:09.000000000 -0700 ---- sequence/sequence.c 2008-08-15 09:58:46.000000000 -0700 -*************** -*** 187,193 **** - if ((ret = __db_get_flags(dbp, &tflags)) != 0) - goto err; - -! if (DB_IS_READONLY(dbp)) { - ret = __db_rdonly(dbp->env, "DB_SEQUENCE->open"); - goto err; - } ---- 187,197 ---- - if ((ret = __db_get_flags(dbp, &tflags)) != 0) - goto err; - -! /* -! * We can let replication clients open sequences, but must -! * check later that they do not update them. -! */ -! if (F_ISSET(dbp, DB_AM_RDONLY)) { - ret = __db_rdonly(dbp->env, "DB_SEQUENCE->open"); - goto err; - } -*************** -*** 244,249 **** ---- 248,258 ---- - if ((ret != DB_NOTFOUND && ret != DB_KEYEMPTY) || - !LF_ISSET(DB_CREATE)) - goto err; -+ if (IS_REP_CLIENT(env) && -+ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { -+ ret = __db_rdonly(env, "DB_SEQUENCE->open"); -+ goto err; -+ } - ret = 0; - - rp = &seq->seq_record; -*************** -*** 296,302 **** - */ - rp = seq->seq_data.data; - if (rp->seq_version == DB_SEQUENCE_OLDVER) { -! oldver: rp->seq_version = DB_SEQUENCE_VERSION; - if (!F_ISSET(env, ENV_LITTLEENDIAN)) { - if (IS_DB_AUTO_COMMIT(dbp, txn)) { - if ((ret = ---- 305,316 ---- - */ - rp = seq->seq_data.data; - if (rp->seq_version == DB_SEQUENCE_OLDVER) { -! oldver: if (IS_REP_CLIENT(env) && -! !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { -! ret = __db_rdonly(env, "DB_SEQUENCE->open"); -! goto err; -! } -! rp->seq_version = DB_SEQUENCE_VERSION; - if (!F_ISSET(env, ENV_LITTLEENDIAN)) { - if (IS_DB_AUTO_COMMIT(dbp, txn)) { - if ((ret = -*************** -*** 707,712 **** ---- 721,733 ---- - - MUTEX_LOCK(env, seq->mtx_seq); - -+ if (handle_check && IS_REP_CLIENT(env) && -+ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { -+ ret = __db_rdonly(env, "DB_SEQUENCE->get"); -+ goto err; -+ } -+ -+ - if (rp->seq_min + delta > rp->seq_max) { - __db_errx(env, "Sequence overflow"); - ret = EINVAL; Deleted: csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.2 =================================================================== --- csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.2 2009-09-30 15:41:26 UTC (rev 6627) +++ csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.2 2009-09-30 15:46:02 UTC (rev 6628) @@ -1,71 +0,0 @@ -Index: lock/lock.c -=================================================================== -RCS file: /a/CVSROOT/db/lock/lock.c,v -retrieving revision 12.61 -diff -c -r12.61 lock.c -*** lock/lock.c 22 Jul 2008 12:08:53 -0000 12.61 ---- lock/lock.c 19 Aug 2008 17:28:24 -0000 -*************** -*** 1278,1287 **** - SH_TAILQ_REMOVE( - <->obj_tab[obj_ndx], sh_obj, links, __db_lockobj); - if (sh_obj->lockobj.size > sizeof(sh_obj->objdata)) { -! LOCK_REGION_LOCK(env); - __env_alloc_free(<->reginfo, - SH_DBT_PTR(&sh_obj->lockobj)); -! LOCK_REGION_UNLOCK(env); - } - SH_TAILQ_INSERT_HEAD( - &FREE_OBJS(lt, part_id), sh_obj, links, __db_lockobj); ---- 1278,1289 ---- - SH_TAILQ_REMOVE( - <->obj_tab[obj_ndx], sh_obj, links, __db_lockobj); - if (sh_obj->lockobj.size > sizeof(sh_obj->objdata)) { -! if (region->part_t_size != 1) -! LOCK_REGION_LOCK(env); - __env_alloc_free(<->reginfo, - SH_DBT_PTR(&sh_obj->lockobj)); -! if (region->part_t_size != 1) -! LOCK_REGION_UNLOCK(env); - } - SH_TAILQ_INSERT_HEAD( - &FREE_OBJS(lt, part_id), sh_obj, links, __db_lockobj); -*************** -*** 1470,1484 **** - if (obj->size <= sizeof(sh_obj->objdata)) - p = sh_obj->objdata; - else { -! LOCK_REGION_LOCK(env); - if ((ret = - __env_alloc(<->reginfo, obj->size, &p)) != 0) { - __db_errx(env, - "No space for lock object storage"); -! LOCK_REGION_UNLOCK(env); - goto err; - } -! LOCK_REGION_UNLOCK(env); - } - - memcpy(p, obj->data, obj->size); ---- 1472,1492 ---- - if (obj->size <= sizeof(sh_obj->objdata)) - p = sh_obj->objdata; - else { -! /* -! * If we have only one partition, the region is locked. -! */ -! if (region->part_t_size != 1) -! LOCK_REGION_LOCK(env); - if ((ret = - __env_alloc(<->reginfo, obj->size, &p)) != 0) { - __db_errx(env, - "No space for lock object storage"); -! if (region->part_t_size != 1) -! LOCK_REGION_UNLOCK(env); - goto err; - } -! if (region->part_t_size != 1) -! LOCK_REGION_UNLOCK(env); - } - - memcpy(p, obj->data, obj->size); Deleted: csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.3 =================================================================== --- csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.3 2009-09-30 15:41:26 UTC (rev 6627) +++ csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.3 2009-09-30 15:46:02 UTC (rev 6628) @@ -1,314 +0,0 @@ -*** lock/lock_deadlock.c 2008-03-11 00:31:33.000000000 +1100 ---- lock/lock_deadlock.c 2008-12-16 21:54:18.000000000 +1100 -*************** -*** 121,127 **** - DB_LOCKTAB *lt; - db_timespec now; - locker_info *idmap; -! u_int32_t *bitmap, *copymap, **deadp, **free_me, *tmpmap; - u_int32_t i, cid, keeper, killid, limit, nalloc, nlockers; - u_int32_t lock_max, txn_max; - int ret, status; ---- 121,127 ---- - DB_LOCKTAB *lt; - db_timespec now; - locker_info *idmap; -! u_int32_t *bitmap, *copymap, **deadp, **deadlist, *tmpmap; - u_int32_t i, cid, keeper, killid, limit, nalloc, nlockers; - u_int32_t lock_max, txn_max; - int ret, status; -*************** -*** 133,139 **** - if (IS_REP_CLIENT(env)) - atype = DB_LOCK_MINWRITE; - -! free_me = NULL; - - lt = env->lk_handle; - if (rejectp != NULL) ---- 133,140 ---- - if (IS_REP_CLIENT(env)) - atype = DB_LOCK_MINWRITE; - -! copymap = tmpmap = NULL; -! deadlist = NULL; - - lt = env->lk_handle; - if (rejectp != NULL) -*************** -*** 179,189 **** - memcpy(copymap, bitmap, nlockers * sizeof(u_int32_t) * nalloc); - - if ((ret = __os_calloc(env, sizeof(u_int32_t), nalloc, &tmpmap)) != 0) -! goto err1; - - /* Find a deadlock. */ - if ((ret = -! __dd_find(env, bitmap, idmap, nlockers, nalloc, &deadp)) != 0) - return (ret); - - /* ---- 180,190 ---- - memcpy(copymap, bitmap, nlockers * sizeof(u_int32_t) * nalloc); - - if ((ret = __os_calloc(env, sizeof(u_int32_t), nalloc, &tmpmap)) != 0) -! goto err; - - /* Find a deadlock. */ - if ((ret = -! __dd_find(env, bitmap, idmap, nlockers, nalloc, &deadlist)) != 0) - return (ret); - - /* -*************** -*** 204,211 **** - txn_max = TXN_MAXIMUM; - - killid = BAD_KILLID; -! free_me = deadp; -! for (; *deadp != NULL; deadp++) { - if (rejectp != NULL) - ++*rejectp; - killid = (u_int32_t)(*deadp - bitmap) / nalloc; ---- 205,211 ---- - txn_max = TXN_MAXIMUM; - - killid = BAD_KILLID; -! for (deadp = deadlist; *deadp != NULL; deadp++) { - if (rejectp != NULL) - ++*rejectp; - killid = (u_int32_t)(*deadp - bitmap) / nalloc; -*************** -*** 342,352 **** - __db_msg(env, - "Aborting locker %lx", (u_long)idmap[killid].id); - } -! __os_free(env, tmpmap); -! err1: __os_free(env, copymap); -! -! err: if (free_me != NULL) -! __os_free(env, free_me); - __os_free(env, bitmap); - __os_free(env, idmap); - ---- 342,353 ---- - __db_msg(env, - "Aborting locker %lx", (u_long)idmap[killid].id); - } -! err: if(copymap != NULL) -! __os_free(env, copymap); -! if (deadlist != NULL) -! __os_free(env, deadlist); -! if(tmpmap != NULL) -! __os_free(env, tmpmap); - __os_free(env, bitmap); - __os_free(env, idmap); - -*************** -*** 360,365 **** ---- 361,377 ---- - - #define DD_INVALID_ID ((u_int32_t) -1) - -+ /* -+ * __dd_build -- -+ * Build the lock dependency bit maps. -+ * Notes on syncronization: -+ * LOCK_SYSTEM_LOCK is used to hold objects locked when we have -+ * a single partition. -+ * LOCK_LOCKERS is held while we are walking the lockers list and -+ * to single thread the use of lockerp->dd_id. -+ * LOCK_DD protects the DD list of objects. -+ */ -+ - static int - __dd_build(env, atype, bmp, nlockers, allocp, idmap, rejectp) - ENV *env; -*************** -*** 393,398 **** ---- 405,411 ---- - * In particular we do not build the conflict array and our caller - * needs to expect this. - */ -+ LOCK_SYSTEM_LOCK(lt, region); - if (atype == DB_LOCK_EXPIRE) { - skip: LOCK_DD(env, region); - op = SH_TAILQ_FIRST(®ion->dd_objs, __db_lockobj); -*************** -*** 430,446 **** - OBJECT_UNLOCK(lt, region, indx); - } - UNLOCK_DD(env, region); - goto done; - } - - /* -! * We'll check how many lockers there are, add a few more in for -! * good measure and then allocate all the structures. Then we'll -! * verify that we have enough room when we go back in and get the -! * mutex the second time. - */ -! retry: count = region->stat.st_nlockers; - if (count == 0) { - *nlockers = 0; - return (0); - } ---- 443,460 ---- - OBJECT_UNLOCK(lt, region, indx); - } - UNLOCK_DD(env, region); -+ LOCK_SYSTEM_UNLOCK(lt, region); - goto done; - } - - /* -! * Allocate after locking the region -! * to make sure the structures are large enough. - */ -! LOCK_LOCKERS(env, region); -! count = region->stat.st_nlockers; - if (count == 0) { -+ UNLOCK_LOCKERS(env, region); - *nlockers = 0; - return (0); - } -*************** -*** 448,497 **** - if (FLD_ISSET(env->dbenv->verbose, DB_VERB_DEADLOCK)) - __db_msg(env, "%lu lockers", (u_long)count); - -- count += 20; - nentries = (u_int32_t)DB_ALIGN(count, 32) / 32; - -! /* -! * Allocate enough space for a count by count bitmap matrix. -! * -! * XXX -! * We can probably save the malloc's between iterations just -! * reallocing if necessary because count grew by too much. -! */ - if ((ret = __os_calloc(env, (size_t)count, -! sizeof(u_int32_t) * nentries, &bitmap)) != 0) - return (ret); - - if ((ret = __os_calloc(env, - sizeof(u_int32_t), nentries, &tmpmap)) != 0) { - __os_free(env, bitmap); - return (ret); - } - - if ((ret = __os_calloc(env, - (size_t)count, sizeof(locker_info), &id_array)) != 0) { - __os_free(env, bitmap); - __os_free(env, tmpmap); - return (ret); - } - - /* -- * Now go back in and actually fill in the matrix. -- */ -- if (region->stat.st_nlockers > count) { -- __os_free(env, bitmap); -- __os_free(env, tmpmap); -- __os_free(env, id_array); -- goto retry; -- } -- -- /* - * First we go through and assign each locker a deadlock detector id. - */ - id = 0; -- LOCK_LOCKERS(env, region); - SH_TAILQ_FOREACH(lip, ®ion->lockers, ulinks, __db_locker) { - if (lip->master_locker == INVALID_ROFF) { - lip->dd_id = id++; - id_array[lip->dd_id].id = lip->id; - switch (atype) { ---- 462,498 ---- - if (FLD_ISSET(env->dbenv->verbose, DB_VERB_DEADLOCK)) - __db_msg(env, "%lu lockers", (u_long)count); - - nentries = (u_int32_t)DB_ALIGN(count, 32) / 32; - -! /* Allocate enough space for a count by count bitmap matrix. */ - if ((ret = __os_calloc(env, (size_t)count, -! sizeof(u_int32_t) * nentries, &bitmap)) != 0) { -! UNLOCK_LOCKERS(env, region); - return (ret); -+ } - - if ((ret = __os_calloc(env, - sizeof(u_int32_t), nentries, &tmpmap)) != 0) { -+ UNLOCK_LOCKERS(env, region); - __os_free(env, bitmap); - return (ret); - } - - if ((ret = __os_calloc(env, - (size_t)count, sizeof(locker_info), &id_array)) != 0) { -+ UNLOCK_LOCKERS(env, region); - __os_free(env, bitmap); - __os_free(env, tmpmap); - return (ret); - } - - /* - * First we go through and assign each locker a deadlock detector id. - */ - id = 0; - SH_TAILQ_FOREACH(lip, ®ion->lockers, ulinks, __db_locker) { - if (lip->master_locker == INVALID_ROFF) { -+ DB_ASSERT(env, id < count); - lip->dd_id = id++; - id_array[lip->dd_id].id = lip->id; - switch (atype) { -*************** -*** 510,516 **** - lip->dd_id = DD_INVALID_ID; - - } -- UNLOCK_LOCKERS(env, region); - - /* - * We only need consider objects that have waiters, so we use ---- 511,516 ---- -*************** -*** 669,675 **** - * status after building the bit maps so that we will not detect - * a blocked transaction without noting that it is already aborting. - */ -- LOCK_LOCKERS(env, region); - for (id = 0; id < count; id++) { - if (!id_array[id].valid) - continue; ---- 669,674 ---- -*************** -*** 738,743 **** ---- 737,743 ---- - id_array[id].in_abort = 1; - } - UNLOCK_LOCKERS(env, region); -+ LOCK_SYSTEM_UNLOCK(lt, region); - - /* - * Now we can release everything except the bitmap matrix that we -*************** -*** 839,844 **** ---- 839,845 ---- - ret = 0; - - /* We must lock so this locker cannot go away while we abort it. */ -+ LOCK_SYSTEM_LOCK(lt, region); - LOCK_LOCKERS(env, region); - - /* -*************** -*** 895,900 **** ---- 896,902 ---- - done: OBJECT_UNLOCK(lt, region, info->last_ndx); - err: - out: UNLOCK_LOCKERS(env, region); -+ LOCK_SYSTEM_UNLOCK(lt, region); - return (ret); - } - Deleted: csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.4 =================================================================== --- csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.4 2009-09-30 15:41:26 UTC (rev 6627) +++ csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.4 2009-09-30 15:46:02 UTC (rev 6628) @@ -1,183 +0,0 @@ -*** dbinc/repmgr.h.orig 2009-05-04 10:33:55.000000000 -0400 ---- dbinc/repmgr.h 2009-05-04 10:27:26.000000000 -0400 -*************** -*** 374,379 **** ---- 374,380 ---- - #define SITE_FROM_EID(eid) (&db_rep->sites[eid]) - #define EID_FROM_SITE(s) ((int)((s) - (&db_rep->sites[0]))) - #define IS_VALID_EID(e) ((e) >= 0) -+ #define IS_KNOWN_REMOTE_SITE(e) ((e) >= 0 && ((u_int)(e)) < db_rep->site_cnt) - #define SELF_EID INT_MAX - - #define IS_PEER_POLICY(p) ((p) == DB_REPMGR_ACKS_ALL_PEERS || \ -*** rep/rep_elect.c.orig 2009-05-04 10:35:50.000000000 -0400 ---- rep/rep_elect.c 2009-05-04 10:31:24.000000000 -0400 -*************** -*** 33,39 **** - static int __rep_fire_elected __P((ENV *, REP *, u_int32_t)); - static void __rep_elect_master __P((ENV *, REP *)); - static int __rep_tally __P((ENV *, REP *, int, u_int32_t *, u_int32_t, roff_t)); -! static int __rep_wait __P((ENV *, db_timeout_t *, int *, int, u_int32_t)); - - /* - * __rep_elect -- ---- 33,39 ---- - static int __rep_fire_elected __P((ENV *, REP *, u_int32_t)); - static void __rep_elect_master __P((ENV *, REP *)); - static int __rep_tally __P((ENV *, REP *, int, u_int32_t *, u_int32_t, roff_t)); -! static int __rep_wait __P((ENV *, db_timeout_t *, int, u_int32_t)); - - /* - * __rep_elect -- -*************** -*** 55,61 **** - ENV *env; - LOG *lp; - REP *rep; -! int done, eid, elected, full_elect, locked, in_progress, need_req; - int ret, send_vote, t_ret; - u_int32_t ack, ctlflags, egen, nsites, orig_tally, priority, realpri; - u_int32_t tiebreaker; ---- 55,61 ---- - ENV *env; - LOG *lp; - REP *rep; -! int done, elected, full_elect, locked, in_progress, need_req; - int ret, send_vote, t_ret; - u_int32_t ack, ctlflags, egen, nsites, orig_tally, priority, realpri; - u_int32_t tiebreaker; -*************** -*** 181,188 **** - REP_SYSTEM_UNLOCK(env); - (void)__rep_send_message(env, DB_EID_BROADCAST, - REP_MASTER_REQ, NULL, NULL, 0, 0); -! ret = __rep_wait(env, &to, &eid, -! 0, REP_F_EPHASE0); - REP_SYSTEM_LOCK(env); - F_CLR(rep, REP_F_EPHASE0); - switch (ret) { ---- 181,187 ---- - REP_SYSTEM_UNLOCK(env); - (void)__rep_send_message(env, DB_EID_BROADCAST, - REP_MASTER_REQ, NULL, NULL, 0, 0); -! ret = __rep_wait(env, &to, 0, REP_F_EPHASE0); - REP_SYSTEM_LOCK(env); - F_CLR(rep, REP_F_EPHASE0); - switch (ret) { -*************** -*** 286,296 **** - REP_SYSTEM_LOCK(env); - goto vote; - } -! ret = __rep_wait(env, &to, &eid, full_elect, REP_F_EPHASE1); - switch (ret) { - case 0: - /* Check if election complete or phase complete. */ -! if (eid != DB_EID_INVALID && !IN_ELECTION(rep)) { - RPRINT(env, DB_VERB_REP_ELECT, - (env, "Ended election phase 1")); - goto edone; ---- 285,295 ---- - REP_SYSTEM_LOCK(env); - goto vote; - } -! ret = __rep_wait(env, &to, full_elect, REP_F_EPHASE1); - switch (ret) { - case 0: - /* Check if election complete or phase complete. */ -! if (!IN_ELECTION(rep)) { - RPRINT(env, DB_VERB_REP_ELECT, - (env, "Ended election phase 1")); - goto edone; -*************** -*** 398,412 **** - REP_SYSTEM_LOCK(env); - goto i_won; - } -! ret = __rep_wait(env, &to, &eid, full_elect, REP_F_EPHASE2); - RPRINT(env, DB_VERB_REP_ELECT, - (env, "Ended election phase 2 %d", ret)); - switch (ret) { - case 0: -! if (eid != DB_EID_INVALID) -! goto edone; -! ret = DB_REP_UNAVAIL; -! break; - case DB_REP_EGENCHG: - if (to > timeout) - to = timeout; ---- 397,408 ---- - REP_SYSTEM_LOCK(env); - goto i_won; - } -! ret = __rep_wait(env, &to, full_elect, REP_F_EPHASE2); - RPRINT(env, DB_VERB_REP_ELECT, - (env, "Ended election phase 2 %d", ret)); - switch (ret) { - case 0: -! goto edone; - case DB_REP_EGENCHG: - if (to > timeout) - to = timeout; -*************** -*** 1050,1062 **** - ENV *env; - REP *rep; - { -- /* -- * We often come through here twice, sometimes even more. We mustn't -- * let the redundant calls affect stats counting. But rep_elect relies -- * on this first part for setting eidp. -- */ -- rep->master_id = rep->eid; -- - if (F_ISSET(rep, REP_F_MASTERELECT | REP_F_MASTER)) { - /* We've been through here already; avoid double counting. */ - return; ---- 1046,1051 ---- -*************** -*** 1093,1102 **** - (timeout > 5000000) ? 500000 : ((timeout >= 10) ? timeout / 10 : 1); - - static int -! __rep_wait(env, timeoutp, eidp, full_elect, flags) - ENV *env; - db_timeout_t *timeoutp; -! int *eidp, full_elect; - u_int32_t flags; - { - DB_REP *db_rep; ---- 1082,1091 ---- - (timeout > 5000000) ? 500000 : ((timeout >= 10) ? timeout / 10 : 1); - - static int -! __rep_wait(env, timeoutp, full_elect, flags) - ENV *env; - db_timeout_t *timeoutp; -! int full_elect; - u_int32_t flags; - { - DB_REP *db_rep; -*************** -*** 1174,1180 **** - F_CLR(rep, REP_F_EGENUPDATE); - ret = DB_REP_EGENCHG; - } else if (phase_over) { -- *eidp = rep->master_id; - done = 1; - ret = 0; - } ---- 1163,1168 ---- -*** repmgr/repmgr_net.c.orig 2009-05-04 10:34:46.000000000 -0400 ---- repmgr/repmgr_net.c 2009-05-04 10:27:26.000000000 -0400 -*************** -*** 100,105 **** ---- 100,107 ---- - control, rec, &nsites_sent, &npeers_sent)) != 0) - goto out; - } else { -+ DB_ASSERT(env, IS_KNOWN_REMOTE_SITE(eid)); -+ - /* - * If this is a request that can be sent anywhere, then see if - * we can send it to our peer (to save load on the master), but This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Wed Sep 30 20:37:22 2009 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Wed, 30 Sep 2009 18:37:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[6630] csw/mgar/pkg/gvim/trunk/Makefile Message-ID: Revision: 6630 http://gar.svn.sourceforge.net/gar/?rev=6630&view=rev Author: harpchad Date: 2009-09-30 18:37:22 +0000 (Wed, 30 Sep 2009) Log Message: ----------- Fix X11 paths Modified Paths: -------------- csw/mgar/pkg/gvim/trunk/Makefile Modified: csw/mgar/pkg/gvim/trunk/Makefile =================================================================== --- csw/mgar/pkg/gvim/trunk/Makefile 2009-09-30 15:47:24 UTC (rev 6629) +++ csw/mgar/pkg/gvim/trunk/Makefile 2009-09-30 18:37:22 UTC (rev 6630) @@ -31,6 +31,9 @@ WORKSRC = $(WORKDIR)/$(GARNAME)$(subst .,,$(DISTVERSION)) +EXTRA_PKG_CONFIG_DIRS = /opt/csw/X11/lib +EXTRA_LDFLAGS = -R /opt/csw/X11/lib + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-global-runtime=$(sharedstatedir)/$(GARNAME) CONFIGURE_ARGS += --with-features=huge @@ -39,7 +42,10 @@ CONFIGURE_ARGS += --enable-cscope CONFIGURE_ARGS += --with-vim-name="vim-x11" CONFIGURE_ARGS += --enable-gui=gnome2 +CONFIGURE_ARGS += --x-includes=/opt/csw/X11/include +CONFIGURE_ARGS += --x-libraries=/opt/csw/X11/lib + BUILD_ARGS = "VIMRCLOC=/opt/csw/share/vim" BUILD_ARGS += "VIMRUNTIMEDIR=/opt/csw/share/vim/vim72" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Wed Sep 30 20:43:44 2009 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Wed, 30 Sep 2009 18:43:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[6631] csw/mgar/pkg/gvim/trunk/Makefile Message-ID: Revision: 6631 http://gar.svn.sourceforge.net/gar/?rev=6631&view=rev Author: harpchad Date: 2009-09-30 18:43:43 +0000 (Wed, 30 Sep 2009) Log Message: ----------- Add missing depend Modified Paths: -------------- csw/mgar/pkg/gvim/trunk/Makefile Modified: csw/mgar/pkg/gvim/trunk/Makefile =================================================================== --- csw/mgar/pkg/gvim/trunk/Makefile 2009-09-30 18:37:22 UTC (rev 6630) +++ csw/mgar/pkg/gvim/trunk/Makefile 2009-09-30 18:43:43 UTC (rev 6631) @@ -56,7 +56,7 @@ REQUIRED_PKGS_CSWgvim += CSWiconv CSWlibart CSWlibatk CSWlibbonoboui CSWlibcairo REQUIRED_PKGS_CSWgvim += CSWlibgnome CSWlibgnomecanvas CSWlibgnomeui CSWlibpopt REQUIRED_PKGS_CSWgvim += CSWlibxml2 CSWlibxrender CSWncurses CSWorbit2 CSWpango -REQUIRED_PKGS_CSWgvim += CSWperl CSWpng CSWzlib +REQUIRED_PKGS_CSWgvim += CSWperl CSWpng CSWzlib CSWlibx11 INSTALL_SCRIPTS = minimal This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Sep 30 22:38:04 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 30 Sep 2009 20:38:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[6632] csw/mgar/pkg/x11 Message-ID: Revision: 6632 http://gar.svn.sourceforge.net/gar/?rev=6632&view=rev Author: wbonnet Date: 2009-09-30 20:38:04 +0000 (Wed, 30 Sep 2009) Log Message: ----------- Add the x11 prefix Modified Paths: -------------- csw/mgar/pkg/x11/x11_appleproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/x11_appleproto/ Removed Paths: ------------- csw/mgar/pkg/x11/applewmproto/ Modified: csw/mgar/pkg/x11/x11_appleproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/applewmproto/trunk/Makefile 2009-09-29 15:47:36 UTC (rev 6612) +++ csw/mgar/pkg/x11/x11_appleproto/trunk/Makefile 2009-09-30 20:38:04 UTC (rev 6632) @@ -1,6 +1,8 @@ -GARNAME = applewmproto +PROTONAME = applewmproto GARVERSION = 1.4.1 CATEGORIES = x11 +GARNAME = x11_$(PROTONAME) +DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = AppleWM extension headers from X.org define BLURB @@ -8,11 +10,14 @@ endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(PROTONAME)-$(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 +UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWx11applewmproto +CATALOGNAME_CSWx11applewmproto = x11_applewmproto + REQUIRED_PKGS = CSWx11common BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Sep 30 22:38:57 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 30 Sep 2009 20:38:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[6633] csw/mgar/pkg/x11 Message-ID: Revision: 6633 http://gar.svn.sourceforge.net/gar/?rev=6633&view=rev Author: wbonnet Date: 2009-09-30 20:38:57 +0000 (Wed, 30 Sep 2009) Log Message: ----------- fix directory name Added Paths: ----------- csw/mgar/pkg/x11/x11_applewmproto/ Removed Paths: ------------- csw/mgar/pkg/x11/x11_appleproto/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.