Attachment #93712 for bug #131679

View | Details | Raw Unified | Return to bug 131679
Collapse All | Expand All





OPTIONS=	NTLM	"NTLM autorization/ActiveDirectory support"	off \
		APACHE22	"Use apache version 2.2"	on \
		INSTALLGD 	"Graphic reports"		on

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

USE_MYSQL=	5.0

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
USE_PHP+=	ldap
.endif

.if defined(WITH_PHP5GD)
RUN_DEPENDS+=	${LOCALBASE}/include/php/ext/gd/php_gd.h:${PORTSDIR}/graphics/php5-gd/
.endif

.if defined(WITH_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}/


Lines 16-21 Link Here

(-)pkg-plist (-26 / +26 lines)
16	%%DATADIR%%/bin/updateuserlist	16	%%DATADIR%%/bin/updateuserlist
17	%%DATADIR%%/config.php	17	%%DATADIR%%/config.php
18	%%DATADIR%%/createpdf.php	18	%%DATADIR%%/createpdf.php
		19	%%DATADIR%%/data/sams_db.sql
		20	%%DATADIR%%/data/squid_db.sql
		21	%%DATADIR%%/data/upgrade_mysql_table.php
19	%%DATADIR%%/doc/EN/admin.html	22	%%DATADIR%%/doc/EN/admin.html
20	%%DATADIR%%/doc/EN/apache.html	23	%%DATADIR%%/doc/EN/apache.html
21	%%DATADIR%%/doc/EN/faq.html	24	%%DATADIR%%/doc/EN/faq.html
Lines 29-64 Link Here
29	%%DATADIR%%/doc/EN/sams_conf.html	32	%%DATADIR%%/doc/EN/sams_conf.html
30	%%DATADIR%%/doc/EN/squid.html	33	%%DATADIR%%/doc/EN/squid.html
31	%%DATADIR%%/doc/EN/upgrade.html	34	%%DATADIR%%/doc/EN/upgrade.html
32	%%DATADIR%%/doc/RU/redirector.html	35	%%DATADIR%%/doc/RU/about.html
33	%%DATADIR%%/doc/RU/script.html	36	%%DATADIR%%/doc/RU/addusers.html
34	%%DATADIR%%/doc/RU/settings.html	37	%%DATADIR%%/doc/RU/adldap.html
35	%%DATADIR%%/doc/RU/samba.html
36	%%DATADIR%%/doc/RU/apache.html	38	%%DATADIR%%/doc/RU/apache.html
		39	%%DATADIR%%/doc/RU/backup.html
		40	%%DATADIR%%/doc/RU/faq.html
		41	%%DATADIR%%/doc/RU/filerecovery.html
37	%%DATADIR%%/doc/RU/groups.html	42	%%DATADIR%%/doc/RU/groups.html
38	%%DATADIR%%/doc/RU/users.html
39	%%DATADIR%%/doc/RU/about.html
40	%%DATADIR%%/doc/RU/gui.html	43	%%DATADIR%%/doc/RU/gui.html
41	%%DATADIR%%/doc/RU/urllists.html	44	%%DATADIR%%/doc/RU/index.html
42	%%DATADIR%%/doc/RU/addusers.html
43	%%DATADIR%%/doc/RU/shablons.html
44	%%DATADIR%%/doc/RU/install.html	45	%%DATADIR%%/doc/RU/install.html
45	%%DATADIR%%/doc/RU/osandsoft.html	46	%%DATADIR%%/doc/RU/localhost.html
46	%%DATADIR%%/doc/RU/filerecovery.html
47	%%DATADIR%%/doc/RU/log.html	47	%%DATADIR%%/doc/RU/log.html
		48	%%DATADIR%%/doc/RU/mysql.html
		49	%%DATADIR%%/doc/RU/mysql_install.html
		50	%%DATADIR%%/doc/RU/osandsoft.html
		51	%%DATADIR%%/doc/RU/pdfreport.html
		52	%%DATADIR%%/doc/RU/redirector.html
		53	%%DATADIR%%/doc/RU/samba.html
		54	%%DATADIR%%/doc/RU/samba3.html
		55	%%DATADIR%%/doc/RU/sams_conf.html
		56	%%DATADIR%%/doc/RU/script.html
		57	%%DATADIR%%/doc/RU/settings.html
