Update to 1.0.3

Note new WWW: in pkg-descr
Pass maintainership to submitter.

PR:		ports/128124
Submitted by:	Yuri Grishin <uzgrishin@mail.ru>
Approved by:	Denis Barov <dindin@yandex-team.ru> (maintainer)

6 files changed, 90 insertions, 92 deletions

diff --git a/www/sams/Makefile b/www/sams/Makefile
index b8a9a6af2a08..ed5777cef285 100644
--- a/www/sams/Makefile
+++ b/www/sams/Makefile
@@ -6,38 +6,32 @@
 #
 
 PORTNAME=	sams
-DISTVERSION=	20070524
-PORTREVISION=	2
+DISTVERSION=	1.0.3
+PORTEPOCH=	1
 CATEGORIES=	www
-MASTER_SITES=	http://sams.irc.perm.ru/downloads/ \
-		http://www.dindin.ru/download/
+MASTER_SITES=	http://sams.perm.ru/download/ \
+		http://grishin.000webhost.info/sams/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	dindin@dindin.ru
-COMMENT=	Squid Accounting Management System
+MAINTAINER=	uzgrishin@mail.ru
+COMMENT=	Squid 2.x Accounting Management System
 
 LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre
 
 USE_RC_SUBR=	sams.sh
 
-USE_PHP=	gd mysql ldap
-USE_MYSQL=	4.1
-
 OPTIONS=	NTLM	"NTLM autorization/ActiveDirectory support"	off \
-		APACHE2	"Use apache version 2"	off
-
-OPTIONSFILE?=	${PORT_DBDIR}/${PORTNAME}/options
-
-.if exists(${OPTIONSFILE})
-.include "${OPTIONSFILE}"
-.endif
+		APACHE2	"Use apache version 2"	on
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
+USE_PHP=	gd mysql ldap
+USE_MYSQL=	5.0
 
-CONFIGURE_ARGS=--with-configfile=${LOCALBASE}/etc/sams.conf \
-	       --with-rcd-locations=${LOCALBASE}/etc/rc.d/ \
-	       --with-httpd-locations=${DOCUMENT_ROOT}
+CONFIGURE_ARGS=	--with-configfile=${LOCALBASE}/etc/sams.conf \
+		--with-rcd-locations=${LOCALBASE}/etc/rc.d/ \
+		--with-httpd-locations=${DOCUMENT_ROOT}
 
 SUB_FILES=	pkg-message
 
diff --git a/www/sams/distinfo b/www/sams/distinfo
index 33ea1199cfba..9fefa096db9e 100644
--- a/www/sams/distinfo
+++ b/www/sams/distinfo
@@ -1,3 +1,3 @@
-MD5 (sams-20070524.tar.gz) = f9d7a0d6b9a43133f87bc797178902b3
-SHA256 (sams-20070524.tar.gz) = 4f076537b8823e6d0935c17eabbb45a31b7d5e918db5edd0516c68fea8966b19
-SIZE (sams-20070524.tar.gz) = 1665940
+MD5 (sams-1.0.3.tar.bz2) = 78782acf45dc8d69976f23f5a9de816f
+SHA256 (sams-1.0.3.tar.bz2) = 0369e1397eccb2e32f6132069b8a45638d8507214ebd935084d0a871ca1ad05d
+SIZE (sams-1.0.3.tar.bz2) = 1561538
diff --git a/www/sams/files/patch-Makefile.in b/www/sams/files/patch-Makefile.in
index c36e9b04a20b..05b516ac5e84 100644
--- a/www/sams/files/patch-Makefile.in
+++ b/www/sams/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Mon Dec 25 11:22:30 2006
-+++ Makefile.in	Mon Dec 25 11:23:23 2006
+--- Makefile.in.orig	2008-11-12 13:17:41.950768912 -0500
++++ Makefile.in	2008-11-12 13:21:44.532888985 -0500
 @@ -201,12 +201,11 @@
  		echo "move old sams.conf to sams.conf.old"; \
  		mv /etc/sams.conf /etc/sams.conf.old; \
