From nobody@FreeBSD.org  Sat Feb 14 17:44:14 2009
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4C971106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 14 Feb 2009 17:44:14 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 3AB268FC0C
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 14 Feb 2009 17:44:14 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n1EHiDqk037755
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 14 Feb 2009 17:44:13 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id n1EHiD2K037754;
	Sat, 14 Feb 2009 17:44:13 GMT
	(envelope-from nobody)
Message-Id: <200902141744.n1EHiD2K037754@www.freebsd.org>
Date: Sat, 14 Feb 2009 17:44:13 GMT
From: Yuriy Grishin <uzgrishin@mail.ru>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [maintainer update] port: www/sams 1.0.4 -> 1.0.4_1
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         131679
>Category:       ports
>Synopsis:       [maintainer update] port: www/sams 1.0.4 -> 1.0.4_1
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    beech
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 14 17:50:02 UTC 2009
>Closed-Date:    Sun Feb 15 21:31:56 UTC 2009
>Last-Modified:  Sun Feb 15 21:40:01 UTC 2009
>Originator:     Yuriy Grishin
>Release:        7.0-RELEASE
>Organization:
Samara-Lada LLC
>Environment:
gateway1.local 7.0-RELEASE FreeBSD 7.0-RELEASE #0: Mon Apr 21 13:24:35 SAMST 2008     grishin@gateway1.local:/usr/obj/usr/src/sys/MYKERNEL  i386
>Description:
Hello,

There are some improvements have been made.

Commiters always have problems decompressing my diffs posted through http://www.freebsd.org/send-pr.html form. Please, download the diff here http://grishin.000webhost.info/sams/tmp/sams-1.0.4_1.diff (51k plaintext)
>How-To-Repeat:

>Fix:


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->beech 
Responsible-Changed-By: beech 
Responsible-Changed-When: Sat Feb 14 20:32:42 UTC 2009 
Responsible-Changed-Why:  
I'll take it 

http://www.freebsd.org/cgi/query-pr.cgi?pr=131679 

From: Beech Rintoul <beech@freebsd.org>
To: Yuriy Grishin <uzgrishin@mail.ru>
Cc: Beech Rintoul <beech@freebsd.org>,
 Bug Followup <bug-followup@freebsd.org>
