Attachment 121701 Details for Bug 164738 – rt40.diff

[patch] rt40.diff

rt40.diff (text/plain), 6.99 KB, created by Matthew Seaman on 2012-02-03 14:20:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Seaman

Created: 2012-02-03 14:20:09 UTC

Size: 6.99 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/www/rt40/Makefile,v
>retrieving revision 1.48
>diff -u -u -r1.48 Makefile
>--- Makefile	5 Jan 2012 22:54:15 -0000	1.48
>+++ Makefile	3 Feb 2012 14:15:25 -0000
>@@ -11,8 +11,7 @@
> #   o install a sample into etc/apache22/Includes
> 
> PORTNAME=	rt
>-PORTVERSION=	4.0.4
>-PORTREVISION=	1
>+PORTVERSION=	4.0.5
> CATEGORIES=	www
> MASTER_SITES=	http://download.bestpractical.com/pub/rt/release/ \
> 		ftp://ftp.eu.uu.net/pub/unix/ticketing/rt/release/
>@@ -24,14 +23,14 @@
> EXTRA_PATCHES+=	${FILESDIR}/extra-patch-noportdocs-Makefile.in
> .endif
> 
>-CONFLICTS=	rt-3.6* rt-3.8*
>+CONFLICTS=	rt-3.8*
> LATEST_LINK=	rt40
> 
> # See doc/web_deployment.pod for info on the choices of webserver /
>-# webapp combinations.  Note: apache-1.3.x is no longer supported in
>-# ports: apache-2.2+ is recommended.  For deployment with nginx, use
>-# the SPAWN_FCGI method.  A standalone PSGI based webserver is always
>-# available, but this is really only suitable for development usage.
>+# webapp combinations.  Note: if using apache, apache-2.2+ is
>+# recommended.  For deployment with nginx, use the SPAWN_FCGI method.
>+# A standalone PSGI based webserver is always available, but this is
>+# really only suitable for development usage.
> #
> # See doc/full_text_indexing.pod if you need to set up full text
> # indexes on your ticket database.  PostgreSQL or Oracle are
>@@ -47,6 +46,7 @@
> 		POSTGRESQL	"Enable PosgreSQL backend"		off \
> 		ORACLE		"Enable Oracle backend"			off \
> 		SQLITE		"Enable SQLite backend (dev only)"	off \
>+		SSL_MAILGATE	"Enable HTTPS support for rt-mailgate"	off \
> 		DEV 		"Configure for Developers"		off \
> 		GPG		"Enable GnuPG support"			on \
> 		GRAPHVIZ	"Enable GraphViz charts"		off \
>@@ -160,25 +160,31 @@
> .if defined(WITH_DEV)
> BUILD_DEPENDS+=	${DEV_DEPS}
> RUN_DEPENDS+=	${DEV_DEPS}
>-CONFIGURE_ARGS+=	"--enable-developer-mode"
>+CONFIGURE_ARGS+=	--enable-developer-mode
>+.endif
>+
>+.if defined(WITH_SSL_MAILGATE)
>+BUILD_DEPENDS+=	${SSL_MAILGATE_DEPS}
>+RUN_DEPENDS+=	${SSL_MAILGATE_DEPS}
>+CONFIGURE_ARGS+=	--enable-ssl-mailgate
> .endif
> 
> .if defined(WITH_GRAPHVIZ)
> BUILD_DEPENDS+=	${GRAPHVIZ_DEPS}
> RUN_DEPENDS+=	${GRAPHVIZ_DEPS}
>-CONFIGURE_ARGS+=	"--enable-graphviz"
>+CONFIGURE_ARGS+=	--enable-graphviz
> .endif
> 
> .if defined(WITH_GPG)
> BUILD_DEPENDS+=	${GPG_DEPS}
> RUN_DEPENDS+=	${GPG_DEPS}
>-CONFIGURE_ARGS+=	"--enable-gpg"
>+CONFIGURE_ARGS+=	--enable-gpg
> .endif
> 
> .if defined(WITH_GD)
> BUILD_DEPENDS+=	${GD_DEPS}
> RUN_DEPENDS+=	${GD_DEPS}
>-configure_args+=	"--enable-gd"
>+configure_args+=	--enable-gd
> .endif
> 
> RT_ETC_PATH?=	${PREFIX}/etc/${PORTNAME}40
>Index: Makefile.cpan
>===================================================================
>RCS file: /home/ncvs/ports/www/rt40/Makefile.cpan,v
>retrieving revision 1.9
>diff -u -u -r1.9 Makefile.cpan
>--- Makefile.cpan	5 Jan 2012 17:47:28 -0000	1.9
>+++ Makefile.cpan	3 Feb 2012 14:15:25 -0000
>@@ -6,7 +6,7 @@
> ### Scalar::Util     1.18                 core
> ### Text::ParseWords 3.24                 core
> ### Term::ReadLine	 		  core
>-### 
>+###
> ### Digest::base                          core
> ### Time::HiRes                           core
> ### Errno                                 core
>@@ -73,15 +73,19 @@
> 
> MAILGATE_DEPS=	p5-HTML-Format>0:${PORTSDIR}/textproc/p5-HTML-Format \
> 		p5-HTML-Tree>0:${PORTSDIR}/www/p5-HTML-Tree \
>-		p5-libwww>0:${PORTSDIR}/www/p5-libwww
>-	
>+		p5-libwww>6.0:${PORTSDIR}/www/p5-libwww
>+
>+SSL_MAILGATE_DEPS=	p5-Crypt-SSLeay>0:${PORTSDIR}/security/p5-Crypt-SSLeay \
>+		p5-LWP-Protocol-https>0:${PORTSDIR}/www/p5-LWP-Protocol-https \
>+		p5-Mozilla-CA>0:${PORTSDIR}/www/p5-Mozilla-CA
>+
> CLI_DEPS=	p5-HTTP-Message>0:${PORTSDIR}/www/p5-HTTP-Message \
> 		p5-libwww>0:${PORTSDIR}/www/p5-libwww \
> 		p5-Term-ReadKey>0:${PORTSDIR}/devel/p5-Term-ReadKey
> 
> # ports to add:
> # Test::Email
>-# Test::Builder >= 0.90 
>+# Test::Builder >= 0.90
> # Plack::Middleware::Test::StashWarnings
> DEV_DEPS=	p5-Email-Abstract>0:${PORTSDIR}/mail/p5-Email-Abstract \
> 		p5-HTML-Form>0:${PORTSDIR}/www/p5-HTML-Form \
>@@ -105,7 +109,7 @@
> MODPERL2_DEPS=	${SITE_PERL}/${PERL_ARCH}/Apache2/Request.pm:${PORTSDIR}/www/p5-libapreq2 \
> 		p5-Apache-DBI>0:${PORTSDIR}/www/p5-Apache-DBI
> 
>-MYSQL_DEPS=	p5-DBD-mysql>=2.1018:${PORTSDIR}/databases/p5-DBD-mysql 
>+MYSQL_DEPS=	p5-DBD-mysql>=2.1018:${PORTSDIR}/databases/p5-DBD-mysql
> 
> ORACLE_DEPS=	p5-DBD-Oracle>0:${PORTSDIR}/databases/p5-DBD-Oracle
> 
>@@ -128,6 +132,6 @@
> 
> GD_DEPS=	p5-GD>0:${PORTSDIR}/graphics/p5-GD \
> 		p5-GD-Graph>0:${PORTSDIR}/graphics/p5-GD-Graph \
>-		p5-GD-TextUtil>0:${PORTSDIR}/graphics/p5-GD-TextUtil 
>+		p5-GD-TextUtil>0:${PORTSDIR}/graphics/p5-GD-TextUtil
> 
> USERLOGO_DEPS=	p5-Convert-Color>0:${PORTSDIR}/graphics/p5-Convert-Color
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/www/rt40/distinfo,v
>retrieving revision 1.13
>diff -u -u -r1.13 distinfo
>--- distinfo	11 Nov 2011 14:13:29 -0000	1.13
>+++ distinfo	3 Feb 2012 14:15:25 -0000
>@@ -1,2 +1,2 @@
>-SHA256 (rt-4.0.4.tar.gz) = 541e81d7d020caa1f089a353e8bf7076aef3c2938dcdd9055036a923142f8480
>-SIZE (rt-4.0.4.tar.gz) = 5964551
>+SHA256 (rt-4.0.5.tar.gz) = 280daadff11595fe4baa4f55544cedd26ada560b421c165bba45340fd6eaddb0
>+SIZE (rt-4.0.5.tar.gz) = 5877387
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/www/rt40/pkg-plist,v
>retrieving revision 1.16
>diff -u -u -r1.16 pkg-plist
>--- pkg-plist	11 Nov 2011 14:13:29 -0000	1.16
>+++ pkg-plist	3 Feb 2012 14:15:26 -0000
>@@ -238,6 +238,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/glossary.pod
> %%PORTDOCS%%%%DOCSDIR%%/hacking.pod
> %%PORTDOCS%%%%DOCSDIR%%/network-diagram.svg
>+%%PORTDOCS%%%%DOCSDIR%%/schema.dot
> %%PORTDOCS%%%%DOCSDIR%%/security.pod
> %%PORTDOCS%%%%DOCSDIR%%/upgrade/3.1.0/acl.Oracle
> %%PORTDOCS%%%%DOCSDIR%%/upgrade/3.1.0/acl.Pg
>@@ -1179,6 +1180,7 @@
> share/rt40/html/Ticket/ModifyPeople.html
> share/rt40/html/Ticket/Reminders.html
> share/rt40/html/Ticket/ShowEmailRecord.html
>+share/rt40/html/Ticket/autohandler
> share/rt40/html/Ticket/Update.html
> share/rt40/html/Tools/MyDay.html
> share/rt40/html/Tools/MyReminders.html
>@@ -1215,9 +1217,9 @@
> share/rt40/html/m/login
> share/rt40/html/m/logout
> share/rt40/html/m/style.css
>+share/rt40/html/m/ticket/autohandler
> share/rt40/html/m/ticket/create
> share/rt40/html/m/ticket/history
>-share/rt40/html/m/ticket/modify
> share/rt40/html/m/ticket/reply
> share/rt40/html/m/ticket/select_create_queue
> share/rt40/html/m/ticket/show
>@@ -1259,9 +1261,11 @@
> share/rt40/po/zh_TW.po
> @dirrmtry www/rt40
> @dirrm share/rt40/po
>+@exec mkdir -p %D/share/rt40/etc
>+@exec mkdir -p %D/share/rt40/lib
> @exec mkdir -p %D/share/rt40/plugins
> @dirrm share/rt40/plugins
>-@dirrm share/rt40/lib
>+@dirrmtry share/rt40/lib
> @dirrm share/rt40/html/m/tickets
> @dirrm share/rt40/html/m/ticket
> @dirrm share/rt40/html/m/_elements
>@@ -1444,7 +1448,7 @@
> @dirrm share/rt40/html/Admin
> @dirrm share/rt40/html
> @dirrm share/rt40/fonts
>-@dirrm share/rt40/etc
>+@dirrmtry share/rt40/etc
> @dirrm share/rt40
> %%PORTDOCS%%@dirrm %%DOCSDIR%%/upgrade/4.0.4
> %%PORTDOCS%%@dirrm %%DOCSDIR%%/upgrade/4.0.3

Actions: View | Diff

Attachments on bug 164738: 121701