48	%%DATADIR%%/doc/RU/several.html	58	%%DATADIR%%/doc/RU/several.html
		59	%%DATADIR%%/doc/RU/shablons.html
49	%%DATADIR%%/doc/RU/soft.html	60	%%DATADIR%%/doc/RU/soft.html
50	%%DATADIR%%/doc/RU/squid.html	61	%%DATADIR%%/doc/RU/squid.html
51	%%DATADIR%%/doc/RU/samba3.html
52	%%DATADIR%%/doc/RU/pdfreport.html
53	%%DATADIR%%/doc/RU/mysql_install.html
54	%%DATADIR%%/doc/RU/adldap.html
55	%%DATADIR%%/doc/RU/backup.html
56	%%DATADIR%%/doc/RU/localhost.html
57	%%DATADIR%%/doc/RU/upgrade.html	62	%%DATADIR%%/doc/RU/upgrade.html
58	%%DATADIR%%/doc/RU/index.html	63	%%DATADIR%%/doc/RU/urllists.html
59	%%DATADIR%%/doc/RU/mysql.html	64	%%DATADIR%%/doc/RU/users.html
60	%%DATADIR%%/doc/RU/sams_conf.html
61	%%DATADIR%%/doc/RU/faq.html
62	%%DATADIR%%/doc/img/10.jpg	65	%%DATADIR%%/doc/img/10.jpg
63	%%DATADIR%%/doc/img/11.jpg	66	%%DATADIR%%/doc/img/11.jpg
64	%%DATADIR%%/doc/img/12.jpg	67	%%DATADIR%%/doc/img/12.jpg
Lines 143-151 Link Here
143	%%DATADIR%%/doc/img/usergroup_32.jpg	146	%%DATADIR%%/doc/img/usergroup_32.jpg
144	%%DATADIR%%/doc/img/userlog-32.gif	147	%%DATADIR%%/doc/img/userlog-32.gif
145	%%DATADIR%%/doc/img/websettings.jpg	148	%%DATADIR%%/doc/img/websettings.jpg
146	%%DATADIR%%/data/upgrade_mysql_table.php
147	%%DATADIR%%/data/sams_db.sql
148	%%DATADIR%%/data/squid_db.sql
149	%%DATADIR%%/icon/bumper/adir.gif	149	%%DATADIR%%/icon/bumper/adir.gif
150	%%DATADIR%%/icon/bumper/allow_48.jpg	150	%%DATADIR%%/icon/bumper/allow_48.jpg
151	%%DATADIR%%/icon/bumper/backup_48.jpg	151	%%DATADIR%%/icon/bumper/backup_48.jpg
Lines 641-647 Link Here
641	%%DATADIR%%/src/userbuttom_2_traffic.php	641	%%DATADIR%%/src/userbuttom_2_traffic.php
642	%%DATADIR%%/src/userbuttom_3_file.php	642	%%DATADIR%%/src/userbuttom_3_file.php
643	%%DATADIR%%/src/userbuttom_4_site.php	643	%%DATADIR%%/src/userbuttom_4_site.php
644	%%DATADIR%%/src/usersbuttom_4_site.php
645	%%DATADIR%%/src/userbuttom_4_time.php	644	%%DATADIR%%/src/userbuttom_4_time.php
646	%%DATADIR%%/src/userbuttom_5_clear.php	645	%%DATADIR%%/src/userbuttom_5_clear.php
647	%%DATADIR%%/src/userbuttom_6_chpasswd.php	646	%%DATADIR%%/src/userbuttom_6_chpasswd.php
Lines 654-659 Link Here
654	%%DATADIR%%/src/usersbuttom_2_traffic.php	653	%%DATADIR%%/src/usersbuttom_2_traffic.php
655	%%DATADIR%%/src/usersbuttom_3_file.php	654	%%DATADIR%%/src/usersbuttom_3_file.php
656	%%DATADIR%%/src/usersbuttom_4_percent.php	655	%%DATADIR%%/src/usersbuttom_4_percent.php
		656	%%DATADIR%%/src/usersbuttom_4_site.php
