SF.net SVN: gar:[22604] csw/mgar/pkg/ascii/trunk

[dmichelsen at users.sourceforge.net]

Revision: 22604
          http://gar.svn.sourceforge.net/gar/?rev=22604&view=rev
Author:   dmichelsen
Date:     2013-11-29 08:25:59 +0000 (Fri, 29 Nov 2013)
Log Message:
-----------
ascii/trunk: Update to 3.14

Modified Paths:
--------------
    csw/mgar/pkg/ascii/trunk/Makefile
    csw/mgar/pkg/ascii/trunk/checksums
    csw/mgar/pkg/ascii/trunk/files/0001-Do-not-use-stdbool.h.patch
    csw/mgar/pkg/ascii/trunk/files/0002-Honour-CFLAGS.patch

Modified: csw/mgar/pkg/ascii/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ascii/trunk/Makefile	2013-11-28 14:30:54 UTC (rev 22603)
+++ csw/mgar/pkg/ascii/trunk/Makefile	2013-11-29 08:25:59 UTC (rev 22604)
@@ -1,6 +1,6 @@
 # $Id$
 NAME = ascii
-VERSION = 3.11
+VERSION = 3.14
 GARTYPE = v2
 
 DESCRIPTION = Interactive ASCII name and synonym chart

Modified: csw/mgar/pkg/ascii/trunk/checksums
===================================================================
--- csw/mgar/pkg/ascii/trunk/checksums	2013-11-28 14:30:54 UTC (rev 22603)
+++ csw/mgar/pkg/ascii/trunk/checksums	2013-11-29 08:25:59 UTC (rev 22604)
@@ -1 +1 @@
-ba8a9392f8aa8c6b7a52923fba870579  ascii-3.11.tar.gz
+8412eadd2fd577e54bb8c5c27a542a7f  ascii-3.14.tar.gz

Modified: csw/mgar/pkg/ascii/trunk/files/0001-Do-not-use-stdbool.h.patch
===================================================================
--- csw/mgar/pkg/ascii/trunk/files/0001-Do-not-use-stdbool.h.patch	2013-11-28 14:30:54 UTC (rev 22603)
+++ csw/mgar/pkg/ascii/trunk/files/0001-Do-not-use-stdbool.h.patch	2013-11-29 08:25:59 UTC (rev 22604)
@@ -1,18 +1,18 @@
-From 7c9db391d6cb487169575e9627f2dcc1d8789593 Mon Sep 17 00:00:00 2001
+From d66bef54d6ba8c874f4e7c7abb3df27366d64121 Mon Sep 17 00:00:00 2001
 From: Dagobert Michelsen <dam at opencsw.org>
-Date: Mon, 28 Mar 2011 11:48:10 +0200
+Date: Fri, 29 Nov 2013 09:17:54 +0100
 Subject: [PATCH] Do not use stdbool.h
 
 ---
- ascii.c |    5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
+ ascii.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/ascii.c b/ascii.c
-index 40b4301..08623df 100644
+index a2f8db0..231bcf5 100644
 --- a/ascii.c
 +++ b/ascii.c
-@@ -18,7 +18,10 @@
- #include <ctype.h>
+@@ -20,7 +20,10 @@
+ #include <stdio.h>
  #include <string.h>
  #include <stdlib.h>
 -#include <stdbool.h>
@@ -20,9 +20,9 @@
 +#define bool int
 +#define false 0
 +#define true 1
+ #include <getopt.h>
  
- typedef char	*string;
- 
+ #ifdef __CYGWIN__
 -- 
-1.7.3.2
+1.8.4.1
 

Modified: csw/mgar/pkg/ascii/trunk/files/0002-Honour-CFLAGS.patch
===================================================================
--- csw/mgar/pkg/ascii/trunk/files/0002-Honour-CFLAGS.patch	2013-11-28 14:30:54 UTC (rev 22603)
+++ csw/mgar/pkg/ascii/trunk/files/0002-Honour-CFLAGS.patch	2013-11-29 08:25:59 UTC (rev 22604)
@@ -1,31 +1,28 @@
-From d0988c3028b8b99bf73e8a85adecbba142b983df Mon Sep 17 00:00:00 2001
+From 28e394a55164dc3c6d28fb449b8624915f66f8c9 Mon Sep 17 00:00:00 2001
 From: Dagobert Michelsen <dam at opencsw.org>
-Date: Mon, 28 Mar 2011 12:36:19 +0200
+Date: Fri, 29 Nov 2013 09:22:07 +0100
 Subject: [PATCH] Honour CFLAGS
 
 ---
- Makefile |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 062a31e..1f7e344 100644
+index 7b9d39e..0082595 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -2,12 +2,12 @@
+@@ -2,9 +2,9 @@
  
- VERS=$(shell sed <ascii.spec -n -e '/Version: \(.*\)/s//\1/p')
+ VERS=3.14
  
 -CFLAGS = -O
 +CFLAGS ?= -O
  
+-PREFIX = /usr
++PREFIX ?= /usr
+ 
  all: ascii ascii.1
  
- ascii: ascii.c splashscreen.h nametable.h
--	$(CC) -DREVISION=$(VERS) ascii.c -o ascii
-+	$(CC) $(CFLAGS) -DREVISION=$(VERS) ascii.c -o ascii
- 
- splashscreen.h: splashscreen
- 	sed <splashscreen >splashscreen.h -e 's/\\/\\\\/g' -e 's/"/\\"/g' -e 's/.*/P("&");/' 
 -- 
-1.7.3.2
+1.8.4.1
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.