Upgrade to bk2site 1.1.9.

Submitted by:	ijliao

4 files changed, 2 insertions, 59 deletions

diff --git a/www/bk2site/Makefile b/www/bk2site/Makefile
index 1db9548fe561..972b9109ab03 100644
--- a/www/bk2site/Makefile
+++ b/www/bk2site/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	bk2site
-PORTVERSION=	1.1.8
+PORTVERSION=	1.1.9
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/www/bk2site/distinfo b/www/bk2site/distinfo
index ec84d2664a5a..598a8c75aa0d 100644
--- a/www/bk2site/distinfo
+++ b/www/bk2site/distinfo
@@ -1 +1 @@
-MD5 (bk2site-1.1.8.tar.gz) = 35417b26e056926d42925f25268082a8
+MD5 (bk2site-1.1.9.tar.gz) = b4dc14f4516e580aac9d7ce4aed16a38
diff --git a/www/bk2site/files/patch-iwebstream.C b/www/bk2site/files/patch-iwebstream.C
deleted file mode 100644
index 2b9fbe5f36e1..000000000000
--- a/www/bk2site/files/patch-iwebstream.C
+++ /dev/null
@@ -1,22 +0,0 @@
---- iwebstream.C~	Tue Sep  3 01:05:42 2002
-+++ iwebstream.C	Tue Sep  3 01:08:08 2002
-@@ -33,7 +33,7 @@
- //#define DEBUG_TIMEOUT
- 
- // The constructor.
--iwebstream::iwebstream(string url, int timeout = 30) : defaultTimeout(timeout), data(""), position(0) {
-+iwebstream::iwebstream(string url, int timeout) : defaultTimeout(timeout), data(""), position(0) {
-   string origurl = url;
-   string method;
-   string host;
-@@ -424,8 +424,8 @@
- // Case is ignored in comparisions.
- // If begin is not found, return "". Move position to point to char after end;
- // If end == "" then just find begin and place position just after it
--string iwebstream::findTag(const string & begin, const string & end, const string & after = "",
--													 const string & before = "") {
-+string iwebstream::findTag(const string & begin, const string & end, const string & after,
-+													 const string & before) {
- 	//   cout << "findTag begin=" << begin << "=" << endl
- 	//        << "end=" << end << "=" << endl 
- 	//        << "after=" << after << "=" << endl
diff --git a/www/bk2site/files/patch-reference.C b/www/bk2site/files/patch-reference.C
deleted file mode 100644
index 97cc0ee28551..000000000000
--- a/www/bk2site/files/patch-reference.C
+++ /dev/null
@@ -1,35 +0,0 @@
---- reference.C~	Tue Sep  3 01:02:48 2002
-+++ reference.C	Tue Sep  3 01:04:14 2002
-@@ -1189,7 +1189,7 @@
- 
-     The hard work is done by FolderCommentParser
- */
--void referenceTree::fixCommentCommands(const string parentFolderHTML = ""){
-+void referenceTree::fixCommentCommands(const string parentFolderHTML){
-   for (vector<reference>::iterator i = contents.begin(); i != contents.end(); ++i){
-     reference& r = *i;
-     replaceAll(r.comment,"&lt;","<");
-@@ -1398,7 +1398,7 @@
-     returns the number of elements added.
-     Only adds URLS that are not Private and not Aliasof another one and
-     are not under avoidFolder. */
--void referenceTree::makeVector(vector<reference> & vr, const string & avoidFolder = "")
-+void referenceTree::makeVector(vector<reference> & vr, const string & avoidFolder)
- {
-   for (vector<reference>::iterator i = contents.begin(); i != contents.end(); ++i){
-     reference & r = *i;
-@@ -1466,10 +1466,10 @@
- void referenceTree::createSiteH(const string varValues[], vector<reference> & allReferences,
-                                 channelContainer & channels,
-                                 fileView & baseView, fileView & otherView,
--                                vector<reference> & newsItems, int depth = 0, 
--                                string navigateBar = "", string searchNavBar = "",
--                                string parentTitle = "", string folderTitle="",
--                                string filePath = "") {
-+                                vector<reference> & newsItems, int depth, 
-+                                string navigateBar, string searchNavBar,
-+                                string parentTitle, string folderTitle,
-+                                string filePath ) {
-   string ofileName;
-   fileView & fv = baseView;
-   string fileContents;