From 4675e5abe85836e9f83ce492976dde7d8a510040 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Wed, 14 Oct 2015 23:51:17 +0000 Subject: - Add LICENSE_FILE - Switch to options helpers - Regenerate patches with `make makepatch` --- www/analog/Makefile | 5 +++++ www/analog/files/patch-analog.cfg | 4 ++-- www/analog/files/patch-src__Makefile | 6 +++--- www/analog/files/patch-src__tree.c | 10 +++++----- 4 files changed, 15 insertions(+), 10 deletions(-) (limited to 'www') diff --git a/www/analog/Makefile b/www/analog/Makefile index c62c9cf13701..814b34ee95e5 100644 --- a/www/analog/Makefile +++ b/www/analog/Makefile @@ -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} diff --git a/www/analog/files/patch-analog.cfg b/www/analog/files/patch-analog.cfg index 04e03afbd66f..851319c8d5cf 100644 --- a/www/analog/files/patch-analog.cfg +++ b/www/analog/files/patch-analog.cfg @@ -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!), diff --git a/www/analog/files/patch-src__Makefile b/www/analog/files/patch-src__Makefile index 99e2b9ae29d3..13ef6701001e 100644 --- a/www/analog/files/patch-src__Makefile +++ b/www/analog/files/patch-src__Makefile @@ -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) diff --git a/www/analog/files/patch-src__tree.c b/www/analog/files/patch-src__tree.c index d8e0734783e6..e26917482337 100644 --- a/www/analog/files/patch-src__tree.c +++ b/www/analog/files/patch-src__tree.c @@ -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"; -- cgit v1.2.3