svn commit: r434431 - in head/www/logtools: . files
Vanilla I. Shu
vanilla at FreeBSD.org
Mon Feb 20 03:25:31 UTC 2017
Author: vanilla
Date: Mon Feb 20 03:25:29 2017
New Revision: 434431
URL: https://svnweb.freebsd.org/changeset/ports/434431
Log:
Update to 0.13e.
Modified:
head/www/logtools/Makefile
head/www/logtools/distinfo
head/www/logtools/files/patch-clfdomainsplit.cpp
head/www/logtools/files/patch-clfmerge.cpp
head/www/logtools/files/patch-clfsplit.cpp
Modified: head/www/logtools/Makefile
==============================================================================
--- head/www/logtools/Makefile Mon Feb 20 03:04:38 2017 (r434430)
+++ head/www/logtools/Makefile Mon Feb 20 03:25:29 2017 (r434431)
@@ -2,11 +2,9 @@
# $FreeBSD$
PORTNAME= logtools
-PORTVERSION= 0.13d
-PORTREVISION= 1
+PORTVERSION= 0.13e
CATEGORIES= www
-MASTER_SITES= http://www.coker.com.au/logtools/ \
- LOCAL/chinsan/logtools/
+MASTER_SITES= http://www.coker.com.au/logtools/
MAINTAINER= ports at FreeBSD.org
COMMENT= Useful tools to deal with CLF files (Common Log File format)
Modified: head/www/logtools/distinfo
==============================================================================
--- head/www/logtools/distinfo Mon Feb 20 03:04:38 2017 (r434430)
+++ head/www/logtools/distinfo Mon Feb 20 03:25:29 2017 (r434431)
@@ -1,2 +1,3 @@
-SHA256 (logtools-0.13d.tgz) = 25f9aca0242faca7061bc7b1da634a56ba58ee8201cd9c8299b52a2e4d8b5d30
-SIZE (logtools-0.13d.tgz) = 38633
+TIMESTAMP = 1487560009
+SHA256 (logtools-0.13e.tgz) = 919fe52497dad6783ad5e07f8b7bff596a486c7a24e00b005304007b6b54949b
+SIZE (logtools-0.13e.tgz) = 62468
Modified: head/www/logtools/files/patch-clfdomainsplit.cpp
==============================================================================
--- head/www/logtools/files/patch-clfdomainsplit.cpp Mon Feb 20 03:04:38 2017 (r434430)
+++ head/www/logtools/files/patch-clfdomainsplit.cpp Mon Feb 20 03:25:29 2017 (r434431)
@@ -1,19 +1,12 @@
---- clfdomainsplit.cpp.orig Mon Jun 9 10:56:27 2003
-+++ clfdomainsplit.cpp Mon Jun 9 10:56:47 2003
-@@ -1,19 +1,23 @@
+--- clfdomainsplit.cpp.orig 2016-12-25 15:08:38 UTC
++++ clfdomainsplit.cpp
+@@ -1,15 +1,18 @@
-#include <stdio.h>
+-
+#include <cstdio>
-
--#if (__GNUC__ >= 3)
--#include <ext/hash_map>
-+#if defined(_LIBCPP_VERSION)
-+#include <unordered_map>
- #else
--#include <hash_map>
-+#include <ext/hash_map>
- #endif
-
+#include <cstdlib>
+ #include <unordered_map>
+
#include <unistd.h>
#include <cstring>
#include <vector>
@@ -29,15 +22,3 @@
// MAX_FDS is the maximum number of files that will be directly written to
// by one process
-@@ -166,7 +170,11 @@
- size_t operator()(const string str) const { return hash<const char *>()(str.c_str()); }
- };
-
-+#if defined(_LIBCPP_VERSION)
-+typedef unordered_map<const string, FILE **, hash_string, eqstr> HASH_TYPE;
-+#else
- typedef hash_map<const string, FILE **, hash_string, eqstr> HASH_TYPE;
-+#endif
- HASH_TYPE fd_map;
-
- typedef FILE * PFILE;
Modified: head/www/logtools/files/patch-clfmerge.cpp
==============================================================================
--- head/www/logtools/files/patch-clfmerge.cpp Mon Feb 20 03:04:38 2017 (r434430)
+++ head/www/logtools/files/patch-clfmerge.cpp Mon Feb 20 03:25:29 2017 (r434431)
@@ -1,16 +1,10 @@
---- clfmerge.cpp.orig Tue Jan 8 17:15:37 2002
-+++ clfmerge.cpp Tue Jan 8 17:14:06 2002
-@@ -1,17 +1,26 @@
+--- clfmerge.cpp.orig 2016-12-25 14:50:06 UTC
++++ clfmerge.cpp
+@@ -1,17 +1,20 @@
-#include <stdio.h>
+#include <cstdio>
-+
-+#if defined(_LIBCPP_VERSION)
-+#include <unordered_map>
-+#else
- #include <ext/hash_map>
+ #include <unordered_map>
-#include <stdlib.h>
-+#endif
-+
+#include <cstdlib>
#include <map>
#include <cstring>
@@ -28,26 +22,22 @@
using namespace __gnu_cxx;
+#endif
- struct eqstr
- {
-@@ -19,7 +28,11 @@
- { return strcmp(s1, s2) == 0; }
- };
-
-+#if defined(_LIBCPP_VERSION)
-+unordered_map<const char *, const char *, hash<const char *>, eqstr> months;
-+#else
- hash_map<const char *, const char *, hash<const char *>, eqstr> months;
-+#endif
-
- class LogFile
- {
-@@ -207,7 +220,7 @@
+ struct hashing_func {
+ unsigned long operator()(const char *key) const
+@@ -215,7 +218,7 @@ int main(int argc, char **argv)
unsigned int map_items = 0;
- bool set_map_items = false, domain_mangling = false;
+ bool set_map_items = false, domain_mangling = false, verbose = false;
int int_c;
- optind = 0;
+ optind = 1;
- while(-1 != (int_c = getopt(argc, argv, "b:hd")) )
+ while(-1 != (int_c = getopt(argc, argv, "b:hdv")) )
{
switch(char(int_c))
+@@ -350,6 +353,6 @@ int main(int argc, char **argv)
+ } while(!items[0]->getLine());
+ }
+ }
+- delete items;
++ delete[] items;
+ return 0;
+ }
Modified: head/www/logtools/files/patch-clfsplit.cpp
==============================================================================
--- head/www/logtools/files/patch-clfsplit.cpp Mon Feb 20 03:04:38 2017 (r434430)
+++ head/www/logtools/files/patch-clfsplit.cpp Mon Feb 20 03:25:29 2017 (r434431)
@@ -1,6 +1,6 @@
---- clfsplit.cpp.orig Tue Jan 8 17:41:53 2002
-+++ clfsplit.cpp Tue Jan 8 17:41:18 2002
-@@ -199,7 +199,7 @@
+--- clfsplit.cpp.orig 2008-06-06 05:33:52 UTC
++++ clfsplit.cpp
+@@ -203,7 +203,7 @@ int main(int argc, char **argv)
MAP m;
FILE *input = stdin;
bool new_input = false;
More information about the svn-ports-all
mailing list