@@ -10,14 +10,14 @@
  	cp ./samsf $(bindir);
  	cp ./samsredir $(bindir);
  	cp ./samsdaemon $(bindir);
--	cp ./etc/samsd $(RCDPATH);
+-	cp ./etc/sams $(RCDPATH);
  	cp ./mysql/recover_admin_passwd $(bindir);
  	-@if test ! -d $(datadir); then \
  		echo "creating $(datadir)"; \
-@@ -235,10 +234,6 @@
- 	chmod 777 $(datadir)/sams/data; 
- 	rm -f $(datadir)/sams/data/*;
- 	cp -R doc $(datadir)/sams/;
+@@ -243,10 +242,6 @@
+ 	cp ./mysql/sams_db.sql $(datadir)/sams/data;
+ 	cp ./mysql/squid_db.sql $(datadir)/sams/data;
+ 	cp ./update/upgrade_mysql_table.php $(datadir)/sams/data;
 -	-@if test ! -d $(HTTPDPATH)/sams; then \
 -		echo "creating symlink to sams directory"; \
 -		ln -s $(datadir)/sams $(HTTPDPATH)/sams; \
diff --git a/www/sams/files/patch-sams.conf b/www/sams/files/patch-sams.conf
index 42d5be72113c..bf34b13b1b61 100644
--- a/www/sams/files/patch-sams.conf
+++ b/www/sams/files/patch-sams.conf
@@ -1,24 +1,26 @@
---- etc/sams.conf.orig	Mon Mar  6 14:59:58 2006
-+++ etc/sams.conf	Fri Dec 22 11:17:39 2006
-@@ -4,19 +4,19 @@
+--- etc/sams.conf.orig	2007-08-15 20:05:54.000000000 -0400
++++ etc/sams.conf	2008-11-12 13:26:07.375021156 -0500
+@@ -4,21 +4,21 @@
  MYSQLHOSTNAME=localhost
  MYSQLUSER=sams
  MYSQLPASSWORD=samspasswd
 -MYSQLVERSION=4.0
-+MYSQLVERSION=4.1
++MYSQLVERSION=5.0
  SQUIDCACHEFILE=access.log
 -SQUIDROOTDIR=/etc/squid
 -SQUIDLOGDIR=/var/log/squid
-+SQUIDROOTDIR=/usr/local/etc/squid
-+SQUIDLOGDIR=/usr/local/squid/logs/
- SAMSPATH=/usr/local
++SQUIDROOTDIR=${LOCALBASE}/etc/squid
++SQUIDLOGDIR=${LOCALBSE}/squid/logs
+ SQUIDCACHEDIR=/var/spool/squid
+-SAMSPATH=/usr/local
 -SQUIDPATH=/usr/sbin
-+SQUIDPATH=/usr/local/sbin
++SAMSPATH=${PREFIX}
++SQUIDPATH=${LOCALBASE}/sbin
  SQUIDGUARDLOGPATH=/var/log
 -SQUIDGUARDDBPATH=/var/db/squidguard
 -RECODECOMMAND=iconv -f KOI8-R -t 866 %finp > %fout
 +SQUIDGUARDDBPATH=/var/db/squidGuard
-+RECODECOMMAND=/usr/local/bin/iconv -f KOI8-R -t 866 %finp > %fout
++RECODECOMMAND=${LOCALBASE}/bin/iconv -f KOI8-R -t 866 %finp > %fout
  LDAPSERVER=servername_or_ipadress
  LDAPBASEDN=your.domain
  LDAPUSER=DomainAdministrator
@@ -27,3 +29,4 @@
  REJIKPATH=/usr/local/rejik
 -SHUTDOWNCOMMAND=shutdown -h now
 +SHUTDOWNCOMMAND=/sbin/shutdown -h now
+ CACHENUM=0
diff --git a/www/sams/pkg-descr b/www/sams/pkg-descr
index 73693cd4d9b9..1174e425f63e 100644
--- a/www/sams/pkg-descr
+++ b/www/sams/pkg-descr
@@ -1,5 +1,6 @@
 SAMS (Squid Account Management System) is a WEB-based interface and tool to
-manage users of SQUID proxy server. Main features are:
+manage users of SQUID proxy server. NOTE: SQUID 2.x branch is suppoted only.
+Main features are:
 
     * manage users access to SQUID - proxy with NTLM, NCSA authorization
       or IP address
@@ -10,7 +11,7 @@ manage users of SQUID proxy server. Main features are:
     * switch of users access to SQUID proxy if his traffic quota is off
     * manage a delay pools for users groups
 
-WWW: http://sams.irc.perm.ru/
+WWW: http://sams.perm.ru/
 
-- Dindin
-dindin@freebsd.org.ua
+- GrishinUS
+uzgrishin@mail.ru
diff --git a/www/sams/pkg-plist b/www/sams/pkg-plist
index 4a870bd7fda6..568b46a454f1 100644
--- a/www/sams/pkg-plist
+++ b/www/sams/pkg-plist
@@ -9,11 +9,11 @@ etc/sams.conf.sample
 %%DATADIR%%/bin/freemem
 %%DATADIR%%/bin/freeswap
 %%DATADIR%%/bin/fsusage
+%%DATADIR%%/bin/getuptime
 %%DATADIR%%/bin/getwbinfousers
 %%DATADIR%%/bin/samsdf
 %%DATADIR%%/bin/testwbinfopasswd
 %%DATADIR%%/bin/updateuserlist
-%%DATADIR%%/bin/uptime
 %%DATADIR%%/config.php
 %%DATADIR%%/createpdf.php
 %%DATADIR%%/doc/EN/admin.html
@@ -29,37 +29,37 @@ etc/sams.conf.sample
 %%DATADIR%%/doc/EN/sams_conf.html
 %%DATADIR%%/doc/EN/squid.html
 %%DATADIR%%/doc/EN/upgrade.html
-%%DATADIR%%/doc/KOI8-R/about.html
-%%DATADIR%%/doc/KOI8-R/addusers.html
-%%DATADIR%%/doc/KOI8-R/adldap.html
-%%DATADIR%%/doc/KOI8-R/apache.html
-%%DATADIR%%/doc/KOI8-R/backup.html
-%%DATADIR%%/doc/KOI8-R/faq.html
-%%DATADIR%%/doc/KOI8-R/groups.html
-%%DATADIR%%/doc/KOI8-R/gui.html
-%%DATADIR%%/doc/KOI8-R/index.html
-%%DATADIR%%/doc/KOI8-R/index.html.2966.backup
-%%DATADIR%%/doc/KOI8-R/install.html
-%%DATADIR%%/doc/KOI8-R/localhost.html
-%%DATADIR%%/doc/KOI8-R/log.html
-%%DATADIR%%/doc/KOI8-R/mysql.html
-%%DATADIR%%/doc/KOI8-R/mysql_install.html
-%%DATADIR%%/doc/KOI8-R/osandsoft.html
-%%DATADIR%%/doc/KOI8-R/pdfreport.html
-%%DATADIR%%/doc/KOI8-R/redirector.html
-%%DATADIR%%/doc/KOI8-R/samba.html
-%%DATADIR%%/doc/KOI8-R/samba3.html
-%%DATADIR%%/doc/KOI8-R/sams_conf.html
-%%DATADIR%%/doc/KOI8-R/script.html
-%%DATADIR%%/doc/KOI8-R/settings.html
-%%DATADIR%%/doc/KOI8-R/several.html
-%%DATADIR%%/doc/KOI8-R/shablons.html
-%%DATADIR%%/doc/KOI8-R/soft.html
-%%DATADIR%%/doc/KOI8-R/squid.html
-%%DATADIR%%/doc/KOI8-R/upgrade.html
-%%DATADIR%%/doc/KOI8-R/urllists.html
-%%DATADIR%%/doc/KOI8-R/users.html
-%%DATADIR%%/doc/KOI8-R/weather.php
+%%DATADIR%%/doc/RU/redirector.html
+%%DATADIR%%/doc/RU/script.html
+%%DATADIR%%/doc/RU/settings.html
+%%DATADIR%%/doc/RU/samba.html
+%%DATADIR%%/doc/RU/weather.php
+%%DATADIR%%/doc/RU/apache.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/install.html
+%%DATADIR%%/doc/RU/osandsoft.html
+%%DATADIR%%/doc/RU/filerecovery.html
+%%DATADIR%%/doc/RU/log.html
+%%DATADIR%%/doc/RU/several.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/img/10.jpg
 %%DATADIR%%/doc/img/11.jpg
 %%DATADIR%%/doc/img/12.jpg
@@ -123,6 +123,7 @@ etc/sams.conf.sample
 %%DATADIR%%/doc/img/pfile.gif
 %%DATADIR%%/doc/img/pobject.gif
 %%DATADIR%%/doc/img/reconfig.jpg
+%%DATADIR%%/doc/img/recovery.jpg
 %%DATADIR%%/doc/img/redir.jpg
 %%DATADIR%%/doc/img/redirect.gif
 %%DATADIR%%/doc/img/sams_work.gif
@@ -143,6 +144,9 @@ etc/sams.conf.sample
 %%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
@@ -156,6 +160,8 @@ etc/sams.conf.sample
 %%DATADIR%%/icon/bumper/db_48.jpg
 %%DATADIR%%/icon/bumper/dbcheck_32.jpg
 %%DATADIR%%/icon/bumper/dbcheck_48.jpg
+%%DATADIR%%/icon/bumper/dbupgrade_32.jpg
+%%DATADIR%%/icon/bumper/dbupgrade_48.jpg
 %%DATADIR%%/icon/bumper/denied.gif
 %%DATADIR%%/icon/bumper/denied_48.jpg
 %%DATADIR%%/icon/bumper/denied_rus.gif
@@ -229,7 +235,6 @@ etc/sams.conf.sample
 %%DATADIR%%/icon/bumper/redirect.gif
 %%DATADIR%%/icon/bumper/redirect_48.jpg
 %%DATADIR%%/icon/bumper/sams.gif
-%%DATADIR%%/icon/bumper/sams_icon.zip
 %%DATADIR%%/icon/bumper/sams_old.gif
 %%DATADIR%%/icon/bumper/savebase_32.jpg
 %%DATADIR%%/icon/bumper/savebase_48.jpg
@@ -278,6 +283,8 @@ etc/sams.conf.sample
 %%DATADIR%%/icon/classic/ark_48.jpg
 %%DATADIR%%/icon/classic/backup_48.jpg
 %%DATADIR%%/icon/classic/blank.gif
+%%DATADIR%%/icon/classic/cache_32.jpg
+%%DATADIR%%/icon/classic/cache_48.jpg
 %%DATADIR%%/icon/classic/chname_32.jpg
 %%DATADIR%%/icon/classic/chname_48.jpg
 %%DATADIR%%/icon/classic/config_20.jpg
@@ -287,6 +294,8 @@ etc/sams.conf.sample
 %%DATADIR%%/icon/classic/db_48.jpg
 %%DATADIR%%/icon/classic/dbcheck_32.jpg
 %%DATADIR%%/icon/classic/dbcheck_48.jpg
+%%DATADIR%%/icon/classic/dbupgrade_32.jpg
+%%DATADIR%%/icon/classic/dbupgrade_48.jpg
 %%DATADIR%%/icon/classic/denied.gif
 %%DATADIR%%/icon/classic/denied_48.jpg
 %%DATADIR%%/icon/classic/denied_big.gif
@@ -466,6 +475,7 @@ etc/sams.conf.sample
 %%DATADIR%%/icon/classic/web.gif
 %%DATADIR%%/icon/classic/webinterface.gif
 %%DATADIR%%/index.html
+%%DATADIR%%/install.php
 %%DATADIR%%/lang/koi8r-2-utf8
 %%DATADIR%%/lang/koi8r-2-win1251
 %%DATADIR%%/lang/koi8r-2-win1251.php
@@ -518,27 +528,19 @@ etc/sams.conf.sample
 %%DATADIR%%/lib/fpdf.php
 %%DATADIR%%/lib/rgb.php
 %%DATADIR%%/main.php
-%%DATADIR%%/menu/CVS/Entries
-%%DATADIR%%/menu/CVS/Entries.Extra
-%%DATADIR%%/menu/CVS/Repository
-%%DATADIR%%/menu/CVS/Root
 %%DATADIR%%/menu/ftiens4.js
 %%DATADIR%%/menu/ftiens4.js.work
 %%DATADIR%%/menu/menu.js
 %%DATADIR%%/menu/script.js
 %%DATADIR%%/menu/ua.js
-%%DATADIR%%/messages/EN/blocked.php
-%%DATADIR%%/messages/EN/config.php
-%%DATADIR%%/messages/KOI8-R/blocked.php
-%%DATADIR%%/messages/KOI8-R/config.php
-%%DATADIR%%/messages/WIN1251/blocked.php
-%%DATADIR%%/messages/WIN1251/config.php
+%%DATADIR%%/messages/blocked.php
+%%DATADIR%%/messages/config.php
 %%DATADIR%%/messages/denied.gif
 %%DATADIR%%/messages/denied.html
-%%DATADIR%%/messages/koi8r-win1251
 %%DATADIR%%/messages/urldenied.html
 %%DATADIR%%/mysqltools.php
 %%DATADIR%%/rgb.php
+%%DATADIR%%/src/_adldap.php
 %%DATADIR%%/src/_lffolder_6_users.php
 %%DATADIR%%/src/_usersbuttom_1_ldap.php
 %%DATADIR%%/src/adldap.php
@@ -566,6 +568,7 @@ etc/sams.conf.sample
 %%DATADIR%%/src/dbbuttom_1_dbcheck.php
 %%DATADIR%%/src/dbbuttom_6_statdb.php
 %%DATADIR%%/src/dbbuttom_7_chname.php
+%%DATADIR%%/src/dbbuttom_9_upgr.php
 %%DATADIR%%/src/dbtray.php
 %%DATADIR%%/src/deniedbuttom_1_loadlist.php
 %%DATADIR%%/src/deniedbuttom_2_savelist.php
@@ -633,6 +636,7 @@ etc/sams.conf.sample
 %%DATADIR%%/src/squidbuttom_2_loadbase.php
 %%DATADIR%%/src/squidbuttom_3_delete.php
 %%DATADIR%%/src/squidbuttom_4_addcache.php
+%%DATADIR%%/src/squidbuttom_5_readcache.php
 %%DATADIR%%/src/squidtray.php
 %%DATADIR%%/src/urllistfunction.php
 %%DATADIR%%/src/user.php
@@ -640,12 +644,12 @@ etc/sams.conf.sample
 %%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
 %%DATADIR%%/src/userbuttom_9_delete.php
 %%DATADIR%%/src/userbuttom_9_logoff.php
-%%DATADIR%%/src/usersbuttom_0_switch.php
 %%DATADIR%%/src/usersbuttom_1_adldap.php
 %%DATADIR%%/src/usersbuttom_1_domain.php
 %%DATADIR%%/src/usersbuttom_1_ncsa.php
@@ -663,11 +667,7 @@ etc/sams.conf.sample
 %%DATADIR%%/tray.php
 @dirrm %%DATADIR%%/src/script
 @dirrm %%DATADIR%%/src
-@dirrm %%DATADIR%%/messages/WIN1251
-@dirrm %%DATADIR%%/messages/KOI8-R
-@dirrm %%DATADIR%%/messages/EN
 @dirrm %%DATADIR%%/messages
-@dirrm %%DATADIR%%/menu/CVS
 @dirrm %%DATADIR%%/menu
 @dirrm %%DATADIR%%/lib/font/makefont
 @dirrm %%DATADIR%%/lib/font
@@ -677,8 +677,8 @@ etc/sams.conf.sample
 @dirrm %%DATADIR%%/icon/bumper
 @dirrm %%DATADIR%%/icon
 @dirrm %%DATADIR%%/doc/img
-@dirrm %%DATADIR%%/doc/KOI8-R
 @dirrm %%DATADIR%%/doc/EN
+@dirrm %%DATADIR%%/doc/RU
 @dirrm %%DATADIR%%/doc
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%/bin