gmane.os.solaris.opencsw.devel
http://blog.gmane.org/gmane.os.solaris.opencsw.devel
hourly11901-01-01T00:00+00:00Gmanehttp://gmane.org/img/gmane-25t.png
http://gmane.org
[csw-devel] SF.net SVN: gar:[21370] csw/mgar/pkg/puppet/trunk
http://permalink.gmane.org/gmane.os.solaris.opencsw.devel/20265
<pre>Revision: 21370
http://gar.svn.sourceforge.net/gar/?rev=21370&view=rev
Author: phipsy
Date: 2013-06-18 20:04:49 +0000 (Tue, 18 Jun 2013)
Log Message:
-----------
puppet: version hup to 2.7.22
Modified Paths:
--------------
csw/mgar/pkg/puppet/trunk/Makefile
csw/mgar/pkg/puppet/trunk/checksums
Modified: csw/mgar/pkg/puppet/trunk/Makefile
===================================================================
--- csw/mgar/pkg/puppet/trunk/Makefile2013-06-18 19:58:24 UTC (rev 21369)
+++ csw/mgar/pkg/puppet/trunk/Makefile2013-06-18 20:04:49 UTC (rev 21370)
< at >< at > -7,7 +7,7 < at >< at >
# [1] http://garylaw.net/packages/puppet-build.sh
NAME = puppet
-VERSION = 2.7.21
+VERSION = 2.7.22
GARTYPE = v2
define BLURB
Modified: csw/mgar/pkg/puppet/trunk/checksums
===================================================================
--- csw/mgar/pkg/puppet/trunk/checksums2013-06-18 19:58:24 UTC (rev 21369)
+++ csw/mgar/pkg/puppet/trunk/checksums2013-06-18 20:04:49 UTC (rev 21370)
< at >< at > -18,3 +18,4 < at >< at >
ba76fa7831df53db7424a8d523465ef5 puppet-2.7.19.tar.gz
746ebdd7ae734fb54e53bf6167f0928d puppet-2.7.20.tar.gz
cfea4e3f8cf268c1340aa5c295b3d7f0 puppet-2.7.21.tar.gz
+2fb656ecb5f8c99b25b70cb1438649ab puppet-2.7.22.tar.gz
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
</pre>phipsy-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f< at >public.gmane.org2013-06-18T20:04:50[csw-devel] SF.net SVN: gar:[21369] csw/mgar/pkg/puppet3/trunk
http://permalink.gmane.org/gmane.os.solaris.opencsw.devel/20264
<pre>Revision: 21369
http://gar.svn.sourceforge.net/gar/?rev=21369&view=rev
Author: phipsy
Date: 2013-06-18 19:58:24 +0000 (Tue, 18 Jun 2013)
Log Message:
-----------
puppet3: version hup to 3.2.2
Modified Paths:
--------------
csw/mgar/pkg/puppet3/trunk/Makefile
csw/mgar/pkg/puppet3/trunk/checksums
Modified: csw/mgar/pkg/puppet3/trunk/Makefile
===================================================================
--- csw/mgar/pkg/puppet3/trunk/Makefile2013-06-18 19:06:57 UTC (rev 21368)
+++ csw/mgar/pkg/puppet3/trunk/Makefile2013-06-18 19:58:24 UTC (rev 21369)
< at >< at > -3,7 +3,7 < at >< at >
# $Id$
NAME = puppet3
-VERSION = 3.2.1
+VERSION = 3.2.2
GARTYPE = v2
define BLURB
Modified: csw/mgar/pkg/puppet3/trunk/checksums
===================================================================
--- csw/mgar/pkg/puppet3/trunk/checksums2013-06-18 19:06:57 UTC (rev 21368)
+++ csw/mgar/pkg/puppet3/trunk/checksums2013-06-18 19:58:24 UTC (rev 21369)
< at >< at > -2,3 +2,4 < at >< at >
4cbdcc9dfcda677c820175375a500651 puppet-3.1.0.tar.gz
e942079612703a460a9fdb52e6bcae4a puppet-3.1.1.tar.gz
a9bce4fe7a68aebcb6e97256e7faac5b puppet-3.2.1.tar.gz
+318de47ab9e7d41cce98c1cbc5d33cc1 puppet-3.2.2.tar.gz
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
</pre>phipsy-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f< at >public.gmane.org2013-06-18T19:58:25[csw-devel] SF.net SVN: gar:[21368]csw/mgar/pkg/wxwidgets/trunk/Makefile
http://permalink.gmane.org/gmane.os.solaris.opencsw.devel/20263
<pre>Revision: 21368
http://gar.svn.sourceforge.net/gar/?rev=21368&view=rev
Author: lblume
Date: 2013-06-18 19:06:57 +0000 (Tue, 18 Jun 2013)
Log Message:
-----------
wxwidgets/trunk: Add some new overrides just to please checkpkg
Modified Paths:
--------------
csw/mgar/pkg/wxwidgets/trunk/Makefile
Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wxwidgets/trunk/Makefile2013-06-18 15:07:33 UTC (rev 21367)
+++ csw/mgar/pkg/wxwidgets/trunk/Makefile2013-06-18 19:06:57 UTC (rev 21368)
< at >< at > -121,6 +121,10 < at >< at >
# It is built to use GNOME print, so it must be depending on this somehow
CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += surplus-dependency|CSWlibgnomeprintui
+# Okay, I don't quite understand why checkpkg wants these now...
+CHECKPKG_OVERRIDES_CSWwxwidgetscommon += dependency-listed-more-than-once|CSWwxwidgets
+CHECKPKG_OVERRIDES_CSWwxwidgetsdevel += dependency-listed-more-than-once|CSWwxwidgets-dev
+
# Only samples inside code comments, can be safely ignored at this point
CHECKPKG_OVERRIDES_CSWwxwidgets-dev += file-with-bad-content|/usr/share|root/opt/csw/include/wx-2.8/wx/utils.h
CHECKPKG_OVERRIDES_CSWwxwidgets-dev += file-with-bad-content|/usr/local|root/opt/csw/include/wx-2.8/wx/unix/stdpaths.h
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
</pre>lblume-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f< at >public.gmane.org2013-06-18T19:07:03[csw-devel] SF.net SVN: gar:[21367]csw/mgar/pkg/wxwidgets/trunk/Makefile
http://permalink.gmane.org/gmane.os.solaris.opencsw.devel/20262
<pre>Revision: 21367
http://gar.svn.sourceforge.net/gar/?rev=21367&view=rev
Author: lblume
Date: 2013-06-18 15:07:33 +0000 (Tue, 18 Jun 2013)
Log Message:
-----------
wxwidgets/trunk: Reinstate installation of the contrib bits
Modified Paths:
--------------
csw/mgar/pkg/wxwidgets/trunk/Makefile
Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wxwidgets/trunk/Makefile2013-06-18 09:23:21 UTC (rev 21366)
+++ csw/mgar/pkg/wxwidgets/trunk/Makefile2013-06-18 15:07:33 UTC (rev 21367)
< at >< at > -130,7 +130,17 < at >< at >
include gar/category.mk
+INSTALL_SCRIPTS = wxwidgets
+include gar/category.mk
+
+# It is necessary to use this as the contrib subdirectory is not installed
+# by default
+install-wxwidgets:
+(cd $(WORKSRC) && $(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) install)
+(cd $(WORKSRC)/contrib && $(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) install)
+< at >$(MAKECOOKIE)
+
# Remove Studio-specific arch references
post-install-modulated:
gsed -i \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
</pre>lblume-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f< at >public.gmane.org2013-06-18T15:07:44[csw-devel] SF.net SVN: gar:[21366]csw/mgar/pkg/389-ds-base/trunk/Makefile
http://permalink.gmane.org/gmane.os.solaris.opencsw.devel/20261
<pre>Revision: 21366
http://gar.svn.sourceforge.net/gar/?rev=21366&view=rev
Author: cgrzemba
Date: 2013-06-18 09:23:21 +0000 (Tue, 18 Jun 2013)
Log Message:
-----------
389-ds-base/trunk: update runtime dependency icu51
Modified Paths:
--------------
csw/mgar/pkg/389-ds-base/trunk/Makefile
Modified: csw/mgar/pkg/389-ds-base/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/Makefile2013-06-18 09:16:23 UTC (rev 21365)
+++ csw/mgar/pkg/389-ds-base/trunk/Makefile2013-06-18 09:23:21 UTC (rev 21366)
< at >< at > -74,8 +74,8 < at >< at >
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWbdb48
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibcom-err3
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibkrb5-3
-RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicuuc50
-RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicui18n50
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicui18n51
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicuuc51
# RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibk5crypto3
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWpm-mozldap
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibssl3
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
</pre>cgrzemba-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f< at >public.gmane.org2013-06-18T09:23:23[csw-devel] SF.net SVN: gar:[21365] csw/mgar/pkg/389-ds-base/trunk
http://permalink.gmane.org/gmane.os.solaris.opencsw.devel/20260
<pre>Revision: 21365
http://gar.svn.sourceforge.net/gar/?rev=21365&view=rev
Author: cgrzemba
Date: 2013-06-18 09:16:23 +0000 (Tue, 18 Jun 2013)
Log Message:
-----------
389-ds-base/trunk: add fix for ticket 47327
Modified Paths:
--------------
csw/mgar/pkg/389-ds-base/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/389-ds-base/trunk/files/0012-fix-for-47327.patch
Modified: csw/mgar/pkg/389-ds-base/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/Makefile2013-06-18 08:19:01 UTC (rev 21364)
+++ csw/mgar/pkg/389-ds-base/trunk/Makefile2013-06-18 09:16:23 UTC (rev 21365)
< at >< at > -38,6 +38,7 < at >< at >
PATCHFILES += 0010-mntent-config.ac.patch
PATCHFILES += 0011-Makefile.am.patch
PATCHFILES += 0009-fix-for-550-memberuid-not-created.patch
+PATCHFILES += 0012-fix-for-47327.patch
BUILD_DEP_PKGS += CSWautoconf
Added: csw/mgar/pkg/389-ds-base/trunk/files/0012-fix-for-47327.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/files/0012-fix-for-47327.patch (rev 0)
+++ csw/mgar/pkg/389-ds-base/trunk/files/0012-fix-for-47327.patch2013-06-18 09:16:23 UTC (rev 21365)
< at >< at > -0,0 +1,56 < at >< at >
+--- a/ldap/servers/plugins/replication/windows_protocol_util.c
++++ b/ldap/servers/plugins/replication/windows_protocol_util.c
+< at >< at > -3799,8 +3799,7 < at >< at > map_entry_dn_inbound_ext(Slapi_Entry *e, Slapi_DN **dn, const Repl_Agmt *ra, int
+ windows_private_get_windows_subtree(ra));
+ }
+ }
+-new_dn = slapi_sdn_new_dn_byval(new_dn_string);
+-PR_smprintf_free(new_dn_string);
++new_dn = slapi_sdn_new_normdn_passin(new_dn_string);
+ slapi_ch_free_string(&container_str);
+ /* Clear any earlier error */
+ retval = 0;
+< at >< at > -3895,6 +3894,7 < at >< at > is_subject_of_agreement_remote(Slapi_Entry *e, const Repl_Agmt *ra)
+ int retval = 0;
+ int is_in_subtree = 0;
+ const Slapi_DN *agreement_subtree = NULL;
++const Slapi_DN *sdn;
+
+ /* First test for the sync'ed subtree */
+ agreement_subtree = windows_private_get_windows_subtree(ra);
+< at >< at > -3902,10 +3902,33 < at >< at > is_subject_of_agreement_remote(Slapi_Entry *e, const Repl_Agmt *ra)
+ {
+ goto error;
+ }
+-is_in_subtree = slapi_sdn_scope_test(slapi_entry_get_sdn_const(e), agreement_subtree, LDAP_SCOPE_SUBTREE);
++sdn = slapi_entry_get_sdn_const(e);
++ is_in_subtree = slapi_sdn_scope_test(sdn, agreement_subtree, LDAP_SCOPE_SUBTREE);
+ if (is_in_subtree)
+ {
+-retval = 1;
++ Slapi_DN psdn = {0};
++ Slapi_Entry *pentry = NULL;
++ /*
++ * Check whether the parent of the entry exists or not.
++ * If it does not, treat the entry e is out of scope.
++ * For instance, agreement_subtree is cn=USER,<SUFFIX>
++ * cn=container,cn=USER,<SUFFIX> is not synchronized.
++ * If 'e' is uid=test,cn=container,cn=USER,<SUFFIX>,
++ * the entry is not synchronized, either. We treat
++ * 'e' as out of scope.
++ */
++ slapi_sdn_get_parent(sdn, &psdn);
++ if (0 == slapi_sdn_compare(&psdn, agreement_subtree)) {
++ retval = 1;
++ } else {
++ /* If parent entry is not local, the entry is out of scope */
++ int rc = windows_get_local_entry(&psdn, &pentry);
++ if ((0 == rc) && pentry) {
++ retval = 1;
++ slapi_entry_free(pentry);
++ }
++ }
++ slapi_sdn_done(&psdn);
+ }
+ error:
+ return retval;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
</pre>cgrzemba-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f< at >public.gmane.org2013-06-18T09:16:25[csw-devel] SF.net SVN: gar:[21364]csw/mgar/pkg/bsdiff/trunk/Makefile
http://permalink.gmane.org/gmane.os.solaris.opencsw.devel/20259
<pre>Revision: 21364
http://gar.svn.sourceforge.net/gar/?rev=21364&view=rev
Author: dmichelsen
Date: 2013-06-18 08:19:01 +0000 (Tue, 18 Jun 2013)
Log Message:
-----------
bsdiff/trunk: Enable LD_OPTIONS for direct binding
Modified Paths:
--------------
csw/mgar/pkg/bsdiff/trunk/Makefile
Modified: csw/mgar/pkg/bsdiff/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bsdiff/trunk/Makefile2013-06-18 06:55:17 UTC (rev 21363)
+++ csw/mgar/pkg/bsdiff/trunk/Makefile2013-06-18 08:19:01 UTC (rev 21364)
< at >< at > -19,6 +19,9 < at >< at >
SPKG_DESC_CSWmypkg = Binary diff/patch utility
# PKGFILES is catchall
+BUILD64 = 1
+ISAEXEC = 1
+
EXTRA_CFLAGS += -I.
CONFIGURE_SCRIPTS =
< at >< at > -29,8 +32,8 < at >< at >
include gar/category.mk
build-custom:
-cd $(WORKSRC) && $(CC) $(CFLAGS) -lbz2 -o bsdiff bsdiff.c err.c
-cd $(WORKSRC) && $(CC) $(CFLAGS) -lbz2 -o bspatch bspatch.c err.c
+cd $(WORKSRC) && LD_OPTIONS="$(LD_OPTIONS)" $(CC) $(CFLAGS) -lbz2 -o bsdiff bsdiff.c err.c
+cd $(WORKSRC) && LD_OPTIONS="$(LD_OPTIONS)" $(CC) $(CFLAGS) -lbz2 -o bspatch bspatch.c err.c
< at >$(MAKECOOKIE)
install-custom:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
</pre>dmichelsen-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f< at >public.gmane.org2013-06-18T08:19:12[csw-devel] SF.net SVN: gar:[21363] csw/mgar/pkg/wireshark/trunk
http://permalink.gmane.org/gmane.os.solaris.opencsw.devel/20258
<pre>Revision: 21363
http://gar.svn.sourceforge.net/gar/?rev=21363&view=rev
Author: dmichelsen
Date: 2013-06-18 06:55:17 +0000 (Tue, 18 Jun 2013)
Log Message:
-----------
wireshark/trunk: Update to 1.10.0, enable lua again
Modified Paths:
--------------
csw/mgar/pkg/wireshark/trunk/Makefile
csw/mgar/pkg/wireshark/trunk/checksums
Modified: csw/mgar/pkg/wireshark/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wireshark/trunk/Makefile2013-06-17 21:28:50 UTC (rev 21362)
+++ csw/mgar/pkg/wireshark/trunk/Makefile2013-06-18 06:55:17 UTC (rev 21363)
< at >< at > -1,5 +1,5 < at >< at >
NAME = wireshark
-VERSION = 1.8.6
+VERSION = 1.10.0
GARTYPE = v2
DESCRIPTION = Wireshark (was Ethereal) is a free network protocol analyzer
< at >< at > -49,7 +49,7 < at >< at >
RUNTIME_DEP_PKGS_CSWwireshark += CSWlibsmi2
RUNTIME_DEP_PKGS_CSWwireshark += CSWlibkrb5-3
RUNTIME_DEP_PKGS_CSWwireshark += CSWlibk5crypto3
-RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgnutls26
+RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgnutls28
RUNTIME_DEP_PKGS_CSWwireshark += CSWlibcairo2
RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgeoip1
RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgmodule2-0-0
< at >< at > -58,6 +58,7 < at >< at >
RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgobject2-0-0
RUNTIME_DEP_PKGS_CSWwireshark += CSWlibglib2-0-0
RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgtk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWwireshark += CSWliblua5-2
# No more library splitting unless absolutely necessary
CHECKPKG_OVERRIDES_CSWwireshark += shared-lib-package-contains-so-symlink
< at >< at > -81,14 +82,13 < at >< at >
REINPLACE_WITH_mibs = /opt/csw/share/mibs
REINPLACE_FILES_mibs += epan/oids.c
-# Do not use LD_OPTIONS as it leads to the new version being built against old
-# wireshark private libs
-#LD_OPTIONS =
-#EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
-
# This is now deprecated in Pango, use workaround until Pango is updated
EXTRA_CFLAGS += -DG_CONST_RETURN=const
+# Hardcode ipv6 until this is fixed (taken from acinclude.m4):
+# https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8813
+#EXTRA_CFLAGS += -DINET6 -DSOLARIS8_INET6
+
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --enable-usr-local=no
CONFIGURE_ARGS += --with-ssl=/opt/csw
Modified: csw/mgar/pkg/wireshark/trunk/checksums
===================================================================
--- csw/mgar/pkg/wireshark/trunk/checksums2013-06-17 21:28:50 UTC (rev 21362)
+++ csw/mgar/pkg/wireshark/trunk/checksums2013-06-18 06:55:17 UTC (rev 21363)
< at >< at > -1 +1 < at >< at >
-317361e701936c72f7f18f857059b944 wireshark-1.8.6.tar.bz2
+72e51cd33fd33c7044a41c2ab51ad7af wireshark-1.10.0.tar.bz2
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
</pre>dmichelsen-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f< at >public.gmane.org2013-06-18T06:55:24[csw-devel] SF.net SVN: gar:[21362]csw/mgar/pkg/apache2/trunk/Makefile
http://permalink.gmane.org/gmane.os.solaris.opencsw.devel/20257
<pre>Revision: 21362
http://gar.svn.sourceforge.net/gar/?rev=21362&view=rev
Author: bdwalton
Date: 2013-06-17 21:28:50 +0000 (Mon, 17 Jun 2013)
Log Message:
-----------
apache2/trunk: handle the post-merge step correctly when ensuring the envvars files live in etc
Modified Paths:
--------------
csw/mgar/pkg/apache2/trunk/Makefile
Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile2013-06-17 20:43:55 UTC (rev 21361)
+++ csw/mgar/pkg/apache2/trunk/Makefile2013-06-17 21:28:50 UTC (rev 21362)
< at >< at > -342,6 +342,6 < at >< at >
perl -pi -e 's< at >/usr/local/bin< at >/opt/csw/bin< at >g' *)
< at >echo Adding link from original envvars location
< at >(cd $(PKGROOT)/$(prefix)/apache2/sbin; \
-ln -s ../etc/envvars envvars )
+ [ -L envvars ] || ln -s ../etc/envvars envvars )
< at >$(MAKECOOKIE)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
</pre>bdwalton-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f< at >public.gmane.org2013-06-17T21:28:54[csw-devel] SF.net SVN: gar:[21361] csw/mgar/pkg/apache2/trunk
http://permalink.gmane.org/gmane.os.solaris.opencsw.devel/20256
<pre>Revision: 21361
http://gar.svn.sourceforge.net/gar/?rev=21361&view=rev
Author: bdwalton
Date: 2013-06-17 20:43:55 +0000 (Mon, 17 Jun 2013)
Log Message:
-----------
apache2/trunk: version bump
Modified Paths:
--------------
csw/mgar/pkg/apache2/trunk/Makefile
csw/mgar/pkg/apache2/trunk/checksums
Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile2013-06-17 13:33:32 UTC (rev 21360)
+++ csw/mgar/pkg/apache2/trunk/Makefile2013-06-17 20:43:55 UTC (rev 21361)
< at >< at > -1,7 +1,7 < at >< at >
# $Id$
NAME = httpd
-VERSION = 2.2.23
+VERSION = 2.2.24
GARTYPE = v2
DESCRIPTION = A high performance HTTP server.
Modified: csw/mgar/pkg/apache2/trunk/checksums
===================================================================
--- csw/mgar/pkg/apache2/trunk/checksums2013-06-17 13:33:32 UTC (rev 21360)
+++ csw/mgar/pkg/apache2/trunk/checksums2013-06-17 20:43:55 UTC (rev 21361)
< at >< at > -1 +1 < at >< at >
-77246eaa84a54bb7451f68216333750d httpd-2.2.23.tar.gz
+64a3392018ad60583209a16d728180d3 httpd-2.2.24.tar.gz
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
</pre>bdwalton-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f< at >public.gmane.org2013-06-17T20:43:56[csw-devel] SF.net SVN: gar:[21360]csw/mgar/pkg/tracker/trunk/Makefile
http://permalink.gmane.org/gmane.os.solaris.opencsw.devel/20255
<pre>Revision: 21360
http://gar.svn.sourceforge.net/gar/?rev=21360&view=rev
Author: slowfranklin
Date: 2013-06-17 13:33:32 +0000 (Mon, 17 Jun 2013)
Log Message:
-----------
tracker/trunk: Use pkgfiles_lib for picking up the shared libs
Modified Paths:
--------------
csw/mgar/pkg/tracker/trunk/Makefile
Modified: csw/mgar/pkg/tracker/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tracker/trunk/Makefile2013-06-17 13:26:26 UTC (rev 21359)
+++ csw/mgar/pkg/tracker/trunk/Makefile2013-06-17 13:33:32 UTC (rev 21360)
< at >< at > -123,26 +123,21 < at >< at >
PACKAGES += CSWlibtracker-common
SPKG_DESC_CSWlibtracker-common += $(DESCRIPTION), libtracker-common
-PKGFILES_CSWlibtracker-common += $(call baseisadirs,$(libdir),tracker-0\.16/libtracker-data\.so\.0\.1502\.0)
-PKGFILES_CSWlibtracker-common += $(call baseisadirs,$(libdir),tracker-0\.16/libtracker-data\.so\.0(\.\d+)*)
-PKGFILES_CSWlibtracker-common += $(call baseisadirs,$(libdir),tracker-0\.16/libtracker-common\.so\.0\.1502\.0)
-PKGFILES_CSWlibtracker-common += $(call baseisadirs,$(libdir),tracker-0\.16/libtracker-common\.so\.0(\.\d+)*)
+PKGFILES_CSWlibtracker-common += $(call pkgfiles_lib,tracker-0.16/libtracker-common.so.0)
+PKGFILES_CSWlibtracker-common += $(call pkgfiles_lib,tracker-0.16/libtracker-data.so.0)
PACKAGES += CSWlibtracker-extract0-16-0
SPKG_DESC_CSWlibtracker-extract0-16-0 += $(DESCRIPTION), libtracker-extract-0.16.so.0
-PKGFILES_CSWlibtracker-extract0-16-0 += $(call baseisadirs,$(libdir),libtracker-extract-0\.16\.so\.0\.1502\.0)
-PKGFILES_CSWlibtracker-extract0-16-0 += $(call baseisadirs,$(libdir),libtracker-extract-0\.16\.so\.0(\.\d+)*)
+PKGFILES_CSWlibtracker-extract0-16-0 += $(call pkgfiles_lib,libtracker-extract-0.16.so.0)
PKGFILES_CSWlibtracker-extract0-16-0 += $(call baseisadirs,$(libdir),tracker-0\.16/extract-modules/libextract-.*\.so)
PACKAGES += CSWlibtracker-miner0-16-0
SPKG_DESC_CSWlibtracker-miner0-16-0 += $(DESCRIPTION), libtracker-miner-0.16.so.0
-PKGFILES_CSWlibtracker-miner0-16-0 += $(call baseisadirs,$(libdir),libtracker-miner-0\.16\.so\.0\.1502\.0)
-PKGFILES_CSWlibtracker-miner0-16-0 += $(call baseisadirs,$(libdir),libtracker-miner-0\.16\.so\.0(\.\d+)*)
+PKGFILES_CSWlibtracker-miner0-16-0 += $(call pkgfiles_lib,libtracker-miner-0.16.so.0)
PACKAGES += CSWlibtracker-sparql0-16-0
SPKG_DESC_CSWlibtracker-sparql0-16-0 += $(DESCRIPTION), libtracker-sparql-0.16.so.0
-PKGFILES_CSWlibtracker-sparql0-16-0 += $(call baseisadirs,$(libdir),libtracker-sparql-0\.16\.so\.0\.1502\.0)
-PKGFILES_CSWlibtracker-sparql0-16-0 += $(call baseisadirs,$(libdir),libtracker-sparql-0\.16\.so\.0(\.\d+)*)
+PKGFILES_CSWlibtracker-sparql0-16-0 += $(call pkgfiles_lib,libtracker-sparql-0.16.so.0)
PACKAGES += CSWlibtracker-dev
SPKG_DESC_CSWlibtracker-dev += $(DESCRIPTION), development files
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
</pre>slowfranklin-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f< at >public.gmane.org2013-06-17T13:33:32[csw-devel] SF.net SVN: gar:[21359]csw/mgar/pkg/wxwidgets/trunk/Makefile
http://permalink.gmane.org/gmane.os.solaris.opencsw.devel/20254
<pre>Revision: 21359
http://gar.svn.sourceforge.net/gar/?rev=21359&view=rev
Author: lblume
Date: 2013-06-17 13:26:26 +0000 (Mon, 17 Jun 2013)
Log Message:
-----------
wxwidgets/trunk: Add override for gnomeprintui dep
Modified Paths:
--------------
csw/mgar/pkg/wxwidgets/trunk/Makefile
Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wxwidgets/trunk/Makefile2013-06-17 13:07:39 UTC (rev 21358)
+++ csw/mgar/pkg/wxwidgets/trunk/Makefile2013-06-17 13:26:26 UTC (rev 21359)
< at >< at > -118,6 +118,9 < at >< at >
CHECKPKG_OVERRIDES_CSWwxwidgets = shared-lib-pkgname-mismatch
CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 = shared-lib-pkgname-mismatch
+# It is built to use GNOME print, so it must be depending on this somehow
+CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += surplus-dependency|CSWlibgnomeprintui
+
# Only samples inside code comments, can be safely ignored at this point
CHECKPKG_OVERRIDES_CSWwxwidgets-dev += file-with-bad-content|/usr/share|root/opt/csw/include/wx-2.8/wx/utils.h
CHECKPKG_OVERRIDES_CSWwxwidgets-dev += file-with-bad-content|/usr/local|root/opt/csw/include/wx-2.8/wx/unix/stdpaths.h
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
</pre>lblume-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f< at >public.gmane.org2013-06-17T13:26:27[csw-devel] SF.net SVN: gar:[21358]csw/mgar/pkg/tracker/trunk/Makefile
http://permalink.gmane.org/gmane.os.solaris.opencsw.devel/20253
<pre>Revision: 21358
http://gar.svn.sourceforge.net/gar/?rev=21358&view=rev
Author: slowfranklin
Date: 2013-06-17 13:07:39 +0000 (Mon, 17 Jun 2013)
Log Message:
-----------
tracker/trunk: .so files are already picked up by PKGFILES_DEVEL
Modified Paths:
--------------
csw/mgar/pkg/tracker/trunk/Makefile
Modified: csw/mgar/pkg/tracker/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tracker/trunk/Makefile2013-06-17 12:45:03 UTC (rev 21357)
+++ csw/mgar/pkg/tracker/trunk/Makefile2013-06-17 13:07:39 UTC (rev 21358)
< at >< at > -147,9 +147,6 < at >< at >
PACKAGES += CSWlibtracker-dev
SPKG_DESC_CSWlibtracker-dev += $(DESCRIPTION), development files
PKGFILES_CSWlibtracker-dev += $(PKGFILES_DEVEL)
-PKGFILES_CSWlibtracker-dev += $(call baseisadirs,$(libdir),libtracker-extract-0\.16\.so)
-PKGFILES_CSWlibtracker-dev += $(call baseisadirs,$(libdir),libtracker-miner-0\.16\.so)
-PKGFILES_CSWlibtracker-dev += $(call baseisadirs,$(libdir),libtracker-sparql-0\.16\.so)
PKGFILES_CSWlibtracker-dev += $(call baseisadirs,$(libdir),tracker-0\.16/libtracker-common\.so)
PKGFILES_CSWlibtracker-dev += $(call baseisadirs,$(libdir),tracker-0\.16/libtracker-data\.so)
PKGFILES_CSWlibtracker-dev += $(datadir)/vala/vapi/tracker-.*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
</pre>slowfranklin-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f< at >public.gmane.org2013-06-17T13:07:40[csw-devel] SF.net SVN: gar:[21357]csw/mgar/pkg/tracker/trunk/Makefile
http://permalink.gmane.org/gmane.os.solaris.opencsw.devel/20252
<pre>Revision: 21357
http://gar.svn.sourceforge.net/gar/?rev=21357&view=rev
Author: slowfranklin
Date: 2013-06-17 12:45:03 +0000 (Mon, 17 Jun 2013)
Log Message:
-----------
tracker/trunk: Remove version from dev package
Modified Paths:
--------------
csw/mgar/pkg/tracker/trunk/Makefile
Modified: csw/mgar/pkg/tracker/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tracker/trunk/Makefile2013-06-17 12:03:54 UTC (rev 21356)
+++ csw/mgar/pkg/tracker/trunk/Makefile2013-06-17 12:45:03 UTC (rev 21357)
< at >< at > -94,10 +94,10 < at >< at >
RUNTIME_DEP_PKGS_CSWlibtracker-miner0-16-0 += CSWlibtracker-sparql0-16-0
RUNTIME_DEP_PKGS_CSWlibtracker-miner0-16-0 += CSWlibtracker-common
-RUNTIME_DEP_PKGS_CSWlibtracker0-16-dev += CSWlibtracker-miner0-16-0
-RUNTIME_DEP_PKGS_CSWlibtracker0-16-dev += CSWlibtracker-extract0-16-0
-RUNTIME_DEP_PKGS_CSWlibtracker0-16-dev += CSWlibtracker-sparql0-16-0
-RUNTIME_DEP_PKGS_CSWlibtracker0-16-dev += CSWlibtracker-common
+RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-miner0-16-0
+RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-extract0-16-0
+RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-sparql0-16-0
+RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-common
RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibsqlite3-0
RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibicui18n51
< at >< at > -144,15 +144,15 < at >< at >
PKGFILES_CSWlibtracker-sparql0-16-0 += $(call baseisadirs,$(libdir),libtracker-sparql-0\.16\.so\.0\.1502\.0)
PKGFILES_CSWlibtracker-sparql0-16-0 += $(call baseisadirs,$(libdir),libtracker-sparql-0\.16\.so\.0(\.\d+)*)
-PACKAGES += CSWlibtracker0-16-dev
-SPKG_DESC_CSWlibtracker0-16-dev += $(DESCRIPTION), development files
-PKGFILES_CSWlibtracker0-16-dev += $(PKGFILES_DEVEL)
-PKGFILES_CSWlibtracker0-16-dev += $(call baseisadirs,$(libdir),libtracker-extract-0\.16\.so)
-PKGFILES_CSWlibtracker0-16-dev += $(call baseisadirs,$(libdir),libtracker-miner-0\.16\.so)
-PKGFILES_CSWlibtracker0-16-dev += $(call baseisadirs,$(libdir),libtracker-sparql-0\.16\.so)
-PKGFILES_CSWlibtracker0-16-dev += $(call baseisadirs,$(libdir),tracker-0\.16/libtracker-common\.so)
-PKGFILES_CSWlibtracker0-16-dev += $(call baseisadirs,$(libdir),tracker-0\.16/libtracker-data\.so)
-PKGFILES_CSWlibtracker0-16-dev += $(datadir)/vala/vapi/tracker-.*
+PACKAGES += CSWlibtracker-dev
+SPKG_DESC_CSWlibtracker-dev += $(DESCRIPTION), development files
+PKGFILES_CSWlibtracker-dev += $(PKGFILES_DEVEL)
+PKGFILES_CSWlibtracker-dev += $(call baseisadirs,$(libdir),libtracker-extract-0\.16\.so)
+PKGFILES_CSWlibtracker-dev += $(call baseisadirs,$(libdir),libtracker-miner-0\.16\.so)
+PKGFILES_CSWlibtracker-dev += $(call baseisadirs,$(libdir),libtracker-sparql-0\.16\.so)
+PKGFILES_CSWlibtracker-dev += $(call baseisadirs,$(libdir),tracker-0\.16/libtracker-common\.so)
+PKGFILES_CSWlibtracker-dev += $(call baseisadirs,$(libdir),tracker-0\.16/libtracker-data\.so)
+PKGFILES_CSWlibtracker-dev += $(datadir)/vala/vapi/tracker-.*
# For gettext
CONFIGURE_ENV_PATH = /opt/csw/gnu:$(PATH)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
</pre>slowfranklin-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f< at >public.gmane.org2013-06-17T12:45:05[csw-devel] SF.net SVN: gar:[21356] csw/mgar/pkg/wxwidgets/trunk
http://permalink.gmane.org/gmane.os.solaris.opencsw.devel/20251
<pre>Revision: 21356
http://gar.svn.sourceforge.net/gar/?rev=21356&view=rev
Author: lblume
Date: 2013-06-17 12:03:54 +0000 (Mon, 17 Jun 2013)
Log Message:
-----------
wxwidgets/trunk: Fix building with print support
Modified Paths:
--------------
csw/mgar/pkg/wxwidgets/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/wxwidgets/trunk/files/0006-configure-gnome-print-headers.patch
Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wxwidgets/trunk/Makefile2013-06-17 11:29:33 UTC (rev 21355)
+++ csw/mgar/pkg/wxwidgets/trunk/Makefile2013-06-17 12:03:54 UTC (rev 21356)
< at >< at > -19,6 +19,8 < at >< at >
MASTER_SITES = $(SF_MIRRORS)
SF_PROJECT = wxwindows
+PATCHFILES += 0006-configure-gnome-print-headers.patch
+
PACKAGES = CSWwxwidgets
PACKAGES += CSWwxwidgets-dev
PACKAGES += CSWwxwidgetsgtk2
< at >< at > -43,6 +45,7 < at >< at >
RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibglib2-0-0
RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWmesa
RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWpango
+RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibgnomeprintui
RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWwxwidgets
RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWwxwidgetsgtk2
< at >< at > -70,6 +73,7 < at >< at >
BUILD_DEP_PKGS += CSWlibiconv-dev
BUILD_DEP_PKGS += CSWggettext-dev
BUILD_DEP_PKGS += CSWlibexpat-dev
+BUILD_DEP_PKGS += CSWlibgnomeprintdevel
# Easier than defining each individual .so.xxx
PKGFILES_CSWwxwidgets = $(libdir).*libwx_base.*\.so\..*
< at >< at > -99,8 +103,8 < at >< at >
CONFIGURE_ARGS += --with-regex
CONFIGURE_ARGS += --with-opengl
CONFIGURE_ARGS += --enable-unicode
-CONFIGURE_ARGS += --enable-printarch=no
-CONFIGURE_ARGS += --with-gnomeprint=no
+CONFIGURE_ARGS += --enable-printarch=yes
+CONFIGURE_ARGS += --with-gnomeprint=yes
# -norunpath is needed for LDFLAGS as CC is used as linker. Not cc, so no
# problem with it being a C++compiler parameter
Added: csw/mgar/pkg/wxwidgets/trunk/files/0006-configure-gnome-print-headers.patch
===================================================================
--- csw/mgar/pkg/wxwidgets/trunk/files/0006-configure-gnome-print-headers.patch (rev 0)
+++ csw/mgar/pkg/wxwidgets/trunk/files/0006-configure-gnome-print-headers.patch2013-06-17 12:03:54 UTC (rev 21356)
< at >< at > -0,0 +1,11 < at >< at >
+--- a/configure.originalTue Mar 22 12:59:37 2011
++++ b/configureMon Jun 17 12:04:00 2013
+< at >< at > -43415,7 +43415,7 < at >< at >
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_LIBGNOMEPRINTUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomeprintui-2.2 >= 2.8" 2>/dev/null`
++ pkg_cv_LIBGNOMEPRINTUI_CFLAGS="`$PKG_CONFIG --cflags "libgnomeprintui-2.2 >= 2.8" 2>/dev/null` `$PKG_CONFIG --cflags "libgnomeprint-2.2 >= 2.8" 2>/dev/null`"
+ else
+ pkg_failed=yes
+ fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
</pre>lblume-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f< at >public.gmane.org2013-06-17T12:03:58[csw-devel] SF.net SVN: gar:[21355] csw/mgar/pkg/rapidsvn/trunk
http://permalink.gmane.org/gmane.os.solaris.opencsw.devel/20250
<pre>Revision: 21355
http://gar.svn.sourceforge.net/gar/?rev=21355&view=rev
Author: dmichelsen
Date: 2013-06-17 11:29:33 +0000 (Mon, 17 Jun 2013)
Log Message:
-----------
rapidsvn/trunk: Update to 0.12.1, split packages
Modified Paths:
--------------
csw/mgar/pkg/rapidsvn/trunk/Makefile
csw/mgar/pkg/rapidsvn/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/rapidsvn/trunk/files/0001-Add-missing-svncpp.dox-not-in-tarball.patch
csw/mgar/pkg/rapidsvn/trunk/files/0001-Do-not-strip-norunpath-on-libtool.patch
Removed Paths:
-------------
csw/mgar/pkg/rapidsvn/trunk/files/0002-Make-sure-to-pass-norunpath-through-libtool.patch
Modified: csw/mgar/pkg/rapidsvn/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rapidsvn/trunk/Makefile2013-06-17 11:23:05 UTC (rev 21354)
+++ csw/mgar/pkg/rapidsvn/trunk/Makefile2013-06-17 11:29:33 UTC (rev 21355)
< at >< at > -1,6 +1,5 < at >< at >
NAME = rapidsvn
-VERSION = 0.12.0-1
-SPKG_VERSION = $(subst -,.,$(VERSION))
+VERSION = 0.12.1
GARTYPE = v2
DESCRIPTION = GUI front-end for the Subversion revision system
< at >< at > -11,70 +10,64 < at >< at >
are working on the Documentation and Online Help of RapidSVN
endef
-MASTER_SITES = http://www.rapidsvn.org/download/release/0.12/
+MASTER_SITES = http://www.rapidsvn.org/download/release/0.12.1/
DISTFILES = $(NAME)-$(VERSION).tar.gz
-# DISTFILES += $(call admfiles,CSWrapidsvn,depend prototype)
-# DISTFILES += $(call admfiles,CSWsvncpp,depend prototype)
-PATCHFILES = 0001-Use-explicit-constructor-for-wxString.patch
-PATCHFILES += 0002-Make-sure-to-pass-norunpath-through-libtool.patch
+PATCHFILES += 0001-Use-explicit-constructor-for-wxString.patch
+PATCHFILES += 0001-Do-not-strip-norunpath-on-libtool.patch
+PATCHFILES += 0001-Add-missing-svncpp.dox-not-in-tarball.patch
# We define upstream file regex so we can be notifed of new upstream software release
UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-PACKAGES = CSWrapidsvn CSWlibsvncpp3
+VENDOR_URL = http://rapidsvn.tigris.org/
-CATALOGNAME_CSWrapidsvn = rapidsvn
-CATALOGNAME_CSWlibsvncpp3 = libsvncpp3
+BUILD_DEP_PKGS += CSWsvn-dev
+BUILD_DEP_PKGS += CSWapache2-dev
+BUILD_DEP_PKGS += CSWdocbookxsl
+PACKAGES += CSWrapidsvn
SPKG_DESC_CSWrapidsvn = $(DESCRIPTION)
-SPKG_DESC_CSWlibsvncpp3 = Subversion C++ language binding
-
-SPKG_SOURCEURL = http://rapidsvn.tigris.org/
-
-BUILD_DEP_PKGS = CSWsvn-devel CSWapache2-devel
-
-RUNTIME_DEP_PKGS_CSWrapidsvn += CSWwxwidgetscommon
-RUNTIME_DEP_PKGS_CSWrapidsvn += CSWoldaprt
-RUNTIME_DEP_PKGS_CSWrapidsvn += CSWapr
-RUNTIME_DEP_PKGS_CSWrapidsvn += CSWwxwidgetsgtk2
-RUNTIME_DEP_PKGS_CSWrapidsvn += CSWexpat
-RUNTIME_DEP_PKGS_CSWrapidsvn += CSWbdb48
-RUNTIME_DEP_PKGS_CSWrapidsvn += CSWncurses
-RUNTIME_DEP_PKGS_CSWrapidsvn += CSWapr-util
-RUNTIME_DEP_PKGS_CSWrapidsvn += CSWsunmath
-RUNTIME_DEP_PKGS_CSWrapidsvn += CSWiconv
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWrapidsvn += CSWwxwidgets
+RUNTIME_DEP_PKGS_CSWrapidsvn += CSWlibapr1-0
RUNTIME_DEP_PKGS_CSWrapidsvn += CSWlibsvncpp3
RUNTIME_DEP_PKGS_CSWrapidsvn += CSWsvn
+RUNTIME_DEP_PKGS_CSWrapidsvn += CSWwxwidgetsgtk2
-BUILD_DEP_PKGS += CSWdocbookxsl
+PACKAGES += CSWlibsvncpp3
+SPKG_DESC_CSWlibsvncpp3 = Subversion C++ language binding
+PKGFILES_CSWlibsvncpp3 += $(call pkgfiles_lib,libsvncpp.so.3)
+
+PACKAGES += CSWlibsvncpp-dev
+SPKG_DESC_CSWlibsvncpp-dev = Development files for libsvncpp.so.3
+PKGFILES_CSWlibsvncpp-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWlibsvncpp-dev += CSWlibsvncpp3
+
DOCBOOK_MANPAGE = $(sharedstatedir)/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl
APR_CONFIG = $(bindir)/apr-1-config
APU_CONFIG = $(bindir)/apu-1-config
SVNLIBDIR = $(libdir)/svn
+EXTRA_LINKER_FLAGS += -norunpath
+
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --with-apr-config=$(APR_CONFIG)
CONFIGURE_ARGS += --with-apu-config=$(APU_CONFIG)
CONFIGURE_ARGS += --with-svn-lib=$(SVNLIBDIR)
CONFIGURE_ARGS += --with-svn-include=$(includedir)
CONFIGURE_ARGS += --with-docbook-xsl-manpages=$(DOCBOOK_MANPAGE)
+CONFIGURE_ARGS += --with-manpage=yes
# This must match the apr bdb binding. We need this to make sure
# libdb.so is found at the correct place.
EXTRA_LIB = $(SVNLIBDIR) $(prefix)/bdb48/lib
-PKGFILES_CSWlibsvncpp3 = $(PKGFILES_RT)
-PKGFILES_CSWlibsvncpp3 += $(PKGFILES_DEVEL)
-
-# We don't have a devel package
-CHECKPKG_OVERRIDES_CSWlibsvncpp3 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libsvncpp.so
-
include gar/category.mk
-post-install-modulated:
-ginstall -d $(DESTDIR)$(mandir)/man1
-ginstall $(WORKSRC)/doc/manpage/rapidsvn.1 $(DESTDIR)$(mandir)/man1
-< at >$(MAKECOOKIE)
+#post-install-modulated:
+#ginstall -d $(DESTDIR)$(mandir)/man1
+#ginstall $(WORKSRC)/doc/manpage/rapidsvn.1 $(DESTDIR)$(mandir)/man1
+#< at >$(MAKECOOKIE)
Modified: csw/mgar/pkg/rapidsvn/trunk/checksums
===================================================================
--- csw/mgar/pkg/rapidsvn/trunk/checksums2013-06-17 11:23:05 UTC (rev 21354)
+++ csw/mgar/pkg/rapidsvn/trunk/checksums2013-06-17 11:29:33 UTC (rev 21355)
< at >< at > -1 +1 < at >< at >
-8ec54104fca32d81e396a68e25324263 rapidsvn-0.12.0-1.tar.gz
+8de3ca6da3ef6a27d59f959d1bbcd96b rapidsvn-0.12.1.tar.gz
Added: csw/mgar/pkg/rapidsvn/trunk/files/0001-Add-missing-svncpp.dox-not-in-tarball.patch
===================================================================
--- csw/mgar/pkg/rapidsvn/trunk/files/0001-Add-missing-svncpp.dox-not-in-tarball.patch (rev 0)
+++ csw/mgar/pkg/rapidsvn/trunk/files/0001-Add-missing-svncpp.dox-not-in-tarball.patch2013-06-17 11:29:33 UTC (rev 21355)
< at >< at > -0,0 +1,202 < at >< at >
+From 63cd5923fb6ec46ec7b1415a22cf0540518b5bcb Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam-RJLij68YbUJAfugRpC6u6w< at >public.gmane.org>
+Date: Mon, 17 Jun 2013 11:04:48 +0200
+Subject: [PATCH] Add missing svncpp.dox not in tarball
+
+---
+ doc/svncpp/svncpp.dox | 183 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 183 insertions(+)
+ create mode 100644 doc/svncpp/svncpp.dox
+
+diff --git a/doc/svncpp/svncpp.dox b/doc/svncpp/svncpp.dox
+new file mode 100644
+index 0000000..b60e62b
+--- /dev/null
++++ b/doc/svncpp/svncpp.dox
+< at >< at > -0,0 +1,183 < at >< at >
++# Doxyfile for SvnCpp
++# To build this documentation download Doxygen http://www.doxygen.org/
++
++#---------------------------------------------------------------------------
++# General configuration options
++#---------------------------------------------------------------------------
++PROJECT_NAME = SvnCpp
++PROJECT_NUMBER =
++OUTPUT_DIRECTORY = .
++OUTPUT_LANGUAGE = English
++EXTRACT_ALL = YES
++EXTRACT_PRIVATE = NO
++EXTRACT_STATIC = NO
++EXTRACT_LOCAL_CLASSES = YES
++HIDE_UNDOC_MEMBERS = NO
++HIDE_UNDOC_CLASSES = NO
++BRIEF_MEMBER_DESC = YES
++REPEAT_BRIEF = YES
++ALWAYS_DETAILED_SEC = NO
++INLINE_INHERITED_MEMB = NO
++FULL_PATH_NAMES = NO
++STRIP_FROM_PATH =
++INTERNAL_DOCS = NO
++STRIP_CODE_COMMENTS = YES
++CASE_SENSE_NAMES = YES
++SHORT_NAMES = NO
++HIDE_SCOPE_NAMES = NO
++VERBATIM_HEADERS = YES
++SHOW_INCLUDE_FILES = YES
++JAVADOC_AUTOBRIEF = NO
++MULTILINE_CPP_IS_BRIEF = NO
++DETAILS_AT_TOP = NO
++INHERIT_DOCS = YES
++INLINE_INFO = YES
++SORT_MEMBER_DOCS = YES
++DISTRIBUTE_GROUP_DOC = NO
++TAB_SIZE = 8
++GENERATE_TODOLIST = YES
++GENERATE_TESTLIST = YES
++GENERATE_BUGLIST = YES
++ALIASES =
++ENABLED_SECTIONS =
++MAX_INITIALIZER_LINES = 30
++OPTIMIZE_OUTPUT_FOR_C = YES
++OPTIMIZE_OUTPUT_JAVA = NO
++SHOW_USED_FILES = YES
++#---------------------------------------------------------------------------
++# configuration options related to warning and progress messages
++#---------------------------------------------------------------------------
++QUIET = NO
++WARNINGS = YES
++WARN_IF_UNDOCUMENTED = NO
++WARN_FORMAT = "$file:$line: $text"
++WARN_LOGFILE =
++#---------------------------------------------------------------------------
++# configuration options related to the input files
++#---------------------------------------------------------------------------
++INPUT = ../../include/svncpp
++FILE_PATTERNS = *.hpp
++RECURSIVE = NO
++EXCLUDE =
++EXCLUDE_SYMLINKS = NO
++EXCLUDE_PATTERNS =
++EXAMPLE_PATH =
++EXAMPLE_PATTERNS =
++EXAMPLE_RECURSIVE = NO
++IMAGE_PATH =
++INPUT_FILTER =
++FILTER_SOURCE_FILES = NO
++#---------------------------------------------------------------------------
++# configuration options related to source browsing
++#---------------------------------------------------------------------------
++SOURCE_BROWSER = NO
++INLINE_SOURCES = NO
++REFERENCED_BY_RELATION = YES
++REFERENCES_RELATION = YES
++#---------------------------------------------------------------------------
++# configuration options related to the alphabetical class index
++#---------------------------------------------------------------------------
++ALPHABETICAL_INDEX = NO
++COLS_IN_ALPHA_INDEX = 5
++IGNORE_PREFIX =
++#---------------------------------------------------------------------------
++# configuration options related to the HTML output
++#---------------------------------------------------------------------------
++GENERATE_HTML = YES
++HTML_OUTPUT = html
++HTML_FILE_EXTENSION = .html
++HTML_HEADER =
++HTML_FOOTER =
++HTML_STYLESHEET =
++HTML_ALIGN_MEMBERS = YES
++GENERATE_HTMLHELP = YES
++CHM_FILE = svncpp.chm
++HHC_LOCATION =
++GENERATE_CHI = NO
++BINARY_TOC = NO
++TOC_EXPAND = NO
++DISABLE_INDEX = NO
++ENUM_VALUES_PER_LINE = 4
++GENERATE_TREEVIEW = NO
++TREEVIEW_WIDTH = 250
++#---------------------------------------------------------------------------
++# configuration options related to the LaTeX output
++#---------------------------------------------------------------------------
++GENERATE_LATEX = NO
++LATEX_OUTPUT = latex
++LATEX_CMD_NAME = latex
++MAKEINDEX_CMD_NAME = makeindex
++COMPACT_LATEX = NO
++PAPER_TYPE = a4wide
++EXTRA_PACKAGES =
++LATEX_HEADER =
++PDF_HYPERLINKS = NO
++USE_PDFLATEX = NO
++LATEX_BATCHMODE = NO
++#---------------------------------------------------------------------------
++# configuration options related to the RTF output
++#---------------------------------------------------------------------------
++GENERATE_RTF = NO
++RTF_OUTPUT = rtf
++COMPACT_RTF = NO
++RTF_HYPERLINKS = NO
++RTF_STYLESHEET_FILE =
++RTF_EXTENSIONS_FILE =
++#---------------------------------------------------------------------------
++# configuration options related to the man page output
++#---------------------------------------------------------------------------
++GENERATE_MAN = NO
++MAN_OUTPUT = man
++MAN_EXTENSION = .3
++MAN_LINKS = NO
++#---------------------------------------------------------------------------
++# configuration options related to the XML output
++#---------------------------------------------------------------------------
++GENERATE_XML = NO
++#---------------------------------------------------------------------------
++# configuration options for the AutoGen Definitions output
++#---------------------------------------------------------------------------
++GENERATE_AUTOGEN_DEF = NO
++#---------------------------------------------------------------------------
++# Configuration options related to the preprocessor
++#---------------------------------------------------------------------------
++ENABLE_PREPROCESSING = YES
++MACRO_EXPANSION = NO
++EXPAND_ONLY_PREDEF = NO
++SEARCH_INCLUDES = YES
++INCLUDE_PATH =
++INCLUDE_FILE_PATTERNS =
++PREDEFINED =
++EXPAND_AS_DEFINED =
++SKIP_FUNCTION_MACROS = YES
++#---------------------------------------------------------------------------
++# Configuration::addtions related to external references
++#---------------------------------------------------------------------------
++TAGFILES =
++GENERATE_TAGFILE =
++ALLEXTERNALS = NO
++EXTERNAL_GROUPS = YES
++PERL_PATH = /usr/bin/perl
++#---------------------------------------------------------------------------
++# Configuration options related to the dot tool
++#---------------------------------------------------------------------------
++CLASS_DIAGRAMS = YES
++HIDE_UNDOC_RELATIONS = YES
++HAVE_DOT = YES
++CLASS_GRAPH = NO
++COLLABORATION_GRAPH = NO
++TEMPLATE_RELATIONS = YES
++INCLUDE_GRAPH = NO
++INCLUDED_BY_GRAPH = YES
++GRAPHICAL_HIERARCHY = YES
++DOT_IMAGE_FORMAT = png
++DOT_PATH =
++DOTFILE_DIRS =
++MAX_DOT_GRAPH_WIDTH = 1024
++MAX_DOT_GRAPH_HEIGHT = 1024
++GENERATE_LEGEND = NO
++DOT_CLEANUP = YES
++#---------------------------------------------------------------------------
++# Configuration::addtions related to the search engine
++#---------------------------------------------------------------------------
++SEARCHENGINE = NO
+--
+1.8.1.4
+
Added: csw/mgar/pkg/rapidsvn/trunk/files/0001-Do-not-strip-norunpath-on-libtool.patch
===================================================================
--- csw/mgar/pkg/rapidsvn/trunk/files/0001-Do-not-strip-norunpath-on-libtool.patch (rev 0)
+++ csw/mgar/pkg/rapidsvn/trunk/files/0001-Do-not-strip-norunpath-on-libtool.patch2013-06-17 11:29:33 UTC (rev 21355)
< at >< at > -0,0 +1,25 < at >< at >
+From f1b39457612f77450c34ebb3f8ff3b1e22cfea6d Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam-RJLij68YbUJAfugRpC6u6w< at >public.gmane.org>
+Date: Mon, 17 Jun 2013 12:53:52 +0200
+Subject: [PATCH] Do not strip -norunpath on libtool
+
+---
+ ltmain.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ltmain.sh b/ltmain.sh
+index c2852d8..24983b6 100644
+--- a/ltmain.sh
++++ b/ltmain.sh
+< at >< at > -5853,7 +5853,7 < at >< at > func_mode_link ()
+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|< at >*|-tp=*|--sysroot=*| \
+- -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-norunpath)
+ func_quote_for_eval "$arg"
+ arg="$func_quote_for_eval_result"
+ func_append compile_command " $arg"
+--
+1.8.1.4
+
Deleted: csw/mgar/pkg/rapidsvn/trunk/files/0002-Make-sure-to-pass-norunpath-through-libtool.patch
===================================================================
--- csw/mgar/pkg/rapidsvn/trunk/files/0002-Make-sure-to-pass-norunpath-through-libtool.patch2013-06-17 11:23:05 UTC (rev 21354)
+++ csw/mgar/pkg/rapidsvn/trunk/files/0002-Make-sure-to-pass-norunpath-through-libtool.patch2013-06-17 11:29:33 UTC (rev 21355)
< at >< at > -1,25 +0,0 < at >< at >
-From 1b25c39d53c48db42781fad4c4d8762949c91bba Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam-RJLij68YbUJAfugRpC6u6w< at >public.gmane.org>
-Date: Wed, 20 Oct 2010 14:16:27 +0200
-Subject: [PATCH] Make sure to pass -norunpath through libtool
-
----
- ltmain.sh | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/ltmain.sh b/ltmain.sh
-index b612e9a..d5cf479 100755
---- a/ltmain.sh
-+++ b/ltmain.sh
-< at >< at > -4765,7 +4765,7 < at >< at > func_mode_link ()
- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
- # < at >file GCC response files
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
</pre>dmichelsen-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f< at >public.gmane.org2013-06-17T11:29:33[csw-devel] SF.net SVN: gar:[21354]csw/mgar/pkg/gnuplot/trunk/Makefile
http://permalink.gmane.org/gmane.os.solaris.opencsw.devel/20249
<pre>Revision: 21354
http://gar.svn.sourceforge.net/gar/?rev=21354&view=rev
Author: lblume
Date: 2013-06-17 11:23:05 +0000 (Mon, 17 Jun 2013)
Log Message:
-----------
gnuplot/trunk: New name for the emacs dependency
Modified Paths:
--------------
csw/mgar/pkg/gnuplot/trunk/Makefile
Modified: csw/mgar/pkg/gnuplot/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnuplot/trunk/Makefile2013-06-17 11:21:10 UTC (rev 21353)
+++ csw/mgar/pkg/gnuplot/trunk/Makefile2013-06-17 11:23:05 UTC (rev 21354)
< at >< at > -22,7 +22,7 < at >< at >
RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibpdf6
# There is just an emacs style in it, do not depend on it
-CHECKPKG_OVERRIDES_CSWgnuplot += missing-dependency|CSWemacscommon
+CHECKPKG_OVERRIDES_CSWgnuplot += missing-dependency|CSWemacs-common
PACKAGES += CSWgnuplot-wx
CATALOGNAME_CSWgnuplot-wx = gnuplot_wx
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
</pre>lblume-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f< at >public.gmane.org2013-06-17T11:23:06[csw-devel] SF.net SVN: gar:[21353] csw/mgar/pkg/gd/branches
http://permalink.gmane.org/gmane.os.solaris.opencsw.devel/20248
<pre>Revision: 21353
http://gar.svn.sourceforge.net/gar/?rev=21353&view=rev
Author: mattdarcy
Date: 2013-06-17 11:21:10 +0000 (Mon, 17 Jun 2013)
Log Message:
-----------
BTS test branch for recipe testing - please ignore temporary only
Modified Paths:
--------------
csw/mgar/pkg/gd/branches/nim/Makefile
Added Paths:
-----------
csw/mgar/pkg/gd/branches/nim/
Modified: csw/mgar/pkg/gd/branches/nim/Makefile
===================================================================
--- csw/mgar/pkg/gd/trunk/Makefile2013-06-03 08:51:06 UTC (rev 21242)
+++ csw/mgar/pkg/gd/branches/nim/Makefile2013-06-17 11:21:10 UTC (rev 21353)
< at >< at > -19,36 +19,36 < at >< at >
PATCHFILES += gdkanji.c.patch
-PACKAGES = CSWgd
-CATALOGNAME_CSWgd = gd
-SPKG_DESC_CSWgd = Utilities facilitating libgd for dynamic image creation
+PACKAGES = NIMOSSgd
+CATALOGNAME_NIMOSSgd = gd
+SPKG_DESC_NIMOSSgd = Utilities facilitating libgd for dynamic image creation
# PKGFILES is catchall
-RUNTIME_DEP_PKGS_CSWgd += CSWlibgd2
+RUNTIME_DEP_PKGS_NIMOSSgd += NIMOSSlibgd2
-PACKAGES += CSWlibgd2
-CATALOGNAME_CSWlibgd2 = libgd2
-SPKG_DESC_CSWlibgd2 = A library used for dynamic image creation providing libgd.so.2
-PKGFILES_CSWlibgd2 += $(call pkgfiles_lib,libgd.so.2)
-RUNTIME_DEP_PKGS_CSWlibgd2 += CSWlibfontconfig1
-RUNTIME_DEP_PKGS_CSWlibgd2 += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWlibgd2 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWlibgd2 += CSWlibjpeg7
-RUNTIME_DEP_PKGS_CSWlibgd2 += CSWlibpng15-15
-RUNTIME_DEP_PKGS_CSWlibgd2 += CSWlibxpm4
-RUNTIME_DEP_PKGS_CSWlibgd2 += CSWlibz1
+PACKAGES += NIMOSSlibgd2
+CATALOGNAME_NIMOSSlibgd2 = libgd2
+SPKG_DESC_NIMOSSlibgd2 = A library used for dynamic image creation providing libgd.so.2
+PKGFILES_NIMOSSlibgd2 += $(call pkgfiles_lib,libgd.so.2)
+RUNTIME_DEP_PKGS_NIMOSSlibgd2 += NIMOSSlibfontconfig1
+RUNTIME_DEP_PKGS_NIMOSSlibgd2 += NIMOSSlibfreetype6
+RUNTIME_DEP_PKGS_NIMOSSlibgd2 += NIMOSSlibiconv2
+RUNTIME_DEP_PKGS_NIMOSSlibgd2 += NIMOSSlibjpeg7
+RUNTIME_DEP_PKGS_NIMOSSlibgd2 += NIMOSSlibpng15-15
+RUNTIME_DEP_PKGS_NIMOSSlibgd2 += NIMOSSlibxpm4
+RUNTIME_DEP_PKGS_NIMOSSlibgd2 += NIMOSSlibz1
-PACKAGES += CSWlibgd-dev
-CATALOGNAME_CSWlibgd-dev = libgd_dev
-SPKG_DESC_CSWlibgd-dev = Development files for libgd.so.2
-PKGFILES_CSWlibgd-dev += $(PKGFILES_DEVEL)
-RUNTIME_DEP_PKGS_CSWlibgd-dev = CSWlibgd2
+PACKAGES += NIMOSSlibgd-dev
+CATALOGNAME_NIMOSSlibgd-dev = libgd_dev
+SPKG_DESC_NIMOSSlibgd-dev = Development files for libgd.so.2
+PKGFILES_NIMOSSlibgd-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_NIMOSSlibgd-dev = NIMOSSlibgd2
UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-CSW_DEFAULT_FONTPATH = $(sharedstatedir)/fonts/truetype
+NIMOSS_DEFAULT_FONTPATH = $(sharedstatedir)/fonts/truetype
# This is evaluated twice, quote properly
-EXTRA_CPPFLAGS = -DDEFAULT_FONTPATH=\\\"$(CSW_DEFAULT_FONTPATH)\\\"
+EXTRA_CPPFLAGS = -DDEFAULT_FONTPATH=\\\"$(NIMOSS_DEFAULT_FONTPATH)\\\"
BUILD64_LIBS_ONLY = 1
STRIP_LIBTOOL = 1
< at >< at > -66,17 +66,17 < at >< at >
TEST_SCRIPTS =
# This is ok as there are a number of search pathes for fonts in there.
-# We made sure that the $CSW_DEFAULT_FONTPATH is the first one in the list.
-CHECKPKG_OVERRIDES_CSWlibgd-dev += file-with-bad-content|/usr/share|root/opt/csw/include/gd.h
+# We made sure that the $NIMOSS_DEFAULT_FONTPATH is the first one in the list.
+CHECKPKG_OVERRIDES_NIMOSSlibgd-dev += file-with-bad-content|/usr/share|root/opt/csw/include/gd.h
include gar/category.mk
# Make sure GDFONTPATH is set correctly
post-extract-modulated:
-perl -pi -e 's,/usr/share/fonts/truetype,$(CSW_DEFAULT_FONTPATH),' \
+perl -pi -e 's,/usr/share/fonts/truetype,$(NIMOSS_DEFAULT_FONTPATH),' \
$(WORKSRC)/gdtestft.c \
$(WORKSRC)/annotate.c
-perl -pi -e 's,(DEFAULT_FONTPATH\s+"),\1$(CSW_DEFAULT_FONTPATH):,' \
+perl -pi -e 's,(DEFAULT_FONTPATH\s+"),\1$(NIMOSS_DEFAULT_FONTPATH):,' \
$(WORKSRC)/gd.h
< at >$(MAKECOOKIE)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
</pre>mattdarcy-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f< at >public.gmane.org2013-06-17T11:21:13[csw-devel] SF.net SVN: gar:[21352] csw/mgar/pkg/gnuplot/trunk
http://permalink.gmane.org/gmane.os.solaris.opencsw.devel/20247
<pre>Revision: 21352
http://gar.svn.sourceforge.net/gar/?rev=21352&view=rev
Author: lblume
Date: 2013-06-17 09:18:17 +0000 (Mon, 17 Jun 2013)
Log Message:
-----------
gnuplot/trunk: bump to 4.6.3; change wxwidget dependencies; clean up useless dependencies thanks to -z ignore
Modified Paths:
--------------
csw/mgar/pkg/gnuplot/trunk/Makefile
csw/mgar/pkg/gnuplot/trunk/checksums
Modified: csw/mgar/pkg/gnuplot/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnuplot/trunk/Makefile2013-06-17 09:15:33 UTC (rev 21351)
+++ csw/mgar/pkg/gnuplot/trunk/Makefile2013-06-17 09:18:17 UTC (rev 21352)
< at >< at > -1,5 +1,5 < at >< at >
NAME = gnuplot
-VERSION = 4.6.1
+VERSION = 4.6.3
DESCRIPTION = The Gnuplot Plotting Utility
< at >< at > -15,19 +15,11 < at >< at >
PACKAGES += CSWgnuplot
CATALOGNAME_CSWgnuplot = gnuplot
SPKG_DESC_CSWgnuplot = $(DESCRIPTION)
-RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibpng12-0
-RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibfontconfig1
RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibiconv2
RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibreadline6
RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibgd2
-RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibxpm4
-RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibncurses5
RUNTIME_DEP_PKGS_CSWgnuplot += CSWliblua5-2
-RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibz1
-RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibjpeg7
RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibpdf6
-RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibpng15-15
# There is just an emacs style in it, do not depend on it
CHECKPKG_OVERRIDES_CSWgnuplot += missing-dependency|CSWemacscommon
< at >< at > -36,34 +28,18 < at >< at >
CATALOGNAME_CSWgnuplot-wx = gnuplot_wx
SPKG_DESC_CSWgnuplot-wx = $(DESCRIPTION) (with WX-Widgets and Pango)
RUNTIME_DEP_PKGS_CSWgnuplot-wx = CSWgnuplot
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWwxwidgetscommon
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibatk1-0-0
RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWpango
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibpng12-0
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibfontconfig1
RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibcairo2
RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWwxwidgetsgtk2
RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibreadline6
RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgd2
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibxpm4
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibncurses5
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibncursesw5
RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWliblua5-2
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWsunmath
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibz1
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibjpeg7
RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgdk-x11-2-0-0
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgmodule2-0-0
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgtk-x11-2-0-0
RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgobject2-0-0
RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgdk-pixbuf2-0-0
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgio2-0-0
RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibpdf6
-RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibpng15-15
+RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWwxwidgets
+RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWwxwidgetsgtk2
# This is pulled in from Wx, take out if that has been redone
CHECKPKG_OVERRIDES_CSWgnuplot-wx += bad-rpath-entry|/opt/csw/lib/|opt/csw/libexec/gnuplot/4.6/gnuplot_x11-wx
< at >< at > -73,7 +49,7 < at >< at >
REINPLACE_USRLOCAL += share/gnuplotrc
-EXTRA_LINKER_FLAGS += -norunpath
+EXTRA_LINKER_FLAGS += -norunpath -z ignore
# Gnuplot automatically pulls in libCstd which is needed by libwx_gtk2u_core-2.8.so.0.6.0 because
# the library is wrong self-contained (ldd -r on that throws unresolved symbol errors).
< at >< at > -133,11 +109,6 < at >< at >
CHECKPKG_OVERRIDES_CSWgnuplot += surplus-dependency|CSWalternatives
CHECKPKG_OVERRIDES_CSWgnuplot-wx += surplus-dependency|CSWalternatives
-# These are just examples
-CHECKPKG_OVERRIDES_CSWgnuplot += file-with-bad-content|/usr/local|root/opt/csw/share/gnuplot/4.6/gnuplot.gih-nowx
-CHECKPKG_OVERRIDES_CSWgnuplot-wx += file-with-bad-content|/usr/local|root/opt/csw/share/gnuplot/4.6/gnuplot.gih-wx
-CHECKPKG_OVERRIDES_CSWgnuplot += file-with-bad-content|/usr/local|root/opt/csw/share/info/gnuplot.info
-
# Is this GDFONTPATH related? That would be bad... CHECK!!!
#CHECKPKG_OVERRIDES_CSWgnuplot += file-with-bad-content|/usr/local|root/opt/csw/bin/gnuplot-nowx
#CHECKPKG_OVERRIDES_CSWgnuplot-wx += file-with-bad-content|/usr/local|root/opt/csw/bin/gnuplot-wx
Modified: csw/mgar/pkg/gnuplot/trunk/checksums
===================================================================
--- csw/mgar/pkg/gnuplot/trunk/checksums2013-06-17 09:15:33 UTC (rev 21351)
+++ csw/mgar/pkg/gnuplot/trunk/checksums2013-06-17 09:18:17 UTC (rev 21352)
< at >< at > -1 +1 < at >< at >
-4c9a06461f402482c30cf94e267eb877 gnuplot-4.6.1.tar.gz
+db7a73d2dddec0149dcec35e30561aa3 gnuplot-4.6.3.tar.gz
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
</pre>lblume-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f< at >public.gmane.org2013-06-17T09:18:18[csw-devel] SF.net SVN: gar:[21351] csw/mgar/pkg/chmlib/trunk
http://permalink.gmane.org/gmane.os.solaris.opencsw.devel/20246
<pre>Revision: 21351
http://gar.svn.sourceforge.net/gar/?rev=21351&view=rev
Author: dmichelsen
Date: 2013-06-17 09:15:33 +0000 (Mon, 17 Jun 2013)
Log Message:
-----------
chmlib/trunk: Update to Solaris 10, latest standards and new package naming
Modified Paths:
--------------
csw/mgar/pkg/chmlib/trunk/Makefile
csw/mgar/pkg/chmlib/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/chmlib/trunk/files/0001-gnulib-import-getopt-posix.patch
csw/mgar/pkg/chmlib/trunk/files/0002-integrate-gnulib-into-the-auto-tool-files.patch
csw/mgar/pkg/chmlib/trunk/files/0003-add-dummy-config.h-file.patch
csw/mgar/pkg/chmlib/trunk/files/0004-add-autoconf-checks-for-lnsl-and-lsocket.patch
Modified: csw/mgar/pkg/chmlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/chmlib/trunk/Makefile2013-06-17 08:21:45 UTC (rev 21350)
+++ csw/mgar/pkg/chmlib/trunk/Makefile2013-06-17 09:15:33 UTC (rev 21351)
< at >< at > -12,17 +12,25 < at >< at >
endef
MASTER_SITES = http://www.jedrea.com/chmlib/
-DISTFILES = $(NAME)-$(VERSION).tar.bz2
+DISTFILES += $(DISTNAME).tar.bz2
-PATCHFILES = 0001-gnulib-import-getopt-posix.patch
-PATCHFILES += 0002-integrate-gnulib-into-the-auto-tool-files.patch
-PATCHFILES += 0003-add-dummy-config.h-file.patch
-PATCHFILES += 0004-add-autoconf-checks-for-lnsl-and-lsocket.patch
-
# We define upstream file regex so we can be notifed of new upstream software release
UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
-BUILD64_LIBS_ONLY = 1
+PACKAGES += CSWlibchm0
+SPKG_DESC_CSWlibchm0 = Library designed for accessing MS ITSS files (chm), libchm.so.0
+PKGFILES_CSWlibchm0 += $(call pkgfiles_lib,libchm.so.0)
+OBSOLETED_BY_CSWlibchm0 += CSWchmlib
+
+PACKAGES += CSWlibchm-dev
+SPKG_DESC_CSWlibchm-dev = Development files for libchm.so.0
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWlibchm-dev += CSWlibchm0
+
+EXTRA_LINKER_FLAGS += -lnsl -lsocket
+
+BUILD64 = 1
+ISAEXEC = 1
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --enable-examples
< at >< at > -31,11 +39,7 < at >< at >
include gar/category.mk
-pre-configure-modulated:
-< at >(cd $(WORKSRC); aclocal -I gnulib/m4; autoconf -I gnulib/m4; automake)
-< at >$(MAKECOOKIE)
-
-post-install-modulated:
+post-install:
ginstall -d $(DESTDIR)$(docdir)/$(NAME)
$(foreach D,$(DOCS),ginstall $(WORKSRC)/$D $(DESTDIR)$(docdir)/$(NAME)/$D;)
< at >$(MAKECOOKIE)
Modified: csw/mgar/pkg/chmlib/trunk/checksums
===================================================================
--- csw/mgar/pkg/chmlib/trunk/checksums2013-06-17 08:21:45 UTC (rev 21350)
+++ csw/mgar/pkg/chmlib/trunk/checksums2013-06-17 09:15:33 UTC (rev 21351)
< at >< at > -1,5 +1 < at >< at >
-b454cb00abe8653f2e3c11318a884e0e 0001-gnulib-import-getopt-posix.patch
-c181447a053d0c5a83099af4a68a5510 0002-integrate-gnulib-into-the-auto-tool-files.patch
-b96303db2702dd6696ea45dfba2de5dc 0003-add-dummy-config.h-file.patch
-883567051286cd6984b7a1b23fa8e783 0004-add-autoconf-checks-for-lnsl-and-lsocket.patch
7ea49ed8c335215c1edc6fae83e6b912 chmlib-0.40.tar.bz2
Deleted: csw/mgar/pkg/chmlib/trunk/files/0001-gnulib-import-getopt-posix.patch
===================================================================
--- csw/mgar/pkg/chmlib/trunk/files/0001-gnulib-import-getopt-posix.patch2013-06-17 08:21:45 UTC (rev 21350)
+++ csw/mgar/pkg/chmlib/trunk/files/0001-gnulib-import-getopt-posix.patch2013-06-17 09:15:33 UTC (rev 21351)
< at >< at > -1,4596 +0,0 < at >< at >
-From 23637dad0fc9fb0e5e0755744d5d3726536068ee Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton-RJLij68YbUJAfugRpC6u6w< at >public.gmane.org>
-Date: Thu, 15 Oct 2009 21:32:41 +0200
-Subject: [PATCH 1/4] gnulib --import getopt-posix
-
----
- gnulib/Makefile.am | 207 ++++++++
- gnulib/dummy.c | 42 ++
- gnulib/getopt.c | 1186 ++++++++++++++++++++++++++++++++++++++++++++
- gnulib/getopt.in.h | 242 +++++++++
- gnulib/getopt1.c | 170 +++++++
- gnulib/getopt_int.h | 130 +++++
- gnulib/gettext.h | 279 +++++++++++
- gnulib/m4/00gnulib.m4 | 30 ++
- gnulib/m4/extensions.m4 | 104 ++++
- gnulib/m4/getopt.m4 | 250 ++++++++++
- gnulib/m4/gnulib-cache.m4 | 36 ++
- gnulib/m4/gnulib-common.m4 | 124 +++++
- gnulib/m4/gnulib-comp.m4 | 197 ++++++++
- gnulib/m4/gnulib-tool.m4 | 57 +++
- gnulib/m4/include_next.m4 | 187 +++++++
- gnulib/m4/onceonly.m4 | 90 ++++
- gnulib/m4/stddef_h.m4 | 45 ++
- gnulib/m4/unistd_h.m4 | 115 +++++
- gnulib/m4/wchar_t.m4 | 20 +
- gnulib/stddef.in.h | 86 ++++
- gnulib/unistd.in.h | 784 +++++++++++++++++++++++++++++
- link-warning.h | 28 +
- 22 files changed, 4409 insertions(+), 0 deletions(-)
- create mode 100644 gnulib/Makefile.am
- create mode 100644 gnulib/dummy.c
- create mode 100644 gnulib/getopt.c
- create mode 100644 gnulib/getopt.in.h
- create mode 100644 gnulib/getopt1.c
- create mode 100644 gnulib/getopt_int.h
- create mode 100644 gnulib/gettext.h
- create mode 100644 gnulib/m4/00gnulib.m4
- create mode 100644 gnulib/m4/extensions.m4
- create mode 100644 gnulib/m4/getopt.m4
- create mode 100644 gnulib/m4/gnulib-cache.m4
- create mode 100644 gnulib/m4/gnulib-common.m4
- create mode 100644 gnulib/m4/gnulib-comp.m4
- create mode 100644 gnulib/m4/gnulib-tool.m4
- create mode 100644 gnulib/m4/include_next.m4
- create mode 100644 gnulib/m4/onceonly.m4
- create mode 100644 gnulib/m4/stddef_h.m4
- create mode 100644 gnulib/m4/unistd_h.m4
- create mode 100644 gnulib/m4/wchar_t.m4
- create mode 100644 gnulib/stddef.in.h
- create mode 100644 gnulib/unistd.in.h
- create mode 100644 link-warning.h
-
-diff --git a/gnulib/Makefile.am b/gnulib/Makefile.am
-new file mode 100644
-index 0000000..ddcdb88
---- /dev/null
-+++ b/gnulib/Makefile.am
-< at >< at > -0,0 +1,207 < at >< at >
-+## DO NOT EDIT! GENERATED AUTOMATICALLY!
-+## Process this file with automake to produce Makefile.in.
-+# Copyright (C) 2002-2009 Free Software Foundation, Inc.
-+#
-+# This file is free software, distributed under the terms of the GNU
-+# General Public License. As a special exception to the GNU General
-+# Public License, this file may be distributed as part of a program
-+# that contains a configuration script generated by Autoconf, under
-+# the same distribution terms as the rest of that program.
-+#
-+# Generated by gnulib-tool.
-+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=. --libtool --macro-prefix=gl --no-vc-files getopt-gnu
-+
-+AUTOMAKE_OPTIONS = 1.5 gnits
-+
-+SUBDIRS =
-+noinst_HEADERS =
-+noinst_LIBRARIES =
-+noinst_LTLIBRARIES =
-+EXTRA_DIST =
-+BUILT_SOURCES =
-+SUFFIXES =
-+MOSTLYCLEANFILES = core *.stackdump
-+MOSTLYCLEANDIRS =
-+CLEANFILES =
-+DISTCLEANFILES =
-+MAINTAINERCLEANFILES =
-+EXTRA_DIST += m4/gnulib-cache.m4
-+
-+AM_CPPFLAGS =
-+AM_CFLAGS =
-+
-+noinst_LTLIBRARIES += libgnu.la
-+
-+libgnu_la_SOURCES =
-+libgnu_la_LIBADD = $(gl_LTLIBOBJS)
-+libgnu_la_DEPENDENCIES = $(gl_LTLIBOBJS)
-+EXTRA_libgnu_la_SOURCES =
-+libgnu_la_LDFLAGS = $(AM_LDFLAGS)
-+
-+## begin gnulib module getopt-posix
-+
-+BUILT_SOURCES += $(GETOPT_H)
-+
-+# We need the following in order to create <getopt.h> when the system
-+# doesn't have one that works with the given compiler.
-+getopt.h: getopt.in.h
-+$(AM_V_GEN)rm -f $< at >-t $< at > && \
-+{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-+ sed -e 's|< at >''HAVE_GETOPT_H''< at >|$(HAVE_GETOPT_H)|g' \
-+ -e 's|< at >''INCLUDE_NEXT''< at >|$(INCLUDE_NEXT)|g' \
-+ -e 's|< at >''PRAGMA_SYSTEM_HEADER''< at >|< at >PRAGMA_SYSTEM_HEADER< at >|g' \
-+ -e 's|< at >''NEXT_GETOPT_H''< at >|$(NEXT_GETOPT_H)|g' \
-+ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
-+ < $(srcdir)/getopt.in.h; \
-+} > $< at >-t && \
-+mv -f $< at >-t $< at >
-+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 <stddef.h> when the system
-+# doesn't have one that works with the given compiler.
-+stddef.h: stddef.in.h
-+$(AM_V_GEN)rm -f $< at >-t $< at > && \
-+{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-+ sed -e 's|< at >''INCLUDE_NEXT''< at >|$(INCLUDE_NEXT)|g' \
-+ -e 's|< at >''PRAGMA_SYSTEM_HEADER''< at >|< at >PRAGMA_SYSTEM_HEADER< at >|g' \
-+ -e 's|< at >''NEXT_STDDEF_H''< at >|$(NEXT_STDDEF_H)|g' \
-+ -e 's|< at >''HAVE_WCHAR_T''< at >|$(HAVE_WCHAR_T)|g' \
-+ -e 's|< at >''REPLACE_NULL''< at >|$(REPLACE_NULL)|g' \
-+ < $(srcdir)/stddef.in.h; \
-+} > $< at >-t && \
-+mv $< at >-t $< at >
-+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
-+# <unistd.h> when the system doesn't have one.
-+unistd.h: unistd.in.h
-+$(AM_V_GEN)rm -f $< at >-t $< at > && \
-+{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-+ sed -e 's|< at >''HAVE_UNISTD_H''< at >|$(HAVE_UNISTD_H)|g' \
-+ -e 's|< at >''INCLUDE_NEXT''< at >|$(INCLUDE_NEXT)|g' \
-+ -e 's|< at >''PRAGMA_SYSTEM_HEADER''< at >|< at >PRAGMA_SYSTEM_HEADER< at >|g' \
-+ -e 's|< at >''NEXT_UNISTD_H''< at >|$(NEXT_UNISTD_H)|g' \
-+ -e 's|< at >''GNULIB_CHOWN''< at >|$(GNULIB_CHOWN)|g' \
-+ -e 's|< at >''GNULIB_CLOSE''< at >|$(GNULIB_CLOSE)|g' \
-+ -e 's|< at >''GNULIB_DUP2''< at >|$(GNULIB_DUP2)|g' \
-+ -e 's|< at >''GNULIB_DUP3''< at >|$(GNULIB_DUP3)|g' \
-+ -e 's|< at >''GNULIB_ENVIRON''< at >|$(GNULIB_ENVIRON)|g' \
-+ -e 's|< at >''GNULIB_EUIDACCESS''< at >|$(GNULIB_EUIDACCESS)|g' \
-+ -e 's|< at >''GNULIB_FACCESSAT''< at >|$(GNULIB_FACCESSAT)|g' \
-+ -e 's|< at >''GNULIB_FCHDIR''< at >|$(GNULIB_FCHDIR)|g' \
-+ -e 's|< at >''GNULIB_FCHOWNAT''< at >|$(GNULIB_FCHOWNAT)|g' \
-+ -e 's|< at >''GNULIB_FSYNC''< at >|$(GNULIB_FSYNC)|g' \
-+ -e 's|< at >''GNULIB_FTRUNCATE''< at >|$(GNULIB_FTRUNCATE)|g' \
-+ -e 's|< at >''GNULIB_GETCWD''< at >|$(GNULIB_GETCWD)|g' \
-+ -e 's|< at >''GNULIB_GETDOMAINNAME''< at >|$(GNULIB_GETDOMAINNAME)|g' \
-+ -e 's|< at >''GNULIB_GETDTABLESIZE''< at >|$(GNULIB_GETDTABLESIZE)|g' \
-+ -e 's|< at >''GNULIB_GETHOSTNAME''< at >|$(GNULIB_GETHOSTNAME)|g' \
-+ -e 's|< at >''GNULIB_GETLOGIN_R''< at >|$(GNULIB_GETLOGIN_R)|g' \
-+ -e 's|< at >''GNULIB_GETPAGESIZE''< at >|$(GNULIB_GETPAGESIZE)|g' \
-+ -e 's|< at >''GNULIB_GETUSERSHELL''< at >|$(GNULIB_GETUSERSHELL)|g' \
-+ -e 's|< at >''GNULIB_LCHOWN''< at >|$(GNULIB_LCHOWN)|g' \
-+ -e 's|< at >''GNULIB_LINK''< at >|$(GNULIB_LINK)|g' \
-+ -e 's|< at >''GNULIB_LINKAT''< at >|$(GNULIB_LINKAT)|g' \
-+ -e 's|< at >''GNULIB_LSEEK''< at >|$(GNULIB_LSEEK)|g' \
-+ -e 's|< at >''GNULIB_PIPE2''< at >|$(GNULIB_PIPE2)|g' \
-+ -e 's|< at >''GNULIB_READLINK''< at >|$(GNULIB_READLINK)|g' \
-+ -e 's|< at >''GNULIB_READLINKAT''< at >|$(GNULIB_READLINKAT)|g' \
-+ -e 's|< at >''GNULIB_RMDIR''< at >|$(GNULIB_RMDIR)|g' \
-+ -e 's|< at >''GNULIB_SLEEP''< at >|$(GNULIB_SLEEP)|g' \
-+ -e 's|< at >''GNULIB_SYMLINK''< at >|$(GNULIB_SYMLINK)|g' \
-+ -e 's|< at >''GNULIB_SYMLINKAT''< at >|$(GNULIB_SYMLINKAT)|g' \
-+ -e 's|< at >''GNULIB_UNISTD_H_GETOPT''< at >|$(GNULIB_UNISTD_H_GETOPT)|g' \
-+ -e 's|< at >''GNULIB_UNISTD_H_SIGPIPE''< at >|$(GNULIB_UNISTD_H_SIGPIPE)|g' \
-+ -e 's|< at >''GNULIB_UNLINK''< at >|$(GNULIB_UNLINK)|g' \
-+ -e 's|< at >''GNULIB_UNLINKAT''< at >|$(GNULIB_UNLINKAT)|g' \
-+ -e 's|< at >''GNULIB_WRITE''< at >|$(GNULIB_WRITE)|g' \
-+ -e 's|< at >''HAVE_DUP2''< at >|$(HAVE_DUP2)|g' \
-+ -e 's|< at >''HAVE_DUP3''< at >|$(HAVE_DUP3)|g' \
-+ -e 's|< at >''HAVE_EUIDACCESS''< at >|$(HAVE_EUIDACCESS)|g' \
-+ -e 's|< at >''HAVE_FACCESSAT''< at >|$(HAVE_FACCESSAT)|g' \
-+ -e 's|< at >''HAVE_FCHOWNAT''< at >|$(HAVE_FCHOWNAT)|g' \
-+ -e 's|< at >''HAVE_FSYNC''< at >|$(HAVE_FSYNC)|g' \
-+ -e 's|< at >''HAVE_FTRUNCATE''< at >|$(HAVE_FTRUNCATE)|g' \
-+ -e 's|< at >''HAVE_GETDOMAINNAME''< at >|$(HAVE_GETDOMAINNAME)|g' \
-+ -e 's|< at >''HAVE_GETDTABLESIZE''< at >|$(HAVE_GETDTABLESIZE)|g' \
-+ -e 's|< at >''HAVE_GETHOSTNAME''< at >|$(HAVE_GETHOSTNAME)|g' \
-+ -e 's|< at >''HAVE_GETPAGESIZE''< at >|$(HAVE_GETPAGESIZE)|g' \
-+ -e 's|< at >''HAVE_GETUSERSHELL''< at >|$(HAVE_GETUSERSHELL)|g' \
-+ -e 's|< at >''HAVE_LINK''< at >|$(HAVE_LINK)|g' \
-+ -e 's|< at >''HAVE_LINKAT''< at >|$(HAVE_LINKAT)|g' \
-+ -e 's|< at >''HAVE_PIPE2''< at >|$(HAVE_PIPE2)|g' \
-+ -e 's|< at >''HAVE_READLINK''< at >|$(HAVE_READLINK)|g' \
-+ -e 's|< at >''HAVE_READLINKAT''< at >|$(HAVE_READLINKAT)|g' \
-+ -e 's|< at >''HAVE_SLEEP''< at >|$(HAVE_SLEEP)|g' \
-+ -e 's|< at >''HAVE_SYMLINK''< at >|$(HAVE_SYMLINK)|g' \
-+ -e 's|< at >''HAVE_SYMLINKAT''< at >|$(HAVE_SYMLINKAT)|g' \
-+ -e 's|< at >''HAVE_UNLINKAT''< at >|$(HAVE_UNLINKAT)|g' \
-+ -e 's|< at >''HAVE_DECL_ENVIRON''< at >|$(HAVE_DECL_ENVIRON)|g' \
-+ -e 's|< at >''HAVE_DECL_GETLOGIN_R''< at >|$(HAVE_DECL_GETLOGIN_R)|g' \
-+ -e 's|< at >''HAVE_OS_H''< at >|$(HAVE_OS_H)|g' \
-+ -e 's|< at >''HAVE_SYS_PARAM_H''< at >|$(HAVE_SYS_PARAM_H)|g' \
-+ -e 's|< at >''REPLACE_CHOWN''< at >|$(REPLACE_CHOWN)|g' \
-+ -e 's|< at >''REPLACE_CLOSE''< at >|$(REPLACE_CLOSE)|g' \
-+ -e 's|< at >''REPLACE_DUP''< at >|$(REPLACE_DUP)|g' \
-+ -e 's|< at >''REPLACE_DUP2''< at >|$(REPLACE_DUP2)|g' \
-+ -e 's|< at >''REPLACE_FCHDIR''< at >|$(REPLACE_FCHDIR)|g' \
-+ -e 's|< at >''REPLACE_FCHOWNAT''< at >|$(REPLACE_FCHOWNAT)|g' \
-+ -e 's|< at >''REPLACE_GETCWD''< at >|$(REPLACE_GETCWD)|g' \
-+ -e 's|< at >''REPLACE_GETPAGESIZE''< at >|$(REPLACE_GETPAGESIZE)|g' \
-+ -e 's|< at >''REPLACE_LCHOWN''< at >|$(REPLACE_LCHOWN)|g' \
-+ -e 's|< at >''REPLACE_LINK''< at >|$(REPLACE_LINK)|g' \
-+ -e 's|< at >''REPLACE_LSEEK''< at >|$(REPLACE_LSEEK)|g' \
-+ -e 's|< at >''REPLACE_READLINK''< at >|$(REPLACE_READLINK)|g' \
-+ -e 's|< at >''REPLACE_RMDIR''< at >|$(REPLACE_RMDIR)|g' \
-+ -e 's|< at >''REPLACE_SYMLINK''< at >|$(REPLACE_SYMLINK)|g' \
-+ -e 's|< at >''REPLACE_UNLINK''< at >|$(REPLACE_UNLINK)|g' \
-+ -e 's|< at >''REPLACE_UNLINKAT''< at >|$(REPLACE_UNLINKAT)|g' \
-+ -e 's|< at >''REPLACE_WRITE''< at >|$(REPLACE_WRITE)|g' \
-+ -e 's|< at >''UNISTD_H_HAVE_WINSOCK2_H''< at >|$(UNISTD_H_HAVE_WINSOCK2_H)|g' \
-+ -e 's|< at >''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''< at >|$(UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g' \
-+ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
-+ < $(srcdir)/unistd.in.h; \
-+} > $< at >-t && \
-+mv $< at >-t $< at >
-+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
-+< at >for dir in '' $(MOSTLYCLEANDIRS); do \
-+ if test -n "$$dir" && test -d $$dir; then \
-+ echo "rmdir $$dir"; rmdir $$dir; \
-+ fi; \
-+done; \
-+:
-diff --git a/gnulib/dummy.c b/gnulib/dummy.c
-new file mode 100644
-index 0000000..ccb5c26
---- /dev/null
-+++ b/gnulib/dummy.c
-< at >< at > -0,0 +1,42 < at >< at >
-+/* 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 <http://www.gnu.org/licenses/>. */
-+
-+/* Some systems, reportedly OpenBSD and Mac OS X, refuse to create
-+ libraries without any object files. You might get an error like:
-+
-+ > ar cru .libs/libgl.a
-+ > ar: no archive members specified
-+
-+ Compiling this file, and adding its object file to the library, will
-+ prevent the library from being empty. */
-+
-+/* Some systems, such as Solaris with cc 5.0, refuse to work with libraries
-+ that don't export any symbol. You might get an error like:
-+
-+ > cc ... libgnu.a
-+ > ild: (bad file) garbled symbol table in archive ../gllib/libgnu.a
-+
-+ Compiling this file, and adding its object file to the library, will
-+ prevent the library from exporting no symbols. */
-+
-+#ifdef __sun
-+/* This declaration ensures that the library will export at least 1 symbol. */
-+int gl_dummy_symbol;
-+#else
-+/* This declaration is solely to ensure that after preprocessing
-+ this file is never empty. */
-+typedef int dummy;
-+#endif
-diff --git a/gnulib/getopt.c b/gnulib/getopt.c
-new file mode 100644
-index 0000000..f1e6d1f
---- /dev/null
-+++ b/gnulib/getopt.c
-< at >< at > -0,0 +1,1186 < at >< at >
-+/* 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-mXXj517/zsQ< at >public.gmane.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 <http://www.gnu.org/licenses/>. */
-+
-+#ifndef _LIBC
-+# include <config.h>
-+#endif
-+
-+#include "getopt.h"
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
-+
-+#ifdef _LIBC
-+# include <libintl.h>
-+#else
-+# include "gettext.h"
-+# define _(msgid) gettext (msgid)
-+#endif
-+
-+#if defined _LIBC && defined USE_IN_LIBIO
-+# include <wchar.h>
-+#endif
-+
-+#ifndef attribute_hidden
-+# define attribute_hidden
-+#endif
-+
-+/* Unlike standard Unix `getopt', functions like `getopt_long'
-+ let the user intersperse the options with the other arguments.
-+
-+ As `getopt_long' works, it permutes the elements of ARGV so that,
-+ when it is done, all the options precede everything else. Thus
-+ all application programs are extended to handle flexible argument order.
-+
-+ Using `getopt' or setting the environment variable POSIXLY_CORRECT
-+ disables permutation.
-+ Then the application's behavior is completely standard.
-+
-+ GNU application programs can use a third alternative mode in which
-+ they can distinguish the relative order of options and other arguments. */
-+
-+#include "getopt_int.h"
-+
-+/* For communication from `getopt' to the caller.
-+ When `getopt' finds an option that takes an argument,
-+ the argument value is returned here.
-+ Also, when `ordering' is RETURN_IN_ORDER,
-+ each non-option ARGV-element is returned here. */
-+
-+char *optarg;
-+
-+/* Index in ARGV of the next element to be scanned.
-+ This is used for communication to and from the caller
-+ and for communication between successive calls to `getopt'.
-+
-+ On entry to `getopt', zero means this is the first call; initialize.
-+
-+ When `getopt' returns -1, this is the index of the first of the
-+ non-option elements that the caller should itself scan.
-+
-+ Otherwise, `optind' communicates from one call to the next
-+ how much of ARGV has been scanned so far. */
-+
-+/* 1003.2 says this must be 1 before any call. */
-+int optind = 1;
-+
-+/* Callers store zero here to inhibit the error message
-+ for unrecognized options. */
-+
-+int opterr = 1;
-+
-+/* Set to an option character which was unrecognized.
-+ This must be initialized on some systems to avoid linking in the
-+ system's own getopt implementation. */
-+
-+int optopt = '?';
-+
-+/* Keep a global copy of all internal members of getopt_data. */
-+
-+static struct _getopt_data getopt_data;
-+
-+
-+#if defined HAVE_DECL_GETENV && !HAVE_DECL_GETENV
-+extern char *getenv ();
-+#endif
-+
-+#ifdef _LIBC
-+/* Stored original parameters.
-+ XXX This is no good solution. We should rather copy the args so
-+ that we can compare them later. But we must not use malloc(3). */
-+extern int __libc_argc;
-+extern char **__libc_argv;
-+
-+/* Bash 2.0 gives us an environment variable containing flags
-+ indicating ARGV elements that should not be considered arguments. */
-+
-+# ifdef USE_NONOPTION_FLAGS
-+/* Defined in getopt_init.c */
-+extern char *__getopt_nonoption_flags;
-+# endif
-+
-+# ifdef USE_NONOPTION_FLAGS
-+# define SWAP_FLAGS(ch1, ch2) \
-+ if (d->__nonoption_flags_len > 0) \
-+ { \
-+ char __tmp = __getopt_nonoption_flags[ch1]; \
-+ __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2]; \
-+ __getopt_nonoption_flags[ch2] = __tmp; \
-+ }
-+# else
-+# define SWAP_FLAGS(ch1, ch2)
-+# endif
-+#else/* !_LIBC */
-+# define SWAP_FLAGS(ch1, ch2)
-+#endif/* _LIBC */
-+
-+/* Exchange two adjacent subsequences of ARGV.
-+ One subsequence is elements [first_nonopt,last_nonopt)
-+ which contains all the non-options that have been skipped so far.
-+ The other is elements [last_nonopt,optind), which contains all
-+ the options processed since those non-options were skipped.
-+
-+ `first_nonopt' and `last_nonopt' are relocated so that they describe
-+ the new indices of the non-options in ARGV after they are moved. */
-+
-+static void
-+exchange (char **argv, struct _getopt_data *d)
-+{
-+ int bottom = d->__first_nonopt;
-+ int middle = d->__last_nonopt;
-+ int top = d->optind;
-+ char *tem;
-+
-+ /* Exchange the shorter segment with the far end of the longer segment.
-+ That puts the shorter segment into the right place.
-+ It leaves the longer segment in the right place overall,
-+ but it consists of two parts that need to be swapped next. */
-+
-+#if defined _LIBC && defined USE_NONOPTION_FLAGS
-+ /* First make sure the handling of the `__getopt_nonoption_flags'
-+ string can work normally. Our top argument must be in the range
-+ of the string. */
-+ if (d->__nonoption_flags_len > 0 && top >= d->__nonoption_flags_max_len)
-+ {
-+ /* We must extend the array. The user plays games with us and
-+ presents new arguments. */
-+ char *new_str = malloc (top + 1);
-+ if (new_str == NULL)
-+d->__nonoption_flags_len = d->__nonoption_flags_max_len = 0;
-+ else
-+{
-+ memset (__mempcpy (new_str, __getopt_nonoption_flags,
-+ d->__nonoption_flags_max_len),
-+ '\0', top + 1 - d->__nonoption_flags_max_len);
-+ d->__nonoption_flags_max_len = top + 1;
-+ __getopt_nonoption_flags = new_str;
-+}
-+ }
-+#endif
-+
-+ while (top > middle && middle > bottom)
-+ {
-+ if (top - middle > middle - bottom)
-+{
-+ /* Bottom segment is the short one. */
-+ int len = middle - bottom;
-+ register int i;
-+
-+ /* Swap it with the top part of the top segment. */
-+ for (i = 0; i < len; i++)
-+ {
-+ tem = argv[bottom + i];
-+ argv[bottom + i] = argv[top - (middle - bottom) + i];
-+ argv[top - (middle - bottom) + i] = tem;
-+ SWAP_FLAGS (bottom + i, top - (middle - bottom) + i);
-+ }
-+ /* Exclude the moved bottom segment from further swapping. */
-+ top -= len;
-+}
-+ else
-+{
-+ /* Top segment is the short one. */
-+ int len = top - middle;
-+ register int i;
-+
-+ /* Swap it with the bottom part of the bottom segment. */
-+ for (i = 0; i < len; i++)
-+ {
-+ tem = argv[bottom + i];
-+ argv[bottom + i] = argv[middle + i];
-+ argv[middle + i] = tem;
-+ SWAP_FLAGS (bottom + i, middle + i);
-+ }
-+ /* Exclude the moved top segment from further swapping. */
-+ bottom += len;
-+}
-+ }
-+
-+ /* Update records for the slots the non-options now occupy. */
-+
-+ d->__first_nonopt += (d->optind - d->__last_nonopt);
-+ d->__last_nonopt = d->optind;
-+}
-+
-+/* Initialize the internal data when the first call is made. */
-+
-+static const char *
-+_getopt_initialize (int argc, char **argv, const char *optstring,
-+ int posixly_correct, struct _getopt_data *d)
-+{
-+ /* Start processing options with ARGV-element 1 (since ARGV-element 0
-+ is the program name); the sequence of previously skipped
-+ non-option ARGV-elements is empty. */
-+
-+ d->__first_nonopt = d->__last_nonopt = d->optind;
-+
-+ d->__nextchar = NULL;
-+
-+ d->__posixly_correct = posixly_correct || !!getenv ("POSIXLY_CORRECT");
-+
-+ /* Determine how to handle the ordering of options and nonoptions. */
-+
-+ if (optstring[0] == '-')
-+ {
-+ d->__ordering = RETURN_IN_ORDER;
-+ ++optstring;
-+ }
-+ else if (optstring[0] == '+')
-+ {
-+ d->__ordering = REQUIRE_ORDER;
-+ ++optstring;
-+ }
-+ else if (d->__posixly_correct)
-+ d->__ordering = REQUIRE_ORDER;
-+ else
-+ d->__ordering = PERMUTE;
-+
-+#if defined _LIBC && defined USE_NONOPTION_FLAGS
-+ if (!d->__posixly_correct
-+ && argc == __libc_argc && argv == __libc_argv)
-+ {
-+ if (d->__nonoption_flags_max_len == 0)
-+{
-+ if (__getopt_nonoption_flags == NULL
-+ || __getopt_nonoption_flags[0] == '\0')
-+ d->__nonoption_flags_max_len = -1;
-+ else
-+ {
-+ const char *orig_str = __getopt_nonoption_flags;
-+ int len = d->__nonoption_flags_max_len = strlen (orig_str);
-+ if (d->__nonoption_flags_max_len < argc)
-+d->__nonoption_flags_max_len = argc;
-+ __getopt_nonoption_flags =
-+(char *) malloc (d->__nonoption_flags_max_len);
-+ if (__getopt_nonoption_flags == NULL)
-+d->__nonoption_flags_max_len = -1;
-+ else
-+memset (__mempcpy (__getopt_nonoption_flags, orig_str, len),
-+'\0', d->__nonoption_flags_max_len - len);
-+ }
-+}
-+ d->__nonoption_flags_len = d->__nonoption_flags_max_len;
-+ }
-+ else
-+ d->__nonoption_flags_len = 0;
-+#endif
-+
-+ return optstring;
-+}
-+
-+/* Scan elements of ARGV (whose length is ARGC) for option characters
-+ given in OPTSTRING.
-+
-+ If an element of ARGV starts with '-', and is not exactly "-" or "--",
-+ then it is an option element. The characters of this element
-+ (aside from the initial '-') are option characters. If `getopt'
-+ is called repeatedly, it returns successively each of the option characters
-+ from each of the option elements.
-+
-+ If `getopt' finds another option character, it returns that character,
-+ updating `optind' and `nextchar' so that the next call to `getopt' can
-+ resume the scan with the following option character or ARGV-element.
-+
-+ If there are no more option characters, `getopt' returns -1.
-+ Then `optind' is the index in ARGV of the first ARGV-element
-+ that is not an option. (The ARGV-elements have been permuted
-+ so that those that are not options now come last.)
-+
-+ OPTSTRING is a string containing the legitimate option characters.
-+ If an option character is seen that is not listed in OPTSTRING,
-+ return '?' after printing an error message. If you set `opterr' to
-+ zero, the error message is suppressed but we still return '?'.
-+
-+ If a char in OPTSTRING is followed by a colon, that means it wants an arg,
-+ so the following text in the same ARGV-element, or the text of the following
-+ ARGV-element, is returned in `optarg'. Two colons mean an option that
-+ wants an optional arg; if there is text in the current ARGV-element,
-+ it is returned in `optarg', otherwise `optarg' is set to zero.
-+
-+ If OPTSTRING starts with `-' or `+', it requests different methods of
-+ handling the non-option ARGV-elements.
-+ See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above.
-+
-+ Long-named options begin with `--' instead of `-'.
-+ Their names may be abbreviated as long as the abbreviation is unique
-+ or is an exact match for some defined option. If they have an
-+ argument, it follows the option name in the same ARGV-element, separated
-+ from the option name by a `=', or else the in next ARGV-element.
-+ When `getopt' finds a long-named option, it returns 0 if that option's
-+ `flag' field is nonzero, the value of the option's `val' field
-+ if the `flag' field is zero.
-+
-+ LONGOPTS is a vector of `struct option' terminated by an
-+ element containing a name which is zero.
-+
-+ LONGIND returns the index in LONGOPT of the long-named option found.
-+ It is only valid when a long-named option has been found by the most
-+ recent call.
-+
-+ If LONG_ONLY is nonzero, '-' as well as '--' can introduce
-+ long-named options.
-+
-+ If POSIXLY_CORRECT is nonzero, behave as if the POSIXLY_CORRECT
-+ environment variable were set. */
-+
-+int
-+_getopt_internal_r (int argc, char **argv, const char *optstring,
-+ const struct option *longopts, int *longind,
-+ int long_only, int posixly_correct, struct _getopt_data *d)
-+{
-+ int print_errors = d->opterr;
-+ if (optstring[0] == ':')
-+ print_errors = 0;
-+
-+ if (argc < 1)
-+ return -1;
-+
-+ d->optarg = NULL;
-+
-+ if (d->optind == 0 || !d->__initialized)
-+ {
-+ if (d->optind == 0)
-+d->optind = 1;/* Don't scan ARGV[0], the program name. */
-+ optstring = _getopt_initialize (argc, argv, optstring,
-+ posixly_correct, d);
-+ d->__initialized = 1;
-+ }
-+
-+ /* Test whether ARGV[optind] points to a non-option argument.
-+ Either it does not have option syntax, or there is an environment flag
-+ from the shell indicating it is not an option. The later information
-+ is only used when the used in the GNU libc. */
-+#if defined _LIBC && defined USE_NONOPTION_FLAGS
-+# define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0' \
-+ || (d->optind < d->__nonoption_flags_len \
-+ && __getopt_nonoption_flags[d->optind] == '1'))
-+#else
-+# define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0')
-+#endif
-+
-+ if (d->__nextchar == NULL || *d->__nextchar == '\0')
-+ {
-+ /* Advance to the next ARGV-element. */
-+
-+ /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been
-+ moved back by the user (who may also have changed the arguments). */
-+ if (d->__last_nonopt > d->optind)
-+d->__last_nonopt = d->optind;
-+ if (d->__first_nonopt > d->optind)
-+d->__first_nonopt = d->optind;
-+
-+ if (d->__ordering == PERMUTE)
-+{
-+ /* If we have just processed some options following some non-options,
-+ exchange them so that the options come first. */
-+
-+ if (d->__first_nonopt != d->__last_nonopt
-+ && d->__last_nonopt != d->optind)
-+ exchange ((char **) argv, d);
-+ else if (d->__last_nonopt != d->optind)
-+ d->__first_nonopt = d->optind;
-+
-+ /* Skip any additional non-options
-+ and extend the range of non-options previously skipped. */
-+
-+ while (d->optind < argc && NONOPTION_P)
-+ d->optind++;
-+ d->__last_nonopt = d->optind;
-+}
-+
-+ /* The special ARGV-element `--' means premature end of options.
-+ Skip it like a null option,
-+ then exchange with previous non-options as if it were an option,
-+ then skip everything else like a non-option. */
-+
-+ if (d->optind != argc && !strcmp (argv[d->optind], "--"))
-+{
-+ d->optind++;
-+
-+ if (d->__first_nonopt != d->__last_nonopt
-+ && d->__last_nonopt != d->optind)
-+ exchange ((char **) argv, d);
-+ else if (d->__first_nonopt == d->__last_nonopt)
-+ d->__first_nonopt = d->optind;
-+ d->__last_nonopt = argc;
-+
-+ d->optind = argc;
-+}
-+
-+ /* If we have done all the ARGV-elements, stop the scan
-+ and back over any non-options that we skipped and permuted. */
-+
-+ if (d->optind == argc)
-+{
-+ /* Set the next-arg-index to point at the non-options
-+ that we previously skipped, so the caller will digest them. */
-+ if (d->__first_nonopt != d->__last_nonopt)
-+ d->optind = d->__first_nonopt;
-+ return -1;
-+}
-+
-+ /* If we have come to a non-option and did not permute it,
-+ either stop the scan or describe it to the caller and pass it by. */
-+
-+ if (NONOPTION_P)
-+{
-+ if (d->__ordering == REQUIRE_ORDER)
-+ return -1;
-+ d->optarg = argv[d->optind++];
-+ return 1;
-+}
-+
-+ /* We have found another option-ARGV-element.
-+ Skip the initial punctuation. */
-+
-+ d->__nextchar = (argv[d->optind] + 1
-+ + (longopts != NULL && argv[d->optind][1] == '-'));
-+ }
-+
-+ /* Decode the current option-ARGV-element. */
-+
-+ /* Check whether the ARGV-element is a long option.
-+
-+ If long_only and the ARGV-element has the form "-f", where f is
-+ a valid short option, don't consider it an abbreviated form of
-+ a long option that starts with f. Otherwise there would be no
-+ way to give the -f short option.
-+
-+ On the other hand, if there's a long option "fubar" and
-+ the ARGV-element is "-fu", do consider that an abbreviation of
-+ the long option, just like "--fu", and not "-f" with arg "u".
-+
-+ This distinction seems to be the most useful approach. */
-+
-+ if (longopts != NULL
-+ && (argv[d->optind][1] == '-'
-+ || (long_only && (argv[d->optind][2]
-+ || !strchr (optstring, argv[d->optind][1])))))
-+ {
-+ char *nameend;
-+ const struct option *p;
-+ const struct option *pfound = NULL;
-+ int exact = 0;
-+ int ambig = 0;
-+ int indfound = -1;
-+ int option_index;
-+
-+ for (nameend = d->__nextchar; *nameend && *nameend != '='; nameend++)
-+/* Do nothing. */ ;
-+
-+ /* Test all long options for either exact match
-+ or abbreviated matches. */
-+ for (p = longopts, option_index = 0; p->name; p++, option_index++)
-+if (!strncmp (p->name, d->__nextchar, nameend - d->__nextchar))
-+ {
-+ if ((unsigned int) (nameend - d->__nextchar)
-+== (unsigned int) strlen (p->name))
-+ {
-+/* Exact match found. */
-+pfound = p;
-+indfound = option_index;
-+exact = 1;
-+break;
-+ }
-+ else if (pfound == NULL)
-+ {
-+/* First nonexact match found. */
-+pfound = p;
-+indfound = option_index;
-+ }
-+ else if (long_only
-+ || pfound->has_arg != p->has_arg
-+ || pfound->flag != p->flag
-+ || pfound->val != p->val)
-+ /* Second or later nonexact match found. */
-+ ambig = 1;
-+ }
-+
-+ if (ambig && !exact)
-+{
-+ if (print_errors)
-+ {
-+#if defined _LIBC && defined USE_IN_LIBIO
-+ char *buf;
-+
-+ if (__asprintf (&buf, _("%s: option `%s' is ambiguous\n"),
-+ argv[0], argv[d->optind]) >= 0)
-+{
-+ _IO_flockfile (stderr);
-+
-+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
-+ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
-+
-+ __fxprintf (NULL, "%s", buf);
-+
-+ ((_IO_FILE *) stderr)->_flags2 = old_flags2;
-+ _IO_funlockfile (stderr);
-+
-+ free (buf);
-+}
-+#else
-+ fprintf (stderr, _("%s: option `%s' is ambiguous\n"),
-+ argv[0], argv[d->optind]);
-+#endif
-+ }
-+ d->__nextchar += strlen (d->__nextchar);
-+ d->optind++;
-+ d->optopt = 0;
-+ return '?';
-+}
-+
-+ if (pfound != NULL)
-+{
-+ option_index = indfound;
-+ d->optind++;
-+ if (*nameend)
-+ {
-+ /* Don't test has_arg with >, because some C compilers don't
-+ allow it to be used on enums. */
-+ if (pfound->has_arg)
-+d->optarg = nameend + 1;
-+ else
-+{
-+ if (print_errors)
-+ {
-+#if defined _LIBC && defined USE_IN_LIBIO
-+ char *buf;
-+ int n;
-+#endif
-+
-+ if (argv[d->optind - 1][1] == '-')
-+{
-+ /* --option */
-+#if defined _LIBC && defined USE_IN_LIBIO
-+ n = __asprintf (&buf, _("\
-+%s: option `--%s' doesn't allow an argument\n"),
-+ argv[0], pfound->name);
-+#else
-+ fprintf (stderr, _("\
-+%s: option `--%s' doesn't allow an argument\n"),
-+ argv[0], pfound->name);
-+#endif
-+}
-+ else
-+{
-+ /* +option or -option */
-+#if defined _LIBC && defined USE_IN_LIBIO
-+ n = __asprintf (&buf, _("\
-+%s: option `%c%s' doesn't allow an argument\n"),
-+ argv[0], argv[d->optind - 1][0],
-+ pfound->name);
-+#else
-+ fprintf (stderr, _("\
-+%s: option `%c%s' doesn't allow an argument\n"),
-+ argv[0], argv[d->optind - 1][0],
-+ pfound->name);
-+#endif
-+}
-+
-+#if defined _LIBC && defined USE_IN_LIBIO
-+ if (n >= 0)
-+{
-+ _IO_flockfile (stderr);
-+
-+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
-+ ((_IO_FILE *) stderr)->_flags2
-+ |= _IO_FLAGS2_NOTCANCEL;
-+
-+ __fxprintf (NULL, "%s", buf);
-+
-+ ((_IO_FILE *) stderr)->_flags2 = old_flags2;
-+ _IO_funlockfile (stderr);
-+
-+ free (buf);
-+}
-+#endif
-+ }
-+
-+ d->__nextchar += strlen (d->__nextchar);
-+
-+ d->optopt = pfound->val;
-+ return '?';
-+}
-+ }
-+ else if (pfound->has_arg == 1)
-+ {
-+ if (d->optind < argc)
-+d->optarg = argv[d->optind++];
-+ else
-+{
-+ if (print_errors)
-+ {
-+#if defined _LIBC && defined USE_IN_LIBIO
-+ char *buf;
-+
-+ if (__asprintf (&buf, _("\
-+%s: option `%s' requires an argument\n"),
-+ argv[0], argv[d->optind - 1]) >= 0)
-+{
-+ _IO_flockfile (stderr);
-+
-+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
-+ ((_IO_FILE *) stderr)->_flags2
-+ |= _IO_FLAGS2_NOTCANCEL;
-+
-+ __fxprintf (NULL, "%s", buf);
-+
-+ ((_IO_FILE *) stderr)->_flags2 = old_flags2;
-+ _IO_funlockfile (stderr);
-+
-+ free (buf);
-+}
-+#else
-+ fprintf (stderr,
-+ _("%s: option `%s' requires an argument\n"),
-+ argv[0], argv[d->optind - 1]);
-+#endif
-+ }
-+ d->__nextchar += strlen (d->__nextchar);
-+ d->optopt = pfound->val;
-+ return optstring[0] == ':' ? ':' : '?';
-+}
-+ }
-+ d->__nextchar += strlen (d->__nextchar);
-+ if (longind != NULL)
-+ *longind = option_index;
-+ if (pfound->flag)
-+ {
-+ *(pfound->flag) = pfound->val;
-+ return 0;
-+ }
-+ return pfound->val;
-+}
-+
-+ /* Can't find it as a long option. If this is not getopt_long_only,
-+ or the option starts with '--' or is not a valid short
-+ option, then it's an error.
-+ Otherwise interpret it as a short option. */
-+ if (!long_only || argv[d->optind][1] == '-'
-+ || strchr (optstring, *d->__nextchar) == NULL)
-+{
-+ if (print_errors)
-+ {
-+#if defined _LIBC && defined USE_IN_LIBIO
-+ char *buf;
-+ int n;
-+#endif
-+
-+ if (argv[d->optind][1] == '-')
-+{
-+ /* --option */
-+#if defined _LIBC && defined USE_IN_LIBIO
-+ n = __asprintf (&buf, _("%s: unrecognized option `--%s'\n"),
-+ argv[0], d->__nextchar);
-+#else
-+ fprintf (stderr, _("%s: unrecognized option `--%s'\n"),
-+ argv[0], d->__nextchar);
-+#endif
-+}
-+ else
-+{
-+ /* +option or -option */
-+#if defined _LIBC && defined USE_IN_LIBIO
-+ n = __asprintf (&buf, _("%s: unrecognized option `%c%s'\n"),
-+ argv[0], argv[d->optind][0], d->__nextchar);
-+#else
-+ fprintf (stderr, _("%s: unrecognized option `%c%s'\n"),
-+ argv[0], argv[d->optind][0], d->__nextchar);
-+#endif
-+}
-+
-+#if defined _LIBC && defined USE_IN_LIBIO
-+ if (n >= 0)
-+{
-+ _IO_flockfile (stderr);
-+
-+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
-+ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
-+
-+ __fxprintf (NULL, "%s", buf);
-+
-+ ((_IO_FILE *) stderr)->_flags2 = old_flags2;
-+ _IO_funlockfile (stderr);
-+
-+ free (buf);
-+}
-+#endif
-+ }
-+ d->__nextchar = (char *) "";
-+ d->optind++;
-+ d->optopt = 0;
-+ return '?';
-+}
-+ }
-+
-+ /* Look at and handle the next short option-character. */
-+
-+ {
-+ char c = *d->__nextchar++;
-+ char *temp = strchr (optstring, c);
-+
-+ /* Increment `optind' when we start to process its last character. */
-+ if (*d->__nextchar == '\0')
-+ ++d->optind;
-+
-+ if (temp == NULL || c == ':')
-+ {
-+if (print_errors)
-+ {
-+#if defined _LIBC && defined USE_IN_LIBIO
-+ char *buf;
-+ int n;
-+#endif
-+
-+ if (d->__posixly_correct)
-+ {
-+/* 1003.2 specifies the format of this message. */
-+#if defined _LIBC && defined USE_IN_LIBIO
-+n = __asprintf (&buf, _("%s: illegal option -- %c\n"),
-+argv[0], c);
-+#else
-+fprintf (stderr, _("%s: illegal option -- %c\n"), argv[0], c);
-+#endif
-+ }
-+ else
-+ {
-+#if defined _LIBC && defined USE_IN_LIBIO
-+n = __asprintf (&buf, _("%s: invalid option -- %c\n"),
-+argv[0], c);
-+#else
-+fprintf (stderr, _("%s: invalid option -- %c\n"), argv[0], c);
-+#endif
-+ }
-+
-+#if defined _LIBC && defined USE_IN_LIBIO
-+ if (n >= 0)
-+ {
-+_IO_flockfile (stderr);
-+
-+int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
-+((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
-+
-+__fxprintf (NULL, "%s", buf);
-+
-+((_IO_FILE *) stderr)->_flags2 = old_flags2;
-+_IO_funlockfile (stderr);
-+
-+free (buf);
-+ }
-+#endif
-+ }
-+d->optopt = c;
-+return '?';
-+ }
-+ /* Convenience. Treat POSIX -W foo same as long option --foo */
-+ if (temp[0] == 'W' && temp[1] == ';')
-+ {
-+char *nameend;
-+const struct option *p;
-+const struct option *pfound = NULL;
-+int exact = 0;
-+int ambig = 0;
-+int indfound = 0;
-+int option_index;
-+
-+/* This is an option that requires an argument. */
-+if (*d->__nextchar != '\0')
-+ {
-+ d->optarg = d->__nextchar;
-+ /* If we end this ARGV-element by taking the rest as an arg,
-+ we must advance to the next element now. */
-+ d->optind++;
-+ }
-+else if (d->optind == argc)
-+ {
-+ if (print_errors)
-+ {
-+/* 1003.2 specifies the format of this message. */
-+#if defined _LIBC && defined USE_IN_LIBIO
-+char *buf;
-+
-+if (__asprintf (&buf,
-+_("%s: option requires an argument -- %c\n"),
-+argv[0], c) >= 0)
-+ {
-+ _IO_flockfile (stderr);
-+
-+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
-+ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
-+
-+ __fxprintf (NULL, "%s", buf);
-+
-+ ((_IO_FILE *) stderr)->_flags2 = old_flags2;
-+ _IO_funlockfile (stderr);
-+
-+ free (buf);
-+ }
-+#else
-+fprintf (stderr, _("%s: option requires an argument -- %c\n"),
-+ argv[0], c);
-+#endif
-+ }
-+ d->optopt = c;
-+ if (optstring[0] == ':')
-+ c = ':';
-+ else
-+ c = '?';
-+ return c;
-+ }
-+else
-+ /* We already incremented `d->optind' once;
-+ increment it again when taking next ARGV-elt as argument. */
-+ d->optarg = argv[d->optind++];
-+
-+/* optarg is now the argument, see if it's in the
-+ table of longopts. */
-+
-+for (d->__nextchar = nameend = d->optarg; *nameend && *nameend != '=';
-+ nameend++)
-+ /* Do nothing. */ ;
-+
-+/* Test all long options for either exact match
-+ or abbreviated matches. */
-+for (p = longopts, option_index = 0; p->name; p++, option_index++)
-+ if (!strncmp (p->name, d->__nextchar, nameend - d->__nextchar))
-+ {
-+ if ((unsigned int) (nameend - d->__nextchar) == strlen (p->name))
-+{
-+ /* Exact match found. */
-+ pfound = p;
-+ indfound = option_index;
-+ exact = 1;
-+ break;
-+}
-+ else if (pfound == NULL)
-+{
-+ /* First nonexact match found. */
-+ pfound = p;
-+ indfound = option_index;
-+}
-+ else
-+/* Second or later nonexact match found. */
-+ambig = 1;
-+ }
-+if (ambig && !exact)
-+ {
-+ if (print_errors)
-+ {
-+#if defined _LIBC && defined USE_IN_LIBIO
-+char *buf;
-+
-+if (__asprintf (&buf, _("%s: option `-W %s' is ambiguous\n"),
-+argv[0], argv[d->optind]) >= 0)
-+ {
-+ _IO_flockfile (stderr);
-+
-+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
-+ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
-+
-+ __fxprintf (NULL, "%s", buf);
-+
-+ ((_IO_FILE *) stderr)->_flags2 = old_flags2;
-+ _IO_funlockfile (stderr);
-+
-+ free (buf);
-+ }
-+#else
-+fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"),
-+ argv[0], argv[d->optind]);
-+#endif
-+ }
-+ d->__nextchar += strlen (d->__nextchar);
-+ d->optind++;
-+ return '?';
-+ }
-+if (pfound != NULL)
-+ {
-+ option_index = indfound;
-+ if (*nameend)
-+ {
-+/* Don't test has_arg with >, because some C compilers don't
-+ allow it to be used on enums. */
-+if (pfound->has_arg)
-+ d->optarg = nameend + 1;
-+else
-+ {
-+ if (print_errors)
-+ {
-+#if defined _LIBC && defined USE_IN_LIBIO
-+char *buf;
-+
-+if (__asprintf (&buf, _("\
-+%s: option `-W %s' doesn't allow an argument\n"),
-+argv[0], pfound->name) >= 0)
-+ {
-+ _IO_flockfile (stderr);
-+
-+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
-+ ((_IO_FILE *) stderr)->_flags2
-+ |= _IO_FLAGS2_NOTCANCEL;
-+
-+ __fxprintf (NULL, "%s", buf);
-+
-+ ((_IO_FILE *) stderr)->_flags2 = old_flags2;
-+ _IO_funlockfile (stderr);
-+
-+ free (buf);
-+ }
-+#else
-+fprintf (stderr, _("\
-+%s: option `-W %s' doesn't allow an argument\n"),
-+ argv[0], pfound->name);
-+#endif
-+ }
-+
-+ d->__nextchar += strlen (d->__nextchar);
-+ return '?';
-+ }
-+ }
-+ else if (pfound->has_arg == 1)
-+ {
-+if (d->optind < argc)
-+ d->optarg = argv[d->optind++];
-+else
-+ {
-+ if (print_errors)
-+ {
-+#if defined _LIBC && defined USE_IN_LIBIO
-+char *buf;
-+
-+if (__asprintf (&buf, _("\
-+%s: option `%s' requires an argument\n"),
-+argv[0], argv[d->optind - 1]) >= 0)
-+ {
-+ _IO_flockfile (stderr);
-+
-+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
-+ ((_IO_FILE *) stderr)->_flags2
-+ |= _IO_FLAGS2_NOTCANCEL;
-+
-+ __fxprintf (NULL, "%s", buf);
-+
-+ ((_IO_FILE *) stderr)->_flags2 = old_flags2;
-+ _IO_funlockfile (stderr);
-+
-+ free (buf);
-+ }
-+#else
-+fprintf (stderr,
-+ _("%s: option `%s' requires an argument\n"),
-+ argv[0], argv[d->optind - 1]);
-+#endif
-+ }
-+ d->__nextchar += strlen (d->__nextchar);
-+ return optstring[0] == ':' ? ':' : '?';
-+ }
-+ }
-+ d->__nextchar += strlen (d->__nextchar);
-+ if (longind != NULL)
-+ *longind = option_index;
-+ if (pfound->flag)
-+ {
-+*(pfound->flag) = pfound->val;
-+return 0;
-+ }
-+ return pfound->val;
-+ }
-+ d->__nextchar = NULL;
-+ return 'W';/* Let the application handle it. */
-+ }
-+ if (temp[1] == ':')
-+ {
-+if (temp[2] == ':')
-+ {
-+ /* This is an option that accepts an argument optionally. */
-+ if (*d->__nextchar != '\0')
-+ {
-+d->optarg = d->__nextchar;
-+d->optind++;
-+ }
-+ else
-+ d->optarg = NULL;
-+ d->__nextchar = NULL;
-+ }
-+else
-+ {
-+ /* This is an option that requires an argument. */
-+ if (*d->__nextchar != '\0')
-+ {
-+d->optarg = d->__nextchar;
-+/* If we end this ARGV-element by taking the rest as an arg,
-+ we must advance to the next element now. */
-+d->optind++;
-+ }
-+ else if (d->optind == argc)
-+ {
-+if (print_errors)
-+ {
-+ /* 1003.2 specifies the format of this message. */
-+#if defined _LIBC && defined USE_IN_LIBIO
-+ char *buf;
-+
-+ if (__asprintf (&buf, _("\
-+%s: option requires an argument -- %c\n"),
-+ argv[0], c) >= 0)
-+ {
-+_IO_flockfile (stderr);
-+
-+int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
-+((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
-+
-+__fxprintf (NULL, "%s", buf);
-+
-+((_IO_FILE *) stderr)->_flags2 = old_flags2;
-+_IO_funlockfile (stderr);
-+
-+free (buf);
-+ }
-+#else
-+ fprintf (stderr,
-+ _("%s: option requires an argument -- %c\n"),
-+ argv[0], c);
-+#endif
-+ }
-+d->optopt = c;
-+if (optstring[0] == ':')
-+ c = ':';
-+else
-+ c = '?';
-+ }
-+ else
-+ /* We already incremented `optind' once;
-+ increment it again when taking next ARGV-elt as argument. */
-+ d->optarg = argv[d->optind++];
-+ d->__nextchar = NULL;
-+ }
-+ }
-+ return c;
-+ }
-+}
-+
-+int
-+_getopt_internal (int argc, char **argv, const char *optstring,
-+ const struct option *longopts, int *longind,
-+ int long_only, int posixly_correct)
-+{
-+ int result;
-+
-+ getopt_data.optind = optind;
-+ getopt_data.opterr = opterr;
-+
-+ result = _getopt_internal_r (argc, argv, optstring, longopts, longind,
-+ long_only, posixly_correct, &getopt_data);
-+
-+ optind = getopt_data.optind;
-+ optarg = getopt_data.optarg;
-+ optopt = getopt_data.optopt;
-+
-+ return result;
-+}
-+
-+/* glibc gets a LSB-compliant getopt.
-+ Standalone applications get a POSIX-compliant getopt. */
-+#if _LIBC
-+enum { POSIXLY_CORRECT = 0 };
-+#else
-+enum { POSIXLY_CORRECT = 1 };
-+#endif
-+
-+int
-+getopt (int argc, char *const *argv, const char *optstring)
-+{
-+ return _getopt_internal (argc, (char **) argv, optstring, NULL, NULL, 0,
-+ POSIXLY_CORRECT);
-+}
-+
-+
-+#ifdef TEST
-+
-+/* Compile with -DTEST to make an executable for use in testing
-+ the above definition of `getopt'. */
-+
-+int
-+main (int argc, char **argv)
-+{
-+ int c;
-+ int digit_optind = 0;
-+
-+ while (1)
-+ {
-+ int this_option_optind = optind ? optind : 1;
-+
-+ c = getopt (argc, argv, "abc:d:0123456789");
-+ if (c == -1)
-+break;
-+
-+ switch (c)
-+{
-+case '0':
-+case '1':
-+case '2':
-+case '3':
-+case '4':
-+case '5':
-+case '6':
-+case '7':
-+case '8':
-+case '9':
-+ if (digit_optind != 0 && digit_optind != this_option_optind)
-+ printf ("digits occur in two different argv-elements.\n");
-+ digit_optind = this_option_optind;
-+ printf ("option %c\n", c);
-+ break;
-+
-+case 'a':
-+ printf ("option a\n");
-+ break;
-+
-+case 'b':
-+ printf ("option b\n");
-+ break;
-+
-+case 'c':
-+ printf ("option c with value `%s'\n", optarg);
-+ break;
-+
-+case '?':
-+ break;
-+
-+default:
-+ printf ("?? getopt returned character code 0%o ??\n", c);
-+}
-+ }
-+
-+ if (optind < argc)
-+ {
-+ printf ("non-option ARGV-elements: ");
-+ while (optind < argc)
-+printf ("%s ", argv[optind++]);
-+ printf ("\n");
-+ }
-+
-+ exit (0);
-+}
-+
-+#endif /* TEST */
-diff --git a/gnulib/getopt.in.h b/gnulib/getopt.in.h
-new file mode 100644
-index 0000000..15c213f
---- /dev/null
-+++ b/gnulib/getopt.in.h
-< at >< at > -0,0 +1,242 < at >< at >
-+/* 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 <http://www.gnu.org/licenses/>. */
-+
-+#ifndef _GL_GETOPT_H
-+
-+#if __GNUC__ >= 3
-+< at >PRAGMA_SYSTEM_HEADER< at >
-+#endif
-+
-+/* The include_next requires a split double-inclusion guard. */
-+#if < at >HAVE_GETOPT_H< at >
-+# < at >INCLUDE_NEXT< at > < at >NEXT_GETOPT_H< at >
-+#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 <getopt.h>,
-+ 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 !< at >HAVE_GETOPT_H< at >
-+# include <stdlib.h>
-+# include <stdio.h>
-+# include <unistd.h>
-+# 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 <features.h>, but
-+ that does not exist if we are standalone. So: if __GNU_LIBRARY__ is
-+ not defined, include <ctype.h>, which will pull in <features.h> 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 <ctype.h>
-+#endif
-+
-+#ifndef __THROW
-+# ifndef __GNUC_PREREQ
-+# define __GNUC_PREREQ(maj, min) (0)
-+# endif
-+# if defined __cplusplus && __GNUC_PREREQ (2,8)
-+# define __THROWthrow ()
-+# 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_argument0
-+# define required_argument1
-+# define optional_argument2
-+#endif/* need getopt */
-+
-+
-+/* Get definitions and prototypes for functions to process the
-+ arguments in ARGV (ARGC of them, minus the program name) for
-+ options given in OPTS.
-+
-+ Return the option character from OPTS just read. Return -1 when
-+ there are no more options. For unrecognized options, or options
-+ missing arguments, `optopt' is set to the option letter, and '?' is
-+ returned.
-+
-+ The OPTS string is a list of characters which are recognized option
-+ letters, optionally followed by colons, specifying that that letter
-+ takes an argument, to be placed in `optarg'.
-+
-+ If a letter in OPTS is followed by two colons, its argument is
-+ optional. This behavior is specific to the GNU `getopt'.
-+
-+ The argument `--' causes premature termination of argument
-+ scanning, explicitly telling `getopt' that there are no more
-+ options.
-+
-+ If OPTS begins with `-', then non-option arguments are treated as
-+ arguments to the option '\1'. This behavior is specific to the GNU
-+ `getopt'. If OPTS begins with `+', or POSIXLY_CORRECT is set in
-+ the environment, then do not permute arguments. */
-+
-+extern int getopt (int ___argc, char *const *___argv, const char *__shortopts)
-+ __THROW;
-+
-+#ifndef __need_getopt
-+extern int getopt_long (int ___argc, char *__getopt_argv_const *___argv,
-+const char *__shortopts,
-+ const struct option *__longopts, int *__longind)
-+ __THROW;
-+extern int getopt_long_only (int ___argc, char *__getopt_argv_const *___argv,
-+ const char *__shortopts,
-+ const struct option *__longopts, int *__longind)
-+ __THROW;
-+
-+#endif
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+/* Make sure we later can get all the definitions and declarations. */
-+#undef __need_getopt
-+
-+#endif /* getopt.h */
-+#endif /* getopt.h */
-diff --git a/gnulib/getopt1.c b/gnulib/getopt1.c
-new file mode 100644
-index 0000000..ba115c4
---- /dev/null
-+++ b/gnulib/getopt1.c
-< at >< at > -0,0 +1,170 < at >< at >
-+/* 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 <http://www.gnu.org/licenses/>. */
-+
-+#ifdef _LIBC
-+# include <getopt.h>
-+#else
-+# include <config.h>
-+# include "getopt.h"
-+#endif
-+#include "getopt_int.h"
-+
-+#include <stdio.h>
-+
-+/* This needs to come after some library #include
-+ to get __GNU_LIBRARY__ defined. */
-+#ifdef __GNU_LIBRARY__
-+#include <stdlib.h>
-+#endif
-+
-+#ifndefNULL
-+#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 <stdio.h>
-+
-+int
-+main (int argc, char **argv)
-+{
-+ int c;
-+ int digit_optind = 0;
-+
-+ while (1)
-+ {
-+ int this_option_optind = optind ? optind : 1;
-+ int option_index = 0;
-+ static const struct option long_options[] =
-+ {
-+{"add", 1, 0, 0},
-+{"append", 0, 0, 0},
-+{"delete", 1, 0, 0},
-+{"verbose", 0, 0, 0},
-+{"create", 0, 0, 0},
-+{"file", 1, 0, 0},
-+{0, 0, 0, 0}
-+ };
-+
-+ c = getopt_long (argc, argv, "abc:d:0123456789",
-+ long_options, &option_index);
-+ if (c == -1)
-+break;
-+
-+ switch (c)
-+{
-+case 0:
-+ printf ("option %s", long_options[option_index].name);
-+ if (optarg)
-+ printf (" with arg %s", optarg);
-+ printf ("\n");
-+ break;
-+
-+case '0':
-+case '1':
-+case '2':
-+case '3':
-+case '4':
-+case '5':
-+case '6':
-+case '7':
-+case '8':
-+case '9':
-+ if (digit_optind != 0 && digit_optind != this_option_optind)
-+ printf ("digits occur in two different argv-elements.\n");
-+ digit_optind = this_option_optind;
-+ printf ("option %c\n", c);
-+ break;
-+
-+case 'a':
-+ printf ("option a\n");
-+ break;
-+
-+case 'b':
-+ printf ("option b\n");
-+ break;
-+
-+case 'c':
-+ printf ("option c with value `%s'\n", optarg);
-+ break;
-+
-+case 'd':
-+ printf ("option d with value `%s'\n", optarg);
-+ break;
-+
-+case '?':
-+ break;
-+
-+default:
-+ printf ("?? getopt returned character code 0%o ??\n", c);
-+}
-+ }
-+
-+ if (optind < argc)
-+ {
-+ printf ("non-option ARGV-elements: ");
-+ while (optind < argc)
-+printf ("%s ", argv[optind++]);
-+ printf ("\n");
-+ }
-+
-+ exit (0);
-+}
-+
-+#endif /* TEST */
-diff --git a/gnulib/getopt_int.h b/gnulib/getopt_int.h
-new file mode 100644
-index 0000000..3c6628b
---- /dev/null
-+++ b/gnulib/getopt_int.h
-< at >< at > -0,0 +1,130 < at >< at >
-+/* 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 <http://www.gnu.org/licenses/>. */
-+
-+#ifndef _GETOPT_INT_H
-+#define _GETOPT_INT_H1
-+
-+extern int _getopt_internal (int ___argc, char **___argv,
-+ const char *__shortopts,
-+ const struct option *__longopts, int *__longind,
-+ int __long_only, int __posixly_correct);
-+
-+
-+/* Reentrant versions which can handle parsing multiple argument
-+ vectors at the same time. */
-+
-+/* Data type for reentrant functions. */
-+struct _getopt_data
-+{
-+ /* These have exactly the same meaning as the corresponding global
-+ variables, except that they are used for the reentrant
-+ versions of getopt. */
-+ int optind;
-+ int opterr;
-+ int optopt;
-+ char *optarg;
-+
-+ /* Internal members. */
-+
-+ /* True if the internal members have been initialized. */
-+ int __initialized;
-+
-+ /* The next char to be scanned in the option-element
-+ in which the last option character we returned was found.
-+ This allows us to pick up the scan where we left off.
-+
-+ If this is zero, or a null string, it means resume the scan
-+ by advancing to the next ARGV-element. */
-+ char *__nextchar;
-+
-+ /* Describe how to deal with options that follow non-option ARGV-elements.
-+
-+ If the caller did not specify anything,
-+ the default is REQUIRE_ORDER if the environment variable
-+ POSIXLY_CORRECT is defined, PERMUTE otherwise.
-+
-+ REQUIRE_ORDER means don't recognize them as options;
-+ stop option processing when the first non-option is seen.
-+ This is what Unix does.
-+ This mode of operation is selected by either setting the environment
-+ variable POSIXLY_CORRECT, or using `+' as the first character
-+ of the list of option characters, or by calling getopt.
-+
-+ PERMUTE is the default. We permute the contents of ARGV as we
-+ scan, so that eventually all the non-options are at the end.
-+ This allows options to be given in any order, even with programs
-+ that were not written to expect this.
-+
-+ RETURN_IN_ORDER is an option available to programs that were
-+ written to expect options and other ARGV-elements in any order
-+ and that care about the ordering of the two. We describe each
-+ non-option ARGV-element as if it were the argument of an option
-+ with character code 1. Using `-' as the first character of the
-+ list of option characters selects this mode of operation.
-+
-+ The special argument `--' forces an end of option-scanning regardless
-+ of the value of `ordering'. In the case of RETURN_IN_ORDER, only
-+ `--' can cause `getopt' to return -1 with `optind' != ARGC. */
-+
-+ enum
-+ {
-+ REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
-+ } __ordering;
-+
-+ /* If the POSIXLY_CORRECT environment variable is set
-+ or getopt was called. */
-+ int __posixly_correct;
-+
-+
-+ /* Handle permutation of arguments. */
-+
-+ /* Describe the part of ARGV that contains non-options that have
-+ been skipped. `first_nonopt' is the index in ARGV of the first
-+ of them; `last_nonopt' is the index after the last of them. */
-+
-+ int __first_nonopt;
-+ int __last_nonopt;
-+
-+#if defined _LIBC && defined USE_NONOPTION_FLAGS
-+ int __nonoption_flags_max_len;
-+ int __nonoption_flags_len;
-+# endif
-+};
-+
-+/* The initializer is necessary to set OPTIND and OPTERR to their
-+ default values and to clear the initialization flag. */
-+#define _GETOPT_DATA_INITIALIZER{ 1, 1 }
-+
-+extern int _getopt_internal_r (int ___argc, char **___argv,
-+ const char *__shortopts,
-+ const struct option *__longopts, int *__longind,
-+ int __long_only, int __posixly_correct,
-+ struct _getopt_data *__data);
-+
-+extern int _getopt_long_r (int ___argc, char **___argv,
-+ const char *__shortopts,
-+ const struct option *__longopts, int *__longind,
-+ struct _getopt_data *__data);
-+
-+extern int _getopt_long_only_r (int ___argc, char **___argv,
-+const char *__shortopts,
-+const struct option *__longopts,
-+int *__longind,
-+struct _getopt_data *__data);
-+
-+#endif /* getopt_int.h */
-diff --git a/gnulib/gettext.h b/gnulib/gettext.h
-new file mode 100644
-index 0000000..8cf2dca
---- /dev/null
-+++ b/gnulib/gettext.h
-< at >< at > -0,0 +1,279 < at >< at >
-+/* Convenience header for conditional use of GNU <libintl.h>.
-+ Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009 Free Software Foundation, Inc.
-+
-+ This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; either version 3, or (at your option)
-+ any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License along
-+ with this program; if not, write to the Free Software Foundation,
-+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-+
-+#ifndef _LIBGETTEXT_H
-+#define _LIBGETTEXT_H 1
-+
-+/* NLS can be disabled through the configure --disable-nls option. */
-+#if ENABLE_NLS
-+
-+/* Get declarations of GNU message catalog functions. */
-+# include <libintl.h>
-+
-+/* 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 <locale.h> a NOP. We don't include <libintl.h>
-+ as well because people using "gettext.h" will not include <libintl.h>,
-+ and also including <libintl.h> would fail on SunOS 4, whereas <locale.h>
-+ is OK. */
-+#if defined(__sun)
-+# include <locale.h>
-+#endif
-+
-+/* Many header files from the libstdc++ coming with g++ 3.3 or newer include
-+ <libintl.h>, which chokes if dcgettext is defined as a macro. So include
-+ it now, to make later inclusions of <libintl.h> a NOP. */
-+#if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3)
-+# include <cstdlib>
-+# if (__GLIBC__ >= 2) || _GLIBCXX_HAVE_LIBINTL_H
-+# include <libintl.h>
-+# 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 <string.h>
-+
-+#define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS \
-+ (((__GNUC__ >= 3 || __GNUG__ >= 2) && !__STRICT_ANSI__) \
-+ /* || __STDC_VERSION__ >= 199901L */ )
-+
-+#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
-+#include <stdlib.h>
-+#endif
-+
-+#define pgettext_expr(Msgctxt, Msgid) \
-+ dcpgettext_expr (NULL, Msgctxt, Msgid, LC_MESSAGES)
-+#define dpgettext_expr(Domainname, Msgctxt, Msgid) \
-+ dcpgettext_expr (Domainname, Msgctxt, Msgid, LC_MESSAGES)
-+
-+#ifdef __GNUC__
-+__inline
-+#else
-+#ifdef __cplusplus
-+inline
-+#endif
-+#endif
-+static const char *
-+dcpgettext_expr (const char *domain,
-+ const char *msgctxt, const char *msgid,
-+ int category)
-+{
-+ size_t msgctxt_len = strlen (msgctxt) + 1;
-+ size_t msgid_len = strlen (msgid) + 1;
-+ const char *translation;
-+#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
-+ char msg_ctxt_id[msgctxt_len + msgid_len];
-+#else
-+ char buf[1024];
-+ char *msg_ctxt_id =
-+ (msgctxt_len + msgid_len <= sizeof (buf)
-+ ? buf
-+ : (char *) malloc (msgctxt_len + msgid_len));
-+ if (msg_ctxt_id != NULL)
-+#endif
-+ {
-+ memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
-+ msg_ctxt_id[msgctxt_len - 1] = '\004';
-+ memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
-+ translation = dcgettext (domain, msg_ctxt_id, category);
-+#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
-+ if (msg_ctxt_id != buf)
-+free (msg_ctxt_id);
-+#endif
-+ if (translation != msg_ctxt_id)
-+return translation;
-+ }
-+ return msgid;
-+}
-+
-+#define npgettext_expr(Msgctxt, Msgid, MsgidPlural, N) \
-+ dcnpgettext_expr (NULL, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES)
-+#define dnpgettext_expr(Domainname, Msgctxt, Msgid, MsgidPlural, N) \
-+ dcnpgettext_expr (Domainname, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES)
-+
-+#ifdef __GNUC__
-+__inline
-+#else
-+#ifdef __cplusplus
-+inline
-+#endif
-+#endif
-+static const char *
-+dcnpgettext_expr (const char *domain,
-+ const char *msgctxt, const char *msgid,
-+ const char *msgid_plural, unsigned long int n,
-+ int category)
-+{
-+ size_t msgctxt_len = strlen (msgctxt) + 1;
-+ size_t msgid_len = strlen (msgid) + 1;
-+ const char *translation;
-+#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
-+ char msg_ctxt_id[msgctxt_len + msgid_len];
-+#else
-+ char buf[1024];
-+ char *msg_ctxt_id =
-+ (msgctxt_len + msgid_len <= sizeof (buf)
-+ ? buf
-+ : (char *) malloc (msgctxt_len + msgid_len));
-+ if (msg_ctxt_id != NULL)
-+#endif
-+ {
-+ memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
-+ msg_ctxt_id[msgctxt_len - 1] = '\004';
-+ memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
-+ translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
-+#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
-+ if (msg_ctxt_id != buf)
-+free (msg_ctxt_id);
-+#endif
-+ if (!(translation == msg_ctxt_id || translation == msgid_plural))
-+return translation;
-+ }
-+ return (n == 1 ? msgid : msgid_plural);
-+}
-+
-+#endif /* _LIBGETTEXT_H */
-diff --git a/gnulib/m4/00gnulib.m4 b/gnulib/m4/00gnulib.m4
-new file mode 100644
-index 0000000..d4d04d1
---- /dev/null
-+++ b/gnulib/m4/00gnulib.m4
-< at >< at > -0,0 +1,30 < at >< at >
-+# 00gnulib.m4 serial 2
-+dnl Copyright (C) 2009 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+dnl This file must be named something that sorts before all other
-+dnl gnulib-provided .m4 files. It is needed until such time as we can
-+dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE semantics.
-+
-+# AC_DEFUN_ONCE([NAME], VALUE)
-+# ----------------------------
-+# Define NAME to expand to VALUE on the first use (whether by direct
-+# expansion, or by AC_REQUIRE), and to nothing on all subsequent uses.
-+# Avoid bugs in AC_REQUIRE in Autoconf 2.63 and earlier. This
-+# definition is slower than the version in Autoconf 2.64, because it
-+# can only use interfaces that existed since 2.59; but it achieves the
-+# same effect. Quoting is necessary to avoid confusing Automake.
-+m4_version_prereq([2.63.263], [],
-+[m4_define([AC][_DEFUN_ONCE],
-+ [AC][_DEFUN([$1],
-+ [AC_REQUIRE([_gl_DEFUN_ONCE([$1])],
-+ [m4_indir([_gl_DEFUN_ONCE([$1])])])])]dnl
-+[AC][_DEFUN([_gl_DEFUN_ONCE([$1])], [$2])])])
-+
-+# gl_00GNULIB
-+# -----------
-+# Witness macro that this file has been included. Needed to force
-+# Automake to include this file prior to all other gnulib .m4 files.
-+AC_DEFUN([gl_00GNULIB])
-diff --git a/gnulib/m4/extensions.m4 b/gnulib/m4/extensions.m4
-new file mode 100644
-index 0000000..ba6d5e1
---- /dev/null
-+++ b/gnulib/m4/extensions.m4
-< at >< at > -0,0 +1,104 < at >< at >
-+# serial 8 -*- Autoconf -*-
-+# Enable extensions on systems that normally disable them.
-+
-+# Copyright (C) 2003, 2006-2009 Free Software Foundation, Inc.
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This definition of AC_USE_SYSTEM_EXTENSIONS is stolen from CVS
-+# Autoconf. Perhaps we can remove this once we can assume Autoconf
-+# 2.62 or later everywhere, but since CVS Autoconf mutates rapidly
-+# enough in this area it's likely we'll need to redefine
-+# AC_USE_SYSTEM_EXTENSIONS for quite some time.
-+
-+# AC_USE_SYSTEM_EXTENSIONS
-+# ------------------------
-+# Enable extensions on systems that normally disable them,
-+# typically due to standards-conformance issues.
-+# Remember that #undef in AH_VERBATIM gets replaced with #define by
-+# AC_DEFINE. The goal here is to define all known feature-enabling
-+# macros, then, if reports of conflicts are made, disable macros that
-+# cause problems on some platforms (such as __EXTENSIONS__).
-+AC_DEFUN_ONCE([AC_USE_SYSTEM_EXTENSIONS],
-+[AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
-+AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
-+
-+ AC_REQUIRE([AC_CANONICAL_HOST])
-+
-+ AC_CHECK_HEADER([minix/config.h], [MINIX=yes], [MINIX=])
-+ if test "$MINIX" = yes; then
-+ AC_DEFINE([_POSIX_SOURCE], [1],
-+ [Define to 1 if you need to in order for `stat' and other
-+ things to work.])
-+ AC_DEFINE([_POSIX_1_SOURCE], [2],
-+ [Define to 2 if the system does not provide POSIX.1 features
-+ except with this defined.])
-+ AC_DEFINE([_MINIX], [1],
-+ [Define to 1 if on MINIX.])
-+ fi
-+
-+ dnl HP-UX 11.11 defines mbstate_t only if _XOPEN_SOURCE is defined to 500,
-+ dnl regardless of whether the flags -Ae or _D_HPUX_SOURCE=1 are already
-+ dnl provided.
-+ case "$host_os" in
-+ hpux*)
-+ AC_DEFINE([_XOPEN_SOURCE], [500],
-+ [Define to 500 only on HP-UX.])
-+ ;;
-+ esac
-+
-+ AH_VERBATIM([__EXTENSIONS__],
-+[/* Enable extensions on AIX 3, Interix. */
-+#ifndef _ALL_SOURCE
-+# undef _ALL_SOURCE
-+#endif
-+/* Enable GNU extensions on systems that have them. */
-+#ifndef _GNU_SOURCE
-+# undef _GNU_SOURCE
-+#endif
-+/* Enable threading extensions on Solaris. */
-+#ifndef _POSIX_PTHREAD_SEMANTICS
-+# undef _POSIX_PTHREAD_SEMANTICS
-+#endif
-+/* Enable extensions on HP NonStop. */
-+#ifndef _TANDEM_SOURCE
-+# undef _TANDEM_SOURCE
-+#endif
-+/* Enable general extensions on Solaris. */
-+#ifndef __EXTENSIONS__
-+# undef __EXTENSIONS__
-+#endif
-+])
-+ AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__],
-+ [ac_cv_safe_to_define___extensions__],
-+ [AC_COMPILE_IFELSE(
-+ [AC_LANG_PROGRAM([[
-+# define __EXTENSIONS__ 1
-+ ]AC_INCLUDES_DEFAULT])],
-+ [ac_cv_safe_to_define___extensions__=yes],
-+ [ac_cv_safe_to_define___extensions__=no])])
-+ test $ac_cv_safe_to_define___extensions__ = yes &&
-+ AC_DEFINE([__EXTENSIONS__])
-+ AC_DEFINE([_ALL_SOURCE])
-+ AC_DEFINE([_GNU_SOURCE])
-+ AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
-+ AC_DEFINE([_TANDEM_SOURCE])
-+])# AC_USE_SYSTEM_EXTENSIONS
-+
-+# gl_USE_SYSTEM_EXTENSIONS
-+# ------------------------
-+# Enable extensions on systems that normally disable them,
-+# typically due to standards-conformance issues.
-+AC_DEFUN_ONCE([gl_USE_SYSTEM_EXTENSIONS],
-+[
-+ dnl Require this macro before AC_USE_SYSTEM_EXTENSIONS.
-+ dnl gnulib does not need it. But if it gets required by third-party macros
-+ dnl after AC_USE_SYSTEM_EXTENSIONS is required, autoconf 2.62..2.63 emit a
-+ dnl warning: "AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS".
-+ dnl Note: We can do this only for one of the macros AC_AIX, AC_GNU_SOURCE,
-+ dnl AC_MINIX. If people still use AC_AIX or AC_MINIX, they are out of luck.
-+ AC_REQUIRE([AC_GNU_SOURCE])
-+
-+ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
-+])
-diff --git a/gnulib/m4/getopt.m4 b/gnulib/m4/getopt.m4
-new file mode 100644
-index 0000000..53a1a7e
---- /dev/null
-+++ b/gnulib/m4/getopt.m4
-< at >< at > -0,0 +1,250 < at >< at >
-+# getopt.m4 serial 22
-+dnl Copyright (C) 2002-2006, 2008-2009 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+# Request a POSIX compliant getopt function.
-+AC_DEFUN([gl_FUNC_GETOPT_POSIX],
-+[
-+ m4_divert_text([DEFAULTS], [gl_getopt_required=POSIX])
-+ AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
-+ gl_GETOPT_IFELSE([
-+ gl_REPLACE_GETOPT
-+ ],
-+ [])
-+])
-+
-+# Request a POSIX compliant getopt function with GNU extensions (such as
-+# options with optional arguments) and the functions getopt_long,
-+# getopt_long_only.
-+AC_DEFUN([gl_FUNC_GETOPT_GNU],
-+[
-+ m4_divert_text([INIT_PREPARE], [gl_getopt_required=GNU])
-+
-+ AC_REQUIRE([gl_FUNC_GETOPT_POSIX])
-+])
-+
-+# Request the gnulib implementation of the getopt functions unconditionally.
-+# argp.m4 uses this.
-+AC_DEFUN([gl_REPLACE_GETOPT],
-+[
-+ dnl Arrange for getopt.h to be created.
-+ gl_GETOPT_SUBSTITUTE_HEADER
-+ dnl Arrange for unistd.h to include getopt.h.
-+ GNULIB_UNISTD_H_GETOPT=1
-+ dnl Arrange to compile the getopt implementation.
-+ AC_LIBOBJ([getopt])
-+ AC_LIBOBJ([getopt1])
-+ gl_PREREQ_GETOPT
-+])
-+
-+# emacs' configure.in uses this.
-+AC_DEFUN([gl_GETOPT_IFELSE],
-+[
-+ AC_REQUIRE([gl_GETOPT_CHECK_HEADERS])
-+ AS_IF([test -n "$gl_replace_getopt"], [$1], [$2])
-+])
-+
-+# Determine whether to replace the entire getopt facility.
-+AC_DEFUN([gl_GETOPT_CHECK_HEADERS],
-+[
-+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-+
-+ dnl Persuade Solaris <unistd.h> to declare optarg, optind, opterr, optopt.
-+ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
-+
-+ gl_CHECK_NEXT_HEADERS([getopt.h])
-+ AC_CHECK_HEADERS_ONCE([getopt.h])
-+ if test $ac_cv_header_getopt_h = yes; then
-+ HAVE_GETOPT_H=1
-+ else
-+ HAVE_GETOPT_H=0
-+ fi
-+ AC_SUBST([HAVE_GETOPT_H])
-+
-+ gl_replace_getopt=
-+
-+ dnl Test whether <getopt.h> is available.
-+ if test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then
-+ AC_CHECK_HEADERS([getopt.h], [], [gl_replace_getopt=yes])
-+ fi
-+
-+ dnl Test whether the function getopt_long is available.
-+ if test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then
-+ AC_CHECK_FUNCS([getopt_long_only], [], [gl_replace_getopt=yes])
-+ fi
-+
-+ dnl BSD getopt_long uses an incompatible method to reset option processing,
-+ dnl but the testsuite does not show a need to use this 'optreset' variable.
-+ if false && test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then
-+ AC_CHECK_DECL([optreset], [gl_replace_getopt=yes], [],
-+ [#include <getopt.h>])
-+ fi
-+
-+ dnl mingw's getopt (in libmingwex.a) does weird things when the options
-+ dnl strings starts with '+' and it's not the first call. Some internal state
-+ dnl is left over from earlier calls, and neither setting optind = 0 nor
-+ dnl setting optreset = 1 get rid of this internal state.
-+ if test -z "$gl_replace_getopt"; then
-+ AC_CACHE_CHECK([whether getopt is POSIX compatible],
-+ [gl_cv_func_getopt_posix],
-+ [
-+ dnl This test fails on mingw and succeeds on all other platforms.
-+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
-+#include <unistd.h>
-+#include <stdlib.h>
-+#include <string.h>
-+
-+/* The glibc implementation of getopt supports setting optind = 0 as a means
-+ of clearing the internal state, but other implementations don't. */
-+#if (__GLIBC__ >= 2)
-+# define OPTIND_MIN 0
-+#else
-+# define OPTIND_MIN 1
-+#endif
-+
-+int
-+main ()
-+{
-+ {
-+ int argc = 0;
-+ char *argv[10];
-+ int c;
-+
-+ argv[argc++] = "program";
-+ argv[argc++] = "-a";
-+ argv[argc++] = "foo";
-+ argv[argc++] = "bar";
-+ optind = OPTIND_MIN;
-+ opterr = 0;
-+
-+ c = getopt (argc, argv, "ab");
-+ if (!(c == 'a'))
-+ return 1;
-+ c = getopt (argc, argv, "ab");
-+ if (!(c == -1))
-+ return 2;
-+ if (!(optind == 2))
-+ return 3;
-+ }
-+ /* Some internal state exists at this point. */
-+ {
-+ int argc = 0;
-+ char *argv[10];
-+ int c;
-+
-+ argv[argc++] = "program";
-+ argv[argc++] = "donald";
-+ argv[argc++] = "-p";
-+ argv[argc++] = "billy";
-+ argv[argc++] = "duck";
-+ argv[argc++] = "-a";
-+ argv[argc++] = "bar";
-+ optind = OPTIND_MIN;
-+ opterr = 0;
-+
-+ c = getopt (argc, argv, "+abp:q:");
-+ if (!(c == -1))
-+ return 4;
-+ if (!(strcmp (argv[0], "program") == 0))
-+ return 5;
-+ if (!(strcmp (argv[1], "donald") == 0))
-+ return 6;
-+ if (!(strcmp (argv[2], "-p") == 0))
-+ return 7;
-+ if (!(strcmp (argv[3], "billy") == 0))
-+ return 8;
-+ if (!(strcmp (argv[4], "duck") == 0))
-+ return 9;
-+ if (!(strcmp (argv[5], "-a") == 0))
-+ return 10;
-+ if (!(strcmp (argv[6], "bar") == 0))
-+ return 11;
-+ if (!(optind == 1))
-+ return 12;
-+ }
-+
-+ return 0;
-+}
-+]])],
-+ [gl_cv_func_getopt_posix=yes], [gl_cv_func_getopt_posix=no],
-+ [case "$host_os" in
-+ mingw*) gl_cv_func_getopt_posix="guessing no";;
-+ *) gl_cv_func_getopt_posix="guessing yes";;
-+ esac
-+ ])
-+ ])
-+ case "$gl_cv_func_getopt_posix" in
-+ *no) gl_replace_getopt=yes ;;
-+ esac
-+ fi
-+
-+ if test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then
-+ AC_CACHE_CHECK([for working GNU getopt function], [gl_cv_func_getopt_gnu],
-+ [AC_RUN_IFELSE(
-+[AC_LANG_PROGRAM([[#include <getopt.h>
-+ #include <stddef.h>
-+ #include <string.h>]],
-+ [[
-+ /* This code succeeds on glibc 2.8, OpenBSD 4.0, Cygwin, mingw,
-+ and fails on MacOS X 10.5, AIX 5.2, HP-UX 11, IRIX 6.5,
-+ OSF/1 5.1, Solaris 10. */
-+ {
-+ char *myargv[3];
-+ myargv[0] = "conftest";
-+ myargv[1] = "-+";
-+ myargv[2] = 0;
-+ opterr = 0;
-+ if (getopt (2, myargv, "+a") != '?')
-+ return 1;
-+ }
-+ /* This code succeeds on glibc 2.8, mingw,
-+ and fails on MacOS X 10.5, OpenBSD 4.0, AIX 5.2, HP-UX 11,
-+ IRIX 6.5, OSF/1 5.1, Solaris 10, Cygwin. */
-+ {
-+ char *argv[] = { "program", "-p", "foo", "bar" };
-+
-+ optind = 1;
-+ if (getopt (4, argv, "p::") != 'p')
-+ return 2;
-+ if (optarg != NULL)
-+ return 3;
-+ if (getopt (4, argv, "p::") != -1)
-+ return 4;
-+ if (optind != 2)
-+ return 5;
-+ }
-+ return 0;
-+ ]])],
-+[gl_cv_func_getopt_gnu=yes],
-+[gl_cv_func_getopt_gnu=no],
-+[dnl Cross compiling. Guess based on host and declarations.
-+ case "$host_os" in
-+ *-gnu* | mingw*) gl_cv_func_getopt_gnu=no;;
-+ *) gl_cv_func_getopt_gnu=yes;;
-+ esac
-+ ])
-+ ])
-+ if test "$gl_cv_func_getopt_gnu" = "no"; then
-+ gl_replace_getopt=yes
-+ fi
-+ fi
-+])
-+
-+# emacs' configure.in uses this.
-+AC_DEFUN([gl_GETOPT_SUBSTITUTE_HEADER],
-+[
-+ GETOPT_H=getopt.h
-+ AC_DEFINE([__GETOPT_PREFIX], [[rpl_]],
-+ [Define to rpl_ if the getopt replacement functions and variables
-+ should be used.])
-+ AC_SUBST([GETOPT_H])
-+])
-+
-+# Prerequisites of lib/getopt*.
-+# emacs' configure.in uses this.
-+AC_DEFUN([gl_PREREQ_GETOPT],
-+[
-+ AC_CHECK_DECLS_ONCE([getenv])
-+])
-diff --git a/gnulib/m4/gnulib-cache.m4 b/gnulib/m4/gnulib-cache.m4
-new file mode 100644
-index 0000000..56a554b
---- /dev/null
-+++ b/gnulib/m4/gnulib-cache.m4
-< at >< at > -0,0 +1,36 < at >< at >
-+# Copyright (C) 2002-2009 Free Software Foundation, Inc.
-+#
-+# This file is free software, distributed under the terms of the GNU
-+# General Public License. As a special exception to the GNU General
-+# Public License, this file may be distributed as part of a program
-+# that contains a configuration script generated by Autoconf, under
-+# the same distribution terms as the rest of that program.
-+#
-+# Generated by gnulib-tool.
-+#
-+# This file represents the specification of how gnulib-tool is used.
-+# It acts as a cache: It is written and read by gnulib-tool.
-+# In projects using CVS, this file is meant to be stored in CVS,
-+# like the configure.ac and various Makefile.am files.
-+
-+
-+# Specification in the form of a command-line invocation:
-+# gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=. --libtool --macro-prefix=gl --no-vc-files getopt-gnu
-+
-+# Specification in the form of a few gnulib-tool.m4 macro invocations:
-+gl_LOCAL_DIR([])
-+gl_MODULES([
-+ getopt-gnu
-+])
-+gl_AVOID([])
-+gl_SOURCE_BASE([gnulib])
-+gl_M4_BASE([gnulib/m4])
-+gl_PO_BASE([])
-+gl_DOC_BASE([doc])
-+gl_TESTS_BASE([tests])
-+gl_LIB([libgnu])
-+gl_MAKEFILE_NAME([])
-+gl_LIBTOOL
-+gl_MACRO_PREFIX([gl])
-+gl_PO_DOMAIN([])
-+gl_VC_FILES([false])
-diff --git a/gnulib/m4/gnulib-common.m4 b/gnulib/m4/gnulib-common.m4
-new file mode 100644
-index 0000000..c8fda20
---- /dev/null
-+++ b/gnulib/m4/gnulib-common.m4
-< at >< at > -0,0 +1,124 < at >< at >
-+# gnulib-common.m4 serial 11
-+dnl Copyright (C) 2007-2009 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+# gl_COMMON
-+# is expanded unconditionally through gnulib-tool magic.
-+AC_DEFUN([gl_COMMON], [
-+ dnl Use AC_REQUIRE here, so that the code is expanded once only.
-+ AC_REQUIRE([gl_00GNULIB])
-+ AC_REQUIRE([gl_COMMON_BODY])
-+])
-+AC_DEFUN([gl_COMMON_BODY], [
-+ AH_VERBATIM([isoc99_inline],
-+[/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
-+ the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
-+ earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.
-+ __APPLE__ && __MACH__ test for MacOS X.
-+ __APPLE_CC__ tests for the Apple compiler and its version.
-+ __STDC_VERSION__ tests for the C99 mode. */
-+#if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__
-+# define __GNUC_STDC_INLINE__ 1
-+#endif])
-+ AH_VERBATIM([unused_parameter],
-+[/* Define as a marker that can be attached to function parameter declarations
-+ for parameters that are not used. This helps to reduce warnings, such as
-+ from GCC -Wunused-parameter. */
-+#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
-+# define _UNUSED_PARAMETER_ __attribute__ ((__unused__))
-+#else
-+# define _UNUSED_PARAMETER_
-+#endif
-+])
-+])
-+
-+# gl_MODULE_INDICATOR([modulename])
-+# defines a C macro indicating the presence of the given module.
-+AC_DEFUN([gl_MODULE_INDICATOR],
-+[
-+ AC_DEFINE([GNULIB_]translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___]), [1],
-+ [Define to 1 when using the gnulib module ]$1[.])
-+])
-+
-+# m4_foreach_w
-+# is a backport of autoconf-2.59c's m4_foreach_w.
-+# Remove this macro when we can assume autoconf >= 2.60.
-+m4_ifndef([m4_foreach_w],
-+ [m4_define([m4_foreach_w],
-+ [m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])])
-+
-+# AC_PROG_MKDIR_P
-+# is a backport of autoconf-2.60's AC_PROG_MKDIR_P.
-+# Remove this macro when we can assume autoconf >= 2.60.
-+m4_ifdef([AC_PROG_MKDIR_P], [], [
-+ AC_DEFUN_ONCE([AC_PROG_MKDIR_P],
-+ [AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
-+ MKDIR_P='$(mkdir_p)'
-+ AC_SUBST([MKDIR_P])])])
-+
-+# AC_C_RESTRICT
-+# This definition overrides the AC_C_RESTRICT macro from autoconf 2.60..2.61,
-+# so that mixed use of GNU C and GNU C++ and mixed use of Sun C and Sun C++
-+# works.
-+# This definition can be removed once autoconf >= 2.62 can be assumed.
-+AC_DEFUN([AC_C_RESTRICT],
-+[AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict],
-+ [ac_cv_c_restrict=no
-+ # The order here caters to the fact that C++ does not require restrict.
-+ for ac_kw in __restrict __restrict__ _Restrict restrict; do
-+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-+ [[typedef int * int_ptr;
-+int foo (int_ptr $ac_kw ip) {
-+return ip[0];
-+ }]],
-+ [[int s[1];
-+int * $ac_kw t = s;
-+t[0] = 0;
-+return foo(t)]])],
-+ [ac_cv_c_restrict=$ac_kw])
-+ test "$ac_cv_c_restrict" != no && break
-+ done
-+ ])
-+ AH_VERBATIM([restrict],
-+[/* Define to the equivalent of the C99 'restrict' keyword, or to
-+ nothing if this is not supported. Do not define if restrict is
-+ supported directly. */
-+#undef restrict
-+/* Work around a bug in Sun C++: it does not support _Restrict, even
-+ though the corresponding Sun C compiler does, which causes
-+ "#define restrict _Restrict" in the previous line. Perhaps some future
-+ version of Sun C++ will work with _Restrict; if so, it'll probably
-+ define __RESTRICT, just as Sun C does. */
-+#if defined __SUNPRO_CC && !defined __RESTRICT
-+# define _Restrict
-+#endif])
-+ case $ac_cv_c_restrict in
-+ restrict) ;;
-+ no) AC_DEFINE([restrict], []) ;;
-+ *) AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;;
-+ esac
-+])
-+
-+# gl_BIGENDIAN
-+# is like AC_C_BIGENDIAN, except that it can be AC_REQUIREd.
-+# Note that AC_REQUIRE([AC_C_BIGENDIAN]) does not work reliably because some
-+# macros invoke AC_C_BIGENDIAN with arguments.
-+AC_DEFUN([gl_BIGENDIAN],
-+[
-+ AC_C_BIGENDIAN
-+])
-+
-+# gl_CACHE_VAL_SILENT(cache-id, command-to-set-it)
-+# is like AC_CACHE_VAL(cache-id, command-to-set-it), except that it does not
-+# output a spurious "(cached)" mark in the midst of other configure output.
-+# This macro should be used instead of AC_CACHE_VAL when it is not surrounded
-+# by an AC_MSG_CHECKING/AC_MSG_RESULT pair.
-+AC_DEFUN([gl_CACHE_VAL_SILENT],
-+[
-+ saved_as_echo_n="$as_echo_n"
-+ as_echo_n=':'
-+ AC_CACHE_VAL([$1], [$2])
-+ as_echo_n="$saved_as_echo_n"
-+])
-diff --git a/gnulib/m4/gnulib-comp.m4 b/gnulib/m4/gnulib-comp.m4
-new file mode 100644
-index 0000000..6514552
---- /dev/null
-+++ b/gnulib/m4/gnulib-comp.m4
-< at >< at > -0,0 +1,197 < at >< at >
-+# DO NOT EDIT! GENERATED AUTOMATICALLY!
-+# Copyright (C) 2002-2009 Free Software Foundation, Inc.
-+#
-+# This file is free software, distributed under the terms of the GNU
-+# General Public License. As a special exception to the GNU General
-+# Public License, this file may be distributed as part of a program
-+# that contains a configuration script generated by Autoconf, under
-+# the same distribution terms as the rest of that program.
-+#
-+# Generated by gnulib-tool.
-+#
-+# This file represents the compiled summary of the specification in
-+# gnulib-cache.m4. It lists the computed macro invocations that need
-+# to be invoked from configure.ac.
-+# In projects using CVS, this file can be treated like other built files.
-+
-+
-+# This macro should be invoked from ./configure.in, in the section
-+# "Checks for programs", right after AC_PROG_CC, and certainly before
-+# any checks for libraries, header files, types and library functions.
-+AC_DEFUN([gl_EARLY],
-+[
-+ m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace
-+ m4_pattern_allow([^gl_ES$])dnl a valid locale name
-+ m4_pattern_allow([^gl_LIBOBJS$])dnl a variable
-+ m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable
-+ AC_REQUIRE([AC_PROG_RANLIB])
-+ AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
-+])
-+
-+# This macro should be invoked from ./configure.in, in the section
-+# "Check for header files, types and library functions".
-+AC_DEFUN([gl_INIT],
-+[
-+ AM_CONDITIONAL([GL_COND_LIBTOOL], [true])
-+ gl_cond_libtool=true
-+ m4_pushdef([AC_LIBOBJ], m4_defn([gl_LIBOBJ]))
-+ m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gl_REPLACE_FUNCS]))
-+ m4_pushdef([AC_LIBSOURCES], m4_defn([gl_LIBSOURCES]))
-+ m4_pushdef([gl_LIBSOURCES_LIST], [])
-+ m4_pushdef([gl_LIBSOURCES_DIR], [])
-+ gl_COMMON
-+ gl_source_base='gnulib'
-+ gl_FUNC_GETOPT_GNU
-+ gl_MODULE_INDICATOR([getopt-gnu])
-+ gl_FUNC_GETOPT_POSIX
-+ AC_SUBST([LIBINTL])
-+ AC_SUBST([LTLIBINTL])
-+ gl_STDDEF_H
-+ gl_UNISTD_H
-+ m4_ifval(gl_LIBSOURCES_LIST, [
-+ m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ ||
-+ for gl_file in ]gl_LIBSOURCES_LIST[ ; do
-+ if test ! -r ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file ; then
-+ echo "missing file ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file" >&2
-+ exit 1
-+ fi
-+ done])dnl
-+ m4_if(m4_sysval, [0], [],
-+ [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])])
-+ ])
-+ m4_popdef([gl_LIBSOURCES_DIR])
-+ m4_popdef([gl_LIBSOURCES_LIST])
-+ m4_popdef([AC_LIBSOURCES])
-+ m4_popdef([AC_REPLACE_FUNCS])
-+ m4_popdef([AC_LIBOBJ])
-+ AC_CONFIG_COMMANDS_PRE([
-+ gl_libobjs=
-+ gl_ltlibobjs=
-+ if test -n "$gl_LIBOBJS"; then
-+ # Remove the extension.
-+ sed_drop_objext='s/\.o$//;s/\.obj$//'
-+ for i in `for i in $gl_LIBOBJS; do echo "$i"; done | sed "$sed_drop_objext" | sort | uniq`; do
-+ gl_libobjs="$gl_libobjs $i.$ac_objext"
-+ gl_ltlibobjs="$gl_ltlibobjs $i.lo"
-+ done
-+ fi
-+ AC_SUBST([gl_LIBOBJS], [$gl_libobjs])
-+ AC_SUBST([gl_LTLIBOBJS], [$gl_ltlibobjs])
-+ ])
-+ gltests_libdeps=
-+ gltests_ltlibdeps=
-+ m4_pushdef([AC_LIBOBJ], m4_defn([gltests_LIBOBJ]))
-+ m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gltests_REPLACE_FUNCS]))
< at >< at > Diff output truncated at 100000 characters. < at >< at >
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
</pre>dmichelsen-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f< at >public.gmane.org2013-06-17T09:15:37[csw-devel] SF.net SVN: gar:[21350] csw/mgar/pkg/xchm/trunk
http://permalink.gmane.org/gmane.os.solaris.opencsw.devel/20245
<pre>Revision: 21350
http://gar.svn.sourceforge.net/gar/?rev=21350&view=rev
Author: dmichelsen
Date: 2013-06-17 08:21:45 +0000 (Mon, 17 Jun 2013)
Log Message:
-----------
xchm/trunk: Update to 1.20
Modified Paths:
--------------
csw/mgar/pkg/xchm/trunk/Makefile
csw/mgar/pkg/xchm/trunk/checksums
Modified: csw/mgar/pkg/xchm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xchm/trunk/Makefile2013-06-16 19:45:57 UTC (rev 21349)
+++ csw/mgar/pkg/xchm/trunk/Makefile2013-06-17 08:21:45 UTC (rev 21350)
< at >< at > -1,5 +1,5 < at >< at >
NAME = xchm
-VERSION = 1.18
+VERSION = 1.20
GARTYPE = v2
DESCRIPTION = Cross-platform GUI front-end to chmlib (.chm reader)
< at >< at > -13,19 +13,20 < at >< at >
DISTFILES = $(NAME)-$(VERSION).tar.gz
PATCHFILES = 0001-Fix-extra-comma-at-end-of-enum.patch
PATCHFILES += 0002-Remove-W-Wall-for-Sun-Studio.patch
-PATCHFILES += 0003-Use-inttypes-instead-of-stdint.patch
+#PATCHFILES += 0003-Use-inttypes-instead-of-stdint.patch
# We define upstream file regex so we can be notifed of new upstream software release
UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+BUILD_DEP_PKGS += CSWwxwidgets-dev
+BUILD_DEP_PKGS += CSWlibncurses-dev
+
RUNTIME_DEP_PKGS_CSWxchm = CSWchmlib
RUNTIME_DEP_PKGS_CSWxchm += CSWwxwidgetscommon
RUNTIME_DEP_PKGS_CSWxchm += CSWwxwidgetsgtk2
RUNTIME_DEP_PKGS_CSWxchm += CSWsunmath
RUNTIME_DEP_PKGS_CSWxchm += CSWncurses
-BUILD_DEP_PKGS = $(REQUIRED_PGKS) CSWwxwidgetsdevel
-
CONFIGURE_ARGS = $(DIRPATHS)
TEST_SCRIPTS =
Modified: csw/mgar/pkg/xchm/trunk/checksums
===================================================================
--- csw/mgar/pkg/xchm/trunk/checksums2013-06-16 19:45:57 UTC (rev 21349)
+++ csw/mgar/pkg/xchm/trunk/checksums2013-06-17 08:21:45 UTC (rev 21350)
< at >< at > -1 +1 < at >< at >
-07d7a910b3216301a002be5630c71866 xchm-1.18.tar.gz
+85943645d20af536704a20b58ebd5849 xchm-1.20.tar.gz
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
</pre>dmichelsen-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f< at >public.gmane.org2013-06-17T08:21:59Search EngineSearch the mailing list at Gmanequery
http://search.gmane.org/?group=$group=gmane.os.solaris.opencsw.devel