aboutsummaryrefslogtreecommitdiffstats
path: root/www
diff options
context:
space:
mode:
authorgarga <garga@FreeBSD.org>2006-05-19 19:43:01 +0800
committergarga <garga@FreeBSD.org>2006-05-19 19:43:01 +0800
commit38f0f6c31c175de033dc5b8475de6bae5aea9064 (patch)
tree8b810d86ffd1cde8f4e4938947388024bdc7fbbe /www
parent100911649476afc9c2185e6926aed5d1ac3acc83 (diff)
downloadfreebsd-ports-gnome-38f0f6c31c175de033dc5b8475de6bae5aea9064.tar.gz
freebsd-ports-gnome-38f0f6c31c175de033dc5b8475de6bae5aea9064.tar.zst
freebsd-ports-gnome-38f0f6c31c175de033dc5b8475de6bae5aea9064.zip
- Update to 2.2.1
- OPTIONS'ify Full Changelog at: http://sarg.sourceforge.net/sarg.ChangeLog.txt
Diffstat (limited to 'www')
-rw-r--r--www/sarg/Makefile24
-rw-r--r--www/sarg/distinfo12
-rw-r--r--www/sarg/files/patch-css.c10
-rw-r--r--www/sarg/pkg-plist1
4 files changed, 16 insertions, 31 deletions
diff --git a/www/sarg/Makefile b/www/sarg/Makefile
index acbe291b1e0b..c2c20848a460 100644
--- a/www/sarg/Makefile
+++ b/www/sarg/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= sarg
-PORTVERSION= 2.1
-PORTREVISION= 2
+PORTVERSION= 2.2.1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,31 +14,32 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= garga@FreeBSD.org
COMMENT= Squid log analyzer and HTML report generator
-PATCH_SITES= http://sarg.sourceforge.net/
-PATCHFILES= datafile.patch lastlog.patch
+OPTIONS= GD "Enable GD support" on
+USE_ICONV= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CC=gcc
+CFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+CONFIGURE_ENV= CC=gcc CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-bindir="${PREFIX}/bin" \
--enable-sysconfdir="${PREFIX}/etc/${PORTNAME}" \
--enable-htmldir="${PREFIX}/www/${PORTNAME}" \
--enable-mandir="${MAN1PREFIX}/man/man1"
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+MAN1= sarg.1
+
+.include <bsd.port.pre.mk>
+
.if !defined(WITHOUT_GD)
GD_PORT?= graphics/gd
LIB_DEPENDS+= gd.4:${PORTSDIR}/${GD_PORT}
-CFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
.endif
-MAN1= sarg.1
-
post-extract:
@${CHMOD} +x ${WRKSRC}/sarg-php/locale
post-patch:
- @${REINPLACE_CMD} -e '/^LDFLAGS/d' ${WRKSRC}/${CONFIGURE_SCRIPT}
+ @${REINPLACE_CMD} -e '/^LDFLAGS=/d' ${WRKSRC}/${CONFIGURE_SCRIPT}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/sarg/distinfo b/www/sarg/distinfo
index 5ae32b2a75d8..b92d83f7ef76 100644
--- a/www/sarg/distinfo
+++ b/www/sarg/distinfo
@@ -1,9 +1,3 @@
-MD5 (sarg-2.1.tar.gz) = 15b1c3fbff47ac6ea77573cae75b5e63
-SHA256 (sarg-2.1.tar.gz) = 89ec31f3b7b8187de1e4ee4fa0a4abf6867f2404bd9059bbfbe4beb609dd5818
-SIZE (sarg-2.1.tar.gz) = 352935
-MD5 (datafile.patch) = be7c27dc81fd42e595adbcdcb14130e1
-SHA256 (datafile.patch) = 328bdd49a7bc6e0649af6c91620a7f6ddf7cd95f56425a2228e6c1f97fd4e9ed
-SIZE (datafile.patch) = 1300
-MD5 (lastlog.patch) = d2c22dddfa0d8214692f382a69eb82f3
-SHA256 (lastlog.patch) = 9fc56675e99a3d427c22cab90e1e79e3b11382578b1f4c5047c10dcdd910b224
-SIZE (lastlog.patch) = 406
+MD5 (sarg-2.2.1.tar.gz) = 8e9a47a63e1326162b6cb6570f24221c
+SHA256 (sarg-2.2.1.tar.gz) = 1f7ad24d7afa18279c232ce0b97f35b6145e33de824abfe7ea6ff058f7045cc0
+SIZE (sarg-2.2.1.tar.gz) = 385693
diff --git a/www/sarg/files/patch-css.c b/www/sarg/files/patch-css.c
deleted file mode 100644
index 5fcdb67b913a..000000000000
--- a/www/sarg/files/patch-css.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- css.c.orig Tue Mar 28 10:25:11 2006
-+++ css.c Tue Mar 28 10:25:41 2006
-@@ -40,6 +40,7 @@
- while(fgets(buf,MAXLEN,fp_in)!=NULL)
- fputs(buf,fp_ou);
- fputs("</style>\n",fp_ou);
-+ fclose(fp_in);
- return;
- }
-
diff --git a/www/sarg/pkg-plist b/www/sarg/pkg-plist
index ea51bee009bf..51cc4d68751b 100644
--- a/www/sarg/pkg-plist
+++ b/www/sarg/pkg-plist
@@ -54,6 +54,7 @@ etc/sarg/sarg-php/sarg-squidguard-block.php
etc/sarg/sarg-php/sarg-squidguard-block2.php
etc/sarg/sarg-php/style.php
etc/sarg/sarg-php/translate.this
+etc/sarg/user_limit_block
@dirrm etc/sarg/sarg-php/locale/ru/LC_MESSAGES
@dirrm etc/sarg/sarg-php/locale/ru
@dirrm etc/sarg/sarg-php/locale/pt_BR/LC_MESSAGES