4 files changed, 16 insertions, 18 deletions

diff --git a/www/sams/Makefile b/www/sams/Makefile
index cc986168aee5..f84af0fe9b58 100644
--- a/www/sams/Makefile
+++ b/www/sams/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	sams
-DISTVERSION=	1.0.4
+DISTVERSION=	1.0.5
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	http://sams.perm.ru/download/ \
-		http://grishin.000webhost.info/sams/
+		http://gateway11.ath.cx/sams/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	uzgrishin@mail.ru
@@ -28,9 +28,9 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_PHP=	ctype curl gettext hash iconv json mysql \
-		pcre pdf pdo pdo_sqlite posix session \
-		session simplexml spl sqlite tokenizer  \
-		xmlreader xmlwriter zlib
+		pcre pdo pdo_sqlite posix session \
+		simplexml spl sqlite tokenizer \
+		xmlwriter zlib xmlreader
 
 USE_MYSQL=	5.0
 
@@ -53,17 +53,13 @@ RUN_DEPENDS+=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13
 .endif
 
 .if defined(WITH_INSTALLGD)
-USE_PHP+=	gd
+USE_PHP+=	pdf 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/distinfo b/www/sams/distinfo
index 01a8a9214331..1cd529566dde 100644
--- a/www/sams/distinfo
+++ b/www/sams/distinfo
@@ -1,3 +1,3 @@
-MD5 (sams-1.0.4.tar.bz2) = e0aad64098968bd4159687d2d569dcea
-SHA256 (sams-1.0.4.tar.bz2) = 6f770008cb910418011118198f0a6d211588cc24e9d567a2dee49f78f29681ec
-SIZE (sams-1.0.4.tar.bz2) = 1561524
+MD5 (sams-1.0.5.tar.bz2) = feedd9380b77d31cfc6d67931a02ee25
+SHA256 (sams-1.0.5.tar.bz2) = 23b45778275a841df90a5fa5ec063e596bd28fd5a43d2bcfb8df3ec5b20bc5b2
+SIZE (sams-1.0.5.tar.bz2) = 1545260
diff --git a/www/sams/files/sams.sh.in b/www/sams/files/sams.sh.in
index 809f61136b1e..46656180b2e5 100644
--- a/www/sams/files/sams.sh.in
+++ b/www/sams/files/sams.sh.in
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 # PROVIDE: sams
-# REQUIRE: LOGIN cleanvar
+# REQUIRE: LOGIN cleanvar mysql
 # KEYWORD: shutdown
 
 # Define these sams_* variables in one of these files:
diff --git a/www/sams/pkg-plist b/www/sams/pkg-plist
index 53d07137888d..105e5974b8e5 100644
--- a/www/sams/pkg-plist
+++ b/www/sams/pkg-plist
@@ -149,6 +149,8 @@ etc/sams.conf.sample
 %%DATADIR%%/icon/bumper/adir.gif
 %%DATADIR%%/icon/bumper/allow_48.jpg
 %%DATADIR%%/icon/bumper/backup_48.jpg
+%%DATADIR%%/icon/bumper/cache_32.jpg
+%%DATADIR%%/icon/bumper/cache_48.jpg
 %%DATADIR%%/icon/bumper/chname_32.jpg
 %%DATADIR%%/icon/bumper/chname_48.jpg
 %%DATADIR%%/icon/bumper/computer.gif
@@ -222,7 +224,10 @@ etc/sams.conf.sample
 %%DATADIR%%/icon/bumper/pobject.gif
 %%DATADIR%%/icon/bumper/proxy.gif
 %%DATADIR%%/icon/bumper/proxy_big.gif
+%%DATADIR%%/icon/bumper/proxyes_32.jpg
+%%DATADIR%%/icon/bumper/proxyes_48.jpg
 %%DATADIR%%/icon/bumper/puser.gif
+%%DATADIR%%/icon/bumper/puser_open.gif
 %%DATADIR%%/icon/bumper/puserd.gif
 %%DATADIR%%/icon/bumper/quote_alarm.gif
 %%DATADIR%%/icon/bumper/recalc_32.jpg
@@ -284,8 +289,6 @@ 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
@@ -390,8 +393,6 @@ 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
@@ -666,6 +667,7 @@ etc/sams.conf.sample
 %%DATADIR%%/src/webconfigbuttom_1_prop.php
 %%DATADIR%%/src/webconfigtray.php
 %%DATADIR%%/tray.php
+@exec mkdir -p %D/%%DATADIR%%/backup
 @dirrm %%DATADIR%%/src/script
 @dirrm %%DATADIR%%/src
 @dirrm %%DATADIR%%/messages