21 files changed, 48 insertions, 533 deletions

diff --git a/devel/kaptain/Makefile b/devel/kaptain/Makefile
index cbcf351cf62c..f7aa5d72cafe 100644
--- a/devel/kaptain/Makefile
+++ b/devel/kaptain/Makefile
@@ -8,8 +8,7 @@
 #
 
 PORTNAME=	kaptain
-PORTVERSION=	0.7
-#PORTEPOCH=
+PORTVERSION=	0.71
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,10 +17,20 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A tool for building/running QT GUIs for commmand line programs
 
 USE_QT_VER=	3
-GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS+=--enable-mt
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS=	--enable-mt
+
+MAN1=		kaptain.1
+INFO=		kaptain
+
+post-extract:
+	@${RM} -f ${WRKSRC}/doc/*.info*
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/examples/dia2code.kaptn
 
-.include "${.CURDIR}/maninfo.mk"
 .include <bsd.port.mk>
-#EOF
diff --git a/devel/kaptain/distinfo b/devel/kaptain/distinfo
index b0cbfd51804a..bd576f13e825 100644
--- a/devel/kaptain/distinfo
+++ b/devel/kaptain/distinfo
@@ -1 +1 @@
-MD5 (kaptain-0.7.tar.gz) = 83c9c7428a0dd454b5c4fa2ae7619510
+MD5 (kaptain-0.71.tar.gz) = bd3e56fc31703872ef1b22a4c3e982b5
diff --git a/devel/kaptain/files/patch-doc-kaptain.texi b/devel/kaptain/files/patch-doc-kaptain.texi
new file mode 100644
index 000000000000..71e01ba29a7b
--- /dev/null
+++ b/devel/kaptain/files/patch-doc-kaptain.texi
@@ -0,0 +1,13 @@
+--- doc/kaptain.texi.orig	Mon Mar 24 21:07:29 2003
++++ doc/kaptain.texi	Sat Aug 30 16:13:22 2003
+@@ -3,6 +3,10 @@
+ @c %**start of header
+ @setfilename kaptain.info
+ @settitle Kaptain
++@dircategory
++@direntry Applications
++* Kaptain: (kaptain).		The Universal Graphical Front-end.
++@end direntry
+ @finalout
+ @c %**end of header
+ 
diff --git a/devel/kaptain/files/patch-examples-dia2code.kaptn b/devel/kaptain/files/patch-examples-dia2code.kaptn
index acddf898b5b3..414691f08f07 100644
--- a/devel/kaptain/files/patch-examples-dia2code.kaptn
+++ b/devel/kaptain/files/patch-examples-dia2code.kaptn
@@ -2,7 +2,7 @@
 +++ examples/dia2code.kaptn	Fri Dec 20 13:17:45 2002
 @@ -1,17 +1,20 @@
 -#!/usr/bin/kaptain
-+#!/usr/local/bin/kaptain
++#!%%PREFIX%%/bin/kaptain
  start "Dia2Code" -> dia2code buttons;
  dia2code :tabbed -> main about;
  
diff --git a/devel/kaptain/files/patch-kaptain-communication.cpp b/devel/kaptain/files/patch-kaptain-communication.cpp
deleted file mode 100644
index 5e78e3a89641..000000000000
--- a/devel/kaptain/files/patch-kaptain-communication.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- kaptain/communication.cpp.orig	Wed Aug 14 12:13:13 2002
-+++ kaptain/communication.cpp	Fri Dec 20 16:14:31 2002
-@@ -8,7 +8,7 @@
- #include <sys/stat.h>
- #include <netdb.h>
- #include <fcntl.h>
--#include <iostream.h>
-+#include <iostream>
- #include <sstream>
- #include "global.h"
- #include "tools.h"
-@@ -16,6 +16,8 @@
- #include "grammar.h"
- 
- #define NO_MORE_IO "At most one i/o channel is allowed.\n"
-+
-+using namespace std;
- 
- extern Grammar * yygrammar;
- 
diff --git a/devel/kaptain/files/patch-kaptain-communication.h b/devel/kaptain/files/patch-kaptain-communication.h
deleted file mode 100644
index 3af0956d9af3..000000000000
--- a/devel/kaptain/files/patch-kaptain-communication.h
+++ /dev/null
@@ -1,37 +0,0 @@
---- kaptain/communication.h.orig	Sat Mar  2 19:56:32 2002
-+++ kaptain/communication.h	Fri Dec 20 16:14:31 2002
-@@ -12,7 +12,7 @@
-   QSocketNotifier * reader;
-   bool ok;
-   bool input, output;
--  string message; // buffer
-+  std::string message; // buffer
- 
- public:
-   Communicator();
-@@ -21,19 +21,19 @@
-   bool is_stdin();
- 
-   bool setup_stdio();
--  bool setup_progio(string);
--  bool setup_socket_server(string);
--  bool setup_socket_client(string);
-+  bool setup_progio(std::string);
-+  bool setup_socket_server(std::string);
-+  bool setup_socket_client(std::string);
- 
-   bool setup_stdin();
-   bool setup_stdout();
--  bool setup_filein(string);
--  bool setup_fileout(string);
-+  bool setup_filein(std::string);
-+  bool setup_fileout(std::string);
- 
-   void no_input() {input=false;}
-   void no_output() {output=false;}
- 
--  void send(string);
-+  void send(std::string);
- 
- public slots:
-   void data_arrived(int);
diff --git a/devel/kaptain/files/patch-kaptain-grammar.cpp b/devel/kaptain/files/patch-kaptain-grammar.cpp
deleted file mode 100644
index 3413eb920a7e..000000000000
--- a/devel/kaptain/files/patch-kaptain-grammar.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- kaptain/grammar.cpp.orig	Wed Aug 14 12:13:38 2002
-+++ kaptain/grammar.cpp	Fri Dec 20 16:14:31 2002
-@@ -878,7 +878,7 @@
- }
- 
- 
--void Rule::send(string message, bool prefix_sender=true)
-+void Rule::send(string message, bool prefix_sender)
- {
-   string total;
-   if (prefix_sender)
diff --git a/devel/kaptain/files/patch-kaptain-grammar.h b/devel/kaptain/files/patch-kaptain-grammar.h
deleted file mode 100644
index 10d95979097f..000000000000
--- a/devel/kaptain/files/patch-kaptain-grammar.h
+++ /dev/null
@@ -1,207 +0,0 @@
---- kaptain/grammar.h.orig	Wed Aug 14 12:17:49 2002
-+++ kaptain/grammar.h	Fri Dec 20 16:14:31 2002
-@@ -6,7 +6,6 @@
- #include <string>
- #include <map>
- 
--using namespace std;
- 
- class Grammar;
- class Rule;
-@@ -33,12 +32,12 @@
-   friend class Intermediate;
- 
-   Grammar * grammar;
--  list<string *> * modifiers;
--  string textinfo[3];
-+  std::list<std::string *> * modifiers;
-+  std::string textinfo[3];
-   int nonterminal;
- 
- public:
--  Description(Grammar *, string *, list<string *> *, string **);
-+  Description(Grammar *, std::string *, std::list<std::string *> *, std::string **);
-   ~Description();
- };
- 
-@@ -54,18 +53,18 @@
-   Grammar * grammar;
-   int type;
-   int value;
--  string data;
--  string data2;
-+  std::string data;
-+  std::string data2;
- 
- public: 
-   Parameter(Grammar *);
- 
-   void set_numeral(int);
--  void set_string(string *);
--  void set_nonterminal(string *);
--  void set_regexp(string *);
--  void set_substitution(string **);  
--  void set_transliteration(string **);
-+  void set_string(std::string *);
-+  void set_nonterminal(std::string *);
-+  void set_regexp(std::string *);
-+  void set_substitution(std::string **);  
-+  void set_transliteration(std::string **);
- 
- };
- 
-@@ -75,18 +74,18 @@
- {
-   /* Broker of string<->int transformations */
- 
--  vector<string> nonterminal_table;
--  vector<string> terminal_table;
-+  std::vector<std::string> nonterminal_table;
-+  std::vector<std::string> terminal_table;
- 
- public:
- 
-   Broker();
-   ~Broker();
- 
--  int get_nonterminal(string *); /* returns the number of a nonterminal */
--  int get_terminal(string *); /* returns the number of a terminal */
-+  int get_nonterminal(std::string *); /* returns the number of a nonterminal */
-+  int get_terminal(std::string *); /* returns the number of a terminal */
- 
--  string get_string(int); /* returns the name of a nonterminal
-+  std::string get_string(int); /* returns the name of a nonterminal
-                              or the value of a terminal */
- 
-   int get_nt_num() { return nonterminal_table.size(); }
-@@ -103,22 +102,22 @@
- 
-   Grammar * grammar;
- 
--  list<int> symbols;
-+  std::list<int> symbols;
-   bool is_default;
- 
- public:
-   Conjunction(Grammar *);
-   ~Conjunction();
- 
--  void add_nonterminal(string *);
--  void add_terminal(string *);
-+  void add_nonterminal(std::string *);
-+  void add_terminal(std::string *);
- 
-   void set_default();
-   bool get_default() { return is_default; }
- 
--  void add_special(string *, list<Parameter *> *, Parameter *);
-+  void add_special(std::string *, std::list<Parameter *> *, Parameter *);
- 
--  string evaluate(bool);
-+  std::string evaluate(bool);
- 
- };
- 
-@@ -132,7 +131,7 @@
- 
-   Grammar * grammar;
- 
--  list<Conjunction *> conjunctions;
-+  std::list<Conjunction *> conjunctions;
-   int default_num;
- 
- public:
-@@ -158,17 +157,17 @@
-   Disjunction * disjunction; /* the right hand side */
- 
-   int type; /* special(>0) or normal(0) */
--  string special_type;
--  list<Parameter *> * parameters; /* parameter list */
-+  std::string special_type;
-+  std::list<Parameter *> * parameters; /* parameter list */
-   Parameter  * initvalue;
--  list<string *> * modifiers;
-+  std::list<std::string *> * modifiers;
-   int mods; /* modifier bits */
- 
-   /* textual information for the rule */
--  string textinfo[3];
-+  std::string textinfo[3];
- 
-   /* transformations for the rule */
--  list<Parameter *> * transformations;
-+  std::list<Parameter *> * transformations;
- 
-   Intermediate * my_intermediate;
- 
-@@ -177,12 +176,12 @@
-   Rule(Grammar *);
-   ~Rule();
- 
--  void set_left(string *);
-+  void set_left(std::string *);
-   void set_disjunction(Disjunction *);
--  void set_special(string *, list<Parameter *> *, Parameter *);
--  void add_modifiers(list<string *> *);
--  void set_textinfo(string ** ti);
--  void set_transformations(list<Parameter *> *);
-+  void set_special(std::string *, std::list<Parameter *> *, Parameter *);
-+  void add_modifiers(std::list<std::string *> *);
-+  void set_textinfo(std::string ** ti);
-+  void set_transformations(std::list<Parameter *> *);
-   
-   int get_left() { return left; }
-   Intermediate * get_intermediate() { return my_intermediate; }
-@@ -191,10 +190,10 @@
- 
-   void verify_rule();
- 
--  string evaluate(bool);
-+  std::string evaluate(bool);
- 
--  void send(string message, bool prefix_sender=true);
--  void recieve(char, string);
-+  void send(std::string message, bool prefix_sender=true);
-+  void recieve(char, std::string);
- 
- };
- 
-@@ -204,9 +203,9 @@
- {
-   friend class Intermediate;
- 
--  list<Rule *> rules;
--  multimap<int, int> constraints;
--  list<Description *> descriptions;
-+  std::list<Rule *> rules;
-+  std::multimap<int, int> constraints;
-+  std::list<Description *> descriptions;
-   Rule * start_rule;
- 
- public:
-@@ -217,8 +216,8 @@
-   bool was_default_widget_done; // global variable for a Kaptain tree
- 
-   void add_rule(Rule *);
--  void add_description(string *, list<string *> *, string **);
--  void add_constraint(string *, string *);
-+  void add_description(std::string *, std::list<std::string *> *, std::string **);
-+  void add_constraint(std::string *, std::string *);
-   
-   Rule * get_rule(int);
-   Rule * get_start_rule() { return start_rule; }
-@@ -234,11 +233,11 @@
-   void unify_rules();
-   void unify_descriptions();
- 
--  string evaluate_nonterminal(int, bool);
-+  std::string evaluate_nonterminal(int, bool);
-   int get_constraint_for(int);
- 
--  void send(string);
--  void recieve(string);
-+  void send(std::string);
-+  void recieve(std::string);
- };
- 
- 
diff --git a/devel/kaptain/files/patch-kaptain-intermediate.cpp b/devel/kaptain/files/patch-kaptain-intermediate.cpp
deleted file mode 100644
index 427e2ec2fb31..000000000000
--- a/devel/kaptain/files/patch-kaptain-intermediate.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- kaptain/intermediate.cpp.orig	Wed Aug 14 12:14:52 2002
-+++ kaptain/intermediate.cpp	Fri Dec 20 16:14:31 2002
-@@ -552,7 +552,7 @@
- 
- 
- 
--void Intermediate::send(string message, char separ=':')
-+void Intermediate::send(string message, char separ)
- {
-   if (is_special() && father)
-     /* send throuh SPEC's father */
diff --git a/devel/kaptain/files/patch-kaptain-intermediate.h b/devel/kaptain/files/patch-kaptain-intermediate.h
deleted file mode 100644
index b69fc37a2e8e..000000000000
--- a/devel/kaptain/files/patch-kaptain-intermediate.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- kaptain/intermediate.h.orig	Wed Aug 14 12:14:40 2002
-+++ kaptain/intermediate.h	Fri Dec 20 16:14:31 2002
-@@ -3,6 +3,7 @@
- 
- #include <list>
- #include <string>
-+#include <iostream>
- 
- using namespace std;
- 
diff --git a/devel/kaptain/files/patch-kaptain-kaptain.cpp b/devel/kaptain/files/patch-kaptain-kaptain.cpp
new file mode 100644
index 000000000000..2c9a9f80fd94
--- /dev/null
+++ b/devel/kaptain/files/patch-kaptain-kaptain.cpp
@@ -0,0 +1,11 @@
+--- kaptain/kaptain.cpp.orig	Tue Mar 25 00:27:44 2003
++++ kaptain/kaptain.cpp	Fri Sep  5 16:59:24 2003
+@@ -15,6 +15,8 @@
+ #include <iostream>
+ #include <sstream>
+ #include <string>
++#include <iterator>
++#include <cassert>
+ 
+ #define BORDER 10
+ #define SPACING 5
diff --git a/devel/kaptain/files/patch-kaptain-kaptain.h b/devel/kaptain/files/patch-kaptain-kaptain.h
index 0d26c9ec01e3..0354d164c018 100644
--- a/devel/kaptain/files/patch-kaptain-kaptain.h
+++ b/devel/kaptain/files/patch-kaptain-kaptain.h
@@ -1,5 +1,5 @@
---- kaptain/kaptain.h.orig	Wed Aug 14 06:15:09 2002
-+++ kaptain/kaptain.h	Thu Dec 12 19:20:47 2002
+--- kaptain/kaptain.h.orig	Wed Aug 14 19:15:09 2002
++++ kaptain/kaptain.h	Wed Sep  3 18:44:51 2003
 @@ -18,6 +18,7 @@
  #include <qvalidator.h>
  #include <qmultilineedit.h>
diff --git a/devel/kaptain/files/patch-kaptain-lexer.cpp b/devel/kaptain/files/patch-kaptain-lexer.cpp
deleted file mode 100644
index e1d28d9cae67..000000000000
--- a/devel/kaptain/files/patch-kaptain-lexer.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
---- kaptain/lexer.cpp.orig	Wed Aug 14 14:25:07 2002
-+++ kaptain/lexer.cpp	Fri Dec 20 16:14:31 2002
-@@ -559,7 +559,7 @@
- int rarrow_lineno=0, larrow_lineno=0, 
-   nonterminal_lineno=0, last_correct_lineno=0;
- char quoting, first_char; 
--bool exception(int e);
-+bool myexception(int e);
- string safe_getenv(char *);
- #define DOUBLE_QUOTES 1
- #define SINGLE_QUOTES 2
-@@ -921,7 +921,7 @@
- case 16:
- YY_RULE_SETUP
- #line 54 "lexer.lpp"
--{ if (exception(1)) return ERROR; }
-+{ if (myexception(1)) return ERROR; }
- 	YY_BREAK
- case 17:
- YY_RULE_SETUP
-@@ -960,7 +960,7 @@
- case 23:
- YY_RULE_SETUP
- #line 67 "lexer.lpp"
--{ exception(1); return ERROR; }
-+{ myexception(1); return ERROR; }
- 	YY_BREAK
- case 24:
- YY_RULE_SETUP
-@@ -990,7 +990,7 @@
- case 28:
- YY_RULE_SETUP
- #line 79 "lexer.lpp"
--{ exception(1); return ERROR; }
-+{ myexception(1); return ERROR; }
- 	YY_BREAK
- case 29:
- YY_RULE_SETUP
-@@ -1037,7 +1037,7 @@
- case 34:
- YY_RULE_SETUP
- #line 101 "lexer.lpp"
--{ exception(1); return ERROR; }
-+{ myexception(1); return ERROR; }
- 	YY_BREAK
- case 35:
- *yy_cp = yy_hold_char; /* undo effects of setting up yytext */
-@@ -1069,7 +1069,7 @@
- case 38:
- YY_RULE_SETUP
- #line 116 "lexer.lpp"
--{ exception(2); return ERROR; }
-+{ myexception(2); return ERROR; }
- 	YY_BREAK
- case 39:
- *yy_cp = yy_hold_char; /* undo effects of setting up yytext */
-@@ -1115,12 +1115,12 @@
- case 43:
- YY_RULE_SETUP
- #line 141 "lexer.lpp"
--{ exception(3); return ERROR; }
-+{ myexception(3); return ERROR; }
- 	YY_BREAK
- case 44:
- YY_RULE_SETUP
- #line 142 "lexer.lpp"
--{ exception(3); return ERROR; }
-+{ myexception(3); return ERROR; }
- 	YY_BREAK
- case 45:
- YY_RULE_SETUP
-@@ -1188,12 +1188,12 @@
- case 50:
- YY_RULE_SETUP
- #line 186 "lexer.lpp"
--{ exception(4); return ERROR; }
-+{ myexception(4); return ERROR; }
- 	YY_BREAK
- case 51:
- YY_RULE_SETUP
- #line 187 "lexer.lpp"
--{ exception(4); return ERROR; }
-+{ myexception(4); return ERROR; }
- 	YY_BREAK
- case 52:
- YY_RULE_SETUP
-@@ -2142,7 +2142,7 @@
- extern Grammar * yygrammar;
- 
- 
--bool exception(int e)
-+bool myexception(int e)
- {
-   ostringstream message;
-   string s;
diff --git a/devel/kaptain/files/patch-kaptain-parser.cpp b/devel/kaptain/files/patch-kaptain-parser.cpp
deleted file mode 100644
index a4be0633dc7c..000000000000
--- a/devel/kaptain/files/patch-kaptain-parser.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- kaptain/parser.cpp.orig	Wed Aug 14 13:00:21 2002
-+++ kaptain/parser.cpp	Fri Dec 20 16:14:31 2002
-@@ -18,7 +18,7 @@
- #line 1 "parser.ypp"
- 
- #include <stdlib.h>
--#include <iostream.h>
-+#include <iostream>
- #include <string>
- #include <list>
- #include "grammar.h"
diff --git a/devel/kaptain/files/patch-kaptain-parser.h b/devel/kaptain/files/patch-kaptain-parser.h
deleted file mode 100644
index 6332e5e3d2ac..000000000000
--- a/devel/kaptain/files/patch-kaptain-parser.h
+++ /dev/null
@@ -1,23 +0,0 @@
---- kaptain/parser.h.orig	Wed Aug 14 12:26:33 2002
-+++ kaptain/parser.h	Fri Dec 20 16:14:31 2002
-@@ -5,15 +5,15 @@
- typedef union
- {
-   int integer;
--  string * pstring;
-+  std::string * pstring;
-   Rule * prule;
-   Disjunction * pdisjunction;
-   Conjunction * pconjunction;
-   Parameter * pparameter;
--  list<Parameter *> * pparamlist;
--  string * string_array[3];
--  list<string *> * pstringlist;
--  list<Parameter *> * ptrafolist;
-+  std::list<Parameter *> * pparamlist;
-+  std::string * string_array[3];
-+  std::list<std::string *> * pstringlist;
-+  std::list<Parameter *> * ptrafolist;
- } yystype;
- # define YYSTYPE yystype
- # define YYSTYPE_IS_TRIVIAL 1
diff --git a/devel/kaptain/files/patch-kaptain-process.cpp b/devel/kaptain/files/patch-kaptain-process.cpp
deleted file mode 100644
index b61bc8487570..000000000000
--- a/devel/kaptain/files/patch-kaptain-process.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- kaptain/process.cpp.orig	Wed Aug 14 12:17:25 2002
-+++ kaptain/process.cpp	Fri Dec 20 16:14:31 2002
-@@ -8,6 +8,7 @@
- 
- /* ---------------------------------------------------------------------- */
- 
-+using namespace std;
- 
- void clean_up_child_process(int s)
- {
diff --git a/devel/kaptain/files/patch-kaptain-process.h b/devel/kaptain/files/patch-kaptain-process.h
deleted file mode 100644
index 758619a9a1b8..000000000000
--- a/devel/kaptain/files/patch-kaptain-process.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- kaptain/process.h.orig	Wed Aug 14 12:17:20 2002
-+++ kaptain/process.h	Fri Dec 20 16:14:31 2002
-@@ -3,13 +3,13 @@
- 
- #include <list>
- #include <string>
-+#include <iostream>
- 
--using namespace std;
- 
- void clean_up_child_process(int);
- void POSIX_init();
--int exec_async(list<string> &);
--string exec_sync_stdout(string &);
--string exec_sync_stdout(list<string> &);
-+int exec_async(std::list<std::string> &);
-+std::string exec_sync_stdout(std::string &);
-+std::string exec_sync_stdout(std::list<std::string> &);
- 
- #endif // PROCESS_HH
diff --git a/devel/kaptain/files/patch-kaptain-tools.cpp b/devel/kaptain/files/patch-kaptain-tools.cpp
index 3d9c3d143cb4..8233cea7690e 100644
--- a/devel/kaptain/files/patch-kaptain-tools.cpp
+++ b/devel/kaptain/files/patch-kaptain-tools.cpp
@@ -1,13 +1,9 @@
---- kaptain/tools.cpp.orig	Wed Aug 14 06:17:39 2002
-+++ kaptain/tools.cpp	Fri Dec 20 18:53:13 2002
-@@ -1,8 +1,10 @@
+--- kaptain/tools.cpp.orig	Wed Mar 12 01:38:12 2003
++++ kaptain/tools.cpp	Wed Sep  3 18:43:40 2003
+@@ -1,5 +1,6 @@
  #include <stdlib.h>
  #include <stdio.h>
 +#include <sys/types.h>
  #include <regex.h>
- #include "tools.h"
- 
-+using namespace std;
- 
- Error::Error()
- {
+ #include <iostream>
+ #include <iterator>
diff --git a/devel/kaptain/files/patch-kaptain-tools.h b/devel/kaptain/files/patch-kaptain-tools.h
deleted file mode 100644
index 5cffb6aaee64..000000000000
--- a/devel/kaptain/files/patch-kaptain-tools.h
+++ /dev/null
@@ -1,57 +0,0 @@
---- kaptain/tools.h.orig	Wed Aug 14 12:17:34 2002
-+++ kaptain/tools.h	Fri Dec 20 16:14:31 2002
-@@ -3,20 +3,21 @@
- 
- #include <list>
- #include <string>
-+#include <iostream>
-+#include <iterator>
- 
--using namespace std;
- 
- /**********/
- class Error
- {
--  list<string> messages;
-+  std::list<std::string> messages;
-   bool stop;
- 
- public:
-   Error();
- 
--  void warning(string);
--  void error(string);
-+  void warning(std::string);
-+  void error(std::string);
- 
-   bool go_on() { return !stop; }
- 
-@@ -32,19 +33,19 @@
- public:
-   Regexp();
- 
--  static bool matches(string, string, list<string> & );
-+  static bool matches(std::string, std::string, std::list<std::string> & );
- 
--  static bool substitute_local(string, string, string, 
--                               string &, int &);
--  static void substitute(string, string, string, 
--                         string &, bool);
-+  static bool substitute_local(std::string, std::string, std::string, 
-+                               std::string &, int &);
-+  static void substitute(std::string, std::string, std::string, 
-+                         std::string &, bool);
- 
--  static void transliterate(string, string,
--                            string, string &);
-+  static void transliterate(std::string, std::string,
-+                            std::string, std::string &);
- 
--  static void split(char, string, list<string> &);
-+  static void split(char, std::string, std::list<std::string> &);
- 
--  static void join(char, list<string> &, string &);
-+  static void join(char, std::list<std::string> &, std::string &);
- };
- 
- 
diff --git a/devel/kaptain/maninfo.mk b/devel/kaptain/maninfo.mk
deleted file mode 100644
index 1bbb5f38359b..000000000000
--- a/devel/kaptain/maninfo.mk
+++ /dev/null
@@ -1 +0,0 @@
-MAN1+=		kaptain.1
diff --git a/devel/kaptain/pkg-plist b/devel/kaptain/pkg-plist
index 7ca7e108a08d..ab6395ecfe90 100644
--- a/devel/kaptain/pkg-plist
+++ b/devel/kaptain/pkg-plist
@@ -1,5 +1,4 @@
 bin/kaptain
-info/kaptain.info
 share/kaptain/arping.kaptn
 share/kaptain/budget.kaptn
 share/kaptain/crypt.gif