Attachment 92220 Details for Bug 129816 – file.diff

[patch] file.diff

file.diff (text/plain), 3.16 KB, created by Yuri Grishin on 2008-12-21 14:00:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Grishin

Created: 2008-12-21 14:00:10 UTC

Size: 3.16 KB

patch

obsolete

>diff -ruN /usr/ports/www/sams/Makefile /tmp/sams-1.04/Makefile
>--- /usr/ports/www/sams/Makefile	2008-11-14 04:36:58.000000000 +0400
>+++ /tmp/sams-1.04/Makefile	2008-12-21 17:42:59.000000000 +0400
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	sams
>-DISTVERSION=	1.0.3
>+DISTVERSION=	1.0.4
> PORTEPOCH=	1
> CATEGORIES=	www
> MASTER_SITES=	http://sams.perm.ru/download/ \
>@@ -21,30 +21,35 @@
> USE_RC_SUBR=	sams.sh
> 
> OPTIONS=	NTLM	"NTLM autorization/ActiveDirectory support"	off \
>-		APACHE2	"Use apache version 2"	on
>+		APACHE22	"Use apache version 2.2"	on \
>+		PHP5GD	"Enable constructing graphs" on
> 
> USE_GMAKE=	yes
> GNU_CONFIGURE=	yes
> USE_BZIP2=	yes
>-USE_PHP=	gd mysql ldap
>+USE_PHP=	mysql
> 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/
> 
> 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}/bin/ntlm_auth:${PORTSDIR}/net/samba3
>+RUN_DEPENDS+=	${LOCALBASE}/include/php/ext/ldap/php_ldap.h:${PORTSDIR}/net/php5-ldap/
> .endif
> 
>-.if defined(WITH_APACHE2)
>-RUN_DEPENDS+=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13
>-.else
>+.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/apache22
>+.else
>+RUN_DEPENDS+=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13
> .endif
> 
> post-extract:
>diff -ruN /usr/ports/www/sams/distinfo /tmp/sams-1.04/distinfo
>--- /usr/ports/www/sams/distinfo	2008-11-14 04:36:58.000000000 +0400
>+++ /tmp/sams-1.04/distinfo	2008-12-21 11:07:43.000000000 +0400
>@@ -1,3 +1,3 @@
>-MD5 (sams-1.0.3.tar.bz2) = 78782acf45dc8d69976f23f5a9de816f
>-SHA256 (sams-1.0.3.tar.bz2) = 0369e1397eccb2e32f6132069b8a45638d8507214ebd935084d0a871ca1ad05d
>-SIZE (sams-1.0.3.tar.bz2) = 1561538
>+MD5 (sams-1.0.4.tar.bz2) = e0aad64098968bd4159687d2d569dcea
>+SHA256 (sams-1.0.4.tar.bz2) = 6f770008cb910418011118198f0a6d211588cc24e9d567a2dee49f78f29681ec
>+SIZE (sams-1.0.4.tar.bz2) = 1561524
>diff -ruN /usr/ports/www/sams/pkg-plist /tmp/sams-1.04/pkg-plist
>--- /usr/ports/www/sams/pkg-plist	2008-11-14 04:36:58.000000000 +0400
>+++ /tmp/sams-1.04/pkg-plist	2008-12-21 17:35:28.000000000 +0400
>@@ -33,7 +33,6 @@
> %%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
>@@ -478,7 +477,6 @@
> %%DATADIR%%/install.php
> %%DATADIR%%/lang/koi8r-2-utf8
> %%DATADIR%%/lang/koi8r-2-win1251
>-%%DATADIR%%/lang/koi8r-2-win1251.php
> %%DATADIR%%/lang/lang.EN
> %%DATADIR%%/lang/lang.KOI8-R
> %%DATADIR%%/lang/lang.UTF8
>@@ -616,7 +614,6 @@
> %%DATADIR%%/src/newgrpbuttom_1_adldap.php
> %%DATADIR%%/src/newgrpbuttom_5_addgroup.php
> %%DATADIR%%/src/newgrptray.php
>-%%DATADIR%%/src/newshablon.php
> %%DATADIR%%/src/proxybuttom_1_down.php
> %%DATADIR%%/src/proxytray.php
> %%DATADIR%%/src/redirbuttom_1_loadlist.php

Actions: View | Diff

Attachments on bug 129816: 92220