svn commit: r310082 - in head/www/sarg: . files

[Renato Botelho]

Author: garga
Date: Tue Jan  8 10:25:00 2013
New Revision: 310082
URL: http://svnweb.freebsd.org/changeset/ports/310082

Log:
  - Update to 2.3.4
  - Add OPTIONS for ICONV, LDAP and PCRE

Deleted:
  head/www/sarg/files/patch-configure.in
  head/www/sarg/files/patch-fix_missing_href
  head/www/sarg/files/patch-log.c
Modified:
  head/www/sarg/Makefile
  head/www/sarg/distinfo
  head/www/sarg/files/patch-Makefile.in

Modified: head/www/sarg/Makefile
==============================================================================
--- head/www/sarg/Makefile	Tue Jan  8 10:22:33 2013	(r310081)
+++ head/www/sarg/Makefile	Tue Jan  8 10:25:00 2013	(r310082)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sarg
-PORTVERSION=	2.3.2
-PORTREVISION=	5
+PORTVERSION=	2.3.4
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -13,10 +12,9 @@ COMMENT=	Squid log analyzer and HTML rep
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-OPTIONS_DEFINE=	GD PHP NLS
-OPTIONS_DEFAULT=GD PHP NLS
+OPTIONS_DEFINE=	GD PHP NLS PCRE LDAP ICONV
+OPTIONS_DEFAULT=GD PHP NLS PCRE LDAP ICONV
 
-GD_DESC=	Enable GD support
 PHP_DESC=	Install PHP for reporting generating
 
 USE_AUTOTOOLS=	autoconf aclocal
@@ -24,7 +22,8 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--sysconfdir="${ETCDIR}" \
+CONFIGURE_ARGS=	CPPFLAGS=-I${LOCALBASE}/include \
+		--sysconfdir="${ETCDIR}" \
 		--enable-fontdir="${ETCDIR}/fonts" \
 		--enable-imagedir="${ETCDIR}/images"
 
@@ -35,14 +34,16 @@ MAN1=		sarg.1
 .if ${PORT_OPTIONS:MNLS}
 PLIST_SUB+=	NLS=""
 USE_GETTEXT=	yes
-USE_ICONV=	yes
 .else
 PLIST_SUB+=	NLS="@comment "
 CONFIGURE_ARGS+=--disable-nls
 .endif
 
 .if ${PORT_OPTIONS:MGD}
+CONFIGURE_ARGS+=--with-gd
 LIB_DEPENDS+=	gd:${PORTSDIR}/graphics/gd
+.else
+CONFIGURE_ARGS+=--without-gd
 .endif
 
 .if ${PORT_OPTIONS:MPHP}
@@ -53,6 +54,27 @@ CONFIGURE_ARGS+=--disable-sargphp
 PLIST_SUB+=	PHP="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MPCRE}
+CONFIGURE_ARGS+=--with-pcre
+LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre
+.else
+CONFIGURE_ARGS+=--without-pcre
+.endif
+
+.if ${PORT_OPTIONS:MLDAP}
+CONFIGURE_ARGS+=--with-ldap
+USE_OPENLDAP=	yes
+.else
+CONFIGURE_ARGS+=--without-ldap
+.endif
+
+.if ${PORT_OPTIONS:MICONV}
+CONFIGURE_ARGS+=--with-iconv
+USE_ICONV=	yes
+.else
+CONFIGURE_ARGS+=--without-iconv
+.endif
+
 post-extract:
 	@${FIND} ${WRKSRC} -type d -exec ${CHMOD} 0755 {} \;
 	@${CHMOD} 0755 ${WRKSRC}/configure

Modified: head/www/sarg/distinfo
==============================================================================
--- head/www/sarg/distinfo	Tue Jan  8 10:22:33 2013	(r310081)
+++ head/www/sarg/distinfo	Tue Jan  8 10:25:00 2013	(r310082)
@@ -1,2 +1,2 @@
-SHA256 (sarg-2.3.2.tar.gz) = b117f417da577e73e8d6b44d8f63c99ceb8cd34b72bc0c4a5af889bfacb5c8a5
-SIZE (sarg-2.3.2.tar.gz) = 1180411
+SHA256 (sarg-2.3.4.tar.gz) = 9448de524bd91dbf0eaa8ebd393bc34c716dfb98e4595c8f0166062b8fac9f76
+SIZE (sarg-2.3.4.tar.gz) = 1282009

Modified: head/www/sarg/files/patch-Makefile.in
==============================================================================
--- head/www/sarg/files/patch-Makefile.in	Tue Jan  8 10:22:33 2013	(r310081)
+++ head/www/sarg/files/patch-Makefile.in	Tue Jan  8 10:25:00 2013	(r310082)
@@ -1,18 +1,20 @@
---- Makefile.in.orig	2011-06-20 04:12:39.000000000 +0900
-+++ Makefile.in	2012-02-02 18:04:28.000000000 +0900
-@@ -27,9 +27,9 @@
+--- Makefile.in.orig	2012-08-30 14:23:05.000000000 -0300
++++ Makefile.in	2012-11-20 11:50:32.000000000 -0200
+@@ -27,11 +27,11 @@
  LIBS        = @LIBS@ -lm
  SRCDIR      = .
  VPATH       = .
 -INSTALL     = cp
 +INSTALL     = @INSTALL@ -m 644 -S
-
+ XSL_MAN_STYLESHEET=@XSL_MAN_STYLESHEET@
+ XSL_HTML_STYLESHEET=@XSL_HTML_STYLESHEET@
+ 
 -INSTALL_PROGRAM = $(INSTALL)
 +INSTALL_PROGRAM = @INSTALL@ -m 755 -S -s
-
+ 
  SRCS = util.c log.c report.c topuser.c email.c sort.c html.c \
-        index.c getconf.c usage.c decomp.c ip2name.c \
-@@ -91,14 +91,11 @@
+        index.c getconf.c usage.c decomp.c ip2name.c ip2name_dns.c \
+@@ -93,14 +93,11 @@
  		mkdir -p $(DESTDIR)$(IMAGEDIR); \
  	fi
  	$(INSTALL_PROGRAM) sarg $(DESTDIR)$(bindir)/sarg