Attachment 93712 Details for Bug 131679 – sams.diff

[patch] sams.diff

sams.diff (text/x-patch; charset="ISO-8859-1"), 6.58 KB, created by Beech Rintoul on 2009-02-15 11:20:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Beech Rintoul

Created: 2009-02-15 11:20:27 UTC

Size: 6.58 KB

patch

obsolete

>? 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

Actions: View | Diff

Attachments on bug 131679: 93712