Index: head/www/sarg/Makefile =================================================================== --- head/www/sarg/Makefile (revision 289017) +++ head/www/sarg/Makefile (revision 289018) @@ -1,64 +1,64 @@ # New ports collection makefile for: sarg # Date created: 23.02.2003 # Whom: mt@primats.org.ua # # $FreeBSD$ # PORTNAME= sarg PORTVERSION= 2.3.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= garga@FreeBSD.org COMMENT= Squid log analyzer and HTML report generator LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE OPTIONS= GD "Enable GD support" on USE_GMAKE= yes GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --sysconfdir="${PREFIX}/etc/${PORTNAME}" \ --enable-sargphp="${PREFIX}/etc/${PORTNAME}" \ --enable-fontdir="${PREFIX}/etc/${PORTNAME}/fonts" \ --enable-imagedir="${PREFIX}/etc/${PORTNAME}/images" MAN1= sarg.1 .include .if ${CC} == "cc" CC= gcc .endif .if defined(WITHOUT_NLS) PLIST_SUB+= NLS="@comment " CONFIGURE_ARGS+= --disable-nls .else PLIST_SUB+= NLS="" USE_GETTEXT= yes USE_ICONV= yes .endif .if !defined(WITHOUT_GD) LIB_DEPENDS+= gd.4:${PORTSDIR}/graphics/gd .endif pre-install: ${STRIP_CMD} ${WRKSRC}/sarg post-extract: @${FIND} ${WRKSRC} -type d -exec ${CHMOD} 0755 {} \; @${CHMOD} 0755 ${WRKSRC}/configure post-patch: .if !defined(WITHOUT_NLS) @${REINPLACE_CMD} -e '/^LIBS/ s/$$/ -lintl/' ${WRKSRC}/Makefile.in .endif .include Property changes on: head/www/sarg/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.50 \ No newline at end of property +1.51 \ No newline at end of property Index: head/www/sarg/files/patch-fix_missing_href =================================================================== --- head/www/sarg/files/patch-fix_missing_href (nonexistent) +++ head/www/sarg/files/patch-fix_missing_href (revision 289018) @@ -0,0 +1,142 @@ +Index: redirector.c +=================================================================== +--- redirector.c (revision 594) ++++ redirector.c (revision 595) +@@ -552,7 +552,7 @@ + else + fputs("",fp_ou); + fprintf(fp_ou,"%s-%s",data,hora); +- output_html_link(fp_ou,url,100); ++ output_html_link(fp_ou,NULL,url,100); + fprintf(fp_ou,"%s\n",rule); + } + fclose(fp_in); +Index: util.c +=================================================================== +--- util.c (revision 594) ++++ util.c (revision 595) +@@ -1724,16 +1724,18 @@ + so the A tag is not written around the host name. + + \param fp_ou The handle of the HTML file. ++ \param scheme The scheme to print in the link (http:// if the pointer is null). + \param url The host to display in the HTML file. + \param maxlen The maximum number of characters to print into the host name. + */ +-void output_html_link(FILE *fp_ou,const char *url,int maxlen) ++void output_html_link(FILE *fp_ou,const char *scheme,const char *url,int maxlen) + { + if (url[0]==ALIAS_PREFIX) { + // this is an alias, no need for a A tag + output_html_string(fp_ou,url+1,100); + } else { +- fputs("",fp_ou); + output_html_string(fp_ou,url,100); +Index: denied.c +=================================================================== +--- denied.c (revision 594) ++++ denied.c (revision 595) +@@ -158,7 +158,7 @@ + output_html_url(fp_ou,url); + fprintf(fp_ou,"\"> ",ImageFile); + } +- output_html_link(fp_ou,url,100); ++ output_html_link(fp_ou,"",url,100); //the URL contains the scheme + fputs("\n",fp_ou); + } + fclose(fp_in); +Index: include/defs.h +=================================================================== +--- include/defs.h (revision 594) ++++ include/defs.h (revision 595) +@@ -253,7 +253,7 @@ + __attribute__((warn_unused_result)) int write_html_trailer(FILE *fp_ou); + void output_html_string(FILE *fp_ou,const char *str,int maxlen); + void output_html_url(FILE *fp_ou,const char *url); +-void output_html_link(FILE *fp_ou,const char *url,int maxlen); ++void output_html_link(FILE *fp_ou,const char *scheme,const char *url,int maxlen); + void debuga(const char *msg,...) __attribute__((format(printf,1,2))); + void debugaz(const char *msg,...) __attribute__((format(printf,1,2))); + void my_lltoa(unsigned long long int n, char *s, int ssize, int len); +Index: download.c +=================================================================== +--- download.c (revision 594) ++++ download.c (revision 595) +@@ -156,7 +156,7 @@ + output_html_url(fp_ou,url); + fprintf(fp_ou,"\"> ",ImageFile); + } +- output_html_link(fp_ou,url,100); ++ output_html_link(fp_ou,"",url,100);//scheme is kept from the log file + fputs("\n",fp_ou); + } + fclose(fp_in); +Index: topsites.c +=================================================================== +--- topsites.c (revision 594) ++++ topsites.c (revision 595) +@@ -275,7 +275,7 @@ + fputs("\"> ",fp_ou); + } + +- output_html_link(fp_ou,url,100); ++ output_html_link(fp_ou,NULL,url,100); + fputs("%s",fixnum(twork1,1)); +Index: authfail.c +=================================================================== +--- authfail.c (revision 594) ++++ authfail.c (revision 595) +@@ -189,7 +189,7 @@ + output_html_url(fp_ou,url); + fputs("\"> ",fp_ou); + } +- output_html_link(fp_ou,url,100); ++ output_html_link(fp_ou,"",url,100); //the original scheme is left in the URL + fputs("\n",fp_ou); + } + fclose(fp_in); +Index: siteuser.c +=================================================================== +--- siteuser.c (revision 594) ++++ siteuser.c (revision 595) +@@ -146,7 +146,7 @@ + output_html_url(fp_ou,ourl); + fputs("\"> ",fp_ou); + } +- output_html_link(fp_ou,ourl,100); ++ output_html_link(fp_ou,NULL,ourl,100); + fputs("",fp_ou); + + if (BytesInSitesUsersReport) { +Index: html.c +=================================================================== +--- html.c (revision 594) ++++ html.c (revision 595) +@@ -285,7 +285,7 @@ + output_html_url(fp_ou,url); + fprintf(fp_ou,"\"> ",tmp6); + } +- output_html_link(fp_ou,url,100); ++ output_html_link(fp_ou,NULL,url,100); + fputs("",fp_ou); + } + +Index: dansguardian_report.c +=================================================================== +--- dansguardian_report.c (revision 594) ++++ dansguardian_report.c (revision 595) +@@ -155,7 +155,7 @@ + } + + fprintf(fp_ou,"%s%s%s-%s",name,ip,date,hour); +- output_html_link(fp_ou,url,100); ++ output_html_link(fp_ou,NULL,url,100); + fprintf(fp_ou,"%s\n",rule); + } + fclose(fp_in); Property changes on: head/www/sarg/files/patch-fix_missing_href ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property