From owner-svn-ports-head@freebsd.org Wed Oct 14 23:51:18 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D27EAA15068; Wed, 14 Oct 2015 23:51:18 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A20EF1D89; Wed, 14 Oct 2015 23:51:18 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9ENpHSk055071; Wed, 14 Oct 2015 23:51:17 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9ENpHVI055067; Wed, 14 Oct 2015 23:51:17 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201510142351.t9ENpHVI055067@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 14 Oct 2015 23:51:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399315 - in head/www/analog: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Oct 2015 23:51:18 -0000 Author: amdmi3 Date: Wed Oct 14 23:51:17 2015 New Revision: 399315 URL: https://svnweb.freebsd.org/changeset/ports/399315 Log: - Add LICENSE_FILE - Switch to options helpers - Regenerate patches with `make makepatch` Modified: head/www/analog/Makefile head/www/analog/files/patch-analog.cfg head/www/analog/files/patch-src__Makefile head/www/analog/files/patch-src__tree.c Modified: head/www/analog/Makefile ============================================================================== --- head/www/analog/Makefile Wed Oct 14 23:51:12 2015 (r399314) +++ head/www/analog/Makefile Wed Oct 14 23:51:17 2015 (r399315) @@ -16,6 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Fast program for analysing WWW logfiles LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/Licence.txt LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd \ libpng.so:${PORTSDIR}/graphics/png @@ -41,8 +42,12 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/lang/* ${STAGEDIR}${DATADIR}/lang ${MKDIR} ${STAGEDIR}${IMGDIR} ${INSTALL_DATA} ${WRKSRC}/images/* ${STAGEDIR}${IMGDIR} + +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR} + +do-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/*.cfg ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/anlgform.html ${STAGEDIR}${EXAMPLESDIR} Modified: head/www/analog/files/patch-analog.cfg ============================================================================== --- head/www/analog/files/patch-analog.cfg Wed Oct 14 23:51:12 2015 (r399314) +++ head/www/analog/files/patch-analog.cfg Wed Oct 14 23:51:17 2015 (r399315) @@ -1,5 +1,5 @@ ---- analog.cfg.orig Sun Mar 23 13:56:53 2003 -+++ analog.cfg Sun May 11 09:25:33 2003 +--- analog.cfg.orig 2004-12-19 13:51:22 UTC ++++ analog.cfg @@ -10,7 +10,8 @@ # # If you need a LOGFORMAT command (most people don't -- try it without first!), Modified: head/www/analog/files/patch-src__Makefile ============================================================================== --- head/www/analog/files/patch-src__Makefile Wed Oct 14 23:51:12 2015 (r399314) +++ head/www/analog/files/patch-src__Makefile Wed Oct 14 23:51:17 2015 (r399315) @@ -1,5 +1,5 @@ ---- src/Makefile.orig Sun Dec 19 05:51:30 2004 -+++ src/Makefile Sun Jan 9 12:50:26 2005 +--- src/Makefile.orig 2004-12-19 13:51:30 UTC ++++ src/Makefile @@ -2,16 +2,23 @@ # Please read docs/Readme.html, or http://www.analog.cx/ # This is a general Unix-like Makefile: Makefiles for other OS's can be found @@ -26,7 +26,7 @@ # ... -DNOOPEN -DNOFOLLOW -DNOALARM -DNOGRAPHICS -DNOGMTIME ... # ... -DEBCDIC -DUSE_PLAIN_SETJMP ... # ... -DHAVE_GD -DHAVE_ZLIB -DHAVE_BZLIB -DHAVE_PCRE ... -@@ -31,6 +38,12 @@ +@@ -31,6 +38,12 @@ DEFS = # any combination of -DN OS = UNIX # Operating system: UNIX, DOS, WIN32, MAC, OS2, OSX, VMS # RISCOS, BEOS, NEXTSTEP, MPEIX, BS2000, AS400, OS390 LIBS = -lm # extra libraries needed; most platforms (but not OS X or BeOS) Modified: head/www/analog/files/patch-src__tree.c ============================================================================== --- head/www/analog/files/patch-src__tree.c Wed Oct 14 23:51:12 2015 (r399314) +++ head/www/analog/files/patch-src__tree.c Wed Oct 14 23:51:17 2015 (r399315) @@ -1,6 +1,6 @@ ---- src/tree.c.orig 2004-12-19 08:51:31.000000000 -0500 -+++ src/tree.c 2011-08-01 12:49:29.176805068 -0400 -@@ -769,11 +769,13 @@ +--- src/tree.c.orig 2004-12-19 13:51:31 UTC ++++ src/tree.c +@@ -769,11 +769,13 @@ void Bnextname(char **name, char **namee if (((*name = strstr(whole, "Mosaic")) != NULL && (len = 6)) || ((*name = strstr(whole, "mosaic")) != NULL && (len = 6)) || ((*name = strstr(whole, "Konqueror")) != NULL && (len = 9)) || @@ -14,7 +14,7 @@ ((*name = strstr(whole, "Camino")) != NULL && (len = 6)) || ((*name = strstr(whole, "Safari")) != NULL && (len = 6)) || ((*name = strstr(whole, "WebTV")) != NULL && (len = 5)) || -@@ -871,7 +873,17 @@ +@@ -871,7 +873,17 @@ void Pnextname(char **name, char **namee else *name = "Windows:Unknown Windows"; } @@ -33,7 +33,7 @@ *name = "Windows:Unknown Windows"; else *name = "Windows:Windows NT"; -@@ -904,8 +916,16 @@ +@@ -904,8 +916,16 @@ void Pnextname(char **name, char **namee *name = "Macintosh"; else if (strstr(whole, "Linux") != NULL || strstr(whole, "linux") != NULL) *name = "Unix:Linux";