3 files changed, 54 insertions, 42 deletions

diff --git a/www/sams/Makefile b/www/sams/Makefile
index 9559e3109f1c..cc986168aee5 100644
--- a/www/sams/Makefile
+++ b/www/sams/Makefile
@@ -22,16 +22,20 @@ USE_RC_SUBR=	sams.sh
 
 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
 
@@ -39,11 +43,7 @@ SUB_FILES=	pkg-message
 
 .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/
+USE_PHP+=	ldap
 .endif
 
 .if defined(WITH_APACHE22)
@@ -52,10 +52,18 @@ RUN_DEPENDS+=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache22
 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}/
 
 post-install:
+	@cp ${PREFIX}/share/sams/icon/classic/proxyes_32.jpg ${PREFIX}/share/sams/icon/bumper/proxyes_32.jpg
+	@cp ${PREFIX}/share/sams/icon/classic/cache_32.jpg ${PREFIX}/share/sams/icon/bumper/cache_32.jpg
+	@cp ${PREFIX}/share/sams/icon/classic/proxyes_48.jpg ${PREFIX}/share/sams/icon/bumper/proxyes_48.jpg
+	@cp ${PREFIX}/share/sams/icon/classic/cache_48.jpg ${PREFIX}/share/sams/icon/bumper/cache_48.jpg
 	@${CAT} ${PKGMESSAGE}
 
 setup:
diff --git a/www/sams/files/patch-sams.conf b/www/sams/files/patch-sams.conf
index bf34b13b1b61..a116cd1d13fb 100644
--- a/www/sams/files/patch-sams.conf
+++ b/www/sams/files/patch-sams.conf
@@ -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
diff --git a/www/sams/pkg-plist b/www/sams/pkg-plist
index 7ab97b2b82b5..53d07137888d 100644
--- a/www/sams/pkg-plist
+++ b/www/sams/pkg-plist
@@ -16,6 +16,9 @@ etc/sams.conf.sample
 %%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 @@ etc/sams.conf.sample
 %%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 @@ 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
@@ -284,6 +284,8 @@ etc/sams.conf.sample
 %%DATADIR%%/icon/classic/blank.gif
 %%DATADIR%%/icon/classic/cache_32.jpg
 %%DATADIR%%/icon/classic/cache_48.jpg
+%%DATADIR%%/icon/bumper/cache_32.jpg
+%%DATADIR%%/icon/bumper/cache_48.jpg
 %%DATADIR%%/icon/classic/chname_32.jpg
 %%DATADIR%%/icon/classic/chname_48.jpg
 %%DATADIR%%/icon/classic/config_20.jpg
@@ -388,6 +390,8 @@ etc/sams.conf.sample
 %%DATADIR%%/icon/classic/proxy_big.gif
 %%DATADIR%%/icon/classic/proxyes_32.jpg
 %%DATADIR%%/icon/classic/proxyes_48.jpg
+%%DATADIR%%/icon/bumper/proxyes_32.jpg
+%%DATADIR%%/icon/bumper/proxyes_48.jpg
 %%DATADIR%%/icon/classic/psite.gif
 %%DATADIR%%/icon/classic/puser.gif
 %%DATADIR%%/icon/classic/puser_open.gif
@@ -641,7 +645,6 @@ 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
@@ -654,6 +657,7 @@ etc/sams.conf.sample
 %%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 +678,8 @@ etc/sams.conf.sample
 @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