Update to 1.1.8 and C++ fixes for gcc3; ok dugsong@

2002-10-17 11:25:39 +00:00 · 2002-10-17 11:25:39 +00:00 · 6b94c6706c
commit 6b94c6706c
parent 61f65bb490
7 changed files with 93 additions and 46 deletions
--- a/www/bk2site/Makefile
+++ b/www/bk2site/Makefile
@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2002/05/20 00:15:23 brad Exp $
+# $OpenBSD: Makefile,v 1.9 2002/10/17 11:25:39 naddy Exp $

 COMMENT=	"convert Netscape bookmarks into a Yahoo-like website"

-DISTNAME=	bk2site-1.1.5
+DISTNAME=	bk2site-1.1.8
 CATEGORIES=	www
-NEED_VERSION=	1.402
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bk2site/}
+HOMEPAGE=	http://bk2site.sourceforge.net/

 MAINTAINER=	Dug Song <dugsong@monkey.org>

@ -14,8 +13,12 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bk2site/}
+
 SEPARATE_BUILD=		concurrent
 CONFIGURE_STYLE=	gnu
+CONFIGURE_ARGS=		--enable-standard-datadir
+MAKE_FLAGS=		CXXFLAGS="${CXXFLAGS}"

 post-install:
 	${INSTALL_MAN} ${WRKSRC}/bk2site.1 ${PREFIX}/man/man1/
--- a/www/bk2site/distinfo
+++ b/www/bk2site/distinfo
@ -1,3 +1,3 @@
-MD5 (bk2site-1.1.5.tar.gz) = fbccd90bd421ffca11f481dfcef42527
-RMD160 (bk2site-1.1.5.tar.gz) = 6652b6b8d8e6f5f6beb3128027a9e58b6146006f
-SHA1 (bk2site-1.1.5.tar.gz) = 37c8bd21bee5820ff7960f3e38ea33d650081fec
+MD5 (bk2site-1.1.8.tar.gz) = 35417b26e056926d42925f25268082a8
+RMD160 (bk2site-1.1.8.tar.gz) = 28b5540cad72763f2167c6c2596801c4030cd773
+SHA1 (bk2site-1.1.8.tar.gz) = 6cb8bf5bab822ed36f91b9d5ff1dac66cc114ee1
--- a/www/bk2site/patches/patch-Makefile_in
+++ b/www/bk2site/patches/patch-Makefile_in
@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.1 2001/03/16 10:25:57 wilfried Exp $
--- Makefile.in.orig	Thu Jun  1 20:28:27 2000
-+++ Makefile.in	Thu Mar 15 22:41:06 2001
-@@ -72,7 +72,7 @@ pkgdata_DATA = dot.bk2siterc
- INCLUDES = -DCONFIGFILE=/etc/bk2site/dot.bk2siterc
- EXTRA_DIST = indexbase.html otherbase.html searchbase.html newbase.html new.gif dot.bk2siterc 	search.pl redirect.pl closeup.gif check-meta.pl bk2site.1 bk2site.html 	cool.gif cool2.gif disk.gif earth.gif ltbulb.gif mailto.gif mana_red.gif 	news.gif note.gif question.gif smiley.gif thumbs_down.gif
- 
-CXXFLAGS = -O2
-+CXXFLAGS = @CXXFLAGS@
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = config.h
--- a/www/bk2site/patches/patch-aa
+++ b/www/bk2site/patches/patch-aa
@ -1,25 +0,0 @@
--- reference.C~	Thu Jun  1 14:14:01 2000
-+++ reference.C	Mon Jun 26 01:04:21 2000
-@@ -762,19 +762,19 @@
-       else
- 	replaceAll(outputString, "%NEW", "");
-     else if (FORMATVARS[i] == "%TIMEFCRE"){
-      long int l = creationTime;
-+      time_t l = creationTime;
-       string c (ctime(&l));
-       c = c.substr(0,c.size()-1);
-       replaceAll(outputString, "%TIMEFCRE", c);
-     }
-     else if (FORMATVARS[i] == "%TIMEFMOD"){
-      long int l = modifiedTime;
-+      time_t l = modifiedTime;
-       string c(ctime(&l));
-       c = c.substr(0,c.size()-1);
-       replaceAll(outputString, "%TIMEFMOD", c);
-     }
-     else if (FORMATVARS[i] == "%TIMEFVIS"){
-      long int l = visitTime;
-+      time_t l = visitTime;
-       string c(ctime(&l));
-       c = c.substr(0,c.size()-1);
-       replaceAll(outputString, "%TIMEFVIS", c);
--- a/www/bk2site/patches/patch-iwebstream_C
+++ b/www/bk2site/patches/patch-iwebstream_C
@ -0,0 +1,23 @@
+$OpenBSD: patch-iwebstream_C,v 1.1 2002/10/17 11:25:39 naddy Exp $
+--- iwebstream.C.orig	Wed Oct 16 23:57:13 2002
+++ iwebstream.C	Wed Oct 16 23:58:06 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 @@ bool iwebstream::findAndPass(const strin
+ // 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
--- a/www/bk2site/patches/patch-reference_C
+++ b/www/bk2site/patches/patch-reference_C
@ -0,0 +1,59 @@
+$OpenBSD: patch-reference_C,v 1.1 2002/10/17 11:25:39 naddy Exp $
+--- reference.C.orig	Thu Dec  6 15:29:25 2001
+++ reference.C	Thu Oct 17 00:10:39 2002
+@@ -804,19 +804,19 @@ string reference::sendAsHTML(const strin
+       else
+         replaceAll(outputString, "%NEW", "");
+     else if (FORMATVARS[i] == "%TIMEFCRE"){
+-      long int l = creationTime;
+      time_t l = creationTime;
+       string c (ctime(&l));
+       c = c.substr(0,c.size()-1);
+       replaceAll(outputString, "%TIMEFCRE", c);
+     }
+     else if (FORMATVARS[i] == "%TIMEFMOD"){
+-      long int l = modifiedTime;
+      time_t l = modifiedTime;
+       string c(ctime(&l));
+       c = c.substr(0,c.size()-1);
+       replaceAll(outputString, "%TIMEFMOD", c);
+     }
+     else if (FORMATVARS[i] == "%TIMEFVIS"){
+-      long int l = visitTime;
+      time_t l = visitTime;
+       string c(ctime(&l));
+       c = c.substr(0,c.size()-1);
+       replaceAll(outputString, "%TIMEFVIS", c);
+@@ -1189,7 +1189,7 @@ time_t referenceTree::setFolderCreationT
+ 
+     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 @@ void referenceTree::merge(const referenc
+     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::createSite(const str
+ 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;
--- a/www/bk2site/pkg/DESCR
+++ b/www/bk2site/pkg/DESCR
@ -1,6 +1,5 @@
-http://bk2site.sourceforge.net/
-
 bk2site will transform your Netscape bookmarks file into a yahoo-like
 website with slashdot-like news. You can see an example website
 created with it at www.MultiAgent.com.

+WWW: ${HOMEPAGE}