mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 17:59:20 -04:00
Update to newest version 2.01 from Apr 02.
This commit is contained in:
parent
52cd19d8a9
commit
1a26056e32
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=10461
5 changed files with 136 additions and 98 deletions
|
@ -3,13 +3,14 @@
|
|||
# Date created: Fri Jul 11 06:11:41 CEST 1997
|
||||
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
|
||||
#
|
||||
# $Id: Makefile,v 1.2 1997/07/11 04:58:45 andreas Exp $
|
||||
# $Id: Makefile,v 1.3 1997/07/12 00:15:04 asami Exp $
|
||||
#
|
||||
|
||||
DISTNAME= http-analyze1.9e
|
||||
PKGNAME= http-analyze-1.9
|
||||
DISTNAME= http-analyze2.01
|
||||
PKGNAME= http-analyze-2.01
|
||||
CATEGORIES= www
|
||||
MASTER_SITES= ftp://ftp.rent-a-guru.de/pub/
|
||||
MASTER_SITES= ftp://ftp.rent-a-guru.de/pub/http-analyze2.01/
|
||||
DISTFILES= http-analyze2.01-src.tar.gz
|
||||
|
||||
MAINTAINER= andreas@FreeBSD.ORG
|
||||
|
||||
|
@ -17,9 +18,4 @@ BUILD_DEPENDS= ${PREFIX}/lib/libgd.a:${PORTSDIR}/graphics/gd
|
|||
|
||||
MAN1= http-analyze.1
|
||||
|
||||
do-install:
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/http-analyze ${PREFIX}/bin
|
||||
${INSTALL_MAN} ${WRKSRC}/http-analyze.man \
|
||||
${PREFIX}/man/man1/http-analyze.1
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
@ -1 +1 @@
|
|||
MD5 (http-analyze1.9e.tar.gz) = 8c7619a19c7e9dc2d5fb4c9787e758f4
|
||||
MD5 (http-analyze2.01-src.tar.gz) = 3a54db1800b0d99a12ed45624dce7878
|
||||
|
|
|
@ -1,36 +1,84 @@
|
|||
--- Makefile.orig Sun Sep 22 15:59:18 1996
|
||||
+++ Makefile Fri Jul 11 06:31:20 1997
|
||||
@@ -16,8 +16,8 @@
|
||||
#COMPRESS = compress
|
||||
--- Makefile.orig Thu Apr 2 15:53:41 1998
|
||||
+++ Makefile Fri Apr 10 20:39:26 1998
|
||||
@@ -28,9 +28,9 @@
|
||||
# SVR4 /usr/share/man/cat1 - 1
|
||||
# Linux /usr/local/man/man1 - man
|
||||
#
|
||||
-LOCALLIB = /usr/local/lib
|
||||
-LOCALBIN = /usr/local/bin
|
||||
-LOCALMAN = /usr/local/man/cat1
|
||||
+LOCALLIB = $(PREFIX)/lib/http-analyze
|
||||
+LOCALBIN = $(PREFIX)/bin
|
||||
+LOCALMAN = $(PREFIX)/man/man1
|
||||
|
||||
# where your gd library and include files reside
|
||||
# Program to use for compressing the manpage.
|
||||
# If set to 'true', no compression is applied.
|
||||
@@ -41,12 +41,12 @@
|
||||
# Extension of the source to be installed as manpage.
|
||||
# if it is set to '1', the pre-formatted format is used,
|
||||
# if it is set to 'man', the source format is used.
|
||||
-#EXTENSION = man
|
||||
-EXTENSION = 1
|
||||
+EXTENSION = man
|
||||
+#EXTENSION = 1
|
||||
|
||||
# Location of the GD library and include files.
|
||||
-GDLIB = /usr/local/lib/libgd.a
|
||||
-GDINC = /usr/local/include/gd
|
||||
+GDLIB = ${PREFIX}/lib/libgd.a
|
||||
+GDINC = ${PREFIX}/include/gd
|
||||
-GDINC = /usr/local/include
|
||||
+GDLIB = $(PREFIX)/lib/libgd.a
|
||||
+GDINC = $(PREFIX)/include/gd
|
||||
|
||||
# Customization
|
||||
#
|
||||
@@ -62,7 +62,8 @@
|
||||
# Platform selection
|
||||
@@ -76,7 +76,7 @@
|
||||
#
|
||||
#CC = cc
|
||||
#OPTIM = -O2
|
||||
-OPTIM = -g
|
||||
+#OPTIM = -g
|
||||
|
||||
#DEFINES = -DCOUNT_EXTRA_BYTES -DUSER_AGENT -DUSE_GETHOSTNAME -DUSE_FGETS
|
||||
-DEFINES = -DUSE_GETHOSTNAME
|
||||
+DEFINES = -DNS_FASTTRACK -DCOUNT_EXTRA_BYTES -DUSER_AGENT -DUSE_GETHOSTNAME \
|
||||
+ -DTIME_STATS
|
||||
# Remove NDEBUG to include various assertion checks in the program.
|
||||
#COMDEFS = -DTIME_STATS -DNDEBUG
|
||||
@@ -108,6 +108,10 @@
|
||||
#PLATFORM = -ansi -Dunix
|
||||
#CC = gcc
|
||||
|
||||
VERSION = -DVERSION=\"1.9e\"
|
||||
+# FreeBSD
|
||||
+DEFINES = -DBSD -DHA_LIBDIR="$(LOCALLIB)"
|
||||
+PLATFORM =
|
||||
+
|
||||
# HP/UX
|
||||
#
|
||||
# Lacks definition of the 'unix' macro in it's compiler, so we
|
||||
@@ -139,7 +143,7 @@
|
||||
#DEFINES = -DNETWARE $(COMDEFS)
|
||||
#PLATFORM =
|
||||
|
||||
@@ -71,10 +72,10 @@
|
||||
TARGETS = http-analyze http-analyze.1
|
||||
|
||||
# Compiler flags
|
||||
-CC = cc
|
||||
+#CC = cc
|
||||
#CFLAGS = -O -xansi -fullwarn -wlint,-pui -woff 827,828 $(DEFINES) $(VERSION)
|
||||
#CFLAGS = -O $(DEFINES) $(VERSION) -DTIME_STATS
|
||||
-CFLAGS = -O $(DEFINES) $(VERSION)
|
||||
+CFLAGS += $(DEFINES) $(VERSION)
|
||||
LDFLAGS =
|
||||
LINT = lint -u
|
||||
-CFLAGS = $(OPTIM) $(PLATFORM) $(DEFINES)
|
||||
+CFLAGS += $(PLATFORM) $(DEFINES)
|
||||
LDFLAGS =
|
||||
LINT = lint -Dunix -Xa -u
|
||||
LIBS = -lm
|
||||
@@ -213,13 +217,14 @@
|
||||
chmod 755 $(LOCALBIN)/http-analyze $(LOCALBIN)/ha-setup
|
||||
chmod 444 $(LOCALMAN)/http-analyze.1
|
||||
chown bin.bin $(LOCALBIN)/http-analyze $(LOCALBIN)/ha-setup
|
||||
- $(COMPRESS) $(LOCALMAN)/http-analyze.1
|
||||
+ -mkdir -p $(PREFIX)/share/doc/http-analyze
|
||||
+ cp http-analyze.pdf http-analyze.ps $(PREFIX)/share/doc/http-analyze
|
||||
-mkdir -p $(LOCALLIB)/http-analyze/btn
|
||||
- cp files/3D* files/TLD files/bugreport.html sample.conf $(LOCALLIB)/http-analyze/
|
||||
+ cp files/3D* files/TLD files/bugreport.html rotate-httpd sample.conf \
|
||||
+ $(LOCALLIB)/http-analyze/
|
||||
cp files/btn/* $(LOCALLIB)/http-analyze/btn/
|
||||
@echo "\nNow run 'ha-setup' to configure http-analyze for your server (Unix only).\n"
|
||||
|
||||
-
|
||||
clean:
|
||||
-rm -f $(HA_OBJ) $(3D_OBJ) lint.out
|
||||
|
||||
@@ -228,4 +233,3 @@
|
||||
|
||||
clobber:: realclean
|
||||
-rm -f index.html stats*.html stats*.hist sites*.html files*.html agents*.html *.gif
|
||||
-
|
||||
|
|
|
@ -1,64 +1,12 @@
|
|||
--- http-analyze.c.orig Sun Sep 22 15:59:19 1996
|
||||
+++ http-analyze.c Fri Jul 11 06:35:28 1997
|
||||
@@ -466,8 +466,12 @@
|
||||
struct timeval tvs, tve;
|
||||
u_long asec = 0L, rsec = 0L;
|
||||
|
||||
+#ifdef __FreeBSD__
|
||||
+ (void) gettimeofday(&tvs, NULL); /* measure execution time */
|
||||
+#else
|
||||
(void) gettimeofday(&tvs); /* measure execution time */
|
||||
--- config.h.orig Fri Apr 10 20:27:39 1998
|
||||
+++ config.h Fri Apr 10 20:28:54 1998
|
||||
@@ -167,7 +167,7 @@
|
||||
# define HA_LIBDIR "/usr/local/lib/http-analyze"
|
||||
#endif
|
||||
+#endif
|
||||
now = time(NULL); /* get current time */
|
||||
|
||||
if ((progname = strrchr(argv[0], '/')) != NULL)
|
||||
@@ -679,7 +683,11 @@
|
||||
}
|
||||
#if defined(TIME_STATS)
|
||||
if (timestats) {
|
||||
+#ifdef __FreeBSD__
|
||||
+ (void) gettimeofday(&tve, NULL);
|
||||
+#else
|
||||
(void) gettimeofday(&tve);
|
||||
+#endif
|
||||
rsec += (tve.tv_sec-tvs.tv_sec) * TICKS_PER_MSEC;
|
||||
rsec -= tvs.tv_usec/TICKS_PER_MSEC;
|
||||
rsec += tve.tv_usec/TICKS_PER_MSEC;
|
||||
@@ -714,7 +722,11 @@
|
||||
mkdtab(&tstart);
|
||||
#if defined(TIME_STATS)
|
||||
if (timestats) {
|
||||
+#ifdef __FreeBSD__
|
||||
+ (void) gettimeofday(&tvs, NULL);
|
||||
+#else
|
||||
(void) gettimeofday(&tvs);
|
||||
+#endif
|
||||
asec += (tvs.tv_sec-tve.tv_sec) * TICKS_PER_MSEC;
|
||||
asec -= tve.tv_usec/TICKS_PER_MSEC;
|
||||
asec += tvs.tv_usec/TICKS_PER_MSEC;
|
||||
@@ -844,7 +856,11 @@
|
||||
-#define REGID_FILE HA_LIBDIR "/REGID"
|
||||
-#define BUTTON_DIR HA_LIBDIR "/btn"
|
||||
+#define REGID_FILE "HA_LIBDIR/REGID"
|
||||
+#define BUTTON_DIR "HA_LIBDIR/btn"
|
||||
|
||||
#if defined(TIME_STATS)
|
||||
if (timestats) {
|
||||
+#ifdef __FreeBSD__
|
||||
+ (void) gettimeofday(&tve, NULL);
|
||||
+#else
|
||||
(void) gettimeofday(&tve);
|
||||
+#endif
|
||||
rsec += (tve.tv_sec-tvs.tv_sec) * TICKS_PER_MSEC;
|
||||
rsec -= tvs.tv_usec/TICKS_PER_MSEC;
|
||||
rsec += tve.tv_usec/TICKS_PER_MSEC;
|
||||
@@ -882,7 +898,11 @@
|
||||
|
||||
#if defined(TIME_STATS)
|
||||
if (timestats) {
|
||||
- (void) gettimeofday(&tvs); /* measure execution time */
|
||||
+#ifdef __FreeBSD__
|
||||
+ (void) gettimeofday(&tvs, NULL);/* measure execution time */
|
||||
+#else
|
||||
+ (void) gettimeofday(&tvs); /* measure execution time */
|
||||
+#endif
|
||||
asec += (tvs.tv_sec-tve.tv_sec) * TICKS_PER_MSEC;
|
||||
asec -= tve.tv_usec/TICKS_PER_MSEC;
|
||||
asec += tvs.tv_usec/TICKS_PER_MSEC;
|
||||
/* End of user configuration section. */
|
||||
|
|
|
@ -1,2 +1,48 @@
|
|||
bin/ha-setup
|
||||
bin/http-analyze
|
||||
lib/http-analyze/http-analyze/3Dlogo.wrl.gz
|
||||
lib/http-analyze/http-analyze/3Dprolog.wrl
|
||||
lib/http-analyze/http-analyze/3DshelfMotion.wav
|
||||
lib/http-analyze/http-analyze/TLD
|
||||
lib/http-analyze/http-analyze/btn/RAG_sb.gif
|
||||
lib/http-analyze/http-analyze/btn/RAG_sw.gif
|
||||
lib/http-analyze/http-analyze/btn/agents_off.gif
|
||||
lib/http-analyze/http-analyze/btn/agents_on.gif
|
||||
lib/http-analyze/http-analyze/btn/avload_off.gif
|
||||
lib/http-analyze/http-analyze/btn/avload_on.gif
|
||||
lib/http-analyze/http-analyze/btn/cntry_off.gif
|
||||
lib/http-analyze/http-analyze/btn/cntry_on.gif
|
||||
lib/http-analyze/http-analyze/btn/days_off.gif
|
||||
lib/http-analyze/http-analyze/btn/days_on.gif
|
||||
lib/http-analyze/http-analyze/btn/files_off.gif
|
||||
lib/http-analyze/http-analyze/btn/files_on.gif
|
||||
lib/http-analyze/http-analyze/btn/globe.jpg
|
||||
lib/http-analyze/http-analyze/btn/ha2.0_sm.gif
|
||||
lib/http-analyze/http-analyze/btn/netstore_sb.gif
|
||||
lib/http-analyze/http-analyze/btn/netstore_sw.gif
|
||||
lib/http-analyze/http-analyze/btn/refers_off.gif
|
||||
lib/http-analyze/http-analyze/btn/refers_on.gif
|
||||
lib/http-analyze/http-analyze/btn/rfiles_off.gif
|
||||
lib/http-analyze/http-analyze/btn/rfiles_on.gif
|
||||
lib/http-analyze/http-analyze/btn/rsites_off.gif
|
||||
lib/http-analyze/http-analyze/btn/rsites_on.gif
|
||||
lib/http-analyze/http-analyze/btn/sites_off.gif
|
||||
lib/http-analyze/http-analyze/btn/sites_on.gif
|
||||
lib/http-analyze/http-analyze/btn/topdom_off.gif
|
||||
lib/http-analyze/http-analyze/btn/topdom_on.gif
|
||||
lib/http-analyze/http-analyze/btn/topref_off.gif
|
||||
lib/http-analyze/http-analyze/btn/topref_on.gif
|
||||
lib/http-analyze/http-analyze/btn/topuag_off.gif
|
||||
lib/http-analyze/http-analyze/btn/topuag_on.gif
|
||||
lib/http-analyze/http-analyze/btn/topurl_off.gif
|
||||
lib/http-analyze/http-analyze/btn/topurl_on.gif
|
||||
lib/http-analyze/http-analyze/btn/totals_off.gif
|
||||
lib/http-analyze/http-analyze/btn/totals_on.gif
|
||||
lib/http-analyze/http-analyze/btn/year_off.gif
|
||||
lib/http-analyze/http-analyze/btn/year_on.gif
|
||||
lib/http-analyze/http-analyze/bugreport.html
|
||||
lib/http-analyze/http-analyze/rotate-httpd
|
||||
lib/http-analyze/http-analyze/sample.conf
|
||||
man/man1/http-analyze.1.gz
|
||||
share/doc/http-analyze/http-analyze.pdf
|
||||
share/doc/http-analyze/http-analyze.ps
|
||||
|
|
Loading…
Add table
Reference in a new issue