657	%%DATADIR%%/src/usersbuttom_5_recalc.php	657	%%DATADIR%%/src/usersbuttom_5_recalc.php
658	%%DATADIR%%/src/usersbuttom_6_clear.php	658	%%DATADIR%%/src/usersbuttom_6_clear.php
659	%%DATADIR%%/src/usersbuttom_7_pdf.php	659	%%DATADIR%%/src/usersbuttom_7_pdf.php
Lines 674-681 Link Here
674	@dirrm %%DATADIR%%/icon/bumper	674	@dirrm %%DATADIR%%/icon/bumper
675	@dirrm %%DATADIR%%/icon	675	@dirrm %%DATADIR%%/icon
676	@dirrm %%DATADIR%%/doc/img	676	@dirrm %%DATADIR%%/doc/img
677	@dirrm %%DATADIR%%/doc/EN
678	@dirrm %%DATADIR%%/doc/RU	677	@dirrm %%DATADIR%%/doc/RU
		678	@dirrm %%DATADIR%%/doc/EN
679	@dirrm %%DATADIR%%/doc	679	@dirrm %%DATADIR%%/doc
680	@dirrm %%DATADIR%%/data	680	@dirrm %%DATADIR%%/data
681	@dirrm %%DATADIR%%/bin	681	@dirrm %%DATADIR%%/bin




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

 SQUIDCACHEFILE=access.log
-SQUIDROOTDIR=/etc/squid
-SQUIDLOGDIR=/var/log/squid
+SQUIDROOTDIR=/usr/local/etc/squid
+SQUIDLOGDIR=/usr/local/squid/logs
 SQUIDCACHEDIR=/var/spool/squid
-SAMSPATH=/usr/local
-SQUIDPATH=/usr/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=iconv -f KOI8-R -t 866 %finp > %fout 
 LDAPSERVER=servername_or_ipadress
 LDAPBASEDN=your.domain
 LDAPUSER=DomainAdministrator

Return to bug 131679

Lines 22-49 Link Here

(-)Makefile (-10 / +14 lines)
22		22
23	OPTIONS= NTLM "NTLM autorization/ActiveDirectory support" off \	23	OPTIONS= NTLM "NTLM autorization/ActiveDirectory support" off \
24	APACHE22 "Use apache version 2.2" on \	24	APACHE22 "Use apache version 2.2" on \
25	PHP5GD "Enable constructing graphs" on	25	INSTALLGD "Graphic reports" on
26		26
27	USE_GMAKE= yes	27	USE_GMAKE= yes
28	GNU_CONFIGURE= yes	28	GNU_CONFIGURE= yes
29	USE_BZIP2= yes	29	USE_BZIP2= yes
30	USE_PHP= mysql	30	USE_PHP= ctype curl gettext hash iconv json mysql \
		31	pcre pdf pdo pdo_sqlite posix session \
		32	session simplexml spl sqlite tokenizer \
		33	xmlreader xmlwriter zlib
		34