Subject: Re: ports/131679: [maintainer update] port: www/sams 1.0.4 -> 1.0.4_1
Date: Sun, 15 Feb 2009 02:20:27 -0900

 --Boundary-00=_7p/lJZdbVIVhDez
 Content-Type: text/plain;
   charset="us-ascii"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 %%DATADIR%% should not be changed to a share/sams
 Portrevision does not need bump for bug fix.
 
 Diff attached, please approve
 
 Beech
 -- 
 ---------------------------------------------------------------------------------------
 Beech Rintoul - FreeBSD Developer - beech@FreeBSD.org
 /"\   ASCII Ribbon Campaign  | FreeBSD Since 4.x
 \ / - NO HTML/RTF in e-mail   | http://people.freebsd.org/~beech
  X  - NO Word docs in e-mail | Skype: akbeech
 / \  - http://www.FreeBSD.org/releases/7.1R/announce.html
 ---------------------------------------------------------------------------------------
 
 
 
 
 
 --Boundary-00=_7p/lJZdbVIVhDez
 Content-Type: text/x-patch;
   charset="ISO-8859-1";
   name="sams.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
 	filename="sams.diff"
 
 ? sams.diff
 Index: Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/www/sams/Makefile,v
 retrieving revision 1.9
 diff -u -r1.9 Makefile
 --- Makefile	18 Jan 2009 11:23:39 -0000	1.9
 +++ Makefile	14 Feb 2009 22:22:24 -0000
 @@ -22,28 +22,28 @@
  
  OPTIONS=	NTLM	"NTLM autorization/ActiveDirectory support"	off \
  		APACHE22	"Use apache version 2.2"	on \
 -		PHP5GD	"Enable constructing graphs" on
 +		INSTALLGD 	"Graphic reports"		on
  
  USE_GMAKE=	yes
  GNU_CONFIGURE=	yes
  USE_BZIP2=	yes
 -USE_PHP=	mysql
 +USE_PHP=	ctype curl gettext hash iconv json mysql \
 +		pcre pdf pdo pdo_sqlite posix session \
 +		session simplexml spl sqlite tokenizer  \
 +		xmlreader xmlwriter zlib
 +
  USE_MYSQL=	5.0
  
 -CONFIGURE_ARGS=	--with-configfile=${LOCALBASE}/etc/sams.conf \
 -		--with-rcd-locations=${LOCALBASE}/etc/rc.d/
 +CONFIGURE_ARGS=	--with-configfile=${PREFIX}/etc/sams.conf \
 +		--with-rcd-locations=${PREFIX}/etc/rc.d/
  
  SUB_FILES=	pkg-message
  
  .include <bsd.port.pre.mk>
  
  .if defined(WITH_NTLM)
 -RUN_DEPENDS=	${LOCALBASE}/bin/ntlm_auth:${PORTSDIR}/net/samba3
 -RUN_DEPENDS+=	${LOCALBASE}/include/php/ext/ldap/php_ldap.h:${PORTSDIR}/net/php5-ldap/
 -.endif
 -
 -.if defined(WITH_PHP5GD)
 -RUN_DEPENDS+=	${LOCALBASE}/include/php/ext/gd/php_gd.h:${PORTSDIR}/graphics/php5-gd/
 +RUN_DEPENDS+=	${LOCALBASE}/bin/ntlm_auth:${PORTSDIR}/net/samba3
 +USE_PHP+=	ldap
  .endif
  
  .if defined(WITH_APACHE22)
 @@ -52,6 +52,10 @@
  RUN_DEPENDS+=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13
  .endif
  
 +.if defined(WITH_INSTALLGD)
 +USE_PHP+=	gd
 +.endif
 +
  post-extract:
  	${INSTALL_SCRIPT} ${FILESDIR}/setup.sh ${WRKSRC}/
  
 Index: pkg-plist
 ===================================================================
 RCS file: /home/pcvs/ports/www/sams/pkg-plist,v
 retrieving revision 1.4
 diff -u -r1.4 pkg-plist
 --- pkg-plist	18 Jan 2009 11:23:39 -0000	1.4
 +++ pkg-plist	14 Feb 2009 22:22:24 -0000
 @@ -16,6 +16,9 @@
  %%DATADIR%%/bin/updateuserlist
  %%DATADIR%%/config.php
  %%DATADIR%%/createpdf.php
 +%%DATADIR%%/data/sams_db.sql
 +%%DATADIR%%/data/squid_db.sql
 +%%DATADIR%%/data/upgrade_mysql_table.php
  %%DATADIR%%/doc/EN/admin.html
  %%DATADIR%%/doc/EN/apache.html
  %%DATADIR%%/doc/EN/faq.html
 @@ -29,36 +32,36 @@
  %%DATADIR%%/doc/EN/sams_conf.html
  %%DATADIR%%/doc/EN/squid.html
  %%DATADIR%%/doc/EN/upgrade.html
 -%%DATADIR%%/doc/RU/redirector.html
 -%%DATADIR%%/doc/RU/script.html
 -%%DATADIR%%/doc/RU/settings.html
 -%%DATADIR%%/doc/RU/samba.html
 +%%DATADIR%%/doc/RU/about.html
 +%%DATADIR%%/doc/RU/addusers.html
 +%%DATADIR%%/doc/RU/adldap.html
  %%DATADIR%%/doc/RU/apache.html
 +%%DATADIR%%/doc/RU/backup.html
 +%%DATADIR%%/doc/RU/faq.html
 +%%DATADIR%%/doc/RU/filerecovery.html
  %%DATADIR%%/doc/RU/groups.html
 -%%DATADIR%%/doc/RU/users.html
 -%%DATADIR%%/doc/RU/about.html
  %%DATADIR%%/doc/RU/gui.html
 -%%DATADIR%%/doc/RU/urllists.html
 -%%DATADIR%%/doc/RU/addusers.html
 -%%DATADIR%%/doc/RU/shablons.html
 +%%DATADIR%%/doc/RU/index.html
  %%DATADIR%%/doc/RU/install.html
 -%%DATADIR%%/doc/RU/osandsoft.html
 -%%DATADIR%%/doc/RU/filerecovery.html
 +%%DATADIR%%/doc/RU/localhost.html
  %%DATADIR%%/doc/RU/log.html
 +%%DATADIR%%/doc/RU/mysql.html
 +%%DATADIR%%/doc/RU/mysql_install.html
 +%%DATADIR%%/doc/RU/osandsoft.html
 +%%DATADIR%%/doc/RU/pdfreport.html
 +%%DATADIR%%/doc/RU/redirector.html
 +%%DATADIR%%/doc/RU/samba.html
 +%%DATADIR%%/doc/RU/samba3.html
 +%%DATADIR%%/doc/RU/sams_conf.html
 +%%DATADIR%%/doc/RU/script.html
 +%%DATADIR%%/doc/RU/settings.html
  %%DATADIR%%/doc/RU/several.html
 +%%DATADIR%%/doc/RU/shablons.html
  %%DATADIR%%/doc/RU/soft.html
  %%DATADIR%%/doc/RU/squid.html
 -%%DATADIR%%/doc/RU/samba3.html
 -%%DATADIR%%/doc/RU/pdfreport.html
 -%%DATADIR%%/doc/RU/mysql_install.html
 -%%DATADIR%%/doc/RU/adldap.html
 -%%DATADIR%%/doc/RU/backup.html
 -%%DATADIR%%/doc/RU/localhost.html
  %%DATADIR%%/doc/RU/upgrade.html
 -%%DATADIR%%/doc/RU/index.html
 -%%DATADIR%%/doc/RU/mysql.html
 -%%DATADIR%%/doc/RU/sams_conf.html
 -%%DATADIR%%/doc/RU/faq.html
 +%%DATADIR%%/doc/RU/urllists.html
 +%%DATADIR%%/doc/RU/users.html
  %%DATADIR%%/doc/img/10.jpg
  %%DATADIR%%/doc/img/11.jpg
  %%DATADIR%%/doc/img/12.jpg
 @@ -143,9 +146,6 @@
  %%DATADIR%%/doc/img/usergroup_32.jpg
  %%DATADIR%%/doc/img/userlog-32.gif
  %%DATADIR%%/doc/img/websettings.jpg
 -%%DATADIR%%/data/upgrade_mysql_table.php
 -%%DATADIR%%/data/sams_db.sql
 -%%DATADIR%%/data/squid_db.sql
  %%DATADIR%%/icon/bumper/adir.gif
  %%DATADIR%%/icon/bumper/allow_48.jpg
  %%DATADIR%%/icon/bumper/backup_48.jpg
 @@ -641,7 +641,6 @@
  %%DATADIR%%/src/userbuttom_2_traffic.php
  %%DATADIR%%/src/userbuttom_3_file.php
  %%DATADIR%%/src/userbuttom_4_site.php
 -%%DATADIR%%/src/usersbuttom_4_site.php
  %%DATADIR%%/src/userbuttom_4_time.php
  %%DATADIR%%/src/userbuttom_5_clear.php
  %%DATADIR%%/src/userbuttom_6_chpasswd.php
 @@ -654,6 +653,7 @@
  %%DATADIR%%/src/usersbuttom_2_traffic.php
  %%DATADIR%%/src/usersbuttom_3_file.php
  %%DATADIR%%/src/usersbuttom_4_percent.php
 +%%DATADIR%%/src/usersbuttom_4_site.php
  %%DATADIR%%/src/usersbuttom_5_recalc.php
  %%DATADIR%%/src/usersbuttom_6_clear.php
  %%DATADIR%%/src/usersbuttom_7_pdf.php
 @@ -674,8 +674,8 @@
  @dirrm %%DATADIR%%/icon/bumper
  @dirrm %%DATADIR%%/icon
  @dirrm %%DATADIR%%/doc/img
 -@dirrm %%DATADIR%%/doc/EN
  @dirrm %%DATADIR%%/doc/RU
 +@dirrm %%DATADIR%%/doc/EN
  @dirrm %%DATADIR%%/doc
  @dirrm %%DATADIR%%/data
  @dirrm %%DATADIR%%/bin
 Index: files/patch-sams.conf
 ===================================================================
 RCS file: /home/pcvs/ports/www/sams/files/patch-sams.conf,v
 retrieving revision 1.2
 diff -u -r1.2 patch-sams.conf
 --- files/patch-sams.conf	14 Nov 2008 00:36:58 -0000	1.2
 +++ files/patch-sams.conf	14 Feb 2009 22:22:24 -0000
 @@ -1,5 +1,5 @@
 ---- etc/sams.conf.orig	2007-08-15 20:05:54.000000000 -0400
 -+++ etc/sams.conf	2008-11-12 13:26:07.375021156 -0500
 +--- etc/sams.conf.orig	2008-11-12 13:26:07.375021156 -0400
 ++++ etc/sams.conf	2009-02-14 19:25:00.000000000 -0500
  @@ -4,21 +4,21 @@
   MYSQLHOSTNAME=localhost
   MYSQLUSER=sams
 @@ -9,18 +9,18 @@
   SQUIDCACHEFILE=access.log
  -SQUIDROOTDIR=/etc/squid
  -SQUIDLOGDIR=/var/log/squid
 -+SQUIDROOTDIR=${LOCALBASE}/etc/squid
 -+SQUIDLOGDIR=${LOCALBSE}/squid/logs
 ++SQUIDROOTDIR=/usr/local/etc/squid
 ++SQUIDLOGDIR=/usr/local/squid/logs
   SQUIDCACHEDIR=/var/spool/squid
  -SAMSPATH=/usr/local
  -SQUIDPATH=/usr/sbin
 -+SAMSPATH=${PREFIX}
 -+SQUIDPATH=${LOCALBASE}/sbin
 ++SAMSPATH=/usr/local
 ++SQUIDPATH=/usr/local/sbin
   SQUIDGUARDLOGPATH=/var/log
  -SQUIDGUARDDBPATH=/var/db/squidguard
  -RECODECOMMAND=iconv -f KOI8-R -t 866 %finp > %fout
  +SQUIDGUARDDBPATH=/var/db/squidGuard
 -+RECODECOMMAND=${LOCALBASE}/bin/iconv -f KOI8-R -t 866 %finp > %fout
 ++RECODECOMMAND=iconv -f KOI8-R -t 866 %finp > %fout 
   LDAPSERVER=servername_or_ipadress
   LDAPBASEDN=your.domain
   LDAPUSER=DomainAdministrator
 
 --Boundary-00=_7p/lJZdbVIVhDez--

