summaryrefslogtreecommitdiffstats
path: root/indent
diff options
context:
space:
mode:
authorpiernov <piernov@piernov.org>2012-05-30 19:09:20 +0000
committerpiernov <piernov@piernov.org>2012-05-30 19:09:20 +0000
commitedcce2f336c905ab1aeba022d9c2bf23d70981bc (patch)
tree431fea1af60b83a0b80f90ea06b7e3791262062c /indent
parentb3a897ed01ced2ef07e699a63d1adf6a649b441a (diff)
downloadnutyx-extra-edcce2f336c905ab1aeba022d9c2bf23d70981bc.tar.gz
nutyx-extra-edcce2f336c905ab1aeba022d9c2bf23d70981bc.tar.bz2
nutyx-extra-edcce2f336c905ab1aeba022d9c2bf23d70981bc.tar.xz
nutyx-extra-edcce2f336c905ab1aeba022d9c2bf23d70981bc.zip
indent 2.2.11-1 ajout port
Diffstat (limited to 'indent')
-rw-r--r--indent/.footprint.i68618
-rw-r--r--indent/.footprint.x86_6418
-rw-r--r--indent/.md5sum.i6864
-rw-r--r--indent/.md5sum.x86_644
-rw-r--r--indent/LC_ALL.patch17
-rw-r--r--indent/Pkgfile24
-rw-r--r--indent/decimal_format.patch97
-rw-r--r--indent/segfault.patch16
8 files changed, 198 insertions, 0 deletions
diff --git a/indent/.footprint.i686 b/indent/.footprint.i686
new file mode 100644
index 000000000..db8826e03
--- /dev/null
+++ b/indent/.footprint.i686
@@ -0,0 +1,18 @@
+drwxr-xr-x root/root usr/
+drwxr-xr-x root/root usr/bin/
+-rwxr-xr-x root/root usr/bin/indent
+-rwxr-xr-x root/root usr/bin/texinfo2man
+drwxr-xr-x root/root usr/doc/
+drwxr-xr-x root/root usr/doc/indent/
+-rw-r--r-- root/root usr/doc/indent/indent.html
+drwxr-xr-x root/root usr/share/
+drwxr-xr-x root/root usr/share/info/
+-rw-r--r-- root/root usr/share/info/dir.gz
+-rw-r--r-- root/root usr/share/info/indent.info.gz
+drwxr-xr-x root/root usr/share/locale/
+drwxr-xr-x root/root usr/share/locale/fr/
+drwxr-xr-x root/root usr/share/locale/fr/LC_MESSAGES/
+-rw-r--r-- root/root usr/share/locale/fr/LC_MESSAGES/indent.mo
+drwxr-xr-x root/root usr/share/man/
+drwxr-xr-x root/root usr/share/man/man1/
+-rw-r--r-- root/root usr/share/man/man1/indent.1.gz
diff --git a/indent/.footprint.x86_64 b/indent/.footprint.x86_64
new file mode 100644
index 000000000..db8826e03
--- /dev/null
+++ b/indent/.footprint.x86_64
@@ -0,0 +1,18 @@
+drwxr-xr-x root/root usr/
+drwxr-xr-x root/root usr/bin/
+-rwxr-xr-x root/root usr/bin/indent
+-rwxr-xr-x root/root usr/bin/texinfo2man
+drwxr-xr-x root/root usr/doc/
+drwxr-xr-x root/root usr/doc/indent/
+-rw-r--r-- root/root usr/doc/indent/indent.html
+drwxr-xr-x root/root usr/share/
+drwxr-xr-x root/root usr/share/info/
+-rw-r--r-- root/root usr/share/info/dir.gz
+-rw-r--r-- root/root usr/share/info/indent.info.gz
+drwxr-xr-x root/root usr/share/locale/
+drwxr-xr-x root/root usr/share/locale/fr/
+drwxr-xr-x root/root usr/share/locale/fr/LC_MESSAGES/
+-rw-r--r-- root/root usr/share/locale/fr/LC_MESSAGES/indent.mo
+drwxr-xr-x root/root usr/share/man/
+drwxr-xr-x root/root usr/share/man/man1/
+-rw-r--r-- root/root usr/share/man/man1/indent.1.gz
diff --git a/indent/.md5sum.i686 b/indent/.md5sum.i686
new file mode 100644
index 000000000..d4097f924
--- /dev/null
+++ b/indent/.md5sum.i686
@@ -0,0 +1,4 @@
+ebd423603ebb91ffd4352ff39ea7f03f LC_ALL.patch
+48c844099ac72b88b3ca35d8a11c84ae decimal_format.patch
+98beafca62472805a3739d3867d5d70f indent-2.2.11.tar.gz
+e5ded8513547ff4555dec2bb805dd2ab segfault.patch
diff --git a/indent/.md5sum.x86_64 b/indent/.md5sum.x86_64
new file mode 100644
index 000000000..d4097f924
--- /dev/null
+++ b/indent/.md5sum.x86_64
@@ -0,0 +1,4 @@
+ebd423603ebb91ffd4352ff39ea7f03f LC_ALL.patch
+48c844099ac72b88b3ca35d8a11c84ae decimal_format.patch
+98beafca62472805a3739d3867d5d70f indent-2.2.11.tar.gz
+e5ded8513547ff4555dec2bb805dd2ab segfault.patch
diff --git a/indent/LC_ALL.patch b/indent/LC_ALL.patch
new file mode 100644
index 000000000..71c584605
--- /dev/null
+++ b/indent/LC_ALL.patch
@@ -0,0 +1,17 @@
+From: Santiago Vila <sanvila@debian.org>
+Subject: setlocale using LC_ALL, not LC_MESSAGES
+Bug-Debian: http://bugs.debian.org/205692
+
+--- a/src/indent.c
++++ b/src/indent.c
+@@ -1008,8 +1008,8 @@
+ BOOLEAN using_stdin = false;
+ exit_values_ty exit_status;
+
+-#if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES) && defined (HAVE_LCCTYPES)
+- setlocale(LC_MESSAGES, "");
++#if defined (HAVE_SETLOCALE)
++ setlocale(LC_ALL, "");
+ #endif
+ bindtextdomain(PACKAGE, LOCALEDIR);
+ textdomain(PACKAGE);
diff --git a/indent/Pkgfile b/indent/Pkgfile
new file mode 100644
index 000000000..333e1c932
--- /dev/null
+++ b/indent/Pkgfile
@@ -0,0 +1,24 @@
+# Description: Programme de formattage du code source C.
+# URL: http://indent.isidore-it.eu/beautify.html
+# Maintainer:
+# Packager: piernov <piernov@piernov.org>
+# Depends on: texi2html
+# Run on:
+
+name=indent
+version=2.2.11
+release=1
+source=(http://indent.isidore-it.eu/$name-$version.tar.gz
+ LC_ALL.patch
+ segfault.patch
+ decimal_format.patch)
+
+build() {
+ cd $name-$version
+ patch -p1 < ../segfault.patch
+ patch -p1 < ../LC_ALL.patch
+ patch -p1 < ../decimal_format.patch
+ ./configure --prefix=/usr
+ make
+ make DESTDIR=$PKG install
+}
diff --git a/indent/decimal_format.patch b/indent/decimal_format.patch
new file mode 100644
index 000000000..51668cad6
--- /dev/null
+++ b/indent/decimal_format.patch
@@ -0,0 +1,97 @@
+From ff47ab3b90333bdfaa40b86cb548e92a01787345 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Thu, 25 Aug 2011 11:26:24 +0200
+Subject: [PATCH] Do not split decimal float suffix from constant
+
+N1312 draft of ISO/IEC WDTR24732 defines additional floating types
+with given suffixes:
+
+_Decimal32 DF, df
+_Decimal64 DD, dd
+_Decimal128 DL, dl
+
+These suffixes must stick on numeric part of the constant as classic
+float or long float does.
+---
+ regression/TEST | 3 ++-
+ regression/input/float-constant-suffix.c | 13 +++++++++++++
+ regression/standard/float-constant-suffix.c | 13 +++++++++++++
+ src/lexi.c | 9 +++++++++
+ 4 files changed, 37 insertions(+), 1 deletions(-)
+ create mode 100644 regression/input/float-constant-suffix.c
+ create mode 100644 regression/standard/float-constant-suffix.c
+
+diff --git a/regression/TEST b/regression/TEST
+index c860ef2..1402ddf 100755
+--- a/regression/TEST
++++ b/regression/TEST
+@@ -35,7 +35,8 @@ EXAMPLES="do.c else.c for.c func-def.c lshift.c ncs.c \
+
+ BUGS="case-label.c one-line-1.c one-line-2.c one-line-3.c \
+ one-line-4.c struct-decl.c sizeof-in-while.c line-break-comment.c \
+- macro.c enum.c elif.c nested.c wrapped-string.c minus_predecrement.c"
++ macro.c enum.c elif.c nested.c wrapped-string.c minus_predecrement.c \
++ float-constant-suffix.c"
+
+ INDENTSRC="args.c backup.h backup.c dirent_def.h globs.c indent.h \
+ indent.c indent_globs.h io.c lexi.c memcpy.c parse.c pr_comment.c \
+diff --git a/regression/input/float-constant-suffix.c b/regression/input/float-constant-suffix.c
+new file mode 100644
+index 0000000..58f5310
+--- /dev/null
++++ b/regression/input/float-constant-suffix.c
+@@ -0,0 +1,13 @@
++float foo = 1.0F;
++float foo = 1.0f;
++double foo = 1.0;
++double foo = 1.0;
++long double foo = 1.0L;
++long double foo = 1.0l;
++
++_Decimal32 foo = 1.0DF;
++_Decimal32 foo = 1.0df;
++_Decimal64 foo = 1.0DD;
++_Decimal64 foo = 1.0dd;
++_Decimal128 foo = 1.0DL;
++_Decimal128 foo = 1.0dl;
+diff --git a/regression/standard/float-constant-suffix.c b/regression/standard/float-constant-suffix.c
+new file mode 100644
+index 0000000..58f5310
+--- /dev/null
++++ b/regression/standard/float-constant-suffix.c
+@@ -0,0 +1,13 @@
++float foo = 1.0F;
++float foo = 1.0f;
++double foo = 1.0;
++double foo = 1.0;
++long double foo = 1.0L;
++long double foo = 1.0l;
++
++_Decimal32 foo = 1.0DF;
++_Decimal32 foo = 1.0df;
++_Decimal64 foo = 1.0DD;
++_Decimal64 foo = 1.0dd;
++_Decimal128 foo = 1.0DL;
++_Decimal128 foo = 1.0dl;
+diff --git a/src/lexi.c b/src/lexi.c
+index abc2bfa..eafb65e 100644
+--- a/src/lexi.c
++++ b/src/lexi.c
+@@ -330,6 +330,15 @@ extern codes_ty lexi(void)
+ {
+ buf_ptr++;
+ }
++ else if (*buf_ptr == 'D' || *buf_ptr == 'd')
++ {
++ if (buf_ptr[1] == 'F' || buf_ptr[1] == 'f' ||
++ buf_ptr[1] == 'D' || buf_ptr[1] == 'd' ||
++ buf_ptr[1] == 'L' || buf_ptr[1] == 'l')
++ {
++ buf_ptr+=2;
++ }
++ }
+ else
+ {
+ while (*buf_ptr == 'U' || *buf_ptr == 'u' || *buf_ptr == 'L' || *buf_ptr == 'l')
+--
+1.7.6
diff --git a/indent/segfault.patch b/indent/segfault.patch
new file mode 100644
index 000000000..e91922480
--- /dev/null
+++ b/indent/segfault.patch
@@ -0,0 +1,16 @@
+--- a/man/texinfo2man.c
++++ b/man/texinfo2man.c
+@@ -287,6 +287,13 @@
+ char buf[1024];
+ int line_no = 0;
+
++ if (argc != 3)
++ {
++ fprintf(stderr, "Usage: %s <man template> <info file>\n", argv[0]);
++ fprintf(stderr, " The man page will be written to stdout.\n");
++ return -1;
++ }
++
+ texinfoname = argv[2];
+
+ in = fopen (argv[2], "r");