aboutsummaryrefslogtreecommitdiffstats
path: root/www/sarg
diff options
context:
space:
mode:
authorleeym <leeym@FreeBSD.org>2005-03-08 01:34:24 +0800
committerleeym <leeym@FreeBSD.org>2005-03-08 01:34:24 +0800
commit427cfce0596397176d997b9290796dd1a3012b78 (patch)
treed43b40ae05ef2ac10a9c7a3028a6061790196dd8 /www/sarg
parent4d44529eefb9fc42ae148bb8da527d4b793353b4 (diff)
downloadfreebsd-ports-gnome-427cfce0596397176d997b9290796dd1a3012b78.tar.gz
freebsd-ports-gnome-427cfce0596397176d997b9290796dd1a3012b78.tar.zst
freebsd-ports-gnome-427cfce0596397176d997b9290796dd1a3012b78.zip
- update sarg to 2.0.4
PR: 78231 Submitted by: maintainer
Diffstat (limited to 'www/sarg')
-rw-r--r--www/sarg/Makefile27
-rw-r--r--www/sarg/distinfo6
-rw-r--r--www/sarg/files/patch-log.c11
-rw-r--r--www/sarg/pkg-plist4
4 files changed, 35 insertions, 13 deletions
diff --git a/www/sarg/Makefile b/www/sarg/Makefile
index 5badaf10e8cd..f56f794f1fce 100644
--- a/www/sarg/Makefile
+++ b/www/sarg/Makefile
@@ -6,23 +6,30 @@
#
PORTNAME= sarg
-PORTVERSION= 2.0.3
+PORTVERSION= 2.0.4
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
+PATCH_SITES= http://sarg.sourceforge.net/
+PATCHFILES= sarg-2.0.4-segmentation-fault.patch
+PATCH_DIST_STRIP= -p1
+
MAINTAINER= mt@primats.org.ua
COMMENT= Squid log analyzer and HTML report generator
-.if !defined(WITHOUT_GD)
-LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd
-.endif
-
+USE_REINPLACE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= CC=gcc --enable-bindir="${PREFIX}/bin" --enable-sysconfdir="${PREFIX}/etc/${PORTNAME}" --enable-htmldir=${PREFIX}/www/${PORTNAME}
+CONFIGURE_ENV= CC=gcc
+CONFIGURE_ARGS= --enable-bindir="${PREFIX}/bin" \
+ --enable-sysconfdir="${PREFIX}/etc/${PORTNAME}" \
+ --enable-htmldir=${PREFIX}/www/${PORTNAME}
.if !defined(WITHOUT_GD)
-CFLAGS+= -I ${LOCALBASE}/include -L ${LOCALBASE}/lib
+LIB_DEPENDS+= gd.4:${PORTSDIR}/graphics/gd
+CFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
.endif
MAN1= sarg.1
@@ -30,9 +37,7 @@ MAN1= sarg.1
post-extract:
@${CHMOD} +x ${WRKSRC}/sarg-php/locale
-post-configure:
-.if !defined(WITHOUT_GD)
- @${SED} -i .orig 's|^\(LDFLAGS.*\)|\1 -I ${LOCALBASE}/include -L ${LOCALBASE}/lib|g' ${WRKSRC}/Makefile
-.endif
+post-patch:
+ @${REINPLACE_CMD} -e '/^LDFLAGS/d' ${WRKSRC}/${CONFIGURE_SCRIPT}
.include <bsd.port.mk>
diff --git a/www/sarg/distinfo b/www/sarg/distinfo
index c1f9d5a2e8b2..bc9c95d0af7b 100644
--- a/www/sarg/distinfo
+++ b/www/sarg/distinfo
@@ -1,2 +1,4 @@
-MD5 (sarg-2.0.3.tar.gz) = 573642c4777ce3ceb2e73798eef3bccf
-SIZE (sarg-2.0.3.tar.gz) = 325202
+MD5 (sarg-2.0.4.tar.gz) = 68a5ed4ae66ba87054104dd1cc2a5609
+SIZE (sarg-2.0.4.tar.gz) = 325125
+MD5 (sarg-2.0.4-segmentation-fault.patch) = d2c9b136c8a85e6e1960eb73cfb496cf
+SIZE (sarg-2.0.4-segmentation-fault.patch) = 985
diff --git a/www/sarg/files/patch-log.c b/www/sarg/files/patch-log.c
new file mode 100644
index 000000000000..9c8d143abf91
--- /dev/null
+++ b/www/sarg/files/patch-log.c
@@ -0,0 +1,11 @@
+--- log.c.orig Tue Feb 22 22:06:18 2005
++++ log.c Tue Mar 8 01:13:01 2005
+@@ -23,6 +23,8 @@
+ *
+ */
+
++#include <sys/time.h>
++#include <inttypes.h>
+ #include <sys/resource.h>
+ #include <time.h>
+ #include "include/conf.h"
diff --git a/www/sarg/pkg-plist b/www/sarg/pkg-plist
index f8749840a0e9..c0a956e416cb 100644
--- a/www/sarg/pkg-plist
+++ b/www/sarg/pkg-plist
@@ -37,6 +37,8 @@ etc/sarg/sarg-php/LANGUAGES
etc/sarg/sarg-php/language.php
etc/sarg/sarg-php/locale/en_EN/LC_MESSAGES/messages.mo
etc/sarg/sarg-php/locale/en_EN/LC_MESSAGES/messages.po
+etc/sarg/sarg-php/locale/fr/LC_MESSAGES/messages.mo
+etc/sarg/sarg-php/locale/fr/LC_MESSAGES/messages.po
etc/sarg/sarg-php/locale/pt_BR/LC_MESSAGES/messages.mo
etc/sarg/sarg-php/locale/pt_BR/LC_MESSAGES/messages.po
etc/sarg/sarg-php/locale/ru/LC_MESSAGES/messages.mo
@@ -50,6 +52,8 @@ etc/sarg/sarg-php/translate.this
@dirrm etc/sarg/sarg-php/locale/ru
@dirrm etc/sarg/sarg-php/locale/pt_BR/LC_MESSAGES
@dirrm etc/sarg/sarg-php/locale/pt_BR
+@dirrm etc/sarg/sarg-php/locale/fr/LC_MESSAGES
+@dirrm etc/sarg/sarg-php/locale/fr
@dirrm etc/sarg/sarg-php/locale/en_EN/LC_MESSAGES
@dirrm etc/sarg/sarg-php/locale/en_EN
@dirrm etc/sarg/sarg-php/locale