31	USE_MYSQL= 5.0	35	USE_MYSQL= 5.0
32		36
33	CONFIGURE_ARGS= --with-configfile=${LOCALBASE}/etc/sams.conf \	37	CONFIGURE_ARGS= --with-configfile=${PREFIX}/etc/sams.conf \
34	--with-rcd-locations=${LOCALBASE}/etc/rc.d/	38	--with-rcd-locations=${PREFIX}/etc/rc.d/
35		39
36	SUB_FILES= pkg-message	40	SUB_FILES= pkg-message
37		41
38	.include <bsd.port.pre.mk>	42	.include <bsd.port.pre.mk>
39		43
40	.if defined(WITH_NTLM)	44	.if defined(WITH_NTLM)
41	RUN_DEPENDS= ${LOCALBASE}/bin/ntlm_auth:${PORTSDIR}/net/samba3	45	RUN_DEPENDS+= ${LOCALBASE}/bin/ntlm_auth:${PORTSDIR}/net/samba3
42	RUN_DEPENDS+= ${LOCALBASE}/include/php/ext/ldap/php_ldap.h:${PORTSDIR}/net/php5-ldap/	46	USE_PHP+= ldap
43	.endif
44
45	.if defined(WITH_PHP5GD)
46	RUN_DEPENDS+= ${LOCALBASE}/include/php/ext/gd/php_gd.h:${PORTSDIR}/graphics/php5-gd/
47	.endif	47	.endif
48		48
49	.if defined(WITH_APACHE22)	49	.if defined(WITH_APACHE22)
Lines 52-57 Link Here
52	RUN_DEPENDS+= ${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13	52	RUN_DEPENDS+= ${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13
53	.endif	53	.endif
54		54
		55	.if defined(WITH_INSTALLGD)
		56	USE_PHP+= gd
		57	.endif
		58
55	post-extract:	59	post-extract:
56	${INSTALL_SCRIPT} ${FILESDIR}/setup.sh ${WRKSRC}/	60	${INSTALL_SCRIPT} ${FILESDIR}/setup.sh ${WRKSRC}/
57		61

Lines 1-5 Link Here

(-)files/patch-sams.conf (-7 / +7 lines)
1	--- etc/sams.conf.orig 2007-08-15 20:05:54.000000000 -0400	1	--- etc/sams.conf.orig 2008-11-12 13:26:07.375021156 -0400
2	+++ etc/sams.conf 2008-11-12 13:26:07.375021156 -0500	2	+++ etc/sams.conf 2009-02-14 19:25:00.000000000 -0500
3	@@ -4,21 +4,21 @@	3	@@ -4,21 +4,21 @@
4	MYSQLHOSTNAME=localhost	4	MYSQLHOSTNAME=localhost
5	MYSQLUSER=sams	5	MYSQLUSER=sams
Lines 9-26 Link Here
9	SQUIDCACHEFILE=access.log	9	SQUIDCACHEFILE=access.log
10	-SQUIDROOTDIR=/etc/squid	10	-SQUIDROOTDIR=/etc/squid
11	-SQUIDLOGDIR=/var/log/squid	11	-SQUIDLOGDIR=/var/log/squid
12	+SQUIDROOTDIR=${LOCALBASE}/etc/squid	12	+SQUIDROOTDIR=/usr/local/etc/squid
13	+SQUIDLOGDIR=${LOCALBSE}/squid/logs	13	+SQUIDLOGDIR=/usr/local/squid/logs
14	SQUIDCACHEDIR=/var/spool/squid	14	SQUIDCACHEDIR=/var/spool/squid
15	-SAMSPATH=/usr/local	15	-SAMSPATH=/usr/local
16	-SQUIDPATH=/usr/sbin	16	-SQUIDPATH=/usr/sbin
17	+SAMSPATH=${PREFIX}	17	+SAMSPATH=/usr/local
18	+SQUIDPATH=${LOCALBASE}/sbin	18	+SQUIDPATH=/usr/local/sbin
19	SQUIDGUARDLOGPATH=/var/log	19	SQUIDGUARDLOGPATH=/var/log
20	-SQUIDGUARDDBPATH=/var/db/squidguard	20	-SQUIDGUARDDBPATH=/var/db/squidguard
21	-RECODECOMMAND=iconv -f KOI8-R -t 866 %finp > %fout	21	-RECODECOMMAND=iconv -f KOI8-R -t 866 %finp > %fout
22	+SQUIDGUARDDBPATH=/var/db/squidGuard	22	+SQUIDGUARDDBPATH=/var/db/squidGuard
23	+RECODECOMMAND=${LOCALBASE}/bin/iconv -f KOI8-R -t 866 %finp > %fout	23	+RECODECOMMAND=iconv -f KOI8-R -t 866 %finp > %fout
24	LDAPSERVER=servername_or_ipadress	24	LDAPSERVER=servername_or_ipadress
25	LDAPBASEDN=your.domain	25	LDAPBASEDN=your.domain
26	LDAPUSER=DomainAdministrator	26	LDAPUSER=DomainAdministrator