From: Yuriy Grishin <uzgrishin@mail.ru>
To: akbeech@gmail.com, bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/131679: [maintainer update] port: www/sams 1.0.4 -> 1.0.4_1
Date: Sun, 15 Feb 2009 18:20:53 +0400

 Beech Rintoul wrote:
 > %%DATADIR%% should not be changed to a share/sams
 > Portrevision does not need bump for bug fix.
 >
 > Diff attached, please approve
 >
 > Beech
 >   
 
 Hello Beech!
 
     I've fixed the problem with %%DATADIR%% , unbumped portrevision and 
 added some post install routine (a workaround copying 4 forgotten jpegs 
 from one dir into another). I couldn't check the diff you sent, I 
 instead uploaded new version here 
 http://grishin.000webhost.info/sams/tmp/sams-1.0.4.diff (7k plaintext)
 
 --
 Kind Regards, Yuriy Grishin
State-Changed-From-To: open->closed 
State-Changed-By: beech 
State-Changed-When: Sun Feb 15 21:31:43 UTC 2009 
State-Changed-Why:  
Committed, Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=131679 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/131679: commit references a PR
Date: Sun, 15 Feb 2009 21:31:44 +0000 (UTC)

 beech       2009-02-15 21:31:29 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/sams             Makefile pkg-plist 
     www/sams/files       patch-sams.conf 
   Log:
   - Bug fixes and tweaks
   
   PR:             ports/131679
   Submitted by:   Yuriy Grishin <uzgrishin@mail.ru> (maintainer)
   
   Revision  Changes    Path
   1.10      +17 -9     ports/www/sams/Makefile
   1.3       +7 -7      ports/www/sams/files/patch-sams.conf
   1.5       +30 -26    ports/www/sams/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
