Date: Fri, 20 Dec 2002 17:29:30 +0100 (CET) From: David Holm <david@realityrift.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/46404: New port: Kaptain is a universal graphical front-end for command line programs Message-ID: <200212201629.gBKGTU7C061428@rift.ath.cx>
next in thread | raw e-mail | index | archive | help
>Number: 46404
>Category: ports
>Synopsis: New port: Kaptain is a universal graphical front-end for command line programs
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Dec 20 08:30:02 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: David Holm
>Release: FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD rift.ath.cx 5.0-CURRENT FreeBSD 5.0-CURRENT #3: Sun Dec 15 14:14:05 CET 2002 avatar@rift.ath.cx:/usr/src/sys/i386/compile/MYKERNEL i386
>Description:
>How-To-Repeat:
>Fix:
--- kaptain.sh begins here ---
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# kaptain
# kaptain/distinfo
# kaptain/Makefile
# kaptain/pkg-descr
# kaptain/pkg-comment
# kaptain/pkg-plist
# kaptain/files
# kaptain/files/patch-communication.cpp
# kaptain/files/patch-communication.h
# kaptain/files/patch-grammar.cpp
# kaptain/files/patch-grammar.h
# kaptain/files/patch-intermediate.cpp
# kaptain/files/patch-intermediate.h
# kaptain/files/patch-lexer.cpp
# kaptain/files/patch-parser.cpp
# kaptain/files/patch-parser.h
# kaptain/files/patch-process.cpp
# kaptain/files/patch-process.h
# kaptain/files/patch-tools.cpp
# kaptain/files/patch-tools.h
# kaptain/files/patch-dia2code.kaptn
#
echo c - kaptain
mkdir -p kaptain > /dev/null 2>&1
echo x - kaptain/distinfo
sed 's/^X//' >kaptain/distinfo << 'END-of-kaptain/distinfo'
XMD5 (kaptain-0.7.tar.gz) = 83c9c7428a0dd454b5c4fa2ae7619510
END-of-kaptain/distinfo
echo x - kaptain/Makefile
sed 's/^X//' >kaptain/Makefile << 'END-of-kaptain/Makefile'
X# New ports collection makefile for: oneko
X# Date created: 5 December 1994
X# Whom: asami
X#
X# $FreeBSD$
X#
X
XPORTNAME= kaptain
XPORTVERSION= 0.7
XCATEGORIES= kde
XMASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
XMASTER_SITE_SUBDIR= ${PORTNAME}
X
XMAINTAINER= david@realityrift.com
X
XUSE_GMAKE= yes
XMAN1= kaptain.1
XUSE_QT_VER= 3
XGNU_CONFIGURE= yes
XCONFIGURE_TARGET=
XCONFIGURE_ARGS+= --enable-mt
X
Xpost-install:
X @${ECHO}
X @${ECHO} "kaptn-files are installed in ${PREFIX}/share/kaptain"
X @${ECHO} "Start Kaptain like: kaptain ${PREFIX}/share/kaptain/<application>.kaptn"
X @${ECHO}
X
X.include <bsd.port.mk>
END-of-kaptain/Makefile
echo x - kaptain/pkg-descr
sed 's/^X//' >kaptain/pkg-descr << 'END-of-kaptain/pkg-descr'
XKaptain is a universal graphical front-end for command line programs.
XIt works on linux/UNIX platforms whereever Qt 2 or Qt 3 is available.
X
XSomeone writes a simple script (so called grammar) which describes
Xthe possible arguments for a command line program and Kaptain brings
Xup a friendly dialog to the user to set up the command line.
X
XWWW: http://kaptain.sourceforge.net/
X
XDavid Holm
Xdavid@realityrift.com
END-of-kaptain/pkg-descr
echo x - kaptain/pkg-comment
sed 's/^X//' >kaptain/pkg-comment << 'END-of-kaptain/pkg-comment'
XKaptain is a universal graphical front-end for command line programs
END-of-kaptain/pkg-comment
echo x - kaptain/pkg-plist
sed 's/^X//' >kaptain/pkg-plist << 'END-of-kaptain/pkg-plist'
Xbin/kaptain
Xshare/kaptain/kaptain.html
Xshare/kaptain/crypt.gif
Xshare/kaptain/record.gif
Xshare/kaptain/tar.gif
Xshare/kaptain/fig1.png
Xshare/kaptain/old-doc.tgz
Xshare/kaptain/tutorial.tgz
Xshare/kaptain/database.tgz
Xshare/kaptain/emboss.tgz
Xshare/kaptain/puf.tgz
Xshare/kaptain/crypt.kaptn
Xshare/kaptain/grep.kaptn
Xshare/kaptain/ping.kaptn
Xshare/kaptain/wget.kaptn
Xshare/kaptain/curl.kaptn
Xshare/kaptain/indent.kaptn
Xshare/kaptain/povray.kaptn
Xshare/kaptain/whois.kaptn
Xshare/kaptain/dia2code.kaptn
Xshare/kaptain/lameGUI.kaptn
Xshare/kaptain/procmail.kaptn
Xshare/kaptain/zangband.kaptn
Xshare/kaptain/ls.kaptn
Xshare/kaptain/enscript.kaptn
Xshare/kaptain/mpage.kaptn
Xshare/kaptain/search.kaptn
Xshare/kaptain/arping.kaptn
Xshare/kaptain/find.kaptn
Xshare/kaptain/nslookup.kaptn
Xshare/kaptain/tar.kaptn
Xshare/kaptain/budget.kaptn
Xshare/kaptain/finger.kaptn
Xshare/kaptain/open.kaptn
Xshare/kaptain/weblint.kaptn
X@unexec install-info --delete %D/info/kaptain.info %D/info/dir
Xinfo/kaptain.info
X@exec install-info %D/info/kaptain.info %D/info/dir
X@dirrm share/kaptain
X@dirrm share
END-of-kaptain/pkg-plist
echo c - kaptain/files
mkdir -p kaptain/files > /dev/null 2>&1
echo x - kaptain/files/patch-communication.cpp
sed 's/^X//' >kaptain/files/patch-communication.cpp << 'END-of-kaptain/files/patch-communication.cpp'
X--- kaptain/communication.cpp.orig Wed Aug 14 12:13:13 2002
X+++ kaptain/communication.cpp Fri Dec 20 16:14:31 2002
X@@ -8,7 +8,7 @@
X #include <sys/stat.h>
X #include <netdb.h>
X #include <fcntl.h>
X-#include <iostream.h>
X+#include <iostream>
X #include <sstream>
X #include "global.h"
X #include "tools.h"
X@@ -16,6 +16,8 @@
X #include "grammar.h"
X
X #define NO_MORE_IO "At most one i/o channel is allowed.\n"
X+
X+using namespace std;
X
X extern Grammar * yygrammar;
X
END-of-kaptain/files/patch-communication.cpp
echo x - kaptain/files/patch-communication.h
sed 's/^X//' >kaptain/files/patch-communication.h << 'END-of-kaptain/files/patch-communication.h'
X--- kaptain/communication.h.orig Sat Mar 2 19:56:32 2002
X+++ kaptain/communication.h Fri Dec 20 16:14:31 2002
X@@ -12,7 +12,7 @@
X QSocketNotifier * reader;
X bool ok;
X bool input, output;
X- string message; // buffer
X+ std::string message; // buffer
X
X public:
X Communicator();
X@@ -21,19 +21,19 @@
X bool is_stdin();
X
X bool setup_stdio();
X- bool setup_progio(string);
X- bool setup_socket_server(string);
X- bool setup_socket_client(string);
X+ bool setup_progio(std::string);
X+ bool setup_socket_server(std::string);
X+ bool setup_socket_client(std::string);
X
X bool setup_stdin();
X bool setup_stdout();
X- bool setup_filein(string);
X- bool setup_fileout(string);
X+ bool setup_filein(std::string);
X+ bool setup_fileout(std::string);
X
X void no_input() {input=false;}
X void no_output() {output=false;}
X
X- void send(string);
X+ void send(std::string);
X
X public slots:
X void data_arrived(int);
END-of-kaptain/files/patch-communication.h
echo x - kaptain/files/patch-grammar.cpp
sed 's/^X//' >kaptain/files/patch-grammar.cpp << 'END-of-kaptain/files/patch-grammar.cpp'
X--- kaptain/grammar.cpp.orig Wed Aug 14 12:13:38 2002
X+++ kaptain/grammar.cpp Fri Dec 20 16:14:31 2002
X@@ -878,7 +878,7 @@
X }
X
X
X-void Rule::send(string message, bool prefix_sender=true)
X+void Rule::send(string message, bool prefix_sender)
X {
X string total;
X if (prefix_sender)
END-of-kaptain/files/patch-grammar.cpp
echo x - kaptain/files/patch-grammar.h
sed 's/^X//' >kaptain/files/patch-grammar.h << 'END-of-kaptain/files/patch-grammar.h'
X--- kaptain/grammar.h.orig Wed Aug 14 12:17:49 2002
X+++ kaptain/grammar.h Fri Dec 20 16:14:31 2002
X@@ -6,7 +6,6 @@
X #include <string>
X #include <map>
X
X-using namespace std;
X
X class Grammar;
X class Rule;
X@@ -33,12 +32,12 @@
X friend class Intermediate;
X
X Grammar * grammar;
X- list<string *> * modifiers;
X- string textinfo[3];
X+ std::list<std::string *> * modifiers;
X+ std::string textinfo[3];
X int nonterminal;
X
X public:
X- Description(Grammar *, string *, list<string *> *, string **);
X+ Description(Grammar *, std::string *, std::list<std::string *> *, std::string **);
X ~Description();
X };
X
X@@ -54,18 +53,18 @@
X Grammar * grammar;
X int type;
X int value;
X- string data;
X- string data2;
X+ std::string data;
X+ std::string data2;
X
X public:
X Parameter(Grammar *);
X
X void set_numeral(int);
X- void set_string(string *);
X- void set_nonterminal(string *);
X- void set_regexp(string *);
X- void set_substitution(string **);
X- void set_transliteration(string **);
X+ void set_string(std::string *);
X+ void set_nonterminal(std::string *);
X+ void set_regexp(std::string *);
X+ void set_substitution(std::string **);
X+ void set_transliteration(std::string **);
X
X };
X
X@@ -75,18 +74,18 @@
X {
X /* Broker of string<->int transformations */
X
X- vector<string> nonterminal_table;
X- vector<string> terminal_table;
X+ std::vector<std::string> nonterminal_table;
X+ std::vector<std::string> terminal_table;
X
X public:
X
X Broker();
X ~Broker();
X
X- int get_nonterminal(string *); /* returns the number of a nonterminal */
X- int get_terminal(string *); /* returns the number of a terminal */
X+ int get_nonterminal(std::string *); /* returns the number of a nonterminal */
X+ int get_terminal(std::string *); /* returns the number of a terminal */
X
X- string get_string(int); /* returns the name of a nonterminal
X+ std::string get_string(int); /* returns the name of a nonterminal
X or the value of a terminal */
X
X int get_nt_num() { return nonterminal_table.size(); }
X@@ -103,22 +102,22 @@
X
X Grammar * grammar;
X
X- list<int> symbols;
X+ std::list<int> symbols;
X bool is_default;
X
X public:
X Conjunction(Grammar *);
X ~Conjunction();
X
X- void add_nonterminal(string *);
X- void add_terminal(string *);
X+ void add_nonterminal(std::string *);
X+ void add_terminal(std::string *);
X
X void set_default();
X bool get_default() { return is_default; }
X
X- void add_special(string *, list<Parameter *> *, Parameter *);
X+ void add_special(std::string *, std::list<Parameter *> *, Parameter *);
X
X- string evaluate(bool);
X+ std::string evaluate(bool);
X
X };
X
X@@ -132,7 +131,7 @@
X
X Grammar * grammar;
X
X- list<Conjunction *> conjunctions;
X+ std::list<Conjunction *> conjunctions;
X int default_num;
X
X public:
X@@ -158,17 +157,17 @@
X Disjunction * disjunction; /* the right hand side */
X
X int type; /* special(>0) or normal(0) */
X- string special_type;
X- list<Parameter *> * parameters; /* parameter list */
X+ std::string special_type;
X+ std::list<Parameter *> * parameters; /* parameter list */
X Parameter * initvalue;
X- list<string *> * modifiers;
X+ std::list<std::string *> * modifiers;
X int mods; /* modifier bits */
X
X /* textual information for the rule */
X- string textinfo[3];
X+ std::string textinfo[3];
X
X /* transformations for the rule */
X- list<Parameter *> * transformations;
X+ std::list<Parameter *> * transformations;
X
X Intermediate * my_intermediate;
X
X@@ -177,12 +176,12 @@
X Rule(Grammar *);
X ~Rule();
X
X- void set_left(string *);
X+ void set_left(std::string *);
X void set_disjunction(Disjunction *);
X- void set_special(string *, list<Parameter *> *, Parameter *);
X- void add_modifiers(list<string *> *);
X- void set_textinfo(string ** ti);
X- void set_transformations(list<Parameter *> *);
X+ void set_special(std::string *, std::list<Parameter *> *, Parameter *);
X+ void add_modifiers(std::list<std::string *> *);
X+ void set_textinfo(std::string ** ti);
X+ void set_transformations(std::list<Parameter *> *);
X
X int get_left() { return left; }
X Intermediate * get_intermediate() { return my_intermediate; }
X@@ -191,10 +190,10 @@
X
X void verify_rule();
X
X- string evaluate(bool);
X+ std::string evaluate(bool);
X
X- void send(string message, bool prefix_sender=true);
X- void recieve(char, string);
X+ void send(std::string message, bool prefix_sender=true);
X+ void recieve(char, std::string);
X
X };
X
X@@ -204,9 +203,9 @@
X {
X friend class Intermediate;
X
X- list<Rule *> rules;
X- multimap<int, int> constraints;
X- list<Description *> descriptions;
X+ std::list<Rule *> rules;
X+ std::multimap<int, int> constraints;
X+ std::list<Description *> descriptions;
X Rule * start_rule;
X
X public:
X@@ -217,8 +216,8 @@
X bool was_default_widget_done; // global variable for a Kaptain tree
X
X void add_rule(Rule *);
X- void add_description(string *, list<string *> *, string **);
X- void add_constraint(string *, string *);
X+ void add_description(std::string *, std::list<std::string *> *, std::string **);
X+ void add_constraint(std::string *, std::string *);
X
X Rule * get_rule(int);
X Rule * get_start_rule() { return start_rule; }
X@@ -234,11 +233,11 @@
X void unify_rules();
X void unify_descriptions();
X
X- string evaluate_nonterminal(int, bool);
X+ std::string evaluate_nonterminal(int, bool);
X int get_constraint_for(int);
X
X- void send(string);
X- void recieve(string);
X+ void send(std::string);
X+ void recieve(std::string);
X };
X
X
END-of-kaptain/files/patch-grammar.h
echo x - kaptain/files/patch-intermediate.cpp
sed 's/^X//' >kaptain/files/patch-intermediate.cpp << 'END-of-kaptain/files/patch-intermediate.cpp'
X--- kaptain/intermediate.cpp.orig Wed Aug 14 12:14:52 2002
X+++ kaptain/intermediate.cpp Fri Dec 20 16:14:31 2002
X@@ -552,7 +552,7 @@
X
X
X
X-void Intermediate::send(string message, char separ=':')
X+void Intermediate::send(string message, char separ)
X {
X if (is_special() && father)
X /* send throuh SPEC's father */
END-of-kaptain/files/patch-intermediate.cpp
echo x - kaptain/files/patch-intermediate.h
sed 's/^X//' >kaptain/files/patch-intermediate.h << 'END-of-kaptain/files/patch-intermediate.h'
X--- kaptain/intermediate.h.orig Wed Aug 14 12:14:40 2002
X+++ kaptain/intermediate.h Fri Dec 20 16:14:31 2002
X@@ -3,6 +3,7 @@
X
X #include <list>
X #include <string>
X+#include <iostream>
X
X using namespace std;
X
END-of-kaptain/files/patch-intermediate.h
echo x - kaptain/files/patch-lexer.cpp
sed 's/^X//' >kaptain/files/patch-lexer.cpp << 'END-of-kaptain/files/patch-lexer.cpp'
X--- kaptain/lexer.cpp.orig Wed Aug 14 14:25:07 2002
X+++ kaptain/lexer.cpp Fri Dec 20 16:14:31 2002
X@@ -559,7 +559,7 @@
X int rarrow_lineno=0, larrow_lineno=0,
X nonterminal_lineno=0, last_correct_lineno=0;
X char quoting, first_char;
X-bool exception(int e);
X+bool myexception(int e);
X string safe_getenv(char *);
X #define DOUBLE_QUOTES 1
X #define SINGLE_QUOTES 2
X@@ -921,7 +921,7 @@
X case 16:
X YY_RULE_SETUP
X #line 54 "lexer.lpp"
X-{ if (exception(1)) return ERROR; }
X+{ if (myexception(1)) return ERROR; }
X YY_BREAK
X case 17:
X YY_RULE_SETUP
X@@ -960,7 +960,7 @@
X case 23:
X YY_RULE_SETUP
X #line 67 "lexer.lpp"
X-{ exception(1); return ERROR; }
X+{ myexception(1); return ERROR; }
X YY_BREAK
X case 24:
X YY_RULE_SETUP
X@@ -990,7 +990,7 @@
X case 28:
X YY_RULE_SETUP
X #line 79 "lexer.lpp"
X-{ exception(1); return ERROR; }
X+{ myexception(1); return ERROR; }
X YY_BREAK
X case 29:
X YY_RULE_SETUP
X@@ -1037,7 +1037,7 @@
X case 34:
X YY_RULE_SETUP
X #line 101 "lexer.lpp"
X-{ exception(1); return ERROR; }
X+{ myexception(1); return ERROR; }
X YY_BREAK
X case 35:
X *yy_cp = yy_hold_char; /* undo effects of setting up yytext */
X@@ -1069,7 +1069,7 @@
X case 38:
X YY_RULE_SETUP
X #line 116 "lexer.lpp"
X-{ exception(2); return ERROR; }
X+{ myexception(2); return ERROR; }
X YY_BREAK
X case 39:
X *yy_cp = yy_hold_char; /* undo effects of setting up yytext */
X@@ -1115,12 +1115,12 @@
X case 43:
X YY_RULE_SETUP
X #line 141 "lexer.lpp"
X-{ exception(3); return ERROR; }
X+{ myexception(3); return ERROR; }
X YY_BREAK
X case 44:
X YY_RULE_SETUP
X #line 142 "lexer.lpp"
X-{ exception(3); return ERROR; }
X+{ myexception(3); return ERROR; }
X YY_BREAK
X case 45:
X YY_RULE_SETUP
X@@ -1188,12 +1188,12 @@
X case 50:
X YY_RULE_SETUP
X #line 186 "lexer.lpp"
X-{ exception(4); return ERROR; }
X+{ myexception(4); return ERROR; }
X YY_BREAK
X case 51:
X YY_RULE_SETUP
X #line 187 "lexer.lpp"
X-{ exception(4); return ERROR; }
X+{ myexception(4); return ERROR; }
X YY_BREAK
X case 52:
X YY_RULE_SETUP
X@@ -2142,7 +2142,7 @@
X extern Grammar * yygrammar;
X
X
X-bool exception(int e)
X+bool myexception(int e)
X {
X ostringstream message;
X string s;
END-of-kaptain/files/patch-lexer.cpp
echo x - kaptain/files/patch-parser.cpp
sed 's/^X//' >kaptain/files/patch-parser.cpp << 'END-of-kaptain/files/patch-parser.cpp'
X--- kaptain/parser.cpp.orig Wed Aug 14 13:00:21 2002
X+++ kaptain/parser.cpp Fri Dec 20 16:14:31 2002
X@@ -18,7 +18,7 @@
X #line 1 "parser.ypp"
X
X #include <stdlib.h>
X-#include <iostream.h>
X+#include <iostream>
X #include <string>
X #include <list>
X #include "grammar.h"
END-of-kaptain/files/patch-parser.cpp
echo x - kaptain/files/patch-parser.h
sed 's/^X//' >kaptain/files/patch-parser.h << 'END-of-kaptain/files/patch-parser.h'
X--- kaptain/parser.h.orig Wed Aug 14 12:26:33 2002
X+++ kaptain/parser.h Fri Dec 20 16:14:31 2002
X@@ -5,15 +5,15 @@
X typedef union
X {
X int integer;
X- string * pstring;
X+ std::string * pstring;
X Rule * prule;
X Disjunction * pdisjunction;
X Conjunction * pconjunction;
X Parameter * pparameter;
X- list<Parameter *> * pparamlist;
X- string * string_array[3];
X- list<string *> * pstringlist;
X- list<Parameter *> * ptrafolist;
X+ std::list<Parameter *> * pparamlist;
X+ std::string * string_array[3];
X+ std::list<std::string *> * pstringlist;
X+ std::list<Parameter *> * ptrafolist;
X } yystype;
X # define YYSTYPE yystype
X # define YYSTYPE_IS_TRIVIAL 1
END-of-kaptain/files/patch-parser.h
echo x - kaptain/files/patch-process.cpp
sed 's/^X//' >kaptain/files/patch-process.cpp << 'END-of-kaptain/files/patch-process.cpp'
X--- kaptain/process.cpp.orig Wed Aug 14 12:17:25 2002
X+++ kaptain/process.cpp Fri Dec 20 16:14:31 2002
X@@ -8,6 +8,7 @@
X
X /* ---------------------------------------------------------------------- */
X
X+using namespace std;
X
X void clean_up_child_process(int s)
X {
END-of-kaptain/files/patch-process.cpp
echo x - kaptain/files/patch-process.h
sed 's/^X//' >kaptain/files/patch-process.h << 'END-of-kaptain/files/patch-process.h'
X--- kaptain/process.h.orig Wed Aug 14 12:17:20 2002
X+++ kaptain/process.h Fri Dec 20 16:14:31 2002
X@@ -3,13 +3,13 @@
X
X #include <list>
X #include <string>
X+#include <iostream>
X
X-using namespace std;
X
X void clean_up_child_process(int);
X void POSIX_init();
X-int exec_async(list<string> &);
X-string exec_sync_stdout(string &);
X-string exec_sync_stdout(list<string> &);
X+int exec_async(std::list<std::string> &);
X+std::string exec_sync_stdout(std::string &);
X+std::string exec_sync_stdout(std::list<std::string> &);
X
X #endif // PROCESS_HH
END-of-kaptain/files/patch-process.h
echo x - kaptain/files/patch-tools.cpp
sed 's/^X//' >kaptain/files/patch-tools.cpp << 'END-of-kaptain/files/patch-tools.cpp'
X--- kaptain/tools.cpp.orig Wed Aug 14 12:17:39 2002
X+++ kaptain/tools.cpp Fri Dec 20 16:14:31 2002
X@@ -3,6 +3,7 @@
X #include <regex.h>
X #include "tools.h"
X
X+using namespace std;
X
X Error::Error()
X {
END-of-kaptain/files/patch-tools.cpp
echo x - kaptain/files/patch-tools.h
sed 's/^X//' >kaptain/files/patch-tools.h << 'END-of-kaptain/files/patch-tools.h'
X--- kaptain/tools.h.orig Wed Aug 14 12:17:34 2002
X+++ kaptain/tools.h Fri Dec 20 16:14:31 2002
X@@ -3,20 +3,21 @@
X
X #include <list>
X #include <string>
X+#include <iostream>
X+#include <iterator>
X
X-using namespace std;
X
X /**********/
X class Error
X {
X- list<string> messages;
X+ std::list<std::string> messages;
X bool stop;
X
X public:
X Error();
X
X- void warning(string);
X- void error(string);
X+ void warning(std::string);
X+ void error(std::string);
X
X bool go_on() { return !stop; }
X
X@@ -32,19 +33,19 @@
X public:
X Regexp();
X
X- static bool matches(string, string, list<string> & );
X+ static bool matches(std::string, std::string, std::list<std::string> & );
X
X- static bool substitute_local(string, string, string,
X- string &, int &);
X- static void substitute(string, string, string,
X- string &, bool);
X+ static bool substitute_local(std::string, std::string, std::string,
X+ std::string &, int &);
X+ static void substitute(std::string, std::string, std::string,
X+ std::string &, bool);
X
X- static void transliterate(string, string,
X- string, string &);
X+ static void transliterate(std::string, std::string,
X+ std::string, std::string &);
X
X- static void split(char, string, list<string> &);
X+ static void split(char, std::string, std::list<std::string> &);
X
X- static void join(char, list<string> &, string &);
X+ static void join(char, std::list<std::string> &, std::string &);
X };
X
X
END-of-kaptain/files/patch-tools.h
echo x - kaptain/files/patch-dia2code.kaptn
sed 's/^X//' >kaptain/files/patch-dia2code.kaptn << 'END-of-kaptain/files/patch-dia2code.kaptn'
X--- examples/dia2code.kaptn.orig Sat Nov 17 00:11:04 2001
X+++ examples/dia2code.kaptn Fri Dec 20 13:17:45 2002
X@@ -1,17 +1,20 @@
X-#!/usr/bin/kaptain
X+#!/usr/local/bin/kaptain
X start "Dia2Code" -> dia2code buttons;
X dia2code :tabbed -> main about;
X
X-main "Dia2Code" -> "dia2code" language outdir classlist mask noclobber " " diagramfile;
X+main "Dia2Code" -> "dia2code" language outdir classlist mask noclobber licensefile " " diagramfile;
X
X-language "Output Language" -> " -t " outlanguage;
X-outlanguage :double :horizontal -> ada | c | ! cpp | java | python | sql ;
X+language "Output Language" -> " -t " outlanguage ;
X+outlanguage :double :horizontal -> ada | c | ! cpp | idl | java | php | python | shp | sql ;
X c "C" -> "c";
X cpp "C++" -> "cpp";
X java "Java" -> "java";
X ada "Ada" -> "ada";
X python "Python" -> "python";
X sql "SQL" -> "sql";
X+shp "SHP" -> "shp";
X+php "PHP" -> "php";
X+idl "IDL" -> "idl";
X
X outdir "Output Dir" -> " -d " @directory=`pwd`;
X
X@@ -22,10 +25,12 @@
X noclobber "Don't overwrite existing files" -> @ | " -nc";
X yesclobber -> "";
X
X+licensefile "License File" -> @ | " -l " @infile("*");
X+
X diagramfile "Diagram File" -> @infile("*.dia");
X
X buttons :horizontal -> @action(dia2code)="Go" @preview(dia2code)="Preview Command" @close="Quit" ;
X
X-about "About" -> @text("Kaptain grammar for Dia2Code\n\nVersion 1.0\n(c) 2001 Javier O'Hara\n<joh314@users.sourceforge.net>\n\nDia2Code homepage:\nhttp://dia2code.sourceforge.net");
X+about "About" -> @text("Kaptain grammar for Dia2Code\n\nVersion 1.2\n(c) 2001 Javier O'Hara\n<joh314@users.sourceforge.net>\n\nDia2Code homepage:\nhttp://dia2code.sourceforge.net");
X
X classlist="" "Generates code only for the classes specified\nin this comma-separated list";
END-of-kaptain/files/patch-dia2code.kaptn
exit
--- kaptain.sh ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200212201629.gBKGTU7C061428>